@twin.org/ts-to-openapi 0.0.2-next.4 → 0.0.2-next.6

package/dist/cjs/index.cjs

@@ -600,7 +600,7 @@ async function tsToOpenApi(config, outputFile, workingDirectory) {
             }
         }
     }
-    await finaliseOutput(usedCommonResponseTypes, schemas, openApi, securitySchemes, config.externalReferences, outputFile);
+    await finaliseOutput(usedCommonResponseTypes, schemas, openApi, securitySchemes, config.externalReferences, autoExpandTypes, outputFile);
 }
 /**
  * Finalise the schemas and output the spec.
@@ -609,9 +609,10 @@ async function tsToOpenApi(config, outputFile, workingDirectory) {
  * @param openApi The OpenAPI spec.
  * @param securitySchemes The security schemes.
  * @param externalReferences The external references.
+ * @param autoExpandTypes The auto expand types.
  * @param outputFile The output file.
  */
-async function finaliseOutput(usedCommonResponseTypes, schemas, openApi, securitySchemes, externalReferences, outputFile) {
+async function finaliseOutput(usedCommonResponseTypes, schemas, openApi, securitySchemes, externalReferences, autoExpandTypes, outputFile) {
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.ts-to-openapi.progress.finalisingSchemas"));
     // Remove the response codes that we haven't used
@@ -652,6 +653,15 @@ async function finaliseOutput(usedCommonResponseTypes, schemas, openApi, securit
                 }
             }
         }
+        // We can remove any auto expand types from the final schema as they
+        // will have been expanded inline so no need to keep them
+        for (const autoExpandType of autoExpandTypes) {
+            const regExp = toolsCore.JsonSchemaHelper.autoExpandToRegEx(autoExpandType);
+            if (regExp.test(schema)) {
+                skipSchema = true;
+                break;
+            }
+        }
         if (!skipSchema) {
             // If the final schema has no properties and is just a ref to another object type
             // then replace the references with that of the referenced type
@@ -871,10 +881,7 @@ async function generateSchemas(modelDirWildcards, types, autoExpandTypes, output
         }
     }
     const referencedSchemas = {};
-    toolsCore.JsonSchemaHelper.extractTypes(allSchemas, [
-        ...types,
-        ...autoExpandTypes.map(t => (t.startsWith("/") && t.endsWith("/") ? new RegExp(t) : t))
-    ], referencedSchemas);
+    toolsCore.JsonSchemaHelper.extractTypes(allSchemas, [...types, ...autoExpandTypes], referencedSchemas);
     toolsCore.JsonSchemaHelper.expandTypes(referencedSchemas, autoExpandTypes);
     for (const arraySingularType of arraySingularTypes) {
         referencedSchemas[`${arraySingularType}[]`] = {
@@ -1055,7 +1062,7 @@ class CLI extends cliCore.CLIBase {
         return this.execute({
             title: "TWIN TypeScript To OpenAPI",
             appName: "ts-to-openapi",
-            version: "0.0.2-next.4", // x-release-please-version
+            version: "0.0.2-next.6", // x-release-please-version
             icon: "⚙️ ",
             supportsEnvFiles: false,
             overrideOutputWidth: options?.overrideOutputWidth

package/dist/esm/index.mjs

@@ -597,7 +597,7 @@ async function tsToOpenApi(config, outputFile, workingDirectory) {
             }
         }
     }
-    await finaliseOutput(usedCommonResponseTypes, schemas, openApi, securitySchemes, config.externalReferences, outputFile);
+    await finaliseOutput(usedCommonResponseTypes, schemas, openApi, securitySchemes, config.externalReferences, autoExpandTypes, outputFile);
 }
 /**
  * Finalise the schemas and output the spec.
@@ -606,9 +606,10 @@ async function tsToOpenApi(config, outputFile, workingDirectory) {
  * @param openApi The OpenAPI spec.
  * @param securitySchemes The security schemes.
  * @param externalReferences The external references.
+ * @param autoExpandTypes The auto expand types.
  * @param outputFile The output file.
  */
-async function finaliseOutput(usedCommonResponseTypes, schemas, openApi, securitySchemes, externalReferences, outputFile) {
+async function finaliseOutput(usedCommonResponseTypes, schemas, openApi, securitySchemes, externalReferences, autoExpandTypes, outputFile) {
     CLIDisplay.break();
     CLIDisplay.task(I18n.formatMessage("commands.ts-to-openapi.progress.finalisingSchemas"));
     // Remove the response codes that we haven't used
@@ -649,6 +650,15 @@ async function finaliseOutput(usedCommonResponseTypes, schemas, openApi, securit
                 }
             }
         }
+        // We can remove any auto expand types from the final schema as they
+        // will have been expanded inline so no need to keep them
+        for (const autoExpandType of autoExpandTypes) {
+            const regExp = JsonSchemaHelper.autoExpandToRegEx(autoExpandType);
+            if (regExp.test(schema)) {
+                skipSchema = true;
+                break;
+            }
+        }
         if (!skipSchema) {
             // If the final schema has no properties and is just a ref to another object type
             // then replace the references with that of the referenced type
@@ -868,10 +878,7 @@ async function generateSchemas(modelDirWildcards, types, autoExpandTypes, output
         }
     }
     const referencedSchemas = {};
-    JsonSchemaHelper.extractTypes(allSchemas, [
-        ...types,
-        ...autoExpandTypes.map(t => (t.startsWith("/") && t.endsWith("/") ? new RegExp(t) : t))
-    ], referencedSchemas);
+    JsonSchemaHelper.extractTypes(allSchemas, [...types, ...autoExpandTypes], referencedSchemas);
     JsonSchemaHelper.expandTypes(referencedSchemas, autoExpandTypes);
     for (const arraySingularType of arraySingularTypes) {
         referencedSchemas[`${arraySingularType}[]`] = {
@@ -1052,7 +1059,7 @@ class CLI extends CLIBase {
         return this.execute({
             title: "TWIN TypeScript To OpenAPI",
             appName: "ts-to-openapi",
-            version: "0.0.2-next.4", // x-release-please-version
+            version: "0.0.2-next.6", // x-release-please-version
             icon: "⚙️ ",
             supportsEnvFiles: false,
             overrideOutputWidth: options?.overrideOutputWidth

package/docs/changelog.md

@@ -1,5 +1,33 @@
 # @twin.org/ts-to-openapi - Changelog
 
+## [0.0.2-next.6](https://github.com/twinfoundation/tools/compare/ts-to-openapi-v0.0.2-next.5...ts-to-openapi-v0.0.2-next.6) (2025-08-21)
+
+
+### Features
+
+* remove auto expanded types from final output ([18e05dc](https://github.com/twinfoundation/tools/commit/18e05dc88f71a0a27b79d1d076b1261b42d2c4c2))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/tools-core bumped from 0.0.2-next.5 to 0.0.2-next.6
+
+## [0.0.2-next.5](https://github.com/twinfoundation/tools/compare/ts-to-openapi-v0.0.2-next.4...ts-to-openapi-v0.0.2-next.5) (2025-08-19)
+
+
+### Features
+
+* correctly handle auto expand types ([57fce0f](https://github.com/twinfoundation/tools/commit/57fce0f9ec4a0876665d70adc6e885f6feb3caf7))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/tools-core bumped from 0.0.2-next.4 to 0.0.2-next.5
+
 ## [0.0.2-next.4](https://github.com/twinfoundation/tools/compare/ts-to-openapi-v0.0.2-next.3...ts-to-openapi-v0.0.2-next.4) (2025-08-19)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/ts-to-openapi",
-	"version": "0.0.2-next.4",
+	"version": "0.0.2-next.6",
 	"description": "Tool to convert TypeScript REST route definitions to OpenAPI Specifications",
 	"repository": {
 		"type": "git",
@@ -18,7 +18,7 @@
 		"@twin.org/cli-core": "next",
 		"@twin.org/core": "next",
 		"@twin.org/nameof": "next",
-		"@twin.org/tools-core": "0.0.2-next.4",
+		"@twin.org/tools-core": "0.0.2-next.6",
 		"@twin.org/web": "next",
 		"commander": "14.0.0",
 		"glob": "11.0.3",