@qrvey/formula-lang 2.0.1-rc.537 → 2.0.1-rc.542

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.
@@ -38,14 +38,14 @@ function elasticsearch(value, timeFormat) {
38
38
  function SQL(value, timeFormat) {
39
39
  if ((0, utils_1.removeQuotes)(timeFormat !== null && timeFormat !== void 0 ? timeFormat : '') === '12h') {
40
40
  return `(CASE
41
- WHEN DATE_PART(HOUR, ${value})::INTEGER % 12 = 0 THEN
41
+ WHEN DATE_PART('HOUR', ${value})::INTEGER % 12 = 0 THEN
42
42
  12
43
43
  ELSE
44
- DATE_PART(HOUR, ${value})::INTEGER % 12
44
+ DATE_PART('HOUR', ${value})::INTEGER % 12
45
45
  END)`;
46
46
  }
47
47
  else {
48
- return `DATE_PART('hour', ${value})`;
48
+ return `DATE_PART('HOUR', ${value})`;
49
49
  }
50
50
  }
51
51
  function snowflake(value, timeFormat) {
@@ -1 +1 @@
1
- {"version":3,"file":"hour.js","sourceRoot":"","sources":["../../../src/functions/hour.ts"],"names":[],"mappings":";;;AACA,4DAA4D;AAC5D,oCAAoE;AACpE,4CAA8C;AAC9C,gEAA6D;AAE7D;;GAEG;AACU,QAAA,IAAI,GAAuB;IACpC,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,IAAI;YACtC,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;QACD;YACI,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAa,EAAE,IAAA,mCAAgB,EAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;SAC/D;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,UAAmB;IACrD,OAAO,IAAA,oBAAU,EAAC,KAAK,EAAE,IAAA,oBAAY,EAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,UAAmB;IAC3C,IAAI,IAAA,oBAAY,EAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,KAAK,KAAK,EAAE;QAC1C,OAAO;mCACoB,KAAK;;;kCAGN,KAAK;eACxB,CAAC;KACX;SAAM;QACH,OAAO,qBAAqB,KAAK,GAAG,CAAC;KACxC;AACL,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,UAAmB;IACjD,OAAO,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,UAAmB;IAChD,OAAO,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,UAAmB;IAClD,OAAO,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC"}
1
+ {"version":3,"file":"hour.js","sourceRoot":"","sources":["../../../src/functions/hour.ts"],"names":[],"mappings":";;;AACA,4DAA4D;AAC5D,oCAAoE;AACpE,4CAA8C;AAC9C,gEAA6D;AAE7D;;GAEG;AACU,QAAA,IAAI,GAAuB;IACpC,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,IAAI;YACtC,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;QACD;YACI,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAa,EAAE,IAAA,mCAAgB,EAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;SAC/D;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,UAAmB;IACrD,OAAO,IAAA,oBAAU,EAAC,KAAK,EAAE,IAAA,oBAAY,EAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,UAAmB;IAC3C,IAAI,IAAA,oBAAY,EAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,KAAK,KAAK,EAAE;QAC1C,OAAO;qCACsB,KAAK;;;oCAGN,KAAK;eAC1B,CAAC;KACX;SAAM;QACH,OAAO,qBAAqB,KAAK,GAAG,CAAC;KACxC;AACL,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,UAAmB;IACjD,OAAO,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,UAAmB;IAChD,OAAO,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,UAAmB;IAClD,OAAO,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC"}
@@ -20,11 +20,14 @@ function validateFuncStructure(definition, args, node) {
20
20
  while (parameterIndex < parameters.length) {
21
21
  const parameter = parameters[parameterIndex];
22
22
  const { value, dataType } = (_a = args[argumentIndex]) !== null && _a !== void 0 ? _a : {};
23
- if ((0, isNull_1.isNull)(value) && parameter.optional) {
23
+ if ((0, isNull_1.isNull)(value) && (0, isNull_1.isNull)(dataType) && parameter.optional) {
24
24
  incrementCounter();
25
25
  continue;
26
26
  }
27
- if ((0, isNull_1.isNull)(value) && !parameter.optional) {
27
+ // Valid if the parameter is required or if it is optional but needs to be specified ex RIGHT("Text",)
28
+ if ((0, isNull_1.isNull)(value) &&
29
+ (!parameter.optional ||
30
+ (parameter.optional && dataType === constants_1.AST_PRIMITIVES.UNKNOWN))) {
28
31
  invalidValidator = true;
29
32
  hasMismatch = true;
30
33
  execValidators.push(Object.assign(Object.assign({ valid: false, source: constants_1.RESPONSE_LEVEL.function }, dictionary_1.ERROR_DICTIONARY[dictionary_1.ERROR_LIST.missingArg]), { parameter,
@@ -1 +1 @@
1
- {"version":3,"file":"validateFuncStructure.js","sourceRoot":"","sources":["../../../src/transpiler/validateFuncStructure.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validateFuncStructure.js","sourceRoot":"","sources":["../../../src/transpiler/validateFuncStructure.ts"],"names":[],"mappings":"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"}
@@ -35,14 +35,14 @@ function elasticsearch(value, timeFormat) {
35
35
  function SQL(value, timeFormat) {
36
36
  if (removeQuotes(timeFormat !== null && timeFormat !== void 0 ? timeFormat : '') === '12h') {
37
37
  return `(CASE
38
- WHEN DATE_PART(HOUR, ${value})::INTEGER % 12 = 0 THEN
38
+ WHEN DATE_PART('HOUR', ${value})::INTEGER % 12 = 0 THEN
39
39
  12
40
40
  ELSE
41
- DATE_PART(HOUR, ${value})::INTEGER % 12
41
+ DATE_PART('HOUR', ${value})::INTEGER % 12
42
42
  END)`;
43
43
  }
44
44
  else {
45
- return `DATE_PART('hour', ${value})`;
45
+ return `DATE_PART('HOUR', ${value})`;
46
46
  }
47
47
  }
48
48
  function snowflake(value, timeFormat) {
@@ -1 +1 @@
1
- {"version":3,"file":"hour.js","sourceRoot":"","sources":["../../../src/functions/hour.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D;;GAEG;AACH,MAAM,CAAC,MAAM,IAAI,GAAuB;IACpC,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,IAAI;YACtC,SAAS,EAAE,CAAC,WAAW,CAAC;SAC3B;QACD;YACI,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;SAC/D;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,UAAmB;IACrD,OAAO,UAAU,CAAC,KAAK,EAAE,YAAY,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,UAAmB;IAC3C,IAAI,YAAY,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,KAAK,KAAK,EAAE;QAC1C,OAAO;mCACoB,KAAK;;;kCAGN,KAAK;eACxB,CAAC;KACX;SAAM;QACH,OAAO,qBAAqB,KAAK,GAAG,CAAC;KACxC;AACL,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,UAAmB;IACjD,OAAO,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,UAAmB;IAChD,OAAO,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,UAAmB;IAClD,OAAO,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC"}
1
+ {"version":3,"file":"hour.js","sourceRoot":"","sources":["../../../src/functions/hour.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D;;GAEG;AACH,MAAM,CAAC,MAAM,IAAI,GAAuB;IACpC,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,IAAI;YACtC,SAAS,EAAE,CAAC,WAAW,CAAC;SAC3B;QACD;YACI,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;SAC/D;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;KACb;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa,EAAE,UAAmB;IACrD,OAAO,UAAU,CAAC,KAAK,EAAE,YAAY,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,UAAmB;IAC3C,IAAI,YAAY,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,KAAK,KAAK,EAAE;QAC1C,OAAO;qCACsB,KAAK;;;oCAGN,KAAK;eAC1B,CAAC;KACX;SAAM;QACH,OAAO,qBAAqB,KAAK,GAAG,CAAC;KACxC;AACL,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,UAAmB;IACjD,OAAO,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,UAAmB;IAChD,OAAO,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,UAAmB;IAClD,OAAO,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC"}
@@ -1,4 +1,4 @@
1
- import { RESPONSE_LEVEL } from '../constants';
1
+ import { AST_PRIMITIVES, RESPONSE_LEVEL } from '../constants';
2
2
  import { isNull } from '../utils/isNull';
3
3
  import { validateParameters, FunctionArgumentsMismatch, ArgumentValidatorError, } from '../errors';
4
4
  import { ERROR_DICTIONARY, ERROR_LIST } from '../errors/dictionary';
@@ -17,11 +17,14 @@ export function validateFuncStructure(definition, args, node) {
17
17
  while (parameterIndex < parameters.length) {
18
18
  const parameter = parameters[parameterIndex];
19
19
  const { value, dataType } = (_a = args[argumentIndex]) !== null && _a !== void 0 ? _a : {};
20
- if (isNull(value) && parameter.optional) {
20
+ if (isNull(value) && isNull(dataType) && parameter.optional) {
21
21
  incrementCounter();
22
22
  continue;
23
23
  }
24
- if (isNull(value) && !parameter.optional) {
24
+ // Valid if the parameter is required or if it is optional but needs to be specified ex RIGHT("Text",)
25
+ if (isNull(value) &&
26
+ (!parameter.optional ||
27
+ (parameter.optional && dataType === AST_PRIMITIVES.UNKNOWN))) {
25
28
  invalidValidator = true;
26
29
  hasMismatch = true;
27
30
  execValidators.push(Object.assign(Object.assign({ valid: false, source: RESPONSE_LEVEL.function }, ERROR_DICTIONARY[ERROR_LIST.missingArg]), { parameter,
@@ -1 +1 @@
1
- {"version":3,"file":"validateFuncStructure.js","sourceRoot":"","sources":["../../../src/transpiler/validateFuncStructure.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validateFuncStructure.js","sourceRoot":"","sources":["../../../src/transpiler/validateFuncStructure.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/formula-lang",
3
- "version": "2.0.1-rc.537",
3
+ "version": "2.0.1-rc.542",
4
4
  "description": "QFormula support for qrvey projects",
5
5
  "types": "dist/module/index.d.ts",
6
6
  "main": "dist/module/index.js",