@iamnnort/nestjs-serializer 2.2.8 → 2.10.0

package/README.md

@@ -145,9 +145,7 @@ import { AppController } from './controller';
 @Module({
   imports: [
     LoggerModule,
-    SerializerModule.register({
-      globalEntityNames: [Model.name],
-    }),
+    SerializerModule,
   ],
   controllers: [AppController],
 })

package/dist/index.d.mts

@@ -27,7 +27,6 @@ type SerializerFieldConfig = {
     fieldTransform?: (value: any, entity: any) => any | Promise<any>;
 };
 type SerializerConfig = {
-    globalEntityNames?: string[];
     globalLimitedScopes?: string[];
     globalSecretScopes?: string[];
 };
@@ -63,7 +62,7 @@ declare const SerializerInterceptor: (config: {
         serializerService: SerializerService;
         intercept(ctx: ExecutionContext, next: CallHandler<Promise<any>>): rxjs.Observable<Promise<any>>;
         getScopes(ctx: ExecutionContext): string[];
-        withQueryScopes(ctx: ExecutionContext, scopes: string[]): string[];
+        withExtendedScopes(ctx: ExecutionContext, scopes: string[]): string[];
         withSecretScopes(ctx: ExecutionContext, scopes: string[]): string[];
     };
 };
@@ -72,7 +71,7 @@ declare const SerializerIdInterceptor_base: {
         serializerService: SerializerService;
         intercept(ctx: ExecutionContext, next: CallHandler<Promise<any>>): rxjs.Observable<Promise<any>>;
         getScopes(ctx: ExecutionContext): string[];
-        withQueryScopes(ctx: ExecutionContext, scopes: string[]): string[];
+        withExtendedScopes(ctx: ExecutionContext, scopes: string[]): string[];
         withSecretScopes(ctx: ExecutionContext, scopes: string[]): string[];
     };
 };

package/dist/index.d.ts

@@ -27,7 +27,6 @@ type SerializerFieldConfig = {
     fieldTransform?: (value: any, entity: any) => any | Promise<any>;
 };
 type SerializerConfig = {
-    globalEntityNames?: string[];
     globalLimitedScopes?: string[];
     globalSecretScopes?: string[];
 };
@@ -63,7 +62,7 @@ declare const SerializerInterceptor: (config: {
         serializerService: SerializerService;
         intercept(ctx: ExecutionContext, next: CallHandler<Promise<any>>): rxjs.Observable<Promise<any>>;
         getScopes(ctx: ExecutionContext): string[];
-        withQueryScopes(ctx: ExecutionContext, scopes: string[]): string[];
+        withExtendedScopes(ctx: ExecutionContext, scopes: string[]): string[];
         withSecretScopes(ctx: ExecutionContext, scopes: string[]): string[];
     };
 };
@@ -72,7 +71,7 @@ declare const SerializerIdInterceptor_base: {
         serializerService: SerializerService;
         intercept(ctx: ExecutionContext, next: CallHandler<Promise<any>>): rxjs.Observable<Promise<any>>;
         getScopes(ctx: ExecutionContext): string[];
-        withQueryScopes(ctx: ExecutionContext, scopes: string[]): string[];
+        withExtendedScopes(ctx: ExecutionContext, scopes: string[]): string[];
         withSecretScopes(ctx: ExecutionContext, scopes: string[]): string[];
     };
 };

package/dist/index.js

@@ -9110,12 +9110,9 @@ var SerializerService = class {
       return _lodash.pick.call(void 0, entity, config.fields);
     }
     const serializerFieldConfigs = global.serializerFieldConfigs.filter((fieldConfig) => {
-      const isTarget = fieldConfig.target === entity.constructor;
+      const isTarget = entity instanceof fieldConfig.target;
       if (!isTarget) {
-        const isGlobalTarget = (this.config.globalEntityNames || []).includes(fieldConfig.target.name);
-        if (!isGlobalTarget) {
-          return false;
-        }
+        return false;
       }
       const isScope = fieldConfig.scopes.some((scope) => {
         if (!config.scopes) {
@@ -9228,7 +9225,7 @@ var SerializerInterceptor = /* @__PURE__ */ __name((config) => {
     }
     intercept(ctx, next) {
       const request = ctx.switchToHttp().getRequest();
-      request.scopes = this.withQueryScopes(ctx, this.withSecretScopes(ctx, this.getScopes(ctx)));
+      request.scopes = this.getScopes(ctx);
       return next.handle().pipe((0, import_operators.map)(async (responsePromise) => {
         const response = await responsePromise;
         if (!request.scopes && !config.fields) {
@@ -9246,18 +9243,18 @@ var SerializerInterceptor = /* @__PURE__ */ __name((config) => {
       if (request.query.limited === "true") {
         return config.limitedScopes || this.serializerService.config.globalLimitedScopes || scopes;
       }
-      if (request.query.extended === "true") {
-        return config.extendedScopes || scopes;
+      if (request.query.scopes && config.allowedScopes) {
+        return _lodash.intersection.call(void 0, request.query.scopes, config.allowedScopes);
       }
-      return scopes;
+      return this.withSecretScopes(ctx, this.withExtendedScopes(ctx, scopes));
     }
-    withQueryScopes(ctx, scopes) {
+    withExtendedScopes(ctx, scopes) {
       const request = ctx.switchToHttp().getRequest();
-      if (request.query.scopes && config.allowedScopes) {
-        const queryScopes = _lodash.intersection.call(void 0, request.query.scopes, config.allowedScopes);
+      if (request.query.extended === "true") {
+        const extendedScopes = config.extendedScopes || [];
         return _lodash.uniq.call(void 0, [
           ...scopes,
-          ...queryScopes
+          ...extendedScopes
         ]);
       }
       return scopes;