@twin.org/tools-core 0.0.2-next.4 → 0.0.2-next.6

package/dist/cjs/index.cjs

@@ -152,8 +152,10 @@ class JsonSchemaHelper {
         for (const typeKey of Object.keys(allSchemas)) {
             if (!referencedSchemas[typeKey]) {
                 for (const requiredType of requiredTypes) {
-                    if ((core.Is.regexp(requiredType) && new RegExp(requiredType).test(typeKey)) ||
-                        (core.Is.stringValue(requiredType) && requiredType === typeKey)) {
+                    const regex = requiredType.startsWith("/") && requiredType.endsWith("/")
+                        ? new RegExp(requiredType.slice(1, -1))
+                        : new RegExp(requiredType);
+                    if (regex.test(typeKey)) {
                         referencedSchemas[typeKey] = allSchemas[typeKey];
                         JsonSchemaHelper.extractTypesFromSchema(allSchemas, allSchemas[typeKey], referencedSchemas);
                     }
@@ -182,7 +184,8 @@ class JsonSchemaHelper {
         if (core.Is.stringValue(schema.$ref)) {
             for (const expandedType of expandedTypes) {
                 const typeName = JsonSchemaHelper.normaliseTypeName(schema.$ref.replace("#/definitions/", ""));
-                if (new RegExp(expandedType).test(typeName) && allSchemas[typeName]) {
+                const regex = JsonSchemaHelper.autoExpandToRegEx(expandedType);
+                if (regex.test(typeName) && allSchemas[typeName]) {
                     delete schema.$ref;
                     Object.assign(schema, allSchemas[typeName]);
                     break;
@@ -227,6 +230,16 @@ class JsonSchemaHelper {
             }
         }
     }
+    /**
+     * Convert a string auto expand pattern to a regular expression.
+     * @param autoExpand The auto expand pattern.
+     * @returns The regular expression.
+     */
+    static autoExpandToRegEx(autoExpand) {
+        return autoExpand.startsWith("/") && autoExpand.endsWith("/")
+            ? new RegExp(autoExpand.slice(1, -1))
+            : new RegExp(autoExpand);
+    }
 }
 
 // Copyright 2024 IOTA Stiftung.

package/dist/esm/index.mjs

@@ -150,8 +150,10 @@ class JsonSchemaHelper {
         for (const typeKey of Object.keys(allSchemas)) {
             if (!referencedSchemas[typeKey]) {
                 for (const requiredType of requiredTypes) {
-                    if ((Is.regexp(requiredType) && new RegExp(requiredType).test(typeKey)) ||
-                        (Is.stringValue(requiredType) && requiredType === typeKey)) {
+                    const regex = requiredType.startsWith("/") && requiredType.endsWith("/")
+                        ? new RegExp(requiredType.slice(1, -1))
+                        : new RegExp(requiredType);
+                    if (regex.test(typeKey)) {
                         referencedSchemas[typeKey] = allSchemas[typeKey];
                         JsonSchemaHelper.extractTypesFromSchema(allSchemas, allSchemas[typeKey], referencedSchemas);
                     }
@@ -180,7 +182,8 @@ class JsonSchemaHelper {
         if (Is.stringValue(schema.$ref)) {
             for (const expandedType of expandedTypes) {
                 const typeName = JsonSchemaHelper.normaliseTypeName(schema.$ref.replace("#/definitions/", ""));
-                if (new RegExp(expandedType).test(typeName) && allSchemas[typeName]) {
+                const regex = JsonSchemaHelper.autoExpandToRegEx(expandedType);
+                if (regex.test(typeName) && allSchemas[typeName]) {
                     delete schema.$ref;
                     Object.assign(schema, allSchemas[typeName]);
                     break;
@@ -225,6 +228,16 @@ class JsonSchemaHelper {
             }
         }
     }
+    /**
+     * Convert a string auto expand pattern to a regular expression.
+     * @param autoExpand The auto expand pattern.
+     * @returns The regular expression.
+     */
+    static autoExpandToRegEx(autoExpand) {
+        return autoExpand.startsWith("/") && autoExpand.endsWith("/")
+            ? new RegExp(autoExpand.slice(1, -1))
+            : new RegExp(autoExpand);
+    }
 }
 
 // Copyright 2024 IOTA Stiftung.

package/dist/types/utils/jsonSchemaHelper.d.ts

@@ -49,7 +49,7 @@ export declare class JsonSchemaHelper {
      */
     static extractTypes(allSchemas: {
         [id: string]: IJsonSchema;
-    }, requiredTypes: (string | RegExp)[], referencedSchemas: {
+    }, requiredTypes: string[], referencedSchemas: {
         [id: string]: IJsonSchema;
     }): void;
     /**
@@ -69,4 +69,10 @@ export declare class JsonSchemaHelper {
     static expandSchemaTypes(allSchemas: {
         [id: string]: IJsonSchema;
     }, schema: IJsonSchema, expandedTypes: string[]): void;
+    /**
+     * Convert a string auto expand pattern to a regular expression.
+     * @param autoExpand The auto expand pattern.
+     * @returns The regular expression.
+     */
+    static autoExpandToRegEx(autoExpand: string): RegExp;
 }

package/docs/changelog.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.0.2-next.6](https://github.com/twinfoundation/tools/compare/tools-core-v0.0.2-next.5...tools-core-v0.0.2-next.6) (2025-08-21)
+
+
+### Features
+
+* remove auto expanded types from final output ([18e05dc](https://github.com/twinfoundation/tools/commit/18e05dc88f71a0a27b79d1d076b1261b42d2c4c2))
+
+## [0.0.2-next.5](https://github.com/twinfoundation/tools/compare/tools-core-v0.0.2-next.4...tools-core-v0.0.2-next.5) (2025-08-19)
+
+
+### Features
+
+* correctly handle auto expand types ([57fce0f](https://github.com/twinfoundation/tools/commit/57fce0f9ec4a0876665d70adc6e885f6feb3caf7))
+
 ## [0.0.2-next.4](https://github.com/twinfoundation/tools/compare/tools-core-v0.0.2-next.3...tools-core-v0.0.2-next.4) (2025-08-19)
 
 

package/docs/reference/classes/JsonSchemaHelper.md

@@ -144,7 +144,7 @@ All the known schemas.
 
 ##### requiredTypes
 
-(`string` \| `RegExp`)[]
+`string`[]
 
 The required types.
 
@@ -209,3 +209,25 @@ The types to expand.
 #### Returns
 
 `void`
+
+***
+
+### autoExpandToRegEx()
+
+> `static` **autoExpandToRegEx**(`autoExpand`): `RegExp`
+
+Convert a string auto expand pattern to a regular expression.
+
+#### Parameters
+
+##### autoExpand
+
+`string`
+
+The auto expand pattern.
+
+#### Returns
+
+`RegExp`
+
+The regular expression.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/tools-core",
-	"version": "0.0.2-next.4",
+	"version": "0.0.2-next.6",
 	"description": "Shared components for the tools",
 	"repository": {
 		"type": "git",