@qrvey/formula-lang 0.6.0 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +16 -0
- package/dist/cjs/constants/interfaces.d.ts +2 -0
- package/dist/cjs/functions/mid.js +1 -1
- package/dist/cjs/functions/mid.js.map +1 -1
- package/dist/cjs/main.js +9 -54
- package/dist/cjs/main.js.map +1 -1
- package/dist/cjs/transpiler/columnTranspilation.js +1 -1
- package/dist/cjs/transpiler/columnTranspilation.js.map +1 -1
- package/dist/cjs/transpiler/index.d.ts +1 -0
- package/dist/cjs/transpiler/index.js +8 -1
- package/dist/cjs/transpiler/index.js.map +1 -1
- package/dist/cjs/utils/index.d.ts +0 -1
- package/dist/cjs/utils/index.js +0 -1
- package/dist/cjs/utils/index.js.map +1 -1
- package/dist/cjs/utils/isNumberParam.d.ts +1 -1
- package/dist/cjs/utils/isNumberParam.js +2 -2
- package/dist/cjs/utils/isNumberParam.js.map +1 -1
- package/dist/cjs/utils/isStringParam.d.ts +1 -1
- package/dist/cjs/utils/isStringParam.js +3 -2
- package/dist/cjs/utils/isStringParam.js.map +1 -1
- package/dist/cjs/utils/sql/scripts.js +9 -6
- package/dist/cjs/utils/sql/scripts.js.map +1 -1
- package/dist/module/constants/interfaces.d.ts +2 -0
- package/dist/module/functions/mid.js +2 -2
- package/dist/module/functions/mid.js.map +1 -1
- package/dist/module/main.js +9 -54
- package/dist/module/main.js.map +1 -1
- package/dist/module/transpiler/columnTranspilation.js +1 -1
- package/dist/module/transpiler/columnTranspilation.js.map +1 -1
- package/dist/module/transpiler/index.d.ts +1 -0
- package/dist/module/transpiler/index.js +8 -1
- package/dist/module/transpiler/index.js.map +1 -1
- package/dist/module/utils/index.d.ts +0 -1
- package/dist/module/utils/index.js +0 -1
- package/dist/module/utils/index.js.map +1 -1
- package/dist/module/utils/isNumberParam.d.ts +1 -1
- package/dist/module/utils/isNumberParam.js +2 -2
- package/dist/module/utils/isNumberParam.js.map +1 -1
- package/dist/module/utils/isStringParam.d.ts +1 -1
- package/dist/module/utils/isStringParam.js +3 -2
- package/dist/module/utils/isStringParam.js.map +1 -1
- package/dist/module/utils/sql/scripts.js +9 -6
- package/dist/module/utils/sql/scripts.js.map +1 -1
- package/package.json +4 -4
- package/dist/cjs/utils/isPositiveNumberParam.d.ts +0 -2
- package/dist/cjs/utils/isPositiveNumberParam.js +0 -12
- package/dist/cjs/utils/isPositiveNumberParam.js.map +0 -1
- package/dist/module/utils/isPositiveNumberParam.d.ts +0 -2
- package/dist/module/utils/isPositiveNumberParam.js +0 -8
- package/dist/module/utils/isPositiveNumberParam.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,19 @@
|
|
|
1
|
+
<a name="0.7.0"></a>
|
|
2
|
+
# [0.7.0](https://bitbucket.org/qrvey/qrvey_formula_lang/compare/v0.6.0...v0.7.0) (2023-05-08)
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
### Bug Fixes
|
|
6
|
+
|
|
7
|
+
* **functions:** fix some function that are failed ([d8cd07a](https://bitbucket.org/qrvey/qrvey_formula_lang/commits/d8cd07a))
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
### Features
|
|
11
|
+
|
|
12
|
+
* **testingmode:** transpile expression from columns to literals ([7d0c90f](https://bitbucket.org/qrvey/qrvey_formula_lang/commits/7d0c90f))
|
|
13
|
+
* **usesampledata:** change sample data propertie names RB-1122 ([3ad704e](https://bitbucket.org/qrvey/qrvey_formula_lang/commits/3ad704e))
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
1
17
|
<a name="0.6.0"></a>
|
|
2
18
|
# [0.6.0](https://bitbucket.org/qrvey/qrvey_formula_lang/compare/v0.5.2...v0.6.0) (2023-05-03)
|
|
3
19
|
|
|
@@ -83,6 +83,8 @@ export interface VariableContextDefinition {
|
|
|
83
83
|
export interface FormulaContext {
|
|
84
84
|
model?: VariableContextDefinition[];
|
|
85
85
|
timezone?: TimezoneDefinition;
|
|
86
|
+
useSampleData?: boolean;
|
|
87
|
+
sampleData?: any;
|
|
86
88
|
}
|
|
87
89
|
interface TimezoneDefinition {
|
|
88
90
|
offset: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mid.js","sourceRoot":"","sources":["../../../src/functions/mid.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"mid.js","sourceRoot":"","sources":["../../../src/functions/mid.ts"],"names":[],"mappings":";;;AACA,oCAAwD;AAExD;;GAEG;AACU,QAAA,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,IAAI,EAAE,KAAK;IACX,UAAU,EAAE;QACR;YACI,UAAU,EAAE,SAAS;YACrB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,aAAa;YACzB,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,gBAAgB;YAC5B,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;KACX;CACJ,CAAC;AAEF,SAAS,aAAa,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IACjE,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,OAAO,GAAG,OAAO,cAAc,KAAK,GAAG,QAAQ,GAAG,CAAC;AACvD,CAAC;AAED,SAAS,GAAG,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IACvD,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,OAAO,aAAa,OAAO,KAAK,KAAK,GAAG,QAAQ,GAAG,CAAC;AACxD,CAAC;AAED,SAAS,SAAS,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IAC7D,OAAO,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,QAAQ,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IAC5D,OAAO,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC"}
|
package/dist/cjs/main.js
CHANGED
|
@@ -2,64 +2,19 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const _1 = require(".");
|
|
4
4
|
customElements.whenDefined('q-codemirror-test').then(load);
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
label: 'Date',
|
|
11
|
-
type: 'date',
|
|
12
|
-
},
|
|
13
|
-
{
|
|
14
|
-
id: 'idColumn2',
|
|
15
|
-
replacement: 'Date_Origin_Column2',
|
|
16
|
-
label: 'DateTime',
|
|
17
|
-
type: 'date',
|
|
18
|
-
},
|
|
19
|
-
{
|
|
20
|
-
id: 'idColumn3',
|
|
21
|
-
replacement: 'Date_Origin_Column3',
|
|
22
|
-
label: 'Donations',
|
|
23
|
-
type: 'string',
|
|
24
|
-
},
|
|
25
|
-
{
|
|
26
|
-
id: 'idColumn4',
|
|
27
|
-
replacement: 'Date_Origin_Column4',
|
|
28
|
-
label: 'Duration',
|
|
29
|
-
type: 'number',
|
|
30
|
-
},
|
|
31
|
-
{
|
|
32
|
-
id: 'idColumn5',
|
|
33
|
-
replacement: 'Date_Origin_Column5',
|
|
34
|
-
label: 'City',
|
|
35
|
-
type: 'string',
|
|
36
|
-
},
|
|
37
|
-
{
|
|
38
|
-
id: 'idColumn6',
|
|
39
|
-
replacement: 'Date_Origin_Column6',
|
|
40
|
-
label: 'City New',
|
|
41
|
-
type: 'string',
|
|
42
|
-
},
|
|
43
|
-
{
|
|
44
|
-
id: 'idColumn7',
|
|
45
|
-
replacement: 'Date_Origin_Column7',
|
|
46
|
-
label: 'City New Country',
|
|
47
|
-
type: 'string',
|
|
48
|
-
},
|
|
49
|
-
{
|
|
50
|
-
id: 'idColumn8',
|
|
51
|
-
replacement: 'Date_Origin_Column8',
|
|
52
|
-
label: 'Country',
|
|
53
|
-
type: 'string',
|
|
54
|
-
},
|
|
55
|
-
],
|
|
5
|
+
window.formulaSetting = {
|
|
6
|
+
domain: 'https://postqa2.qrveyapp.com',
|
|
7
|
+
apiKey: 'VXlA8eZmrJUaCk8OlAxP3KUpR6S79UO2xgawf1tX',
|
|
8
|
+
userId: 'iduDnkZPS',
|
|
9
|
+
appId: 'XqsfiPaxO',
|
|
56
10
|
};
|
|
57
11
|
function load() {
|
|
58
|
-
const quiFormulaEditor = document.querySelector('q-codemirror-test');
|
|
12
|
+
const quiFormulaEditor = document.querySelector('q-codemirror-integrated-test');
|
|
59
13
|
if (quiFormulaEditor) {
|
|
60
14
|
// (quiFormulaEditor as any).value = 'DATEDIF([idColumn1], "11/02/2021 10:22:30", "Y") + 1 + MONTH([idColumn1]) + DAY([idColumn1])';
|
|
61
|
-
quiFormulaEditor.value = 'ABS()';
|
|
62
|
-
quiFormulaEditor.
|
|
15
|
+
// (quiFormulaEditor as any).value = 'ABS()';
|
|
16
|
+
quiFormulaEditor.value =
|
|
17
|
+
'DATEDIF([mIXvWLlAw], "11/02/2021 10:22:30", "Y") + 1 + MONTH([mIXvWLlAw]) + DAY([mIXvWLlAw])';
|
|
63
18
|
quiFormulaEditor.langSupport = {
|
|
64
19
|
customCalculateAST: _1.calculateAST,
|
|
65
20
|
customTranspileAST: _1.TranspileAST,
|
package/dist/cjs/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";;AAAA,wBAA+C;AAE/C,cAAc,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";;AAAA,wBAA+C;AAE/C,cAAc,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1D,MAAc,CAAC,cAAc,GAAG;IAC7B,MAAM,EAAE,8BAA8B;IACtC,MAAM,EAAE,0CAA0C;IAClD,MAAM,EAAE,WAAW;IACnB,KAAK,EAAE,WAAW;CACrB,CAAC;AAEF,SAAS,IAAI;IACT,MAAM,gBAAgB,GAAG,QAAQ,CAAC,aAAa,CAC3C,8BAA8B,CACjC,CAAC;IACF,IAAI,gBAAgB,EAAE;QAClB,oIAAoI;QACpI,6CAA6C;QAC5C,gBAAwB,CAAC,KAAK;YAC3B,8FAA8F,CAAC;QAClG,gBAAwB,CAAC,WAAW,GAAG;YACpC,kBAAkB,EAAE,eAAY;YAChC,kBAAkB,EAAE,eAAY;SACnC,CAAC;KACL;AACL,CAAC"}
|
|
@@ -16,7 +16,7 @@ function columnTranspilation(engine, { value, context }, globalContext) {
|
|
|
16
16
|
}
|
|
17
17
|
exports.columnTranspilation = columnTranspilation;
|
|
18
18
|
function elasticsearch(context, globalContext) {
|
|
19
|
-
const value = `doc[
|
|
19
|
+
const value = `doc['${context.replacement}'].value`;
|
|
20
20
|
if ((context === null || context === void 0 ? void 0 : context.type) === 'date' && (globalContext === null || globalContext === void 0 ? void 0 : globalContext.timezone)) {
|
|
21
21
|
const offset = globalContext === null || globalContext === void 0 ? void 0 : globalContext.timezone.offset;
|
|
22
22
|
return `${constants_2.ELASTICSEARCH_SCRIPT_NAMES.setTimezone}(${value}, '${offset}')`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columnTranspilation.js","sourceRoot":"","sources":["../../../src/transpiler/columnTranspilation.ts"],"names":[],"mappings":";;;AAAA,4CAAuC;AACvC,4CAA0D;AAQ1D,SAAgB,mBAAmB,CAC/B,MAAe,EACf,EAAE,KAAK,EAAE,OAAO,EAAe,EAC/B,aAA8B;IAE9B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW;QAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACvD,MAAM,eAAe,GAAG;QACpB,CAAC,mBAAO,CAAC,aAAa,CAAC,EAAE,aAAa;QACtC,CAAC,mBAAO,CAAC,SAAS,CAAC,EAAE,GAAG;QACxB,CAAC,mBAAO,CAAC,QAAQ,CAAC,EAAE,GAAG;KAC1B,CAAC;IACF,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;AACrD,CAAC;AAbD,kDAaC;AAED,SAAS,aAAa,CAClB,OAAkC,EAClC,aAA8B;IAE9B,MAAM,KAAK,GAAG,QAAQ,OAAO,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"columnTranspilation.js","sourceRoot":"","sources":["../../../src/transpiler/columnTranspilation.ts"],"names":[],"mappings":";;;AAAA,4CAAuC;AACvC,4CAA0D;AAQ1D,SAAgB,mBAAmB,CAC/B,MAAe,EACf,EAAE,KAAK,EAAE,OAAO,EAAe,EAC/B,aAA8B;IAE9B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW;QAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACvD,MAAM,eAAe,GAAG;QACpB,CAAC,mBAAO,CAAC,aAAa,CAAC,EAAE,aAAa;QACtC,CAAC,mBAAO,CAAC,SAAS,CAAC,EAAE,GAAG;QACxB,CAAC,mBAAO,CAAC,QAAQ,CAAC,EAAE,GAAG;KAC1B,CAAC;IACF,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;AACrD,CAAC;AAbD,kDAaC;AAED,SAAS,aAAa,CAClB,OAAkC,EAClC,aAA8B;IAE9B,MAAM,KAAK,GAAG,QAAQ,OAAO,CAAC,WAAW,UAAU,CAAC;IACpD,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,MAAM,KAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAA,EAAE;QACrD,MAAM,MAAM,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAC,MAAM,CAAC;QAC9C,OAAO,GAAG,sCAA0B,CAAC,WAAW,IAAI,KAAK,MAAM,MAAM,IAAI,CAAC;KAC7E;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,GAAG,CAAC,OAAkC;IAC3C,OAAO,IAAI,OAAO,CAAC,WAAW,GAAG,CAAC;AACtC,CAAC"}
|
|
@@ -9,6 +9,7 @@ export declare class Transpiler {
|
|
|
9
9
|
constructor(ast: ProgramAST, engine: ENGINES, globalContext?: FormulaContext | undefined);
|
|
10
10
|
get(): TranspilationResponse;
|
|
11
11
|
private processNode;
|
|
12
|
+
private conversionFromColumnToLiteral;
|
|
12
13
|
private column;
|
|
13
14
|
private literal;
|
|
14
15
|
private unaryExpression;
|
|
@@ -30,12 +30,15 @@ class Transpiler {
|
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
32
|
processNode(expression) {
|
|
33
|
+
var _a;
|
|
33
34
|
try {
|
|
34
35
|
const { type } = expression !== null && expression !== void 0 ? expression : { type: constants_1.AST_TYPES.unknown };
|
|
35
36
|
const nodes = {
|
|
36
37
|
[constants_1.AST_TYPES.token]: this.literal,
|
|
37
38
|
[constants_1.AST_TYPES.literal]: this.literal,
|
|
38
|
-
[constants_1.AST_TYPES.column]: this.
|
|
39
|
+
[constants_1.AST_TYPES.column]: ((_a = this.globalContext) === null || _a === void 0 ? void 0 : _a.useSampleData)
|
|
40
|
+
? this.conversionFromColumnToLiteral
|
|
41
|
+
: this.column,
|
|
39
42
|
[constants_1.AST_TYPES.unaryExpression]: this.unaryExpression,
|
|
40
43
|
[constants_1.AST_TYPES.binaryExpression]: this.binaryExpression,
|
|
41
44
|
[constants_1.AST_TYPES.functionCall]: this.functionCall,
|
|
@@ -50,6 +53,10 @@ class Transpiler {
|
|
|
50
53
|
return { value: '' };
|
|
51
54
|
}
|
|
52
55
|
}
|
|
56
|
+
conversionFromColumnToLiteral(data) {
|
|
57
|
+
var _a, _b, _c, _d, _e, _f;
|
|
58
|
+
return this.literal(Object.assign(Object.assign({}, data), { value: (_d = (((_a = this.globalContext) === null || _a === void 0 ? void 0 : _a.sampleData) || {})[(_c = (_b = data.context) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : '']) !== null && _d !== void 0 ? _d : '', dataType: (_f = (_e = data.context) === null || _e === void 0 ? void 0 : _e.type) !== null && _f !== void 0 ? _f : 'string' }));
|
|
59
|
+
}
|
|
53
60
|
column(data) {
|
|
54
61
|
var _a, _b;
|
|
55
62
|
if (((_a = data === null || data === void 0 ? void 0 : data.context) === null || _a === void 0 ? void 0 : _a.type) === 'date' && ((_b = this.globalContext) === null || _b === void 0 ? void 0 : _b.timezone)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transpiler/index.ts"],"names":[],"mappings":";;;AAAA,4CAAmE;AAcnE,uDAG+B;AAC/B,4CAA4C;AAC5C,oCAIkB;AAClB,mEAAgE;AAChE,+DAA4D;AAC5D,qEAAkE;AAClE,yDAAsD;AAEtD,MAAa,UAAU;IAGnB,YACY,GAAe,EACN,MAAe,EACf,aAA8B;QAFvC,QAAG,GAAH,GAAG,CAAY;QACN,WAAM,GAAN,MAAM,CAAS;QACf,kBAAa,GAAb,aAAa,CAAiB;QAL3C,uBAAkB,GAAgB,IAAI,GAAG,EAAE,CAAC;QAC5C,qBAAgB,GAAqB,IAAI,mCAAgB,EAAE,CAAC;IAKjE,CAAC;IAEG,GAAG;QACN,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;QAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACzD,MAAM,UAAU,GAAG,IAAA,+CAAsB,EACrC,IAAI,CAAC,kBAAkB,EACvB,MAAM,CACT,CAAC;QAEF,OAAO;YACH,KAAK,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,IAAI,IAAI,KAAK,SAAS;YAC7D,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE;YACnC,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS;gBACvC,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,UAAU;SACnB,CAAC;IACN,CAAC;IAEO,WAAW,CAAC,UAAqB
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transpiler/index.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/utils/index.js
CHANGED
|
@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
exports.removeQuotes = void 0;
|
|
18
18
|
__exportStar(require("./customFunctions"), exports);
|
|
19
19
|
__exportStar(require("./isNumberParam"), exports);
|
|
20
|
-
__exportStar(require("./isPositiveNumberParam"), exports);
|
|
21
20
|
__exportStar(require("./isStringParam"), exports);
|
|
22
21
|
__exportStar(require("./isDateParam"), exports);
|
|
23
22
|
__exportStar(require("./isValidDate"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,kDAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,kDAAgC;AAChC,kDAAgC;AAChC,gDAA8B;AAC9B,gDAA8B;AAC9B,0DAAwC;AACxC,iDAA+B;AAC/B,oDAAkC;AAE3B,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAAtD,QAAA,YAAY,gBAA0C"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ValidatorResponse } from '../constants/interfaces';
|
|
2
|
-
export declare function isNumberParam(param: any): ValidatorResponse;
|
|
2
|
+
export declare function isNumberParam(param: any, dataType: string | undefined): ValidatorResponse;
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isNumberParam = void 0;
|
|
4
4
|
const dictionary_1 = require("../errors/dictionary");
|
|
5
|
-
function isNumberParam(param) {
|
|
6
|
-
const valid = typeof param === 'number';
|
|
5
|
+
function isNumberParam(param, dataType) {
|
|
6
|
+
const valid = typeof param === 'number' || dataType === 'number';
|
|
7
7
|
if (!valid)
|
|
8
8
|
return Object.assign({ valid }, dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.missingNumber]);
|
|
9
9
|
return { valid };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isNumberParam.js","sourceRoot":"","sources":["../../../src/utils/isNumberParam.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAGpE,SAAgB,aAAa,
|
|
1
|
+
{"version":3,"file":"isNumberParam.js","sourceRoot":"","sources":["../../../src/utils/isNumberParam.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAGpE,SAAgB,aAAa,CACzB,KAAU,EACV,QAA4B;IAE5B,MAAM,KAAK,GAAG,OAAO,KAAK,KAAK,QAAQ,IAAI,QAAQ,KAAK,QAAQ,CAAC;IACjE,IAAI,CAAC,KAAK;QAAE,uBAAS,KAAK,IAAK,6BAAgB,CAAC,uBAAU,CAAC,aAAa,CAAC,EAAG;IAC5E,OAAO,EAAE,KAAK,EAAE,CAAC;AACrB,CAAC;AAPD,sCAOC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ValidatorResponse } from '../constants/interfaces';
|
|
2
|
-
export declare function isStringParam(param: any): ValidatorResponse;
|
|
2
|
+
export declare function isStringParam(param: any, dataType: string | undefined): ValidatorResponse;
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isStringParam = void 0;
|
|
4
4
|
const dictionary_1 = require("../errors/dictionary");
|
|
5
|
-
function isStringParam(param) {
|
|
6
|
-
const valid =
|
|
5
|
+
function isStringParam(param, dataType) {
|
|
6
|
+
const valid = dataType === 'string' ||
|
|
7
|
+
(dataType === undefined && typeof param === 'string');
|
|
7
8
|
if (!valid)
|
|
8
9
|
return Object.assign({ valid }, dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.missingString]);
|
|
9
10
|
return { valid };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isStringParam.js","sourceRoot":"","sources":["../../../src/utils/isStringParam.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAGpE,SAAgB,aAAa,
|
|
1
|
+
{"version":3,"file":"isStringParam.js","sourceRoot":"","sources":["../../../src/utils/isStringParam.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAGpE,SAAgB,aAAa,CACzB,KAAU,EACV,QAA4B;IAE5B,MAAM,KAAK,GACP,QAAQ,KAAK,QAAQ;QACrB,CAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK;QAAE,uBAAS,KAAK,IAAK,6BAAgB,CAAC,uBAAU,CAAC,aAAa,CAAC,EAAG;IAC5E,OAAO,EAAE,KAAK,EAAE,CAAC;AACrB,CAAC;AATD,sCASC"}
|
|
@@ -5,9 +5,12 @@ function datePart(value, format) {
|
|
|
5
5
|
return `DATE_PART('${format}', ${value})`;
|
|
6
6
|
}
|
|
7
7
|
function toDate(value) {
|
|
8
|
-
return `CAST('${value}' AS
|
|
8
|
+
return `CAST('${value}' AS TIMESTAMP)`;
|
|
9
9
|
}
|
|
10
10
|
exports.toDate = toDate;
|
|
11
|
+
function newDate(value) {
|
|
12
|
+
return `DATE(${value})`;
|
|
13
|
+
}
|
|
11
14
|
function generalDateDif(start, end, unit) {
|
|
12
15
|
const units = {
|
|
13
16
|
Y: 'year',
|
|
@@ -18,11 +21,11 @@ function generalDateDif(start, end, unit) {
|
|
|
18
21
|
return `DATEDIFF('${currentUnit}', ${start}, ${end})`;
|
|
19
22
|
}
|
|
20
23
|
function customDateDifYear(start, end) {
|
|
21
|
-
const month = datePart('month'
|
|
22
|
-
const day = datePart('day'
|
|
23
|
-
const year = datePart('year'
|
|
24
|
-
const parts = [year, month, day].join(
|
|
25
|
-
const customDate =
|
|
24
|
+
const month = datePart(end, 'month');
|
|
25
|
+
const day = datePart(end, 'day');
|
|
26
|
+
const year = datePart(start, 'year');
|
|
27
|
+
const parts = [year, month, day].join(` || '-' || `);
|
|
28
|
+
const customDate = newDate(parts);
|
|
26
29
|
const dateDifToCompare = generalDateDif(start, customDate, 'D');
|
|
27
30
|
const dateDifYear = generalDateDif(start, end, 'Y');
|
|
28
31
|
const result = `CASE
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/sql/scripts.ts"],"names":[],"mappings":";;;AAEA,SAAS,QAAQ,CAAC,KAAa,EAAE,MAAc;IAC3C,OAAO,cAAc,MAAM,MAAM,KAAK,GAAG,CAAC;AAC9C,CAAC;AAED,SAAgB,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,
|
|
1
|
+
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/sql/scripts.ts"],"names":[],"mappings":";;;AAEA,SAAS,QAAQ,CAAC,KAAa,EAAE,MAAc;IAC3C,OAAO,cAAc,MAAM,MAAM,KAAK,GAAG,CAAC;AAC9C,CAAC;AAED,SAAgB,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,iBAAiB,CAAC;AAC3C,CAAC;AAFD,wBAEC;AAED,SAAS,OAAO,CAAC,KAAa;IAC1B,OAAO,QAAQ,KAAK,GAAG,CAAC;AAC5B,CAAC;AAED,SAAS,cAAc,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IACtE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,KAAK;KACX,CAAC;IACF,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,aAAa,WAAW,MAAM,KAAK,KAAK,GAAG,GAAG,CAAC;AAC1D,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAa,EAAE,GAAW;IACjD,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACrC,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,gBAAgB,GAAG,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAChE,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG;eACJ,gBAAgB;mBACZ,WAAW;eACf,WAAW;QAClB,CAAC;IACL,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAgB,OAAO,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IACtE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,iBAAiB;QACpB,CAAC,EAAE,cAAc;QACjB,CAAC,EAAE,cAAc;KACpB,CAAC;IACF,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AACzC,CAAC;AAPD,0BAOC"}
|
|
@@ -83,6 +83,8 @@ export interface VariableContextDefinition {
|
|
|
83
83
|
export interface FormulaContext {
|
|
84
84
|
model?: VariableContextDefinition[];
|
|
85
85
|
timezone?: TimezoneDefinition;
|
|
86
|
+
useSampleData?: boolean;
|
|
87
|
+
sampleData?: any;
|
|
86
88
|
}
|
|
87
89
|
interface TimezoneDefinition {
|
|
88
90
|
offset: string;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isNumberParam,
|
|
1
|
+
import { isNumberParam, isStringParam } from '../utils';
|
|
2
2
|
/**
|
|
3
3
|
* `MID` Returns a segment of a string.
|
|
4
4
|
*/
|
|
@@ -18,7 +18,7 @@ export const MID = {
|
|
|
18
18
|
name: 'starting_at',
|
|
19
19
|
type: 'Number',
|
|
20
20
|
optional: false,
|
|
21
|
-
validator: [
|
|
21
|
+
validator: [isNumberParam],
|
|
22
22
|
},
|
|
23
23
|
{
|
|
24
24
|
identifier: 'EXTRACT_LENGTH',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mid.js","sourceRoot":"","sources":["../../../src/functions/mid.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"mid.js","sourceRoot":"","sources":["../../../src/functions/mid.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAExD;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,IAAI,EAAE,KAAK;IACX,UAAU,EAAE;QACR;YACI,UAAU,EAAE,SAAS;YACrB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,aAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,aAAa;YACzB,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,CAAC,aAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,gBAAgB;YAC5B,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,CAAC,aAAa,CAAC;SAC7B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;KACX;CACJ,CAAC;AAEF,SAAS,aAAa,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IACjE,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,OAAO,GAAG,OAAO,cAAc,KAAK,GAAG,QAAQ,GAAG,CAAC;AACvD,CAAC;AAED,SAAS,GAAG,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IACvD,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,OAAO,aAAa,OAAO,KAAK,KAAK,GAAG,QAAQ,GAAG,CAAC;AACxD,CAAC;AAED,SAAS,SAAS,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IAC7D,OAAO,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,QAAQ,CAAC,OAAe,EAAE,KAAa,EAAE,MAAc;IAC5D,OAAO,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC"}
|
package/dist/module/main.js
CHANGED
|
@@ -1,63 +1,18 @@
|
|
|
1
1
|
import { TranspileAST, calculateAST } from '.';
|
|
2
2
|
customElements.whenDefined('q-codemirror-test').then(load);
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
label: 'Date',
|
|
9
|
-
type: 'date',
|
|
10
|
-
},
|
|
11
|
-
{
|
|
12
|
-
id: 'idColumn2',
|
|
13
|
-
replacement: 'Date_Origin_Column2',
|
|
14
|
-
label: 'DateTime',
|
|
15
|
-
type: 'date',
|
|
16
|
-
},
|
|
17
|
-
{
|
|
18
|
-
id: 'idColumn3',
|
|
19
|
-
replacement: 'Date_Origin_Column3',
|
|
20
|
-
label: 'Donations',
|
|
21
|
-
type: 'string',
|
|
22
|
-
},
|
|
23
|
-
{
|
|
24
|
-
id: 'idColumn4',
|
|
25
|
-
replacement: 'Date_Origin_Column4',
|
|
26
|
-
label: 'Duration',
|
|
27
|
-
type: 'number',
|
|
28
|
-
},
|
|
29
|
-
{
|
|
30
|
-
id: 'idColumn5',
|
|
31
|
-
replacement: 'Date_Origin_Column5',
|
|
32
|
-
label: 'City',
|
|
33
|
-
type: 'string',
|
|
34
|
-
},
|
|
35
|
-
{
|
|
36
|
-
id: 'idColumn6',
|
|
37
|
-
replacement: 'Date_Origin_Column6',
|
|
38
|
-
label: 'City New',
|
|
39
|
-
type: 'string',
|
|
40
|
-
},
|
|
41
|
-
{
|
|
42
|
-
id: 'idColumn7',
|
|
43
|
-
replacement: 'Date_Origin_Column7',
|
|
44
|
-
label: 'City New Country',
|
|
45
|
-
type: 'string',
|
|
46
|
-
},
|
|
47
|
-
{
|
|
48
|
-
id: 'idColumn8',
|
|
49
|
-
replacement: 'Date_Origin_Column8',
|
|
50
|
-
label: 'Country',
|
|
51
|
-
type: 'string',
|
|
52
|
-
},
|
|
53
|
-
],
|
|
3
|
+
window.formulaSetting = {
|
|
4
|
+
domain: 'https://postqa2.qrveyapp.com',
|
|
5
|
+
apiKey: 'VXlA8eZmrJUaCk8OlAxP3KUpR6S79UO2xgawf1tX',
|
|
6
|
+
userId: 'iduDnkZPS',
|
|
7
|
+
appId: 'XqsfiPaxO',
|
|
54
8
|
};
|
|
55
9
|
function load() {
|
|
56
|
-
const quiFormulaEditor = document.querySelector('q-codemirror-test');
|
|
10
|
+
const quiFormulaEditor = document.querySelector('q-codemirror-integrated-test');
|
|
57
11
|
if (quiFormulaEditor) {
|
|
58
12
|
// (quiFormulaEditor as any).value = 'DATEDIF([idColumn1], "11/02/2021 10:22:30", "Y") + 1 + MONTH([idColumn1]) + DAY([idColumn1])';
|
|
59
|
-
quiFormulaEditor.value = 'ABS()';
|
|
60
|
-
quiFormulaEditor.
|
|
13
|
+
// (quiFormulaEditor as any).value = 'ABS()';
|
|
14
|
+
quiFormulaEditor.value =
|
|
15
|
+
'DATEDIF([mIXvWLlAw], "11/02/2021 10:22:30", "Y") + 1 + MONTH([mIXvWLlAw]) + DAY([mIXvWLlAw])';
|
|
61
16
|
quiFormulaEditor.langSupport = {
|
|
62
17
|
customCalculateAST: calculateAST,
|
|
63
18
|
customTranspileAST: TranspileAST,
|
package/dist/module/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,GAAG,CAAC;AAE/C,cAAc,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,GAAG,CAAC;AAE/C,cAAc,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1D,MAAc,CAAC,cAAc,GAAG;IAC7B,MAAM,EAAE,8BAA8B;IACtC,MAAM,EAAE,0CAA0C;IAClD,MAAM,EAAE,WAAW;IACnB,KAAK,EAAE,WAAW;CACrB,CAAC;AAEF,SAAS,IAAI;IACT,MAAM,gBAAgB,GAAG,QAAQ,CAAC,aAAa,CAC3C,8BAA8B,CACjC,CAAC;IACF,IAAI,gBAAgB,EAAE;QAClB,oIAAoI;QACpI,6CAA6C;QAC5C,gBAAwB,CAAC,KAAK;YAC3B,8FAA8F,CAAC;QAClG,gBAAwB,CAAC,WAAW,GAAG;YACpC,kBAAkB,EAAE,YAAY;YAChC,kBAAkB,EAAE,YAAY;SACnC,CAAC;KACL;AACL,CAAC"}
|
|
@@ -12,7 +12,7 @@ export function columnTranspilation(engine, { value, context }, globalContext) {
|
|
|
12
12
|
return { value: result, dataType: context.type };
|
|
13
13
|
}
|
|
14
14
|
function elasticsearch(context, globalContext) {
|
|
15
|
-
const value = `doc[
|
|
15
|
+
const value = `doc['${context.replacement}'].value`;
|
|
16
16
|
if ((context === null || context === void 0 ? void 0 : context.type) === 'date' && (globalContext === null || globalContext === void 0 ? void 0 : globalContext.timezone)) {
|
|
17
17
|
const offset = globalContext === null || globalContext === void 0 ? void 0 : globalContext.timezone.offset;
|
|
18
18
|
return `${ELASTICSEARCH_SCRIPT_NAMES.setTimezone}(${value}, '${offset}')`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columnTranspilation.js","sourceRoot":"","sources":["../../../src/transpiler/columnTranspilation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAQ1D,MAAM,UAAU,mBAAmB,CAC/B,MAAe,EACf,EAAE,KAAK,EAAE,OAAO,EAAe,EAC/B,aAA8B;IAE9B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW;QAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACvD,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,EAAE,aAAa,CAAC,CAAC;IAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;AACrD,CAAC;AAED,SAAS,aAAa,CAClB,OAAkC,EAClC,aAA8B;IAE9B,MAAM,KAAK,GAAG,QAAQ,OAAO,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"columnTranspilation.js","sourceRoot":"","sources":["../../../src/transpiler/columnTranspilation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAQ1D,MAAM,UAAU,mBAAmB,CAC/B,MAAe,EACf,EAAE,KAAK,EAAE,OAAO,EAAe,EAC/B,aAA8B;IAE9B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW;QAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACvD,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,EAAE,aAAa,CAAC,CAAC;IAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;AACrD,CAAC;AAED,SAAS,aAAa,CAClB,OAAkC,EAClC,aAA8B;IAE9B,MAAM,KAAK,GAAG,QAAQ,OAAO,CAAC,WAAW,UAAU,CAAC;IACpD,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,MAAM,KAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAA,EAAE;QACrD,MAAM,MAAM,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAC,MAAM,CAAC;QAC9C,OAAO,GAAG,0BAA0B,CAAC,WAAW,IAAI,KAAK,MAAM,MAAM,IAAI,CAAC;KAC7E;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,GAAG,CAAC,OAAkC;IAC3C,OAAO,IAAI,OAAO,CAAC,WAAW,GAAG,CAAC;AACtC,CAAC"}
|
|
@@ -9,6 +9,7 @@ export declare class Transpiler {
|
|
|
9
9
|
constructor(ast: ProgramAST, engine: ENGINES, globalContext?: FormulaContext | undefined);
|
|
10
10
|
get(): TranspilationResponse;
|
|
11
11
|
private processNode;
|
|
12
|
+
private conversionFromColumnToLiteral;
|
|
12
13
|
private column;
|
|
13
14
|
private literal;
|
|
14
15
|
private unaryExpression;
|
|
@@ -27,12 +27,15 @@ export class Transpiler {
|
|
|
27
27
|
};
|
|
28
28
|
}
|
|
29
29
|
processNode(expression) {
|
|
30
|
+
var _a;
|
|
30
31
|
try {
|
|
31
32
|
const { type } = expression !== null && expression !== void 0 ? expression : { type: AST_TYPES.unknown };
|
|
32
33
|
const nodes = {
|
|
33
34
|
[AST_TYPES.token]: this.literal,
|
|
34
35
|
[AST_TYPES.literal]: this.literal,
|
|
35
|
-
[AST_TYPES.column]: this.
|
|
36
|
+
[AST_TYPES.column]: ((_a = this.globalContext) === null || _a === void 0 ? void 0 : _a.useSampleData)
|
|
37
|
+
? this.conversionFromColumnToLiteral
|
|
38
|
+
: this.column,
|
|
36
39
|
[AST_TYPES.unaryExpression]: this.unaryExpression,
|
|
37
40
|
[AST_TYPES.binaryExpression]: this.binaryExpression,
|
|
38
41
|
[AST_TYPES.functionCall]: this.functionCall,
|
|
@@ -47,6 +50,10 @@ export class Transpiler {
|
|
|
47
50
|
return { value: '' };
|
|
48
51
|
}
|
|
49
52
|
}
|
|
53
|
+
conversionFromColumnToLiteral(data) {
|
|
54
|
+
var _a, _b, _c, _d, _e, _f;
|
|
55
|
+
return this.literal(Object.assign(Object.assign({}, data), { value: (_d = (((_a = this.globalContext) === null || _a === void 0 ? void 0 : _a.sampleData) || {})[(_c = (_b = data.context) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : '']) !== null && _d !== void 0 ? _d : '', dataType: (_f = (_e = data.context) === null || _e === void 0 ? void 0 : _e.type) !== null && _f !== void 0 ? _f : 'string' }));
|
|
56
|
+
}
|
|
50
57
|
column(data) {
|
|
51
58
|
var _a, _b;
|
|
52
59
|
if (((_a = data === null || data === void 0 ? void 0 : data.context) === null || _a === void 0 ? void 0 : _a.type) === 'date' && ((_b = this.globalContext) === null || _b === void 0 ? void 0 : _b.timezone)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transpiler/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,SAAS,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAcnE,OAAO,EACH,sBAAsB,EACtB,oBAAoB,GACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EACH,cAAc,IAAI,kBAAkB,EACpC,cAAc,EACd,cAAc,GACjB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,OAAO,UAAU;IAGnB,YACY,GAAe,EACN,MAAe,EACf,aAA8B;QAFvC,QAAG,GAAH,GAAG,CAAY;QACN,WAAM,GAAN,MAAM,CAAS;QACf,kBAAa,GAAb,aAAa,CAAiB;QAL3C,uBAAkB,GAAgB,IAAI,GAAG,EAAE,CAAC;QAC5C,qBAAgB,GAAqB,IAAI,gBAAgB,EAAE,CAAC;IAKjE,CAAC;IAEG,GAAG;QACN,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;QAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACzD,MAAM,UAAU,GAAG,sBAAsB,CACrC,IAAI,CAAC,kBAAkB,EACvB,MAAM,CACT,CAAC;QAEF,OAAO;YACH,KAAK,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,IAAI,IAAI,KAAK,SAAS;YAC7D,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE;YACnC,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS;gBACvC,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,UAAU;SACnB,CAAC;IACN,CAAC;IAEO,WAAW,CAAC,UAAqB
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transpiler/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAElC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ValidatorResponse } from '../constants/interfaces';
|
|
2
|
-
export declare function isNumberParam(param: any): ValidatorResponse;
|
|
2
|
+
export declare function isNumberParam(param: any, dataType: string | undefined): ValidatorResponse;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ERROR_LIST, ERROR_DICTIONARY } from '../errors/dictionary';
|
|
2
|
-
export function isNumberParam(param) {
|
|
3
|
-
const valid = typeof param === 'number';
|
|
2
|
+
export function isNumberParam(param, dataType) {
|
|
3
|
+
const valid = typeof param === 'number' || dataType === 'number';
|
|
4
4
|
if (!valid)
|
|
5
5
|
return Object.assign({ valid }, ERROR_DICTIONARY[ERROR_LIST.missingNumber]);
|
|
6
6
|
return { valid };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isNumberParam.js","sourceRoot":"","sources":["../../../src/utils/isNumberParam.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGpE,MAAM,UAAU,aAAa,
|
|
1
|
+
{"version":3,"file":"isNumberParam.js","sourceRoot":"","sources":["../../../src/utils/isNumberParam.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGpE,MAAM,UAAU,aAAa,CACzB,KAAU,EACV,QAA4B;IAE5B,MAAM,KAAK,GAAG,OAAO,KAAK,KAAK,QAAQ,IAAI,QAAQ,KAAK,QAAQ,CAAC;IACjE,IAAI,CAAC,KAAK;QAAE,uBAAS,KAAK,IAAK,gBAAgB,CAAC,UAAU,CAAC,aAAa,CAAC,EAAG;IAC5E,OAAO,EAAE,KAAK,EAAE,CAAC;AACrB,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ValidatorResponse } from '../constants/interfaces';
|
|
2
|
-
export declare function isStringParam(param: any): ValidatorResponse;
|
|
2
|
+
export declare function isStringParam(param: any, dataType: string | undefined): ValidatorResponse;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ERROR_LIST, ERROR_DICTIONARY } from '../errors/dictionary';
|
|
2
|
-
export function isStringParam(param) {
|
|
3
|
-
const valid =
|
|
2
|
+
export function isStringParam(param, dataType) {
|
|
3
|
+
const valid = dataType === 'string' ||
|
|
4
|
+
(dataType === undefined && typeof param === 'string');
|
|
4
5
|
if (!valid)
|
|
5
6
|
return Object.assign({ valid }, ERROR_DICTIONARY[ERROR_LIST.missingString]);
|
|
6
7
|
return { valid };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isStringParam.js","sourceRoot":"","sources":["../../../src/utils/isStringParam.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGpE,MAAM,UAAU,aAAa,
|
|
1
|
+
{"version":3,"file":"isStringParam.js","sourceRoot":"","sources":["../../../src/utils/isStringParam.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGpE,MAAM,UAAU,aAAa,CACzB,KAAU,EACV,QAA4B;IAE5B,MAAM,KAAK,GACP,QAAQ,KAAK,QAAQ;QACrB,CAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK;QAAE,uBAAS,KAAK,IAAK,gBAAgB,CAAC,UAAU,CAAC,aAAa,CAAC,EAAG;IAC5E,OAAO,EAAE,KAAK,EAAE,CAAC;AACrB,CAAC"}
|
|
@@ -2,7 +2,10 @@ function datePart(value, format) {
|
|
|
2
2
|
return `DATE_PART('${format}', ${value})`;
|
|
3
3
|
}
|
|
4
4
|
export function toDate(value) {
|
|
5
|
-
return `CAST('${value}' AS
|
|
5
|
+
return `CAST('${value}' AS TIMESTAMP)`;
|
|
6
|
+
}
|
|
7
|
+
function newDate(value) {
|
|
8
|
+
return `DATE(${value})`;
|
|
6
9
|
}
|
|
7
10
|
function generalDateDif(start, end, unit) {
|
|
8
11
|
const units = {
|
|
@@ -14,11 +17,11 @@ function generalDateDif(start, end, unit) {
|
|
|
14
17
|
return `DATEDIFF('${currentUnit}', ${start}, ${end})`;
|
|
15
18
|
}
|
|
16
19
|
function customDateDifYear(start, end) {
|
|
17
|
-
const month = datePart('month'
|
|
18
|
-
const day = datePart('day'
|
|
19
|
-
const year = datePart('year'
|
|
20
|
-
const parts = [year, month, day].join(
|
|
21
|
-
const customDate =
|
|
20
|
+
const month = datePart(end, 'month');
|
|
21
|
+
const day = datePart(end, 'day');
|
|
22
|
+
const year = datePart(start, 'year');
|
|
23
|
+
const parts = [year, month, day].join(` || '-' || `);
|
|
24
|
+
const customDate = newDate(parts);
|
|
22
25
|
const dateDifToCompare = generalDateDif(start, customDate, 'D');
|
|
23
26
|
const dateDifYear = generalDateDif(start, end, 'Y');
|
|
24
27
|
const result = `CASE
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/sql/scripts.ts"],"names":[],"mappings":"AAEA,SAAS,QAAQ,CAAC,KAAa,EAAE,MAAc;IAC3C,OAAO,cAAc,MAAM,MAAM,KAAK,GAAG,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,
|
|
1
|
+
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/sql/scripts.ts"],"names":[],"mappings":"AAEA,SAAS,QAAQ,CAAC,KAAa,EAAE,MAAc;IAC3C,OAAO,cAAc,MAAM,MAAM,KAAK,GAAG,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,iBAAiB,CAAC;AAC3C,CAAC;AAED,SAAS,OAAO,CAAC,KAAa;IAC1B,OAAO,QAAQ,KAAK,GAAG,CAAC;AAC5B,CAAC;AAED,SAAS,cAAc,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IACtE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,KAAK;KACX,CAAC;IACF,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,aAAa,WAAW,MAAM,KAAK,KAAK,GAAG,GAAG,CAAC;AAC1D,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAa,EAAE,GAAW;IACjD,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACrC,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,gBAAgB,GAAG,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAChE,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG;eACJ,gBAAgB;mBACZ,WAAW;eACf,WAAW;QAClB,CAAC;IACL,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IACtE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,iBAAiB;QACpB,CAAC,EAAE,cAAc;QACjB,CAAC,EAAE,cAAc;KACpB,CAAC;IACF,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AACzC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@qrvey/formula-lang",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.7.0",
|
|
4
4
|
"description": "QFormula support for qrvey projects",
|
|
5
5
|
"types": "dist/module/index.d.ts",
|
|
6
6
|
"main": "dist/module/index.js",
|
|
@@ -14,11 +14,11 @@
|
|
|
14
14
|
"test": "jest __tests__",
|
|
15
15
|
"test:coverage": "jest __tests__ --collect-coverage",
|
|
16
16
|
"build": "rm -rf dist && tsc && tsc -m commonjs --outDir dist/cjs",
|
|
17
|
-
"build:watch": "tsc -w",
|
|
17
|
+
"build:watch": "tsc -w && tsc -w -m commonjs --outDir dist/cjs",
|
|
18
18
|
"debug:bundle": "webpack",
|
|
19
19
|
"debug:watch": "webpack --watch",
|
|
20
|
-
"debug:serve": "cd dist && live-server --port=3553 --
|
|
21
|
-
"debug:local": "npm-run-all --parallel debug:watch debug:serve",
|
|
20
|
+
"debug:serve": "cd dist && live-server --port=3553 --no-browser",
|
|
21
|
+
"debug:local": "npm-run-all --parallel build:watch debug:watch debug:serve",
|
|
22
22
|
"debug:copy-index": "mkdir -p dist && cp src/index.html dist/",
|
|
23
23
|
"prepublishOnly": "npm run build",
|
|
24
24
|
"start": "npm run debug:copy-index && npm run debug:bundle && npm run debug:local",
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isPositiveNumberParam = void 0;
|
|
4
|
-
const dictionary_1 = require("../errors/dictionary");
|
|
5
|
-
function isPositiveNumberParam(param) {
|
|
6
|
-
const valid = param >= 0;
|
|
7
|
-
if (!valid)
|
|
8
|
-
return Object.assign({ valid }, dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.greaterThanZero]);
|
|
9
|
-
return { valid };
|
|
10
|
-
}
|
|
11
|
-
exports.isPositiveNumberParam = isPositiveNumberParam;
|
|
12
|
-
//# sourceMappingURL=isPositiveNumberParam.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"isPositiveNumberParam.js","sourceRoot":"","sources":["../../../src/utils/isPositiveNumberParam.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAGpE,SAAgB,qBAAqB,CAAC,KAAU;IAC5C,MAAM,KAAK,GAAG,KAAK,IAAI,CAAC,CAAC;IACzB,IAAI,CAAC,KAAK;QACN,uBAAS,KAAK,IAAK,6BAAgB,CAAC,uBAAU,CAAC,eAAe,CAAC,EAAG;IACtE,OAAO,EAAE,KAAK,EAAE,CAAC;AACrB,CAAC;AALD,sDAKC"}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import { ERROR_LIST, ERROR_DICTIONARY } from '../errors/dictionary';
|
|
2
|
-
export function isPositiveNumberParam(param) {
|
|
3
|
-
const valid = param >= 0;
|
|
4
|
-
if (!valid)
|
|
5
|
-
return Object.assign({ valid }, ERROR_DICTIONARY[ERROR_LIST.greaterThanZero]);
|
|
6
|
-
return { valid };
|
|
7
|
-
}
|
|
8
|
-
//# sourceMappingURL=isPositiveNumberParam.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"isPositiveNumberParam.js","sourceRoot":"","sources":["../../../src/utils/isPositiveNumberParam.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGpE,MAAM,UAAU,qBAAqB,CAAC,KAAU;IAC5C,MAAM,KAAK,GAAG,KAAK,IAAI,CAAC,CAAC;IACzB,IAAI,CAAC,KAAK;QACN,uBAAS,KAAK,IAAK,gBAAgB,CAAC,UAAU,CAAC,eAAe,CAAC,EAAG;IACtE,OAAO,EAAE,KAAK,EAAE,CAAC;AACrB,CAAC"}
|