@quillsql/react 2.13.5 → 2.13.7

package/dist/esm/utils/columnProcessing.js

@@ -133,10 +133,10 @@ export function convertPostgresColumn(field) {
             jsType = 'string';
     }
     return {
-        label: 'field' in field
+        label: ('field' in field
             ? snakeAndCamelCaseToTitleCase(field.field)
-            : snakeAndCamelCaseToTitleCase(field.name),
-        field: 'field' in field ? field.field : field.name,
+            : snakeAndCamelCaseToTitleCase(field.name)) ?? '',
+        field: ('field' in field ? field.field : field.name) ?? '',
         format,
         fieldType,
         dataTypeID: field.dataTypeID,
@@ -316,7 +316,7 @@ export const getYAxisFields = (report) => {
         }
         else {
             if (curDateFilter?.comparison &&
-                curDateFilter.comparisonRange.value !== 'NO_COMPARISON') {
+                curDateFilter.comparisonRange?.value !== 'NO_COMPARISON') {
                 const comparisonYAxisFields = report.yAxisFields?.map((field) => {
                     return {
                         ...field,

package/dist/esm/utils/constants.d.ts

@@ -1,4 +1,5 @@
 export declare const MAX_COLUMN_ROWS_LIMIT = 500;
-export declare const QUILL_SERVER = "https://quill-344421.uc.r.appspot.com";
 export declare const MAX_PIVOT_UNIQUE_VALUES = 250;
+export declare const QUILL_SERVER: string;
+export declare const QUILL_QUERY_ENDPOINT: string;
 //# sourceMappingURL=constants.d.ts.map

package/dist/esm/utils/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,YAAY,0CAA0C,CAAC;AACpE,eAAO,MAAM,uBAAuB,MAAM,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C,eAAO,MAAM,YAAY,QACiD,CAAC;AAC3E,eAAO,MAAM,oBAAoB,QACa,CAAC"}

package/dist/esm/utils/constants.js

@@ -1,3 +1,4 @@
 export const MAX_COLUMN_ROWS_LIMIT = 500;
-export const QUILL_SERVER = 'https://quill-344421.uc.r.appspot.com';
 export const MAX_PIVOT_UNIQUE_VALUES = 250;
+export const QUILL_SERVER = process.env.QUILL_SERVER_HOST ?? 'https://quill-344421.uc.r.appspot.com';
+export const QUILL_QUERY_ENDPOINT = process.env.QUILL_QUERY_ENDPOINT ?? '/cloud';

package/dist/esm/utils/dataFetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AA8EvD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,mBAAmB,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,gBAqJ1B;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,mBAAmB,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,WAAW,CAAC,EAAE,WAAW,gBAiC1B;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,CAAC,EAAE,GAAG,GACb,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB5C"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AA8EvD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,mBAAmB,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,gBAqJ1B;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,mBAAmB,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,WAAW,CAAC,EAAE,WAAW,gBA+B1B;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,CAAC,EAAE,GAAG,GACb,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB5C"}

package/dist/esm/utils/dataFetcher.js

@@ -183,8 +183,7 @@ export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestB
 }
 export async function getDataFromCloud(client, cloudQueryEndpoint, cloudRequestBody, method = 'POST', abortSignal) {
     try {
-        const host = (typeof process !== 'undefined' && process?.env?.QUILL_SERVER_HOST) ||
-            'https://quill-344421.uc.r.appspot.com';
+        const host = QUILL_SERVER;
         const url = `${host}/${cloudQueryEndpoint}`;
         const resp = await fetch(url, {
             method,

package/dist/esm/utils/pivotConstructor.js

@@ -76,7 +76,7 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
             label: snakeCaseToTitleCase(processColumnName(field.name.replace('comparison_', 'comparison '))),
             format: field.name === pivot.rowField
                 ? 'string'
-                : pivot.valueFieldType ?? 'whole_number',
+                : (pivot.valueFieldType ?? 'whole_number'),
         }))
             .filter((field, index) => field.field !== 'comparison_' + pivot.rowField || index === 0)
             .sort((a, b) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.13.5",
+  "version": "2.13.7",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
@@ -8,12 +8,16 @@
     }
   },
   "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
   "files": [
     "dist"
   ],
   "scripts": {
     "build": "rm -rf dist && tsc -p tsconfig.json && tsc -p tsconfig.esm.json",
-    "dev": "tsc -p tsconfig.json -w & tsc -p tsconfig.esm.json -w",
+    "dev": "concurrently \"npm run dev:types\" \"npm run dev:esm\" \"npm run dev:cjs\"",
+    "dev:cjs": "babel src --out-dir dist/cjs --extensions \".ts,.tsx\" --copy-files --watch --env-name cjs",
+    "dev:esm": "babel src --out-dir dist/esm --extensions \".ts,.tsx\" --copy-files --watch --env-name esm",
+    "dev:types": "tsc --emitDeclarationOnly -w",
     "lint": "eslint . --max-warnings 0",
     "pub": "rm -rf dist && tsc -p tsconfig.json && tsc -p tsconfig.esm.json && npm publish --access public"
   },
@@ -27,20 +31,29 @@
     "date-fns-tz": "^2.0.0",
     "fast-deep-equal": "^3.1.3",
     "jspdf": "^2.5.2",
-    "react-dom": "^18.2.0",
-    "recharts": "^2.12.5"
+    "recharts": "^2.13.0"
   },
   "devDependencies": {
+    "@babel/cli": "^7.25.7",
+    "@babel/core": "^7.25.8",
+    "@babel/preset-env": "^7.25.8",
+    "@babel/preset-react": "^7.25.7",
+    "@babel/preset-typescript": "^7.25.7",
     "@repo/eslint-config": "*",
     "@repo/typescript-config": "*",
     "@types/big.js": "^6.2.2",
     "@types/eslint": "^8.56.1",
     "@types/node": "^20.10.6",
-    "@types/react": "^18.2.46",
-    "@types/react-dom": "^18.2.18",
+    "@types/react": "^18",
+    "@types/react-dom": "^18",
+    "babel-plugin-inline-dotenv": "^1.7.0",
+    "concurrently": "^9.0.1",
     "eslint": "^8.56.0",
-    "react": "^18.2.0",
     "typescript": "^5.3.3"
   },
+  "peerDependencies": {
+    "react": "^18",
+    "react-dom": "^18"
+  },
   "access": "public"
 }

package/dist/cjs/components/BigModal/BigModal.d.ts

@@ -1,15 +0,0 @@
-import React from 'react';
-import { HorizontalPosition } from '../../lib/inputTypes';
-export interface ModalProps extends React.HTMLAttributes<HTMLDivElement> {
-    showModal: boolean;
-    setShowModal: React.Dispatch<React.SetStateAction<boolean>> | ((nextState: boolean) => void);
-    parentRef?: React.RefObject<HTMLElement>;
-    width?: number;
-    maxHeight?: string;
-    anchorPosition?: HorizontalPosition;
-    children: React.ReactNode;
-    theme: any;
-}
-declare const BigModal: React.ForwardRefExoticComponent<ModalProps & React.RefAttributes<HTMLDivElement>>;
-export default BigModal;
-//# sourceMappingURL=BigModal.d.ts.map

package/dist/cjs/components/BigModal/BigModal.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BigModal.d.ts","sourceRoot":"","sources":["../../../../src/components/BigModal/BigModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAG9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,MAAM,WAAW,UAAW,SAAQ,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC;IACtE,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EACR,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,GAC7C,CAAC,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC;IACnC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACpC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC;CACZ;AAED,QAAA,MAAM,QAAQ,mFA+EZ,CAAC;AAEH,eAAe,QAAQ,CAAC"}

package/dist/cjs/components/BigModal/BigModal.js

@@ -1,81 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const jsx_runtime_1 = require("react/jsx-runtime");
-const react_1 = __importStar(require("react"));
-const hooks_1 = require("../../hooks");
-const lib_1 = require("../../lib");
-const BigModal = react_1.default.forwardRef((props, ref) => {
-    const { showModal, setShowModal, parentRef, width, children, className, theme, ...other } = props;
-    const modalRef = (0, react_1.useRef)(null);
-    const checkModalExceedsWindow = (0, react_1.useCallback)((modalWidth, windowWidth) => {
-        if (!parentRef?.current) {
-            return false;
-        }
-        const modalBoundingRight = parentRef.current.getBoundingClientRect().left + modalWidth;
-        return windowWidth - modalBoundingRight < 0;
-    }, [parentRef]);
-    (0, hooks_1.useOnClickOutside)(modalRef, (e) => {
-        // Exclude click on trigger button (e.g. Dropdown Button) from outside click handler
-        const isTriggerElem = parentRef
-            ? parentRef.current?.contains(e.target)
-            : false;
-        if (!isTriggerElem) {
-            setShowModal(false);
-        }
-    });
-    // Execute only when modal is of absolute size
-    (0, react_1.useEffect)(() => {
-        if (width) {
-            checkModalExceedsWindow(width, window.innerWidth);
-        }
-    }, [checkModalExceedsWindow, parentRef, width]);
-    (0, hooks_1.useOnWindowResize)(() => {
-        if (width) {
-            checkModalExceedsWindow(width, window.innerWidth);
-        }
-    });
-    return showModal ? ((0, jsx_runtime_1.jsx)("div", { className: className, ref: (0, lib_1.mergeRefs)([modalRef, ref]), style: {
-            position: 'absolute',
-            zIndex: 10,
-            overflowY: 'auto',
-            backgroundColor: theme?.backgroundColor || 'white',
-            borderColor: theme?.borderColor || '#E5E7EB',
-            borderTopStyle: 'solid',
-            borderBottomStyle: 'solid',
-            borderLeftStyle: 'solid',
-            borderRightStyle: 'solid',
-            borderTopWidth: 1,
-            borderBottomWidth: 1,
-            borderLeftWidth: 1,
-            borderRightWidth: 1,
-            borderRadius: '0.375rem',
-            boxShadow: '0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1)',
-            top: '50%',
-            left: '50%',
-            transform: 'translate(-50%, -50%)',
-        }, ...other, children: children })) : null;
-});
-exports.default = BigModal;

package/dist/esm/components/BigModal/BigModal.d.ts

@@ -1,15 +0,0 @@
-import React from 'react';
-import { HorizontalPosition } from '../../lib/inputTypes';
-export interface ModalProps extends React.HTMLAttributes<HTMLDivElement> {
-    showModal: boolean;
-    setShowModal: React.Dispatch<React.SetStateAction<boolean>> | ((nextState: boolean) => void);
-    parentRef?: React.RefObject<HTMLElement>;
-    width?: number;
-    maxHeight?: string;
-    anchorPosition?: HorizontalPosition;
-    children: React.ReactNode;
-    theme: any;
-}
-declare const BigModal: React.ForwardRefExoticComponent<ModalProps & React.RefAttributes<HTMLDivElement>>;
-export default BigModal;
-//# sourceMappingURL=BigModal.d.ts.map

package/dist/esm/components/BigModal/BigModal.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BigModal.d.ts","sourceRoot":"","sources":["../../../../src/components/BigModal/BigModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAG9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,MAAM,WAAW,UAAW,SAAQ,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC;IACtE,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EACR,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,GAC7C,CAAC,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC;IACnC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACpC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC;CACZ;AAED,QAAA,MAAM,QAAQ,mFA+EZ,CAAC;AAEH,eAAe,QAAQ,CAAC"}

package/dist/esm/components/BigModal/BigModal.js

@@ -1,56 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useCallback, useEffect, useRef } from 'react';
-import { useOnClickOutside, useOnWindowResize } from '../../hooks';
-import { mergeRefs } from '../../lib';
-const BigModal = React.forwardRef((props, ref) => {
-    const { showModal, setShowModal, parentRef, width, children, className, theme, ...other } = props;
-    const modalRef = useRef(null);
-    const checkModalExceedsWindow = useCallback((modalWidth, windowWidth) => {
-        if (!parentRef?.current) {
-            return false;
-        }
-        const modalBoundingRight = parentRef.current.getBoundingClientRect().left + modalWidth;
-        return windowWidth - modalBoundingRight < 0;
-    }, [parentRef]);
-    useOnClickOutside(modalRef, (e) => {
-        // Exclude click on trigger button (e.g. Dropdown Button) from outside click handler
-        const isTriggerElem = parentRef
-            ? parentRef.current?.contains(e.target)
-            : false;
-        if (!isTriggerElem) {
-            setShowModal(false);
-        }
-    });
-    // Execute only when modal is of absolute size
-    useEffect(() => {
-        if (width) {
-            checkModalExceedsWindow(width, window.innerWidth);
-        }
-    }, [checkModalExceedsWindow, parentRef, width]);
-    useOnWindowResize(() => {
-        if (width) {
-            checkModalExceedsWindow(width, window.innerWidth);
-        }
-    });
-    return showModal ? (_jsx("div", { className: className, ref: mergeRefs([modalRef, ref]), style: {
-            position: 'absolute',
-            zIndex: 10,
-            overflowY: 'auto',
-            backgroundColor: theme?.backgroundColor || 'white',
-            borderColor: theme?.borderColor || '#E5E7EB',
-            borderTopStyle: 'solid',
-            borderBottomStyle: 'solid',
-            borderLeftStyle: 'solid',
-            borderRightStyle: 'solid',
-            borderTopWidth: 1,
-            borderBottomWidth: 1,
-            borderLeftWidth: 1,
-            borderRightWidth: 1,
-            borderRadius: '0.375rem',
-            boxShadow: '0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1)',
-            top: '50%',
-            left: '50%',
-            transform: 'translate(-50%, -50%)',
-        }, ...other, children: children })) : null;
-});
-export default BigModal;