@adaptabletools/adaptable-cjs 19.2.4 → 20.0.0-canary.1

package/src/components/ExpressionEditor/QueryBuilder/QueryBuilderInputs.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 const rebass_1 = require("rebass");
 const mapQlPredicateToExpression_1 = require("../../../parser/src/predicate/mapQlPredicateToExpression");
+const adaptableQlUtils_1 = require("../../../Utilities/adaptableQlUtils");
 const AdaptableContext_1 = require("../../../View/AdaptableContext");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../../../View/Components/AdaptableInput"));
 const ColumnSelector_1 = require("../../../View/Components/Selectors/ColumnSelector");
@@ -26,8 +27,7 @@ const PrimitiveColumnOrFieldSelector = (props) => {
         );
     });
     const hasFields = react_1.default.useMemo(() => {
-        var _a;
-        return ((_a = adaptable.api.expressionApi.internalApi.getAvailableFields()) === null || _a === void 0 ? void 0 : _a.length) > 0;
+        return adaptable.api.expressionApi.internalApi.getAvailableFields()?.length > 0;
     }, []);
     const hasFieldsOrValueIsField = hasFields || (0, utils_1.isFieldValue)(props.fieldOrColumn);
     let input = null;
@@ -71,16 +71,14 @@ exports.PrimitiveColumnOrFieldSelector = PrimitiveColumnOrFieldSelector;
 const PrimiteValueInput = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const hasFields = react_1.default.useMemo(() => {
-        var _a;
-        return ((_a = adaptable.api.expressionApi.internalApi.getAvailableFields()) === null || _a === void 0 ? void 0 : _a.length) > 0;
+        return adaptable.api.expressionApi.internalApi.getAvailableFields()?.length > 0;
     }, []);
     const hasFieldsOrValueIsField = hasFields || (0, utils_1.isFieldValue)(props.value);
     const [type, setType] = react_1.default.useState(() => {
-        var _a, _b;
-        if (typeof (props === null || props === void 0 ? void 0 : props.value) === 'string' && ((_a = props === null || props === void 0 ? void 0 : props.value) === null || _a === void 0 ? void 0 : _a.includes('['))) {
+        if (typeof props?.value === 'string' && props?.value?.includes('[')) {
             return 'column-name';
         }
-        if (typeof (props === null || props === void 0 ? void 0 : props.value) === 'string' && ((_b = props === null || props === void 0 ? void 0 : props.value) === null || _b === void 0 ? void 0 : _b.includes('FIELD'))) {
+        if (typeof props?.value === 'string' && props?.value?.includes('FIELD')) {
             return 'field';
         }
         return 'input-value';
@@ -93,15 +91,14 @@ const PrimiteValueInput = (props) => {
         }
     };
     const getEditor = () => {
-        var _a, _b;
         const common = {
             'data-id': 'query-input',
         };
         switch (props.inputType) {
             case 'boolean':
-                return (react_1.default.createElement(CheckBox_1.CheckBox, Object.assign({}, common, { checked: props.value, onChange: () => props.onChange(!props.value) })));
+                return (react_1.default.createElement(CheckBox_1.CheckBox, { ...common, checked: props.value, onChange: () => props.onChange(!props.value) }));
             case 'number':
-                return (react_1.default.createElement(AdaptableInput_1.default, Object.assign({}, common, { type: "number", value: (_a = props.value) !== null && _a !== void 0 ? _a : '', onChange: (event) => {
+                return (react_1.default.createElement(AdaptableInput_1.default, { ...common, type: "number", value: props.value ?? '', onChange: (event) => {
                         const value = event.target.value;
                         if (value === '') {
                             props.onChange(undefined);
@@ -109,25 +106,25 @@ const PrimiteValueInput = (props) => {
                         else {
                             props.onChange(parseFloat(value));
                         }
-                    } })));
+                    } }));
             case 'text':
-                return (react_1.default.createElement(AdaptableInput_1.default, Object.assign({}, common, { type: "text", value: (_b = props.value) !== null && _b !== void 0 ? _b : '', onChange: (event) => {
+                return (react_1.default.createElement(AdaptableInput_1.default, { ...common, type: "text", value: props.value ?? '', onChange: (event) => {
                         props.onChange(event.target.value);
-                    } })));
+                    } }));
             case 'date':
                 // date format = 'DATE(2020-01-01)'
                 const dateStr = typeof props.value === 'string' ? props.value.replace('DATE(', '').replace(')', '') : '';
-                return (react_1.default.createElement(AdaptableInput_1.default, Object.assign({}, common, { type: "date", value: dateStr !== null && dateStr !== void 0 ? dateStr : '', onChange: (event) => {
+                return (react_1.default.createElement(AdaptableInput_1.default, { ...common, type: "date", value: dateStr ?? '', onChange: (event) => {
                         const stringified = `DATE("${event.target.value}")`;
                         props.onChange(stringified);
-                    } })));
+                    } }));
             default:
                 return react_1.default.createElement(react_1.default.Fragment, null);
         }
     };
     let editor = null;
     if (type === 'column-name') {
-        const abColType = (0, utils_1.mapExpressionFunctionTypeToColumnDataType)(props.inputType);
+        const abColType = (0, adaptableQlUtils_1.mapExpressionFunctionTypeToColumnDataType)(props.inputType);
         editor = (react_1.default.createElement(exports.PrimitiveColumnOrFieldSelector, { hideFields: true, fieldOrColumn: props.value, type: abColType, onChange: (columnId) => {
                 props.onChange(columnId);
             } }));
@@ -203,7 +200,6 @@ const SymbolToIcon = (props) => {
     }
 };
 const ExpressionSelector = (props) => {
-    var _a;
     const { getExpressions } = (0, QueryBuilder_1.useQueryBuilderContext)();
     const expressions = props.dataType ? getExpressions(props.dataType) : [];
     return (react_1.default.createElement(DropdownButton_1.default, { "data-id": "expression-selector", "data-value": props.value, variant: "raised", tone: 'accent', columns: ['label'], items: expressions.map((expression) => ({
@@ -214,7 +210,7 @@ const ExpressionSelector = (props) => {
                 }
             },
         })) },
-        react_1.default.createElement(SymbolToIcon, { symbol: (_a = (0, mapQlPredicateToExpression_1.getQlPredicateSymbol)(props.value)) !== null && _a !== void 0 ? _a : 'Select Operator' })));
+        react_1.default.createElement(SymbolToIcon, { symbol: (0, mapQlPredicateToExpression_1.getQlPredicateSymbol)(props.value) ?? 'Select Operator' })));
 };
 exports.ExpressionSelector = ExpressionSelector;
 const CombinatorSelector = (props) => {

package/src/components/ExpressionEditor/QueryBuilder/QueryPredicateBuilder.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryPredicateBuilder = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
-const react_beautiful_dnd_1 = require("react-beautiful-dnd");
+const dnd_1 = require("../../dnd");
 const rebass_1 = require("rebass");
 const predicate_1 = require("../../../parser/src/predicate");
 const adaptableQlUtils_1 = require("../../../Utilities/adaptableQlUtils");
@@ -17,7 +17,7 @@ const QueryBuilderInputs_1 = require("./QueryBuilderInputs");
 const utils_1 = require("./utils");
 const ITEM_HEIGHT = 40;
 const BASE_CLASS_NAME = 'ab-QueryBuilder-predicate-editor';
-const Handle = (props) => (react_1.default.createElement(rebass_1.Flex, Object.assign({ className: `${BASE_CLASS_NAME}__handle`, height: ITEM_HEIGHT, alignItems: "center", mr: 1 }, props),
+const Handle = (props) => (react_1.default.createElement(rebass_1.Flex, { className: `${BASE_CLASS_NAME}__handle`, height: ITEM_HEIGHT, alignItems: "center", mr: 1, ...props },
     react_1.default.createElement(icons_1.Icon, { name: "drag" })));
 const QueryPredicateButtons = (props) => {
     return (react_1.default.createElement(react_1.default.Fragment, null,
@@ -39,16 +39,19 @@ const LogicalFunctionEditor = (props) => {
     ${props.lastChild ? `${BASE_CLASS_NAME}--last-child` : ''}
     ${props.isRoot ? `${BASE_CLASS_NAME}--root` : `${BASE_CLASS_NAME}--child`}
   `;
-    const getCombinatorEl = (handleProps, className) => (react_1.default.createElement(react_beautiful_dnd_1.Droppable, { droppableId: props.id, type: props.id }, (provided, snapshot) => {
-        return (react_1.default.createElement("div", Object.assign({}, provided.droppableProps, { ref: provided.innerRef, className: className }),
+    const getCombinatorEl = (handleProps, className) => (react_1.default.createElement(dnd_1.Droppable, { droppableId: props.id, type: props.id }, (provided, snapshot) => {
+        return (react_1.default.createElement("div", { ...provided.droppableProps, ref: provided.innerRef, className: className },
             react_1.default.createElement(rebass_1.Flex, null,
-                props.isRoot ? null : react_1.default.createElement(Handle, Object.assign({}, handleProps)),
+                props.isRoot ? null : react_1.default.createElement(Handle, { ...handleProps }),
                 react_1.default.createElement(rebass_1.Flex, { flex: 1, alignItems: "center", height: ITEM_HEIGHT },
                     react_1.default.createElement(QueryBuilderInputs_1.CombinatorSelector, { value: props.predicate.operator, onChange: (combinator) => {
-                            props.onChange(Object.assign(Object.assign({}, props.predicate), { operator: combinator }));
+                            props.onChange({
+                                ...props.predicate,
+                                operator: combinator,
+                            });
                         } }),
                     react_1.default.createElement(rebass_1.Box, { flex: 1 }),
-                    react_1.default.createElement(QueryPredicateButtons, Object.assign({ hideDelete: props.isRoot, hideAdd: true }, props)))),
+                    react_1.default.createElement(QueryPredicateButtons, { hideDelete: props.isRoot, hideAdd: true, ...props }))),
             react_1.default.createElement(rebass_1.Box, { className: `${BASE_CLASS_NAME}__children-wrapper` },
                 props.predicate.args.map((arg, index) => {
                     const id = `${props.id}/${index}`;
@@ -61,16 +64,25 @@ const LogicalFunctionEditor = (props) => {
                                 'operator' in arg &&
                                 (0, predicate_1.isQlLogicalOperator)(arg.operator)) {
                                 // add as a child
-                                const newArg = Object.assign(Object.assign({}, arg), { args: [...arg.args, newPredicate] });
+                                const newArg = {
+                                    ...arg,
+                                    args: [...arg.args, newPredicate],
+                                };
                                 const args = [...props.predicate.args];
                                 args[index] = newArg;
-                                props.onChange(Object.assign(Object.assign({}, props.predicate), { args }));
+                                props.onChange({
+                                    ...props.predicate,
+                                    args,
+                                });
                             }
                             else {
                                 // add as a sibling
                                 const prevArgs = [...props.predicate.args];
                                 prevArgs.splice(index + 1, 0, newPredicate);
-                                props.onChange(Object.assign(Object.assign({}, props.predicate), { args: prevArgs }));
+                                props.onChange({
+                                    ...props.predicate,
+                                    args: prevArgs,
+                                });
                             }
                         }, onChange: (predicate) => {
                             const args = [...props.predicate.args];
@@ -80,24 +92,26 @@ const LogicalFunctionEditor = (props) => {
                             else {
                                 args.splice(index, 1);
                             }
-                            props.onChange(Object.assign(Object.assign({}, props.predicate), { args }));
+                            props.onChange({
+                                ...props.predicate,
+                                args,
+                            });
                         } }));
                 }),
                 provided.placeholder,
                 react_1.default.createElement("div", { className: `${BASE_CLASS_NAME}__root-actions` },
-                    react_1.default.createElement(QueryPredicateButtons, Object.assign({}, props, { hideDelete: true }))))));
+                    react_1.default.createElement(QueryPredicateButtons, { ...props, hideDelete: true })))));
     }));
     if (props.isRoot) {
         return getCombinatorEl({ className: className });
     }
     else {
-        return (react_1.default.createElement(react_beautiful_dnd_1.Draggable, { key: props.id, draggableId: props.id, index: props.index }, (provided, snapshot) => {
-            return (react_1.default.createElement("div", Object.assign({}, provided.draggableProps, { ref: provided.innerRef, className: className }), getCombinatorEl(provided.dragHandleProps)));
+        return (react_1.default.createElement(dnd_1.Draggable, { key: props.id, draggableId: props.id, index: props.index }, (provided, snapshot) => {
+            return (react_1.default.createElement("div", { ...provided.draggableProps, ref: provided.innerRef, className: className }, getCombinatorEl(provided.dragHandleProps)));
         }));
     }
 };
 const PrimitiveFunctionEditor = (props) => {
-    var _a;
     // [handle] [column] [operator-dropdown] [...args] [delete-button] [plus-button]
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const [columnOrFieldExpression, ...restOfArgs] = props.predicate.args;
@@ -125,56 +139,68 @@ const PrimitiveFunctionEditor = (props) => {
             columnOrFieldDataType = adaptable.api.columnApi.getColumnDataTypeForColumnId(columnId);
         }
         columnInputDataType = (0, adaptableQlUtils_1.mapColumnDataTypeToExpressionFunctionType)(columnOrFieldDataType);
-        functionInputInputDataTypes = (_a = booleanExpressionFunctions_1.booleanExpressionFunctions[props.predicate.operator]) === null || _a === void 0 ? void 0 : _a.inputs;
+        functionInputInputDataTypes = booleanExpressionFunctions_1.booleanExpressionFunctions[props.predicate.operator]?.inputs;
         restOfFunctionInputDataTypes = functionInputInputDataTypes
             ? (0, utils_1.getOperatorMatchingInputs)(columnInputDataType, functionInputInputDataTypes)
             : [];
     }
     const level = props.id.split('/').length - 1;
-    return (react_1.default.createElement(react_beautiful_dnd_1.Draggable, { key: props.id, draggableId: props.id, index: props.index }, (provided) => {
-        return (react_1.default.createElement(rebass_1.Flex, Object.assign({ className: `
-              ${BASE_CLASS_NAME} 
+    return (react_1.default.createElement(dnd_1.Draggable, { key: props.id, draggableId: props.id, index: props.index }, (provided) => {
+        return (react_1.default.createElement(rebass_1.Flex, { className: `
+              ${BASE_CLASS_NAME}
               ${BASE_CLASS_NAME}-level-${level}
               ${BASE_CLASS_NAME}-primitive
               ${props.lastChild ? `${BASE_CLASS_NAME}--last-child` : ''}
-            `, pb: 2, ref: provided.innerRef }, provided.draggableProps, { style: Object.assign(Object.assign({}, provided.draggableProps.style), { minHeight: ITEM_HEIGHT }) }),
-            react_1.default.createElement(Handle, Object.assign({}, provided.dragHandleProps)),
+            `, pb: 2, ref: provided.innerRef, ...provided.draggableProps, style: { ...provided.draggableProps.style, minHeight: ITEM_HEIGHT } },
+            react_1.default.createElement(Handle, { ...provided.dragHandleProps }),
             react_1.default.createElement(rebass_1.Flex, { alignItems: "center", height: ITEM_HEIGHT },
                 react_1.default.createElement(rebass_1.Box, { mr: 2 },
                     react_1.default.createElement(QueryBuilderInputs_1.PrimitiveColumnOrFieldSelector, { onChange: (colOrField) => {
-                            props.onChange(Object.assign(Object.assign({}, props.predicate), { args: [colOrField], operator: null }));
+                            props.onChange({
+                                ...props.predicate,
+                                args: [colOrField],
+                                operator: null,
+                            });
                         }, fieldOrColumn: columnOrFieldId })),
                 columnOrFieldId && columnOrFieldDataType && (react_1.default.createElement(QueryBuilderInputs_1.ExpressionSelector, { dataType: columnOrFieldDataType, onExpressionChange: (operator) => {
                         let args = [props.predicate.args[0]];
-                        if (columnOrFieldDataType === 'Boolean' && operator !== 'NOT') {
+                        if (columnOrFieldDataType === 'boolean' && operator !== 'NOT') {
                             args = [props.predicate.args[0], 'TRUE'];
                         }
-                        props.onChange(Object.assign(Object.assign({}, props.predicate), { operator,
+                        props.onChange({
+                            ...props.predicate,
+                            operator,
                             // discard arguments
-                            args }));
+                            args,
+                        });
                     }, value: props.predicate.operator })),
                 react_1.default.createElement(rebass_1.Flex, { flex: 1, ml: 2 }, restOfFunctionInputDataTypes.map((type, index) => {
-                    var _a;
                     const key = type + index;
                     const commonProps = {
                         lefthandColumnIdParam: columnOrFieldId,
                         inputType: type,
                     };
                     if (type.includes('[]')) {
-                        return (react_1.default.createElement(QueryBuilderInputs_1.PrimitiveMultiValueInput, Object.assign({}, commonProps, { key: key, value: restOfArgs, onChange: (values) => {
+                        return (react_1.default.createElement(QueryBuilderInputs_1.PrimitiveMultiValueInput, { ...commonProps, key: key, value: restOfArgs, onChange: (values) => {
                                 const args = [...props.predicate.args.slice(0, 1), ...values];
-                                props.onChange(Object.assign(Object.assign({}, props.predicate), { args }));
-                            } })));
+                                props.onChange({
+                                    ...props.predicate,
+                                    args,
+                                });
+                            } }));
                     }
-                    return (react_1.default.createElement(QueryBuilderInputs_1.PrimiteValueInput, Object.assign({}, commonProps, { key: key, value: (_a = restOfArgs[index]) !== null && _a !== void 0 ? _a : null, onChange: (value) => {
+                    return (react_1.default.createElement(QueryBuilderInputs_1.PrimiteValueInput, { ...commonProps, key: key, value: restOfArgs[index] ?? null, onChange: (value) => {
                             const args = [...props.predicate.args];
                             // +1 because col is the first argument
                             args[index + 1] = value;
-                            props.onChange(Object.assign(Object.assign({}, props.predicate), { args }));
-                        } })));
+                            props.onChange({
+                                ...props.predicate,
+                                args,
+                            });
+                        } }));
                 }))),
             react_1.default.createElement(rebass_1.Box, { flex: 1 }),
-            react_1.default.createElement(QueryPredicateButtons, Object.assign({}, props))));
+            react_1.default.createElement(QueryPredicateButtons, { ...props })));
     }));
 };
 /**
@@ -189,10 +215,10 @@ const PrimitiveFunctionEditor = (props) => {
  */
 const QueryPredicateBuilder = (props) => {
     if ((0, predicate_1.isQlLogicalOperator)(props.predicate.operator)) {
-        return react_1.default.createElement(LogicalFunctionEditor, Object.assign({}, props));
+        return react_1.default.createElement(LogicalFunctionEditor, { ...props });
     }
     else {
-        return react_1.default.createElement(PrimitiveFunctionEditor, Object.assign({}, props));
+        return react_1.default.createElement(PrimitiveFunctionEditor, { ...props });
     }
 };
 exports.QueryPredicateBuilder = QueryPredicateBuilder;

package/src/components/ExpressionEditor/QueryBuilder/utils.d.ts

@@ -2,8 +2,7 @@ import { QlPredicate, QlPredicateError } from '../../../parser/src/predicate';
 import { ExpressionFunctionInputType } from '../../../parser/src/types';
 import { AdaptableColumnDataType, BooleanFunctionName } from '../../../types';
 export declare const reorder: (predicate: QlPredicate, from: string, to: string) => any;
-export declare const mapExpressionFunctionTypeToColumnDataType: (type: ExpressionFunctionInputType) => AdaptableColumnDataType;
-export declare const getOperatorMatchingInputs: (columnType: ExpressionFunctionInputType, inputs: ExpressionFunctionInputType[] | Array<ExpressionFunctionInputType>[]) => ExpressionFunctionInputType[];
+export declare const getOperatorMatchingInputs: (columnType: ExpressionFunctionInputType, inputs: ExpressionFunctionInputType[] | Array<ExpressionFunctionInputType>[], includeAllInputs?: boolean) => ExpressionFunctionInputType[];
 export declare const getFunctionsForColumnType: (dataType: AdaptableColumnDataType, availableBooleanFunctions: BooleanFunctionName[]) => BooleanFunctionName[];
 export declare const getUnsuportedExpressionFromQlPredicate: (predicate: QlPredicate | QlPredicateError, context: {
     supportedFields: {

package/src/components/ExpressionEditor/QueryBuilder/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFieldValue = exports.mapColumnExpressionToColumnId = exports.mapExpressionToFieldValue = exports.mapFieldValueToExpression = exports.getUnsuportedExpressionFromQlPredicate = exports.getFunctionsForColumnType = exports.getOperatorMatchingInputs = exports.mapExpressionFunctionTypeToColumnDataType = exports.reorder = void 0;
+exports.isFieldValue = exports.mapColumnExpressionToColumnId = exports.mapExpressionToFieldValue = exports.mapFieldValueToExpression = exports.getUnsuportedExpressionFromQlPredicate = exports.getFunctionsForColumnType = exports.getOperatorMatchingInputs = exports.reorder = void 0;
 const adaptableQlUtils_1 = require("../../../Utilities/adaptableQlUtils");
 const predicate_1 = require("../../../parser/src/predicate");
 const booleanExpressionFunctions_1 = require("../../../Utilities/ExpressionFunctions/booleanExpressionFunctions");
@@ -31,30 +31,16 @@ const reorder = (predicate, from, to) => {
     return predicateCopy;
 };
 exports.reorder = reorder;
-const mapExpressionFunctionTypeToColumnDataType = (type) => {
-    if (type === 'number') {
-        return 'Number';
-    }
-    if (type === 'boolean') {
-        return 'Boolean';
-    }
-    if (type === 'text') {
-        return 'String';
-    }
-    if (type === 'date') {
-        return 'Date';
-    }
-    return undefined;
-};
-exports.mapExpressionFunctionTypeToColumnDataType = mapExpressionFunctionTypeToColumnDataType;
-const getOperatorMatchingInputs = (columnType, inputs) => {
+const getOperatorMatchingInputs = (columnType, inputs, includeAllInputs = false) => {
     if (Array.isArray(inputs[0])) {
         const matchingInput = inputs.find((input) => input[0] === columnType);
-        const [_, ...restOfArgs] = matchingInput !== null && matchingInput !== void 0 ? matchingInput : [];
+        const [_, ...restOfArgs] = matchingInput ?? [];
         return restOfArgs;
     }
     const [_, ...restOfArgs] = inputs;
-    return restOfArgs;
+    return includeAllInputs
+        ? inputs
+        : restOfArgs;
 };
 exports.getOperatorMatchingInputs = getOperatorMatchingInputs;
 const getFunctionsForColumnType = (dataType, availableBooleanFunctions) => {
@@ -72,18 +58,17 @@ const getFunctionsForColumnType = (dataType, availableBooleanFunctions) => {
         else {
             matchingInputTypes = inputs;
         }
-        return (matchingInputTypes === null || matchingInputTypes === void 0 ? void 0 : matchingInputTypes[0]) === columnType;
+        return matchingInputTypes?.[0] === columnType;
     });
 };
 exports.getFunctionsForColumnType = getFunctionsForColumnType;
 const getUnsuportedExpressionFromQlPredicate = (predicate, context) => {
-    var _a;
     if (!predicate) {
         return null;
     }
     if (typeof predicate === 'string' && (0, exports.isFieldValue)(predicate)) {
         const field = (0, exports.mapExpressionToFieldValue)(predicate);
-        if (!((_a = context.supportedFields) === null || _a === void 0 ? void 0 : _a.some((field) => (field === null || field === void 0 ? void 0 : field.value) === (0, exports.mapExpressionToFieldValue)(predicate)))) {
+        if (!context.supportedFields?.some((field) => field?.value === (0, exports.mapExpressionToFieldValue)(predicate))) {
             return `Expression uses an unregistered field: "${field}"`;
         }
         else {
@@ -119,12 +104,11 @@ exports.getUnsuportedExpressionFromQlPredicate = getUnsuportedExpressionFromQlPr
 const mapFieldValueToExpression = (field) => `FIELD('${field}')`;
 exports.mapFieldValueToExpression = mapFieldValueToExpression;
 const mapExpressionToFieldValue = (expression) => {
-    var _a;
     if (!expression) {
         return '';
     }
     try {
-        return (_a = expression.match(/FIELD\(['"](.+)['"]\)/)) === null || _a === void 0 ? void 0 : _a[1];
+        return expression.match(/FIELD\(['"](.+)['"]\)/)?.[1];
     }
     catch (e) {
         return '';
@@ -132,12 +116,11 @@ const mapExpressionToFieldValue = (expression) => {
 };
 exports.mapExpressionToFieldValue = mapExpressionToFieldValue;
 const mapColumnExpressionToColumnId = (expression) => {
-    var _a;
     if (!expression) {
         return null;
     }
     try {
-        return (_a = expression.match(/\[(.+)\]/)) === null || _a === void 0 ? void 0 : _a[1];
+        return expression.match(/\[(.+)\]/)?.[1];
     }
     catch (e) {
         return expression;

package/src/components/ExpressionEditor/index.d.ts

@@ -20,5 +20,5 @@ interface ExpressionEditorProps {
     showExpressionEditor?: boolean;
 }
 export declare const baseClassName = "ab-ExpressionEditor";
-export declare function ExpressionEditor(props: ExpressionEditorProps): JSX.Element;
+export declare function ExpressionEditor(props: ExpressionEditorProps): React.JSX.Element;
 export {};

package/src/components/ExpressionEditor/index.js

@@ -26,13 +26,12 @@ const NamedQueryEditor_1 = require("./NamedQueryEditor");
 const QueryBuilder_1 = require("./QueryBuilder");
 exports.baseClassName = `ab-ExpressionEditor`;
 function ExpressionEditor(props) {
-    var _a, _b, _c;
     const { type, module } = props;
     const [selectedFunction, setSelectedFunction] = (0, react_1.useState)(null);
     const [expressionText, setExpressionText] = (0, react_1.useState)(props.value);
     const { namedQuery, setNamedQuery } = (0, NamedQueryContext_1.useNamedQueryContext)();
     const textAreaRef = (0, react_1.useRef)(null);
-    const allowSaveNamedQuery = (_a = props.allowSaveNamedQuery) !== null && _a !== void 0 ? _a : type === 'boolean';
+    const allowSaveNamedQuery = props.allowSaveNamedQuery ?? type === 'boolean';
     const editorInput = type === 'observable' || type === 'aggregatedBoolean' ? (React.createElement(EditorInputWithWhereClause_1.default, { type: type, module: module, value: props.value, onChange: (value) => {
             setExpressionText(value);
             props.onChange(value);
@@ -49,7 +48,7 @@ function ExpressionEditor(props) {
     // currently only boolean and scalar expressions support nested calculated columns (calc cols which reference other calc cols)
     const queryableColumns = type === 'scalar' || type === 'boolean' || type === 'aggregatedScalar'
         ? props.columns
-        : props.columns.filter((c) => !props.api.columnApi.isCalculatedColumn(c.columnId));
+        : props.columns.filter((c) => !c.isCalculatedColumn);
     const showDocumentationLinks = props.api.internalApi.isDocumentationLinksDisplayed();
     // @Bogdan i did this to be sure but i think we can get rid of this as the button does the same (and better IMO)
     const showNamedQueryStuff = false;
@@ -86,9 +85,9 @@ function ExpressionEditor(props) {
             React.createElement(rebass_1.Flex, { flex: 1, flexDirection: "row", "data-name": "expression-editor", fontSize: 2, style: { minHeight: 0 } },
                 React.createElement(rebass_1.Flex, { flex: 1, paddingRight: 2, style: { overflow: 'auto' }, "data-name": "expression-builder", flexDirection: "column" },
                     editorInput,
-                    StringExtensions_1.default.IsNotNullOrEmpty(expressionText === null || expressionText === void 0 ? void 0 : expressionText.trim()) && (React.createElement(ExpressionFunctionDocumentation_1.ExpressionFunctionDocumentation, { expressionFunction: selectedFunction })),
+                    StringExtensions_1.default.IsNotNullOrEmpty(expressionText?.trim()) && (React.createElement(ExpressionFunctionDocumentation_1.ExpressionFunctionDocumentation, { expressionFunction: selectedFunction })),
                     /* displayed for advanced queries (observable&Aggregation) to give the users a starting point */
-                    StringExtensions_1.default.IsNullOrEmpty(expressionText === null || expressionText === void 0 ? void 0 : expressionText.trim()) && renderQueryHints(type),
+                    StringExtensions_1.default.IsNullOrEmpty(expressionText?.trim()) && renderQueryHints(type),
                     showDocumentationLinks && (React.createElement(HelpBlock_1.default, { "data-name": "query-documentation", mt: 2, mb: 2, fontSize: 3 },
                         React.createElement(ButtonInfo_1.ButtonInfo, { mr: 2, onClick: () => window.open(queryDocumentationLink, '_blank') }),
                         "See documentation for more details and examples")),
@@ -110,7 +109,7 @@ function ExpressionEditor(props) {
                             React.createElement(Tabs_1.Tabs.Content, null, adaptableFields && adaptableFields.length > 0 ? (React.createElement(DataTableEditor_1.DataTableEditor, { type: "field", labels: {
                                     showIds: 'Show Field path',
                                     filterPlaceholder: 'Filter fields...',
-                                }, dataFormatter: (value) => `FIELD("${value}")`, data: props.initialData, fields: adaptableFields === null || adaptableFields === void 0 ? void 0 : adaptableFields.map((field) => ({
+                                }, dataFormatter: (value) => `FIELD("${value}")`, data: props.initialData, fields: adaptableFields?.map((field) => ({
                                     label: field.label,
                                     value: field.name,
                                     dataType: field.dataType,
@@ -130,10 +129,10 @@ function ExpressionEditor(props) {
             return props.fields
                 .filter((field) => {
                 if (!type) {
-                    return (field.dataType === 'String' ||
-                        field.dataType === 'Number' ||
-                        field.dataType === 'Boolean' ||
-                        field.dataType === 'Date');
+                    return (field.dataType === 'text' ||
+                        field.dataType === 'number' ||
+                        field.dataType === 'boolean' ||
+                        field.dataType === 'date');
                 }
                 else {
                     return field.dataType === type;
@@ -148,26 +147,23 @@ function ExpressionEditor(props) {
             return props.columns
                 .filter((column) => {
                 if (!type) {
-                    return (column.dataType === 'String' ||
-                        column.dataType === 'Number' ||
-                        column.dataType === 'Boolean' ||
-                        column.dataType === 'Date');
+                    return (column.dataType === 'text' ||
+                        column.dataType === 'number' ||
+                        column.dataType === 'boolean' ||
+                        column.dataType === 'date');
                 }
                 else {
                     return column.dataType === type;
                 }
             })
-                .map((col) => {
-                var _a;
-                return ({
-                    value: col.columnId,
-                    label: (_a = col.friendlyName) !== null && _a !== void 0 ? _a : col.columnId,
-                    type: col.dataType,
-                });
-            });
+                .map((col) => ({
+                value: col.columnId,
+                label: col.friendlyName ?? col.columnId,
+                type: col.dataType,
+            }));
         } }));
-    const showQueryBuilder = (_b = props.showQueryBuilder) !== null && _b !== void 0 ? _b : false;
-    const showExpressionEditor = (_c = props.showExpressionEditor) !== null && _c !== void 0 ? _c : true;
+    const showQueryBuilder = props.showQueryBuilder ?? false;
+    const showExpressionEditor = props.showExpressionEditor ?? true;
     return (React.createElement(EditorContext_1.ExpressionEditorContext.Provider, { value: {
             selectedFunction,
             setSelectedFunction,

package/src/components/FieldWrap/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { FlexProps } from 'rebass';
-declare const FieldWrap: (props: FlexProps) => JSX.Element;
+declare const FieldWrap: (props: FlexProps) => React.JSX.Element;
 export default FieldWrap;

package/src/components/FieldWrap/index.js

@@ -9,7 +9,7 @@ const defaulProps = {
     alignItems: 'center',
 };
 const FieldWrap = (props) => {
-    const flexProps = Object.assign(Object.assign({}, defaulProps), props);
-    return React.createElement(rebass_1.Flex, Object.assign({}, flexProps, { className: (0, join_1.default)(props.className, 'ab-FieldWrap') }));
+    const flexProps = { ...defaulProps, ...props };
+    return React.createElement(rebass_1.Flex, { ...flexProps, className: (0, join_1.default)(props.className, 'ab-FieldWrap') });
 };
 exports.default = FieldWrap;

package/src/components/FileDroppable/index.d.ts

@@ -15,5 +15,5 @@ interface FileDroppableProps extends FlexProps {
     file?: File;
 }
 export declare const readJSONFile: (file: File, toJSON?: (str: string) => Promise<any> | any) => Promise<Record<string, unknown>[]>;
-declare const FileDroppable: (props?: FileDroppableProps) => JSX.Element;
+declare const FileDroppable: (props?: FileDroppableProps) => React.JSX.Element;
 export default FileDroppable;

package/src/components/FileDroppable/index.js

@@ -40,8 +40,7 @@ const readJSONFile = async (file, toJSON) => {
 };
 exports.readJSONFile = readJSONFile;
 const FileDroppable = (props = {}) => {
-    var _a;
-    const { onDropSuccess, message, fileAccept = '.json', helpText = 'AdapTable No Code Version', defaultText = 'Click here to select a JSON file to load or drag it here', dragOverText = 'Drop file here to start Adaptable Wizard', icon = React.createElement(icons_1.Icon, { name: "paperclip", size: 48 }), value } = props, domProps = tslib_1.__rest(props, ["onDropSuccess", "message", "fileAccept", "helpText", "defaultText", "dragOverText", "icon", "value"]);
+    const { onDropSuccess, message, fileAccept = '.json', helpText = 'AdapTable No Code Version', defaultText = 'Click here to select a JSON file to load or drag it here', dragOverText = 'Drop file here to start Adaptable Wizard', icon = React.createElement(icons_1.Icon, { name: "paperclip", size: 48 }), value, ...domProps } = props;
     const [state, dispatch] = (0, react_1.useReducer)(reducer_1.default, initialState);
     const onDragEnter = (e) => {
         dispatch({
@@ -98,11 +97,11 @@ const FileDroppable = (props = {}) => {
             }
         }
     };
-    const domRef = (0, react_1.useRef)();
+    const domRef = (0, react_1.useRef)(null);
     let form = (React.createElement("form", { onSubmit: preventEventPropagation },
         React.createElement(SimpleButton_1.default, { style: { cursor: 'pointer' }, variant: "outlined" },
             React.createElement("div", null, state.dragOver ? dragOverText : defaultText),
-            React.createElement("input", { type: "file", onChange: onDrop, accept: fileAccept, value: (_a = props === null || props === void 0 ? void 0 : props.file) === null || _a === void 0 ? void 0 : _a.name, style: {
+            React.createElement("input", { type: "file", onChange: onDrop, accept: fileAccept, value: props?.file?.name, style: {
                     opacity: 0,
                     position: 'absolute',
                     cursor: 'pointer',
@@ -115,7 +114,7 @@ const FileDroppable = (props = {}) => {
                     zIndex: 1,
                 } }))));
     const msg = message || state.message;
-    return (React.createElement(rebass_1.Flex, Object.assign({}, domProps, { flexDirection: "column", className: (0, join_1.default)(props.className, 'ab-FileDroppable', state.dragOver ? 'ab-FileDroppable--drag-over' : ''), alignItems: "center", justifyContent: "center", onDragEnter: onDragEnter, onDragLeave: onDragLeave, onDrop: onDrop, onDragOver: preventEventPropagation, ref: domRef }),
+    return (React.createElement(rebass_1.Flex, { ...domProps, flexDirection: "column", className: (0, join_1.default)(props.className, 'ab-FileDroppable', state.dragOver ? 'ab-FileDroppable--drag-over' : ''), alignItems: "center", justifyContent: "center", onDragEnter: onDragEnter, onDragLeave: onDragLeave, onDrop: onDrop, onDragOver: preventEventPropagation, ref: domRef },
         props.children,
         helpText || icon ? (React.createElement(rebass_1.Flex, { flexDirection: "column" },
             helpText ? (React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "center", margin: 2 },

package/src/components/FileDroppable/reducer.js

@@ -7,19 +7,32 @@ var ActionTypes;
     ActionTypes["DRAG_OUT"] = "DRAG_OUT";
     ActionTypes["SET_INVALID_FILE"] = "SET_INVALID_FILE";
     ActionTypes["DROP_SUCCES"] = "DROP_SUCCES";
-})(ActionTypes = exports.ActionTypes || (exports.ActionTypes = {}));
+})(ActionTypes || (exports.ActionTypes = ActionTypes = {}));
 const reducer = (state, action) => {
     if (action.type === ActionTypes.DRAG_OVER) {
-        return Object.assign(Object.assign({}, state), { dragOver: true });
+        return {
+            ...state,
+            dragOver: true,
+        };
     }
     if (action.type === ActionTypes.DRAG_OUT) {
-        return Object.assign(Object.assign({}, state), { dragOver: false });
+        return {
+            ...state,
+            dragOver: false,
+        };
     }
     if (action.type === ActionTypes.SET_INVALID_FILE) {
-        return Object.assign(Object.assign({}, state), { message: action.payload.message });
+        return {
+            ...state,
+            message: action.payload.message,
+        };
     }
     if (action.type === ActionTypes.DROP_SUCCES) {
-        return Object.assign(Object.assign({}, state), { dragOver: false, message: action.payload.message });
+        return {
+            ...state,
+            dragOver: false,
+            message: action.payload.message,
+        };
     }
     return state;
 };

package/src/components/Flex.d.ts

@@ -0,0 +1 @@
+export { Flex } from 'rebass';