type-crafter 0.12.1 → 0.12.2

package/dist/index.js

@@ -21417,21 +21417,23 @@ 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,
-            valueTypeReferenced: false,
-            valuePrimitiveType: 'unknown',
-            valueComposerType: null
+        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)) {
@@ -21439,17 +21441,20 @@ async function generateAdditionalPropertiesType(typeName, typeInfo, parentTypes)
         const generatedValueType = await generateType(typeName + 'ValueType', valueTypeInfo, parentTypes);
         const isReferenced = valueTypeInfo.$ref !== null;
         const isArray = valueTypeInfo.type === 'array';
-        result = {
-            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
+        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)) {
@@ -21457,17 +21462,20 @@ async function generateAdditionalPropertiesType(typeName, typeInfo, parentTypes)
         const generatedValueType = await generateType(typeName + 'ValueType', valueTypeInfo, parentTypes);
         const isReferenced = valueTypeInfo.$ref !== null;
         const isArray = valueTypeInfo.type === 'array';
-        result = {
-            keyType: stringKeyType,
-            valueType: generatedValueType.templateInput.type,
-            valueTypeReferenced: isReferenced,
-            valuePrimitiveType: isArray ? 'array' : (valueTypeInfo.type ?? 'object'),
-            valueComposerType: 'composerType' in generatedValueType.templateInput
-                ? (generatedValueType.templateInput.composerType ?? null)
-                : null
+        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 = {
@@ -21556,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) +
@@ -22215,7 +22224,7 @@ async function runner(language, inputFilePath, outputDirectory, _typesWriterMode
     }
 }
 greeting();
-const program = new Command().version('0.12.1');
+const program = new Command().version('0.12.2');
 program
     .command('generate')
     .description('Generate types for your language from a type spec file')

package/dist/types/index.d.ts

@@ -122,6 +122,10 @@ export type AdditionalPropertiesTemplateInput = {
     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.1",
+  "version": "0.12.2",
   "description": "A tool to generate types from a yaml schema for any language",
   "main": "./dist/index.js",
   "type": "module",