@tsed/schema 6.90.0 → 6.93.0

package/lib/esm/registries/JsonSchemaMapperContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonSchemaMapperContainer.js","sourceRoot":"","sources":["../../../src/registries/JsonSchemaMapperContainer.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,MAAM,0BAA0B,GAAkC,IAAI,GAAG,EAAE,CAAC;AAC5E;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAC,IAAY,EAAE,MAAwB;IAC7E,OAAO,0BAA0B,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AACD;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,uBAAuB;IACvB,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACzC,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,wBAAwB,CAAC,CAAC;KAC7D;IACD,OAAO,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;AAC/C,CAAC;AACD;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,MAAW,EAAE,OAAY;IAChE,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC","sourcesContent":["/**\n * @ignore\n */\nexport interface JsonSchemaMapper {\n  (schema: any, options: any): any;\n}\n/**\n * @ignore\n */\nconst JsonSchemaMappersContainer: Map<string, JsonSchemaMapper> = new Map();\n/**\n * @ignore\n */\nexport function registerJsonSchemaMapper(type: string, mapper: JsonSchemaMapper) {\n  return JsonSchemaMappersContainer.set(type, mapper);\n}\n/**\n * @ignore\n */\nexport function getJsonSchemaMapper(type: string): JsonSchemaMapper {\n  // istanbul ignore next\n  if (!JsonSchemaMappersContainer.has(type)) {\n    throw new Error(`JsonSchema ${type} mapper doesn't exists`);\n  }\n  return JsonSchemaMappersContainer.get(type)!;\n}\n/**\n * @ignore\n */\nexport function execMapper(type: string, schema: any, options: any): any {\n  return getJsonSchemaMapper(type)(schema, options);\n}\n"]}
+{"version":3,"file":"JsonSchemaMapperContainer.js","sourceRoot":"","sources":["../../../src/registries/JsonSchemaMapperContainer.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,MAAM,0BAA0B,GAAkC,IAAI,GAAG,EAAE,CAAC;AAE5E;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAC,IAAY,EAAE,MAAwB;IAC7E,OAAO,0BAA0B,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,uBAAuB;IACvB,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACzC,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,wBAAwB,CAAC,CAAC;KAC7D;IACD,OAAO,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;AAC/C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,MAAW,EAAE,OAAY,EAAE,MAAY;IAC9E,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,OAAO,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAC9C,CAAC","sourcesContent":["/**\n * @ignore\n */\nexport interface JsonSchemaMapper {\n  (schema: any, options: any, parent?: any): any;\n}\n\n/**\n * @ignore\n */\nconst JsonSchemaMappersContainer: Map<string, JsonSchemaMapper> = new Map();\n\n/**\n * @ignore\n */\nexport function registerJsonSchemaMapper(type: string, mapper: JsonSchemaMapper) {\n  return JsonSchemaMappersContainer.set(type, mapper);\n}\n\n/**\n * @ignore\n */\nexport function getJsonSchemaMapper(type: string): JsonSchemaMapper {\n  // istanbul ignore next\n  if (!JsonSchemaMappersContainer.has(type)) {\n    throw new Error(`JsonSchema ${type} mapper doesn't exists`);\n  }\n  return JsonSchemaMappersContainer.get(type)!;\n}\n\n/**\n * @ignore\n */\nexport function execMapper(type: string, schema: any, options: any, parent?: any): any {\n  return getJsonSchemaMapper(type)(schema, options, parent);\n}\n\nexport function hasMapper(type: string) {\n  return JsonSchemaMappersContainer.has(type);\n}\n"]}

package/lib/esm/utils/getJsonEntityStore.js

@@ -8,12 +8,6 @@ JsonEntitiesContainer.set(DecoratorTypes.CLASS, JsonClassStore);
 JsonEntitiesContainer.set(DecoratorTypes.PROP, JsonPropertyStore);
 JsonEntitiesContainer.set(DecoratorTypes.PARAM, JsonParameterStore);
 JsonEntitiesContainer.set(DecoratorTypes.METHOD, JsonMethodStore);
-/**
- * @ignore
- */
-export function isJsonEntityStore(model) {
-    return model.isStore;
-}
 export function getJsonEntityStore(...args) {
     return JsonEntityStore.from(...args);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"getJsonEntityStore.js","sourceRoot":"","sources":["../../../src/utils/getJsonEntityStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAO,MAAM,YAAY,CAAC;AAChD,OAAO,EAAC,qBAAqB,EAAE,eAAe,EAAC,MAAM,2BAA2B,CAAC;AACjF,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAC,kBAAkB,EAAC,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAE1D,qBAAqB,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;AAChE,qBAAqB,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;AAClE,qBAAqB,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;AACpE,qBAAqB,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;AAElE;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAU;IAC1C,OAAO,KAAK,CAAC,OAAO,CAAC;AACvB,CAAC;AAsBD,MAAM,UAAU,kBAAkB,CAA8C,GAAG,IAAW;IAC5F,OAAO,eAAe,CAAC,IAAI,CAAI,GAAG,IAAI,CAAC,CAAC;AAC1C,CAAC","sourcesContent":["import {DecoratorTypes, Type} from \"@tsed/core\";\nimport {JsonEntitiesContainer, JsonEntityStore} from \"../domain/JsonEntityStore\";\nimport {JsonClassStore} from \"../domain/JsonClassStore\";\nimport {JsonPropertyStore} from \"../domain/JsonPropertyStore\";\nimport {JsonParameterStore} from \"../domain/JsonParameterStore\";\nimport {JsonMethodStore} from \"../domain/JsonMethodStore\";\n\nJsonEntitiesContainer.set(DecoratorTypes.CLASS, JsonClassStore);\nJsonEntitiesContainer.set(DecoratorTypes.PROP, JsonPropertyStore);\nJsonEntitiesContainer.set(DecoratorTypes.PARAM, JsonParameterStore);\nJsonEntitiesContainer.set(DecoratorTypes.METHOD, JsonMethodStore);\n\n/**\n * @ignore\n */\nexport function isJsonEntityStore(model: any): model is JsonEntityStore {\n  return model.isStore;\n}\n\n/**\n * Get entity store from decorator args\n * @param target\n */\nexport function getJsonEntityStore<T extends JsonClassStore = JsonClassStore>(target: Type<any>): T;\nexport function getJsonEntityStore<T extends JsonPropertyStore = JsonPropertyStore>(\n  target: Type<any> | any,\n  propertyKey: string | symbol\n): T;\nexport function getJsonEntityStore<T extends JsonParameterStore = JsonParameterStore>(\n  target: Type<any> | any,\n  propertyKey: string | symbol,\n  index: number\n): T;\nexport function getJsonEntityStore<T extends JsonMethodStore = JsonMethodStore>(\n  target: Type<any> | any,\n  propertyKey: string | symbol,\n  descriptor: PropertyDescriptor\n): T;\nexport function getJsonEntityStore<T extends JsonEntityStore = JsonEntityStore>(...args: any[]): T;\nexport function getJsonEntityStore<T extends JsonEntityStore = JsonEntityStore>(...args: any[]): T {\n  return JsonEntityStore.from<T>(...args);\n}\n"]}
+{"version":3,"file":"getJsonEntityStore.js","sourceRoot":"","sources":["../../../src/utils/getJsonEntityStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAO,MAAM,YAAY,CAAC;AAChD,OAAO,EAAC,qBAAqB,EAAE,eAAe,EAAC,MAAM,2BAA2B,CAAC;AACjF,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAC,kBAAkB,EAAC,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAE1D,qBAAqB,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;AAChE,qBAAqB,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;AAClE,qBAAqB,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;AACpE,qBAAqB,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;AAsBlE,MAAM,UAAU,kBAAkB,CAA8C,GAAG,IAAW;IAC5F,OAAO,eAAe,CAAC,IAAI,CAAI,GAAG,IAAI,CAAC,CAAC;AAC1C,CAAC","sourcesContent":["import {DecoratorTypes, Type} from \"@tsed/core\";\nimport {JsonEntitiesContainer, JsonEntityStore} from \"../domain/JsonEntityStore\";\nimport {JsonClassStore} from \"../domain/JsonClassStore\";\nimport {JsonPropertyStore} from \"../domain/JsonPropertyStore\";\nimport {JsonParameterStore} from \"../domain/JsonParameterStore\";\nimport {JsonMethodStore} from \"../domain/JsonMethodStore\";\n\nJsonEntitiesContainer.set(DecoratorTypes.CLASS, JsonClassStore);\nJsonEntitiesContainer.set(DecoratorTypes.PROP, JsonPropertyStore);\nJsonEntitiesContainer.set(DecoratorTypes.PARAM, JsonParameterStore);\nJsonEntitiesContainer.set(DecoratorTypes.METHOD, JsonMethodStore);\n\n/**\n * Get entity store from decorator args\n * @param target\n */\nexport function getJsonEntityStore<T extends JsonClassStore = JsonClassStore>(target: Type<any>): T;\nexport function getJsonEntityStore<T extends JsonPropertyStore = JsonPropertyStore>(\n  target: Type<any> | any,\n  propertyKey: string | symbol\n): T;\nexport function getJsonEntityStore<T extends JsonParameterStore = JsonParameterStore>(\n  target: Type<any> | any,\n  propertyKey: string | symbol,\n  index: number\n): T;\nexport function getJsonEntityStore<T extends JsonMethodStore = JsonMethodStore>(\n  target: Type<any> | any,\n  propertyKey: string | symbol,\n  descriptor: PropertyDescriptor\n): T;\nexport function getJsonEntityStore<T extends JsonEntityStore = JsonEntityStore>(...args: any[]): T;\nexport function getJsonEntityStore<T extends JsonEntityStore = JsonEntityStore>(...args: any[]): T {\n  return JsonEntityStore.from<T>(...args);\n}\n"]}

package/lib/esm/utils/getRequiredProperties.js

@@ -23,8 +23,7 @@ function mapRequiredProps(obj, schema, options = {}) {
         if (props.includes(aliasedKey)) {
             const propSchema = schema.get("properties")[key];
             const serializeSchema = obj.properties[aliasedKey];
-            obj.properties[aliasedKey] = applyStringRule(serializeSchema, propSchema); // applyNullRule(applyStringRule(serializeSchema, propSchema), propSchema);
-            // obj.properties[aliasedKey] = mapNullableType(obj.properties[aliasedKey]);
+            obj.properties[aliasedKey] = applyStringRule(serializeSchema, propSchema);
             return keys.concat(aliasedKey);
         }
         return keys;

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

@@ -1 +1 @@
-{"version":3,"file":"getRequiredProperties.js","sourceRoot":"","sources":["../../../src/utils/getRequiredProperties.ts"],"names":[],"mappings":"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","sourcesContent":["import {uniq} from \"@tsed/core\";\nimport type {JsonSchema} from \"../domain/JsonSchema\";\nimport {alterRequiredGroups} from \"../hooks/alterRequiredGroups\";\nimport type {JsonSchemaOptions} from \"../interfaces/JsonSchemaOptions\";\n\nfunction applyStringRule(obj: any, propSchema: JsonSchema) {\n  if (!propSchema?.$allow.includes(\"\")) {\n    if (([] as string[]).concat(propSchema?.get(\"type\")).includes(\"string\")) {\n      const minLength = obj?.minLength;\n      // Disallow empty string\n      if (minLength === undefined) {\n        return {\n          ...obj,\n          minLength: 1\n        };\n      }\n    }\n  }\n\n  return obj;\n}\n\nfunction mapRequiredProps(obj: any, schema: JsonSchema, options: JsonSchemaOptions = {}) {\n  const {useAlias} = options;\n  const props = Object.keys(obj.properties || {});\n\n  return (keys: string[], key: string) => {\n    const aliasedKey = useAlias ? (schema.alias.get(key) as string) || key : key;\n\n    if (props.includes(aliasedKey)) {\n      const propSchema = schema.get(\"properties\")[key];\n      const serializeSchema = obj.properties[aliasedKey];\n\n      obj.properties[aliasedKey] = applyStringRule(serializeSchema, propSchema); // applyNullRule(applyStringRule(serializeSchema, propSchema), propSchema);\n      // obj.properties[aliasedKey] = mapNullableType(obj.properties[aliasedKey]);\n\n      return keys.concat(aliasedKey);\n    }\n\n    return keys;\n  };\n}\n\nfunction extractRequiredProps(obj: any, schema: JsonSchema, options: JsonSchemaOptions): string[] {\n  let required: string[] = obj.required || [];\n\n  required = [...required, ...schema.$required];\n\n  if (schema.get(\"properties\")) {\n    required = Object.entries(schema.get(\"properties\")).reduce((required, [key, prop]: [string, any]) => {\n      if (prop && prop.$selfRequired !== undefined) {\n        return prop.$selfRequired ? required.concat(key) : required.filter((k) => k === key);\n      }\n\n      return required;\n    }, required);\n  }\n\n  return alterRequiredGroups(uniq(required), schema, options);\n}\n\n/**\n * @ignore\n */\nexport function getRequiredProperties(obj: any, schema: JsonSchema, options: JsonSchemaOptions) {\n  if (options.groups && options.groups.includes(\"partial\")) {\n    return obj;\n  }\n\n  let required = extractRequiredProps(obj, schema, options);\n\n  required = uniq(required).reduce(mapRequiredProps(obj, schema, options), []);\n\n  if (required.length) {\n    return {\n      ...obj,\n      required\n    };\n  }\n\n  return obj;\n}\n"]}
+{"version":3,"file":"getRequiredProperties.js","sourceRoot":"","sources":["../../../src/utils/getRequiredProperties.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAC;AAEhC,OAAO,EAAC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAGjE,SAAS,eAAe,CAAC,GAAQ,EAAE,UAAsB;IACvD,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA,EAAE;QACpC,IAAK,EAAe,CAAC,MAAM,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACvE,MAAM,SAAS,GAAG,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,SAAS,CAAC;YACjC,wBAAwB;YACxB,IAAI,SAAS,KAAK,SAAS,EAAE;gBAC3B,OAAO;oBACL,GAAG,GAAG;oBACN,SAAS,EAAE,CAAC;iBACb,CAAC;aACH;SACF;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAQ,EAAE,MAAkB,EAAE,UAA6B,EAAE;IACrF,MAAM,EAAC,QAAQ,EAAC,GAAG,OAAO,CAAC;IAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;IAEhD,OAAO,CAAC,IAAc,EAAE,GAAW,EAAE,EAAE;QACrC,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAY,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAE7E,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC9B,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC;YACjD,MAAM,eAAe,GAAG,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAEnD,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,eAAe,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;YAE1E,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;SAChC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,GAAQ,EAAE,MAAkB,EAAE,OAA0B;IACpF,IAAI,QAAQ,GAAa,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC;IAE5C,QAAQ,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IAE9C,IAAI,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;QAC5B,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,IAAI,CAAgB,EAAE,EAAE;YAClG,IAAI,IAAI,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;gBAC5C,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;aACtF;YAED,OAAO,QAAQ,CAAC;QAClB,CAAC,EAAE,QAAQ,CAAC,CAAC;KACd;IAED,OAAO,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAQ,EAAE,MAAkB,EAAE,OAA0B;IAC5F,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QACxD,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,QAAQ,GAAG,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAE1D,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAE7E,IAAI,QAAQ,CAAC,MAAM,EAAE;QACnB,OAAO;YACL,GAAG,GAAG;YACN,QAAQ;SACT,CAAC;KACH;IAED,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import {uniq} from \"@tsed/core\";\nimport type {JsonSchema} from \"../domain/JsonSchema\";\nimport {alterRequiredGroups} from \"../hooks/alterRequiredGroups\";\nimport type {JsonSchemaOptions} from \"../interfaces/JsonSchemaOptions\";\n\nfunction applyStringRule(obj: any, propSchema: JsonSchema) {\n  if (!propSchema?.$allow.includes(\"\")) {\n    if (([] as string[]).concat(propSchema?.get(\"type\")).includes(\"string\")) {\n      const minLength = obj?.minLength;\n      // Disallow empty string\n      if (minLength === undefined) {\n        return {\n          ...obj,\n          minLength: 1\n        };\n      }\n    }\n  }\n\n  return obj;\n}\n\nfunction mapRequiredProps(obj: any, schema: JsonSchema, options: JsonSchemaOptions = {}) {\n  const {useAlias} = options;\n  const props = Object.keys(obj.properties || {});\n\n  return (keys: string[], key: string) => {\n    const aliasedKey = useAlias ? (schema.alias.get(key) as string) || key : key;\n\n    if (props.includes(aliasedKey)) {\n      const propSchema = schema.get(\"properties\")[key];\n      const serializeSchema = obj.properties[aliasedKey];\n\n      obj.properties[aliasedKey] = applyStringRule(serializeSchema, propSchema);\n\n      return keys.concat(aliasedKey);\n    }\n\n    return keys;\n  };\n}\n\nfunction extractRequiredProps(obj: any, schema: JsonSchema, options: JsonSchemaOptions): string[] {\n  let required: string[] = obj.required || [];\n\n  required = [...required, ...schema.$required];\n\n  if (schema.get(\"properties\")) {\n    required = Object.entries(schema.get(\"properties\")).reduce((required, [key, prop]: [string, any]) => {\n      if (prop && prop.$selfRequired !== undefined) {\n        return prop.$selfRequired ? required.concat(key) : required.filter((k) => k === key);\n      }\n\n      return required;\n    }, required);\n  }\n\n  return alterRequiredGroups(uniq(required), schema, options);\n}\n\n/**\n * @ignore\n */\nexport function getRequiredProperties(obj: any, schema: JsonSchema, options: JsonSchemaOptions) {\n  if (options.groups && options.groups.includes(\"partial\")) {\n    return obj;\n  }\n\n  let required = extractRequiredProps(obj, schema, options);\n\n  required = uniq(required).reduce(mapRequiredProps(obj, schema, options), []);\n\n  if (required.length) {\n    return {\n      ...obj,\n      required\n    };\n  }\n\n  return obj;\n}\n"]}

package/lib/esm/utils/mapRouteOptions.js

@@ -16,7 +16,7 @@ export function mapRouteOptions(args) {
     return {
         path,
         method,
-        handlers
+        use: handlers
     };
 }
 //# sourceMappingURL=mapRouteOptions.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"mapRouteOptions.js","sourceRoot":"","sources":["../../../src/utils/mapRouteOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAEtD,MAAM,UAAU,eAAe,CAAC,IAAW;IACzC,IAAI,MAAM,GAAuB,SAAS,CAAC;IAC3C,IAAI,IAAI,GAAgC,SAAS,CAAC;IAElD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE;QACxC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,EAAE;YACvE,MAAM,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC;YAEjC,OAAO,KAAK,CAAC;SACd;QAED,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,YAAY,MAAM,EAAE;YACpD,IAAI,GAAG,GAAG,IAAI,GAAG,CAAC;YAElB,OAAO,KAAK,CAAC;SACd;QAED,OAAO,CAAC,CAAC,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI;QACJ,MAAM;QACN,QAAQ;KACT,CAAC;AACJ,CAAC","sourcesContent":["import {HTTP_METHODS} from \"../constants/httpMethods\";\n\nexport function mapRouteOptions(args: any[]) {\n  let method: string | undefined = undefined;\n  let path: string | RegExp | undefined = undefined;\n\n  const handlers = args.filter((arg: any) => {\n    if (typeof arg === \"string\" && HTTP_METHODS.includes(arg.toLowerCase())) {\n      method = arg.toLocaleUpperCase();\n\n      return false;\n    }\n\n    if (typeof arg === \"string\" || arg instanceof RegExp) {\n      path = arg || \"/\";\n\n      return false;\n    }\n\n    return !!arg;\n  });\n\n  return {\n    path,\n    method,\n    handlers\n  };\n}\n"]}
+{"version":3,"file":"mapRouteOptions.js","sourceRoot":"","sources":["../../../src/utils/mapRouteOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAEtD,MAAM,UAAU,eAAe,CAAC,IAAW;IACzC,IAAI,MAAM,GAAuB,SAAS,CAAC;IAC3C,IAAI,IAAI,GAAgC,SAAS,CAAC;IAElD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE;QACxC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,EAAE;YACvE,MAAM,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC;YAEjC,OAAO,KAAK,CAAC;SACd;QAED,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,YAAY,MAAM,EAAE;YACpD,IAAI,GAAG,GAAG,IAAI,GAAG,CAAC;YAElB,OAAO,KAAK,CAAC;SACd;QAED,OAAO,CAAC,CAAC,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI;QACJ,MAAM;QACN,GAAG,EAAE,QAAQ;KACd,CAAC;AACJ,CAAC","sourcesContent":["import {HTTP_METHODS} from \"../constants/httpMethods\";\n\nexport function mapRouteOptions(args: any[]) {\n  let method: string | undefined = undefined;\n  let path: string | RegExp | undefined = undefined;\n\n  const handlers = args.filter((arg: any) => {\n    if (typeof arg === \"string\" && HTTP_METHODS.includes(arg.toLowerCase())) {\n      method = arg.toLocaleUpperCase();\n\n      return false;\n    }\n\n    if (typeof arg === \"string\" || arg instanceof RegExp) {\n      path = arg || \"/\";\n\n      return false;\n    }\n\n    return !!arg;\n  });\n\n  return {\n    path,\n    method,\n    use: handlers\n  };\n}\n"]}

package/lib/types/components/classMapper.d.ts

@@ -1,3 +1,3 @@
 import { JsonSchema } from "../domain/JsonSchema";
 import { JsonSchemaOptions } from "../interfaces/JsonSchemaOptions";
-export declare function classMapper(value: JsonSchema, options?: JsonSchemaOptions): any;
+export declare function classMapper(value: JsonSchema, options: JsonSchemaOptions): any;

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

@@ -7,3 +7,5 @@ export * from "./lazyRefMapper";
 export * from "./mapMapper";
 export * from "./objectMapper";
 export * from "./schemaMapper";
+export * from "./ofMapper";
+export * from "./propertiesMapper";

package/lib/types/components/inheritedClassMapper.d.ts

@@ -2,4 +2,4 @@ import { JsonSchemaOptions } from "../interfaces/JsonSchemaOptions";
 /**
  * @ignore
  */
-export declare function inheritedClassMapper(obj: any, { target, ...options }?: JsonSchemaOptions): any;
+export declare function inheritedClassMapper(obj: any, { target, ...options }: JsonSchemaOptions): any;

package/lib/types/components/mapMapper.d.ts

@@ -6,4 +6,4 @@ import { JsonSchemaOptions } from "../interfaces/JsonSchemaOptions";
  * @param options
  * @ignore
  */
-export declare function mapMapper(input: Map<string, any>, { ignore, ...options }?: JsonSchemaOptions): any;
+export declare function mapMapper(input: Map<string, any>, { ignore, ...options }: JsonSchemaOptions): any;

package/lib/types/components/ofMapper.d.ts

@@ -0,0 +1,3 @@
+import type { JsonSchema } from "../domain/JsonSchema";
+import type { JsonSchemaOptions } from "../interfaces/JsonSchemaOptions";
+export declare function ofMapper(input: (any | JsonSchema)[], options: JsonSchemaOptions, parent: JsonSchema): any[];

package/lib/types/components/propertiesMapper.d.ts

@@ -0,0 +1,3 @@
+import type { JsonSchema } from "../domain/JsonSchema";
+import type { JsonSchemaOptions } from "../interfaces/JsonSchemaOptions";
+export declare function propertiesMapper(input: any | JsonSchema, options: JsonSchemaOptions, parent: JsonSchema): any;

package/lib/types/components/schemaMapper.d.ts

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

package/lib/types/decorators/common/requiredGroups.d.ts

@@ -7,4 +7,4 @@
  * @schema
  * @input
  */
-export declare function RequiredGroups(...groups: string[]): Function;
+export declare function RequiredGroups(...groups: string[]): PropertyDecorator;

package/lib/types/decorators/index.d.ts

@@ -12,6 +12,7 @@ export * from "./operations/deprecated";
 export * from "./operations/consumes";
 export * from "./operations/contentType";
 export * from "./operations/in";
+export * from "./operations/inFile";
 export * from "./operations/operationId";
 export * from "./operations/operationPath";
 export * from "./operations/path";

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

@@ -0,0 +1,25 @@
+/**
+ * Add a input file parameter.
+ *
+ * ::: warning
+ * Don't use decorator with Ts.ED application to decorate parameters. Use @@BodyParams@@, @@PathParams@@, etc... instead.
+ * But you can use this decorator on Method, to add extra in parameters like Authorization header.
+ *
+ * ```typescript
+ * @Controller("/")
+ * class MyController {
+ *    @Post("/")
+ *    method(@InFile("file1") file: any) {
+ *    }
+ *  }
+ * ```
+ * :::
+ *
+ * @decorator
+ * @swagger
+ * @schema
+ * @input
+ * @operation
+ * @param name
+ */
+export declare function InFile(name: string): ParameterDecorator;

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

@@ -32,6 +32,9 @@ export interface RouteChainedDecorators {
      * @param Summary
      */
     Summary(Summary: string): this;
+    Use(...args: any[]): this;
+    UseAfter(...args: any[]): this;
+    UseBefore(...args: any[]): this;
 }
 /**
  * Describe a new route with a method and path.

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

@@ -16,6 +16,9 @@ export interface JsonEntityStoreOptions {
     descriptor?: any;
     type?: Type<any>;
     collectionType?: Type<any>;
+    beforeMiddlewares?: Function[];
+    middlewares?: Function[];
+    afterMiddlewares?: Function[];
     [key: string]: any;
 }
 export declare abstract class JsonEntityStore implements JsonEntityStoreOptions {

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

@@ -1,9 +1,13 @@
-import { JsonEntityStore } from "./JsonEntityStore";
+import { JsonEntityStore, JsonEntityStoreOptions } from "./JsonEntityStore";
 import { JsonOperation } from "./JsonOperation";
 import type { JsonParameterStore } from "./JsonParameterStore";
 import type { JsonClassStore } from "./JsonClassStore";
 export declare class JsonMethodStore extends JsonEntityStore {
     readonly parent: JsonClassStore;
+    middlewares: any[];
+    beforeMiddlewares: any[];
+    afterMiddlewares: any[];
+    constructor(options: JsonEntityStoreOptions);
     /**
      * Ref to JsonOperation when the decorated object is a method.
      */
@@ -16,4 +20,21 @@ export declare class JsonMethodStore extends JsonEntityStore {
     get operationPaths(): Map<string, import("./JsonOperation").JsonMethodPath>;
     getResponseOptions(status: number, contentType?: string): undefined | any;
     protected build(): void;
+    /**
+     * Append middlewares to the beforeMiddlewares list.
+     * @param args
+     * @returns {EndpointMetadata}
+     */
+    before(args: Function[]): this;
+    /**
+     * Append middlewares to the afterMiddlewares list.
+     * @param args
+     * @returns {EndpointMetadata}
+     */
+    after(args: Function[]): this;
+    /**
+     * Store all arguments collected via Annotation.
+     * @param args
+     */
+    use(args: Function[]): this;
 }

package/lib/types/registries/JsonSchemaMapperContainer.d.ts

@@ -2,7 +2,7 @@
  * @ignore
  */
 export interface JsonSchemaMapper {
-    (schema: any, options: any): any;
+    (schema: any, options: any, parent?: any): any;
 }
 /**
  * @ignore
@@ -15,4 +15,5 @@ export declare function getJsonSchemaMapper(type: string): JsonSchemaMapper;
 /**
  * @ignore
  */
-export declare function execMapper(type: string, schema: any, options: any): any;
+export declare function execMapper(type: string, schema: any, options: any, parent?: any): any;
+export declare function hasMapper(type: string): boolean;

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

@@ -4,10 +4,6 @@ import { JsonClassStore } from "../domain/JsonClassStore";
 import { JsonPropertyStore } from "../domain/JsonPropertyStore";
 import { JsonParameterStore } from "../domain/JsonParameterStore";
 import { JsonMethodStore } from "../domain/JsonMethodStore";
-/**
- * @ignore
- */
-export declare function isJsonEntityStore(model: any): model is JsonEntityStore;
 /**
  * Get entity store from decorator args
  * @param target

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

@@ -1,5 +1,5 @@
 export declare function mapRouteOptions(args: any[]): {
     path: undefined;
     method: undefined;
-    handlers: any[];
+    use: any[];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/schema",
-  "version": "6.90.0",
+  "version": "6.93.0",
   "description": "JsonSchema module for Ts.ED Framework",
   "private": false,
   "source": "./src/index.ts",
@@ -15,7 +15,8 @@
   "scripts": {
     "build": "yarn run build:esm && yarn run build:cjs",
     "build:cjs": "tsc --build tsconfig.compile.json",
-    "build:esm": "tsc --build tsconfig.compile.esm.json"
+    "build:esm": "tsc --build tsconfig.compile.esm.json",
+    "test": "cross-env NODE_ENV=test nyc mocha"
   },
   "keywords": [
     "TypeScript",
@@ -28,8 +29,8 @@
     "tsed"
   ],
   "dependencies": {
-    "@tsed/core": "6.90.0",
-    "@tsed/openspec": "6.90.0",
+    "@tsed/core": "6.93.0",
+    "@tsed/openspec": "6.93.0",
     "camel-case": "4.1.2",
     "json-schema": "0.4.0",
     "micromatch": "4.0.2",
@@ -44,8 +45,8 @@
     "fs-extra": "9.0.1"
   },
   "peerDependencies": {
-    "@tsed/core": "^6.90.0",
-    "@tsed/openspec": "^6.90.0"
+    "@tsed/core": "^6.93.0",
+    "@tsed/openspec": "^6.93.0"
   },
   "repository": "https://github.com/tsedio/tsed",
   "bugs": {