fix(javascript): waitForApiKey consistency

Author: Fluf22

templates/javascript/clients/client/api/helpers.mustache

@@ -90,9 +90,11 @@ waitForApiKey(
       Math.min(retryCount * 200, 5000),
   }: WaitForApiKeyOptions,
   requestOptions?: RequestOptions
-): Promise<ApiError | GetApiKeyResponse> {
+): Promise<GetApiKeyResponse | undefined> {
   let retryCount = 0;
-  const baseIteratorOptions: IterableOptions<ApiError | GetApiKeyResponse> = {
+  const baseIteratorOptions: IterableOptions<
+    GetApiKeyResponse | undefined
+  > = {
     aggregator: () => (retryCount += 1),
     error: {
       validate: () => retryCount >= maxRetries,
@@ -135,9 +137,15 @@ waitForApiKey(
   return createIterablePromise({
     ...baseIteratorOptions,
     func: () =>
-      this.getApiKey({ key }, requestOptions).catch((error) => error),
-    validate: (error: ApiError) =>
-      operation === 'add' ? error.status !== 404 : error.status === 404,
+      this.getApiKey({ key }, requestOptions).catch((error: ApiError) => {
+        if (error.status === 404) {
+          return undefined;
+        }
+
+        throw error;
+      }),
+    validate: (response) =>
+      operation === 'add' ? response !== undefined : response === undefined,
   });
 },
 

templates/javascript/tests/client/suite.mustache

@@ -46,7 +46,12 @@ describe('{{testType}}', () => {
             expect(result).toEqual({{{match.parameters}}});
           {{/matchIsJSON}}
           {{^matchIsJSON}}
-            expect(result).toEqual("{{{match}}}");
+            {{#matchIsNull}}
+              expect(result).toBeUndefined();
+            {{/matchIsNull}}
+            {{^matchIsNull}}
+              expect(result).toEqual("{{{match}}}");
+            {{/matchIsNull}}
           {{/matchIsJSON}}
         {{/testResponse}}
       {{/isError}}