@finos/legend-query-builder 3.0.5 → 3.0.7

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

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderConstantExpressionPanel.d.ts","sourceRoot":"","sources":["../../src/components/QueryBuilderConstantExpressionPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AA+BH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAsJxE,eAAO,MAAM,mCAAmC,WACtC;IAAE,iBAAiB,EAAE,iBAAiB,CAAA;CAAE;;CAsGjD,CAAC"}
+{"version":3,"file":"QueryBuilderConstantExpressionPanel.d.ts","sourceRoot":"","sources":["../../src/components/QueryBuilderConstantExpressionPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAgCH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAiKxE,eAAO,MAAM,mCAAmC,WACtC;IAAE,iBAAiB,EAAE,iBAAiB,CAAA;CAAE;;CAsGjD,CAAC"}

package/lib/components/QueryBuilderConstantExpressionPanel.js

@@ -15,18 +15,19 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * limitations under the License.
  */
 import { buildElementOption, getPackageableElementOptionFormatter, } from '@finos/legend-lego/graph-editor';
-import { BlankPanelPlaceholder, CustomSelectorInput, Dialog, InfoCircleIcon, Modal, ModalBody, ModalFooter, ModalFooterButton, ModalHeader, PanelFormSection, PanelFormTextField, PlusIcon, } from '@finos/legend-art';
-import { PrimitiveType, VariableExpression, Multiplicity, } from '@finos/legend-graph';
+import { BlankPanelPlaceholder, CustomSelectorInput, Dialog, InfoCircleIcon, Modal, ModalBody, ModalFooter, ModalFooterButton, ModalHeader, PanelFormSection, PanelFormValidatedTextField, PlusIcon, } from '@finos/legend-art';
+import { PrimitiveType, VariableExpression, Multiplicity, isValidIdentifier, } from '@finos/legend-graph';
 import { generateEnumerableNameFromToken } from '@finos/legend-shared';
 import { observer } from 'mobx-react-lite';
 import { DEFAULT_CONSTANT_VARIABLE_NAME } from '../stores/QueryBuilderConfig.js';
 import { QueryBuilderConstantExpressionState } from '../stores/QueryBuilderConstantsState.js';
 import { buildDefaultInstanceValue } from '../stores/shared/ValueSpecificationEditorHelper.js';
-import { variableExpression_setName } from '../stores/shared/ValueSpecificationModifierHelper.js';
 import { BasicValueSpecificationEditor } from './shared/BasicValueSpecificationEditor.js';
 import { VariableViewer } from './shared/QueryBuilderVariableSelector.js';
 import { QUERY_BUILDER_TEST_ID } from '../__lib__/QueryBuilderTesting.js';
 import { QUERY_BUILDER_DOCUMENTATION_KEY } from '../__lib__/QueryBuilderDocumentation.js';
+import { useState } from 'react';
+import { variableExpression_setName } from '../stores/shared/ValueSpecificationModifierHelper.js';
 // NOTE: We currently only allow constant variables for primitive types of multiplicity ONE.
 // This is why we don't show multiplicity in the editor.
 const QueryBuilderConstantExpressionEditor = observer((props) => {
@@ -41,9 +42,6 @@ const QueryBuilderConstantExpressionEditor = observer((props) => {
     const valueSpec = constantState.value;
     const variableType = constantState.value.genericType?.value.rawType ?? PrimitiveType.STRING;
     const selectedType = buildElementOption(variableType);
-    const close = () => {
-        variableState.setSelectedConstant(undefined);
-    };
     const changeType = (val) => {
         if (variableType !== val.value) {
             constantState.changeValSpecType(val.value);
@@ -52,12 +50,18 @@ const QueryBuilderConstantExpressionEditor = observer((props) => {
     const typeOptions = queryBuilderState.graphManagerState.graph.primitiveTypes
         .map(buildElementOption)
         .concat(queryBuilderState.graphManagerState.graph.enumerations.map(buildElementOption));
-    const validationMessage = !variableName
-        ? `Constant Name can't be empty`
-        : allVariableNames.filter((e) => e === variableName).length >
-            (isCreating ? 0 : 1)
-            ? 'Constant Name Already Exists'
-            : undefined;
+    const [isNameValid, setIsNameValid] = useState(true);
+    const getValidationMessage = (constantInput) => !constantInput
+        ? `Constant name can't be empty`
+        : isValidIdentifier(constantInput) === false
+            ? 'Constant name must be text with no spaces and not start with an uppercase letter or number'
+            : allVariableNames.filter((e) => e === constantInput).length >
+                (isCreating ? 0 : 1)
+                ? 'Constant name already exists'
+                : undefined;
+    const close = () => {
+        variableState.setSelectedConstant(undefined);
+    };
     const onAction = () => {
         if (isCreating) {
             variableState.addConstant(constantState);
@@ -72,7 +76,9 @@ const QueryBuilderConstantExpressionEditor = observer((props) => {
             root: 'editor-modal__root-container',
             container: 'editor-modal__container',
             paper: 'editor-modal__content',
-        }, children: _jsxs(Modal, { darkMode: true, className: "editor-modal query-builder__variables__modal", children: [_jsx(ModalHeader, { title: `${isCreating ? 'Create Constant' : 'Update Constant'}` }), _jsxs(ModalBody, { className: "query-builder__variables__modal__body", children: [_jsx(PanelFormTextField, { name: "Constant Name", prompt: "Name of constant. Should be descriptive of its purpose.", update: (value) => variableExpression_setName(varExpression, value ?? ''), value: varExpression.name, errorMessage: validationMessage, isReadOnly: false }), _jsxs(PanelFormSection, { children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "Type" }), _jsx("div", { className: "panel__content__form__section__header__prompt", children: "Data type of the constant." }), _jsx(CustomSelectorInput, { placeholder: "Choose a type...", options: typeOptions, onChange: changeType, value: selectedType, darkMode: !applicationStore.layoutService
+        }, children: _jsxs(Modal, { darkMode: true, className: "editor-modal query-builder__variables__modal", children: [_jsx(ModalHeader, { title: `${isCreating ? 'Create Constant' : 'Update Constant'}` }), _jsxs(ModalBody, { className: "query-builder__variables__modal__body", children: [_jsx(PanelFormValidatedTextField, { name: "Constant Name", prompt: "Name of constant. Should be descriptive of its purpose.", update: (value) => {
+                                variableExpression_setName(varExpression, value ?? '');
+                            }, validate: getValidationMessage, onValidate: (issue) => setIsNameValid(!issue), value: variableName, isReadOnly: false }), _jsxs(PanelFormSection, { children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "Type" }), _jsx("div", { className: "panel__content__form__section__header__prompt", children: "Data type of the constant." }), _jsx(CustomSelectorInput, { placeholder: "Choose a type...", options: typeOptions, onChange: changeType, value: selectedType, darkMode: !applicationStore.layoutService
                                         .TEMPORARY__isLightColorThemeEnabled, formatOptionLabel: getPackageableElementOptionFormatter({
                                         darkMode: !applicationStore.layoutService
                                             .TEMPORARY__isLightColorThemeEnabled,
@@ -81,7 +87,7 @@ const QueryBuilderConstantExpressionEditor = observer((props) => {
                                         }, graph: queryBuilderState.graphManagerState.graph, obseverContext: queryBuilderState.observerContext, typeCheckOption: {
                                             expectedType: variableType,
                                             match: variableType === PrimitiveType.DATETIME,
-                                        }, resetValue: resetConstantValue }) })] })] }), _jsxs(ModalFooter, { children: [isCreating && (_jsx(ModalFooterButton, { text: "Create", inProgress: Boolean(validationMessage), onClick: onAction })), _jsx(ModalFooterButton, { text: "Close", onClick: close })] })] }) }));
+                                        }, resetValue: resetConstantValue }) })] })] }), _jsxs(ModalFooter, { children: [isCreating && (_jsx(ModalFooterButton, { text: "Create", disabled: !isNameValid, onClick: onAction })), _jsx(ModalFooterButton, { text: "Close", onClick: close })] })] }) }));
 });
 export const QueryBuilderConstantExpressionPanel = observer((props) => {
     const { queryBuilderState } = props;

package/lib/components/QueryBuilderConstantExpressionPanel.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderConstantExpressionPanel.js","sourceRoot":"","sources":["../../src/components/QueryBuilderConstantExpressionPanel.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderConstantExpressionPanel.js","sourceRoot":"","sources":["../../src/components/QueryBuilderConstantExpressionPanel.tsx"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderParametersPanel.d.ts","sourceRoot":"","sources":["../../src/components/QueryBuilderParametersPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAmNxE,eAAO,MAAM,2BAA2B,WAC9B;IAAE,iBAAiB,EAAE,iBAAiB,CAAA;CAAE;;CA4GjD,CAAC"}
+{"version":3,"file":"QueryBuilderParametersPanel.d.ts","sourceRoot":"","sources":["../../src/components/QueryBuilderParametersPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AA8NxE,eAAO,MAAM,2BAA2B,WAC9B;IAAE,iBAAiB,EAAE,iBAAiB,CAAA;CAAE;;CA4GjD,CAAC"}

package/lib/components/QueryBuilderParametersPanel.js

@@ -15,8 +15,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * limitations under the License.
  */
 import { observer } from 'mobx-react-lite';
-import { Dialog, BlankPanelContent, CustomSelectorInput, PlusIcon, BlankPanelPlaceholder, Modal, ModalBody, ModalFooter, ModalHeader, PanelFormTextField, InfoCircleIcon, ModalFooterButton, } from '@finos/legend-art';
-import { VariableExpression, GenericTypeExplicitReference, GenericType, PrimitiveType, Multiplicity, getMultiplicityPrettyDescription, } from '@finos/legend-graph';
+import { Dialog, BlankPanelContent, CustomSelectorInput, PlusIcon, BlankPanelPlaceholder, Modal, ModalBody, ModalFooter, ModalHeader, InfoCircleIcon, ModalFooterButton, PanelFormValidatedTextField, } from '@finos/legend-art';
+import { VariableExpression, GenericTypeExplicitReference, GenericType, PrimitiveType, Multiplicity, getMultiplicityPrettyDescription, isValidIdentifier, } from '@finos/legend-graph';
 import { useApplicationStore } from '@finos/legend-application';
 import { generateEnumerableNameFromToken } from '@finos/legend-shared';
 import { DEFAULT_VARIABLE_NAME } from '../stores/QueryBuilderConfig.js';
@@ -26,6 +26,7 @@ import { LambdaParameterValuesEditor } from './shared/LambdaParameterValuesEdito
 import { VariableViewer } from './shared/QueryBuilderVariableSelector.js';
 import { QUERY_BUILDER_TEST_ID } from '../__lib__/QueryBuilderTesting.js';
 import { QUERY_BUILDER_DOCUMENTATION_KEY } from '../__lib__/QueryBuilderDocumentation.js';
+import { useState } from 'react';
 import { buildElementOption, getPackageableElementOptionFormatter, } from '@finos/legend-lego/graph-editor';
 const buildMultiplicityOption = (multiplicity) => ({
     label: getMultiplicityPrettyDescription(multiplicity),
@@ -40,17 +41,6 @@ const VariableExpressionEditor = observer((props) => {
     const isCreating = !queryParametersState.parameterStates.includes(lambdaParameterState);
     const varState = lambdaParameterState.parameter;
     const multiplity = varState.multiplicity;
-    const validationMessage = !varState.name
-        ? `Parameter name can't be empty`
-        : allVariableNames.filter((e) => e === varState.name).length >
-            (isCreating ? 0 : 1)
-            ? 'Parameter Name Already Exists'
-            : (isCreating &&
-                queryParametersState.parameterStates.find((p) => p.parameter.name === varState.name)) ||
-                (!isCreating &&
-                    queryParametersState.parameterStates.filter((p) => p.parameter.name === varState.name).length > 1)
-                ? 'Parameter name already exists'
-                : undefined;
     // type
     const variableType = lambdaParameterState.variableType ?? PrimitiveType.STRING;
     const selectedType = buildElementOption(variableType);
@@ -73,6 +63,21 @@ const VariableExpressionEditor = observer((props) => {
     const changeMultiplicity = (val) => {
         lambdaParameterState.changeMultiplicity(varState, val.value);
     };
+    const parameterNameValue = varState.name;
+    const [isNameValid, setIsNameValid] = useState(true);
+    const getValidationMessage = (input) => !input
+        ? `Parameter name can't be empty`
+        : allVariableNames.filter((e) => e === input).length >
+            (isCreating ? 0 : 1)
+            ? 'Parameter name already exists'
+            : (isCreating &&
+                queryParametersState.parameterStates.find((p) => p.parameter.name === input)) ||
+                (!isCreating &&
+                    queryParametersState.parameterStates.filter((p) => p.parameter.name === input).length > 1)
+                ? 'Parameter name already exists'
+                : isValidIdentifier(input, true) === false
+                    ? 'Parameter name must be text with no spaces and not start with an uppercase letter or number'
+                    : undefined;
     const close = () => {
         queryParametersState.setSelectedParameter(undefined);
     };
@@ -86,12 +91,14 @@ const VariableExpressionEditor = observer((props) => {
             root: 'editor-modal__root-container',
             container: 'editor-modal__container',
             paper: 'editor-modal__content',
-        }, children: _jsxs(Modal, { darkMode: true, className: "editor-modal query-builder__variables__modal", children: [_jsx(ModalHeader, { title: `${isCreating ? 'Create Parameter' : 'Update Parameter'}` }), _jsxs(ModalBody, { className: "query-builder__variables__modal__body", children: [_jsx(PanelFormTextField, { name: "Parameter Name", prompt: "Name of the parameter. Should be descriptive of its purpose.", update: (value) => variableExpression_setName(varState, value ?? ''), value: varState.name, errorMessage: validationMessage, isReadOnly: false }), _jsxs("div", { className: "panel__content__form__section", children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "Type" }), _jsx("div", { className: "panel__content__form__section__header__prompt", children: "Data type of the parameter." }), _jsx(CustomSelectorInput, { placeholder: "Choose a type...", options: typeOptions, onChange: changeType, value: selectedType, darkMode: !applicationStore.layoutService
+        }, children: _jsxs(Modal, { darkMode: true, className: "editor-modal query-builder__variables__modal", children: [_jsx(ModalHeader, { title: `${isCreating ? 'Create Parameter' : 'Update Parameter'}` }), _jsxs(ModalBody, { className: "query-builder__variables__modal__body", children: [_jsx(PanelFormValidatedTextField, { name: "Parameter Name", prompt: "Name of the parameter. Should be descriptive of its purpose.", value: parameterNameValue, update: (value) => {
+                                variableExpression_setName(varState, value ?? '');
+                            }, validate: getValidationMessage, onValidate: (issue) => setIsNameValid(!issue), isReadOnly: false }), _jsxs("div", { className: "panel__content__form__section", children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "Type" }), _jsx("div", { className: "panel__content__form__section__header__prompt", children: "Data type of the parameter." }), _jsx(CustomSelectorInput, { placeholder: "Choose a type...", options: typeOptions, onChange: changeType, value: selectedType, darkMode: !applicationStore.layoutService
                                         .TEMPORARY__isLightColorThemeEnabled, formatOptionLabel: getPackageableElementOptionFormatter({
                                         darkMode: !applicationStore.layoutService
                                             .TEMPORARY__isLightColorThemeEnabled,
                                     }) })] }), _jsxs("div", { className: "panel__content__form__section", children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "Multiplicity" }), _jsx("div", { className: "panel__content__form__section__header__prompt", children: "The multiplity determines how many values a parameter can have. Default is set to mandatory single vlue." }), _jsx(CustomSelectorInput, { placeholder: "Choose a multiplicity...", options: multilicityOptions, onChange: changeMultiplicity, value: selectedMultiplicity, hasError: !validParamMultiplicityList.includes(selectedMultiplicity.value), darkMode: !applicationStore.layoutService
-                                        .TEMPORARY__isLightColorThemeEnabled })] })] }), _jsxs(ModalFooter, { children: [isCreating && (_jsx(ModalFooterButton, { text: "Create", inProgress: Boolean(validationMessage), onClick: onAction })), _jsx(ModalFooterButton, { onClick: close, text: "Close" })] })] }) }));
+                                        .TEMPORARY__isLightColorThemeEnabled })] })] }), _jsxs(ModalFooter, { children: [isCreating && (_jsx(ModalFooterButton, { text: "Create", disabled: !isNameValid, onClick: onAction })), _jsx(ModalFooterButton, { onClick: close, text: "Close" })] })] }) }));
 });
 export const QueryBuilderParametersPanel = observer((props) => {
     const { queryBuilderState } = props;

package/lib/components/QueryBuilderParametersPanel.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderParametersPanel.js","sourceRoot":"","sources":["../../src/components/QueryBuilderParametersPanel.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderParametersPanel.js","sourceRoot":"","sources":["../../src/components/QueryBuilderParametersPanel.tsx"],"names":[],"mappings":"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"}

package/lib/components/shared/LambdaParameterValuesEditor.js

@@ -51,6 +51,6 @@ export const LambdaParameterValuesEditor = observer((props) => {
                                         expectedType: variableType,
                                         match: variableType === PrimitiveType.DATETIME,
                                     }, className: "query-builder__parameters__value__editor", resetValue: () => paramState.mockParameterValue() }))] }, paramState.uuid));
-                    }) }), _jsxs(ModalFooter, { children: [isClosingAction && (_jsx(ModalFooterStatus, { children: " Closing..." })), submitAction && (_jsx(ModalFooterButton, { inProgress: isSubmitAction, inProgressText: `${submitAction.label}...`, onClick: submit, text: submitAction.label })), _jsx(ModalFooterButton, { inProgress: isClosingAction, inProgressText: 'Closing...', onClick: close, text: "Close" })] })] }) }));
+                    }) }), _jsxs(ModalFooter, { children: [isClosingAction && (_jsx(ModalFooterStatus, { children: " Closing..." })), submitAction && (_jsx(ModalFooterButton, { inProgressText: isSubmitAction ? `${submitAction.label}...` : undefined, onClick: submit, text: submitAction.label })), _jsx(ModalFooterButton, { inProgressText: isClosingAction ? 'Closing...' : undefined, onClick: close, text: "Close" })] })] }) }));
 });
 //# sourceMappingURL=LambdaParameterValuesEditor.js.map

package/lib/components/shared/LambdaParameterValuesEditor.js.map

@@ -1 +1 @@
-{"version":3,"file":"LambdaParameterValuesEditor.js","sourceRoot":"","sources":["../../../src/components/shared/LambdaParameterValuesEditor.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"LambdaParameterValuesEditor.js","sourceRoot":"","sources":["../../../src/components/shared/LambdaParameterValuesEditor.tsx"],"names":[],"mappings":"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"}

package/lib/index.css

@@ -1,4 +1,4 @@
-/** @license @finos/legend-query-builder v3.0.5
+/** @license @finos/legend-query-builder v3.0.7
  * Copyright (c) 2020-present, Goldman Sachs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

package/lib/index.d.ts

@@ -35,6 +35,8 @@ export * from './components/ServiceQuerySetupUtils.js';
 export * from './components/QuerySetupUtils.js';
 export * from './components/QueryBuilderTextEditor.js';
 export { QueryBuilderTextEditorMode } from './stores/QueryBuilderTextEditorState.js';
+export { buildSerialzieFunctionWithGraphFetch } from './stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.js';
+export { buildGetAllFunction } from './stores/QueryBuilderValueSpecificationBuilder.js';
 export * from './components/shared/LambdaEditor.js';
 export { LambdaEditorState } from './stores/shared/LambdaEditorState.js';
 export * from './stores/shared/LambdaParameterState.js';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,cAAc,0CAA0C,CAAC;AACzD,cAAc,gCAAgC,CAAC;AAE/C,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AAErG,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EACL,KAAK,4BAA4B,EACjC,oCAAoC,GACrC,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,6BAA6B,EAAE,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,kCAAkC,EAAE,MAAM,8CAA8C,CAAC;AAClG,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,+BAA+B,EAAE,MAAM,sDAAsD,CAAC;AACvG,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAC1F,OAAO,EACL,KAAK,uBAAuB,EAC5B,wBAAwB,GACzB,MAAM,gDAAgD,CAAC;AAExD,OAAO,EAAE,oCAAoC,EAAE,MAAM,yEAAyE,CAAC;AAC/H,YAAY,EAAE,8BAA8B,EAAE,MAAM,8DAA8D,CAAC;AACnH,YAAY,EAAE,yCAAyC,EAAE,MAAM,yEAAyE,CAAC;AACzI,cAAc,yBAAyB,CAAC;AACxC,cAAc,wCAAwC,CAAC;AACvD,cAAc,iCAAiC,CAAC;AAChD,cAAc,wCAAwC,CAAC;AAEvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AAIrF,cAAc,qCAAqC,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,cAAc,yCAAyC,CAAC;AAExD,cAAc,sDAAsD,CAAC;AACrE,cAAc,oDAAoD,CAAC;AAEnE,cAAc,qDAAqD,CAAC;AACpE,cAAc,mDAAmD,CAAC;AAElE,cAAc,oDAAoD,CAAC;AACnE,cAAc,+CAA+C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,cAAc,0CAA0C,CAAC;AACzD,cAAc,gCAAgC,CAAC;AAE/C,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AAErG,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EACL,KAAK,4BAA4B,EACjC,oCAAoC,GACrC,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,6BAA6B,EAAE,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,kCAAkC,EAAE,MAAM,8CAA8C,CAAC;AAClG,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,+BAA+B,EAAE,MAAM,sDAAsD,CAAC;AACvG,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAC1F,OAAO,EACL,KAAK,uBAAuB,EAC5B,wBAAwB,GACzB,MAAM,gDAAgD,CAAC;AAExD,OAAO,EAAE,oCAAoC,EAAE,MAAM,yEAAyE,CAAC;AAC/H,YAAY,EAAE,8BAA8B,EAAE,MAAM,8DAA8D,CAAC;AACnH,YAAY,EAAE,yCAAyC,EAAE,MAAM,yEAAyE,CAAC;AACzI,cAAc,yBAAyB,CAAC;AACxC,cAAc,wCAAwC,CAAC;AACvD,cAAc,iCAAiC,CAAC;AAChD,cAAc,wCAAwC,CAAC;AAEvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EAAE,oCAAoC,EAAE,MAAM,6FAA6F,CAAC;AACnJ,OAAO,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAIxF,cAAc,qCAAqC,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,cAAc,yCAAyC,CAAC;AAExD,cAAc,sDAAsD,CAAC;AACrE,cAAc,oDAAoD,CAAC;AAEnE,cAAc,qDAAqD,CAAC;AACpE,cAAc,mDAAmD,CAAC;AAElE,cAAc,oDAAoD,CAAC;AACnE,cAAc,+CAA+C,CAAC"}

package/lib/index.js

@@ -34,6 +34,8 @@ export * from './components/ServiceQuerySetupUtils.js';
 export * from './components/QuerySetupUtils.js';
 export * from './components/QueryBuilderTextEditor.js';
 export { QueryBuilderTextEditorMode } from './stores/QueryBuilderTextEditorState.js';
+export { buildSerialzieFunctionWithGraphFetch } from './stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.js';
+export { buildGetAllFunction } from './stores/QueryBuilderValueSpecificationBuilder.js';
 // ------------------------------------------- Shared components -------------------------------------------
 export * from './components/shared/LambdaEditor.js';
 export { LambdaEditorState } from './stores/shared/LambdaEditorState.js';

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,cAAc;AACd,cAAc,0CAA0C,CAAC;AACzD,cAAc,gCAAgC,CAAC;AAE/C,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AAErG,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAEL,oCAAoC,GACrC,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,6BAA6B,EAAE,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,kCAAkC,EAAE,MAAM,8CAA8C,CAAC;AAClG,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,+BAA+B,EAAE,MAAM,sDAAsD,CAAC;AACvG,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAC1F,OAAO,EAEL,wBAAwB,GACzB,MAAM,gDAAgD,CAAC;AAExD,OAAO,EAAE,oCAAoC,EAAE,MAAM,yEAAyE,CAAC;AAG/H,cAAc,yBAAyB,CAAC;AACxC,cAAc,wCAAwC,CAAC;AACvD,cAAc,iCAAiC,CAAC;AAChD,cAAc,wCAAwC,CAAC;AAEvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AAErF,4GAA4G;AAE5G,cAAc,qCAAqC,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,cAAc,yCAAyC,CAAC;AAExD,cAAc,sDAAsD,CAAC;AACrE,cAAc,oDAAoD,CAAC;AAEnE,cAAc,qDAAqD,CAAC;AACpE,cAAc,mDAAmD,CAAC;AAElE,cAAc,oDAAoD,CAAC;AACnE,cAAc,+CAA+C,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,cAAc;AACd,cAAc,0CAA0C,CAAC;AACzD,cAAc,gCAAgC,CAAC;AAE/C,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AAErG,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAEL,oCAAoC,GACrC,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,6BAA6B,EAAE,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,kCAAkC,EAAE,MAAM,8CAA8C,CAAC;AAClG,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,+BAA+B,EAAE,MAAM,sDAAsD,CAAC;AACvG,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAC1F,OAAO,EAEL,wBAAwB,GACzB,MAAM,gDAAgD,CAAC;AAExD,OAAO,EAAE,oCAAoC,EAAE,MAAM,yEAAyE,CAAC;AAG/H,cAAc,yBAAyB,CAAC;AACxC,cAAc,wCAAwC,CAAC;AACvD,cAAc,iCAAiC,CAAC;AAChD,cAAc,wCAAwC,CAAC;AAEvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EAAE,oCAAoC,EAAE,MAAM,6FAA6F,CAAC;AACnJ,OAAO,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAExF,4GAA4G;AAE5G,cAAc,qCAAqC,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,cAAc,yCAAyC,CAAC;AAExD,cAAc,sDAAsD,CAAC;AACrE,cAAc,oDAAoD,CAAC;AAEnE,cAAc,qDAAqD,CAAC;AACpE,cAAc,mDAAmD,CAAC;AAElE,cAAc,oDAAoD,CAAC;AACnE,cAAc,+CAA+C,CAAC"}

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@finos/legend-query-builder",
-    "version": "3.0.5",
+    "version": "3.0.7",
     "description": "Legend query builder core",
     "keywords": [
         "legend",
@@ -50,7 +50,7 @@
         "@finos/legend-shared": "workspace:*",
         "@finos/legend-storage": "workspace:*",
         "@testing-library/react": "14.0.0",
-        "@types/react": "18.0.37",
+        "@types/react": "18.0.38",
         "@types/react-dom": "18.0.11",
         "mathjs": "11.8.0",
         "mobx": "6.9.0",
@@ -66,7 +66,7 @@
         "@finos/legend-dev-utils": "workspace:*",
         "@jest/globals": "29.5.0",
         "cross-env": "7.0.3",
-        "eslint": "8.38.0",
+        "eslint": "8.39.0",
         "jest": "29.5.0",
         "npm-run-all": "4.1.5",
         "rimraf": "5.0.0",

package/lib/stores/QueryBuilderState.js

@@ -293,7 +293,7 @@ export class QueryBuilderState {
         }
         catch (error) {
             assertErrorThrown(error);
-            this.resetQueryResult();
+            this.resetQueryResult({ preserveResult: options?.preserveResult });
             this.resetQueryContent();
             this.unsupportedQueryState.setLambdaError(error);
             this.unsupportedQueryState.setRawLambda(query);
@@ -301,7 +301,7 @@ export class QueryBuilderState {
             const parameters = buildLambdaVariableExpressions(query, this.graphManagerState)
                 .map((param) => observe_ValueSpecification(param, this.observerContext))
                 .filter(filterByType(VariableExpression));
-            processParameters(parameters, this);
+            processParameters(parameters, this, previousStateParameterValues);
         }
     }
     async saveQuery(onSaveQuery) {

package/lib/stores/QueryBuilderState.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderState.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderState.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderState.ts"],"names":[],"mappings":"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"}

package/lib/stores/QueryBuilderValueSpecificationBuilder.d.ts

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { LambdaFunction } from '@finos/legend-graph';
+import { type Class, Multiplicity, LambdaFunction, SimpleFunctionExpression } from '@finos/legend-graph';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import type { LambdaFunctionBuilderOption } from './QueryBuilderValueSpecificationBuilderHelper.js';
+export declare const buildGetAllFunction: (_class: Class, multiplicity: Multiplicity) => SimpleFunctionExpression;
 export declare const buildLambdaFunction: (queryBuilderState: QueryBuilderState, options?: LambdaFunctionBuilderOption) => LambdaFunction;
 //# sourceMappingURL=QueryBuilderValueSpecificationBuilder.d.ts.map

package/lib/stores/QueryBuilderValueSpecificationBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAWL,cAAc,EAKf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,kDAAkD,CAAC;AAoEpG,eAAO,MAAM,mBAAmB,sBACX,iBAAiB,YAC1B,2BAA2B,KACpC,cAiFF,CAAC"}
+{"version":3,"file":"QueryBuilderValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,KAAK,KAAK,EACV,YAAY,EASZ,cAAc,EACd,wBAAwB,EAIzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,kDAAkD,CAAC;AAOpG,eAAO,MAAM,mBAAmB,WACtB,KAAK,gBACC,YAAY,KACzB,wBAWF,CAAC;AA+CF,eAAO,MAAM,mBAAmB,sBACX,iBAAiB,YAC1B,2BAA2B,KACpC,cAiFF,CAAC"}

package/lib/stores/QueryBuilderValueSpecificationBuilder.js

@@ -19,7 +19,7 @@ import { buildFilterExpression } from './filter/QueryBuilderFilterValueSpecifica
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graph/QueryBuilderMetaModelConst.js';
 import { buildWatermarkExpression } from './watermark/QueryBuilderWatermarkValueSpecificationBuilder.js';
 import { buildExecutionQueryFromLambdaFunction } from './shared/LambdaParameterState.js';
-const buildGetAllFunction = (_class, multiplicity) => {
+export const buildGetAllFunction = (_class, multiplicity) => {
     const _func = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.GET_ALL));
     const classInstance = new InstanceValue(multiplicity, GenericTypeExplicitReference.create(new GenericType(_class)));
     classInstance.values[0] = PackageableElementExplicitReference.create(_class);

package/lib/stores/QueryBuilderValueSpecificationBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderValueSpecificationBuilder.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderValueSpecificationBuilder.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderValueSpecificationBuilder.ts"],"names":[],"mappings":"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"}

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.d.ts

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { type LambdaFunction, type PureModel, SimpleFunctionExpression } from '@finos/legend-graph';
+import { type ValueSpecification, type LambdaFunction, type PureModel, type RootGraphFetchTree, SimpleFunctionExpression } from '@finos/legend-graph';
 import { type QueryBuilderGraphFetchTreeState } from './QueryBuilderGraphFetchTreeState.js';
 export declare const buildPureSerializationConfig: (config: Record<PropertyKey, boolean>, graph: PureModel) => SimpleFunctionExpression;
+export declare const buildSerialzieFunctionWithGraphFetch: (tree: RootGraphFetchTree, isChecked: boolean, precedingExpression: ValueSpecification, pureConfig: SimpleFunctionExpression | undefined) => SimpleFunctionExpression;
 export declare const appendGraphFetch: (graphFetchTreeState: QueryBuilderGraphFetchTreeState, lambdaFunction: LambdaFunction, options?: {
     /**
      * Set queryBuilderState to `true` when we construct query for execution within the app.

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderGraphFetchTreeValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,SAAS,EAMd,wBAAwB,EAUzB,MAAM,qBAAqB,CAAC;AAU7B,OAAO,EAGL,KAAK,+BAA+B,EACrC,MAAM,sCAAsC,CAAC;AAmD9C,eAAO,MAAM,4BAA4B,WAC/B,OAAO,WAAW,EAAE,OAAO,CAAC,SAC7B,SAAS,KACf,wBAwDF,CAAC;AAEF,eAAO,MAAM,gBAAgB,wBACN,+BAA+B,kBACpC,cAAc,YACpB;IACR;;;OAGG;IACH,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/C,qBAAqB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7C,KACA,IAmGF,CAAC"}
+{"version":3,"file":"QueryBuilderGraphFetchTreeValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,kBAAkB,EAMvB,wBAAwB,EAUzB,MAAM,qBAAqB,CAAC;AAU7B,OAAO,EAGL,KAAK,+BAA+B,EACrC,MAAM,sCAAsC,CAAC;AAmD9C,eAAO,MAAM,4BAA4B,WAC/B,OAAO,WAAW,EAAE,OAAO,CAAC,SAC7B,SAAS,KACf,wBAwDF,CAAC;AAEF,eAAO,MAAM,oCAAoC,SACzC,kBAAkB,aACb,OAAO,uBACG,kBAAkB,cAC3B,wBAAwB,GAAG,SAAS,KAC/C,wBAqBF,CAAC;AAEF,eAAO,MAAM,gBAAgB,wBACN,+BAA+B,kBACpC,cAAc,YACpB;IACR;;;OAGG;IACH,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/C,qBAAqB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7C,KACA,IAwFF,CAAC"}

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.js

@@ -80,6 +80,20 @@ export const buildPureSerializationConfig = (config, graph) => {
     ];
     return newFunction;
 };
+export const buildSerialzieFunctionWithGraphFetch = (tree, isChecked, precedingExpression, pureConfig) => {
+    const graphFetchInstance = new GraphFetchTreeInstanceValue();
+    graphFetchInstance.values = [tree];
+    const serializeFunction = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SERIALIZE));
+    const graphFetchFunc = new SimpleFunctionExpression(isChecked
+        ? extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH_CHECKED)
+        : extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH));
+    graphFetchFunc.parametersValues = [precedingExpression, graphFetchInstance];
+    serializeFunction.parametersValues = [graphFetchFunc, graphFetchInstance];
+    if (pureConfig) {
+        serializeFunction.parametersValues.push(pureConfig);
+    }
+    return serializeFunction;
+};
 export const appendGraphFetch = (graphFetchTreeState, lambdaFunction, options) => {
     const queryBuilderState = graphFetchTreeState.queryBuilderState;
     const precedingExpression = guaranteeNonNullable(lambdaFunction.expressionSequence[0], `Can't build graph-fetch tree expression: preceding expression is not defined`);
@@ -88,21 +102,10 @@ export const appendGraphFetch = (graphFetchTreeState, lambdaFunction, options) =
         // build graph-fetch tree
         if (graphFetchTreeState.treeData &&
             !isGraphFetchTreeDataEmpty(graphFetchTreeState.treeData)) {
-            const graphFetchInstance = new GraphFetchTreeInstanceValue();
-            graphFetchInstance.values = [graphFetchTreeState.treeData.tree];
-            const serializeFunction = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SERIALIZE));
-            const graphFetchFunc = new SimpleFunctionExpression(graphFetchTreeState.isChecked
-                ? extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH_CHECKED)
-                : extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH));
-            graphFetchFunc.parametersValues = [
-                precedingExpression,
-                graphFetchInstance,
-            ];
-            serializeFunction.parametersValues = [graphFetchFunc, graphFetchInstance];
-            if (serializationState.config) {
-                const configFunction = buildPureSerializationConfig(serializationState.config, graphFetchTreeState.queryBuilderState.graphManagerState.graph);
-                serializeFunction.parametersValues.push(configFunction);
-            }
+            const pureConfig = serializationState.config
+                ? buildPureSerializationConfig(serializationState.config, graphFetchTreeState.queryBuilderState.graphManagerState.graph)
+                : undefined;
+            const serializeFunction = buildSerialzieFunctionWithGraphFetch(graphFetchTreeState.treeData.tree, graphFetchTreeState.isChecked, precedingExpression, pureConfig);
             lambdaFunction.expressionSequence[0] = serializeFunction;
         }
     }

package/lib/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderGraphFetchTreeValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderGraphFetchTreeValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../../src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -42,15 +42,15 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "15.0.2",
-    "@finos/legend-art": "7.0.3",
-    "@finos/legend-graph": "28.0.3",
-    "@finos/legend-lego": "0.1.8",
-    "@finos/legend-server-depot": "6.0.0",
-    "@finos/legend-shared": "10.0.0",
-    "@finos/legend-storage": "3.0.50",
+    "@finos/legend-application": "15.0.4",
+    "@finos/legend-art": "7.0.5",
+    "@finos/legend-graph": "28.1.1",
+    "@finos/legend-lego": "0.1.10",
+    "@finos/legend-server-depot": "6.0.2",
+    "@finos/legend-shared": "10.0.2",
+    "@finos/legend-storage": "3.0.52",
     "@testing-library/react": "14.0.0",
-    "@types/react": "18.0.37",
+    "@types/react": "18.0.38",
     "@types/react-dom": "18.0.11",
     "mathjs": "11.8.0",
     "mobx": "6.9.0",
@@ -63,10 +63,10 @@
     "sql-formatter": "12.2.0"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.55",
+    "@finos/legend-dev-utils": "2.0.56",
     "@jest/globals": "29.5.0",
     "cross-env": "7.0.3",
-    "eslint": "8.38.0",
+    "eslint": "8.39.0",
     "jest": "29.5.0",
     "npm-run-all": "4.1.5",
     "rimraf": "5.0.0",

package/src/components/QueryBuilderConstantExpressionPanel.tsx

@@ -30,7 +30,7 @@ import {
   ModalFooterButton,
   ModalHeader,
   PanelFormSection,
-  PanelFormTextField,
+  PanelFormValidatedTextField,
   PlusIcon,
 } from '@finos/legend-art';
 import {
@@ -39,6 +39,7 @@ import {
   PrimitiveType,
   VariableExpression,
   Multiplicity,
+  isValidIdentifier,
 } from '@finos/legend-graph';
 import { generateEnumerableNameFromToken } from '@finos/legend-shared';
 import { observer } from 'mobx-react-lite';
@@ -46,11 +47,12 @@ import { DEFAULT_CONSTANT_VARIABLE_NAME } from '../stores/QueryBuilderConfig.js'
 import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
 import { QueryBuilderConstantExpressionState } from '../stores/QueryBuilderConstantsState.js';
 import { buildDefaultInstanceValue } from '../stores/shared/ValueSpecificationEditorHelper.js';
-import { variableExpression_setName } from '../stores/shared/ValueSpecificationModifierHelper.js';
 import { BasicValueSpecificationEditor } from './shared/BasicValueSpecificationEditor.js';
 import { VariableViewer } from './shared/QueryBuilderVariableSelector.js';
 import { QUERY_BUILDER_TEST_ID } from '../__lib__/QueryBuilderTesting.js';
 import { QUERY_BUILDER_DOCUMENTATION_KEY } from '../__lib__/QueryBuilderDocumentation.js';
+import { useState } from 'react';
+import { variableExpression_setName } from '../stores/shared/ValueSpecificationModifierHelper.js';
 
 // NOTE: We currently only allow constant variables for primitive types of multiplicity ONE.
 // This is why we don't show multiplicity in the editor.
@@ -68,9 +70,7 @@ const QueryBuilderConstantExpressionEditor = observer(
     const variableType =
       constantState.value.genericType?.value.rawType ?? PrimitiveType.STRING;
     const selectedType = buildElementOption(variableType);
-    const close = (): void => {
-      variableState.setSelectedConstant(undefined);
-    };
+
     const changeType = (val: PackageableElementOption<Type>): void => {
       if (variableType !== val.value) {
         constantState.changeValSpecType(val.value);
@@ -84,12 +84,23 @@ const QueryBuilderConstantExpressionEditor = observer(
             buildElementOption,
           ),
         );
-    const validationMessage = !variableName
-      ? `Constant Name can't be empty`
-      : allVariableNames.filter((e) => e === variableName).length >
-        (isCreating ? 0 : 1)
-      ? 'Constant Name Already Exists'
-      : undefined;
+
+    const [isNameValid, setIsNameValid] = useState<boolean>(true);
+
+    const getValidationMessage = (constantInput: string): string | undefined =>
+      !constantInput
+        ? `Constant name can't be empty`
+        : isValidIdentifier(constantInput) === false
+        ? 'Constant name must be text with no spaces and not start with an uppercase letter or number'
+        : allVariableNames.filter((e) => e === constantInput).length >
+          (isCreating ? 0 : 1)
+        ? 'Constant name already exists'
+        : undefined;
+
+    const close = (): void => {
+      variableState.setSelectedConstant(undefined);
+    };
+
     const onAction = (): void => {
       if (isCreating) {
         variableState.addConstant(constantState);
@@ -123,14 +134,15 @@ const QueryBuilderConstantExpressionEditor = observer(
             title={`${isCreating ? 'Create Constant' : 'Update Constant'}`}
           />
           <ModalBody className="query-builder__variables__modal__body">
-            <PanelFormTextField
+            <PanelFormValidatedTextField
               name="Constant Name"
               prompt="Name of constant. Should be descriptive of its purpose."
-              update={(value: string | undefined): void =>
-                variableExpression_setName(varExpression, value ?? '')
-              }
-              value={varExpression.name}
-              errorMessage={validationMessage}
+              update={(value: string | undefined): void => {
+                variableExpression_setName(varExpression, value ?? '');
+              }}
+              validate={getValidationMessage}
+              onValidate={(issue: string | undefined) => setIsNameValid(!issue)}
+              value={variableName}
               isReadOnly={false}
             />
             <PanelFormSection>
@@ -181,7 +193,7 @@ const QueryBuilderConstantExpressionEditor = observer(
             {isCreating && (
               <ModalFooterButton
                 text="Create"
-                inProgress={Boolean(validationMessage)}
+                disabled={!isNameValid}
                 onClick={onAction}
               />
             )}

package/src/components/QueryBuilderParametersPanel.tsx

@@ -26,9 +26,9 @@ import {
   ModalBody,
   ModalFooter,
   ModalHeader,
-  PanelFormTextField,
   InfoCircleIcon,
   ModalFooterButton,
+  PanelFormValidatedTextField,
 } from '@finos/legend-art';
 import {
   type Type,
@@ -38,6 +38,7 @@ import {
   PrimitiveType,
   Multiplicity,
   getMultiplicityPrettyDescription,
+  isValidIdentifier,
 } from '@finos/legend-graph';
 import { useApplicationStore } from '@finos/legend-application';
 import { generateEnumerableNameFromToken } from '@finos/legend-shared';
@@ -48,6 +49,7 @@ import { LambdaParameterValuesEditor } from './shared/LambdaParameterValuesEdito
 import { VariableViewer } from './shared/QueryBuilderVariableSelector.js';
 import { QUERY_BUILDER_TEST_ID } from '../__lib__/QueryBuilderTesting.js';
 import { QUERY_BUILDER_DOCUMENTATION_KEY } from '../__lib__/QueryBuilderDocumentation.js';
+import { useState } from 'react';
 import {
   buildElementOption,
   getPackageableElementOptionFormatter,
@@ -77,21 +79,6 @@ const VariableExpressionEditor = observer(
       !queryParametersState.parameterStates.includes(lambdaParameterState);
     const varState = lambdaParameterState.parameter;
     const multiplity = varState.multiplicity;
-    const validationMessage = !varState.name
-      ? `Parameter name can't be empty`
-      : allVariableNames.filter((e) => e === varState.name).length >
-        (isCreating ? 0 : 1)
-      ? 'Parameter Name Already Exists'
-      : (isCreating &&
-          queryParametersState.parameterStates.find(
-            (p) => p.parameter.name === varState.name,
-          )) ||
-        (!isCreating &&
-          queryParametersState.parameterStates.filter(
-            (p) => p.parameter.name === varState.name,
-          ).length > 1)
-      ? 'Parameter name already exists'
-      : undefined;
 
     // type
     const variableType =
@@ -124,6 +111,29 @@ const VariableExpressionEditor = observer(
       lambdaParameterState.changeMultiplicity(varState, val.value);
     };
 
+    const parameterNameValue = varState.name;
+
+    const [isNameValid, setIsNameValid] = useState<boolean>(true);
+
+    const getValidationMessage = (input: string): string | undefined =>
+      !input
+        ? `Parameter name can't be empty`
+        : allVariableNames.filter((e) => e === input).length >
+          (isCreating ? 0 : 1)
+        ? 'Parameter name already exists'
+        : (isCreating &&
+            queryParametersState.parameterStates.find(
+              (p) => p.parameter.name === input,
+            )) ||
+          (!isCreating &&
+            queryParametersState.parameterStates.filter(
+              (p) => p.parameter.name === input,
+            ).length > 1)
+        ? 'Parameter name already exists'
+        : isValidIdentifier(input, true) === false
+        ? 'Parameter name must be text with no spaces and not start with an uppercase letter or number'
+        : undefined;
+
     const close = (): void => {
       queryParametersState.setSelectedParameter(undefined);
     };
@@ -152,14 +162,15 @@ const VariableExpressionEditor = observer(
             title={`${isCreating ? 'Create Parameter' : 'Update Parameter'}`}
           />
           <ModalBody className="query-builder__variables__modal__body">
-            <PanelFormTextField
+            <PanelFormValidatedTextField
               name="Parameter Name"
               prompt="Name of the parameter. Should be descriptive of its purpose."
-              update={(value: string | undefined): void =>
-                variableExpression_setName(varState, value ?? '')
-              }
-              value={varState.name}
-              errorMessage={validationMessage}
+              value={parameterNameValue}
+              update={(value: string | undefined): void => {
+                variableExpression_setName(varState, value ?? '');
+              }}
+              validate={getValidationMessage}
+              onValidate={(issue: string | undefined) => setIsNameValid(!issue)}
               isReadOnly={false}
             />
             <div className="panel__content__form__section">
@@ -214,7 +225,7 @@ const VariableExpressionEditor = observer(
             {isCreating && (
               <ModalFooterButton
                 text="Create"
-                inProgress={Boolean(validationMessage)}
+                disabled={!isNameValid}
                 onClick={onAction}
               />
             )}

package/src/components/shared/LambdaParameterValuesEditor.tsx

@@ -119,15 +119,15 @@ export const LambdaParameterValuesEditor = observer(
             )}
             {submitAction && (
               <ModalFooterButton
-                inProgress={isSubmitAction}
-                inProgressText={`${submitAction.label}...`}
+                inProgressText={
+                  isSubmitAction ? `${submitAction.label}...` : undefined
+                }
                 onClick={submit}
                 text={submitAction.label}
               />
             )}
             <ModalFooterButton
-              inProgress={isClosingAction}
-              inProgressText={'Closing...'}
+              inProgressText={isClosingAction ? 'Closing...' : undefined}
               onClick={close}
               text="Close"
             />

package/src/index.ts

@@ -52,6 +52,8 @@ export * from './components/QuerySetupUtils.js';
 export * from './components/QueryBuilderTextEditor.js';
 
 export { QueryBuilderTextEditorMode } from './stores/QueryBuilderTextEditorState.js';
+export { buildSerialzieFunctionWithGraphFetch } from './stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.js';
+export { buildGetAllFunction } from './stores/QueryBuilderValueSpecificationBuilder.js';
 
 // ------------------------------------------- Shared components -------------------------------------------
 

package/src/stores/QueryBuilderState.ts

@@ -437,7 +437,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.resetQueryResult();
+      this.resetQueryResult({ preserveResult: options?.preserveResult });
       this.resetQueryContent();
       this.unsupportedQueryState.setLambdaError(error);
       this.unsupportedQueryState.setRawLambda(query);
@@ -448,7 +448,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
       )
         .map((param) => observe_ValueSpecification(param, this.observerContext))
         .filter(filterByType(VariableExpression));
-      processParameters(parameters, this);
+      processParameters(parameters, this, previousStateParameterValues);
     }
   }
 

package/src/stores/QueryBuilderValueSpecificationBuilder.ts

@@ -41,7 +41,7 @@ import { buildWatermarkExpression } from './watermark/QueryBuilderWatermarkValue
 import { buildExecutionQueryFromLambdaFunction } from './shared/LambdaParameterState.js';
 import type { QueryBuilderConstantExpressionState } from './QueryBuilderConstantsState.js';
 
-const buildGetAllFunction = (
+export const buildGetAllFunction = (
   _class: Class,
   multiplicity: Multiplicity,
 ): SimpleFunctionExpression => {

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

@@ -18,6 +18,7 @@ import {
   type ValueSpecification,
   type LambdaFunction,
   type PureModel,
+  type RootGraphFetchTree,
   extractElementNameFromPath,
   GenericType,
   GenericTypeExplicitReference,
@@ -159,6 +160,34 @@ export const buildPureSerializationConfig = (
   return newFunction;
 };
 
+export const buildSerialzieFunctionWithGraphFetch = (
+  tree: RootGraphFetchTree,
+  isChecked: boolean,
+  precedingExpression: ValueSpecification,
+  pureConfig: SimpleFunctionExpression | undefined,
+): SimpleFunctionExpression => {
+  const graphFetchInstance = new GraphFetchTreeInstanceValue();
+  graphFetchInstance.values = [tree];
+  const serializeFunction = new SimpleFunctionExpression(
+    extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SERIALIZE),
+  );
+  const graphFetchFunc = new SimpleFunctionExpression(
+    isChecked
+      ? extractElementNameFromPath(
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH_CHECKED,
+        )
+      : extractElementNameFromPath(
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH,
+        ),
+  );
+  graphFetchFunc.parametersValues = [precedingExpression, graphFetchInstance];
+  serializeFunction.parametersValues = [graphFetchFunc, graphFetchInstance];
+  if (pureConfig) {
+    serializeFunction.parametersValues.push(pureConfig);
+  }
+  return serializeFunction;
+};
+
 export const appendGraphFetch = (
   graphFetchTreeState: QueryBuilderGraphFetchTreeState,
   lambdaFunction: LambdaFunction,
@@ -184,32 +213,21 @@ export const appendGraphFetch = (
       graphFetchTreeState.treeData &&
       !isGraphFetchTreeDataEmpty(graphFetchTreeState.treeData)
     ) {
-      const graphFetchInstance = new GraphFetchTreeInstanceValue();
-      graphFetchInstance.values = [graphFetchTreeState.treeData.tree];
-      const serializeFunction = new SimpleFunctionExpression(
-        extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SERIALIZE),
-      );
-      const graphFetchFunc = new SimpleFunctionExpression(
-        graphFetchTreeState.isChecked
-          ? extractElementNameFromPath(
-              QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH_CHECKED,
-            )
-          : extractElementNameFromPath(
-              QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH,
-            ),
-      );
-      graphFetchFunc.parametersValues = [
+      const pureConfig = serializationState.config
+        ? buildPureSerializationConfig(
+            serializationState.config as unknown as Record<
+              PropertyKey,
+              boolean
+            >,
+            graphFetchTreeState.queryBuilderState.graphManagerState.graph,
+          )
+        : undefined;
+      const serializeFunction = buildSerialzieFunctionWithGraphFetch(
+        graphFetchTreeState.treeData.tree,
+        graphFetchTreeState.isChecked,
         precedingExpression,
-        graphFetchInstance,
-      ];
-      serializeFunction.parametersValues = [graphFetchFunc, graphFetchInstance];
-      if (serializationState.config) {
-        const configFunction = buildPureSerializationConfig(
-          serializationState.config as unknown as Record<PropertyKey, boolean>,
-          graphFetchTreeState.queryBuilderState.graphManagerState.graph,
-        );
-        serializeFunction.parametersValues.push(configFunction);
-      }
+        pureConfig,
+      );
       lambdaFunction.expressionSequence[0] = serializeFunction;
     }
   } else if (