Add .yaspellerrc.js and .yaspellerrc.json for project config

README.md

@@ -160,6 +160,8 @@ To run the linter:<br/>
 `yaspeller` is configured using JSON file at the root of the project:
 
 - `.yaspellerrc`
+- `.yaspellerrc.js`
+- `.yaspellerrc.json`
 - `.yaspeller.json`
 - `package.json`, field `yaspeller`
 

README.ru.md

@@ -151,6 +151,8 @@ JSON-файл собственного словаря.
 `yaspeller` настраивается, используя JSON-файл, расположенный в корне проекта:
 
 - `.yaspellerrc`
+- `.yaspellerrc.js`
+- `.yaspellerrc.json`
 - `.yaspeller.json`
 - `package.json`, поле `yaspeller`
 

lib/config/index.js

@@ -37,8 +37,10 @@ function getConfig(file) {
         },
         searchPlaces: [
             'package.json',
+            '.yaspeller.json',
             '.yaspellerrc',
-            '.yaspeller.json'
+            '.yaspellerrc.js',
+            '.yaspellerrc.json',
         ]
     });
 

test/config.test.js

@@ -16,49 +16,60 @@ afterEach(function() {
 });
 
 describe('Config', function() {
-    it('get, custom config', function() {
-        assert.deepEqual(getConfig('./test/json/no_comment.json'), {
-            relativePath: 'test/json/no_comment.json',
-            data: ['1']
-        });
-    });
-
-    it('get, custom config with comments', function() {
-        assert.deepEqual(getConfig('./test/json/comment.json'), {
-            relativePath: 'test/json/comment.json',
-            data: ['1']
+    it('getConfig, custom config with comments', function() {
+        assert.deepEqual(getConfig('./test/configs/comment.json'), {
+            relativePath: 'test/configs/comment.json',
+            data: { report: ['console'] }
         });
     });
 
-    it('get, default config', function() {
+    it('getConfig, default config', function() {
         const result = getConfig(null);
         assert.equal(result.relativePath, '.yaspellerrc');
         assert.ok(Object.keys(result.data).length);
     });
 
-    it('get, throw', function() {
-        getConfig('test/json/error_parsing.json');
+    it('getConfig, throw', function() {
+        getConfig('test/configs/error_parsing.json');
 
         assert.equal(process.exit.args[0], exitCodes.ERROR_CONFIG);
     });
 
-    it('get, unknown properties', function() {
-        getConfig('test/json/unknown_properties.json');
+    it('getConfig, unknown properties', function() {
+        getConfig('test/configs/unknown_properties.json');
 
         const count = console.error.args.length;
         assert.equal(count, 2);
     });
 
-    it('get, wrong property type', function() {
-        getConfig('test/json/wrong_prop_type.json');
+    it('getConfig, wrong property type', function() {
+        getConfig('test/configs/wrong_prop_type.json');
 
         const count = console.error.args.length;
         assert.equal(count, 2);
     });
 
-    it('get, config from package.json', function() {
-        process.chdir('./test/json');
+    it('getConfig from package.json', function() {
+        process.chdir('./test/configs');
         assert.deepEqual(getConfig(null).data, { lang: 'en,ru' });
         process.chdir('../../');
     });
+
+    it('getConfig from yaspellerrc.js', function() {
+        process.chdir('./test/configs/rc.js');
+        assert.deepEqual(getConfig(null).data, { report: ['rc.js'] });
+        process.chdir('../../../');
+    });
+
+    it('getConfig from yaspellerrc.json', function() {
+        process.chdir('./test/configs/json');
+        assert.deepEqual(getConfig(null).data, { report: ['json'] });
+        process.chdir('../../../');
+    });
+
+    it('getConfig from yaspellerrc', function() {
+        process.chdir('./test/configs/rc');
+        assert.deepEqual(getConfig(null).data, { report: ['rc'] });
+        process.chdir('../../../');
+    });
 });

test/configs/comment.json

@@ -0,0 +1,3 @@
+{
+    "report": ["console"] // comment
+}

test/configs/error_parsing.json

@@ -0,0 +1,3 @@
+{
+    "report": ["console" // comment
+}

test/configs/json/.yaspellerrc.json

@@ -0,0 +1,3 @@
+{
+  "report": ["json"]
+}

test/configs/rc.js/.yaspellerrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+    report: ['rc.js'],
+};

test/configs/rc/.yaspellerrc

@@ -0,0 +1,3 @@
+{
+  "report": ["rc"]
+}

test/json/unknown_properties.json → test/configs/unknown_properties.json

@@ -17,4 +17,3 @@
     "lang": "en,ru",
     "report": ["console"]
 }
-

test/json/wrong_prop_type.json → test/configs/wrong_prop_type.json

@@ -16,4 +16,3 @@
     "lang": "en,ru",
     "report": ["console"]
 }
-