Add node type

Author: Sascha Goldhofer

lib/interpreter/index.ts

@@ -1,11 +1,12 @@
 import { expand, select, cache } from "./nodes";
 import { VALUE_INDEX, KEY_INDEX, PARENT_INDEX, POINTER_INDEX } from "./keys";
 import { QueryResult, Input, JSONPointer } from "../types";
+import { IToken } from "ebnf";
 
 type WorkingSet = Array<QueryResult>;
 
 
-function collect(func, input: WorkingSet, node, pointer: JSONPointer) {
+function collect(func, input: WorkingSet, node: IToken, pointer: JSONPointer): WorkingSet {
     const result = [];
     for (let i = 0, l = input.length; i < l; i += 1) {
         result.push(...func(node, input[i], node, pointer));
@@ -14,7 +15,7 @@ function collect(func, input: WorkingSet, node, pointer: JSONPointer) {
 }
 
 
-function reduce(func, input, node, pointer: JSONPointer) {
+function reduce(func, input: WorkingSet, node: IToken, pointer: JSONPointer): WorkingSet {
     const result = [];
     for (let i = 0, l = input.length; i < l; i += 1) {
         const output = func(node, input[i], pointer);
@@ -26,7 +27,7 @@ function reduce(func, input, node, pointer: JSONPointer) {
 }
 
 
-function query(data: WorkingSet, ast, pointer: JSONPointer): WorkingSet {
+function query(data: WorkingSet, ast: IToken, pointer: JSONPointer): WorkingSet {
     let result = data;
     ast.children.forEach(node => {
         if (expand[node.type]) {
@@ -43,7 +44,7 @@ function query(data: WorkingSet, ast, pointer: JSONPointer): WorkingSet {
 }
 
 
-function runPatternOnce(inputSet: WorkingSet, ast, pointer: JSONPointer): WorkingSet {
+function runPatternOnce(inputSet: WorkingSet, ast: IToken, pointer: JSONPointer): WorkingSet {
     const resultingSet = [];
     let workingSet = inputSet;
     ast.children.forEach(node => {
@@ -58,7 +59,7 @@ function runPatternOnce(inputSet: WorkingSet, ast, pointer: JSONPointer): Workin
     return resultingSet;
 }
 
-function getIterationCount(quantifier?: string) {
+function getIterationCount(quantifier?: string): number {
     if (quantifier == null) {
         return 1; // default, simple group
     }
@@ -70,7 +71,7 @@ function getIterationCount(quantifier?: string) {
 }
 
 
-function pattern(data, ast, pointer: JSONPointer) {
+function pattern(data: WorkingSet, ast: IToken, pointer: JSONPointer): WorkingSet {
     const result = [];
     const quantifier = ast.children.find(node => node.type === "quantifier");
     const iterationCount = getIterationCount(quantifier && quantifier.text);
@@ -88,14 +89,14 @@ function pattern(data, ast, pointer: JSONPointer) {
 }
 
 
-function skip(data: WorkingSet, ast, pointer: JSONPointer) {
+function skip(data: WorkingSet, ast: IToken, pointer: JSONPointer): WorkingSet {
     let result = data;
     ast.children.forEach(n => (result = runNode(result, n, pointer)));
     return result;
 }
 
 
-function runNode(data: WorkingSet, ast, pointer?: JSONPointer): WorkingSet {
+function runNode(data: WorkingSet, ast: IToken, pointer?: JSONPointer): WorkingSet {
     let result;
     if (ast.type === "query") {
         result = query(data, ast, pointer);
@@ -111,7 +112,7 @@ function runNode(data: WorkingSet, ast, pointer?: JSONPointer): WorkingSet {
 }
 
 
-export default function run(data: Input, ast): Array<QueryResult> {
+export default function run(data: Input, ast: IToken): Array<QueryResult> {
     cache.reset();
     cache.mem.push(data);
     return runNode([[data, null, null, "#"]], ast);

lib/interpreter/nodes.ts

@@ -1,6 +1,7 @@
 import o from "gson-conform";
 const join = (a, b) => `${a}/${b}`;
 import { VALUE_INDEX, POINTER_INDEX } from "./keys";
+import { IToken } from "ebnf";
 
 const toString = Object.prototype.toString;
 const rContainer = /Object|Array/;
@@ -30,14 +31,14 @@ const cache = {
 
 
 const expand = {
-    any(node, entry) {
+    any(node: IToken, entry) {
         const value = entry[VALUE_INDEX];
         return o.keys(value)
             // .map(prop => cache.get(entry, prop));
             .map(prop => [value[prop], prop, value, join(entry[POINTER_INDEX], prop)]);
     },
 
-    all(node, entry) {
+    all(node: IToken, entry) {
         const result = [entry];
         o.forEach(entry[VALUE_INDEX], (value, prop) => {
             const childEntry = cache.get(entry, prop);
@@ -47,7 +48,7 @@ const expand = {
         return result;
     },
 
-    regex(node, entry) {
+    regex(node: IToken, entry) {
         const regex = nodeAsRegex(node);
         const value = entry[VALUE_INDEX];
         return o.keys(value)
@@ -59,9 +60,9 @@ const expand = {
 
 const select = {
     // alias to property (but escaped)
-    escaped: (node, entry) => select.property(node, entry),
+    escaped: (node: IToken, entry) => select.property(node, entry),
 
-    property: (node, entry) => {
+    property: (node: IToken, entry) => {
         const prop = node.text;
         if (entry[VALUE_INDEX] && entry[VALUE_INDEX][prop] !== undefined) {
             return [
@@ -73,7 +74,7 @@ const select = {
         }
     },
 
-    typecheck: (node, entry) => {
+    typecheck: (node: IToken, entry) => {
         const checkedTyped = node.text.replace(/^\?:/, "");
         if (checkedTyped === "value") {
             return isContainer(entry[VALUE_INDEX]) ? undefined : entry;
@@ -85,7 +86,7 @@ const select = {
         }
     },
 
-    lookahead: (node, entry) => {
+    lookahead: (node: IToken, entry) => {
         let valid = true;
         let or = false;
         node.children.forEach(expr => {
@@ -99,7 +100,7 @@ const select = {
         return valid ? entry : undefined;
     },
 
-    expression: (node, entry) => {
+    expression: (node: IToken, entry) => {
         const prop = node.children[0].text;
         const cmp = node.children[1];
         const test = node.children[2];

lib/parser/index.ts

@@ -1,4 +1,5 @@
 import { default as EBNF } from "ebnf/dist/Grammars/W3CEBNF";
+import { IToken } from "ebnf";
 import enbf from "./grammar";
 
 const valid = /(children|text|type|start|end|rest|errors|fullText|\d+)/;
@@ -9,6 +10,6 @@ const toSmallJSON = (ast) => JSON.stringify(ast, (key, value) => (key === "" ||
 const parser = new EBNF.Parser(enbf);
 
 
-export const parse = (query) => parser.getAST(query);
-export const reduce = (ast) => JSON.parse(toSmallJSON(ast));
+export const parse = (query): IToken => parser.getAST(query);
+export const reduce = (ast: IToken) => JSON.parse(toSmallJSON(ast));
 export { toJSON };