@rpcbase/db 0.7.0 → 0.9.0

package/dist/index.js

@@ -3,7 +3,7 @@ import { z, ZodMap, ZodRecord, ZodAny, ZodUnion, ZodNullable, ZodOptional, ZodDe
 export * from "zod";
 import { z as z2 } from "zod";
 import assert from "assert";
-const ZUser = z.object({
+const ZRBUser = z.object({
   email: z.string().email().optional(),
   password: z.string(),
   name: z.string().optional(),
@@ -12,7 +12,7 @@ const ZUser = z.object({
   email_verification_code: z.string().length(6).optional(),
   email_verification_expires_at: z.date().optional()
 });
-const UserSchema = new Schema({
+const RBUserSchema = new Schema({
   email: { type: String, unique: true, sparse: true },
   phone: { type: String, unique: true, sparse: true },
   password: { type: String, required: true },
@@ -20,23 +20,23 @@ const UserSchema = new Schema({
   tenants: { type: [String], index: true, required: true },
   email_verification_code: { type: String, required: false },
   email_verification_expires_at: { type: Date, required: false }
-});
-const ZTenant = z.object({
+}, { collection: "users" });
+const ZRBTenant = z.object({
   tenant_id: z.string(),
   parent_tenant_id: z.string().optional(),
   name: z.string().optional()
 });
-const TenantSchema = new Schema({
+const RBTenantSchema = new Schema({
   tenant_id: { type: String, required: true, unique: true, index: true },
   parent_tenant_id: { type: String },
   name: { type: String }
-});
+}, { collection: "tenants" });
 const frameworkSchemas = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  TenantSchema,
-  UserSchema,
-  ZTenant,
-  ZUser
+  RBTenantSchema,
+  RBUserSchema,
+  ZRBTenant,
+  ZRBUser
 }, Symbol.toStringTag, { value: "Module" }));
 const zmAssert$4 = {
   string(f) {
@@ -350,6 +350,10 @@ const zUUID = (ref) => {
   };
   return output;
 };
+const zI18nString = () => z.record(
+  z.string().regex(/^[A-Za-z]{2}$/i, { message: "Expected a country code (ISO 3166-1 alpha-2)." }),
+  z.string()
+);
 function zodSchema(schema, options) {
   const definition = parseObject(schema);
   return new Schema(definition, options);
@@ -681,7 +685,8 @@ const loadModel = async (modelName, ctx) => {
   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`;
+  const userModelNames = ["User", "Tenant", "RBUser", "RBTenant"];
+  const dbName = userModelNames.includes(modelName) ? `${APP_NAME}-users-db` : `${APP_NAME}-${tenantId}-db`;
   const connectionString = `mongodb://localhost:${DB_PORT}/${dbName}`;
   if (!connections[dbName]) {
     const connection = mongoose.createConnection(connectionString, {
@@ -710,15 +715,16 @@ const loadModel = async (modelName, ctx) => {
   return modelConnection.models[modelName];
 };
 export {
-  TenantSchema,
-  UserSchema,
-  ZTenant,
-  ZUser,
+  RBTenantSchema,
+  RBUserSchema,
+  ZRBTenant,
+  ZRBUser,
   extendZod,
   getRegisteredModels,
   loadModel,
   registerModels,
   z2 as z,
+  zI18nString,
   zId,
   zUUID,
   zodSchema,

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;AAKF,eAAO,MAAM,SAAS,GAAU,WAAW,MAAM,EAAE,KAAK,YAAY,uDA0CnE,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,uDA4CnE,CAAA;AAED,YAAY,EAAE,YAAY,EAAE,CAAA"}

package/dist/models/Tenant.d.ts

@@ -1,10 +1,10 @@
 import { Schema } from '../../../vite/node_modules/mongoose';
 import { z } from '../../../vite/node_modules/zod';
-export declare const ZTenant: z.ZodObject<{
+export declare const ZRBTenant: z.ZodObject<{
     tenant_id: z.ZodString;
     parent_tenant_id: z.ZodOptional<z.ZodString>;
     name: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
-export type ITenant = z.infer<typeof ZTenant>;
-export declare const TenantSchema: Schema;
+export type IRBTenant = z.infer<typeof ZRBTenant>;
+export declare const RBTenantSchema: Schema;
 //# sourceMappingURL=Tenant.d.ts.map

package/dist/models/Tenant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tenant.d.ts","sourceRoot":"","sources":["../../src/models/Tenant.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,eAAO,MAAM,OAAO;;;;iBAIlB,CAAA;AAEF,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,CAAC;AAE9C,eAAO,MAAM,YAAY,EAAE,MAIzB,CAAA"}
+{"version":3,"file":"Tenant.d.ts","sourceRoot":"","sources":["../../src/models/Tenant.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,eAAO,MAAM,SAAS;;;;iBAIpB,CAAA;AAEF,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAC;AAElD,eAAO,MAAM,cAAc,EAAE,MAIA,CAAA"}

package/dist/models/User.d.ts

@@ -1,6 +1,6 @@
 import { Schema } from '../../../vite/node_modules/mongoose';
 import { z } from '../../../vite/node_modules/zod';
-export declare const ZUser: z.ZodObject<{
+export declare const ZRBUser: z.ZodObject<{
     email: z.ZodOptional<z.ZodString>;
     password: z.ZodString;
     name: z.ZodOptional<z.ZodString>;
@@ -9,6 +9,6 @@ export declare const ZUser: z.ZodObject<{
     email_verification_code: z.ZodOptional<z.ZodString>;
     email_verification_expires_at: z.ZodOptional<z.ZodDate>;
 }, z.core.$strip>;
-export type IUser = z.infer<typeof ZUser>;
-export declare const UserSchema: Schema;
+export type IRBUser = z.infer<typeof ZRBUser>;
+export declare const RBUserSchema: Schema;
 //# sourceMappingURL=User.d.ts.map

package/dist/models/User.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../../src/models/User.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,eAAO,MAAM,KAAK;;;;;;;;iBAQhB,CAAA;AAEF,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,CAAC,CAAC;AAE1C,eAAO,MAAM,UAAU,EAAE,MAQvB,CAAA"}
+{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../../src/models/User.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,eAAO,MAAM,OAAO;;;;;;;;iBAQlB,CAAA;AAEF,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,CAAC;AAE9C,eAAO,MAAM,YAAY,EAAE,MAQA,CAAA"}

package/dist/schema/extension.d.ts

@@ -62,5 +62,7 @@ export type TzmUUID = ReturnType<typeof createUUID> & {
 };
 declare const createUUID: () => z.ZodUnion<[z.ZodUUID, z.ZodCustom<Types.UUID, Types.UUID>]>;
 export declare const zUUID: (ref?: string) => TzmUUID;
+export type I18nStringRecord = Record<string, string>;
+export declare const zI18nString: () => z.ZodRecord<z.ZodString, z.ZodString>;
 export {};
 //# sourceMappingURL=extension.d.ts.map

package/dist/schema/extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../src/schema/extension.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAmB,MAAM,UAAU,CAAA;AACjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,OAAO,QAAQ,KAAK,CAAC;IACnB,UAAU,SAAS;QACjB,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,SAAS,CAAA;QACpC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,SAAS,CAAA;QACpC,WAAW,EAAE,OAAO,CAAA;QACpB,WAAW,EAAE,OAAO,CAAA;KACrB;IAED,UAAU,SAAS;QACjB,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,SAAS,CAAA;QACpC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,SAAS,CAAA;QACpC,WAAW,EAAE,OAAO,CAAA;QACpB,WAAW,EAAE,OAAO,CAAA;KACrB;IAED,UAAU,OAAO;QACf,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;QAClC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;QAClC,WAAW,EAAE,OAAO,CAAA;QACpB,WAAW,EAAE,OAAO,CAAA;KACrB;CAEF;AA+CD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,QA2DtC;AAED,MAAM,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,GAAG;IAChD,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,KAAK,CAAA;IAChC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,KAAK,CAAA;IAChC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,KAAK,CAAA;IAC3B,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,KAAK,CAAA;CAChC,CAAA;AAED,QAAA,MAAM,QAAQ,8EAKb,CAAA;AAED,eAAO,MAAM,GAAG,GAAI,MAAM,MAAM,KAAG,KAoDlC,CAAA;AAED,MAAM,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG;IACpD,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;IAClC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;IAClC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAA;IAC7B,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAA;CAClC,CAAA;AAED,QAAA,MAAM,UAAU,oEAEf,CAAA;AAED,eAAO,MAAM,KAAK,GAAI,MAAM,MAAM,KAAG,OAoDpC,CAAA"}
+{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../src/schema/extension.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAmB,MAAM,UAAU,CAAA;AACjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,OAAO,QAAQ,KAAK,CAAC;IACnB,UAAU,SAAS;QACjB,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,SAAS,CAAA;QACpC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,SAAS,CAAA;QACpC,WAAW,EAAE,OAAO,CAAA;QACpB,WAAW,EAAE,OAAO,CAAA;KACrB;IAED,UAAU,SAAS;QACjB,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,SAAS,CAAA;QACpC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,SAAS,CAAA;QACpC,WAAW,EAAE,OAAO,CAAA;QACpB,WAAW,EAAE,OAAO,CAAA;KACrB;IAED,UAAU,OAAO;QACf,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;QAClC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;QAClC,WAAW,EAAE,OAAO,CAAA;QACpB,WAAW,EAAE,OAAO,CAAA;KACrB;CAEF;AA+CD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,QA2DtC;AAED,MAAM,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,GAAG;IAChD,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,KAAK,CAAA;IAChC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,KAAK,CAAA;IAChC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,KAAK,CAAA;IAC3B,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,KAAK,CAAA;CAChC,CAAA;AAED,QAAA,MAAM,QAAQ,8EAKb,CAAA;AAED,eAAO,MAAM,GAAG,GAAI,MAAM,MAAM,KAAG,KAoDlC,CAAA;AAED,MAAM,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG;IACpD,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;IAClC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;IAClC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAA;IAC7B,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAA;CAClC,CAAA;AAED,QAAA,MAAM,UAAU,oEAEf,CAAA;AAED,eAAO,MAAM,KAAK,GAAI,MAAM,MAAM,KAAG,OAoDpC,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAErD,eAAO,MAAM,WAAW,QAMjB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/db",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "type": "module",
   "files": [
     "dist"
@@ -50,7 +50,7 @@
     }
   },
   "peerDependencies": {
-    "mongoose": "^8",
+    "mongoose": "^8 || ^9",
     "zod": "^4"
   },
   "devDependencies": {