@twin.org/ts-to-schema 0.0.1-next.20 → 0.0.1-next.22

package/dist/cjs/index.cjs

@@ -76,11 +76,13 @@ async function tsToSchema(config, outputFolder, workingDirectory) {
     await promises.writeFile(path.join(workingDirectory, "tsconfig.json"), JSON.stringify({
         compilerOptions: {}
     }, undefined, "\t"));
-    cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.ts-to-schema.progress.generatingSchemas"));
-    const schemas = await generateSchemas(config.sources, config.types, workingDirectory);
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.ts-to-schema.progress.writingSchemas"));
-    for (const type of config.types) {
+    for (const typeSource of config.types) {
+        cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.ts-to-schema.progress.generatingSchema"));
+        const typeSourceParts = typeSource.split("/");
+        const type = core.StringHelper.pascalCase(typeSourceParts[typeSourceParts.length - 1].replace(/(\.d)?\.ts$/, ""), false);
+        const schemas = await generateSchemas(typeSource, type, workingDirectory);
         if (core.Is.empty(schemas[type])) {
             throw new core.GeneralError("commands", "commands.ts-to-schema.schemaNotFound", { type });
         }
@@ -107,48 +109,28 @@ async function tsToSchema(config, outputFolder, workingDirectory) {
  * @returns Nothing.
  * @internal
  */
-async function generateSchemas(modelDirWildcards, types, outputWorkingDir) {
+async function generateSchemas(typeSource, type, outputWorkingDir) {
     const allSchemas = {};
-    const arraySingularTypes = [];
-    for (const type of types) {
-        if (type.endsWith("[]")) {
-            const singularType = type.slice(0, -2);
-            arraySingularTypes.push(singularType);
-            if (!types.includes(singularType)) {
-                types.push(singularType);
-            }
-        }
-    }
-    for (const files of modelDirWildcards) {
-        cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.ts-to-schema.progress.models"), files.replace(/\\/g, "/"), 1);
-        const generator = tsJsonSchemaGenerator.createGenerator({
-            path: files.replace(/\\/g, "/"),
-            type: "*",
-            tsconfig: path.join(outputWorkingDir, "tsconfig.json"),
-            skipTypeCheck: true,
-            expose: "all"
-        });
-        const schema = generator.createSchema("*");
-        if (schema.definitions) {
-            for (const def in schema.definitions) {
-                // Remove the partial markers
-                let defSub = def.replace(/^Partial<(.*?)>/g, "$1");
-                // Cleanup the generic markers
-                defSub = defSub.replace(/</g, "%3C").replace(/>/g, "%3E");
-                allSchemas[defSub] = schema.definitions[def];
-            }
+    cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.ts-to-schema.progress.models"), typeSource, 1);
+    const generator = tsJsonSchemaGenerator.createGenerator({
+        path: typeSource,
+        type,
+        tsconfig: path.join(outputWorkingDir, "tsconfig.json"),
+        skipTypeCheck: true,
+        expose: "all"
+    });
+    const schema = generator.createSchema("*");
+    if (schema.definitions) {
+        for (const def in schema.definitions) {
+            // Remove the partial markers
+            let defSub = def.replace(/^Partial<(.*?)>/g, "$1");
+            // Cleanup the generic markers
+            defSub = defSub.replace(/</g, "%3C").replace(/>/g, "%3E");
+            allSchemas[defSub] = schema.definitions[def];
         }
     }
     const referencedSchemas = {};
-    extractTypes(allSchemas, types, referencedSchemas);
-    for (const arraySingularType of arraySingularTypes) {
-        referencedSchemas[`${arraySingularType}[]`] = {
-            type: "array",
-            items: {
-                $ref: `#/components/schemas/${arraySingularType}`
-            }
-        };
-    }
+    extractTypes(allSchemas, [type], referencedSchemas);
     return referencedSchemas;
 }
 /**
@@ -238,7 +220,7 @@ class CLI extends cliCore.CLIBase {
         return this.execute({
             title: "TWIN TypeScript To Schema",
             appName: "ts-to-schema",
-            version: "0.0.1-next.20", // x-release-please-version
+            version: "0.0.1-next.22", // x-release-please-version
             icon: "⚙️ ",
             supportsEnvFiles: false,
             overrideOutputWidth: options?.overrideOutputWidth

package/dist/esm/index.mjs

@@ -73,11 +73,13 @@ async function tsToSchema(config, outputFolder, workingDirectory) {
     await writeFile(path.join(workingDirectory, "tsconfig.json"), JSON.stringify({
         compilerOptions: {}
     }, undefined, "\t"));
-    CLIDisplay.task(I18n.formatMessage("commands.ts-to-schema.progress.generatingSchemas"));
-    const schemas = await generateSchemas(config.sources, config.types, workingDirectory);
     CLIDisplay.break();
     CLIDisplay.task(I18n.formatMessage("commands.ts-to-schema.progress.writingSchemas"));
-    for (const type of config.types) {
+    for (const typeSource of config.types) {
+        CLIDisplay.task(I18n.formatMessage("commands.ts-to-schema.progress.generatingSchema"));
+        const typeSourceParts = typeSource.split("/");
+        const type = StringHelper.pascalCase(typeSourceParts[typeSourceParts.length - 1].replace(/(\.d)?\.ts$/, ""), false);
+        const schemas = await generateSchemas(typeSource, type, workingDirectory);
         if (Is.empty(schemas[type])) {
             throw new GeneralError("commands", "commands.ts-to-schema.schemaNotFound", { type });
         }
@@ -104,48 +106,28 @@ async function tsToSchema(config, outputFolder, workingDirectory) {
  * @returns Nothing.
  * @internal
  */
-async function generateSchemas(modelDirWildcards, types, outputWorkingDir) {
+async function generateSchemas(typeSource, type, outputWorkingDir) {
     const allSchemas = {};
-    const arraySingularTypes = [];
-    for (const type of types) {
-        if (type.endsWith("[]")) {
-            const singularType = type.slice(0, -2);
-            arraySingularTypes.push(singularType);
-            if (!types.includes(singularType)) {
-                types.push(singularType);
-            }
-        }
-    }
-    for (const files of modelDirWildcards) {
-        CLIDisplay.value(I18n.formatMessage("commands.ts-to-schema.progress.models"), files.replace(/\\/g, "/"), 1);
-        const generator = createGenerator({
-            path: files.replace(/\\/g, "/"),
-            type: "*",
-            tsconfig: path.join(outputWorkingDir, "tsconfig.json"),
-            skipTypeCheck: true,
-            expose: "all"
-        });
-        const schema = generator.createSchema("*");
-        if (schema.definitions) {
-            for (const def in schema.definitions) {
-                // Remove the partial markers
-                let defSub = def.replace(/^Partial<(.*?)>/g, "$1");
-                // Cleanup the generic markers
-                defSub = defSub.replace(/</g, "%3C").replace(/>/g, "%3E");
-                allSchemas[defSub] = schema.definitions[def];
-            }
+    CLIDisplay.value(I18n.formatMessage("commands.ts-to-schema.progress.models"), typeSource, 1);
+    const generator = createGenerator({
+        path: typeSource,
+        type,
+        tsconfig: path.join(outputWorkingDir, "tsconfig.json"),
+        skipTypeCheck: true,
+        expose: "all"
+    });
+    const schema = generator.createSchema("*");
+    if (schema.definitions) {
+        for (const def in schema.definitions) {
+            // Remove the partial markers
+            let defSub = def.replace(/^Partial<(.*?)>/g, "$1");
+            // Cleanup the generic markers
+            defSub = defSub.replace(/</g, "%3C").replace(/>/g, "%3E");
+            allSchemas[defSub] = schema.definitions[def];
         }
     }
     const referencedSchemas = {};
-    extractTypes(allSchemas, types, referencedSchemas);
-    for (const arraySingularType of arraySingularTypes) {
-        referencedSchemas[`${arraySingularType}[]`] = {
-            type: "array",
-            items: {
-                $ref: `#/components/schemas/${arraySingularType}`
-            }
-        };
-    }
+    extractTypes(allSchemas, [type], referencedSchemas);
     return referencedSchemas;
 }
 /**
@@ -235,7 +217,7 @@ class CLI extends CLIBase {
         return this.execute({
             title: "TWIN TypeScript To Schema",
             appName: "ts-to-schema",
-            version: "0.0.1-next.20", // x-release-please-version
+            version: "0.0.1-next.22", // x-release-please-version
             icon: "⚙️ ",
             supportsEnvFiles: false,
             overrideOutputWidth: options?.overrideOutputWidth

package/dist/locales/en.json

@@ -249,8 +249,7 @@
 			"progress": {
 				"loadingConfigJson": "Loading Config JSON",
 				"creatingWorkingDir": "Creating Working Directory",
-				"generatingSchemas": "Generating Schemas",
-				"finalisingSchemas": "Finalising Schemas",
+				"generatingSchema": "Generating Schema",
 				"writingSchemas": "Writing Schemas",
 				"writingSchema": "Writing Schema",
 				"models": "Models"

package/dist/types/models/ITsToSchemaConfig.d.ts

@@ -7,11 +7,7 @@ export interface ITsToSchemaConfig {
      */
     baseUrl: string;
     /**
-     * The list of glob sources that can be used to generate the schemas.
-     */
-    sources: string[];
-    /**
-     * The list of types to generate.
+     * The source files to generate the types from.
      */
     types: string[];
     /**

package/docs/changelog.md

@@ -1,5 +1,46 @@
 # @twin.org/ts-to-schema - Changelog
 
+## [0.0.1-next.22](https://github.com/twinfoundation/tools/compare/ts-to-schema-v0.0.1-next.21...ts-to-schema-v0.0.1-next.22) (2025-06-03)
+
+
+### Features
+
+* generate schemas as individual entities ([9f372ab](https://github.com/twinfoundation/tools/commit/9f372abdfc27aba93b303c7b214991919c0c18c3))
+
+
+### Bug Fixes
+
+* remove debugging ([4def3d1](https://github.com/twinfoundation/tools/commit/4def3d1ef6a41a3b3358f864214e6a7ec3f9c638))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/nameof bumped from 0.0.1-next.21 to 0.0.1-next.22
+  * devDependencies
+    * @twin.org/merge-locales bumped from 0.0.1-next.21 to 0.0.1-next.22
+    * @twin.org/nameof-transformer bumped from 0.0.1-next.21 to 0.0.1-next.22
+    * @twin.org/nameof-vitest-plugin bumped from 0.0.1-next.21 to 0.0.1-next.22
+
+## [0.0.1-next.21](https://github.com/twinfoundation/tools/compare/ts-to-schema-v0.0.1-next.20...ts-to-schema-v0.0.1-next.21) (2025-04-17)
+
+
+### Features
+
+* use shared store mechanism ([#31](https://github.com/twinfoundation/tools/issues/31)) ([d9fe68b](https://github.com/twinfoundation/tools/commit/d9fe68b903d1268c7cb3c64772df5cb78fd63667))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/nameof bumped from 0.0.1-next.20 to 0.0.1-next.21
+  * devDependencies
+    * @twin.org/merge-locales bumped from 0.0.1-next.20 to 0.0.1-next.21
+    * @twin.org/nameof-transformer bumped from 0.0.1-next.20 to 0.0.1-next.21
+    * @twin.org/nameof-vitest-plugin bumped from 0.0.1-next.20 to 0.0.1-next.21
+
 ## [0.0.1-next.20](https://github.com/twinfoundation/tools/compare/ts-to-schema-v0.0.1-next.19...ts-to-schema-v0.0.1-next.20) (2025-03-28)
 
 

package/docs/reference/classes/CLI.md

@@ -8,13 +8,13 @@ The main entry point for the CLI.
 
 ## Constructors
 
-### new CLI()
+### Constructor
 
-> **new CLI**(): [`CLI`](CLI.md)
+> **new CLI**(): `CLI`
 
 #### Returns
 
-[`CLI`](CLI.md)
+`CLI`
 
 #### Inherited from
 
@@ -24,7 +24,7 @@ The main entry point for the CLI.
 
 ### run()
 
-> **run**(`argv`, `localesDirectory`?, `options`?): `Promise`\<`number`\>
+> **run**(`argv`, `localesDirectory?`, `options?`): `Promise`\<`number`\>
 
 Run the app.
 

package/docs/reference/interfaces/ITsToSchemaConfig.md

@@ -12,19 +12,11 @@ The base url for the type references e.g. https://schema.twindev.org/my-namespac
 
 ***
 
-### sources
-
-> **sources**: `string`[]
-
-The list of glob sources that can be used to generate the schemas.
-
-***
-
 ### types
 
 > **types**: `string`[]
 
-The list of types to generate.
+The source files to generate the types from.
 
 ***
 

package/locales/en.json

@@ -22,8 +22,7 @@
 			"progress": {
 				"loadingConfigJson": "Loading Config JSON",
 				"creatingWorkingDir": "Creating Working Directory",
-				"generatingSchemas": "Generating Schemas",
-				"finalisingSchemas": "Finalising Schemas",
+				"generatingSchema": "Generating Schema",
 				"writingSchemas": "Writing Schemas",
 				"writingSchema": "Writing Schema",
 				"models": "Models"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/ts-to-schema",
-	"version": "0.0.1-next.20",
+	"version": "0.0.1-next.22",
 	"description": "Tool to convert TypeScript definitions to JSON schemas",
 	"repository": {
 		"type": "git",
@@ -16,11 +16,11 @@
 	"dependencies": {
 		"@twin.org/cli-core": "next",
 		"@twin.org/core": "next",
-		"@twin.org/nameof": "0.0.1-next.20",
+		"@twin.org/nameof": "0.0.1-next.22",
 		"commander": "13.1.0",
 		"glob": "11.0.1",
 		"jsonschema": "1.5.0",
-		"ts-json-schema-generator": "2.4.0-next.1"
+		"ts-json-schema-generator": "2.4.0"
 	},
 	"main": "./dist/cjs/index.cjs",
 	"module": "./dist/esm/index.mjs",