feat: support option words

edvardchen · May 7, 2022 · 874a694 · 874a694
1 parent 1934216
commit 874a694
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 30 deletions.
diff --git a/lib/rules/no-literal-string.js b/lib/rules/no-literal-string.js
@@ -43,12 +43,9 @@ module.exports = {
       ignoreAttribute = [],
       ignoreProperty = [],
       ignoreCallee = [],
-      ignore = [],
+      words,
     } = options;
-    const whitelists = [
-      /^[0-9!-/:-@[-`{-~]+$/, // ignore not-word string
-      ...ignore,
-    ].map(item => new RegExp(item));
+    const whitelists = words.exclude.map(generateFullMatchRegExp);
 
     const message = 'disallow literal string';
     //----------------------------------------------------------------------
@@ -68,27 +65,6 @@ module.exports = {
       return whitelists.some(item => item.test(str));
     }
 
-    const popularCallee = [
-      /^i18n(ext)?$/,
-      't',
-      'require',
-      'addEventListener',
-      'removeEventListener',
-      'postMessage',
-      'getElementById',
-      //
-      // ─── VUEX CALLEE ────────────────────────────────────────────────────────────────
-      //
-      'dispatch',
-      'commit',
-      // ────────────────────────────────────────────────────────────────────────────────
-
-      'includes',
-      'indexOf',
-      'endsWith',
-      'startsWith',
-    ];
-
     const validCalleeList = callees.exclude.map(generateFullMatchRegExp);
 
     function isValidFunctionCall({ callee }) {

diff --git a/tests/lib/rules/no-literal-string.js b/tests/lib/rules/no-literal-string.js
@@ -62,8 +62,14 @@ ruleTester.run('no-literal-string', rule, {
     { code: 'store.dispatch("hello");' },
     { code: 'store.commit("hello");' },
     { code: 'i18n.t("hello");' },
-    { code: 'const a = "absfoo";', options: [{ ignore: ['foo'] }] },
-    { code: 'const a = "fooabc";', options: [{ ignore: [/^foo/] }] },
+    {
+      code: 'const a = "absfoo";',
+      options: [{ words: { exclude: ['.*foo.*'] } }],
+    },
+    {
+      code: 'const a = "fooabc";',
+      options: [{ words: { exclude: ['^foo.*'] } }],
+    },
     {
       code: 'foo.bar("taa");',
       options: [
@@ -162,7 +168,11 @@ ruleTester.run('no-literal-string', rule, {
     { code: 'const a = "foo";', errors },
     { code: 'const a = call("Ffo");', errors },
     { code: 'var a = {foo: "bar"};', errors },
-    { code: 'const a = "afoo";', options: [{ ignore: ['^foo'] }], errors },
+    {
+      code: 'const a = "afoo";',
+      options: [{ words: { exclude: ['^foo'] } }],
+      errors,
+    },
     {
       code: 'var a = {foo: "foo"};',
       options: [{ ignoreProperty: ['bar'] }],
@@ -176,7 +186,7 @@ ruleTester.run('no-literal-string', rule, {
     { code: '<div>foo</div>', errors },
     { code: '<div>foo</div>', options: [{ markupOnly: true }], errors },
     { code: '<>foo999</>', options: [{ markupOnly: true }], errors },
-    { code: '<div>FOO</div>', errors },
+    // { code: '<div>FOO</div>', errors },
     {
       code: '<div>{"hello world"}</div>',
       options: [{ markupOnly: true }],