@finos/legend-query-builder 0.4.4 → 0.5.0

package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeStateBuilder.ts

@@ -15,6 +15,7 @@
  */
 
 import {
+  type LambdaFunction,
   GraphFetchTreeInstanceValue,
   matchFunctionName,
   RootGraphFetchTree,
@@ -31,6 +32,7 @@ import { buildGraphFetchTreeData } from './QueryBuilderGraphFetchTreeUtil.js';
 export const processGraphFetchExpression = (
   expression: SimpleFunctionExpression,
   queryBuilderState: QueryBuilderState,
+  parentLambda: LambdaFunction,
 ): void => {
   const functionName = expression.functionName;
 
@@ -55,6 +57,7 @@ export const processGraphFetchExpression = (
   );
   QueryBuilderValueSpecificationProcessor.process(
     precedingExpression,
+    parentLambda,
     queryBuilderState,
   );
 
@@ -77,6 +80,7 @@ export const processGraphFetchExpression = (
 export const processGraphFetchSerializeExpression = (
   expression: SimpleFunctionExpression,
   queryBuilderState: QueryBuilderState,
+  parentLambda: LambdaFunction,
 ): void => {
   // update fetch-structure
   queryBuilderState.fetchStructureState.changeImplementation(
@@ -104,6 +108,7 @@ export const processGraphFetchSerializeExpression = (
   );
   QueryBuilderValueSpecificationProcessor.process(
     precedingExpression,
+    parentLambda,
     queryBuilderState,
   );
 

package/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts

@@ -91,9 +91,9 @@ import type { LambdaFunctionBuilderOption } from '../../QueryBuilderValueSpecifi
 import { appendProjection } from './projection/QueryBuilderProjectionValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../graphManager/QueryBuilderHashUtils.js';
-import { QueryBuilderOLAPGroupByState } from './olapGroupBy/QueryBuilderOLAPGroupByState_.js';
+import { QueryBuilderOLAPGroupByState } from './olapGroupBy/QueryBuilderOLAPGroupByState.js';
 import type { QueryBuilderTDS_OLAPOperator } from './olapGroupBy/operators/QueryBuilderTDS_OLAPOperator.js';
-import { getQueryBuilderCoreOLAPGroupByOperators } from './olapGroupBy/QueryBuilderOLAPGroupByOperatorLoader_.js';
+import { getQueryBuilderCoreOLAPGroupByOperators } from './olapGroupBy/QueryBuilderOLAPGroupByOperatorLoader.js';
 import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState.js';
 
 export class QueryBuilderTDSState

package/src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationStateBuilder.ts

@@ -15,6 +15,7 @@
  */
 
 import {
+  type LambdaFunction,
   CollectionInstanceValue,
   LambdaFunctionInstanceValue,
   matchFunctionName,
@@ -41,6 +42,7 @@ export const processTDSAggregateExpression = (
   expression: SimpleFunctionExpression,
   parentExpression: SimpleFunctionExpression | undefined,
   queryBuilderState: QueryBuilderState,
+  parentLambda: LambdaFunction,
 ): void => {
   // check parent expression
   assertTrue(
@@ -65,6 +67,7 @@ export const processTDSAggregateExpression = (
     // TODO?: do we want to do more validation here for the shape of the column lambda?
     guaranteeNonNullable(expression.parametersValues[0]),
     expression,
+    parentLambda,
     queryBuilderState,
   );
 
@@ -137,6 +140,7 @@ export const processTDSAggregateExpression = (
 export const processTDSGroupByExpression = (
   expression: SimpleFunctionExpression,
   queryBuilderState: QueryBuilderState,
+  parentLambda: LambdaFunction,
 ): void => {
   // update fetch-structureTABULAR_DATA_STRUCTURE
   queryBuilderState.fetchStructureState.changeImplementation(
@@ -164,6 +168,7 @@ export const processTDSGroupByExpression = (
   );
   QueryBuilderValueSpecificationProcessor.process(
     precedingExpression,
+    parentLambda,
     queryBuilderState,
   );
 
@@ -178,6 +183,7 @@ export const processTDSGroupByExpression = (
     QueryBuilderValueSpecificationProcessor.processChild(
       value,
       expression,
+      parentLambda,
       queryBuilderState,
     ),
   );
@@ -193,6 +199,7 @@ export const processTDSGroupByExpression = (
     QueryBuilderValueSpecificationProcessor.processChild(
       value,
       expression,
+      parentLambda,
       queryBuilderState,
     ),
   );

package/src/stores/fetch-structure/tds/olapGroupBy/{QueryBuilderOLAPGroupByStateBuilder_.ts → QueryBuilderOLAPGroupByStateBuilder.ts}

@@ -44,11 +44,12 @@ import {
   QueryBuilderOLAPGroupByColumnState,
   QueryBuilderTDS_OLAPAggreationOperatorState,
   QueryBuilderTDS_OLAPRankOperatorState,
-} from './QueryBuilderOLAPGroupByState_.js';
+} from './QueryBuilderOLAPGroupByState.js';
 
 export const processTDS_OLAPGroupByExpression = (
   expression: SimpleFunctionExpression,
   queryBuilderState: QueryBuilderState,
+  parentLambda: LambdaFunction,
 ): void => {
   // check parameters
   const parametersLength = expression.parametersValues.length;
@@ -90,6 +91,7 @@ export const processTDS_OLAPGroupByExpression = (
   );
   QueryBuilderValueSpecificationProcessor.process(
     precedingExpression,
+    parentLambda,
     queryBuilderState,
   );
 

package/src/stores/fetch-structure/tds/olapGroupBy/{QueryBuilderOLAPGroupByValueSpecificationBuilder_.ts → QueryBuilderOLAPGroupByValueSpecificationBuilder.ts}

@@ -34,7 +34,7 @@ import {
   type QueryBuilderOLAPGroupByColumnState,
   type QueryBuilderOLAPGroupByState,
   QueryBuilderTDS_OLAPAggreationOperatorState,
-} from './QueryBuilderOLAPGroupByState_.js';
+} from './QueryBuilderOLAPGroupByState.js';
 
 const appendOLAPGroupByColumnState = (
   olapGroupByColumnState: QueryBuilderOLAPGroupByColumnState,

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperatorHelper.ts

@@ -17,7 +17,7 @@
 import { Multiplicity } from '@finos/legend-graph';
 import { UnsupportedOperationError } from '@finos/legend-shared';
 import { QueryBuilderAggregateColumnState } from '../../aggregation/QueryBuilderAggregationState.js';
-import { QueryBuilderOLAPGroupByColumnState } from '../../olapGroupBy/QueryBuilderOLAPGroupByState_.js';
+import { QueryBuilderOLAPGroupByColumnState } from '../../olapGroupBy/QueryBuilderOLAPGroupByState.js';
 import { QueryBuilderSimpleProjectionColumnState } from '../../projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderTDSColumnState } from '../../QueryBuilderTDSColumnState.js';
 

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.ts

@@ -17,6 +17,7 @@
 import {
   type INTERNAL__UnknownValueSpecification,
   type ValueSpecification,
+  type LambdaFunction,
   AbstractPropertyExpression,
   CollectionInstanceValue,
   DerivedProperty,
@@ -59,6 +60,7 @@ import {
 export const processTDSProjectExpression = (
   expression: SimpleFunctionExpression,
   queryBuilderState: QueryBuilderState,
+  parentLambda: LambdaFunction,
 ): void => {
   // update fetch-structure
   queryBuilderState.fetchStructureState.changeImplementation(
@@ -87,6 +89,7 @@ export const processTDSProjectExpression = (
   );
   QueryBuilderValueSpecificationProcessor.process(
     precedingExpression,
+    parentLambda,
     queryBuilderState,
   );
 
@@ -101,6 +104,7 @@ export const processTDSProjectExpression = (
     QueryBuilderValueSpecificationProcessor.processChild(
       value,
       expression,
+      parentLambda,
       queryBuilderState,
     ),
   );
@@ -236,6 +240,7 @@ export const processTDSProjectionDerivationExpression = (
 export const processTDSTakeExpression = (
   expression: SimpleFunctionExpression,
   queryBuilderState: QueryBuilderState,
+  parentLambda: LambdaFunction,
 ): void => {
   // check parameters
   assertTrue(
@@ -263,6 +268,7 @@ export const processTDSTakeExpression = (
   );
   QueryBuilderValueSpecificationProcessor.process(
     precedingExpression,
+    parentLambda,
     queryBuilderState,
   );
 
@@ -283,6 +289,7 @@ export const processTDSTakeExpression = (
 export const processTDSDistinctExpression = (
   expression: SimpleFunctionExpression,
   queryBuilderState: QueryBuilderState,
+  parentLambda: LambdaFunction,
 ): void => {
   // check parameters
   assertTrue(
@@ -309,6 +316,7 @@ export const processTDSDistinctExpression = (
   );
   QueryBuilderValueSpecificationProcessor.process(
     precedingExpression,
+    parentLambda,
     queryBuilderState,
   );
 
@@ -326,6 +334,7 @@ export const processTDSDistinctExpression = (
 export const processTDSSortExpression = (
   expression: SimpleFunctionExpression,
   queryBuilderState: QueryBuilderState,
+  parentLambda: LambdaFunction,
 ): void => {
   // check parameters
   assertTrue(
@@ -353,6 +362,7 @@ export const processTDSSortExpression = (
   );
   QueryBuilderValueSpecificationProcessor.process(
     precedingExpression,
+    parentLambda,
     queryBuilderState,
   );
 
@@ -367,6 +377,7 @@ export const processTDSSortExpression = (
     QueryBuilderValueSpecificationProcessor.processChild(
       value,
       expression,
+      parentLambda,
       queryBuilderState,
     ),
   );

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.ts

@@ -47,7 +47,7 @@ import {
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/QueryBuilderSupportedFunctions.js';
 import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPropertyExpressionChain } from '../../../QueryBuilderValueSpecificationBuilderHelper.js';
-import { appendOLAPGroupByState } from '../olapGroupBy/QueryBuilderOLAPGroupByValueSpecificationBuilder_.js';
+import { appendOLAPGroupByState } from '../olapGroupBy/QueryBuilderOLAPGroupByValueSpecificationBuilder.js';
 import { appendPostFilter } from '../post-filter/QueryBuilderPostFilterValueSpecificationBuilder.js';
 
 const buildSortExpression = (

package/src/stores/filter/QueryBuilderFilterValueSpecificationBuilder.ts

@@ -17,6 +17,7 @@
 import { isNonNullable, guaranteeNonNullable } from '@finos/legend-shared';
 import {
   type ValueSpecification,
+  type LambdaFunction,
   extractElementNameFromPath,
   SimpleFunctionExpression,
 } from '@finos/legend-graph';
@@ -80,22 +81,25 @@ const buildFilterConditionExpression = (
 
 export const buildFilterExpression = (
   filterState: QueryBuilderFilterState,
-  getAllFunc: SimpleFunctionExpression,
-): SimpleFunctionExpression | undefined => {
+  lambdaFunction: LambdaFunction,
+): void => {
   const filterConditionExpressions = filterState.rootIds
     .map((e) => guaranteeNonNullable(filterState.nodes.get(e)))
     .map((e) => buildFilterConditionExpression(filterState, e))
     .filter(isNonNullable);
 
   if (!filterConditionExpressions.length) {
-    return undefined;
+    return;
   }
   // main filter expression
   const filterExpression = new SimpleFunctionExpression(
     extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.FILTER),
   );
+  const currentExpression = guaranteeNonNullable(
+    lambdaFunction.expressionSequence[0],
+  );
   // param [0]
-  filterExpression.parametersValues.push(getAllFunc);
+  filterExpression.parametersValues.push(currentExpression);
   // param [1]
   filterExpression.parametersValues.push(
     buildGenericLambdaFunctionInstanceValue(
@@ -104,5 +108,6 @@ export const buildFilterExpression = (
       filterState.queryBuilderState.graphManagerState.graph,
     ),
   );
-  return filterExpression;
+  // reprocess filter as main expression
+  lambdaFunction.expressionSequence[0] = filterExpression;
 };

package/src/stores/milestoning/QueryBuilderBitemporalMilestoningImplementation.ts

@@ -0,0 +1,165 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  type ValueSpecification,
+  PROCESSING_DATE_MILESTONING_PROPERTY_NAME,
+  BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
+  type SimpleFunctionExpression,
+  AbstractPropertyExpression,
+  MILESTONING_STEREOTYPE,
+  INTERNAL__PropagatedValue,
+} from '@finos/legend-graph';
+import {
+  assertTrue,
+  guaranteeNonNullable,
+  guaranteeType,
+} from '@finos/legend-shared';
+import { getParameterValue } from '../../components/QueryBuilderSideBar.js';
+import type { QueryBuilderDerivedPropertyExpressionState } from '../QueryBuilderPropertyEditorState.js';
+import { QueryBuilderMilestoningImplementation } from './QueryBuilderMilestoningImplementation.js';
+
+export class QueryBuilderBitemporalMilestoningImplementation extends QueryBuilderMilestoningImplementation {
+  getMilestoningDate(index?: number): ValueSpecification | undefined {
+    if (index === 0) {
+      return this.milestoningState.processingDate;
+    } else {
+      return this.milestoningState.businessDate;
+    }
+  }
+
+  getMilestoningToolTipText(): string {
+    return `Processing Date: ${getParameterValue(
+      this.getMilestoningDate(0),
+    )}, Business Date: ${getParameterValue(this.getMilestoningDate(1))}`;
+  }
+
+  initializeMilestoningParameters(force?: boolean): void {
+    if (!this.milestoningState.processingDate || force) {
+      this.milestoningState.setProcessingDate(
+        this.milestoningState.buildMilestoningParameter(
+          PROCESSING_DATE_MILESTONING_PROPERTY_NAME,
+        ),
+      );
+    }
+    if (!this.milestoningState.businessDate || force) {
+      this.milestoningState.setBusinessDate(
+        this.milestoningState.buildMilestoningParameter(
+          BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
+        ),
+      );
+    }
+  }
+
+  processGetAllParamaters(parameterValues: ValueSpecification[]): void {
+    assertTrue(
+      parameterValues.length === 3,
+      `Can't process getAll() expression: when used with a bitemporal milestoned class getAll() expects two parameters`,
+    );
+    this.milestoningState.setProcessingDate(parameterValues[1]);
+    this.milestoningState.setBusinessDate(parameterValues[2]);
+  }
+
+  buildGetAllParameters(getAllFunction: SimpleFunctionExpression): void {
+    getAllFunction.parametersValues.push(
+      guaranteeNonNullable(
+        this.getMilestoningDate(0),
+        `Milestoning class should have a parameter of type 'Date'`,
+      ),
+    );
+    getAllFunction.parametersValues.push(
+      guaranteeNonNullable(
+        this.getMilestoningDate(1),
+        `Milestoning class should have a parameter of type 'Date'`,
+      ),
+    );
+  }
+
+  generateMilestoningDate(
+    isDatePropagationSupported: boolean,
+    hasDefaultMilestoningDate: boolean,
+    prevPropertyExpression: AbstractPropertyExpression | undefined,
+    temporalSource: MILESTONING_STEREOTYPE | undefined,
+    idx?: number,
+    derivedPropertyExpressionState?: QueryBuilderDerivedPropertyExpressionState,
+  ): ValueSpecification {
+    this.initializeMilestoningParameters();
+    if (idx === 0) {
+      if (
+        temporalSource === MILESTONING_STEREOTYPE.PROCESSING_TEMPORAL &&
+        derivedPropertyExpressionState?.parameterValues.length === 1
+      ) {
+        return new INTERNAL__PropagatedValue(() =>
+          guaranteeNonNullable(
+            guaranteeType(prevPropertyExpression, AbstractPropertyExpression)
+              .parametersValues[1],
+          ),
+        );
+      }
+      let parameter;
+      if (
+        isDatePropagationSupported &&
+        prevPropertyExpression &&
+        !hasDefaultMilestoningDate
+      ) {
+        parameter = new INTERNAL__PropagatedValue(() =>
+          guaranteeNonNullable(prevPropertyExpression.parametersValues[1]),
+        );
+      } else {
+        parameter = new INTERNAL__PropagatedValue(() =>
+          guaranteeNonNullable(this.getMilestoningDate(idx)),
+        );
+        parameter.isPropagatedValue = hasDefaultMilestoningDate
+          ? false
+          : isDatePropagationSupported;
+      }
+      return parameter;
+    } else {
+      if (
+        temporalSource === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL &&
+        derivedPropertyExpressionState?.parameterValues.length === 1
+      ) {
+        return new INTERNAL__PropagatedValue(() =>
+          guaranteeNonNullable(
+            guaranteeType(
+              derivedPropertyExpressionState.propertyExpression
+                .parametersValues[0],
+              AbstractPropertyExpression,
+            ).parametersValues[1],
+          ),
+        );
+      }
+      let parameter;
+      if (
+        isDatePropagationSupported &&
+        prevPropertyExpression &&
+        !hasDefaultMilestoningDate
+      ) {
+        parameter = new INTERNAL__PropagatedValue(() =>
+          guaranteeNonNullable(prevPropertyExpression.parametersValues[2]),
+        );
+      } else {
+        parameter = new INTERNAL__PropagatedValue(() =>
+          guaranteeNonNullable(this.getMilestoningDate(idx)),
+        );
+        parameter.isPropagatedValue = hasDefaultMilestoningDate
+          ? false
+          : isDatePropagationSupported;
+      }
+      return parameter;
+    }
+  }
+}

package/src/stores/milestoning/QueryBuilderBusinessTemporalMilestoningImplementation.ts

@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  type ValueSpecification,
+  BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
+  type SimpleFunctionExpression,
+  type AbstractPropertyExpression,
+  MILESTONING_STEREOTYPE,
+  INTERNAL__PropagatedValue,
+} from '@finos/legend-graph';
+import { assertTrue, guaranteeNonNullable } from '@finos/legend-shared';
+import { getParameterValue } from '../../components/QueryBuilderSideBar.js';
+import { QueryBuilderMilestoningImplementation } from './QueryBuilderMilestoningImplementation.js';
+
+export class QueryBuilderBusinessTemporalMilestoningImplementation extends QueryBuilderMilestoningImplementation {
+  getMilestoningDate(): ValueSpecification | undefined {
+    return this.milestoningState.businessDate;
+  }
+
+  getMilestoningToolTipText(): string {
+    return `Business Date: ${getParameterValue(this.getMilestoningDate())}`;
+  }
+
+  initializeMilestoningParameters(force?: boolean): void {
+    if (!this.milestoningState.businessDate || force) {
+      this.milestoningState.setBusinessDate(
+        this.milestoningState.buildMilestoningParameter(
+          BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
+        ),
+      );
+    }
+  }
+
+  processGetAllParamaters(parameterValues: ValueSpecification[]): void {
+    assertTrue(
+      parameterValues.length === 2,
+      `Can't process getAll() expression: when used with a milestoned class getAll() expects a parameter`,
+    );
+    this.milestoningState.setBusinessDate(parameterValues[1]);
+  }
+
+  buildGetAllParameters(getAllFunction: SimpleFunctionExpression): void {
+    getAllFunction.parametersValues.push(
+      guaranteeNonNullable(
+        this.getMilestoningDate(),
+        `Milestoning class should have a parameter of type 'Date'`,
+      ),
+    );
+  }
+
+  generateMilestoningDate(
+    isDatePropagationSupported: boolean,
+    hasDefaultMilestoningDate: boolean,
+    prevPropertyExpression: AbstractPropertyExpression | undefined,
+    temporalSource: MILESTONING_STEREOTYPE | undefined,
+  ): ValueSpecification {
+    this.initializeMilestoningParameters();
+    if (
+      isDatePropagationSupported &&
+      prevPropertyExpression &&
+      !hasDefaultMilestoningDate
+    ) {
+      if (temporalSource === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL) {
+        return new INTERNAL__PropagatedValue(() =>
+          guaranteeNonNullable(prevPropertyExpression.parametersValues[1]),
+        );
+      } else {
+        return new INTERNAL__PropagatedValue(() =>
+          guaranteeNonNullable(prevPropertyExpression.parametersValues[2]),
+        );
+      }
+    } else {
+      const milestoningDate = new INTERNAL__PropagatedValue(() =>
+        guaranteeNonNullable(this.getMilestoningDate()),
+      );
+      milestoningDate.isPropagatedValue = hasDefaultMilestoningDate
+        ? false
+        : isDatePropagationSupported;
+      return milestoningDate;
+    }
+  }
+}