Fix crash with null value in no-raw-text rule (#315)

* Fix crash with null value in no-raw-text rule

* fix

Author: ota-meshi

lib/rules/no-duplicate-keys-in-locale.ts

@@ -113,20 +113,21 @@ function create(context: RuleContext): RuleListener {
           }
           return
         }
-        const keyOtherValues = pathStack.otherDictionaries
-          .filter(dict => dict.dict[key] != null)
-          .map(dict => {
-            return {
-              value: dict.dict[key],
-              source: dict.source
-            }
-          })
+        const keyOtherValues = pathStack.otherDictionaries.map(dict => {
+          return {
+            value: dict.dict[key],
+            source: dict.source
+          }
+        })
         const keyPath = [...pathStack.keyPath, key]
         const keyPathStr = joinPath(...keyPath)
         const nextOtherDictionaries: DictData[] = []
         const reportFiles = []
         for (const value of keyOtherValues) {
-          if (typeof value.value === 'string') {
+          if (value.value == null) {
+            continue
+          }
+          if (typeof value.value !== 'object') {
             reportFiles.push(
               '"' + getMessageFilepath(value.source.fullpath, context) + '"'
             )

lib/rules/no-raw-text.ts

@@ -662,7 +662,10 @@ function extractMessageKeys(
   ): Iterable<string> {
     for (const key of Object.keys(messages)) {
       const value = messages[key]
-      if (typeof value === 'string') {
+      if (value == null) {
+        continue
+      }
+      if (typeof value !== 'object') {
         if (targetValue === value) {
           yield [...paths, key].join('.')
         }

lib/types/i18n.ts

@@ -1,4 +1,12 @@
-export type I18nLocaleMessageValue = string | I18nLocaleMessageDictionary
+export type I18nLocaleMessageValue =
+  | string
+  | null
+  | undefined
+  | number
+  | boolean
+  | symbol
+  | bigint
+  | I18nLocaleMessageDictionary
 
 export type I18nLocaleMessageDictionary = {
   [property: string]: I18nLocaleMessageValue

lib/utils/locale-messages.ts

@@ -300,7 +300,7 @@ export class LocaleMessages {
       )
       if (
         localeMessages.some(last => {
-          return last && typeof last !== 'string' ? last[key] != null : false
+          return last && typeof last === 'object' ? last[key] != null : false
         })
       ) {
         // Hit the original key.
@@ -316,7 +316,7 @@ export class LocaleMessages {
         targetPaths.push(path)
         const values: I18nLocaleMessageValue[] = lasts
           .map(last => {
-            return last && typeof last !== 'string' ? last[path] : undefined
+            return last && typeof last === 'object' ? last[path] : undefined
           })
           .filter((val): val is I18nLocaleMessageValue => val != null)
 

tests/lib/rules/no-duplicate-keys-in-locale.ts

@@ -76,6 +76,12 @@ new RuleTester({
       <template></template>
       <script></script>`
     },
+    {
+      filename: 'test.vue',
+      code: `
+      <i18n locale="en">{ "foo": null, "bar": 123 }</i18n>
+      <template>Hello!</template>`
+    },
     ...getTestCasesFromFixtures({
       cwd: join(cwdRoot, './valid/vue-cli-format'),
       localeDir: `./locales/*.{json,yaml,yml}`

tests/lib/rules/no-raw-text.ts

@@ -1597,6 +1597,27 @@ tester.run('no-raw-text', rule as never, {
           ]
         }
       ]
+    },
+    {
+      // null value
+      code: `
+      <i18n locale="en">{ "foo": null, "bar": 123 }</i18n>
+      <template>Hello!</template>`,
+      errors: [
+        {
+          message: "raw text 'Hello!' is used",
+          suggestions: [
+            {
+              desc: "Add the resource to the '<i18n>' block.",
+              output: `
+      <i18n locale="en">{
+        "Hello!": "Hello!",
+         "foo": null, "bar": 123 }</i18n>
+      <template>{{$t('Hello!')}}</template>`
+            }
+          ]
+        }
+      ]
     }
   ]
 })