Fix code coverage

Author: lahmatiy

package.json

@@ -40,7 +40,7 @@
     "watch": "node scripts/watch.cjs",
     "prepare": "npm run compile-modules && npm run esm-to-cjs",
     "prepack": "npm run lint && npm run test && npm run test:cjs && npm run bundle-and-test",
-    "coverage": "c8 --exclude src/lang/build.js --exclude src/lang/parse.js --reporter=lcovonly npm test"
+    "coverage": "c8 --exclude src/lang/build.js --exclude src/lang/parse.js --exclude test --reporter=lcovonly npm test"
   },
   "dependencies": {
     "@discoveryjs/natural-compare": "^1.0.0"

src/lang/compile.js

@@ -109,7 +109,7 @@ export default function compile(ast, tolerant = false, suggestions = null) {
         if (nodes.has(node.type)) {
             nodes.get(node.type)(node, ctx, relatedNode);
         } else {
-            throw new Error('Unknown node type `' + node.type + '`');
+            throw new Error('Unknown node type "' + node.type + '"');
         }
 
         if (spName) {
@@ -183,11 +183,6 @@ export default function compile(ast, tolerant = false, suggestions = null) {
         },
         put: chunk => buffer.push(chunk),
         node: walk,
-        nodeOrNothing(node, relatedNode) {
-            if (node) {
-                walk(node, relatedNode);
-            }
-        },
         nodeOrCurrent(node, relatedNode) {
             walk(node || { type: 'Current' }, relatedNode);
         },

src/lang/stringify.js

@@ -5,14 +5,6 @@ function isSimpleGetPropertyQuery(node) {
         return false;
     }
 
-    if (node.value && node.value.type !== 'Current') {
-        return false;
-    }
-
-    if (node.property.type !== 'Identifier') {
-        return false;
-    }
-
     return true;
 }
 
@@ -21,10 +13,6 @@ function isSimpleMethodCallQuery(node) {
         return false;
     }
 
-    if (node.value && node.value.type !== 'Current') {
-        return false;
-    }
-
     return true;
 }
 
@@ -33,7 +21,7 @@ export default function stringify(ast) {
         if (nodes.has(node.type)) {
             nodes.get(node.type)(node, ctx);
         } else {
-            throw new Error('Unknown node type `' + node.type + '`');
+            throw new Error('Unknown node type "' + node.type + '"');
         }
     }
 

src/lang/suggest.js

@@ -38,12 +38,7 @@ function getSuggestRanges(from, to, input, commentRanges, noSuggestOnEofPos) {
             continue;
         }
 
-        if (commentFrom === from) {
-            ranges.push(from, from);
-        } else {
-            ranges.push(from, commentFrom);
-        }
-
+        ranges.push(from, commentFrom);
         from = commentTo;
     }
 

src/lang/walk.js

@@ -7,7 +7,7 @@ export default function walk(ast, options) {
             nodes.get(node.type)(node, ctx);
             leave(node);
         } else {
-            throw new Error('Unknown node type `' + node.type + '`');
+            throw new Error('Unknown node type "' + node.type + '"');
         }
     }
 

test/helpers/all-syntax.js

@@ -9,6 +9,6 @@ export default [
     '.({foo:a|b,bar:a|$x;y})',
     '.map(=>$["abc"] or $[abc] or $[])',
     '.map().().[]..()..a..a()[]',
-    '.map([foo,$.foo,method(),$.method(),.(),$.(),.[],$.[],..(),..a,..a(),$..(),$..a,$..a()])',
+    '.map([foo,$.foo,method(),$.method(),.(),$.(),.[],$.[],..(),..a,..a(),..$a(),$..(),$..a,$..a(),..($),..($+[]),..(a() or b())])',
     '.reduce(=>$$+$)'
 ].join('');

test/method-sort.js

@@ -142,6 +142,7 @@ describe('sort()', () => {
     });
 
     describe('mixed value types', () => {
+        const fn = () => {};
         const data = [
             true,
             1,
@@ -156,7 +157,8 @@ describe('sort()', () => {
             { b: 1 },
             undefined,
             NaN,
-            Infinity
+            Infinity,
+            fn
         ];
 
         it('asc', () => {
@@ -176,6 +178,7 @@ describe('sort()', () => {
                     null,
                     { c: 1 },
                     { b: 1 },
+                    fn,
                     undefined
                 ])
             );
@@ -184,6 +187,7 @@ describe('sort()', () => {
             assert.deepEqual(
                 escapeNaN(query('sort($ desc)')([...data])),
                 escapeNaN([
+                    fn,
                     { c: 1 },
                     { b: 1 },
                     null,

test/syntax-compile.js

@@ -1,15 +1,16 @@
 import assert from 'assert';
-import query from 'jora';
+import jora from 'jora';
 
+const { syntax: { parse, compile } } = jora;
 const match = assert.match || ((str, rx) => assert(rx.test(str), `${str} doesn't match to ${rx}`));
 
 describe('syntax/compile', () => {
     it('compilation error', () => {
         assert.throws(
             () => {
-                const { ast } = query.syntax.parse('foo()');
+                const { ast } = parse('foo()');
                 ast.body.method.reference.name = ','; // break AST for a compilation error simulation
-                query.syntax.compile(ast);
+                compile(ast);
             },
             (error) => {
                 match(error.compiledSource, /data,context/);
@@ -20,4 +21,11 @@ describe('syntax/compile', () => {
             }
         );
     });
+
+    it('unknown node type', () => {
+        assert.throws(
+            () => compile({ type: 'Foo' }),
+            /Unknown node type "Foo"/
+        );
+    });
 });

test/syntax-stringify.js

@@ -10,4 +10,11 @@ describe('syntax/stringify', () => {
 
         assert.equal(actual, allSyntax);
     });
+
+    it('unknown node type', () => {
+        assert.throws(
+            () => stringify({ type: 'Foo' }),
+            /Unknown node type "Foo"/
+        );
+    });
 });

test/syntax-walk.js

@@ -53,4 +53,11 @@ describe('syntax/walk', () => {
 
         assert.deepEqual(actual.sort(), expected.sort());
     });
+
+    it('unknown node type', () => {
+        assert.throws(
+            () => walk({ type: 'Foo' }),
+            /Unknown node type "Foo"/
+        );
+    });
 });