@vuu-ui/vuu-utils 3.3.5 → 3.3.7

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.5",
+  "version": "3.3.7",
   "author": "heswell",
   "main": "./src/index.js",
   "license": "Apache-2.0",
@@ -15,14 +15,14 @@
   },
   "devDependencies": {
     "@dnd-kit/react": "^0.1.21",
-    "@vuu-ui/vuu-data-types": "3.3.5",
-    "@vuu-ui/vuu-table-types": "3.3.5",
-    "@vuu-ui/vuu-filter-types": "3.3.5",
-    "@vuu-ui/vuu-protocol-types": "3.3.5"
+    "@vuu-ui/vuu-data-types": "3.3.7",
+    "@vuu-ui/vuu-table-types": "3.3.7",
+    "@vuu-ui/vuu-filter-types": "3.3.7",
+    "@vuu-ui/vuu-protocol-types": "3.3.7"
   },
   "peerDependencies": {
     "@internationalized/date": "^3.0.0",
-    "@vuu-ui/vuu-filter-parser": "3.3.5",
+    "@vuu-ui/vuu-filter-parser": "3.3.7",
     "clsx": "^2.0.0",
     "react": "^19.2.3",
     "react-dom": "^19.2.3"

package/src/filters/filterAsQuery.js

@@ -1,7 +1,21 @@
 import { isDateTimeDataValue } from "../column-utils.js";
+import { stringIsValidLong } from "../data-utils.js";
 import { isMultiClauseFilter, isMultiValueFilter, isSerializableFilter } from "./filter-utils.js";
 import { ScaledDecimal } from "../ScaledDecimal.js";
-const filterValue = (value)=>"string" == typeof value ? `"${value}"` : value instanceof ScaledDecimal || "bigint" == typeof value ? value.toString() : value;
+const filterValue = (value, columnType)=>{
+    if ("string" == typeof value) {
+        if (void 0 !== columnType) {
+            const isNumericType = [
+                "int",
+                "long",
+                "double"
+            ].includes(columnType);
+            return isNumericType ? value : `"${value}"`;
+        }
+        return stringIsValidLong(value) ? value : `"${value}"`;
+    }
+    return value instanceof ScaledDecimal || "bigint" == typeof value ? value.toString() : value;
+};
 const quotedStrings = (value)=>"string" == typeof value ? `"${value}"` : value;
 const removeOuterMostParentheses = (s)=>s.replace(/^\((.*)\)$/, "$1");
 const filterAsQuery = (f, opts)=>removeOuterMostParentheses(filterAsQueryCore(f, opts));
@@ -17,12 +31,12 @@ function singleValueFilterAsQuery(f, opts) {
     if (isSerializableFilter(f)) return f.asQuery();
     {
         const column = opts?.columnsByName?.[f.column];
-        if (column && isDateTimeDataValue(column)) return dateFilterAsQuery(f);
-        return defaultSingleValueFilterAsQuery(f);
+        if (column && isDateTimeDataValue(column)) return dateFilterAsQuery(f, opts);
+        return defaultSingleValueFilterAsQuery(f, opts);
     }
 }
 const ONE_DAY_IN_MILLIS = 86400000;
-function dateFilterAsQuery(f) {
+function dateFilterAsQuery(f, opts) {
     switch(f.op){
         case "=":
             {
@@ -41,7 +55,7 @@ function dateFilterAsQuery(f) {
                 return filterAsQueryCore({
                     op: "and",
                     filters
-                });
+                }, opts);
             }
         case "!=":
             {
@@ -60,11 +74,14 @@ function dateFilterAsQuery(f) {
                 return filterAsQueryCore({
                     op: "or",
                     filters
-                });
+                }, opts);
             }
         default:
-            return defaultSingleValueFilterAsQuery(f);
+            return defaultSingleValueFilterAsQuery(f, opts);
     }
 }
-const defaultSingleValueFilterAsQuery = (f)=>`${f.column} ${f.op} ${filterValue(f.value)}`;
+const defaultSingleValueFilterAsQuery = (f, opts)=>{
+    const columnType = opts?.columnsByName?.[f.column]?.serverDataType;
+    return `${f.column} ${f.op} ${filterValue(f.value, columnType)}`;
+};
 export { ONE_DAY_IN_MILLIS, dateFilterAsQuery, filterAsQuery };

package/src/form-utils.js

@@ -40,7 +40,7 @@ function getTypedValue(value, type, throwIfInvalid = false, options) {
             if (!throwIfInvalid) return;
             throw Error(`value ${value} is not a valid ${type}`);
         case "long":
-            if (stringIsValidLong(value)) return BigInt(value);
+            if (stringIsValidLong(value)) return value;
             if (!throwIfInvalid) return;
             throw Error(`value ${value} is not a valid ${type}`);
         case "scaleddecimal2":

package/types/filters/filterAsQuery.d.ts

@@ -1,6 +1,8 @@
-import { ColumnDescriptorsByName, Filter, SingleValueFilterClause } from "@vuu-ui/vuu-filter-types";
+import type { ColumnDescriptorsByName, Filter, SingleValueFilterClause } from "@vuu-ui/vuu-filter-types";
 export declare const filterAsQuery: (f: Filter, opts?: {
     columnsByName?: ColumnDescriptorsByName;
 }) => string;
 export declare const ONE_DAY_IN_MILLIS: number;
-export declare function dateFilterAsQuery(f: SingleValueFilterClause<number>): string;
+export declare function dateFilterAsQuery(f: SingleValueFilterClause<number>, opts?: {
+    columnsByName?: ColumnDescriptorsByName;
+}): string;