@rpcbase/db 0.5.0 → 0.7.0

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from './models';
 export * from './schema';
 export * from './loadModel';
+export * from './registerModels';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,kBAAkB,CAAA"}

package/dist/index.js

@@ -21,11 +21,6 @@ const UserSchema = new Schema({
   email_verification_code: { type: String, required: false },
   email_verification_expires_at: { type: Date, required: false }
 });
-const __vite_glob_0_1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  UserSchema,
-  ZUser
-}, Symbol.toStringTag, { value: "Module" }));
 const ZTenant = z.object({
   tenant_id: z.string(),
   parent_tenant_id: z.string().optional(),
@@ -36,11 +31,6 @@ const TenantSchema = new Schema({
   parent_tenant_id: { type: String },
   name: { type: String }
 });
-const __vite_glob_0_0 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  TenantSchema,
-  ZTenant
-}, Symbol.toStringTag, { value: "Module" }));
 const frameworkSchemas = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   TenantSchema,
@@ -653,38 +643,42 @@ function parseMixed(required = true, def) {
     required
   };
 }
-const { APP_NAME, DB_PORT } = process.env;
-const connections = {};
 let cachedModels = null;
-const buildModels = () => {
-  const externalModelModules = globalThis.__rb_model_modules;
-  const modelModules = externalModelModules ?? /* @__PURE__ */ Object.assign({ "/src/models/Tenant.ts": __vite_glob_0_0, "/src/models/User.ts": __vite_glob_0_1, "/src/models/index.ts": frameworkSchemas });
-  const appModels = Object.entries(modelModules).flatMap(([key, exports$1]) => {
-    const modelName = key.split("/").pop()?.replace(/\.(t|j)sx?$/, "");
-    assert(modelName, "Model name not found");
-    const schemaEntry = Object.entries(exports$1).find(([key2]) => key2 === `${modelName}Schema`);
-    if (!schemaEntry) return [];
-    const schema = schemaEntry[1];
-    if (!(schema instanceof mongoose.Schema)) return [];
-    return [{
-      name: modelName,
-      model: mongoose.models[modelName] ?? mongoose.model(modelName, schema)
-    }];
-  });
-  const frameworkModels = Object.entries(frameworkSchemas).filter(([_, schema]) => schema instanceof mongoose.Schema).map(([key, schema]) => {
-    const name = key.replace(/Schema$/, "");
-    return {
-      name,
-      model: mongoose.models[name] ?? mongoose.model(name, schema)
-    };
-  });
+const buildAppModels = (modules) => Object.entries(modules).filter(([key, schema]) => key.endsWith("Schema") && schema instanceof mongoose.Schema).map(([key, schema]) => {
+  const name = key.replace(/Schema$/, "");
+  return {
+    name,
+    model: mongoose.models[name] ?? mongoose.model(name, schema)
+  };
+});
+const buildFrameworkModels = () => Object.entries(frameworkSchemas).filter(([_, schema]) => schema instanceof mongoose.Schema).map(([key, schema]) => {
+  const name = key.replace(/Schema$/, "");
+  return {
+    name,
+    model: mongoose.models[name] ?? mongoose.model(name, schema)
+  };
+});
+const buildModels = (modules) => {
+  const appModels = buildAppModels(modules);
+  const frameworkModels = buildFrameworkModels();
   return [...frameworkModels, ...appModels].reduce((acc, { name, model }) => {
     acc[name] = model;
     return acc;
   }, {});
 };
+const registerModels = (modules) => {
+  cachedModels = buildModels(modules);
+};
+const getRegisteredModels = () => {
+  if (!cachedModels) {
+    throw new Error("Models not registered. Call registerModels before using loadModel.");
+  }
+  return cachedModels;
+};
+const { APP_NAME, DB_PORT } = process.env;
+const connections = {};
 const loadModel = async (modelName, ctx) => {
-  const models = cachedModels ?? (cachedModels = buildModels());
+  const models = getRegisteredModels();
   const tenantId = ctx.req.session?.user?.current_tenant_id || "00000000";
   assert(tenantId, "Tenant ID is missing from session");
   const dbName = ["User", "Tenant"].includes(modelName) ? `${APP_NAME}-users-db` : `${APP_NAME}-${tenantId}-db`;
@@ -721,7 +715,9 @@ export {
   ZTenant,
   ZUser,
   extendZod,
+  getRegisteredModels,
   loadModel,
+  registerModels,
   z2 as z,
   zId,
   zUUID,

package/dist/loadModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadModel.d.ts","sourceRoot":"","sources":["../src/loadModel.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAK/B,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE;QACH,OAAO,CAAC,EAAE;YACR,IAAI,CAAC,EAAE;gBACL,iBAAiB,CAAC,EAAE,MAAM,CAAC;aAC5B,CAAA;SACF,GAAG,IAAI,CAAC;KACV,CAAC;CACH,CAAC;AA+CF,eAAO,MAAM,SAAS,GAAU,WAAW,MAAM,EAAE,KAAK,YAAY,uDA2CnE,CAAA;AAED,YAAY,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"loadModel.d.ts","sourceRoot":"","sources":["../src/loadModel.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAK/B,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE;QACH,OAAO,CAAC,EAAE;YACR,IAAI,CAAC,EAAE;gBACL,iBAAiB,CAAC,EAAE,MAAM,CAAC;aAC5B,CAAA;SACF,GAAG,IAAI,CAAC;KACV,CAAC;CACH,CAAC;AAKF,eAAO,MAAM,SAAS,GAAU,WAAW,MAAM,EAAE,KAAK,YAAY,uDA0CnE,CAAA;AAED,YAAY,EAAE,YAAY,EAAE,CAAA"}

package/dist/registerModels.d.ts

@@ -0,0 +1,6 @@
+import { default as mongoose } from '../../vite/node_modules/mongoose';
+type ModelModules = Record<string, unknown>;
+export declare const registerModels: (modules: ModelModules) => void;
+export declare const getRegisteredModels: () => Record<string, mongoose.Model<any, {}, {}, {}, any, any>>;
+export type { ModelModules };
+//# sourceMappingURL=registerModels.d.ts.map

package/dist/registerModels.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registerModels.d.ts","sourceRoot":"","sources":["../src/registerModels.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAK/B,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAoC3C,eAAO,MAAM,cAAc,GAAI,SAAS,YAAY,SAEnD,CAAA;AAED,eAAO,MAAM,mBAAmB,iEAK/B,CAAA;AAED,YAAY,EAAE,YAAY,EAAE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/db",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "type": "module",
   "files": [
     "dist"
@@ -28,11 +28,8 @@
       ]
     },
     "build-watch": {
-      "command": "../../node_modules/.bin/vite build --watch'",
-      "service": true,
-      "dependencies": [
-        "build"
-      ]
+      "command": "../../node_modules/.bin/vite build --watch",
+      "service": true
     },
     "release": {
       "command": "../../scripts/publish.js",