@tsed/schema 6.105.2 → 6.106.0

package/lib/esm/utils/mapNullableType.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapNullableType.js","sourceRoot":"","sources":["../../../src/utils/mapNullableType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAC;AAEhC,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAG9C,SAAS,WAAW,CAAC,GAAQ;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAQ,EAAE,MAAyB,EAAE,OAA0B;IAC7F,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,CAAA,EAAE;QACvB,OAAO,GAAG,CAAC;KACZ;IACD,IAAI,KAAK,GAAa,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE1D,QAAQ,OAAO,CAAC,QAAQ,EAAE;QACxB,KAAK,SAAS,CAAC,OAAO;YACpB,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;gBAC3B,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;aACrC;YACD,MAAM;QACR,QAAQ;QACR,KAAK,SAAS,CAAC,IAAI;YACjB,IAAI,GAAG,CAAC,KAAK,EAAE;gBACb,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;oBACrB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;wBAChB,IAAI,EAAE,MAAM;qBACb,CAAC,CAAC;iBACJ;aACF;iBAAM;gBACL,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;aACrC;YACD,MAAM;QAER,KAAK,SAAS,CAAC,OAAO;YACpB,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC;YAEpB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;gBACd,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpB,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAC,IAAI,EAAC,CAAC,CAAC,CAAC;oBAC1C,OAAO,GAAG,CAAC,IAAI,CAAC;iBACjB;qBAAM;oBACL,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;iBACrB;aACF;YACD,MAAM;KACT;IAED,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import {uniq} from \"@tsed/core\";\nimport type {JsonSchema} from \"../domain/JsonSchema\";\nimport {SpecTypes} from \"../domain/SpecTypes\";\nimport type {JsonSchemaOptions} from \"../interfaces/JsonSchemaOptions\";\n\nfunction hasNullable(obj: any) {\n  return obj.oneOf.find((o: any) => o.type === \"null\");\n}\n\nexport function mapNullableType(obj: any, schema: JsonSchema | null, options: JsonSchemaOptions) {\n  if (!schema?.isNullable) {\n    return obj;\n  }\n  let types: string[] = [].concat(obj.type).filter(Boolean);\n\n  switch (options.specType) {\n    case SpecTypes.SWAGGER:\n      if (!obj.allOf && !obj.$ref) {\n        obj.type = uniq([\"null\", ...types]);\n      }\n      break;\n    default:\n    case SpecTypes.JSON:\n      if (obj.oneOf) {\n        if (!hasNullable(obj)) {\n          obj.oneOf.unshift({\n            type: \"null\"\n          });\n        }\n      } else {\n        obj.type = uniq([\"null\", ...types]);\n      }\n      break;\n\n    case SpecTypes.OPENAPI:\n      obj.nullable = true;\n\n      if (!obj.oneOf) {\n        if (types.length > 1) {\n          obj.oneOf = types.map((type) => ({type}));\n          delete obj.type;\n        } else {\n          obj.type = types[0];\n        }\n      }\n      break;\n  }\n\n  return obj;\n}\n"]}
+{"version":3,"file":"mapNullableType.js","sourceRoot":"","sources":["../../../src/utils/mapNullableType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAC;AAEhC,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAG9C,SAAS,WAAW,CAAC,GAAQ;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAQ,EAAE,MAAyB,EAAE,OAA0B;IAC7F,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,CAAA,EAAE;QACvB,OAAO,GAAG,CAAC;KACZ;IACD,IAAI,KAAK,GAAa,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE1D,QAAQ,OAAO,CAAC,QAAQ,EAAE;QACxB,QAAQ;QACR,KAAK,SAAS,CAAC,IAAI;YACjB,IAAI,GAAG,CAAC,KAAK,EAAE;gBACb,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;oBACrB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;wBAChB,IAAI,EAAE,MAAM;qBACb,CAAC,CAAC;iBACJ;aACF;iBAAM;gBACL,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;aACrC;YACD,MAAM;QAER,KAAK,SAAS,CAAC,OAAO;YACpB,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC;YAEpB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;gBACd,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpB,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAC,IAAI,EAAC,CAAC,CAAC,CAAC;oBAC1C,OAAO,GAAG,CAAC,IAAI,CAAC;iBACjB;qBAAM;oBACL,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;iBACrB;aACF;YACD,MAAM;KACT;IAED,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import {uniq} from \"@tsed/core\";\nimport type {JsonSchema} from \"../domain/JsonSchema\";\nimport {SpecTypes} from \"../domain/SpecTypes\";\nimport type {JsonSchemaOptions} from \"../interfaces/JsonSchemaOptions\";\n\nfunction hasNullable(obj: any) {\n  return obj.oneOf.find((o: any) => o.type === \"null\");\n}\n\nexport function mapNullableType(obj: any, schema: JsonSchema | null, options: JsonSchemaOptions) {\n  if (!schema?.isNullable) {\n    return obj;\n  }\n  let types: string[] = [].concat(obj.type).filter(Boolean);\n\n  switch (options.specType) {\n    default:\n    case SpecTypes.JSON:\n      if (obj.oneOf) {\n        if (!hasNullable(obj)) {\n          obj.oneOf.unshift({\n            type: \"null\"\n          });\n        }\n      } else {\n        obj.type = uniq([\"null\", ...types]);\n      }\n      break;\n\n    case SpecTypes.OPENAPI:\n      obj.nullable = true;\n\n      if (!obj.oneOf) {\n        if (types.length > 1) {\n          obj.oneOf = types.map((type) => ({type}));\n          delete obj.type;\n        } else {\n          obj.type = types[0];\n        }\n      }\n      break;\n  }\n\n  return obj;\n}\n"]}

package/lib/esm/utils/mapOpenSpec.js

@@ -0,0 +1,37 @@
+import { getValue, setValue } from "@tsed/core";
+import { getSpecType } from "./getSpecType.js";
+import { mapOpenSpec2 } from "./mapOpenSpec2.js";
+import { SpecTypes } from "../domain/SpecTypes.js";
+import { mapOpenSpec3 } from "./mapOpenSpec3.js";
+import { mergeSpec } from "./mergeSpec.js";
+/**
+ * @ignore
+ * @param spec
+ * @param fileSpec
+ * @param version
+ * @param acceptMimes
+ * @param specVersion
+ */
+export function mapOpenSpec(spec, { fileSpec, acceptMimes, specVersion, version }) {
+    specVersion = specVersion || getValue(spec, "openapi", getValue(spec, "swagger", "2.0"));
+    const options = {
+        specVersion,
+        acceptMimes
+    };
+    switch (getSpecType(specVersion)) {
+        case SpecTypes.OPENAPI:
+            spec = mapOpenSpec3(spec, options);
+            fileSpec = fileSpec ? mapOpenSpec3(fileSpec, options) : fileSpec;
+            break;
+        default:
+        case SpecTypes.SWAGGER:
+            spec = mapOpenSpec2(spec, options);
+            fileSpec = fileSpec ? mapOpenSpec2(fileSpec, options) : fileSpec;
+            break;
+    }
+    spec = mergeSpec(spec, fileSpec);
+    setValue(spec, "info.title", getValue(spec, "info.title", "Api documentation"));
+    setValue(spec, "info.version", getValue(spec, "info.version", version));
+    return spec;
+}
+//# sourceMappingURL=mapOpenSpec.js.map

package/lib/esm/utils/mapOpenSpec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mapOpenSpec.js","sourceRoot":"","sources":["../../../src/utils/mapOpenSpec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AAE9C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC;;;;;;;GAOG;AACH,MAAM,UAAU,WAAW,CAAC,IAAS,EAAE,EAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAM;IACvF,WAAW,GAAG,WAAW,IAAI,QAAQ,CAAmB,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;IAE3G,MAAM,OAAO,GAAG;QACd,WAAW;QACX,WAAW;KACZ,CAAC;IAEF,QAAQ,WAAW,CAAC,WAAW,CAAC,EAAE;QAChC,KAAK,SAAS,CAAC,OAAO;YACpB,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACnC,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YACjE,MAAM;QACR,QAAQ;QACR,KAAK,SAAS,CAAC,OAAO;YACpB,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACnC,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YACjE,MAAM;KACT;IAED,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEjC,QAAQ,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,IAAI,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAChF,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;IAExE,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import {getValue, setValue} from \"@tsed/core\";\nimport {OpenSpec2, OpenSpec3, OpenSpecVersions} from \"@tsed/openspec\";\nimport {getSpecType} from \"./getSpecType\";\nimport {mapOpenSpec2} from \"./mapOpenSpec2\";\nimport {SpecTypes} from \"../domain/SpecTypes\";\nimport {mapOpenSpec3} from \"./mapOpenSpec3\";\nimport {mergeSpec} from \"./mergeSpec\";\n\n/**\n * @ignore\n * @param spec\n * @param fileSpec\n * @param version\n * @param acceptMimes\n * @param specVersion\n */\nexport function mapOpenSpec(spec: any, {fileSpec, acceptMimes, specVersion, version}: any): Partial<OpenSpec2 | OpenSpec3> {\n  specVersion = specVersion || getValue<OpenSpecVersions>(spec, \"openapi\", getValue(spec, \"swagger\", \"2.0\"));\n\n  const options = {\n    specVersion,\n    acceptMimes\n  };\n\n  switch (getSpecType(specVersion)) {\n    case SpecTypes.OPENAPI:\n      spec = mapOpenSpec3(spec, options);\n      fileSpec = fileSpec ? mapOpenSpec3(fileSpec, options) : fileSpec;\n      break;\n    default:\n    case SpecTypes.SWAGGER:\n      spec = mapOpenSpec2(spec, options);\n      fileSpec = fileSpec ? mapOpenSpec2(fileSpec, options) : fileSpec;\n      break;\n  }\n\n  spec = mergeSpec(spec, fileSpec);\n\n  setValue(spec, \"info.title\", getValue(spec, \"info.title\", \"Api documentation\"));\n  setValue(spec, \"info.version\", getValue(spec, \"info.version\", version));\n\n  return spec;\n}\n"]}

package/lib/esm/utils/mapOpenSpec2.js

@@ -0,0 +1,30 @@
+import { getValue, uniq } from "@tsed/core";
+import { mapOpenSpecInfo } from "./mapOpenSpecInfo.js";
+/**
+ * @ignore
+ * @param spec
+ * @param version
+ * @param specVersion
+ * @param acceptMimes
+ */
+export function mapOpenSpec2(spec, { version, specVersion, acceptMimes = ["application/json"] }) {
+    const { paths, security, tags, host, basePath, schemes, consumes = [], produces = ["application/json"], definitions, parameters, responses, securityDefinitions, externalDocs } = spec;
+    return {
+        swagger: specVersion,
+        consumes: uniq([...acceptMimes, ...consumes]),
+        produces: uniq([...produces]),
+        info: mapOpenSpecInfo(getValue(spec, "info", {})),
+        paths,
+        host,
+        basePath,
+        schemes,
+        definitions,
+        parameters,
+        responses,
+        security,
+        securityDefinitions,
+        tags,
+        externalDocs
+    };
+}
+//# sourceMappingURL=mapOpenSpec2.js.map

package/lib/esm/utils/mapOpenSpec2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mapOpenSpec2.js","sourceRoot":"","sources":["../../../src/utils/mapOpenSpec2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,IAAI,EAAC,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAC1B,IAAwB,EACxB,EAAC,OAAO,EAAE,WAAW,EAAE,WAAW,GAAG,CAAC,kBAAkB,CAAC,EAAM;IAE/D,MAAM,EACJ,KAAK,EACL,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,QAAQ,GAAG,EAAE,EACb,QAAQ,GAAG,CAAC,kBAAkB,CAAC,EAC/B,WAAW,EACX,UAAU,EACV,SAAS,EACT,mBAAmB,EACnB,YAAY,EACb,GAAG,IAAI,CAAC;IAET,OAAO;QACL,OAAO,EAAE,WAAW;QACpB,QAAQ,EAAE,IAAI,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,QAAQ,CAAC,CAAC;QAC7C,QAAQ,EAAE,IAAI,CAAS,CAAC,GAAG,QAAQ,CAAC,CAAC;QACrC,IAAI,EAAE,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACjD,KAAK;QACL,IAAI;QACJ,QAAQ;QACR,OAAO;QACP,WAAW;QACX,UAAU;QACV,SAAS;QACT,QAAQ;QACR,mBAAmB;QACnB,IAAI;QACJ,YAAY;KACb,CAAC;AACJ,CAAC","sourcesContent":["import {getValue, uniq} from \"@tsed/core\";\nimport {OpenSpec2} from \"@tsed/openspec\";\nimport {mapOpenSpecInfo} from \"./mapOpenSpecInfo\";\n\n/**\n * @ignore\n * @param spec\n * @param version\n * @param specVersion\n * @param acceptMimes\n */\nexport function mapOpenSpec2(\n  spec: Partial<OpenSpec2>,\n  {version, specVersion, acceptMimes = [\"application/json\"]}: any\n): Partial<OpenSpec2> {\n  const {\n    paths,\n    security,\n    tags,\n    host,\n    basePath,\n    schemes,\n    consumes = [],\n    produces = [\"application/json\"],\n    definitions,\n    parameters,\n    responses,\n    securityDefinitions,\n    externalDocs\n  } = spec;\n\n  return {\n    swagger: specVersion,\n    consumes: uniq([...acceptMimes, ...consumes]),\n    produces: uniq<string>([...produces]),\n    info: mapOpenSpecInfo(getValue(spec, \"info\", {})),\n    paths,\n    host,\n    basePath,\n    schemes,\n    definitions,\n    parameters,\n    responses,\n    security,\n    securityDefinitions,\n    tags,\n    externalDocs\n  };\n}\n"]}

package/lib/esm/utils/mapOpenSpec3.js

@@ -0,0 +1,22 @@
+import { getValue } from "@tsed/core";
+import { mapOpenSpecInfo } from "./mapOpenSpecInfo.js";
+/**
+ * @ignore
+ * @param spec
+ * @param version
+ * @param specVersion
+ */
+export function mapOpenSpec3(spec, { specVersion }) {
+    const { servers, paths, components, security, tags, externalDocs } = spec;
+    return {
+        openapi: specVersion,
+        info: mapOpenSpecInfo(getValue(spec, "info", {})),
+        servers,
+        paths,
+        components,
+        security,
+        tags,
+        externalDocs
+    };
+}
+//# sourceMappingURL=mapOpenSpec3.js.map

package/lib/esm/utils/mapOpenSpec3.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mapOpenSpec3.js","sourceRoot":"","sources":["../../../src/utils/mapOpenSpec3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAElD;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,IAAS,EAAE,EAAC,WAAW,EAAM;IACxD,MAAM,EAAC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAC,GAAG,IAAI,CAAC;IAExE,OAAO;QACL,OAAO,EAAE,WAAW;QACpB,IAAI,EAAE,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACjD,OAAO;QACP,KAAK;QACL,UAAU;QACV,QAAQ;QACR,IAAI;QACJ,YAAY;KACb,CAAC;AACJ,CAAC","sourcesContent":["import {getValue} from \"@tsed/core\";\nimport {OpenSpec3} from \"@tsed/openspec\";\nimport {mapOpenSpecInfo} from \"./mapOpenSpecInfo\";\n\n/**\n * @ignore\n * @param spec\n * @param version\n * @param specVersion\n */\nexport function mapOpenSpec3(spec: any, {specVersion}: any): Partial<OpenSpec3> {\n  const {servers, paths, components, security, tags, externalDocs} = spec;\n\n  return {\n    openapi: specVersion,\n    info: mapOpenSpecInfo(getValue(spec, \"info\", {})),\n    servers,\n    paths,\n    components,\n    security,\n    tags,\n    externalDocs\n  };\n}\n"]}

package/lib/esm/utils/mapOpenSpecInfo.js

@@ -0,0 +1,17 @@
+import { cleanObject } from "@tsed/core";
+/**
+ * @ignore
+ * @param info
+ */
+export function mapOpenSpecInfo(info) {
+    const { title, description, version, termsOfService, contact, license } = info;
+    return cleanObject({
+        version,
+        title,
+        description,
+        termsOfService,
+        contact,
+        license
+    });
+}
+//# sourceMappingURL=mapOpenSpecInfo.js.map

package/lib/esm/utils/mapOpenSpecInfo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mapOpenSpecInfo.js","sourceRoot":"","sources":["../../../src/utils/mapOpenSpecInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AAGvC;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,IAA2B;IACzD,MAAM,EAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC;IAE7E,OAAO,WAAW,CAAC;QACjB,OAAO;QACP,KAAK;QACL,WAAW;QACX,cAAc;QACd,OAAO;QACP,OAAO;KACR,CAAC,CAAC;AACL,CAAC","sourcesContent":["import {cleanObject} from \"@tsed/core\";\nimport {OpenSpecInfo} from \"@tsed/openspec\";\n\n/**\n * @ignore\n * @param info\n */\nexport function mapOpenSpecInfo(info: Partial<OpenSpecInfo>): OpenSpecInfo {\n  const {title, description, version, termsOfService, contact, license} = info;\n\n  return cleanObject({\n    version,\n    title,\n    description,\n    termsOfService,\n    contact,\n    license\n  });\n}\n"]}

package/lib/esm/utils/mergeOperation.js

@@ -7,6 +7,7 @@ import { getJsonPathParameters } from "./getJsonPathParameters.js";
 export function mergeOperation(obj, operation, { rootPath, specType, operationId, defaultTags, tags, path, method }) {
     const pathParameters = getJsonPathParameters(rootPath, path).map(({ path, parameters }) => {
         path = path ? path : "/";
+        // FIXME not on the right place
         if (specType === SpecTypes.OPENAPI) {
             parameters = parameters.map(({ type, ...param }) => {
                 return {

package/lib/esm/utils/mergeOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeOperation.js","sourceRoot":"","sources":["../../../src/utils/mergeOperation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAe9D;;GAEG;AACH,MAAM,UAAU,cAAc,CAC5B,GAAQ,EACR,SAAc,EACd,EAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAwB;IAEzF,MAAM,cAAc,GAAG,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAE,UAAU,EAAC,EAAE,EAAE;QACtF,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QAEzB,IAAI,QAAQ,KAAK,SAAS,CAAC,OAAO,EAAE;YAClC,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAE,GAAG,KAAK,EAAC,EAAE,EAAE;gBAC/C,OAAO;oBACL,GAAG,KAAK;oBACR,MAAM,EAAE;wBACN,IAAI;qBACL;iBACF,CAAC;YACJ,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,EAAC,IAAI,EAAE,UAAU,EAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAC,IAAI,EAAE,UAAU,EAAC,EAAE,EAAE;;QACvD,UAAU,GAAG,gBAAgB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACrD,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QAEzB,MAAM,aAAa,GAAG,CAAA,MAAA,SAAS,CAAC,IAAI,0CAAE,MAAM,EAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAE9E,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG;YAChB,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;YAClB,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE;gBACtB,WAAW,EAAE,SAAS,CAAC,WAAW,IAAI,WAAW,CAAC,IAAI,CAAC;gBACvD,GAAG,SAAS;gBACZ,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAM,EAAE,EAAE,CAAC,IAAI,CAAC;gBAC9C,UAAU;aACX;SACF,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;QAE5B,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,GAAG,CAAC,CAAC;AACV,CAAC","sourcesContent":["import {SpecTypes} from \"../domain/SpecTypes\";\nimport {concatParameters} from \"./concatParameters\";\nimport {getJsonPathParameters} from \"./getJsonPathParameters\";\n\n/**\n * @ignore\n */\nexport interface MergeOperationOptions {\n  rootPath: string;\n  specType: SpecTypes;\n  operationId: (path: string) => string | undefined;\n  defaultTags: string[];\n  tags: string[];\n  path: string;\n  method: string;\n}\n\n/**\n * @ignore\n */\nexport function mergeOperation(\n  obj: any,\n  operation: any,\n  {rootPath, specType, operationId, defaultTags, tags, path, method}: MergeOperationOptions\n) {\n  const pathParameters = getJsonPathParameters(rootPath, path).map(({path, parameters}) => {\n    path = path ? path : \"/\";\n\n    if (specType === SpecTypes.OPENAPI) {\n      parameters = parameters.map(({type, ...param}) => {\n        return {\n          ...param,\n          schema: {\n            type\n          }\n        };\n      });\n    }\n\n    return {path, parameters};\n  });\n\n  return pathParameters.reduce((obj, {path, parameters}) => {\n    parameters = concatParameters(parameters, operation);\n    path = path ? path : \"/\";\n\n    const operationTags = operation.tags?.length ? operation.tags : [defaultTags];\n\n    obj.paths[path] = {\n      ...obj.paths[path],\n      [method.toLowerCase()]: {\n        operationId: operation.operationId || operationId(path),\n        ...operation,\n        tags: operationTags.map(({name}: any) => name),\n        parameters\n      }\n    };\n\n    tags.push(...operationTags);\n\n    return obj;\n  }, obj);\n}\n"]}
+{"version":3,"file":"mergeOperation.js","sourceRoot":"","sources":["../../../src/utils/mergeOperation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAe9D;;GAEG;AACH,MAAM,UAAU,cAAc,CAC5B,GAAQ,EACR,SAAc,EACd,EAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAwB;IAEzF,MAAM,cAAc,GAAG,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAE,UAAU,EAAC,EAAE,EAAE;QACtF,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QAEzB,+BAA+B;QAC/B,IAAI,QAAQ,KAAK,SAAS,CAAC,OAAO,EAAE;YAClC,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAE,GAAG,KAAK,EAAC,EAAE,EAAE;gBAC/C,OAAO;oBACL,GAAG,KAAK;oBACR,MAAM,EAAE;wBACN,IAAI;qBACL;iBACF,CAAC;YACJ,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,EAAC,IAAI,EAAE,UAAU,EAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAC,IAAI,EAAE,UAAU,EAAC,EAAE,EAAE;;QACvD,UAAU,GAAG,gBAAgB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACrD,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QAEzB,MAAM,aAAa,GAAG,CAAA,MAAA,SAAS,CAAC,IAAI,0CAAE,MAAM,EAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAE9E,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG;YAChB,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;YAClB,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE;gBACtB,WAAW,EAAE,SAAS,CAAC,WAAW,IAAI,WAAW,CAAC,IAAI,CAAC;gBACvD,GAAG,SAAS;gBACZ,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAM,EAAE,EAAE,CAAC,IAAI,CAAC;gBAC9C,UAAU;aACX;SACF,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;QAE5B,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,GAAG,CAAC,CAAC;AACV,CAAC","sourcesContent":["import {SpecTypes} from \"../domain/SpecTypes\";\nimport {concatParameters} from \"./concatParameters\";\nimport {getJsonPathParameters} from \"./getJsonPathParameters\";\n\n/**\n * @ignore\n */\nexport interface MergeOperationOptions {\n  rootPath: string;\n  specType: SpecTypes;\n  operationId: (path: string) => string | undefined;\n  defaultTags: string[];\n  tags: string[];\n  path: string;\n  method: string;\n}\n\n/**\n * @ignore\n */\nexport function mergeOperation(\n  obj: any,\n  operation: any,\n  {rootPath, specType, operationId, defaultTags, tags, path, method}: MergeOperationOptions\n) {\n  const pathParameters = getJsonPathParameters(rootPath, path).map(({path, parameters}) => {\n    path = path ? path : \"/\";\n\n    // FIXME not on the right place\n    if (specType === SpecTypes.OPENAPI) {\n      parameters = parameters.map(({type, ...param}) => {\n        return {\n          ...param,\n          schema: {\n            type\n          }\n        };\n      });\n    }\n\n    return {path, parameters};\n  });\n\n  return pathParameters.reduce((obj, {path, parameters}) => {\n    parameters = concatParameters(parameters, operation);\n    path = path ? path : \"/\";\n\n    const operationTags = operation.tags?.length ? operation.tags : [defaultTags];\n\n    obj.paths[path] = {\n      ...obj.paths[path],\n      [method.toLowerCase()]: {\n        operationId: operation.operationId || operationId(path),\n        ...operation,\n        tags: operationTags.map(({name}: any) => name),\n        parameters\n      }\n    };\n\n    tags.push(...operationTags);\n\n    return obj;\n  }, obj);\n}\n"]}

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

@@ -1,8 +1,5 @@
 export declare enum SpecTypes {
     JSON = "jsonschema",
-    /**
-     * @deprecated
-     */
     SWAGGER = "swagger2",
     OPENAPI = "openapi3"
 }

package/lib/types/index.d.ts

@@ -116,6 +116,7 @@ export * from "./utils/concatParameters";
 export * from "./utils/concatPath";
 export * from "./utils/defineStatusModel";
 export * from "./utils/from";
+export * from "./utils/generateSpec";
 export * from "./utils/generics";
 export * from "./utils/getComputedType";
 export * from "./utils/getInheritedStores";
@@ -128,9 +129,14 @@ export * from "./utils/getOperationsStores";
 export * from "./utils/getPropertiesStores";
 export * from "./utils/getRequiredProperties";
 export * from "./utils/getSpec";
+export * from "./utils/getSpecType";
 export * from "./utils/isSuccessStatus";
 export * from "./utils/mapHeaders";
 export * from "./utils/mapNullableType";
+export * from "./utils/mapOpenSpec";
+export * from "./utils/mapOpenSpec2";
+export * from "./utils/mapOpenSpec3";
+export * from "./utils/mapOpenSpecInfo";
 export * from "./utils/mapRouteOptions";
 export * from "./utils/matchGroups";
 export * from "./utils/mergeOperation";

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

@@ -0,0 +1,16 @@
+import { OpenSpec2, OpenSpec3 } from "@tsed/openspec";
+import { JsonTokenOptions, SpecSerializerOptions } from "./getSpec";
+export interface GenerateSpecOptions extends Omit<SpecSerializerOptions, "specType"> {
+    tokens: JsonTokenOptions;
+    version?: string;
+    acceptMimes?: string;
+    specPath?: string;
+    specVersion?: string;
+    spec?: any;
+}
+/**
+ * Generate OpenAPI spec from multiple sources (models, files, conf)
+ * @param tokens
+ * @param options
+ */
+export declare function generateSpec({ tokens, ...options }: GenerateSpecOptions): Promise<OpenSpec2 | OpenSpec3>;

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

@@ -1,9 +1,10 @@
 import { Type } from "@tsed/core";
-import { OpenSpec2, OpenSpec3 } from "@tsed/openspec";
-import { SpecTypes } from "../domain/SpecTypes";
+import { OpenSpec3 } from "@tsed/openspec";
 import { JsonSchemaOptions } from "../interfaces/JsonSchemaOptions";
+export declare type JsonTokenOptions = ({
+    token: Type<any>;
+} & Partial<SpecSerializerOptions>)[];
 export interface SpecSerializerOptions extends JsonSchemaOptions {
-    specType?: SpecTypes.SWAGGER | SpecTypes.OPENAPI;
     /**
      * Paths
      */
@@ -21,29 +22,9 @@ export interface SpecSerializerOptions extends JsonSchemaOptions {
      */
     operationIdPattern?: string;
 }
-export interface OS3SpecSerializerOptions extends SpecSerializerOptions {
-    /**
-     * Define Spec types level
-     */
-    specType: SpecTypes.OPENAPI;
-}
-export interface OS2SpecSerializerOptions extends SpecSerializerOptions {
-    /**
-     * Define Spec types level
-     */
-    specType: SpecTypes.SWAGGER;
-}
-/**
- * Return the swagger or open spec for the given class.
- * @param model
- * @param options
- */
-export declare function getSpec(model: Type<any>, options: OS2SpecSerializerOptions): Partial<OpenSpec2>;
-export declare function getSpec(model: Type<any>): Partial<OpenSpec2>;
-export declare function getSpec(model: Type<any>, options: SpecSerializerOptions): Partial<OpenSpec2>;
 /**
  * Return the swagger or open spec for the given class.
  * @param model
  * @param options
  */
-export declare function getSpec(model: Type<any>, options: OS3SpecSerializerOptions): Partial<OpenSpec3>;
+export declare function getSpec(model: Type<any> | JsonTokenOptions, options?: SpecSerializerOptions): Partial<OpenSpec3>;

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

@@ -0,0 +1,12 @@
+import { OpenSpec2, OpenSpec3 } from "@tsed/openspec";
+import { SpecTypes } from "../domain/SpecTypes";
+/**
+ * @ignore
+ * @param version
+ */
+export declare function getSpecType(version: string): SpecTypes.SWAGGER | SpecTypes.OPENAPI;
+/**
+ * @ignore
+ * @param spec
+ */
+export declare function getSpecTypeFromSpec(spec: Partial<OpenSpec2 | OpenSpec3>): SpecTypes.SWAGGER | SpecTypes.OPENAPI;

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

@@ -0,0 +1,10 @@
+import { OpenSpec2, OpenSpec3 } from "@tsed/openspec";
+/**
+ * @ignore
+ * @param spec
+ * @param fileSpec
+ * @param version
+ * @param acceptMimes
+ * @param specVersion
+ */
+export declare function mapOpenSpec(spec: any, { fileSpec, acceptMimes, specVersion, version }: any): Partial<OpenSpec2 | OpenSpec3>;

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

@@ -0,0 +1,9 @@
+import { OpenSpec2 } from "@tsed/openspec";
+/**
+ * @ignore
+ * @param spec
+ * @param version
+ * @param specVersion
+ * @param acceptMimes
+ */
+export declare function mapOpenSpec2(spec: Partial<OpenSpec2>, { version, specVersion, acceptMimes }: any): Partial<OpenSpec2>;

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

@@ -0,0 +1,8 @@
+import { OpenSpec3 } from "@tsed/openspec";
+/**
+ * @ignore
+ * @param spec
+ * @param version
+ * @param specVersion
+ */
+export declare function mapOpenSpec3(spec: any, { specVersion }: any): Partial<OpenSpec3>;

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

@@ -0,0 +1,6 @@
+import { OpenSpecInfo } from "@tsed/openspec";
+/**
+ * @ignore
+ * @param info
+ */
+export declare function mapOpenSpecInfo(info: Partial<OpenSpecInfo>): OpenSpecInfo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/schema",
-  "version": "6.105.2",
+  "version": "6.106.0",
   "description": "JsonSchema module for Ts.ED Framework",
   "private": false,
   "source": "./src/index.ts",
@@ -32,8 +32,10 @@
     "tsed"
   ],
   "dependencies": {
-    "@tsed/openspec": "6.105.2",
+    "@tsed/openspec": "6.106.0",
+    "api-spec-converter": "2.12.0",
     "camel-case": "4.1.2",
+    "fs-extra": "^10.0.1",
     "json-schema": "0.4.0",
     "micromatch": "4.0.4",
     "pascal-case": "3.1.2",
@@ -42,19 +44,18 @@
   },
   "devDependencies": {
     "@apidevtools/swagger-parser": "10.0.2",
-    "@tsed/core": "6.105.2",
-    "@tsed/openspec": "6.105.2",
+    "@tsed/core": "6.106.0",
+    "@tsed/openspec": "6.106.0",
     "@types/fs-extra": "9.0.6",
     "@types/json-schema": "7.0.7",
     "@types/micromatch": "4.0.1",
-    "@types/statuses": "2.0.0",
-    "fs-extra": "9.0.1"
+    "@types/statuses": "2.0.0"
   },
   "peerDependencies": {
-    "@tsed/core": "^6.105.2"
+    "@tsed/core": "^6.106.0"
   },
   "peerDependenciesMeta": {
-    "@tsed/code": {
+    "@tsed/core": {
       "optional": false
     }
   },