@aiao/rxdb-client-generator 0.0.4 → 0.0.5

package/dist/{RxDBClientGenerator-HeMQrLeK.js → RxDBClientGenerator-B3NS1KdI.js}

@@ -1,20 +1,20 @@
-import { PropertyType as u, RelationKind as h, getEntityMetadata as A, getEntityMetadataOptions as k, transitionMetadata as b, ENTITY_METADATA_MAP as C } from "@aiao/rxdb";
-import { isNil as j, omit as v, isObject as F, isArray as B, capitalizeFirst as g, unionBy as K, isFunction as Y } from "@aiao/utils";
-const U = (n) => {
-  const e = N(n), t = !!n.nullable;
-  let r = !0;
-  !t && Object.hasOwn(n, "default") && (r = !1);
-  const s = {
+import { PropertyType as u, RelationKind as h, getEntityMetadata as k, getEntityMetadataOptions as C, transitionMetadata as b, ENTITY_METADATA_MAP as j } from "@aiao/rxdb";
+import { isNil as v, omit as F, isObject as B, isArray as K, capitalizeFirst as g, unionBy as Y, isFunction as U } from "@aiao/utils";
+const G = (s) => {
+  const e = N(s), t = !!s.nullable;
+  let n = !0;
+  !t && Object.hasOwn(s, "default") && (n = !1);
+  const r = {
     type: e,
-    name: n.name,
+    name: s.name,
     hasQuestionToken: t,
-    hasExclamationToken: r,
-    isReadonly: n.readonly
+    hasExclamationToken: n,
+    isReadonly: s.readonly
   };
-  return j(n.default) || (s.initializer = G(n)), s;
-}, N = (n) => {
+  return v(s.default) || (r.initializer = J(s)), r;
+}, N = (s) => {
   let e = "any";
-  switch (n.type) {
+  switch (s.type) {
     case u.uuid:
       e = "UUID";
       break;
@@ -31,64 +31,64 @@ const U = (n) => {
       e = "Date";
       break;
   }
-  return n.nullable && (e += " | null"), e;
-}, G = (n) => {
-  switch (n.type) {
+  return s.nullable && (e += " | null"), e;
+}, J = (s) => {
+  switch (s.type) {
     case u.string:
-      return `'${String(n.default)}'`;
+      return `'${String(s.default)}'`;
     case u.date:
-      if (n.default)
+      if (s.default)
         return "new Date()";
       break;
   }
   return "";
-}, D = (n, e = /* @__PURE__ */ new Set()) => {
-  if (F(n))
-    for (const t in n)
-      e.add(t), Object.prototype.hasOwnProperty.call(n, t) && D(Reflect.get(n, t), e);
-  else if (B(n))
-    for (const t of n)
-      D(t, e);
+}, _ = (s, e = /* @__PURE__ */ new Set()) => {
+  if (B(s))
+    for (const t in s)
+      e.add(t), Object.prototype.hasOwnProperty.call(s, t) && _(Reflect.get(s, t), e);
+  else if (K(s))
+    for (const t of s)
+      _(t, e);
   return e;
 }, x = /* @__PURE__ */ new Map();
-Object.keys(u).forEach((n) => {
-  const e = u[n];
-  x.set(e, n);
+Object.keys(u).forEach((s) => {
+  const e = u[s];
+  x.set(e, s);
 });
 const I = /* @__PURE__ */ new Map();
-Object.keys(h).forEach((n) => {
-  const e = h[n];
-  I.set(e, n);
+Object.keys(h).forEach((s) => {
+  const e = h[s];
+  I.set(e, s);
 });
-function J(n) {
-  const e = v(n, ["propertyMap", "relationMap", "indexMap"]), t = D(e);
-  let r = JSON.stringify(e, null, 2);
-  return new Set(n.properties.map((i) => i.type)).forEach((i) => {
+function Q(s) {
+  const e = F(s, ["propertyMap", "relationMap", "indexMap"]), t = _(e);
+  let n = JSON.stringify(e, null, 2);
+  return new Set(s.properties.map((i) => i.type)).forEach((i) => {
     const o = x.get(i);
-    r = r.replaceAll(`"type": "${i}"`, `"type": PropertyType.${o}`);
-  }), n.relations && new Set(n.relations.map((o) => o.kind)).forEach((o) => {
+    n = n.replaceAll(`"type": "${i}"`, `"type": PropertyType.${o}`);
+  }), s.relations && new Set(s.relations.map((o) => o.kind)).forEach((o) => {
     const a = I.get(o);
-    r = r.replaceAll(`"kind": "${o}"`, `"kind": RelationKind.${a}`);
+    n = n.replaceAll(`"kind": "${o}"`, `"kind": RelationKind.${a}`);
   }), t.forEach((i) => {
-    i.includes("-") || i.includes(" ") || (r = r.replaceAll(`"${i}":`, `${i}:`));
-  }), r;
+    i.includes("-") || i.includes(" ") || (n = n.replaceAll(`"${i}":`, `${i}:`));
+  }), n;
 }
-const Q = ({
-  classProperties: n,
+const L = ({
+  classProperties: s,
   metadata: e,
   file: t,
-  rxdbNamedImports: r
+  rxdbNamedImports: n
 }) => {
-  const { name: s } = e, i = t.addInterface({
-    name: `${s}InitData`,
+  const { name: r } = e, i = t.addInterface({
+    name: `${r}InitData`,
     isExported: !0,
     docs: ["初始化数据"]
   });
   Array.from(e.properties.values()).forEach((o) => {
-    const a = U(o), { initializer: c, ...l } = a, d = [];
+    const a = G(o), { initializer: c, ...l } = a, d = [];
     switch (d.push(o.displayName || o.name), c && d.push(`@default ${c}`), a.type) {
       case "UUID":
-        r.add("UUID");
+        n.add("UUID");
         break;
     }
     i.addProperty({
@@ -96,15 +96,15 @@ const Q = ({
       type: a.type,
       hasQuestionToken: !0,
       docs: d
-    }), n.push({
+    }), s.push({
       ...l,
       hasExclamationToken: !1,
       docs: d
     });
   });
-}, S = (n) => {
+}, S = (s) => {
   let e = "UUID";
-  switch (n.propertyMap.get("id").type) {
+  switch (s.propertyMap.get("id").type) {
     case u.uuid:
       e = "UUID";
       break;
@@ -116,14 +116,14 @@ const Q = ({
       break;
   }
   return e;
-}, L = ({
-  classProperties: n,
+}, H = ({
+  classProperties: s,
   metadata: e,
   rxdbNamedImports: t,
-  generator: r
+  generator: n
 }) => {
-  Array.from(e.relationMap.values()).forEach((s) => {
-    switch (s.kind) {
+  Array.from(e.relationMap.values()).forEach((r) => {
+    switch (r.kind) {
       // 处理一对一和多对一关系
       // 这两种关系需要生成：
       // 1. 关系可观察对象属性（name$）- 用于访问关联实体
@@ -131,22 +131,22 @@ const Q = ({
       case h.ONE_TO_ONE:
       case h.MANY_TO_ONE:
         {
-          const i = s.nullable ? `RelationEntityObservable<${s.mappedEntity} | null>` : `RelationEntityObservable<${s.mappedEntity}>`, o = s.displayName || s.name;
-          n.push({
-            name: s.name + "$",
+          const i = r.nullable ? `RelationEntityObservable<${r.mappedEntity} | null>` : `RelationEntityObservable<${r.mappedEntity}>`, o = r.displayName || r.name;
+          s.push({
+            name: r.name + "$",
             // 关系属性名使用$后缀，表示可观察对象
             type: i,
             isReadonly: !0,
             // 关系属性是只读的，通过set/remove方法修改
             docs: [o]
           });
-          const a = r.getMetadata(s.mappedEntity, s.mappedNamespace), c = S(a);
-          n.push({
-            name: s.name + "Id",
+          const a = n.getMetadata(r.mappedEntity, r.mappedNamespace), c = S(a);
+          s.push({
+            name: r.name + "Id",
             // 外键ID属性
             type: c,
             isReadonly: !0,
-            hasQuestionToken: s.nullable,
+            hasQuestionToken: r.nullable,
             docs: [o + " id"]
           }), t.add("RelationEntityObservable");
         }
@@ -157,9 +157,9 @@ const Q = ({
       case h.ONE_TO_MANY:
       case h.MANY_TO_MANY:
         {
-          const i = s.displayName || s.name, o = `RelationEntitiesObservable<${s.mappedEntity}>`;
-          n.push({
-            name: s.name + "$",
+          const i = r.displayName || r.name, o = `RelationEntitiesObservable<${r.mappedEntity}>`;
+          s.push({
+            name: r.name + "$",
             // 关系集合属性名使用$后缀
             isReadonly: !0,
             // 关系属性是只读的，通过add/remove方法修改
@@ -170,54 +170,54 @@ const Q = ({
         break;
     }
   });
-}, H = (n) => {
+}, V = (s) => {
   const e = [];
-  return Array.from(n.propertyMap.keys()).forEach((t) => {
-    const r = n.propertyMap.get(t);
-    let s = "";
-    switch (r.type) {
+  return Array.from(s.propertyMap.keys()).forEach((t) => {
+    const n = s.propertyMap.get(t);
+    let r = "";
+    switch (n.type) {
       case u.uuid:
-        s = "UUID";
+        r = "UUID";
         break;
       case u.string:
-        s = "String";
+        r = "String";
         break;
       case u.number:
       case u.integer:
-        s = "Number";
+        r = "Number";
         break;
       case u.boolean:
-        s = "Boolean";
+        r = "Boolean";
         break;
       case u.date:
-        s = "Date";
+        r = "Date";
         break;
     }
-    if (s) {
-      s += "Rules";
-      const i = N(r);
+    if (r) {
+      r += "Rules";
+      const i = N(n);
       e.push({
-        rule: s,
-        entity: n.name,
+        rule: r,
+        entity: s.name,
         key: t,
         valueType: i
       });
     }
   }), e;
-}, _ = (n, e, t, r = [], s = [], i = []) => (t = t ?? e, H(e).forEach(({ rule: o, entity: a, key: c, valueType: l }) => {
-  i.length > 0 ? c = i.map((d) => d.key).join(".") + "." + c : l = void 0, s.push({
+}, D = (s, e, t, n = [], r = [], i = []) => (t = t ?? e, V(e).forEach(({ rule: o, entity: a, key: c, valueType: l }) => {
+  i.length > 0 ? c = i.map((d) => d.key).join(".") + "." + c : l = void 0, r.push({
     rule: o,
     entity: a,
     key: c,
     valueType: l
   });
 }), e.foreignKeyNames.forEach((o) => {
-  s.push({
+  r.push({
     rule: "UUIDRules",
     entity: e.name,
     key: o
   });
-}), Array.from(e.relationMap.keys()).filter((o) => !r.includes(o)).forEach((o) => {
+}), Array.from(e.relationMap.keys()).filter((o) => !n.includes(o)).forEach((o) => {
   const a = e.relationMap.get(o);
   if (!a)
     throw new Error("relation is empty");
@@ -234,31 +234,31 @@ const Q = ({
       c.push(a.mappedProperty);
       break;
   }
-  const l = n.getMetadata(a.mappedEntity, a.mappedNamespace);
+  const l = s.getMetadata(a.mappedEntity, a.mappedNamespace);
   if (!l)
     throw new Error(`generator_entity_rules: metadata "${a.mappedEntity}" not found`);
   if (i.find(($) => $.entity === e.name) || i.length && l === t) return;
   const y = [...i, { key: o, entity: e.name }];
-  i.length < n.config.relationQueryDeep && _(n, l, t, c, s, y);
-}), s), M = (n, e) => n.map(({ rule: t, entity: r, key: s, valueType: i }) => (e.add(t), i ? s.includes(".") ? (e.add(`Relation${t}`), `Relation${t}<'${s}', ${i}>`) : `${t}<${r}, '${s}', ${i}>` : s.includes(".") ? (e.add(`Relation${t}`), `Relation${t}<'${s}'>`) : `${t}<${r}, '${s}'>`)), V = ({
-  classMethods: n,
+  i.length < s.config.relationQueryDeep && D(s, l, t, c, r, y);
+}), r), M = (s, e) => s.map(({ rule: t, entity: n, key: r, valueType: i }) => (e.add(t), i ? r.includes(".") ? (e.add(`Relation${t}`), `Relation${t}<'${r}', ${i}>`) : `${t}<${n}, '${r}', ${i}>` : r.includes(".") ? (e.add(`Relation${t}`), `Relation${t}<'${r}'>`) : `${t}<${n}, '${r}'>`)), z = ({
+  classMethods: s,
   rxdbNamedImports: e,
   generator: t,
-  metadata: r,
-  file: s,
+  metadata: n,
+  file: r,
   staticTypesInterface: i,
   idType: o
 }) => {
-  const { name: a } = r, c = _(t, r), l = M(c, e), d = `
+  const { name: a } = n, c = D(t, n), l = M(c, e), d = `
   |` + c.map((f) => `'${f.key}'`).join(`
   |`);
-  s.addTypeAlias({
+  r.addTypeAlias({
     name: `${a}Rule`,
     type: Array.from(new Set(l)).join(`
 | `),
     hasDeclareKeyword: !0,
     docs: ["rule"]
-  }), s.addTypeAlias({
+  }), r.addTypeAlias({
     name: `${a}RuleGroup`,
     type: `RuleGroupCustom<typeof ${a}, ${d},
 ${a}Rule>`,
@@ -266,8 +266,8 @@ ${a}Rule>`,
     docs: ["RuleGroupCustom"],
     isExported: !0
   });
-  const y = `${a}OrderByField`, $ = Array.from(r.propertyMap.keys());
-  s.addTypeAlias({
+  const y = `${a}OrderByField`, $ = Array.from(n.propertyMap.keys());
+  r.addTypeAlias({
     name: y,
     type: $.map((f) => `"${f}"`).join(" | "),
     hasDeclareKeyword: !0,
@@ -279,7 +279,7 @@ ${a}Rule>`,
     returnType: E,
     metHodDoc: P
   }) => {
-    n.push({
+    s.push({
       name: f,
       returnType: `Observable<${E}>`,
       docs: [P || `${f} 查询`, "@param options 查询选项"],
@@ -294,7 +294,9 @@ ${a}Rule>`,
       name: `${f}Options`,
       type: T,
       docs: ["查询选项"]
-    }), e.add(g(`${f}Options`));
+    });
+    const A = g(`${f}Options`);
+    T.includes(A) && e.add(g(`${f}Options`));
   };
   p({
     method: "get",
@@ -321,37 +323,37 @@ ${a}Rule>`,
     method: "count",
     options: `${g("count")}Options<typeof ${a},${a}RuleGroup>`,
     returnType: "number"
-  }), n.push({
+  }), s.push({
     name: "save",
     returnType: `Promise<${a}>`,
     docs: ["保存"]
-  }), n.push({
+  }), s.push({
     name: "remove",
     returnType: `Promise<${a}>`,
     docs: ["删除"]
-  }), n.push({
+  }), s.push({
     name: "reset",
     returnType: "void",
     docs: ["重置数据"]
   });
-}, z = ({
-  metadata: n,
+}, q = ({
+  metadata: s,
   classMethods: e,
   rxdbNamedImports: t,
-  generator: r,
-  file: s,
+  generator: n,
+  file: r,
   staticTypesInterface: i
 }) => {
-  const { name: o } = n, a = _(r, n).filter(
+  const { name: o } = s, a = D(n, s).filter(
     (p) => p.key.startsWith("children.") && p.key !== "children.id"
   ), c = M(a, t), l = a.map((p) => `'${p.key}'`).join(" | ");
-  s.addTypeAlias({
+  r.addTypeAlias({
     name: `${o}TreeRule`,
     type: Array.from(new Set(c)).join(`
 | `),
     hasDeclareKeyword: !0,
     docs: ["TreeRule"]
-  }), s.addTypeAlias({
+  }), r.addTypeAlias({
     name: `${o}TreeRuleGroup`,
     type: `RuleGroupCustom<typeof ${o}, ${l}, ${o}TreeRule>`,
     hasDeclareKeyword: !0,
@@ -423,11 +425,11 @@ ${a}Rule>`,
     returnType: "number",
     metHodDoc: "查询祖先实体数量"
   });
-}, q = (n, e, t) => {
-  const r = /* @__PURE__ */ new Set(), { name: s } = e, i = e.extends[0] || "", o = ["IEntityStaticType"];
-  i.includes("TreeAdjacencyListEntityBase") ? o.push("ITreeEntity") : i.includes("EntityBase") && o.push("IEntity"), r.add(i);
+}, W = (s, e, t) => {
+  const n = /* @__PURE__ */ new Set(), { name: r } = e, i = e.extends[0] || "", o = ["IEntityStaticType"];
+  i.includes("TreeAdjacencyListEntityBase") ? o.push("ITreeEntity") : i.includes("EntityBase") && o.push("IEntity"), n.add(i);
   const a = t.addClass({
-    name: s,
+    name: r,
     isExported: !0,
     extends: i,
     implements: o.sort(),
@@ -437,12 +439,12 @@ ${a}Rule>`,
   a.addJsDoc(`${e.displayName}`);
   const c = [];
   c.push({
-    type: `${s}StaticTypes`,
+    type: `${r}StaticTypes`,
     name: "[ENTITY_STATIC_TYPES]",
     isStatic: !1
-  }), r.add("ENTITY_STATIC_TYPES");
+  }), n.add("ENTITY_STATIC_TYPES");
   const l = t.addInterface({
-    name: `${s}StaticTypes`,
+    name: `${r}StaticTypes`,
     docs: ["静态类型"],
     isExported: !0
   }), d = S(e);
@@ -452,30 +454,30 @@ ${a}Rule>`,
     docs: ["id 类型"]
   });
   const y = [];
-  Q({
+  L({
     classProperties: c,
     file: t,
     metadata: e,
-    rxdbNamedImports: r
-  }), L({
+    rxdbNamedImports: n
+  }), H({
     classProperties: c,
     metadata: e,
-    rxdbNamedImports: r,
-    generator: n
-  }), V({
+    rxdbNamedImports: n,
+    generator: s
+  }), z({
     classMethods: y,
     file: t,
-    generator: n,
+    generator: s,
     metadata: e,
-    rxdbNamedImports: r,
+    rxdbNamedImports: n,
     staticTypesInterface: l,
     idType: d
-  }), e.repository === "TreeRepository" && z({
+  }), e.repository === "TreeRepository" && q({
     classMethods: y,
     metadata: e,
     file: t,
-    generator: n,
-    rxdbNamedImports: r,
+    generator: s,
+    rxdbNamedImports: n,
     staticTypesInterface: l
   }), a.addProperties(
     c.sort((p, m) => p.isReadonly && !m.isReadonly ? -1 : !p.isReadonly && m.isReadonly ? 1 : p.name.localeCompare(m.name))
@@ -483,25 +485,25 @@ ${a}Rule>`,
     parameters: [
       {
         name: "initData",
-        type: `${s}InitData`,
+        type: `${r}InitData`,
         hasQuestionToken: !0
       }
     ],
     docs: ["初始化数据", "@param initData 初始化数据"]
   });
-  const $ = K(y, (p) => p.name).sort(
+  const $ = Y(y, (p) => p.name).sort(
     (p, m) => p.isStatic && !m.isStatic ? -1 : !p.isStatic && m.isStatic ? 1 : p.name.localeCompare(m.name)
   );
   return a.addMethods($), {
-    rxdbNamedImports: r
+    rxdbNamedImports: n
   };
 };
-var w = /* @__PURE__ */ ((n) => (n.Var = "var", n.Let = "let", n.Const = "const", n))(w || {});
-class W {
+var w = /* @__PURE__ */ ((s) => (s.Var = "var", s.Let = "let", s.Const = "const", s))(w || {});
+class X {
   files = /* @__PURE__ */ new Map();
   createSourceFile(e, t) {
-    const r = new O(e);
-    return t && r.setContent(t), this.files.set(e, r), r;
+    const n = new O(e);
+    return t && n.setContent(t), this.files.set(e, n), n;
   }
   addSourceFileAtPath(e) {
     const t = new O(e);
@@ -524,21 +526,21 @@ class O {
     this.filePath = e;
   }
   addClass(e) {
-    const t = new Z(e);
+    const t = new ee(e);
     return this.classes.push(t), t;
   }
   addInterface(e) {
-    let t = this.interfaces.find((r) => r.name === e.name);
-    return t || (t = new X(e), this.interfaces.push(t)), t;
+    let t = this.interfaces.find((n) => n.name === e.name);
+    return t || (t = new Z(e), this.interfaces.push(t)), t;
   }
   addModule(e) {
     return this.modules.push(e), {
       addInterface: (t) => {
-        const r = this.modules[this.modules.length - 1];
-        return r.interfaces || (r.interfaces = []), r.interfaces.push(t), {
-          addProperty: (s) => {
+        const n = this.modules[this.modules.length - 1];
+        return n.interfaces || (n.interfaces = []), n.interfaces.push(t), {
+          addProperty: (r) => {
             const i = this.modules[this.modules.length - 1], o = i.interfaces[i.interfaces.length - 1];
-            o.properties || (o.properties = []), o.properties.push(s);
+            o.properties || (o.properties = []), o.properties.push(r);
           }
         };
       }
@@ -573,8 +575,8 @@ class O {
 `;
     }), this.modules.forEach((t) => {
       t.docs && t.docs.length > 0 && (e += this.renderJsDoc(t.docs, 0)), t.hasDeclareKeyword && (e += "declare "), e += `module ${t.name} {
-`, t.interfaces && t.interfaces.length > 0 && t.interfaces.forEach((r) => {
-        e += this.renderInterfaceBlock(r, 2, !1);
+`, t.interfaces && t.interfaces.length > 0 && t.interfaces.forEach((n) => {
+        e += this.renderInterfaceBlock(n, 2, !1);
       }), e += `}
 
 `;
@@ -582,12 +584,12 @@ class O {
       e += this.renderInterfaceBlock(t, 0, !0) + `
 `;
     }), this.classes.forEach((t) => {
-      const r = t.getName();
-      if (r) {
-        t.jsDoc && t.jsDoc.length > 0 ? e += this.renderJsDoc(t.jsDoc) : e += this.renderJsDoc([r]), e += `export declare class ${r}`;
-        const s = t.getBaseClass();
-        if (s) {
-          const o = s.getName();
+      const n = t.getName();
+      if (n) {
+        t.jsDoc && t.jsDoc.length > 0 ? e += this.renderJsDoc(t.jsDoc) : e += this.renderJsDoc([n]), e += `export declare class ${n}`;
+        const r = t.getBaseClass();
+        if (r) {
+          const o = r.getName();
           o && (e += ` extends ${o}`);
         }
         const i = t.getImplements();
@@ -624,53 +626,53 @@ class O {
   // Helpers: rendering
   // 通用参数渲染函数
   renderParameter(e, t) {
-    let r = "";
-    return t > 0 && (r += ", "), r += e.name, e.hasQuestionToken && (r += "?"), e.type && (r += `: ${e.type}`), r;
+    let n = "";
+    return t > 0 && (n += ", "), n += e.name, e.hasQuestionToken && (n += "?"), e.type && (n += `: ${e.type}`), n;
   }
   // 通用参数列表渲染函数
   renderParameterList(e) {
-    return !e || e.length === 0 ? "" : e.map((t, r) => this.renderParameter(t, r)).join("");
+    return !e || e.length === 0 ? "" : e.map((t, n) => this.renderParameter(t, n)).join("");
   }
   // 通用变量声明渲染函数
   renderVariableDeclaration(e, t) {
-    let r = "";
-    return t > 0 && (r += ", "), r += e.name, e.type && (r += `: ${e.type}`), e.initializer && (r += ` = ${e.initializer}`), r;
+    let n = "";
+    return t > 0 && (n += ", "), n += e.name, e.type && (n += `: ${e.type}`), e.initializer && (n += ` = ${e.initializer}`), n;
   }
   // 通用变量声明列表渲染函数
   renderVariableDeclarationList(e) {
-    return !e || e.length === 0 ? "" : e.map((t, r) => this.renderVariableDeclaration(t, r)).join("");
+    return !e || e.length === 0 ? "" : e.map((t, n) => this.renderVariableDeclaration(t, n)).join("");
   }
   // 通用JSDoc渲染函数
   renderJsDoc(e, t = 0) {
     if (!e || e.length === 0) return "";
-    const r = " ".repeat(t);
-    return `${r}/**
-${r} * ${e.join(`
-${r} * `)}
-${r} */
+    const n = " ".repeat(t);
+    return `${n}/**
+${n} * ${e.join(`
+${n} * `)}
+${n} */
 `;
   }
   // 通用属性渲染函数
-  renderProperty(e, t, r = !0) {
-    let s = "";
-    return e.docs && e.docs.length > 0 && (s += this.renderJsDoc(e.docs, t)), s += " ".repeat(t), e.isStatic && (s += "static "), s += e.name, e.hasQuestionToken && (s += "?"), e.type && (s += `: ${e.type}`), !r && e.initializer && (s += ` = ${e.initializer}`), s += `;
-`, s;
+  renderProperty(e, t, n = !0) {
+    let r = "";
+    return e.docs && e.docs.length > 0 && (r += this.renderJsDoc(e.docs, t)), r += " ".repeat(t), e.isStatic && (r += "static "), r += e.name, e.hasQuestionToken && (r += "?"), e.type && (r += `: ${e.type}`), !n && e.initializer && (r += ` = ${e.initializer}`), r += `;
+`, r;
   }
   // 接口属性渲染（调用通用函数）
   renderInterfaceProperty(e, t) {
     return this.renderProperty(e, t);
   }
-  renderInterfaceBlock(e, t, r) {
-    const s = " ".repeat(t);
+  renderInterfaceBlock(e, t, n) {
+    const r = " ".repeat(t);
     let i = "";
-    return e.docs && e.docs.length > 0 && (i += this.renderJsDoc(e.docs, t)), r && e.isExported ? i += `${s}export ` : i += s, i += `interface ${e.name}`, e.extends && e.extends.length > 0 && (i += ` extends ${e.extends.join(", ")}`), i += ` {
+    return e.docs && e.docs.length > 0 && (i += this.renderJsDoc(e.docs, t)), n && e.isExported ? i += `${r}export ` : i += r, i += `interface ${e.name}`, e.extends && e.extends.length > 0 && (i += ` extends ${e.extends.join(", ")}`), i += ` {
 `, e.properties && e.properties.length > 0 && e.properties.forEach((o) => {
       i += this.renderInterfaceProperty(o, t + 2);
-    }), i += `${s}}
+    }), i += `${r}}
 `, i;
   }
 }
-class X {
+class Z {
   name;
   extends;
   docs;
@@ -683,7 +685,7 @@ class X {
     this.properties.some((t) => t.name === e.name) || this.properties.push(e);
   }
 }
-class Z {
+class ee {
   structure;
   decorators = [];
   properties = [];
@@ -735,8 +737,8 @@ class Z {
     return this.structure.name || "";
   }
 }
-const ee = (n) => {
-  const { project: e, metadataSet: t } = n, r = e.createSourceFile("index.d.ts"), i = r.addModule({
+const te = (s) => {
+  const { project: e, metadataSet: t } = s, n = e.createSourceFile("index.d.ts"), i = n.addModule({
     name: '"@aiao/rxdb"',
     hasDeclareKeyword: !0,
     docs: ["rxdb"]
@@ -744,14 +746,15 @@ const ee = (n) => {
     name: "RxDB",
     docs: ["RxDB"]
   }), o = /* @__PURE__ */ new Set([
-    "UUID",
     "EntityType",
-    "RuleGroupCustom",
+    "IEntity",
     "IEntityStaticType",
-    "ITreeEntity"
+    "ITreeEntity",
+    "RuleGroupCustom",
+    "UUID"
   ]);
   t.forEach((a) => {
-    const { rxdbNamedImports: c } = q(n, a, r);
+    const { rxdbNamedImports: c } = W(s, a, n);
     c.forEach((y) => o.add(y));
     const { name: l } = a, d = l;
     a.namespace && a.namespace !== "public" ? i.addProperty({
@@ -765,15 +768,15 @@ ${d}: typeof ${d};
       type: `typeof ${d}`,
       docs: [a.displayName]
     });
-  }), r.addImportDeclaration({
+  }), n.addImportDeclaration({
     namedImports: Array.from(o).filter(Boolean).sort(),
     isTypeOnly: !0,
     moduleSpecifier: "@aiao/rxdb"
-  }), r.addImportDeclaration({
+  }), n.addImportDeclaration({
     namedImports: ["Observable"],
     isTypeOnly: !0,
     moduleSpecifier: "rxjs"
-  }), r.addVariableStatement({
+  }), n.addVariableStatement({
     declarationKind: w.Const,
     hasDeclareKeyword: !0,
     isExported: !0,
@@ -784,10 +787,10 @@ ${d}: typeof ${d};
       }
     ]
   });
-}, te = (n) => {
-  const { project: e, metadataSet: t } = n;
-  let r = "";
-  const s = /* @__PURE__ */ new Set(["Entity", "__decorateClass"]), i = (a) => {
+}, ne = (s) => {
+  const { project: e, metadataSet: t } = s;
+  let n = "";
+  const r = /* @__PURE__ */ new Set(["Entity", "__decorateClass"]), i = (a) => {
     for (const c of t.values())
       if (c.relations && c.namespace === a.mappedNamespace && c.name === a.mappedEntity)
         return c.relations.find((l) => l.kind === h.MANY_TO_MANY && l.mappedProperty === a.name);
@@ -798,22 +801,22 @@ ${d}: typeof ${d};
         throw new Error("mapped relation not found");
     });
   }), t.forEach((a) => {
-    const c = a.extends[0], { name: l } = a, d = l, y = J(a);
-    c && s.add(c), a.properties.length && s.add("PropertyType"), a.relations.length && s.add("RelationKind"), r += `
-let ${d} = class ${c ? "extends " + c : ""} {};`, r += `
+    const c = a.extends[0], { name: l } = a, d = l, y = Q(a);
+    c && r.add(c), a.properties.length && r.add("PropertyType"), a.relations.length && r.add("RelationKind"), n += `
+let ${d} = class ${c ? "extends " + c : ""} {};`, n += `
 ${d} = __decorateClass(
 [
   Entity(${y})
 ],
 ${d}
 );`;
-  }), r = `import { ${Array.from(s).sort().join(", ")} } from '@aiao/rxdb';` + r;
+  }), n = `import { ${Array.from(r).sort().join(", ")} } from '@aiao/rxdb';` + n;
   const o = Array.from(t.values()).map((a) => a.name).sort().join(", ");
-  r += `
-const ENTITIES = [ ${o} ];`, r += `
-export { ENTITIES, ${o} };`, e.createSourceFile("index.js", r);
-}, R = (n, e = "public") => `${e}_${n}`;
-class ne {
+  n += `
+const ENTITIES = [ ${o} ];`, n += `
+export { ENTITIES, ${o} };`, e.createSourceFile("index.js", n);
+}, R = (s, e = "public") => `${e}_${s}`;
+class oe {
   metadataMap = /* @__PURE__ */ new Map();
   project;
   metadataSet = /* @__PURE__ */ new Set();
@@ -828,14 +831,14 @@ class ne {
    * @param value 实体
    */
   addEntity(e, t) {
-    let r;
-    if (Y(e))
-      r = A(e);
+    let n;
+    if (U(e))
+      n = k(e);
     else {
-      const s = e;
-      t = t || s.extends?.length && k(s.extends[0]) || [], r = b(e, t);
+      const r = e;
+      t = t || r.extends?.length && C(r.extends[0]) || [], n = b(e, t);
     }
-    this.metadataSet.add(r), this.metadataMap.set(`${r.namespace}_${r.name}`, r);
+    this.metadataSet.add(n), this.metadataMap.set(`${n.namespace}_${n.name}`, n);
   }
   getMetadata(e, t) {
     return this.metadataMap.get(R(e, t));
@@ -844,17 +847,17 @@ class ne {
    * 执行生成器
    */
   exec() {
-    this.project = new W(), Object.values(C).forEach(
+    this.project = new X(), Object.values(j).forEach(
       (e) => e.forEach((t) => {
-        const r = b(t);
-        this.metadataMap.set(R(t.name, t.namespace), r);
+        const n = b(t);
+        this.metadataMap.set(R(t.name, t.namespace), n);
       })
-    ), ee(this), te(this);
+    ), te(this), ne(this);
   }
   getSourceFiles() {
     return this.project.getSourceFiles();
   }
 }
 export {
-  ne as R
+  oe as R
 };

package/dist/{build_rxdb_client_lib-ClVnYEnB.js → build_rxdb_client_lib-D1VubBOB.js}

@@ -3,7 +3,7 @@ import { resolve as b, join as E, dirname as _ } from "node:path";
 import { Project as g, Node as u } from "ts-morph";
 import { getEntityMetadataOptions as w, PropertyType as N, RelationKind as C } from "@aiao/rxdb";
 import { glob as O } from "glob";
-import { R as F } from "./RxDBClientGenerator-HeMQrLeK.js";
+import { R as F } from "./RxDBClientGenerator-B3NS1KdI.js";
 const P = (r, s = new g()) => {
   const n = s.addSourceFileAtPath(r).getClasses(), c = /* @__PURE__ */ new Map();
   n.forEach((t) => {

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { existsSync as f } from "node:fs";
 import { resolve as c, dirname as a } from "node:path";
-import { b as g } from "./build_rxdb_client_lib-ClVnYEnB.js";
+import { b as g } from "./build_rxdb_client_lib-D1VubBOB.js";
 async function u(s) {
   try {
     if (!f(s))

package/dist/generator_all_entity_definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator_all_entity_definition.d.ts","sourceRoot":"","sources":["../src/generator_all_entity_definition.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAGpE;;GAEG;yBACa,WAAW,mBAAmB;AAA9C,wBAyEE"}
+{"version":3,"file":"generator_all_entity_definition.d.ts","sourceRoot":"","sources":["../src/generator_all_entity_definition.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAGpE;;GAEG;yBACa,WAAW,mBAAmB;AAA9C,wBA0EE"}

package/dist/generator_repository_methods.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator_repository_methods.d.ts","sourceRoot":"","sources":["../src/generator_repository_methods.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElD,OAA+B,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,0BAA0B,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAElH,eAAO,MAAM,WAAW,GAAI,aAAa,YAAY,EAAE,EAAE,kBAAkB,GAAG,CAAC,MAAM,CAAC,aAmBrF,CAAC;AAEF;;GAEG;yBACa,6FAQb;IACD,YAAY,EAAE,YAAY,CAAC,0BAA0B,CAAC,EAAE,CAAC;IACzD,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,SAAS,EAAE,mBAAmB,CAAC;IAC/B,QAAQ,EAAE,cAAc,CAAC;IACzB,IAAI,EAAE,UAAU,CAAC;IACjB,oBAAoB,EAAE,cAAc,CAAC;IACrC,MAAM,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;CAChC;AAhBD,wBAsIE"}
+{"version":3,"file":"generator_repository_methods.d.ts","sourceRoot":"","sources":["../src/generator_repository_methods.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElD,OAA+B,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,0BAA0B,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAElH,eAAO,MAAM,WAAW,GAAI,aAAa,YAAY,EAAE,EAAE,kBAAkB,GAAG,CAAC,MAAM,CAAC,aAmBrF,CAAC;AAEF;;GAEG;yBACa,6FAQb;IACD,YAAY,EAAE,YAAY,CAAC,0BAA0B,CAAC,EAAE,CAAC;IACzD,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,SAAS,EAAE,mBAAmB,CAAC;IAC/B,QAAQ,EAAE,cAAc,CAAC;IACzB,IAAI,EAAE,UAAU,CAAC;IACjB,oBAAoB,EAAE,cAAc,CAAC;IACrC,MAAM,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;CAChC;AAhBD,wBA2IE"}

package/dist/index.js

@@ -1,4 +1,4 @@
-import { R as o } from "./RxDBClientGenerator-HeMQrLeK.js";
+import { R as o } from "./RxDBClientGenerator-B3NS1KdI.js";
 export {
   o as RxDBClientGenerator
 };

package/dist/vite.js

@@ -1,4 +1,4 @@
-import { b as r } from "./build_rxdb_client_lib-ClVnYEnB.js";
+import { b as r } from "./build_rxdb_client_lib-D1VubBOB.js";
 function l(t) {
   return {
     name: "rxdb-client-generator-vite-plugin",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiao/rxdb-client-generator",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -37,7 +37,7 @@
   "dependencies": {
     "ts-morph": "^27.0.0",
     "glob": "^10.4.5",
-    "@aiao/rxdb": "0.0.4",
-    "@aiao/utils": "0.0.4"
+    "@aiao/rxdb": "0.0.5",
+    "@aiao/utils": "0.0.5"
   }
 }