@finos/legend-query-builder 4.14.11 → 4.14.13

package/src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx

@@ -216,6 +216,15 @@ const ColumnsSortEditor = observer(
   },
 );
 
+const cloneSortColumnStateArray = (
+  sortColumns: SortColumnState[],
+): SortColumnState[] =>
+  sortColumns.map((sortColumn) => {
+    const newSortColumn = new SortColumnState(sortColumn.columnState);
+    newSortColumn.setSortType(sortColumn.sortType);
+    return newSortColumn;
+  });
+
 export const QueryResultModifierModal = observer(
   (props: { tdsState: QueryBuilderTDSState }) => {
     // Read current state
@@ -227,7 +236,9 @@ export const QueryResultModifierModal = observer(
     const stateSlice = resultSetModifierState.slice;
 
     // Set up temp state for modal lifecycle
-    const [sortColumns, setSortColumns] = useState([...stateSortColumns]);
+    const [sortColumns, setSortColumns] = useState(
+      cloneSortColumnStateArray(stateSortColumns),
+    );
     const [distinct, setDistinct] = useState(stateDistinct);
     const [limitResults, setLimitResults] = useState(stateLimitResults);
     const [slice, setSlice] = useState<
@@ -236,7 +247,7 @@ export const QueryResultModifierModal = observer(
 
     // Sync temp state with tdsState when modal is opened/closed
     useEffect(() => {
-      setSortColumns([...stateSortColumns]);
+      setSortColumns(cloneSortColumnStateArray(stateSortColumns));
       setDistinct(stateDistinct);
       setLimitResults(stateLimitResults);
       setSlice(stateSlice ?? [undefined, undefined]);

package/src/components/fetch-structure/QueryBuilderTDSPanel.tsx

@@ -41,6 +41,7 @@ import {
   PanelEntryDropZonePlaceholder,
   FunctionIcon,
   CogIcon,
+  InfoCircleIcon,
 } from '@finos/legend-art';
 import {
   type QueryBuilderExplorerTreeDragSource,
@@ -103,9 +104,13 @@ import {
   propertyExpression_setFunc,
 } from '../../stores/shared/ValueSpecificationModifierHelper.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import { getPropertyChainName } from '../../stores/QueryBuilderPropertyEditorState.js';
+import {
+  getPropertyChainName,
+  getPropertyPath,
+} from '../../stores/QueryBuilderPropertyEditorState.js';
 import { generateDefaultValueForPrimitiveType } from '../../stores/QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_CALENDAR_TYPE } from '../../graph-manager/QueryBuilderConst.js';
+import { QueryBuilderPropertyInfoTooltip } from '../shared/QueryBuilderPropertyInfoTooltip.js';
 
 const QueryBuilderProjectionColumnContextMenu = observer(
   forwardRef<
@@ -145,8 +150,9 @@ const QueryBuilderSimpleProjectionColumnEditor = observer(
   (props: {
     projectionColumnState: QueryBuilderSimpleProjectionColumnState;
     setIsEditingColumnName: (isEditing: boolean) => void;
+    error?: boolean | undefined;
   }) => {
-    const { projectionColumnState, setIsEditingColumnName } = props;
+    const { projectionColumnState, setIsEditingColumnName, error } = props;
     const onPropertyExpressionChange = (
       node: QueryBuilderExplorerTreePropertyNodeData,
     ): void =>
@@ -165,6 +171,7 @@ const QueryBuilderSimpleProjectionColumnEditor = observer(
           }
           onPropertyExpressionChange={onPropertyExpressionChange}
           setIsEditingColumnName={setIsEditingColumnName}
+          error={error}
         />
       </div>
     );
@@ -753,38 +760,63 @@ const QueryBuilderProjectionColumnEditor = observer(
               className="query-builder__projection__column__drag-handle__container"
             />
             {projectionColumnState instanceof
-              QueryBuilderSimpleProjectionColumnState &&
-              (isEditingColumnName ? (
-                <div className="query-builder__projection__column__name">
-                  <InputWithInlineValidation
-                    className="query-builder__projection__column__name__input input-group__input"
-                    spellCheck={false}
-                    value={projectionColumnState.columnName}
-                    onChange={changeColumnName}
-                    onKeyDown={(
-                      event: React.KeyboardEvent<HTMLInputElement>,
-                    ) => {
-                      if (event.key === 'Enter') {
+              QueryBuilderSimpleProjectionColumnState && (
+              <>
+                <QueryBuilderPropertyInfoTooltip
+                  title={projectionColumnState.propertyExpressionState.title}
+                  property={
+                    projectionColumnState.propertyExpressionState
+                      .propertyExpression.func.value
+                  }
+                  path={getPropertyPath(
+                    projectionColumnState.propertyExpressionState
+                      .propertyExpression,
+                  )}
+                  isMapped={true}
+                  placement="bottom-start"
+                  explorerState={
+                    projectionColumnState.propertyExpressionState
+                      .queryBuilderState.explorerState
+                  }
+                >
+                  <div className="query-builder-property-expression-badge__property__info">
+                    <InfoCircleIcon />
+                  </div>
+                </QueryBuilderPropertyInfoTooltip>
+                {isEditingColumnName ? (
+                  <div className="query-builder__projection__column__name">
+                    <InputWithInlineValidation
+                      className="query-builder__projection__column__name__input input-group__input"
+                      spellCheck={false}
+                      value={projectionColumnState.columnName}
+                      onChange={changeColumnName}
+                      onKeyDown={(
+                        event: React.KeyboardEvent<HTMLInputElement>,
+                      ) => {
+                        if (event.key === 'Enter') {
+                          setIsEditingColumnName(false);
+                        }
+                      }}
+                      onBlur={() => {
                         setIsEditingColumnName(false);
+                      }}
+                      error={
+                        isDuplicatedColumnName ? 'Duplicated column' : undefined
                       }
-                    }}
-                    onBlur={() => {
-                      setIsEditingColumnName(false);
-                    }}
-                    error={
-                      isDuplicatedColumnName ? 'Duplicated column' : undefined
-                    }
-                    ref={columnNameInputRef}
-                  />
-                </div>
-              ) : (
-                <div className="query-builder__projection__column__value">
-                  <QueryBuilderSimpleProjectionColumnEditor
-                    projectionColumnState={projectionColumnState}
-                    setIsEditingColumnName={setIsEditingColumnName}
-                  />
-                </div>
-              ))}
+                      ref={columnNameInputRef}
+                    />
+                  </div>
+                ) : (
+                  <div className="query-builder__projection__column__value">
+                    <QueryBuilderSimpleProjectionColumnEditor
+                      projectionColumnState={projectionColumnState}
+                      setIsEditingColumnName={setIsEditingColumnName}
+                      error={isDuplicatedColumnName}
+                    />
+                  </div>
+                )}
+              </>
+            )}
             {projectionColumnState instanceof
               QueryBuilderDerivationProjectionColumnState && (
               <>

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

@@ -18,6 +18,7 @@ import {
   type Hashable,
   guaranteeType,
   UnsupportedOperationError,
+  hashArray,
 } from '@finos/legend-shared';
 import {
   AbstractPropertyExpression,
@@ -25,6 +26,7 @@ import {
   LambdaFunctionInstanceValue,
   type SimpleFunctionExpression,
   type ValueSpecification,
+  PRIMITIVE_TYPE,
 } from '@finos/legend-graph';
 import {
   type QueryBuilderProjectionColumnState,
@@ -32,19 +34,25 @@ import {
   QueryBuilderDerivationProjectionColumnState,
 } from '../projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderAggregateColumnState } from './QueryBuilderAggregationState.js';
-import { computed, makeObservable, observable, action } from 'mobx';
+import { action, computed, makeObservable, observable } from 'mobx';
 import type { QUERY_BUILDER_CALENDAR_TYPE } from '../../../../graph-manager/QueryBuilderConst.js';
 import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../../../QueryBuilderConfig.js';
+import {
+  buildCalendarFunctionExpression,
+  updateAggregateColumnState,
+} from './QueryBuilderAggregateCalendarFunctionValueSpecificationBuilder.js';
 
-export abstract class QueryBuilderAggregateCalendarFunction
-  implements Hashable
-{
+export class QueryBuilderAggregateCalendarFunction implements Hashable {
   dateColumn?: AbstractPropertyExpression | undefined;
   calendarType!: QUERY_BUILDER_CALENDAR_TYPE;
   endDate!: ValueSpecification;
   lambdaParameterName: string = DEFAULT_LAMBDA_VARIABLE_NAME;
 
-  constructor() {
+  private func: string;
+  private label: string;
+  private hash: string;
+
+  constructor(func: string, label: string, hash: string) {
     makeObservable(this, {
       dateColumn: observable,
       lambdaParameterName: observable,
@@ -56,19 +64,60 @@ export abstract class QueryBuilderAggregateCalendarFunction
       setEndDate: action,
       hashCode: computed,
     });
+
+    this.func = func;
+    this.label = label;
+    this.hash = hash;
   }
 
-  abstract getLabel(): string;
+  getLabel(): string {
+    return this.label;
+  }
 
-  abstract isCompatibleWithColumn(
+  isCompatibleWithColumn(
     projectionColumnState: QueryBuilderProjectionColumnState,
-  ): boolean;
+  ): boolean {
+    if (
+      projectionColumnState instanceof QueryBuilderSimpleProjectionColumnState
+    ) {
+      const propertyType =
+        projectionColumnState.propertyExpressionState.propertyExpression.func
+          .value.genericType.value.rawType;
+      return (
+        [
+          PRIMITIVE_TYPE.NUMBER,
+          PRIMITIVE_TYPE.INTEGER,
+          PRIMITIVE_TYPE.DECIMAL,
+          PRIMITIVE_TYPE.FLOAT,
+        ] as string[]
+      ).includes(propertyType.path);
+    }
+    return true;
+  }
 
-  abstract buildCalendarFunctionExpression(
-    propertyExpression:
-      | AbstractPropertyExpression
-      | INTERNAL__UnknownValueSpecification,
-  ): ValueSpecification;
+  buildCalendarFunctionExpression(
+    p: AbstractPropertyExpression | INTERNAL__UnknownValueSpecification,
+  ): ValueSpecification {
+    return buildCalendarFunctionExpression(
+      this.func,
+      this.dateColumn,
+      this.calendarType,
+      this.endDate,
+      p,
+    );
+  }
+
+  updateAggregateColumnState(
+    expression: SimpleFunctionExpression,
+    aggregationColumnState: QueryBuilderAggregateColumnState,
+  ): void {
+    updateAggregateColumnState(
+      expression,
+      this.func,
+      this,
+      aggregationColumnState,
+    );
+  }
 
   buildCalendarFunctionExpressionFromState(
     aggregateColumnState: QueryBuilderAggregateColumnState,
@@ -104,11 +153,6 @@ export abstract class QueryBuilderAggregateCalendarFunction
     return this.buildCalendarFunctionExpression(targetColumn);
   }
 
-  abstract updateAggregateColumnState(
-    expression: SimpleFunctionExpression,
-    aggregationColumnState: QueryBuilderAggregateColumnState,
-  ): void;
-
   setDateColumn(val: AbstractPropertyExpression): void {
     this.dateColumn = val;
   }
@@ -125,5 +169,12 @@ export abstract class QueryBuilderAggregateCalendarFunction
     this.endDate = val;
   }
 
-  abstract get hashCode(): string;
+  get hashCode(): string {
+    return hashArray([
+      this.hash,
+      this.dateColumn ?? '',
+      this.calendarType,
+      this.endDate,
+    ]);
+  }
 }

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

@@ -14,70 +14,173 @@
  * limitations under the License.
  */
 
-import { QueryBuilderAggregateCalendarFunction_Ytd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Ytd.js';
-import { QueryBuilderAggregateCalendarFunction_Annualized } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Annualized.js';
-import type { QueryBuilderAggregateCalendarFunction } from './QueryBuilderAggregateCalendarFunction.js';
-import { QueryBuilderAggregateCalendarFunction_Cme } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Cme.js';
-import { QueryBuilderAggregateCalendarFunction_Cw } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Cw.js';
-import { QueryBuilderAggregateCalendarFunction_Cw_Fm } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Cw_Fm.js';
-import { QueryBuilderAggregateCalendarFunction_Cy_Minus2 } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Cy_Minus2.js';
-import { QueryBuilderAggregateCalendarFunction_Cy_Minus3 } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Cy_Minus3.js';
-import { QueryBuilderAggregateCalendarFunction_Mtd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Mtd.js';
-import { QueryBuilderAggregateCalendarFunction_P12Wa } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_P12Wa.js';
-import { QueryBuilderAggregateCalendarFunction_P12Wtd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_P12Wtd.js';
-import { QueryBuilderAggregateCalendarFunction_P4Wa } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_P4Wa.js';
-import { QueryBuilderAggregateCalendarFunction_P4Wtd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_P4Wtd.js';
-import { QueryBuilderAggregateCalendarFunction_P52Wa } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_P52Wa.js';
-import { QueryBuilderAggregateCalendarFunction_P52Wtd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_P52Wtd.js';
-import { QueryBuilderAggregateCalendarFunction_Pma } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Pma.js';
-import { QueryBuilderAggregateCalendarFunction_Pmtd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Pmtd.js';
-import { QueryBuilderAggregateCalendarFunction_Pqtd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Pqtd.js';
-import { QueryBuilderAggregateCalendarFunction_PriorDay } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_PriorDay.js';
-import { QueryBuilderAggregateCalendarFunction_PriorYear } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_PriorYear.js';
-import { QueryBuilderAggregateCalendarFunction_Pw } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Pw.js';
-import { QueryBuilderAggregateCalendarFunction_Pw_Fm } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Pw_Fm.js';
-import { QueryBuilderAggregateCalendarFunction_Pwa } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Pwa.js';
-import { QueryBuilderAggregateCalendarFunction_Pwtd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Pwtd.js';
-import { QueryBuilderAggregateCalendarFunction_Pymtd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Pymtd.js';
-import { QueryBuilderAggregateCalendarFunction_Pyqtd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Pyqtd.js';
-import { QueryBuilderAggregateCalendarFunction_Pytd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Pytd.js';
-import { QueryBuilderAggregateCalendarFunction_Pywa } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Pywa.js';
-import { QueryBuilderAggregateCalendarFunction_Pywtd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Pywtd.js';
-import { QueryBuilderAggregateCalendarFunction_Qtd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Qtd.js';
-import { QueryBuilderAggregateCalendarFunction_ReportEndDay } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_ReportEndDay.js';
-import { QueryBuilderAggregateCalendarFunction_Wtd } from './calendarFunctions/QueryBuilderAggregateCalendarFunction_Wtd.js';
+import { QueryBuilderAggregateCalendarFunction } from './QueryBuilderAggregateCalendarFunction.js';
+import { QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS } from '../../../../graph/QueryBuilderMetaModelConst.js';
+import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../QueryBuilderStateHashUtils.js';
+
+function create(
+  func: string,
+  label: string,
+  hash: string,
+): QueryBuilderAggregateCalendarFunction {
+  return new QueryBuilderAggregateCalendarFunction(func, label, hash);
+}
 
 export const getQueryBuilderCoreAggregrationCalendarFunctions =
   (): QueryBuilderAggregateCalendarFunction[] => [
-    new QueryBuilderAggregateCalendarFunction_Annualized(),
-    new QueryBuilderAggregateCalendarFunction_Ytd(),
-    new QueryBuilderAggregateCalendarFunction_Cme(),
-    new QueryBuilderAggregateCalendarFunction_Cw(),
-    new QueryBuilderAggregateCalendarFunction_Cw_Fm(),
-    new QueryBuilderAggregateCalendarFunction_Cy_Minus2(),
-    new QueryBuilderAggregateCalendarFunction_Cy_Minus3(),
-    new QueryBuilderAggregateCalendarFunction_Mtd(),
-    new QueryBuilderAggregateCalendarFunction_P12Wa(),
-    new QueryBuilderAggregateCalendarFunction_P12Wtd(),
-    new QueryBuilderAggregateCalendarFunction_P4Wa(),
-    new QueryBuilderAggregateCalendarFunction_P4Wtd(),
-    new QueryBuilderAggregateCalendarFunction_P52Wa(),
-    new QueryBuilderAggregateCalendarFunction_P52Wtd(),
-    new QueryBuilderAggregateCalendarFunction_Pma(),
-    new QueryBuilderAggregateCalendarFunction_Pmtd(),
-    new QueryBuilderAggregateCalendarFunction_Pqtd(),
-    new QueryBuilderAggregateCalendarFunction_PriorDay(),
-    new QueryBuilderAggregateCalendarFunction_PriorYear(),
-    new QueryBuilderAggregateCalendarFunction_Pw(),
-    new QueryBuilderAggregateCalendarFunction_Pw_Fm(),
-    new QueryBuilderAggregateCalendarFunction_Pwa(),
-    new QueryBuilderAggregateCalendarFunction_Pwtd(),
-    new QueryBuilderAggregateCalendarFunction_Pymtd(),
-    new QueryBuilderAggregateCalendarFunction_Pyqtd(),
-    new QueryBuilderAggregateCalendarFunction_Pytd(),
-    new QueryBuilderAggregateCalendarFunction_Pywa(),
-    new QueryBuilderAggregateCalendarFunction_Pywtd(),
-    new QueryBuilderAggregateCalendarFunction_Qtd(),
-    new QueryBuilderAggregateCalendarFunction_ReportEndDay(),
-    new QueryBuilderAggregateCalendarFunction_Wtd(),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_ANNUALIZED,
+      'Annualized',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_ANNUALIZED,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_YTD,
+      'Year to Date',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_YTD,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_CME,
+      'Current Month Estimate',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_CME,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_CW,
+      'Current Week',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_CW,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_CME,
+      'Current Month Estimate',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_CME,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_CY_MINUS2,
+      'Current year minus 2',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_CY_MINUS2,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_CY_MINUS3,
+      'Current year minus 3',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_CY_MINUS3,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_MTD,
+      'Month to date',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_MTD,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_P12WA,
+      'Previous 12 Weeks Averaged',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_P12WA,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_P12WTD,
+      'Previous 12 Weeks To Date',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_P12WTD,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_P4WA,
+      'Previous 4 Weeks Averaged',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_P4WA,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_P4WTD,
+      'Previous 4 Weeks To Date',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_P4WTD,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_P52WA,
+      'Previous 52 Weeks Averaged',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_P52WA,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_P52WTD,
+      'Previous 52 Weeks To Date',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_P52WTD,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PMA,
+      'Previous Months Averaged',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PMA,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PMTD,
+      'Previous Month To Date',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PMTD,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PQTD,
+      'Previous Quarter To Date',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PQTD,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PRIOR_DAY,
+      'Prior Day',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PRIOR_DAY,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PRIOR_YEAR,
+      'Prior Year',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PRIOR_YEAR,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PW,
+      'Previous week',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PW,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PW_FM,
+      'Previous week, Franchise Manager',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PW_FM,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PWA,
+      "Past Weeks' Average",
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PWA,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PWTD,
+      'Previous Week To Date',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PWTD,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PYMTD,
+      "Previous Year's Month To Date",
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PYMTD,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PYQTD,
+      "Previous Year's Quarter To Date",
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PYQTD,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PYTD,
+      'Previous Year To Date',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PYTD,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PYWA,
+      "Previous Year's Weekly Average",
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PYWA,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_PYWTD,
+      "Previous Year's Week to Date",
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_PYWTD,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_QTD,
+      'Quarter to Date',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_QTD,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_REPORT_END_DAY,
+      'Report End Day',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_REPORT_END_DAY,
+    ),
+    create(
+      QUERY_BUILDER_SUPPORTED_CALENDAR_AGGREGATION_FUNCTIONS.CALENDAR_WTD,
+      'Week to Date',
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_CALENDAR_FUNCTION_WTD,
+    ),
   ];

package/src/stores/fetch-structure/tds/aggregation/{calendarFunctions/QueryBuilderAggregateCalendarFunctionValueSpecificationBuilder.ts → QueryBuilderAggregateCalendarFunctionValueSpecificationBuilder.ts}

@@ -35,10 +35,10 @@ import {
   UnsupportedOperationError,
   guaranteeNonNullable,
 } from '@finos/legend-shared';
-import type { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
-import { type QueryBuilderAggregateCalendarFunction } from '../QueryBuilderAggregateCalendarFunction.js';
-import { QUERY_BUILDER_CALENDAR_TYPE } from '../../../../../graph-manager/QueryBuilderConst.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
+import type { QueryBuilderAggregateColumnState } from './QueryBuilderAggregationState.js';
+import { type QueryBuilderAggregateCalendarFunction } from './QueryBuilderAggregateCalendarFunction.js';
+import { QUERY_BUILDER_CALENDAR_TYPE } from '../../../../graph-manager/QueryBuilderConst.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graph/QueryBuilderMetaModelConst.js';
 
 export const buildCalendarFunctionExpression = (
   calendarFunctionFullPath: string,

package/tsconfig.json

@@ -98,42 +98,11 @@
     "./src/stores/fetch-structure/tds/QueryResultSetModifierState.ts",
     "./src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateCalendarFunction.ts",
     "./src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateCalendarFunctionLoader.ts",
+    "./src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateCalendarFunctionValueSpecificationBuilder.ts",
     "./src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateOperator.ts",
     "./src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateOperatorLoader.ts",
     "./src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationState.ts",
     "./src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationStateBuilder.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunctionValueSpecificationBuilder.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Annualized.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Cme.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Cw.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Cw_Fm.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Cy_Minus2.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Cy_Minus3.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Mtd.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_P12Wa.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_P12Wtd.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_P4Wa.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_P4Wtd.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_P52Wa.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_P52Wtd.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Pma.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Pmtd.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Pqtd.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_PriorDay.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_PriorYear.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Pw.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Pw_Fm.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Pwa.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Pwtd.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Pymtd.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Pyqtd.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Pytd.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Pywa.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Pywtd.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Qtd.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_ReportEndDay.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Wtd.ts",
-    "./src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunction_Ytd.ts",
     "./src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperatorValueSpecificationBuilder.ts",
     "./src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Average.ts",
     "./src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Count.ts",

package/lib/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunctionValueSpecificationBuilder.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBuilderAggregateCalendarFunctionValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunctionValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EAGxB,0BAA0B,EAO1B,KAAK,mCAAmC,EAEzC,MAAM,qBAAqB,CAAC;AAO7B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAC3F,OAAO,EAAE,KAAK,qCAAqC,EAAE,MAAM,6CAA6C,CAAC;AACzG,OAAO,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAC;AAGhG,eAAO,MAAM,+BAA+B,6BAChB,MAAM,cACpB,0BAA0B,GAAG,SAAS,gBACpC,2BAA2B,WAChC,kBAAkB,gBAEvB,0BAA0B,GAC1B,mCAAmC,KACtC,kBAmBF,CAAC;AAEF,eAAO,MAAM,0BAA0B,eACzB,wBAAwB,4BACV,MAAM,oBACd,qCAAqC,wBACjC,gCAAgC,KACrD,IA8HF,CAAC"}

package/lib/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunctionValueSpecificationBuilder.js.map

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