type-crafter 0.16.1 → 0.18.0

package/dist/index.js

@@ -21281,6 +21281,31 @@ function escapeReservedWord(input) {
     }
     return input;
 }
+function appendUnique(base, additions) {
+    const seen = new Set();
+    const result = [];
+    const add = (item) => {
+        if (typeof item !== 'string') {
+            return;
+        }
+        const trimmed = item.trim();
+        if (trimmed.length === 0 || seen.has(trimmed)) {
+            return;
+        }
+        seen.add(trimmed);
+        result.push(trimmed);
+    };
+    if (typeof base === 'string') {
+        base.split(',').forEach(add);
+    }
+    if (Array.isArray(additions)) {
+        additions.forEach(add);
+    }
+    else {
+        add(additions);
+    }
+    return result.join(', ');
+}
 function registerTemplateHelpers() {
     Handlebars.registerHelper('getOptionalKeys', getOptionalKeys);
     Handlebars.registerHelper('getRequiredKeys', getRequiredKeys);
@@ -21297,6 +21322,7 @@ function registerTemplateHelpers() {
     Handlebars.registerHelper('variableName', refineVariableName);
     Handlebars.registerHelper('indexKey', refineIndexKey);
     Handlebars.registerHelper('escapeReservedWord', escapeReservedWord);
+    Handlebars.registerHelper('appendUnique', appendUnique);
     Handlebars.registerHelper('stringify', (value) => JSON.stringify(value));
     Handlebars.registerHelper('not', (value) => {
         if (typeof value === 'boolean') {
@@ -21534,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)) {
@@ -21558,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)) {
@@ -21579,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;
@@ -21678,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) +
@@ -22547,7 +22581,7 @@ async function runner(language, inputFilePath, outputDirectory, _typesWriterMode
     }
 }
 greeting();
-const program = new Command().version('0.16.1');
+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

@@ -1,7 +1,10 @@
 {{#if description}}
 /// {{{description}}}
 {{/if}}
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[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

@@ -4,7 +4,10 @@
 {{#if example}}
 /// Example: {{{example}}}
 {{/if}}
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[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

@@ -4,7 +4,10 @@
 {{#if example}}
 /// Example: {{{example}}}
 {{/if}}
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[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

@@ -1,7 +1,10 @@
 {{#if description}}
 /// {{{description}}}
 {{/if}}
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[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/dist/utils/index.d.ts

@@ -17,6 +17,7 @@ export declare function refineJSONKey(input: unknown): unknown;
 export declare function refineVariableName(input: unknown): unknown;
 export declare function refineIndexKey(input: unknown): unknown;
 export declare function escapeReservedWord(input: unknown): unknown;
+export declare function appendUnique(base: unknown, additions: unknown): string;
 export declare function registerTemplateHelpers(): void;
 export declare function readNestedValue(json: unknown, keyPath: string[]): JSONObject;
 export declare function generateRelativePath(fromPath: string, toPath: string): string;

package/package.json

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