@rpcbase/db 0.31.0 → 0.33.0

package/dist/createModels.d.ts

@@ -1,19 +1,38 @@
-import { LoadModelCtx, loadModel, loadRbModel } from './loadModel';
+import { LoadModelCtx, loadGlobalModel, loadModel } from './loadModel';
 import { ModelModules } from './registerModels';
+import { DefaultGlobalRbModelName, TenantAppRbModelName } from './rbModelScopes';
 import type * as frameworkSchemas from "./models";
 type ExtractModelNamesFromSchemas<TModules> = {
     [K in keyof TModules]-?: K extends `${infer Name}Schema` ? Name : never;
 }[keyof TModules] & string;
 type FrameworkModelName = ExtractModelNamesFromSchemas<typeof frameworkSchemas>;
 type WithoutRbPrefix<TName extends string> = TName extends `RB${string}` ? never : TName;
-type TenantInternalRbModelName = "RBUploadSession" | "RBUploadChunk" | "RBNotification" | "RBNotificationSettings";
-export type TenantModelName<TModules extends ModelModules> = WithoutRbPrefix<ExtractModelNamesFromSchemas<TModules>> | WithoutRbPrefix<FrameworkModelName> | TenantInternalRbModelName;
-export type RbModelName = ExtractModelNamesFromSchemas<typeof frameworkSchemas> extends infer Name ? Name extends string ? Name extends `RB${string}` ? Name extends "RBRtsChange" | "RBRtsCounter" | "RBUploadSession" | "RBUploadChunk" | "RBNotification" | "RBNotificationSettings" ? never : Name : never : never : never;
-export type ModelsClient<TModules extends ModelModules> = {
-    register: (modules: TModules) => void;
-    get: (modelName: TenantModelName<TModules>, ctx: LoadModelCtx) => ReturnType<typeof loadModel>;
-    getRb: (modelName: RbModelName, ctx: LoadModelCtx) => ReturnType<typeof loadRbModel>;
+type FrameworkGlobalRbModelName = Extract<FrameworkModelName, DefaultGlobalRbModelName>;
+export type TenantModelName<TTenantModules extends ModelModules> = WithoutRbPrefix<ExtractModelNamesFromSchemas<TTenantModules>> | TenantAppRbModelName;
+export type GlobalModelName<TGlobalModules extends ModelModules> = FrameworkGlobalRbModelName | WithoutRbPrefix<ExtractModelNamesFromSchemas<TGlobalModules>>;
+type LoadedTenantModel = Awaited<ReturnType<typeof loadModel>>;
+type LoadedGlobalModel = Awaited<ReturnType<typeof loadGlobalModel>>;
+type ModelsGetFn<TTenantModules extends ModelModules> = {
+    (modelName: TenantModelName<TTenantModules>, ctx: LoadModelCtx): ReturnType<typeof loadModel>;
+    <const TNames extends readonly TenantModelName<TTenantModules>[]>(modelNames: TNames, ctx: LoadModelCtx): Promise<{
+        [K in keyof TNames]: LoadedTenantModel;
+    }>;
 };
-export declare const createModels: <TModules extends ModelModules>(modules: TModules) => ModelsClient<TModules>;
+type ModelsGetGlobalFn<TGlobalModules extends ModelModules> = {
+    (modelName: GlobalModelName<TGlobalModules>, ctx: LoadModelCtx): ReturnType<typeof loadGlobalModel>;
+    <const TNames extends readonly GlobalModelName<TGlobalModules>[]>(modelNames: TNames, ctx: LoadModelCtx): Promise<{
+        [K in keyof TNames]: LoadedGlobalModel;
+    }>;
+};
+export type ModelsConfig<TTenantModules extends ModelModules, TGlobalModules extends ModelModules> = {
+    tenant: TTenantModules;
+    global?: TGlobalModules;
+};
+export type ModelsClient<TTenantModules extends ModelModules, TGlobalModules extends ModelModules> = {
+    register: (modules: ModelsConfig<TTenantModules, TGlobalModules>) => void;
+    get: ModelsGetFn<TTenantModules>;
+    getGlobal: ModelsGetGlobalFn<TGlobalModules>;
+};
+export declare const createModels: <TTenantModules extends ModelModules, TGlobalModules extends ModelModules = Record<string, never>>(modules: ModelsConfig<TTenantModules, TGlobalModules>) => ModelsClient<TTenantModules, TGlobalModules>;
 export {};
 //# sourceMappingURL=createModels.d.ts.map

package/dist/createModels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createModels.d.ts","sourceRoot":"","sources":["../src/createModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,KAAK,KAAK,gBAAgB,MAAM,UAAU,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAIpD,KAAK,4BAA4B,CAAC,QAAQ,IAAI;KAC3C,CAAC,IAAI,MAAM,QAAQ,CAAC,CAAC,GAAG,CAAC,SAAS,GAAG,MAAM,IAAI,QAAQ,GAAG,IAAI,GAAG,KAAK;CACxE,CAAC,MAAM,QAAQ,CAAC,GAAG,MAAM,CAAA;AAE1B,KAAK,kBAAkB,GAAG,4BAA4B,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAE/E,KAAK,eAAe,CAAC,KAAK,SAAS,MAAM,IAAI,KAAK,SAAS,KAAK,MAAM,EAAE,GAAG,KAAK,GAAG,KAAK,CAAA;AAExF,KAAK,yBAAyB,GAC1B,iBAAiB,GACjB,eAAe,GACf,gBAAgB,GAChB,wBAAwB,CAAA;AAE5B,MAAM,MAAM,eAAe,CAAC,QAAQ,SAAS,YAAY,IACrD,eAAe,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC,GACvD,eAAe,CAAC,kBAAkB,CAAC,GACnC,yBAAyB,CAAA;AAE7B,MAAM,MAAM,WAAW,GAAG,4BAA4B,CAAC,OAAO,gBAAgB,CAAC,SAAS,MAAM,IAAI,GAC9F,IAAI,SAAS,MAAM,GACjB,IAAI,SAAS,KAAK,MAAM,EAAE,GACxB,IAAI,SACF,aAAa,GACb,cAAc,GACd,iBAAiB,GACjB,eAAe,GACf,gBAAgB,GAChB,wBAAwB,GACxB,KAAK,GACL,IAAI,GACN,KAAK,GACP,KAAK,GACP,KAAK,CAAA;AAET,MAAM,MAAM,YAAY,CAAC,QAAQ,SAAS,YAAY,IAAI;IACxD,QAAQ,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,CAAA;IACrC,GAAG,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,YAAY,KAAK,UAAU,CAAC,OAAO,SAAS,CAAC,CAAA;IAC9F,KAAK,EAAE,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,YAAY,KAAK,UAAU,CAAC,OAAO,WAAW,CAAC,CAAA;CACrF,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,QAAQ,SAAS,YAAY,EAAE,SAAS,QAAQ,KAAG,YAAY,CAAC,QAAQ,CAQpG,CAAA"}
+{"version":3,"file":"createModels.d.ts","sourceRoot":"","sources":["../src/createModels.ts"],"names":[],"mappings":"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"}

package/dist/dbNames.d.ts

@@ -0,0 +1,4 @@
+export declare const GLOBAL_DB_SUFFIX = "-global-db";
+export declare const getGlobalDbName: (env?: NodeJS.ProcessEnv) => string;
+export declare const getTenantDbName: (tenantId: string, env?: NodeJS.ProcessEnv) => string;
+//# sourceMappingURL=dbNames.d.ts.map

package/dist/dbNames.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dbNames.d.ts","sourceRoot":"","sources":["../src/dbNames.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,gBAAgB,eAAe,CAAA;AAE5C,eAAO,MAAM,eAAe,GAAI,MAAK,MAAM,CAAC,UAAwB,KAAG,MAEtE,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,MAAK,MAAM,CAAC,UAAwB,KAAG,MAExF,CAAA"}

package/dist/index.js

@@ -225,6 +225,7 @@ const ZRBUploadSession = z.object({
   createdAt: z.date(),
   expiresAt: z.date(),
   fileId: z.string().optional(),
+  isPublic: z.boolean().optional(),
   error: z.string().optional()
 });
 const RBUploadSessionSchema = new Schema(
@@ -241,6 +242,7 @@ const RBUploadSessionSchema = new Schema(
     createdAt: { type: Date, required: true, default: Date.now },
     expiresAt: { type: Date, required: true },
     fileId: { type: String, required: false },
+    isPublic: { type: Boolean, required: false },
     error: { type: String, required: false }
   },
   {
@@ -1140,6 +1142,20 @@ function parseMixed(required = true, def) {
     required
   };
 }
+const getAppName$1 = (env = process.env) => {
+  const appName = env.APP_NAME?.trim();
+  if (!appName) {
+    throw new Error("Missing APP_NAME");
+  }
+  return appName;
+};
+const GLOBAL_DB_SUFFIX = "-global-db";
+const getGlobalDbName = (env = process.env) => {
+  return `${getAppName$1(env)}${GLOBAL_DB_SUFFIX}`;
+};
+const getTenantDbName = (tenantId, env = process.env) => {
+  return `${getAppName$1(env)}-${tenantId.trim()}-db`;
+};
 const getMongoUrl = (env = process.env) => {
   const explicitUrl = env.MONGODB_URL ?? env.MONGO_URL ?? env.MONGODB_URI ?? env.DB_URL;
   if (explicitUrl && explicitUrl.trim()) {
@@ -1174,6 +1190,11 @@ const ensureMongooseConnection = async (dbName) => {
   }
   return connections[dbName];
 };
+const DEFAULT_GLOBAL_RB_MODEL_NAMES = [
+  "RBUser",
+  "RBTenant"
+];
+const DEFAULT_GLOBAL_RB_MODEL_NAMES_SET = new Set(DEFAULT_GLOBAL_RB_MODEL_NAMES);
 const RTS_COUNTER_ID = "rts";
 const EXCLUDED_MODEL_NAMES = /* @__PURE__ */ new Set(["RBRtsChange", "RBRtsCounter"]);
 const maxDeleteIdsRaw = process.env.RB_RTS_DELETE_LOG_MAX_IDS ?? "";
@@ -1196,7 +1217,7 @@ const getDbName = (db) => {
   const raw = maybe.name ?? maybe.db?.databaseName;
   return typeof raw === "string" ? raw : "";
 };
-const isUsersDb = (db) => getDbName(db).endsWith("-users-db");
+const isGlobalDb = (db) => getDbName(db).endsWith(GLOBAL_DB_SUFFIX);
 const getRtsModels = (db) => {
   const RtsCounter = db.models.RBRtsCounter ?? db.model("RBRtsCounter", RBRtsCounterSchema);
   const RtsChange = db.models.RBRtsChange ?? db.model("RBRtsChange", RBRtsChangeSchema);
@@ -1243,7 +1264,7 @@ const recordResetModel = async (db, modelName) => {
 const captureDeleteMeta = async (query, mode) => {
   const modelName = String(query?.model?.modelName ?? "");
   if (!modelName || modelName.startsWith("RB") || EXCLUDED_MODEL_NAMES.has(modelName)) return;
-  if (isUsersDb(query?.model?.db)) return;
+  if (isGlobalDb(query?.model?.db)) return;
   const filter = typeof query.getFilter === "function" ? query.getFilter() : query.getQuery?.() ?? {};
   const findQuery = query.model.find(filter, { _id: 1 }).lean();
   if (mode === "one") {
@@ -1296,7 +1317,7 @@ const rtsChangeLogPlugin = (schema) => {
     if (!modelName || modelName.startsWith("RB") || EXCLUDED_MODEL_NAMES.has(modelName)) return;
     const db = this?.model?.db;
     if (!db) return;
-    if (isUsersDb(db)) return;
+    if (isGlobalDb(db)) return;
     const docId = normalizeId(doc?._id);
     if (!docId) return;
     try {
@@ -1854,12 +1875,8 @@ const mongoPaginationPlugin = (schema, pluginOptions) => {
     return await paginateMongoQuery(this, spec, { cursor });
   };
 };
-const rtsChangeLogApplied = /* @__PURE__ */ new WeakSet();
-const accessibleRecordsApplied = /* @__PURE__ */ new WeakSet();
-const aclPluginApplied = /* @__PURE__ */ new WeakSet();
-const paginationPluginApplied = /* @__PURE__ */ new WeakSet();
 let cachedModels = null;
-const isRtsChangelogExcludedModelName = (name) => name.startsWith("RB");
+const isRbModelName = (name) => name.startsWith("RB");
 const assertSchema = (exportName, value) => {
   if (value instanceof mongoose.Schema) return value;
   throw new Error(
@@ -1870,104 +1887,89 @@ const assertSchema = (exportName, value) => {
     ].join(" ")
   );
 };
-const buildAppModels = (modules) => Object.entries(modules).filter(([key]) => key.endsWith("Schema")).map(([key, schemaValue]) => {
+const applyTenantPlugins = (schema, modelName) => {
+  schema.plugin(accessibleRecordsPlugin);
+  schema.plugin(mongooseAclPlugin);
+  schema.plugin(mongoPaginationPlugin);
+  if (!isRbModelName(modelName)) {
+    schema.plugin(rtsChangeLogPlugin);
+  }
+};
+const registerSchema = (target, other, modelName, schema, scope) => {
+  if (target[modelName] || other[modelName]) {
+    throw new Error(`Duplicate model name "${modelName}" across tenant/global scopes`);
+  }
+  target[modelName] = schema;
+};
+const buildSchemasFromModules = (modules) => Object.entries(modules).filter(([key]) => key.endsWith("Schema")).map(([key, schemaValue]) => {
   const schema = assertSchema(key, schemaValue);
-  const name = key.replace(/Schema$/, "");
-  if (!accessibleRecordsApplied.has(schema)) {
-    schema.plugin(accessibleRecordsPlugin);
-    accessibleRecordsApplied.add(schema);
-  }
-  if (!aclPluginApplied.has(schema)) {
-    schema.plugin(mongooseAclPlugin);
-    aclPluginApplied.add(schema);
-  }
-  if (!paginationPluginApplied.has(schema)) {
-    schema.plugin(mongoPaginationPlugin);
-    paginationPluginApplied.add(schema);
-  }
-  if (!isRtsChangelogExcludedModelName(name)) {
-    if (!rtsChangeLogApplied.has(schema)) {
-      schema.plugin(rtsChangeLogPlugin);
-      rtsChangeLogApplied.add(schema);
+  const modelName = key.replace(/Schema$/, "");
+  return { modelName, schema };
+});
+const registerModels = ({ tenant, global }) => {
+  registerPoliciesFromModules(frameworkSchemas);
+  registerPoliciesFromModules(tenant);
+  const tenantSchemas = {};
+  const globalSchemas = {};
+  for (const { modelName, schema } of buildSchemasFromModules(frameworkSchemas)) {
+    if (DEFAULT_GLOBAL_RB_MODEL_NAMES_SET.has(modelName)) {
+      const cloned = schema.clone();
+      registerSchema(globalSchemas, tenantSchemas, modelName, cloned);
+    } else {
+      const cloned = schema.clone();
+      applyTenantPlugins(cloned, modelName);
+      registerSchema(tenantSchemas, globalSchemas, modelName, cloned);
     }
   }
-  return {
-    name,
-    model: mongoose.models[name] ?? mongoose.model(name, schema)
-  };
-});
-const buildFrameworkModels = () => Object.entries(frameworkSchemas).filter(([key]) => key.endsWith("Schema")).map(([key, schemaValue]) => {
-  const schema = assertSchema(key, schemaValue);
-  const name = key.replace(/Schema$/, "");
-  if (!accessibleRecordsApplied.has(schema)) {
-    schema.plugin(accessibleRecordsPlugin);
-    accessibleRecordsApplied.add(schema);
-  }
-  if (!aclPluginApplied.has(schema)) {
-    schema.plugin(mongooseAclPlugin);
-    aclPluginApplied.add(schema);
-  }
-  if (!paginationPluginApplied.has(schema)) {
-    schema.plugin(mongoPaginationPlugin);
-    paginationPluginApplied.add(schema);
-  }
-  if (!isRtsChangelogExcludedModelName(name)) {
-    if (!rtsChangeLogApplied.has(schema)) {
-      schema.plugin(rtsChangeLogPlugin);
-      rtsChangeLogApplied.add(schema);
+  for (const { modelName, schema } of buildSchemasFromModules(tenant)) {
+    if (isRbModelName(modelName)) {
+      throw new Error(`Invalid tenant model name "${modelName}". RB* models are reserved for rpcbase.`);
     }
+    const cloned = schema.clone();
+    applyTenantPlugins(cloned, modelName);
+    registerSchema(tenantSchemas, globalSchemas, modelName, cloned);
   }
-  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) => {
-  registerPoliciesFromModules(frameworkSchemas);
-  registerPoliciesFromModules(modules);
-  cachedModels = buildModels(modules);
+  for (const { modelName, schema } of buildSchemasFromModules(global ?? {})) {
+    if (isRbModelName(modelName)) {
+      throw new Error(`Invalid global model name "${modelName}". RB* models are reserved for rpcbase.`);
+    }
+    const cloned = schema.clone();
+    registerSchema(globalSchemas, tenantSchemas, modelName, cloned);
+  }
+  const allSchemas = { ...globalSchemas, ...tenantSchemas };
+  for (const [modelName, schema] of Object.entries(allSchemas)) {
+    if (!mongoose.models[modelName]) {
+      mongoose.model(modelName, schema);
+    }
+  }
+  cachedModels = { tenant: tenantSchemas, global: globalSchemas };
 };
-const getRegisteredModels = () => {
+const getRegisteredModels = (scope) => {
   if (!cachedModels) {
     throw new Error("Models not registered. Call createModels(...) once at startup (or import your models module) before using loadModel.");
   }
-  return cachedModels;
+  return cachedModels[scope];
 };
-const { APP_NAME } = process.env;
-const TENANT_INTERNAL_MODEL_NAMES = /* @__PURE__ */ new Set([
-  "RBRtsChange",
-  "RBRtsCounter",
-  "RBUploadSession",
-  "RBUploadChunk",
-  "RBNotification",
-  "RBNotificationSettings"
-]);
 const assertTenantModelName = (modelName) => {
-  if (TENANT_INTERNAL_MODEL_NAMES.has(modelName)) return;
   assert(
-    !modelName.startsWith("RB"),
-    "Invalid tenant model name. RB* models are stored in the global users DB; use loadRbModel."
+    !DEFAULT_GLOBAL_RB_MODEL_NAMES_SET.has(modelName),
+    'Invalid tenant model name. "RBUser" and "RBTenant" are stored in the global DB; use loadGlobalModel (or loadRbModel for rpcbase models).'
   );
 };
 const assertRbModelName = (modelName) => {
   assert(modelName.startsWith("RB"), "Invalid RB model name. Supported: RB*");
-  assert(!TENANT_INTERNAL_MODEL_NAMES.has(modelName), "Invalid RB model name. Use loadModel for tenant-scoped RB* models.");
+  assert(
+    DEFAULT_GLOBAL_RB_MODEL_NAMES_SET.has(modelName),
+    'Invalid RB model name. Only "RBUser" and "RBTenant" are global; use loadModel for tenant-scoped RB* models.'
+  );
 };
-const loadModelFromDb = async (modelName, dbName) => {
-  const models = getRegisteredModels();
-  const model = models[modelName];
-  assert(model, `Model ${modelName} not registered. Available models: ${Object.keys(models).join(", ")}`);
+const loadModelFromDb = async (modelName, dbName, scope) => {
+  const schemas = getRegisteredModels(scope);
+  const schema = schemas[modelName];
+  assert(schema, `Model ${modelName} not registered. Available models: ${Object.keys(schemas).join(", ")}`);
   const modelConnection = await ensureMongooseConnection(dbName);
   if (!modelConnection.models[modelName]) {
-    modelConnection.model(modelName, model.schema);
+    modelConnection.model(modelName, schema);
   }
   return modelConnection.models[modelName];
 };
@@ -1975,20 +1977,38 @@ const loadModel = async (modelName, ctx) => {
   assertTenantModelName(modelName);
   const tenantId = ctx.req.session?.user?.currentTenantId;
   assert(typeof tenantId === "string" && tenantId.trim(), "Tenant ID is missing from session");
-  const dbName = `${APP_NAME}-${tenantId.trim()}-db`;
-  return loadModelFromDb(modelName, dbName);
+  const dbName = getTenantDbName(tenantId);
+  return loadModelFromDb(modelName, dbName, "tenant");
+};
+const loadGlobalModel = async (modelName, _ctx) => {
+  if (modelName.startsWith("RB") && !DEFAULT_GLOBAL_RB_MODEL_NAMES_SET.has(modelName)) {
+    throw new Error(`Invalid global model name "${modelName}". RB* models are tenant-scoped by default; use loadModel.`);
+  }
+  const dbName = getGlobalDbName();
+  return loadModelFromDb(modelName, dbName, "global");
 };
 const loadRbModel = async (modelName, _ctx) => {
   assertRbModelName(modelName);
-  const dbName = `${APP_NAME}-users-db`;
-  return loadModelFromDb(modelName, dbName);
+  return loadGlobalModel(modelName);
 };
 const createModels = (modules) => {
   registerModels(modules);
+  const get = (async (modelNameOrNames, ctx) => {
+    if (Array.isArray(modelNameOrNames)) {
+      return Promise.all(modelNameOrNames.map((modelName) => loadModel(modelName, ctx)));
+    }
+    return loadModel(modelNameOrNames, ctx);
+  });
+  const getGlobal = (async (modelNameOrNames, ctx) => {
+    if (Array.isArray(modelNameOrNames)) {
+      return Promise.all(modelNameOrNames.map((modelName) => loadGlobalModel(modelName)));
+    }
+    return loadGlobalModel(modelNameOrNames);
+  });
   return {
     register: registerModels,
-    get: (modelName, ctx) => loadModel(modelName, ctx),
-    getRb: (modelName, ctx) => loadRbModel(modelName)
+    get,
+    getGlobal
   };
 };
 const getAppName = () => {
@@ -2057,6 +2077,7 @@ export {
   getTenantFilesystemDbName,
   getTenantRolesFromSessionUser,
   isPaginationValidationError,
+  loadGlobalModel,
   loadModel,
   loadRbModel,
   mongoPaginationPlugin,

package/dist/loadModel.d.ts

@@ -9,6 +9,7 @@ type LoadModelCtx = {
     };
 };
 export declare const loadModel: (modelName: string, ctx: LoadModelCtx) => Promise<mongoose.Model<any, {}, {}, {}, any, any, any>>;
+export declare const loadGlobalModel: (modelName: string, _ctx: LoadModelCtx) => Promise<mongoose.Model<any, {}, {}, {}, any, any, any>>;
 export declare const loadRbModel: (modelName: string, _ctx: LoadModelCtx) => Promise<mongoose.Model<any, {}, {}, {}, any, any, any>>;
 export type { LoadModelCtx };
 //# sourceMappingURL=loadModel.d.ts.map

package/dist/loadModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadModel.d.ts","sourceRoot":"","sources":["../src/loadModel.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAA;AAMpC,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE;QACH,OAAO,CAAC,EAAE;YACR,IAAI,CAAC,EAAE;gBACL,eAAe,CAAC,EAAE,MAAM,CAAC;aAC1B,CAAA;SACF,GAAG,IAAI,CAAC;KACV,CAAC;CACH,CAAC;AAyCF,eAAO,MAAM,SAAS,GAAU,WAAW,MAAM,EAAE,KAAK,YAAY,4DAOnE,CAAA;AAED,eAAO,MAAM,WAAW,GAAU,WAAW,MAAM,EAAE,MAAM,YAAY,4DAItE,CAAA;AAED,YAAY,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"loadModel.d.ts","sourceRoot":"","sources":["../src/loadModel.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAA;AAQpC,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE;QACH,OAAO,CAAC,EAAE;YACR,IAAI,CAAC,EAAE;gBACL,eAAe,CAAC,EAAE,MAAM,CAAC;aAC1B,CAAA;SACF,GAAG,IAAI,CAAC;KACV,CAAC;CACH,CAAC;AAmCF,eAAO,MAAM,SAAS,GAAU,WAAW,MAAM,EAAE,KAAK,YAAY,4DAOnE,CAAA;AAED,eAAO,MAAM,eAAe,GAAU,WAAW,MAAM,EAAE,MAAM,YAAY,4DAM1E,CAAA;AAED,eAAO,MAAM,WAAW,GAAU,WAAW,MAAM,EAAE,MAAM,YAAY,4DAGtE,CAAA;AAED,YAAY,EAAE,YAAY,EAAE,CAAA"}

package/dist/models/RBUploadSession.d.ts

@@ -25,6 +25,7 @@ export declare const ZRBUploadSession: z.ZodObject<{
     createdAt: z.ZodDate;
     expiresAt: z.ZodDate;
     fileId: z.ZodOptional<z.ZodString>;
+    isPublic: z.ZodOptional<z.ZodBoolean>;
     error: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export type IRBUploadSession = z.infer<typeof ZRBUploadSession>;

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

@@ -1 +1 @@
-{"version":3,"file":"RBUploadSession.d.ts","sourceRoot":"","sources":["../../src/models/RBUploadSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAGvC,eAAO,MAAM,sBAAsB;;;;;EAAuD,CAAA;AAE1F,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;iBAc3B,CAAA;AAEF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAE/D,eAAO,MAAM,qBAAqB,EAAE,MAoBnC,CAAA;AAID,eAAO,MAAM,qBAAqB,EAAE,SAkBnC,CAAA"}
+{"version":3,"file":"RBUploadSession.d.ts","sourceRoot":"","sources":["../../src/models/RBUploadSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAGvC,eAAO,MAAM,sBAAsB;;;;;EAAuD,CAAA;AAE1F,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;iBAe3B,CAAA;AAEF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAE/D,eAAO,MAAM,qBAAqB,EAAE,MAqBnC,CAAA;AAID,eAAO,MAAM,qBAAqB,EAAE,SAkBnC,CAAA"}

package/dist/rbModelScopes.d.ts

@@ -0,0 +1,6 @@
+export declare const DEFAULT_GLOBAL_RB_MODEL_NAMES: readonly ["RBUser", "RBTenant"];
+export type DefaultGlobalRbModelName = (typeof DEFAULT_GLOBAL_RB_MODEL_NAMES)[number];
+export declare const DEFAULT_GLOBAL_RB_MODEL_NAMES_SET: Set<string>;
+export declare const TENANT_APP_RB_MODEL_NAMES: readonly ["RBUploadSession", "RBUploadChunk", "RBNotification", "RBNotificationSettings"];
+export type TenantAppRbModelName = (typeof TENANT_APP_RB_MODEL_NAMES)[number];
+//# sourceMappingURL=rbModelScopes.d.ts.map

package/dist/rbModelScopes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rbModelScopes.d.ts","sourceRoot":"","sources":["../src/rbModelScopes.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,6BAA6B,iCAGhC,CAAA;AAEV,MAAM,MAAM,wBAAwB,GAAG,CAAC,OAAO,6BAA6B,CAAC,CAAC,MAAM,CAAC,CAAA;AAErF,eAAO,MAAM,iCAAiC,aAAiD,CAAA;AAE/F,eAAO,MAAM,yBAAyB,2FAK5B,CAAA;AAEV,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,CAAC,CAAA"}

package/dist/registerModels.d.ts

@@ -1,6 +1,11 @@
 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, any>>;
-export type { ModelModules };
+type ModelsScope = "tenant" | "global";
+type RegisteredSchemas = Record<string, mongoose.Schema>;
+export declare const registerModels: ({ tenant, global }: {
+    tenant: ModelModules;
+    global?: ModelModules;
+}) => void;
+export declare const getRegisteredModels: (scope: ModelsScope) => RegisteredSchemas;
+export type { ModelModules, ModelsScope };
 //# sourceMappingURL=registerModels.d.ts.map

package/dist/registerModels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerModels.d.ts","sourceRoot":"","sources":["../src/registerModels.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAiB/B,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAwF3C,eAAO,MAAM,cAAc,GAAI,SAAS,YAAY,SAInD,CAAA;AAED,eAAO,MAAM,mBAAmB,sEAK/B,CAAA;AAED,YAAY,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"registerModels.d.ts","sourceRoot":"","sources":["../src/registerModels.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAW/B,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAC3C,KAAK,WAAW,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAEtC,KAAK,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;AAuDxD,eAAO,MAAM,cAAc,GAAI,oBAAoB;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,MAAM,CAAC,EAAE,YAAY,CAAA;CAAE,SA4CjG,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,OAAO,WAAW,sBAKrD,CAAA;AAED,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,CAAA"}

package/dist/rtsChangeLogPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rtsChangeLogPlugin.d.ts","sourceRoot":"","sources":["../src/rtsChangeLogPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAA;AAkKpC,eAAO,MAAM,kBAAkB,GAAI,QAAQ,QAAQ,CAAC,MAAM,KAAG,IAkC5D,CAAA"}
+{"version":3,"file":"rtsChangeLogPlugin.d.ts","sourceRoot":"","sources":["../src/rtsChangeLogPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAA;AAmKpC,eAAO,MAAM,kBAAkB,GAAI,QAAQ,QAAQ,CAAC,MAAM,KAAG,IAkC5D,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/db",
-  "version": "0.31.0",
+  "version": "0.33.0",
   "type": "module",
   "files": [
     "dist"