@qrvey/formula-lang 0.3.1 → 0.4.0

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="0.4.0"></a>
+# [0.4.0](https://bitbucket.org/qrvey/qrvey_formula_lang/compare/v0.3.1...v0.4.0) (2023-04-24)
+
+
+### Features
+
+* **columns:** add column transpilation from AST ([cd28ff9](https://bitbucket.org/qrvey/qrvey_formula_lang/commits/cd28ff9))
+* **columns:** support columns ([478909c](https://bitbucket.org/qrvey/qrvey_formula_lang/commits/478909c))
+
+
+
 <a name="0.3.0"></a>
 # [0.3.0](https://bitbucket.org/qrvey/qrvey_formula_lang/compare/v0.2.0...v0.3.0) (2023-04-24)
 

package/__tests__/integration/__mocks__/context.ts

@@ -0,0 +1,23 @@
+import { FormulaContext } from '../../../src/constants/interfaces';
+
+export const basicContext: FormulaContext = {
+    model: [
+        {
+            id: 'ID123.test',
+            label: 'Column String',
+            column: 'Origin_String_Column_Test',
+            type: 'string',
+        },
+        {
+            id: 'DateID1',
+            label: 'Column Date',
+            column: 'Origin_Date_Column_Test',
+            type: 'date',
+        },
+        {
+            id: 'NOW',
+            label: 'NOW',
+            type: 'string',
+        },
+    ],
+};

package/__tests__/integration/__mocks__/elasticsearchScripts.ts

@@ -7,12 +7,19 @@ export const dateFormatScript = `String DATE_FORMAT_SCRIPT(def date_value, Strin
     return DateTimeFormatter.ofPattern(format).format(date_value)
 }`;
 
-export function dateFormatToInt(format: string): string {
-    return `Integer.parseInt(DATE_FORMAT_SCRIPT(ZonedDateTime.parse("2023-12-31T00:00:00.000Z"), '${format}'))`;
+export function dateFormatToInt(
+    format: string,
+    column: string | undefined = undefined,
+): string {
+    if (!column) column = `ZonedDateTime.parse("2023-12-31T00:00:00.000Z")`;
+    return `Integer.parseInt(DATE_FORMAT_SCRIPT(${column}, '${format}'))`;
 }
 
-export function dateParser(format: string): string {
-    const dateToInt = dateFormatToInt(format);
+export function dateParser(
+    format: string,
+    column: string | undefined = undefined,
+): string {
+    const dateToInt = dateFormatToInt(format, column);
     return `${dateFormatScript}\n${dateToInt}`;
 }
 

package/__tests__/integration/__mocks__/sqlScripts.ts

@@ -1,5 +1,6 @@
-export function datePart(part: string) {
-    return `DATE_PART('${part}', CAST('2023-12-31T00:00:00.000Z' AS TIMESTAMPTZ))`;
+export function datePart(part: string, column: string | undefined = undefined) {
+    if (!column) column = `CAST('2023-12-31T00:00:00.000Z' AS TIMESTAMPTZ)`;
+    return `DATE_PART('${part}', ${column})`;
 }
 
 export function dateDif(unit: string): string {

package/__tests__/integration/elasticsearch.test.ts

@@ -5,6 +5,7 @@ import {
     dateFormatToInt,
     dateFormatScript,
 } from './__mocks__/elasticsearchScripts';
+import { basicContext } from './__mocks__/context';
 const currentEngine = ENGINES.ELASTICSEARCH;
 
 describe('ELASTICSEARCH Transpile program', () => {
@@ -32,6 +33,13 @@ describe('ELASTICSEARCH Transpile program', () => {
         expect(result?.expression).toBe(`Math.abs(5)`);
     });
 
+    test('Cast Date string', () => {
+        const result = Transpile('"12/31/2022 13:35:45"', currentEngine);
+        expect(result?.expression).toBe(
+            `ZonedDateTime.parse("2022-12-31T13:35:45.000Z")`,
+        );
+    });
+
     test('DAY function', () => {
         const result = Transpile('DAY("12/31/2023")', currentEngine);
         const mock = dateParser('dd').replace(/\n/g, '');
@@ -43,13 +51,19 @@ describe('ELASTICSEARCH Transpile program', () => {
             'DAY("12/31/2023") + DAY("12/31/2023")',
             currentEngine,
         );
-        const concat = `${dateFormatScript}\n(${dateFormatToInt(
-            'dd',
-        )} + ${dateFormatToInt('dd')})`;
+        const ddToInt = dateFormatToInt('dd');
+        const concat = `${dateFormatScript}\n(${ddToInt} + ${ddToInt})`;
         const mock = concat.replace(/\n/g, '');
         expect(result?.expression?.replace(/\n/g, '')).toBe(mock);
     });
 
+    test('DAY function with a variable Column', () => {
+        const result = Transpile('DAY([DateID1])', currentEngine, basicContext);
+        const column = 'doc["Origin_Date_Column_Test"]';
+        const mock = dateParser('dd', column).replace(/\n/g, '');
+        expect(result?.expression?.replace(/\n/g, '')).toBe(mock);
+    });
+
     test('MONTH function', () => {
         const result = Transpile('MONTH("12/31/2023")', currentEngine);
         const mock = dateParser('MM').replace(/\n/g, '');

package/__tests__/integration/expression.test.ts

@@ -19,4 +19,38 @@ describe('Raw Expression test suite', () => {
         expect(result?.error).not.toBeUndefined();
         expect(result?.error instanceof MissingArgumentError).toBeTruthy();
     });
+
+    test('Should transpile a column', () => {
+        const program = '[8db21fc4]';
+        const columnName = 'Origin_Column_Test';
+        const result = Transpile(program, ENGINES.ELASTICSEARCH, {
+            model: [
+                {
+                    label: 'Text',
+                    id: '8db21fc4',
+                    column: columnName,
+                    type: 'string',
+                },
+            ],
+        });
+        expect(result?.valid).toBe(true);
+        expect(result?.expression).toBe(`doc["${columnName}"]`);
+    });
+    /*
+    test('Should transpile a column with property', () => {
+        const program = '[8db21fc4.country]';
+        const columnName = 'Origin_Column_Test';
+        const result = Transpile(program, ENGINES.ELASTICSEARCH, {
+            model: [
+                {
+                    label: 'Text',
+                    id: '8db21fc4',
+                    column: columnName,
+                    type: 'string',
+                },
+            ],
+        });
+        expect(result?.valid).toBe(true);
+        expect(result?.expression).toBe(`doc["${columnName}"]`);
+    });*/
 });

package/__tests__/integration/redshift.test.ts

@@ -1,5 +1,6 @@
 import { ENGINES, Transpile } from '../../src';
 import { datePart, dateDif } from './__mocks__/sqlScripts';
+import { basicContext } from './__mocks__/context';
 const currentEngine = ENGINES.REDSHIFT;
 
 describe('SNOWFLAKE Transpile program', () => {
@@ -27,11 +28,25 @@ describe('SNOWFLAKE Transpile program', () => {
         expect(result?.expression).toBe(`ABS(5)`);
     });
 
+    test('Cast Date string', () => {
+        const result = Transpile('"12/31/2022 13:35:45"', currentEngine);
+        expect(result?.expression).toBe(
+            `CAST('2022-12-31T13:35:45.000Z' AS TIMESTAMPTZ)`,
+        );
+    });
+
     test('DAY function', () => {
         const result = Transpile('DAY("12/31/2023")', currentEngine);
         expect(result?.expression).toBe(datePart('day'));
     });
 
+    test('DAY function with a variable Column', () => {
+        const result = Transpile('DAY([DateID1])', currentEngine, basicContext);
+        const column = '"Origin_Date_Column_Test"';
+        const mock = datePart('day', column).replace(/\n/g, '');
+        expect(result?.expression?.replace(/\n/g, '')).toBe(mock);
+    });
+
     test('MONTH function', () => {
         const result = Transpile('MONTH("12/31/2023")', currentEngine);
         expect(result?.expression).toBe(datePart('month'));

package/__tests__/integration/sonwflake.test.ts

@@ -1,5 +1,6 @@
 import { ENGINES, Transpile } from '../../src';
 import { datePart, dateDif } from './__mocks__/sqlScripts';
+import { basicContext } from './__mocks__/context';
 const currentEngine = ENGINES.SNOWFLAKE;
 
 describe('SNOWFLAKE Transpile program', () => {
@@ -27,11 +28,25 @@ describe('SNOWFLAKE Transpile program', () => {
         expect(result?.expression).toBe(`ABS(5)`);
     });
 
+    test('Cast Date string', () => {
+        const result = Transpile('"12/31/2022 13:35:45"', currentEngine);
+        expect(result?.expression).toBe(
+            `CAST('2022-12-31T13:35:45.000Z' AS TIMESTAMPTZ)`,
+        );
+    });
+
     test('DAY function', () => {
         const result = Transpile('DAY("12/31/2023")', currentEngine);
         expect(result?.expression).toBe(datePart('day'));
     });
 
+    test('DAY function with a variable Column', () => {
+        const result = Transpile('DAY([DateID1])', currentEngine, basicContext);
+        const column = '"Origin_Date_Column_Test"';
+        const mock = datePart('day', column).replace(/\n/g, '');
+        expect(result?.expression?.replace(/\n/g, '')).toBe(mock);
+    });
+
     test('MONTH function', () => {
         const result = Transpile('MONTH("12/31/2023")', currentEngine);
         expect(result?.expression).toBe(datePart('month'));

package/dist/constants/interfaces.d.ts

@@ -8,7 +8,7 @@ export interface FunctionDefinition extends FunctionElementDefinition {
     transpiler: TranspilerEnginesFunction;
     parameters?: Array<FunctionParameters>;
 }
-type TranspilerEnginesFunction = {
+export type TranspilerEnginesFunction = {
     [key in ENGINES]: Function;
 };
 interface FunctionParameters extends FunctionElementDefinition {
@@ -58,24 +58,24 @@ export interface FunctionCallAST extends CommonAST {
     arguments: Array<CommonAST>;
 }
 export type ValueASTType = string | boolean | number | CommonAST[] | null | Date;
-export interface ValueAST extends CommonAST {
+export interface CommonValueAST extends CommonAST {
     value: ValueASTType;
 }
-export interface VariableAST extends ValueAST {
-    context?: VariableDefinition;
+export interface VariableAST extends CommonValueAST {
+    context?: VariableContextDefinition;
 }
-export interface LiteralAST extends ValueAST {
+export interface LiteralAST extends CommonValueAST {
     dataType: string;
 }
-export type DateDifUnitParam = 'Y' | 'M' | 'D';
-export interface VariableDefinition {
+export interface VariableContextDefinition {
     label: string;
     id: string;
     column?: string;
     type: string;
 }
 export interface FormulaContext {
-    model?: VariableDefinition[];
+    model?: VariableContextDefinition[];
 }
 export type VariableASTType = 'Variable' | 'Column' | 'Token';
+export type DateDifUnitParam = 'Y' | 'M' | 'D';
 export {};

package/dist/transpiler/columnTranspilation.d.ts

@@ -0,0 +1,3 @@
+import { ENGINES } from '../constants';
+import { ProcessNodeResult, VariableAST } from '../constants/interfaces';
+export declare function columnTranspilation(engine: ENGINES, { value, context }: VariableAST): ProcessNodeResult;

package/dist/transpiler/columnTranspilation.js

@@ -0,0 +1,19 @@
+import { ENGINES } from '../constants';
+export function columnTranspilation(engine, { value, context }) {
+    if (!context || !context.column)
+        return { value };
+    const columnForEngine = {
+        [ENGINES.ELASTICSEARCH]: elasticsearch,
+        [ENGINES.SNOWFLAKE]: sql,
+        [ENGINES.REDSHIFT]: sql,
+    };
+    const result = columnForEngine[engine](context);
+    return { value: result, dataType: context.type };
+}
+function elasticsearch(context) {
+    return `doc["${context.column}"]`;
+}
+function sql(context) {
+    return `"${context.column}"`;
+}
+//# sourceMappingURL=columnTranspilation.js.map

package/dist/transpiler/columnTranspilation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"columnTranspilation.js","sourceRoot":"","sources":["../../src/transpiler/columnTranspilation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAOvC,MAAM,UAAU,mBAAmB,CAC/B,MAAe,EACf,EAAE,KAAK,EAAE,OAAO,EAAe;IAE/B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAClD,MAAM,eAAe,GAAG;QACpB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,aAAa;QACtC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,GAAG;QACxB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG;KAC1B,CAAC;IACF,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;IAChD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;AACrD,CAAC;AAED,SAAS,aAAa,CAAC,OAAkC;IACrD,OAAO,QAAQ,OAAO,CAAC,MAAM,IAAI,CAAC;AACtC,CAAC;AAED,SAAS,GAAG,CAAC,OAAkC;IAC3C,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;AACjC,CAAC"}

package/dist/transpiler/index.d.ts

@@ -1,12 +1,13 @@
 import { ENGINES } from '../constants';
-import { CommonAST, ProgramAST, BinaryExpressionAST, UnaryExpressionAST, FunctionCallAST, LiteralAST, FunctionDefinition, TranspilationResponse, ProcessNodeResult } from '../constants/interfaces';
+import { CommonAST, ProgramAST, BinaryExpressionAST, UnaryExpressionAST, FunctionCallAST, LiteralAST, FunctionDefinition, TranspilationResponse, ProcessNodeResult, VariableAST } from '../constants/interfaces';
 export declare class Transpiler {
-    readonly engine: ENGINES;
     private ast;
+    private readonly engine;
     private customFunctionList;
     constructor(ast: ProgramAST, engine: ENGINES);
     get(): TranspilationResponse;
     processNode(expression: CommonAST): ProcessNodeResult;
+    column(data: VariableAST): ProcessNodeResult;
     literal({ value, dataType }: LiteralAST): ProcessNodeResult;
     unaryExpression({ operator, right, }: UnaryExpressionAST): ProcessNodeResult;
     binaryExpression({ left, operator, right, }: BinaryExpressionAST): ProcessNodeResult;

package/dist/transpiler/index.js

@@ -3,11 +3,12 @@ import { UnknownFunctionError } from '../errors/definitions';
 import { functionList } from '../functions';
 import { customFunction as customFunctionUtil, customDateCast } from '../utils';
 import { validateFuncStructure } from './validateFuncStructure';
+import { columnTranspilation } from './columnTranspilation';
 export class Transpiler {
     constructor(ast, engine) {
-        this.customFunctionList = new Set();
         this.ast = ast;
         this.engine = engine;
+        this.customFunctionList = new Set();
     }
     get() {
         try {
@@ -30,12 +31,16 @@ export class Transpiler {
         const nodes = {
             [AST_TYPES.variable]: this.literal,
             [AST_TYPES.literal]: this.literal,
+            [AST_TYPES.column]: this.column,
             [AST_TYPES.unaryExpression]: this.unaryExpression,
             [AST_TYPES.binaryExpression]: this.binaryExpression,
             [AST_TYPES.functionCall]: this.functionCall,
         };
         return nodes[type].call(this, expression);
     }
+    column(data) {
+        return columnTranspilation(this.engine, data);
+    }
     literal({ value, dataType }) {
         if (dataType === 'date')
             value = customDateCast(this.engine)(value);

package/dist/transpiler/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/transpiler/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/transpiler/index.ts"],"names":[],"mappings":"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"}

package/dist/utils/getVariableType.d.ts

@@ -1,3 +1,3 @@
-import { FormulaContext, VariableASTType, VariableDefinition } from '../constants/interfaces';
-export declare function getVariableContext(variableName: string, context?: FormulaContext): VariableDefinition | undefined;
-export declare function getVariableType(columnCxt?: VariableDefinition): VariableASTType;
+import { FormulaContext, VariableASTType, VariableContextDefinition } from '../constants/interfaces';
+export declare function getVariableContext(variableName: string, context?: FormulaContext): VariableContextDefinition | undefined;
+export declare function getVariableType(columnCxt?: VariableContextDefinition): VariableASTType;

package/dist/utils/getVariableType.js.map

@@ -1 +1 @@
-{"version":3,"file":"getVariableType.js","sourceRoot":"","sources":["../../src/utils/getVariableType.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,kBAAkB,CAC9B,YAAoB,EACpB,OAAwB;;IAExB,OAAO,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,uBAAuB,CAC5B,eAAmC;IAEnC,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,eAAe,CAC3B,SAA8B;IAE9B,OAAO,SAAS,KAAK,SAAS;QAC1B,CAAC,CAAC,uBAAuB,CAAC,SAAS,CAAC;QACpC,CAAC,CAAC,UAAU,CAAC;AACrB,CAAC"}
+{"version":3,"file":"getVariableType.js","sourceRoot":"","sources":["../../src/utils/getVariableType.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,kBAAkB,CAC9B,YAAoB,EACpB,OAAwB;;IAExB,OAAO,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,uBAAuB,CAC5B,eAA0C;IAE1C,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,eAAe,CAC3B,SAAqC;IAErC,OAAO,SAAS,KAAK,SAAS;QAC1B,CAAC,CAAC,uBAAuB,CAAC,SAAS,CAAC;QACpC,CAAC,CAAC,UAAU,CAAC;AACrB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/formula-lang",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "QFormula support for qrvey projects",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",