@finos/legend-query-builder 1.0.0 → 1.0.2

package/src/stores/QueryBuilderStateBuilder.ts

@@ -69,6 +69,8 @@ import { LambdaParameterState } from './shared/LambdaParameterState.js';
 import { processTDS_OLAPGroupByExpression } from './fetch-structure/tds/window/QueryBuilderWindowStateBuilder.js';
 import { processWatermarkExpression } from './watermark/QueryBuilderWatermarkStateBuilder.js';
 import { QueryBuilderConstantExpressionState } from './QueryBuilderConstantsState.js';
+import { checkIfEquivalent } from './milestoning/QueryBuilderMilestoningHelper.js';
+import { QueryBuilderParametersState } from './QueryBuilderParametersState.js';
 
 const processGetAllExpression = (
   expression: SimpleFunctionExpression,
@@ -607,16 +609,29 @@ export const processParameters = (
   parameters: VariableExpression[],
   queryBuilderState: QueryBuilderState,
 ): void => {
-  const queryParameterState = queryBuilderState.parametersState;
+  const queryParameterState = new QueryBuilderParametersState(
+    queryBuilderState,
+  );
+  // Here we won't process the parameters which are present in the previous state
+  // because we don't want to lose the parameter value
   parameters.forEach((parameter) => {
-    const parameterState = new LambdaParameterState(
-      parameter,
-      queryBuilderState.observableContext,
-      queryBuilderState.graphManagerState.graph,
-    );
-    parameterState.mockParameterValue();
-    queryParameterState.addParameter(parameterState);
+    const oldParamterState =
+      queryBuilderState.parametersState.parameterStates.find((ps) =>
+        checkIfEquivalent(ps.parameter, parameter),
+      );
+    if (oldParamterState) {
+      queryParameterState.addParameter(oldParamterState);
+    } else {
+      const parameterState = new LambdaParameterState(
+        parameter,
+        queryBuilderState.observableContext,
+        queryBuilderState.graphManagerState.graph,
+      );
+      parameterState.mockParameterValue();
+      queryParameterState.addParameter(parameterState);
+    }
   });
+  queryBuilderState.parametersState = queryParameterState;
 };
 
 export const processQueryLambdaFunction = (

package/src/stores/milestoning/QueryBuilderMilestoningHelper.ts

@@ -133,6 +133,40 @@ export const isDefaultDatePropagationSupported = (
   return false;
 };
 
+export const checkIfEquivalent = (
+  param1: ValueSpecification | undefined,
+  param2: ValueSpecification | undefined,
+): boolean => {
+  if (
+    param1?.multiplicity.lowerBound !== param2?.multiplicity.lowerBound ||
+    param1?.multiplicity.upperBound !== param2?.multiplicity.upperBound
+  ) {
+    return false;
+  }
+  if (
+    param1 instanceof VariableExpression &&
+    param2 instanceof VariableExpression
+  ) {
+    return param1.name === param2.name;
+  } else if (
+    param1 instanceof PrimitiveInstanceValue &&
+    param2 instanceof PrimitiveInstanceValue
+  ) {
+    if (
+      param1.genericType.value.rawType.name === PRIMITIVE_TYPE.LATESTDATE &&
+      param2.genericType.value.rawType.name === PRIMITIVE_TYPE.LATESTDATE
+    ) {
+      return true;
+    }
+    return (
+      param1.genericType.value.rawType.name ===
+        param2.genericType.value.rawType.name &&
+      param1.values[0] === param2.values[0]
+    );
+  }
+  return false;
+};
+
 /**
  * Check if the parameter value of the milestoned property is
  * the same as those specified in global scope, so that we can
@@ -144,33 +178,6 @@ export const matchMilestoningParameterValue = (
   parameterValue: ValueSpecification,
   milestoningDate: QueryBuilderMilestoningState,
 ): boolean => {
-  const checkIfEquivalent = (
-    param1: ValueSpecification | undefined,
-    param2: ValueSpecification | undefined,
-  ): boolean => {
-    if (
-      param1 instanceof VariableExpression &&
-      param2 instanceof VariableExpression
-    ) {
-      return param1.name === param2.name;
-    } else if (
-      param1 instanceof PrimitiveInstanceValue &&
-      param2 instanceof PrimitiveInstanceValue
-    ) {
-      if (
-        param1.genericType.value.rawType.name === PRIMITIVE_TYPE.LATESTDATE &&
-        param2.genericType.value.rawType.name === PRIMITIVE_TYPE.LATESTDATE
-      ) {
-        return true;
-      }
-      return (
-        param1.genericType.value.rawType.name ===
-          param2.genericType.value.rawType.name &&
-        param1.values[0] === param2.values[0]
-      );
-    }
-    return false;
-  };
   switch (stereotype) {
     case MILESTONING_STEREOTYPE.BITEMPORAL:
       return (

package/tsconfig.json

@@ -36,9 +36,9 @@
     "./src/application/QueryBuilderEvent.ts",
     "./src/application/QueryBuilderSetting.ts",
     "./src/application/QueryBuilderTelemetryHelper.ts",
+    "./src/application/QueryBuilderTesting.ts",
     "./src/components/QueryBuilderComponentElement.ts",
     "./src/components/QueryBuilder_LegendApplicationPlugin.ts",
-    "./src/components/QueryBuilder_TestID.ts",
     "./src/components/QuerySetupUtils.ts",
     "./src/graphManager/QueryBuilderHashUtils.ts",
     "./src/graphManager/QueryBuilderSupportedFunctions.ts",

package/lib/components/QueryBuilder_TestID.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBuilder_TestID.d.ts","sourceRoot":"","sources":["../../src/components/QueryBuilder_TestID.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,oBAAY,qBAAqB;IAC/B,2BAA2B,iCAAiC;IAE5D,aAAa,mBAAmB;IAChC,mBAAmB,0BAA0B;IAC7C,iBAAiB,wBAAwB;IACzC,yBAAyB,iCAAiC;IAC1D,oBAAoB,2BAA2B;IAC/C,yBAAyB,gCAAgC;IACzD,4BAA4B,2BAA2B;IACvD,sBAAsB,6BAA6B;IACnD,mCAAmC,4CAA4C;IAC/E,0BAA0B,kCAAkC;IAC5D,wBAAwB,8BAA8B;IACtD,uBAAuB,6BAA6B;CACrD"}

package/lib/components/QueryBuilder_TestID.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBuilder_TestID.js","sourceRoot":"","sources":["../../src/components/QueryBuilder_TestID.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,MAAM,CAAN,IAAY,qBAeX;AAfD,WAAY,qBAAqB;IAC/B,qFAA4D,CAAA;IAE5D,yDAAgC,CAAA;IAChC,sEAA6C,CAAA;IAC7C,kEAAyC,CAAA;IACzC,mFAA0D,CAAA;IAC1D,wEAA+C,CAAA;IAC/C,kFAAyD,CAAA;IACzD,gFAAuD,CAAA;IACvD,4EAAmD,CAAA;IACnD,wGAA+E,CAAA;IAC/E,qFAA4D,CAAA;IAC5D,+EAAsD,CAAA;IACtD,6EAAoD,CAAA;AACtD,CAAC,EAfW,qBAAqB,GAArB,qBAAqB,KAArB,qBAAqB,QAehC"}