@qrvey/formula-lang 0.9.2 → 2.0.0-post-mvp
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/dist/cjs/constants/index.d.ts +2 -1
- package/dist/cjs/constants/index.js +1 -0
- package/dist/cjs/constants/index.js.map +1 -1
- package/dist/cjs/constants/interfaces.d.ts +2 -0
- package/dist/cjs/errors/analyzer/index.js +2 -0
- package/dist/cjs/errors/analyzer/index.js.map +1 -1
- package/dist/cjs/errors/analyzer/postgresql.d.ts +8 -0
- package/dist/cjs/errors/analyzer/postgresql.js +26 -0
- package/dist/cjs/errors/analyzer/postgresql.js.map +1 -0
- package/dist/cjs/functions/abs.js +4 -0
- package/dist/cjs/functions/abs.js.map +1 -1
- package/dist/cjs/functions/datedif.js +5 -0
- package/dist/cjs/functions/datedif.js.map +1 -1
- package/dist/cjs/functions/day.js +4 -0
- package/dist/cjs/functions/day.js.map +1 -1
- package/dist/cjs/functions/hour.js +4 -0
- package/dist/cjs/functions/hour.js.map +1 -1
- package/dist/cjs/functions/if.js +8 -1
- package/dist/cjs/functions/if.js.map +1 -1
- package/dist/cjs/functions/ifs.js +9 -2
- package/dist/cjs/functions/ifs.js.map +1 -1
- package/dist/cjs/functions/isNull.js +4 -0
- package/dist/cjs/functions/isNull.js.map +1 -1
- package/dist/cjs/functions/mid.js +4 -0
- package/dist/cjs/functions/mid.js.map +1 -1
- package/dist/cjs/functions/minute.js +4 -0
- package/dist/cjs/functions/minute.js.map +1 -1
- package/dist/cjs/functions/month.js +4 -0
- package/dist/cjs/functions/month.js.map +1 -1
- package/dist/cjs/functions/second.js +4 -0
- package/dist/cjs/functions/second.js.map +1 -1
- package/dist/cjs/functions/year.js +4 -0
- package/dist/cjs/functions/year.js.map +1 -1
- package/dist/cjs/main.js +6 -9
- package/dist/cjs/main.js.map +1 -1
- package/dist/cjs/parser/json-parser.js +25 -10
- package/dist/cjs/parser/json-parser.js.map +1 -1
- package/dist/cjs/transpiler/columnTranspilation.js +1 -0
- package/dist/cjs/transpiler/columnTranspilation.js.map +1 -1
- package/dist/cjs/utils/customFunctions.js +1 -0
- package/dist/cjs/utils/customFunctions.js.map +1 -1
- package/dist/cjs/utils/sql/scripts.d.ts +1 -0
- package/dist/cjs/utils/sql/scripts.js +18 -6
- package/dist/cjs/utils/sql/scripts.js.map +1 -1
- package/dist/module/constants/index.d.ts +2 -1
- package/dist/module/constants/index.js +1 -0
- package/dist/module/constants/index.js.map +1 -1
- package/dist/module/constants/interfaces.d.ts +2 -0
- package/dist/module/errors/analyzer/index.js +2 -0
- package/dist/module/errors/analyzer/index.js.map +1 -1
- package/dist/module/errors/analyzer/postgresql.d.ts +8 -0
- package/dist/module/errors/analyzer/postgresql.js +22 -0
- package/dist/module/errors/analyzer/postgresql.js.map +1 -0
- package/dist/module/functions/abs.js +4 -0
- package/dist/module/functions/abs.js.map +1 -1
- package/dist/module/functions/datedif.js +6 -1
- package/dist/module/functions/datedif.js.map +1 -1
- package/dist/module/functions/day.js +4 -0
- package/dist/module/functions/day.js.map +1 -1
- package/dist/module/functions/hour.js +4 -0
- package/dist/module/functions/hour.js.map +1 -1
- package/dist/module/functions/if.js +8 -1
- package/dist/module/functions/if.js.map +1 -1
- package/dist/module/functions/ifs.js +9 -2
- package/dist/module/functions/ifs.js.map +1 -1
- package/dist/module/functions/isNull.js +4 -0
- package/dist/module/functions/isNull.js.map +1 -1
- package/dist/module/functions/mid.js +4 -0
- package/dist/module/functions/mid.js.map +1 -1
- package/dist/module/functions/minute.js +4 -0
- package/dist/module/functions/minute.js.map +1 -1
- package/dist/module/functions/month.js +4 -0
- package/dist/module/functions/month.js.map +1 -1
- package/dist/module/functions/second.js +4 -0
- package/dist/module/functions/second.js.map +1 -1
- package/dist/module/functions/year.js +4 -0
- package/dist/module/functions/year.js.map +1 -1
- package/dist/module/main.js +6 -9
- package/dist/module/main.js.map +1 -1
- package/dist/module/parser/json-parser.js +25 -10
- package/dist/module/parser/json-parser.js.map +1 -1
- package/dist/module/transpiler/columnTranspilation.js +1 -0
- package/dist/module/transpiler/columnTranspilation.js.map +1 -1
- package/dist/module/utils/customFunctions.js +1 -0
- package/dist/module/utils/customFunctions.js.map +1 -1
- package/dist/module/utils/sql/scripts.d.ts +1 -0
- package/dist/module/utils/sql/scripts.js +16 -5
- package/dist/module/utils/sql/scripts.js.map +1 -1
- package/package.json +1 -1
|
@@ -16,9 +16,10 @@ export function calculateAST(program, tree, context) {
|
|
|
16
16
|
errorList: syntaxErrors,
|
|
17
17
|
formulaVariables: [],
|
|
18
18
|
formulaFunctions: [],
|
|
19
|
+
flatBody: [],
|
|
19
20
|
};
|
|
20
21
|
const body = transformNode(program, startNode, inference, context);
|
|
21
|
-
const { errorList: errors, formulaVariables: variables, formulaFunctions, } = inference;
|
|
22
|
+
const { errorList: errors, formulaVariables: variables, formulaFunctions, flatBody, } = inference;
|
|
22
23
|
return {
|
|
23
24
|
type: AST_TYPES.program,
|
|
24
25
|
exp: program,
|
|
@@ -30,36 +31,50 @@ export function calculateAST(program, tree, context) {
|
|
|
30
31
|
errors,
|
|
31
32
|
variables,
|
|
32
33
|
formulaFunctions,
|
|
34
|
+
flatBody,
|
|
33
35
|
primitive: (_a = body === null || body === void 0 ? void 0 : body.primitive) !== null && _a !== void 0 ? _a : AST_PRIMITIVES.UNKNOWN,
|
|
34
36
|
};
|
|
35
37
|
}
|
|
36
38
|
function transformNode(program, node, inference, context) {
|
|
37
39
|
if (!node)
|
|
38
40
|
return undefined;
|
|
41
|
+
let resultNode;
|
|
39
42
|
switch (node.name) {
|
|
40
43
|
case 'BinaryExpression':
|
|
41
|
-
|
|
44
|
+
resultNode = transformBinaryExpression(program, node, inference, context);
|
|
45
|
+
break;
|
|
42
46
|
case 'UnaryExpression':
|
|
43
|
-
|
|
47
|
+
resultNode = transformUnaryExpression(program, node, inference, context);
|
|
48
|
+
break;
|
|
44
49
|
case 'ParenthesizedExpression':
|
|
45
|
-
|
|
50
|
+
resultNode = transformParenthesizedExpression(program, node, inference, context);
|
|
51
|
+
break;
|
|
46
52
|
case 'Function':
|
|
47
|
-
|
|
53
|
+
resultNode = transformFunctionExpression(program, node, inference, context, transformNode);
|
|
54
|
+
break;
|
|
48
55
|
case 'Number':
|
|
49
|
-
|
|
56
|
+
resultNode = transformNumberValue(program, node);
|
|
57
|
+
break;
|
|
50
58
|
case 'Date':
|
|
51
|
-
|
|
59
|
+
resultNode = transformDateValue(program, node);
|
|
60
|
+
break;
|
|
52
61
|
case 'String':
|
|
53
|
-
|
|
62
|
+
resultNode = transformStringValue(program, node);
|
|
63
|
+
break;
|
|
54
64
|
case 'Boolean':
|
|
55
|
-
|
|
65
|
+
resultNode = transformBooleanValue(program, node);
|
|
66
|
+
break;
|
|
56
67
|
case 'Variable':
|
|
57
|
-
|
|
68
|
+
resultNode = transformVariableValue(program, node, inference, context);
|
|
69
|
+
break;
|
|
58
70
|
default:
|
|
59
71
|
return node.firstChild
|
|
60
72
|
? transformNode(program, node.firstChild, inference, context)
|
|
61
73
|
: undefined;
|
|
62
74
|
}
|
|
75
|
+
if (resultNode !== undefined)
|
|
76
|
+
inference.flatBody.push(resultNode);
|
|
77
|
+
return resultNode;
|
|
63
78
|
}
|
|
64
79
|
const VALID_STRING_DATE_BINARY_OPERATORS = ['=', '<>'];
|
|
65
80
|
function isValidStringDateBinaryOperation(logicOperator) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-parser.js","sourceRoot":"","sources":["../../../src/parser/json-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAa,MAAM,cAAc,CAAC;AACpE,OAAO,EACH,YAAY,EACZ,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,kBAAkB,GACrB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAE/D,MAAM,cAAc,GAAG,OAAO,CAAC;AAC/B,MAAM,SAAS,GAAG,WAAW,CAAC;AAE9B,MAAM,UAAU,YAAY,CACxB,OAAe,EACf,IAAU,EACV,OAAwB;;IAExB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;IAC/B,IAAI,CAAC,SAAS;QAAE,OAAO;IACvB,MAAM,YAAY,GAAG,yBAAyB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACnE,MAAM,SAAS,GAAG;QACd,SAAS,EAAE,YAAY;QACvB,gBAAgB,EAAE,EAAE;QACpB,gBAAgB,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"json-parser.js","sourceRoot":"","sources":["../../../src/parser/json-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export function columnTranspilation(engine, { value, context }, globalContext) {
|
|
|
6
6
|
[ENGINES.ELASTICSEARCH]: elasticsearch,
|
|
7
7
|
[ENGINES.SNOWFLAKE]: sql,
|
|
8
8
|
[ENGINES.REDSHIFT]: sql,
|
|
9
|
+
[ENGINES.POSTGRESQL]: sql,
|
|
9
10
|
};
|
|
10
11
|
const result = columnForEngine[engine](context, globalContext);
|
|
11
12
|
return { value: result, dataType: context.type, type: AST_TYPES.column };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columnTranspilation.js","sourceRoot":"","sources":["../../../src/transpiler/columnTranspilation.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,0BAA0B,EAC1B,cAAc,EACd,SAAS,EACT,OAAO,GACV,MAAM,cAAc,CAAC;AAQtB,MAAM,UAAU,mBAAmB,CAC/B,MAAe,EACf,EAAE,KAAK,EAAE,OAAO,EAAe,EAC/B,aAA8B;IAE9B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW;QAChC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC;IAC7C,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;
|
|
1
|
+
{"version":3,"file":"columnTranspilation.js","sourceRoot":"","sources":["../../../src/transpiler/columnTranspilation.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,0BAA0B,EAC1B,cAAc,EACd,SAAS,EACT,OAAO,GACV,MAAM,cAAc,CAAC;AAQtB,MAAM,UAAU,mBAAmB,CAC/B,MAAe,EACf,EAAE,KAAK,EAAE,OAAO,EAAe,EAC/B,aAA8B;IAE9B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW;QAChC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC;IAC7C,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;QACvB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG;KAC5B,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,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC;AAC7E,CAAC;AAED,SAAS,aAAa,CAClB,OAAkC,EAClC,aAA8B;IAE9B,MAAM,KAAK,GAAG,kBAAkB,OAAO,CAAC,WAAW,KAAK,CAAC;IACzD,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,cAAc,CAAC,IAAI,KAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAA,EAAE;QAClE,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customFunctions.js","sourceRoot":"","sources":["../../../src/utils/customFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EACH,mBAAmB,IAAI,iBAAiB,EACxC,MAAM,IAAI,QAAQ,EAClB,uBAAuB,IAAI,UAAU,GACxC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,OAAO,CAAC;AAE5C,MAAM,UAAU,cAAc,CAAC,MAAe,EAAE,IAAY;IACxD,QAAQ,MAAM,EAAE;QACZ,KAAK,OAAO,CAAC,aAAa;YACtB,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACnC;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAe;IAC1C,QAAQ,MAAM,EAAE;QACZ,KAAK,OAAO,CAAC,aAAa;YACtB,OAAO,QAAQ,CAAC;QACpB,KAAK,OAAO,CAAC,QAAQ,CAAC;QACtB,KAAK,OAAO,CAAC,SAAS;
|
|
1
|
+
{"version":3,"file":"customFunctions.js","sourceRoot":"","sources":["../../../src/utils/customFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EACH,mBAAmB,IAAI,iBAAiB,EACxC,MAAM,IAAI,QAAQ,EAClB,uBAAuB,IAAI,UAAU,GACxC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,OAAO,CAAC;AAE5C,MAAM,UAAU,cAAc,CAAC,MAAe,EAAE,IAAY;IACxD,QAAQ,MAAM,EAAE;QACZ,KAAK,OAAO,CAAC,aAAa;YACtB,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACnC;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAe;IAC1C,QAAQ,MAAM,EAAE;QACZ,KAAK,OAAO,CAAC,aAAa;YACtB,OAAO,QAAQ,CAAC;QACpB,KAAK,OAAO,CAAC,QAAQ,CAAC;QACtB,KAAK,OAAO,CAAC,SAAS,CAAC;QACvB,KAAK,OAAO,CAAC,UAAU;YACnB,OAAO,SAAS,CAAC;KACxB;AACL,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAe;IAC1C,QAAQ,MAAM,EAAE;QACZ,KAAK,OAAO,CAAC,aAAa;YACtB,OAAO,UAAU,CAAC;QACtB;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { DateDifUnitParam } from '../../constants/interfaces';
|
|
2
2
|
export declare function toDate(value: string): string;
|
|
3
3
|
export declare function dateDif(start: string, end: string, unit: DateDifUnitParam): string;
|
|
4
|
+
export declare function dateDifPostgres(start: string, end: string, unit: DateDifUnitParam): string;
|
|
@@ -10,26 +10,37 @@ function generalDateDif(start, end, unit) {
|
|
|
10
10
|
const currentUnit = units[unit];
|
|
11
11
|
return `DATEDIFF('${currentUnit}', ${start}, ${end})`;
|
|
12
12
|
}
|
|
13
|
-
function customDateDifYear(start, end) {
|
|
13
|
+
function customDateDifYear({ start, end, yearDif }) {
|
|
14
14
|
const customFun = (date) => {
|
|
15
15
|
return `EXTRACT(MONTH FROM ${date}) * 100 + EXTRACT(DAY FROM ${date})`;
|
|
16
16
|
};
|
|
17
17
|
const startComparison = customFun(start);
|
|
18
18
|
const endComparison = customFun(end);
|
|
19
|
-
const dateDifYear = generalDateDif(start, end, 'Y');
|
|
20
19
|
const result = `CASE
|
|
21
20
|
WHEN ${startComparison} <= ${endComparison}
|
|
22
|
-
THEN ${
|
|
23
|
-
ELSE ${
|
|
21
|
+
THEN ${yearDif}
|
|
22
|
+
ELSE ${yearDif} - 1
|
|
24
23
|
END`;
|
|
25
24
|
return result;
|
|
26
25
|
}
|
|
26
|
+
function commonSQLDifYear(start, end) {
|
|
27
|
+
const yearDif = generalDateDif(start, end, 'Y');
|
|
28
|
+
return customDateDifYear({ start, end, yearDif });
|
|
29
|
+
}
|
|
27
30
|
export function dateDif(start, end, unit) {
|
|
28
31
|
const units = {
|
|
29
|
-
Y:
|
|
32
|
+
Y: commonSQLDifYear,
|
|
30
33
|
M: generalDateDif,
|
|
31
34
|
D: generalDateDif,
|
|
32
35
|
};
|
|
33
36
|
return units[unit](start, end, unit);
|
|
34
37
|
}
|
|
38
|
+
export function dateDifPostgres(start, end, unit) {
|
|
39
|
+
if (unit === 'D')
|
|
40
|
+
return `DATE_PART('day', ${end} - ${start})`;
|
|
41
|
+
const yearDif = `DATE_PART('year', ${end}) - DATE_PART('year', ${start})`;
|
|
42
|
+
if (unit === 'M')
|
|
43
|
+
return `(${yearDif}) * 12 + (DATE_PART('month', ${end}) - DATE_PART('month', ${start}))`;
|
|
44
|
+
return customDateDifYear({ start, end, yearDif });
|
|
45
|
+
}
|
|
35
46
|
//# sourceMappingURL=scripts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/sql/scripts.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,iBAAiB,CAAC;AAC3C,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,
|
|
1
|
+
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/sql/scripts.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,iBAAiB,CAAC;AAC3C,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,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAA0B;IACtE,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE;QAC/B,OAAO,sBAAsB,IAAI,8BAA8B,IAAI,GAAG,CAAC;IAC3E,CAAC,CAAC;IACF,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG;eACJ,eAAe,OAAO,aAAa;mBAC/B,OAAO;eACX,OAAO;QACd,CAAC;IACL,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAa,EAAE,GAAW;IAChD,MAAM,OAAO,GAAG,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAChD,OAAO,iBAAiB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IACtE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,gBAAgB;QACnB,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;AAED,MAAM,UAAU,eAAe,CAC3B,KAAa,EACb,GAAW,EACX,IAAsB;IAEtB,IAAI,IAAI,KAAK,GAAG;QAAE,OAAO,oBAAoB,GAAG,MAAM,KAAK,GAAG,CAAC;IAC/D,MAAM,OAAO,GAAG,qBAAqB,GAAG,yBAAyB,KAAK,GAAG,CAAC;IAC1E,IAAI,IAAI,KAAK,GAAG;QACZ,OAAO,IAAI,OAAO,gCAAgC,GAAG,0BAA0B,KAAK,IAAI,CAAC;IAC7F,OAAO,iBAAiB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;AACtD,CAAC"}
|