nesties 1.1.15 → 1.1.16

package/dist/index.cjs

@@ -39,6 +39,7 @@ __export(index_exports, {
   As: () => As,
   BlankPaginatedReturnMessageDto: () => BlankPaginatedReturnMessageDto,
   BlankReturnMessageDto: () => BlankReturnMessageDto,
+  CombinedParamResolver: () => CombinedParamResolver,
   DataBody: () => DataBody,
   DataPipe: () => DataPipe,
   DataQuery: () => DataQuery,
@@ -58,6 +59,9 @@ __export(index_exports, {
   MergeParameterDecorators: () => MergeParameterDecorators,
   MergePropertyDecorators: () => MergePropertyDecorators,
   PaginatedReturnMessageDto: () => PaginatedReturnMessageDto,
+  ParamResolver: () => ParamResolver,
+  ParamResolverBase: () => ParamResolverBase,
+  ParamResolverPipe: () => ParamResolverPipe,
   PutLocale: () => PutLocale,
   RenameClass: () => RenameClass,
   RequireToken: () => RequireToken,
@@ -73,6 +77,7 @@ __export(index_exports, {
   fromAbortable: () => fromAbortable,
   getApiProperty: () => getApiProperty,
   getClassFromClassOrArray: () => getClassFromClassOrArray,
+  getParamResolver: () => getParamResolver,
   takeUntilAbort: () => takeUntilAbort
 });
 module.exports = __toCommonJS(index_exports);
@@ -287,12 +292,24 @@ var DataQuery = createDataPipeDec(import_common2.Query);
 var DataBody = createDataPipeDec(import_common2.Body);
 
 // src/token.guard.ts
-var import_common3 = require("@nestjs/common");
+var import_common4 = require("@nestjs/common");
 var import_config = require("@nestjs/config");
 var import_swagger5 = require("@nestjs/swagger");
 
 // src/resolver.ts
+var import_common3 = require("@nestjs/common");
+var import_core = require("@nestjs/core");
 var import_swagger4 = require("@nestjs/swagger");
+
+// src/create-provider.ts
+var createProvider = (options, factory) => {
+  return {
+    useFactory: factory,
+    ...options
+  };
+};
+
+// src/resolver.ts
 var coerceToString = (v) => {
   if (v == null) return void 0;
   if (v === false) return void 0;
@@ -337,45 +354,161 @@ function getQueryValue(req, key) {
   }
   return void 0;
 }
-var createResolver = (_options) => {
-  if (typeof _options === "function") {
-    return _options;
-  }
-  const options = _options;
-  const field = options.paramType;
-  let name = options.paramName;
-  if (field === "header") name = name.toLowerCase();
-  return (ctx) => {
-    const req = ctx.switchToHttp().getRequest();
-    if (field === "header") {
-      let raw = getHeader(req, name);
-      if (name === "accept-language") raw = pickPrimaryFromAcceptLanguage(raw);
-      return raw;
-    }
-    if (field === "query") {
-      return getQueryValue(req, name);
+var ParamResolverPipe = class {
+  constructor(moduleRef) {
+    this.moduleRef = moduleRef;
+  }
+  async transform(params, metadata) {
+    return params.resolver.resolve(params.req, this.moduleRef);
+  }
+};
+ParamResolverPipe = __decorateClass([
+  (0, import_common3.Injectable)(),
+  __decorateParam(0, (0, import_common3.Inject)(import_core.ModuleRef))
+], ParamResolverPipe);
+var usedParamResolverTokens = /* @__PURE__ */ new Set();
+var ParamResolverBase = class {
+  toResolverFunction() {
+    return async (req, ref) => this.resolve(req, ref);
+  }
+  toParamDecorator() {
+    const dec = (0, import_common3.createParamDecorator)((_, ctx) => {
+      const req = ctx.switchToHttp().getRequest();
+      return { req, resolver: this };
+    });
+    return (...pipes) => dec(ParamResolverPipe, ...pipes);
+  }
+  // for override
+  toString() {
+    return "ParamResolverBase";
+  }
+  toRequestScopedProvider() {
+    const token = `PARAM_RESOLVER_${this.toString()}`;
+    let useToken = token;
+    if (usedParamResolverTokens.has(token)) {
+      let suffix = 0;
+      const tryToken = `${token}__${suffix}`;
+      while (usedParamResolverTokens.has(tryToken)) {
+        suffix++;
+      }
+      useToken = tryToken;
     }
-    throw new Error(`Unsupported paramType: ${field}`);
-  };
+    const provider = createProvider(
+      {
+        provide: useToken,
+        inject: [import_core.REQUEST, import_core.ModuleRef],
+        scope: import_common3.Scope.REQUEST
+      },
+      this.toResolverFunction()
+    );
+    return {
+      token: useToken,
+      provider,
+      inject: () => (0, import_common3.Inject)(useToken)
+    };
+  }
 };
-var ApiFromResolver = (_options, extras = {}) => {
-  if (typeof _options === "function") {
-    return () => {
+var ParamResolver = class extends ParamResolverBase {
+  constructor(input) {
+    super();
+    if (typeof input === "function") {
+      this.dynamic = input;
+    } else {
+      this.info = { ...input };
+      if (this.info.paramType === "header") {
+        this.info.paramName = this.info.paramName.toLowerCase();
+      }
+    }
+  }
+  resolve(req, ref) {
+    if (this.info) {
+      if (this.info.paramType === "header") {
+        const name = this.info.paramName;
+        let raw = getHeader(req, name);
+        if (name === "accept-language")
+          raw = pickPrimaryFromAcceptLanguage(raw);
+        return raw;
+      }
+      if (this.info.paramType === "query") {
+        return getQueryValue(req, this.info.paramName);
+      }
+      throw new Error(`Unsupported paramType: ${this.info.paramType}`);
+    } else if (this.dynamic) {
+      return this.dynamic(req, ref);
+    }
+  }
+  toString() {
+    const suffix = this.info ? `${this.info.paramType.toUpperCase()}_${this.info.paramName}` : `DYNAMIC`;
+    return `ParamResolver_${suffix}`;
+  }
+  toApiPropertyDecorator(extras = {}) {
+    return (extras2 = {}) => {
+      if (this.info) {
+        const paramType = this.info.paramType;
+        const apiOptions = {
+          name: this.info.paramName,
+          ...extras,
+          ...extras2
+        };
+        return paramType === "header" ? (0, import_swagger4.ApiHeader)(apiOptions) : paramType === "query" ? (0, import_swagger4.ApiQuery)({ type: "string", ...apiOptions }) : () => {
+        };
+      }
+      return () => {
+      };
     };
   }
-  const options = _options;
-  const paramType = options?.paramType;
-  const apiOptions = {
-    name: options.paramName,
-    ...extras
-  };
-  return paramType === "header" ? (0, import_swagger4.ApiHeader)(apiOptions) : paramType === "query" ? (0, import_swagger4.ApiQuery)({ type: "string", ...apiOptions }) : () => {
-  };
+};
+var CombinedParamResolver = class extends ParamResolverBase {
+  constructor(resolvers) {
+    super();
+    this.resolvers = resolvers;
+  }
+  async resolve(req, ref) {
+    const result = {};
+    await Promise.all(
+      Object.entries(this.resolvers).map(async ([key, resolver]) => {
+        result[key] = await resolver.resolve(
+          req,
+          ref
+        );
+      })
+    );
+    return result;
+  }
+  toString() {
+    const suffix = Object.entries(this.resolvers).map(([key, resolver]) => `${key.toString()}_${resolver.toString()}`).join("__");
+    return `CombinedParamResolver_${suffix}`;
+  }
+  toApiPropertyDecorator(extras = {}) {
+    const decs = Object.values(this.resolvers).map(
+      (resolver) => resolver.toApiPropertyDecorator(extras)
+    );
+    return (extras2) => MergeClassOrMethodDecorators(
+      decs.map(
+        (dec) => dec({
+          ...extras,
+          ...extras2
+        })
+      )
+    );
+  }
+};
+var getParamResolver = (input) => {
+  if (input instanceof ParamResolverBase) {
+    return input;
+  }
+  return new ParamResolver(input);
+};
+var createResolver = (_options) => {
+  return getParamResolver(_options).toResolverFunction();
+};
+var ApiFromResolver = (_options, extras = {}) => {
+  return getParamResolver(_options).toApiPropertyDecorator(extras)();
 };
 
 // src/token.guard.ts
 var import_typed_reflector = require("typed-reflector");
-var import_core = require("@nestjs/core");
+var import_core2 = require("@nestjs/core");
 var reflector = new import_typed_reflector.Reflector();
 var Metadata = new import_typed_reflector.MetadataSetter();
 var defaultHeaderName = "x-server-token";
@@ -401,9 +534,10 @@ var TokenGuard = class {
       config.resolver || { paramType: "header", paramName: defaultHeaderName }
     );
     const tokenSource = config.tokenSource || defaultConfigName;
+    const req = context.switchToHttp().getRequest();
     const [tokenFromClient, tokenFromConfig] = await Promise.all([
-      resolver(context, this.moduleRef),
-      typeof tokenSource === "function" ? tokenSource(context, this.moduleRef) : this.config.get(tokenSource)
+      resolver(req, this.moduleRef),
+      typeof tokenSource === "function" ? tokenSource(req, this.moduleRef) : this.config.get(tokenSource)
     ]);
     if (tokenFromConfig && tokenFromConfig !== tokenFromClient) {
       throw new BlankReturnMessageDto(
@@ -415,9 +549,9 @@ var TokenGuard = class {
   }
 };
 TokenGuard = __decorateClass([
-  (0, import_common3.Injectable)(),
-  __decorateParam(0, (0, import_common3.Inject)(import_config.ConfigService)),
-  __decorateParam(1, (0, import_common3.Inject)(import_core.ModuleRef))
+  (0, import_common4.Injectable)(),
+  __decorateParam(0, (0, import_common4.Inject)(import_config.ConfigService)),
+  __decorateParam(1, (0, import_common4.Inject)(import_core2.ModuleRef))
 ], TokenGuard);
 var RequireToken = (options = {}) => {
   const swaggerDec = options.resolver ? ApiFromResolver(options.resolver, {
@@ -429,7 +563,7 @@ var RequireToken = (options = {}) => {
     required: false
   });
   return MergeClassOrMethodDecorators([
-    (0, import_common3.UseGuards)(TokenGuard),
+    (0, import_common4.UseGuards)(TokenGuard),
     swaggerDec,
     ApiError(
       options.errorCode || defaultErrorCode,
@@ -441,7 +575,7 @@ var RequireToken = (options = {}) => {
 
 // src/abort-utils.ts
 var import_rxjs = require("rxjs");
-var import_common4 = require("@nestjs/common");
+var import_common5 = require("@nestjs/common");
 
 // src/utility/abort-http-signal.ts
 function toRawReq(req) {
@@ -507,7 +641,7 @@ var takeUntilAbort = (signal) => {
     );
   };
 };
-var As = (0, import_common4.createParamDecorator)(
+var As = (0, import_common5.createParamDecorator)(
   (_data, ctx) => {
     const req = ctx.switchToHttp().getRequest();
     return createAbortSignalFromHttp(req);
@@ -515,37 +649,27 @@ var As = (0, import_common4.createParamDecorator)(
 );
 
 // src/abortable-module/abortable.token.ts
-var import_common6 = require("@nestjs/common");
+var import_common7 = require("@nestjs/common");
 var import_nfkit = require("nfkit");
 
 // src/abortable-module/abort-signal.provider.ts
-var import_common5 = require("@nestjs/common");
-var import_core2 = require("@nestjs/core");
-
-// src/create-provider.ts
-var createProvider = (options, factory) => {
-  return {
-    useFactory: factory,
-    ...options
-  };
-};
-
-// src/abortable-module/abort-signal.provider.ts
+var import_common6 = require("@nestjs/common");
+var import_core3 = require("@nestjs/core");
 var ABORT_SIGNAL = Symbol(
   "ABORT_SIGNAL"
 );
 var AbortSignalProvider = createProvider(
   {
     provide: ABORT_SIGNAL,
-    scope: import_common5.Scope.REQUEST,
-    inject: [import_core2.REQUEST]
+    scope: import_common6.Scope.REQUEST,
+    inject: [import_core3.REQUEST]
   },
   createAbortSignalFromHttp
 );
-var InjectAbortSignal = () => (0, import_common5.Inject)(ABORT_SIGNAL);
+var InjectAbortSignal = () => (0, import_common6.Inject)(ABORT_SIGNAL);
 
 // src/abortable-module/abortable.token.ts
-var import_core3 = require("@nestjs/core");
+var import_core4 = require("@nestjs/core");
 var tokenMemo = /* @__PURE__ */ new Map();
 var abortableToken = (token) => {
   if (tokenMemo.has(token)) return tokenMemo.get(token);
@@ -566,7 +690,7 @@ function InjectAbortable(token) {
         );
       }
     }
-    (0, import_common6.Inject)(abortableToken(actualToken))(target, propertyKey, parameterIndex);
+    (0, import_common7.Inject)(abortableToken(actualToken))(target, propertyKey, parameterIndex);
   };
 }
 function createAbortableProvider(token, opts) {
@@ -574,11 +698,11 @@ function createAbortableProvider(token, opts) {
   return createProvider(
     {
       provide,
-      scope: import_common6.Scope.REQUEST,
-      inject: [import_core3.ModuleRef, import_core3.REQUEST, ABORT_SIGNAL]
+      scope: import_common7.Scope.REQUEST,
+      inject: [import_core4.ModuleRef, import_core4.REQUEST, ABORT_SIGNAL]
     },
     async (moduleRef, req, signal) => {
-      const ctxId = import_core3.ContextIdFactory.getByRequest(req);
+      const ctxId = import_core4.ContextIdFactory.getByRequest(req);
       const svc = await moduleRef.resolve(token, ctxId, { strict: false });
       if (svc == null) {
         throw new Error(
@@ -593,7 +717,7 @@ function createAbortableProvider(token, opts) {
 }
 
 // src/abortable-module/abortable.module.ts
-var import_common7 = require("@nestjs/common");
+var import_common8 = require("@nestjs/common");
 var AbortableModule = class {
   static forRoot() {
     return {
@@ -615,19 +739,19 @@ var AbortableModule = class {
   }
 };
 AbortableModule = __decorateClass([
-  (0, import_common7.Module)({})
+  (0, import_common8.Module)({})
 ], AbortableModule);
 
 // src/i18n-module/i18n.service.ts
-var import_common9 = require("@nestjs/common");
+var import_common10 = require("@nestjs/common");
 
 // src/i18n-module/i18n-token.ts
-var import_common8 = require("@nestjs/common");
-var { ConfigurableModuleClass, MODULE_OPTIONS_TOKEN } = new import_common8.ConfigurableModuleBuilder().build();
+var import_common9 = require("@nestjs/common");
+var { ConfigurableModuleClass, MODULE_OPTIONS_TOKEN } = new import_common9.ConfigurableModuleBuilder().build();
 var I18nModuleOptionsToken = MODULE_OPTIONS_TOKEN;
 
 // src/i18n-module/i18n.service.ts
-var import_core4 = require("@nestjs/core");
+var import_core5 = require("@nestjs/core");
 var import_nfkit2 = require("nfkit");
 var I18nService = class extends import_nfkit2.I18n {
   constructor(i18nServiceOptions, moduleRef) {
@@ -635,7 +759,7 @@ var I18nService = class extends import_nfkit2.I18n {
     this.i18nServiceOptions = i18nServiceOptions;
     this.moduleRef = moduleRef;
     this._shadowMiddlewareMap = /* @__PURE__ */ new Map();
-    this.logger = new import_common9.ConsoleLogger("I18nService");
+    this.logger = new import_common10.ConsoleLogger("I18nService");
     this.resolver = createResolver(this.i18nServiceOptions.resolver);
   }
   middleware(mw, prior = false) {
@@ -643,7 +767,7 @@ var I18nService = class extends import_nfkit2.I18n {
       try {
         return await mw(locale, text, next, ctx);
       } catch (e) {
-        if (e instanceof import_common9.HttpException) {
+        if (e instanceof import_common10.HttpException) {
           throw e;
         }
         this.logger.error(`Error in i18n middleware: ${e.message}`);
@@ -662,26 +786,28 @@ var I18nService = class extends import_nfkit2.I18n {
     return this;
   }
   async getExactLocaleFromRequest(ctx) {
-    const locale = await this.resolver(ctx, this.moduleRef);
+    const req = ctx.switchToHttp().getRequest();
+    const locale = await this.resolver(req, this.moduleRef);
     return this.getExactLocale(locale);
   }
   async translateRequest(ctx, obj) {
-    const locale = await this.resolver(ctx, this.moduleRef);
+    const req = ctx.switchToHttp().getRequest();
+    const locale = await this.resolver(req, this.moduleRef);
     return this.translate(locale, obj, ctx);
   }
 };
 I18nService = __decorateClass([
-  (0, import_common9.Injectable)(),
-  __decorateParam(0, (0, import_common9.Inject)(I18nModuleOptionsToken)),
-  __decorateParam(1, (0, import_common9.Inject)(import_core4.ModuleRef))
+  (0, import_common10.Injectable)(),
+  __decorateParam(0, (0, import_common10.Inject)(I18nModuleOptionsToken)),
+  __decorateParam(1, (0, import_common10.Inject)(import_core5.ModuleRef))
 ], I18nService);
 
 // src/i18n-module/i18n.module.ts
-var import_common11 = require("@nestjs/common");
+var import_common12 = require("@nestjs/common");
 
 // src/i18n-module/locale.pipe.ts
-var import_common10 = require("@nestjs/common");
-var import_core5 = require("@nestjs/core");
+var import_common11 = require("@nestjs/common");
+var import_core6 = require("@nestjs/core");
 var LocalePipe = class {
   constructor(i18nService, moduleRef) {
     this.i18nService = i18nService;
@@ -691,7 +817,8 @@ var LocalePipe = class {
     const resolver = ctx.resolver;
     if (resolver) {
       const _resolver = createResolver(resolver);
-      const locale = await _resolver(ctx.ctx, this.moduleRef);
+      const req = ctx.ctx.switchToHttp().getRequest();
+      const locale = await _resolver(req, this.moduleRef);
       return this.i18nService.getExactLocale(locale);
     } else {
       return this.i18nService.getExactLocaleFromRequest(ctx.ctx);
@@ -699,31 +826,33 @@ var LocalePipe = class {
   }
 };
 LocalePipe = __decorateClass([
-  (0, import_common10.Injectable)(),
-  __decorateParam(0, (0, import_common10.Inject)(I18nService)),
-  __decorateParam(1, (0, import_common10.Inject)(import_core5.ModuleRef))
+  (0, import_common11.Injectable)(),
+  __decorateParam(0, (0, import_common11.Inject)(I18nService)),
+  __decorateParam(1, (0, import_common11.Inject)(import_core6.ModuleRef))
 ], LocalePipe);
-var _dec = (0, import_common10.createParamDecorator)((resolver, ctx) => {
-  return { ctx, resolver };
-});
+var _dec = (0, import_common11.createParamDecorator)(
+  (resolver, ctx) => {
+    return { ctx, resolver };
+  }
+);
 var PutLocale = (resolver) => _dec(resolver, LocalePipe);
 
 // src/i18n-module/i18n.module.ts
 var I18nModule = class extends ConfigurableModuleClass {
 };
 I18nModule = __decorateClass([
-  (0, import_common11.Global)(),
-  (0, import_common11.Module)({
+  (0, import_common12.Global)(),
+  (0, import_common12.Module)({
     providers: [I18nService, LocalePipe],
     exports: [I18nService, LocalePipe]
   })
 ], I18nModule);
 
 // src/i18n-module/i18n-decorator.ts
-var import_common13 = require("@nestjs/common");
+var import_common14 = require("@nestjs/common");
 
 // src/i18n-module/i18n.interceptor.ts
-var import_common12 = require("@nestjs/common");
+var import_common13 = require("@nestjs/common");
 var import_rxjs2 = require("rxjs");
 var import_operators = require("rxjs/operators");
 var I18nInterceptor = class {
@@ -736,13 +865,13 @@ var I18nInterceptor = class {
       (0, import_operators.mergeMap)((data) => this.i18nService.translateRequest(context, data)),
       // 错误路径：若是 HttpException，把其 response 翻译后再抛
       (0, import_operators.catchError)((err) => {
-        if (err instanceof import_common12.HttpException) {
+        if (err instanceof import_common13.HttpException) {
           const status = err.getStatus();
           const resp = err.getResponse();
           return (0, import_rxjs2.from)(this.i18nService.translateRequest(context, resp)).pipe(
             (0, import_operators.mergeMap)(
               (translated) => (0, import_rxjs2.throwError)(
-                () => new import_common12.HttpException(translated, status, { cause: err })
+                () => new import_common13.HttpException(translated, status, { cause: err })
               )
             )
           );
@@ -753,14 +882,14 @@ var I18nInterceptor = class {
   }
 };
 I18nInterceptor = __decorateClass([
-  (0, import_common12.Injectable)(),
-  __decorateParam(0, (0, import_common12.Inject)(I18nService))
+  (0, import_common13.Injectable)(),
+  __decorateParam(0, (0, import_common13.Inject)(I18nService))
 ], I18nInterceptor);
 
 // src/i18n-module/i18n-decorator.ts
 var createI18nDecorator = (options) => {
   return () => MergeClassOrMethodDecorators([
-    (0, import_common13.UseInterceptors)(I18nInterceptor),
+    (0, import_common14.UseInterceptors)(I18nInterceptor),
     ApiFromResolver(options.resolver, {
       description: "Locale for internationalization",
       required: false,
@@ -800,6 +929,7 @@ var I18nLookupMiddleware = (0, import_nfkit3.createI18nLookupMiddleware)();
   As,
   BlankPaginatedReturnMessageDto,
   BlankReturnMessageDto,
+  CombinedParamResolver,
   DataBody,
   DataPipe,
   DataQuery,
@@ -819,6 +949,9 @@ var I18nLookupMiddleware = (0, import_nfkit3.createI18nLookupMiddleware)();
   MergeParameterDecorators,
   MergePropertyDecorators,
   PaginatedReturnMessageDto,
+  ParamResolver,
+  ParamResolverBase,
+  ParamResolverPipe,
   PutLocale,
   RenameClass,
   RequireToken,
@@ -834,6 +967,7 @@ var I18nLookupMiddleware = (0, import_nfkit3.createI18nLookupMiddleware)();
   fromAbortable,
   getApiProperty,
   getClassFromClassOrArray,
+  getParamResolver,
   takeUntilAbort
 });
 //# sourceMappingURL=index.cjs.map