@aws/nx-plugin 1.0.0-rc.7 → 1.0.0-rc.71

package/src/open-api/ts-client/generator.js

@@ -1,39 +1,54 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateOpenApiTsClient = exports.buildOpenApiCodeGenerationData = exports.openApiTsClientGenerator = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const path = tslib_1.__importStar(require("path"));
-const format_1 = require("../../utils/format");
-const codegen_data_1 = require("../utils/codegen-data");
-const parse_1 = require("../utils/parse");
+ */ import { generateFiles, logger } from "@nx/devkit";
+import * as path from "path";
+import { formatFilesInSubtree } from "../../utils/format.js";
+import { esmVars } from "../../utils/module-format.js";
+import { buildOpenApiCodeGenData } from "../utils/codegen-data.js";
+import { parseOpenApiSpec } from "../utils/parse.js";
 /**
  * Generates typescript client from an openapi spec
- */
-const openApiTsClientGenerator = async (tree, options) => {
-    const data = await (0, exports.buildOpenApiCodeGenerationData)(tree, options.openApiSpecPath);
-    (0, exports.generateOpenApiTsClient)(tree, data, options.outputPath);
-    await (0, format_1.formatFilesInSubtree)(tree);
+ */ export const openApiTsClientGenerator = async (tree, options)=>{
+    const data = await buildOpenApiCodeGenerationData(tree, options.openApiSpecPath);
+    generateOpenApiTsClient(tree, data, options.outputPath);
+    await formatFilesInSubtree(tree);
 };
-exports.openApiTsClientGenerator = openApiTsClientGenerator;
 /**
  * Build a data structure which can be used to generate code from OpenAPI
- */
-const buildOpenApiCodeGenerationData = async (tree, specPath) => {
-    const spec = await (0, parse_1.parseOpenApiSpec)(tree, specPath);
-    return await (0, codegen_data_1.buildOpenApiCodeGenData)(spec);
+ */ export const buildOpenApiCodeGenerationData = async (tree, specPath)=>{
+    const spec = await parseOpenApiSpec(tree, specPath);
+    warnForUnsupportedFeatures(spec);
+    return buildOpenApiCodeGenData(spec);
+};
+/**
+ * Warn for spec features the generated client does not implement, so their
+ * omission is never silent.
+ */ const warnForUnsupportedFeatures = (spec)=>{
+    if (Object.keys(spec.webhooks ?? {}).length > 0) {
+        logger.warn('OpenAPI webhooks are not supported and no client code is generated for them');
+    }
+    for (const [p, pathItem] of Object.entries(spec.paths ?? {})){
+        for (const [method, op] of Object.entries(pathItem ?? {})){
+            if (typeof op !== 'object' || op === null) continue;
+            const operation = op;
+            if (Object.keys(operation.callbacks ?? {}).length > 0) {
+                logger.warn(`Operation ${method.toUpperCase()} ${p} declares callbacks, which are not supported and are ignored`);
+            }
+            if ((operation.servers ?? []).length > 0) {
+                logger.warn(`Operation ${method.toUpperCase()} ${p} declares operation-level servers, which are ignored — the client always uses its configured url`);
+            }
+        }
+    }
 };
-exports.buildOpenApiCodeGenerationData = buildOpenApiCodeGenerationData;
 /**
  * Generate an OpenAPI typescript client in the target directory
- */
-const generateOpenApiTsClient = (tree, data, outputPath) => {
-    (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), outputPath, data);
+ */ export const generateOpenApiTsClient = (tree, data, outputPath)=>{
+    generateFiles(tree, path.join(import.meta.dirname, 'files'), outputPath, {
+        ...data,
+        ...esmVars(tree)
+    });
 };
-exports.generateOpenApiTsClient = generateOpenApiTsClient;
-exports.default = exports.openApiTsClientGenerator;
+export default openApiTsClientGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/open-api/ts-client/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/open-api/ts-client/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAAsD;AACtD,mDAA6B;AAC7B,+CAA0D;AAC1D,wDAAgE;AAEhE,0CAAkD;AAGlD;;GAEG;AACI,MAAM,wBAAwB,GAAG,KAAK,EAC3C,IAAU,EACV,OAAuC,EACvC,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,IAAA,sCAA8B,EAC/C,IAAI,EACJ,OAAO,CAAC,eAAe,CACxB,CAAC;IAEF,IAAA,+BAAuB,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAExD,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC;AAZW,QAAA,wBAAwB,4BAYnC;AAEF;;GAEG;AACI,MAAM,8BAA8B,GAAG,KAAK,EACjD,IAAU,EACV,QAAgB,EAChB,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,IAAA,wBAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACpD,OAAO,MAAM,IAAA,sCAAuB,EAAC,IAAI,CAAC,CAAC;AAC7C,CAAC,CAAC;AANW,QAAA,8BAA8B,kCAMzC;AAEF;;GAEG;AACI,MAAM,uBAAuB,GAAG,CACrC,IAAU,EACV,IAAiB,EACjB,UAAkB,EAClB,EAAE;IACF,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;AACvE,CAAC,CAAC;AANW,QAAA,uBAAuB,2BAMlC;AAEF,kBAAe,gCAAwB,CAAC"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/open-api/ts-client/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { generateFiles, logger, type Tree } from '@nx/devkit';\nimport * as path from 'path';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { esmVars } from '../../utils/module-format';\nimport { buildOpenApiCodeGenData } from '../utils/codegen-data';\nimport type { CodeGenData } from '../utils/codegen-data/types';\nimport { parseOpenApiSpec } from '../utils/parse';\nimport type { Spec } from '../utils/types';\nimport type { OpenApiTsClientGeneratorSchema } from './schema';\n\n/**\n * Generates typescript client from an openapi spec\n */\nexport const openApiTsClientGenerator = async (\n  tree: Tree,\n  options: OpenApiTsClientGeneratorSchema,\n) => {\n  const data = await buildOpenApiCodeGenerationData(\n    tree,\n    options.openApiSpecPath,\n  );\n\n  generateOpenApiTsClient(tree, data, options.outputPath);\n\n  await formatFilesInSubtree(tree);\n};\n\n/**\n * Build a data structure which can be used to generate code from OpenAPI\n */\nexport const buildOpenApiCodeGenerationData = async (\n  tree: Tree,\n  specPath: string,\n) => {\n  const spec = await parseOpenApiSpec(tree, specPath);\n  warnForUnsupportedFeatures(spec);\n  return buildOpenApiCodeGenData(spec);\n};\n\n/**\n * Warn for spec features the generated client does not implement, so their\n * omission is never silent.\n */\nconst warnForUnsupportedFeatures = (spec: Spec) => {\n  if (Object.keys((spec as { webhooks?: object }).webhooks ?? {}).length > 0) {\n    logger.warn(\n      'OpenAPI webhooks are not supported and no client code is generated for them',\n    );\n  }\n  for (const [p, pathItem] of Object.entries(spec.paths ?? {})) {\n    for (const [method, op] of Object.entries(pathItem ?? {})) {\n      if (typeof op !== 'object' || op === null) continue;\n      const operation = op as {\n        callbacks?: object;\n        servers?: unknown[];\n      };\n      if (Object.keys(operation.callbacks ?? {}).length > 0) {\n        logger.warn(\n          `Operation ${method.toUpperCase()} ${p} declares callbacks, which are not supported and are ignored`,\n        );\n      }\n      if ((operation.servers ?? []).length > 0) {\n        logger.warn(\n          `Operation ${method.toUpperCase()} ${p} declares operation-level servers, which are ignored — the client always uses its configured url`,\n        );\n      }\n    }\n  }\n};\n\n/**\n * Generate an OpenAPI typescript client in the target directory\n */\nexport const generateOpenApiTsClient = (\n  tree: Tree,\n  data: CodeGenData,\n  outputPath: string,\n) => {\n  generateFiles(tree, path.join(import.meta.dirname, 'files'), outputPath, {\n    ...data,\n    ...esmVars(tree),\n  });\n};\n\nexport default openApiTsClientGenerator;\n"],"names":["generateFiles","logger","path","formatFilesInSubtree","esmVars","buildOpenApiCodeGenData","parseOpenApiSpec","openApiTsClientGenerator","tree","options","data","buildOpenApiCodeGenerationData","openApiSpecPath","generateOpenApiTsClient","outputPath","specPath","spec","warnForUnsupportedFeatures","Object","keys","webhooks","length","warn","p","pathItem","entries","paths","method","op","operation","callbacks","toUpperCase","servers","join","dirname"],"mappings":"AAAA;;;CAGC,GACD,SAASA,aAAa,EAAEC,MAAM,QAAmB,aAAa;AAC9D,YAAYC,UAAU,OAAO;AAC7B,SAASC,oBAAoB,QAAQ,wBAAqB;AAC1D,SAASC,OAAO,QAAQ,+BAA4B;AACpD,SAASC,uBAAuB,QAAQ,2BAAwB;AAEhE,SAASC,gBAAgB,QAAQ,oBAAiB;AAIlD;;CAEC,GACD,OAAO,MAAMC,2BAA2B,OACtCC,MACAC;IAEA,MAAMC,OAAO,MAAMC,+BACjBH,MACAC,QAAQG,eAAe;IAGzBC,wBAAwBL,MAAME,MAAMD,QAAQK,UAAU;IAEtD,MAAMX,qBAAqBK;AAC7B,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMG,iCAAiC,OAC5CH,MACAO;IAEA,MAAMC,OAAO,MAAMV,iBAAiBE,MAAMO;IAC1CE,2BAA2BD;IAC3B,OAAOX,wBAAwBW;AACjC,EAAE;AAEF;;;CAGC,GACD,MAAMC,6BAA6B,CAACD;IAClC,IAAIE,OAAOC,IAAI,CAAC,AAACH,KAA+BI,QAAQ,IAAI,CAAC,GAAGC,MAAM,GAAG,GAAG;QAC1EpB,OAAOqB,IAAI,CACT;IAEJ;IACA,KAAK,MAAM,CAACC,GAAGC,SAAS,IAAIN,OAAOO,OAAO,CAACT,KAAKU,KAAK,IAAI,CAAC,GAAI;QAC5D,KAAK,MAAM,CAACC,QAAQC,GAAG,IAAIV,OAAOO,OAAO,CAACD,YAAY,CAAC,GAAI;YACzD,IAAI,OAAOI,OAAO,YAAYA,OAAO,MAAM;YAC3C,MAAMC,YAAYD;YAIlB,IAAIV,OAAOC,IAAI,CAACU,UAAUC,SAAS,IAAI,CAAC,GAAGT,MAAM,GAAG,GAAG;gBACrDpB,OAAOqB,IAAI,CACT,CAAC,UAAU,EAAEK,OAAOI,WAAW,GAAG,CAAC,EAAER,EAAE,4DAA4D,CAAC;YAExG;YACA,IAAI,AAACM,CAAAA,UAAUG,OAAO,IAAI,EAAE,AAAD,EAAGX,MAAM,GAAG,GAAG;gBACxCpB,OAAOqB,IAAI,CACT,CAAC,UAAU,EAAEK,OAAOI,WAAW,GAAG,CAAC,EAAER,EAAE,gGAAgG,CAAC;YAE5I;QACF;IACF;AACF;AAEA;;CAEC,GACD,OAAO,MAAMV,0BAA0B,CACrCL,MACAE,MACAI;IAEAd,cAAcQ,MAAMN,KAAK+B,IAAI,CAAC,YAAYC,OAAO,EAAE,UAAUpB,YAAY;QACvE,GAAGJ,IAAI;QACP,GAAGN,QAAQI,KAAK;IAClB;AACF,EAAE;AAEF,eAAeD,yBAAyB"}

package/src/open-api/ts-client/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/open-api/ts-client/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/open-api/ts-client/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nexport interface OpenApiTsClientGeneratorSchema {\n  openApiSpecPath: string;\n  outputPath: string;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAED,WAGC"}

package/src/open-api/ts-hooks/files/options-proxy.gen.ts.template

@@ -36,9 +36,14 @@ import type {
 <%_ uniq(allOperations.flatMap((op) => op.result && modelsByName[op.result.type] ? [modelsByName[op.result.type].typescriptType] : [])).forEach((returnTypeModel) => { _%>
   <%- returnTypeModel %>,
 <%_ }); _%>
-} from './types.gen.js';
+<%_ /* Infinite-query cursor types may reference a named model (e.g. an enum),
+      which the cursorType uses but is otherwise not imported. */ _%>
+<%_ uniq(allOperations.flatMap((op) => op.isInfiniteQuery && op.infiniteQueryCursorProperty && modelsByName[op.infiniteQueryCursorProperty.type] ? [modelsByName[op.infiniteQueryCursorProperty.type].typescriptType] : [])).forEach((cursorTypeModel) => { _%>
+  <%- cursorTypeModel %>,
+<%_ }); _%>
+} from './types.gen<% if (esm) { %>.js<% } %>';
 <%_ } _%>
-import { <%- className %> } from './client.gen.js';
+import { <%- className %> } from './client.gen<% if (esm) { %>.js<% } %>';
 
 export interface <%- className %>OptionsProxyConfig {
   client: <%- className %>;

package/src/open-api/ts-hooks/generator.js

@@ -1,31 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateOpenApiTsHooks = exports.openApiTsHooksGenerator = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const path_1 = tslib_1.__importDefault(require("path"));
-const format_1 = require("../../utils/format");
-const generator_1 = require("../ts-client/generator");
+ */ import { generateFiles } from "@nx/devkit";
+import path from "path";
+import { formatFilesInSubtree } from "../../utils/format.js";
+import { esmVars } from "../../utils/module-format.js";
+import { buildOpenApiCodeGenerationData, generateOpenApiTsClient } from "../ts-client/generator.js";
 /**
  * Generates typescript hooks from an openapi spec
- */
-const openApiTsHooksGenerator = async (tree, options) => {
-    const data = await (0, generator_1.buildOpenApiCodeGenerationData)(tree, options.openApiSpecPath);
-    (0, generator_1.generateOpenApiTsClient)(tree, data, options.outputPath);
-    (0, exports.generateOpenApiTsHooks)(tree, data, options.outputPath);
-    await (0, format_1.formatFilesInSubtree)(tree);
+ */ export const openApiTsHooksGenerator = async (tree, options)=>{
+    const data = await buildOpenApiCodeGenerationData(tree, options.openApiSpecPath);
+    generateOpenApiTsClient(tree, data, options.outputPath);
+    generateOpenApiTsHooks(tree, data, options.outputPath);
+    await formatFilesInSubtree(tree);
 };
-exports.openApiTsHooksGenerator = openApiTsHooksGenerator;
 /**
  * Generate OpenAPI typescript hooks in the target directory
- */
-const generateOpenApiTsHooks = (tree, data, outputPath) => {
-    (0, devkit_1.generateFiles)(tree, path_1.default.join(__dirname, 'files'), outputPath, data);
+ */ export const generateOpenApiTsHooks = (tree, data, outputPath)=>{
+    generateFiles(tree, path.join(import.meta.dirname, 'files'), outputPath, {
+        ...data,
+        ...esmVars(tree)
+    });
 };
-exports.generateOpenApiTsHooks = generateOpenApiTsHooks;
-exports.default = exports.openApiTsHooksGenerator;
+export default openApiTsHooksGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/open-api/ts-hooks/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/open-api/ts-hooks/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAAsD;AACtD,wDAAwB;AACxB,+CAA0D;AAC1D,sDAGgC;AAIhC;;GAEG;AACI,MAAM,uBAAuB,GAAG,KAAK,EAC1C,IAAU,EACV,OAAsC,EACtC,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,IAAA,0CAA8B,EAC/C,IAAI,EACJ,OAAO,CAAC,eAAe,CACxB,CAAC;IAEF,IAAA,mCAAuB,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACxD,IAAA,8BAAsB,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAEvD,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC;AAbW,QAAA,uBAAuB,2BAalC;AAEF;;GAEG;AACI,MAAM,sBAAsB,GAAG,CACpC,IAAU,EACV,IAAiB,EACjB,UAAkB,EAClB,EAAE;IACF,IAAA,sBAAa,EAAC,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;AACvE,CAAC,CAAC;AANW,QAAA,sBAAsB,0BAMjC;AAEF,kBAAe,+BAAuB,CAAC"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/open-api/ts-hooks/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { generateFiles, type Tree } from '@nx/devkit';\nimport path from 'path';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { esmVars } from '../../utils/module-format';\nimport {\n  buildOpenApiCodeGenerationData,\n  generateOpenApiTsClient,\n} from '../ts-client/generator';\nimport type { CodeGenData } from '../utils/codegen-data/types';\nimport type { OpenApiTsHooksGeneratorSchema } from './schema';\n\n/**\n * Generates typescript hooks from an openapi spec\n */\nexport const openApiTsHooksGenerator = async (\n  tree: Tree,\n  options: OpenApiTsHooksGeneratorSchema,\n) => {\n  const data = await buildOpenApiCodeGenerationData(\n    tree,\n    options.openApiSpecPath,\n  );\n\n  generateOpenApiTsClient(tree, data, options.outputPath);\n  generateOpenApiTsHooks(tree, data, options.outputPath);\n\n  await formatFilesInSubtree(tree);\n};\n\n/**\n * Generate OpenAPI typescript hooks in the target directory\n */\nexport const generateOpenApiTsHooks = (\n  tree: Tree,\n  data: CodeGenData,\n  outputPath: string,\n) => {\n  generateFiles(tree, path.join(import.meta.dirname, 'files'), outputPath, {\n    ...data,\n    ...esmVars(tree),\n  });\n};\n\nexport default openApiTsHooksGenerator;\n"],"names":["generateFiles","path","formatFilesInSubtree","esmVars","buildOpenApiCodeGenerationData","generateOpenApiTsClient","openApiTsHooksGenerator","tree","options","data","openApiSpecPath","outputPath","generateOpenApiTsHooks","join","dirname"],"mappings":"AAAA;;;CAGC,GACD,SAASA,aAAa,QAAmB,aAAa;AACtD,OAAOC,UAAU,OAAO;AACxB,SAASC,oBAAoB,QAAQ,wBAAqB;AAC1D,SAASC,OAAO,QAAQ,+BAA4B;AACpD,SACEC,8BAA8B,EAC9BC,uBAAuB,QAClB,4BAAyB;AAIhC;;CAEC,GACD,OAAO,MAAMC,0BAA0B,OACrCC,MACAC;IAEA,MAAMC,OAAO,MAAML,+BACjBG,MACAC,QAAQE,eAAe;IAGzBL,wBAAwBE,MAAME,MAAMD,QAAQG,UAAU;IACtDC,uBAAuBL,MAAME,MAAMD,QAAQG,UAAU;IAErD,MAAMT,qBAAqBK;AAC7B,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMK,yBAAyB,CACpCL,MACAE,MACAE;IAEAX,cAAcO,MAAMN,KAAKY,IAAI,CAAC,YAAYC,OAAO,EAAE,UAAUH,YAAY;QACvE,GAAGF,IAAI;QACP,GAAGN,QAAQI,KAAK;IAClB;AACF,EAAE;AAEF,eAAeD,wBAAwB"}

package/src/open-api/ts-hooks/generator.spec.tsx

@@ -1226,6 +1226,76 @@ describe('openApiTsHooksGenerator', () => {
     );
   });
 
+  it('should import the cursor model when the cursor parameter is a $ref', async () => {
+    // Regression: when the infinite-query cursor parameter is a $ref to a named
+    // schema (e.g. an enum), the options proxy references that model in the
+    // cursor type but must also import it, or the proxy fails to compile.
+    const spec: Spec = {
+      openapi: '3.0.0',
+      info: { title, version: '1.0.0' },
+      paths: {
+        '/records': {
+          get: {
+            ...{ 'x-cursor': 'token' },
+            operationId: 'listRecords',
+            parameters: [
+              {
+                name: 'token',
+                in: 'query',
+                required: false,
+                schema: { $ref: '#/components/schemas/PageToken' },
+              },
+            ],
+            responses: {
+              '200': {
+                description: 'ok',
+                content: {
+                  'application/json': {
+                    schema: {
+                      type: 'object',
+                      required: ['records'],
+                      properties: {
+                        records: { type: 'array', items: { type: 'string' } },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+      components: {
+        schemas: {
+          PageToken: { type: 'string', enum: ['a', 'b', 'c'] },
+        },
+      },
+    };
+
+    tree.write('openapi.json', JSON.stringify(spec));
+
+    await openApiTsHooksGenerator(tree, {
+      openApiSpecPath: 'openapi.json',
+      outputPath: 'src/generated',
+    });
+
+    const optionsProxy = tree.read(
+      'src/generated/options-proxy.gen.ts',
+      'utf-8',
+    )!;
+    // The cursor model is used in the cursor type and imported from types.gen.
+    expect(optionsProxy).toContain('PageToken | undefined | null');
+    expect(optionsProxy).toMatch(
+      /import type \{[\s\S]*PageToken,[\s\S]*\} from '\.\/types\.gen\.js'/,
+    );
+
+    validateTypeScript([
+      'src/generated/client.gen.ts',
+      'src/generated/types.gen.ts',
+      'src/generated/options-proxy.gen.ts',
+    ]);
+  });
+
   it('should handle infinite query with custom cursor parameter via object vendor extension', async () => {
     const spec: Spec = {
       openapi: '3.0.0',

package/src/open-api/ts-hooks/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/open-api/ts-hooks/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/open-api/ts-hooks/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nexport interface OpenApiTsHooksGeneratorSchema {\n  openApiSpecPath: string;\n  outputPath: string;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAED,WAGC"}

package/src/open-api/ts-metadata/generator.js

@@ -1,30 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateOpenApiTsMetadata = exports.openApiTsMetadataGenerator = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const path_1 = tslib_1.__importDefault(require("path"));
-const format_1 = require("../../utils/format");
-const generator_1 = require("../ts-client/generator");
+ */ import { generateFiles } from "@nx/devkit";
+import path from "path";
+import { formatFilesInSubtree } from "../../utils/format.js";
+import { buildOpenApiCodeGenerationData } from "../ts-client/generator.js";
 /**
  * Generates typescript metadata from an openapi spec
- */
-const openApiTsMetadataGenerator = async (tree, options) => {
-    const data = await (0, generator_1.buildOpenApiCodeGenerationData)(tree, options.openApiSpecPath);
-    (0, exports.generateOpenApiTsMetadata)(tree, data, options.outputPath);
-    await (0, format_1.formatFilesInSubtree)(tree);
+ */ export const openApiTsMetadataGenerator = async (tree, options)=>{
+    const data = await buildOpenApiCodeGenerationData(tree, options.openApiSpecPath);
+    generateOpenApiTsMetadata(tree, data, options.outputPath);
+    await formatFilesInSubtree(tree);
 };
-exports.openApiTsMetadataGenerator = openApiTsMetadataGenerator;
 /**
  * Generate OpenAPI typescript metadata in the target directory
- */
-const generateOpenApiTsMetadata = (tree, data, outputPath) => {
-    (0, devkit_1.generateFiles)(tree, path_1.default.join(__dirname, 'files'), outputPath, data);
+ */ export const generateOpenApiTsMetadata = (tree, data, outputPath)=>{
+    generateFiles(tree, path.join(import.meta.dirname, 'files'), outputPath, data);
 };
-exports.generateOpenApiTsMetadata = generateOpenApiTsMetadata;
-exports.default = exports.openApiTsMetadataGenerator;
+export default openApiTsMetadataGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/open-api/ts-metadata/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/open-api/ts-metadata/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAAsD;AACtD,wDAAwB;AACxB,+CAA0D;AAC1D,sDAAwE;AAIxE;;GAEG;AACI,MAAM,0BAA0B,GAAG,KAAK,EAC7C,IAAU,EACV,OAAyC,EACzC,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,IAAA,0CAA8B,EAC/C,IAAI,EACJ,OAAO,CAAC,eAAe,CACxB,CAAC;IAEF,IAAA,iCAAyB,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAE1D,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC;AAZW,QAAA,0BAA0B,8BAYrC;AAEF;;GAEG;AACI,MAAM,yBAAyB,GAAG,CACvC,IAAU,EACV,IAAiB,EACjB,UAAkB,EAClB,EAAE;IACF,IAAA,sBAAa,EAAC,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;AACvE,CAAC,CAAC;AANW,QAAA,yBAAyB,6BAMpC;AAEF,kBAAe,kCAA0B,CAAC"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/open-api/ts-metadata/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { generateFiles, type Tree } from '@nx/devkit';\nimport path from 'path';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { buildOpenApiCodeGenerationData } from '../ts-client/generator';\nimport type { CodeGenData } from '../utils/codegen-data/types';\nimport type { OpenApiTsMetadataGeneratorSchema } from './schema';\n\n/**\n * Generates typescript metadata from an openapi spec\n */\nexport const openApiTsMetadataGenerator = async (\n  tree: Tree,\n  options: OpenApiTsMetadataGeneratorSchema,\n) => {\n  const data = await buildOpenApiCodeGenerationData(\n    tree,\n    options.openApiSpecPath,\n  );\n\n  generateOpenApiTsMetadata(tree, data, options.outputPath);\n\n  await formatFilesInSubtree(tree);\n};\n\n/**\n * Generate OpenAPI typescript metadata in the target directory\n */\nexport const generateOpenApiTsMetadata = (\n  tree: Tree,\n  data: CodeGenData,\n  outputPath: string,\n) => {\n  generateFiles(\n    tree,\n    path.join(import.meta.dirname, 'files'),\n    outputPath,\n    data,\n  );\n};\n\nexport default openApiTsMetadataGenerator;\n"],"names":["generateFiles","path","formatFilesInSubtree","buildOpenApiCodeGenerationData","openApiTsMetadataGenerator","tree","options","data","openApiSpecPath","generateOpenApiTsMetadata","outputPath","join","dirname"],"mappings":"AAAA;;;CAGC,GACD,SAASA,aAAa,QAAmB,aAAa;AACtD,OAAOC,UAAU,OAAO;AACxB,SAASC,oBAAoB,QAAQ,wBAAqB;AAC1D,SAASC,8BAA8B,QAAQ,4BAAyB;AAIxE;;CAEC,GACD,OAAO,MAAMC,6BAA6B,OACxCC,MACAC;IAEA,MAAMC,OAAO,MAAMJ,+BACjBE,MACAC,QAAQE,eAAe;IAGzBC,0BAA0BJ,MAAME,MAAMD,QAAQI,UAAU;IAExD,MAAMR,qBAAqBG;AAC7B,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMI,4BAA4B,CACvCJ,MACAE,MACAG;IAEAV,cACEK,MACAJ,KAAKU,IAAI,CAAC,YAAYC,OAAO,EAAE,UAC/BF,YACAH;AAEJ,EAAE;AAEF,eAAeH,2BAA2B"}

package/src/open-api/ts-metadata/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/open-api/ts-metadata/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/open-api/ts-metadata/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nexport interface OpenApiTsMetadataGeneratorSchema {\n  openApiSpecPath: string;\n  outputPath: string;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAED,WAGC"}

package/src/open-api/utils/codegen-data/languages.d.ts

@@ -3,14 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type Model } from './types';
-/**
- * Return the typescript type for the given model
- */
 export declare const toTypeScriptType: (property: Model) => string;
 export declare const toTypeScriptName: (name: string) => string;
 export declare const toTypeScriptModelName: (name: string) => string;
-/**
- * Return the python type for a given property
- */
 export declare const toPythonType: (property: Model) => string;
 export declare const toPythonName: (namedEntity: "model" | "property" | "operation", name: string) => string;

package/src/open-api/utils/codegen-data/languages.js

@@ -1,57 +1,60 @@
-"use strict";
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPythonName = exports.toPythonType = exports.toTypeScriptModelName = exports.toTypeScriptName = exports.toTypeScriptType = void 0;
-const tslib_1 = require("tslib");
-const lodash_camelcase_1 = tslib_1.__importDefault(require("lodash.camelcase"));
-const names_1 = require("../../../utils/names");
-const types_1 = require("./types");
-const toTypescriptPrimitive = (property) => {
-    if (property.type === 'string' &&
-        ['date', 'date-time'].includes(property.format ?? '')) {
+ */ import { camelCase, snakeCase, toClassName } from "../../../utils/names.js";
+import { PRIMITIVE_TYPES } from "./types.js";
+const toTypescriptPrimitive = (property)=>{
+    if (property.type === 'string' && [
+        'date',
+        'date-time'
+    ].includes(property.format ?? '')) {
         return 'Date';
-    }
-    else if (property.type === 'binary') {
+    } else if (property.type === 'binary') {
         return 'Blob';
     }
     return property.type;
 };
-/**
- * Return the typescript type for the given model
- */
-const toTypeScriptType = (property) => {
-    const propertyLink = (0, types_1.flattenModelLink)(property.link);
-    switch (property.export) {
+// A nullable tuple member renders as a union with null.
+const memberType = (rendered, member)=>member.isNullable && member.type !== 'null' ? `${rendered} | null` : rendered;
+export const toTypeScriptType = (property)=>{
+    // A discriminated subtype's discriminator property renders as its literal
+    // tag, making the union a true (narrowable) tagged union.
+    if (property.discriminatorValue) {
+        return property.discriminatorValue;
+    }
+    const link = property.link;
+    // Enum links serialise as their primitive; use the model's own type instead.
+    const valueType = ()=>link && link.export !== 'enum' ? toTypeScriptType(link) : property.type;
+    switch(property.export){
         case 'enum':
         case 'generic':
             return toTypescriptPrimitive(property);
         case 'array':
-            return `Array<${propertyLink && propertyLink.export !== 'enum' ? (0, exports.toTypeScriptType)(propertyLink) : property.type}>`;
+            return `Array<${valueType()}>`;
+        case 'tuple':
+            return `[${property.properties.map((member)=>memberType(toTypeScriptType(member), member)).join(', ')}]`;
         case 'dictionary':
-            return `{ [key: string]: ${propertyLink && propertyLink.export !== 'enum' ? (0, exports.toTypeScriptType)(propertyLink) : property.type}; }`;
+            return `{ [key: string]: ${valueType()}; }`;
         case 'one-of':
         case 'any-of':
         case 'all-of':
-            return (0, exports.toTypeScriptModelName)(property.name);
+            return toTypeScriptModelName(property.name);
         case 'reference':
         default:
             if (property.type === 'unknown') {
                 return 'unknown';
             }
-            if (types_1.PRIMITIVE_TYPES.has(property.type)) {
+            if (PRIMITIVE_TYPES.has(property.type)) {
                 return toTypescriptPrimitive(property);
             }
-            return (0, exports.toTypeScriptModelName)(property.type);
+            return toTypeScriptModelName(property.type);
     }
 };
-exports.toTypeScriptType = toTypeScriptType;
-const toTypeScriptName = (name) => {
-    return (0, lodash_camelcase_1.default)(name);
+export const toTypeScriptName = (name)=>{
+    // A name of only non-identifier characters (e.g. "_") camelCases to an empty
+    // string; fall back to an underscore so the emitted property stays valid.
+    return camelCase(name) || (name ?? '').replace(/[^a-zA-Z0-9]/g, '_') || '_';
 };
-exports.toTypeScriptName = toTypeScriptName;
 const TYPESCRIPT_RESERVED_MODEL_NAMES = new Set([
     'Date',
     'Blob',
@@ -73,34 +76,27 @@ const TYPESCRIPT_RESERVED_MODEL_NAMES = new Set([
     'Function',
     'Promise',
     'RegExp',
-    'JSON',
+    'JSON'
 ]);
-const toTypeScriptModelName = (name) => {
-    const candidateName = (0, names_1.toClassName)(name);
+export const toTypeScriptModelName = (name)=>{
+    const candidateName = toClassName(name);
     // Prepend underscore for any reserved model names
-    return TYPESCRIPT_RESERVED_MODEL_NAMES.has(candidateName)
-        ? `_${candidateName}`
-        : candidateName;
+    return TYPESCRIPT_RESERVED_MODEL_NAMES.has(candidateName) ? `_${candidateName}` : candidateName;
 };
-exports.toTypeScriptModelName = toTypeScriptModelName;
-const toPythonPrimitive = (property) => {
+const toPythonPrimitive = (property)=>{
     if (property.type === 'string' && property.format === 'date') {
         return 'date';
-    }
-    else if (property.type === 'string' && property.format === 'date-time') {
+    } else if (property.type === 'string' && property.format === 'date-time') {
         return 'datetime';
-    }
-    else if (property.type === 'any') {
+    } else if (property.type === 'any') {
         return 'object';
-    }
-    else if (property.type === 'binary') {
+    } else if (property.type === 'binary') {
         return 'bytearray';
-    }
-    else if (property.type === 'number') {
+    } else if (property.type === 'number') {
         if (property.openapiType === 'integer') {
             return 'int';
         }
-        switch (property.format) {
+        switch(property.format){
             case 'int32':
             case 'int64':
                 return 'int';
@@ -109,41 +105,38 @@ const toPythonPrimitive = (property) => {
             default:
                 return 'float';
         }
-    }
-    else if (property.type === 'boolean') {
+    } else if (property.type === 'boolean') {
         return 'bool';
-    }
-    else if (property.type === 'string') {
+    } else if (property.type === 'string') {
         return 'str';
     }
     return property.type;
 };
-/**
- * Return the python type for a given property
- */
-const toPythonType = (property) => {
-    const propertyLink = (0, types_1.flattenModelLink)(property.link);
-    switch (property.export) {
+export const toPythonType = (property)=>{
+    const link = property.link;
+    const valueType = ()=>link && link.export !== 'enum' ? toPythonType(link) : property.type;
+    switch(property.export){
         case 'generic':
         case 'reference':
             return toPythonPrimitive(property);
         case 'array':
-            return `List[${propertyLink && propertyLink.export !== 'enum' ? (0, exports.toPythonType)(propertyLink) : property.type}]`;
+            return `List[${valueType()}]`;
+        case 'tuple':
+            return `Tuple[${property.properties.map((member)=>toPythonType(member)).join(', ')}]`;
         case 'dictionary':
-            return `Dict[str, ${propertyLink && propertyLink.export !== 'enum' ? (0, exports.toPythonType)(propertyLink) : property.type}]`;
+            return `Dict[str, ${valueType()}]`;
         case 'one-of':
         case 'any-of':
         case 'all-of':
             return property.name;
         default:
             // "any" has export = interface
-            if (types_1.PRIMITIVE_TYPES.has(property.type)) {
+            if (PRIMITIVE_TYPES.has(property.type)) {
                 return toPythonPrimitive(property);
             }
             return property.type;
     }
 };
-exports.toPythonType = toPythonType;
 // @see https://github.com/OpenAPITools/openapi-generator/blob/e2a62ace74de361bef6338b7fa37da8577242aef/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java#L106
 const PYTHON_KEYWORDS = new Set([
     // @property
@@ -192,15 +185,15 @@ const PYTHON_KEYWORDS = new Set([
     'True',
     'False',
     'async',
-    'await',
+    'await'
 ]);
-const toPythonName = (namedEntity, name) => {
-    const nameSnakeCase = (0, names_1.snakeCase)(name);
-    // Check if the name is a reserved word. Reserved words that overlap with TypeScript will already be escaped
-    // with a leading _ by @hey-api/openapi-ts, so we remove this to test
+export const toPythonName = (namedEntity, name)=>{
+    const nameSnakeCase = snakeCase(name);
+    // Names overlapping a TypeScript reserved word carry a leading `_`; strip it
+    // before testing against the Python keyword set.
     if (PYTHON_KEYWORDS.has(name.startsWith('_') ? name.slice(1) : name)) {
         const nameSuffix = `_${nameSnakeCase}`;
-        switch (namedEntity) {
+        switch(namedEntity){
             case 'model':
                 return `model${nameSuffix}`;
             case 'operation':
@@ -213,5 +206,5 @@ const toPythonName = (namedEntity, name) => {
     }
     return nameSnakeCase;
 };
-exports.toPythonName = toPythonName;
+
 //# sourceMappingURL=languages.js.map