🐛 fix Expose options weren't passed correctly

fix #102

Author: momocow

lib/features/validate-headers/impl.ts

@@ -47,19 +47,27 @@ export class ValidateHeaders extends Feature<ValidateHeadersOptions> {
         : ValidationGroup.I18n,
     ];
 
+    const transformerGroups = whitelist
+      ? groups
+      : [ValidationGroup.Main, ValidationGroup.I18n];
+
     const headers = plainToInstance(HeadersClass, headersProps, {
       exposeDefaultValues: true,
       excludeExtraneousValues: whitelist,
       exposeUnsetFields: false,
-      groups,
+      groups: transformerGroups,
     });
 
     if (strict) {
       const errors = validateSync(headers, {
         forbidNonWhitelisted: true,
         whitelist: true,
         stopAtFirstError: false,
-        groups,
+        groups: [
+          locale === DEFAULT_LOCALE_KEY
+            ? ValidationGroup.Main
+            : ValidationGroup.I18n,
+        ],
       });
 
       if (errors.length > 0) {
@@ -72,6 +80,9 @@ export class ValidateHeaders extends Feature<ValidateHeadersOptions> {
       }
     }
 
-    return instanceToPlain(headers, { exposeUnsetFields: false, groups });
+    return instanceToPlain(headers, {
+      exposeUnsetFields: false,
+      groups: transformerGroups,
+    });
   }
 }

lib/features/validate-headers/utils.ts

@@ -16,22 +16,29 @@ export type ValidatorFactory<T extends any[] = []> = (...args: T) => Validator;
  * wrap it in a new `@Expose()` implementation to stack for `groups` options.
  */
 export const Expose: Validator =
-  ({ groups } = {}) =>
+  (options: transformer.ExposeOptions = {}) =>
   (target, prop) => {
     const metadata = defaultMetadataStorage.findExposeMetadata(
       target.constructor,
       prop as string,
     );
 
     if (!metadata) {
-      transformer.Expose()(target, prop);
+      transformer.Expose(options)(target, prop);
 
       return;
     }
 
-    if (!groups) return;
-
-    metadata.options.groups = (metadata.options.groups ?? []).concat(groups);
+    // merge expose options
+    Object.assign(
+      metadata.options,
+      options,
+      options.groups
+        ? {
+            groups: (metadata.options.groups ?? []).concat(options.groups),
+          }
+        : undefined,
+    );
   };
 
 export const partialGroups =

test/integration/i18n/fixtures.ts

@@ -3,4 +3,7 @@ import { File, GlobalFixtures } from '../fixtures';
 export class Fixtures extends GlobalFixtures {
   @File(__dirname, 'i18n.headers.txt')
   public static readonly i18nHeaders: string;
+
+  @File(__dirname, 'non-strict-i18n.headers.txt')
+  public static readonly nonStrictI18nHeaders: string;
 }

test/integration/i18n/i18n.headers.txt

@@ -1,5 +1,6 @@
 // ==UserScript==
 // @name i18n
+// @name:en localized name
 // @description this is a fantastic userscript
 // @description:en i18n description
 // @version 0.0.0

test/integration/i18n/index.test.ts

@@ -24,6 +24,7 @@ describe('i18n', () => {
           },
           i18n: {
             en: {
+              name: 'localized name',
               description: 'i18n description',
             },
           },
@@ -41,6 +42,7 @@ describe('i18n', () => {
     input.writeFileSync(
       '/headers.json',
       JSON.stringify({
+        name: 'localized name',
         description: 'i18n description',
       }),
     );
@@ -76,6 +78,7 @@ describe('i18n', () => {
           i18n: {
             en: (headers): HeadersProps => ({
               ...headers,
+              name: 'localized name',
               description: 'i18n description',
             }),
           },
@@ -89,23 +92,80 @@ describe('i18n', () => {
     });
   });
 
-  it('unlocalizable tags', () => {
-    const promise = compile(input, {
-      ...Fixtures.webpackConfig,
-      plugins: [
-        new UserscriptPlugin({
-          headers: {
-            name: 'i18n',
-          },
-          i18n: {
-            en: {
-              downloadURL: 'https://example.com',
+  describe('unlocalizable tags', () => {
+    it('are rejected in strict mode', () => {
+      const promise = compile(input, {
+        ...Fixtures.webpackConfig,
+        plugins: [
+          new UserscriptPlugin({
+            headers: {
+              name: 'i18n',
             },
-          },
-        }),
-      ],
+            i18n: {
+              en: {
+                name: 'localized name',
+                downloadURL: 'https://example.com',
+              },
+            },
+          }),
+        ],
+      });
+
+      return expect(promise).toReject();
     });
 
-    return expect(promise).toReject();
+    it('are allowed in non-strict mode', async () => {
+      const output = await compile(input, {
+        ...Fixtures.webpackConfig,
+        plugins: [
+          new UserscriptPlugin({
+            headers: {
+              name: 'non-strict i18n',
+            },
+            i18n: {
+              en: (headers): HeadersProps => ({
+                ...headers,
+                downloadURL: 'https://example.com',
+              }),
+            },
+            strict: false,
+          }),
+        ],
+      });
+
+      expect(output.toJSON()).toEqual({
+        '/dist/output.user.js': Fixtures.entryUserJs(
+          Fixtures.nonStrictI18nHeaders,
+        ),
+        '/dist/output.meta.js': Fixtures.nonStrictI18nHeaders,
+      });
+    });
+
+    it('are stripped in whitelist mode', async () => {
+      const output = await compile(input, {
+        ...Fixtures.webpackConfig,
+        plugins: [
+          new UserscriptPlugin({
+            headers: {
+              name: 'i18n',
+            },
+            i18n: {
+              en: {
+                name: 'localized name',
+                description: 'i18n description',
+                // downloadURL will be stripped
+                downloadURL: 'https://example.com',
+              },
+            },
+            whitelist: true,
+          }),
+        ],
+      });
+
+      expect(output.toJSON()).toEqual({
+        '/dist/output.user.js': Fixtures.entryUserJs(Fixtures.i18nHeaders),
+        '/dist/output.meta.js': Fixtures.i18nHeaders,
+      });
+    });
   });
 });

test/integration/i18n/non-strict-i18n.headers.txt

@@ -0,0 +1,7 @@
+// ==UserScript==
+// @name non-strict i18n
+// @description this is a fantastic userscript
+// @version 0.0.0
+// @match *://*/*
+// @downloadURL:en https://example.com
+// ==/UserScript==