@finos/legend-query-builder 4.17.97 → 4.17.99

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.
Files changed (93) hide show
  1. package/lib/components/explorer/QueryBuilderExplorerPanel.d.ts.map +1 -1
  2. package/lib/components/explorer/QueryBuilderExplorerPanel.js +13 -11
  3. package/lib/components/explorer/QueryBuilderExplorerPanel.js.map +1 -1
  4. package/lib/components/fetch-structure/QueryBuilderTDSComponentHelper.d.ts.map +1 -1
  5. package/lib/components/fetch-structure/QueryBuilderTDSComponentHelper.js +13 -11
  6. package/lib/components/fetch-structure/QueryBuilderTDSComponentHelper.js.map +1 -1
  7. package/lib/data-access-overview.css +1 -1
  8. package/lib/index.css +1 -1
  9. package/lib/package.json +1 -1
  10. package/lib/stores/QueryBuilderValueSpecificationHelper.d.ts +7 -0
  11. package/lib/stores/QueryBuilderValueSpecificationHelper.d.ts.map +1 -1
  12. package/lib/stores/QueryBuilderValueSpecificationHelper.js +31 -13
  13. package/lib/stores/QueryBuilderValueSpecificationHelper.js.map +1 -1
  14. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.d.ts.map +1 -1
  15. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.js +6 -4
  16. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.js.map +1 -1
  17. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.d.ts.map +1 -1
  18. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.js +6 -4
  19. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.js.map +1 -1
  20. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.d.ts.map +1 -1
  21. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.js +14 -12
  22. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.js.map +1 -1
  23. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.d.ts.map +1 -1
  24. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.js +12 -10
  25. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.js.map +1 -1
  26. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.d.ts.map +1 -1
  27. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.js +10 -8
  28. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.js.map +1 -1
  29. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.d.ts.map +1 -1
  30. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.js +4 -2
  31. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.js.map +1 -1
  32. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.d.ts.map +1 -1
  33. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.js +12 -10
  34. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.js.map +1 -1
  35. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.d.ts.map +1 -1
  36. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.js +6 -4
  37. package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.js.map +1 -1
  38. package/lib/stores/filter/operators/QueryBuilderFilterOperator_Contain.d.ts.map +1 -1
  39. package/lib/stores/filter/operators/QueryBuilderFilterOperator_Contain.js +6 -6
  40. package/lib/stores/filter/operators/QueryBuilderFilterOperator_Contain.js.map +1 -1
  41. package/lib/stores/filter/operators/QueryBuilderFilterOperator_EndWith.d.ts.map +1 -1
  42. package/lib/stores/filter/operators/QueryBuilderFilterOperator_EndWith.js +6 -6
  43. package/lib/stores/filter/operators/QueryBuilderFilterOperator_EndWith.js.map +1 -1
  44. package/lib/stores/filter/operators/QueryBuilderFilterOperator_Equal.d.ts.map +1 -1
  45. package/lib/stores/filter/operators/QueryBuilderFilterOperator_Equal.js +14 -12
  46. package/lib/stores/filter/operators/QueryBuilderFilterOperator_Equal.js.map +1 -1
  47. package/lib/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.d.ts.map +1 -1
  48. package/lib/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.js +12 -10
  49. package/lib/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.js.map +1 -1
  50. package/lib/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.d.ts.map +1 -1
  51. package/lib/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.js +12 -10
  52. package/lib/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.js.map +1 -1
  53. package/lib/stores/filter/operators/QueryBuilderFilterOperator_In.d.ts.map +1 -1
  54. package/lib/stores/filter/operators/QueryBuilderFilterOperator_In.js +17 -13
  55. package/lib/stores/filter/operators/QueryBuilderFilterOperator_In.js.map +1 -1
  56. package/lib/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.d.ts.map +1 -1
  57. package/lib/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.js +3 -2
  58. package/lib/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.js.map +1 -1
  59. package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThan.d.ts.map +1 -1
  60. package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThan.js +12 -10
  61. package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThan.js.map +1 -1
  62. package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.d.ts.map +1 -1
  63. package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.js +12 -10
  64. package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.js.map +1 -1
  65. package/lib/stores/filter/operators/QueryBuilderFilterOperator_StartWith.d.ts.map +1 -1
  66. package/lib/stores/filter/operators/QueryBuilderFilterOperator_StartWith.js +6 -6
  67. package/lib/stores/filter/operators/QueryBuilderFilterOperator_StartWith.js.map +1 -1
  68. package/lib/stores/shared/ValueSpecificationEditorHelper.d.ts.map +1 -1
  69. package/lib/stores/shared/ValueSpecificationEditorHelper.js +3 -2
  70. package/lib/stores/shared/ValueSpecificationEditorHelper.js.map +1 -1
  71. package/package.json +6 -6
  72. package/src/components/explorer/QueryBuilderExplorerPanel.tsx +13 -10
  73. package/src/components/fetch-structure/QueryBuilderTDSComponentHelper.tsx +13 -10
  74. package/src/stores/QueryBuilderValueSpecificationHelper.ts +35 -10
  75. package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts +5 -3
  76. package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts +5 -3
  77. package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts +16 -13
  78. package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts +18 -11
  79. package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.ts +12 -9
  80. package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.ts +6 -1
  81. package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts +18 -11
  82. package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts +5 -3
  83. package/src/stores/filter/operators/QueryBuilderFilterOperator_Contain.ts +9 -5
  84. package/src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts +9 -5
  85. package/src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts +16 -13
  86. package/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts +18 -11
  87. package/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts +18 -11
  88. package/src/stores/filter/operators/QueryBuilderFilterOperator_In.ts +23 -14
  89. package/src/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.ts +3 -1
  90. package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts +18 -11
  91. package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts +18 -11
  92. package/src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts +9 -5
  93. package/src/stores/shared/ValueSpecificationEditorHelper.ts +6 -2
@@ -17,7 +17,7 @@ import { AbstractPropertyExpression, PRIMITIVE_TYPE, PrimitiveType, } from '@fin
17
17
  import { guaranteeNonNullable, hashArray, UnsupportedOperationError, } from '@finos/legend-shared';
18
18
  import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
19
19
  import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
20
- import { isTypeCompatibleForAssignment } from '../../../../QueryBuilderValueSpecificationHelper.js';
20
+ import { getStandardPrimitiveTypeEquivalent, isTypeCompatibleForAssignment, } from '../../../../QueryBuilderValueSpecificationHelper.js';
21
21
  import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
22
22
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
23
23
  import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
@@ -27,15 +27,17 @@ export class QueryBuilderPostFilterOperator_GreaterThan extends QueryBuilderPost
27
27
  return '>';
28
28
  }
29
29
  isCompatibleWithType(type) {
30
- return [
31
- PRIMITIVE_TYPE.NUMBER,
32
- PRIMITIVE_TYPE.INTEGER,
33
- PRIMITIVE_TYPE.DECIMAL,
34
- PRIMITIVE_TYPE.FLOAT,
35
- PRIMITIVE_TYPE.DATE,
36
- PRIMITIVE_TYPE.STRICTDATE,
37
- PRIMITIVE_TYPE.DATETIME,
38
- ].includes(type.path);
30
+ const normalizedType = getStandardPrimitiveTypeEquivalent(type);
31
+ return (normalizedType !== undefined &&
32
+ [
33
+ PRIMITIVE_TYPE.NUMBER,
34
+ PRIMITIVE_TYPE.INTEGER,
35
+ PRIMITIVE_TYPE.DECIMAL,
36
+ PRIMITIVE_TYPE.FLOAT,
37
+ PRIMITIVE_TYPE.DATE,
38
+ PRIMITIVE_TYPE.STRICTDATE,
39
+ PRIMITIVE_TYPE.DATETIME,
40
+ ].includes(normalizedType));
39
41
  }
40
42
  isCompatibleWithConditionValue(postFilterConditionState) {
41
43
  return isTypeCompatibleForAssignment(!postFilterConditionState.rightConditionValue.isCollection
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThan.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThan.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderPostFilterOperator_In.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,cAAc,EAQpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,2BAA2B,EACjC,MAAM,mCAAmC,CAAC;AAU3C,qBAAa,iCACX,SAAQ,8BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAgBzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAmDV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IAUrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,EAClD,gBAAgB,EAAE,cAAc,GAAG,SAAS,GAC3C,kBAAkB,GAAG,SAAS;IASjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IASvC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,oCAAqC,SAAQ,iCAAiC;IAChF,QAAQ,IAAI,MAAM;IAIlB,kCAAkC,CACzC,wBAAwB,EAAE,wBAAwB,EAClD,gBAAgB,EAAE,cAAc,GAAG,SAAS,GAC3C,kBAAkB,GAAG,SAAS;IAQxB,6BAA6B,CACpC,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,wBAAwB,GACnC,wBAAwB,GAAG,SAAS;IAOvC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
1
+ {"version":3,"file":"QueryBuilderPostFilterOperator_In.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,cAAc,EAQpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,2BAA2B,EACjC,MAAM,mCAAmC,CAAC;AAW3C,qBAAa,iCACX,SAAQ,8BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAkBzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAmDV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IAUrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,EAClD,gBAAgB,EAAE,cAAc,GAAG,SAAS,GAC3C,kBAAkB,GAAG,SAAS;IASjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IASvC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,oCAAqC,SAAQ,iCAAiC;IAChF,QAAQ,IAAI,MAAM;IAIlB,kCAAkC,CACzC,wBAAwB,EAAE,wBAAwB,EAClD,gBAAgB,EAAE,cAAc,GAAG,SAAS,GAC3C,kBAAkB,GAAG,SAAS;IAQxB,6BAA6B,CACpC,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,wBAAwB,GACnC,wBAAwB,GAAG,SAAS;IAOvC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
@@ -19,7 +19,7 @@ import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperato
19
19
  import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
20
20
  import { PostFilterValueSpecConditionValueState, } from '../QueryBuilderPostFilterState.js';
21
21
  import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
22
- import { buildNotExpression, getCollectionValueSpecificationType, unwrapNotExpression, } from '../../../../QueryBuilderValueSpecificationHelper.js';
22
+ import { buildNotExpression, getCollectionValueSpecificationType, getStandardPrimitiveTypeEquivalent, unwrapNotExpression, } from '../../../../QueryBuilderValueSpecificationHelper.js';
23
23
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
24
24
  import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
25
25
  export class QueryBuilderPostFilterOperator_In extends QueryBuilderPostFilterOperator {
@@ -27,13 +27,15 @@ export class QueryBuilderPostFilterOperator_In extends QueryBuilderPostFilterOpe
27
27
  return 'is in list of';
28
28
  }
29
29
  isCompatibleWithType(type) {
30
- return ([
31
- PRIMITIVE_TYPE.STRING,
32
- PRIMITIVE_TYPE.NUMBER,
33
- PRIMITIVE_TYPE.INTEGER,
34
- PRIMITIVE_TYPE.DECIMAL,
35
- PRIMITIVE_TYPE.FLOAT,
36
- ].includes(type.path) ||
30
+ const normalizedType = getStandardPrimitiveTypeEquivalent(type);
31
+ return ((normalizedType !== undefined &&
32
+ [
33
+ PRIMITIVE_TYPE.STRING,
34
+ PRIMITIVE_TYPE.NUMBER,
35
+ PRIMITIVE_TYPE.INTEGER,
36
+ PRIMITIVE_TYPE.DECIMAL,
37
+ PRIMITIVE_TYPE.FLOAT,
38
+ ].includes(normalizedType)) ||
37
39
  // TODO: do we care if the enumeration type has no value (like in the case of `==` operator)?
38
40
  type instanceof Enumeration);
39
41
  }
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderPostFilterOperator_In.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryBuilderPostFilterOperator_In.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderPostFilterOperator_IsEmpty.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EAGpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,2BAA2B,EAEjC,MAAM,mCAAmC,CAAC;AAI3C,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAEvF,qBAAa,sCACX,SAAQ,8BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIT,kBAAkB,IAAI,iBAAiB,GAAG,SAAS;IAI5D,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAIzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAWD,gCAAgC,CACvC,eAAe,EAAE,wBAAwB,GACxC,OAAO;IAiBV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAIjC,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,EAClD,gBAAgB,EAAE,cAAc,GAAG,SAAS,GAC3C,kBAAkB,GAAG,SAAS;IASjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IASvC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,yCAA0C,SAAQ,sCAAsC;IAC1F,QAAQ,IAAI,MAAM;IAIlB,kBAAkB,IAAI,iBAAiB,GAAG,SAAS;IAI5D,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
1
+ {"version":3,"file":"QueryBuilderPostFilterOperator_IsEmpty.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EAIpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,2BAA2B,EAEjC,MAAM,mCAAmC,CAAC;AAI3C,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAEvF,qBAAa,sCACX,SAAQ,8BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIT,kBAAkB,IAAI,iBAAiB,GAAG,SAAS;IAI5D,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAQzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAWD,gCAAgC,CACvC,eAAe,EAAE,wBAAwB,GACxC,OAAO;IAiBV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAIjC,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,EAClD,gBAAgB,EAAE,cAAc,GAAG,SAAS,GAC3C,kBAAkB,GAAG,SAAS;IASjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IASvC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,yCAA0C,SAAQ,sCAAsC;IAC1F,QAAQ,IAAI,MAAM;IAIlB,kBAAkB,IAAI,iBAAiB,GAAG,SAAS;IAI5D,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
@@ -13,7 +13,7 @@
13
13
  * See the License for the specific language governing permissions and
14
14
  * limitations under the License.
15
15
  */
16
- import { Enumeration, PrimitiveType, } from '@finos/legend-graph';
16
+ import { Enumeration, PrimitiveType, PrecisePrimitiveType, } from '@finos/legend-graph';
17
17
  import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
18
18
  import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
19
19
  import { PostFilterValueSpecConditionValueState, } from '../QueryBuilderPostFilterState.js';
@@ -31,7 +31,9 @@ export class QueryBuilderPostFilterOperator_IsEmpty extends QueryBuilderPostFilt
31
31
  return TDS_COLUMN_GETTER.IS_NULL;
32
32
  }
33
33
  isCompatibleWithType(type) {
34
- return type instanceof PrimitiveType || type instanceof Enumeration;
34
+ return (type instanceof PrimitiveType ||
35
+ type instanceof PrecisePrimitiveType ||
36
+ type instanceof Enumeration);
35
37
  }
36
38
  isCompatibleWithConditionValue(postFilterConditionState) {
37
39
  if (postFilterConditionState.rightConditionValue instanceof
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderPostFilterOperator_IsEmpty.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAKL,WAAW,EACX,aAAa,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AACzF,OAAO,EAGL,sCAAsC,GACvC,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,uCAAuC,EAAE,MAAM,uDAAuD,CAAC;AAChH,OAAO,EAAE,wCAAwC,EAAE,MAAM,8DAA8D,CAAC;AACxH,OAAO,EAAE,iCAAiC,EAAE,MAAM,qDAAqD,CAAC;AACxG,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,kCAAkC,EAAE,MAAM,2CAA2C,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAEvF,MAAM,OAAO,sCACX,SAAQ,8BAA8B;IAGtC,QAAQ;QACN,OAAO,UAAU,CAAC;IACpB,CAAC;IAEQ,kBAAkB;QACzB,OAAO,iBAAiB,CAAC,OAAO,CAAC;IACnC,CAAC;IAED,oBAAoB,CAAC,IAAU;QAC7B,OAAO,IAAI,YAAY,aAAa,IAAI,IAAI,YAAY,WAAW,CAAC;IACtE,CAAC;IAED,8BAA8B,CAC5B,wBAAkD;QAElD,IACE,wBAAwB,CAAC,mBAAmB;YAC1C,sCAAsC;YACxC,wBAAwB,CAAC,mBAAmB,CAAC,KAAK,KAAK,SAAS,EAChE,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEQ,gCAAgC,CACvC,eAAyC;QAEzC,MAAM,UAAU,GAAG,eAAe,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC;QACtE,IAAI,UAAU,IAAI,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC;YACxD,IACE,eAAe,CAAC,kBAAkB;gBAClC,uCAAuC,EACvC,CAAC;gBACD,OAAO,iCAAiC,CACtC,eAAe,CAAC,kBAAkB,CAAC,uBAAuB;qBACvD,kBAAkB,CACtB,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,8BAA8B,CAC5B,wBAAkD;QAElD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,kCAAkC,CAChC,wBAAkD,EAClD,gBAA4C;QAE5C,OAAO,wCAAwC,CAC7C,wBAAwB,EACxB,IAAI,EACJ,SAAS,EACT,gBAAgB,CACjB,CAAC;IACJ,CAAC;IAED,6BAA6B,CAC3B,eAA4C,EAC5C,UAA8B;QAE9B,OAAO,6BAA6B,CAClC,eAAe,EACf,UAAU,EACV,SAAS,EACT,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,6BAA6B;SACjE,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,yCAA0C,SAAQ,sCAAsC;IAC1F,QAAQ;QACf,OAAO,cAAc,CAAC;IACxB,CAAC;IAEQ,kBAAkB;QACzB,OAAO,iBAAiB,CAAC,WAAW,CAAC;IACvC,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,iCAAiC;SACrE,CAAC,CAAC;IACL,CAAC;CACF"}
1
+ {"version":3,"file":"QueryBuilderPostFilterOperator_IsEmpty.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAKL,WAAW,EACX,aAAa,EACb,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AACzF,OAAO,EAGL,sCAAsC,GACvC,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,uCAAuC,EAAE,MAAM,uDAAuD,CAAC;AAChH,OAAO,EAAE,wCAAwC,EAAE,MAAM,8DAA8D,CAAC;AACxH,OAAO,EAAE,iCAAiC,EAAE,MAAM,qDAAqD,CAAC;AACxG,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,kCAAkC,EAAE,MAAM,2CAA2C,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAEvF,MAAM,OAAO,sCACX,SAAQ,8BAA8B;IAGtC,QAAQ;QACN,OAAO,UAAU,CAAC;IACpB,CAAC;IAEQ,kBAAkB;QACzB,OAAO,iBAAiB,CAAC,OAAO,CAAC;IACnC,CAAC;IAED,oBAAoB,CAAC,IAAU;QAC7B,OAAO,CACL,IAAI,YAAY,aAAa;YAC7B,IAAI,YAAY,oBAAoB;YACpC,IAAI,YAAY,WAAW,CAC5B,CAAC;IACJ,CAAC;IAED,8BAA8B,CAC5B,wBAAkD;QAElD,IACE,wBAAwB,CAAC,mBAAmB;YAC1C,sCAAsC;YACxC,wBAAwB,CAAC,mBAAmB,CAAC,KAAK,KAAK,SAAS,EAChE,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEQ,gCAAgC,CACvC,eAAyC;QAEzC,MAAM,UAAU,GAAG,eAAe,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC;QACtE,IAAI,UAAU,IAAI,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC;YACxD,IACE,eAAe,CAAC,kBAAkB;gBAClC,uCAAuC,EACvC,CAAC;gBACD,OAAO,iCAAiC,CACtC,eAAe,CAAC,kBAAkB,CAAC,uBAAuB;qBACvD,kBAAkB,CACtB,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,8BAA8B,CAC5B,wBAAkD;QAElD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,kCAAkC,CAChC,wBAAkD,EAClD,gBAA4C;QAE5C,OAAO,wCAAwC,CAC7C,wBAAwB,EACxB,IAAI,EACJ,SAAS,EACT,gBAAgB,CACjB,CAAC;IACJ,CAAC;IAED,6BAA6B,CAC3B,eAA4C,EAC5C,UAA8B;QAE9B,OAAO,6BAA6B,CAClC,eAAe,EACf,UAAU,EACV,SAAS,EACT,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,6BAA6B;SACjE,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,yCAA0C,SAAQ,sCAAsC;IAC1F,QAAQ;QACf,OAAO,cAAc,CAAC;IACxB,CAAC;IAEQ,kBAAkB;QACzB,OAAO,iBAAiB,CAAC,WAAW,CAAC;IACvC,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,iCAAiC;SACrE,CAAC,CAAC;IACL,CAAC;CACF"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderPostFilterOperator_LessThan.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EAEvB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EAGpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAO3C,qBAAa,uCACX,SAAQ,8BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAczC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAWV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IA4BrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,EAClD,gBAAgB,EAAE,cAAc,GAAG,SAAS,GAC3C,kBAAkB,GAAG,SAAS;IAcjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IAevC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
1
+ {"version":3,"file":"QueryBuilderPostFilterOperator_LessThan.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EAEvB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EAGpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAU3C,qBAAa,uCACX,SAAQ,8BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAkBzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAWV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IA4BrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,EAClD,gBAAgB,EAAE,cAAc,GAAG,SAAS,GAC3C,kBAAkB,GAAG,SAAS;IAcjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IAevC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
@@ -17,7 +17,7 @@ import { AbstractPropertyExpression, PRIMITIVE_TYPE, PrimitiveType, } from '@fin
17
17
  import { guaranteeNonNullable, hashArray, UnsupportedOperationError, } from '@finos/legend-shared';
18
18
  import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
19
19
  import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
20
- import { isTypeCompatibleForAssignment } from '../../../../QueryBuilderValueSpecificationHelper.js';
20
+ import { getStandardPrimitiveTypeEquivalent, isTypeCompatibleForAssignment, } from '../../../../QueryBuilderValueSpecificationHelper.js';
21
21
  import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
22
22
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
23
23
  import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
@@ -27,15 +27,17 @@ export class QueryBuilderPostFilterOperator_LessThan extends QueryBuilderPostFil
27
27
  return '<';
28
28
  }
29
29
  isCompatibleWithType(type) {
30
- return [
31
- PRIMITIVE_TYPE.NUMBER,
32
- PRIMITIVE_TYPE.INTEGER,
33
- PRIMITIVE_TYPE.DECIMAL,
34
- PRIMITIVE_TYPE.FLOAT,
35
- PRIMITIVE_TYPE.DATE,
36
- PRIMITIVE_TYPE.STRICTDATE,
37
- PRIMITIVE_TYPE.DATETIME,
38
- ].includes(type.path);
30
+ const normalizedType = getStandardPrimitiveTypeEquivalent(type);
31
+ return (normalizedType !== undefined &&
32
+ [
33
+ PRIMITIVE_TYPE.NUMBER,
34
+ PRIMITIVE_TYPE.INTEGER,
35
+ PRIMITIVE_TYPE.DECIMAL,
36
+ PRIMITIVE_TYPE.FLOAT,
37
+ PRIMITIVE_TYPE.DATE,
38
+ PRIMITIVE_TYPE.STRICTDATE,
39
+ PRIMITIVE_TYPE.DATETIME,
40
+ ].includes(normalizedType));
39
41
  }
40
42
  isCompatibleWithConditionValue(postFilterConditionState) {
41
43
  return isTypeCompatibleForAssignment(!postFilterConditionState.rightConditionValue.isCollection
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderPostFilterOperator_LessThan.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryBuilderPostFilterOperator_LessThan.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderPostFilterOperator_StartWith.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,cAAc,EAGpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAU3C,qBAAa,wCACX,SAAQ,8BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAIzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAOV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IAsBrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,EAClD,gBAAgB,EAAE,cAAc,GAAG,SAAS,GAC3C,kBAAkB,GAAG,SAAS;IASjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IASvC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AACD,qBAAa,2CACX,SAAQ,wCACR,YAAW,QAAQ;IAEV,QAAQ,IAAI,MAAM;IAIlB,kCAAkC,CACzC,wBAAwB,EAAE,wBAAwB,EAClD,gBAAgB,EAAE,cAAc,GAAG,SAAS,GAC3C,kBAAkB,GAAG,SAAS;IAQxB,6BAA6B,CACpC,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,wBAAwB,GACnC,wBAAwB,GAAG,SAAS;IAOvC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
1
+ {"version":3,"file":"QueryBuilderPostFilterOperator_StartWith.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,KAAK,cAAc,EAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAW3C,qBAAa,wCACX,SAAQ,8BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAIzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IASV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IAsBrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,EAClD,gBAAgB,EAAE,cAAc,GAAG,SAAS,GAC3C,kBAAkB,GAAG,SAAS;IASjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IASvC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AACD,qBAAa,2CACX,SAAQ,wCACR,YAAW,QAAQ;IAEV,QAAQ,IAAI,MAAM;IAIlB,kCAAkC,CACzC,wBAAwB,EAAE,wBAAwB,EAClD,gBAAgB,EAAE,cAAc,GAAG,SAAS,GAC3C,kBAAkB,GAAG,SAAS;IAQxB,6BAA6B,CACpC,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,wBAAwB,GACnC,wBAAwB,GAAG,SAAS;IAOvC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
@@ -13,11 +13,11 @@
13
13
  * See the License for the specific language governing permissions and
14
14
  * limitations under the License.
15
15
  */
16
- import { PRIMITIVE_TYPE, PrimitiveType, } from '@finos/legend-graph';
16
+ import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
17
17
  import { hashArray, UnsupportedOperationError, } from '@finos/legend-shared';
18
18
  import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
19
19
  import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
20
- import { buildNotExpression, unwrapNotExpression, } from '../../../../QueryBuilderValueSpecificationHelper.js';
20
+ import { buildNotExpression, getStandardPrimitiveTypeEquivalent, unwrapNotExpression, } from '../../../../QueryBuilderValueSpecificationHelper.js';
21
21
  import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
22
22
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
23
23
  import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
@@ -27,11 +27,13 @@ export class QueryBuilderPostFilterOperator_StartWith extends QueryBuilderPostFi
27
27
  return 'starts with';
28
28
  }
29
29
  isCompatibleWithType(type) {
30
- return PrimitiveType.STRING === type;
30
+ return getStandardPrimitiveTypeEquivalent(type) === PRIMITIVE_TYPE.STRING;
31
31
  }
32
32
  isCompatibleWithConditionValue(postFilterConditionState) {
33
+ const rhsType = postFilterConditionState.rightConditionValue.type;
33
34
  return (!postFilterConditionState.rightConditionValue.isCollection &&
34
- PrimitiveType.STRING === postFilterConditionState.rightConditionValue.type);
35
+ rhsType !== undefined &&
36
+ getStandardPrimitiveTypeEquivalent(rhsType) === PRIMITIVE_TYPE.STRING);
35
37
  }
36
38
  getDefaultFilterConditionValue(postFilterConditionState) {
37
39
  const propertyType = postFilterConditionState.leftConditionValue.getColumnType();
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderPostFilterOperator_StartWith.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryBuilderPostFilterOperator_StartWith.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_Contain.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_Contain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAE9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAa9B,qBAAa,kCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAQV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IASV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAsBjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAQrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IASnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,qCAAsC,SAAQ,kCAAkC;IAClF,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_Contain.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_Contain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAc9B,qBAAa,kCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IASV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAYV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAsBjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAQrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IASnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,qCAAsC,SAAQ,kCAAkC;IAClF,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
@@ -14,10 +14,10 @@
14
14
  * limitations under the License.
15
15
  */
16
16
  import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
17
- import { PRIMITIVE_TYPE, PrimitiveType, } from '@finos/legend-graph';
17
+ import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
18
18
  import { hashArray, UnsupportedOperationError, } from '@finos/legend-shared';
19
19
  import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
20
- import { buildNotExpression, unwrapNotExpression, } from '../../QueryBuilderValueSpecificationHelper.js';
20
+ import { buildNotExpression, getStandardPrimitiveTypeEquivalent, unwrapNotExpression, } from '../../QueryBuilderValueSpecificationHelper.js';
21
21
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
22
22
  import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
23
23
  import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
@@ -26,16 +26,16 @@ export class QueryBuilderFilterOperator_Contain extends QueryBuilderFilterOperat
26
26
  return 'contains';
27
27
  }
28
28
  isCompatibleWithFilterConditionProperty(filterConditionState) {
29
- return (PrimitiveType.STRING ===
30
- filterConditionState.propertyExpressionState.propertyExpression.func.value
31
- .genericType.value.rawType);
29
+ return (getStandardPrimitiveTypeEquivalent(filterConditionState.propertyExpressionState.propertyExpression.func
30
+ .value.genericType.value.rawType) === PRIMITIVE_TYPE.STRING);
32
31
  }
33
32
  isCompatibleWithFilterConditionValue(filterConditionState) {
34
33
  const type = filterConditionState.rightConditionValue &&
35
34
  !filterConditionState.rightConditionValue.isCollection
36
35
  ? filterConditionState.rightConditionValue.type
37
36
  : undefined;
38
- return PrimitiveType.STRING === type;
37
+ return (type !== undefined &&
38
+ getStandardPrimitiveTypeEquivalent(type) === PRIMITIVE_TYPE.STRING);
39
39
  }
40
40
  getDefaultFilterConditionValue(filterConditionState) {
41
41
  const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_Contain.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_Contain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,cAAc,EAGd,aAAa,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,SAAS,EACT,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,0DAA0D,CAAC;AAClE,OAAO,EACL,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAE3F,MAAM,OAAO,kCACX,SAAQ,0BAA0B;IAGlC,QAAQ;QACN,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,OAAO,CACL,aAAa,CAAC,MAAM;YACpB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK;iBACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAC7B,CAAC;IACJ,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,MAAM,IAAI,GACR,oBAAoB,CAAC,mBAAmB;YACxC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,YAAY;YACpD,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,IAAI;YAC/C,CAAC,CAAC,SAAS,CAAC;QAChB,OAAO,aAAa,CAAC,MAAM,KAAK,IAAI,CAAC;IACvC,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,MAAM,YAAY,GAChB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK;aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,QAAQ,YAAY,CAAC,IAAI,EAAE,CAAC;YAC1B,KAAK,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC3B,OAAO,yBAAyB,CAC9B,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;qBACjE,KAAK,EACR,YAAY,EACZ,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,eAAe,EAClE,oBAAoB,CAAC,WAAW,CAAC,iBAAiB;qBAC/C,wDAAwD,CAC5D,CAAC;YACJ,CAAC;YACD;gBACE,MAAM,IAAI,yBAAyB,CACjC,gDAAgD,IAAI,CAAC,QAAQ,EAAE,uCAAuC,YAAY,CAAC,IAAI,GAAG,CAC3H,CAAC;QACN,CAAC;IACH,CAAC;IAED,8BAA8B,CAC5B,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,iCAAiC,CAAC,QAAQ,EAC1C,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,QAAQ,EAC1C,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,uBAAuB;SAC3D,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,qCAAsC,SAAQ,kCAAkC;IAClF,QAAQ;QACf,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEQ,8BAA8B,CACrC,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,kBAAkB,CACvB,KAAK,CAAC,8BAA8B,CAClC,oBAAoB,EACpB,mBAAmB,CACpB,CACF,CAAC;IACJ,CAAC;IAEQ,yBAAyB,CAChC,WAAoC,EACpC,UAAoC;QAEpC,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACxD,OAAO,eAAe;YACpB,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,WAAW,EAAE,eAAe,CAAC;YAC/D,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,2BAA2B;SAC/D,CAAC,CAAC;IACL,CAAC;CACF"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_Contain.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_Contain.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_EndWith.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAE9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAa9B,qBAAa,kCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAQV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IASV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAsBjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAQrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IASnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,qCAAsC,SAAQ,kCAAkC;IAClF,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_EndWith.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAc9B,qBAAa,kCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IASV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAYV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAsBjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAQrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IASnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,qCAAsC,SAAQ,kCAAkC;IAClF,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
@@ -14,10 +14,10 @@
14
14
  * limitations under the License.
15
15
  */
16
16
  import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
17
- import { PRIMITIVE_TYPE, PrimitiveType, } from '@finos/legend-graph';
17
+ import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
18
18
  import { hashArray, UnsupportedOperationError, } from '@finos/legend-shared';
19
19
  import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
20
- import { buildNotExpression, unwrapNotExpression, } from '../../QueryBuilderValueSpecificationHelper.js';
20
+ import { buildNotExpression, getStandardPrimitiveTypeEquivalent, unwrapNotExpression, } from '../../QueryBuilderValueSpecificationHelper.js';
21
21
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
22
22
  import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
23
23
  import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
@@ -26,16 +26,16 @@ export class QueryBuilderFilterOperator_EndWith extends QueryBuilderFilterOperat
26
26
  return 'ends with';
27
27
  }
28
28
  isCompatibleWithFilterConditionProperty(filterConditionState) {
29
- return (PrimitiveType.STRING ===
30
- filterConditionState.propertyExpressionState.propertyExpression.func.value
31
- .genericType.value.rawType);
29
+ return (getStandardPrimitiveTypeEquivalent(filterConditionState.propertyExpressionState.propertyExpression.func
30
+ .value.genericType.value.rawType) === PRIMITIVE_TYPE.STRING);
32
31
  }
33
32
  isCompatibleWithFilterConditionValue(filterConditionState) {
34
33
  const type = filterConditionState.rightConditionValue &&
35
34
  !filterConditionState.rightConditionValue.isCollection
36
35
  ? filterConditionState.rightConditionValue.type
37
36
  : undefined;
38
- return PrimitiveType.STRING === type;
37
+ return (type !== undefined &&
38
+ getStandardPrimitiveTypeEquivalent(type) === PRIMITIVE_TYPE.STRING);
39
39
  }
40
40
  getDefaultFilterConditionValue(filterConditionState) {
41
41
  const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_EndWith.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_EndWith.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_Equal.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAI9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAchE,qBAAa,gCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAuBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAWV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAcjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAarB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,mCAAoC,SAAQ,gCAAgC;IAC9E,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_Equal.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAI9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAehE,qBAAa,gCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAyBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAWV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAcjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAarB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,mCAAoC,SAAQ,gCAAgC;IAC9E,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
@@ -18,7 +18,7 @@ import { Enumeration, PRIMITIVE_TYPE, } from '@finos/legend-graph';
18
18
  import { hashArray } from '@finos/legend-shared';
19
19
  import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
20
20
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
21
- import { buildNotExpression, isTypeCompatibleForAssignment, unwrapNotExpression, } from '../../QueryBuilderValueSpecificationHelper.js';
21
+ import { buildNotExpression, getStandardPrimitiveTypeEquivalent, isTypeCompatibleForAssignment, unwrapNotExpression, } from '../../QueryBuilderValueSpecificationHelper.js';
22
22
  import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
23
23
  import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
24
24
  export class QueryBuilderFilterOperator_Equal extends QueryBuilderFilterOperator {
@@ -28,17 +28,19 @@ export class QueryBuilderFilterOperator_Equal extends QueryBuilderFilterOperator
28
28
  isCompatibleWithFilterConditionProperty(filterConditionState) {
29
29
  const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
30
30
  .genericType.value.rawType;
31
- return ([
32
- PRIMITIVE_TYPE.STRING,
33
- PRIMITIVE_TYPE.BOOLEAN,
34
- PRIMITIVE_TYPE.NUMBER,
35
- PRIMITIVE_TYPE.INTEGER,
36
- PRIMITIVE_TYPE.DECIMAL,
37
- PRIMITIVE_TYPE.FLOAT,
38
- PRIMITIVE_TYPE.DATE,
39
- PRIMITIVE_TYPE.STRICTDATE,
40
- PRIMITIVE_TYPE.DATETIME,
41
- ].includes(propertyType.path) ||
31
+ const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
32
+ return ((normalizedType !== undefined &&
33
+ [
34
+ PRIMITIVE_TYPE.STRING,
35
+ PRIMITIVE_TYPE.BOOLEAN,
36
+ PRIMITIVE_TYPE.NUMBER,
37
+ PRIMITIVE_TYPE.INTEGER,
38
+ PRIMITIVE_TYPE.DECIMAL,
39
+ PRIMITIVE_TYPE.FLOAT,
40
+ PRIMITIVE_TYPE.DATE,
41
+ PRIMITIVE_TYPE.STRICTDATE,
42
+ PRIMITIVE_TYPE.DATETIME,
43
+ ].includes(normalizedType)) ||
42
44
  // if the type is enumeration, make sure the enumeration has some value
43
45
  (propertyType instanceof Enumeration && propertyType.values.length > 0));
44
46
  }
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_Equal.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAIL,WAAW,EACX,cAAc,GACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EACL,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EACL,kBAAkB,EAClB,6BAA6B,EAC7B,mBAAmB,GACpB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAE3F,MAAM,OAAO,gCACX,SAAQ,0BAA0B;IAGlC,QAAQ;QACN,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,MAAM,YAAY,GAChB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK;aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,OAAO,CAEH;YACE,cAAc,CAAC,MAAM;YACrB,cAAc,CAAC,OAAO;YACtB,cAAc,CAAC,MAAM;YACrB,cAAc,CAAC,OAAO;YACtB,cAAc,CAAC,OAAO;YACtB,cAAc,CAAC,KAAK;YACpB,cAAc,CAAC,IAAI;YACnB,cAAc,CAAC,UAAU;YACzB,cAAc,CAAC,QAAQ;SAE1B,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC;YAC7B,uEAAuE;YACvE,CAAC,YAAY,YAAY,WAAW,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CACxE,CAAC;IACJ,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,OAAO,6BAA6B,CAClC,oBAAoB,CAAC,mBAAmB;YACtC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,YAAY;YACtD,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,IAAI;YAC/C,CAAC,CAAC,SAAS,EACb,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK;aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAC7B,CAAC;IACJ,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,MAAM,YAAY,GAChB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK;aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,OAAO,yBAAyB,CAC9B,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;aACjE,KAAK,EACR,YAAY,EACZ,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,eAAe,EAClE,oBAAoB,CAAC,WAAW,CAAC,iBAAiB;aAC/C,wDAAwD,CAC5D,CAAC;IACJ,CAAC;IAED,8BAA8B,CAC5B,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK;aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,QAAQ;YAC3D,oBAAoB,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI;gBAClD,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,SAAS;YAC7C,CAAC,CAAC,iCAAiC,CAAC,KAAK,EAC3C,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,EACT,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAgC,CAAC,IAAI,CAAC,KAAK;aACtE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,QAAQ;YAC3D,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBAC7D,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,SAAS;YAC7C,CAAC,CAAC,iCAAiC,CAAC,KAAK,EAC3C,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,qBAAqB;SACzD,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,mCAAoC,SAAQ,gCAAgC;IAC9E,QAAQ;QACf,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEQ,8BAA8B,CACrC,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,kBAAkB,CACvB,KAAK,CAAC,8BAA8B,CAClC,oBAAoB,EACpB,mBAAmB,CACpB,CACF,CAAC;IACJ,CAAC;IAEQ,yBAAyB,CAChC,WAAoC,EACpC,UAAoC;QAEpC,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACxD,OAAO,eAAe;YACpB,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,WAAW,EAAE,eAAe,CAAC;YAC/D,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,yBAAyB;SAC7D,CAAC,CAAC;IACL,CAAC;CACF"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_Equal.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_GreaterThan.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAG9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAU9B,qBAAa,sCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAiBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAWV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA4BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAarB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_GreaterThan.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAG9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAa9B,qBAAa,sCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAqBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAWV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA4BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAarB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
@@ -18,7 +18,7 @@ import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
18
18
  import { UnsupportedOperationError, hashArray, } from '@finos/legend-shared';
19
19
  import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
20
20
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
21
- import { isTypeCompatibleForAssignment } from '../../QueryBuilderValueSpecificationHelper.js';
21
+ import { getStandardPrimitiveTypeEquivalent, isTypeCompatibleForAssignment, } from '../../QueryBuilderValueSpecificationHelper.js';
22
22
  import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
23
23
  import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
24
24
  export class QueryBuilderFilterOperator_GreaterThan extends QueryBuilderFilterOperator {
@@ -28,15 +28,17 @@ export class QueryBuilderFilterOperator_GreaterThan extends QueryBuilderFilterOp
28
28
  isCompatibleWithFilterConditionProperty(filterConditionState) {
29
29
  const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
30
30
  .genericType.value.rawType;
31
- return [
32
- PRIMITIVE_TYPE.NUMBER,
33
- PRIMITIVE_TYPE.INTEGER,
34
- PRIMITIVE_TYPE.DECIMAL,
35
- PRIMITIVE_TYPE.FLOAT,
36
- PRIMITIVE_TYPE.DATE,
37
- PRIMITIVE_TYPE.STRICTDATE,
38
- PRIMITIVE_TYPE.DATETIME,
39
- ].includes(propertyType.path);
31
+ const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
32
+ return (normalizedType !== undefined &&
33
+ [
34
+ PRIMITIVE_TYPE.NUMBER,
35
+ PRIMITIVE_TYPE.INTEGER,
36
+ PRIMITIVE_TYPE.DECIMAL,
37
+ PRIMITIVE_TYPE.FLOAT,
38
+ PRIMITIVE_TYPE.DATE,
39
+ PRIMITIVE_TYPE.STRICTDATE,
40
+ PRIMITIVE_TYPE.DATETIME,
41
+ ].includes(normalizedType));
40
42
  }
41
43
  isCompatibleWithFilterConditionValue(filterConditionState) {
42
44
  return isTypeCompatibleForAssignment(filterConditionState.rightConditionValue &&
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_GreaterThan.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_GreaterThan.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAIL,cAAc,GACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,yBAAyB,EACzB,SAAS,GACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EACL,kCAAkC,EAClC,6BAA6B,GAC9B,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAE3F,MAAM,OAAO,sCACX,SAAQ,0BAA0B;IAGlC,QAAQ;QACN,OAAO,GAAG,CAAC;IACb,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,MAAM,YAAY,GAChB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK;aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,MAAM,cAAc,GAAG,kCAAkC,CAAC,YAAY,CAAC,CAAC;QACxE,OAAO,CACL,cAAc,KAAK,SAAS;YAE1B;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;gBACpB,cAAc,CAAC,IAAI;gBACnB,cAAc,CAAC,UAAU;gBACzB,cAAc,CAAC,QAAQ;aAE1B,CAAC,QAAQ,CAAC,cAAc,CAAC,CAC3B,CAAC;IACJ,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,OAAO,6BAA6B,CAClC,oBAAoB,CAAC,mBAAmB;YACtC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,YAAY;YACtD,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,IAAI;YAC/C,CAAC,CAAC,SAAS,EACb,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK;aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAC7B,CAAC;IACJ,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,MAAM,YAAY,GAChB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK;aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,QAAQ,YAAY,CAAC,IAAI,EAAE,CAAC;YAC1B,KAAK,cAAc,CAAC,MAAM,CAAC;YAC3B,KAAK,cAAc,CAAC,OAAO,CAAC;YAC5B,KAAK,cAAc,CAAC,KAAK,CAAC;YAC1B,KAAK,cAAc,CAAC,OAAO,CAAC;YAC5B,KAAK,cAAc,CAAC,UAAU,CAAC;YAC/B,KAAK,cAAc,CAAC,QAAQ,CAAC;YAC7B,KAAK,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzB,OAAO,yBAAyB,CAC9B,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;qBACjE,KAAK,EACR,YAAY,EACZ,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,eAAe,EAClE,oBAAoB,CAAC,WAAW,CAAC,iBAAiB;qBAC/C,wDAAwD,CAC5D,CAAC;YACJ,CAAC;YACD;gBACE,MAAM,IAAI,yBAAyB,CACjC,gDAAgD,IAAI,CAAC,QAAQ,EAAE,uCAAuC,YAAY,CAAC,IAAI,GAAG,CAC3H,CAAC;QACN,CAAC;IACH,CAAC;IAED,8BAA8B,CAC5B,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK;aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,QAAQ;YAC3D,oBAAoB,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI;gBAClD,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,YAAY;YAChD,CAAC,CAAC,iCAAiC,CAAC,YAAY,EAClD,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,EACT,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAgC,CAAC,IAAI,CAAC,KAAK;aACtE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,QAAQ;YAC3D,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBAC7D,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,YAAY;YAChD,CAAC,CAAC,iCAAiC,CAAC,YAAY,EAClD,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,4BAA4B;SAChE,CAAC,CAAC;IACL,CAAC;CACF"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderFilterOperator_GreaterThanEqual.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAE9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAU9B,qBAAa,2CACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAiBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAWV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA4BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAarB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
1
+ {"version":3,"file":"QueryBuilderFilterOperator_GreaterThanEqual.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAE9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAa9B,qBAAa,2CACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAqBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAWV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA4BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAarB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
@@ -18,7 +18,7 @@ import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
18
18
  import { UnsupportedOperationError, hashArray, } from '@finos/legend-shared';
19
19
  import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
20
20
  import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
21
- import { isTypeCompatibleForAssignment } from '../../QueryBuilderValueSpecificationHelper.js';
21
+ import { getStandardPrimitiveTypeEquivalent, isTypeCompatibleForAssignment, } from '../../QueryBuilderValueSpecificationHelper.js';
22
22
  import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
23
23
  import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
24
24
  export class QueryBuilderFilterOperator_GreaterThanEqual extends QueryBuilderFilterOperator {
@@ -28,15 +28,17 @@ export class QueryBuilderFilterOperator_GreaterThanEqual extends QueryBuilderFil
28
28
  isCompatibleWithFilterConditionProperty(filterConditionState) {
29
29
  const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
30
30
  .genericType.value.rawType;
31
- return [
32
- PRIMITIVE_TYPE.NUMBER,
33
- PRIMITIVE_TYPE.INTEGER,
34
- PRIMITIVE_TYPE.DECIMAL,
35
- PRIMITIVE_TYPE.FLOAT,
36
- PRIMITIVE_TYPE.DATE,
37
- PRIMITIVE_TYPE.STRICTDATE,
38
- PRIMITIVE_TYPE.DATETIME,
39
- ].includes(propertyType.path);
31
+ const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
32
+ return (normalizedType !== undefined &&
33
+ [
34
+ PRIMITIVE_TYPE.NUMBER,
35
+ PRIMITIVE_TYPE.INTEGER,
36
+ PRIMITIVE_TYPE.DECIMAL,
37
+ PRIMITIVE_TYPE.FLOAT,
38
+ PRIMITIVE_TYPE.DATE,
39
+ PRIMITIVE_TYPE.STRICTDATE,
40
+ PRIMITIVE_TYPE.DATETIME,
41
+ ].includes(normalizedType));
40
42
  }
41
43
  isCompatibleWithFilterConditionValue(filterConditionState) {
42
44
  return isTypeCompatibleForAssignment(filterConditionState.rightConditionValue &&