@quillsql/react 2.12.28 → 2.12.30

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

@@ -3,6 +3,7 @@
 // Definitions by: taozhi8833998 <https://github.com/taozhi8833998>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
+import { recursiveSearchByKey } from '../../utils/astProcessing';
 /**
  * Returns whether the AST is for a 'use' query.
  */
@@ -112,6 +113,26 @@ export const isNodeEmptyCollection = (node) => {
         return false;
     return true;
 };
+export function getColumnName(ast) {
+    let columnObj = recursiveSearchByKey(ast.expr, 'column');
+    if (columnObj) {
+        return extractColumnish(columnObj);
+    }
+    columnObj = recursiveSearchByKey(ast.expr, 'args');
+    if (columnObj) {
+        if (Array.isArray(columnObj.value)) {
+            columnObj.value.forEach((arg) => {
+                if (arg.type === 'double_quote_string' || arg.type === 'column_ref') {
+                    return extractColumnish(arg);
+                }
+            });
+        }
+        else {
+            return extractColumnish(columnObj);
+        }
+    }
+    return undefined;
+}
 /**
  * Extracts the column-like part from a ColumnRef node or a Value node
  * that is typed as double_quote_string.
@@ -119,13 +140,18 @@ export const isNodeEmptyCollection = (node) => {
  * @returns column as a string or undefined
  */
 export const extractColumnish = (expr_value) => {
-    if (expr_value?.type === 'column_ref') {
-        return expr_value.column;
+    if (typeof expr_value === 'string')
+        return expr_value;
+    //@ts-ignore
+    if (expr_value.expr && !expr_value.type) {
+        //@ts-ignore
+        return expr_value.expr.value;
     }
-    else if (expr_value?.type === 'double_quote_string') {
-        return expr_value.value;
+    else if (expr_value?.type === 'column_ref') {
+        return (expr_value.column?.expr?.value ??
+            expr_value.column);
     }
-    return undefined;
+    return expr_value.value;
 };
 /**
  * Returns whether the given columnType is a numeric type (ie. number-ish).

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

@@ -37,7 +37,12 @@ export declare const defaultEntry: {
     operator: string;
     left: {
         type: string;
-        name: string;
+        name: {
+            name: {
+                type: string;
+                value: string;
+            }[];
+        };
         args: {
             type: string;
             value: {
@@ -51,7 +56,12 @@ export declare const defaultEntry: {
         type: string;
         value: {
             type: string;
-            name: string;
+            name: {
+                name: {
+                    type: string;
+                    value: string;
+                }[];
+            };
             args: {
                 type: string;
                 value: {
@@ -90,7 +100,12 @@ export declare const defaultBoolComparison: {
 };
 export declare const defaultVariant: {
     type: string;
-    name: string;
+    name: {
+        name: {
+            type: string;
+            value: string;
+        }[];
+    };
     args: {
         type: string;
         value: {

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,QAAQ,qBAInB,CAAC;AAGH,eAAO,MAAM,SAAS,mBAKpB,CAAC;AAEH,eAAO,MAAM,WAAW,UAQvB,CAAC;AAEF,eAAO,MAAM,aAAa,UAazB,CAAC;AAEF,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;CAatB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;CAIxB,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;CAQzB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmCxB,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;CAYpC,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;;;;;;;CAYjC,CAAC;AAEF,eAAO,MAAM,cAAc;;;;;;;;;;CAY1B,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,QAAQ,qBAInB,CAAC;AAGH,eAAO,MAAM,SAAS,mBAKpB,CAAC;AAEH,eAAO,MAAM,WAAW,UAQvB,CAAC;AAEF,eAAO,MAAM,aAAa,UAazB,CAAC;AAEF,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;CAatB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;CAIxB,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;CAQzB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiDxB,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;CAYpC,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;;;;;;;CAYjC,CAAC;AAEF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;CAmB1B,CAAC"}

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

@@ -68,7 +68,14 @@ export const defaultEntry = {
     operator: 'IN',
     left: {
         type: 'function',
-        name: 'LOWER',
+        name: {
+            name: [
+                {
+                    type: 'default',
+                    value: 'LOWER',
+                },
+            ],
+        },
         args: {
             type: 'expr_list',
             value: [
@@ -85,7 +92,14 @@ export const defaultEntry = {
         value: [
             {
                 type: 'function',
-                name: 'LOWER',
+                name: {
+                    name: [
+                        {
+                            type: 'default',
+                            value: 'LOWER',
+                        },
+                    ],
+                },
                 args: {
                     type: 'expr_list',
                     value: [
@@ -127,7 +141,14 @@ export const defaultBoolComparison = {
 };
 export const defaultVariant = {
     type: 'function',
-    name: 'LOWER',
+    name: {
+        name: [
+            {
+                type: 'default',
+                value: 'LOWER',
+            },
+        ],
+    },
     args: {
         type: 'expr_list',
         value: [

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

@@ -1,6 +1,7 @@
 import { NodeSQLParser as NSP, AST } from './ast';
 import { Pivot } from './pivot';
 import { TableInfo } from './schema';
+import { ColumnInternal } from '../../models/Columns';
 export declare function convertDateComparison(node: NSP.Select): NSP.Select;
 export declare function recursiveSearchAndReplace(node: any, search: string, replace: string): void;
 export declare function recursiveSearchAndReplaceByKey(node: any, search: string, replace: string, searchKey: string): void;
@@ -12,6 +13,11 @@ export declare function convertBigQuery(ast: any): NSP.Select;
  * Replaces the wildcard column selector with their literal column names.
  */
 export declare function convertWildcardColumns(ast: NSP.Select, schemaTables: TableInfo[]): NSP.Select;
+/**
+ * Take a list of AST column objects of any form and turn them into the generic select form
+ */
+export declare function convertColumnToGenericColumns(astColumns: NSP.Column[]): NSP.Column[];
+export declare function convertASTToPivotData(ast: NSP.Select, columnInfo: ColumnInternal[]): Pivot | null;
 /**
  * Processes the AST and builds up a new pivot, given the old AST, the old pivot
  * and a list of tables in the schema.
@@ -20,7 +26,7 @@ export declare function convertGroupBy(ast: AST, prevPivot: Pivot | undefined, s
     ast: NSP.Insert_Replace | NSP.Update | NSP.Delete | NSP.Alter | NSP.Use | NSP.Create | NSP.Drop | NSP.BigQuery;
     pivot: Pivot;
 } | {
-    pivot: Partial<{
+    pivot: {
         aggregationType: "count" | "sum" | "average" | "min" | "max" | "avg";
         valueField: string;
         valueFieldType?: string | undefined;
@@ -31,33 +37,24 @@ export declare function convertGroupBy(ast: AST, prevPivot: Pivot | undefined, s
         sortDirection: "ASC" | "DESC";
         sortField?: string | undefined;
         sortFieldType?: string | undefined;
-    }> | null;
+    } | null;
     ast: Partial<NSP.Select>;
 } | {
     pivot: {
         title: string;
-        aggregationType?: "count" | "sum" | "average" | "min" | "max" | "avg" | undefined;
-        valueField?: string | undefined;
+        aggregationType: "count" | "sum" | "average" | "min" | "max" | "avg";
+        valueField: string;
         valueFieldType?: string | undefined;
         rowField?: string | undefined;
         rowFieldType?: string | undefined;
         columnField?: string | undefined;
-        sort?: boolean | undefined;
-        sortDirection?: "ASC" | "DESC" | undefined;
+        sort: boolean;
+        sortDirection: "ASC" | "DESC";
         sortField?: string | undefined;
         sortFieldType?: string | undefined;
     };
     ast: Partial<NSP.Select>;
 };
-/**
- * Applies a pivot to an object with {rows, fields} keys, returning
- * a new object with the aggragation applied to the rows and the
- * corresponding fields updated to reflect the accurate types.
- */
-export declare function applyPivot(data: any, pivot: any, schema: any): {
-    rows: any;
-    fields: any;
-};
 export declare function convertStringComparison(node: any, databaseType: string): any;
 export declare function convertRemoveSimpleParentheses(ast: NSP.Select): NSP.Select;
 //# sourceMappingURL=convert.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAMJ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAc,SAAS,EAAE,MAAM,UAAU,CAAC;AASjD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAuBlE;AAGD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,QAahB;AAGD,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAalB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAoDpD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,SAAS,EAAE,GACxB,GAAG,CAAC,MAAM,CAwBZ;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,SAAS,mBAAc,EACvB,YAAY,EAAE,SAAS,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoe1B;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;EA6G5D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyJtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E"}
+{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAOJ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAc,SAAS,EAAE,MAAM,UAAU,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAStD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAuBlE;AAGD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,QAahB;AAGD,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAalB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAoDpD;AAUD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,SAAS,EAAE,GACxB,GAAG,CAAC,MAAM,CA8BZ;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,gBAkBrE;AAmID,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,UAAU,EAAE,cAAc,EAAE,GAC3B,KAAK,GAAG,IAAI,CAmFd;AA+BD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,SAAS,mBAAc,EACvB,YAAY,EAAE,SAAS,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2F1B;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyNtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E"}