@twin.org/tools-core 0.0.2-next.3 → 0.0.2-next.5

package/dist/cjs/index.cjs

@@ -5,7 +5,7 @@ var core = require('@twin.org/core');
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
 /**
- * Helper class for JSON Schema processing. It provides methods to process arrays and clean up type names.
+ * Helper class for JSON Schema processing.
  */
 class JsonSchemaHelper {
     /**
@@ -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,10 @@ 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 = expandedType.startsWith("/") && expandedType.endsWith("/")
+                    ? new RegExp(expandedType.slice(1, -1))
+                    : new RegExp(expandedType);
+                if (regex.test(typeName) && allSchemas[typeName]) {
                     delete schema.$ref;
                     Object.assign(schema, allSchemas[typeName]);
                     break;

package/dist/esm/index.mjs

@@ -3,7 +3,7 @@ import { Is, ArrayHelper } from '@twin.org/core';
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
 /**
- * Helper class for JSON Schema processing. It provides methods to process arrays and clean up type names.
+ * Helper class for JSON Schema processing.
  */
 class JsonSchemaHelper {
     /**
@@ -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,10 @@ 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 = expandedType.startsWith("/") && expandedType.endsWith("/")
+                    ? new RegExp(expandedType.slice(1, -1))
+                    : new RegExp(expandedType);
+                if (regex.test(typeName) && allSchemas[typeName]) {
                     delete schema.$ref;
                     Object.assign(schema, allSchemas[typeName]);
                     break;

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

@@ -1,6 +1,6 @@
 import type { IJsonSchema } from "../models/IJsonSchema";
 /**
- * Helper class for JSON Schema processing. It provides methods to process arrays and clean up type names.
+ * Helper class for JSON Schema processing.
  */
 export declare class JsonSchemaHelper {
     /**
@@ -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;
     /**

package/docs/changelog.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [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)
+
+
+### Features
+
+* update framework core ([559cb98](https://github.com/twinfoundation/tools/commit/559cb98612c05a05458b37462cda806b9591b18a))
+
 ## [0.0.2-next.3](https://github.com/twinfoundation/tools/compare/tools-core-v0.0.2-next.2...tools-core-v0.0.2-next.3) (2025-08-05)
 
 

package/docs/reference/classes/JsonSchemaHelper.md

@@ -1,6 +1,6 @@
 # Class: JsonSchemaHelper
 
-Helper class for JSON Schema processing. It provides methods to process arrays and clean up type names.
+Helper class for JSON Schema processing.
 
 ## Constructors
 
@@ -144,7 +144,7 @@ All the known schemas.
 
 ##### requiredTypes
 
-(`string` \| `RegExp`)[]
+`string`[]
 
 The required types.
 

package/package.json

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