@tsed/schema 8.25.5 → 8.26.1

package/lib/esm/components/default/schemaMapper.js

@@ -29,7 +29,6 @@ function shouldMapAlias(key, value, useAlias) {
  */
 function shouldSkipKey(key, { specType = SpecTypes.JSON, customKeys = false }) {
     return (IGNORES.includes(key) ||
-        key.startsWith("x-") ||
         (key.startsWith("#") && (!customKeys || specType !== SpecTypes.JSON)) ||
         (specType !== SpecTypes.JSON && IGNORES_OPENSPEC.includes(key)));
 }

package/lib/esm/decorators/operations/inFile.js

@@ -29,12 +29,11 @@ import { Returns } from "./returns.js";
  * @param name
  */
 export function InFile(name) {
-    return (...args) => {
-        const [target, propertyKey, index] = args;
+    return (target, propertyKey, index) => {
         const multiple = Metadata.getParamTypes(target, propertyKey)[index] === Array;
         name = (typeof name === "object" ? undefined : name);
         const expression = [name, !multiple && "0"].filter(Boolean).join(".");
         const decorators = useDecorators(In(JsonParameterTypes.FILES), Name(expression), useMethodDecorators(Returns(400).Description(`<File too long | Too many parts | Too many files | Field name too long | Field value too long | Too many fields | Unexpected field>  [fieldName] Example: File too long file1`), Consumes("multipart/form-data")));
-        decorators(...args);
+        decorators(target, propertyKey, index);
     };
 }

package/lib/esm/decorators/operations/returns.js

@@ -1,4 +1,4 @@
-import { decorateMethodsOf, decoratorTypeOf, DecoratorTypes, isArray, isCollection, isPlainObject, isPrimitiveOrPrimitiveClass, isString } from "@tsed/core";
+import { decorateMethodsOf, decoratorTypeOf, DecoratorTypes, isArray, isClass, isCollection, isPlainObject, isPrimitiveOrPrimitiveClass, isString } from "@tsed/core";
 import { getStatusMessage } from "../../constants/httpStatusMessages.js";
 import { DecoratorContext } from "../../domain/DecoratorContext.js";
 import { JsonEntityStore } from "../../domain/JsonEntityStore.js";
@@ -32,6 +32,7 @@ class ReturnDecoratorContext extends DecoratorContext {
             "location",
             "binary"
         ];
+        this.hasOfTypes = false;
         this.model(model);
         this.status(status);
     }
@@ -251,8 +252,8 @@ class ReturnDecoratorContext extends DecoratorContext {
 }
 export function Returns(status, model) {
     const context = new ReturnDecoratorContext({
-        status,
-        model
+        status: isClass(status) ? 200 : status,
+        model: isClass(status) ? status : model
     });
     return context.build();
 }

package/lib/esm/domain/JsonMethodStore.js

@@ -199,10 +199,12 @@ let JsonMethodStore = class JsonMethodStore extends JsonEntityStore {
         return deepMerge(ctrlValue, this.store.get(key));
     }
     getParamTypes() {
-        return [...this.children.values()].reduce((obj, item) => ({
-            ...obj,
-            [item.paramType]: true
-        }), {});
+        return [...this.children.values()].reduce((obj, item) => {
+            if (item.paramType) {
+                obj[item.paramType] = true;
+            }
+            return obj;
+        }, {});
     }
     build() {
         this.parent.children.set(this.propertyName, this);

package/lib/esm/domain/JsonOperation.js

@@ -63,6 +63,7 @@ export class JsonMethodPath extends JsonMap {
  * @public
  */
 export class JsonOperation extends JsonMap {
+    // TODO check this after migration
     #status;
     #redirection;
     constructor(obj = {}) {

package/lib/esm/domain/JsonResponse.js

@@ -35,6 +35,7 @@ export class JsonResponse extends JsonMap {
     constructor(obj = {}) {
         super(obj);
         this.$kind = "operationResponse";
+        this.status = 200;
         this.content(obj.content || {});
     }
     description(description) {

package/lib/esm/utils/mergeSchema.js

@@ -26,10 +26,8 @@ function mergeManyOf(kind, schema1, schema2) {
     const { [kind]: kind1, ...$rest1 } = schema1;
     const { [kind]: kind2, ...$rest2 } = schema2;
     let hasRef = false;
-    const map = [kind1, $rest1, kind2, $rest2]
-        .flat()
-        .filter(Boolean)
-        .reduce((map, schema, index) => {
+    const schemas = [kind1, $rest1, kind2, $rest2].flat().filter(Boolean);
+    const map = schemas.reduce((map, schema, index) => {
         schema = cleanObject(schema);
         if (schema.$ref) {
             hasRef = true;

package/lib/types/components/open-spec/pathsMapper.d.ts

@@ -1,2 +1,3 @@
+import { OS3Paths } from "@tsed/openspec";
 import { JsonSchemaOptions } from "../../interfaces/JsonSchemaOptions.js";
-export declare function pathsMapper(model: any, { paths, rootPath, ...options }: JsonSchemaOptions): any;
+export declare function pathsMapper(model: any, { paths, rootPath, ...options }: JsonSchemaOptions): OS3Paths<import("@tsed/openspec").OS3Schema>;

package/lib/types/decorators/operations/returns.d.ts

@@ -265,4 +265,5 @@ export interface ReturnsChainedDecorators {
  * @response
  * @operation
  */
+export declare function Returns(model?: Type<any> | Type<any>[]): ReturnsChainedDecorators;
 export declare function Returns(status?: string | number, model?: Type<any> | Type<any>[]): ReturnsChainedDecorators;

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

@@ -39,7 +39,7 @@ import { JsonSchema } from "./JsonSchema.js";
  */
 export declare class JsonParameter extends JsonMap<OS3Parameter<JsonSchema>> {
     $kind: string;
-    expression: string;
+    expression: string | undefined;
     constructor(obj?: Partial<OS3Parameter<JsonSchema>>);
     getName(): any;
     name(name: string): this;

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

@@ -108,9 +108,9 @@ export interface PipeMethods<T = any, R = any> {
  * @public
  */
 export declare class JsonParameterStore extends JsonEntityStore {
-    paramType: string;
-    expression: string;
-    dataPath: string;
+    paramType?: string;
+    expression?: string;
+    dataPath?: string;
     /**
      * Define pipes can be called by the framework to transform input parameter
      */

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

@@ -20,6 +20,7 @@ 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)[];
@@ -96,7 +97,7 @@ export declare class JsonSchema<T = JSONSchema7Type> extends Map<string, any> {
     readonly $isJsonDocument = true;
     readonly $hooks: Hooks;
     readonly $allow: any[];
-    $selfRequired: boolean;
+    $selfRequired?: boolean;
     $ignore: boolean | IgnoreCallback;
     isDiscriminatorKey: boolean;
     isDiscriminator: boolean;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/schema",
   "description": "JsonSchema module for Ts.ED Framework",
   "type": "module",
-  "version": "8.25.5",
+  "version": "8.26.1",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -34,27 +34,27 @@
     "tsed"
   ],
   "dependencies": {
-    "@tsed/openspec": "8.25.5",
+    "@tsed/openspec": "8.26.1",
     "change-case": "^5.4.4",
     "json-schema": "0.4.0",
-    "picomatch": "4.0.2",
+    "picomatch": "4.0.4",
     "statuses": "^2.0.1",
-    "tslib": "2.7.0"
+    "tslib": ">=2.7.0"
   },
   "devDependencies": {
     "@apidevtools/swagger-parser": "10.1.0",
-    "@tsed/barrels": "8.25.5",
-    "@tsed/core": "8.25.5",
-    "@tsed/hooks": "8.25.5",
-    "@tsed/openspec": "8.25.5",
-    "@tsed/typescript": "8.25.5",
+    "@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",
     "@types/fs-extra": "11.0.4",
     "@types/json-schema": "7.0.15",
     "@types/picomatch": "3.0.2",
     "@types/statuses": "2.0.5",
     "ajv": "^8.17.1",
     "eslint": "9.12.0",
-    "typescript": "5.9.3",
+    "typescript": "6.0.2",
     "vitest": "3.2.4"
   },
   "peerDependencies": {