@tsed/schema 6.96.0 → 6.97.1

package/lib/cjs/components/objectMapper.js

@@ -4,6 +4,7 @@ exports.objectMapper = void 0;
 const core_1 = require("@tsed/core");
 const alterIgnore_1 = require("../hooks/alterIgnore");
 const JsonSchemaMapperContainer_1 = require("../registries/JsonSchemaMapperContainer");
+const mapNullableType_1 = require("../utils/mapNullableType");
 /**
  * Serialize Any object to a json schema
  * @param input
@@ -14,11 +15,13 @@ function objectMapper(input, options) {
     const { specType, operationIdFormatter, root, schemas, genericTypes, nestedGenerics, useAlias, genericLabels, ...ctx } = options;
     return Object.entries(input).reduce((obj, [key, value]) => {
         if (options.withIgnoredProps !== false && !(0, alterIgnore_1.alterIgnore)(value, ctx)) {
-            // remove groups to avoid bad schema generation over children models
-            obj[key] = (0, JsonSchemaMapperContainer_1.execMapper)("item", value, {
+            const opts = {
                 ...options,
                 groups: (input === null || input === void 0 ? void 0 : input.$forwardGroups) || (value === null || value === void 0 ? void 0 : value.$forwardGroups) ? options.groups : undefined
-            });
+            };
+            // remove groups to avoid bad schema generation over children models
+            obj[key] = (0, JsonSchemaMapperContainer_1.execMapper)("item", value, opts);
+            obj[key] = (0, mapNullableType_1.mapNullableType)(obj[key], value, opts);
         }
         return obj;
     }, (0, core_1.isArray)(input) ? [] : {});

package/lib/cjs/components/objectMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"objectMapper.js","sourceRoot":"","sources":["../../../src/components/objectMapper.ts"],"names":[],"mappings":";;;AAAA,qCAAmC;AAEnC,sDAAiD;AAEjD,uFAA6F;AAE7F;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,KAAU,EAAE,OAA0B;IACjE,MAAM,EAAC,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,GAAG,EAAC,GAAG,OAAO,CAAC;IAE/H,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAA6B,EAAE,EAAE;QAChD,IAAI,OAAO,CAAC,gBAAgB,KAAK,KAAK,IAAI,CAAC,IAAA,yBAAW,EAAC,KAAK,EAAE,GAAG,CAAC,EAAE;YAClE,oEAAoE;YACpE,GAAG,CAAC,GAAG,CAAC,GAAG,IAAA,sCAAU,EAAC,MAAM,EAAE,KAAK,EAAE;gBACnC,GAAG,OAAO;gBACV,MAAM,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,cAAc,MAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,cAAc,CAAA,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;aACpF,CAAC,CAAC;SACJ;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EACD,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CACzB,CAAC;AACJ,CAAC;AAjBD,oCAiBC;AAED,IAAA,oDAAwB,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC","sourcesContent":["import {isArray} from \"@tsed/core\";\nimport {JsonSchema} from \"../domain/JsonSchema\";\nimport {alterIgnore} from \"../hooks/alterIgnore\";\nimport {JsonSchemaOptions} from \"../interfaces/JsonSchemaOptions\";\nimport {execMapper, registerJsonSchemaMapper} from \"../registries/JsonSchemaMapperContainer\";\n\n/**\n * Serialize Any object to a json schema\n * @param input\n * @param options\n * @ignore\n */\nexport function objectMapper(input: any, options: JsonSchemaOptions) {\n  const {specType, operationIdFormatter, root, schemas, genericTypes, nestedGenerics, useAlias, genericLabels, ...ctx} = options;\n\n  return Object.entries(input).reduce<any>(\n    (obj, [key, value]: [string, any | JsonSchema]) => {\n      if (options.withIgnoredProps !== false && !alterIgnore(value, ctx)) {\n        // remove groups to avoid bad schema generation over children models\n        obj[key] = execMapper(\"item\", value, {\n          ...options,\n          groups: input?.$forwardGroups || value?.$forwardGroups ? options.groups : undefined\n        });\n      }\n\n      return obj;\n    },\n    isArray(input) ? [] : {}\n  );\n}\n\nregisterJsonSchemaMapper(\"object\", objectMapper);\n"]}
+{"version":3,"file":"objectMapper.js","sourceRoot":"","sources":["../../../src/components/objectMapper.ts"],"names":[],"mappings":";;;AAAA,qCAAmC;AAEnC,sDAAiD;AAEjD,uFAA6F;AAC7F,8DAAyD;AAEzD;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,KAAU,EAAE,OAA0B;IACjE,MAAM,EAAC,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,GAAG,EAAC,GAAG,OAAO,CAAC;IAE/H,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAA6B,EAAE,EAAE;QAChD,IAAI,OAAO,CAAC,gBAAgB,KAAK,KAAK,IAAI,CAAC,IAAA,yBAAW,EAAC,KAAK,EAAE,GAAG,CAAC,EAAE;YAClE,MAAM,IAAI,GAAG;gBACX,GAAG,OAAO;gBACV,MAAM,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,cAAc,MAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,cAAc,CAAA,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;aACpF,CAAC;YACF,oEAAoE;YACpE,GAAG,CAAC,GAAG,CAAC,GAAG,IAAA,sCAAU,EAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YAC3C,GAAG,CAAC,GAAG,CAAC,GAAG,IAAA,iCAAe,EAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;SACnD;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EACD,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CACzB,CAAC;AACJ,CAAC;AAnBD,oCAmBC;AAED,IAAA,oDAAwB,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC","sourcesContent":["import {isArray} from \"@tsed/core\";\nimport {JsonSchema} from \"../domain/JsonSchema\";\nimport {alterIgnore} from \"../hooks/alterIgnore\";\nimport {JsonSchemaOptions} from \"../interfaces/JsonSchemaOptions\";\nimport {execMapper, registerJsonSchemaMapper} from \"../registries/JsonSchemaMapperContainer\";\nimport {mapNullableType} from \"../utils/mapNullableType\";\n\n/**\n * Serialize Any object to a json schema\n * @param input\n * @param options\n * @ignore\n */\nexport function objectMapper(input: any, options: JsonSchemaOptions) {\n  const {specType, operationIdFormatter, root, schemas, genericTypes, nestedGenerics, useAlias, genericLabels, ...ctx} = options;\n\n  return Object.entries(input).reduce<any>(\n    (obj, [key, value]: [string, any | JsonSchema]) => {\n      if (options.withIgnoredProps !== false && !alterIgnore(value, ctx)) {\n        const opts = {\n          ...options,\n          groups: input?.$forwardGroups || value?.$forwardGroups ? options.groups : undefined\n        };\n        // remove groups to avoid bad schema generation over children models\n        obj[key] = execMapper(\"item\", value, opts);\n        obj[key] = mapNullableType(obj[key], value, opts);\n      }\n\n      return obj;\n    },\n    isArray(input) ? [] : {}\n  );\n}\n\nregisterJsonSchemaMapper(\"object\", objectMapper);\n"]}

package/lib/cjs/components/schemaMapper.js

@@ -6,8 +6,8 @@ const JsonAliasMap_1 = require("../domain/JsonAliasMap");
 const SpecTypes_1 = require("../domain/SpecTypes");
 const JsonSchemaMapperContainer_1 = require("../registries/JsonSchemaMapperContainer");
 const getRequiredProperties_1 = require("../utils/getRequiredProperties");
-const mapNullableType_1 = require("../utils/mapNullableType");
 const alterOneOf_1 = require("../hooks/alterOneOf");
+const mapNullableType_1 = require("../utils/mapNullableType");
 /**
  * @ignore
  */

package/lib/cjs/components/schemaMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemaMapper.js","sourceRoot":"","sources":["../../../src/components/schemaMapper.ts"],"names":[],"mappings":"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","sourcesContent":["import {isObject} from \"@tsed/core\";\nimport {mapAliasedProperties} from \"../domain/JsonAliasMap\";\nimport {JsonSchema} from \"../domain/JsonSchema\";\nimport {SpecTypes} from \"../domain/SpecTypes\";\nimport {JsonSchemaOptions} from \"../interfaces/JsonSchemaOptions\";\nimport {execMapper, hasMapper, registerJsonSchemaMapper} from \"../registries/JsonSchemaMapperContainer\";\nimport {getRequiredProperties} from \"../utils/getRequiredProperties\";\nimport {mapNullableType} from \"../utils/mapNullableType\";\nimport {alterOneOf} from \"../hooks/alterOneOf\";\n\n/**\n * @ignore\n */\nconst IGNORES = [\"name\", \"$required\", \"$hooks\", \"_nestedGenerics\", SpecTypes.OPENAPI, SpecTypes.SWAGGER, SpecTypes.JSON];\n/**\n * @ignore\n */\nconst IGNORES_OPENSPEC = [\"const\"];\nconst IGNORES_OS2 = [\"writeOnly\", \"readOnly\"];\n\n/**\n * @ignore\n */\nfunction isEmptyProperties(key: string, value: any) {\n  return typeof value === \"object\" && [\"items\", \"properties\", \"additionalProperties\"].includes(key) && Object.keys(value).length === 0;\n}\n\n/**\n * @ignore\n */\nfunction shouldMapAlias(key: string, value: any, useAlias: boolean) {\n  return typeof value === \"object\" && useAlias && [\"properties\", \"additionalProperties\"].includes(key);\n}\n\n/**\n * @ignore\n */\nfunction shouldSkipKey(key: string, {specType = SpecTypes.JSON, customKeys = false}: JsonSchemaOptions) {\n  return (\n    IGNORES.includes(key) ||\n    (key.startsWith(\"#\") && (customKeys === false || specType !== SpecTypes.JSON)) ||\n    (specType === SpecTypes.SWAGGER && IGNORES_OS2.includes(key)) ||\n    (specType !== SpecTypes.JSON && IGNORES_OPENSPEC.includes(key))\n  );\n}\n\nfunction isExample(key: string, value: any, options: JsonSchemaOptions) {\n  return key === \"examples\" && isObject(value) && [SpecTypes.OPENAPI, SpecTypes.SWAGGER].includes(options.specType!);\n}\n\nexport function schemaMapper(schema: JsonSchema, options: JsonSchemaOptions): any {\n  const {useAlias = true, schemas = {}} = options;\n  options = {\n    ...options,\n    useAlias,\n    schemas\n  };\n\n  let obj: any = [...schema.keys()]\n    .filter((key) => !shouldSkipKey(key, options))\n    .reduce((item: any, key) => {\n      let value = schema.get(key);\n\n      key = key.replace(/^#/, \"\");\n\n      if (key === \"type\") {\n        return {\n          ...item,\n          [key]: schema.getJsonType()\n        };\n      }\n\n      if (isExample(key, value, options)) {\n        key = \"example\";\n        value = Object.values(value)[0];\n      }\n\n      if (value && typeof value === \"object\" && hasMapper(key)) {\n        value = execMapper(key, value, options, schema);\n\n        if (isEmptyProperties(key, value)) {\n          return item;\n        }\n\n        if (shouldMapAlias(key, value, useAlias)) {\n          value = mapAliasedProperties(value, schema.alias);\n        }\n      }\n\n      return {\n        ...item,\n        [key]: value\n      };\n    }, {});\n\n  if (schema.isClass) {\n    obj = execMapper(\"inheritedClass\", obj, {...options, root: false, schemas, target: schema.getComputedType()});\n  }\n\n  obj = execMapper(\"generics\", obj, {...options, root: false, schemas} as any);\n\n  if (schema.has(options.specType as string)) {\n    obj = {\n      ...obj,\n      ...schema.get(options.specType as string).toJSON(options)\n    };\n  }\n\n  obj = getRequiredProperties(obj, schema, {...options, useAlias});\n  obj = mapNullableType(obj, schema, options);\n  obj = alterOneOf(obj, schema, options);\n\n  return obj;\n}\n\nregisterJsonSchemaMapper(\"schema\", schemaMapper);\n"]}
+{"version":3,"file":"schemaMapper.js","sourceRoot":"","sources":["../../../src/components/schemaMapper.ts"],"names":[],"mappings":"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","sourcesContent":["import {isObject} from \"@tsed/core\";\nimport {mapAliasedProperties} from \"../domain/JsonAliasMap\";\nimport {JsonSchema} from \"../domain/JsonSchema\";\nimport {SpecTypes} from \"../domain/SpecTypes\";\nimport {JsonSchemaOptions} from \"../interfaces/JsonSchemaOptions\";\nimport {execMapper, hasMapper, registerJsonSchemaMapper} from \"../registries/JsonSchemaMapperContainer\";\nimport {getRequiredProperties} from \"../utils/getRequiredProperties\";\nimport {alterOneOf} from \"../hooks/alterOneOf\";\nimport {mapNullableType} from \"../utils/mapNullableType\";\n\n/**\n * @ignore\n */\nconst IGNORES = [\"name\", \"$required\", \"$hooks\", \"_nestedGenerics\", SpecTypes.OPENAPI, SpecTypes.SWAGGER, SpecTypes.JSON];\n/**\n * @ignore\n */\nconst IGNORES_OPENSPEC = [\"const\"];\nconst IGNORES_OS2 = [\"writeOnly\", \"readOnly\"];\n\n/**\n * @ignore\n */\nfunction isEmptyProperties(key: string, value: any) {\n  return typeof value === \"object\" && [\"items\", \"properties\", \"additionalProperties\"].includes(key) && Object.keys(value).length === 0;\n}\n\n/**\n * @ignore\n */\nfunction shouldMapAlias(key: string, value: any, useAlias: boolean) {\n  return typeof value === \"object\" && useAlias && [\"properties\", \"additionalProperties\"].includes(key);\n}\n\n/**\n * @ignore\n */\nfunction shouldSkipKey(key: string, {specType = SpecTypes.JSON, customKeys = false}: JsonSchemaOptions) {\n  return (\n    IGNORES.includes(key) ||\n    (key.startsWith(\"#\") && (customKeys === false || specType !== SpecTypes.JSON)) ||\n    (specType === SpecTypes.SWAGGER && IGNORES_OS2.includes(key)) ||\n    (specType !== SpecTypes.JSON && IGNORES_OPENSPEC.includes(key))\n  );\n}\n\nfunction isExample(key: string, value: any, options: JsonSchemaOptions) {\n  return key === \"examples\" && isObject(value) && [SpecTypes.OPENAPI, SpecTypes.SWAGGER].includes(options.specType!);\n}\n\nexport function schemaMapper(schema: JsonSchema, options: JsonSchemaOptions): any {\n  const {useAlias = true, schemas = {}} = options;\n  options = {\n    ...options,\n    useAlias,\n    schemas\n  };\n\n  let obj: any = [...schema.keys()]\n    .filter((key) => !shouldSkipKey(key, options))\n    .reduce((item: any, key) => {\n      let value = schema.get(key);\n\n      key = key.replace(/^#/, \"\");\n\n      if (key === \"type\") {\n        return {\n          ...item,\n          [key]: schema.getJsonType()\n        };\n      }\n\n      if (isExample(key, value, options)) {\n        key = \"example\";\n        value = Object.values(value)[0];\n      }\n\n      if (value && typeof value === \"object\" && hasMapper(key)) {\n        value = execMapper(key, value, options, schema);\n\n        if (isEmptyProperties(key, value)) {\n          return item;\n        }\n\n        if (shouldMapAlias(key, value, useAlias)) {\n          value = mapAliasedProperties(value, schema.alias);\n        }\n      }\n\n      return {\n        ...item,\n        [key]: value\n      };\n    }, {});\n\n  if (schema.isClass) {\n    obj = execMapper(\"inheritedClass\", obj, {...options, root: false, schemas, target: schema.getComputedType()});\n  }\n\n  obj = execMapper(\"generics\", obj, {...options, root: false, schemas} as any);\n\n  if (schema.has(options.specType as string)) {\n    obj = {\n      ...obj,\n      ...schema.get(options.specType as string).toJSON(options)\n    };\n  }\n\n  obj = getRequiredProperties(obj, schema, {...options, useAlias});\n  obj = mapNullableType(obj, schema, options);\n  obj = alterOneOf(obj, schema, options);\n\n  return obj;\n}\n\nregisterJsonSchemaMapper(\"schema\", schemaMapper);\n"]}

package/lib/cjs/domain/JsonOperation.js

@@ -239,16 +239,12 @@ function buildSchemaFromBodyParameters(parameters, options) {
             refs.push(jsonParameter);
         }
     });
-    if (propsLength) {
-        schema.type("object");
-        return { schema: schema.toJSON(options), required: false, ...props };
-    }
-    if (refs.length === 1) {
-        return refs[0];
-    }
-    if (refs.length > 0) {
-        schema.allOf(refs);
+    if (!propsLength) {
+        if (refs.length === 1) {
+            return refs[0];
+        }
     }
+    schema.type("object");
     return { schema: schema.toJSON(options), required: false, ...props };
 }
 //# sourceMappingURL=JsonOperation.js.map

package/lib/cjs/domain/JsonOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonOperation.js","sourceRoot":"","sources":["../../../src/domain/JsonOperation.ts"],"names":[],"mappings":"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","sourcesContent":["import {deepMerge, uniq, uniqBy} from \"@tsed/core\";\nimport {OpenSpecSecurity, OpenSpecTag, OS3Operation} from \"@tsed/openspec\";\nimport {getStatusMessage} from \"../constants/httpStatusMessages\";\nimport {JsonHeader, JsonSchemaOptions} from \"../interfaces\";\nimport {isRedirectionStatus, isSuccessStatus} from \"../utils/isSuccessStatus\";\nimport {JsonMap} from \"./JsonMap\";\nimport {JsonParameter} from \"./JsonParameter\";\nimport {isParameterType, JsonParameterTypes} from \"./JsonParameterTypes\";\nimport {JsonRequestBody} from \"./JsonRequestBody\";\nimport {JsonResponse} from \"./JsonResponse\";\nimport {JsonSchema} from \"./JsonSchema\";\nimport {SpecTypes} from \"./SpecTypes\";\n\nexport interface JsonMethodPath {\n  path: string | RegExp;\n  method: string;\n  isFinal?: boolean;\n\n  [key: string]: any;\n}\n\nexport interface JsonOperationOptions extends OS3Operation<JsonSchema, JsonParameter, JsonMap<JsonResponse>> {\n  consumes: string[];\n  produces: string[];\n}\n\nexport class JsonOperation extends JsonMap<JsonOperationOptions> {\n  readonly operationPaths: Map<string, JsonMethodPath> = new Map();\n  #status: number;\n  #redirection: boolean = false;\n\n  constructor(obj: Partial<JsonOperationOptions> = {}) {\n    super({parameters: [], responses: new JsonMap(), ...obj});\n  }\n\n  get response(): JsonResponse | undefined {\n    return this.getResponses().get(this.getStatus().toString());\n  }\n\n  get status() {\n    return this.#status;\n  }\n\n  tags(tags: OpenSpecTag[]): this {\n    super.set(\"tags\", tags);\n\n    return this;\n  }\n\n  addTags(tags: OpenSpecTag[]) {\n    tags = uniqBy([...(this.get(\"tags\") || []), ...tags], \"name\");\n\n    return this.tags(tags);\n  }\n\n  summary(summary: string): this {\n    super.set(\"summary\", summary);\n\n    return this;\n  }\n\n  operationId(operationId: string): this {\n    this.set(\"operationId\", operationId);\n\n    return this;\n  }\n\n  responses(responses: JsonMap<any>): this {\n    this.set(\"responses\", responses);\n\n    return this;\n  }\n\n  defaultStatus(status: number) {\n    this.#status = status;\n\n    return this;\n  }\n\n  getStatus() {\n    return this.#status || 200;\n  }\n\n  setRedirection(status = 302) {\n    this.#redirection = true;\n    this.#status = status;\n    return this;\n  }\n\n  isRedirection(status?: number) {\n    if (this.#redirection) {\n      if (status) {\n        return isRedirectionStatus(status);\n      }\n    }\n\n    return this.#redirection;\n  }\n\n  addResponse(statusCode: string | number, response: JsonResponse) {\n    if ((isSuccessStatus(statusCode) || isRedirectionStatus(statusCode)) && !this.#status) {\n      const res = this.getResponseOf(200);\n\n      this.getResponses().set(statusCode.toString(), res).delete(\"200\");\n\n      this.defaultStatus(Number(statusCode));\n    }\n\n    const currentCode = statusCode === \"default\" ? this.getStatus().toString() : statusCode.toString();\n    const currentResponse = this.getResponses().get(currentCode);\n\n    if (!currentResponse) {\n      response.status = Number(currentCode);\n      this.getResponses().set(currentCode, response);\n    } else {\n      response.forEach((value, key) => {\n        if (![\"content\"].includes(key)) {\n          currentResponse.set(key, deepMerge(currentResponse.get(key), value));\n        }\n      });\n      currentResponse.status = Number(currentCode);\n    }\n\n    return this;\n  }\n\n  getResponses() {\n    return this.get(\"responses\") as JsonMap<JsonResponse>;\n  }\n\n  getResponseOf(status: number | string): JsonResponse {\n    return (status === \"default\" ? this.response : this.getResponses().get(String(status))) || new JsonResponse();\n  }\n\n  ensureResponseOf(status: number | string): JsonResponse {\n    this.addResponse(status, this.getResponseOf(status));\n    return this.getResponseOf(status);\n  }\n\n  getHeadersOf(status: number): Record<string, JsonHeader & {example: string}> {\n    return this.getResponseOf(status).get(\"headers\") || {};\n  }\n\n  getContentTypeOf(status: number): any {\n    return [...this.getResponseOf(status).get(\"content\").keys()].slice(-1)[0];\n  }\n\n  security(security: OpenSpecSecurity): this {\n    this.set(\"security\", security);\n\n    return this;\n  }\n\n  addSecurityScopes(name: string, scopes: string[]) {\n    const security = this.get(\"security\") || {};\n    security[name] = uniq([...(security[name] || []), ...scopes]);\n\n    return this.security(security);\n  }\n\n  description(description: string): this {\n    super.set(\"description\", description);\n\n    return this;\n  }\n\n  deprecated(deprecated: boolean): this {\n    super.set(\"deprecated\", deprecated);\n\n    return this;\n  }\n\n  parameters(parameters: JsonParameter[]): this {\n    super.set(\"parameters\", parameters);\n\n    return this;\n  }\n\n  addParameter(index: number, parameter: JsonParameter) {\n    if (index === -1) {\n      index = this.get(\"parameters\").length;\n    }\n    this.get(\"parameters\")[index] = parameter;\n  }\n\n  consumes(consumes: string[]): this {\n    super.set(\"consumes\", consumes);\n\n    return this;\n  }\n\n  produces(produces: string[]): this {\n    super.set(\"produces\", produces);\n\n    return this;\n  }\n\n  addProduce(produce: string) {\n    const produces = uniq([].concat(this.get(\"produces\"), produce as never)).filter(Boolean);\n\n    this.set(\"produces\", produces);\n  }\n\n  addOperationPath(method: string, path: string | RegExp, options: any = {}) {\n    this.operationPaths.set(String(method) + String(path), {\n      ...options,\n      method,\n      path\n    });\n\n    return this;\n  }\n\n  toJSON(options: JsonSchemaOptions = {}): any {\n    const operation = super.toJSON({...options, ignore: [\"parameters\"]});\n    const bodyParameters: JsonParameter[] = [];\n    const parameters: any[] = [];\n\n    if (operation.security) {\n      operation.security = [].concat(operation.security);\n    }\n\n    this.get(\"parameters\").forEach((parameter: JsonParameter) => {\n      if (!isParameterType(this.get(\"in\"))) {\n        if (parameter.get(\"in\")) {\n          if ([JsonParameterTypes.BODY, JsonParameterTypes.FILES].includes(parameter.get(\"in\"))) {\n            bodyParameters.push(parameter);\n          } else {\n            parameters.push(...[].concat(parameter.toJSON(options)));\n          }\n        }\n      }\n    });\n\n    operation.parameters = parameters.filter(Boolean);\n\n    if (this.get(\"responses\").size === 0) {\n      operation.responses = {\n        \"200\": {\n          description: getStatusMessage(200)\n        }\n      };\n    }\n\n    if (bodyParameters.length) {\n      const parameter = buildSchemaFromBodyParameters(bodyParameters, options);\n      if (options.specType === SpecTypes.OPENAPI) {\n        operation.requestBody = toRequestBody(this, parameter).toJSON(options);\n      } else {\n        operation.parameters.push(toJsonParameter(parameter));\n      }\n    }\n\n    if (options.specType === SpecTypes.OPENAPI) {\n      delete operation.consumes;\n      delete operation.produces;\n    }\n\n    return operation;\n  }\n}\n\nfunction toRequestBody(operation: JsonOperation, {schema, in: _, ...props}: any) {\n  const requestBody = new JsonRequestBody(props);\n\n  const consumes = operation.get(\"consumes\")?.length ? operation.get(\"consumes\") : [\"application/json\"];\n\n  consumes.forEach((consume: string) => {\n    requestBody.addContent(consume, schema);\n  });\n\n  return requestBody;\n}\n\nfunction toJsonParameter(parameter: any) {\n  return {\n    in: JsonParameterTypes.BODY,\n    name: JsonParameterTypes.BODY,\n    ...parameter\n  };\n}\n\nfunction buildSchemaFromBodyParameters(parameters: JsonParameter[], options: JsonSchemaOptions) {\n  let schema = new JsonSchema();\n  const props: any = {};\n  const refs: JsonSchema[] = [];\n  let propsLength = 0;\n\n  parameters.forEach((parameter) => {\n    const name = parameter.getName();\n\n    Array.from(parameter.entries())\n      .filter(([key]) => ![\"in\", \"name\"].includes(key))\n      .forEach(([key, value]) => {\n        if (props[key] === undefined) {\n          props[key] = value;\n        }\n      });\n\n    const jsonParameter = parameter.toJSON(options);\n\n    if (name) {\n      schema.addProperty(\n        name,\n        jsonParameter.schema || {\n          type: jsonParameter.type\n        }\n      );\n\n      if (parameter.get(\"required\")) {\n        schema.addRequired(name);\n      }\n\n      propsLength++;\n    } else {\n      refs.push(jsonParameter);\n    }\n  });\n\n  if (propsLength) {\n    schema.type(\"object\");\n    return {schema: schema.toJSON(options), required: false, ...props};\n  }\n\n  if (refs.length === 1) {\n    return refs[0];\n  }\n\n  if (refs.length > 0) {\n    schema.allOf(refs);\n  }\n\n  return {schema: schema.toJSON(options), required: false, ...props};\n}\n"]}
+{"version":3,"file":"JsonOperation.js","sourceRoot":"","sources":["../../../src/domain/JsonOperation.ts"],"names":[],"mappings":"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","sourcesContent":["import {deepMerge, uniq, uniqBy} from \"@tsed/core\";\nimport {OpenSpecSecurity, OpenSpecTag, OS3Operation} from \"@tsed/openspec\";\nimport {getStatusMessage} from \"../constants/httpStatusMessages\";\nimport {JsonHeader, JsonSchemaOptions} from \"../interfaces\";\nimport {isRedirectionStatus, isSuccessStatus} from \"../utils/isSuccessStatus\";\nimport {JsonMap} from \"./JsonMap\";\nimport {JsonParameter} from \"./JsonParameter\";\nimport {isParameterType, JsonParameterTypes} from \"./JsonParameterTypes\";\nimport {JsonRequestBody} from \"./JsonRequestBody\";\nimport {JsonResponse} from \"./JsonResponse\";\nimport {JsonSchema} from \"./JsonSchema\";\nimport {SpecTypes} from \"./SpecTypes\";\n\nexport interface JsonMethodPath {\n  path: string | RegExp;\n  method: string;\n  isFinal?: boolean;\n\n  [key: string]: any;\n}\n\nexport interface JsonOperationOptions extends OS3Operation<JsonSchema, JsonParameter, JsonMap<JsonResponse>> {\n  consumes: string[];\n  produces: string[];\n}\n\nexport class JsonOperation extends JsonMap<JsonOperationOptions> {\n  readonly operationPaths: Map<string, JsonMethodPath> = new Map();\n  #status: number;\n  #redirection: boolean = false;\n\n  constructor(obj: Partial<JsonOperationOptions> = {}) {\n    super({parameters: [], responses: new JsonMap(), ...obj});\n  }\n\n  get response(): JsonResponse | undefined {\n    return this.getResponses().get(this.getStatus().toString());\n  }\n\n  get status() {\n    return this.#status;\n  }\n\n  tags(tags: OpenSpecTag[]): this {\n    super.set(\"tags\", tags);\n\n    return this;\n  }\n\n  addTags(tags: OpenSpecTag[]) {\n    tags = uniqBy([...(this.get(\"tags\") || []), ...tags], \"name\");\n\n    return this.tags(tags);\n  }\n\n  summary(summary: string): this {\n    super.set(\"summary\", summary);\n\n    return this;\n  }\n\n  operationId(operationId: string): this {\n    this.set(\"operationId\", operationId);\n\n    return this;\n  }\n\n  responses(responses: JsonMap<any>): this {\n    this.set(\"responses\", responses);\n\n    return this;\n  }\n\n  defaultStatus(status: number) {\n    this.#status = status;\n\n    return this;\n  }\n\n  getStatus() {\n    return this.#status || 200;\n  }\n\n  setRedirection(status = 302) {\n    this.#redirection = true;\n    this.#status = status;\n    return this;\n  }\n\n  isRedirection(status?: number) {\n    if (this.#redirection) {\n      if (status) {\n        return isRedirectionStatus(status);\n      }\n    }\n\n    return this.#redirection;\n  }\n\n  addResponse(statusCode: string | number, response: JsonResponse) {\n    if ((isSuccessStatus(statusCode) || isRedirectionStatus(statusCode)) && !this.#status) {\n      const res = this.getResponseOf(200);\n\n      this.getResponses().set(statusCode.toString(), res).delete(\"200\");\n\n      this.defaultStatus(Number(statusCode));\n    }\n\n    const currentCode = statusCode === \"default\" ? this.getStatus().toString() : statusCode.toString();\n    const currentResponse = this.getResponses().get(currentCode);\n\n    if (!currentResponse) {\n      response.status = Number(currentCode);\n      this.getResponses().set(currentCode, response);\n    } else {\n      response.forEach((value, key) => {\n        if (![\"content\"].includes(key)) {\n          currentResponse.set(key, deepMerge(currentResponse.get(key), value));\n        }\n      });\n      currentResponse.status = Number(currentCode);\n    }\n\n    return this;\n  }\n\n  getResponses() {\n    return this.get(\"responses\") as JsonMap<JsonResponse>;\n  }\n\n  getResponseOf(status: number | string): JsonResponse {\n    return (status === \"default\" ? this.response : this.getResponses().get(String(status))) || new JsonResponse();\n  }\n\n  ensureResponseOf(status: number | string): JsonResponse {\n    this.addResponse(status, this.getResponseOf(status));\n    return this.getResponseOf(status);\n  }\n\n  getHeadersOf(status: number): Record<string, JsonHeader & {example: string}> {\n    return this.getResponseOf(status).get(\"headers\") || {};\n  }\n\n  getContentTypeOf(status: number): any {\n    return [...this.getResponseOf(status).get(\"content\").keys()].slice(-1)[0];\n  }\n\n  security(security: OpenSpecSecurity): this {\n    this.set(\"security\", security);\n\n    return this;\n  }\n\n  addSecurityScopes(name: string, scopes: string[]) {\n    const security = this.get(\"security\") || {};\n    security[name] = uniq([...(security[name] || []), ...scopes]);\n\n    return this.security(security);\n  }\n\n  description(description: string): this {\n    super.set(\"description\", description);\n\n    return this;\n  }\n\n  deprecated(deprecated: boolean): this {\n    super.set(\"deprecated\", deprecated);\n\n    return this;\n  }\n\n  parameters(parameters: JsonParameter[]): this {\n    super.set(\"parameters\", parameters);\n\n    return this;\n  }\n\n  addParameter(index: number, parameter: JsonParameter) {\n    if (index === -1) {\n      index = this.get(\"parameters\").length;\n    }\n    this.get(\"parameters\")[index] = parameter;\n  }\n\n  consumes(consumes: string[]): this {\n    super.set(\"consumes\", consumes);\n\n    return this;\n  }\n\n  produces(produces: string[]): this {\n    super.set(\"produces\", produces);\n\n    return this;\n  }\n\n  addProduce(produce: string) {\n    const produces = uniq([].concat(this.get(\"produces\"), produce as never)).filter(Boolean);\n\n    this.set(\"produces\", produces);\n  }\n\n  addOperationPath(method: string, path: string | RegExp, options: any = {}) {\n    this.operationPaths.set(String(method) + String(path), {\n      ...options,\n      method,\n      path\n    });\n\n    return this;\n  }\n\n  toJSON(options: JsonSchemaOptions = {}): any {\n    const operation = super.toJSON({...options, ignore: [\"parameters\"]});\n    const bodyParameters: JsonParameter[] = [];\n    const parameters: any[] = [];\n\n    if (operation.security) {\n      operation.security = [].concat(operation.security);\n    }\n\n    this.get(\"parameters\").forEach((parameter: JsonParameter) => {\n      if (!isParameterType(this.get(\"in\"))) {\n        if (parameter.get(\"in\")) {\n          if ([JsonParameterTypes.BODY, JsonParameterTypes.FILES].includes(parameter.get(\"in\"))) {\n            bodyParameters.push(parameter);\n          } else {\n            parameters.push(...[].concat(parameter.toJSON(options)));\n          }\n        }\n      }\n    });\n\n    operation.parameters = parameters.filter(Boolean);\n\n    if (this.get(\"responses\").size === 0) {\n      operation.responses = {\n        \"200\": {\n          description: getStatusMessage(200)\n        }\n      };\n    }\n\n    if (bodyParameters.length) {\n      const parameter = buildSchemaFromBodyParameters(bodyParameters, options);\n      if (options.specType === SpecTypes.OPENAPI) {\n        operation.requestBody = toRequestBody(this, parameter).toJSON(options);\n      } else {\n        operation.parameters.push(toJsonParameter(parameter));\n      }\n    }\n\n    if (options.specType === SpecTypes.OPENAPI) {\n      delete operation.consumes;\n      delete operation.produces;\n    }\n\n    return operation;\n  }\n}\n\nfunction toRequestBody(operation: JsonOperation, {schema, in: _, ...props}: any) {\n  const requestBody = new JsonRequestBody(props);\n\n  const consumes = operation.get(\"consumes\")?.length ? operation.get(\"consumes\") : [\"application/json\"];\n\n  consumes.forEach((consume: string) => {\n    requestBody.addContent(consume, schema);\n  });\n\n  return requestBody;\n}\n\nfunction toJsonParameter(parameter: any) {\n  return {\n    in: JsonParameterTypes.BODY,\n    name: JsonParameterTypes.BODY,\n    ...parameter\n  };\n}\n\nfunction buildSchemaFromBodyParameters(parameters: JsonParameter[], options: JsonSchemaOptions) {\n  let schema = new JsonSchema();\n  const props: any = {};\n  const refs: JsonSchema[] = [];\n  let propsLength = 0;\n\n  parameters.forEach((parameter) => {\n    const name = parameter.getName();\n\n    Array.from(parameter.entries())\n      .filter(([key]) => ![\"in\", \"name\"].includes(key))\n      .forEach(([key, value]) => {\n        if (props[key] === undefined) {\n          props[key] = value;\n        }\n      });\n\n    const jsonParameter = parameter.toJSON(options);\n\n    if (name) {\n      schema.addProperty(\n        name,\n        jsonParameter.schema || {\n          type: jsonParameter.type\n        }\n      );\n\n      if (parameter.get(\"required\")) {\n        schema.addRequired(name);\n      }\n\n      propsLength++;\n    } else {\n      refs.push(jsonParameter);\n    }\n  });\n\n  if (!propsLength) {\n    if (refs.length === 1) {\n      return refs[0];\n    }\n  }\n\n  schema.type(\"object\");\n\n  return {schema: schema.toJSON(options), required: false, ...props};\n}\n"]}

package/lib/cjs/domain/JsonSchema.js

@@ -1,6 +1,8 @@
 "use strict";
+var _JsonSchema_nullable, _JsonSchema_genericLabels, _JsonSchema_nestedGenerics, _JsonSchema_alias, _JsonSchema_itemSchema, _JsonSchema_target, _JsonSchema_isGeneric, _JsonSchema_isCollection, _JsonSchema_ref;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonSchema = void 0;
+const tslib_1 = require("tslib");
 const core_1 = require("@tsed/core");
 const JsonSchemaMapperContainer_1 = require("../registries/JsonSchemaMapperContainer");
 const getComputedType_1 = require("../utils/getComputedType");
@@ -13,7 +15,7 @@ function mapProperties(properties) {
         return properties;
     }
     return Object.entries(properties).reduce((properties, [key, schema]) => {
-        properties[(0, toJsonRegex_1.toJsonRegex)(key)] = (0, core_1.isArray)(schema) ? schema.map(mapToJsonSchema) : mapToJsonSchema(schema);
+        properties[(0, toJsonRegex_1.toJsonRegex)(key)] = mapToJsonSchema(schema);
         return properties;
     }, {});
 }
@@ -33,7 +35,6 @@ function mapToJsonSchema(item) {
     return item;
 }
 class JsonSchema extends Map {
-    // protected _specs: Map<SpecTypes, any> = new Map();
     constructor(obj = {}) {
         super();
         this.isJsonSchema = true;
@@ -41,51 +42,48 @@ class JsonSchema extends Map {
         this.$required = new Set();
         this.$allow = [];
         this.$forwardGroups = false;
-        this._nullable = false;
-        this._nestedGenerics = [];
-        this._alias = new Map();
-        this._isGeneric = false;
-        this._isCollection = false;
-        this._ref = false;
+        _JsonSchema_nullable.set(this, false);
+        _JsonSchema_genericLabels.set(this, void 0);
+        _JsonSchema_nestedGenerics.set(this, []);
+        _JsonSchema_alias.set(this, new Map());
+        _JsonSchema_itemSchema.set(this, void 0);
+        _JsonSchema_target.set(this, void 0);
+        _JsonSchema_isGeneric.set(this, false);
+        _JsonSchema_isCollection.set(this, false);
+        _JsonSchema_ref.set(this, false);
         if (obj) {
             this.assign(obj);
         }
     }
     get alias() {
-        return this._alias;
+        return (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_alias, "f");
     }
     get nestedGenerics() {
-        return this._nestedGenerics;
+        return (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_nestedGenerics, "f");
     }
     set nestedGenerics(value) {
-        this._nestedGenerics = value;
+        (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_nestedGenerics, value, "f");
     }
     get genericLabels() {
-        return this._genericLabels;
+        return (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_genericLabels, "f");
     }
     set genericLabels(value) {
-        this._genericLabels = value;
-    }
-    get nullable() {
-        return this._nullable || this.$allow.includes(null);
-    }
-    set nullable(value) {
-        this._nullable = value;
+        (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_genericLabels, value, "f");
     }
     get isClass() {
-        return (0, core_1.isClass)(this.class) && ![Map, Array, Set, Object, Date, Boolean, Number, String].includes(this._target);
+        return (0, core_1.isClass)(this.class) && ![Map, Array, Set, Object, Date, Boolean, Number, String].includes((0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_target, "f"));
     }
     /**
      * Current schema is a collection
      */
     get isCollection() {
-        return this._isCollection;
+        return (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_isCollection, "f");
     }
     /**
      * Current schema is a generic
      */
     get isGeneric() {
-        return this._isGeneric;
+        return (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_isGeneric, "f");
     }
     /**
      * Current schema has generics items
@@ -100,28 +98,40 @@ class JsonSchema extends Map {
         return this.getComputedType();
     }
     get canRef() {
-        return this._ref;
+        return (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_ref, "f");
+    }
+    get isNullable() {
+        return (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_nullable, "f") || this.$allow.includes(null);
+    }
+    get isReadOnly() {
+        return this.get("readOnly");
+    }
+    get isWriteOnly() {
+        return this.get("writeOnly");
     }
     static from(obj = {}) {
         return new JsonSchema(obj);
     }
+    nullable(value) {
+        (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_nullable, value, "f");
+    }
     itemSchema(obj = {}) {
-        this._itemSchema = this._itemSchema || mapToJsonSchema(obj);
-        this._itemSchema.assign(obj);
-        return this._itemSchema;
+        (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_itemSchema, (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_itemSchema, "f") || mapToJsonSchema(obj), "f");
+        (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_itemSchema, "f").assign(obj);
+        return (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_itemSchema, "f");
     }
     getAliasOf(property) {
-        return this._alias.get(property);
+        return (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_alias, "f").get(property);
     }
     addAlias(property, alias) {
-        this._alias.set(property, alias);
-        this._alias.set(alias, property);
+        (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_alias, "f").set(property, alias);
+        (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_alias, "f").set(alias, property);
         return this;
     }
     removeAlias(property) {
-        const alias = this._alias.get(property);
-        alias && this._alias.delete(alias);
-        this._alias.delete(property);
+        const alias = (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_alias, "f").get(property);
+        alias && (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_alias, "f").delete(alias);
+        (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_alias, "f").delete(property);
         return this;
     }
     $id($id) {
@@ -141,7 +151,7 @@ class JsonSchema extends Map {
      * @param name
      */
     label(name) {
-        this._ref = true;
+        (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_ref, true, "f");
         super.set("name", name);
         return this;
     }
@@ -225,7 +235,7 @@ class JsonSchema extends Map {
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.9
      */
     items(items) {
-        super.set("items", (this._itemSchema = mapToJsonSchema(items)));
+        super.set("items", ((0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_itemSchema, mapToJsonSchema(items), "f")));
         return this;
     }
     /**
@@ -519,24 +529,24 @@ class JsonSchema extends Map {
         switch (type) {
             case Map:
                 super.set("type", (0, getJsonType_1.getJsonType)(type));
-                this._target = type;
-                this._isCollection = true;
+                (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_target, type, "f");
+                (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_isCollection, true, "f");
                 if (!this.has("additionalProperties")) {
                     super.set("additionalProperties", this.itemSchema({}));
                 }
                 break;
             case Array:
                 super.set("type", (0, getJsonType_1.getJsonType)(type));
-                this._target = type;
-                this._isCollection = true;
+                (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_target, type, "f");
+                (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_isCollection, true, "f");
                 if (!this.has("items")) {
                     super.set("items", this.itemSchema({}));
                 }
                 break;
             case Set:
                 super.set("type", (0, getJsonType_1.getJsonType)(type));
-                this._target = type;
-                this._isCollection = true;
+                (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_target, type, "f");
+                (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_isCollection, true, "f");
                 this.uniqueItems(true);
                 if (!this.has("items")) {
                     super.set("items", this.itemSchema({}));
@@ -552,7 +562,7 @@ class JsonSchema extends Map {
             case Number:
             case String:
                 super.set("type", (0, getJsonType_1.getJsonType)(type));
-                this._target = type;
+                (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_target, type, "f");
                 if (!this.has("properties")) {
                     super.set("properties", {});
                 }
@@ -560,7 +570,7 @@ class JsonSchema extends Map {
             default:
                 if ((0, core_1.isClass)(type) || (0, core_1.isFunction)(type)) {
                     super.set("type", undefined);
-                    this._target = type;
+                    (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_target, type, "f");
                     if (!this.has("properties")) {
                         super.set("properties", {});
                     }
@@ -568,7 +578,7 @@ class JsonSchema extends Map {
                 else {
                     const jsonType = (0, getJsonType_1.getJsonType)(type);
                     if (jsonType === "generic") {
-                        this._isGeneric = true;
+                        (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_isGeneric, true, "f");
                         super.set("$ref", type);
                     }
                     else {
@@ -581,9 +591,9 @@ class JsonSchema extends Map {
     any(...types) {
         const hasClasses = types.filter((type) => (0, core_1.isClass)(type));
         if (hasClasses.length >= 2) {
-            this.anyOf(types.filter((value) => {
+            this.oneOf(types.filter((value) => {
                 if (value !== null) {
-                    this.nullable = true;
+                    this.nullable(true);
                     return true;
                 }
                 return false;
@@ -591,9 +601,16 @@ class JsonSchema extends Map {
         }
         else {
             // TODO when OS3 will the only minimal supported version, we'll can remove this code
-            types = (0, core_1.uniq)(types.length ? types : ["integer", "number", "string", "boolean", "array", "object", "null"]).map(getJsonType_1.getJsonType);
-            if (types.includes("null")) {
-                this.nullable = true;
+            if (types.length) {
+                types = (0, core_1.uniq)(types).map(getJsonType_1.getJsonType);
+                if (types.includes("null")) {
+                    this.nullable(true);
+                    types = types.filter((o) => o !== "null");
+                }
+            }
+            else {
+                types = ["integer", "number", "string", "boolean", "array", "object"];
+                this.nullable(true);
             }
             this.type(types.length === 1 ? types[0] : types);
         }
@@ -650,14 +667,14 @@ class JsonSchema extends Map {
             obj.$required.forEach((key) => {
                 this.$required.add(key);
             });
-            this._ref = obj._ref;
-            this._alias = new Map(this._alias.entries());
-            obj._genericLabels && (this._genericLabels = [...obj._genericLabels]);
-            this._nestedGenerics = obj._nestedGenerics.map((item) => [...item]);
-            this._target = obj._target;
-            this._isGeneric = obj._isGeneric;
-            this._isCollection = obj._isCollection;
-            this._ref = obj._ref;
+            (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_ref, (0, tslib_1.__classPrivateFieldGet)(obj, _JsonSchema_ref, "f"), "f");
+            (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_alias, new Map((0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_alias, "f").entries()), "f");
+            (0, tslib_1.__classPrivateFieldGet)(obj, _JsonSchema_genericLabels, "f") && ((0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_genericLabels, [...(0, tslib_1.__classPrivateFieldGet)(obj, _JsonSchema_genericLabels, "f")], "f"));
+            (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_nestedGenerics, (0, tslib_1.__classPrivateFieldGet)(obj, _JsonSchema_nestedGenerics, "f").map((item) => [...item]), "f");
+            (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_target, (0, tslib_1.__classPrivateFieldGet)(obj, _JsonSchema_target, "f"), "f");
+            (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_isGeneric, (0, tslib_1.__classPrivateFieldGet)(obj, _JsonSchema_isGeneric, "f"), "f");
+            (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_isCollection, (0, tslib_1.__classPrivateFieldGet)(obj, _JsonSchema_isCollection, "f"), "f");
+            (0, tslib_1.__classPrivateFieldSet)(this, _JsonSchema_ref, (0, tslib_1.__classPrivateFieldGet)(obj, _JsonSchema_ref, "f"), "f");
             super.set("type", obj.get("type"));
         }
         return this;
@@ -677,10 +694,10 @@ class JsonSchema extends Map {
      * the function will be called to get the right type.
      */
     getComputedType() {
-        return (0, getComputedType_1.getComputedType)(this._target);
+        return (0, getComputedType_1.getComputedType)((0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_target, "f"));
     }
     getComputedItemType() {
-        return this._itemSchema ? this._itemSchema.getComputedType() : this.getComputedType();
+        return (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_itemSchema, "f") ? (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_itemSchema, "f").getComputedType() : this.getComputedType();
     }
     /**
      * Return the Json type as string
@@ -689,17 +706,18 @@ class JsonSchema extends Map {
         return this.get("type") || (0, getJsonType_1.getJsonType)(this.getComputedType());
     }
     getTarget() {
-        return this._target;
+        return (0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_target, "f");
     }
     /**
      * Get the symbolic name of the entity
      */
     getName() {
-        return this.get("name") || (this._target ? (0, core_1.nameOf)((0, core_1.classOf)(this.getComputedType())) : "");
+        return this.get("name") || ((0, tslib_1.__classPrivateFieldGet)(this, _JsonSchema_target, "f") ? (0, core_1.nameOf)((0, core_1.classOf)(this.getComputedType())) : "");
     }
     clone() {
         return new JsonSchema(this);
     }
 }
 exports.JsonSchema = JsonSchema;
+_JsonSchema_nullable = new WeakMap(), _JsonSchema_genericLabels = new WeakMap(), _JsonSchema_nestedGenerics = new WeakMap(), _JsonSchema_alias = new WeakMap(), _JsonSchema_itemSchema = new WeakMap(), _JsonSchema_target = new WeakMap(), _JsonSchema_isGeneric = new WeakMap(), _JsonSchema_isCollection = new WeakMap(), _JsonSchema_ref = new WeakMap();
 //# sourceMappingURL=JsonSchema.js.map