npm - @twin.org/ts-to-schema - Versions diffs - 0.0.3-next.4 → 0.0.3-next.6 - Mend

@twin.org/ts-to-schema 0.0.3-next.4 → 0.0.3-next.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/es/cli.js +1 -1
package/dist/es/cli.js.map +1 -1
package/dist/es/commands/tsToSchema.js +16 -12
package/dist/es/commands/tsToSchema.js.map +1 -1
package/docs/changelog.md +28 -0
package/package.json +2 -2

package/dist/es/cli.js CHANGED Viewed

@@ -20,7 +20,7 @@ export class CLI extends CLIBase {
         return this.execute({
             title: "TWIN TypeScript To Schema",
             appName: "ts-to-schema",
-            version: "0.0.3-next.4", // x-release-please-version
+            version: "0.0.3-next.6", // x-release-please-version
             icon: "⚙️ ",
             supportsEnvFiles: false,
             overrideOutputWidth: options?.overrideOutputWidth

package/dist/es/cli.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,uCAAuC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE;;GAEG;AACH,MAAM,OAAO,GAAI,SAAQ,OAAO;IAC/B;;;;;;;OAOG;IACI,KAAK,CAAC,GAAG,CACf,IAAc,EACd,gBAAyB,EACzB,OAA0C;QAE1C,OAAO,IAAI,CAAC,OAAO,CAClB;YACC,KAAK,EAAE,2BAA2B;YAClC,OAAO,EAAE,cAAc;YACvB,OAAO,EAAE,cAAc,EAAE,2BAA2B;YACpD,IAAI,EAAE,KAAK;YACX,gBAAgB,EAAE,KAAK;YACvB,mBAAmB,EAAE,OAAO,EAAE,mBAAmB;SACjD,EACD,gBAAgB,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC,EACzF,IAAI,CACJ,CAAC;IACH,CAAC;IAED;;;OAGG;IACO,aAAa,CAAC,OAAgB;QACvC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;CACD","sourcesContent":["// Copyright 2024 IOTA Stiftung.\n// SPDX-License-Identifier: Apache-2.0.\nimport path from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\nimport { CLIBase } from \"@twin.org/cli-core\";\nimport type { Command } from \"commander\";\nimport { buildCommandTsToSchema } from \"./commands/tsToSchema.js\";\n\n/*\n The main entry point for the CLI.\n /\nexport class CLI extends CLIBase {\n\t/\n\t Run the app.\n\t * @param argv The process arguments.\n\t * @param localesDirectory The directory for the locales, default to relative to the script.\n\t * @param options Additional options.\n\t * @param options.overrideOutputWidth Override the output width.\n\t * @returns The exit code.\n\t /\n\tpublic async run(\n\t\targv: string[],\n\t\tlocalesDirectory?: string,\n\t\toptions?: { overrideOutputWidth?: number }\n\t): Promise<number> {\n\t\treturn this.execute(\n\t\t\t{\n\t\t\t\ttitle: \"TWIN TypeScript To Schema\",\n\t\t\t\tappName: \"ts-to-schema\",\n\t\t\t\tversion: \"0.0.3-next.4\", // x-release-please-version\n\t\t\t\ticon: \"⚙️ \",\n\t\t\t\tsupportsEnvFiles: false,\n\t\t\t\toverrideOutputWidth: options?.overrideOutputWidth\n\t\t\t},\n\t\t\tlocalesDirectory ?? path.join(path.dirname(fileURLToPath(import.meta.url)), \"../locales\"),\n\t\t\targv\n\t\t);\n\t}\n\n\t/\n\t Configure any options or actions at the root program level.\n\t * @param program The root program command.\n\t */\n\tprotected configureRoot(program: Command): void {\n\t\tbuildCommandTsToSchema(program);\n\t}\n}\n"]}
1	+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,uCAAuC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE;;GAEG;AACH,MAAM,OAAO,GAAI,SAAQ,OAAO;IAC/B;;;;;;;OAOG;IACI,KAAK,CAAC,GAAG,CACf,IAAc,EACd,gBAAyB,EACzB,OAA0C;QAE1C,OAAO,IAAI,CAAC,OAAO,CAClB;YACC,KAAK,EAAE,2BAA2B;YAClC,OAAO,EAAE,cAAc;YACvB,OAAO,EAAE,cAAc,EAAE,2BAA2B;YACpD,IAAI,EAAE,KAAK;YACX,gBAAgB,EAAE,KAAK;YACvB,mBAAmB,EAAE,OAAO,EAAE,mBAAmB;SACjD,EACD,gBAAgB,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC,EACzF,IAAI,CACJ,CAAC;IACH,CAAC;IAED;;;OAGG;IACO,aAAa,CAAC,OAAgB;QACvC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;CACD","sourcesContent":["// Copyright 2024 IOTA Stiftung.\n// SPDX-License-Identifier: Apache-2.0.\nimport path from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\nimport { CLIBase } from \"@twin.org/cli-core\";\nimport type { Command } from \"commander\";\nimport { buildCommandTsToSchema } from \"./commands/tsToSchema.js\";\n\n/*\n The main entry point for the CLI.\n /\nexport class CLI extends CLIBase {\n\t/\n\t Run the app.\n\t * @param argv The process arguments.\n\t * @param localesDirectory The directory for the locales, default to relative to the script.\n\t * @param options Additional options.\n\t * @param options.overrideOutputWidth Override the output width.\n\t * @returns The exit code.\n\t /\n\tpublic async run(\n\t\targv: string[],\n\t\tlocalesDirectory?: string,\n\t\toptions?: { overrideOutputWidth?: number }\n\t): Promise<number> {\n\t\treturn this.execute(\n\t\t\t{\n\t\t\t\ttitle: \"TWIN TypeScript To Schema\",\n\t\t\t\tappName: \"ts-to-schema\",\n\t\t\t\tversion: \"0.0.3-next.6\", // x-release-please-version\n\t\t\t\ticon: \"⚙️ \",\n\t\t\t\tsupportsEnvFiles: false,\n\t\t\t\toverrideOutputWidth: options?.overrideOutputWidth\n\t\t\t},\n\t\t\tlocalesDirectory ?? path.join(path.dirname(fileURLToPath(import.meta.url)), \"../locales\"),\n\t\t\targv\n\t\t);\n\t}\n\n\t/\n\t Configure any options or actions at the root program level.\n\t * @param program The root program command.\n\t */\n\tprotected configureRoot(program: Command): void {\n\t\tbuildCommandTsToSchema(program);\n\t}\n}\n"]}

package/dist/es/commands/tsToSchema.js CHANGED Viewed

@@ -78,6 +78,14 @@ export async function tsToSchema(config, outputFolder, workingDirectory) {
     }, undefined, "\t"));
     CLIDisplay.break();
     CLIDisplay.task(I18n.formatMessage("commands.ts-to-schema.progress.writingSchemas"));
+    const autoExpandTypes = config.autoExpandTypes ?? [];
+    const defaultExpandTypes = ["/ObjectOrArray<.*>/"];
+    for (const defaultType of defaultExpandTypes) {
+        if (!autoExpandTypes.includes(defaultType)) {
+            autoExpandTypes.push(defaultType);
+        }
+    }
+    let combinedSchemas = {};
     for (const typeSource of config.types) {
         const typeSourceParts = typeSource.split("/");
         const type = StringHelper.pascalCase(typeSourceParts[typeSourceParts.length - 1].replace(/(\.d)?\.ts$/, ""), false);
@@ -88,18 +96,15 @@ export async function tsToSchema(config, outputFolder, workingDirectory) {
         }
         else {
             CLIDisplay.task(I18n.formatMessage("commands.ts-to-schema.progress.generatingSchema"));
-            const autoExpandTypes = config.autoExpandTypes ?? [];
-            const defaultExpandTypes = ["/ObjectOrArray<.*>/"];
-            for (const defaultType of defaultExpandTypes) {
-                if (!autoExpandTypes.includes(defaultType)) {
-                    autoExpandTypes.push(defaultType);
+            CLIDisplay.value(I18n.formatMessage("commands.ts-to-schema.progress.models"), typeSource, 1);
+            if (!combinedSchemas[type]) {
+                const schemas = await generateSchemas(typeSource, type, autoExpandTypes, workingDirectory);
+                if (Is.empty(schemas[type])) {
+                    throw new GeneralError("commands", "commands.ts-to-schema.schemaNotFound", { type });
                 }
+                combinedSchemas = { ...combinedSchemas, ...schemas };
             }
-            const schemas = await generateSchemas(typeSource, type, autoExpandTypes, workingDirectory);
-            if (Is.empty(schemas[type])) {
-                throw new GeneralError("commands", "commands.ts-to-schema.schemaNotFound", { type });
-            }
-            schemaObject = schemas[type];
+            schemaObject = combinedSchemas[type];
         }
         schemaObject = finaliseSchema(schemaObject, config.baseUrl, type);
         let content = JSON.stringify(schemaObject, undefined, "\t");
@@ -128,7 +133,6 @@ export async function tsToSchema(config, outputFolder, workingDirectory) {
  */
 async function generateSchemas(typeSource, type, autoExpandTypes, outputWorkingDir) {
     const allSchemas = {};
-    CLIDisplay.value(I18n.formatMessage("commands.ts-to-schema.progress.models"), typeSource, 1);
     const generator = createGenerator({
         path: typeSource,
         type,
@@ -136,7 +140,7 @@ async function generateSchemas(typeSource, type, autoExpandTypes, outputWorkingD
         skipTypeCheck: true,
         expose: "all"
     });
-    const schema = generator.createSchema("*");
+    const schema = generator.createSchema(type);
     if (schema.definitions) {
         for (const def in schema.definitions) {
             const defSub = JsonSchemaHelper.normaliseTypeName(def);

package/dist/es/commands/tsToSchema.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tsToSchema.js","sourceRoot":"","sources":["../../../src/commands/tsToSchema.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2024 IOTA Stiftung.\n// SPDX-License-Identifier: Apache-2.0.\nimport { mkdir, rm, writeFile } from \"node:fs/promises\";\nimport path from \"node:path\";\nimport { CLIDisplay, CLIUtils } from \"@twin.org/cli-core\";\nimport { GeneralError, I18n, Is, StringHelper } from \"@twin.org/core\";\nimport { type IJsonSchema, JsonSchemaHelper } from \"@twin.org/tools-core\";\nimport type { Command } from \"commander\";\nimport { createGenerator } from \"ts-json-schema-generator\";\nimport type { ITsToSchemaConfig } from \"../models/ITsToSchemaConfig.js\";\n\n/*\n Build the root command to be consumed by the CLI.\n * @param program The command to build on.\n /\nexport function buildCommandTsToSchema(program: Command): void {\n\tprogram\n\t\t.argument(\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.options.config.param\"),\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.options.config.description\")\n\t\t)\n\t\t.argument(\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.options.output-folder.param\"),\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.options.output-folder.description\")\n\t\t)\n\t\t.action(async (config, outputFolder, opts) => {\n\t\t\tawait actionCommandTsToSchema(config, outputFolder, opts);\n\t\t});\n}\n\n/\n Action the root command.\n * @param configFile The optional configuration file.\n * @param outputFolder The output folder for the schemas.\n * @param opts The options for the command.\n /\nexport async function actionCommandTsToSchema(\n\tconfigFile: string,\n\toutputFolder: string,\n\topts: unknown\n): Promise<void> {\n\tlet outputWorkingDir: string \| undefined;\n\ttry {\n\t\tlet config: ITsToSchemaConfig \| undefined;\n\n\t\tconst fullConfigFile = path.resolve(configFile);\n\t\tconst fullOutputFolder = path.resolve(outputFolder);\n\t\toutputWorkingDir = path.join(fullOutputFolder, \"working\");\n\n\t\tCLIDisplay.value(I18n.formatMessage(\"commands.ts-to-schema.labels.configJson\"), fullConfigFile);\n\t\tCLIDisplay.value(\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.labels.outputFolder\"),\n\t\t\tfullOutputFolder\n\t\t);\n\t\tCLIDisplay.value(\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.labels.outputWorkingDir\"),\n\t\t\toutputWorkingDir\n\t\t);\n\t\tCLIDisplay.break();\n\n\t\ttry {\n\t\t\tCLIDisplay.task(I18n.formatMessage(\"commands.ts-to-schema.progress.loadingConfigJson\"));\n\t\t\tCLIDisplay.break();\n\n\t\t\tconfig = await CLIUtils.readJsonFile<ITsToSchemaConfig>(fullConfigFile);\n\t\t} catch (err) {\n\t\t\tthrow new GeneralError(\"commands\", \"commands.ts-to-schema.configFailed\", undefined, err);\n\t\t}\n\n\t\tif (Is.empty(config)) {\n\t\t\tthrow new GeneralError(\"commands\", \"commands.ts-to-schema.configFailed\");\n\t\t}\n\n\t\tCLIDisplay.task(I18n.formatMessage(\"commands.ts-to-schema.progress.creatingWorkingDir\"));\n\t\tawait mkdir(outputWorkingDir, { recursive: true });\n\t\tCLIDisplay.break();\n\n\t\tawait tsToSchema(config ?? {}, fullOutputFolder, outputWorkingDir);\n\n\t\tCLIDisplay.break();\n\t\tCLIDisplay.done();\n\t} finally {\n\t\ttry {\n\t\t\tif (outputWorkingDir) {\n\t\t\t\tawait rm(outputWorkingDir, { recursive: true });\n\t\t\t}\n\t\t} catch {}\n\t}\n}\n\n/\n Convert the TypeScript definitions to JSON Schemas.\n * @param config The configuration for the app.\n * @param outputFolder The location of the folder to output the JSON schemas.\n * @param workingDirectory The folder the app was run from.\n /\nexport async function tsToSchema(\n\tconfig: ITsToSchemaConfig,\n\toutputFolder: string,\n\tworkingDirectory: string\n): Promise<void> {\n\tawait writeFile(\n\t\tpath.join(workingDirectory, \"tsconfig.json\"),\n\t\tJSON.stringify(\n\t\t\t{\n\t\t\t\tcompilerOptions: {\n\t\t\t\t\tmodule: \"nodenext\",\n\t\t\t\t\tmoduleResolution: \"nodenext\",\n\t\t\t\t\ttarget: \"ES2022\"\n\t\t\t\t}\n\t\t\t},\n\t\t\tundefined,\n\t\t\t\"\\t\"\n\t\t)\n\t);\n\n\tCLIDisplay.break();\n\tCLIDisplay.task(I18n.formatMessage(\"commands.ts-to-schema.progress.writingSchemas\"));\n\tfor (const typeSource of config.types) {\n\t\tconst typeSourceParts = typeSource.split(\"/\");\n\t\tconst type = StringHelper.pascalCase(\n\t\t\ttypeSourceParts[typeSourceParts.length - 1].replace(/(\\.d)?\\.ts$/, \"\"),\n\t\t\tfalse\n\t\t);\n\n\t\tlet schemaObject;\n\t\tif (Is.object<IJsonSchema>(config.overrides?.[type])) {\n\t\t\tCLIDisplay.task(I18n.formatMessage(\"commands.ts-to-schema.progress.overridingSchema\"));\n\t\t\tschemaObject = config.overrides?.[type];\n\t\t} else {\n\t\t\tCLIDisplay.task(I18n.formatMessage(\"commands.ts-to-schema.progress.generatingSchema\"));\n\n\t\t\tconst autoExpandTypes = config.autoExpandTypes ?? [];\n\t\t\tconst defaultExpandTypes = [\"/ObjectOrArray<.>/\"];\n\t\t\tfor (const defaultType of defaultExpandTypes) {\n\t\t\t\tif (!autoExpandTypes.includes(defaultType)) {\n\t\t\t\t\tautoExpandTypes.push(defaultType);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tconst schemas = await generateSchemas(typeSource, type, autoExpandTypes, workingDirectory);\n\t\t\tif (Is.empty(schemas[type])) {\n\t\t\t\tthrow new GeneralError(\"commands\", \"commands.ts-to-schema.schemaNotFound\", { type });\n\t\t\t}\n\t\t\tschemaObject = schemas[type];\n\t\t}\n\n\t\tschemaObject = finaliseSchema(schemaObject, config.baseUrl, type);\n\n\t\tlet content = JSON.stringify(schemaObject, undefined, \"\\t\");\n\n\t\tif (Is.objectValue(config.externalReferences)) {\n\t\t\tfor (const external in config.externalReferences) {\n\t\t\t\tcontent = content.replace(\n\t\t\t\t\tnew RegExp(`#/definitions/${external}`, \"g\"),\n\t\t\t\t\tconfig.externalReferences[external]\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\n\t\t// First replace all types that start with II to a single I with the new base url\n\t\tcontent = content.replace(/#\\/definitions\\/II(.)/g, `${config.baseUrl}I$1`);\n\n\t\t// Then other types starting with capitals (optionally interfaces starting with I)\n\t\tcontent = content.replace(/#\\/definitions\\/I?([A-Z].)/g, `${config.baseUrl}$1`);\n\n\t\tconst filename = path.join(outputFolder, `${StringHelper.stripPrefix(type)}.json`);\n\t\tCLIDisplay.value(\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.progress.writingSchema\"),\n\t\t\tfilename,\n\t\t\t1\n\t\t);\n\t\tawait writeFile(filename, `${content}\\n`);\n\t}\n}\n\n/*\n Generate schemas for the models.\n * @param modelDirWildcards The filenames for all the models.\n * @param types The types of the schema objects.\n * @param autoExpandTypes The types to automatically expand.\n * @param outputWorkingDir The working directory.\n * @returns Nothing.\n * @internal\n /\nasync function generateSchemas(\n\ttypeSource: string,\n\ttype: string,\n\tautoExpandTypes: string[],\n\toutputWorkingDir: string\n): Promise<{\n\t[id: string]: IJsonSchema;\n}> {\n\tconst allSchemas: { [id: string]: IJsonSchema } = {};\n\n\tCLIDisplay.value(I18n.formatMessage(\"commands.ts-to-schema.progress.models\"), typeSource, 1);\n\tconst generator = createGenerator({\n\t\tpath: typeSource,\n\t\ttype,\n\t\ttsconfig: path.join(outputWorkingDir, \"tsconfig.json\"),\n\t\tskipTypeCheck: true,\n\t\texpose: \"all\"\n\t});\n\n\tconst schema = generator.createSchema(\"\");\n\n\tif (schema.definitions) {\n\t\tfor (const def in schema.definitions) {\n\t\t\tconst defSub = JsonSchemaHelper.normaliseTypeName(def);\n\n\t\t\tallSchemas[defSub] ??= schema.definitions[def] as IJsonSchema;\n\t\t}\n\t}\n\n\tconst referencedSchemas: { [id: string]: IJsonSchema } = {};\n\n\tJsonSchemaHelper.extractTypes(allSchemas, [type, ...autoExpandTypes], referencedSchemas);\n\tJsonSchemaHelper.expandTypes(referencedSchemas, autoExpandTypes);\n\n\treturn referencedSchemas;\n}\n\n/*\n Process the schema object to ensure it has the correct properties.\n * @param schemaObject The schema object to process.\n * @param baseUrl The base URL for the schema references.\n * @param type The type of the schema object.\n * @returns The finalised schema object.\n */\nfunction finaliseSchema(schemaObject: IJsonSchema, baseUrl: string, type: string): IJsonSchema {\n\tJsonSchemaHelper.processArrays(schemaObject);\n\tconst { description, ...rest } = schemaObject;\n\treturn {\n\t\t$schema: JsonSchemaHelper.SCHEMA_VERSION,\n\t\t$id: `${baseUrl}${StringHelper.stripPrefix(type)}`,\n\t\tdescription,\n\t\t...rest\n\t};\n}\n"]}
1	+ {"version":3,"file":"tsToSchema.js","sourceRoot":"","sources":["../../../src/commands/tsToSchema.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2024 IOTA Stiftung.\n// SPDX-License-Identifier: Apache-2.0.\nimport { mkdir, rm, writeFile } from \"node:fs/promises\";\nimport path from \"node:path\";\nimport { CLIDisplay, CLIUtils } from \"@twin.org/cli-core\";\nimport { GeneralError, I18n, Is, StringHelper } from \"@twin.org/core\";\nimport { type IJsonSchema, JsonSchemaHelper } from \"@twin.org/tools-core\";\nimport type { Command } from \"commander\";\nimport { createGenerator } from \"ts-json-schema-generator\";\nimport type { ITsToSchemaConfig } from \"../models/ITsToSchemaConfig.js\";\n\n/*\n Build the root command to be consumed by the CLI.\n * @param program The command to build on.\n /\nexport function buildCommandTsToSchema(program: Command): void {\n\tprogram\n\t\t.argument(\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.options.config.param\"),\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.options.config.description\")\n\t\t)\n\t\t.argument(\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.options.output-folder.param\"),\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.options.output-folder.description\")\n\t\t)\n\t\t.action(async (config, outputFolder, opts) => {\n\t\t\tawait actionCommandTsToSchema(config, outputFolder, opts);\n\t\t});\n}\n\n/\n Action the root command.\n * @param configFile The optional configuration file.\n * @param outputFolder The output folder for the schemas.\n * @param opts The options for the command.\n /\nexport async function actionCommandTsToSchema(\n\tconfigFile: string,\n\toutputFolder: string,\n\topts: unknown\n): Promise<void> {\n\tlet outputWorkingDir: string \| undefined;\n\ttry {\n\t\tlet config: ITsToSchemaConfig \| undefined;\n\n\t\tconst fullConfigFile = path.resolve(configFile);\n\t\tconst fullOutputFolder = path.resolve(outputFolder);\n\t\toutputWorkingDir = path.join(fullOutputFolder, \"working\");\n\n\t\tCLIDisplay.value(I18n.formatMessage(\"commands.ts-to-schema.labels.configJson\"), fullConfigFile);\n\t\tCLIDisplay.value(\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.labels.outputFolder\"),\n\t\t\tfullOutputFolder\n\t\t);\n\t\tCLIDisplay.value(\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.labels.outputWorkingDir\"),\n\t\t\toutputWorkingDir\n\t\t);\n\t\tCLIDisplay.break();\n\n\t\ttry {\n\t\t\tCLIDisplay.task(I18n.formatMessage(\"commands.ts-to-schema.progress.loadingConfigJson\"));\n\t\t\tCLIDisplay.break();\n\n\t\t\tconfig = await CLIUtils.readJsonFile<ITsToSchemaConfig>(fullConfigFile);\n\t\t} catch (err) {\n\t\t\tthrow new GeneralError(\"commands\", \"commands.ts-to-schema.configFailed\", undefined, err);\n\t\t}\n\n\t\tif (Is.empty(config)) {\n\t\t\tthrow new GeneralError(\"commands\", \"commands.ts-to-schema.configFailed\");\n\t\t}\n\n\t\tCLIDisplay.task(I18n.formatMessage(\"commands.ts-to-schema.progress.creatingWorkingDir\"));\n\t\tawait mkdir(outputWorkingDir, { recursive: true });\n\t\tCLIDisplay.break();\n\n\t\tawait tsToSchema(config ?? {}, fullOutputFolder, outputWorkingDir);\n\n\t\tCLIDisplay.break();\n\t\tCLIDisplay.done();\n\t} finally {\n\t\ttry {\n\t\t\tif (outputWorkingDir) {\n\t\t\t\tawait rm(outputWorkingDir, { recursive: true });\n\t\t\t}\n\t\t} catch {}\n\t}\n}\n\n/\n Convert the TypeScript definitions to JSON Schemas.\n * @param config The configuration for the app.\n * @param outputFolder The location of the folder to output the JSON schemas.\n * @param workingDirectory The folder the app was run from.\n /\nexport async function tsToSchema(\n\tconfig: ITsToSchemaConfig,\n\toutputFolder: string,\n\tworkingDirectory: string\n): Promise<void> {\n\tawait writeFile(\n\t\tpath.join(workingDirectory, \"tsconfig.json\"),\n\t\tJSON.stringify(\n\t\t\t{\n\t\t\t\tcompilerOptions: {\n\t\t\t\t\tmodule: \"nodenext\",\n\t\t\t\t\tmoduleResolution: \"nodenext\",\n\t\t\t\t\ttarget: \"ES2022\"\n\t\t\t\t}\n\t\t\t},\n\t\t\tundefined,\n\t\t\t\"\\t\"\n\t\t)\n\t);\n\n\tCLIDisplay.break();\n\tCLIDisplay.task(I18n.formatMessage(\"commands.ts-to-schema.progress.writingSchemas\"));\n\n\tconst autoExpandTypes = config.autoExpandTypes ?? [];\n\tconst defaultExpandTypes = [\"/ObjectOrArray<.>/\"];\n\tfor (const defaultType of defaultExpandTypes) {\n\t\tif (!autoExpandTypes.includes(defaultType)) {\n\t\t\tautoExpandTypes.push(defaultType);\n\t\t}\n\t}\n\n\tlet combinedSchemas: { [id: string]: IJsonSchema } = {};\n\tfor (const typeSource of config.types) {\n\t\tconst typeSourceParts = typeSource.split(\"/\");\n\t\tconst type = StringHelper.pascalCase(\n\t\t\ttypeSourceParts[typeSourceParts.length - 1].replace(/(\\.d)?\\.ts$/, \"\"),\n\t\t\tfalse\n\t\t);\n\n\t\tlet schemaObject;\n\t\tif (Is.object<IJsonSchema>(config.overrides?.[type])) {\n\t\t\tCLIDisplay.task(I18n.formatMessage(\"commands.ts-to-schema.progress.overridingSchema\"));\n\t\t\tschemaObject = config.overrides?.[type];\n\t\t} else {\n\t\t\tCLIDisplay.task(I18n.formatMessage(\"commands.ts-to-schema.progress.generatingSchema\"));\n\t\t\tCLIDisplay.value(I18n.formatMessage(\"commands.ts-to-schema.progress.models\"), typeSource, 1);\n\n\t\t\tif (!combinedSchemas[type]) {\n\t\t\t\tconst schemas = await generateSchemas(typeSource, type, autoExpandTypes, workingDirectory);\n\t\t\t\tif (Is.empty(schemas[type])) {\n\t\t\t\t\tthrow new GeneralError(\"commands\", \"commands.ts-to-schema.schemaNotFound\", { type });\n\t\t\t\t}\n\t\t\t\tcombinedSchemas = { ...combinedSchemas, ...schemas };\n\t\t\t}\n\t\t\tschemaObject = combinedSchemas[type];\n\t\t}\n\n\t\tschemaObject = finaliseSchema(schemaObject, config.baseUrl, type);\n\n\t\tlet content = JSON.stringify(schemaObject, undefined, \"\\t\");\n\n\t\tif (Is.objectValue(config.externalReferences)) {\n\t\t\tfor (const external in config.externalReferences) {\n\t\t\t\tcontent = content.replace(\n\t\t\t\t\tnew RegExp(`#/definitions/${external}`, \"g\"),\n\t\t\t\t\tconfig.externalReferences[external]\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\n\t\t// First replace all types that start with II to a single I with the new base url\n\t\tcontent = content.replace(/#\\/definitions\\/II(.)/g, `${config.baseUrl}I$1`);\n\n\t\t// Then other types starting with capitals (optionally interfaces starting with I)\n\t\tcontent = content.replace(/#\\/definitions\\/I?([A-Z].)/g, `${config.baseUrl}$1`);\n\n\t\tconst filename = path.join(outputFolder, `${StringHelper.stripPrefix(type)}.json`);\n\t\tCLIDisplay.value(\n\t\t\tI18n.formatMessage(\"commands.ts-to-schema.progress.writingSchema\"),\n\t\t\tfilename,\n\t\t\t1\n\t\t);\n\t\tawait writeFile(filename, `${content}\\n`);\n\t}\n}\n\n/*\n Generate schemas for the models.\n * @param modelDirWildcards The filenames for all the models.\n * @param types The types of the schema objects.\n * @param autoExpandTypes The types to automatically expand.\n * @param outputWorkingDir The working directory.\n * @returns Nothing.\n * @internal\n /\nasync function generateSchemas(\n\ttypeSource: string,\n\ttype: string,\n\tautoExpandTypes: string[],\n\toutputWorkingDir: string\n): Promise<{\n\t[id: string]: IJsonSchema;\n}> {\n\tconst allSchemas: { [id: string]: IJsonSchema } = {};\n\n\tconst generator = createGenerator({\n\t\tpath: typeSource,\n\t\ttype,\n\t\ttsconfig: path.join(outputWorkingDir, \"tsconfig.json\"),\n\t\tskipTypeCheck: true,\n\t\texpose: \"all\"\n\t});\n\n\tconst schema = generator.createSchema(type);\n\n\tif (schema.definitions) {\n\t\tfor (const def in schema.definitions) {\n\t\t\tconst defSub = JsonSchemaHelper.normaliseTypeName(def);\n\n\t\t\tallSchemas[defSub] ??= schema.definitions[def] as IJsonSchema;\n\t\t}\n\t}\n\n\tconst referencedSchemas: { [id: string]: IJsonSchema } = {};\n\n\tJsonSchemaHelper.extractTypes(allSchemas, [type, ...autoExpandTypes], referencedSchemas);\n\tJsonSchemaHelper.expandTypes(referencedSchemas, autoExpandTypes);\n\n\treturn referencedSchemas;\n}\n\n/\n Process the schema object to ensure it has the correct properties.\n * @param schemaObject The schema object to process.\n * @param baseUrl The base URL for the schema references.\n * @param type The type of the schema object.\n * @returns The finalised schema object.\n */\nfunction finaliseSchema(schemaObject: IJsonSchema, baseUrl: string, type: string): IJsonSchema {\n\tJsonSchemaHelper.processArrays(schemaObject);\n\tconst { description, ...rest } = schemaObject;\n\treturn {\n\t\t$schema: JsonSchemaHelper.SCHEMA_VERSION,\n\t\t$id: `${baseUrl}${StringHelper.stripPrefix(type)}`,\n\t\tdescription,\n\t\t...rest\n\t};\n}\n"]}

package/docs/changelog.md CHANGED Viewed

@@ -1,5 +1,33 @@
 # @twin.org/ts-to-schema - Changelog
+## [0.0.3-next.6](https://github.com/twinfoundation/tools/compare/ts-to-schema-v0.0.3-next.5...ts-to-schema-v0.0.3-next.6) (2026-01-28)
+### Miscellaneous Chores
+* **ts-to-schema:** Synchronize repo versions
+### Dependencies
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/tools-core bumped from 0.0.3-next.5 to 0.0.3-next.6
+## [0.0.3-next.5](https://github.com/twinfoundation/tools/compare/ts-to-schema-v0.0.3-next.4...ts-to-schema-v0.0.3-next.5) (2026-01-06)
+### Bug Fixes
+* speed up schema generation ([#64](https://github.com/twinfoundation/tools/issues/64)) ([2dc1829](https://github.com/twinfoundation/tools/commit/2dc1829965cb5917d6672bc633e47788a361b071))
+### Dependencies
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/tools-core bumped from 0.0.3-next.4 to 0.0.3-next.5
 ## [0.0.3-next.4](https://github.com/twinfoundation/tools/compare/ts-to-schema-v0.0.3-next.3...ts-to-schema-v0.0.3-next.4) (2026-01-05)

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/ts-to-schema",
-	"version": "0.0.3-next.4",
+	"version": "0.0.3-next.6",
 	"description": "Tool to convert TypeScript definitions to JSON schemas",
 	"repository": {
 		"type": "git",
@@ -17,7 +17,7 @@
 		"@twin.org/cli-core": "next",
 		"@twin.org/core": "next",
 		"@twin.org/nameof": "next",
-		"@twin.org/tools-core": "0.0.3-next.4",
+		"@twin.org/tools-core": "0.0.3-next.6",
 		"commander": "14.0.2",
 		"glob": "11.0.3",
 		"ts-json-schema-generator": "2.4.0"