@finos/legend-application-query 5.2.7 → 5.2.8

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/lib/index.css CHANGED
@@ -1,4 +1,4 @@
1
- /** @license @finos/legend-application-query v5.2.7
1
+ /** @license @finos/legend-application-query v5.2.8
2
2
  * Copyright (c) 2020-present, Goldman Sachs
3
3
  *
4
4
  * Licensed under the Apache License, Version 2.0 (the "License");
package/lib/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@finos/legend-application-query",
3
- "version": "5.2.7",
3
+ "version": "5.2.8",
4
4
  "description": "Legend Query application core",
5
5
  "keywords": [
6
6
  "legend",
@@ -15,7 +15,7 @@
15
15
  */
16
16
  import { AbstractPropertyExpression, type ValueSpecification } from '@finos/legend-graph';
17
17
  import type { QueryBuilderState } from './QueryBuilderState.js';
18
- export declare const buildPropertyExpressionChain: (propertyExpression: AbstractPropertyExpression, queryBuilderState: QueryBuilderState) => ValueSpecification;
18
+ export declare const buildPropertyExpressionChain: (propertyExpression: AbstractPropertyExpression, queryBuilderState: QueryBuilderState, isDatePropagationNotSupported?: boolean) => ValueSpecification;
19
19
  export declare type LambdaFunctionBuilderOption = {
20
20
  /**
21
21
  * Set queryBuilderState to `true` when we construct query for execution within the app.
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderValueSpecificationBuilderHelper.d.ts","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilderHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EACL,0BAA0B,EAS1B,KAAK,kBAAkB,EACxB,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAkGhE,eAAO,MAAM,4BAA4B,uBACnB,0BAA0B,qBAC3B,iBAAiB,KACnC,kBAkGF,CAAC;AAEF,oBAAY,2BAA2B,GAAG;IACxC;;;OAGG;IACH,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/C,qBAAqB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7C,CAAC"}
1
+ {"version":3,"file":"QueryBuilderValueSpecificationBuilderHelper.d.ts","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilderHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EACL,0BAA0B,EAS1B,KAAK,kBAAkB,EACxB,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAsGhE,eAAO,MAAM,4BAA4B,uBACnB,0BAA0B,qBAC3B,iBAAiB,kCACJ,OAAO,KACtC,kBAmGF,CAAC;AAEF,oBAAY,2BAA2B,GAAG;IACxC;;;OAGG;IACH,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/C,qBAAqB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7C,CAAC"}
@@ -52,7 +52,10 @@ import { getDerivedPropertyMilestoningSteoreotype } from './QueryBuilderProperty
52
52
  * PRD : default processing date is propagated
53
53
  * BUD : default business date is propgated
54
54
  */
55
- const isDefaultDatePropagationSupported = (currentPropertyExpression, queryBuilderState, prevPropertyExpression) => {
55
+ const isDefaultDatePropagationSupported = (currentPropertyExpression, queryBuilderState, prevPropertyExpression, isDatePropagationNotSupported) => {
56
+ if (isDatePropagationNotSupported) {
57
+ return false;
58
+ }
56
59
  const property = currentPropertyExpression.func;
57
60
  const graph = queryBuilderState.graphManagerState.graph;
58
61
  // Default date propagation is not supported for current expression when the previous property expression is a derived property.
@@ -91,7 +94,7 @@ const isDefaultDatePropagationSupported = (currentPropertyExpression, queryBuild
91
94
  }
92
95
  return false;
93
96
  };
94
- export const buildPropertyExpressionChain = (propertyExpression, queryBuilderState) => {
97
+ export const buildPropertyExpressionChain = (propertyExpression, queryBuilderState, isDatePropagationNotSupported) => {
95
98
  const graph = queryBuilderState.graphManagerState.graph;
96
99
  const newPropertyExpression = new AbstractPropertyExpression('', graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE));
97
100
  newPropertyExpression.func = propertyExpression.func;
@@ -114,7 +117,7 @@ export const buildPropertyExpressionChain = (propertyExpression, queryBuilderSta
114
117
  // Replace with argumentless derived property expression only when default date propagation is supported
115
118
  if (isDefaultDatePropagationSupported(guaranteeType(currentExpression, AbstractPropertyExpression), queryBuilderState, nextExpression instanceof AbstractPropertyExpression
116
119
  ? nextExpression
117
- : undefined)) {
120
+ : undefined, isDatePropagationNotSupported)) {
118
121
  // NOTE: For `bitemporal` property check if the property expression has parameters which are not instance of
119
122
  // `INTERNAL_PropagatedValue` then pass the parameters as user explicitly changed values of either of the parameters.
120
123
  if ((index === 1 &&
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderValueSpecificationBuilderHelper.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilderHelper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryBuilderValueSpecificationBuilderHelper.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilderHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,sCAAsC,EACtC,qCAAqC,GACtC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,0BAA0B,EAC1B,KAAK,EACL,eAAe,EACf,8BAA8B,EAC9B,yBAAyB,EACzB,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACxB,yBAAyB,GAE1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,aAAa,GACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,iCAAiC,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,wCAAwC,EAAE,MAAM,sCAAsC,CAAC;AAGhG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,MAAM,iCAAiC,GAAG,CACxC,yBAAqD,EACrD,iBAAoC,EACpC,sBAA+D,EAC/D,6BAAuC,EAC9B,EAAE;IACX,IAAI,6BAA6B,EAAE;QACjC,OAAO,KAAK,CAAC;KACd;IACD,MAAM,QAAQ,GAAG,yBAAyB,CAAC,IAAI,CAAC;IAChD,MAAM,KAAK,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC;IACxD,gIAAgI;IAChI,IACE,sBAAsB;QACtB,sBAAsB,CAAC,IAAI,YAAY,eAAe;QACtD,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAC3D,sBAAsB,CAAC,IAAI,CAC5B,EACD;QACA,OAAO,KAAK,CAAC;KACd;IACD,yGAAyG;IACzG,2FAA2F;IAC3F,IACE,sBAAsB;QACtB,sBAAsB,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,YAAY,KAAK,EACtE;QACA,MAAM,qBAAqB,GAAG,8BAA8B,CAC1D,sBAAsB,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EACrD,KAAK,CACN,CAAC;QACF,IACE,qBAAqB;YACrB,CAAC,sBAAsB,CAAC,gBAAgB;iBACrC,KAAK,CAAC,CAAC,CAAC;iBACR,KAAK,CACJ,CAAC,cAAc,EAAE,EAAE,CACjB,cAAc,YAAY,yBAAyB,CACtD,EACH;YACA,OAAO,KAAK,CAAC;SACd;KACF;IACD,IAAI,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,YAAY,KAAK,EAAE;QACvD,iEAAiE;QACjE,MAAM,gBAAgB,GACpB,QAAQ,YAAY,eAAe;YACjC,CAAC,CAAC,wCAAwC,CAAC,QAAQ,EAAE,KAAK,CAAC;YAC3D,CAAC,CAAC,SAAS,CAAC;QAChB,6EAA6E;QAC7E,IAAI,gBAAgB,KAAK,sBAAsB,CAAC,UAAU,EAAE;YAC1D,OAAO,IAAI,CAAC;SACb;QACD,iFAAiF;QACjF,MAAM,gBAAgB,GAAG,8BAA8B,CACrD,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAClC,KAAK,CACN,CAAC;QACF,0FAA0F;QAC1F,IAAI,gBAAgB,IAAI,gBAAgB,EAAE;YACxC,OAAO,gBAAgB,KAAK,gBAAgB,CAAC;SAC9C;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,kBAA8C,EAC9C,iBAAoC,EACpC,6BAAuC,EACnB,EAAE;IACtB,MAAM,KAAK,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC;IACxD,MAAM,qBAAqB,GAAG,IAAI,0BAA0B,CAC1D,EAAE,EACF,KAAK,CAAC,sBAAsB,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAC5D,CAAC;IACF,qBAAqB,CAAC,IAAI,GAAG,kBAAkB,CAAC,IAAI,CAAC;IACrD,qBAAqB,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,gBAAgB,CAAC;IAE7E,IAAI,cAA8C,CAAC;IACnD,IAAI,iBAAiB,GAAmC,qBAAqB,CAAC;IAC9E,OAAO,iBAAiB,YAAY,0BAA0B,EAAE;QAC9D,cAAc,GAAG,uBAAuB,CACtC,iBAAiB,CAAC,gBAAgB,CACnC,CAAC;QACF,IAAI,cAAc,YAAY,0BAA0B,EAAE;YACxD,MAAM,cAAc,GAAG,IAAI,0BAA0B,CACnD,EAAE,EACF,KAAK,CAAC,sBAAsB,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAC5D,CAAC;YACF,cAAc,CAAC,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;YAC1C,cAAc,CAAC,gBAAgB,GAAG,cAAc,CAAC,gBAAgB,CAAC;YAClE,cAAc,GAAG,cAAc,CAAC;YAChC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC;SACxD;QACD,IAAI,iBAAiB,CAAC,IAAI,YAAY,eAAe,EAAE;YACrD,MAAM,eAAe,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACpE,eAAe,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE;gBAChD,IAAI,cAAc,YAAY,yBAAyB,EAAE;oBACvD,wGAAwG;oBACxG,IACE,iCAAiC,CAC/B,aAAa,CAAC,iBAAiB,EAAE,0BAA0B,CAAC,EAC5D,iBAAiB,EACjB,cAAc,YAAY,0BAA0B;wBAClD,CAAC,CAAC,cAAc;wBAChB,CAAC,CAAC,SAAS,EACb,6BAA6B,CAC9B,EACD;wBACA,4GAA4G;wBAC5G,qHAAqH;wBACrH,IACE,CAAC,KAAK,KAAK,CAAC;4BACV,aAAa,CAAC,iBAAiB,EAAE,0BAA0B,CAAC;iCACzD,gBAAgB,CAAC,MAAM,KAAK,CAAC,CAAC;4BACnC,CAAC,KAAK,KAAK,CAAC;gCACV,aAAa,CAAC,iBAAiB,EAAE,0BAA0B,CAAC;qCACzD,gBAAgB,CAAC,MAAM,KAAK,CAAC;gCAChC,CAAC,CACC,aAAa,CAAC,iBAAiB,EAAE,0BAA0B,CAAC;qCACzD,gBAAgB,CAAC,CAAC,CAAC,YAAY,yBAAyB,CAC5D,CAAC,EACJ;4BACA,qCAAqC,CACnC,aAAa,CAAC,iBAAiB,EAAE,0BAA0B,CAAC,EAC5D,KAAK,GAAG,CAAC,EACT,cAAc,CAAC,QAAQ,EAAE,EACzB,iBAAiB,CAAC,iBAAiB,CACpC,CAAC;yBACH;6BAAM;4BACL,sCAAsC,CACpC,aAAa,CAAC,iBAAiB,EAAE,0BAA0B,CAAC,EAC5D;gCACE,oBAAoB,CAClB,aAAa,CAAC,iBAAiB,EAAE,0BAA0B,CAAC;qCACzD,gBAAgB,CAAC,CAAC,CAAC,CACvB;6BACF,EACD,iBAAiB,CAAC,iBAAiB,CACpC,CAAC;yBACH;qBACF;yBAAM;wBACL,qCAAqC,CACnC,aAAa,CAAC,iBAAiB,EAAE,0BAA0B,CAAC,EAC5D,KAAK,GAAG,CAAC,EACT,cAAc,CAAC,QAAQ,EAAE,EACzB,iBAAiB,CAAC,iBAAiB,CACpC,CAAC;qBACH;iBACF;YACH,CAAC,CAAC,CAAC;SACJ;QACD,iBAAiB,GAAG,cAAc,CAAC;QACnC,oGAAoG;QACpG,kDAAkD;QAClD,OACE,iBAAiB,YAAY,wBAAwB;YACrD,iBAAiB,CACf,iBAAiB,CAAC,YAAY,EAC9B,iCAAiC,CAAC,OAAO,CAC1C,EACD;YACA,iBAAiB,GAAG,uBAAuB,CACzC,iBAAiB,CAAC,gBAAgB,CACnC,CAAC;SACH;KACF;IACD,OAAO,qBAAqB,CAAC;AAC/B,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderProjectionValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/projection/QueryBuilderProjectionValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,cAAc,EAgBpB,MAAM,qBAAqB,CAAC;AAa7B,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAuIpF,eAAO,MAAM,gBAAgB,oBACV,2BAA2B,kBAC5B,cAAc,YACpB;IACR;;;OAGG;IACH,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/C,qBAAqB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7C,KACA,IA8NF,CAAC"}
1
+ {"version":3,"file":"QueryBuilderProjectionValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/projection/QueryBuilderProjectionValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,cAAc,EAgBpB,MAAM,qBAAqB,CAAC;AAa7B,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAuIpF,eAAO,MAAM,gBAAgB,oBACV,2BAA2B,kBAC5B,cAAc,YACpB;IACR;;;OAGG;IACH,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/C,qBAAqB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7C,KACA,IA+NF,CAAC"}
@@ -101,7 +101,7 @@ export const appendProjection = (projectionState, lambdaFunction, options) => {
101
101
  let columnLambda;
102
102
  if (projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState) {
103
103
  columnLambda = buildGenericLambdaFunctionInstanceValue(projectionColumnState.lambdaParameterName, [
104
- buildPropertyExpressionChain(projectionColumnState.propertyExpressionState.propertyExpression, projectionColumnState.propertyExpressionState.queryBuilderState),
104
+ buildPropertyExpressionChain(projectionColumnState.propertyExpressionState.propertyExpression, projectionColumnState.propertyExpressionState.queryBuilderState, true),
105
105
  ], queryBuilderState.graphManagerState.graph);
106
106
  }
107
107
  else if (projectionColumnState instanceof
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilderProjectionValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/projection/QueryBuilderProjectionValueSpecificationBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryBuilderProjectionValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/projection/QueryBuilderProjectionValueSpecificationBuilder.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@finos/legend-application-query",
3
- "version": "5.2.7",
3
+ "version": "5.2.8",
4
4
  "description": "Legend Query application core",
5
5
  "keywords": [
6
6
  "legend",
@@ -77,7 +77,11 @@ const isDefaultDatePropagationSupported = (
77
77
  currentPropertyExpression: AbstractPropertyExpression,
78
78
  queryBuilderState: QueryBuilderState,
79
79
  prevPropertyExpression?: AbstractPropertyExpression | undefined,
80
+ isDatePropagationNotSupported?: boolean,
80
81
  ): boolean => {
82
+ if (isDatePropagationNotSupported) {
83
+ return false;
84
+ }
81
85
  const property = currentPropertyExpression.func;
82
86
  const graph = queryBuilderState.graphManagerState.graph;
83
87
  // Default date propagation is not supported for current expression when the previous property expression is a derived property.
@@ -138,6 +142,7 @@ const isDefaultDatePropagationSupported = (
138
142
  export const buildPropertyExpressionChain = (
139
143
  propertyExpression: AbstractPropertyExpression,
140
144
  queryBuilderState: QueryBuilderState,
145
+ isDatePropagationNotSupported?: boolean,
141
146
  ): ValueSpecification => {
142
147
  const graph = queryBuilderState.graphManagerState.graph;
143
148
  const newPropertyExpression = new AbstractPropertyExpression(
@@ -175,6 +180,7 @@ export const buildPropertyExpressionChain = (
175
180
  nextExpression instanceof AbstractPropertyExpression
176
181
  ? nextExpression
177
182
  : undefined,
183
+ isDatePropagationNotSupported,
178
184
  )
179
185
  ) {
180
186
  // NOTE: For `bitemporal` property check if the property expression has parameters which are not instance of
@@ -259,6 +259,7 @@ export const appendProjection = (
259
259
  buildPropertyExpressionChain(
260
260
  projectionColumnState.propertyExpressionState.propertyExpression,
261
261
  projectionColumnState.propertyExpressionState.queryBuilderState,
262
+ true,
262
263
  ),
263
264
  ],
264
265
  queryBuilderState.graphManagerState.graph,