type-crafter 0.12.0 → 0.12.2

package/dist/index.js

@@ -21417,37 +21417,65 @@ function getPrimitiveType(typeName, typeInfo) {
     return result;
 }
 async function generateAdditionalPropertiesType(typeName, typeInfo, parentTypes) {
-    let result = null;
     const stringKeyType = getPrimitiveType(typeName, {
         ...placeholderTypeInfo,
         type: 'string'
     }).templateInput.type;
     if (typeof typeInfo.additionalProperties === 'boolean') {
-        result = {
-            keyType: stringKeyType,
-            valueType: getPrimitiveType(typeName, {
-                ...placeholderTypeInfo,
-                type: 'unknown'
-            }).templateInput.type
+        return {
+            templateInput: {
+                keyType: stringKeyType,
+                valueType: getPrimitiveType(typeName, {
+                    ...placeholderTypeInfo,
+                    type: 'unknown'
+                }).templateInput.type,
+                valueTypeReferenced: false,
+                valuePrimitiveType: 'unknown',
+                valueComposerType: null
+            },
+            primitives: new Set()
         };
     }
     else if (valueIsKeyedAdditionalProperties(typeInfo.additionalProperties)) {
-        result = {
-            keyType: getPrimitiveType(typeName, {
-                ...placeholderTypeInfo,
-                type: typeInfo.additionalProperties.keyType
-            }).templateInput.type,
-            valueType: (await generateType(typeName + 'ValueType', typeInfo.additionalProperties.valueType, parentTypes)).templateInput.type
+        const valueTypeInfo = typeInfo.additionalProperties.valueType;
+        const generatedValueType = await generateType(typeName + 'ValueType', valueTypeInfo, parentTypes);
+        const isReferenced = valueTypeInfo.$ref !== null;
+        const isArray = valueTypeInfo.type === 'array';
+        return {
+            templateInput: {
+                keyType: getPrimitiveType(typeName, {
+                    ...placeholderTypeInfo,
+                    type: typeInfo.additionalProperties.keyType
+                }).templateInput.type,
+                valueType: generatedValueType.templateInput.type,
+                valueTypeReferenced: isReferenced,
+                valuePrimitiveType: isArray ? 'array' : (valueTypeInfo.type ?? 'object'),
+                valueComposerType: 'composerType' in generatedValueType.templateInput
+                    ? (generatedValueType.templateInput.composerType ?? null)
+                    : null
+            },
+            primitives: generatedValueType.primitives
         };
     }
     else if (valueIsTypeInfo(typeInfo.additionalProperties)) {
-        const valueType = await generateType(typeName + 'ValueType', typeInfo.additionalProperties, parentTypes);
-        result = {
-            keyType: stringKeyType,
-            valueType: valueType.templateInput.type
+        const valueTypeInfo = typeInfo.additionalProperties;
+        const generatedValueType = await generateType(typeName + 'ValueType', valueTypeInfo, parentTypes);
+        const isReferenced = valueTypeInfo.$ref !== null;
+        const isArray = valueTypeInfo.type === 'array';
+        return {
+            templateInput: {
+                keyType: stringKeyType,
+                valueType: generatedValueType.templateInput.type,
+                valueTypeReferenced: isReferenced,
+                valuePrimitiveType: isArray ? 'array' : (valueTypeInfo.type ?? 'object'),
+                valueComposerType: 'composerType' in generatedValueType.templateInput
+                    ? (generatedValueType.templateInput.composerType ?? null)
+                    : null
+            },
+            primitives: generatedValueType.primitives
         };
     }
-    return result;
+    return null;
 }
 async function generateObjectType(typeName, typeInfo, parentTypes) {
     const templateInput = {
@@ -21536,9 +21564,10 @@ async function generateObjectType(typeName, typeInfo, parentTypes) {
         };
     }
     // Generating additional property types
-    const additionalProperties = await generateAdditionalPropertiesType(typeName + 'AdditionalProperty', typeInfo, parentTypes);
-    if (additionalProperties !== null) {
-        templateInput.additionalProperties = additionalProperties;
+    const additionalPropertiesResult = await generateAdditionalPropertiesType(typeName + 'AdditionalProperty', typeInfo, parentTypes);
+    if (additionalPropertiesResult !== null) {
+        templateInput.additionalProperties = additionalPropertiesResult.templateInput;
+        primitives.push(...additionalPropertiesResult.primitives);
     }
     const result = {
         content: Runtime.getObjectTemplate()(templateInput) +
@@ -22195,7 +22224,7 @@ async function runner(language, inputFilePath, outputDirectory, _typesWriterMode
     }
 }
 greeting();
-const program = new Command().version('0.12.0');
+const program = new Command().version('0.12.2');
 program
     .command('generate')
     .description('Generate types for your language from a type spec file')

package/dist/templates/typescript-with-decoders/object-syntax.hbs

@@ -61,14 +61,67 @@ export function decode{{typeName}}(rawInput: unknown): {{typeName}} | null {
     }
     {{/if}}
 
-    return {
-      {{#if additionalProperties}}
-      ...rawInput,
+    {{#if additionalProperties}}
+    {{#if (isEmptyObject properties)}}
+    const decodedAdditionalProperties: {{typeName}} = {};
+    for (const key in rawInput) {
+      {{#if additionalProperties.valueTypeReferenced}}
+      const decodedValue = {{#if (eq additionalProperties.valuePrimitiveType 'array')~}}
+        decodeArray(rawInput[key], decode{{{toPascalCase additionalProperties.valueComposerType}}});
+      {{~else~}}
+        decode{{{toPascalCase additionalProperties.valueType}}}(rawInput[key]);
+      {{~/if}}
+      {{else}}
+      {{#if (eq additionalProperties.valuePrimitiveType 'array')}}
+      const decodedValue = decodeArray(rawInput[key], decode{{{toPascalCase additionalProperties.valueComposerType}}});
+      {{else}}
+      const decodedValue = decode{{{toPascalCase additionalProperties.valueType}}}(rawInput[key]);
       {{/if}}
+      {{/if}}
+      if (decodedValue === null) {
+        return null;
+      }
+      decodedAdditionalProperties[key] = decodedValue;
+    }
+    return decodedAdditionalProperties;
+    {{else}}
+    const decodedAdditionalProperties: Record<{{additionalProperties.keyType}}, {{additionalProperties.valueType}}> = {};
+    const knownKeys = new Set([{{#each properties}}{{{indexKey @key}}}{{#unless @last}}, {{/unless}}{{/each}}]);
+    for (const key in rawInput) {
+      if (!knownKeys.has(key)) {
+        {{#if additionalProperties.valueTypeReferenced}}
+        const decodedValue = {{#if (eq additionalProperties.valuePrimitiveType 'array')~}}
+          decodeArray(rawInput[key], decode{{{toPascalCase additionalProperties.valueComposerType}}});
+        {{~else~}}
+          decode{{{toPascalCase additionalProperties.valueType}}}(rawInput[key]);
+        {{~/if}}
+        {{else}}
+        {{#if (eq additionalProperties.valuePrimitiveType 'array')}}
+        const decodedValue = decodeArray(rawInput[key], decode{{{toPascalCase additionalProperties.valueComposerType}}});
+        {{else}}
+        const decodedValue = decode{{{toPascalCase additionalProperties.valueType}}}(rawInput[key]);
+        {{/if}}
+        {{/if}}
+        if (decodedValue === null) {
+          return null;
+        }
+        decodedAdditionalProperties[key] = decodedValue;
+      }
+    }
+    return {
+      ...decodedAdditionalProperties,
       {{#each properties}}
       {{{jsonKey @key}}}: decoded{{{variableName @key}}}{{#unless @last}},{{/unless}}
       {{/each}}
     };
+    {{/if}}
+    {{else}}
+    return {
+      {{#each properties}}
+      {{{jsonKey @key}}}: decoded{{{variableName @key}}}{{#unless @last}},{{/unless}}
+      {{/each}}
+    };
+    {{/if}}
   }
   return null;
 }
@@ -100,14 +153,67 @@ export function _decode{{typeName}}(rawInput: unknown): {{typeName}} | undefined
     }
     {{/if}}
 
-    return {
-      {{#if additionalProperties}}
-      ...rawInput,
+    {{#if additionalProperties}}
+    {{#if (isEmptyObject properties)}}
+    const decodedAdditionalProperties: {{typeName}} = {};
+    for (const key in rawInput) {
+      {{#if additionalProperties.valueTypeReferenced}}
+      const decodedValue = {{#if (eq additionalProperties.valuePrimitiveType 'array')~}}
+        decodeArray(rawInput[key], decode{{{toPascalCase additionalProperties.valueComposerType}}});
+      {{~else~}}
+        decode{{{toPascalCase additionalProperties.valueType}}}(rawInput[key]);
+      {{~/if}}
+      {{else}}
+      {{#if (eq additionalProperties.valuePrimitiveType 'array')}}
+      const decodedValue = decodeArray(rawInput[key], decode{{{toPascalCase additionalProperties.valueComposerType}}});
+      {{else}}
+      const decodedValue = decode{{{toPascalCase additionalProperties.valueType}}}(rawInput[key]);
       {{/if}}
+      {{/if}}
+      if (decodedValue === null) {
+        return;
+      }
+      decodedAdditionalProperties[key] = decodedValue;
+    }
+    return decodedAdditionalProperties;
+    {{else}}
+    const decodedAdditionalProperties: Record<{{additionalProperties.keyType}}, {{additionalProperties.valueType}}> = {};
+    const knownKeys = new Set([{{#each properties}}{{{indexKey @key}}}{{#unless @last}}, {{/unless}}{{/each}}]);
+    for (const key in rawInput) {
+      if (!knownKeys.has(key)) {
+        {{#if additionalProperties.valueTypeReferenced}}
+        const decodedValue = {{#if (eq additionalProperties.valuePrimitiveType 'array')~}}
+          decodeArray(rawInput[key], decode{{{toPascalCase additionalProperties.valueComposerType}}});
+        {{~else~}}
+          decode{{{toPascalCase additionalProperties.valueType}}}(rawInput[key]);
+        {{~/if}}
+        {{else}}
+        {{#if (eq additionalProperties.valuePrimitiveType 'array')}}
+        const decodedValue = decodeArray(rawInput[key], decode{{{toPascalCase additionalProperties.valueComposerType}}});
+        {{else}}
+        const decodedValue = decode{{{toPascalCase additionalProperties.valueType}}}(rawInput[key]);
+        {{/if}}
+        {{/if}}
+        if (decodedValue === null) {
+          return;
+        }
+        decodedAdditionalProperties[key] = decodedValue;
+      }
+    }
+    return {
+      ...decodedAdditionalProperties,
       {{#each properties}}
       {{{jsonKey @key}}}: decoded{{{variableName @key}}}{{#unless @last}},{{/unless}}
       {{/each}}
     };
+    {{/if}}
+    {{else}}
+    return {
+      {{#each properties}}
+      {{{jsonKey @key}}}: decoded{{{variableName @key}}}{{#unless @last}},{{/unless}}
+      {{/each}}
+    };
+    {{/if}}
   }
   return;
 }

package/dist/types/index.d.ts

@@ -118,6 +118,13 @@ export type ObjectTemplateInputProperty = TypeDescriptors & {
 export type AdditionalPropertiesTemplateInput = {
     keyType: string;
     valueType: string;
+    valueTypeReferenced: boolean;
+    valuePrimitiveType: string;
+    valueComposerType: string | null;
+};
+export type AdditionalPropertiesGenerationResult = {
+    templateInput: AdditionalPropertiesTemplateInput;
+    primitives: Set<string>;
 };
 export type ExporterModuleTemplateInput = {
     modules: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "type-crafter",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "A tool to generate types from a yaml schema for any language",
   "main": "./dist/index.js",
   "type": "module",