@react-querybuilder/core 8.14.0 → 8.14.1

package/dist/{convertQuery-DAj92cbM.mjs → convertQuery-B5Qm_6ut.mjs}

@@ -1,6 +1,4 @@
-import { a as lc, n as isRuleGroupType, r as isRuleGroupTypeIC, t as isRuleGroup } from "./isRuleGroup-DztIOOKa.mjs";
-import { produce } from "immer";
-
+import { a as lc, n as isRuleGroupType, r as isRuleGroupTypeIC, t as isRuleGroup } from "./isRuleGroup-LzP0HCKh.mjs";
 //#region src/utils/convertQuery.ts
 const combinatorLevels = [
 	"or",
@@ -11,20 +9,27 @@ const isSameString = (a, b) => lc(a) === b;
 const generateRuleGroupICWithConsistentCombinators = (rg, baseCombinatorLevel = 0) => {
 	const baseCombinator = combinatorLevels[baseCombinatorLevel];
 	if (!rg.rules.includes(baseCombinator)) return baseCombinatorLevel < combinatorLevels.length - 2 ? generateRuleGroupICWithConsistentCombinators(rg, baseCombinatorLevel + 1) : rg;
-	return produce(rg, (draft) => {
-		let cursor = 0;
-		while (cursor < draft.rules.length - 2) {
-			if (isSameString(draft.rules[cursor + 1], baseCombinator)) {
-				cursor += 2;
-				continue;
-			}
-			const nextBaseCombinatorIndex = draft.rules.findIndex((r, i) => i > cursor && typeof r === "string" && lc(r) === baseCombinator);
-			if (nextBaseCombinatorIndex === -1) {
-				draft.rules.splice(cursor, draft.rules.length, generateRuleGroupICWithConsistentCombinators({ rules: draft.rules.slice(cursor) }, baseCombinatorLevel + 1));
-				break;
-			} else draft.rules.splice(cursor, nextBaseCombinatorIndex - cursor, generateRuleGroupICWithConsistentCombinators({ rules: draft.rules.slice(cursor, nextBaseCombinatorIndex) }, baseCombinatorLevel + 1));
+	const newRules = [...rg.rules];
+	let cursor = 0;
+	while (cursor < newRules.length - 2) {
+		if (isSameString(newRules[cursor + 1], baseCombinator)) {
+			cursor += 2;
+			continue;
+		}
+		let nextBaseCombinatorIndex = -1;
+		for (let i = cursor + 2; i < newRules.length; i++) if (typeof newRules[i] === "string" && lc(newRules[i]) === baseCombinator) {
+			nextBaseCombinatorIndex = i;
+			break;
 		}
-	});
+		if (nextBaseCombinatorIndex === -1) {
+			newRules.splice(cursor, newRules.length, generateRuleGroupICWithConsistentCombinators({ rules: newRules.slice(cursor) }, baseCombinatorLevel + 1));
+			break;
+		} else newRules.splice(cursor, nextBaseCombinatorIndex - cursor, generateRuleGroupICWithConsistentCombinators({ rules: newRules.slice(cursor, nextBaseCombinatorIndex) }, baseCombinatorLevel + 1));
+	}
+	return {
+		...rg,
+		rules: newRules
+	};
 };
 /**
 * Converts a {@link RuleGroupTypeIC} to {@link RuleGroupType}.
@@ -37,9 +42,11 @@ const generateRuleGroupICWithConsistentCombinators = (rg, baseCombinatorLevel =
 const convertFromIC = (rg) => {
 	if (isRuleGroupType(rg)) return rg;
 	const processedRG = generateRuleGroupICWithConsistentCombinators(rg);
-	const rulesAsMixedList = processedRG.rules.map((r) => typeof r === "string" || !isRuleGroup(r) ? r : convertFromIC(r));
-	const combinator = rulesAsMixedList.length < 2 ? "and" : rulesAsMixedList[1];
-	const rules = rulesAsMixedList.filter((r) => typeof r !== "string");
+	const rules = [];
+	let combinator = "and";
+	for (const [idx, r] of processedRG.rules.entries()) if (typeof r === "string") {
+		if (idx === 1) combinator = r;
+	} else rules.push(isRuleGroup(r) ? convertFromIC(r) : r);
 	return {
 		...processedRG,
 		combinator,
@@ -59,7 +66,8 @@ const convertToIC = (rg) => {
 	const { combinator, ...queryWithoutCombinator } = rg;
 	const rules = [];
 	const { length } = rg.rules;
-	for (const [idx, r] of rg.rules.entries()) {
+	for (let idx = 0; idx < length; idx++) {
+		const r = rg.rules[idx];
 		if (isRuleGroup(r)) rules.push(convertToIC(r));
 		else rules.push(r);
 		if (combinator && idx < length - 1) rules.push(combinator);
@@ -69,7 +77,7 @@ const convertToIC = (rg) => {
 		rules
 	};
 };
-
 //#endregion
 export { convertToIC as n, convertFromIC as t };
-//# sourceMappingURL=convertQuery-DAj92cbM.mjs.map
+
+//# sourceMappingURL=convertQuery-B5Qm_6ut.mjs.map

package/dist/convertQuery-B5Qm_6ut.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"convertQuery-B5Qm_6ut.mjs","names":[],"sources":["../src/utils/convertQuery.ts"],"sourcesContent":["import type {\n  RuleGroupArray,\n  RuleGroupICArray,\n  RuleGroupType,\n  RuleGroupTypeAny,\n  RuleGroupTypeIC,\n  RuleType,\n} from '../types';\nimport { isRuleGroup, isRuleGroupType, isRuleGroupTypeIC } from './isRuleGroup';\nimport { lc } from './misc';\n\nconst combinatorLevels = ['or', 'xor', 'and'] as const;\n\nconst isSameString = (a: unknown, b: string) => lc(a) === b;\n\nconst generateRuleGroupICWithConsistentCombinators = (\n  rg: RuleGroupTypeIC,\n  baseCombinatorLevel: number = 0\n): RuleGroupTypeIC => {\n  const baseCombinator = combinatorLevels[baseCombinatorLevel];\n\n  // oxlint-disable-next-line typescript/no-explicit-any\n  if (!rg.rules.includes(baseCombinator as any)) {\n    // No instances of this combinator, so group based on the next\n    // combinator level if at least two levels remain\n    return baseCombinatorLevel < combinatorLevels.length - 2\n      ? generateRuleGroupICWithConsistentCombinators(rg, baseCombinatorLevel + 1)\n      : rg;\n  }\n\n  const newRules = [...rg.rules] as RuleGroupICArray;\n  let cursor = 0;\n\n  // Group all chains of combinators in the rule array that are not the base combinator\n  while (cursor < newRules.length - 2) {\n    if (isSameString(newRules[cursor + 1], baseCombinator)) {\n      cursor += 2;\n      continue;\n    }\n\n    let nextBaseCombinatorIndex = -1;\n    for (let i = cursor + 2; i < newRules.length; i++) {\n      if (typeof newRules[i] === 'string' && lc(newRules[i]) === baseCombinator) {\n        nextBaseCombinatorIndex = i;\n        break;\n      }\n    }\n\n    if (nextBaseCombinatorIndex === -1) {\n      // No more instances of this combinator, so group all remaining rules and exit the loop\n      newRules.splice(\n        cursor,\n        newRules.length,\n        generateRuleGroupICWithConsistentCombinators(\n          // oxlint-disable-next-line typescript/no-explicit-any\n          { rules: newRules.slice(cursor) as any },\n          baseCombinatorLevel + 1\n        )\n      );\n      break;\n    } else {\n      // Group all rules between the current cursor and the next instance of the base combinator\n      newRules.splice(\n        cursor,\n        nextBaseCombinatorIndex - cursor,\n        generateRuleGroupICWithConsistentCombinators(\n          // oxlint-disable-next-line typescript/no-explicit-any\n          { rules: newRules.slice(cursor, nextBaseCombinatorIndex) as any },\n          baseCombinatorLevel + 1\n        )\n      );\n    }\n  }\n\n  return { ...rg, rules: newRules };\n};\n\n/**\n * Converts a {@link RuleGroupTypeIC} to {@link RuleGroupType}.\n *\n * This function is idempotent: {@link RuleGroupType} queries will be\n * returned as-is.\n *\n * @group Query Tools\n */\nexport const convertFromIC = <RG extends RuleGroupType = RuleGroupType>(\n  rg: RuleGroupTypeAny\n): RG => {\n  if (isRuleGroupType(rg)) {\n    return rg as RG;\n  }\n  const processedRG = generateRuleGroupICWithConsistentCombinators(rg);\n  const rules: RuleGroupArray = [];\n  let combinator = 'and';\n  for (const [idx, r] of processedRG.rules.entries()) {\n    if (typeof r === 'string') {\n      if (idx === 1) combinator = r;\n    } else {\n      rules.push(isRuleGroup(r) ? convertFromIC(r) : r);\n    }\n  }\n  return { ...processedRG, combinator, rules } as RG;\n};\n\n/**\n * Converts a {@link RuleGroupType} to {@link RuleGroupTypeIC}.\n *\n * This function is idempotent: {@link RuleGroupTypeIC} queries will be\n * returned as-is.\n *\n * @group Query Tools\n */\nexport const convertToIC = <RGIC extends RuleGroupTypeIC = RuleGroupTypeIC>(\n  rg: RuleGroupTypeAny\n): RGIC => {\n  if (isRuleGroupTypeIC(rg)) {\n    return rg as RGIC;\n  }\n  const { combinator, ...queryWithoutCombinator } = rg;\n  const rules: (RuleGroupTypeIC | RuleType | string)[] = [];\n  const { length } = rg.rules;\n  for (let idx = 0; idx < length; idx++) {\n    const r = rg.rules[idx];\n    if (isRuleGroup(r)) {\n      rules.push(convertToIC(r));\n    } else {\n      rules.push(r);\n    }\n    if (combinator && idx < length - 1) {\n      rules.push(combinator);\n    }\n  }\n  return { ...queryWithoutCombinator, rules } as RGIC;\n};\n\n/**\n * Converts a {@link RuleGroupType} to {@link RuleGroupTypeIC}. For a more explicit\n * operation, use {@link convertToIC}.\n *\n * @group Query Tools\n */\nfunction convertQuery(query: RuleGroupType): RuleGroupTypeIC;\n/**\n * Converts a {@link RuleGroupTypeIC} to {@link RuleGroupType}. For a more explicit\n * operation, use {@link convertFromIC}.\n *\n * @group Query Tools\n */\nfunction convertQuery(query: RuleGroupTypeIC): RuleGroupType;\nfunction convertQuery(query: RuleGroupType | RuleGroupTypeIC): RuleGroupType | RuleGroupTypeIC {\n  return isRuleGroupTypeIC(query) ? convertFromIC(query) : convertToIC(query);\n}\n\nexport { convertQuery };\n"],"mappings":";;AAWA,MAAM,mBAAmB;CAAC;CAAM;CAAO;CAAM;AAE7C,MAAM,gBAAgB,GAAY,MAAc,GAAG,EAAE,KAAK;AAE1D,MAAM,gDACJ,IACA,sBAA8B,MACV;CACpB,MAAM,iBAAiB,iBAAiB;AAGxC,KAAI,CAAC,GAAG,MAAM,SAAS,eAAsB,CAG3C,QAAO,sBAAsB,iBAAiB,SAAS,IACnD,6CAA6C,IAAI,sBAAsB,EAAE,GACzE;CAGN,MAAM,WAAW,CAAC,GAAG,GAAG,MAAM;CAC9B,IAAI,SAAS;AAGb,QAAO,SAAS,SAAS,SAAS,GAAG;AACnC,MAAI,aAAa,SAAS,SAAS,IAAI,eAAe,EAAE;AACtD,aAAU;AACV;;EAGF,IAAI,0BAA0B;AAC9B,OAAK,IAAI,IAAI,SAAS,GAAG,IAAI,SAAS,QAAQ,IAC5C,KAAI,OAAO,SAAS,OAAO,YAAY,GAAG,SAAS,GAAG,KAAK,gBAAgB;AACzE,6BAA0B;AAC1B;;AAIJ,MAAI,4BAA4B,IAAI;AAElC,YAAS,OACP,QACA,SAAS,QACT,6CAEE,EAAE,OAAO,SAAS,MAAM,OAAO,EAAS,EACxC,sBAAsB,EACvB,CACF;AACD;QAGA,UAAS,OACP,QACA,0BAA0B,QAC1B,6CAEE,EAAE,OAAO,SAAS,MAAM,QAAQ,wBAAwB,EAAS,EACjE,sBAAsB,EACvB,CACF;;AAIL,QAAO;EAAE,GAAG;EAAI,OAAO;EAAU;;;;;;;;;;AAWnC,MAAa,iBACX,OACO;AACP,KAAI,gBAAgB,GAAG,CACrB,QAAO;CAET,MAAM,cAAc,6CAA6C,GAAG;CACpE,MAAM,QAAwB,EAAE;CAChC,IAAI,aAAa;AACjB,MAAK,MAAM,CAAC,KAAK,MAAM,YAAY,MAAM,SAAS,CAChD,KAAI,OAAO,MAAM;MACX,QAAQ,EAAG,cAAa;OAE5B,OAAM,KAAK,YAAY,EAAE,GAAG,cAAc,EAAE,GAAG,EAAE;AAGrD,QAAO;EAAE,GAAG;EAAa;EAAY;EAAO;;;;;;;;;;AAW9C,MAAa,eACX,OACS;AACT,KAAI,kBAAkB,GAAG,CACvB,QAAO;CAET,MAAM,EAAE,YAAY,GAAG,2BAA2B;CAClD,MAAM,QAAiD,EAAE;CACzD,MAAM,EAAE,WAAW,GAAG;AACtB,MAAK,IAAI,MAAM,GAAG,MAAM,QAAQ,OAAO;EACrC,MAAM,IAAI,GAAG,MAAM;AACnB,MAAI,YAAY,EAAE,CAChB,OAAM,KAAK,YAAY,EAAE,CAAC;MAE1B,OAAM,KAAK,EAAE;AAEf,MAAI,cAAc,MAAM,SAAS,EAC/B,OAAM,KAAK,WAAW;;AAG1B,QAAO;EAAE,GAAG;EAAwB;EAAO"}

package/dist/convertQuery-DfZehtnd.js

@@ -0,0 +1,94 @@
+const require_isRuleGroup = require("./isRuleGroup-BCwaLzDj.js");
+//#region src/utils/convertQuery.ts
+const combinatorLevels = [
+	"or",
+	"xor",
+	"and"
+];
+const isSameString = (a, b) => require_isRuleGroup.lc(a) === b;
+const generateRuleGroupICWithConsistentCombinators = (rg, baseCombinatorLevel = 0) => {
+	const baseCombinator = combinatorLevels[baseCombinatorLevel];
+	if (!rg.rules.includes(baseCombinator)) return baseCombinatorLevel < combinatorLevels.length - 2 ? generateRuleGroupICWithConsistentCombinators(rg, baseCombinatorLevel + 1) : rg;
+	const newRules = [...rg.rules];
+	let cursor = 0;
+	while (cursor < newRules.length - 2) {
+		if (isSameString(newRules[cursor + 1], baseCombinator)) {
+			cursor += 2;
+			continue;
+		}
+		let nextBaseCombinatorIndex = -1;
+		for (let i = cursor + 2; i < newRules.length; i++) if (typeof newRules[i] === "string" && require_isRuleGroup.lc(newRules[i]) === baseCombinator) {
+			nextBaseCombinatorIndex = i;
+			break;
+		}
+		if (nextBaseCombinatorIndex === -1) {
+			newRules.splice(cursor, newRules.length, generateRuleGroupICWithConsistentCombinators({ rules: newRules.slice(cursor) }, baseCombinatorLevel + 1));
+			break;
+		} else newRules.splice(cursor, nextBaseCombinatorIndex - cursor, generateRuleGroupICWithConsistentCombinators({ rules: newRules.slice(cursor, nextBaseCombinatorIndex) }, baseCombinatorLevel + 1));
+	}
+	return {
+		...rg,
+		rules: newRules
+	};
+};
+/**
+* Converts a {@link RuleGroupTypeIC} to {@link RuleGroupType}.
+*
+* This function is idempotent: {@link RuleGroupType} queries will be
+* returned as-is.
+*
+* @group Query Tools
+*/
+const convertFromIC = (rg) => {
+	if (require_isRuleGroup.isRuleGroupType(rg)) return rg;
+	const processedRG = generateRuleGroupICWithConsistentCombinators(rg);
+	const rules = [];
+	let combinator = "and";
+	for (const [idx, r] of processedRG.rules.entries()) if (typeof r === "string") {
+		if (idx === 1) combinator = r;
+	} else rules.push(require_isRuleGroup.isRuleGroup(r) ? convertFromIC(r) : r);
+	return {
+		...processedRG,
+		combinator,
+		rules
+	};
+};
+/**
+* Converts a {@link RuleGroupType} to {@link RuleGroupTypeIC}.
+*
+* This function is idempotent: {@link RuleGroupTypeIC} queries will be
+* returned as-is.
+*
+* @group Query Tools
+*/
+const convertToIC = (rg) => {
+	if (require_isRuleGroup.isRuleGroupTypeIC(rg)) return rg;
+	const { combinator, ...queryWithoutCombinator } = rg;
+	const rules = [];
+	const { length } = rg.rules;
+	for (let idx = 0; idx < length; idx++) {
+		const r = rg.rules[idx];
+		if (require_isRuleGroup.isRuleGroup(r)) rules.push(convertToIC(r));
+		else rules.push(r);
+		if (combinator && idx < length - 1) rules.push(combinator);
+	}
+	return {
+		...queryWithoutCombinator,
+		rules
+	};
+};
+//#endregion
+Object.defineProperty(exports, "convertFromIC", {
+	enumerable: true,
+	get: function() {
+		return convertFromIC;
+	}
+});
+Object.defineProperty(exports, "convertToIC", {
+	enumerable: true,
+	get: function() {
+		return convertToIC;
+	}
+});
+
+//# sourceMappingURL=convertQuery-DfZehtnd.js.map

package/dist/convertQuery-DfZehtnd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convertQuery-DfZehtnd.js","names":["lc","isRuleGroupType","isRuleGroup","isRuleGroupTypeIC"],"sources":["../src/utils/convertQuery.ts"],"sourcesContent":["import type {\n  RuleGroupArray,\n  RuleGroupICArray,\n  RuleGroupType,\n  RuleGroupTypeAny,\n  RuleGroupTypeIC,\n  RuleType,\n} from '../types';\nimport { isRuleGroup, isRuleGroupType, isRuleGroupTypeIC } from './isRuleGroup';\nimport { lc } from './misc';\n\nconst combinatorLevels = ['or', 'xor', 'and'] as const;\n\nconst isSameString = (a: unknown, b: string) => lc(a) === b;\n\nconst generateRuleGroupICWithConsistentCombinators = (\n  rg: RuleGroupTypeIC,\n  baseCombinatorLevel: number = 0\n): RuleGroupTypeIC => {\n  const baseCombinator = combinatorLevels[baseCombinatorLevel];\n\n  // oxlint-disable-next-line typescript/no-explicit-any\n  if (!rg.rules.includes(baseCombinator as any)) {\n    // No instances of this combinator, so group based on the next\n    // combinator level if at least two levels remain\n    return baseCombinatorLevel < combinatorLevels.length - 2\n      ? generateRuleGroupICWithConsistentCombinators(rg, baseCombinatorLevel + 1)\n      : rg;\n  }\n\n  const newRules = [...rg.rules] as RuleGroupICArray;\n  let cursor = 0;\n\n  // Group all chains of combinators in the rule array that are not the base combinator\n  while (cursor < newRules.length - 2) {\n    if (isSameString(newRules[cursor + 1], baseCombinator)) {\n      cursor += 2;\n      continue;\n    }\n\n    let nextBaseCombinatorIndex = -1;\n    for (let i = cursor + 2; i < newRules.length; i++) {\n      if (typeof newRules[i] === 'string' && lc(newRules[i]) === baseCombinator) {\n        nextBaseCombinatorIndex = i;\n        break;\n      }\n    }\n\n    if (nextBaseCombinatorIndex === -1) {\n      // No more instances of this combinator, so group all remaining rules and exit the loop\n      newRules.splice(\n        cursor,\n        newRules.length,\n        generateRuleGroupICWithConsistentCombinators(\n          // oxlint-disable-next-line typescript/no-explicit-any\n          { rules: newRules.slice(cursor) as any },\n          baseCombinatorLevel + 1\n        )\n      );\n      break;\n    } else {\n      // Group all rules between the current cursor and the next instance of the base combinator\n      newRules.splice(\n        cursor,\n        nextBaseCombinatorIndex - cursor,\n        generateRuleGroupICWithConsistentCombinators(\n          // oxlint-disable-next-line typescript/no-explicit-any\n          { rules: newRules.slice(cursor, nextBaseCombinatorIndex) as any },\n          baseCombinatorLevel + 1\n        )\n      );\n    }\n  }\n\n  return { ...rg, rules: newRules };\n};\n\n/**\n * Converts a {@link RuleGroupTypeIC} to {@link RuleGroupType}.\n *\n * This function is idempotent: {@link RuleGroupType} queries will be\n * returned as-is.\n *\n * @group Query Tools\n */\nexport const convertFromIC = <RG extends RuleGroupType = RuleGroupType>(\n  rg: RuleGroupTypeAny\n): RG => {\n  if (isRuleGroupType(rg)) {\n    return rg as RG;\n  }\n  const processedRG = generateRuleGroupICWithConsistentCombinators(rg);\n  const rules: RuleGroupArray = [];\n  let combinator = 'and';\n  for (const [idx, r] of processedRG.rules.entries()) {\n    if (typeof r === 'string') {\n      if (idx === 1) combinator = r;\n    } else {\n      rules.push(isRuleGroup(r) ? convertFromIC(r) : r);\n    }\n  }\n  return { ...processedRG, combinator, rules } as RG;\n};\n\n/**\n * Converts a {@link RuleGroupType} to {@link RuleGroupTypeIC}.\n *\n * This function is idempotent: {@link RuleGroupTypeIC} queries will be\n * returned as-is.\n *\n * @group Query Tools\n */\nexport const convertToIC = <RGIC extends RuleGroupTypeIC = RuleGroupTypeIC>(\n  rg: RuleGroupTypeAny\n): RGIC => {\n  if (isRuleGroupTypeIC(rg)) {\n    return rg as RGIC;\n  }\n  const { combinator, ...queryWithoutCombinator } = rg;\n  const rules: (RuleGroupTypeIC | RuleType | string)[] = [];\n  const { length } = rg.rules;\n  for (let idx = 0; idx < length; idx++) {\n    const r = rg.rules[idx];\n    if (isRuleGroup(r)) {\n      rules.push(convertToIC(r));\n    } else {\n      rules.push(r);\n    }\n    if (combinator && idx < length - 1) {\n      rules.push(combinator);\n    }\n  }\n  return { ...queryWithoutCombinator, rules } as RGIC;\n};\n\n/**\n * Converts a {@link RuleGroupType} to {@link RuleGroupTypeIC}. For a more explicit\n * operation, use {@link convertToIC}.\n *\n * @group Query Tools\n */\nfunction convertQuery(query: RuleGroupType): RuleGroupTypeIC;\n/**\n * Converts a {@link RuleGroupTypeIC} to {@link RuleGroupType}. For a more explicit\n * operation, use {@link convertFromIC}.\n *\n * @group Query Tools\n */\nfunction convertQuery(query: RuleGroupTypeIC): RuleGroupType;\nfunction convertQuery(query: RuleGroupType | RuleGroupTypeIC): RuleGroupType | RuleGroupTypeIC {\n  return isRuleGroupTypeIC(query) ? convertFromIC(query) : convertToIC(query);\n}\n\nexport { convertQuery };\n"],"mappings":";;AAWA,MAAM,mBAAmB;CAAC;CAAM;CAAO;CAAM;AAE7C,MAAM,gBAAgB,GAAY,MAAcA,oBAAAA,GAAG,EAAE,KAAK;AAE1D,MAAM,gDACJ,IACA,sBAA8B,MACV;CACpB,MAAM,iBAAiB,iBAAiB;AAGxC,KAAI,CAAC,GAAG,MAAM,SAAS,eAAsB,CAG3C,QAAO,sBAAsB,iBAAiB,SAAS,IACnD,6CAA6C,IAAI,sBAAsB,EAAE,GACzE;CAGN,MAAM,WAAW,CAAC,GAAG,GAAG,MAAM;CAC9B,IAAI,SAAS;AAGb,QAAO,SAAS,SAAS,SAAS,GAAG;AACnC,MAAI,aAAa,SAAS,SAAS,IAAI,eAAe,EAAE;AACtD,aAAU;AACV;;EAGF,IAAI,0BAA0B;AAC9B,OAAK,IAAI,IAAI,SAAS,GAAG,IAAI,SAAS,QAAQ,IAC5C,KAAI,OAAO,SAAS,OAAO,YAAYA,oBAAAA,GAAG,SAAS,GAAG,KAAK,gBAAgB;AACzE,6BAA0B;AAC1B;;AAIJ,MAAI,4BAA4B,IAAI;AAElC,YAAS,OACP,QACA,SAAS,QACT,6CAEE,EAAE,OAAO,SAAS,MAAM,OAAO,EAAS,EACxC,sBAAsB,EACvB,CACF;AACD;QAGA,UAAS,OACP,QACA,0BAA0B,QAC1B,6CAEE,EAAE,OAAO,SAAS,MAAM,QAAQ,wBAAwB,EAAS,EACjE,sBAAsB,EACvB,CACF;;AAIL,QAAO;EAAE,GAAG;EAAI,OAAO;EAAU;;;;;;;;;;AAWnC,MAAa,iBACX,OACO;AACP,KAAIC,oBAAAA,gBAAgB,GAAG,CACrB,QAAO;CAET,MAAM,cAAc,6CAA6C,GAAG;CACpE,MAAM,QAAwB,EAAE;CAChC,IAAI,aAAa;AACjB,MAAK,MAAM,CAAC,KAAK,MAAM,YAAY,MAAM,SAAS,CAChD,KAAI,OAAO,MAAM;MACX,QAAQ,EAAG,cAAa;OAE5B,OAAM,KAAKC,oBAAAA,YAAY,EAAE,GAAG,cAAc,EAAE,GAAG,EAAE;AAGrD,QAAO;EAAE,GAAG;EAAa;EAAY;EAAO;;;;;;;;;;AAW9C,MAAa,eACX,OACS;AACT,KAAIC,oBAAAA,kBAAkB,GAAG,CACvB,QAAO;CAET,MAAM,EAAE,YAAY,GAAG,2BAA2B;CAClD,MAAM,QAAiD,EAAE;CACzD,MAAM,EAAE,WAAW,GAAG;AACtB,MAAK,IAAI,MAAM,GAAG,MAAM,QAAQ,OAAO;EACrC,MAAM,IAAI,GAAG,MAAM;AACnB,MAAID,oBAAAA,YAAY,EAAE,CAChB,OAAM,KAAK,YAAY,EAAE,CAAC;MAE1B,OAAM,KAAK,EAAE;AAEf,MAAI,cAAc,MAAM,SAAS,EAC/B,OAAM,KAAK,WAAW;;AAG1B,QAAO;EAAE,GAAG;EAAwB;EAAO"}

package/dist/{export-_wipiqJZ.d.mts → export-6x7MilFR.d.mts}

@@ -1,8 +1,7 @@
-import { C as Except, a as ValueSource, b as FullOptionList, c as RuleValidator, f as RuleGroupTypeAny, h as DefaultOperatorName, i as ParseNumbersPropConfig, l as ValidationMap, n as FullOperator, r as InputType, s as QueryValidator, t as FullField, u as ValidationResult, v as RuleType, y as FlexibleOptionList } from "./basic-GFsWfi0Z.mjs";
+import { C as Except, a as ValueSource, b as FullOptionList, c as RuleValidator, f as RuleGroupTypeAny, h as DefaultOperatorName, i as ParseNumbersPropConfig, l as ValidationMap, n as FullOperator, r as InputType, s as QueryValidator, t as FullField, u as ValidationResult, v as RuleType, y as FlexibleOptionList } from "./basic-CNIjb6rI.mjs";
 import { RulesLogic } from "json-logic-js";
 
 //#region src/types/export.d.ts
-
 /**
 * Available export formats for {@link formatQuery}.
 *
@@ -449,4 +448,4 @@ type NLTranslationKey = "and" | "or" | "true" | "false" | `groupPrefix${ZeroOrMo
 type NLTranslations = Partial<Record<NLTranslationKey, string>>;
 //#endregion
 export { ValueProcessorOptions as _, FormatQueryOptions as a, NLTranslations as c, RQBJsonLogic as d, RuleGroupProcessor as f, ValueProcessorLegacy as g, ValueProcessorByRule as h, ExportOperatorMap as i, ParameterizedNamedSQL as l, SQLPreset as m, ExportFormat as n, GroupVariantCondition as o, RuleProcessor as p, ExportObjectFormats as r, NLTranslationKey as s, ConstituentWordOrder as t, ParameterizedSQL as u };
-//# sourceMappingURL=export-_wipiqJZ.d.mts.map
+//# sourceMappingURL=export-6x7MilFR.d.mts.map

package/dist/{export-6VbkhCrf.d.ts → export-CpJOQuZv.d.ts}

@@ -1,8 +1,7 @@
-import { C as Except, a as ValueSource, b as FullOptionList, c as RuleValidator, f as RuleGroupTypeAny, h as DefaultOperatorName, i as ParseNumbersPropConfig, l as ValidationMap, n as FullOperator, r as InputType, s as QueryValidator, t as FullField, u as ValidationResult, v as RuleType, y as FlexibleOptionList } from "./basic-Dxm6jWFu.js";
+import { C as Except, a as ValueSource, b as FullOptionList, c as RuleValidator, f as RuleGroupTypeAny, h as DefaultOperatorName, i as ParseNumbersPropConfig, l as ValidationMap, n as FullOperator, r as InputType, s as QueryValidator, t as FullField, u as ValidationResult, v as RuleType, y as FlexibleOptionList } from "./basic-BXJVfD0P.js";
 import { RulesLogic } from "json-logic-js";
 
 //#region src/types/export.d.ts
-
 /**
 * Available export formats for {@link formatQuery}.
 *
@@ -449,4 +448,4 @@ type NLTranslationKey = "and" | "or" | "true" | "false" | `groupPrefix${ZeroOrMo
 type NLTranslations = Partial<Record<NLTranslationKey, string>>;
 //#endregion
 export { ValueProcessorOptions as _, FormatQueryOptions as a, NLTranslations as c, RQBJsonLogic as d, RuleGroupProcessor as f, ValueProcessorLegacy as g, ValueProcessorByRule as h, ExportOperatorMap as i, ParameterizedNamedSQL as l, SQLPreset as m, ExportFormat as n, GroupVariantCondition as o, RuleProcessor as p, ExportObjectFormats as r, NLTranslationKey as s, ConstituentWordOrder as t, ParameterizedSQL as u };
-//# sourceMappingURL=export-6VbkhCrf.d.ts.map
+//# sourceMappingURL=export-CpJOQuZv.d.ts.map

package/dist/formatQuery.d.mts

@@ -1,5 +1,5 @@
-import { S as SetRequired, f as RuleGroupTypeAny, v as RuleType } from "./basic-GFsWfi0Z.mjs";
-import { _ as ValueProcessorOptions, a as FormatQueryOptions, c as NLTranslations, d as RQBJsonLogic, f as RuleGroupProcessor, g as ValueProcessorLegacy, h as ValueProcessorByRule, i as ExportOperatorMap, l as ParameterizedNamedSQL, m as SQLPreset, n as ExportFormat, o as GroupVariantCondition, p as RuleProcessor, r as ExportObjectFormats, s as NLTranslationKey, t as ConstituentWordOrder, u as ParameterizedSQL } from "./export-_wipiqJZ.mjs";
+import { S as SetRequired, f as RuleGroupTypeAny, v as RuleType } from "./basic-CNIjb6rI.mjs";
+import { _ as ValueProcessorOptions, a as FormatQueryOptions, c as NLTranslations, d as RQBJsonLogic, f as RuleGroupProcessor, g as ValueProcessorLegacy, h as ValueProcessorByRule, i as ExportOperatorMap, l as ParameterizedNamedSQL, m as SQLPreset, n as ExportFormat, o as GroupVariantCondition, p as RuleProcessor, r as ExportObjectFormats, s as NLTranslationKey, t as ConstituentWordOrder, u as ParameterizedSQL } from "./export-6x7MilFR.mjs";
 import { Column, Operators, SQL, Table } from "drizzle-orm";
 import { WhereOptions } from "sequelize";
 
@@ -506,7 +506,8 @@ declare const celCombinatorMap: {
 */
 declare const jsonLogicAdditionalOperators: Record<"startsWith" | "endsWith", (a: string, b: string) => boolean>;
 /**
-* Converts all `string`-type `value` properties of a query object into `number` where appropriate.
+* Returns a new query object with all `string`-type `value` properties converted
+* to `number` where appropriate.
 *
 * Used by {@link formatQuery} for the `json*` formats when `parseNumbers` is `true`.
 *

package/dist/formatQuery.d.ts

@@ -1,5 +1,5 @@
-import { S as SetRequired, f as RuleGroupTypeAny, v as RuleType } from "./basic-Dxm6jWFu.js";
-import { _ as ValueProcessorOptions, a as FormatQueryOptions, c as NLTranslations, d as RQBJsonLogic, f as RuleGroupProcessor, g as ValueProcessorLegacy, h as ValueProcessorByRule, i as ExportOperatorMap, l as ParameterizedNamedSQL, m as SQLPreset, n as ExportFormat, o as GroupVariantCondition, p as RuleProcessor, r as ExportObjectFormats, s as NLTranslationKey, t as ConstituentWordOrder, u as ParameterizedSQL } from "./export-6VbkhCrf.js";
+import { S as SetRequired, f as RuleGroupTypeAny, v as RuleType } from "./basic-BXJVfD0P.js";
+import { _ as ValueProcessorOptions, a as FormatQueryOptions, c as NLTranslations, d as RQBJsonLogic, f as RuleGroupProcessor, g as ValueProcessorLegacy, h as ValueProcessorByRule, i as ExportOperatorMap, l as ParameterizedNamedSQL, m as SQLPreset, n as ExportFormat, o as GroupVariantCondition, p as RuleProcessor, r as ExportObjectFormats, s as NLTranslationKey, t as ConstituentWordOrder, u as ParameterizedSQL } from "./export-CpJOQuZv.js";
 import { Column, Operators, SQL, Table } from "drizzle-orm";
 import { WhereOptions } from "sequelize";
 
@@ -506,7 +506,8 @@ declare const celCombinatorMap: {
 */
 declare const jsonLogicAdditionalOperators: Record<"startsWith" | "endsWith", (a: string, b: string) => boolean>;
 /**
-* Converts all `string`-type `value` properties of a query object into `number` where appropriate.
+* Returns a new query object with all `string`-type `value` properties converted
+* to `number` where appropriate.
 *
 * Used by {@link formatQuery} for the `json*` formats when `parseNumbers` is `true`.
 *

package/dist/formatQuery.js

@@ -1,10 +1,8 @@
-const require_chunk = require('./chunk-U64pC571.js');
-const require_utils = require('./utils-CR1ToTMW.js');
-const require_isRuleGroup = require('./isRuleGroup-Cjk1Q2mj.js');
-const require_transformQuery = require('./transformQuery-ClBRfnFg.js');
-const require_convertQuery = require('./convertQuery-DRldbzhZ.js');
-let immer = require("immer");
-
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_utils = require("./utils-EsYRkPtf.js");
+const require_isRuleGroup = require("./isRuleGroup-BCwaLzDj.js");
+const require_transformQuery = require("./transformQuery.js");
+const require_convertQuery = require("./convertQuery-DfZehtnd.js");
 //#region src/utils/isRuleOrGroupValid.ts
 /**
 * Determines if an object is useful as a validation result.
@@ -27,7 +25,6 @@ const isRuleOrGroupValid = (rg, validationResult, validator) => {
 	}
 	return true;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorCEL.ts
 /**
@@ -83,7 +80,6 @@ const defaultRuleGroupProcessorCEL = (ruleGroup, options) => {
 	};
 	return processRuleGroup(ruleGroup, true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorCEL.ts
 const shouldNegate$2 = (op) => op.startsWith("not") || op.startsWith("doesnot");
@@ -164,7 +160,6 @@ const defaultRuleProcessorCEL = (rule, opts = {}) => {
 	}
 	return "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorMongoDBQuery.ts
 /**
@@ -202,11 +197,11 @@ const defaultRuleGroupProcessorMongoDBQuery = (ruleGroup, options, meta) => {
 				fieldData
 			}, meta);
 		}).filter(Boolean);
-		return expressions.length > 0 ? expressions.length === 1 && !hasChildRules ? expressions[0] : { [combinator]: expressions } : mongoDbFallback;
+		const result = expressions.length > 0 ? expressions.length === 1 && !hasChildRules ? expressions[0] : { [combinator]: expressions } : mongoDbFallback;
+		return rg.not ? { $not: result } : result;
 	};
 	return processRuleGroup(require_convertQuery.convertFromIC(ruleGroup), true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorMongoDBQuery.ts
 const processNumber$1 = (value, fallback, parseNumbers = false) => require_utils.shouldRenderAsNumber(value, parseNumbers || typeof value === "bigint") ? Number(require_utils.parseNumber(value, { parseNumbers: "strict" })) : fallback;
@@ -335,7 +330,6 @@ const defaultRuleProcessorMongoDBQuery = (rule, options = {}) => {
 	}
 	return "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorMongoDB.ts
 /**
@@ -349,7 +343,6 @@ const defaultRuleProcessorMongoDB = (rule, options) => {
 	const queryObj = defaultRuleProcessorMongoDBQuery(rule, options);
 	return queryObj ? JSON.stringify(queryObj) : "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorSpEL.ts
 /**
@@ -405,11 +398,10 @@ const defaultRuleGroupProcessorSpEL = (ruleGroup, options) => {
 	};
 	return processRuleGroup(ruleGroup, true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorSpEL.ts
 const shouldNegate$1 = (op) => op.startsWith("not") || op.startsWith("doesnot");
-const wrapInNegation = (clause, negate$1) => negate$1 ? `!(${clause})` : clause;
+const wrapInNegation = (clause, negate) => negate ? `!(${clause})` : clause;
 const escapeSingleQuotes = (v, escapeQuotes) => typeof v !== "string" || !escapeQuotes ? `${v}` : v.replaceAll(`'`, `\\'`);
 /**
 * Default rule processor used by {@link formatQuery} for "spel" format.
@@ -462,9 +454,9 @@ const defaultRuleProcessorSpEL = (rule, opts = {}) => {
 		case "notnull": return `${field} != null`;
 		case "in":
 		case "notin": {
-			const negate$1 = shouldNegate$1(operatorTL) ? "!" : "";
+			const negate = shouldNegate$1(operatorTL) ? "!" : "";
 			const valueAsArray = require_utils.toArray(value);
-			return valueAsArray.length > 0 ? `${negate$1}(${valueAsArray.map((val) => `${field} == ${valueIsField || require_utils.shouldRenderAsNumber(val, parseNumbers) ? `${require_utils.trimIfString(val)}` : `'${escapeSingleQuotes(val, escapeQuotes)}'`}`).join(" or ")})` : "";
+			return valueAsArray.length > 0 ? `${negate}(${valueAsArray.map((val) => `${field} == ${valueIsField || require_utils.shouldRenderAsNumber(val, parseNumbers) ? `${require_utils.trimIfString(val)}` : `'${escapeSingleQuotes(val, escapeQuotes)}'`}`).join(" or ")})` : "";
 		}
 		case "between":
 		case "notbetween": {
@@ -487,7 +479,6 @@ const defaultRuleProcessorSpEL = (rule, opts = {}) => {
 	}
 	return "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultValueProcessorByRule.ts
 const escapeStringValueQuotes$1 = (v, quoteChar, escapeQuotes) => escapeQuotes && typeof v === "string" ? v.replaceAll(`${quoteChar}`, `${quoteChar}${quoteChar}`) : v;
@@ -543,7 +534,6 @@ const defaultValueProcessorByRule = ({ operator, value, valueSource }, { escapeQ
 	if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
 	return valueIsField ? wrapFieldName(value) : require_utils.shouldRenderAsNumber(value, parseNumbers) ? `${require_utils.trimIfString(value)}` : `${wrapAndEscape(value)}`;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorDrizzle.ts
 /**
@@ -640,7 +630,6 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
 		default: return;
 	}
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorDrizzle.ts
 /**
@@ -684,7 +673,6 @@ const defaultRuleGroupProcessorDrizzle = (ruleGroup, options, _meta) => (columns
 	};
 	return processRuleGroup(require_convertQuery.convertFromIC(ruleGroup), true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorElasticSearch.ts
 /**
@@ -713,7 +701,6 @@ const defaultRuleGroupProcessorElasticSearch = (ruleGroup, options) => {
 	const processedRuleGroup = processRuleGroup(require_convertQuery.convertFromIC(ruleGroup));
 	return processedRuleGroup === false ? {} : processedRuleGroup;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorJSONata.ts
 /**
@@ -769,7 +756,6 @@ const defaultRuleGroupProcessorJSONata = (ruleGroup, options) => {
 	};
 	return processRuleGroup(ruleGroup, true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorJsonLogic.ts
 /**
@@ -799,7 +785,6 @@ const defaultRuleGroupProcessorJsonLogic = (ruleGroup, options) => {
 	};
 	return processRuleGroup(query, true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorLDAP.ts
 /**
@@ -830,7 +815,6 @@ const defaultRuleGroupProcessorLDAP = (ruleGroup, options) => {
 	};
 	return processRuleGroup(require_convertQuery.convertFromIC(ruleGroup), true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorMongoDB.ts
 const isBracketed = (str) => str.startsWith("{") && str.endsWith("}");
@@ -865,12 +849,12 @@ const defaultRuleGroupProcessorMongoDB = (ruleGroup, options, meta) => {
 				fieldData
 			}, meta);
 		}).filter(Boolean);
-		return expressions.length > 0 ? expressions.length === 1 && !hasChildRules ? expressions[0] : `${combinator}:[${expressions.join(",")}]` : fallbackExpression;
+		const result = expressions.length > 0 ? expressions.length === 1 && !hasChildRules ? expressions[0] : `${combinator}:[${expressions.join(",")}]` : fallbackExpression;
+		return rg.not ? `"$not":${isBracketed(result) ? result : `{${result}}`}` : result;
 	};
 	const processedQuery = processRuleGroup(require_convertQuery.convertFromIC(ruleGroup), true);
 	return isBracketed(processedQuery) ? processedQuery : `{${processedQuery}}`;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorNL.ts
 /**
@@ -934,7 +918,6 @@ const defaultRuleGroupProcessorNL = (ruleGroup, options) => {
 	};
 	return processRuleGroup(ruleGroup, true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorParameterized.ts
 /**
@@ -1023,7 +1006,6 @@ const defaultRuleGroupProcessorParameterized = (ruleGroup, options) => {
 		params: paramsNamed
 	};
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorPrisma.ts
 /**
@@ -1066,7 +1048,6 @@ const defaultRuleGroupProcessorPrisma = (ruleGroup, options) => {
 	const result = processRuleGroup(require_convertQuery.convertFromIC(ruleGroup), true);
 	return ruleGroup.not ? { NOT: result } : result;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorSequelize.ts
 /**
@@ -1107,7 +1088,6 @@ const defaultRuleGroupProcessorSequelize = (ruleGroup, options) => {
 	};
 	return processRuleGroup(require_convertQuery.convertFromIC(ruleGroup), true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorSQL.ts
 /**
@@ -1164,7 +1144,6 @@ const defaultRuleGroupProcessorSQL = (ruleGroup, options) => {
 	};
 	return processRuleGroup(ruleGroup, true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorElasticSearch.ts
 const rangeOperatorMap = {
@@ -1316,12 +1295,11 @@ const defaultRuleProcessorElasticSearch = (rule, options = {}) => {
 	}
 	return false;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorJSONata.ts
 const shouldNegate = (op) => op.startsWith("not") || op.startsWith("doesnot");
 const quote = (v, escapeQuotes) => `"${typeof v !== "string" || !escapeQuotes ? `${v}` : v.replaceAll(`"`, `\\"`)}"`;
-const negate = (clause, negate$1) => negate$1 ? `$not(${clause})` : clause;
+const negate = (clause, neg) => neg ? `$not(${clause})` : clause;
 const escapeStringRegex = (s) => `${s}`.replaceAll(/[/$()*+.?[\\\]^{|}]/g, String.raw`\$&`).replaceAll("-", String.raw`\x2d`);
 /**
 * Default rule processor used by {@link formatQuery} for "jsonata" format.
@@ -1403,7 +1381,6 @@ const defaultRuleProcessorJSONata = (rule, options = {}) => {
 	}
 	return "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorJsonLogic.ts
 const convertOperator = (op) => op.replace(/^(=)$/, "$1=").replace(/^notnull$/i, "!=").replace(/^null$/i, "==");
@@ -1498,10 +1475,9 @@ const defaultRuleProcessorJsonLogic = (rule, options = {}) => {
 	}
 	return false;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorLDAP.ts
-const negateIf = (clause, negate$1) => negate$1 ? `(!${clause})` : `${clause}`;
+const negateIf = (clause, negate) => negate ? `(!${clause})` : `${clause}`;
 const ldapEscape = (s) => `${require_utils.trimIfString(s)}`.replaceAll(/[()&|=<>~*\\/]/g, (m) => `\\${m.codePointAt(0).toString(16)}`);
 /**
 * Default rule processor used by {@link formatQuery} for "ldap" format.
@@ -1550,7 +1526,6 @@ const defaultRuleProcessorLDAP = (rule, options = {}) => {
 	// istanbul ignore next
 	return "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultValueProcessorNL.ts
 const escapeStringValueQuotes = (v, quoteChar, escapeQuotes) => escapeQuotes && typeof v === "string" ? v.replaceAll(`${quoteChar}`, `${quoteChar}${quoteChar}`) : v;
@@ -1600,7 +1575,6 @@ const defaultValueProcessorNL = (rule, opts = {}) => {
 	if (typeof rule.value === "boolean") return rule.value ? trueTL : falseTL;
 	return valueIsField ? wrapFieldName(require_utils.getOption(fields ?? [], rule.value)?.label ?? rule.value) : require_utils.shouldRenderAsNumber(rule.value, parseNumbers) ? `${require_utils.trimIfString(rule.value)}` : `${wrapAndEscape(rule.value)}`;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorNL.ts
 /**
@@ -1710,7 +1684,6 @@ const defaultRuleProcessorNL = (rule, opts) => {
 	};
 	return require_utils.normalizeConstituentWordOrder(wordOrder).map((term) => `${wordOrderMap[term]}`).join(" ").trim();
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorSQL.ts
 /**
@@ -1765,7 +1738,6 @@ const defaultRuleProcessorSQL = (rule, opts = {}) => {
 	if ((operatorLowerCase === "in" || operatorLowerCase === "not in" || operatorLowerCase === "between" || operatorLowerCase === "not between") && !value) return "";
 	return `${ruleField} ${operator} ${value}`.trim();
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorParameterized.ts
 /**
@@ -1870,7 +1842,6 @@ const defaultRuleProcessorParameterized = (rule, opts, meta) => {
 	}
 	return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator} ${parameterized ? numberedParams ? `${paramPrefix}${processedParams.length + 1}` : "?" : `${paramPrefix}${paramName}`}`.trim());
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorPrisma.ts
 const processNumber = (value, fallback, parseNumbers) => require_utils.shouldRenderAsNumber(value, !!parseNumbers || typeof value === "bigint") ? Number(require_utils.parseNumber(value, { parseNumbers: !!parseNumbers })) : fallback;
@@ -1932,7 +1903,6 @@ const defaultRuleProcessorPrisma = (rule, options = {}) => {
 	}
 	return "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorSequelize.ts
 /**
@@ -1999,7 +1969,6 @@ const defaultRuleProcessorSequelize = (rule, { parseNumbers, preserveValueOrder,
 		}
 	}
 };
-
 //#endregion
 //#region src/utils/formatQuery/formatQuery.ts
 /**
@@ -2088,8 +2057,8 @@ const defaultFormatQueryOptions = {
 	paramsKeepPrefix: false,
 	numberedParams: false,
 	preserveValueOrder: false,
-	placeholderFieldName: require_utils.defaultPlaceholderFieldName,
-	placeholderOperatorName: require_utils.defaultPlaceholderOperatorName,
+	placeholderFieldName: "~",
+	placeholderOperatorName: "~",
 	quoteValuesWith: "'",
 	concatOperator: "||",
 	preset: "ansi",
@@ -2194,7 +2163,7 @@ function formatQuery(ruleGroup, optionParam = {}) {
 	switch (format) {
 		case "json":
 		case "json_without_ids": {
-			const rg = parseNumbers ? (0, immer.produce)(ruleGroup, (g) => require_utils.numerifyValues(g, finalOptions)) : ruleGroup;
+			const rg = parseNumbers ? require_utils.numerifyValues(ruleGroup, finalOptions) : ruleGroup;
 			if (format === "json_without_ids") return JSON.stringify(rg, (key, value) => key === "id" || key === "path" ? void 0 : require_utils.bigIntJsonStringifyReplacer(key, value));
 			return JSON.stringify(rg, require_utils.bigIntJsonStringifyReplacer, 2);
 		}
@@ -2216,7 +2185,6 @@ function formatQuery(ruleGroup, optionParam = {}) {
 		default: return "";
 	}
 }
-
 //#endregion
 //#region src/utils/formatQuery/index.ts
 const generateValueProcessor = (vpbr) => (field, operator, value, valueSource) => vpbr({
@@ -2267,7 +2235,6 @@ const defaultValueProcessorMongoDBByRule = defaultRuleProcessorMongoDB;
 * @group Export
 */
 const defaultValueProcessorSpELByRule = defaultRuleProcessorSpEL;
-
 //#endregion
 exports.bigIntJsonParseReviver = require_utils.bigIntJsonParseReviver;
 exports.bigIntJsonStringifyReplacer = require_utils.bigIntJsonStringifyReplacer;
@@ -2331,4 +2298,5 @@ exports.prismaOperators = require_utils.prismaOperators;
 exports.processMatchMode = require_utils.processMatchMode;
 exports.shouldRenderAsNumber = require_utils.shouldRenderAsNumber;
 exports.sqlDialectPresets = sqlDialectPresets;
+
 //# sourceMappingURL=formatQuery.js.map