@aws/nx-plugin 1.0.0-rc.30 → 1.0.0-rc.32

package/src/open-api/ts-client/files/client.gen.ts.template

@@ -16,7 +16,26 @@ const uniqStrings = (strings) => {
     return true;
   });
 };
-const returnTypeSet = new Set(allOperations.map(op => op.result.typescriptType));
+const returnTypeSet = new Set(allOperations.flatMap(op => op.result ? [op.result.typescriptType] : []));
+// Names of discriminator "base" models (an object schema whose subtypes allOf-
+// compose it). A subtype composes its base's non-dispatching `$toJsonBase`/
+// `$fromJsonBase` body, so composing the dispatching `toJson`/`fromJson` would
+// recurse infinitely (base -> subtype -> base).
+const discriminatorBaseNames = new Set(models.filter(m => m.discriminator && m.discriminator.isBase).map(m => m.name));
+const modelByName = Object.fromEntries(models.map(m => [m.name, m]));
+// The $IO marshaller call for a composed member: a subtype composes its base's
+// non-dispatching body to avoid recursing back through the base's dispatch.
+const composedMarshaller = (property, method) =>
+  property.export === 'reference' && discriminatorBaseNames.has(property.type)
+    ? `$IO.${property.typescriptType}.$${method}Base`
+    : `$IO.${property.typescriptType}.${method}`;
+// The single wire media type chosen for an operation's request body, if any.
+const bodyMediaTypeOf = (op) => {
+  if (!op.parametersBody || !op.parametersBody.mediaTypes) return undefined;
+  const mediaTypes = Array.isArray(op.parametersBody.mediaTypes) ? op.parametersBody.mediaTypes : [op.parametersBody.mediaTypes];
+  return mediaTypes.find(mt => mt === 'application/json' || mt.endsWith('+json')) || mediaTypes[0];
+};
+const hasMultipartBody = allOperations.some(op => bodyMediaTypeOf(op) === 'multipart/form-data');
 _%>
 <%_ if ((models.length + allOperations.filter(p => p.parameters.length > 0).length) > 0) { _%>
 import type {
@@ -44,14 +63,18 @@ const renderToJsonDateValue = (identifier, format) => {
 // Renders the appropriate nested function for .map() or $mapValues() for arrays and dictionaries for the given type
 const renderNestedToJsonValue = (type, argumentType = undefined, depth = 0) => {
   const itemIdentifier = `item${depth}`;
-  const argType = `${argumentType ? `: ${argumentType}` : ''}`;
+  // Nested items (depth > 0) come from mapping over an `any`, so annotate them
+  // to satisfy noImplicitAny.
+  const argType = `${argumentType ? `: ${argumentType}` : (depth > 0 ? ': any' : '')}`;
   if (type.isPrimitive || type.typescriptType === 'unknown' || type.export === 'enum' || type.isEnum) {
     return `(${itemIdentifier}${argType}) => ${["date", "date-time"].includes(type.format) ? renderToJsonDateValue(itemIdentifier, type.format) : itemIdentifier}`;
   } else if (type.export === "array") {
     return `(${itemIdentifier}${argType}) => ${itemIdentifier}.map(${renderNestedToJsonValue(type.link, argumentType, depth + 1)})`;
   } else if (type.export === "dictionary") {
     return `(${itemIdentifier}${argType}) => $IO.$mapValues(${itemIdentifier}, ${renderNestedToJsonValue(type.link, argumentType, depth + 1)})`;
-  } else if (type.type === 'unknown') {
+  } else if (type.type === 'unknown' && !["one-of", "any-of", "all-of"].includes(type.export)) {
+    // A bare `unknown` element passes through; a composite has type `unknown`
+    // but must still be marshalled via its own $IO entry.
     return `(${itemIdentifier}${argType}) => ${itemIdentifier}`;
   }
   return `$IO.${type.typescriptType || type.typescriptName}.toJson`;
@@ -83,14 +106,18 @@ const renderToJsonValue = (property, value, argumentType = undefined) => {
 // Renders the appropriate nested function for .map() or $mapValues() for arrays and dictionaries for the given type
 const renderNestedFromJsonValue = (type, argumentType = undefined, depth = 0) => {
     const itemIdentifier = `item${depth}`;
-    const argType = `${argumentType ? `: ${argumentType}` : ''}`;
+    // Nested items (depth > 0) come from mapping over an `any`, so annotate them
+    // to satisfy noImplicitAny.
+    const argType = `${argumentType ? `: ${argumentType}` : (depth > 0 ? ': any' : '')}`;
     if (type.isPrimitive || type.typescriptType === 'unknown' || type.export === 'enum' || type.isEnum) {
         return `(${itemIdentifier}${argType}) => ${["date", "date-time"].includes(type.format) ? `new Date(${itemIdentifier})` : itemIdentifier}`;
     } else if (type.export === "array") {
         return `(${itemIdentifier}${argType}) => ${itemIdentifier}.map(${renderNestedFromJsonValue(type.link, argumentType, depth + 1)})`;
     } else if (type.export === "dictionary") {
         return `(${itemIdentifier}${argType}) => $IO.$mapValues(${itemIdentifier}, ${renderNestedFromJsonValue(type.link, argumentType, depth + 1)})`;
-    } else if (type.type === 'unknown') {
+    } else if (type.type === 'unknown' && !["one-of", "any-of", "all-of"].includes(type.export)) {
+      // A bare `unknown` element passes through; a composite has type `unknown`
+      // but must still be marshalled via its own $IO entry.
       return `(${itemIdentifier}${argType}) => ${itemIdentifier}`;
     }
     return `$IO.${type.typescriptType || type.typescriptName}.fromJson`;
@@ -163,13 +190,44 @@ _%>
  * Utility for serialisation and deserialisation of API types.
  */
 export class $IO {
-  protected static $mapValues = (data: any, fn: (item: any) => any) =>
+  public static $mapValues = (data: any, fn: (item: any) => any) =>
     Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
 <%_ models.filter(m => m.export !== 'enum').forEach((model) => { _%>
 <%_ const isComposite = model.export === "one-of" || model.export === "any-of" || model.export === "all-of"; _%>
+<%_ /* A discriminator base emits its plain (own-fields) body under a $-prefixed
+      name that its subtypes compose, while its public toJson/fromJson dispatch
+      to the matching subtype — so composing a subtype never recurses back into
+      the dispatch. */ _%>
+<%_ const isBase = model.discriminator && model.discriminator.isBase; _%>
+<%_ const toJsonName = isBase ? '$toJsonBase' : 'toJson'; _%>
+<%_ const fromJsonName = isBase ? '$fromJsonBase' : 'fromJson'; _%>
 
   public static <%- model.typescriptName %> = {
+    <%_ if (isBase) { _%>
     toJson: (model: <%- model.typescriptName %>): any => {
+      if (model === undefined || model === null) {
+        return model;
+      }
+      switch ((model as any).<%- model.discriminator.typescriptPropertyName %>) {
+        <%_ model.discriminator.mapping.filter(m => modelByName[m.modelName]).forEach(({ value, modelName }) => { _%>
+        case <%- JSON.stringify(value) %>: return $IO.<%- modelByName[modelName].typescriptName %>.toJson(model as <%- modelByName[modelName].typescriptName %>);
+        <%_ }); _%>
+      }
+      return $IO.<%- model.typescriptName %>.$toJsonBase(model);
+    },
+    fromJson: (json: any): <%- model.typescriptName %> => {
+      if (json === undefined || json === null) {
+        return json;
+      }
+      switch (json?.[<%- JSON.stringify(model.discriminator.propertyName) %>]) {
+        <%_ model.discriminator.mapping.filter(m => modelByName[m.modelName]).forEach(({ value, modelName }) => { _%>
+        case <%- JSON.stringify(value) %>: return $IO.<%- modelByName[modelName].typescriptName %>.fromJson(json);
+        <%_ }); _%>
+      }
+      return $IO.<%- model.typescriptName %>.$fromJsonBase(json);
+    },
+    <%_ } _%>
+    <%- toJsonName %>: (model: <%- model.typescriptName %>): any => {
       if (model === undefined || model === null) {
         return model;
       }
@@ -202,10 +260,25 @@ export class $IO {
           return <%- renderToJsonValue(arrayOfNonPrimitives, 'model') %>;
       }
       <%_ } _%>
+      <%_ /* A discriminated composite marshals directly to the matching branch,
+            rather than merging every branch (which would leak fields from the
+            non-matching branches). Unknown values fall through to the merge. */ _%>
+      <%_ if (model.discriminator) { _%>
+      <%_ const discToJsonByName = Object.fromEntries(model.composedModels.map(m => [m.name, m.typescriptName])); _%>
+      switch ((model as any).<%- model.discriminator.typescriptPropertyName %>) {
+        <%_ model.discriminator.mapping.filter(m => discToJsonByName[m.modelName]).forEach(({ value, modelName }) => { _%>
+        case <%- JSON.stringify(value) %>: return $IO.<%- discToJsonByName[modelName] %>.toJson(model as <%- discToJsonByName[modelName] %>);
+        <%_ }); _%>
+      }
+      <%_ } _%>
       <%_ if (model.composedModels.length > 0) { _%>
       return {
         <%_ model.properties.filter(p => !p.isPrimitive && p.export !== 'array').forEach((property, i) => { _%>
+        <%_ if (property.export === 'reference' && discriminatorBaseNames.has(property.type)) { _%>
+        ...<%- composedMarshaller(property, 'toJson') %>(model),
+        <%_ } else { _%>
         ...<%- renderToJsonValue(property, `model${(model.export !== 'all-of' && property.export !== 'dictionary') ? ` as ${property.typescriptType}` : ''}`) %>,
+        <%_ } _%>
         <%_ }); _%>
       };
       <%_ } else { _%>
@@ -238,7 +311,7 @@ export class $IO {
       };
       <%_ } _%>
     },
-    fromJson: (json: any): <%- model.typescriptName %> => {
+    <%- fromJsonName %>: (json: any): <%- model.typescriptName %> => {
       if (json === undefined || json === null) {
         return json;
       }
@@ -270,10 +343,25 @@ export class $IO {
           return <%- renderFromJsonValue(arrayOfNonPrimitives, 'json') %>;
       }
       <%_ } _%>
+      <%_ /* A discriminated composite marshals directly to the matching branch;
+            the discriminator value comes off the raw json by its wire name.
+            Unknown values fall through to the merge. */ _%>
+      <%_ if (model.discriminator) { _%>
+      <%_ const discFromJsonByName = Object.fromEntries(model.composedModels.map(m => [m.name, m.typescriptName])); _%>
+      switch (json?.[<%- JSON.stringify(model.discriminator.propertyName) %>]) {
+        <%_ model.discriminator.mapping.filter(m => discFromJsonByName[m.modelName]).forEach(({ value, modelName }) => { _%>
+        case <%- JSON.stringify(value) %>: return $IO.<%- discFromJsonByName[modelName] %>.fromJson(json);
+        <%_ }); _%>
+      }
+      <%_ } _%>
       <%_ if (model.composedModels.length > 0) { _%>
       return {
         <%_ model.properties.filter(p => !p.isPrimitive && p.export !== 'array').forEach((composedType) => { _%>
+        <%_ if (composedType.export === 'reference' && discriminatorBaseNames.has(composedType.type)) { _%>
+        ...<%- composedMarshaller(composedType, 'fromJson') %>(json),
+        <%_ } else { _%>
         ...<%- renderFromJsonValue(composedType, 'json') %>,
+        <%_ } _%>
         <%_ }); _%>
       };
       <%_ } else { _%>
@@ -355,29 +443,70 @@ export class <%- className %> {
     <%_ }); _%>
   }
 
-  private $url = (path: string, pathParameters: { [key: string]: any }, queryParameters: { [key: string]: any }, collectionFormats?: { [key: string]: 'multi' | 'csv' }): string => {
+  private $collectionDelimiters: { [format: string]: string } = { csv: ',', ssv: ' ', pipes: '|' };
+
+  private $deepObject = (key: string, value: any): string[] => {
+    if (value === undefined || value === null) {
+      return [];
+    }
+    if (typeof value !== 'object') {
+      return [`${key}=${encodeURIComponent(String(value))}`];
+    }
+    return Object.entries(value).flatMap(([prop, v]) =>
+      this.$deepObject(`${key}[${encodeURIComponent(prop)}]`, v),
+    );
+  };
+
+  private $url = (path: string, pathParameters: { [key: string]: any }, queryParameters: { [key: string]: any }, collectionFormats?: { [key: string]: 'multi' | 'csv' | 'ssv' | 'pipes' | 'deepObject' }): string => {
     const baseUrl = this.$config.url.endsWith('/') ? this.$config.url.slice(0, -1) : this.$config.url;
     const pathWithParameters = Object.entries(pathParameters).reduce((withParams, [key, value]) =>
       withParams.replace(`{${key}}`, encodeURIComponent(`${value}`))
     , path);
-    const queryString = Object.entries(queryParameters).map(([key, value]) => {
+    const queryString = Object.entries(queryParameters).flatMap(([key, value]) => {
       if (Array.isArray(value) && collectionFormats?.[key] === 'multi') {
-        return value.map(v => `${encodeURIComponent(key)}=${encodeURIComponent(`${v}`)}`).join('&');
+        return value.map(v => `${encodeURIComponent(key)}=${encodeURIComponent(`${v}`)}`);
       }
-      return `${encodeURIComponent(key)}=${encodeURIComponent(Array.isArray(value) ? value.map(String).join(',') : String(value))}`;
+      if (collectionFormats?.[key] === 'deepObject' && value !== null && typeof value === 'object') {
+        return this.$deepObject(encodeURIComponent(key), value);
+      }
+      const delimiter = this.$collectionDelimiters[collectionFormats?.[key] ?? 'csv'] ?? ',';
+      return [`${encodeURIComponent(key)}=${encodeURIComponent(Array.isArray(value) ? value.map(String).join(delimiter) : String(value))}`];
     }).join('&');
     return baseUrl + pathWithParameters + (queryString ? `?${queryString}` : '');
   };
 
-  private $headers = (headerParameters: { [key: string]: any }, collectionFormats?: { [key: string]: 'multi' | 'csv' }): [string, string][] => {
+  private $headers = (headerParameters: { [key: string]: any }, collectionFormats?: { [key: string]: 'multi' | 'csv' | 'ssv' | 'pipes' }): [string, string][] => {
     return Object.entries(headerParameters).flatMap(([key, value]) => {
       if (Array.isArray(value) && collectionFormats?.[key] === 'multi') {
         return value.map(v => [key, String(v)]) as [string, string][];
       }
-      return [[key, String(value)]];
+      const delimiter = this.$collectionDelimiters[collectionFormats?.[key] ?? 'csv'] ?? ',';
+      return [[key, Array.isArray(value) ? value.map(String).join(delimiter) : String(value)]];
     });
   };
 
+  <%_ if (hasMultipartBody) { _%>
+  private $formData = (model: { [key: string]: any }): FormData => {
+    const formData = new FormData();
+    const append = (key: string, value: any): void => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (value instanceof Blob || typeof value === 'string') {
+        formData.append(key, value);
+      } else if (Array.isArray(value)) {
+        value.forEach((v) => append(key, v));
+      } else if (typeof value === 'object') {
+        formData.append(key, JSON.stringify(value));
+      } else {
+        formData.append(key, String(value));
+      }
+    };
+    Object.entries(model).forEach(([key, value]) => append(key, value));
+    return formData;
+  };
+
+  <%_ } _%>
   private $fetch: typeof fetch = (...args) => (this.$config.fetch ?? fetch)(...args);
   <%_ allOperations.forEach((op) => { _%>
   <%_ const hasTag = op.tags && op.tags.length > 0; _%>
@@ -418,15 +547,33 @@ export class <%- className %> {
     }
     <%_ } _%>
     <%_ } _%>
-    <%_ if (op.parameters.filter(p => p.collectionFormat).length > 0) { _%>
-    const collectionFormats = {
-      <%_ op.parameters.filter(p => p.collectionFormat).forEach((parameter) => { _%>
+    <%_ /* Query and header collection formats are kept in separate maps: a
+           query and a header parameter may share a name, which would collide
+           in a single object literal. */ _%>
+    <%_ const queryCollectionParams = op.parameters.filter(p => p.collectionFormat && p.in === 'query'); _%>
+    <%_ const headerCollectionParams = op.parameters.filter(p => p.collectionFormat && p.in === 'header'); _%>
+    <%_ if (queryCollectionParams.length > 0) { _%>
+    const queryCollectionFormats = {
+      <%_ queryCollectionParams.forEach((parameter) => { _%>
+      '<%- parameter.prop %>': '<%- parameter.collectionFormat %>',
+      <%_ }); _%>
+    } as const;
+    <%_ } _%>
+    <%_ if (headerCollectionParams.length > 0) { _%>
+    const headerCollectionFormats = {
+      <%_ headerCollectionParams.forEach((parameter) => { _%>
       '<%- parameter.prop %>': '<%- parameter.collectionFormat %>',
       <%_ }); _%>
     } as const;
     <%_ } _%>
     <%_ if (op.parametersBody) { _%>
-    <%_ if (op.parametersBody.isPrimitive && ['number', 'boolean', 'string'].includes(op.parametersBody.type) && !['array', 'dictionary'].includes(op.parametersBody.export) && !["date", "date-time"].includes(op.parametersBody.format)) { _%>
+    <%_ if (bodyMediaTypeOf(op) === 'multipart/form-data') { _%>
+    <%_ /* A multipart body is sent as FormData: Blob fields stream as file
+           parts, primitives serialise to strings, and fetch computes the
+           boundary itself (so the Content-Type header is intentionally unset
+           above). */ _%>
+    const body = <% if (!op.parametersBody.isRequired) { %>input === undefined ? undefined : <% } %>this.$formData(<%- op.explicitRequestBodyParameter ? `$IO.${op.operationIdPascalCase}RequestBodyParameters.toJson(input).${op.explicitRequestBodyParameter.prop}` : renderToJsonValue(op.parametersBody, 'input') %>);
+    <%_ } else if (op.parametersBody.isPrimitive && ['number', 'boolean', 'string'].includes(op.parametersBody.type) && !['array', 'dictionary'].includes(op.parametersBody.export) && !["date", "date-time"].includes(op.parametersBody.format)) { _%>
     const body = <% if (!op.parametersBody.isRequired) { %>input === undefined ? undefined : <% } %>String(input<%- op.explicitRequestBodyParameter ? `.${op.explicitRequestBodyParameter.typescriptName}` : '' %>);
     <%_ } else if (op.parametersBody.isPrimitive && ["date", "date-time"].includes(op.parametersBody.format)) { _%>
     const body = <%- renderToJsonDateValue('input', op.parametersBody.format) %>;
@@ -457,8 +604,8 @@ export class <%- className %> {
     const body = undefined;
     <%_ } _%>
 
-    const response = await this.$fetch(this.$url('<%- op.path %>', pathParameters, queryParameters<% if (op.parameters.filter(p => p.collectionFormat).length > 0) { %>, collectionFormats<% } %>), {
-      headers: this.$headers(headerParameters<% if (op.parameters.filter(p => p.collectionFormat).length > 0) { %>, collectionFormats<% } %>),
+    const response = await this.$fetch(this.$url('<%- op.path %>', pathParameters, queryParameters<% if (queryCollectionParams.length > 0) { %>, queryCollectionFormats<% } %>), {
+      headers: this.$headers(headerParameters<% if (headerCollectionParams.length > 0) { %>, headerCollectionFormats<% } %>),
       method: '<%- op.method %>',
       body,
     });

package/src/open-api/ts-client/files/types.gen.ts.template

@@ -22,7 +22,8 @@ _%>
 <%_ if (model.export === "enum") { _%>
 <%- docString(model, '') %>export type <%= model.typescriptName %> =
 <%_ model.enum.forEach((enumMember, i) => { _%>
-  | '<%- enumMember.value %>'
+<%_ /* JSON.stringify escapes quotes, newlines and backslashes in values */ _%>
+  | <%- JSON.stringify(`${enumMember.value}`) %>
 <%_ }); _%>
 <%_ } else if (isComposite) { _%>
 <%- docString(model, '') %>export type <%- model.typescriptName %> =<% model.properties.forEach((composedType, i) => { %><% if (i > 0) { %><% if (model.export === "all-of") { %> &<% } else { %> |<% } %><% } %> <%- composedType.typescriptType %><% }); %>;
@@ -30,9 +31,8 @@ _%>
 <%- docString(model, '') %>export type <%= model.typescriptName %> = <% if (model.isNullable && model.type !== 'null') { %>null | <% } %>{
 <%_ if (model.export === "dictionary" && model.link) { _%>
 <%_ /* When the spec says `type: object` with `additionalProperties: true`
-      (or omits additionalProperties), hey-api sets `model.link` but the
-      link's typescriptType is empty — fall back to `unknown` to keep the
-      emitted code valid. */ _%>
+      (or omits additionalProperties), the value model has an unknown type —
+      fall back to `unknown` to keep the emitted code valid. */ _%>
 <%- docString(model.link, '  ') %>  [key: string]: <%- model.link.typescriptType || 'unknown' %>;
 <%_ } _%>
 <%_ model.properties.forEach((property) => { _%>

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

@@ -17,7 +17,7 @@ import { parseOpenApiSpec } from "../utils/parse.js";
  * Build a data structure which can be used to generate code from OpenAPI
  */ export const buildOpenApiCodeGenerationData = async (tree, specPath)=>{
     const spec = await parseOpenApiSpec(tree, specPath);
-    return await buildOpenApiCodeGenData(spec);
+    return buildOpenApiCodeGenData(spec);
 };
 /**
  * Generate an OpenAPI typescript client in the target directory

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

@@ -1 +1 @@
-{"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, type Tree } from '@nx/devkit';\nimport * as path from 'path';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { buildOpenApiCodeGenData } from '../utils/codegen-data';\nimport type { CodeGenData } from '../utils/codegen-data/types';\nimport { parseOpenApiSpec } from '../utils/parse';\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  return await buildOpenApiCodeGenData(spec);\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(\n    tree,\n    path.join(import.meta.dirname, 'files'),\n    outputPath,\n    data,\n  );\n};\n\nexport default openApiTsClientGenerator;\n"],"names":["generateFiles","path","formatFilesInSubtree","buildOpenApiCodeGenData","parseOpenApiSpec","openApiTsClientGenerator","tree","options","data","buildOpenApiCodeGenerationData","openApiSpecPath","generateOpenApiTsClient","outputPath","specPath","spec","join","dirname"],"mappings":"AAAA;;;CAGC,GACD,SAASA,aAAa,QAAmB,aAAa;AACtD,YAAYC,UAAU,OAAO;AAC7B,SAASC,oBAAoB,QAAQ,wBAAqB;AAC1D,SAASC,uBAAuB,QAAQ,2BAAwB;AAEhE,SAASC,gBAAgB,QAAQ,oBAAiB;AAGlD;;CAEC,GACD,OAAO,MAAMC,2BAA2B,OACtCC,MACAC;IAEA,MAAMC,OAAO,MAAMC,+BACjBH,MACAC,QAAQG,eAAe;IAGzBC,wBAAwBL,MAAME,MAAMD,QAAQK,UAAU;IAEtD,MAAMV,qBAAqBI;AAC7B,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMG,iCAAiC,OAC5CH,MACAO;IAEA,MAAMC,OAAO,MAAMV,iBAAiBE,MAAMO;IAC1C,OAAO,MAAMV,wBAAwBW;AACvC,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMH,0BAA0B,CACrCL,MACAE,MACAI;IAEAZ,cACEM,MACAL,KAAKc,IAAI,CAAC,YAAYC,OAAO,EAAE,UAC/BJ,YACAJ;AAEJ,EAAE;AAEF,eAAeH,yBAAyB"}
+{"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, type Tree } from '@nx/devkit';\nimport * as path from 'path';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { buildOpenApiCodeGenData } from '../utils/codegen-data';\nimport type { CodeGenData } from '../utils/codegen-data/types';\nimport { parseOpenApiSpec } from '../utils/parse';\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  return buildOpenApiCodeGenData(spec);\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(\n    tree,\n    path.join(import.meta.dirname, 'files'),\n    outputPath,\n    data,\n  );\n};\n\nexport default openApiTsClientGenerator;\n"],"names":["generateFiles","path","formatFilesInSubtree","buildOpenApiCodeGenData","parseOpenApiSpec","openApiTsClientGenerator","tree","options","data","buildOpenApiCodeGenerationData","openApiSpecPath","generateOpenApiTsClient","outputPath","specPath","spec","join","dirname"],"mappings":"AAAA;;;CAGC,GACD,SAASA,aAAa,QAAmB,aAAa;AACtD,YAAYC,UAAU,OAAO;AAC7B,SAASC,oBAAoB,QAAQ,wBAAqB;AAC1D,SAASC,uBAAuB,QAAQ,2BAAwB;AAEhE,SAASC,gBAAgB,QAAQ,oBAAiB;AAGlD;;CAEC,GACD,OAAO,MAAMC,2BAA2B,OACtCC,MACAC;IAEA,MAAMC,OAAO,MAAMC,+BACjBH,MACAC,QAAQG,eAAe;IAGzBC,wBAAwBL,MAAME,MAAMD,QAAQK,UAAU;IAEtD,MAAMV,qBAAqBI;AAC7B,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMG,iCAAiC,OAC5CH,MACAO;IAEA,MAAMC,OAAO,MAAMV,iBAAiBE,MAAMO;IAC1C,OAAOV,wBAAwBW;AACjC,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMH,0BAA0B,CACrCL,MACAE,MACAI;IAEAZ,cACEM,MACAL,KAAKc,IAAI,CAAC,YAAYC,OAAO,EAAE,UAC/BJ,YACAJ;AAEJ,EAAE;AAEF,eAAeH,yBAAyB"}

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

@@ -36,6 +36,11 @@ import type {
 <%_ uniq(allOperations.flatMap((op) => op.result && modelsByName[op.result.type] ? [modelsByName[op.result.type].typescriptType] : [])).forEach((returnTypeModel) => { _%>
   <%- returnTypeModel %>,
 <%_ }); _%>
+<%_ /* 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.js';
 <%_ } _%>
 import { <%- className %> } from './client.gen.js';

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/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,9 +1,8 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import camelCase from "lodash.camelcase";
-import { snakeCase, toClassName } from "../../../utils/names.js";
-import { flattenModelLink, PRIMITIVE_TYPES } from "./types.js";
+ */ import { camelCase, snakeCase, toClassName } from "../../../utils/names.js";
+import { PRIMITIVE_TYPES } from "./types.js";
 const toTypescriptPrimitive = (property)=>{
     if (property.type === 'string' && [
         'date',
@@ -15,18 +14,23 @@ const toTypescriptPrimitive = (property)=>{
     }
     return property.type;
 };
-/**
- * Return the typescript type for the given model
- */ export const toTypeScriptType = (property)=>{
-    const propertyLink = flattenModelLink(property.link);
+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' ? toTypeScriptType(propertyLink) : property.type}>`;
+            return `Array<${valueType()}>`;
         case 'dictionary':
-            return `{ [key: string]: ${propertyLink && propertyLink.export !== 'enum' ? toTypeScriptType(propertyLink) : property.type}; }`;
+            return `{ [key: string]: ${valueType()}; }`;
         case 'one-of':
         case 'any-of':
         case 'all-of':
@@ -43,7 +47,9 @@ const toTypescriptPrimitive = (property)=>{
     }
 };
 export const toTypeScriptName = (name)=>{
-    return camelCase(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, '_') || '_';
 };
 const TYPESCRIPT_RESERVED_MODEL_NAMES = new Set([
     'Date',
@@ -102,18 +108,17 @@ const toPythonPrimitive = (property)=>{
     }
     return property.type;
 };
-/**
- * Return the python type for a given property
- */ export const toPythonType = (property)=>{
-    const propertyLink = flattenModelLink(property.link);
+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' ? toPythonType(propertyLink) : property.type}]`;
+            return `List[${valueType()}]`;
         case 'dictionary':
-            return `Dict[str, ${propertyLink && propertyLink.export !== 'enum' ? toPythonType(propertyLink) : property.type}]`;
+            return `Dict[str, ${valueType()}]`;
         case 'one-of':
         case 'any-of':
         case 'all-of':
@@ -178,8 +183,8 @@ const PYTHON_KEYWORDS = new Set([
 ]);
 export const toPythonName = (namedEntity, name)=>{
     const nameSnakeCase = 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
+    // 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){

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/open-api/utils/codegen-data/languages.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport camelCase from 'lodash.camelcase';\nimport { snakeCase, toClassName } from '../../../utils/names';\nimport { flattenModelLink, type Model, PRIMITIVE_TYPES } from './types';\n\nconst toTypescriptPrimitive = (property: Model): string => {\n  if (\n    property.type === 'string' &&\n    ['date', 'date-time'].includes(property.format ?? '')\n  ) {\n    return 'Date';\n  } else if (property.type === 'binary') {\n    return 'Blob';\n  }\n  return property.type;\n};\n\n/**\n * Return the typescript type for the given model\n */\nexport const toTypeScriptType = (property: Model): string => {\n  const propertyLink = flattenModelLink(property.link);\n  switch (property.export) {\n    case 'enum':\n    case 'generic':\n      return toTypescriptPrimitive(property);\n    case 'array':\n      return `Array<${propertyLink && propertyLink.export !== 'enum' ? toTypeScriptType(propertyLink) : property.type}>`;\n    case 'dictionary':\n      return `{ [key: string]: ${propertyLink && propertyLink.export !== 'enum' ? toTypeScriptType(propertyLink) : property.type}; }`;\n    case 'one-of':\n    case 'any-of':\n    case 'all-of':\n      return toTypeScriptModelName(property.name);\n    case 'reference':\n    default:\n      if (property.type === 'unknown') {\n        return 'unknown';\n      }\n      if (PRIMITIVE_TYPES.has(property.type)) {\n        return toTypescriptPrimitive(property);\n      }\n      return toTypeScriptModelName(property.type);\n  }\n};\n\nexport const toTypeScriptName = (name: string): string => {\n  return camelCase(name);\n};\n\nconst TYPESCRIPT_RESERVED_MODEL_NAMES = new Set([\n  'Date',\n  'Blob',\n  'Object',\n  'String',\n  'Boolean',\n  'Integer',\n  'Long',\n  'Float',\n  'Array',\n  'ReadonlyArray',\n  'File',\n  'Error',\n  'Map',\n  'Set',\n  'Number',\n  'Symbol',\n  'BigInt',\n  'Function',\n  'Promise',\n  'RegExp',\n  'JSON',\n]);\n\nexport const toTypeScriptModelName = (name: string): string => {\n  const candidateName = toClassName(name);\n\n  // Prepend underscore for any reserved model names\n  return TYPESCRIPT_RESERVED_MODEL_NAMES.has(candidateName)\n    ? `_${candidateName}`\n    : candidateName;\n};\n\nconst toPythonPrimitive = (property: Model): string => {\n  if (property.type === 'string' && property.format === 'date') {\n    return 'date';\n  } else if (property.type === 'string' && property.format === 'date-time') {\n    return 'datetime';\n  } else if (property.type === 'any') {\n    return 'object';\n  } else if (property.type === 'binary') {\n    return 'bytearray';\n  } else if (property.type === 'number') {\n    if ((property as any).openapiType === 'integer') {\n      return 'int';\n    }\n\n    switch (property.format) {\n      case 'int32':\n      case 'int64':\n        return 'int';\n      case 'float':\n      case 'double':\n      default:\n        return 'float';\n    }\n  } else if (property.type === 'boolean') {\n    return 'bool';\n  } else if (property.type === 'string') {\n    return 'str';\n  }\n  return property.type;\n};\n\n/**\n * Return the python type for a given property\n */\nexport const toPythonType = (property: Model): string => {\n  const propertyLink = flattenModelLink(property.link);\n  switch (property.export) {\n    case 'generic':\n    case 'reference':\n      return toPythonPrimitive(property);\n    case 'array':\n      return `List[${propertyLink && propertyLink.export !== 'enum' ? toPythonType(propertyLink) : property.type}]`;\n    case 'dictionary':\n      return `Dict[str, ${propertyLink && propertyLink.export !== 'enum' ? toPythonType(propertyLink) : property.type}]`;\n    case 'one-of':\n    case 'any-of':\n    case 'all-of':\n      return property.name;\n    default:\n      // \"any\" has export = interface\n      if (PRIMITIVE_TYPES.has(property.type)) {\n        return toPythonPrimitive(property);\n      }\n      return property.type;\n  }\n};\n\n// @see https://github.com/OpenAPITools/openapi-generator/blob/e2a62ace74de361bef6338b7fa37da8577242aef/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java#L106\nconst PYTHON_KEYWORDS = new Set([\n  // @property\n  'property',\n  // typing keywords\n  'schema',\n  'base64',\n  'json',\n  'date',\n  'float',\n  // python reserved words\n  'and',\n  'del',\n  'from',\n  'not',\n  'while',\n  'as',\n  'elif',\n  'global',\n  'or',\n  'with',\n  'assert',\n  'else',\n  'if',\n  'pass',\n  'yield',\n  'break',\n  'except',\n  'import',\n  'print',\n  'class',\n  'exec',\n  'in',\n  'raise',\n  'continue',\n  'finally',\n  'is',\n  'return',\n  'def',\n  'for',\n  'lambda',\n  'try',\n  'self',\n  'nonlocal',\n  'None',\n  'True',\n  'False',\n  'async',\n  'await',\n]);\n\nexport const toPythonName = (\n  namedEntity: 'model' | 'property' | 'operation',\n  name: string,\n) => {\n  const nameSnakeCase = snakeCase(name);\n\n  // Check if the name is a reserved word. Reserved words that overlap with TypeScript will already be escaped\n  // with a leading _ by @hey-api/openapi-ts, so we remove this to test\n  if (PYTHON_KEYWORDS.has(name.startsWith('_') ? name.slice(1) : name)) {\n    const nameSuffix = `_${nameSnakeCase}`;\n    switch (namedEntity) {\n      case 'model':\n        return `model${nameSuffix}`;\n      case 'operation':\n        return `call${nameSuffix}`;\n      case 'property':\n        return `var${nameSuffix}`;\n      default:\n        break;\n    }\n  }\n  return nameSnakeCase;\n};\n"],"names":["camelCase","snakeCase","toClassName","flattenModelLink","PRIMITIVE_TYPES","toTypescriptPrimitive","property","type","includes","format","toTypeScriptType","propertyLink","link","export","toTypeScriptModelName","name","has","toTypeScriptName","TYPESCRIPT_RESERVED_MODEL_NAMES","Set","candidateName","toPythonPrimitive","openapiType","toPythonType","PYTHON_KEYWORDS","toPythonName","namedEntity","nameSnakeCase","startsWith","slice","nameSuffix"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/open-api/utils/codegen-data/languages.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { camelCase, snakeCase, toClassName } from '../../../utils/names';\nimport { type Model, PRIMITIVE_TYPES } from './types';\n\nconst toTypescriptPrimitive = (property: Model): string => {\n  if (\n    property.type === 'string' &&\n    ['date', 'date-time'].includes(property.format ?? '')\n  ) {\n    return 'Date';\n  } else if (property.type === 'binary') {\n    return 'Blob';\n  }\n  return property.type;\n};\n\nexport const toTypeScriptType = (property: Model): string => {\n  // A discriminated subtype's discriminator property renders as its literal\n  // tag, making the union a true (narrowable) tagged union.\n  if (property.discriminatorValue) {\n    return property.discriminatorValue;\n  }\n  const link = property.link;\n  // Enum links serialise as their primitive; use the model's own type instead.\n  const valueType = () =>\n    link && link.export !== 'enum' ? toTypeScriptType(link) : property.type;\n  switch (property.export) {\n    case 'enum':\n    case 'generic':\n      return toTypescriptPrimitive(property);\n    case 'array':\n      return `Array<${valueType()}>`;\n    case 'dictionary':\n      return `{ [key: string]: ${valueType()}; }`;\n    case 'one-of':\n    case 'any-of':\n    case 'all-of':\n      return toTypeScriptModelName(property.name);\n    case 'reference':\n    default:\n      if (property.type === 'unknown') {\n        return 'unknown';\n      }\n      if (PRIMITIVE_TYPES.has(property.type)) {\n        return toTypescriptPrimitive(property);\n      }\n      return toTypeScriptModelName(property.type);\n  }\n};\n\nexport const toTypeScriptName = (name: string): string => {\n  // A name of only non-identifier characters (e.g. \"_\") camelCases to an empty\n  // string; fall back to an underscore so the emitted property stays valid.\n  return camelCase(name) || (name ?? '').replace(/[^a-zA-Z0-9]/g, '_') || '_';\n};\n\nconst TYPESCRIPT_RESERVED_MODEL_NAMES = new Set([\n  'Date',\n  'Blob',\n  'Object',\n  'String',\n  'Boolean',\n  'Integer',\n  'Long',\n  'Float',\n  'Array',\n  'ReadonlyArray',\n  'File',\n  'Error',\n  'Map',\n  'Set',\n  'Number',\n  'Symbol',\n  'BigInt',\n  'Function',\n  'Promise',\n  'RegExp',\n  'JSON',\n]);\n\nexport const toTypeScriptModelName = (name: string): string => {\n  const candidateName = toClassName(name);\n\n  // Prepend underscore for any reserved model names\n  return TYPESCRIPT_RESERVED_MODEL_NAMES.has(candidateName)\n    ? `_${candidateName}`\n    : candidateName;\n};\n\nconst toPythonPrimitive = (property: Model): string => {\n  if (property.type === 'string' && property.format === 'date') {\n    return 'date';\n  } else if (property.type === 'string' && property.format === 'date-time') {\n    return 'datetime';\n  } else if (property.type === 'any') {\n    return 'object';\n  } else if (property.type === 'binary') {\n    return 'bytearray';\n  } else if (property.type === 'number') {\n    if (property.openapiType === 'integer') {\n      return 'int';\n    }\n\n    switch (property.format) {\n      case 'int32':\n      case 'int64':\n        return 'int';\n      case 'float':\n      case 'double':\n      default:\n        return 'float';\n    }\n  } else if (property.type === 'boolean') {\n    return 'bool';\n  } else if (property.type === 'string') {\n    return 'str';\n  }\n  return property.type;\n};\n\nexport const toPythonType = (property: Model): string => {\n  const link = property.link;\n  const valueType = () =>\n    link && link.export !== 'enum' ? toPythonType(link) : property.type;\n  switch (property.export) {\n    case 'generic':\n    case 'reference':\n      return toPythonPrimitive(property);\n    case 'array':\n      return `List[${valueType()}]`;\n    case 'dictionary':\n      return `Dict[str, ${valueType()}]`;\n    case 'one-of':\n    case 'any-of':\n    case 'all-of':\n      return property.name;\n    default:\n      // \"any\" has export = interface\n      if (PRIMITIVE_TYPES.has(property.type)) {\n        return toPythonPrimitive(property);\n      }\n      return property.type;\n  }\n};\n\n// @see https://github.com/OpenAPITools/openapi-generator/blob/e2a62ace74de361bef6338b7fa37da8577242aef/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java#L106\nconst PYTHON_KEYWORDS = new Set([\n  // @property\n  'property',\n  // typing keywords\n  'schema',\n  'base64',\n  'json',\n  'date',\n  'float',\n  // python reserved words\n  'and',\n  'del',\n  'from',\n  'not',\n  'while',\n  'as',\n  'elif',\n  'global',\n  'or',\n  'with',\n  'assert',\n  'else',\n  'if',\n  'pass',\n  'yield',\n  'break',\n  'except',\n  'import',\n  'print',\n  'class',\n  'exec',\n  'in',\n  'raise',\n  'continue',\n  'finally',\n  'is',\n  'return',\n  'def',\n  'for',\n  'lambda',\n  'try',\n  'self',\n  'nonlocal',\n  'None',\n  'True',\n  'False',\n  'async',\n  'await',\n]);\n\nexport const toPythonName = (\n  namedEntity: 'model' | 'property' | 'operation',\n  name: string,\n) => {\n  const nameSnakeCase = snakeCase(name);\n\n  // Names overlapping a TypeScript reserved word carry a leading `_`; strip it\n  // before testing against the Python keyword set.\n  if (PYTHON_KEYWORDS.has(name.startsWith('_') ? name.slice(1) : name)) {\n    const nameSuffix = `_${nameSnakeCase}`;\n    switch (namedEntity) {\n      case 'model':\n        return `model${nameSuffix}`;\n      case 'operation':\n        return `call${nameSuffix}`;\n      case 'property':\n        return `var${nameSuffix}`;\n      default:\n        break;\n    }\n  }\n  return nameSnakeCase;\n};\n"],"names":["camelCase","snakeCase","toClassName","PRIMITIVE_TYPES","toTypescriptPrimitive","property","type","includes","format","toTypeScriptType","discriminatorValue","link","valueType","export","toTypeScriptModelName","name","has","toTypeScriptName","replace","TYPESCRIPT_RESERVED_MODEL_NAMES","Set","candidateName","toPythonPrimitive","openapiType","toPythonType","PYTHON_KEYWORDS","toPythonName","namedEntity","nameSnakeCase","startsWith","slice","nameSuffix"],"mappings":"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"}