@aws/nx-plugin 0.14.1 → 0.15.0

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

@@ -32,7 +32,7 @@ import type {
 // eg. an array of arrays of strings doesn't need to be rendered as `value.map(item0 => item0.map(item1 => item1))`
 const canShortCircuitConversion = (property) => {
   if (["array", "dictionary"].includes(property.export)) {
-    return canShortCircuitConversion(property.link);
+    return !property.link || canShortCircuitConversion(property.link);
   }
   return property.isPrimitive && !["date", "date-time"].includes(property.format);
 };
@@ -41,19 +41,22 @@ const renderToJsonDateValue = (identifier, format) => {
   return `${identifier}.toISOString()${format === 'date' ? '.slice(0,10)' : ''}`;
 };
 // Renders the appropriate nested function for .map() or $mapValues() for arrays and dictionaries for the given type
-const renderNestedToJsonValue = (type, depth = 0) => {
+const renderNestedToJsonValue = (type, argumentType = undefined, depth = 0) => {
   const itemIdentifier = `item${depth}`;
+  const argType = `${argumentType ? `: ${argumentType}` : ''}`;
   if (type.isPrimitive || type.typescriptType === 'unknown' || type.export === 'enum' || type.isEnum) {
-    return `(${itemIdentifier}) => ${["date", "date-time"].includes(type.format) ? renderToJsonDateValue(itemIdentifier, type.format) : itemIdentifier}`;
+    return `(${itemIdentifier}${argType}) => ${["date", "date-time"].includes(type.format) ? renderToJsonDateValue(itemIdentifier, type.format) : itemIdentifier}`;
   } else if (type.export === "array") {
-    return `(${itemIdentifier}) => ${itemIdentifier}.map(${renderNestedToJsonValue(type.link, depth + 1)})`;
+    return `(${itemIdentifier}${argType}) => ${itemIdentifier}.map(${renderNestedToJsonValue(type.link, argumentType, depth + 1)})`;
   } else if (type.export === "dictionary") {
-    return `(${itemIdentifier}) => $IO.$mapValues(${itemIdentifier}, ${renderNestedToJsonValue(type.link, depth + 1)})`;
+    return `(${itemIdentifier}${argType}) => $IO.$mapValues(${itemIdentifier}, ${renderNestedToJsonValue(type.link, argumentType, depth + 1)})`;
+  } else if (type.type === 'unknown') {
+    return `(${itemIdentifier}${argType}) => ${itemIdentifier}`;
   }
   return `$IO.${type.name || type.type}.toJson`;
 };
 // Renders the code to transform a property of the model to its json representation from the model types
-const renderToJsonValue = (property, value) => {
+const renderToJsonValue = (property, value, argumentType = undefined) => {
   let rendered = '';
 
   if (canShortCircuitConversion(property)) {
@@ -62,9 +65,9 @@ const renderToJsonValue = (property, value) => {
     rendered = ["date", "date-time"].includes(property.format) ? `(${renderToJsonDateValue(value, property.format)})` : value;
   } else if (property.export === "array") {
     const prefix = property.uniqueItems ? `Array.from(${value})` : `${value}`;
-    rendered = `(${prefix}.map(${renderNestedToJsonValue(property.link)}))`;
+    rendered = `(${prefix}.map(${renderNestedToJsonValue(property.link, argumentType)}))`;
   } else if (property.export === "dictionary") {
-    rendered = `($IO.$mapValues(${value}, ${renderNestedToJsonValue(property.link)}))`;
+    rendered = `($IO.$mapValues(${value}, ${renderNestedToJsonValue(property.link, argumentType)}))`;
   } else if (property.type !== "any") {
     rendered = `$IO.${property.type}.toJson(${value})`;
   } else {
@@ -77,29 +80,32 @@ const renderToJsonValue = (property, value) => {
   return rendered;
 };
 // Renders the appropriate nested function for .map() or $mapValues() for arrays and dictionaries for the given type
-const renderNestedFromJsonValue = (type, depth = 0) => {
+const renderNestedFromJsonValue = (type, argumentType = undefined, depth = 0) => {
     const itemIdentifier = `item${depth}`;
+    const argType = `${argumentType ? `: ${argumentType}` : ''}`;
     if (type.isPrimitive || type.typescriptType === 'unknown' || type.export === 'enum' || type.isEnum) {
-        return `(${itemIdentifier}) => ${["date", "date-time"].includes(type.format) ? `new Date(${itemIdentifier})` : itemIdentifier}`;
+        return `(${itemIdentifier}${argType}) => ${["date", "date-time"].includes(type.format) ? `new Date(${itemIdentifier})` : itemIdentifier}`;
     } else if (type.export === "array") {
-        return `(${itemIdentifier}) => ${itemIdentifier}.map(${renderNestedFromJsonValue(type.link, depth + 1)})`;
+        return `(${itemIdentifier}${argType}) => ${itemIdentifier}.map(${renderNestedFromJsonValue(type.link, argumentType, depth + 1)})`;
     } else if (type.export === "dictionary") {
-        return `(${itemIdentifier}) => $IO.$mapValues(${itemIdentifier}, ${renderNestedFromJsonValue(type.link, depth + 1)})`;
+        return `(${itemIdentifier}${argType}) => $IO.$mapValues(${itemIdentifier}, ${renderNestedFromJsonValue(type.link, argumentType, depth + 1)})`;
+    } else if (type.type === 'unknown') {
+      return `(${itemIdentifier}${argType}) => ${itemIdentifier}`;
     }
     return `$IO.${type.name || type.type}.fromJson`;
 };
 // Renders the code to transform a property of the model from its json representation into the model types
-const renderFromJsonValue = (property, value) => {
+const renderFromJsonValue = (property, value, argumentType = undefined) => {
     let rendered = '';
     if (canShortCircuitConversion(property)) {
         rendered = value;
     } else if (property.isPrimitive || property.typescriptType === 'unknown' || property.export === 'enum' || property.isEnum) {
         rendered = ["date", "date-time"].includes(property.format) ? `(new Date(${value}))` : value;
     } else if (property.export === "array") {
-        rendered = `((${value} as Array<any>).map(${renderNestedFromJsonValue(property.link)}))`;
+        rendered = `((${value} as Array<any>).map(${renderNestedFromJsonValue(property.link, argumentType)}))`;
         rendered = property.uniqueItems ? `new Set(${rendered})` : rendered;
     } else if (property.export === "dictionary") {
-        rendered = `($IO.$mapValues(${value}, ${renderNestedFromJsonValue(property.link)}))`;
+        rendered = `($IO.$mapValues(${value}, ${renderNestedFromJsonValue(property.link, argumentType)}))`;
     } else {
         rendered = `$IO.${property.type}.fromJson(${value})`;
     }
@@ -147,6 +153,9 @@ const renderStreamingResponseChunk = (response) => {
     asBlob: 'new Blob([value])',
   });
 };
+const matchPattern = (pattern, value) => {
+  return `/${pattern}/.test(${value})`;
+};
 _%>
 
 /**
@@ -164,7 +173,7 @@ export class $IO {
         return model;
       }
       <%_ if (isComposite) { _%>
-      <%_ model.composedPrimitives.filter(p => !['array', 'dictionary'].includes(p.export)).forEach((primitive) => { _%>
+      <%_ model.composedPrimitives.filter(p => !['array', 'dictionary'].includes(p.export) && p.type !== 'null').forEach((primitive) => { _%>
       if (typeof model === "<%- primitive.typescriptType %>") {
           return model;
       }
@@ -196,6 +205,20 @@ export class $IO {
         <%_ if (model.export === 'dictionary') { _%>
         ...<%- renderToJsonValue(model, 'model') %>,
         <%_ } _%>
+        <%_ if (model.hasPatternProperties && model.patternPropertiesModels.length > 0) { _%>
+        <%_ model.patternPropertiesModels.forEach(({ pattern, model: patternProperty }) => { _%>
+          ...$IO.$mapValues(Object.fromEntries(Object.entries(model).filter(([key]) => <% if (model.properties.length > 0) { %>![<%- model.properties.map(p => `'${p.typescriptName}'`).join(', ') %>].includes(key) && <% } %>
+          <%- matchPattern(pattern, 'key') %>
+          )), (patternProperty) => <%- renderToJsonValue(patternProperty, 'patternProperty', 'any') %>),
+        <%_ }); _%>
+        <%_ } _%>
+        <%_ if (model.hasAdditionalProperties) { _%>
+          ...$IO.$mapValues(Object.fromEntries(Object.entries(model).filter(([key]) => <% if (model.properties.length > 0) { %>![<%- model.properties.map(p => `'${p.typescriptName}'`).join(', ') %>].includes(key)<% } %>
+          <%_ if (model.hasPatternProperties && model.patternPropertiesModels.length > 0) { _%>
+          <% if (model.properties.length > 0) { %>&& <% } %>!(<%- model.patternPropertiesModels.map(({ pattern }) => matchPattern(pattern, 'key')).join(' || ') %>)
+          <%_ } _%>
+          )), (additionalProperty) => <%- renderToJsonValue(model.additionalPropertiesModel, 'additionalProperty', 'any') %>),
+        <%_ } _%>
         <%_ model.properties.forEach((property) => { _%>
         ...(model.<%- property.typescriptName %> === undefined ? {} : {
           '<%= property.name %>': <%- renderToJsonValue(property, `model.${property.typescriptName}`) %>,
@@ -209,7 +232,7 @@ export class $IO {
         return json;
       }
       <%_ if (isComposite) { _%>
-      <%_ model.composedPrimitives.filter(p => !['array', 'dictionary'].includes(p.export)).forEach((primitive) => { _%>
+      <%_ model.composedPrimitives.filter(p => !['array', 'dictionary'].includes(p.export) && p.type !== 'null').forEach((primitive) => { _%>
       if (typeof json === "<%- primitive.typescriptType %>") {
           return json;
       }
@@ -240,6 +263,20 @@ export class $IO {
         <%_ if (model.export === 'dictionary') { _%>
         ...<%- renderFromJsonValue(model, 'json') %>,
         <%_ } _%>
+        <%_ 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) => { _%>
         <%_ if (!property.isRequired) { _%>
         ...(json['<%- property.name %>'] === undefined ? {} : {
@@ -323,7 +360,7 @@ export class <%- className %> {
   private $fetch: typeof fetch = (...args) => (this.$config.fetch ?? fetch)(...args);
   <%_ allOperations.forEach((op) => { _%>
   <%_ const hasTag = op.tags && op.tags.length > 0; _%>
-  <%_ const isStreaming = (op.vendorExtensions ?? {})['x-streaming']; _%>
+  <%_ const isStreaming = op.isStreaming; _%>
   <%_ const isInputOptional = (op.parameters.length === 1 && op.parametersBody && !op.parametersBody.isRequired) || op.parameters.length === 0; _%>
 
 <%- docString(op, '  ') %>  <%- hasTag ? 'private' : 'public' %> async <% if (isStreaming) { %>*<% } %><%- hasTag ? '_' : '' %><%- op.uniqueName %>(<% if (op.parameters.length > 0) { %>input<%- isInputOptional ? '?' : '' %>: <%- op.operationIdPascalCase %>Request<% } %>): <%- isStreaming ? 'AsyncIterableIterator' : 'Promise' %><<%- op.result ? op.result.typescriptType : 'void' %>> {

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

@@ -27,13 +27,18 @@ _%>
 <%_ } else if (isComposite) { _%>
 <%- docString(model, '') %>export type <%- model.name %> =<% model.properties.forEach((composedType, i) => { %><% if (i > 0) { %><% if (model.export === "all-of") { %> &<% } else { %> |<% } %><% } %> <%- composedType.typescriptType %><% }); %>;
 <%_ } else { _%>
-<%- docString(model, '') %>export type <%= model.name %> = <% if (model.isNullable) { %>null | <% } %>{
+<%- docString(model, '') %>export type <%= model.name %> = <% if (model.isNullable && model.type !== 'null') { %>null | <% } %>{
 <%_ if (model.export === "dictionary" && model.link) { _%>
 <%- docString(model.link, '  ') %>  [key: string]: <%- model.link.typescriptType %>;
 <%_ } _%>
 <%_ model.properties.forEach((property) => { _%>
-<%- docString(property, '  ') %>  <%= property.isReadOnly ? 'readonly ' : '' %><%= property.typescriptName %><%= property.isRequired ? '' : '?' %>: <%- property.typescriptType %><%= property.isNullable ? ' | null' : '' %>;
+<%- docString(property, '  ') %>  <%= property.isReadOnly ? 'readonly ' : '' %><%= property.typescriptName %><%= property.isRequired ? '' : '?' %>: <%- property.typescriptType %><%= (property.isNullable && property.type !== 'null') ? ' | null' : '' %>;
 <%_ }); _%>
+<%_ if (model.hasAdditionalProperties || model.hasPatternProperties) { _%>
+<%_ const keyName = (model.hasAdditionalProperties && model.hasPatternProperties) ? 'additionalAndPatternProperties' : (model.hasAdditionalProperties ? 'additionalProperties' : 'patternProperties'); _%>
+<%_ const typeComment = (model.hasAdditionalProperties && !model.hasPatternProperties && model.additionalPropertiesModel.typescriptType !== 'unknown') ? ` /* ${model.additionalPropertiesModel.typescriptType} */` : '' _%>
+  [<%- keyName %>: string]: unknown<%- typeComment %>;
+<%_ } _%>
 };
 <%_ } _%>
 <%_ }); _%>