Merge branch 'dev'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-scanner",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Scan your code, extract translation keys/values, and merge them into i18n resource files.",
   "homepage": "https://github.com/i18next/i18next-scanner",
   "author": "Cheton Wu <cheton@gmail.com>",

src/parser.js

@@ -549,9 +549,9 @@ class Parser {
     // @param {string|number} [options.space] The same as the JSON.stringify() method
     // @return {string}
     toJSON(options = {}) {
-        const { replacer, space } = options;
+        const { replacer, space, ...others } = options;
 
-        return JSON.stringify(this.getResourceStore(options), replacer, space);
+        return JSON.stringify(this.get(others), replacer, space);
     }
 }
 

test/parser.js

@@ -5,6 +5,27 @@ import { Parser } from '../src';
 
 const defaults = {};
 
+test('skip undefined namespace', (t) => {
+    const parser = new Parser({
+        ns: ['translation']
+    });
+    const content = `
+        i18next.t('none:key2');
+        i18next.t('key1');
+    `;
+    const wanted = {
+        en: {
+            translation: {
+                key1: ''
+            }
+        }
+    };
+
+    parser.parseFuncFromString(content);
+    t.same(parser.get(), wanted);
+    t.end();
+});
+
 test('parse translation function', (t) => {
     const parser = new Parser({
         lngs: ['en'],
@@ -264,3 +285,40 @@ test('Context with plural combined', (t) => {
     });
     t.end();
 });
+
+test('parser.toJSON()', (t) => {
+    const parser = new Parser();
+    const content = fs.readFileSync(path.resolve(__dirname, 'fixtures/app.js'), 'utf-8');
+
+    parser.parseFuncFromString(content);
+
+    t.same(parser.toJSON(), '{"en":{"translation":{"key2":"","key1":""}}}');
+    t.end();
+});
+
+test('parser.toJSON({ sort: true })', (t) => {
+    const parser = new Parser();
+    const content = fs.readFileSync(path.resolve(__dirname, 'fixtures/app.js'), 'utf-8');
+
+    parser.parseFuncFromString(content);
+
+    t.same(parser.toJSON({ sort: true }), '{"en":{"translation":{"key1":"","key2":""}}}');
+    t.end();
+});
+
+test('parser.toJSON({ sort: true, space: 2 })', (t) => {
+    const parser = new Parser();
+    const content = fs.readFileSync(path.resolve(__dirname, 'fixtures/app.js'), 'utf-8');
+    const wanted = JSON.stringify({
+        en: {
+            translation: {
+                key1: '',
+                key2: ''
+            }
+        }
+    }, null, 2);
+
+    parser.parseFuncFromString(content);
+    t.same(parser.toJSON({ sort: true, space: 2 }), wanted);
+    t.end();
+});