@twin.org/ts-to-schema 0.0.1-next.7 → 0.0.1-next.9

package/dist/cjs/index.cjs

@@ -90,7 +90,10 @@ async function tsToSchema(config, outputFolder, workingDirectory) {
                 content = content.replace(new RegExp(`#/definitions/${external}`, "g"), config.externalReferences[external]);
             }
         }
-        content = content.replace(/#\/definitions\/I?/g, config.baseUrl);
+        // First replace all types that start with II to a single I with the new base url
+        content = content.replace(/#\/definitions\/II(.*)/g, `${config.baseUrl}I$1`);
+        // Then other types starting with capitals (optionally interfaces starting with I)
+        content = content.replace(/#\/definitions\/I?([A-Z].*)/g, `${config.baseUrl}$1`);
         const filename = path.join(outputFolder, `${core.StringHelper.stripPrefix(type)}.json`);
         cliCore.CLIDisplay.value(core.I18n.formatMessage("commands.ts-to-schema.progress.writingSchema"), filename, 1);
         await promises.writeFile(filename, content);
@@ -235,7 +238,7 @@ class CLI extends cliCore.CLIBase {
         return this.execute({
             title: "TWIN TypeScript To Schema",
             appName: "ts-to-schema",
-            version: "0.0.1-next.7",
+            version: "0.0.1-next.9",
             icon: "⚙️ ",
             supportsEnvFiles: false,
             overrideOutputWidth: options?.overrideOutputWidth

package/dist/esm/index.mjs

@@ -87,7 +87,10 @@ async function tsToSchema(config, outputFolder, workingDirectory) {
                 content = content.replace(new RegExp(`#/definitions/${external}`, "g"), config.externalReferences[external]);
             }
         }
-        content = content.replace(/#\/definitions\/I?/g, config.baseUrl);
+        // First replace all types that start with II to a single I with the new base url
+        content = content.replace(/#\/definitions\/II(.*)/g, `${config.baseUrl}I$1`);
+        // Then other types starting with capitals (optionally interfaces starting with I)
+        content = content.replace(/#\/definitions\/I?([A-Z].*)/g, `${config.baseUrl}$1`);
         const filename = path.join(outputFolder, `${StringHelper.stripPrefix(type)}.json`);
         CLIDisplay.value(I18n.formatMessage("commands.ts-to-schema.progress.writingSchema"), filename, 1);
         await writeFile(filename, content);
@@ -232,7 +235,7 @@ class CLI extends CLIBase {
         return this.execute({
             title: "TWIN TypeScript To Schema",
             appName: "ts-to-schema",
-            version: "0.0.1-next.7",
+            version: "0.0.1-next.9",
             icon: "⚙️ ",
             supportsEnvFiles: false,
             overrideOutputWidth: options?.overrideOutputWidth

package/dist/locales/en.json

@@ -1,10 +1,6 @@
 {
   "error": {
     "commands": {
-      "ts-to-schema": {
-        "configFailed": "Configuration failed to load.",
-        "schemaNotFound": "Could not find the requested schema in the generated types \"{type}\"."
-      },
       "common": {
         "missingEnv": "The \"{option}\" option is configured as an environment variable, but there is no environment variable with the name \"{value}\" set.",
         "optionInvalidHex": "The \"{option}\" does not appear to be hex. \"{value}\"",
@@ -13,6 +9,10 @@
         "optionInvalidBech32": "The \"{option}\" does not appear to be bech32. \"{value}\"",
         "optionMinValue": "The \"{option}\" option must be greater than or equal to {minValue}, it is {value}.",
         "optionMaxValue": "The \"{option}\" option must be less than or equal to {maxValue}, it is {value}."
+      },
+      "ts-to-schema": {
+        "configFailed": "Configuration failed to load.",
+        "schemaNotFound": "Could not find the requested schema in the generated types \"{type}\"."
       }
     },
     "validation": {
@@ -160,34 +160,6 @@
       "invalidSeed": "The seed is invalid \"{seed}\""
     }
   },
-  "commands": {
-    "ts-to-schema": {
-      "options": {
-        "config": {
-          "param": "'<'config'>'",
-          "description": "Path to the JSON configuration file."
-        },
-        "output-folder": {
-          "param": "'<'output-folder'>'",
-          "description": "The folder to write the schema files."
-        }
-      },
-      "progress": {
-        "loadingConfigJson": "Loading Config JSON",
-        "creatingWorkingDir": "Creating Working Directory",
-        "generatingSchemas": "Generating Schemas",
-        "finalisingSchemas": "Finalising Schemas",
-        "writingSchemas": "Writing Schemas",
-        "writingSchema": "Writing Schema",
-        "models": "Models"
-      },
-      "labels": {
-        "configJson": "Config JSON",
-        "outputFolder": "Output Folder",
-        "outputWorkingDir": "Output Working Directory"
-      }
-    }
-  },
   "cli": {
     "progress": {
       "done": "Done.",
@@ -244,5 +216,33 @@
   },
   "validation": {
     "defaultFieldName": "The field"
+  },
+  "commands": {
+    "ts-to-schema": {
+      "options": {
+        "config": {
+          "param": "'<'config'>'",
+          "description": "Path to the JSON configuration file."
+        },
+        "output-folder": {
+          "param": "'<'output-folder'>'",
+          "description": "The folder to write the schema files."
+        }
+      },
+      "progress": {
+        "loadingConfigJson": "Loading Config JSON",
+        "creatingWorkingDir": "Creating Working Directory",
+        "generatingSchemas": "Generating Schemas",
+        "finalisingSchemas": "Finalising Schemas",
+        "writingSchemas": "Writing Schemas",
+        "writingSchema": "Writing Schema",
+        "models": "Models"
+      },
+      "labels": {
+        "configJson": "Config JSON",
+        "outputFolder": "Output Folder",
+        "outputWorkingDir": "Output Working Directory"
+      }
+    }
   }
 }

package/docs/changelog.md

@@ -1,5 +1,5 @@
 # @twin.org/ts-to-schema - Changelog
 
-## v0.0.1-next.7
+## v0.0.1-next.9
 
 - Initial Release

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/ts-to-schema",
-	"version": "0.0.1-next.7",
+	"version": "0.0.1-next.9",
 	"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.7",
+		"@twin.org/nameof": "0.0.1-next.9",
 		"commander": "12.1.0",
 		"glob": "11.0.0",
 		"jsonschema": "1.4.1",