Merge pull request #652 from streamich/expr-perf

JSON Expression performance improvements
streamich · Jun 24, 2024 · 0817d77 · 0817d77
2 parents a7c7591 + 43cd177
commit 0817d77
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/src/json-expression/__tests__/codegen.spec.ts b/src/json-expression/__tests__/codegen.spec.ts
@@ -18,7 +18,7 @@ const check = (
     operators: operatorsMap,
   });
   const fn = codegen.run().compile();
-  const result = fn({vars: new Vars(data)});
+  const result = fn(new Vars(data));
   expect(result).toStrictEqual(expected);
 };
 

diff --git a/src/json-expression/__tests__/impure.spec.ts b/src/json-expression/__tests__/impure.spec.ts
@@ -10,7 +10,7 @@ const compile = (expression: Expr, options: JsonExpressionCodegenContext = {}) =
     operators: operatorsMap,
   });
   const fn = codegen.run().compile();
-  return (data: unknown) => fn({vars: new Vars(data)});
+  return (data: unknown) => fn(new Vars(data));
 };
 
 test('can execute expression twice with different inputs', () => {

diff --git a/src/json-expression/codegen.ts b/src/json-expression/codegen.ts
@@ -6,7 +6,7 @@ import {JavaScript} from '@jsonjoy.com/util/lib/codegen';
 import {Vars} from './Vars';
 import type * as types from './types';
 
-export type JsonExpressionFn = (ctx: types.JsonExpressionExecutionContext) => unknown;
+export type JsonExpressionFn = (vars: types.JsonExpressionExecutionContext['vars']) => unknown;
 
 export interface JsonExpressionCodegenOptions extends types.JsonExpressionCodegenContext {
   expression: types.Expr;
@@ -19,8 +19,7 @@ export class JsonExpressionCodegen {
 
   public constructor(protected options: JsonExpressionCodegenOptions) {
     this.codegen = new Codegen<JsonExpressionFn>({
-      args: ['ctx'],
-      prologue: 'var vars = ctx.vars;',
+      args: ['vars'],
       epilogue: '',
     });
     this.evaluate = createEvaluate({...options});
@@ -42,7 +41,7 @@ export class JsonExpressionCodegen {
     return this.codegen.addConstant(js);
   };
 
-  private subExpression = (expr: types.Expr): ((ctx: types.JsonExpressionExecutionContext) => unknown) => {
+  private subExpression = (expr: types.Expr): JsonExpressionFn => {
     const codegen = new JsonExpressionCodegen({...this.options, expression: expr});
     const fn = codegen.run().compile();
     return fn;
@@ -90,12 +89,15 @@ export class JsonExpressionCodegen {
     return this.codegen.generate();
   }
 
-  public compile() {
-    const fn = this.codegen.compile();
-    // console.log('fn', fn.toString());
-    return (ctx: types.JsonExpressionExecutionContext) => {
+  public compileRaw(): JsonExpressionFn {
+    return this.codegen.compile();
+  }
+
+  public compile(): JsonExpressionFn {
+    const fn = this.compileRaw();
+    return (vars) => {
       try {
-        return fn(ctx);
+        return fn(vars);
       } catch (err) {
         if (err instanceof Error) throw err;
         const error = new Error('Expression evaluation error.');

diff --git a/src/json-expression/operators/array.ts b/src/json-expression/operators/array.ts
@@ -30,7 +30,7 @@ const createSubExpressionOperator = <N extends string>(
         operand1 instanceof Literal && operand1.val instanceof Array
           ? JSON.stringify(operand1.val)
           : `asArr(${operand1})`;
-      const js = `${name}(${arr},${JSON.stringify(varname)},vars,function(){return ${d}({vars:vars})})`;
+      const js = `${name}(${arr},${JSON.stringify(varname)},vars,function(){return ${d}(vars)})`;
       return new Expression(js);
     },
   ] as types.OperatorDefinition<types.TernaryExpression<N>>;
@@ -257,7 +257,7 @@ export const arrayOperators: types.OperatorDefinition<any>[] = [
           : `asArr(${operand1})`;
       const js = `reduce((${arr}),(${ctx.operands[1]}),${JSON.stringify(accname)},${JSON.stringify(
         varname,
-      )},vars,function(){return ${d}({vars:vars})})`;
+      )},vars,function(){return ${d}(vars)})`;
       return new Expression(js);
     },
   ] as types.OperatorDefinition<types.ExprReduce>,

diff --git a/src/json-expression/types.ts b/src/json-expression/types.ts
@@ -1,6 +1,7 @@
 import type {JavaScript} from '@jsonjoy.com/util/lib/codegen';
 import type {Vars} from './Vars';
 import type {ExpressionResult} from './codegen-steps';
+import type {JsonExpressionFn} from './codegen';
 
 export type Literal<T> = T | LiteralExpression<T>;
 export type LiteralExpression<O> = [constant: O];
@@ -321,7 +322,7 @@ export interface OperatorCodegenCtx<E extends Expression> extends JsonExpression
   operand: (operand: Expression) => ExpressionResult;
   link: (value: unknown, name?: string) => string;
   const: (js: JavaScript<unknown>) => string;
-  subExpression: (expr: Expression) => (ctx: JsonExpressionExecutionContext) => unknown;
+  subExpression: (expr: Expression) => JsonExpressionFn;
   var: (name: string) => string;
 }
 

diff --git a/src/json-type/type/classes/OrType.ts b/src/json-type/type/classes/OrType.ts
@@ -72,7 +72,7 @@ export class OrType<T extends Type[]> extends AbstractType<schema.OrSchema<{[K i
       operators: operatorsMap,
     });
     const fn = codegen.run().compile();
-    return (this.__discriminator = (data: unknown) => +(fn({vars: new Vars(data)}) as any));
+    return (this.__discriminator = (data: unknown) => +(fn(new Vars(data)) as any));
   }
 
   public validateSchema(): void {