@aiao/rxdb-query-builder 0.0.10 → 0.0.12

package/dist/index.js

@@ -1,13 +1,13 @@
-import { v4 as V } from "uuid";
-import { BehaviorSubject as L, map as M, distinctUntilChanged as w } from "rxjs";
+import { v4 as U } from "uuid";
+import { BehaviorSubject as W, map as k, distinctUntilChanged as $ } from "rxjs";
 import { RelationKind as B, PropertyType as g } from "@aiao/rxdb";
-function b(n) {
+function v(n) {
   return "combinator" in n && "rules" in n;
 }
-function S(n) {
+function M(n) {
   return "field" in n && "operator" in n;
 }
-const k = [
+const O = [
   // 相等操作符
   {
     key: "=",
@@ -136,35 +136,37 @@ const k = [
     applicableTypes: ["relation"]
   }
 ];
-function ce(n, e = k) {
-  return e.filter((r) => r.applicableTypes.includes(n));
+function ye(n, e = O) {
+  return e.filter((t) => t.applicableTypes.includes(n));
 }
-const K = [
+function D(n) {
+  return n == null || Array.isArray(n);
+}
+const Y = [
   {
     name: "stringType",
     appliesTo: ["string"],
     message: "值必须是字符串类型",
-    validate: (n) => n.value === void 0 || n.value === null || Array.isArray(n.value) ? !0 : typeof n.value == "string"
+    validate: (n) => D(n.value) ? !0 : typeof n.value == "string"
   },
   {
     name: "numberType",
     appliesTo: ["number"],
     message: "值必须是数字类型",
-    validate: (n) => n.value === void 0 || n.value === null || Array.isArray(n.value) ? !0 : typeof n.value == "number" && !isNaN(n.value)
+    validate: (n) => D(n.value) ? !0 : typeof n.value == "number" && !isNaN(n.value)
   },
   {
     name: "booleanType",
     appliesTo: ["boolean"],
     message: "值必须是布尔类型",
-    validate: (n) => n.value === void 0 || n.value === null || Array.isArray(n.value) ? !0 : typeof n.value == "boolean"
+    validate: (n) => D(n.value) ? !0 : typeof n.value == "boolean"
   },
   {
     name: "dateType",
     appliesTo: ["date"],
     message: "值必须是有效日期",
     validate: (n) => {
-      if (n.value === void 0 || n.value === null || Array.isArray(n.value))
-        return !0;
+      if (D(n.value)) return !0;
       if (n.value instanceof Date)
         return !isNaN(n.value.getTime());
       if (typeof n.value == "string") {
@@ -174,7 +176,7 @@ const K = [
       return !1;
     }
   }
-], U = {
+], X = {
   uuid: "string",
   string: "string",
   number: "number",
@@ -186,10 +188,10 @@ const K = [
   keyValue: "object",
   json: "object"
 };
-function W(n, e) {
-  return e?.displayName ? e.displayName : n.replace(/([A-Z])/g, " $1").replace(/^./, (r) => r.toUpperCase()).trim();
+function z(n, e) {
+  return e?.displayName ? e.displayName : n.replace(/([A-Z])/g, " $1").replace(/^./, (t) => t.toUpperCase()).trim();
 }
-class P {
+class x {
   options;
   constructor(e = {}) {
     this.options = {
@@ -198,7 +200,7 @@ class P {
       includeRelations: e.includeRelations ?? !1,
       entityMetadataMap: e.entityMetadataMap,
       fieldFilter: e.fieldFilter ?? (() => !0),
-      displayNameGenerator: e.displayNameGenerator ?? W
+      displayNameGenerator: e.displayNameGenerator ?? z
     };
   }
   /**
@@ -215,24 +217,24 @@ class P {
    * ```
    */
   parse(e) {
-    const r = [];
-    for (const t of e.properties) {
-      if (!this.options.includeForeignKeys && e.isForeignKey(t.name))
+    const t = [];
+    for (const r of e.properties) {
+      if (!this.options.includeForeignKeys && e.isForeignKey(r.name))
         continue;
-      const s = this.parseProperty(t);
-      s && this.options.fieldFilter(s) && r.push(s);
+      const s = this.parseProperty(r);
+      s && this.options.fieldFilter(s) && t.push(s);
     }
     if (this.options.includeComputedProperties)
-      for (const t of e.computedProperties) {
-        const s = this.parseProperty(t);
-        s && this.options.fieldFilter(s) && r.push(s);
+      for (const r of e.computedProperties) {
+        const s = this.parseProperty(r);
+        s && this.options.fieldFilter(s) && t.push(s);
       }
     if (this.options.includeRelations && e.relations)
-      for (const t of e.relations) {
-        const s = this.parseRelation(t);
-        s && this.options.fieldFilter(s) && r.push(s);
+      for (const r of e.relations) {
+        const s = this.parseRelation(r);
+        s && this.options.fieldFilter(s) && t.push(s);
       }
-    return r;
+    return t;
   }
   /**
    * 从多个 EntityMetadata 批量解析
@@ -241,37 +243,37 @@ class P {
    * @returns 实体名称到字段数组的映射
    */
   parseMany(e) {
-    const r = /* @__PURE__ */ new Map();
-    for (const [t, s] of e)
-      r.set(t, this.parse(s));
-    return r;
+    const t = /* @__PURE__ */ new Map();
+    for (const [r, s] of e)
+      t.set(r, this.parse(s));
+    return t;
   }
   /**
    * 解析单个属性
    */
   parseProperty(e) {
-    const r = this.mapPropertyType(e.type);
-    if (!r)
+    const t = this.mapPropertyType(e.type);
+    if (!t)
       return null;
-    const t = {
+    const r = {
       name: e.name,
       displayName: this.options.displayNameGenerator(e.name, e),
-      type: r
+      type: t
     };
-    return e.nullable !== void 0 && (t.required = !e.nullable), e.description && (t.description = e.description), e.enum && Array.isArray(e.enum) && (t.enum = e.enum), e.pattern && (t.pattern = e.pattern), t;
+    return e.nullable !== void 0 && (r.required = !e.nullable), e.description && (r.description = e.description), e.enum && Array.isArray(e.enum) && (r.enum = e.enum), e.pattern && (r.pattern = e.pattern), r;
   }
   /**
    * 将 RxDB PropertyType 映射到 QueryBuilder 类型
    */
   mapPropertyType(e) {
-    const r = typeof e == "string" ? e : String(e);
-    return U[r] ?? null;
+    const t = typeof e == "string" ? e : String(e);
+    return X[t] ?? null;
   }
   /**
    * 解析关系字段
    */
   parseRelation(e) {
-    const r = {
+    const t = {
       name: e.name,
       displayName: this.options.displayNameGenerator(e.name, e),
       type: "relation",
@@ -280,29 +282,29 @@ class P {
       relationKind: e.kind
     };
     if (this.options.entityMetadataMap) {
-      const t = e.mappedEntity, s = this.options.entityMetadataMap.get(t);
+      const r = e.mappedEntity, s = this.options.entityMetadataMap.get(r);
       if (s) {
-        const a = new P({
+        const a = new x({
           ...this.options,
           includeRelations: !1
           // 防止无限递归
         });
-        r.relationFields = a.parse(s);
+        t.relationFields = a.parse(s);
       }
     }
-    return r;
+    return t;
   }
 }
-function j(n) {
-  return new P(n);
+function _(n) {
+  return new x(n);
 }
-function A() {
-  return V();
+function E() {
+  return U();
 }
-class Y {
+class Z {
   idGenerator;
   constructor(e = {}) {
-    this.idGenerator = e.idGenerator ?? A;
+    this.idGenerator = e.idGenerator ?? E;
   }
   /**
    * 将 QueryBuilder 状态转换为 RxDB Query
@@ -341,12 +343,12 @@ class Y {
    * 转换单个规则组到 RxDB 格式
    */
   convertGroupToRxDB(e) {
-    const r = [];
-    for (const t of e.rules)
-      b(t) ? r.push(this.convertGroupToRxDB(t)) : S(t) && r.push(this.convertRuleToRxDB(t));
+    const t = [];
+    for (const r of e.rules)
+      v(r) ? t.push(this.convertGroupToRxDB(r)) : t.push(this.convertRuleToRxDB(r));
     return {
       combinator: e.combinator,
-      rules: r
+      rules: t
     };
   }
   /**
@@ -354,20 +356,20 @@ class Y {
    * 移除 QueryBuilder 特有的 id 字段
    */
   convertRuleToRxDB(e) {
-    const { id: r, ...t } = e;
-    return t;
+    const { id: t, ...r } = e;
+    return r;
   }
   /**
    * 从 RxDB 格式转换规则组
    */
   convertGroupFromRxDB(e) {
-    const r = [];
-    for (const t of e.rules)
-      this.isRxDBRuleGroup(t) ? r.push(this.convertGroupFromRxDB(t)) : r.push(this.convertRuleFromRxDB(t));
+    const t = [];
+    for (const r of e.rules)
+      "combinator" in r && "rules" in r ? t.push(this.convertGroupFromRxDB(r)) : t.push(this.convertRuleFromRxDB(r));
     return {
       id: this.idGenerator(),
       combinator: e.combinator,
-      rules: r
+      rules: t
     };
   }
   /**
@@ -380,17 +382,11 @@ class Y {
       ...e
     };
   }
-  /**
-   * 判断是否为 RxDB RuleGroup
-   */
-  isRxDBRuleGroup(e) {
-    return typeof e == "object" && e !== null && "combinator" in e && "rules" in e && Array.isArray(e.rules);
-  }
 }
-function X(n) {
-  return new Y(n);
+function H(n) {
+  return new Z(n);
 }
-class q {
+class C {
   operators;
   /**
    * 获取操作符数量
@@ -400,11 +396,11 @@ class q {
   }
   constructor(e = {}) {
     if (this.operators = /* @__PURE__ */ new Map(), e.useDefaultOperators !== !1)
-      for (const r of k)
-        this.operators.set(r.key, r);
+      for (const t of O)
+        this.operators.set(t.key, t);
     if (e.operators)
-      for (const r of e.operators)
-        this.operators.set(r.key, r);
+      for (const t of e.operators)
+        this.operators.set(t.key, t);
   }
   /**
    * 注册新操作符
@@ -430,8 +426,8 @@ class q {
    * @param operators - 操作符定义数组
    */
   registerMany(e) {
-    for (const r of e)
-      this.register(r);
+    for (const t of e)
+      this.register(t);
   }
   /**
    * 移除操作符
@@ -472,7 +468,7 @@ class q {
    * ```
    */
   getForType(e) {
-    return Array.from(this.operators.values()).filter((r) => r.applicableTypes.includes(e));
+    return Array.from(this.operators.values()).filter((t) => t.applicableTypes.includes(e));
   }
   /**
    * 根据字段元数据获取适用的操作符
@@ -481,12 +477,12 @@ class q {
    * @returns 适用的操作符数组
    */
   getForField(e) {
-    const r = this.getForType(e.type);
+    const t = this.getForType(e.type);
     if (e.nullable) {
-      const t = r.some((o) => o.key === "null"), s = r.some((o) => o.key === "notNull"), a = this.operators.get("null"), l = this.operators.get("notNull"), i = [...r];
-      return !t && a && i.push(a), !s && l && i.push(l), i;
+      const r = t.some((o) => o.key === "null"), s = t.some((o) => o.key === "notNull"), a = this.operators.get("null"), l = this.operators.get("notNull"), i = [...t];
+      return !r && a && i.push(a), !s && l && i.push(l), i;
     }
-    return r;
+    return t;
   }
   /**
    * 检查操作符是否支持指定类型
@@ -495,9 +491,9 @@ class q {
    * @param fieldType - 字段类型
    * @returns 是否支持
    */
-  isOperatorSupportedForType(e, r) {
-    const t = this.operators.get(e);
-    return t ? t.applicableTypes.includes(r) : !1;
+  isOperatorSupportedForType(e, t) {
+    const r = this.operators.get(e);
+    return r ? r.applicableTypes.includes(t) : !1;
   }
   /**
    * 检查操作符是否支持指定字段
@@ -506,9 +502,9 @@ class q {
    * @param field - 字段元数据
    * @returns 是否支持
    */
-  isOperatorSupportedForField(e, r) {
-    const t = this.operators.get(e);
-    return t ? (e === "null" || e === "notNull") && r.nullable ? !0 : t.applicableTypes.includes(r.type) : !1;
+  isOperatorSupportedForField(e, t) {
+    const r = this.operators.get(e);
+    return r ? (e === "null" || e === "notNull") && t.nullable ? !0 : r.applicableTypes.includes(t.type) : !1;
   }
   /**
    * 获取操作符的值类型
@@ -530,63 +526,63 @@ class q {
    */
   reset() {
     this.clear();
-    for (const e of k)
+    for (const e of O)
       this.operators.set(e.key, e);
   }
 }
 function J(n) {
-  return new q(n);
+  return new C(n);
 }
-let $ = null;
-function z() {
-  return $ || ($ = new q()), $;
+let P = null;
+function ee() {
+  return P || (P = new C()), P;
 }
-function Z(n) {
+function te(n) {
   return typeof n == "object" && n !== null && "where" in n;
 }
-function O(n) {
+function j(n) {
   if ("value" in n)
     return n.value;
 }
-class H {
+class re {
   rules;
   operatorRegistry;
   constructor(e = {}) {
-    if (this.rules = /* @__PURE__ */ new Map(), this.operatorRegistry = e.operatorRegistry ?? z(), e.useBuiltinRules !== !1)
-      for (const r of K)
-        this.rules.set(r.name, r);
+    if (this.rules = /* @__PURE__ */ new Map(), this.operatorRegistry = e.operatorRegistry ?? ee(), e.useBuiltinRules !== !1)
+      for (const t of Y)
+        this.rules.set(t.name, t);
     if (e.customRules)
-      for (const r of e.customRules)
-        this.rules.set(r.name, r);
+      for (const t of e.customRules)
+        this.rules.set(t.name, t);
   }
   /**
    * 校验单条规则
    */
-  validateRule(e, r) {
-    const t = [], s = O(e), a = {
-      fieldType: r.type,
+  validateRule(e, t) {
+    const r = [], s = j(e), a = {
+      fieldType: t.type,
       operator: e.operator,
       value: s
     };
-    this.operatorRegistry.isOperatorSupportedForField(e.operator, r) || t.push({
+    this.operatorRegistry.isOperatorSupportedForField(e.operator, t) || r.push({
       field: e.field,
       rule: "operatorTypeMatch",
-      message: `操作符 "${e.operator}" 不支持字段 "${r.name}"`
+      message: `操作符 "${e.operator}" 不支持字段 "${t.name}"`
     });
     const l = this.operatorRegistry.getValueType(e.operator);
     if (l === "subquery") {
-      if (Z(e) && e.where !== void 0 && e.where !== null) {
+      if (te(e) && e.where !== void 0 && e.where !== null) {
         const i = e.where;
         if (typeof i == "object" && "combinator" in i && "rules" in i)
           if (!i.rules || i.rules.length === 0)
-            t.push({
+            r.push({
               field: e.field,
               rule: "valueType",
               message: "EXISTS 子查询条件不能为空"
             });
           else {
             const o = this.validateSubqueryRules(i);
-            o.length > 0 && t.push(
+            o.length > 0 && r.push(
               ...o.map((f) => ({
                 ...f,
                 field: `${e.field}.${f.field}`
@@ -595,43 +591,43 @@ class H {
             );
           }
         else
-          t.push({
+          r.push({
             field: e.field,
             rule: "valueType",
             message: "EXISTS 子查询格式无效"
           });
       }
     } else {
-      const i = this.validateValueType(s, l, e.field, r.displayName);
-      i && t.push(i);
+      const i = this.validateValueType(s, l, e.field, t.displayName);
+      i && r.push(i);
     }
     for (const i of this.rules.values()) {
-      if (i.appliesTo && !i.appliesTo.includes(r.type))
+      if (i.appliesTo && !i.appliesTo.includes(t.type))
         continue;
-      i.validate(a) || t.push({
+      i.validate(a) || r.push({
         field: e.field,
         rule: i.name,
         message: i.message
       });
     }
     return {
-      valid: t.length === 0,
-      errors: t.length > 0 ? t : void 0
+      valid: r.length === 0,
+      errors: r.length > 0 ? r : void 0
     };
   }
   /**
    * 校验整个规则组
    */
-  validateGroup(e, r) {
-    const t = [];
+  validateGroup(e, t) {
+    const r = [];
     for (const s of e.rules)
-      if (b(s)) {
-        const a = this.validateGroup(s, r);
-        !a.valid && a.errors && t.push(...a.errors);
-      } else if (S(s)) {
-        const a = r.get(s.field);
+      if (v(s)) {
+        const a = this.validateGroup(s, t);
+        !a.valid && a.errors && r.push(...a.errors);
+      } else if (M(s)) {
+        const a = t.get(s.field);
         if (!a) {
-          t.push({
+          r.push({
             field: s.field,
             rule: "fieldExists",
             message: `字段 "${s.field}" 不存在`
@@ -639,11 +635,11 @@ class H {
           continue;
         }
         const l = this.validateRule(s, a);
-        !l.valid && l.errors && t.push(...l.errors);
+        !l.valid && l.errors && r.push(...l.errors);
       }
     return {
-      valid: t.length === 0,
-      errors: t.length > 0 ? t : void 0
+      valid: r.length === 0,
+      errors: r.length > 0 ? r : void 0
     };
   }
   /**
@@ -667,19 +663,19 @@ class H {
   /**
    * 校验值类型
    */
-  validateValueType(e, r, t, s) {
-    return r === "none" || r === "subquery" ? null : r === "array" ? !Array.isArray(e) || e.length === 0 ? {
-      field: t,
+  validateValueType(e, t, r, s) {
+    return t === "none" || t === "subquery" ? null : t === "array" ? !Array.isArray(e) || e.length === 0 ? {
+      field: r,
       rule: "valueType",
-      message: `${s || t}需要提供一个或多个值`
-    } : null : r === "range" ? !Array.isArray(e) || e.length !== 2 ? {
-      field: t,
+      message: `${s || r}需要提供一个或多个值`
+    } : null : t === "range" ? !Array.isArray(e) || e.length !== 2 ? {
+      field: r,
       rule: "valueType",
-      message: `${s || t}需要提供两个值（范围）`
+      message: `${s || r}需要提供两个值（范围）`
     } : null : e == null || e === "" ? {
-      field: t,
+      field: r,
       rule: "valueType",
-      message: `${s || t}需要提供一个值`
+      message: `${s || r}需要提供一个值`
     } : null;
   }
   /**
@@ -690,52 +686,70 @@ class H {
    * 因此只验证规则的基本结构和值类型，不验证字段是否存在或操作符是否匹配。
    */
   validateSubqueryRules(e) {
-    const r = [];
-    for (const t of e.rules)
-      if (b(t)) {
-        const s = this.validateSubqueryRules(t);
-        r.push(...s);
-      } else if (S(t)) {
-        const s = O(t), a = this.operatorRegistry.getValueType(t.operator), l = this.validateValueType(s, a, t.field);
-        if (l && r.push(l), a === "subquery") {
-          const i = t;
+    const t = [];
+    for (const r of e.rules)
+      if (v(r)) {
+        const s = this.validateSubqueryRules(r);
+        t.push(...s);
+      } else if (M(r)) {
+        const s = j(r), a = this.operatorRegistry.getValueType(r.operator), l = this.validateValueType(s, a, r.field);
+        if (l && t.push(l), a === "subquery") {
+          const i = r;
           if ("where" in i && i.where) {
             const o = i.where;
             if (typeof o == "object" && "combinator" in o && "rules" in o)
               if (!o.rules || o.rules.length === 0)
-                r.push({
-                  field: t.field,
+                t.push({
+                  field: r.field,
                   rule: "valueType",
                   message: "EXISTS 子查询条件不能为空"
                 });
               else {
                 const f = this.validateSubqueryRules(o);
-                r.push(...f);
+                t.push(...f);
               }
             else
-              r.push({
-                field: t.field,
+              t.push({
+                field: r.field,
                 rule: "valueType",
                 message: "EXISTS 子查询格式无效"
               });
           }
         }
       }
-    return r;
+    return t;
   }
 }
-function ee(n) {
-  return new H(n);
+function se(n) {
+  return new re(n);
+}
+function w(n, e) {
+  if (n === e) return !0;
+  if (n === null || e === null || typeof n != typeof e) return !1;
+  if (Array.isArray(n)) {
+    if (!Array.isArray(e) || n.length !== e.length) return !1;
+    for (let t = 0; t < n.length; t++)
+      if (!w(n[t], e[t])) return !1;
+    return !0;
+  }
+  if (typeof n == "object") {
+    const t = n, r = e, s = Object.keys(t), a = Object.keys(r);
+    if (s.length !== a.length) return !1;
+    for (const l of s)
+      if (!Object.prototype.hasOwnProperty.call(r, l) || !w(t[l], r[l])) return !1;
+    return !0;
+  }
+  return !1;
 }
-const te = 5, _ = "and";
+const ne = 5, V = "and";
 function I() {
   return {
-    id: A(),
-    combinator: _,
+    id: E(),
+    combinator: V,
     rules: []
   };
 }
-class re {
+class ie {
   stateSubject;
   fieldsMap;
   config;
@@ -759,22 +773,22 @@ class re {
    */
   query$;
   constructor(e = {}) {
-    if (this.operatorRegistry = e.operatorRegistry ?? J(), this.validationService = e.validationService ?? ee({
+    if (this.operatorRegistry = e.operatorRegistry ?? J(), this.validationService = e.validationService ?? se({
       operatorRegistry: this.operatorRegistry
-    }), this.queryConverter = e.queryConverter ?? X(), this.fieldsMap = /* @__PURE__ */ new Map(), e.fields)
-      for (const t of e.fields)
-        this.fieldsMap.set(t.name, t);
+    }), this.queryConverter = e.queryConverter ?? H(), this.fieldsMap = /* @__PURE__ */ new Map(), e.fields)
+      for (const r of e.fields)
+        this.fieldsMap.set(r.name, r);
     this.config = e.config ?? {};
-    let r;
-    e.initialState ? r = e.initialState : e.initialQuery ? r = this.queryConverter.fromRxDBQuery(e.initialQuery) : e.config?.initialQuery ? r = { rootGroup: e.config.initialQuery } : r = { rootGroup: I() }, this.stateSubject = new L(r), this.state$ = this.stateSubject.asObservable(), this.rootGroup$ = this.state$.pipe(
-      M((t) => t.rootGroup),
-      w()
+    let t;
+    e.initialState ? t = e.initialState : e.initialQuery ? t = this.queryConverter.fromRxDBQuery(e.initialQuery) : e.config?.initialQuery ? t = { rootGroup: e.config.initialQuery } : t = { rootGroup: I() }, this.stateSubject = new W(t), this.state$ = this.stateSubject.asObservable(), this.rootGroup$ = this.state$.pipe(
+      k((r) => r.rootGroup),
+      $()
     ), this.validation$ = this.state$.pipe(
-      M((t) => this.validationService.validateGroup(t.rootGroup, this.fieldsMap)),
-      w((t, s) => t.valid === s.valid && JSON.stringify(t.errors) === JSON.stringify(s.errors))
+      k((r) => this.validationService.validateGroup(r.rootGroup, this.fieldsMap)),
+      $((r, s) => r.valid === s.valid && w(r.errors, s.errors))
     ), this.query$ = this.state$.pipe(
-      M((t) => this.queryConverter.toRxDBQuery(t)),
-      w((t, s) => JSON.stringify(t) === JSON.stringify(s))
+      k((r) => this.queryConverter.toRxDBQuery(r)),
+      $((r, s) => w(r, s))
     );
   }
   /**
@@ -793,7 +807,7 @@ class re {
    * 获取最大嵌套层级
    */
   getMaxNestingLevel() {
-    return this.config.maxNestingLevel ?? te;
+    return this.config.maxNestingLevel ?? ne;
   }
   /**
    * 获取字段列表
@@ -806,8 +820,8 @@ class re {
    */
   setFields(e) {
     this.fieldsMap.clear();
-    for (const r of e)
-      this.fieldsMap.set(r.name, r);
+    for (const t of e)
+      this.fieldsMap.set(t.name, t);
   }
   /**
    * 获取操作符注册表
@@ -819,52 +833,52 @@ class re {
   /**
    * 添加规则
    */
-  addRule(e = null, r) {
-    const t = {
-      id: A(),
-      field: r?.field ?? "",
-      operator: r?.operator ?? "=",
-      value: "value" in (r ?? {}) ? r.value : ""
-    }, s = this.getState(), a = this.addItemToGroup(s.rootGroup, e ?? s.rootGroup.id, t);
-    return this.stateSubject.next({ rootGroup: a }), t.id;
+  addRule(e = null, t) {
+    const r = {
+      id: E(),
+      field: t?.field ?? "",
+      operator: t?.operator ?? "=",
+      ...t && "value" in t ? { value: t.value } : { value: "" }
+    }, s = this.getState(), a = this.addItemToGroup(s.rootGroup, e ?? s.rootGroup.id, r);
+    return this.stateSubject.next({ rootGroup: a }), r.id;
   }
   /**
    * 添加规则组
    */
-  addGroup(e = null, r = _) {
-    const t = this.getState(), s = e ?? t.rootGroup.id, a = this.getGroupDepth(t.rootGroup, s), l = this.getMaxNestingLevel();
+  addGroup(e = null, t = V) {
+    const r = this.getState(), s = e ?? r.rootGroup.id, a = this.getGroupDepth(r.rootGroup, s), l = this.getMaxNestingLevel();
     if (a >= l)
       throw new Error(`已达到最大嵌套深度 ${l}`);
     const i = {
-      id: A(),
-      combinator: r,
+      id: E(),
+      combinator: t,
       rules: []
-    }, o = this.addItemToGroup(t.rootGroup, s, i);
+    }, o = this.addItemToGroup(r.rootGroup, s, i);
     return this.stateSubject.next({ rootGroup: o }), i.id;
   }
   /**
    * 更新规则
    */
-  updateRule(e, r) {
-    const t = this.getState(), s = this.updateItemInGroup(t.rootGroup, e, r);
+  updateRule(e, t) {
+    const r = this.getState(), s = this.updateItemInGroup(r.rootGroup, e, t);
     this.stateSubject.next({ rootGroup: s });
   }
   /**
    * 更新组的组合器
    */
-  updateGroupCombinator(e, r) {
-    const t = this.getState(), s = this.updateItemInGroup(t.rootGroup, e, { combinator: r });
+  updateGroupCombinator(e, t) {
+    const r = this.getState(), s = this.updateItemInGroup(r.rootGroup, e, { combinator: t });
     this.stateSubject.next({ rootGroup: s });
   }
   /**
    * 删除规则或组
    */
   remove(e) {
-    const r = this.getState();
-    if (e === r.rootGroup.id)
+    const t = this.getState();
+    if (e === t.rootGroup.id)
       throw new Error("不能删除根组");
-    const t = this.removeItemFromGroup(r.rootGroup, e);
-    this.stateSubject.next({ rootGroup: t });
+    const r = this.removeItemFromGroup(t.rootGroup, e);
+    this.stateSubject.next({ rootGroup: r });
   }
   /**
    * 清空所有规则
@@ -889,8 +903,8 @@ class re {
    * 从 RxDB Query 加载
    */
   fromRxDBQuery(e) {
-    const r = this.queryConverter.fromRxDBQuery(e);
-    this.stateSubject.next(r);
+    const t = this.queryConverter.fromRxDBQuery(e);
+    this.stateSubject.next(t);
   }
   // ==================== 校验方法 ====================
   /**
@@ -906,49 +920,49 @@ class re {
     return this.validate().valid;
   }
   // ==================== 私有辅助方法 ====================
-  addItemToGroup(e, r, t) {
-    return e.id === r ? {
+  addItemToGroup(e, t, r) {
+    return e.id === t ? {
       ...e,
-      rules: [...e.rules, t]
+      rules: [...e.rules, r]
     } : {
       ...e,
-      rules: e.rules.map((s) => b(s) ? this.addItemToGroup(s, r, t) : s)
+      rules: e.rules.map((s) => v(s) ? this.addItemToGroup(s, t, r) : s)
     };
   }
-  updateItemInGroup(e, r, t) {
-    return e.id === r ? { ...e, ...t } : {
+  updateItemInGroup(e, t, r) {
+    return e.id === t ? { ...e, ...r } : {
       ...e,
-      rules: e.rules.map((s) => b(s) ? s.id === r ? { ...s, ...t } : this.updateItemInGroup(s, r, t) : S(s) && s.id === r ? { ...s, ...t } : s)
+      rules: e.rules.map((s) => v(s) ? s.id === t ? { ...s, ...r } : this.updateItemInGroup(s, t, r) : M(s) && s.id === t ? { ...s, ...r } : s)
     };
   }
-  removeItemFromGroup(e, r) {
+  removeItemFromGroup(e, t) {
     return {
       ...e,
-      rules: e.rules.filter((t) => b(t) || S(t) ? t.id !== r : !0).map((t) => b(t) ? this.removeItemFromGroup(t, r) : t)
+      rules: e.rules.filter((r) => v(r) || M(r) ? r.id !== t : !0).map((r) => v(r) ? this.removeItemFromGroup(r, t) : r)
     };
   }
-  getGroupDepth(e, r, t = 1) {
-    if (e.id === r)
-      return t;
+  getGroupDepth(e, t, r = 1) {
+    if (e.id === t)
+      return r;
     for (const s of e.rules)
-      if (b(s)) {
-        const a = this.getGroupDepth(s, r, t + 1);
+      if (v(s)) {
+        const a = this.getGroupDepth(s, t, r + 1);
         if (a > 0)
           return a;
       }
     return 0;
   }
 }
-function fe(n) {
-  return new re(n);
+function de(n) {
+  return new ie(n);
 }
-const x = "__exists__";
-function ye(n) {
-  const e = /* @__PURE__ */ new Set(), r = n.filter((i) => e.has(i.name) ? !1 : (e.add(i.name), !0)), t = [], s = /* @__PURE__ */ new Map(), a = [...r].sort((i, o) => {
+const q = "__exists__";
+function he(n) {
+  const e = /* @__PURE__ */ new Set(), t = n.filter((i) => e.has(i.name) ? !1 : (e.add(i.name), !0)), r = [], s = /* @__PURE__ */ new Map(), a = [...t].sort((i, o) => {
     const f = (i.name.match(/\./g) || []).length, y = (o.name.match(/\./g) || []).length;
     return f - y;
   }), l = /* @__PURE__ */ new Map();
-  for (const i of r)
+  for (const i of t)
     if (i.displayName) {
       const o = i.name.split("."), f = i.displayName.split(".");
       let y = "";
@@ -969,23 +983,23 @@ function ye(n) {
       ...i.relationFields && { relationFields: i.relationFields }
     };
     if (s.set(i.name, p), o.length === 1)
-      t.push(p);
+      r.push(p);
     else {
-      const m = o.slice(0, -1).join("."), v = s.get(m);
-      if (v)
-        v.children = v.children ?? [], v.children.push(p);
+      const m = o.slice(0, -1).join("."), b = s.get(m);
+      if (b)
+        b.children = b.children ?? [], b.children.push(p);
       else {
-        let d = "", N = t;
+        let d = "", N = r;
         for (let T = 0; T < o.length - 1; T++) {
           const R = o[T];
           d = d ? `${d}.${R}` : R;
           let h = s.get(d);
           if (!h) {
-            const F = l.get(d) ?? R;
+            const S = l.get(d) ?? R;
             h = {
               label: R,
               value: d,
-              displayName: F,
+              displayName: S,
               type: "relation",
               isRelation: !0,
               children: []
@@ -997,58 +1011,58 @@ function ye(n) {
       }
     }
   }
-  return C(t, r), t;
+  return Q(r, t), r;
 }
-function C(n, e) {
-  const r = new Map(e.map((t) => [t.name, t]));
-  for (const t of n) {
-    if (t.isRelation && t.children && t.children.length > 0 && !t.children.some((a) => a.label === x)) {
-      const l = r.get(t.value)?.relationFields;
-      t.children.unshift({
-        label: x,
-        value: t.value,
+function Q(n, e) {
+  const t = new Map(e.map((r) => [r.name, r]));
+  for (const r of n) {
+    if (r.isRelation && r.children && r.children.length > 0 && !r.children.some((a) => a.label === q)) {
+      const l = t.get(r.value)?.relationFields;
+      r.children.unshift({
+        label: q,
+        value: r.value,
         // 使用父节点的值，这样选择它就等于选择关系字段本身
         displayName: "(存在性检查)",
         type: "relation",
         isRelation: !0,
-        description: `检查 ${t.displayName} 是否存在`,
+        description: `检查 ${r.displayName} 是否存在`,
         relationFields: l
         // 复制 relationFields，确保 EXISTS 查询可以访问关联实体字段
       });
     }
-    t.children && C(t.children, e);
+    r.children && Q(r.children, e);
   }
 }
-function se(n, e) {
-  for (const r of n) {
-    if (r.value === e)
-      return r;
-    if (r.children) {
-      const t = se(r.children, e);
-      if (t) return t;
+function ae(n, e) {
+  for (const t of n) {
+    if (t.value === e)
+      return t;
+    if (t.children) {
+      const r = ae(t.children, e);
+      if (r) return r;
     }
   }
 }
-function de(n) {
-  const e = /* @__PURE__ */ new Map(), r = (t) => {
-    for (const s of t)
-      e.set(s.value, s), s.children && r(s.children);
+function me(n) {
+  const e = /* @__PURE__ */ new Map(), t = (r) => {
+    for (const s of r)
+      e.set(s.value, s), s.children && t(s.children);
   };
-  return r(n), e;
+  return t(n), e;
 }
-function he(n = 10) {
+function ge(n = 10) {
   return Array(n).fill("children");
 }
-function me(n, e) {
-  const r = e.split("."), t = [];
+function be(n, e) {
+  const t = e.split("."), r = [];
   let s = n;
-  for (let a = 0; a < r.length; a++) {
-    const l = r.slice(0, a + 1).join("."), i = s.find((o) => o.value === l);
-    i ? (t.push(i.displayName || i.label), s = i.children ?? []) : t.push(r[a]);
+  for (let a = 0; a < t.length; a++) {
+    const l = t.slice(0, a + 1).join("."), i = s.find((o) => o.value === l);
+    i ? (r.push(i.displayName || i.label), s = i.children ?? []) : r.push(t[a]);
   }
-  return t.join(".");
+  return r.join(".");
 }
-const ne = 4, Q = ["id", "createdAt", "updatedAt", "createdBy", "updatedBy"];
+const oe = 4, L = ["id", "createdAt", "updatedAt", "createdBy", "updatedBy"];
 function G(n) {
   switch (n) {
     case g.uuid:
@@ -1072,12 +1086,15 @@ function G(n) {
       return "string";
   }
 }
-function ie(n) {
-  return n.kind === B.ONE_TO_MANY || n.kind === B.MANY_TO_MANY ? "mappedProperty" in n && n.mappedProperty ? [n.mappedProperty] : [] : [];
+function le(n) {
+  return n.kind === B.ONE_TO_MANY || n.kind === B.MANY_TO_MANY ? [n.mappedProperty] : [];
+}
+function ve(n, e, t = {}) {
+  return K(n, e, t, n, [], "", /* @__PURE__ */ new Set(), 0);
 }
-function ae(n, e, r = {}, t, s = [], a = "", l = /* @__PURE__ */ new Set(), i = 0) {
-  const o = [], f = r.relationQueryDeep ?? ne, y = r.systemFields ?? Q;
-  if (t = t ?? n, l.has(n.name))
+function K(n, e, t, r, s, a, l, i) {
+  const o = [], f = t.relationQueryDeep ?? oe, y = t.systemFields ?? L;
+  if (l.has(n.name))
     return o;
   if (!a)
     for (const u of y) {
@@ -1101,10 +1118,10 @@ function ae(n, e, r = {}, t, s = [], a = "", l = /* @__PURE__ */ new Set(), i =
   for (const u of n.foreignKeyNames) {
     const c = a ? `${a}.${u}` : u;
     if (!o.some((p) => p.name === c)) {
-      const p = u.slice(0, -2), m = n.foreignKeyRelationMap.get(p), v = m?.displayName ?? p, d = m && "nullable" in m ? m.nullable ?? !1 : !1;
+      const p = u.slice(0, -2), m = n.foreignKeyRelationMap.get(p), b = m?.displayName ?? p, d = m && "nullable" in m ? m.nullable ?? !1 : !1;
       o.push({
         name: c,
-        displayName: `${v}ID`,
+        displayName: `${b}ID`,
         type: "string",
         nullable: d
       });
@@ -1114,46 +1131,46 @@ function ae(n, e, r = {}, t, s = [], a = "", l = /* @__PURE__ */ new Set(), i =
     for (const [u, c] of n.relationMap) {
       if (s.includes(u)) continue;
       const p = e.get(c.mappedEntity);
-      if (!p || i > 0 && p.metadata === t || l.has(p.metadata.name)) continue;
-      const m = a ? `${a}.${u}` : u, v = c.displayName || u, d = oe(p.metadata, r);
+      if (!p || i > 0 && p.metadata === r || l.has(p.metadata.name)) continue;
+      const m = a ? `${a}.${u}` : u, b = c.displayName || u, d = ue(p.metadata, t);
       o.push({
         name: m,
-        displayName: `${v} (${c.kind})`,
+        displayName: `${b} (${c.kind})`,
         type: "relation",
         isRelation: !0,
         relationTarget: c.mappedEntity,
         relationFields: d
       });
-      const N = ie(c), T = new Set(l);
+      const N = le(c), T = new Set(l);
       T.add(n.name);
-      const R = ae(
+      const R = K(
         p.metadata,
         e,
-        r,
         t,
+        r,
         N,
         m,
         T,
         i + 1
       );
       for (const h of y) {
-        const F = `${m}.${h}`, D = p.metadata.properties.find((E) => E.name === h);
-        D && !o.some((E) => E.name === F) && o.push({
-          name: F,
-          displayName: `${v}.${D.displayName ?? h}`,
-          type: G(D.type),
-          nullable: D.nullable ?? !1
+        const S = `${m}.${h}`, F = p.metadata.properties.find((A) => A.name === h);
+        F && !o.some((A) => A.name === S) && o.push({
+          name: S,
+          displayName: `${b}.${F.displayName ?? h}`,
+          type: G(F.type),
+          nullable: F.nullable ?? !1
         });
       }
       o.push(...R);
     }
   return o;
 }
-function oe(n, e = {}) {
-  const r = [], t = e.systemFields ?? Q;
-  for (const s of t) {
+function ue(n, e = {}) {
+  const t = [], r = e.systemFields ?? L;
+  for (const s of r) {
     const a = n.properties.find((l) => l.name === s);
-    a && r.push({
+    a && t.push({
       name: s,
       displayName: a.displayName ?? s,
       type: G(a.type),
@@ -1161,64 +1178,65 @@ function oe(n, e = {}) {
     });
   }
   for (const [s, a] of n.propertyMap)
-    r.push({
+    t.push({
       name: s,
       displayName: a.displayName ?? s,
       type: G(a.type),
       nullable: a.nullable ?? !1
     });
   for (const s of n.foreignKeyNames)
-    if (!r.some((a) => a.name === s)) {
+    if (!t.some((a) => a.name === s)) {
       const a = s.slice(0, -2), l = n.foreignKeyRelationMap.get(a), i = l?.displayName ?? a, o = l && "nullable" in l ? l.nullable ?? !1 : !1;
-      r.push({
+      t.push({
         name: s,
         displayName: `${i}ID`,
         type: "string",
         nullable: o
       });
     }
-  return r;
+  return t;
 }
-function ge(n) {
-  return n.sort((e, r) => {
-    const t = (e.name.match(/\./g) || []).length, s = (r.name.match(/\./g) || []).length;
-    return t !== s ? t - s : e.name.localeCompare(r.name);
+function Te(n) {
+  return [...n].sort((e, t) => {
+    const r = (e.name.match(/\./g) || []).length, s = (t.name.match(/\./g) || []).length;
+    return r !== s ? r - s : e.name.localeCompare(t.name);
   });
 }
-function ve(n, e) {
-  return j(e).parse(n);
+function Re(n, e) {
+  return _(e).parse(n);
 }
-function be(n, e) {
-  return j(e).parseMany(n);
+function Ne(n, e) {
+  return _(e).parseMany(n);
 }
 export {
-  K as BUILTIN_VALIDATION_RULES,
-  k as DEFAULT_OPERATORS,
-  q as OperatorRegistry,
-  re as QueryBuilderService,
-  Y as QueryConverter,
-  P as SchemaParser,
-  H as ValidationService,
-  ye as buildFieldTree,
-  de as createFieldNodeMap,
+  Y as BUILTIN_VALIDATION_RULES,
+  O as DEFAULT_OPERATORS,
+  C as OperatorRegistry,
+  ie as QueryBuilderService,
+  Z as QueryConverter,
+  x as SchemaParser,
+  re as ValidationService,
+  he as buildFieldTree,
+  me as createFieldNodeMap,
   J as createOperatorRegistry,
-  fe as createQueryBuilderService,
-  X as createQueryConverter,
-  be as createSchemaFromEntities,
-  ve as createSchemaFromEntity,
-  j as createSchemaParser,
-  ee as createValidationService,
-  ae as extractFieldsFromMetadata,
-  oe as extractRelationTargetFields,
-  se as findNodeByValue,
-  A as generateId,
-  z as getDefaultOperatorRegistry,
-  me as getDisplayNamePath,
-  ce as getOperatorsForType,
-  he as getOptionGroupChildren,
-  ie as getRelationIgnoreKeys,
-  S as isRule,
-  b as isRuleGroup,
+  de as createQueryBuilderService,
+  H as createQueryConverter,
+  Ne as createSchemaFromEntities,
+  Re as createSchemaFromEntity,
+  _ as createSchemaParser,
+  se as createValidationService,
+  ve as extractFieldsFromMetadata,
+  ue as extractRelationTargetFields,
+  ae as findNodeByValue,
+  E as generateId,
+  ee as getDefaultOperatorRegistry,
+  be as getDisplayNamePath,
+  ye as getOperatorsForType,
+  ge as getOptionGroupChildren,
+  le as getRelationIgnoreKeys,
+  M as isRule,
+  v as isRuleGroup,
   G as mapPropertyType,
-  ge as organizeFields
+  Te as organizeFields,
+  w as structuralEqual
 };