@twin.org/ts-to-schema 0.0.1-next.27 → 0.0.1-next.29

package/dist/cjs/index.cjs

@@ -132,10 +132,7 @@ async function generateSchemas(typeSource, type, outputWorkingDir) {
     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");
+            const defSub = normaliseTypeName(def);
             allSchemas[defSub] = schema.definitions[def];
         }
     }
@@ -281,6 +278,26 @@ function processSchemaArray(schemaArray) {
         }
     }
 }
+/**
+ * Cleanup TypeScript markers from the type name.
+ * @param typeName The definition string to clean up.
+ * @returns The cleaned up definition string.
+ */
+function normaliseTypeName(typeName) {
+    // Remove the partial markers
+    let sTypeName = typeName.replace(/^Partial<(.*?)>/g, "$1");
+    sTypeName = sTypeName.replace(/Partial%3CI(.*?)%3E/g, "$1");
+    // Remove the omit markers
+    sTypeName = sTypeName.replace(/^Omit<(.*?),.*>/g, "$1");
+    sTypeName = sTypeName.replace(/Omit%3CI(.*?)%2C.*%3E/g, "$1");
+    // Remove the pick markers
+    sTypeName = sTypeName.replace(/^Pick<(.*?),.*>/g, "$1");
+    sTypeName = sTypeName.replace(/Pick%3CI(.*?)%2C.*%3E/g, "$1");
+    // Cleanup the generic markers
+    sTypeName = sTypeName.replace(/</g, "%3C").replace(/>/g, "%3E");
+    sTypeName = sTypeName.replace(/%3Cunknown%3E/g, "");
+    return sTypeName;
+}
 
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
@@ -300,7 +317,7 @@ class CLI extends cliCore.CLIBase {
         return this.execute({
             title: "TWIN TypeScript To Schema",
             appName: "ts-to-schema",
-            version: "0.0.1-next.27", // x-release-please-version
+            version: "0.0.1-next.29", // x-release-please-version
             icon: "⚙️ ",
             supportsEnvFiles: false,
             overrideOutputWidth: options?.overrideOutputWidth

package/dist/esm/index.mjs

@@ -129,10 +129,7 @@ async function generateSchemas(typeSource, type, outputWorkingDir) {
     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");
+            const defSub = normaliseTypeName(def);
             allSchemas[defSub] = schema.definitions[def];
         }
     }
@@ -278,6 +275,26 @@ function processSchemaArray(schemaArray) {
         }
     }
 }
+/**
+ * Cleanup TypeScript markers from the type name.
+ * @param typeName The definition string to clean up.
+ * @returns The cleaned up definition string.
+ */
+function normaliseTypeName(typeName) {
+    // Remove the partial markers
+    let sTypeName = typeName.replace(/^Partial<(.*?)>/g, "$1");
+    sTypeName = sTypeName.replace(/Partial%3CI(.*?)%3E/g, "$1");
+    // Remove the omit markers
+    sTypeName = sTypeName.replace(/^Omit<(.*?),.*>/g, "$1");
+    sTypeName = sTypeName.replace(/Omit%3CI(.*?)%2C.*%3E/g, "$1");
+    // Remove the pick markers
+    sTypeName = sTypeName.replace(/^Pick<(.*?),.*>/g, "$1");
+    sTypeName = sTypeName.replace(/Pick%3CI(.*?)%2C.*%3E/g, "$1");
+    // Cleanup the generic markers
+    sTypeName = sTypeName.replace(/</g, "%3C").replace(/>/g, "%3E");
+    sTypeName = sTypeName.replace(/%3Cunknown%3E/g, "");
+    return sTypeName;
+}
 
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
@@ -297,7 +314,7 @@ class CLI extends CLIBase {
         return this.execute({
             title: "TWIN TypeScript To Schema",
             appName: "ts-to-schema",
-            version: "0.0.1-next.27", // x-release-please-version
+            version: "0.0.1-next.29", // x-release-please-version
             icon: "⚙️ ",
             supportsEnvFiles: false,
             overrideOutputWidth: options?.overrideOutputWidth

package/docs/changelog.md

@@ -1,5 +1,30 @@
 # @twin.org/ts-to-schema - Changelog
 
+## [0.0.1-next.29](https://github.com/twinfoundation/tools/compare/ts-to-schema-v0.0.1-next.28...ts-to-schema-v0.0.1-next.29) (2025-07-02)
+
+
+### Features
+
+* move package to framework repo ([4490bda](https://github.com/twinfoundation/tools/commit/4490bda472d4dc8ddfe931e2fce81f3411de9ab3))
+
+## [0.0.1-next.28](https://github.com/twinfoundation/tools/compare/ts-to-schema-v0.0.1-next.27...ts-to-schema-v0.0.1-next.28) (2025-06-18)
+
+
+### Features
+
+* improve schema type name normalisation ([1a18b26](https://github.com/twinfoundation/tools/commit/1a18b267d87e9179bda01b396b256c450ae2889e))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/nameof bumped from 0.0.1-next.27 to 0.0.1-next.28
+  * devDependencies
+    * @twin.org/merge-locales bumped from 0.0.1-next.27 to 0.0.1-next.28
+    * @twin.org/nameof-transformer bumped from 0.0.1-next.27 to 0.0.1-next.28
+    * @twin.org/nameof-vitest-plugin bumped from 0.0.1-next.27 to 0.0.1-next.28
+
 ## [0.0.1-next.27](https://github.com/twinfoundation/tools/compare/ts-to-schema-v0.0.1-next.26...ts-to-schema-v0.0.1-next.27) (2025-06-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/ts-to-schema",
-	"version": "0.0.1-next.27",
+	"version": "0.0.1-next.29",
 	"description": "Tool to convert TypeScript definitions to JSON schemas",
 	"repository": {
 		"type": "git",
@@ -16,7 +16,7 @@
 	"dependencies": {
 		"@twin.org/cli-core": "next",
 		"@twin.org/core": "next",
-		"@twin.org/nameof": "0.0.1-next.27",
+		"@twin.org/nameof": "next",
 		"ajv": "8.17.1",
 		"commander": "14.0.0",
 		"glob": "11.0.2",