react-querybuilder - npm Package Compare versions

Comparing version 7.0.0-rc.0 to 7.0.0-rc.1

dist/formatQuery.js

@@ -69,16 +69,5 @@ "use strict";
 
-// src/utils/misc.ts
+// src/utils/parseNumber.ts
 var import_numeric_quantity = require("numeric-quantity");
-var numericRegex = new RegExp(
-  import_numeric_quantity.numericRegex.source.replace(/^\^/, "^\\s*").replace(/\$$/, "\\s*$")
-);
-var isPojo = (obj) => obj === null || typeof obj !== "object" ? false : Object.getPrototypeOf(obj) === Object.prototype;
-
-// src/utils/isRuleGroup.ts
-var isRuleGroup = (rg) => isPojo(rg) && "rules" in rg && Array.isArray(rg.rules);
-var isRuleGroupType = (rg) => isRuleGroup(rg) && typeof rg.combinator === "string";
-
-// src/utils/parseNumber.ts
-var import_numeric_quantity2 = require("numeric-quantity");
-var parseNumber = (v, { parseNumbers }) => {
+var parseNumber = (v, { parseNumbers } = {}) => {
   if (!parseNumbers || typeof v === "bigint" || typeof v === "number") {
@@ -92,3 +81,3 @@ return v;
     // TODO: Should these options be configurable?
-    (0, import_numeric_quantity2.numericQuantity)(v, {
+    (0, import_numeric_quantity.numericQuantity)(v, {
       allowTrailingInvalid: parseNumbers === "enhanced",
@@ -102,2 +91,13 @@ romanNumerals: true,
 
+// src/utils/misc.ts
+var import_numeric_quantity2 = require("numeric-quantity");
+var numericRegex = new RegExp(
+  import_numeric_quantity2.numericRegex.source.replace(/^\^/, "^\\s*").replace(/\$$/, "\\s*$")
+);
+var isPojo = (obj) => obj === null || typeof obj !== "object" ? false : Object.getPrototypeOf(obj) === Object.prototype;
+
+// src/utils/isRuleGroup.ts
+var isRuleGroup = (rg) => isPojo(rg) && "rules" in rg && Array.isArray(rg.rules);
+var isRuleGroupType = (rg) => isRuleGroup(rg) && typeof rg.combinator === "string";
+
 // src/utils/formatQuery/utils.ts
@@ -218,4 +218,4 @@ var mapSQLOperator = (op) => {
         const [first, second] = valueAsArray;
-        const firstNum = shouldRenderAsNumber(first, true) ? parseFloat(first) : NaN;
-        const secondNum = shouldRenderAsNumber(second, true) ? parseFloat(second) : NaN;
+        const firstNum = shouldRenderAsNumber(first, true) ? parseNumber(first, { parseNumbers: true }) : NaN;
+        const secondNum = shouldRenderAsNumber(second, true) ? parseNumber(second, { parseNumbers: true }) : NaN;
         let firstValue = isNaN(firstNum) ? valueIsField ? `${first}` : `"${escapeDoubleQuotes(first, escapeQuotes)}"` : firstNum;
@@ -291,4 +291,4 @@ let secondValue = isNaN(secondNum) ? valueIsField ? `${second}` : `"${escapeDoubleQuotes(second, escapeQuotes)}"` : secondNum;
         const [first, second] = valueAsArray;
-        const firstNum = shouldRenderAsNumber(first, true) ? parseFloat(first) : NaN;
-        const secondNum = shouldRenderAsNumber(second, true) ? parseFloat(second) : NaN;
+        const firstNum = shouldRenderAsNumber(first, true) ? parseNumber(first, { parseNumbers: true }) : NaN;
+        const secondNum = shouldRenderAsNumber(second, true) ? parseNumber(second, { parseNumbers: true }) : NaN;
         const firstValue = valueIsField || !isNaN(firstNum) ? `${first}` : `"${escapeDoubleQuotes2(first)}"`;
@@ -362,4 +362,4 @@ const secondValue = valueIsField || !isNaN(secondNum) ? `${second}` : `"${escapeDoubleQuotes2(second)}"`;
         const [first, second] = valueAsArray;
-        const firstNum = shouldRenderAsNumber(first, true) ? parseFloat(first) : NaN;
-        const secondNum = shouldRenderAsNumber(second, true) ? parseFloat(second) : NaN;
+        const firstNum = shouldRenderAsNumber(first, true) ? parseNumber(first, { parseNumbers: true }) : NaN;
+        const secondNum = shouldRenderAsNumber(second, true) ? parseNumber(second, { parseNumbers: true }) : NaN;
         let firstValue = isNaN(firstNum) ? valueIsField ? `${first}` : `'${escapeSingleQuotes(first, escapeQuotes)}'` : firstNum;
@@ -441,3 +441,3 @@ let secondValue = isNaN(secondNum) ? valueIsField ? `${second}` : `'${escapeSingleQuotes(second, escapeQuotes)}'` : secondNum;
   const fieldObject = { var: field };
-  const fieldOrNumberRenderer = (v) => valueIsField ? { var: `${v}` } : shouldRenderAsNumber(v, parseNumbers) ? parseFloat(v) : v;
+  const fieldOrNumberRenderer = (v) => valueIsField ? { var: `${v}` } : shouldRenderAsNumber(v, parseNumbers) ? parseNumber(v, { parseNumbers }) : v;
   switch (operator) {
@@ -474,4 +474,4 @@ case "<":
         if (!valueIsField && shouldRenderAsNumber(first, true) && shouldRenderAsNumber(second, true)) {
-          const firstNum = parseFloat(first);
-          const secondNum = parseFloat(second);
+          const firstNum = parseNumber(first, { parseNumbers: true });
+          const secondNum = parseNumber(second, { parseNumbers: true });
           if (secondNum < firstNum) {
@@ -553,4 +553,3 @@ const tempNum = secondNum;
       returnArray.push({
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error TS can't keep track of odd/even indexes here
+        // @ts-expect-error Too complicated to keep track of odd/even indexes in TS
         rules: rg.rules.slice(startIndex, i + 1).map(processRuleOrStringOrRuleGroupIC)
@@ -684,2 +683,3 @@ });
 };
+var valueRenderer = (v, parseNumbers) => typeof v === "boolean" ? v : shouldRenderAsNumber(v, parseNumbers) ? parseNumber(v, { parseNumbers }) : v;
 var defaultRuleProcessorElasticSearch = ({ field, operator, value, valueSource }, { parseNumbers } = {}) => {
@@ -755,3 +755,2 @@ if (valueSource === "field") {
   }
-  const valueRenderer = (v) => typeof value === "boolean" ? value : shouldRenderAsNumber(v, parseNumbers) ? parseFloat(v) : v;
   switch (operator) {
@@ -765,3 +764,3 @@ case "<":
           [field]: {
-            [rangeOperatorMap[operator]]: valueRenderer(value)
+            [rangeOperatorMap[operator]]: valueRenderer(value, parseNumbers)
           }
@@ -771,5 +770,5 @@ }
     case "=":
-      return { term: { [field]: valueRenderer(value) } };
+      return { term: { [field]: valueRenderer(value, parseNumbers) } };
     case "!=":
-      return { bool: { must_not: { term: { [field]: valueRenderer(value) } } } };
+      return { bool: { must_not: { term: { [field]: valueRenderer(value, parseNumbers) } } } };
     case "null":
@@ -781,5 +780,5 @@ return { bool: { must_not: { exists: { field } } } };
     case "notIn": {
-      const valueAsArray = toArray(value).map(valueRenderer);
+      const valueAsArray = toArray(value).map((v) => valueRenderer(v, parseNumbers));
       if (valueAsArray.length > 0) {
-        const arr = valueAsArray.map((v) => ({ term: { [field]: valueRenderer(v) } }));
+        const arr = valueAsArray.map((v) => ({ term: { [field]: valueRenderer(v, parseNumbers) } }));
         return { bool: operator === "in" ? { should: arr } : { must_not: arr } };
@@ -795,4 +794,4 @@ }
         if (shouldRenderAsNumber(first, true) && shouldRenderAsNumber(second, true)) {
-          const firstNum = parseFloat(first);
-          const secondNum = parseFloat(second);
+          const firstNum = parseNumber(first, { parseNumbers: true });
+          const secondNum = parseNumber(second, { parseNumbers: true });
           if (secondNum < firstNum) {
@@ -987,3 +986,5 @@ const tempNum = secondNum;
               splitValue.forEach(
-                (v) => params.push(shouldRenderAsNumber(v, parseNumbers) ? parseFloat(v) : v)
+                (v) => params.push(
+                  shouldRenderAsNumber(v, parseNumbers) ? parseNumber(v, { parseNumbers }) : v
+                )
               );
@@ -996,3 +997,3 @@ return `${quoteFieldNamesWith[0]}${rule.field}${quoteFieldNamesWith[1]} ${operator} (${splitValue.map(() => "?").join(", ")})`;
               inParams.push(`${paramPrefix}${thisParamName}`);
-              params_named[`${paramsKeepPrefix ? paramPrefix : ""}${thisParamName}`] = shouldRenderAsNumber(v, parseNumbers) ? parseFloat(v) : v;
+              params_named[`${paramsKeepPrefix ? paramPrefix : ""}${thisParamName}`] = shouldRenderAsNumber(v, parseNumbers) ? parseNumber(v, { parseNumbers }) : v;
             });
@@ -1006,3 +1007,5 @@ return `${quoteFieldNamesWith[0]}${rule.field}${quoteFieldNamesWith[1]} ${operator} (${inParams.join(", ")})`;
             const valueAsArray = toArray(rule.value);
-            const [first, second] = valueAsArray.slice(0, 2).map((v) => shouldRenderAsNumber(v, parseNumbers) ? parseFloat(v) : v);
+            const [first, second] = valueAsArray.slice(0, 2).map(
+              (v) => shouldRenderAsNumber(v, parseNumbers) ? parseNumber(v, { parseNumbers }) : v
+            );
             if (parameterized) {
@@ -1025,3 +1028,3 @@ params.push(first);
           if (shouldRenderAsNumber(rule.value, parseNumbers)) {
-            paramValue = parseFloat(rule.value);
+            paramValue = parseNumber(rule.value, { parseNumbers });
           } else {
@@ -1169,3 +1172,3 @@ paramValue = /^'.*'$/g.test(value) ? value.replace(/(^'|'$)/g, "") : (
     const query = isRuleGroupType(ruleGroup) ? ruleGroup : convertFromIC(ruleGroup);
-    const processRuleGroup = (rg) => {
+    const processRuleGroup = (rg, { outermost } = { outermost: false }) => {
       if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* istanbul ignore next */
@@ -1192,3 +1195,3 @@ ""])) {
       }
-      const jsonRuleGroup = processedRules.length === 1 ? processedRules[0] : {
+      const jsonRuleGroup = processedRules.length === 1 && outermost ? processedRules[0] : {
         [rg.combinator]: processedRules
@@ -1198,3 +1201,3 @@ };
     };
-    return processRuleGroup(query);
+    return processRuleGroup(query, { outermost: true });
   }
@@ -1201,0 +1204,0 @@ if (format === "elasticsearch") {

dist/transformQuery.js

@@ -74,2 +74,3 @@ "use strict";
     ...propertyMap["rules"] === false ? null : {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       [propertyMap["rules"] ?? "rules"]: rg.rules.map((r, idx) => {
@@ -76,0 +77,0 @@ const pathObject = omitPath ? null : { path: [...rg.path, idx] };

package.json

 {
   "name": "react-querybuilder",
-  "version": "7.0.0-rc.0",
+  "version": "7.0.0-rc.1",
   "description": "The React <QueryBuilder /> component for constructing queries",
@@ -129,3 +129,3 @@ "main": "./dist/cjs/index.js",
   },
-  "gitHead": "77ba04a15cc5cf6923dd92314e204efc67941fd6"
+  "gitHead": "eb7197269a2993c50c9449fed55ed51c91f3b7ae"
 }

No alert changes

Improved metrics

Total package byte prevSize

4030032

increased by1.21%

Lines of code

27981

increased by0.39%

No dependency changes