Cleanup

Author: grassick

lib/PromiseExprEvaluator.js

@@ -886,6 +886,9 @@ class PromiseExprEvaluator {
                     return parseFloat(values[0]);
                 }
                 return null;
+            case "within":
+                console.warn("Within operation not supported");
+                throw new Error(`Within operator not supported`);
             default:
                 throw new Error(`Unknown op ${op}`);
         }

lib/types.d.ts

@@ -111,26 +111,30 @@ export interface ScalarExpr {
     /** Expression from final table to get value */
     expr: Expr;
 }
+/** @deprecated */
 export declare type LegacyExpr = LegacyComparisonExpr | LegacyLogicalExpr | LegacyCountExpr;
+/** @deprecated */
 export interface LegacyComparisonExpr {
     type: "comparison";
     op: string;
     table: string;
     lhs: Expr;
     rhs: Expr;
 }
+/** @deprecated */
 export interface LegacyLogicalExpr {
     type: "logical";
     op: string;
     table: string;
     exprs: Expr[];
 }
+/** @deprecated */
 export interface LegacyCountExpr {
     type: "count";
     table: string;
 }
 export declare type AggrStatus = "individual" | "literal" | "aggregate";
-/** a row is a plain object that has the following functions as properties */
+/** Row is a plain object that has the following functions as properties */
 export interface ExprEvaluatorRow {
     /** gets primary key of row. callback is called with (error, value) */
     getPrimaryKey(callback: (error: any, value?: any) => void): void;
@@ -139,12 +143,14 @@ export interface ExprEvaluatorRow {
      */
     getField(columnId: string, callback: (error: any, value?: any) => void): void;
 }
+/** Context to evaluate an expression using the PromiseExprEvalutator */
 export interface ExprEvaluatorContext {
     /** current row. Optional for aggr expressions */
     row?: ExprEvaluatorRow;
     /** array of rows (for aggregate expressions) */
     rows?: ExprEvaluatorRow[];
 }
+/** Single table in a schema */
 export interface Table {
     id: string;
     /** localized name of table */

package-lock.json

@@ -29,7 +29,8 @@
     "jsonql": "github:mWater/jsonql",
     "lodash": "^3.10.1",
     "lru-cache": "^7.14.0",
-    "moment": "^2.29.4"
+    "moment": "^2.29.4",
+    "querystring": "^0.2.1"
   },
   "devDependencies": {
     "@types/chai": "^4.3.3",
@@ -40,6 +41,7 @@
     "canonical-json": "0.0.4",
     "chai": "^4.3.6",
     "husky": "^8.0.1",
-    "sinon": "^14.0.0"
+    "sinon": "^14.0.0",
+    "typescript": "^4.8.4"
   }
 }

package.json

@@ -1007,6 +1007,9 @@ export class PromiseExprEvaluator {
           return parseFloat(values[0])
         }
         return null
+      case "within":
+        console.warn("Within operation not supported")
+        throw new Error(`Within operator not supported`)
       default:
         throw new Error(`Unknown op ${op}`)
     }

src/PromiseExprEvaluator.ts

@@ -146,8 +146,10 @@ export interface ScalarExpr {
   expr: Expr
 }
 
+/** @deprecated */
 export type LegacyExpr = LegacyComparisonExpr | LegacyLogicalExpr | LegacyCountExpr
 
+/** @deprecated */
 export interface LegacyComparisonExpr {
   type: "comparison"
   op: string
@@ -156,21 +158,23 @@ export interface LegacyComparisonExpr {
   rhs: Expr
 }
 
+/** @deprecated */
 export interface LegacyLogicalExpr {
   type: "logical"
   op: string
   table: string
   exprs: Expr[]
 }
 
+/** @deprecated */
 export interface LegacyCountExpr {
   type: "count"
   table: string
 }
 
 export type AggrStatus = "individual" | "literal" | "aggregate"
 
-/** a row is a plain object that has the following functions as properties */
+/** Row is a plain object that has the following functions as properties */
 export interface ExprEvaluatorRow {
   /** gets primary key of row. callback is called with (error, value) */
   getPrimaryKey(callback: (error: any, value?: any) => void): void
@@ -181,13 +185,15 @@ export interface ExprEvaluatorRow {
   getField(columnId: string, callback: (error: any, value?: any) => void): void
 }
 
+/** Context to evaluate an expression using the PromiseExprEvalutator */
 export interface ExprEvaluatorContext {
   /** current row. Optional for aggr expressions */
   row?: ExprEvaluatorRow
   /** array of rows (for aggregate expressions) */
   rows?: ExprEvaluatorRow[]
 }
 
+/** Single table in a schema */
 export interface Table {
   id: string