@finos/legend-query-builder 2.1.6 → 3.0.0

package/src/components/shared/CustomDatePicker.tsx

@@ -34,12 +34,8 @@ import {
   EnumValueExplicitReference,
   EnumValueInstanceValue,
   matchFunctionName,
-  SUPPORTED_FUNCTIONS,
-  DAY_OF_WEEK,
-  DURATION_UNIT,
   type ObserverContext,
   PrimitiveType,
-  getSupportFunctionFullPath,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -58,6 +54,10 @@ import {
   instanceValue_setValues,
   valueSpecification_setGenericType,
 } from '../../stores/shared/ValueSpecificationModifierHelper.js';
+import {
+  QUERY_BUILDER_PURE_PATH,
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+} from '../../graph/QueryBuilderMetaModelConst.js';
 
 export enum CUSTOM_DATE_PICKER_OPTION {
   ABSOLUTE_DATE = 'Absolute Date',
@@ -237,6 +237,13 @@ const reservedCustomDateOptions: CustomDateOption[] = [
   ),
 ];
 
+const getSupportedDateFunctionFullPath = (
+  functionName: string,
+): string | undefined =>
+  Object.values(QUERY_BUILDER_SUPPORTED_FUNCTIONS).find((_func) =>
+    matchFunctionName(functionName, _func),
+  );
+
 /**
  * Generate pure date functions based on the DatePickerOption.
  */
@@ -247,7 +254,7 @@ const buildPureDateFunctionExpression = (
 ): SimpleFunctionExpression => {
   if (datePickerOption instanceof CustomPreviousDayOfWeekOption) {
     const previousFridaySFE = new SimpleFunctionExpression(
-      SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK,
     );
     valueSpecification_setGenericType(
       previousFridaySFE,
@@ -255,7 +262,7 @@ const buildPureDateFunctionExpression = (
     );
     const dayOfWeekEnumIntanceValue = new EnumValueInstanceValue(
       GenericTypeExplicitReference.create(
-        new GenericType(graph.getType(DAY_OF_WEEK)),
+        new GenericType(graph.getType(QUERY_BUILDER_PURE_PATH.DAY_OF_WEEK)),
       ),
     );
     instanceValue_setValues(
@@ -265,7 +272,7 @@ const buildPureDateFunctionExpression = (
         EnumValueExplicitReference.create(
           guaranteeNonNullable(
             graph
-              .getEnumeration(DAY_OF_WEEK)
+              .getEnumeration(QUERY_BUILDER_PURE_PATH.DAY_OF_WEEK)
               .values.filter((e) => e.name === datePickerOption.day)[0],
           ),
         ),
@@ -282,7 +289,7 @@ const buildPureDateFunctionExpression = (
     switch (datePickerOption.unit) {
       case CUSTOM_DATE_FIRST_DAY_OF_UNIT.YEAR: {
         const firstDayOfYearSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR,
         );
         valueSpecification_setGenericType(
           firstDayOfYearSFE,
@@ -294,7 +301,7 @@ const buildPureDateFunctionExpression = (
       }
       case CUSTOM_DATE_FIRST_DAY_OF_UNIT.QUARTER: {
         const firstDayOfQuarterSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER,
         );
         valueSpecification_setGenericType(
           firstDayOfQuarterSFE,
@@ -306,7 +313,7 @@ const buildPureDateFunctionExpression = (
       }
       case CUSTOM_DATE_FIRST_DAY_OF_UNIT.MONTH: {
         const firstDayOfMonthSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH,
         );
         valueSpecification_setGenericType(
           firstDayOfMonthSFE,
@@ -318,7 +325,7 @@ const buildPureDateFunctionExpression = (
       }
       case CUSTOM_DATE_FIRST_DAY_OF_UNIT.WEEK: {
         const firstDayOfWeekSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK,
         );
         valueSpecification_setGenericType(
           firstDayOfWeekSFE,
@@ -337,19 +344,19 @@ const buildPureDateFunctionExpression = (
     switch (datePickerOption.value) {
       case CUSTOM_DATE_PICKER_OPTION.TODAY: {
         return createSupportedFunctionExpression(
-          SUPPORTED_FUNCTIONS.TODAY,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.TODAY,
           PrimitiveType.STRICTDATE,
         );
       }
       case CUSTOM_DATE_PICKER_OPTION.NOW: {
         return createSupportedFunctionExpression(
-          SUPPORTED_FUNCTIONS.NOW,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.NOW,
           PrimitiveType.DATETIME,
         );
       }
       case CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_YEAR: {
         const firstDayOfYearSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR,
         );
         valueSpecification_setGenericType(
           firstDayOfYearSFE,
@@ -361,7 +368,7 @@ const buildPureDateFunctionExpression = (
       }
       case CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_QUARTER: {
         const firstDayOfQuarterSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER,
         );
         valueSpecification_setGenericType(
           firstDayOfQuarterSFE,
@@ -373,7 +380,7 @@ const buildPureDateFunctionExpression = (
       }
       case CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_MONTH: {
         const firstDayOfMonthSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH,
         );
         valueSpecification_setGenericType(
           firstDayOfMonthSFE,
@@ -385,7 +392,7 @@ const buildPureDateFunctionExpression = (
       }
       case CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_WEEK: {
         const firstDayOfWeekSFE = new SimpleFunctionExpression(
-          SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK,
         );
         valueSpecification_setGenericType(
           firstDayOfWeekSFE,
@@ -410,7 +417,9 @@ const buildPureDurationEnumValue = (
   unitString: string,
   graph: PureModel,
 ): Enum => {
-  const durationUnitEnum = graph.getEnumeration(DURATION_UNIT);
+  const durationUnitEnum = graph.getEnumeration(
+    QUERY_BUILDER_PURE_PATH.DURATION_UNIT,
+  );
   const targetPureDurationEnumValue = durationUnitEnum.values.filter(
     (e) =>
       e.name ===
@@ -436,7 +445,7 @@ const buildPureAdjustDateFunction = (
   observerContext: ObserverContext,
 ): SimpleFunctionExpression => {
   const dateAdjustSimpleFunctionExpression = new SimpleFunctionExpression(
-    SUPPORTED_FUNCTIONS.ADJUST,
+    QUERY_BUILDER_SUPPORTED_FUNCTIONS.ADJUST,
   );
   functionExpression_addParameterValue(
     dateAdjustSimpleFunctionExpression,
@@ -451,7 +460,9 @@ const buildPureAdjustDateFunction = (
     observerContext,
   );
   if (customDateOption.direction === CUSTOM_DATE_OPTION_DIRECTION.BEFORE) {
-    const minusFunc = new SimpleFunctionExpression(SUPPORTED_FUNCTIONS.MINUS);
+    const minusFunc = new SimpleFunctionExpression(
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.MINUS,
+    );
     functionExpression_addParameterValue(
       minusFunc,
       buildPrimitiveInstanceValue(
@@ -481,7 +492,7 @@ const buildPureAdjustDateFunction = (
   }
   const durationUnitEnumIntanceValue = new EnumValueInstanceValue(
     GenericTypeExplicitReference.create(
-      new GenericType(graph.getType(DURATION_UNIT)),
+      new GenericType(graph.getType(QUERY_BUILDER_PURE_PATH.DURATION_UNIT)),
     ),
   );
   instanceValue_setValues(
@@ -521,7 +532,10 @@ const buildCustomDateOptionDurationValue = (
   return durationParam instanceof PrimitiveInstanceValue
     ? (durationParam.values[0] as number)
     : durationParam instanceof SimpleFunctionExpression &&
-      matchFunctionName(durationParam.functionName, SUPPORTED_FUNCTIONS.MINUS)
+      matchFunctionName(
+        durationParam.functionName,
+        QUERY_BUILDER_SUPPORTED_FUNCTIONS.MINUS,
+      )
     ? durationParam.parametersValues[0] instanceof PrimitiveInstanceValue
       ? (durationParam.parametersValues[0].values[0] as number)
       : 0
@@ -538,7 +552,7 @@ const buildCustomDateOptionDirectionValue = (
     SimpleFunctionExpression &&
   matchFunctionName(
     pureDateAdjustFunction.parametersValues[1].functionName,
-    SUPPORTED_FUNCTIONS.MINUS,
+    QUERY_BUILDER_SUPPORTED_FUNCTIONS.MINUS,
   )
     ? CUSTOM_DATE_OPTION_DIRECTION.BEFORE
     : CUSTOM_DATE_OPTION_DIRECTION.AFTER;
@@ -572,18 +586,18 @@ const buildCustomDateOptionReferenceMomentValue = (
   const funcName = (
     pureDateAjustFunction.parametersValues[0] as SimpleFunctionExpression
   ).functionName;
-  switch (getSupportFunctionFullPath(funcName)) {
-    case SUPPORTED_FUNCTIONS.TODAY:
+  switch (getSupportedDateFunctionFullPath(funcName)) {
+    case QUERY_BUILDER_SUPPORTED_FUNCTIONS.TODAY:
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.TODAY;
-    case SUPPORTED_FUNCTIONS.NOW:
+    case QUERY_BUILDER_SUPPORTED_FUNCTIONS.NOW:
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.NOW;
-    case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR:
+    case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR:
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_YEAR;
-    case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER:
+    case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER:
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_QUARTER;
-    case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH:
+    case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH:
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_MONTH;
-    case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK:
+    case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK:
       return CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_WEEK;
     default:
       throw new UnsupportedOperationError(
@@ -603,7 +617,7 @@ const buildCustomDateOption = (
     valueSpecification instanceof SimpleFunctionExpression &&
     matchFunctionName(
       valueSpecification.functionName,
-      SUPPORTED_FUNCTIONS.ADJUST,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.ADJUST,
     )
   ) {
     const customDateOption = new CustomDateOption(
@@ -640,38 +654,38 @@ export const buildDatePickerOption = (
   valueSpecification: SimpleFunctionExpression | PrimitiveInstanceValue,
 ): DatePickerOption => {
   if (valueSpecification instanceof SimpleFunctionExpression) {
-    switch (getSupportFunctionFullPath(valueSpecification.functionName)) {
-      case SUPPORTED_FUNCTIONS.TODAY:
+    switch (getSupportedDateFunctionFullPath(valueSpecification.functionName)) {
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.TODAY:
         return new DatePickerOption(
           CUSTOM_DATE_PICKER_OPTION.TODAY,
           CUSTOM_DATE_PICKER_OPTION.TODAY,
         );
-      case SUPPORTED_FUNCTIONS.NOW:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.NOW:
         return new DatePickerOption(
           CUSTOM_DATE_PICKER_OPTION.NOW,
           CUSTOM_DATE_PICKER_OPTION.NOW,
         );
-      case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR:
         return new CustomFirstDayOfOption(
           CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_YEAR,
           CUSTOM_DATE_FIRST_DAY_OF_UNIT.YEAR,
         );
-      case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER:
         return new CustomFirstDayOfOption(
           CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_QUARTER,
           CUSTOM_DATE_FIRST_DAY_OF_UNIT.QUARTER,
         );
-      case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH:
         return new CustomFirstDayOfOption(
           CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_MONTH,
           CUSTOM_DATE_FIRST_DAY_OF_UNIT.MONTH,
         );
-      case SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK:
         return new CustomFirstDayOfOption(
           CUSTOM_DATE_OPTION_REFERENCE_MOMENT.FIRST_DAY_OF_WEEK,
           CUSTOM_DATE_FIRST_DAY_OF_UNIT.WEEK,
         );
-      case SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK:
         return new CustomPreviousDayOfWeekOption(
           `Previous ${
             (valueSpecification.parametersValues[0] as EnumValueInstanceValue)
@@ -680,8 +694,7 @@ export const buildDatePickerOption = (
           (valueSpecification.parametersValues[0] as EnumValueInstanceValue)
             .values[0]?.value.name as CUSTOM_DATE_DAY_OF_WEEK,
         );
-
-      case SUPPORTED_FUNCTIONS.ADJUST:
+      case QUERY_BUILDER_SUPPORTED_FUNCTIONS.ADJUST:
         return buildCustomDateOption(valueSpecification);
       default:
         return new DatePickerOption('', '');

package/src/components/shared/LambdaEditor.tsx

@@ -37,6 +37,8 @@ import {
   normalizeLineEnding,
   clearMarkers,
   setErrorMarkers,
+  CODE_EDITOR_LANGUAGE,
+  CODE_EDITOR_THEME,
 } from '@finos/legend-lego/code-editor';
 import type { LambdaEditorState } from '../../stores/shared/LambdaEditorState.js';
 import {
@@ -48,12 +50,10 @@ import {
 import { flowResult } from 'mobx';
 import { ParserError, type EngineError, type Type } from '@finos/legend-graph';
 import {
-  CODE_EDITOR_LANGUAGE,
-  CODE_EDITOR_THEME,
-  TAB_SIZE,
+  DEFAULT_TAB_SIZE,
   useApplicationStore,
 } from '@finos/legend-application';
-import { QUERY_BUILDER_TEST_ID } from '../../application/QueryBuilderTesting.js';
+import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
 
 const LambdaErrorFeedback: React.FC<{
   error?: EngineError | undefined;
@@ -303,7 +303,7 @@ const LambdaEditorInline = observer(
 
       // Set the errors
       if (editorModel) {
-        editorModel.updateOptions({ tabSize: TAB_SIZE });
+        editorModel.updateOptions({ tabSize: DEFAULT_TAB_SIZE });
         const error = parserError ?? compilationError;
         if (error?.sourceInformation) {
           setErrorMarkers(editorModel, [
@@ -321,6 +321,7 @@ const LambdaEditorInline = observer(
       }
     }
 
+    // dispose editor
     useEffect(
       () => (): void => {
         if (editor) {
@@ -330,7 +331,7 @@ const LambdaEditorInline = observer(
         onDidFocusEditorWidgetDisposer.current?.dispose();
       },
       [editor],
-    ); // dispose editor
+    );
 
     return (
       <>
@@ -537,7 +538,7 @@ const LambdaEditorPopUp = observer(
 
       // Set the errors
       if (editorModel) {
-        editorModel.updateOptions({ tabSize: TAB_SIZE });
+        editorModel.updateOptions({ tabSize: DEFAULT_TAB_SIZE });
         const error = parserError ?? compilationError;
         if (error?.sourceInformation) {
           setErrorMarkers(editorModel, [
@@ -561,6 +562,7 @@ const LambdaEditorPopUp = observer(
       ).catch(applicationStore.alertUnhandledError);
     }, [applicationStore, lambdaEditorState]);
 
+    // dispose editor
     useEffect(
       () => (): void => {
         if (editor) {
@@ -569,7 +571,7 @@ const LambdaEditorPopUp = observer(
         onDidChangeModelContentEventDisposer.current?.dispose();
       },
       [editor],
-    ); // dispose editor
+    );
 
     return (
       <Dialog

package/src/components/workflows/ClassQueryBuilder.tsx

@@ -30,18 +30,18 @@ import {
   getMappingCompatibleRuntimes,
   getClassCompatibleMappings,
 } from '@finos/legend-graph';
-import {
-  type PackageableElementOption,
-  getPackageableElementOptionFormatter,
-  buildElementOption,
-  useApplicationStore,
-} from '@finos/legend-application';
+import { useApplicationStore } from '@finos/legend-application';
 import {
   buildRuntimeValueOption,
   getRuntimeOptionFormatter,
   QueryBuilderClassSelector,
 } from '../QueryBuilderSideBar.js';
 import type { ClassQueryBuilderState } from '../../stores/workflows/ClassQueryBuilderState.js';
+import {
+  buildElementOption,
+  getPackageableElementOptionFormatter,
+  type PackageableElementOption,
+} from '@finos/legend-lego/graph-editor';
 
 /**
  * This setup panel supports cascading in order: Class -> Mapping -> Runtime
@@ -162,7 +162,6 @@ const ClassQueryBuilderSetupPanelContent = observer(
                   darkMode:
                     !applicationStore.layoutService
                       .TEMPORARY__isLightColorThemeEnabled,
-                  graph: queryBuilderState.graphManagerState.graph,
                 })}
               />
             </div>
@@ -192,7 +191,6 @@ const ClassQueryBuilderSetupPanelContent = observer(
                   darkMode:
                     !applicationStore.layoutService
                       .TEMPORARY__isLightColorThemeEnabled,
-                  pureModel: queryBuilderState.graphManagerState.graph,
                 })}
               />
             </div>

package/src/components/workflows/MappingQueryBuilder.tsx

@@ -29,12 +29,7 @@ import {
   getMappingCompatibleRuntimes,
   getMappingCompatibleClasses,
 } from '@finos/legend-graph';
-import {
-  type PackageableElementOption,
-  getPackageableElementOptionFormatter,
-  buildElementOption,
-  useApplicationStore,
-} from '@finos/legend-application';
+import { useApplicationStore } from '@finos/legend-application';
 import {
   buildRuntimeValueOption,
   getRuntimeOptionFormatter,
@@ -42,6 +37,11 @@ import {
 } from '../QueryBuilderSideBar.js';
 import { guaranteeType } from '@finos/legend-shared';
 import type { MappingQueryBuilderState } from '../../stores/workflows/MappingQueryBuilderState.js';
+import {
+  buildElementOption,
+  getPackageableElementOptionFormatter,
+  type PackageableElementOption,
+} from '@finos/legend-lego/graph-editor';
 
 /**
  * This setup panel supports cascading in order: Mapping -> Runtime + Class
@@ -156,7 +156,6 @@ const MappingQueryBuilderSetupPanelContent = observer(
                   darkMode:
                     !applicationStore.layoutService
                       .TEMPORARY__isLightColorThemeEnabled,
-                  graph: queryBuilderState.graphManagerState.graph,
                 })}
               />
             </div>
@@ -184,7 +183,6 @@ const MappingQueryBuilderSetupPanelContent = observer(
                   darkMode:
                     !applicationStore.layoutService
                       .TEMPORARY__isLightColorThemeEnabled,
-                  pureModel: queryBuilderState.graphManagerState.graph,
                 })}
               />
             </div>

package/src/components/workflows/ServiceQueryBuilder.tsx

@@ -17,16 +17,16 @@
 import { CustomSelectorInput, PlayIcon, RobotIcon } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
 import { getMappingCompatibleClasses, type Service } from '@finos/legend-graph';
-import {
-  buildElementOption,
-  useApplicationStore,
-  type PackageableElementOption,
-} from '@finos/legend-application';
+import { useApplicationStore } from '@finos/legend-application';
 import { QueryBuilderClassSelector } from '../QueryBuilderSideBar.js';
 import type {
   ServiceExecutionContext,
   ServiceQueryBuilderState,
 } from '../../stores/workflows/ServiceQueryBuilderState.js';
+import {
+  buildElementOption,
+  type PackageableElementOption,
+} from '@finos/legend-lego/graph-editor';
 
 type ExecutionContextOption = {
   label: string;

package/src/{graphManager/QueryBuilderSupportedFunctions.ts → graph/QueryBuilderMetaModelConst.ts}

@@ -14,6 +14,20 @@
  * limitations under the License.
  */
 
+export enum QUERY_BUILDER_PURE_PATH {
+  // TDS
+  TDS_ROW = 'meta::pure::tds::TDSRow',
+  TDS_COLUMN = 'meta::pure::tds::TDSColumn',
+  TDS_TABULAR_DATASET = 'meta::pure::tds::TabularDataSet',
+
+  // time
+  DURATION_UNIT = 'meta::pure::functions::date::DurationUnit',
+  DAY_OF_WEEK = 'meta::pure::functions::date::DayOfWeek',
+
+  // serialization
+  SERIALIZE_CONFIG = 'meta::pure::graphFetch::execution::AlloySerializationConfig',
+}
+
 export enum QUERY_BUILDER_SUPPORTED_FUNCTIONS {
   AND = 'meta::pure::functions::boolean::and',
   EXISTS = 'meta::pure::functions::collection::exists',
@@ -26,6 +40,21 @@ export enum QUERY_BUILDER_SUPPORTED_FUNCTIONS {
   SUBTYPE = 'meta::pure::functions::lang::subType',
   MINUS = 'meta::pure::functions::math::minus',
 
+  // time
+  ADJUST = 'meta::pure::functions::date::adjust',
+  TODAY = 'meta::pure::functions::date::today',
+  NOW = 'meta::pure::functions::date::now',
+  FIRST_DAY_OF_WEEK = 'meta::pure::functions::date::firstDayOfThisWeek',
+  FIRST_DAY_OF_MONTH = 'meta::pure::functions::date::firstDayOfThisMonth',
+  FIRST_DAY_OF_QUARTER = 'meta::pure::functions::date::firstDayOfThisQuarter',
+  FIRST_DAY_OF_YEAR = 'meta::pure::functions::date::firstDayOfThisYear',
+  PREVIOUS_DAY_OF_WEEK = 'meta::pure::functions::date::previousDayOfWeek',
+  IS_ON_DAY = 'meta::pure::functions::date::isOnDay',
+  IS_ON_OR_AFTER_DAY = 'meta::pure::functions::date::isOnOrAfterDay',
+  IS_AFTER_DAY = 'meta::pure::functions::date::isAfterDay',
+  IS_ON_OR_BEFORE_DAY = 'meta::pure::functions::date::isOnOrBeforeDay',
+  IS_BEFORE_DAY = 'meta::pure::functions::date::isBeforeDay',
+
   // graph-fetch
   GRAPH_FETCH = 'meta::pure::graphFetch::execution::graphFetch',
   GRAPH_FETCH_CHECKED = 'meta::pure::graphFetch::execution::graphFetchChecked',

package/src/{graphManager → graph-manager}/QueryBuilder_GraphManagerPreset.ts

@@ -17,7 +17,7 @@
 import packageJson from '../../package.json';
 import { AbstractPreset } from '@finos/legend-shared';
 import { QueryBuilder_PureProtocolProcessorPlugin } from './protocol/pure/QueryBuilder_PureProtocolProcessorPlugin.js';
-import { QueryBuilder_PureGraphManagerPlugin } from './QueryBuilder_GraphManagerPlugin.js';
+import { QueryBuilder_PureGraphManagerPlugin } from './QueryBuilder_PureGraphManagerPlugin.js';
 
 /**
  * This is the core graph manager preset and should not be exported

package/src/{graphManager/QueryBuilder_GraphManagerPlugin.ts → graph-manager/QueryBuilder_PureGraphManagerPlugin.ts}

@@ -20,6 +20,7 @@ import {
   type PureGraphManagerExtensionBuilder,
 } from '@finos/legend-graph';
 import { QueryBuilder_buildGraphManagerExtension } from './protocol/pure/QueryBuilder_PureGraphManagerExtensionBuilder.js';
+import { QUERY_BUILDER_PURE_PATH } from '../graph/QueryBuilderMetaModelConst.js';
 
 export class QueryBuilder_PureGraphManagerPlugin extends PureGraphManagerPlugin {
   constructor() {
@@ -29,4 +30,12 @@ export class QueryBuilder_PureGraphManagerPlugin extends PureGraphManagerPlugin
   override getExtraPureGraphManagerExtensionBuilders(): PureGraphManagerExtensionBuilder[] {
     return [QueryBuilder_buildGraphManagerExtension];
   }
+
+  override getExtraExposedSystemElementPath(): string[] {
+    return [
+      QUERY_BUILDER_PURE_PATH.TDS_TABULAR_DATASET,
+      QUERY_BUILDER_PURE_PATH.TDS_ROW,
+      QUERY_BUILDER_PURE_PATH.TDS_COLUMN,
+    ];
+  }
 }

package/src/{graphManager → graph-manager}/protocol/pure/QueryBuilder_PureProtocolProcessorPlugin.ts

@@ -38,8 +38,11 @@ import {
   SimpleFunctionExpression,
   extractElementNameFromPath,
   V1_buildGenericFunctionExpression,
+  GenericType,
+  GenericTypeExplicitReference,
+  PrimitiveType,
 } from '@finos/legend-graph';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilderSupportedFunctions.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 
 export class QueryBuilder_PureProtocolProcessorPlugin extends PureProtocolProcessorPlugin {
   constructor() {
@@ -149,6 +152,57 @@ export class QueryBuilder_PureProtocolProcessorPlugin extends PureProtocolProces
             compileContext,
             processingContext,
           );
+        } else if (
+          matchFunctionName(functionName, [
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.TODAY,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER,
+          ])
+        ) {
+          const expression = V1_buildGenericFunctionExpression(
+            functionName,
+            parameters,
+            openVariables,
+            compileContext,
+            processingContext,
+          );
+          expression.genericType = GenericTypeExplicitReference.create(
+            new GenericType(PrimitiveType.STRICTDATE),
+          );
+          return expression;
+        } else if (
+          matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.NOW)
+        ) {
+          const expression = V1_buildGenericFunctionExpression(
+            functionName,
+            parameters,
+            openVariables,
+            compileContext,
+            processingContext,
+          );
+          expression.genericType = GenericTypeExplicitReference.create(
+            new GenericType(PrimitiveType.DATETIME),
+          );
+          return expression;
+        } else if (
+          matchFunctionName(functionName, [
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK,
+            QUERY_BUILDER_SUPPORTED_FUNCTIONS.ADJUST,
+          ])
+        ) {
+          const expression = V1_buildGenericFunctionExpression(
+            functionName,
+            parameters,
+            openVariables,
+            compileContext,
+            processingContext,
+          );
+          expression.genericType = GenericTypeExplicitReference.create(
+            new GenericType(PrimitiveType.DATE),
+          );
+          return expression;
         } else if (
           matchFunctionName(
             functionName,

package/src/{graphManager → graph-manager}/protocol/pure/v1/V1_QueryBuilder_PureGraphManagerExtension.ts

@@ -142,7 +142,7 @@ export class V1_QueryBuilder_PureGraphManagerExtension extends QueryBuilder_Pure
     dependencyEntitiesIndex: Map<string, EntitiesWithOrigin>,
   ): Promise<MappingRuntimeCompatibilityAnalysisResult[]> {
     const result: MappingRuntimeCompatibilityAnalysisResult[] = [];
-    const graph = await this.graphManager.createEmptyGraph({
+    const graph = await this.graphManager.createBasicGraph({
       initializeSystem: false,
     });
 
@@ -252,7 +252,7 @@ export class V1_QueryBuilder_PureGraphManagerExtension extends QueryBuilder_Pure
     dependencyEntitiesIndex: Map<string, EntitiesWithOrigin>,
   ): Promise<ServiceExecutionAnalysisResult[]> {
     const result: ServiceExecutionAnalysisResult[] = [];
-    const graph = await this.graphManager.createEmptyGraph({
+    const graph = await this.graphManager.createBasicGraph({
       initializeSystem: false,
     });