type-crafter 0.16.0 → 0.17.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') {
@@ -22547,7 +22573,7 @@ async function runner(language, inputFilePath, outputDirectory, _typesWriterMode
     }
 }
 greeting();
-const program = new Command().version('0.16.0');
+const program = new Command().version('0.17.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,7 @@
 {{#if description}}
 /// {{{description}}}
 {{/if}}
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive({{{appendUnique "Debug, Clone, Serialize, Deserialize" customAttributes.[x-derive]}}})]
 pub struct {{typeName}} {
 {{#each compositions}}
 {{#if (eq this.source 'referenced')}}

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

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

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

@@ -4,7 +4,7 @@
 {{#if example}}
 /// Example: {{{example}}}
 {{/if}}
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive({{{appendUnique "Debug, Clone, Serialize, Deserialize" customAttributes.[x-derive]}}})]
 {{#if customAttributes.renameAll}}
 #[serde(rename_all = "{{{customAttributes.renameAll}}}")]
 {{/if}}

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

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

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

@@ -50,7 +50,7 @@ export function decode{{typeName}}(rawInput: unknown): {{typeName}} | null {
       {{#if this.optional}}_{{/if}}decode{{{toPascalCase this.type}}}(rawInput[{{{indexKey @key}}}]);
     {{~else~}}
       {{~#if (eq this.primitiveType 'array')~}}
-      decodeArray(rawInput[{{{indexKey @key}}}], {{~> nestedArrayDecoder depth=this.arrayNestingDepth composerType=this.composerType~}})
+      decodeArray(rawInput[{{{indexKey @key}}}], {{~> nestedArrayDecoder depth=this.arrayNestingDepth composerType=this.composerType~}}){{#if this.optional}} ?? undefined{{/if}}
       {{~else~}}
        {{#if this.optional}}_{{/if}}decode{{{toPascalCase this.type}}}(rawInput[{{{indexKey @key}}}])
       {{~/if~}};
@@ -85,9 +85,11 @@ export function decode{{typeName}}(rawInput: unknown): {{typeName}} | null {
       const decodedValue = decode{{{toPascalCase additionalProperties.valueType}}}(rawInput[key]);
       {{/if}}
       {{/if}}
+      {{#unless (eq additionalProperties.valuePrimitiveType 'unknown')}}
       if (decodedValue === null) {
         return null;
       }
+      {{/unless}}
       decodedAdditionalProperties[key] = decodedValue;
     }
     return decodedAdditionalProperties;
@@ -109,9 +111,11 @@ export function decode{{typeName}}(rawInput: unknown): {{typeName}} | null {
         const decodedValue = decode{{{toPascalCase additionalProperties.valueType}}}(rawInput[key]);
         {{/if}}
         {{/if}}
+        {{#unless (eq additionalProperties.valuePrimitiveType 'unknown')}}
         if (decodedValue === null) {
           return null;
         }
+        {{/unless}}
         decodedAdditionalProperties[key] = decodedValue;
       }
     }
@@ -177,9 +181,11 @@ export function _decode{{typeName}}(rawInput: unknown): {{typeName}} | undefined
       const decodedValue = decode{{{toPascalCase additionalProperties.valueType}}}(rawInput[key]);
       {{/if}}
       {{/if}}
+      {{#unless (eq additionalProperties.valuePrimitiveType 'unknown')}}
       if (decodedValue === null) {
         return;
       }
+      {{/unless}}
       decodedAdditionalProperties[key] = decodedValue;
     }
     return decodedAdditionalProperties;
@@ -201,9 +207,11 @@ export function _decode{{typeName}}(rawInput: unknown): {{typeName}} | undefined
         const decodedValue = decode{{{toPascalCase additionalProperties.valueType}}}(rawInput[key]);
         {{/if}}
         {{/if}}
+        {{#unless (eq additionalProperties.valuePrimitiveType 'unknown')}}
         if (decodedValue === null) {
           return;
         }
+        {{/unless}}
         decodedAdditionalProperties[key] = decodedValue;
       }
     }

package/dist/templates/typescript-with-decoders/types-file-syntax.hbs

@@ -1,7 +1,7 @@
 {{#each (getReferencedTypeModules referencedTypes writtenAt)}}
 import { {{#each this.referencedTypes}}type {{this}}, decode{{this}}{{#unless @last}}, {{/unless}} {{/each}} } from '{{this.moduleRelativePath}}';
 {{/each}}
-import { isJSON, {{#each primitives}}decode{{{toPascalCase this}}}, _decode{{{toPascalCase this}}} {{#unless @last}}, {{/unless}}{{/each}} } from 'type-decoder';
+import { isJSON, {{#each primitives}}decode{{{toPascalCase this}}}{{#unless (eq this 'unknown')}}, _decode{{{toPascalCase this}}}{{/unless}} {{#unless @last}}, {{/unless}}{{/each}} } from 'type-decoder';
 
 {{{typesContent}}}
 

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.0",
+  "version": "0.17.0",
   "description": "A tool to generate types from a yaml schema for any language",
   "main": "./dist/index.js",
   "type": "module",