@tsed/schema 7.83.4 → 7.84.1

package/lib/types/utils/transformToOS2.d.ts

@@ -1,5 +1,5 @@
-import { OpenSpec2, OpenSpec3, OS3Operation } from "@tsed/openspec";
-export declare function transformSecurity(securitySchemes: any): {};
+import { OpenSpec2, OpenSpec3, type OS2Security, OS3Operation } from "@tsed/openspec";
+export declare function transformSecurity(securitySchemes: any): Record<string, OS2Security>;
 export declare function transformInformation(server: any): {
     host: string | undefined;
     basePath: string;

package/lib/types-esm/components/default/discriminatorMappingMapper.d.ts

@@ -0,0 +1,9 @@
+import { JsonSchema } from "../../domain/JsonSchema.js";
+import type { JsonSchemaOptions } from "../../interfaces/JsonSchemaOptions.js";
+interface SchemaWithDiscriminator {
+    discriminator?: {
+        mapping?: Record<string, JsonSchema | string>;
+    };
+}
+export declare function discriminatorMappingMapper(obj: SchemaWithDiscriminator, _: JsonSchema, options: JsonSchemaOptions): SchemaWithDiscriminator;
+export {};

package/lib/types-esm/components/default/{inlineEnumsMapper.d.ts → enumsMapper.d.ts}

@@ -1,3 +1,3 @@
 import { JsonSchema } from "../../domain/JsonSchema.js";
 import { JsonSchemaOptions } from "../../interfaces/JsonSchemaOptions.js";
-export declare function inlineEnumsMapper(obj: any, schema: JsonSchema, options: JsonSchemaOptions): any;
+export declare function enumsMapper(obj: any, schema: JsonSchema, options: JsonSchemaOptions): any;

package/lib/types-esm/components/index.d.ts

@@ -8,9 +8,10 @@ export * from "./async-api/payloadMapper.js";
 export * from "./async-api/responseMapper.js";
 export * from "./default/anyMapper.js";
 export * from "./default/classMapper.js";
+export * from "./default/discriminatorMappingMapper.js";
+export * from "./default/enumsMapper.js";
 export * from "./default/genericsMapper.js";
 export * from "./default/inheritedClassMapper.js";
-export * from "./default/inlineEnumsMapper.js";
 export * from "./default/itemMapper.js";
 export * from "./default/lazyRefMapper.js";
 export * from "./default/mapMapper.js";
@@ -20,6 +21,8 @@ export * from "./default/ofMapper.js";
 export * from "./default/propertiesMapper.js";
 export * from "./default/requiredMapper.js";
 export * from "./default/schemaMapper.js";
+export * from "./open-spec/discriminatorMappingMapper.js";
+export * from "./open-spec/enumsMapper.js";
 export * from "./open-spec/generate.js";
 export * from "./open-spec/nullableMapper.js";
 export * from "./open-spec/operationInFilesMapper.js";

package/lib/types-esm/components/open-spec/discriminatorMappingMapper.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/{types/components/default/inlineEnumsMapper.d.ts → types-esm/components/open-spec/enumsMapper.d.ts}

@@ -1,3 +1,3 @@
 import { JsonSchema } from "../../domain/JsonSchema.js";
 import { JsonSchemaOptions } from "../../interfaces/JsonSchemaOptions.js";
-export declare function inlineEnumsMapper(obj: any, schema: JsonSchema, options: JsonSchemaOptions): any;
+export declare function wrapEnumsMapper(obj: any, schema: JsonSchema, options: JsonSchemaOptions): any;

package/lib/types-esm/index.d.ts

@@ -8,9 +8,10 @@ export * from "./components/async-api/payloadMapper.js";
 export * from "./components/async-api/responseMapper.js";
 export * from "./components/default/anyMapper.js";
 export * from "./components/default/classMapper.js";
+export * from "./components/default/discriminatorMappingMapper.js";
+export * from "./components/default/enumsMapper.js";
 export * from "./components/default/genericsMapper.js";
 export * from "./components/default/inheritedClassMapper.js";
-export * from "./components/default/inlineEnumsMapper.js";
 export * from "./components/default/itemMapper.js";
 export * from "./components/default/lazyRefMapper.js";
 export * from "./components/default/mapMapper.js";
@@ -21,6 +22,8 @@ export * from "./components/default/propertiesMapper.js";
 export * from "./components/default/requiredMapper.js";
 export * from "./components/default/schemaMapper.js";
 export * from "./components/index.js";
+export * from "./components/open-spec/discriminatorMappingMapper.js";
+export * from "./components/open-spec/enumsMapper.js";
 export * from "./components/open-spec/generate.js";
 export * from "./components/open-spec/nullableMapper.js";
 export * from "./components/open-spec/operationInFilesMapper.js";

package/lib/types-esm/interfaces/JsonSchemaOptions.d.ts

@@ -25,6 +25,9 @@ export interface JsonSchemaOptions {
      * Generate custom keys when SpecType is JSON.
      */
     customKeys?: boolean;
+    /**
+     * Inline enums when enum instead of using $ref.
+     */
     inlineEnums?: boolean;
     [key: string]: any;
 }

package/lib/types-esm/utils/generateSpec.d.ts

@@ -4,13 +4,14 @@ export interface GenerateSpecOptions extends Omit<SpecSerializerOptions, "specTy
     tokens: JsonTokenOptions;
     version?: string;
     acceptMimes?: string;
-    specPath?: string;
     specVersion?: string;
     spec?: any;
+    fileSpec?: any;
+    sortPaths?: boolean;
 }
 /**
  * Generate OpenAPI spec from multiple sources (models, files, conf)
  * @param tokens
  * @param options
  */
-export declare function generateSpec({ tokens, ...options }: GenerateSpecOptions): Promise<OpenSpec2 | OpenSpec3>;
+export declare function generateSpec({ tokens, ...options }: GenerateSpecOptions): OpenSpec2 | OpenSpec3;

package/lib/types-esm/utils/ref.d.ts

@@ -11,4 +11,4 @@ export declare function createRef(name: string, schema: JsonSchema, options: Jso
 /**
  * @ignore
  */
-export declare function toRef(value: JsonSchema, schema: any, options: JsonSchemaOptions): any;
+export declare function toRef(value: JsonSchema, schema: unknown | undefined, options: JsonSchemaOptions): any;

package/lib/types-esm/utils/transformToOS2.d.ts

@@ -1,5 +1,5 @@
-import { OpenSpec2, OpenSpec3, OS3Operation } from "@tsed/openspec";
-export declare function transformSecurity(securitySchemes: any): {};
+import { OpenSpec2, OpenSpec3, type OS2Security, OS3Operation } from "@tsed/openspec";
+export declare function transformSecurity(securitySchemes: any): Record<string, OS2Security>;
 export declare function transformInformation(server: any): {
     host: string | undefined;
     basePath: string;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/schema",
   "description": "JsonSchema module for Ts.ED Framework",
   "type": "commonjs",
-  "version": "7.83.4",
+  "version": "7.84.1",
   "source": "./src/index.ts",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -37,7 +37,7 @@
     "tsed"
   ],
   "dependencies": {
-    "@tsed/openspec": "7.83.4",
+    "@tsed/openspec": "7.84.1",
     "change-case": "^4.1.2",
     "fs-extra": "^11.2.0",
     "json-schema": "0.4.0",
@@ -47,10 +47,10 @@
   },
   "devDependencies": {
     "@apidevtools/swagger-parser": "10.1.0",
-    "@tsed/barrels": "7.83.4",
-    "@tsed/core": "7.83.4",
-    "@tsed/openspec": "7.83.4",
-    "@tsed/typescript": "7.83.4",
+    "@tsed/barrels": "7.84.1",
+    "@tsed/core": "7.84.1",
+    "@tsed/openspec": "7.84.1",
+    "@tsed/typescript": "7.84.1",
     "@types/fs-extra": "11.0.4",
     "@types/json-schema": "7.0.15",
     "@types/picomatch": "2.3.3",
@@ -61,8 +61,8 @@
     "vitest": "2.0.4"
   },
   "peerDependencies": {
-    "@tsed/core": "7.83.4",
-    "@tsed/openspec": "7.83.4"
+    "@tsed/core": "7.84.1",
+    "@tsed/openspec": "7.84.1"
   },
   "peerDependenciesMeta": {
     "@tsed/core": {

package/lib/cjs/components/default/inlineEnumsMapper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"inlineEnumsMapper.js","sourceRoot":"","sources":["../../../../src/components/default/inlineEnumsMapper.ts"],"names":[],"mappings":";;;AAEA,gGAAuF;AAEvF,SAAgB,iBAAiB,CAAC,GAAQ,EAAE,MAAkB,EAAE,OAA0B;IACxF,IAAI,OAAO,CAAC,WAAW,IAAI,GAAG,CAAC,IAAI,EAAE,eAAe,EAAE;QACpD,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC;KACnC;IAED,IAAI,GAAG,CAAC,IAAI,EAAE;QACZ,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;KAClF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAVD,8CAUC;AAED,IAAA,uDAAwB,EAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC"}

package/lib/esm/components/default/inlineEnumsMapper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"inlineEnumsMapper.js","sourceRoot":"","sources":["../../../../src/components/default/inlineEnumsMapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AAEvF,MAAM,UAAU,iBAAiB,CAAC,GAAQ,EAAE,MAAkB,EAAE,OAA0B;IACxF,IAAI,OAAO,CAAC,WAAW,IAAI,GAAG,CAAC,IAAI,EAAE,eAAe,EAAE;QACpD,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC;KACnC;IAED,IAAI,GAAG,CAAC,IAAI,EAAE;QACZ,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;KAClF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,wBAAwB,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC"}