type-crafter 0.9.7 → 0.10.0

package/dist/index.js

@@ -3561,6 +3561,7 @@ function decodeTypeInfo(rawInput) {
             oneOf: decodeArray(rawInput.oneOf, decodeTypeInfo),
             allOf: decodeArray(rawInput.allOf, decodeTypeInfo),
             additionalProperties,
+            customAttributes: isJSON(rawInput.customAttributes) ? rawInput.customAttributes : null,
             enum: _type === 'string'
                 ? decodeArray(rawInput.enum, decodeString)
                 : _type === 'number'
@@ -3636,7 +3637,11 @@ function decodeObjectTemplateInputProperty(rawInput) {
         const summary = decodeString(rawInput.summary);
         const example = decodeString(rawInput.example) ?? decodeNumber(rawInput.example);
         const description = decodeString(rawInput.description);
-        if (required !== null && _type !== null && referenced !== null && primitiveType !== null && optional !== null) {
+        if (required !== null &&
+            _type !== null &&
+            referenced !== null &&
+            primitiveType !== null &&
+            optional !== null) {
             return {
                 type: _type,
                 required,
@@ -11900,202 +11905,6 @@ if (typeof commonjsRequire !== 'undefined' && commonjsRequire.extensions) {
 
 var Handlebars = /*@__PURE__*/getDefaultExportFromCjs(lib);
 
-const isColorSupported = process.env.COLORTERM === 'truecolor';
-function redLog(r) {
-    if (!isColorSupported) {
-        return r;
-    }
-    return `\x1b[41m\x1b[37m${r}\x1b[0m`;
-}
-function greenLog(r) {
-    if (!isColorSupported) {
-        return r;
-    }
-    return `\x1b[48;2;79;153;7m\x1b[30m${r}\x1b[0m`;
-}
-function darkBlue(r) {
-    if (!isColorSupported) {
-        return r;
-    }
-    return `\x1b[48;2;6;40;61m\x1b[37m${r}\x1b[0m`;
-}
-function logError(header, message = null) {
-    console.log(redLog(` Crafting failed: ${header}`));
-    if (message !== null) {
-        console.log(`${message}`);
-    }
-}
-function logSuccess(header, message) {
-    console.log(greenLog(` ${header} `));
-    console.log(`${message}`);
-}
-function greeting() {
-    console.log('\n' + darkBlue('|' + Array(50).join('‾') + '|'));
-    console.log(darkBlue('|' + Array(20).join(' ') + 'Type Crafter' + Array(19).join(' ') + '|'));
-    console.log(darkBlue('|' + Array(50).join('_') + '|') + '\n');
-}
-
-class LanguageNotSupportedError extends Error {
-    constructor(language) {
-        super(`Language ${language} not supported`);
-        this.name = 'LanguageNotSupportedError';
-    }
-}
-class InvalidParamError extends Error {
-    constructor(key, value) {
-        super(`Invalid Param ${value} for ${key}`);
-        this.name = 'InvalidParamError';
-    }
-}
-class InvalidSpecFileError extends Error {
-    constructor(param) {
-        super(`Bad spec file \n${param ?? ''}`);
-        this.name = 'InvalidSpecFileError';
-    }
-}
-class RuntimeError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'RuntimeError';
-    }
-}
-class UnsupportedFeatureError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'UnsupportedFeatureError';
-    }
-}
-function handleErrors(error) {
-    if (error instanceof Error) {
-        if ('code' in error &&
-            'path' in error &&
-            typeof error.path === 'string' &&
-            error.code === 'ENOENT') {
-            logError('File not found', 'Failed to read file on path: ' + error.path);
-        }
-        else {
-            logError(error.name, error.message);
-        }
-    }
-}
-
-let config$2 = null;
-let specFileData = null;
-let objectSyntaxTemplate = null;
-let exporterModuleSyntaxTemplate = null;
-let typesFileSyntaxTemplate = null;
-let oneOfSyntaxTemplate = null;
-let enumSyntaxTemplate = null;
-let allOfSyntaxTemplate = null;
-const cachedReferencedTypes = new Map();
-let expectedOutputFiles = null;
-function setConfig(newConfig) {
-    config$2 = newConfig;
-}
-function getConfig() {
-    if (config$2 === null) {
-        throw new RuntimeError('Failed to load configuration!');
-    }
-    return config$2;
-}
-function setSpecFileData(newSpecFileData) {
-    specFileData = newSpecFileData;
-}
-function getSpecFileData() {
-    if (specFileData === null) {
-        throw new RuntimeError('Failed to load Spec file data!');
-    }
-    return specFileData;
-}
-function compileTemplates() {
-    const config = getConfig();
-    objectSyntaxTemplate = Handlebars.compile(config.template.objectSyntax);
-    exporterModuleSyntaxTemplate = Handlebars.compile(config.template.exporterModuleSyntax);
-    typesFileSyntaxTemplate = Handlebars.compile(config.template.typesFileSyntax);
-    enumSyntaxTemplate = Handlebars.compile(config.template.enumSyntax);
-    oneOfSyntaxTemplate = Handlebars.compile(config.template.oneOfSyntax);
-    allOfSyntaxTemplate = Handlebars.compile(config.template.allOfSyntax);
-}
-function getObjectTemplate() {
-    if (objectSyntaxTemplate === null) {
-        throw new RuntimeError('Object template not compiled!');
-    }
-    return objectSyntaxTemplate;
-}
-function getExporterModuleTemplate() {
-    if (exporterModuleSyntaxTemplate === null) {
-        throw new RuntimeError('Exporter module template not compiled!');
-    }
-    return exporterModuleSyntaxTemplate;
-}
-function getTypesFileTemplate() {
-    if (typesFileSyntaxTemplate === null) {
-        throw new RuntimeError('Types file template not compiled!');
-    }
-    return typesFileSyntaxTemplate;
-}
-function getEnumTemplate() {
-    if (enumSyntaxTemplate === null) {
-        throw new RuntimeError('Enum template not compiled!');
-    }
-    return enumSyntaxTemplate;
-}
-function getOneOfTemplate() {
-    if (oneOfSyntaxTemplate === null) {
-        throw new RuntimeError('OneOf template not compiled!');
-    }
-    return oneOfSyntaxTemplate;
-}
-function setExpectedOutputFiles(newExpectedOutputFiles) {
-    expectedOutputFiles = newExpectedOutputFiles;
-}
-function getExpectedOutputFiles() {
-    if (expectedOutputFiles === null) {
-        throw new RuntimeError('Expected output files not set!');
-    }
-    return expectedOutputFiles;
-}
-function getCachedReferencedTypes() {
-    return cachedReferencedTypes;
-}
-function getCachedReferenceType(referencePath) {
-    return cachedReferencedTypes.get(referencePath) ?? null;
-}
-function cacheReferenceType(referencePath, generatedData) {
-    cachedReferencedTypes.set(referencePath, generatedData);
-}
-function getInputFilePath(absolutePath = true) {
-    if (config$2 === null) {
-        throw new RuntimeError('Spec file path not set!');
-    }
-    return absolutePath ? resolveFilePath(config$2.input) : config$2.input;
-}
-function getAllOfTemplate() {
-    if (allOfSyntaxTemplate === null) {
-        throw new RuntimeError('AllOf template not compiled!');
-    }
-    return allOfSyntaxTemplate;
-}
-var Runtime = {
-    getConfig,
-    setConfig,
-    setSpecFileData,
-    setExpectedOutputFiles,
-    getSpecFileData,
-    getObjectTemplate,
-    getExporterModuleTemplate,
-    getTypesFileTemplate,
-    getEnumTemplate,
-    getExpectedOutputFiles,
-    compileTemplates,
-    getOneOfTemplate,
-    getCachedReferencedTypes,
-    getCachedReferenceType,
-    cacheReferenceType,
-    getInputFilePath,
-    getAllOfTemplate
-};
-
 const ALIAS = Symbol.for('yaml.alias');
 const DOC = Symbol.for('yaml.document');
 const MAP = Symbol.for('yaml.map');
@@ -19470,6 +19279,202 @@ async function readYaml(filePath) {
     return YAML.parse(fileData);
 }
 
+const isColorSupported = process.env.COLORTERM === 'truecolor';
+function redLog(r) {
+    if (!isColorSupported) {
+        return r;
+    }
+    return `\x1b[41m\x1b[37m${r}\x1b[0m`;
+}
+function greenLog(r) {
+    if (!isColorSupported) {
+        return r;
+    }
+    return `\x1b[48;2;79;153;7m\x1b[30m${r}\x1b[0m`;
+}
+function darkBlue(r) {
+    if (!isColorSupported) {
+        return r;
+    }
+    return `\x1b[48;2;6;40;61m\x1b[37m${r}\x1b[0m`;
+}
+function logError(header, message = null) {
+    console.log(redLog(` Crafting failed: ${header}`));
+    if (message !== null) {
+        console.log(`${message}`);
+    }
+}
+function logSuccess(header, message) {
+    console.log(greenLog(` ${header} `));
+    console.log(`${message}`);
+}
+function greeting() {
+    console.log('\n' + darkBlue('|' + Array(50).join('‾') + '|'));
+    console.log(darkBlue('|' + Array(20).join(' ') + 'Type Crafter' + Array(19).join(' ') + '|'));
+    console.log(darkBlue('|' + Array(50).join('_') + '|') + '\n');
+}
+
+class LanguageNotSupportedError extends Error {
+    constructor(language) {
+        super(`Language ${language} not supported`);
+        this.name = 'LanguageNotSupportedError';
+    }
+}
+class InvalidParamError extends Error {
+    constructor(key, value) {
+        super(`Invalid Param ${value} for ${key}`);
+        this.name = 'InvalidParamError';
+    }
+}
+class InvalidSpecFileError extends Error {
+    constructor(param) {
+        super(`Bad spec file \n${param ?? ''}`);
+        this.name = 'InvalidSpecFileError';
+    }
+}
+class RuntimeError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'RuntimeError';
+    }
+}
+class UnsupportedFeatureError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'UnsupportedFeatureError';
+    }
+}
+function handleErrors(error) {
+    if (error instanceof Error) {
+        if ('code' in error &&
+            'path' in error &&
+            typeof error.path === 'string' &&
+            error.code === 'ENOENT') {
+            logError('File not found', 'Failed to read file on path: ' + error.path);
+        }
+        else {
+            logError(error.name, error.message);
+        }
+    }
+}
+
+let config$2 = null;
+let specFileData = null;
+let objectSyntaxTemplate = null;
+let exporterModuleSyntaxTemplate = null;
+let typesFileSyntaxTemplate = null;
+let oneOfSyntaxTemplate = null;
+let enumSyntaxTemplate = null;
+let allOfSyntaxTemplate = null;
+const cachedReferencedTypes = new Map();
+let expectedOutputFiles = null;
+function setConfig(newConfig) {
+    config$2 = newConfig;
+}
+function getConfig() {
+    if (config$2 === null) {
+        throw new RuntimeError('Failed to load configuration!');
+    }
+    return config$2;
+}
+function setSpecFileData(newSpecFileData) {
+    specFileData = newSpecFileData;
+}
+function getSpecFileData() {
+    if (specFileData === null) {
+        throw new RuntimeError('Failed to load Spec file data!');
+    }
+    return specFileData;
+}
+function compileTemplates() {
+    const config = getConfig();
+    objectSyntaxTemplate = Handlebars.compile(config.template.objectSyntax);
+    exporterModuleSyntaxTemplate = Handlebars.compile(config.template.exporterModuleSyntax);
+    typesFileSyntaxTemplate = Handlebars.compile(config.template.typesFileSyntax);
+    enumSyntaxTemplate = Handlebars.compile(config.template.enumSyntax);
+    oneOfSyntaxTemplate = Handlebars.compile(config.template.oneOfSyntax);
+    allOfSyntaxTemplate = Handlebars.compile(config.template.allOfSyntax);
+}
+function getObjectTemplate() {
+    if (objectSyntaxTemplate === null) {
+        throw new RuntimeError('Object template not compiled!');
+    }
+    return objectSyntaxTemplate;
+}
+function getExporterModuleTemplate() {
+    if (exporterModuleSyntaxTemplate === null) {
+        throw new RuntimeError('Exporter module template not compiled!');
+    }
+    return exporterModuleSyntaxTemplate;
+}
+function getTypesFileTemplate() {
+    if (typesFileSyntaxTemplate === null) {
+        throw new RuntimeError('Types file template not compiled!');
+    }
+    return typesFileSyntaxTemplate;
+}
+function getEnumTemplate() {
+    if (enumSyntaxTemplate === null) {
+        throw new RuntimeError('Enum template not compiled!');
+    }
+    return enumSyntaxTemplate;
+}
+function getOneOfTemplate() {
+    if (oneOfSyntaxTemplate === null) {
+        throw new RuntimeError('OneOf template not compiled!');
+    }
+    return oneOfSyntaxTemplate;
+}
+function setExpectedOutputFiles(newExpectedOutputFiles) {
+    expectedOutputFiles = newExpectedOutputFiles;
+}
+function getExpectedOutputFiles() {
+    if (expectedOutputFiles === null) {
+        throw new RuntimeError('Expected output files not set!');
+    }
+    return expectedOutputFiles;
+}
+function getCachedReferencedTypes() {
+    return cachedReferencedTypes;
+}
+function getCachedReferenceType(referencePath) {
+    return cachedReferencedTypes.get(referencePath) ?? null;
+}
+function cacheReferenceType(referencePath, generatedData) {
+    cachedReferencedTypes.set(referencePath, generatedData);
+}
+function getInputFilePath(absolutePath = true) {
+    if (config$2 === null) {
+        throw new RuntimeError('Spec file path not set!');
+    }
+    return absolutePath ? resolveFilePath(config$2.input) : config$2.input;
+}
+function getAllOfTemplate() {
+    if (allOfSyntaxTemplate === null) {
+        throw new RuntimeError('AllOf template not compiled!');
+    }
+    return allOfSyntaxTemplate;
+}
+var Runtime = {
+    getConfig,
+    setConfig,
+    setSpecFileData,
+    setExpectedOutputFiles,
+    getSpecFileData,
+    getObjectTemplate,
+    getExporterModuleTemplate,
+    getTypesFileTemplate,
+    getEnumTemplate,
+    getExpectedOutputFiles,
+    compileTemplates,
+    getOneOfTemplate,
+    getCachedReferencedTypes,
+    getCachedReferenceType,
+    cacheReferenceType,
+    getInputFilePath,
+    getAllOfTemplate
+};
+
 function addValuesToMappedSet(map, key, values) {
     const existingValues = map.get(key);
     map.set(key, typeof existingValues === 'undefined'
@@ -19637,6 +19642,17 @@ function stripPrefix(value, prefix) {
     return value.startsWith(prefix) ? value.slice(prefix.length) : value;
 }
 // #endregion
+// #region type utils
+function isPrimitiveType(typeInfo) {
+    return (typeInfo.type !== null &&
+        typeInfo.type !== 'object' &&
+        typeInfo.type !== 'array' &&
+        typeInfo.$ref === null &&
+        typeInfo.oneOf === null &&
+        typeInfo.allOf === null &&
+        typeInfo.enum === null);
+}
+// #endregion
 
 function getReferenceMeta(reference) {
     const slashedParts = reference.split('/');
@@ -19812,7 +19828,8 @@ async function generateObjectType(typeName, typeInfo, parentTypes) {
         description: typeInfo.description,
         example: typeInfo.example,
         summary: typeInfo.summary,
-        properties: {}
+        properties: {},
+        customAttributes: typeInfo.customAttributes
     };
     const compositions = [];
     let dynamicGeneratedType = '';
@@ -19855,6 +19872,7 @@ async function generateObjectType(typeName, typeInfo, parentTypes) {
             references.push(...arrayDataGenOutput.references);
             languageDataType = arrayDataGenOutput.templateInput.type;
             composerType = arrayDataGenOutput.templateInput.composerType ?? null;
+            dynamicGeneratedType += arrayDataGenOutput.content;
         }
         else if (propertyType === 'object') {
             recursivePropertyName = typeName + toPascalCase(propertyName);
@@ -19937,7 +19955,23 @@ async function generateArrayType(typeName, typeInfo, parentTypes) {
     if (typeInfo.items === null) {
         throw new InvalidSpecFileError('Invalid array type for: ' + typeName);
     }
-    const arrayItemsType = await generateType(typeName + 'Item', typeInfo.items, parentTypes);
+    const isPrimitiveItemType = isPrimitiveType(typeInfo.items);
+    const isEnumItemType = typeInfo.items.enum !== null;
+    let arrayItemsType;
+    let itemTypeName = null;
+    let dynamicGeneratedType = '';
+    if (isPrimitiveItemType) {
+        arrayItemsType = getPrimitiveType(typeName + 'Item', typeInfo.items);
+    }
+    else if (isEnumItemType) {
+        itemTypeName = toPascalCase(typeName) + 'Item';
+        arrayItemsType = generateEnumType(itemTypeName, typeInfo.items);
+        dynamicGeneratedType += arrayItemsType.content;
+        arrayItemsType.templateInput.type = itemTypeName;
+    }
+    else {
+        arrayItemsType = await generateType(typeName + 'Item', typeInfo.items, parentTypes);
+    }
     if (typeof arrayItemsType.templateInput?.type === 'undefined') {
         throw new InvalidSpecFileError('Invalid array type for: ' + typeName);
     }
@@ -19948,7 +19982,7 @@ async function generateArrayType(typeName, typeInfo, parentTypes) {
     }
     const dataType = fillPatterns(arrayTypeMap, fillerPatterns);
     const result = {
-        content: '',
+        content: dynamicGeneratedType,
         references: arrayItemsType.references,
         primitives: new Set([...arrayItemsType.primitives, 'Array']),
         templateInput: {
@@ -19960,6 +19994,9 @@ async function generateArrayType(typeName, typeInfo, parentTypes) {
             summary: typeInfo.summary
         }
     };
+    if (isEnumItemType && itemTypeName) {
+        result.references.add(itemTypeName);
+    }
     return result;
 }
 function generateVariableType(typeName, typeInfo) {
@@ -20513,7 +20550,7 @@ async function runner(language, inputFilePath, outputDirectory, _typesWriterMode
     }
 }
 greeting();
-const program = new Command().version('0.9.7');
+const program = new Command().version('0.10.0');
 program
     .command('generate')
     .description('Generate types for your language from a type spec file')

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

@@ -72,6 +72,7 @@ export function decode{{typeName}}(rawInput: unknown): {{typeName}} | null {
   return null;
 }
 
+{{#if customAttributes.generateOptionalDecoder}}
 export function _decode{{typeName}}(rawInput: unknown): {{typeName}} | undefined {
   if (isJSON(rawInput)) {
     {{#each properties}}
@@ -108,3 +109,4 @@ export function _decode{{typeName}}(rawInput: unknown): {{typeName}} | undefined
   }
   return;
 }
+{{/if}}

package/dist/types/index.d.ts

@@ -83,6 +83,7 @@ export type TypeInfo = TypeDescriptors & {
     allOf: TypeInfo[] | null;
     enum: string[] | number[] | null;
     additionalProperties: AdditionalProperties | null;
+    customAttributes?: Record<string, unknown> | null;
 };
 export type AdditionalProperties = KeyedAdditionalProperties | TypeInfo | boolean;
 export type KeyedAdditionalProperties = {
@@ -103,6 +104,7 @@ export type ObjectTemplateInput = TypeDescriptors & {
     type: string;
     properties: ObjectTemplateInputProperties;
     additionalProperties?: AdditionalPropertiesTemplateInput;
+    customAttributes?: Record<string, unknown> | null;
 };
 export type ObjectTemplateInputProperties = Record<PropertyName, ObjectTemplateInputProperty>;
 export type ObjectTemplateInputProperty = TypeDescriptors & {

package/dist/utils/index.d.ts

@@ -1,3 +1,4 @@
+import { type TypeInfo, type TypeDataType } from '$types';
 import { type JSONObject } from 'type-decoder';
 export * from './file-system';
 export * from './logger';
@@ -15,3 +16,5 @@ export declare function registerTemplateHelpers(): void;
 export declare function readNestedValue(json: unknown, keyPath: string[]): JSONObject;
 export declare function generateRelativePath(fromPath: string, toPath: string): string;
 export declare function stripPrefix(value: string, prefix: string): string;
+export declare function isPrimitiveType(typeInfo: TypeInfo): boolean;
+export declare function isSimplePrimitiveType(type: TypeDataType | null): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "type-crafter",
-  "version": "0.9.7",
+  "version": "0.10.0",
   "description": "A tool to generate types from a yaml schema for any language",
   "main": "./dist/index.js",
   "type": "module",
@@ -19,6 +19,7 @@
     "lint:all": "eslint . --ext .ts",
     "clean:output": "rm -rf dist",
     "build": "npm run clean:output && rollup --config rollup.config.js",
+    "build:version": "npm run clean:output && rollup --config rollup.config.js --environment",
     "publish": "node scripts/publish.js",
     "changeset:version": "changeset version && git add --all"
   },