type-crafter 0.17.0 → 0.18.0

package/dist/index.js

@@ -21560,7 +21560,8 @@ async function generateAdditionalPropertiesType(typeName, typeInfo, parentTypes)
                 valuePrimitiveType: 'unknown',
                 valueComposerType: null
             },
-            primitives: unknownType.primitives
+            primitives: unknownType.primitives,
+            references: new Set()
         };
     }
     else if (valueIsKeyedAdditionalProperties(typeInfo.additionalProperties)) {
@@ -21584,7 +21585,10 @@ async function generateAdditionalPropertiesType(typeName, typeInfo, parentTypes)
                     ? (generatedValueType.templateInput.arrayNestingDepth ?? 0)
                     : 0
             },
-            primitives: generatedValueType.primitives
+            primitives: generatedValueType.primitives,
+            references: isReferenced
+                ? new Set([generatedValueType.templateInput.typeName])
+                : generatedValueType.references
         };
     }
     else if (valueIsTypeInfo(typeInfo.additionalProperties)) {
@@ -21605,7 +21609,10 @@ async function generateAdditionalPropertiesType(typeName, typeInfo, parentTypes)
                     ? (generatedValueType.templateInput.arrayNestingDepth ?? 0)
                     : 0
             },
-            primitives: generatedValueType.primitives
+            primitives: generatedValueType.primitives,
+            references: isReferenced
+                ? new Set([generatedValueType.templateInput.typeName])
+                : generatedValueType.references
         };
     }
     return null;
@@ -21704,6 +21711,7 @@ async function generateObjectType(typeName, typeInfo, parentTypes) {
     if (additionalPropertiesResult !== null) {
         templateInput.additionalProperties = additionalPropertiesResult.templateInput;
         primitives.push(...additionalPropertiesResult.primitives);
+        references.push(...additionalPropertiesResult.references);
     }
     const result = {
         content: Runtime.getObjectTemplate()(templateInput) +
@@ -22573,7 +22581,7 @@ async function runner(language, inputFilePath, outputDirectory, _typesWriterMode
     }
 }
 greeting();
-const program = new Command().version('0.17.0');
+const program = new Command().version('0.18.0');
 program
     .command('generate')
     .description('Generate types for your language from a type spec file')

package/dist/templates/rust/allOf-syntax.hbs

@@ -2,6 +2,9 @@
 /// {{{description}}}
 {{/if}}
 #[derive({{{appendUnique "Debug, Clone, Serialize, Deserialize" customAttributes.[x-derive]}}})]
+{{#each customAttributes.[x-attributes]}}
+#[{{{this}}}]
+{{/each}}
 pub struct {{typeName}} {
 {{#each compositions}}
 {{#if (eq this.source 'referenced')}}

package/dist/templates/rust/enum-syntax.hbs

@@ -5,6 +5,9 @@
 /// Example: {{{example}}}
 {{/if}}
 #[derive({{{appendUnique "Debug, Clone, Serialize, Deserialize" customAttributes.[x-derive]}}})]
+{{#each customAttributes.[x-attributes]}}
+#[{{{this}}}]
+{{/each}}
 pub enum {{typeName}} {
 {{#each values}}
 {{#if (eq ../type 'string')}}

package/dist/templates/rust/object-syntax.hbs

@@ -5,6 +5,9 @@
 /// Example: {{{example}}}
 {{/if}}
 #[derive({{{appendUnique "Debug, Clone, Serialize, Deserialize" customAttributes.[x-derive]}}})]
+{{#each customAttributes.[x-attributes]}}
+#[{{{this}}}]
+{{/each}}
 {{#if customAttributes.renameAll}}
 #[serde(rename_all = "{{{customAttributes.renameAll}}}")]
 {{/if}}

package/dist/templates/rust/oneOf-syntax.hbs

@@ -2,6 +2,9 @@
 /// {{{description}}}
 {{/if}}
 #[derive({{{appendUnique "Debug, Clone, Serialize, Deserialize" customAttributes.[x-derive]}}})]
+{{#each customAttributes.[x-attributes]}}
+#[{{{this}}}]
+{{/each}}
 #[serde(untagged)]
 pub enum {{typeName}} {
 {{#each compositions}}

package/dist/types/index.d.ts

@@ -144,6 +144,7 @@ export type AdditionalPropertiesTemplateInput = {
 export type AdditionalPropertiesGenerationResult = {
     templateInput: AdditionalPropertiesTemplateInput;
     primitives: Set<string>;
+    references: Set<string>;
 };
 export type ExporterModuleTemplateInput = {
     modules: string[];

package/package.json

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