@quillsql/react 2.11.16 → 2.11.18

package/dist/esm/components/ReportBuilder/ui.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { forwardRef, useContext, useEffect, useRef, useState } from 'react';
-import { MemoizedSelect, MemoizedCheckbox, MemoizedHeader, MemoizedLabel, MemoizedTabs, LoadingSpinner, MemoizedSecondaryButton, } from '../UiComponents';
+import { forwardRef, useContext, useEffect, useState } from 'react';
+import { MemoizedCheckbox, MemoizedHeader, LoadingSpinner, MemoizedSecondaryButton, MemoizedPopover, } from '../UiComponents';
 import MemoizedQuillTable from '../QuillTable';
 import { ThemeContext } from '../../Context';
 import { isNodeEmptyCollection, allNumericNodesValidInTree } from './util';
@@ -52,6 +52,7 @@ export const QuillSecondaryButton = ({ children, ...props }) => {
             ...props.style,
         }, children: children }));
 };
+// TODO: remove this, I think it is unused.
 export const QuillReportBuilderTable = ({ rows, columns, error, ...props }) => {
     const reformattedColumns = columns.map((c) => ({ label: c, field: c }));
     return (_jsx("div", { style: { height: '100%', overflow: 'auto' }, children: _jsx(MemoizedQuillTable, { rows: rows, columns: reformattedColumns, rowsPerPage: 10, showDownloadCSVButton: rows?.length > 0, downloadCSV: () => downloadCSV({ rows, fields: reformattedColumns, name: 'my_report' }), emptyStateLabel: error || 'No results', ...props }) }));
@@ -96,20 +97,18 @@ export const QuillTag = forwardRef(({ label, onClick, children, onClickDelete, h
                     }, children: _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: theme?.secondaryButtonColor || 'currentColor', style: { width: 16, height: 16 }, children: _jsx("path", { d: "M6.28 5.22a.75.75 0 0 0-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 1 0 1.06 1.06L10 11.06l3.72 3.72a.75.75 0 1 0 1.06-1.06L11.06 10l3.72-3.72a.75.75 0 0 0-1.06-1.06L10 8.94 6.28 5.22Z" }) }) }) }))] }));
 });
 // A heading element in the sidebar (eg. "Filters")
-export const QuillSidebarHeading = ({ label }) => (_jsx(MemoizedHeader, { children: label }));
-// A sub-heading element in the sidebar (eg. "Filters")
-export const QuillSidebarSubHeading = ({ label }) => (_jsx(MemoizedLabel, { children: label }));
+export const QuillSidebarHeading = ({ label, }) => _jsx(MemoizedHeader, { label: label });
 // The gray thing on the left.
-export const QuillSidebar = forwardRef(({ children, ...props }, forwardedRef) => (_jsx("div", { style: {
+export const QuillSidebar = ({ children }) => (_jsx("div", { style: {
         overflowX: 'visible',
         padding: '12px',
         width: '25%',
         height: '100%',
         maxWidth: '300px',
         boxSizing: 'border-box',
-    }, ref: forwardedRef, ...props, children: children })));
+    }, children: children }));
 // A big wrapper around the main content (ie. Input, Button, and Table)
-export const CustomContainer = forwardRef(({ children, ...props }, forwardedRef) => (_jsx("div", { style: {
+export const CustomContainer = ({ children }) => (_jsx("div", { style: {
         position: 'sticky',
         top: 0,
         display: 'flex',
@@ -122,59 +121,7 @@ export const CustomContainer = forwardRef(({ children, ...props }, forwardedRef)
         width: '75%',
         height: '100%',
         boxSizing: 'border-box',
-    }, ref: forwardedRef, ...props, children: children })));
-export const QuillSelect = ({ onChange, ...props }) => {
-    const handleOnChange = (value) => {
-        if (!onChange)
-            return;
-        const option = props.options.find((opt) => opt.value === value);
-        if (option) {
-            onChange(option.value);
-        }
-    };
-    return _jsx(MemoizedSelect, { ...props, onChange: handleOnChange });
-};
-export function MemoizedPopover({ onClose, children, style = {}, trigger, isOpen, }) {
-    const modalRef = useRef(null);
-    const [theme] = useContext(ThemeContext);
-    useEffect(() => {
-        const listener = (event) => {
-            if (modalRef?.current && !modalRef?.current?.contains(event.target)) {
-                onClose(event);
-            }
-        };
-        document.addEventListener('mousedown', listener);
-        return () => {
-            document.removeEventListener('mousedown', listener);
-        };
-    }, [modalRef, onClose]);
-    return (_jsxs("div", { children: [trigger, isOpen && (_jsx("div", { id: "quill-popover-modal", ref: modalRef, style: { position: 'relative' }, children: _jsx("div", { style: {
-                        background: theme?.backgroundColor || 'white',
-                        position: 'absolute',
-                        boxShadow: '0px 1px 12px 0px rgba(56, 65, 81, 0.1)',
-                        border: theme
-                            ? `${theme.borderWidth || 1}px solid ${theme.borderColor || '#e7e7e7'}`
-                            : '1px solid #e7e7e7',
-                        boxSizing: 'content-box',
-                        zIndex: 999,
-                        top: 12,
-                        borderRadius: 6,
-                        padding: 20,
-                        ...style,
-                    }, children: children }) }))] }));
-}
-export const QuillPopover = forwardRef(({ children, trigger, isOpen, onClose = () => { }, title = undefined }, ref) => {
-    const [theme] = useContext(ThemeContext);
-    return (_jsxs(MemoizedPopover, { isOpen: isOpen, onClose: onClose, trigger: trigger, parentRef: ref, ref: ref, children: [title && (_jsx("h1", { style: {
-                    fontWeight: '600',
-                    fontSize: 18,
-                    margin: 0,
-                    textAlign: 'left',
-                    marginBottom: 5,
-                    color: theme?.primaryTextColor,
-                    fontFamily: theme?.fontFamily,
-                }, children: title })), children] }));
-});
+    }, children: children }));
 // The six-dot grab-handle icon.
 export const QuillHandleButton = () => {
     const [theme] = useContext(ThemeContext);
@@ -219,7 +166,7 @@ export const QuillHandleButton = () => {
                             background: '#9CA0A7',
                         } })] })] }));
 };
-export const QuillSelectColumn = ({ label, selected, setSelected, children, }) => {
+export const QuillSelectColumn = ({ label, isSelected, setSelected, DragHandle, }) => {
     const [theme] = useContext(ThemeContext);
     return (_jsxs("div", { title: label, style: {
             boxShadow: '0px 1px 4px #e2e8f005',
@@ -231,13 +178,13 @@ export const QuillSelectColumn = ({ label, selected, setSelected, children, }) =
             display: 'flex',
             alignItems: 'center',
             backgroundColor: theme?.backgroundColor || 'white',
-        }, children: [_jsx("div", { children: children }), _jsxs("label", { style: {
+        }, children: [_jsx(DragHandle, { dragIcon: QuillHandleButton }), _jsxs("label", { style: {
                     display: 'flex',
                     gap: 2,
                     whiteSpace: 'nowrap',
                     textOverflow: 'ellipsis',
                     overflow: 'hidden',
-                }, children: [_jsx(MemoizedCheckbox, { checked: selected, onChange: () => setSelected() }), _jsx("span", { style: {
+                }, children: [_jsx(MemoizedCheckbox, { isChecked: isSelected, onChange: () => setSelected() }), _jsx("span", { style: {
                             marginLeft: 6,
                             display: 'block',
                             whiteSpace: 'nowrap',
@@ -247,8 +194,10 @@ export const QuillSelectColumn = ({ label, selected, setSelected, children, }) =
                             color: theme?.primaryTextColor,
                         }, children: snakeCaseToTitleCase(label) })] })] }));
 };
-// A draggable card with a grab-handle and a column name
-export const QuillDraggableColumn = ({ label, children, onDelete }) => {
+/**
+ * A draggable card with a grab-handle and a column name
+ */
+export const QuillDraggableColumn = ({ label, onDelete, DragHandle, }) => {
     const [theme] = useContext(ThemeContext);
     return (_jsxs("div", { style: {
             boxShadow: '0px 1px 4px #e2e8f005',
@@ -257,13 +206,14 @@ export const QuillDraggableColumn = ({ label, children, onDelete }) => {
             display: 'flex',
             alignItems: 'center',
             backgroundColor: theme?.backgroundColor || 'white',
-        }, children: [_jsx("div", { children: children }), _jsx("div", { style: {
+        }, children: [_jsx(DragHandle, { dragIcon: QuillHandleButton }), _jsx("div", { style: {
                     marginLeft: 2,
                     marginRight: 'auto',
                     fontSize: 14,
                     display: 'block',
                     whiteSpace: 'nowrap',
                     textOverflow: 'ellipsis',
+                    overflow: 'hidden',
                     fontFamily: theme?.fontFamily,
                 }, children: label }), _jsx("button", { onClick: onDelete, style: {
                     paddingRight: 4,
@@ -281,11 +231,6 @@ export const QuillButtonLoadingState = () => {
 export const QuillTableLoadingState = () => {
     return (_jsx("div", { style: { display: 'flex', flexDirection: 'column', margin: 'auto' }, children: _jsx(LoadingSpinner, {}) }));
 };
-export const DEFAULT_TAB_OPTIONS = [
-    { label: 'or', value: 'OR' },
-    { label: 'and', value: 'AND' },
-];
-export const QuillTabs = forwardRef(({ options = DEFAULT_TAB_OPTIONS, ...props }, ref) => (_jsx(MemoizedTabs, { ref: ref, options: options, ...props })));
 export const EditPopover = ({ onSave, onDelete, Button, renderNode, activeEditItem, }) => {
     const handleOnClick = () => {
         if (!allNumericNodesValidInTree(activeEditItem)) {
@@ -306,39 +251,45 @@ export const EditPopover = ({ onSave, onDelete, Button, renderNode, activeEditIt
                     width: '100%',
                 }, children: [_jsx(MemoizedSecondaryButton, { onClick: onDelete, label: "Delete" }), _jsx(Button, { onClick: handleOnClick, label: "Save" })] })] }));
 };
-export const QuillFilterPopover = ({ filterLabel, onClickDeleteFilter, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
-    return (_jsx(QuillPopover, { isOpen: isOpen, title: popoverTitle, trigger: _jsx(QuillTag, { label: filterLabel, onClickDelete: onClickDeleteFilter, onClick: () => {
-                setIsOpen((isOpen) => !isOpen);
-            } }), onClose: () => {
-            setIsOpen(false);
-        }, children: popoverChildren }));
+export const QuillFilterPopover = ({ filterLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
+    const handleSetIsOpen = (isOpen) => {
+        setIsOpen(isOpen);
+    };
+    return (_jsxs(_Fragment, { children: [_jsx(QuillTag, { label: filterLabel, onClickDelete: onClickDelete, onClick: () => setIsOpen(!isOpen) }), _jsx(MemoizedPopover, { isOpen: isOpen, setIsOpen: handleSetIsOpen, popoverTitle: popoverTitle, popoverChildren: popoverChildren })] }));
+};
+export const QuillSortPopover = ({ sortLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
+    return (_jsxs(_Fragment, { children: [_jsx(QuillTag, { label: sortLabel, onClickDelete: onClickDelete, onClick: () => {
+                    setIsOpen(!isOpen);
+                } }), _jsx(MemoizedPopover, { isOpen: isOpen, popoverTitle: popoverTitle, setIsOpen: setIsOpen, popoverChildren: popoverChildren })] }));
 };
-export const QuillSortPopover = ({ filterLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
-    return (_jsx(QuillPopover, { isOpen: isOpen, title: popoverTitle, trigger: _jsx(QuillTag, { label: filterLabel, onClickDelete: onClickDelete, onClick: () => {
-                setIsOpen((isOpen) => !isOpen);
-            } }), onClose: () => {
-            setIsOpen(false);
-        }, children: popoverChildren }));
+export const QuillLimitPopover = ({ limitLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
+    return (_jsxs(_Fragment, { children: [_jsx(QuillTag, { label: limitLabel, onClickDelete: onClickDelete, onClick: () => {
+                    setIsOpen(!isOpen);
+                } }), _jsx(MemoizedPopover, { isOpen: isOpen, popoverTitle: popoverTitle, setIsOpen: setIsOpen, popoverChildren: popoverChildren })] }));
 };
-export const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData, activeEditItem, setEditPopoverKey, setActiveEditItem, setActivePath, setOpenPopover, setIsPending, clearCheckboxes, fetchSqlQuery, handleDelete, setCheckboxes, handleReplaceSubtree, FilterPopover, getByKey, EditPopover, Button, renderNode, children, }) => {
+export const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData, activeEditItem, setEditPopoverKey, setActiveEditItem, setActivePath, setOpenPopover, setIsPending, clearCheckboxes, handleDelete, setCheckboxes, handleReplaceSubtree, FilterPopover, getByKey, EditPopover, Button, renderNode, children, }) => {
     const [isOpen, setIsOpen] = useState(false);
+    const onOpen = () => {
+        setActiveEditItem(getByKey(formData, keyPrefix));
+        setActivePath(keyPrefix);
+        setIsPending(true);
+        setEditPopoverKey(keyPrefix);
+        setCheckboxes(getByKey(formData, keyPrefix));
+    };
+    const onClose = () => {
+        setEditPopoverKey(null);
+        setIsPending(false);
+        setActiveEditItem(null);
+        setActivePath(null);
+        setOpenPopover(null);
+        clearCheckboxes();
+    };
     useEffect(() => {
         if (isOpen) {
-            // open
-            setActiveEditItem(getByKey(formData, keyPrefix));
-            setActivePath(keyPrefix);
-            setIsPending(true);
-            setEditPopoverKey(keyPrefix);
-            setCheckboxes(getByKey(formData, keyPrefix));
+            onOpen();
         }
         else {
-            // closed
-            setEditPopoverKey(null);
-            setIsPending(false);
-            setActiveEditItem(null);
-            setActivePath(null);
-            setOpenPopover(null);
-            clearCheckboxes();
+            onClose();
         }
     }, [isOpen]);
     if (isCard && isRow) {
@@ -352,7 +303,7 @@ export const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData,
             setEditPopoverKey(null);
             clearCheckboxes();
         };
-        return (_jsx("div", { style: { width: '100%' }, children: _jsx(FilterPopover, { isOpen: editPopoverKey === keyPrefix, popoverTitle: "Edit Filter", filterLabel: children, onClickDeleteFilter: handleClickDelete, setIsOpen: setIsOpen, popoverChildren: _jsx(EditPopover, { Button: Button, renderNode: renderNode, activeEditItem: activeEditItem, onSave: () => {
+        return (_jsx("div", { style: { width: '100%' }, children: _jsx(FilterPopover, { isOpen: editPopoverKey === keyPrefix, popoverTitle: "Edit Filter", filterLabel: children, onClickDelete: handleClickDelete, setIsOpen: setIsOpen, popoverChildren: _jsx(EditPopover, { Button: Button, renderNode: renderNode, activeEditItem: activeEditItem, onSave: () => {
                         if (isNodeEmptyCollection(activeEditItem)) {
                             setIsPending(false);
                             setActiveEditItem(null);
@@ -360,7 +311,7 @@ export const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData,
                             setOpenPopover(null);
                             setEditPopoverKey(null);
                             handleDelete(keyPrefix);
-                            fetchSqlQuery();
+                            setIsOpen(false);
                             clearCheckboxes();
                         }
                         else {
@@ -370,6 +321,7 @@ export const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData,
                             setActiveEditItem(null);
                             setActivePath(null);
                             setOpenPopover(null);
+                            setIsOpen(false);
                             clearCheckboxes();
                         }
                     }, onDelete: () => {
@@ -378,8 +330,8 @@ export const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData,
                         setActivePath(null);
                         setOpenPopover(null);
                         setEditPopoverKey(null);
+                        setIsOpen(false);
                         handleDelete(keyPrefix);
-                        fetchSqlQuery();
                         clearCheckboxes();
                     } }) }) })); // Make sure to close the <Tag> correctly
     }

package/dist/esm/components/ReportBuilder/util.d.ts

@@ -21,11 +21,15 @@ export declare function formatDateComparisonNode(node: any): string | null;
 export declare function getInTheCurrentIntervalSentence(node: any, databaseType: string): string | null;
 export declare function getInTheLastIntervalSentence(node: any, databaseType: string): string | null;
 export declare function getInThePreviousIntervalSentence(node: any, databaseType: string): string | null;
+export declare function getIsEqualsSentence(node: any, databaseType: string): string | null;
+export declare function getIsAfterSentence(node: any, databaseType: string): string | null;
+export declare function getIsBeforeSentence(node: any, databaseType: string): string | null;
 export declare const isInTheLastInterval: (node: any, databaseType: string) => boolean;
-export declare const isInTheLastIntervalBigQuery: (node: any) => boolean;
+export declare const isAfter: (node: any, databaseType: string) => boolean | undefined;
+export declare const isBefore: (node: any, databaseType: string) => boolean | undefined;
 export declare const isTheCurrentInterval: (node: any, databaseType: string) => boolean;
+export declare const isEquals: (node: any, databaseType: string) => boolean;
 export declare const isThePreviousInterval: (node: any, databaseType: string) => any;
-export declare const isTheCurrentIntervalBigQuery: (node: any) => boolean;
 /**
  * Returns whether this node is the root of a binary expression
  * where the left child is a string but really should be
@@ -56,7 +60,7 @@ export declare function tryConvertDateEquality(node: any, databaseType?: string)
  * Returns whether this node is an equality of a date column with a
  * date trunc.
  */
-export declare const isDateTruncEquals: (node: any) => boolean;
+export declare const isDateTruncEquals: (node: any, databaseType?: string) => boolean;
 /**
  * Returns whether this node is an equality of a date column with extract.
  */
@@ -73,6 +77,8 @@ export declare const getDateFilterInfo: (node: any) => {
     intervalType: any;
     intervalPaths: any;
 };
-export declare function removeNonSelectedTableReferences(ast: any, table: string): any;
+export declare function removeNonSelectedTableReferences(ast: any, table: string, columns: string[]): any;
 export declare function allNumericNodesValidInTree(node: any): boolean;
+export declare function isIdColumn(columnName?: string): boolean | "" | undefined;
+export declare function getCustomSentence(node: any, databaseType: string): string | null;
 //# sourceMappingURL=util.d.ts.map

package/dist/esm/components/ReportBuilder/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/util.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,eAAO,MAAM,qBAAqB,SAAU,GAAG,YAW9C,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,WAa1C;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,WAK5C;AAGD,eAAO,MAAM,WAAW,SAAU,GAAG,YAuBpC,CAAC;AAKF,eAAO,MAAM,oBAAoB,SAAU,GAAG,QAE7C,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG;;;;;;;;EAU3C;AAKD,eAAO,MAAM,eAAe,QAAS,GAAG,QAMvC,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,WAiBvD;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,GAAG,iBAQjD;AAED,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAOf;AAQD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAWf;AAED,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAOf;AAMD,eAAO,MAAM,mBAAmB,SAAU,GAAG,gBAAgB,MAAM,YA4BlE,CAAC;AAIF,eAAO,MAAM,2BAA2B,SAAU,GAAG,YAUpD,CAAC;AAIF,eAAO,MAAM,oBAAoB,SACzB,GAAG,gBACK,MAAM,KACnB,OAoBF,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAAU,GAAG,gBAAgB,MAAM,QAYpE,CAAC;AAEF,eAAO,MAAM,4BAA4B,SAAU,GAAG,KAAG,OAUxD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,SAAU,GAAG,QA4B3C,CAAC;AAGF,eAAO,MAAM,UAAU,eAAgB,MAAM,SAe5C,CAAC;AAmBF;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,MAAM,UAsBvE;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,UAgB9C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,MAAM,sBAmBtE;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,SAAU,GAAG,YAU1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,SAAU,GAAG,YAOxC,CAAC;AAEF,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,WAehD;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,GAAG,GACV,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAyB1C;AAED,eAAO,MAAM,QAAQ,QAAS,GAAG,QAAoC,CAAC;AAEtE,eAAO,MAAM,QAAQ,MAAO,MAAM,WAA2C,CAAC;AA4L9E,eAAO,MAAM,iBAAiB,SAAU,GAAG;;;;;;;CAc1C,CAAC;AAqCF,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,OAQvE;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAe7D"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/util.ts"],"names":[],"mappings":"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"}

package/dist/esm/components/ReportBuilder/util.js

@@ -1,7 +1,9 @@
 // A collection of reusable, pure, utility functions for the Report Builder.
-import { getQuarter } from 'date-fns';
+import { getQuarter, format, addMinutes, } from 'date-fns';
 import { DATE_DESCRIPTION_MAP } from './bigDateMap';
 import { snakeCaseToTitleCase } from '../../utils/textProcessing';
+import { isAfterBigQuery, isBeforeBigQuery, isEqualsBigQuery, isInTheLastIntervalBigQuery, isTheCurrentIntervalBigQuery, } from '../../utils/parserBigQuery';
+import { isInTheLastIntervalPostgres, isTheCurrentIntervalPostgres, } from '../../utils/parserPostgres';
 /**
  * A node that is "in" or "not in" where none of the variants are selected.
  */
@@ -134,7 +136,7 @@ const BIG_QUERY_DAY_TO_INTERVAL_MAP = {
 };
 export function getInTheLastIntervalSentence(node, databaseType) {
     if (databaseType === 'BigQuery') {
-        const dateColumn = snakeCaseToTitleCase(node.left.column);
+        const dateColumn = snakeCaseToTitleCase(node.left.column || node.left.args.value[0].columns || '');
         const amount = node.right.args.value[1].expr.value;
         let unit = node.right.args.value[1].unit.toLowerCase();
         if (unit.includes('*')) {
@@ -152,6 +154,48 @@ export function getInThePreviousIntervalSentence(node, databaseType) {
     }
     return null;
 }
+export function getIsEqualsSentence(node, databaseType) {
+    if (databaseType === 'BigQuery') {
+        const dateColumn = snakeCaseToTitleCase(node.left.args.value[1].column);
+        const type = node.right.args.value[1].column.toLowerCase();
+        const value = node.right.args.value[0].value;
+        // using date-fns can I parse the date to short month year
+        const date = new Date(value);
+        if (type === 'year') {
+            return `${dateColumn} is in ${format(addMinutes(date, date.getTimezoneOffset()), 'yyyy')}`;
+        }
+        else if (type === 'month') {
+            return `${dateColumn} is in ${format(addMinutes(date, date.getTimezoneOffset()), 'MMM yyyy')}`;
+        }
+        else if (type === 'quarter') {
+            return `${dateColumn} is in ${format(addMinutes(date, date.getTimezoneOffset()), 'QQQ yyyy')}`;
+        }
+        return `${dateColumn} is in the ${type} of ${value}`;
+    }
+    return null;
+}
+export function getIsAfterSentence(node, databaseType) {
+    if (databaseType === 'BigQuery') {
+        const dateColumn = snakeCaseToTitleCase(node.left?.column || node.left?.args?.value[0]?.columns || '');
+        const value = node.right?.value || node.right?.args?.value[0]?.value || '';
+        if (!dateColumn || !value) {
+            return null;
+        }
+        return `${dateColumn} is after ${value}`;
+    }
+    return null;
+}
+export function getIsBeforeSentence(node, databaseType) {
+    if (databaseType === 'BigQuery') {
+        const dateColumn = snakeCaseToTitleCase(node.left?.column || node.left?.args?.value[0]?.columns || '');
+        const value = node.right?.value || node.right?.args?.value[0]?.value || '';
+        if (!dateColumn || !value) {
+            return null;
+        }
+        return `${dateColumn} is before ${value}`;
+    }
+    return null;
+}
 // "created_at" >= date_trunc ('year', CURRENT_DATE) - INTERVAL '1 year'
 // or
 // "created_at" >= CURRENT_DATE - INTERVAL '1 year'
@@ -160,38 +204,17 @@ export const isInTheLastInterval = (node, databaseType) => {
     if (databaseType && databaseType.toLowerCase() === 'bigquery') {
         return isInTheLastIntervalBigQuery(node);
     }
-    const isOutsideOfDateTrunc = ['>=', '>'].includes(node.operator) &&
-        node.left.type === 'column_ref' &&
-        node.right.type === 'binary_expr' &&
-        node.right.operator === '-' &&
-        node.right.left.type === 'function' &&
-        node.right.left.name.toLowerCase() === 'date_trunc' &&
-        node.right.left.args.value[0].type === 'single_quote_string' &&
-        node.right.left.args.value[1].type === 'function' &&
-        ['current_date', 'now'].includes(node.right.left.args.value[1].name.toLowerCase()) &&
-        node.right.right.type.toLowerCase() === 'interval' &&
-        node.right.right.expr.type === 'single_quote_string';
-    const noDateTrunc = ['>=', '>'].includes(node.operator) &&
-        node.left.type === 'column_ref' &&
-        node.right.type === 'binary_expr' &&
-        node.right.operator === '-' &&
-        node.right.left.type === 'function' &&
-        ['current_date', 'now'].includes(node.right.left.name.toLowerCase()) &&
-        node.right.right.type.toLowerCase() === 'interval' &&
-        node.right.right.expr.type === 'single_quote_string';
-    return isOutsideOfDateTrunc || noDateTrunc;
+    return isInTheLastIntervalPostgres(node);
 };
-// created_at >= DATE_SUB(CURRENT_DATE(), INTERVAL 1 MONTH)
-// in the last month aka one interval from today
-export const isInTheLastIntervalBigQuery = (node) => {
-    const isOutsideOfDateTrunc = ['>=', '>'].includes(node.operator) &&
-        node.left.type === 'column_ref' &&
-        node.right.type === 'function' &&
-        node.right.name.toLowerCase() === 'timestamp_sub' &&
-        node.right.args.value[0].type === 'function' &&
-        node.right.args.value[1].type === 'interval' &&
-        ['current_timestamp'].includes(node.right.args.value[0].name.toLowerCase());
-    return isOutsideOfDateTrunc;
+export const isAfter = (node, databaseType) => {
+    if (databaseType && databaseType.toLowerCase() === 'bigquery') {
+        return isAfterBigQuery(node);
+    }
+};
+export const isBefore = (node, databaseType) => {
+    if (databaseType && databaseType.toLowerCase() === 'bigquery') {
+        return isBeforeBigQuery(node);
+    }
 };
 // "created_at" >= date_trunc ('year', CURRENT_DATE - INTERVAL '1 year')
 // this year
@@ -199,19 +222,15 @@ export const isTheCurrentInterval = (node, databaseType) => {
     if (databaseType && databaseType.toLowerCase() === 'bigquery') {
         return isTheCurrentIntervalBigQuery(node);
     }
-    const isInsideOfDateTrunc = ['AND'].includes(node.operator) &&
-        (node.left.operator === '=' || node.left.type === 'double_quote_string') &&
-        node.right.operator === '=' &&
-        node.right.name &&
-        node.right.name.toLowerCase() === 'date_trunc' &&
-        node.args.value[0].type === 'single_quote_string' &&
-        node.args.value[1].type === 'binary_expr' &&
-        node.args.value[1].operator === '-' &&
-        node.args.value[1].left.type === 'function' &&
-        ['now', 'current_date'].includes(node.args.value[1].left.name.toLowerCase()) &&
-        node.args.value[1].right.type === 'interval' &&
-        node.args.value[1].right.expr.type === 'single_quote_string';
-    return isInsideOfDateTrunc;
+    return isTheCurrentIntervalPostgres(node);
+};
+// "created_at" >= date_trunc ('year', CURRENT_DATE - INTERVAL '1 year')
+// this year
+export const isEquals = (node, databaseType) => {
+    if (databaseType && databaseType.toLowerCase() === 'bigquery') {
+        return isEqualsBigQuery(node);
+    }
+    return false;
 };
 export const isThePreviousInterval = (node, databaseType) => {
     const isInsideOfDateTrunc = ['='].includes(node.operator) &&
@@ -220,21 +239,11 @@ export const isThePreviousInterval = (node, databaseType) => {
         node.left.type === 'function' &&
         node.right.name &&
         node.right.name.toLowerCase() === 'timestamp_trunc' &&
-        node.right.args.value[0].name.toLowerCase() === 'timestamp_sub' &&
+        node.right.args.value[0]?.name?.toLowerCase() === 'timestamp_sub' &&
         node.right.args.value[0].args.value[0].name.toLowerCase() ===
             'current_timestamp';
     return isInsideOfDateTrunc;
 };
-export const isTheCurrentIntervalBigQuery = (node) => {
-    const isInsideOfDateTrunc = ['='].includes(node.operator) &&
-        node.left.type === 'function' &&
-        node.left.name &&
-        node.left.name.toLowerCase() === 'timestamp_trunc' &&
-        node.right.type === 'function' &&
-        node.right.name.toLowerCase() === 'timestamp_trunc' &&
-        node.right.args.value[0].name.toLowerCase() === 'current_timestamp';
-    return isInsideOfDateTrunc;
-};
 /**
  * Returns whether this node is the root of a binary expression
  * where the left child is a string but really should be
@@ -355,7 +364,7 @@ export function extractSuffixToString(node) {
     }
 }
 export function tryConvertDateEquality(node, databaseType) {
-    if (isDateTruncEquals(node)) {
+    if (isDateTruncEquals(node, databaseType)) {
         const columnNode = node.left.args.value[1];
         const columnName = columnNode.column ?? columnNode.value;
         const cleanColumnName = snakeCaseToTitleCase(columnName.replaceAll('_at', ''));
@@ -375,7 +384,7 @@ export function tryConvertDateEquality(node, databaseType) {
  * Returns whether this node is an equality of a date column with a
  * date trunc.
  */
-export const isDateTruncEquals = (node) => {
+export const isDateTruncEquals = (node, databaseType) => {
     return (node.type === 'binary_expr' &&
         node.operator === '=' &&
         isDateTrunc(node.left) &&
@@ -627,18 +636,29 @@ function getNodeTable(node) {
     return null;
 }
 // Recursively remove filters that don't apply to the given table
-function removeNonSelectedTableFilters(node, table) {
+function removeNonSelectedTableFilters(node, table, columns) {
     if (node.left.type !== 'binary_expr') {
         const referencedTable = getNodeTable(node.left);
-        if (referencedTable && referencedTable !== table) {
+        const referencedColumn = node.left.column ||
+            node.left.value ||
+            node.left.args?.value[0]?.column ||
+            node.left.args?.value[0]?.value;
+        if ((referencedTable && referencedTable !== table) ||
+            !columns.includes(referencedColumn)) {
             return null;
         }
         else {
+            if (node.left.value) {
+                node.left.column = node.left.value;
+            }
+            else if (node.left.args?.value[0].value) {
+                node.left.args.value[0].column = node.left.args.value[0].value;
+            }
             return node;
         }
     }
-    node.left = removeNonSelectedTableFilters(node.left, table);
-    node.right = removeNonSelectedTableFilters(node.right, table);
+    node.left = removeNonSelectedTableFilters(node.left, table, columns);
+    node.right = removeNonSelectedTableFilters(node.right, table, columns);
     if (node.left && node.right) {
         return node;
     }
@@ -652,14 +672,13 @@ function removeNonSelectedTableFilters(node, table) {
         return null;
     }
 }
-export function removeNonSelectedTableReferences(ast, table) {
+export function removeNonSelectedTableReferences(ast, table, columns) {
     ast.columns = ast.columns.filter((col) => {
         return col.table === table || col.expr.table === table || !col.expr.table;
     });
     if (!ast.where)
         return ast;
-    ast.where = removeNonSelectedTableFilters(ast.where, table);
-    console.log(ast);
+    ast.where = removeNonSelectedTableFilters(ast.where, table, columns);
     return ast;
 }
 export function allNumericNodesValidInTree(node) {
@@ -667,7 +686,6 @@ export function allNumericNodesValidInTree(node) {
         return true;
     if (node.type === 'number') {
         const value = parseFloat(node.value);
-        console.log(node.value, value);
         if (Number.isNaN(value)) {
             return false;
         }
@@ -680,3 +698,32 @@ export function allNumericNodesValidInTree(node) {
     const isRightValid = allNumericNodesValidInTree(node.right);
     return isLeftValid && isRightValid;
 }
+export function isIdColumn(columnName) {
+    return (columnName &&
+        (columnName.toLowerCase() === 'id' ||
+            columnName.toLowerCase().endsWith('_id') ||
+            columnName.endsWith('Id')));
+}
+// This function determines if a node is a custom node type.
+// This will parse out date filters and some numeric filters that are unique (between).
+export function getCustomSentence(node, databaseType) {
+    if (isTheCurrentInterval(node, databaseType)) {
+        return getInTheCurrentIntervalSentence(node, databaseType);
+    }
+    else if (isInTheLastInterval(node, databaseType)) {
+        return getInTheLastIntervalSentence(node, databaseType);
+    }
+    else if (isAfter(node, databaseType)) {
+        return getIsAfterSentence(node, databaseType);
+    }
+    else if (isBefore(node, databaseType)) {
+        return getIsBeforeSentence(node, databaseType);
+    }
+    else if (isThePreviousInterval(node, databaseType)) {
+        return getInThePreviousIntervalSentence(node, databaseType);
+    }
+    else if (isEquals(node, databaseType)) {
+        return getIsEqualsSentence(node, databaseType);
+    }
+    return null;
+}