Merge branch 'main' into chore/use-ts-node-scripts

algolia · Mar 15, 2022 · 2abec86 · 2abec86
2 parents ed04725 + 1c71efd
commit 2abec86
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 13 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -133,7 +133,11 @@ jobs:
       - setup
       - specs
       - client_javascript_common
-    if: ${{ needs.setup.outputs.RUN_JS == 'true' }}
+    if: |
+      always() &&
+      needs.setup.outputs.RUN_JS == 'true' &&
+      contains(needs.*.result, 'success') &&
+      !contains(needs.*.result, 'failure')
     strategy:
       matrix: ${{ fromJSON(needs.setup.outputs.JS_MATRIX) }}
     steps:
@@ -172,7 +176,11 @@ jobs:
     needs:
       - setup
       - specs
-    if: ${{ needs.setup.outputs.RUN_JAVA == 'true' }}
+    if: |
+      always() &&
+      needs.setup.outputs.RUN_JAVA == 'true' &&
+      contains(needs.*.result, 'success') &&
+      !contains(needs.*.result, 'failure')
     strategy:
       matrix: ${{ fromJSON(needs.setup.outputs.JAVA_MATRIX) }}
     steps:
@@ -211,7 +219,11 @@ jobs:
     needs:
       - setup
       - specs
-    if: ${{ needs.setup.outputs.RUN_PHP == 'true' }}
+    if: |
+      always() &&
+      needs.setup.outputs.RUN_PHP == 'true' &&
+      contains(needs.*.result, 'success') &&
+      !contains(needs.*.result, 'failure')
     strategy:
       matrix: ${{ fromJSON(needs.setup.outputs.PHP_MATRIX) }}
     steps:

diff --git a/clients/algoliasearch-client-javascript/packages/client-abtesting/.openapi-generator-ignore b/clients/algoliasearch-client-javascript/packages/client-abtesting/.openapi-generator-ignore
@@ -5,5 +5,4 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 git_push.sh
-model/models.ts
 .gitignore
diff --git a/clients/algoliasearch-client-javascript/packages/client-analytics/.openapi-generator-ignore b/clients/algoliasearch-client-javascript/packages/client-analytics/.openapi-generator-ignore
@@ -5,5 +5,4 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 git_push.sh
-model/models.ts
 .gitignore
diff --git a/clients/algoliasearch-client-javascript/packages/client-insights/.openapi-generator-ignore b/clients/algoliasearch-client-javascript/packages/client-insights/.openapi-generator-ignore
@@ -5,5 +5,4 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 git_push.sh
-model/models.ts
 .gitignore
diff --git a/...algoliasearch-client-javascript/packages/client-personalization/.openapi-generator-ignore b/...algoliasearch-client-javascript/packages/client-personalization/.openapi-generator-ignore
@@ -5,5 +5,4 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 git_push.sh
-model/models.ts
 .gitignore
diff --git a/clients/algoliasearch-client-javascript/packages/client-predict/.openapi-generator-ignore b/clients/algoliasearch-client-javascript/packages/client-predict/.openapi-generator-ignore
@@ -5,5 +5,4 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 git_push.sh
-model/models.ts
 .gitignore
diff --git a/...goliasearch-client-javascript/packages/client-query-suggestions/.openapi-generator-ignore b/...goliasearch-client-javascript/packages/client-query-suggestions/.openapi-generator-ignore
@@ -5,5 +5,4 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 git_push.sh
-model/models.ts
 .gitignore
diff --git a/clients/algoliasearch-client-javascript/packages/client-search/.openapi-generator-ignore b/clients/algoliasearch-client-javascript/packages/client-search/.openapi-generator-ignore
@@ -5,5 +5,4 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 git_push.sh
-model/models.ts
 .gitignore
diff --git a/clients/algoliasearch-client-javascript/packages/client-sources/.openapi-generator-ignore b/clients/algoliasearch-client-javascript/packages/client-sources/.openapi-generator-ignore
@@ -5,5 +5,4 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 git_push.sh
-model/models.ts
 .gitignore
diff --git a/clients/algoliasearch-client-javascript/packages/recommend/.openapi-generator-ignore b/clients/algoliasearch-client-javascript/packages/recommend/.openapi-generator-ignore
@@ -5,5 +5,4 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 git_push.sh
-model/models.ts
 .gitignore
diff --git a/playground/javascript/node/algoliasearch.ts b/playground/javascript/node/algoliasearch.ts
@@ -2,6 +2,8 @@ import { algoliasearch } from '@experimental-api-clients-automation/algoliasearc
 import { ApiError } from '@experimental-api-clients-automation/client-common';
 import dotenv from 'dotenv';
 
+import type { SearchResponse } from '@experimental-api-clients-automation/client-search';
+
 dotenv.config({ path: '../../.env' });
 
 const appId = process.env.ALGOLIA_APPLICATION_ID || '**** APP_ID *****';
@@ -29,7 +31,7 @@ client.addUserAgent('algoliasearch node playground', '0.0.1');
 
 async function testAlgoliasearch() {
   try {
-    const res = await client.search({
+    const res: SearchResponse = await client.search({
       indexName: searchIndex,
       searchParams: { query: searchQuery },
     });

diff --git a/templates/javascript/api-single.mustache b/templates/javascript/api-single.mustache
@@ -16,6 +16,7 @@ import type {
 import { {{classname}} } from '{{filename}}';
 {{/imports}}
 
+export * from '../model/models';
 export const apiClientVersion = '{{packageVersion}}';
 
 {{#operations}}

diff --git a/templates/javascript/models.mustache b/templates/javascript/models.mustache
@@ -0,0 +1,5 @@
+{{#models}}
+{{#model}}
+export * from '{{{ classFilename }}}';
+{{/model}}
+{{/models}}