@aiao/rxdb-query-builder 0.0.11 → 0.0.13

package/dist/index.js

@@ -1,11 +1,11 @@
 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 v(s) {
-  return "combinator" in s && "rules" in s;
+function v(n) {
+  return "combinator" in n && "rules" in n;
 }
-function M(s) {
-  return "field" in s && "operator" in s;
+function M(n) {
+  return "field" in n && "operator" in n;
 }
 const O = [
   // 相等操作符
@@ -136,41 +136,41 @@ const O = [
     applicableTypes: ["relation"]
   }
 ];
-function ye(s, e = O) {
-  return e.filter((t) => t.applicableTypes.includes(s));
+function ye(n, e = O) {
+  return e.filter((t) => t.applicableTypes.includes(n));
 }
-function D(s) {
-  return s == null || Array.isArray(s);
+function D(n) {
+  return n == null || Array.isArray(n);
 }
 const Y = [
   {
     name: "stringType",
     appliesTo: ["string"],
     message: "值必须是字符串类型",
-    validate: (s) => D(s.value) ? !0 : typeof s.value == "string"
+    validate: (n) => D(n.value) ? !0 : typeof n.value == "string"
   },
   {
     name: "numberType",
     appliesTo: ["number"],
     message: "值必须是数字类型",
-    validate: (s) => D(s.value) ? !0 : typeof s.value == "number" && !isNaN(s.value)
+    validate: (n) => D(n.value) ? !0 : typeof n.value == "number" && !isNaN(n.value)
   },
   {
     name: "booleanType",
     appliesTo: ["boolean"],
     message: "值必须是布尔类型",
-    validate: (s) => D(s.value) ? !0 : typeof s.value == "boolean"
+    validate: (n) => D(n.value) ? !0 : typeof n.value == "boolean"
   },
   {
     name: "dateType",
     appliesTo: ["date"],
     message: "值必须是有效日期",
-    validate: (s) => {
-      if (D(s.value)) return !0;
-      if (s.value instanceof Date)
-        return !isNaN(s.value.getTime());
-      if (typeof s.value == "string") {
-        const e = new Date(s.value);
+    validate: (n) => {
+      if (D(n.value)) return !0;
+      if (n.value instanceof Date)
+        return !isNaN(n.value.getTime());
+      if (typeof n.value == "string") {
+        const e = new Date(n.value);
         return !isNaN(e.getTime());
       }
       return !1;
@@ -188,8 +188,8 @@ const Y = [
   keyValue: "object",
   json: "object"
 };
-function z(s, e) {
-  return e?.displayName ? e.displayName : s.replace(/([A-Z])/g, " $1").replace(/^./, (t) => t.toUpperCase()).trim();
+function z(n, e) {
+  return e?.displayName ? e.displayName : n.replace(/([A-Z])/g, " $1").replace(/^./, (t) => t.toUpperCase()).trim();
 }
 class x {
   options;
@@ -221,18 +221,18 @@ class x {
     for (const r of e.properties) {
       if (!this.options.includeForeignKeys && e.isForeignKey(r.name))
         continue;
-      const n = this.parseProperty(r);
-      n && this.options.fieldFilter(n) && t.push(n);
+      const s = this.parseProperty(r);
+      s && this.options.fieldFilter(s) && t.push(s);
     }
     if (this.options.includeComputedProperties)
       for (const r of e.computedProperties) {
-        const n = this.parseProperty(r);
-        n && this.options.fieldFilter(n) && t.push(n);
+        const s = this.parseProperty(r);
+        s && this.options.fieldFilter(s) && t.push(s);
       }
     if (this.options.includeRelations && e.relations)
       for (const r of e.relations) {
-        const n = this.parseRelation(r);
-        n && this.options.fieldFilter(n) && t.push(n);
+        const s = this.parseRelation(r);
+        s && this.options.fieldFilter(s) && t.push(s);
       }
     return t;
   }
@@ -244,8 +244,8 @@ class x {
    */
   parseMany(e) {
     const t = /* @__PURE__ */ new Map();
-    for (const [r, n] of e)
-      t.set(r, this.parse(n));
+    for (const [r, s] of e)
+      t.set(r, this.parse(s));
     return t;
   }
   /**
@@ -282,21 +282,21 @@ class x {
       relationKind: e.kind
     };
     if (this.options.entityMetadataMap) {
-      const r = e.mappedEntity, n = this.options.entityMetadataMap.get(r);
-      if (n) {
+      const r = e.mappedEntity, s = this.options.entityMetadataMap.get(r);
+      if (s) {
         const a = new x({
           ...this.options,
           includeRelations: !1
           // 防止无限递归
         });
-        t.relationFields = a.parse(n);
+        t.relationFields = a.parse(s);
       }
     }
     return t;
   }
 }
-function _(s) {
-  return new x(s);
+function _(n) {
+  return new x(n);
 }
 function E() {
   return U();
@@ -383,8 +383,8 @@ class Z {
     };
   }
 }
-function H(s) {
-  return new Z(s);
+function H(n) {
+  return new Z(n);
 }
 class C {
   operators;
@@ -479,8 +479,8 @@ class C {
   getForField(e) {
     const t = this.getForType(e.type);
     if (e.nullable) {
-      const r = t.some((o) => o.key === "null"), n = t.some((o) => o.key === "notNull"), a = this.operators.get("null"), l = this.operators.get("notNull"), i = [...t];
-      return !r && a && i.push(a), !n && 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 t;
   }
@@ -530,19 +530,19 @@ class C {
       this.operators.set(e.key, e);
   }
 }
-function J(s) {
-  return new C(s);
+function J(n) {
+  return new C(n);
 }
 let P = null;
 function ee() {
   return P || (P = new C()), P;
 }
-function te(s) {
-  return typeof s == "object" && s !== null && "where" in s;
+function te(n) {
+  return typeof n == "object" && n !== null && "where" in n;
 }
-function j(s) {
-  if ("value" in s)
-    return s.value;
+function j(n) {
+  if ("value" in n)
+    return n.value;
 }
 class re {
   rules;
@@ -559,10 +559,10 @@ class re {
    * 校验单条规则
    */
   validateRule(e, t) {
-    const r = [], n = j(e), a = {
+    const r = [], s = j(e), a = {
       fieldType: t.type,
       operator: e.operator,
-      value: n
+      value: s
     };
     this.operatorRegistry.isOperatorSupportedForField(e.operator, t) || r.push({
       field: e.field,
@@ -598,7 +598,7 @@ class re {
           });
       }
     } else {
-      const i = this.validateValueType(n, l, e.field, t.displayName);
+      const i = this.validateValueType(s, l, e.field, t.displayName);
       i && r.push(i);
     }
     for (const i of this.rules.values()) {
@@ -620,21 +620,21 @@ class re {
    */
   validateGroup(e, t) {
     const r = [];
-    for (const n of e.rules)
-      if (v(n)) {
-        const a = this.validateGroup(n, t);
+    for (const s of e.rules)
+      if (v(s)) {
+        const a = this.validateGroup(s, t);
         !a.valid && a.errors && r.push(...a.errors);
-      } else if (M(n)) {
-        const a = t.get(n.field);
+      } else if (M(s)) {
+        const a = t.get(s.field);
         if (!a) {
           r.push({
-            field: n.field,
+            field: s.field,
             rule: "fieldExists",
-            message: `字段 "${n.field}" 不存在`
+            message: `字段 "${s.field}" 不存在`
           });
           continue;
         }
-        const l = this.validateRule(n, a);
+        const l = this.validateRule(s, a);
         !l.valid && l.errors && r.push(...l.errors);
       }
     return {
@@ -663,19 +663,19 @@ class re {
   /**
    * 校验值类型
    */
-  validateValueType(e, t, r, n) {
+  validateValueType(e, t, r, s) {
     return t === "none" || t === "subquery" ? null : t === "array" ? !Array.isArray(e) || e.length === 0 ? {
       field: r,
       rule: "valueType",
-      message: `${n || r}需要提供一个或多个值`
+      message: `${s || r}需要提供一个或多个值`
     } : null : t === "range" ? !Array.isArray(e) || e.length !== 2 ? {
       field: r,
       rule: "valueType",
-      message: `${n || r}需要提供两个值（范围）`
+      message: `${s || r}需要提供两个值（范围）`
     } : null : e == null || e === "" ? {
       field: r,
       rule: "valueType",
-      message: `${n || r}需要提供一个值`
+      message: `${s || r}需要提供一个值`
     } : null;
   }
   /**
@@ -689,10 +689,10 @@ class re {
     const t = [];
     for (const r of e.rules)
       if (v(r)) {
-        const n = this.validateSubqueryRules(r);
-        t.push(...n);
+        const s = this.validateSubqueryRules(r);
+        t.push(...s);
       } else if (M(r)) {
-        const n = j(r), a = this.operatorRegistry.getValueType(r.operator), l = this.validateValueType(n, a, r.field);
+        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) {
@@ -720,22 +720,22 @@ class re {
     return t;
   }
 }
-function se(s) {
-  return new re(s);
+function se(n) {
+  return new re(n);
 }
-function w(s, e) {
-  if (s === e) return !0;
-  if (s === null || e === null || typeof s != typeof e) return !1;
-  if (Array.isArray(s)) {
-    if (!Array.isArray(e) || s.length !== e.length) return !1;
-    for (let t = 0; t < s.length; t++)
-      if (!w(s[t], e[t])) return !1;
+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 s == "object") {
-    const t = s, r = e, n = Object.keys(t), a = Object.keys(r);
-    if (n.length !== a.length) return !1;
-    for (const l of n)
+  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;
   }
@@ -785,10 +785,10 @@ class ie {
       $()
     ), this.validation$ = this.state$.pipe(
       k((r) => this.validationService.validateGroup(r.rootGroup, this.fieldsMap)),
-      $((r, n) => r.valid === n.valid && w(r.errors, n.errors))
+      $((r, s) => r.valid === s.valid && w(r.errors, s.errors))
     ), this.query$ = this.state$.pipe(
       k((r) => this.queryConverter.toRxDBQuery(r)),
-      $((r, n) => w(r, n))
+      $((r, s) => w(r, s))
     );
   }
   /**
@@ -839,36 +839,36 @@ class ie {
       field: t?.field ?? "",
       operator: t?.operator ?? "=",
       ...t && "value" in t ? { value: t.value } : { value: "" }
-    }, n = this.getState(), a = this.addItemToGroup(n.rootGroup, e ?? n.rootGroup.id, r);
+    }, s = this.getState(), a = this.addItemToGroup(s.rootGroup, e ?? s.rootGroup.id, r);
     return this.stateSubject.next({ rootGroup: a }), r.id;
   }
   /**
    * 添加规则组
    */
   addGroup(e = null, t = V) {
-    const r = this.getState(), n = e ?? r.rootGroup.id, a = this.getGroupDepth(r.rootGroup, n), l = this.getMaxNestingLevel();
+    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: E(),
       combinator: t,
       rules: []
-    }, o = this.addItemToGroup(r.rootGroup, n, i);
+    }, o = this.addItemToGroup(r.rootGroup, s, i);
     return this.stateSubject.next({ rootGroup: o }), i.id;
   }
   /**
    * 更新规则
    */
   updateRule(e, t) {
-    const r = this.getState(), n = this.updateItemInGroup(r.rootGroup, e, t);
-    this.stateSubject.next({ rootGroup: n });
+    const r = this.getState(), s = this.updateItemInGroup(r.rootGroup, e, t);
+    this.stateSubject.next({ rootGroup: s });
   }
   /**
    * 更新组的组合器
    */
   updateGroupCombinator(e, t) {
-    const r = this.getState(), n = this.updateItemInGroup(r.rootGroup, e, { combinator: t });
-    this.stateSubject.next({ rootGroup: n });
+    const r = this.getState(), s = this.updateItemInGroup(r.rootGroup, e, { combinator: t });
+    this.stateSubject.next({ rootGroup: s });
   }
   /**
    * 删除规则或组
@@ -926,13 +926,13 @@ class ie {
       rules: [...e.rules, r]
     } : {
       ...e,
-      rules: e.rules.map((n) => v(n) ? this.addItemToGroup(n, t, r) : n)
+      rules: e.rules.map((s) => v(s) ? this.addItemToGroup(s, t, r) : s)
     };
   }
   updateItemInGroup(e, t, r) {
     return e.id === t ? { ...e, ...r } : {
       ...e,
-      rules: e.rules.map((n) => v(n) ? n.id === t ? { ...n, ...r } : this.updateItemInGroup(n, t, r) : M(n) && n.id === t ? { ...n, ...r } : n)
+      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, t) {
@@ -944,21 +944,21 @@ class ie {
   getGroupDepth(e, t, r = 1) {
     if (e.id === t)
       return r;
-    for (const n of e.rules)
-      if (v(n)) {
-        const a = this.getGroupDepth(n, t, r + 1);
+    for (const s of e.rules)
+      if (v(s)) {
+        const a = this.getGroupDepth(s, t, r + 1);
         if (a > 0)
           return a;
       }
     return 0;
   }
 }
-function de(s) {
-  return new ie(s);
+function de(n) {
+  return new ie(n);
 }
 const q = "__exists__";
-function he(s) {
-  const e = /* @__PURE__ */ new Set(), t = s.filter((i) => e.has(i.name) ? !1 : (e.add(i.name), !0)), r = [], n = /* @__PURE__ */ new Map(), a = [...t].sort((i, o) => {
+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();
@@ -982,10 +982,10 @@ function he(s) {
       // 关系字段复制 relationFields 用于子查询
       ...i.relationFields && { relationFields: i.relationFields }
     };
-    if (n.set(i.name, p), o.length === 1)
+    if (s.set(i.name, p), o.length === 1)
       r.push(p);
     else {
-      const m = o.slice(0, -1).join("."), b = n.get(m);
+      const m = o.slice(0, -1).join("."), b = s.get(m);
       if (b)
         b.children = b.children ?? [], b.children.push(p);
       else {
@@ -993,7 +993,7 @@ function he(s) {
         for (let T = 0; T < o.length - 1; T++) {
           const R = o[T];
           d = d ? `${d}.${R}` : R;
-          let h = n.get(d);
+          let h = s.get(d);
           if (!h) {
             const S = l.get(d) ?? R;
             h = {
@@ -1003,7 +1003,7 @@ function he(s) {
               type: "relation",
               isRelation: !0,
               children: []
-            }, n.set(d, h), N.push(h);
+            }, s.set(d, h), N.push(h);
           }
           h.children = h.children ?? [], N = h.children;
         }
@@ -1013,9 +1013,9 @@ function he(s) {
   }
   return Q(r, t), r;
 }
-function Q(s, e) {
+function Q(n, e) {
   const t = new Map(e.map((r) => [r.name, r]));
-  for (const r of s) {
+  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({
@@ -1033,8 +1033,8 @@ function Q(s, e) {
     r.children && Q(r.children, e);
   }
 }
-function ae(s, e) {
-  for (const t of s) {
+function ae(n, e) {
+  for (const t of n) {
     if (t.value === e)
       return t;
     if (t.children) {
@@ -1043,28 +1043,28 @@ function ae(s, e) {
     }
   }
 }
-function me(s) {
+function me(n) {
   const e = /* @__PURE__ */ new Map(), t = (r) => {
-    for (const n of r)
-      e.set(n.value, n), n.children && t(n.children);
+    for (const s of r)
+      e.set(s.value, s), s.children && t(s.children);
   };
-  return t(s), e;
+  return t(n), e;
 }
-function ge(s = 10) {
-  return Array(s).fill("children");
+function ge(n = 10) {
+  return Array(n).fill("children");
 }
-function be(s, e) {
+function be(n, e) {
   const t = e.split("."), r = [];
-  let n = s;
+  let s = n;
   for (let a = 0; a < t.length; a++) {
-    const l = t.slice(0, a + 1).join("."), i = n.find((o) => o.value === l);
-    i ? (r.push(i.displayName || i.label), n = i.children ?? []) : r.push(t[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 r.join(".");
 }
 const oe = 4, L = ["id", "createdAt", "updatedAt", "createdBy", "updatedBy"];
-function G(s) {
-  switch (s) {
+function G(n) {
+  switch (n) {
     case g.uuid:
       return "string";
     case g.string:
@@ -1086,19 +1086,19 @@ function G(s) {
       return "string";
   }
 }
-function le(s) {
-  return s.kind === B.ONE_TO_MANY || s.kind === B.MANY_TO_MANY ? "mappedProperty" in s && s.mappedProperty ? [s.mappedProperty] : [] : [];
+function le(n) {
+  return n.kind === B.ONE_TO_MANY || n.kind === B.MANY_TO_MANY ? [n.mappedProperty] : [];
 }
-function ve(s, e, t = {}) {
-  return K(s, e, t, s, [], "", /* @__PURE__ */ new Set(), 0);
+function ve(n, e, t = {}) {
+  return K(n, e, t, n, [], "", /* @__PURE__ */ new Set(), 0);
 }
-function K(s, e, t, r, n, a, l, i) {
+function K(n, e, t, r, s, a, l, i) {
   const o = [], f = t.relationQueryDeep ?? oe, y = t.systemFields ?? L;
-  if (l.has(s.name))
+  if (l.has(n.name))
     return o;
   if (!a)
     for (const u of y) {
-      const c = s.properties.find((p) => p.name === u);
+      const c = n.properties.find((p) => p.name === u);
       c && o.push({
         name: u,
         displayName: c.displayName ?? u,
@@ -1106,7 +1106,7 @@ function K(s, e, t, r, n, a, l, i) {
         nullable: c.nullable ?? !1
       });
     }
-  for (const [u, c] of s.propertyMap) {
+  for (const [u, c] of n.propertyMap) {
     const p = a ? `${a}.${u}` : u;
     o.push({
       name: p,
@@ -1115,10 +1115,10 @@ function K(s, e, t, r, n, a, l, i) {
       nullable: c.nullable ?? !1
     });
   }
-  for (const u of s.foreignKeyNames) {
+  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 = s.foreignKeyRelationMap.get(p), b = 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: `${b}ID`,
@@ -1128,8 +1128,8 @@ function K(s, e, t, r, n, a, l, i) {
     }
   }
   if (i < f)
-    for (const [u, c] of s.relationMap) {
-      if (n.includes(u)) continue;
+    for (const [u, c] of n.relationMap) {
+      if (s.includes(u)) continue;
       const p = e.get(c.mappedEntity);
       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);
@@ -1142,7 +1142,7 @@ function K(s, e, t, r, n, a, l, i) {
         relationFields: d
       });
       const N = le(c), T = new Set(l);
-      T.add(s.name);
+      T.add(n.name);
       const R = K(
         p.metadata,
         e,
@@ -1166,29 +1166,29 @@ function K(s, e, t, r, n, a, l, i) {
     }
   return o;
 }
-function ue(s, e = {}) {
+function ue(n, e = {}) {
   const t = [], r = e.systemFields ?? L;
-  for (const n of r) {
-    const a = s.properties.find((l) => l.name === n);
+  for (const s of r) {
+    const a = n.properties.find((l) => l.name === s);
     a && t.push({
-      name: n,
-      displayName: a.displayName ?? n,
+      name: s,
+      displayName: a.displayName ?? s,
       type: G(a.type),
       nullable: a.nullable ?? !1
     });
   }
-  for (const [n, a] of s.propertyMap)
+  for (const [s, a] of n.propertyMap)
     t.push({
-      name: n,
-      displayName: a.displayName ?? n,
+      name: s,
+      displayName: a.displayName ?? s,
       type: G(a.type),
       nullable: a.nullable ?? !1
     });
-  for (const n of s.foreignKeyNames)
-    if (!t.some((a) => a.name === n)) {
-      const a = n.slice(0, -2), l = s.foreignKeyRelationMap.get(a), i = l?.displayName ?? a, o = l && "nullable" in l ? l.nullable ?? !1 : !1;
+  for (const s of n.foreignKeyNames)
+    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;
       t.push({
-        name: n,
+        name: s,
         displayName: `${i}ID`,
         type: "string",
         nullable: o
@@ -1196,17 +1196,17 @@ function ue(s, e = {}) {
     }
   return t;
 }
-function Te(s) {
-  return [...s].sort((e, t) => {
-    const r = (e.name.match(/\./g) || []).length, n = (t.name.match(/\./g) || []).length;
-    return r !== n ? r - n : e.name.localeCompare(t.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 Re(s, e) {
-  return _(e).parse(s);
+function Re(n, e) {
+  return _(e).parse(n);
 }
-function Ne(s, e) {
-  return _(e).parseMany(s);
+function Ne(n, e) {
+  return _(e).parseMany(n);
 }
 export {
   Y as BUILTIN_VALIDATION_RULES,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiao/rxdb-query-builder",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -30,6 +30,6 @@
   "dependencies": {
     "rxjs": "^7.8.2",
     "uuid": "^13.0.0",
-    "@aiao/rxdb": "0.0.11"
+    "@aiao/rxdb": "0.0.13"
   }
 }