Merge branch 'main' into chore/prepare-release-2022-06-24

Author: millotp

clients/algoliasearch-client-javascript/packages/client-search/model/clientMethodProps.ts

@@ -1,3 +1,5 @@
+import type { CreateRetryablePromiseOptions } from '@experimental-api-clients-automation/client-common';
+
 import type { ApiKey } from './apiKey';
 import type { AssignUserIdParams } from './assignUserIdParams';
 import type { AttributeOrBuiltInOperation } from './attributeOrBuiltInOperation';
@@ -6,7 +8,9 @@ import type { BatchDictionaryEntriesParams } from './batchDictionaryEntriesParam
 import type { BatchWriteParams } from './batchWriteParams';
 import type { BrowseRequest } from './browseRequest';
 import type { DictionaryType } from './dictionaryType';
+import type { GetTaskResponse } from './getTaskResponse';
 import type { IndexSettings } from './indexSettings';
+import type { Key } from './key';
 import type { LogType } from './logType';
 import type { OperationIndexParams } from './operationIndexParams';
 import type { Rule } from './rule';
@@ -719,3 +723,44 @@ export type UpdateApiKeyProps = {
   key: string;
   apiKey: ApiKey;
 };
+
+type WaitForOptions<T> = Omit<
+  CreateRetryablePromiseOptions<T>,
+  'func' | 'validate'
+>;
+
+export type WaitForTaskOptions = WaitForOptions<GetTaskResponse> & {
+  /**
+   * The `indexName` where the operation was performed.
+   */
+  indexName: string;
+  /**
+   * The `taskID` returned by the method response.
+   */
+  taskID: number;
+};
+
+export type WaitForApiKeyOptions = WaitForOptions<Key> & {
+  /**
+   * The API Key.
+   */
+  key: string;
+} & (
+    | {
+        /**
+         * The operation that has been performed, used to compute the stop condition.
+         */
+        operation: 'add' | 'delete';
+        apiKey?: never;
+      }
+    | {
+        /**
+         * The operation that has been performed, used to compute the stop condition.
+         */
+        operation: 'update';
+        /**
+         * The updated fields, used to compute the stop condition.
+         */
+        apiKey: Partial<ApiKey>;
+      }
+  );

clients/algoliasearch-client-javascript/packages/client-search/src/searchClient.ts

@@ -12,7 +12,7 @@ import type {
   Request,
   RequestOptions,
   QueryParameters,
-  CreateRetryablePromiseOptions,
+  ApiError,
 } from '@experimental-api-clients-automation/client-common';
 
 import type { AddApiKeyResponse } from '../model/addApiKeyResponse';
@@ -21,6 +21,8 @@ import type { BatchParams } from '../model/batchParams';
 import type { BatchResponse } from '../model/batchResponse';
 import type { BrowseResponse } from '../model/browseResponse';
 import type {
+  WaitForTaskOptions,
+  WaitForApiKeyOptions,
   AddOrUpdateObjectProps,
   AssignUserIdProps,
   BatchProps,
@@ -183,34 +185,71 @@ export function createSearchClient({
   return {
     addAlgoliaAgent,
     /**
-     * Wait for a task to complete with `indexName` and `taskID`.
+     * Helper: Wait for a task to complete with `indexName` and `taskID`.
      *
      * @summary Wait for a task to complete.
-     * @param waitForTaskProps - The waitForTaskProps object.
-     * @param waitForTaskProps.indexName - The index in which to perform the request.
-     * @param waitForTaskProps.taskID - The unique identifier of the task to wait for.
+     * @param waitForTaskOptions - The waitForTaskOptions object.
+     * @param waitForTaskOptions.indexName - The `indexName` where the operation was performed.
+     * @param waitForTaskOptions.taskID - The `taskID` returned in the method response.
      */
     waitForTask({
       indexName,
       taskID,
       ...createRetryablePromiseOptions
-    }: Omit<
-      CreateRetryablePromiseOptions<GetTaskResponse>,
-      'func' | 'validate'
-    > & {
-      indexName: string;
-      taskID: number;
-    }): Promise<void> {
-      return new Promise<void>((resolve, reject) => {
-        createRetryablePromise<GetTaskResponse>({
+    }: WaitForTaskOptions): Promise<GetTaskResponse> {
+      return createRetryablePromise({
+        ...createRetryablePromiseOptions,
+        func: () => this.getTask({ indexName, taskID }),
+        validate: (response) => response.status === 'published',
+      });
+    },
+
+    /**
+     * Helper: Wait for an API key to be valid, updated or deleted based on a given `operation`.
+     *
+     * @summary Wait for an API key task to be processed.
+     * @param waitForApiKeyOptions - The waitForApiKeyOptions object.
+     * @param waitForApiKeyOptions.operation - The `operation` that was done on a `key`.
+     * @param waitForApiKeyOptions.key - The `key` that has been added, deleted or updated.
+     * @param waitForApiKeyOptions.apiKey - Necessary to know if an `update` operation has been processed, compare fields of the response with it.
+     */
+    waitForApiKey({
+      operation,
+      key,
+      apiKey,
+      ...createRetryablePromiseOptions
+    }: WaitForApiKeyOptions): Promise<ApiError | Key> {
+      if (operation === 'update') {
+        return createRetryablePromise({
           ...createRetryablePromiseOptions,
-          func: () => this.getTask({ indexName, taskID }),
-          validate: (response) => response.status === 'published',
-        })
-          .then(() => resolve())
-          .catch(reject);
+          func: () => this.getApiKey({ key }),
+          validate: (response) => {
+            for (const [entry, values] of Object.entries(apiKey)) {
+              if (Array.isArray(values)) {
+                if (
+                  values.length !== response[entry].length ||
+                  values.some((val, index) => val !== response[entry][index])
+                ) {
+                  return false;
+                }
+              } else if (values !== response[entry]) {
+                return false;
+              }
+            }
+
+            return true;
+          },
+        });
+      }
+
+      return createRetryablePromise({
+        ...createRetryablePromiseOptions,
+        func: () => this.getApiKey({ key }).catch((error) => error),
+        validate: (error: ApiError) =>
+          operation === 'add' ? error.status !== 404 : error.status === 404,
       });
     },
+
     /**
      * Add a new API Key with specific permissions/restrictions.
      *

scripts/cli/utils.ts

@@ -25,13 +25,17 @@ type Prompt = {
   interactive: boolean;
 };
 
-export function getClientChoices(job: Job, language?: LangArg): string[] {
-  const withoutAlgoliaSearch = PROMPT_CLIENTS.filter(
+export function getClientChoices(
+  job: Job,
+  language?: LangArg,
+  clientList = PROMPT_CLIENTS
+): string[] {
+  const withoutAlgoliaSearch = clientList.filter(
     (client) => client !== 'algoliasearch'
   );
 
   if (!language) {
-    return job === 'specs' ? withoutAlgoliaSearch : PROMPT_CLIENTS;
+    return job === 'specs' ? withoutAlgoliaSearch : clientList;
   }
 
   const isJavaScript = language === ALL || language === 'javascript';
@@ -41,7 +45,7 @@ export function getClientChoices(job: Job, language?: LangArg): string[] {
     case 'build':
       // Only `JavaScript` provide a lite client, others can build anything but it.
       if (isJavaScript) {
-        return PROMPT_CLIENTS.filter((client) => client !== 'lite');
+        return clientList.filter((client) => client !== 'lite');
       }
 
       return withoutAlgoliaSearch.filter((client) => client !== 'lite');
@@ -56,7 +60,7 @@ export function getClientChoices(job: Job, language?: LangArg): string[] {
 
       return withoutAlgoliaSearch.filter((client) => client !== 'lite');
     default:
-      return PROMPT_CLIENTS;
+      return clientList;
   }
 }
 
@@ -107,7 +111,7 @@ export async function prompt({
     decision.language = langArg;
   }
 
-  decision.clientList = getClientChoices(job, decision.language);
+  decision.clientList = getClientChoices(job, decision.language, CLIENTS);
 
   if (!clientArg || !clientArg.length) {
     if (interactive) {
@@ -117,15 +121,15 @@ export async function prompt({
           name: 'client',
           message: 'Select a client',
           default: ALL,
-          choices: decision.clientList,
+          choices: getClientChoices(job, decision.language),
         },
       ]);
 
       decision.client = [client];
     }
   } else {
     clientArg.forEach((client) => {
-      if (!decision.clientList.includes(client)) {
+      if (!PROMPT_CLIENTS.includes(client)) {
         throw new Error(
           `The '${clientArg}' client can't run with the given job: '${job}'.\n\nAllowed choices are: ${decision.clientList.join(
             ', '

templates/javascript/api-single.mustache

@@ -18,7 +18,7 @@ export function create{{capitalizedApiName}}({
     hosts: getDefaultHosts({{^hasRegionalHost}}appIdOption{{/hasRegionalHost}}{{#hasRegionalHost}}regionOption{{/hasRegionalHost}}),
     ...options,
     algoliaAgent: getAlgoliaAgent({
-      algoliaAgents: algoliaAgents,
+      algoliaAgents,
       client: '{{{algoliaAgent}}}',
       version: apiClientVersion,
     }),
@@ -40,30 +40,7 @@ export function create{{capitalizedApiName}}({
   return {
     addAlgoliaAgent,
     {{#isSearchClient}}
-    /**
-     * Wait for a task to complete with `indexName` and `taskID`.
-     *
-     * @summary Wait for a task to complete.
-     * @param waitForTaskProps - The waitForTaskProps object.
-     * @param waitForTaskProps.indexName - The index in which to perform the request.
-     * @param waitForTaskProps.taskID - The unique identifier of the task to wait for.
-     */
-    waitForTask({
-      indexName,
-      taskID,
-      ...createRetryablePromiseOptions,
-    }: {
-      indexName: string;
-      taskID: number;
-    } & Omit<CreateRetryablePromiseOptions<GetTaskResponse>, 'func' | 'validate'>): Promise<void> {
-      return new Promise<void>((resolve, reject) => {
-        createRetryablePromise<GetTaskResponse>({
-          ...createRetryablePromiseOptions,
-          func: () => this.getTask({ indexName, taskID }),
-          validate: (response) => response.status === 'published',
-        }).then(() => resolve()).catch(reject);
-      });
-    },
+    {{> api/helpers}}
     {{/isSearchClient}}
     {{#operation}}
     {{> api/operation/jsdoc}}

templates/javascript/api/helpers.mustache

@@ -0,0 +1,65 @@
+/**
+ * Helper: Wait for a task to complete with `indexName` and `taskID`.
+ *
+ * @summary Wait for a task to complete.
+ * @param waitForTaskOptions - The waitForTaskOptions object.
+ * @param waitForTaskOptions.indexName - The `indexName` where the operation was performed.
+ * @param waitForTaskOptions.taskID - The `taskID` returned in the method response.
+ */
+waitForTask({
+  indexName,
+  taskID,
+  ...createRetryablePromiseOptions
+}: WaitForTaskOptions): Promise<GetTaskResponse> {
+  return createRetryablePromise({
+    ...createRetryablePromiseOptions,
+    func: () => this.getTask({ indexName, taskID }),
+    validate: (response) => response.status === 'published',
+  });
+},
+
+/**
+ * Helper: Wait for an API key to be valid, updated or deleted based on a given `operation`.
+ *
+ * @summary Wait for an API key task to be processed.
+ * @param waitForApiKeyOptions - The waitForApiKeyOptions object.
+ * @param waitForApiKeyOptions.operation - The `operation` that was done on a `key`.
+ * @param waitForApiKeyOptions.key - The `key` that has been added, deleted or updated.
+ * @param waitForApiKeyOptions.apiKey - Necessary to know if an `update` operation has been processed, compare fields of the response with it.
+ */
+waitForApiKey({
+  operation,
+  key,
+  apiKey,
+  ...createRetryablePromiseOptions
+}: WaitForApiKeyOptions): Promise<ApiError | Key> {
+  if (operation === 'update') {
+    return createRetryablePromise({
+      ...createRetryablePromiseOptions,
+      func: () => this.getApiKey({ key }),
+      validate: (response) =>  {
+        for (const [entry, values] of Object.entries(apiKey)) {
+          if (Array.isArray(values)) {
+            if (
+              values.length !== response[entry].length ||
+              values.some((val, index) => val !== response[entry][index])
+            ) {
+              return false;
+            }
+          } else if (values !== response[entry]) {
+            return false;
+          }
+        }
+
+        return true;
+      },
+    });
+  }
+
+  return createRetryablePromise({
+    ...createRetryablePromiseOptions,
+    func: () => this.getApiKey({ key }).catch((error) => error),
+    validate: (error: ApiError) =>
+      operation === 'add' ? error.status !== 404 : error.status === 404,
+  });
+},

templates/javascript/api/imports.mustache

@@ -15,7 +15,7 @@ import type {
   RequestOptions,
   QueryParameters,
   {{#isSearchClient}}
-  CreateRetryablePromiseOptions,
+  ApiError,
   {{/isSearchClient}}
 } from '{{{npmNamespace}}}/client-common';
 
@@ -25,6 +25,10 @@ import { {{classname}} } from '{{filename}}';
 
 {{#operations}}
 import type {
+  {{#isSearchClient}}
+    WaitForTaskOptions,
+    WaitForApiKeyOptions,
+  {{/isSearchClient}}
   {{#operation}}
     {{#vendorExtensions}}
       {{#x-create-wrapping-object}}