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

package/src/open-api/ts-client/__snapshots__/generator.tags.spec.ts.snap

@@ -579,7 +579,7 @@ export class TestApi {
     );
 
     if (response.status === 201) {
-      return await response.text();
+      return await response.json();
     }
     throw new Error(
       \`Unknown response status \${response.status} returned by API\`,
@@ -630,7 +630,7 @@ export class TestApi {
     );
 
     if (response.status === 200) {
-      return await response.text();
+      return await response.json();
     }
     throw new Error(
       \`Unknown response status \${response.status} returned by API\`,
@@ -837,7 +837,7 @@ export class TestApi {
     );
 
     if (response.status === 200) {
-      return await response.text();
+      return await response.json();
     }
     throw new Error(
       \`Unknown response status \${response.status} returned by API\`,
@@ -861,7 +861,7 @@ export class TestApi {
     );
 
     if (response.status === 200) {
-      return Number(await response.text());
+      return await response.json();
     }
     throw new Error(
       \`Unknown response status \${response.status} returned by API\`,

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

@@ -29,6 +29,19 @@ const composedMarshaller = (property, method) =>
   property.export === 'reference' && discriminatorBaseNames.has(property.type)
     ? `$IO.${property.typescriptType}.$${method}Base`
     : `$IO.${property.typescriptType}.${method}`;
+// Names of object models composed by a non-discriminated one-of/any-of. These
+// additionally emit an internal `$fromJsonPartial` marshaller that converts
+// only the properties present on the wire value, so composing the union's
+// members never fabricates values (e.g. an Invalid Date) from a non-matching
+// member's absent required fields. Discriminated unions dispatch to a single
+// member instead and never compose, so they don't need the partial form.
+const unionMemberNames = new Set(models
+  .filter(m => (m.export === 'one-of' || m.export === 'any-of') && !m.discriminator)
+  .flatMap(m => (m.composedModels || []).map(c => c.name)));
+const hasPartialMarshaller = (name) => {
+  const member = unionMemberNames.has(name) && modelByName[name];
+  return member && !['one-of', 'any-of', 'all-of', 'dictionary', 'enum', 'tuple'].includes(member.export);
+};
 // 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;
@@ -36,6 +49,14 @@ const bodyMediaTypeOf = (op) => {
   return mediaTypes.find(mt => mt === 'application/json' || mt.endsWith('+json')) || mediaTypes[0];
 };
 const hasMultipartBody = allOperations.some(op => bodyMediaTypeOf(op) === 'multipart/form-data');
+const hasUrlEncodedBody = allOperations.some(op => bodyMediaTypeOf(op) === 'application/x-www-form-urlencoded');
+// Whether any operation uses matrix/label path styles or allowReserved query
+// params, so the extra $url serialisation logic is only emitted when needed.
+const hasStyledPathParams = allOperations.some(op => (op.parameters || []).some(p => p.in === 'path' && p.pathStyle));
+const hasAllowReservedParams = allOperations.some(op => (op.parameters || []).some(p => p.in === 'query' && p.allowReserved));
+// Whether a response is JSON on the wire (so primitives arrive JSON-encoded,
+// e.g. a string response body is `"hello"` including the quotes).
+const isJsonResponse = (response) => (response.mediaTypes || []).some(mt => mt === 'application/json' || mt.split(';')[0].endsWith('+json'));
 _%>
 <%_ if ((models.length + allOperations.filter(p => p.parameters.length > 0).length) > 0) { _%>
 import type {
@@ -45,7 +66,7 @@ import type {
 <%_ allOperations.filter(p => p.parameters.length > 0).forEach((op) => { _%>
   <%- op.requestTypeName %>,
 <%_ }); _%>
-} from './types.gen.js';
+} from './types.gen<% if (esm) { %>.js<% } %>';
 <%_ } _%>
 <%_
 // Nested arrays of primitives (besides dates) don't need to have .map(...) called to convert them as the base case will be a noop
@@ -54,6 +75,9 @@ const canShortCircuitConversion = (property) => {
   if (["array", "dictionary"].includes(property.export)) {
     return !property.link || canShortCircuitConversion(property.link);
   }
+  if (property.export === "tuple") {
+    return property.properties.every(canShortCircuitConversion);
+  }
   return property.isPrimitive && !["date", "date-time"].includes(property.format);
 };
 // Render code to convert a date to its string representation
@@ -70,6 +94,8 @@ const renderNestedToJsonValue = (type, argumentType = undefined, depth = 0) => {
     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 === "tuple") {
+    return `(${itemIdentifier}${argType}) => ${renderTupleToJsonValue(type, itemIdentifier)}`;
   } else if (type.export === "dictionary") {
     return `(${itemIdentifier}${argType}) => $IO.$mapValues(${itemIdentifier}, ${renderNestedToJsonValue(type.link, argumentType, depth + 1)})`;
   } else if (type.type === 'unknown' && !["one-of", "any-of", "all-of"].includes(type.export)) {
@@ -79,6 +105,10 @@ const renderNestedToJsonValue = (type, argumentType = undefined, depth = 0) => {
   }
   return `$IO.${type.typescriptType || type.typescriptName}.toJson`;
 };
+// Renders a tuple's positional element-wise conversion, e.g. `[f(v[0]), g(v[1])]`
+const renderTupleToJsonValue = (property, value) => {
+  return `[${property.properties.map((member, i) => renderToJsonValue(member, `(${value} as any)[${i}]`)).join(', ')}]`;
+};
 // Renders the code to transform a property of the model to its json representation from the model types
 const renderToJsonValue = (property, value, argumentType = undefined) => {
   let rendered = '';
@@ -90,6 +120,8 @@ const renderToJsonValue = (property, value, argumentType = undefined) => {
   } else if (property.export === "array") {
     const prefix = property.uniqueItems ? `Array.from(${value})` : `${value}`;
     rendered = `(${prefix}.map(${renderNestedToJsonValue(property.link, argumentType)}))`;
+  } else if (property.export === "tuple") {
+    rendered = `(${renderTupleToJsonValue(property, value)})`;
   } else if (property.export === "dictionary") {
     rendered = `($IO.$mapValues(${value}, ${renderNestedToJsonValue(property.link, argumentType)}))`;
   } else if (property.type !== "any") {
@@ -98,7 +130,7 @@ const renderToJsonValue = (property, value, argumentType = undefined) => {
     rendered = value;
   }
 
-  if ((property.isPrimitive && ["date", "date-time"].includes(property.format)) || (!property.isPrimitive && ["array", "dictionary"].includes(property.export))) {
+  if ((property.isPrimitive && ["date", "date-time"].includes(property.format)) || (!property.isPrimitive && ["array", "tuple", "dictionary"].includes(property.export))) {
     rendered = property.isNullable ? `${value} === null ? null : ${rendered}` : rendered;
   }
   return rendered;
@@ -113,6 +145,8 @@ const renderNestedFromJsonValue = (type, argumentType = undefined, depth = 0) =>
         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 === "tuple") {
+        return `(${itemIdentifier}${argType}) => ${renderTupleFromJsonValue(type, itemIdentifier)}`;
     } else if (type.export === "dictionary") {
         return `(${itemIdentifier}${argType}) => $IO.$mapValues(${itemIdentifier}, ${renderNestedFromJsonValue(type.link, argumentType, depth + 1)})`;
     } else if (type.type === 'unknown' && !["one-of", "any-of", "all-of"].includes(type.export)) {
@@ -122,6 +156,10 @@ const renderNestedFromJsonValue = (type, argumentType = undefined, depth = 0) =>
     }
     return `$IO.${type.typescriptType || type.typescriptName}.fromJson`;
 };
+// Renders a tuple's positional element-wise revival, e.g. `[f(v[0]), g(v[1])]`
+const renderTupleFromJsonValue = (property, value) => {
+  return `([${property.properties.map((member, i) => renderFromJsonValue(member, `(${value})[${i}]`)).join(', ')}] as ${property.typescriptType})`;
+};
 // Renders the code to transform a property of the model from its json representation into the model types
 const renderFromJsonValue = (property, value, argumentType = undefined) => {
     let rendered = '';
@@ -132,6 +170,8 @@ const renderFromJsonValue = (property, value, argumentType = undefined) => {
     } else if (property.export === "array") {
         rendered = `((${value} as Array<any>).map(${renderNestedFromJsonValue(property.link, argumentType)}))`;
         rendered = property.uniqueItems ? `new Set(${rendered})` : rendered;
+    } else if (property.export === "tuple") {
+        rendered = renderTupleFromJsonValue(property, value);
     } else if (property.export === "dictionary") {
         rendered = `($IO.$mapValues(${value}, ${renderNestedFromJsonValue(property.link, argumentType)}))`;
     } else {
@@ -149,8 +189,13 @@ const renderResponseCondition = (code) => {
   }
   return `response.status === ${code}`;
 };
-// Renders the code which handles deserialising the response from a fetch call
+// Renders the code which handles deserialising the response from a fetch call.
+// A primitive on a JSON wire arrives JSON-encoded (a string body is `"hello"`,
+// quotes included), so it must be JSON-parsed rather than read as raw text.
+// Streaming chunks (options provided) keep raw-text semantics: an x-streaming
+// chunk is an arbitrary fragment, not a complete JSON document.
 const renderResponse = (response, options) => {
+  const jsonWire = !options && isJsonResponse(response);
   let opts = options || {
     asText: 'await response.text()',
     asJson: 'await response.json()',
@@ -159,7 +204,13 @@ const renderResponse = (response, options) => {
   if (response.type === 'binary') {
     return opts.asBlob;
   }
-  if ((response.isPrimitive || ['unknown', 'any'].includes(response.type)) && !['array', 'dictionary'].includes(response.export)) {
+  if ((response.isPrimitive || ['unknown', 'any'].includes(response.type)) && !['array', 'tuple', 'dictionary'].includes(response.export)) {
+    if (jsonWire) {
+      if (['date', 'date-time'].includes(response.format)) {
+        return `new Date(${opts.asJson})`;
+      }
+      return `${opts.asJson}${['unknown', 'any'].includes(response.type) ? ' as any' : ''}`;
+    }
     if (response.type === 'number') {
       return `Number(${opts.asText})`;
     } else if (response.type === 'boolean') {
@@ -170,7 +221,7 @@ const renderResponse = (response, options) => {
     return `${opts.asText}${['unknown', 'any'].includes(response.type) ? ' as any' : ''}`;
   }
   if (response.isEnum || response.export === 'enum') {
-    return `(${opts.asText}) as ${response.typescriptType}`;
+    return `(${jsonWire ? opts.asJson : opts.asText}) as ${response.typescriptType}`;
   }
   return renderFromJsonValue(response, `(${opts.asJson})`);
 };
@@ -202,6 +253,22 @@ export class $IO {
 <%_ const toJsonName = isBase ? '$toJsonBase' : 'toJson'; _%>
 <%_ const fromJsonName = isBase ? '$fromJsonBase' : 'fromJson'; _%>
 
+  <%_ if (model.export === 'tuple') { _%>
+  public static <%- model.typescriptName %> = {
+    toJson: (model: <%- model.typescriptName %>): any => {
+      if (model === undefined || model === null) {
+        return model;
+      }
+      return <%- renderToJsonValue(model, 'model') %>;
+    },
+    fromJson: (json: any): <%- model.typescriptName %> => {
+      if (json === undefined || json === null) {
+        return json;
+      }
+      return <%- renderFromJsonValue(model, 'json') %>;
+    },
+  };
+  <%_ return; } _%>
   public static <%- model.typescriptName %> = {
     <%_ if (isBase) { _%>
     toJson: (model: <%- model.typescriptName %>): any => {
@@ -355,10 +422,15 @@ export class $IO {
       }
       <%_ } _%>
       <%_ if (model.composedModels.length > 0) { _%>
+      <%_ /* A non-discriminated union's members marshal via their partial form:
+            the value matches one member, so the others must convert only the
+            properties actually present rather than fabricate their own. */ _%>
       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 if (model.export !== 'all-of' && composedType.export === 'reference' && hasPartialMarshaller(composedType.type)) { _%>
+        ...$IO.<%- composedType.typescriptType %>.$fromJsonPartial(json),
         <%_ } else { _%>
         ...<%- renderFromJsonValue(composedType, 'json') %>,
         <%_ } _%>
@@ -398,6 +470,36 @@ export class $IO {
       };
       <%_ } _%>
     },
+    <%_ if (hasPartialMarshaller(model.name)) { _%>
+    <%_ /* Converts only the properties present on the wire value — a required
+          field that is absent is skipped, never fabricated (e.g. no
+          `new Date(undefined)`). Used solely when composing this model as a
+          member of a non-discriminated union, where the value may match a
+          different member; `fromJson` remains the fully-typed marshaller. */ _%>
+    $fromJsonPartial: (json: any): any => {
+      return {
+        <%_ if (model.hasPatternProperties && model.patternPropertiesModels.length > 0) { _%>
+        <%_ model.patternPropertiesModels.forEach(({ pattern, model: patternProperty }) => { _%>
+          ...$IO.$mapValues(Object.fromEntries(Object.entries(json).filter(([key]) => <% if (model.properties.length > 0) { %>![<%- model.properties.map(p => `'${p.name}'`).join(', ') %>].includes(key) && <% } %>
+          <%- matchPattern(pattern, 'key') %>
+          )), (patternProperty) => <%- renderFromJsonValue(patternProperty, 'patternProperty', 'any') %>),
+        <%_ }); _%>
+        <%_ } _%>
+        <%_ if (model.hasAdditionalProperties) { _%>
+        ...$IO.$mapValues(Object.fromEntries(Object.entries(json).filter(([key]) => <% if (model.properties.length > 0) { %>![<%- model.properties.map(p => `'${p.name}'`).join(', ') %>].includes(key)<% } %>
+        <%_ if (model.hasPatternProperties && model.patternPropertiesModels.length > 0) { _%>
+        <% if (model.properties.length > 0) { %>&& <% } %>!(<%- model.patternPropertiesModels.map(({ pattern }) => matchPattern(pattern, 'key')).join(' || ') %>)
+        <%_ } _%>
+        )), (additionalProperty) => <%- renderFromJsonValue(model.additionalPropertiesModel, 'additionalProperty', 'any') %>),
+        <%_ } _%>
+        <%_ model.properties.forEach((property) => { _%>
+        ...(json['<%- property.name %>'] === undefined ? {} : {
+          <%= property.typescriptName %>: <%- renderFromJsonValue(property, `json['${property.name}']`) %>,
+        }),
+        <%_ }); _%>
+      };
+    },
+    <%_ } _%>
   };
 <%_ }) _%>
 }
@@ -457,20 +559,44 @@ export class <%- className %> {
     );
   };
 
-  private $url = (path: string, pathParameters: { [key: string]: any }, queryParameters: { [key: string]: any }, collectionFormats?: { [key: string]: 'multi' | 'csv' | 'ssv' | 'pipes' | 'deepObject' }): string => {
+  private $url = (path: string, pathParameters: { [key: string]: any }, queryParameters: { [key: string]: any }, collectionFormats?: { [key: string]: 'multi' | 'csv' | 'ssv' | 'pipes' | 'deepObject' }<% if (hasStyledPathParams) { %>, pathStyles?: { [key: string]: { style: 'matrix' | 'label'; explode: boolean } }<% } %><% if (hasAllowReservedParams) { %>, allowReserved?: string[]<% } %>): string => {
     const baseUrl = this.$config.url.endsWith('/') ? this.$config.url.slice(0, -1) : this.$config.url;
+    <%_ if (hasAllowReservedParams) { _%>
+    // Reserved characters stay literal when a query parameter declares allowReserved
+    const encodeQueryValue = (key: string, v: string): string =>
+      allowReserved?.includes(key) ? encodeURIComponent(v).replace(/%(2F|3A|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/gi, (m) => decodeURIComponent(m)) : encodeURIComponent(v);
+    <%_ } _%>
+    <%_ if (hasStyledPathParams) { _%>
+    const pathWithParameters = Object.entries(pathParameters).reduce((withParams, [key, value]) => {
+      const pathStyle = pathStyles?.[key];
+      let rendered: string;
+      if (pathStyle?.style === 'matrix') {
+        // RFC 6570 path-style expansion: ;key=a,b (explode: ;key=a;key=b)
+        rendered = Array.isArray(value) && pathStyle.explode
+          ? value.map(v => `;${key}=${encodeURIComponent(`${v}`)}`).join('')
+          : `;${key}=${(Array.isArray(value) ? value : [value]).map(v => encodeURIComponent(`${v}`)).join(',')}`;
+      } else if (pathStyle?.style === 'label') {
+        // RFC 6570 label expansion: .a,b (explode: .a.b)
+        rendered = `.${(Array.isArray(value) ? value : [value]).map(v => encodeURIComponent(`${v}`)).join(pathStyle.explode ? '.' : ',')}`;
+      } else {
+        rendered = encodeURIComponent(`${value}`);
+      }
+      return withParams.replace(`{${key}}`, rendered);
+    }, path);
+    <%_ } else { _%>
     const pathWithParameters = Object.entries(pathParameters).reduce((withParams, [key, value]) =>
       withParams.replace(`{${key}}`, encodeURIComponent(`${value}`))
     , path);
+    <%_ } _%>
     const queryString = Object.entries(queryParameters).flatMap(([key, value]) => {
       if (Array.isArray(value) && collectionFormats?.[key] === 'multi') {
-        return value.map(v => `${encodeURIComponent(key)}=${encodeURIComponent(`${v}`)}`);
+        return value.map(v => `${encodeURIComponent(key)}=<% if (hasAllowReservedParams) { %>${encodeQueryValue(key, `${v}`)}<% } else { %>${encodeURIComponent(`${v}`)}<% } %>`);
       }
       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))}`];
+      return [`${encodeURIComponent(key)}=<% if (hasAllowReservedParams) { %>${encodeQueryValue(key, Array.isArray(value) ? value.map(String).join(delimiter) : String(value))}<% } else { %>${encodeURIComponent(Array.isArray(value) ? value.map(String).join(delimiter) : String(value))}<% } %>`];
     }).join('&');
     return baseUrl + pathWithParameters + (queryString ? `?${queryString}` : '');
   };
@@ -486,18 +612,33 @@ export class <%- className %> {
   };
 
   <%_ if (hasMultipartBody) { _%>
-  private $formData = (model: { [key: string]: any }): FormData => {
+  private $formData = (
+    model: { [key: string]: any },
+    partContentTypes?: { [key: string]: string },
+  ): FormData => {
     const formData = new FormData();
     const append = (key: string, value: any): void => {
       if (value === undefined || value === null) {
         return;
       }
+      const partContentType = partContentTypes?.[key];
       if (value instanceof Blob || typeof value === 'string') {
-        formData.append(key, value);
+        // A declared part content type overrides the default (text/plain for
+        // strings, the Blob's own type otherwise)
+        if (partContentType) {
+          formData.append(key, new Blob([value], { type: partContentType }));
+        } else {
+          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));
+        const serialized = JSON.stringify(value);
+        if (partContentType) {
+          formData.append(key, new Blob([serialized], { type: partContentType }));
+        } else {
+          formData.append(key, serialized);
+        }
       } else {
         formData.append(key, String(value));
       }
@@ -506,6 +647,26 @@ export class <%- className %> {
     return formData;
   };
 
+  <%_ } _%>
+  <%_ if (hasUrlEncodedBody) { _%>
+  private $urlEncodedForm = (model: { [key: string]: any }): URLSearchParams => {
+    const params = new URLSearchParams();
+    const append = (key: string, value: any): void => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => append(key, v));
+      } else if (typeof value === 'object') {
+        params.append(key, JSON.stringify(value));
+      } else {
+        params.append(key, String(value));
+      }
+    };
+    Object.entries(model).forEach(([key, value]) => append(key, value));
+    return params;
+  };
+
   <%_ } _%>
   private $fetch: typeof fetch = (...args) => (this.$config.fetch ?? fetch)(...args);
   <%_ allOperations.forEach((op) => { _%>
@@ -517,6 +678,14 @@ export class <%- className %> {
     <%_ ['path', 'query', 'header'].forEach((position) => { _%>
     <%_ if (op.parameters.map(p => p.in).includes(position)) { _%>
     const <%- position %>Parameters: {[key: string]: any} = $IO.<%- op.operationIdPascalCase %>Request<%- upperFirst(position) %>Parameters.toJson(input);
+    <%_ /* A content-based parameter (declared with `content` rather than
+           `schema`) is serialised to its media type — JSON — as a single
+           value. */ _%>
+    <%_ op.parameters.filter(p => p.in === position && p.mediaType === 'application/json').forEach((parameter) => { _%>
+    if (<%- position %>Parameters['<%- parameter.prop %>'] !== undefined) {
+      <%- position %>Parameters['<%- parameter.prop %>'] = JSON.stringify(<%- position %>Parameters['<%- parameter.prop %>']);
+    }
+    <%_ }); _%>
     <%_ } else { _%>
     const <%- position %>Parameters: {[key: string]: any} = {};
     <%_ } _%>
@@ -552,6 +721,8 @@ export class <%- className %> {
            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'); _%>
+    <%_ const styledPathParams = op.parameters.filter(p => p.pathStyle && p.in === 'path'); _%>
+    <%_ const allowReservedParams = op.parameters.filter(p => p.allowReserved && p.in === 'query'); _%>
     <%_ if (queryCollectionParams.length > 0) { _%>
     const queryCollectionFormats = {
       <%_ queryCollectionParams.forEach((parameter) => { _%>
@@ -559,6 +730,13 @@ export class <%- className %> {
       <%_ }); _%>
     } as const;
     <%_ } _%>
+    <%_ if (styledPathParams.length > 0) { _%>
+    const pathParameterStyles = {
+      <%_ styledPathParams.forEach((parameter) => { _%>
+      '<%- parameter.prop %>': { style: '<%- parameter.pathStyle %>', explode: <%- !!parameter.pathExplode %> },
+      <%_ }); _%>
+    } as const;
+    <%_ } _%>
     <%_ if (headerCollectionParams.length > 0) { _%>
     const headerCollectionFormats = {
       <%_ headerCollectionParams.forEach((parameter) => { _%>
@@ -572,7 +750,12 @@ export class <%- className %> {
            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') %>);
+    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') %><% if (op.parametersBody.partContentTypes) { %>, <%- JSON.stringify(op.parametersBody.partContentTypes) %><% } %>);
+    <%_ } else if (bodyMediaTypeOf(op) === 'application/x-www-form-urlencoded') { _%>
+    <%_ /* A urlencoded body is sent as `key=value&...` pairs — the JSON
+           serialisation the wire type declares would be rejected by the
+           server's form parser. */ _%>
+    const body = <% if (!op.parametersBody.isRequired) { %>input === undefined ? undefined : <% } %>this.$urlEncodedForm(<%- op.explicitRequestBodyParameter ? `$IO.${op.operationIdPascalCase}RequestBodyParameters.toJson(input).${op.explicitRequestBodyParameter.prop}` : renderToJsonValue(op.parametersBody, 'input') %>).toString();
     <%_ } 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)) { _%>
@@ -604,7 +787,7 @@ export class <%- className %> {
     const body = undefined;
     <%_ } _%>
 
-    const response = await this.$fetch(this.$url('<%- op.path %>', pathParameters, queryParameters<% if (queryCollectionParams.length > 0) { %>, queryCollectionFormats<% } %>), {
+    const response = await this.$fetch(this.$url('<%- op.path %>', pathParameters, queryParameters<% if (queryCollectionParams.length > 0 || styledPathParams.length > 0 || allowReservedParams.length > 0) { %>, <%- queryCollectionParams.length > 0 ? 'queryCollectionFormats' : 'undefined' %><% } %><% if (styledPathParams.length > 0 || allowReservedParams.length > 0) { %>, <%- styledPathParams.length > 0 ? 'pathParameterStyles' : 'undefined' %><% } %><% if (allowReservedParams.length > 0) { %>, [<%- allowReservedParams.map(p => `'${p.prop}'`).join(', ') %>]<% } %>), {
       headers: this.$headers(headerParameters<% if (headerCollectionParams.length > 0) { %>, headerCollectionFormats<% } %>),
       method: '<%- op.method %>',
       body,

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

@@ -27,6 +27,8 @@ _%>
 <%_ }); _%>
 <%_ } 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 %><% }); %>;
+<%_ } else if (model.export === "tuple") { _%>
+<%- docString(model, '') %>export type <%= model.typescriptName %> = <% if (model.isNullable) { %>null | <% } %>[<% model.properties.forEach((member, i) => { %><% if (i > 0) { %>, <% } %><%- member.typescriptType %><%= (member.isNullable && member.type !== 'null') ? ' | null' : '' %><% }); %>];
 <%_ } else { _%>
 <%- docString(model, '') %>export type <%= model.typescriptName %> = <% if (model.isNullable && model.type !== 'null') { %>null | <% } %>{
 <%_ if (model.export === "dictionary" && model.link) { _%>

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

@@ -1,9 +1,10 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { generateFiles } from "@nx/devkit";
+ */ 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";
 /**
@@ -17,12 +18,36 @@ 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);
+    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`);
+            }
+        }
+    }
+};
 /**
  * Generate an OpenAPI typescript client in the target directory
  */ export const generateOpenApiTsClient = (tree, data, outputPath)=>{
-    generateFiles(tree, path.join(import.meta.dirname, 'files'), outputPath, data);
+    generateFiles(tree, path.join(import.meta.dirname, 'files'), outputPath, {
+        ...data,
+        ...esmVars(tree)
+    });
 };
 export default openApiTsClientGenerator;
 

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 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"}
+{"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(\n    tree,\n    path.join(import.meta.dirname, 'files'),\n    outputPath,\n    { ...data, ...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,cACEQ,MACAN,KAAK+B,IAAI,CAAC,YAAYC,OAAO,EAAE,UAC/BpB,YACA;QAAE,GAAGJ,IAAI;QAAE,GAAGN,QAAQI,KAAK;IAAC;AAEhC,EAAE;AAEF,eAAeD,yBAAyB"}

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

@@ -41,9 +41,9 @@ import type {
 <%_ uniq(allOperations.flatMap((op) => op.isInfiniteQuery && op.infiniteQueryCursorProperty && modelsByName[op.infiniteQueryCursorProperty.type] ? [modelsByName[op.infiniteQueryCursorProperty.type].typescriptType] : [])).forEach((cursorTypeModel) => { _%>
   <%- cursorTypeModel %>,
 <%_ }); _%>
-} from './types.gen.js';
+} 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

@@ -4,6 +4,7 @@
  */ 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
@@ -16,7 +17,10 @@ import { buildOpenApiCodeGenerationData, generateOpenApiTsClient } from "../ts-c
 /**
  * Generate OpenAPI typescript hooks in the target directory
  */ export const generateOpenApiTsHooks = (tree, data, outputPath)=>{
-    generateFiles(tree, path.join(import.meta.dirname, 'files'), outputPath, data);
+    generateFiles(tree, path.join(import.meta.dirname, 'files'), outputPath, {
+        ...data,
+        ...esmVars(tree)
+    });
 };
 export default openApiTsHooksGenerator;
 

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

@@ -1 +1 @@
-{"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 {\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(\n    tree,\n    path.join(import.meta.dirname, 'files'),\n    outputPath,\n    data,\n  );\n};\n\nexport default openApiTsHooksGenerator;\n"],"names":["generateFiles","path","formatFilesInSubtree","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,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,MAAMR,qBAAqBI;AAC7B,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMK,yBAAyB,CACpCL,MACAE,MACAE;IAEAV,cACEM,MACAL,KAAKW,IAAI,CAAC,YAAYC,OAAO,EAAE,UAC/BH,YACAF;AAEJ,EAAE;AAEF,eAAeH,wBAAwB"}
+{"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(\n    tree,\n    path.join(import.meta.dirname, 'files'),\n    outputPath,\n    { ...data, ...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,cACEO,MACAN,KAAKY,IAAI,CAAC,YAAYC,OAAO,EAAE,UAC/BH,YACA;QAAE,GAAGF,IAAI;QAAE,GAAGN,QAAQI,KAAK;IAAC;AAEhC,EAAE;AAEF,eAAeD,wBAAwB"}

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

@@ -14,6 +14,8 @@ const toTypescriptPrimitive = (property)=>{
     }
     return property.type;
 };
+// 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.
@@ -29,6 +31,8 @@ export const toTypeScriptType = (property)=>{
             return toTypescriptPrimitive(property);
         case 'array':
             return `Array<${valueType()}>`;
+        case 'tuple':
+            return `[${property.properties.map((member)=>memberType(toTypeScriptType(member), member)).join(', ')}]`;
         case 'dictionary':
             return `{ [key: string]: ${valueType()}; }`;
         case 'one-of':
@@ -117,6 +121,8 @@ export const toPythonType = (property)=>{
             return toPythonPrimitive(property);
         case 'array':
             return `List[${valueType()}]`;
+        case 'tuple':
+            return `Tuple[${property.properties.map((member)=>toPythonType(member)).join(', ')}]`;
         case 'dictionary':
             return `Dict[str, ${valueType()}]`;
         case 'one-of':