@tsed/schema 7.0.0-beta.1 → 7.0.0-beta.4

package/lib/cjs/utils/getSpec.js

@@ -8,6 +8,7 @@ const getJsonEntityStore_1 = require("./getJsonEntityStore");
 const getOperationsStores_1 = require("./getOperationsStores");
 const mergeOperation_1 = require("./mergeOperation");
 const operationIdFormatter_1 = require("./operationIdFormatter");
+const mergeSpec_1 = require("./mergeSpec");
 /**
  * @ignore
  */
@@ -26,62 +27,76 @@ function get(model, options, cb) {
     }
     return cache.get(key);
 }
+function generate(model, options) {
+    const store = (0, getJsonEntityStore_1.getJsonEntityStore)(model);
+    const { schemas = {}, paths = {}, rootPath = "/", tags = [] } = options;
+    const specType = SpecTypes_1.SpecTypes.OPENAPI;
+    const ctrlPath = store.path;
+    const defaultTags = (0, core_1.cleanObject)({
+        name: store.schema.getName(),
+        description: store.schema.get("description")
+    });
+    const specJson = { paths };
+    (0, getOperationsStores_1.getOperationsStores)(model).forEach((operationStore) => {
+        if (operationStore.store.get("hidden")) {
+            return;
+        }
+        const operation = operationStore.operation.toJSON({ ...options, specType, schemas });
+        operationStore.operation.operationPaths.forEach(({ path, method }) => {
+            if (method) {
+                (0, mergeOperation_1.mergeOperation)(specJson, operation, {
+                    rootPath: (0, buildPath_1.buildPath)(rootPath + ctrlPath),
+                    path,
+                    method,
+                    defaultTags,
+                    tags,
+                    specType,
+                    operationId: (path) => options.operationIdFormatter(operationStore.parent.schema.get("name") || operationStore.parent.targetName, operationStore.propertyName, path)
+                });
+            }
+        });
+    });
+    specJson.tags = (0, core_1.uniqBy)(tags, "name");
+    if (Object.keys(schemas).length) {
+        specJson.components = {
+            schemas
+        };
+    }
+    return specJson;
+}
 /**
  * Return the swagger or open spec for the given class.
  * @param model
  * @param options
  */
 function getSpec(model, options = {}) {
-    if (!options.specType) {
-        options.specType = SpecTypes_1.SpecTypes.OPENAPI;
-    }
     options = {
         ...options,
         operationIdFormatter: options.operationIdFormatter || (0, operationIdFormatter_1.operationIdFormatter)(options.operationIdPattern),
-        root: false,
-        specType: options.specType
+        root: false
     };
-    return get(model, options, () => {
-        const store = (0, getJsonEntityStore_1.getJsonEntityStore)(model);
-        const { specType = SpecTypes_1.SpecTypes.OPENAPI, schemas = {}, paths = {}, rootPath = "/", tags = [] } = options;
-        const ctrlPath = store.path;
-        const defaultTags = (0, core_1.cleanObject)({
-            name: store.schema.getName(),
-            description: store.schema.get("description")
-        });
-        const specJson = { paths };
-        (0, getOperationsStores_1.getOperationsStores)(model).forEach((operationStore) => {
-            if (operationStore.store.get("hidden")) {
-                return;
+    if ((0, core_1.isArray)(model)) {
+        let finalSpec = {};
+        options = {
+            ...options,
+            specType: SpecTypes_1.SpecTypes.OPENAPI,
+            paths: {},
+            tags: [],
+            schemas: {},
+            append(spec) {
+                finalSpec = (0, mergeSpec_1.mergeSpec)(finalSpec, spec);
             }
-            const operation = operationStore.operation.toJSON({ ...options, specType, schemas });
-            operationStore.operation.operationPaths.forEach(({ path, method }) => {
-                if (method) {
-                    (0, mergeOperation_1.mergeOperation)(specJson, operation, {
-                        rootPath: (0, buildPath_1.buildPath)(rootPath + ctrlPath),
-                        path,
-                        method,
-                        defaultTags,
-                        tags,
-                        specType,
-                        operationId: (path) => options.operationIdFormatter(operationStore.parent.schema.get("name") || operationStore.parent.targetName, operationStore.propertyName, path)
-                    });
-                }
+        };
+        model.forEach(({ token, ...opts }) => {
+            const spec = getSpec(token, {
+                ...options,
+                ...opts
             });
+            options.append(spec);
         });
-        specJson.tags = (0, core_1.uniqBy)(tags, "name");
-        if (Object.keys(schemas).length) {
-            if (specType === SpecTypes_1.SpecTypes.OPENAPI) {
-                specJson.components = {
-                    schemas
-                };
-            }
-            else {
-                specJson.definitions = schemas;
-            }
-        }
-        return specJson;
-    });
+        return finalSpec;
+    }
+    return get(model, options, () => generate(model, options));
 }
 exports.getSpec = getSpec;
 //# sourceMappingURL=getSpec.js.map

package/lib/cjs/utils/getSpec.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSpec.js","sourceRoot":"","sources":["../../../src/utils/getSpec.ts"],"names":[],"mappings":"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","sourcesContent":["import {cleanObject, Type, uniqBy} from \"@tsed/core\";\nimport {OpenSpec2, OpenSpec3} from \"@tsed/openspec\";\nimport {SpecTypes} from \"../domain/SpecTypes\";\nimport {JsonSchemaOptions} from \"../interfaces\";\nimport {buildPath} from \"./buildPath\";\nimport {getJsonEntityStore} from \"./getJsonEntityStore\";\nimport {getOperationsStores} from \"./getOperationsStores\";\nimport {mergeOperation} from \"./mergeOperation\";\nimport {operationIdFormatter} from \"./operationIdFormatter\";\n\nexport interface SpecSerializerOptions extends JsonSchemaOptions {\n  specType?: SpecTypes.SWAGGER | SpecTypes.OPENAPI;\n  /**\n   * Paths\n   */\n  paths?: any;\n  /**\n   * Root path. This paths will be added to all generated paths Object.\n   */\n  rootPath?: string;\n  /**\n   * A function to generate the operationId.\n   */\n  operationIdFormatter?: (name: string, propertyKey: string, path: string) => string;\n  /**\n   * A pattern to generate the operationId.\n   */\n  operationIdPattern?: string;\n}\n\nexport interface OS3SpecSerializerOptions extends SpecSerializerOptions {\n  /**\n   * Define Spec types level\n   */\n  specType: SpecTypes.OPENAPI;\n}\n\nexport interface OS2SpecSerializerOptions extends SpecSerializerOptions {\n  /**\n   * Define Spec types level\n   */\n  specType: SpecTypes.SWAGGER;\n}\n\n/**\n * @ignore\n */\nconst caches: Map<Type<any>, Map<string, any>> = new Map();\n\n/**\n * @ignore\n */\nfunction get(model: Type<any>, options: any, cb: any) {\n  if (!caches.has(model)) {\n    caches.set(model, new Map());\n  }\n\n  const cache = caches.get(model)!;\n  const key = JSON.stringify(options);\n\n  if (!cache.has(key)) {\n    cache.set(key, cb());\n  }\n\n  return cache.get(key);\n}\n\n/**\n * Return the swagger or open spec for the given class.\n * @param model\n * @param options\n */\nexport function getSpec(model: Type<any>, options: OS2SpecSerializerOptions): Partial<OpenSpec2>;\nexport function getSpec(model: Type<any>): Partial<OpenSpec2>;\nexport function getSpec(model: Type<any>, options: SpecSerializerOptions): Partial<OpenSpec2>;\n/**\n * Return the swagger or open spec for the given class.\n * @param model\n * @param options\n */\nexport function getSpec(model: Type<any>, options: OS3SpecSerializerOptions): Partial<OpenSpec3>;\n/**\n * Return the swagger or open spec for the given class.\n * @param model\n * @param options\n */\nexport function getSpec(model: Type<any>, options: SpecSerializerOptions = {}): Partial<OpenSpec2 | OpenSpec3> {\n  if (!options.specType) {\n    options.specType = SpecTypes.OPENAPI;\n  }\n\n  options = {\n    ...options,\n    operationIdFormatter: options.operationIdFormatter || operationIdFormatter(options.operationIdPattern),\n    root: false,\n    specType: options.specType\n  };\n\n  return get(model, options, () => {\n    const store = getJsonEntityStore(model);\n    const {specType = SpecTypes.OPENAPI, schemas = {}, paths = {}, rootPath = \"/\", tags = []} = options;\n    const ctrlPath = store.path;\n    const defaultTags = cleanObject({\n      name: store.schema.getName(),\n      description: store.schema.get(\"description\")\n    });\n\n    const specJson: any = {paths};\n\n    getOperationsStores(model).forEach((operationStore) => {\n      if (operationStore.store.get(\"hidden\")) {\n        return;\n      }\n\n      const operation = operationStore.operation!.toJSON({...options, specType, schemas});\n\n      operationStore.operation!.operationPaths.forEach(({path, method}: {path: string; method: string}) => {\n        if (method) {\n          mergeOperation(specJson, operation, {\n            rootPath: buildPath(rootPath + ctrlPath),\n            path,\n            method,\n            defaultTags,\n            tags,\n            specType,\n            operationId: (path: string) =>\n              options.operationIdFormatter!(\n                operationStore.parent.schema.get(\"name\") || operationStore.parent.targetName,\n                operationStore.propertyName,\n                path\n              )\n          });\n        }\n      });\n    });\n\n    specJson.tags = uniqBy(tags, \"name\");\n\n    if (Object.keys(schemas).length) {\n      if (specType === SpecTypes.OPENAPI) {\n        specJson.components = {\n          schemas\n        };\n      } else {\n        specJson.definitions = schemas;\n      }\n    }\n\n    return specJson;\n  });\n}\n"]}
+{"version":3,"file":"getSpec.js","sourceRoot":"","sources":["../../../src/utils/getSpec.ts"],"names":[],"mappings":"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","sourcesContent":["import {cleanObject, isArray, Type, uniqBy} from \"@tsed/core\";\nimport {OpenSpec3} from \"@tsed/openspec\";\nimport {SpecTypes} from \"../domain/SpecTypes\";\nimport {JsonSchemaOptions} from \"../interfaces/JsonSchemaOptions\";\nimport {buildPath} from \"./buildPath\";\nimport {getJsonEntityStore} from \"./getJsonEntityStore\";\nimport {getOperationsStores} from \"./getOperationsStores\";\nimport {mergeOperation} from \"./mergeOperation\";\nimport {operationIdFormatter} from \"./operationIdFormatter\";\nimport {mergeSpec} from \"./mergeSpec\";\n\nexport type JsonTokenOptions = ({token: Type<any>} & Partial<SpecSerializerOptions>)[];\n\nexport interface SpecSerializerOptions extends JsonSchemaOptions {\n  /**\n   * Paths\n   */\n  paths?: any;\n  /**\n   * Root path. This paths will be added to all generated paths Object.\n   */\n  rootPath?: string;\n  /**\n   * A function to generate the operationId.\n   */\n  operationIdFormatter?: (name: string, propertyKey: string, path: string) => string;\n  /**\n   * A pattern to generate the operationId.\n   */\n  operationIdPattern?: string;\n}\n\n/**\n * @ignore\n */\nconst caches: Map<Type<any>, Map<string, any>> = new Map();\n\n/**\n * @ignore\n */\nfunction get(model: Type<any>, options: any, cb: any) {\n  if (!caches.has(model)) {\n    caches.set(model, new Map());\n  }\n\n  const cache = caches.get(model)!;\n  const key = JSON.stringify(options);\n\n  if (!cache.has(key)) {\n    cache.set(key, cb());\n  }\n\n  return cache.get(key);\n}\n\nfunction generate(model: Type<any>, options: SpecSerializerOptions) {\n  const store = getJsonEntityStore(model);\n  const {schemas = {}, paths = {}, rootPath = \"/\", tags = []} = options;\n  const specType = SpecTypes.OPENAPI;\n  const ctrlPath = store.path;\n  const defaultTags = cleanObject({\n    name: store.schema.getName(),\n    description: store.schema.get(\"description\")\n  });\n\n  const specJson: any = {paths};\n\n  getOperationsStores(model).forEach((operationStore) => {\n    if (operationStore.store.get(\"hidden\")) {\n      return;\n    }\n\n    const operation = operationStore.operation!.toJSON({...options, specType, schemas});\n\n    operationStore.operation!.operationPaths.forEach(({path, method}: {path: string; method: string}) => {\n      if (method) {\n        mergeOperation(specJson, operation, {\n          rootPath: buildPath(rootPath + ctrlPath),\n          path,\n          method,\n          defaultTags,\n          tags,\n          specType,\n          operationId: (path: string) =>\n            options.operationIdFormatter!(\n              operationStore.parent.schema.get(\"name\") || operationStore.parent.targetName,\n              operationStore.propertyName,\n              path\n            )\n        });\n      }\n    });\n  });\n\n  specJson.tags = uniqBy(tags, \"name\");\n\n  if (Object.keys(schemas).length) {\n    specJson.components = {\n      schemas\n    };\n  }\n\n  return specJson;\n}\n\n/**\n * Return the swagger or open spec for the given class.\n * @param model\n * @param options\n */\nexport function getSpec(model: Type<any> | JsonTokenOptions, options: SpecSerializerOptions = {}): Partial<OpenSpec3> {\n  options = {\n    ...options,\n    operationIdFormatter: options.operationIdFormatter || operationIdFormatter(options.operationIdPattern),\n    root: false\n  };\n\n  if (isArray(model)) {\n    let finalSpec: any = {};\n\n    options = {\n      ...options,\n      specType: SpecTypes.OPENAPI,\n      paths: {},\n      tags: [],\n      schemas: {},\n      append(spec: any) {\n        finalSpec = mergeSpec(finalSpec, spec);\n      }\n    };\n\n    model.forEach(({token, ...opts}) => {\n      const spec = getSpec(token, {\n        ...options,\n        ...opts\n      });\n\n      options.append(spec);\n    });\n\n    return finalSpec;\n  }\n\n  return get(model, options, () => generate(model, options));\n}\n"]}

package/lib/cjs/utils/getSpecType.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSpecTypeFromSpec = exports.getSpecType = void 0;
+const SpecTypes_1 = require("../domain/SpecTypes");
+/**
+ * @ignore
+ * @param version
+ */
+function getSpecType(version) {
+    return version.startsWith("3.") ? SpecTypes_1.SpecTypes.OPENAPI : SpecTypes_1.SpecTypes.SWAGGER;
+}
+exports.getSpecType = getSpecType;
+/**
+ * @ignore
+ * @param spec
+ */
+function getSpecTypeFromSpec(spec) {
+    return "openapi" in spec ? SpecTypes_1.SpecTypes.OPENAPI : SpecTypes_1.SpecTypes.SWAGGER;
+}
+exports.getSpecTypeFromSpec = getSpecTypeFromSpec;
+//# sourceMappingURL=getSpecType.js.map

package/lib/cjs/utils/getSpecType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getSpecType.js","sourceRoot":"","sources":["../../../src/utils/getSpecType.ts"],"names":[],"mappings":";;;AACA,mDAA8C;AAE9C;;;GAGG;AACH,SAAgB,WAAW,CAAC,OAAe;IACzC,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,qBAAS,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAS,CAAC,OAAO,CAAC;AAC1E,CAAC;AAFD,kCAEC;AAED;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,IAAoC;IACtE,OAAO,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,qBAAS,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAS,CAAC,OAAO,CAAC;AACnE,CAAC;AAFD,kDAEC","sourcesContent":["import {OpenSpec2, OpenSpec3} from \"@tsed/openspec\";\nimport {SpecTypes} from \"../domain/SpecTypes\";\n\n/**\n * @ignore\n * @param version\n */\nexport function getSpecType(version: string) {\n  return version.startsWith(\"3.\") ? SpecTypes.OPENAPI : SpecTypes.SWAGGER;\n}\n\n/**\n * @ignore\n * @param spec\n */\nexport function getSpecTypeFromSpec(spec: Partial<OpenSpec2 | OpenSpec3>) {\n  return \"openapi\" in spec ? SpecTypes.OPENAPI : SpecTypes.SWAGGER;\n}\n"]}

package/lib/cjs/utils/mapNullableType.js

@@ -7,16 +7,11 @@ function hasNullable(obj) {
     return obj.oneOf.find((o) => o.type === "null");
 }
 function mapNullableType(obj, schema, options) {
-    if (!schema.isNullable) {
+    if (!(schema === null || schema === void 0 ? void 0 : schema.isNullable)) {
         return obj;
     }
     let types = [].concat(obj.type).filter(Boolean);
     switch (options.specType) {
-        case SpecTypes_1.SpecTypes.SWAGGER:
-            if (!obj.allOf && !obj.$ref) {
-                obj.type = (0, core_1.uniq)(["null", ...types]);
-            }
-            break;
         default:
         case SpecTypes_1.SpecTypes.JSON:
             if (obj.oneOf) {

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

@@ -1 +1 @@
-{"version":3,"file":"mapNullableType.js","sourceRoot":"","sources":["../../../src/utils/mapNullableType.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAEhC,mDAA8C;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,SAAgB,eAAe,CAAC,GAAQ,EAAE,MAAkB,EAAE,OAA0B;IACtF,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,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,qBAAS,CAAC,OAAO;YACpB,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;gBAC3B,GAAG,CAAC,IAAI,GAAG,IAAA,WAAI,EAAC,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;aACrC;YACD,MAAM;QACR,QAAQ;QACR,KAAK,qBAAS,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,IAAA,WAAI,EAAC,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;aACrC;YACD,MAAM;QAER,KAAK,qBAAS,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;AAxCD,0CAwCC","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, 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,qCAAgC;AAEhC,mDAA8C;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,SAAgB,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,qBAAS,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,IAAA,WAAI,EAAC,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;aACrC;YACD,MAAM;QAER,KAAK,qBAAS,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;AAnCD,0CAmCC","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/cjs/utils/mapOpenSpec.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapOpenSpec = void 0;
+const core_1 = require("@tsed/core");
+const getSpecType_1 = require("./getSpecType");
+const mapOpenSpec2_1 = require("./mapOpenSpec2");
+const SpecTypes_1 = require("../domain/SpecTypes");
+const mapOpenSpec3_1 = require("./mapOpenSpec3");
+const mergeSpec_1 = require("./mergeSpec");
+/**
+ * @ignore
+ * @param spec
+ * @param fileSpec
+ * @param version
+ * @param acceptMimes
+ * @param specVersion
+ */
+function mapOpenSpec(spec, { fileSpec, acceptMimes, specVersion, version }) {
+    specVersion = specVersion || (0, core_1.getValue)(spec, "openapi", (0, core_1.getValue)(spec, "swagger", "2.0"));
+    const options = {
+        specVersion,
+        acceptMimes
+    };
+    switch ((0, getSpecType_1.getSpecType)(specVersion)) {
+        case SpecTypes_1.SpecTypes.OPENAPI:
+            spec = (0, mapOpenSpec3_1.mapOpenSpec3)(spec, options);
+            fileSpec = fileSpec ? (0, mapOpenSpec3_1.mapOpenSpec3)(fileSpec, options) : fileSpec;
+            break;
+        default:
+        case SpecTypes_1.SpecTypes.SWAGGER:
+            spec = (0, mapOpenSpec2_1.mapOpenSpec2)(spec, options);
+            fileSpec = fileSpec ? (0, mapOpenSpec2_1.mapOpenSpec2)(fileSpec, options) : fileSpec;
+            break;
+    }
+    spec = (0, mergeSpec_1.mergeSpec)(spec, fileSpec);
+    (0, core_1.setValue)(spec, "info.title", (0, core_1.getValue)(spec, "info.title", "Api documentation"));
+    (0, core_1.setValue)(spec, "info.version", (0, core_1.getValue)(spec, "info.version", version));
+    return spec;
+}
+exports.mapOpenSpec = mapOpenSpec;
+//# sourceMappingURL=mapOpenSpec.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mapOpenSpec.js","sourceRoot":"","sources":["../../../src/utils/mapOpenSpec.ts"],"names":[],"mappings":";;;AAAA,qCAA8C;AAE9C,+CAA0C;AAC1C,iDAA4C;AAC5C,mDAA8C;AAC9C,iDAA4C;AAC5C,2CAAsC;AAEtC;;;;;;;GAOG;AACH,SAAgB,WAAW,CAAC,IAAS,EAAE,EAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAM;IACvF,WAAW,GAAG,WAAW,IAAI,IAAA,eAAQ,EAAmB,IAAI,EAAE,SAAS,EAAE,IAAA,eAAQ,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;IAE3G,MAAM,OAAO,GAAG;QACd,WAAW;QACX,WAAW;KACZ,CAAC;IAEF,QAAQ,IAAA,yBAAW,EAAC,WAAW,CAAC,EAAE;QAChC,KAAK,qBAAS,CAAC,OAAO;YACpB,IAAI,GAAG,IAAA,2BAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACnC,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,2BAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YACjE,MAAM;QACR,QAAQ;QACR,KAAK,qBAAS,CAAC,OAAO;YACpB,IAAI,GAAG,IAAA,2BAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACnC,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,2BAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YACjE,MAAM;KACT;IAED,IAAI,GAAG,IAAA,qBAAS,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEjC,IAAA,eAAQ,EAAC,IAAI,EAAE,YAAY,EAAE,IAAA,eAAQ,EAAC,IAAI,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAChF,IAAA,eAAQ,EAAC,IAAI,EAAE,cAAc,EAAE,IAAA,eAAQ,EAAC,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;IAExE,OAAO,IAAI,CAAC;AACd,CAAC;AA1BD,kCA0BC","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/cjs/utils/mapOpenSpec2.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapOpenSpec2 = void 0;
+const core_1 = require("@tsed/core");
+const mapOpenSpecInfo_1 = require("./mapOpenSpecInfo");
+/**
+ * @ignore
+ * @param spec
+ * @param version
+ * @param specVersion
+ * @param acceptMimes
+ */
+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: (0, core_1.uniq)([...acceptMimes, ...consumes]),
+        produces: (0, core_1.uniq)([...produces]),
+        info: (0, mapOpenSpecInfo_1.mapOpenSpecInfo)((0, core_1.getValue)(spec, "info", {})),
+        paths,
+        host,
+        basePath,
+        schemes,
+        definitions,
+        parameters,
+        responses,
+        security,
+        securityDefinitions,
+        tags,
+        externalDocs
+    };
+}
+exports.mapOpenSpec2 = mapOpenSpec2;
+//# sourceMappingURL=mapOpenSpec2.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mapOpenSpec2.js","sourceRoot":"","sources":["../../../src/utils/mapOpenSpec2.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAE1C,uDAAkD;AAElD;;;;;;GAMG;AACH,SAAgB,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,IAAA,WAAI,EAAC,CAAC,GAAG,WAAW,EAAE,GAAG,QAAQ,CAAC,CAAC;QAC7C,QAAQ,EAAE,IAAA,WAAI,EAAS,CAAC,GAAG,QAAQ,CAAC,CAAC;QACrC,IAAI,EAAE,IAAA,iCAAe,EAAC,IAAA,eAAQ,EAAC,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;AArCD,oCAqCC","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/cjs/utils/mapOpenSpec3.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapOpenSpec3 = void 0;
+const core_1 = require("@tsed/core");
+const mapOpenSpecInfo_1 = require("./mapOpenSpecInfo");
+/**
+ * @ignore
+ * @param spec
+ * @param version
+ * @param specVersion
+ */
+function mapOpenSpec3(spec, { specVersion }) {
+    const { servers, paths, components, security, tags, externalDocs } = spec;
+    return {
+        openapi: specVersion,
+        info: (0, mapOpenSpecInfo_1.mapOpenSpecInfo)((0, core_1.getValue)(spec, "info", {})),
+        servers,
+        paths,
+        components,
+        security,
+        tags,
+        externalDocs
+    };
+}
+exports.mapOpenSpec3 = mapOpenSpec3;
+//# sourceMappingURL=mapOpenSpec3.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mapOpenSpec3.js","sourceRoot":"","sources":["../../../src/utils/mapOpenSpec3.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,uDAAkD;AAElD;;;;;GAKG;AACH,SAAgB,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,IAAA,iCAAe,EAAC,IAAA,eAAQ,EAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACjD,OAAO;QACP,KAAK;QACL,UAAU;QACV,QAAQ;QACR,IAAI;QACJ,YAAY;KACb,CAAC;AACJ,CAAC;AAbD,oCAaC","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/cjs/utils/mapOpenSpecInfo.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapOpenSpecInfo = void 0;
+const core_1 = require("@tsed/core");
+/**
+ * @ignore
+ * @param info
+ */
+function mapOpenSpecInfo(info) {
+    const { title, description, version, termsOfService, contact, license } = info;
+    return (0, core_1.cleanObject)({
+        version,
+        title,
+        description,
+        termsOfService,
+        contact,
+        license
+    });
+}
+exports.mapOpenSpecInfo = mapOpenSpecInfo;
+//# sourceMappingURL=mapOpenSpecInfo.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mapOpenSpecInfo.js","sourceRoot":"","sources":["../../../src/utils/mapOpenSpecInfo.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAGvC;;;GAGG;AACH,SAAgB,eAAe,CAAC,IAA2B;IACzD,MAAM,EAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC;IAE7E,OAAO,IAAA,kBAAW,EAAC;QACjB,OAAO;QACP,KAAK;QACL,WAAW;QACX,cAAc;QACd,OAAO;QACP,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAXD,0CAWC","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/cjs/utils/matchGroups.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.matchGroups = void 0;
 const tslib_1 = require("tslib");
-const micromatch_1 = (0, tslib_1.__importDefault)(require("micromatch"));
+const micromatch_1 = tslib_1.__importDefault(require("micromatch"));
 /**
  * @ignore
  */

package/lib/cjs/utils/matchGroups.js.map

@@ -1 +1 @@
-{"version":3,"file":"matchGroups.js","sourceRoot":"","sources":["../../../src/utils/matchGroups.ts"],"names":[],"mappings":";;;;AAAA,yEAAoC;AAEpC;;GAEG;AACH,SAAgB,WAAW,CAAC,MAAgB,EAAE,cAAwB,EAAE;IACtE,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9G,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAExE,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,IAAI,WAAW,CAAC,MAAM,IAAI,IAAA,oBAAU,EAAC,cAAc,EAAE,WAAW,CAAC,CAAC,MAAM,EAAE;YACxE,OAAO,IAAI,CAAC;SACb;KACF;IAED,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,OAAO,CAAC,IAAA,oBAAU,EAChB,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAChD,WAAW,CACZ,CAAC,MAAM,CAAC;KACV;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAlBD,kCAkBC","sourcesContent":["import micromatch from \"micromatch\";\n\n/**\n * @ignore\n */\nexport function matchGroups(groups: string[], compareWith: string[] = []) {\n  const groupsExcludes = groups.filter((group) => group.startsWith(\"!\")).map((group) => group.replace(\"!\", \"\"));\n  const groupsIncludes = groups.filter((group) => !group.startsWith(\"!\"));\n\n  if (groupsExcludes.length) {\n    if (compareWith.length && micromatch(groupsExcludes, compareWith).length) {\n      return true;\n    }\n  }\n\n  if (groupsIncludes.length) {\n    return !micromatch(\n      groups.filter((group) => !group.startsWith(\"!\")),\n      compareWith\n    ).length;\n  }\n\n  return false;\n}\n"]}
+{"version":3,"file":"matchGroups.js","sourceRoot":"","sources":["../../../src/utils/matchGroups.ts"],"names":[],"mappings":";;;;AAAA,oEAAoC;AAEpC;;GAEG;AACH,SAAgB,WAAW,CAAC,MAAgB,EAAE,cAAwB,EAAE;IACtE,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9G,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAExE,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,IAAI,WAAW,CAAC,MAAM,IAAI,IAAA,oBAAU,EAAC,cAAc,EAAE,WAAW,CAAC,CAAC,MAAM,EAAE;YACxE,OAAO,IAAI,CAAC;SACb;KACF;IAED,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,OAAO,CAAC,IAAA,oBAAU,EAChB,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAChD,WAAW,CACZ,CAAC,MAAM,CAAC;KACV;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAlBD,kCAkBC","sourcesContent":["import micromatch from \"micromatch\";\n\n/**\n * @ignore\n */\nexport function matchGroups(groups: string[], compareWith: string[] = []) {\n  const groupsExcludes = groups.filter((group) => group.startsWith(\"!\")).map((group) => group.replace(\"!\", \"\"));\n  const groupsIncludes = groups.filter((group) => !group.startsWith(\"!\"));\n\n  if (groupsExcludes.length) {\n    if (compareWith.length && micromatch(groupsExcludes, compareWith).length) {\n      return true;\n    }\n  }\n\n  if (groupsIncludes.length) {\n    return !micromatch(\n      groups.filter((group) => !group.startsWith(\"!\")),\n      compareWith\n    ).length;\n  }\n\n  return false;\n}\n"]}

package/lib/cjs/utils/mergeOperation.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"mergeOperation.js","sourceRoot":"","sources":["../../../src/utils/mergeOperation.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,yDAAoD;AACpD,mEAA8D;AAe9D;;GAEG;AACH,SAAgB,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,IAAA,6CAAqB,EAAC,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,qBAAS,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,IAAA,mCAAgB,EAAC,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;AA1CD,wCA0CC","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,mDAA8C;AAC9C,yDAAoD;AACpD,mEAA8D;AAe9D;;GAEG;AACH,SAAgB,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,IAAA,6CAAqB,EAAC,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,qBAAS,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,IAAA,mCAAgB,EAAC,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;AA3CD,wCA2CC","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/cjs/utils/ref.js

@@ -48,14 +48,6 @@ function createRef(name, schema, options) {
                     writeOnly,
                     oneOf: [ref]
                 });
-            case SpecTypes_1.SpecTypes.SWAGGER: // TODO unsupported feature
-                if (readOnly || writeOnly) {
-                    return (0, core_1.cleanObject)({
-                        readOnly,
-                        writeOnly,
-                        allOf: [ref]
-                    });
-                }
         }
     }
     return ref;

package/lib/cjs/utils/ref.js.map

@@ -1 +1 @@
-{"version":3,"file":"ref.js","sourceRoot":"","sources":["../../../src/utils/ref.ts"],"names":[],"mappings":";;;AAAA,6CAAuC;AAEvC,mDAA8C;AAE9C,qCAAuC;AAEvC;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA0B;IACzC,MAAM,EAAC,IAAI,GAAG,KAAK,OAAO,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,aAAa,EAAE,EAAC,GAAG,OAAO,CAAC;IAEvG,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,IAAY,EAAE,OAA0B;IACpE,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAC3C,OAAO,IAAA,wBAAU,EAAC,GAAG,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;KAC1D;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAND,sCAMC;AAED;;GAEG;AACH,SAAgB,SAAS,CAAC,IAAY,EAAE,MAAkB,EAAE,OAA0B;IACpF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG;QACV,IAAI,EAAE,GAAG,IAAI,IAAI,IAAI,EAAE;KACxB,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC;IACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC;IACnC,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC;IAErC,IAAI,QAAQ,IAAI,QAAQ,IAAI,SAAS,EAAE;QACrC,QAAQ,OAAO,CAAC,QAAQ,EAAE;YACxB,KAAK,qBAAS,CAAC,OAAO;gBACpB,OAAO,IAAA,kBAAW,EAAC;oBACjB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;oBACrC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;oBACrC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;oBACvC,KAAK,EAAE,CAAC,GAAG,CAAC;iBACb,CAAC,CAAC;YACL,KAAK,qBAAS,CAAC,IAAI;gBACjB,OAAO,IAAA,kBAAW,EAAC;oBACjB,QAAQ;oBACR,SAAS;oBACT,KAAK,EAAE,CAAC,GAAG,CAAC;iBACb,CAAC,CAAC;YACL,KAAK,qBAAS,CAAC,OAAO,EAAE,2BAA2B;gBACjD,IAAI,QAAQ,IAAI,SAAS,EAAE;oBACzB,OAAO,IAAA,kBAAW,EAAC;wBACjB,QAAQ;wBACR,SAAS;wBACT,KAAK,EAAE,CAAC,GAAG,CAAC;qBACb,CAAC,CAAC;iBACJ;SACJ;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AArCD,8BAqCC;AAED;;GAEG;AACH,SAAgB,KAAK,CAAC,KAAiB,EAAE,MAAW,EAAE,OAA0B;IAC9E,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IAErD,OAAO,CAAC,OAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC;IAE3C,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAND,sBAMC","sourcesContent":["import {pascalCase} from \"pascal-case\";\nimport type {JsonSchema} from \"../domain/JsonSchema\";\nimport {SpecTypes} from \"../domain/SpecTypes\";\nimport {JsonSchemaOptions} from \"../interfaces/JsonSchemaOptions\";\nimport {cleanObject} from \"@tsed/core\";\n\n/**\n * ignore\n * @param options\n */\nfunction getHost(options: JsonSchemaOptions) {\n  const {host = `#/${options.specType === \"openapi3\" ? \"components/schemas\" : \"definitions\"}`} = options;\n\n  return host;\n}\n\n/**\n * @ignore\n */\nexport function createRefName(name: string, options: JsonSchemaOptions) {\n  if (options.groups && options.groups.length) {\n    return pascalCase(`${name} ${options.groups.join(\" \")}`);\n  }\n\n  return name;\n}\n\n/**\n * @ignore\n */\nexport function createRef(name: string, schema: JsonSchema, options: JsonSchemaOptions) {\n  const host = getHost(options);\n  const ref = {\n    $ref: `${host}/${name}`\n  };\n\n  const nullable = schema.isNullable;\n  const readOnly = schema.isReadOnly;\n  const writeOnly = schema.isWriteOnly;\n\n  if (nullable || readOnly || writeOnly) {\n    switch (options.specType) {\n      case SpecTypes.OPENAPI:\n        return cleanObject({\n          nullable: nullable ? true : undefined,\n          readOnly: readOnly ? true : undefined,\n          writeOnly: writeOnly ? true : undefined,\n          oneOf: [ref]\n        });\n      case SpecTypes.JSON:\n        return cleanObject({\n          readOnly,\n          writeOnly,\n          oneOf: [ref]\n        });\n      case SpecTypes.SWAGGER: // TODO unsupported feature\n        if (readOnly || writeOnly) {\n          return cleanObject({\n            readOnly,\n            writeOnly,\n            allOf: [ref]\n          });\n        }\n    }\n  }\n\n  return ref;\n}\n\n/**\n * @ignore\n */\nexport function toRef(value: JsonSchema, schema: any, options: JsonSchemaOptions) {\n  const name = createRefName(value.getName(), options);\n\n  options.schemas![value.getName()] = schema;\n\n  return createRef(name, value, options);\n}\n"]}
+{"version":3,"file":"ref.js","sourceRoot":"","sources":["../../../src/utils/ref.ts"],"names":[],"mappings":";;;AAAA,6CAAuC;AAEvC,mDAA8C;AAE9C,qCAAuC;AAEvC;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA0B;IACzC,MAAM,EAAC,IAAI,GAAG,KAAK,OAAO,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,aAAa,EAAE,EAAC,GAAG,OAAO,CAAC;IAEvG,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,IAAY,EAAE,OAA0B;IACpE,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAC3C,OAAO,IAAA,wBAAU,EAAC,GAAG,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;KAC1D;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAND,sCAMC;AAED;;GAEG;AACH,SAAgB,SAAS,CAAC,IAAY,EAAE,MAAkB,EAAE,OAA0B;IACpF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG;QACV,IAAI,EAAE,GAAG,IAAI,IAAI,IAAI,EAAE;KACxB,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC;IACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC;IACnC,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC;IAErC,IAAI,QAAQ,IAAI,QAAQ,IAAI,SAAS,EAAE;QACrC,QAAQ,OAAO,CAAC,QAAQ,EAAE;YACxB,KAAK,qBAAS,CAAC,OAAO;gBACpB,OAAO,IAAA,kBAAW,EAAC;oBACjB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;oBACrC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;oBACrC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;oBACvC,KAAK,EAAE,CAAC,GAAG,CAAC;iBACb,CAAC,CAAC;YACL,KAAK,qBAAS,CAAC,IAAI;gBACjB,OAAO,IAAA,kBAAW,EAAC;oBACjB,QAAQ;oBACR,SAAS;oBACT,KAAK,EAAE,CAAC,GAAG,CAAC;iBACb,CAAC,CAAC;SACN;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AA7BD,8BA6BC;AAED;;GAEG;AACH,SAAgB,KAAK,CAAC,KAAiB,EAAE,MAAW,EAAE,OAA0B;IAC9E,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IAErD,OAAO,CAAC,OAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC;IAE3C,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAND,sBAMC","sourcesContent":["import {pascalCase} from \"pascal-case\";\nimport type {JsonSchema} from \"../domain/JsonSchema\";\nimport {SpecTypes} from \"../domain/SpecTypes\";\nimport {JsonSchemaOptions} from \"../interfaces/JsonSchemaOptions\";\nimport {cleanObject} from \"@tsed/core\";\n\n/**\n * ignore\n * @param options\n */\nfunction getHost(options: JsonSchemaOptions) {\n  const {host = `#/${options.specType === \"openapi3\" ? \"components/schemas\" : \"definitions\"}`} = options;\n\n  return host;\n}\n\n/**\n * @ignore\n */\nexport function createRefName(name: string, options: JsonSchemaOptions) {\n  if (options.groups && options.groups.length) {\n    return pascalCase(`${name} ${options.groups.join(\" \")}`);\n  }\n\n  return name;\n}\n\n/**\n * @ignore\n */\nexport function createRef(name: string, schema: JsonSchema, options: JsonSchemaOptions) {\n  const host = getHost(options);\n  const ref = {\n    $ref: `${host}/${name}`\n  };\n\n  const nullable = schema.isNullable;\n  const readOnly = schema.isReadOnly;\n  const writeOnly = schema.isWriteOnly;\n\n  if (nullable || readOnly || writeOnly) {\n    switch (options.specType) {\n      case SpecTypes.OPENAPI:\n        return cleanObject({\n          nullable: nullable ? true : undefined,\n          readOnly: readOnly ? true : undefined,\n          writeOnly: writeOnly ? true : undefined,\n          oneOf: [ref]\n        });\n      case SpecTypes.JSON:\n        return cleanObject({\n          readOnly,\n          writeOnly,\n          oneOf: [ref]\n        });\n    }\n  }\n\n  return ref;\n}\n\n/**\n * @ignore\n */\nexport function toRef(value: JsonSchema, schema: any, options: JsonSchemaOptions) {\n  const name = createRefName(value.getName(), options);\n\n  options.schemas![value.getName()] = schema;\n\n  return createRef(name, value, options);\n}\n"]}

package/lib/cjs/utils/serializeEnumValues.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serializeEnumValues = exports.serializeEnum = void 0;
+const core_1 = require("@tsed/core");
+const serializeEnum = (enumValue) => {
+    if ((0, core_1.isObject)(enumValue) && enumValue !== null) {
+        return Object.entries(enumValue).reduce((acc, [key, value]) => {
+            if (isNaN(+key)) {
+                return acc.concat(value);
+            }
+            return acc;
+        }, []);
+    }
+    return enumValue;
+};
+exports.serializeEnum = serializeEnum;
+function serializeEnumValues(enumValues) {
+    const values = enumValues.reduce((acc, value) => acc.concat((0, exports.serializeEnum)(value)), []);
+    const getValue = (value) => {
+        return value === null ? "null" : typeof value;
+    };
+    const types = values.reduce((set, value) => set.add(getValue(value)), new Set());
+    return { values: (0, core_1.uniq)(values), types };
+}
+exports.serializeEnumValues = serializeEnumValues;
+//# sourceMappingURL=serializeEnumValues.js.map

package/lib/cjs/utils/serializeEnumValues.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serializeEnumValues.js","sourceRoot":"","sources":["../../../src/utils/serializeEnumValues.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAEnC,MAAM,aAAa,GAAG,CAAC,SAAc,EAAE,EAAE;IAC9C,IAAI,IAAA,eAAQ,EAAC,SAAS,CAAC,IAAI,SAAS,KAAK,IAAI,EAAE;QAC7C,OAAO,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,CAAM,EAAE,EAAE;YACtE,IAAI,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE;gBACf,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC1B;YAED,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;KACR;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAZW,QAAA,aAAa,iBAYxB;AAEF,SAAgB,mBAAmB,CAAC,UAAiB;IACnD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEvF,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAE,EAAE;QAC9B,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC;IAChD,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAa,EAAE,KAAU,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IAEhG,OAAO,EAAC,MAAM,EAAE,IAAA,WAAI,EAAC,MAAM,CAAC,EAAE,KAAK,EAAC,CAAC;AACvC,CAAC;AAVD,kDAUC","sourcesContent":["import {isObject, uniq} from \"@tsed/core\";\n\nexport const serializeEnum = (enumValue: any) => {\n  if (isObject(enumValue) && enumValue !== null) {\n    return Object.entries(enumValue).reduce((acc: any, [key, value]: any) => {\n      if (isNaN(+key)) {\n        return acc.concat(value);\n      }\n\n      return acc;\n    }, []);\n  }\n\n  return enumValue;\n};\n\nexport function serializeEnumValues(enumValues: any[]) {\n  const values = enumValues.reduce((acc, value) => acc.concat(serializeEnum(value)), []);\n\n  const getValue = (value: any) => {\n    return value === null ? \"null\" : typeof value;\n  };\n\n  const types = values.reduce((set: Set<any>, value: any) => set.add(getValue(value)), new Set());\n\n  return {values: uniq(values), types};\n}\n"]}

package/lib/esm/components/anyMapper.js

@@ -1,7 +1,7 @@
-import { JsonLazyRef } from "../domain/JsonLazyRef";
-import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer";
-import { mapGenericsOptions } from "../utils/generics";
-import { toRef } from "../utils/ref";
+import { JsonLazyRef } from "../domain/JsonLazyRef.js";
+import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer.js";
+import { mapGenericsOptions } from "../utils/generics.js";
+import { toRef } from "../utils/ref.js";
 export function anyMapper(input, options = {}) {
     if (typeof input !== "object" || input === null) {
         return input;

package/lib/esm/components/classMapper.js

@@ -1,7 +1,7 @@
-import { JsonEntityStore } from "../domain/JsonEntityStore";
-import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer";
-import { mapGenericsOptions, popGenerics } from "../utils/generics";
-import { createRef, createRefName } from "../utils/ref";
+import { JsonEntityStore } from "../domain/JsonEntityStore.js";
+import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer.js";
+import { mapGenericsOptions, popGenerics } from "../utils/generics.js";
+import { createRef, createRefName } from "../utils/ref.js";
 export function classMapper(value, options) {
     const store = JsonEntityStore.from(value.class);
     const name = createRefName(store.schema.getName() || value.getName(), options);

package/lib/esm/components/genericsMapper.js

@@ -1,8 +1,8 @@
 import { isClass, isPrimitiveClass } from "@tsed/core";
-import { JsonEntityStore } from "../domain/JsonEntityStore";
-import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer";
-import { popGenerics } from "../utils/generics";
-import { getJsonType } from "../utils/getJsonType";
+import { JsonEntityStore } from "../domain/JsonEntityStore.js";
+import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer.js";
+import { popGenerics } from "../utils/generics.js";
+import { getJsonType } from "../utils/getJsonType.js";
 /**
  * @ignore
  */

package/lib/esm/components/inheritedClassMapper.js

@@ -1,6 +1,6 @@
 import { classOf, deepMerge } from "@tsed/core";
-import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer";
-import { getInheritedStores } from "../utils/getInheritedStores";
+import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer.js";
+import { getInheritedStores } from "../utils/getInheritedStores.js";
 /**
  * @ignore
  */

package/lib/esm/components/itemMapper.js

@@ -1,4 +1,4 @@
-import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer";
+import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer.js";
 export function itemMapper(value, options) {
     return value && value.isClass ? execMapper("class", value, options) : execMapper("any", value, options);
 }

package/lib/esm/components/lazyRefMapper.js

@@ -1,6 +1,6 @@
-import { registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer";
-import { mapGenericsOptions } from "../utils/generics";
-import { createRef, toRef } from "../utils/ref";
+import { registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer.js";
+import { mapGenericsOptions } from "../utils/generics.js";
+import { createRef, toRef } from "../utils/ref.js";
 export function lazyRefMapper(input, options) {
     var _a;
     const name = input.name;

package/lib/esm/components/mapMapper.js

@@ -1,5 +1,5 @@
-import { mapGenericsOptions } from "../utils/generics";
-import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer";
+import { mapGenericsOptions } from "../utils/generics.js";
+import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer.js";
 /**
  * Serialize class which inherit from Map like JsonMap, JsonOperation, JsonParameter.
  * @param input

package/lib/esm/components/objectMapper.js

@@ -1,7 +1,7 @@
 import { isArray } from "@tsed/core";
-import { alterIgnore } from "../hooks/alterIgnore";
-import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer";
-import { mapNullableType } from "../utils/mapNullableType";
+import { alterIgnore } from "../hooks/alterIgnore.js";
+import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer.js";
+import { mapNullableType } from "../utils/mapNullableType.js";
 /**
  * Serialize Any object to a json schema
  * @param input

package/lib/esm/components/ofMapper.js

@@ -1,4 +1,4 @@
-import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer";
+import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer.js";
 export function ofMapper(input, options, parent) {
     return input.map((value) => {
         return execMapper("item", value, {

package/lib/esm/components/propertiesMapper.js

@@ -1,4 +1,4 @@
-import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer";
+import { execMapper, registerJsonSchemaMapper } from "../registries/JsonSchemaMapperContainer.js";
 export function propertiesMapper(input, options, parent) {
     if (input.isClass) {
         return execMapper("class", input, options);