@adaptabletools/adaptable 17.0.0-canary.0 → 17.0.0-canary.2

package/src/parser/src/predicate/mapExpressionToQlPredicate.js

@@ -77,7 +77,7 @@ export function mapExpressionToQlPredicate(expression) {
         }
     }
     catch (err) {
-        return { errorMessage: `Unsupported expression: ${expression}` };
+        return { errorMessage: `Query Builder does not support the expression: ${expression}` };
     }
 }
 function getOperatorFromAST(astRootNode) {

package/src/parser/src/predicate/mapQlPredicateToExpression.js

@@ -51,6 +51,9 @@ export function mapQlPredicateToExpression(predicate) {
         }
         return `${firstArg} ${operatorSymbol} ${mappedArgs.join(', ')}`;
     }
+    if (predicateType === 'FUNCTION') {
+        return `${operatorSymbol}(${[firstArg, ...mappedArgs].join(', ')})`;
+    }
     return `${operatorSymbol}(${mappedArgs.join(', ')})`;
 }
 export function getQlPredicateSymbol(predicateName) {

package/src/parser/src/predicate/types.d.ts

@@ -1,10 +1,10 @@
 import { BooleanFunctionName } from '../../../types';
-export declare type QlPredicateError = {
+export type QlPredicateError = {
     errorMessage: string;
 };
 export interface QlPredicate {
     operator: BooleanFunctionName;
     args?: (QlPredicate | boolean | number | string)[];
 }
-export declare type QlLogicalOperator = 'AND' | 'OR';
+export type QlLogicalOperator = 'AND' | 'OR';
 export declare const isQlLogicalOperator: (operator: string) => operator is QlLogicalOperator;

package/src/parser/src/types.d.ts

@@ -1,14 +1,20 @@
 import { BaseContext } from '../../../types';
-export declare type AST = AST_Expression[];
-export declare type PredicateType = 'COLUMN' | 'INFIX' | 'UNARY' | 'FUNCTION' | 'CONDITIONAL';
-export declare type AST_Expression = AST_Function | boolean | number | string;
-export declare type AST_Function = {
+export type AST = AST_Expression[];
+export type PredicateType = 'COLUMN' | 'INFIX' | 'UNARY' | 'FUNCTION' | 'CONDITIONAL';
+/**
+ * Defines AST of an Expressoin
+ */
+export type AST_Expression = AST_Function | boolean | number | string;
+/**
+ * Defines AST of an Expression Function
+ */
+export type AST_Function = {
     type: string;
     args: AST_Expression[];
     range?: [number, number];
     metaInfo?: PredicateType;
 };
-export declare type Token = {
+export type Token = {
     type: string;
     value: string;
     range: [number, number];
@@ -45,7 +51,7 @@ export interface ExpressionContext extends BaseContext {
 /**
  * Key-Value map of Expression Names and their implementation
  */
-export declare type ExpressionFunctionMap<T extends string> = Record<T | string, ExpressionFunction>;
+export type ExpressionFunctionMap<T extends string> = Record<T | string, ExpressionFunction>;
 /**
  * Defines an AdaptableQL Function used in an Adaptable Expression
  */
@@ -79,20 +85,26 @@ export interface ExpressionFunction {
      */
     examples?: string[];
     /**
-     * Whether Expression is evaluated eagerly (without handling inner AST nodes)
+     * Whether Expression is evaluated without handling inner AST nodes
      */
     hasEagerEvaluation?: boolean;
+    /**
+     * Data Types of Inputs required by Expression
+     */
     inputs?: ExpressionFunctionInputType[] | ExpressionFunctionInputType[][];
 }
-export declare type ExpressionFunctionInputType = 'text' | 'number' | 'date' | 'boolean';
+/**
+ * Data Types of Inputs used by Expression (test, number, date, boolean)
+ */
+export type ExpressionFunctionInputType = 'text' | 'number' | 'date' | 'boolean';
 /**
  * Categories for Expression Functions
  */
-export declare type ExpressionCategory = 'logical' | 'comparison' | 'strings' | 'maths' | 'dates' | 'conditional' | 'special' | string;
+export type ExpressionCategory = 'logical' | 'comparison' | 'strings' | 'maths' | 'dates' | 'conditional' | 'special' | string;
 /**
  * Defines how an AdaptableQL Function is described in Expression Editor
  */
-export declare type ExpressionFunctionDocBlock = {
+export type ExpressionFunctionDocBlock = {
     type: 'code';
     content: string;
 } | {
@@ -102,7 +114,7 @@ export declare type ExpressionFunctionDocBlock = {
 /**
  * The javascript function which is invoked by an AdaptableQL Function
  */
-export declare type ExpressionFunctionHandler = (
+export type ExpressionFunctionHandler = (
 /**
  * Args passed into function to enable evaluation
  */

package/src/renderReactRoot.d.ts

@@ -1,5 +1,3 @@
 /// <reference types="react" />
-export declare type RenderReactRootFn = (el: JSX.Element, container: HTMLElement) => VoidFunction;
-export declare function captureReactWarnings(): void;
-export declare function releaseReactWarnings(): void;
-export declare const renderReactRoot: (el: JSX.Element, container: HTMLElement, supressReact18RenderWarning: boolean) => () => void;
+export type RenderReactRootFn = (el: JSX.Element, container: HTMLElement) => VoidFunction;
+export declare const renderReactRoot: (el: JSX.Element, container: HTMLElement) => () => void;

package/src/renderReactRoot.js

@@ -1,49 +1,8 @@
-import * as ReactDOM from 'react-dom';
-//@ts-ignore
-// import * as ReactDOMClient from 'react-dom/client';
-const originalConsoleError = console.error;
-const doRenderReactRoot = (el, container) => {
-    // if ((ReactDOMClient || {}).createRoot) {
-    //   const root = ReactDOMClient.createRoot(container);
-    //   root.render(el);
-    //   return () => {
-    //     root.unmount();
-    //   };
-    // }
-    ReactDOM.render(el, container);
+import * as ReactDOMClient from 'react-dom/client';
+export const renderReactRoot = (el, container) => {
+    const root = ReactDOMClient.createRoot(container);
+    root.render(el);
     return () => {
-        ReactDOM.unmountComponentAtNode(container);
-    };
-};
-export function captureReactWarnings() {
-    console.error = (message, ...optionalParams) => {
-        if (message &&
-            typeof message === 'string' &&
-            (message.includes('Warning: ReactDOM.render is no longer supported in React 18.') ||
-                message.includes('Warning: Attempted to synchronously unmount a root while React was already rendering'))) {
-            return;
-        }
-        return originalConsoleError.call(console, message, ...optionalParams);
-    };
-}
-export function releaseReactWarnings() {
-    console.error = originalConsoleError;
-}
-export const renderReactRoot = (el, container, supressReact18RenderWarning) => {
-    if (supressReact18RenderWarning) {
-        captureReactWarnings();
-    }
-    const unmount = doRenderReactRoot(el, container);
-    if (supressReact18RenderWarning) {
-        releaseReactWarnings();
-    }
-    return () => {
-        if (supressReact18RenderWarning) {
-            captureReactWarnings();
-        }
-        unmount();
-        if (supressReact18RenderWarning) {
-            releaseReactWarnings();
-        }
+        root.unmount();
     };
 };

package/src/types.d.ts

@@ -1,4 +1,4 @@
-export type { ExpressionFunction, ExpressionFunctionDocBlock, ExpressionFunctionHandler, ExpressionContext, ExpressionFunctionMap, ExpressionCategory, AST, AST_Function, AST_Expression, Token, } from './../src/parser/src/types';
+export type { ExpressionFunction, ExpressionFunctionDocBlock, ExpressionFunctionHandler, ExpressionContext, ExpressionFunctionMap, ExpressionCategory, ExpressionFunctionInputType, AST, AST_Function, AST_Expression, Token, } from './../src/parser/src/types';
 export type { AgGridConfig } from './AdaptableInterfaces/IAdaptable';
 export type { AdaptableConfig } from './View/AdaptableWizardView/AdaptableConfigurationDialog/AdaptableConfig';
 export type { AdaptableNoCodeWizardOptions, IAdaptableNoCodeWizard, } from './AdaptableInterfaces/AdaptableNoCodeWizard';
@@ -15,7 +15,7 @@ export type { TOAST_POSITIONS, NotificationsOptions, } from './AdaptableOptions/
 export type { AlertOptions, ActionHandler, AlertForm, AlertFormContext, AlertMessageContext, } from './AdaptableOptions/AlertOptions';
 export type { DashboardOptions, CustomToolbar, DashboardButtonContext, CustomToolbarButtonContext, } from './AdaptableOptions/DashboardOptions';
 export type { EditOptions, ValidationResult, SmartEditCustomOperation, SmartEditOperation, SmartEditOperationContext, ServerValidationContext, CellEditableContext, } from './AdaptableOptions/EditOptions';
-export type { ActionRowOptions, ActionRowButtonOptions, ActionRowFormOptions, ActionRowParamContext, ActionRowParamFieldContext, CreateActionRowFormContext, EditActionRowFormContext, ActionRowFormContext, ActionRowButtonType, ActionRowButtonConfigurationContext, ActionRowButtonsContext, SetPrimaryKeyValueContext, } from './AdaptableOptions/ActionRowOptions';
+export type { ActionRowOptions, ActionRowButtonOptions, ActionRowFormOptions, ActionRowParamContext, ActionRowParamFieldContext, CreateActionRowFormContext, EditActionRowFormContext, ActionRowFormContext, ActionRowType, ActionRowButtonType, ActionRowButtonConfigurationContext, ActionRowButtonsContext, SetPrimaryKeyValueContext, ActionRowFormColumnContext, } from './AdaptableOptions/ActionRowOptions';
 export type { ActionColumnContext, ActionColumn, ActionColumnSettings, ActionColumnOptions, } from './AdaptableOptions/ActionColumnOptions';
 export type { ExportOptions, SystemExportDestination, SystemExportDestinations, CustomDestination, ExternalReport, PreProcessExportContext, AdaptableReportColumn, DataFormatType, ExportFormContext, ReportContext, ExportableColumnContext, ReportFileNameContext, } from './AdaptableOptions/ExportOptions';
 export type { DataImportValidationError, DataImportOptions, DataImportFileHandler, HandleImportedDataContext, DataImportValidateContext, GetPrimaryKeyValueContext, PreprocessRowDataContext, HandleImportedDataResolution, } from './AdaptableOptions/DataImportOptions';
@@ -33,7 +33,8 @@ export type { OpenFinPluginOptions } from './AdaptableOptions/OpenFinPluginOptio
 export type { MasterDetailPluginOptions, DetailInitContext, } from './AdaptableOptions/MasterDetailPluginOptions';
 export type { FinsemblePluginOptions, FinsemblePluginStateOptions, } from './AdaptableOptions/FinsemblePluginOptions';
 export type { DateInputOptions } from './AdaptableOptions/DateInputOptions';
-export type { ColumnFilterOptions, ColumnFilterContext } from './AdaptableOptions/ColumnFilterOptions';
+export type { ColumnFilterOptions, QuickFilterOptions, FilterFormOptions, ValuesFilterOptions, ColumnFilterContext, } from './AdaptableOptions/ColumnFilterOptions';
+export type { GridFilterOptions } from './AdaptableOptions/GridFilterOptions';
 export type { QuickSearchOptions, QuickSearchContext } from './AdaptableOptions/QuickSearchOptions';
 export type { FormatColumnOptions, CustomDisplayFormatter, CustomDisplayFormatterContext, } from './AdaptableOptions/FormatColumnOptions';
 export type { ColumnOptions, ColumnFriendlyNameContext } from './AdaptableOptions/ColumnOptions';
@@ -45,7 +46,7 @@ export type { ConfigState } from './PredefinedConfig/ConfigState';
 export type { AdaptableNote, NotesState as NoteState, AdaptableNotes, NoteGridCell, } from './PredefinedConfig/NotesState';
 export type { TeamSharingOptions, SharedEntitiesContext, } from './AdaptableOptions/TeamSharingOptions';
 export type { ToolPanelOptions, CustomToolPanel, ToolPanelButtonContext, CustomToolPanelButtonContext, } from './AdaptableOptions/ToolPanelOptions';
-export type { UserInterfaceOptions, BasePermittedValues, PermittedValues, EditLookUpPermittedValues, FilterPermittedValues, CustomSortPermittedValues, BulkUpdatePermittedValues, EditLookUpContext, PermittedValuesContext, FilterPermittedValuesContext, BulkUpdatePermittedValuesContext, GridInfoSections, GridInfoSection, ObjectTagsContext, CustomIcon, } from './AdaptableOptions/UserInterfaceOptions';
+export type { UserInterfaceOptions, BasePermittedValues, PermittedValues, EditLookUpPermittedValues, FilterPermittedValues, CustomSortPermittedValues, BulkUpdatePermittedValues, EditLookUpContext, PermittedValuesContext, FilterPermittedValuesContext, BulkUpdatePermittedValuesContext, ObjectTagsContext, CustomIcon, } from './AdaptableOptions/UserInterfaceOptions';
 export type { MenuOptions, MenuOrderContext, CustomContextMenuContext, CustomContextMenuItem, UserContextMenuItem, CustomColumnMenuContext, CustomColumnMenuItem, UserColumnMenuItem, AdaptableSystemMenuItem, AgGridMenuItem, AgGridContextMenuItemType, AgGridColumnMenuItemType, } from './AdaptableOptions/MenuOptions';
 export type { CustomSettingsPanel, SettingsPanelOptions, } from './AdaptableOptions/SettingsPanelOptions';
 export type { EntitlementOptions, EntitlementContext, DefaultAccessLevelContext, } from './AdaptableOptions/EntitlementOptions';
@@ -117,11 +118,10 @@ export type { CellChangedInfo } from './Api/Events/CellChanged';
 export type { TeamSharingEntityChangedInfo } from './Api/Events/TeamSharingEntityChanged';
 export type { GridDataChangedInfo } from './Api/Events/GridDataChanged';
 export type { LayoutChangedInfo } from './Api/Events/LayoutChanged';
-export type { CheckboxColumnClickedInfo } from './Api/Events/ChexboxColumnClicked';
 export type { CustomToolbarConfiguredInfo } from './Api/Events/CustomToolbarConfigured';
 export type { LiveDataChangedInfo, LiveReport } from './Api/Events/LiveDataChanged';
 export type { ChartChangedInfo, ChartingOpenState, ChartDisplayedInfo, } from './Api/Events/ChartChanged';
-export type { ActionRowSubmittedInfo, ActionRowType, CreatedActionRowInfo, EditedActionRowInfo, DeletedActionRowInfo, } from './Api/Events/ActionRowSubmitted';
+export type { ActionRowSubmittedInfo, CreatedActionRowInfo, EditedActionRowInfo, DeletedActionRowInfo, } from './Api/Events/ActionRowSubmitted';
 export type { ColumnFilterAppliedInfo } from './Api/Events/ColumnFilterApplied';
 export type { GridFilterAppliedInfo } from './Api/Events/GridFilterApplied';
 export type { GridSortedInfo, AdaptableSortState } from './Api/Events/GridSorted';

package/themes/dark.css

@@ -19,4 +19,4 @@ html.ab--theme-dark input[type=number].ab-Input::-webkit-inner-spin-button {
   background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" viewBox="4 0 18 18" version="1.1"><path fill="%23f7f7f7" d="M7 10l5 5 5-5z" transform="translate(0, 2)"/><path fill="%23f7f7f7" d="M7 14l5-5 5 5z" transform="translate(0, -6)"/></svg>') no-repeat center center;
 }
 
-/*# sourceMappingURL=dark.css.map */
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3BhY2thZ2VzL2FkYXB0YWJsZS9zcmMvdGhlbWVzL2Rhcmsuc2NzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtFQUNFO0VBQ0E7RUFFQTtFQUVBO0VBQ0E7RUFFQTtFQUNBO0VBQ0E7RUFDQTtFQVFBO0VBQ0E7RUFFQTtFQUVBO0VBQ0E7O0FBRUE7QUFBQTtFQUVFIiwiZmlsZSI6ImRhcmsuY3NzIiwic291cmNlUm9vdCI6IiJ9 */

package/themes/dark.css.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/themes/dark.scss","dark.css"],"names":[],"mappings":"AAAA;EACE,yCAAA;EACA,uBAAA;EAEA,6CAAA;EAEA,qCAAA;EACA,6CAAA;EAEA,2BAAA;EACA,gCAAA;EACA,+BAAA;EACA,mCAAA;EAQA,4BAAA;EACA,8DAAA;EAEA,wEAAA;EAEA,gEAAA;EACA,gEAAA;ACXF;ADaE;;EAEE,yTAAA;ACXJ","file":"dark.css"}
+{"version":3,"sourceRoot":"","sources":["../../packages/adaptable/src/themes/dark.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EAEA;EAEA;EACA;EAEA;EACA;EACA;EACA;EAQA;EACA;EAEA;EAEA;EACA;;AAEA;AAAA;EAEE","file":"dark.css"}

package/themes/light.css

@@ -2,4 +2,4 @@ html.ab--theme-light {
   --ab-theme-loaded: light;
 }
 
-/*# sourceMappingURL=light.css.map */
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3BhY2thZ2VzL2FkYXB0YWJsZS9zcmMvdGhlbWVzL2xpZ2h0LnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7RUFDRSIsImZpbGUiOiJsaWdodC5jc3MiLCJzb3VyY2VSb290IjoiIn0= */

package/themes/light.css.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/themes/light.scss","light.css"],"names":[],"mappings":"AAAA;EACE,wBAAA;ACCF","file":"light.css"}
+{"version":3,"sourceRoot":"","sources":["../../packages/adaptable/src/themes/light.scss"],"names":[],"mappings":"AAAA;EACE","file":"light.css"}