@tsed/schema 8.26.1 → 8.27.0

package/lib/esm/domain/JsonSchema.js

@@ -1458,6 +1458,20 @@ export class JsonSchema extends Map {
         return item;
     }
     mapGenerics(jsonSchema, generics) {
+        if (!(jsonSchema instanceof JsonSchema)) {
+            console.warn("[@tsed/schema] The model likely contains an invalid generic declaration. " +
+                "A JsonSchema instance was expected, but a different value was resolved. " +
+                "Check your GenericOf/Nested declaration (or functional API usage).", {
+                context: {
+                    schemaName: this.getName(),
+                    propertyKey: this.getPropertyKey(),
+                    target: nameOf(this.getTarget())
+                },
+                generics,
+                resolvedValue: jsonSchema
+            });
+            return {};
+        }
         const genericLabels = jsonSchema.getGenericLabels();
         if (!genericLabels) {
             return {};

package/lib/types/domain/JsonSchema.d.ts

@@ -20,11 +20,11 @@ import type { Infer, PropsToShape, SchemaKey, SchemaMerge, SchemaOmit, SchemaPar
  * @public
  */
 export interface JsonSchemaObject extends Omit<JSONSchema7, "type" | "additionalProperties" | "items" | "pattern"> {
-    [key: `x-${string}`]: unknown;
     type?: JSONSchema7["type"] | Type | null | (String | null | Date | Number | Object | Boolean)[];
     additionalProperties?: JsonSchemaObject | boolean | Type | JsonSchema;
     items?: JsonSchemaObject | boolean | Type | JsonSchema | (JsonSchemaObject | Type | JsonSchema)[];
     pattern?: string | RegExp;
+    [key: `x-${string}`]: unknown;
 }
 /**
  * Union type representing any valid JSON schema representation.
@@ -817,6 +817,6 @@ export declare class JsonSchema<T = JSONSchema7Type> extends Map<string, any> {
     protected setManyOf(keyword: "oneOf" | "anyOf" | "allOf", value: (AnyJsonSchema | null)[]): this | undefined;
     protected mapToJsonSchema(item: any[]): JsonSchema[];
     protected mapToJsonSchema(item: any): JsonSchema;
-    protected mapGenerics(jsonSchema: JsonSchema, generics: GenericValue[][]): GenericsMap;
+    protected mapGenerics(jsonSchema: unknown, generics: GenericValue[][]): GenericsMap;
     protected mapProperties(properties: Record<string, any>): any;
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/schema",
   "description": "JsonSchema module for Ts.ED Framework",
   "type": "module",
-  "version": "8.26.1",
+  "version": "8.27.0",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -34,7 +34,7 @@
     "tsed"
   ],
   "dependencies": {
-    "@tsed/openspec": "8.26.1",
+    "@tsed/openspec": "8.27.0",
     "change-case": "^5.4.4",
     "json-schema": "0.4.0",
     "picomatch": "4.0.4",
@@ -43,11 +43,11 @@
   },
   "devDependencies": {
     "@apidevtools/swagger-parser": "10.1.0",
-    "@tsed/barrels": "8.26.1",
-    "@tsed/core": "8.26.1",
-    "@tsed/hooks": "8.26.1",
-    "@tsed/openspec": "8.26.1",
-    "@tsed/typescript": "8.26.1",
+    "@tsed/barrels": "8.27.0",
+    "@tsed/core": "8.27.0",
+    "@tsed/hooks": "8.27.0",
+    "@tsed/openspec": "8.27.0",
+    "@tsed/typescript": "8.27.0",
     "@types/fs-extra": "11.0.4",
     "@types/json-schema": "7.0.15",
     "@types/picomatch": "3.0.2",
@@ -55,7 +55,7 @@
     "ajv": "^8.17.1",
     "eslint": "9.12.0",
     "typescript": "6.0.2",
-    "vitest": "3.2.4"
+    "vitest": "4.1.4"
   },
   "peerDependencies": {
     "@tsed/core": ">=8.0.0",