Fix lint issues

Author: Sascha Goldhofer

lib/get.ts

@@ -1,6 +1,6 @@
 import { parse } from "./parser";
 import { run, VALUE_INDEX, POINTER_INDEX } from "./interpreter";
-import { Input } from "./types";
+import { Input, JSONPointer, QueryResult } from "./types";
 
 
 const returnTypes = {
@@ -23,7 +23,9 @@ export enum ReturnType {
     MAP = "map"
 }
 
-export default function get(data: Input, queryString: string, returnType: ReturnType|Function = ReturnType.VALUE) {
+export type ResultCallback = (value: any, property: string|null, parent: { [p: string]: any }|Array<any>|null, pointer: JSONPointer) => any;
+
+export default function get(data: Input, queryString: string, returnType: ReturnType|ResultCallback = ReturnType.VALUE) {
     if (queryString == null) {
         return [];
     }
@@ -43,7 +45,7 @@ export default function get(data: Input, queryString: string, returnType: Return
 
     const result = run(data, ast);
     if (typeof returnType === "function") {
-        return result.map(r => returnType(...r));
+        return result.map((r: QueryResult) => returnType(...r));
     } else if (returnTypes[returnType]) {
         return returnTypes[returnType](result);
     }

lib/interpreter/index.ts

@@ -1,8 +1,11 @@
 import { expand, select, cache } from "./nodes";
 import { VALUE_INDEX, KEY_INDEX, PARENT_INDEX, POINTER_INDEX } from "./keys";
+import { QueryResult, Input, JSONPointer } from "../types";
 
+type WorkingSet = Array<QueryResult>;
 
-function collect(func, input, node, pointer) {
+
+function collect(func, input: WorkingSet, node, pointer: JSONPointer) {
     const result = [];
     for (let i = 0, l = input.length; i < l; i += 1) {
         result.push(...func(node, input[i], node, pointer));
@@ -11,7 +14,7 @@ function collect(func, input, node, pointer) {
 }
 
 
-function reduce(func, input, node, pointer) {
+function reduce(func, input, node, pointer: JSONPointer) {
     const result = [];
     for (let i = 0, l = input.length; i < l; i += 1) {
         const output = func(node, input[i], pointer);
@@ -23,7 +26,7 @@ function reduce(func, input, node, pointer) {
 }
 
 
-function query(data, ast, pointer) {
+function query(data: WorkingSet, ast, pointer: JSONPointer): WorkingSet {
     let result = data;
     ast.children.forEach(node => {
         if (expand[node.type]) {
@@ -40,7 +43,7 @@ function query(data, ast, pointer) {
 }
 
 
-function runPatternOnce(inputSet, ast, pointer) {
+function runPatternOnce(inputSet: WorkingSet, ast, pointer: JSONPointer): WorkingSet {
     const resultingSet = [];
     let workingSet = inputSet;
     ast.children.forEach(node => {
@@ -55,19 +58,19 @@ function runPatternOnce(inputSet, ast, pointer) {
     return resultingSet;
 }
 
-function getIterationCount(quantifier) {
+function getIterationCount(quantifier?: string) {
     if (quantifier == null) {
         return 1; // default, simple group
     }
     if (quantifier === "*" || quantifier === "+") {
         return Infinity;
     }
-    quantifier = parseInt(quantifier);
-    return isNaN(quantifier) ? 1 : quantifier;
+    const count = parseInt(quantifier);
+    return isNaN(count) ? 1 : count;
 }
 
 
-function pattern(data, ast, pointer) {
+function pattern(data, ast, pointer: JSONPointer) {
     const result = [];
     const quantifier = ast.children.find(node => node.type === "quantifier");
     const iterationCount = getIterationCount(quantifier && quantifier.text);
@@ -85,14 +88,14 @@ function pattern(data, ast, pointer) {
 }
 
 
-function skip(data, ast, pointer) {
+function skip(data: WorkingSet, ast, pointer: JSONPointer) {
     let result = data;
     ast.children.forEach(n => (result = runNode(result, n, pointer)));
     return result;
 }
 
 
-function runNode(data, ast, pointer?) {
+function runNode(data: WorkingSet, ast, pointer?: JSONPointer): WorkingSet {
     let result;
     if (ast.type === "query") {
         result = query(data, ast, pointer);
@@ -108,7 +111,7 @@ function runNode(data, ast, pointer?) {
 }
 
 
-export default function run(data, ast) {
+export default function run(data: Input, ast): Array<QueryResult> {
     cache.reset();
     cache.mem.push(data);
     return runNode([[data, null, null, "#"]], ast);

test/unit/get.filter.test.ts

@@ -1,4 +1,4 @@
-/* eslint object-property-newline: 0 */
+/* eslint object-property-newline: "off", @typescript-eslint/ban-ts-comment: "off" */
 import "mocha";
 import { expect } from "chai";
 import get from "../../lib/get";

test/unit/get.test.ts

@@ -1,4 +1,4 @@
-/* eslint object-property-newline: 0 */
+/* eslint object-property-newline: "off", @typescript-eslint/ban-ts-comment: "off" */
 import "mocha";
 import { expect } from "chai";
 import get, { ReturnType } from "../../lib/get";