@aiao/rxdb-client-generator 0.0.7 → 0.0.8

package/dist/{RxDBClientGenerator-DmFzgpuy.js → RxDBClientGenerator-6qmS8Mrd.js}

@@ -1,5 +1,5 @@
-import { PropertyType as d, RelationKind as f, ENTITY_BASE_METADATA_OPTIONS as S, TREE_ADJACENCY_LIST_ENTITY_BASE_OPTIONS as C, getEntityMetadata as B, transitionMetadata as N } from "@aiao/rxdb";
-import { omit as K, isObject as G, isArray as F, isNil as V, unionBy as v, capitalizeFirst as E, isFunction as U } from "@aiao/utils";
+import { PropertyType as d, RelationKind as f, ENTITY_BASE_METADATA_OPTIONS as E, TREE_ADJACENCY_LIST_ENTITY_BASE_OPTIONS as N, getEntityMetadata as B, transitionMetadata as A } from "@aiao/rxdb";
+import { omit as K, isObject as G, isArray as F, isNil as V, unionBy as v, capitalizeFirst as D, isFunction as U } from "@aiao/utils";
 const Y = (r, e) => {
   const t = T(r, e), s = !!r.nullable;
   let a = !0;
@@ -11,8 +11,8 @@ const Y = (r, e) => {
     hasExclamationToken: a,
     isReadonly: r.readonly
   };
-  return V(r.default) || (o.initializer = L(r)), o;
-}, I = (r, e) => `${e.name}${r.name.charAt(0).toUpperCase() + r.name.slice(1)}KeyValue`, J = (r, e) => r.type !== d.keyValue || !("properties" in r) || !r.properties || r.properties.length === 0 ? "KeyValue" : I(r, e), H = (r, e) => r.type !== d.keyValue || !("properties" in r) || !r.properties || r.properties.length === 0 ? [] : r.properties.map((t) => ({
+  return V(r.default) || (o.initializer = H(r)), o;
+}, R = (r, e) => `${e.name}${r.name.charAt(0).toUpperCase() + r.name.slice(1)}KeyValue`, J = (r, e) => r.type !== d.keyValue || !("properties" in r) || !r.properties || r.properties.length === 0 ? "KeyValue" : R(r, e), L = (r, e) => r.type !== d.keyValue || !("properties" in r) || !r.properties || r.properties.length === 0 ? [] : r.properties.map((t) => ({
   name: t.name,
   type: T(t, e),
   hasQuestionToken: t.nullable || !1,
@@ -52,7 +52,7 @@ const Y = (r, e) => {
       break;
   }
   return r.nullable && (t += " | null"), t;
-}, L = (r) => {
+}, H = (r) => {
   switch (r.type) {
     case d.string:
       return `'${String(r.default)}'`;
@@ -62,32 +62,32 @@ const Y = (r, e) => {
       break;
   }
   return "";
-}, D = (r, e = /* @__PURE__ */ new Set()) => {
+}, I = (r, e = /* @__PURE__ */ new Set()) => {
   if (G(r))
     for (const t in r)
-      e.add(t), Object.prototype.hasOwnProperty.call(r, t) && D(Reflect.get(r, t), e);
+      e.add(t), Object.prototype.hasOwnProperty.call(r, t) && I(Reflect.get(r, t), e);
   else if (F(r))
     for (const t of r)
-      D(t, e);
+      I(t, e);
   return e;
-}, x = /* @__PURE__ */ new Map();
+}, w = /* @__PURE__ */ new Map();
 Object.keys(d).forEach((r) => {
   const e = d[r];
-  x.set(e, r);
+  w.set(e, r);
 });
-const w = /* @__PURE__ */ new Map();
+const O = /* @__PURE__ */ new Map();
 Object.keys(f).forEach((r) => {
   const e = f[r];
-  w.set(e, r);
+  O.set(e, r);
 });
 function Q(r) {
-  const e = K(r, ["propertyMap", "relationMap", "indexMap"]), t = D(e);
+  const e = K(r, ["propertyMap", "relationMap", "indexMap"]), t = I(e);
   let s = JSON.stringify(e, null, 2);
   return new Set(r.properties.map((o) => o.type).filter(Boolean)).forEach((o) => {
-    const n = x.get(o);
+    const n = w.get(o);
     s = s.replaceAll(`"type": "${o}"`, `"type": PropertyType.${n}`);
   }), r.relations && new Set(r.relations.map((n) => n.kind)).forEach((n) => {
-    const i = w.get(n);
+    const i = O.get(n);
     s = s.replaceAll(`"kind": "${n}"`, `"kind": RelationKind.${i}`);
   }), t.forEach((o) => {
     o.includes("-") || o.includes(" ") || (s = s.replaceAll(`"${o}":`, `${o}:`));
@@ -105,22 +105,17 @@ const q = ({
     docs: ["初始化数据"]
   }), o = (n, i = !1) => {
     if (n.type === d.keyValue && "properties" in n && n.properties && n.properties.length > 0) {
-      const y = I(n, e), g = t.addInterface({
+      const y = R(n, e), g = t.addInterface({
         name: y,
         isExported: !0,
         docs: [n.displayName || `${n.name} keyValue 类型`]
       });
-      H(n, e).forEach((m) => {
+      L(n, e).forEach((m) => {
         g.addProperty(m);
       });
     }
     const c = Y(n, e), { initializer: u, ...h } = c, l = [];
-    switch (l.push(n.displayName || n.name), u && l.push(`@default ${u}`), c.type) {
-      case "UUID":
-        s.add("UUID");
-        break;
-    }
-    i || a.addProperty({
+    l.push(n.displayName || n.name), u && l.push(`@default ${u}`), c.type === "UUID" && s.add("UUID"), i || a.addProperty({
       name: c.name,
       type: c.type,
       hasQuestionToken: !0,
@@ -295,7 +290,7 @@ const q = ({
   [d.stringArray]: "StringArray",
   [d.numberArray]: "NumberArray",
   [d.keyValue]: "KeyValue"
-}, R = (r) => X[r] ?? null, O = (r, e, t) => {
+}, M = (r) => X[r] ?? null, j = (r, e, t) => {
   const s = r.length > 0 ? r.map((a) => a.key).join(".") + "." : "";
   return t ? `${s}${e}.${t}` : `${s}${e}`;
 }, ee = (r, e, t) => {
@@ -308,7 +303,7 @@ const q = ({
       s = "number";
       break;
     case d.keyValue:
-      s = `Partial<${I(r, e)}>`;
+      s = `Partial<${R(r, e)}>`;
       break;
     default:
       t.length > 0 && (s = T(r, e));
@@ -322,17 +317,17 @@ const q = ({
   subRuleGroup: a
 }), te = (r, e, t, s, a) => {
   r.type !== d.keyValue || !("properties" in r) || !r.properties || r.properties.forEach((o) => {
-    const n = R(o.type);
+    const n = M(o.type);
     if (!n) return;
-    const i = O(t, s, o.name), c = T(o, e);
+    const i = j(t, s, o.name), c = T(o, e);
     a.push(b(n, e.name, i, c));
   });
 }, se = (r, e = []) => {
   const t = [];
   return Array.from(r.propertyMap.keys()).forEach((s) => {
-    const a = r.propertyMap.get(s), o = R(a.type);
+    const a = r.propertyMap.get(s), o = M(a.type);
     if (o) {
-      const n = ee(a, r, e), i = O(e, s);
+      const n = ee(a, r, e), i = j(e, s);
       t.push(b(o, r.name, i, n));
     }
     te(a, r, e, s, t);
@@ -341,7 +336,7 @@ const q = ({
   e.foreignKeyNames.forEach((s) => {
     const a = s.replace(/Id$/, ""), o = e.foreignKeyRelationMap.get(a);
     if (!o) return;
-    const i = r.getMetadata(o.mappedEntity, o.mappedNamespace)?.propertyMap.get("id")?.type, c = i && R(i) || "UUID";
+    const i = r.getMetadata(o.mappedEntity, o.mappedNamespace)?.propertyMap.get("id")?.type, c = i && M(i) || "UUID";
     t.push(b(c, e.name, s));
   });
 }, ne = (r) => {
@@ -369,9 +364,9 @@ const q = ({
     if (o.length >= r.config.relationQueryDeep)
       return;
     const u = ne(i), h = [...o, { key: n, entity: e.name }];
-    M(r, c, t, u, a, h);
+    S(r, c, t, u, a, h);
   });
-}, M = (r, e, t, s = [], a = [], o = []) => (t = t ?? e, a.push(...se(e, o)), re(r, e, a), ie(r, e, t, s, a, o), a), _ = (r, e) => r.map(({ rule: t, entity: s, key: a, valueType: o, subRuleGroup: n }) => (e.add(t), n ? `${t}<'${a}', ${n}>` : o ? a.includes(".") ? (e.add(`Relation${t}`), `Relation${t}<'${a}', ${o}>`) : `${t}<${s}, '${a}', ${o}>` : a.includes(".") ? (e.add(`Relation${t}`), `Relation${t}<'${a}'>`) : `${t}<${s}, '${a}'>`));
+}, S = (r, e, t, s = [], a = [], o = []) => (t = t ?? e, a.push(...se(e, o)), re(r, e, a), ie(r, e, t, s, a, o), a), _ = (r, e) => r.map(({ rule: t, entity: s, key: a, valueType: o, subRuleGroup: n }) => (e.add(t), n ? `${t}<'${a}', ${n}>` : o ? a.includes(".") ? (e.add(`Relation${t}`), `Relation${t}<'${a}', ${o}>`) : `${t}<${s}, '${a}', ${o}>` : a.includes(".") ? (e.add(`Relation${t}`), `Relation${t}<'${a}'>`) : `${t}<${s}, '${a}'>`));
 class ae {
   generate(e) {
     this.generateProperties(e), this.generateMethods(e);
@@ -442,7 +437,7 @@ class ae {
     return s === "uuid" ? "UUID" : s === "string" ? "string" : s === "number" || s === "integer" ? "number" : "UUID";
   }
 }
-class j extends ae {
+class k extends ae {
   name = "Repository";
   generateMethods(e) {
     const { metadata: t, file: s, rxdbNamedImports: a, staticTypesInterface: o } = e, { name: n } = t, i = this.getIdType(t);
@@ -451,7 +446,7 @@ class j extends ae {
       type: i,
       docs: ["id 类型"]
     });
-    const c = M(e.generator, t), u = _(c, a), h = `
+    const c = S(e.generator, t), u = _(c, a), h = `
   |` + c.map((p) => `'${p.key}'`).join(`
   |`);
     s.addTypeAlias({
@@ -478,7 +473,7 @@ ${n}Rule>`,
     });
     const g = (p) => ({
       method: p,
-      options: `${E(p)}Options<typeof ${n},${n}RuleGroup,${l}>`
+      options: `${D(p)}Options<typeof ${n},${n}RuleGroup,${l}>`
     });
     this.addStaticMethod(e, {
       method: "get",
@@ -519,7 +514,7 @@ ${n}Rule>`,
       optionsIsRequired: !0
     }), this.addStaticMethod(e, {
       method: "count",
-      options: `${E("count")}Options<typeof ${n},${n}RuleGroup>`,
+      options: `${D("count")}Options<typeof ${n},${n}RuleGroup>`,
       returnType: "number",
       metHodDoc: "统计实体数量",
       example: `${n}.count({ where: { combinator: 'and', rules: [] } }).subscribe(total => console.log(total));`,
@@ -539,10 +534,10 @@ ${n}Rule>`,
     });
   }
 }
-class ce extends j {
+class ce extends k {
   name = "TreeRepository";
   generateMethods(e) {
-    const { metadata: t, rxdbNamedImports: s, generator: a, file: o, staticTypesInterface: n } = e, { name: i } = t, c = M(a, t).filter(
+    const { metadata: t, rxdbNamedImports: s, generator: a, file: o, staticTypesInterface: n } = e, { name: i } = t, c = S(a, t).filter(
       (y) => y.key.startsWith("children.") && y.key !== "children.id"
     ), u = _(c, s), h = c.map((y) => `'${y.key}'`).join(" | ");
     o.addTypeAlias({
@@ -561,7 +556,7 @@ class ce extends j {
       name: "entity",
       type: `${i}`,
       docs: ["查询的实体"]
-    }), s.add(E("FindTreeOptions"));
+    }), s.add(D("FindTreeOptions"));
     const l = `FindTreeOptions<typeof ${i},${i}TreeRuleGroup>`;
     this.addStaticMethod(e, {
       method: "findDescendants",
@@ -600,7 +595,7 @@ ${i}.countAncestors({ entityId: grand.id }).subscribe(depth => console.log(depth
     });
   }
 }
-var k = /* @__PURE__ */ ((r) => (r.Var = "var", r.Let = "let", r.Const = "const", r))(k || {});
+var C = /* @__PURE__ */ ((r) => (r.Var = "var", r.Let = "let", r.Const = "const", r))(C || {});
 class $ {
   /**
    * 渲染单个参数
@@ -808,7 +803,7 @@ class pe {
     return this.structure.name || "";
   }
 }
-class A {
+class P {
   filePath;
   classes = [];
   interfaces = [];
@@ -880,18 +875,18 @@ class A {
 class le {
   files = /* @__PURE__ */ new Map();
   createSourceFile(e, t) {
-    const s = new A(e);
+    const s = new P(e);
     return t && s.setContent(t), this.files.set(e, s), s;
   }
   addSourceFileAtPath(e) {
-    const t = new A(e);
+    const t = new P(e);
     return this.files.set(e, t), t;
   }
   getSourceFiles() {
     return Array.from(this.files.values());
   }
 }
-const P = (r, e = "public") => `${e}_${r}`;
+const x = (r, e = "public") => `${e}_${r}`;
 class ye {
   /**
    * Repository 生成器注册表
@@ -899,8 +894,9 @@ class ye {
    */
   repositoryGenerators = /* @__PURE__ */ new Map();
   entityMetadataOptionsMap = /* @__PURE__ */ new Map([
-    ["EntityBase", [S]],
-    ["TreeEntityBase", [C, S]]
+    ["EntityBase", [E]],
+    ["TreeAdjacencyListEntityBase", [N, E]],
+    ["TreeEntityBase", [N, E]]
   ]);
   metadataOptionsSet = /* @__PURE__ */ new Set();
   metadataSet = /* @__PURE__ */ new Set();
@@ -910,7 +906,7 @@ class ye {
     relationQueryDeep: 3
   };
   constructor(e) {
-    Object.assign(this.config, e), this.config.relationQueryDeep < 1 && (this.config.relationQueryDeep = 1), this.registerRepositoryGenerator(new j()), this.registerRepositoryGenerator(new ce());
+    Object.assign(this.config, e), this.config.relationQueryDeep < 1 && (this.config.relationQueryDeep = 1), this.registerRepositoryGenerator(new k()), this.registerRepositoryGenerator(new ce());
   }
   /**
    * 添加实体配置
@@ -922,17 +918,17 @@ class ye {
       s = B(e);
     else {
       const a = e;
-      t = t || a.extends?.length && this.entityMetadataOptionsMap.get(a.extends[0]) || [], s = N(e, t);
+      t = t || a.extends?.length && this.entityMetadataOptionsMap.get(a.extends[0]) || [], s = A(e, t);
     }
     this.metadataSet.add(s), this.metadataMap.set(`${s.namespace}_${s.name}`, s);
   }
   getMetadata(e, t) {
-    return this.metadataMap.get(P(e, t));
+    return this.metadataMap.get(x(e, t));
   }
   registerAbstractMetadata(e, t) {
     this.entityMetadataOptionsMap.set(e, t), t.forEach((s) => {
-      const a = N(s);
-      this.metadataMap.set(P(s.name, s.namespace), a);
+      const a = A(s);
+      this.metadataMap.set(x(s.name, s.namespace), a);
     });
   }
   /**
@@ -1038,7 +1034,7 @@ ${h}: typeof ${h};
       isTypeOnly: !0,
       moduleSpecifier: "rxjs"
     }), s.addVariableStatement({
-      declarationKind: k.Const,
+      declarationKind: C.Const,
       hasDeclareKeyword: !0,
       isExported: !0,
       declarations: [

package/dist/{build-client-lib-BGlzuRcG.js → build-client-lib-Bkh60Zeb.js}

@@ -1,16 +1,12 @@
 import { writeFileSync as _, mkdirSync as b } from "node:fs";
 import { normalize as f, resolve as P, join as C, dirname as M } from "node:path";
 import { Project as T, Node as y } from "ts-morph";
-import { a as N } from "./RxDBClientGenerator-DmFzgpuy.js";
+import { a as N } from "./RxDBClientGenerator-6qmS8Mrd.js";
 import { ENTITY_BASE_METADATA_OPTIONS as w, TREE_ADJACENCY_LIST_ENTITY_BASE_OPTIONS as A, PropertyType as D, RelationKind as I, OnDeleteAction as S } from "@aiao/rxdb";
 import { glob as R } from "glob";
 function E(r) {
-  switch (r) {
-    case "EntityBase":
-      return [w];
-    default:
-      return;
-  }
+  if (r === "EntityBase")
+    return [w];
 }
 function x(r) {
   switch (r) {

package/dist/cli.js

@@ -2,7 +2,7 @@
 import { existsSync as p } from "node:fs";
 import { resolve as a, dirname as d, normalize as l } from "node:path";
 import { pathToFileURL as m } from "node:url";
-import { b as h } from "./build-client-lib-BGlzuRcG.js";
+import { b as h } from "./build-client-lib-Bkh60Zeb.js";
 async function b(r) {
   if (!p(r))
     throw new Error(`Config file not found: ${r}`);

package/dist/core/RxDBClientGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RxDBClientGenerator.d.ts","sourceRoot":"","sources":["../../src/core/RxDBClientGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,qBAAqB,EAErB,UAAU,EAKX,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AAI3F,OAAO,EAAE,OAAO,EAA2B,MAAM,uBAAuB,CAAC;AAEzE,MAAM,WAAW,0BAA0B;IACzC;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAKD;;GAEG;AACH,qBAAa,mBAAmB;IAC9B;;;OAGG;IACH,OAAO,CAAC,oBAAoB,CAA2C;IAEvE,wBAAwB,uCAGrB;IACH,kBAAkB,6BAAoC;IACtD,WAAW,uGAA6B;IACxC,WAAW,+GAAqC;IAChD,OAAO,EAAG,OAAO,CAAC;IAElB,MAAM,EAAE,QAAQ,CAAC,0BAA0B,CAAC,CAE1C;gBAEU,OAAO,CAAC,EAAE,0BAA0B;IAShD;;;OAGG;IACH,SAAS,CAAC,KAAK,EAAE,qBAAqB,GAAG,UAAU,EAAE,OAAO,CAAC,EAAE,qBAAqB,EAAE;IAetF,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAIzD,wBAAwB,CAAC,kBAAkB,EAAE,MAAM,EAAE,eAAe,EAAE,qBAAqB,EAAE;IAQ7F;;;;;;;;;;OAUG;IACH,2BAA2B,CAAC,SAAS,EAAE,oBAAoB,GAAG,IAAI;IAIlE;;;;OAIG;IACH,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS;IAItE;;OAEG;IACH,IAAI;IAMJ,cAAc;IAId;;;OAGG;IACH,oBAAoB;IAgEpB;;;OAGG;IACH,OAAO,CAAC,2BAA2B;CAoEpC"}
+{"version":3,"file":"RxDBClientGenerator.d.ts","sourceRoot":"","sources":["../../src/core/RxDBClientGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,qBAAqB,EAErB,UAAU,EAKX,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AAI3F,OAAO,EAAE,OAAO,EAA2B,MAAM,uBAAuB,CAAC;AAEzE,MAAM,WAAW,0BAA0B;IACzC;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAKD;;GAEG;AACH,qBAAa,mBAAmB;IAC9B;;;OAGG;IACH,OAAO,CAAC,oBAAoB,CAA2C;IAEvE,wBAAwB,uCAIrB;IACH,kBAAkB,6BAAoC;IACtD,WAAW,uGAA6B;IACxC,WAAW,+GAAqC;IAChD,OAAO,EAAG,OAAO,CAAC;IAElB,MAAM,EAAE,QAAQ,CAAC,0BAA0B,CAAC,CAE1C;gBAEU,OAAO,CAAC,EAAE,0BAA0B;IAShD;;;OAGG;IACH,SAAS,CAAC,KAAK,EAAE,qBAAqB,GAAG,UAAU,EAAE,OAAO,CAAC,EAAE,qBAAqB,EAAE;IAetF,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAIzD,wBAAwB,CAAC,kBAAkB,EAAE,MAAM,EAAE,eAAe,EAAE,qBAAqB,EAAE;IAQ7F;;;;;;;;;;OAUG;IACH,2BAA2B,CAAC,SAAS,EAAE,oBAAoB,GAAG,IAAI;IAIlE;;;;OAIG;IACH,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS;IAItE;;OAEG;IACH,IAAI;IAMJ,cAAc;IAId;;;OAGG;IACH,oBAAoB;IAgEpB;;;OAGG;IACH,OAAO,CAAC,2BAA2B;CAoEpC"}

package/dist/index.js

@@ -1,4 +1,4 @@
-import { R as a, a as o } from "./RxDBClientGenerator-DmFzgpuy.js";
+import { R as a, a as o } from "./RxDBClientGenerator-6qmS8Mrd.js";
 export {
   a as RepositoryGeneratorBase,
   o as RxDBClientGenerator

package/dist/vite.js

@@ -1,4 +1,4 @@
-import { b as i } from "./build-client-lib-BGlzuRcG.js";
+import { b as i } from "./build-client-lib-Bkh60Zeb.js";
 function l(n) {
   return {
     name: "rxdb-client-generator-vite-plugin",

package/package.json

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