@rpcbase/db 0.33.0 → 0.35.0

package/dist/createModels.d.ts

@@ -1,25 +1,23 @@
-import { LoadModelCtx, loadGlobalModel, loadModel } from './loadModel';
+import { LoadModelCtx, models } from './modelsApi';
 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 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 RpcbaseGlobalModelName = Extract<FrameworkModelName, "RBUser" | "RBTenant">;
+export type TenantModelName<TTenantModules extends ModelModules> = ExtractModelNamesFromSchemas<TTenantModules>;
+export type GlobalModelName<TGlobalModules extends ModelModules> = RpcbaseGlobalModelName | ExtractModelNamesFromSchemas<TGlobalModules>;
+type LoadedTenantModel = Awaited<ReturnType<(typeof models)["get"]>>;
+type LoadedGlobalModel = Awaited<ReturnType<(typeof models)["getGlobal"]>>;
 type ModelsGetFn<TTenantModules extends ModelModules> = {
-    (modelName: TenantModelName<TTenantModules>, ctx: LoadModelCtx): ReturnType<typeof loadModel>;
+    (modelName: TenantModelName<TTenantModules>, ctx: LoadModelCtx): ReturnType<(typeof models)["get"]>;
     <const TNames extends readonly TenantModelName<TTenantModules>[]>(modelNames: TNames, ctx: LoadModelCtx): Promise<{
         [K in keyof TNames]: LoadedTenantModel;
     }>;
 };
 type ModelsGetGlobalFn<TGlobalModules extends ModelModules> = {
-    (modelName: GlobalModelName<TGlobalModules>, ctx: LoadModelCtx): ReturnType<typeof loadGlobalModel>;
+    (modelName: GlobalModelName<TGlobalModules>, ctx: LoadModelCtx): ReturnType<(typeof models)["getGlobal"]>;
     <const TNames extends readonly GlobalModelName<TGlobalModules>[]>(modelNames: TNames, ctx: LoadModelCtx): Promise<{
         [K in keyof TNames]: LoadedGlobalModel;
     }>;

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,eAAe,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAExD,OAAO,KAAK,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAGrF,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,0BAA0B,GAAG,OAAO,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,CAAA;AAEvF,MAAM,MAAM,eAAe,CAAC,cAAc,SAAS,YAAY,IAC3D,eAAe,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC,GAC7D,oBAAoB,CAAA;AAExB,MAAM,MAAM,eAAe,CAAC,cAAc,SAAS,YAAY,IAC3D,0BAA0B,GAC1B,eAAe,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC,CAAA;AAEjE,KAAK,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAA;AAC9D,KAAK,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAA;AAEpE,KAAK,WAAW,CAAC,cAAc,SAAS,YAAY,IAAI;IACtD,CAAC,SAAS,EAAE,eAAe,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,YAAY,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,CAAA;IAC7F,CAAC,KAAK,CAAC,MAAM,SAAS,SAAS,eAAe,CAAC,cAAc,CAAC,EAAE,EAC9D,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC;SAAG,CAAC,IAAI,MAAM,MAAM,GAAG,iBAAiB;KAAE,CAAC,CAAA;CACvD,CAAA;AAED,KAAK,iBAAiB,CAAC,cAAc,SAAS,YAAY,IAAI;IAC5D,CAAC,SAAS,EAAE,eAAe,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,YAAY,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IACnG,CAAC,KAAK,CAAC,MAAM,SAAS,SAAS,eAAe,CAAC,cAAc,CAAC,EAAE,EAC9D,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC;SAAG,CAAC,IAAI,MAAM,MAAM,GAAG,iBAAiB;KAAE,CAAC,CAAA;CACvD,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,cAAc,SAAS,YAAY,EAAE,cAAc,SAAS,YAAY,IAAI;IACnG,MAAM,EAAE,cAAc,CAAA;IACtB,MAAM,CAAC,EAAE,cAAc,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,cAAc,SAAS,YAAY,EAAE,cAAc,SAAS,YAAY,IAAI;IACnG,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,cAAc,EAAE,cAAc,CAAC,KAAK,IAAI,CAAA;IACzE,GAAG,EAAE,WAAW,CAAC,cAAc,CAAC,CAAA;IAChC,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAA;CAC7C,CAAA;AAED,eAAO,MAAM,YAAY,GACvB,cAAc,SAAS,YAAY,EACnC,cAAc,SAAS,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC3D,SAAS,YAAY,CAAC,cAAc,EAAE,cAAc,CAAC,KAAG,YAAY,CAAC,cAAc,EAAE,cAAc,CA4BpG,CAAA"}
+{"version":3,"file":"createModels.d.ts","sourceRoot":"","sources":["../src/createModels.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export * from './models';
 export * from './schema';
 export * from './createModels';
-export * from './loadModel';
+export * from './modelsApi';
 export * from './tenantFilesystemDb';
 export * from './acl';
 export * from './pagination';

package/dist/index.js

@@ -645,7 +645,11 @@ function extendZod(z_0) {
   };
   for (const [key, value] of Object.entries(TypesMap)) {
     if (value?.prototype) {
-      value.prototype.__zm_type = key;
+      Object.defineProperty(value.prototype, "__zm_type", {
+        value: key,
+        configurable: true,
+        writable: true
+      });
     }
   }
 }
@@ -1190,11 +1194,6 @@ 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 ?? "";
@@ -1876,7 +1875,10 @@ const mongoPaginationPlugin = (schema, pluginOptions) => {
   };
 };
 let cachedModels = null;
-const isRbModelName = (name) => name.startsWith("RB");
+const DEFAULT_GLOBAL_RB_MODEL_NAMES_SET = /* @__PURE__ */ new Set([
+  "RBUser",
+  "RBTenant"
+]);
 const assertSchema = (exportName, value) => {
   if (value instanceof mongoose.Schema) return value;
   throw new Error(
@@ -1887,13 +1889,17 @@ const assertSchema = (exportName, value) => {
     ].join(" ")
   );
 };
-const applyTenantPlugins = (schema, modelName) => {
+const getFrameworkSchemaForModelName = (modelName) => {
+  const exportName = `${modelName}Schema`;
+  const value = frameworkSchemas[exportName];
+  if (!(value instanceof mongoose.Schema)) return null;
+  return value;
+};
+const applyTenantPlugins = (schema) => {
   schema.plugin(accessibleRecordsPlugin);
   schema.plugin(mongooseAclPlugin);
   schema.plugin(mongoPaginationPlugin);
-  if (!isRbModelName(modelName)) {
-    schema.plugin(rtsChangeLogPlugin);
-  }
+  schema.plugin(rtsChangeLogPlugin);
 };
 const registerSchema = (target, other, modelName, schema, scope) => {
   if (target[modelName] || other[modelName]) {
@@ -1917,20 +1923,27 @@ const registerModels = ({ tenant, global }) => {
       registerSchema(globalSchemas, tenantSchemas, modelName, cloned);
     } else {
       const cloned = schema.clone();
-      applyTenantPlugins(cloned, modelName);
+      applyTenantPlugins(cloned);
       registerSchema(tenantSchemas, globalSchemas, modelName, cloned);
     }
   }
   for (const { modelName, schema } of buildSchemasFromModules(tenant)) {
-    if (isRbModelName(modelName)) {
+    if (modelName === "RBUser" || modelName === "RBTenant") {
+      throw new Error(`Invalid tenant model name "${modelName}". RBUser/RBTenant are global models.`);
+    }
+    if (modelName.startsWith("RB")) {
+      const frameworkSchema = getFrameworkSchemaForModelName(modelName);
+      if (frameworkSchema && schema === frameworkSchema) continue;
       throw new Error(`Invalid tenant model name "${modelName}". RB* models are reserved for rpcbase.`);
     }
     const cloned = schema.clone();
-    applyTenantPlugins(cloned, modelName);
+    applyTenantPlugins(cloned);
     registerSchema(tenantSchemas, globalSchemas, modelName, cloned);
   }
   for (const { modelName, schema } of buildSchemasFromModules(global ?? {})) {
-    if (isRbModelName(modelName)) {
+    if (modelName.startsWith("RB")) {
+      const frameworkSchema = getFrameworkSchemaForModelName(modelName);
+      if (frameworkSchema && schema === frameworkSchema) continue;
       throw new Error(`Invalid global model name "${modelName}". RB* models are reserved for rpcbase.`);
     }
     const cloned = schema.clone();
@@ -1946,23 +1959,10 @@ const registerModels = ({ tenant, global }) => {
 };
 const getRegisteredModels = (scope) => {
   if (!cachedModels) {
-    throw new Error("Models not registered. Call createModels(...) once at startup (or import your models module) before using loadModel.");
+    throw new Error("Models not registered. Call createModels(...) once at startup (or import your models module) before using models.get.");
   }
   return cachedModels[scope];
 };
-const assertTenantModelName = (modelName) => {
-  assert(
-    !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(
-    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, scope) => {
   const schemas = getRegisteredModels(scope);
   const schema = schemas[modelName];
@@ -1973,37 +1973,36 @@ const loadModelFromDb = async (modelName, dbName, scope) => {
   }
   return modelConnection.models[modelName];
 };
-const loadModel = async (modelName, ctx) => {
-  assertTenantModelName(modelName);
+const getTenantIdFromCtx = (ctx) => {
   const tenantId = ctx.req.session?.user?.currentTenantId;
   assert(typeof tenantId === "string" && tenantId.trim(), "Tenant ID is missing from session");
-  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.`);
+  return tenantId;
+};
+const models = {
+  register: registerModels,
+  get: async (modelName, ctx) => {
+    const tenantId = getTenantIdFromCtx(ctx);
+    const dbName = getTenantDbName(tenantId);
+    return loadModelFromDb(modelName, dbName, "tenant");
+  },
+  getGlobal: async (modelName, ctx) => {
+    const dbName = getGlobalDbName();
+    return loadModelFromDb(modelName, dbName, "global");
   }
-  const dbName = getGlobalDbName();
-  return loadModelFromDb(modelName, dbName, "global");
-};
-const loadRbModel = async (modelName, _ctx) => {
-  assertRbModelName(modelName);
-  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 Promise.all(modelNameOrNames.map((modelName) => models.get(modelName, ctx)));
     }
-    return loadModel(modelNameOrNames, ctx);
+    return models.get(modelNameOrNames, ctx);
   });
   const getGlobal = (async (modelNameOrNames, ctx) => {
     if (Array.isArray(modelNameOrNames)) {
-      return Promise.all(modelNameOrNames.map((modelName) => loadGlobalModel(modelName)));
+      return Promise.all(modelNameOrNames.map((modelName) => models.getGlobal(modelName, ctx)));
     }
-    return loadGlobalModel(modelNameOrNames);
+    return models.getGlobal(modelNameOrNames, ctx);
   });
   return {
     register: registerModels,
@@ -2077,9 +2076,7 @@ export {
   getTenantFilesystemDbName,
   getTenantRolesFromSessionUser,
   isPaginationValidationError,
-  loadGlobalModel,
-  loadModel,
-  loadRbModel,
+  models,
   mongoPaginationPlugin,
   registerPoliciesFromModules,
   registerPolicy,

package/dist/modelsApi.d.ts

@@ -0,0 +1,19 @@
+import { default as mongoose } from '../../vite/node_modules/mongoose';
+export type LoadModelCtx = {
+    req: {
+        session?: {
+            user?: {
+                currentTenantId?: string;
+            };
+        } | null;
+    };
+};
+export declare const models: {
+    readonly register: ({ tenant, global }: {
+        tenant: import('./registerModels').ModelModules;
+        global?: import('./registerModels').ModelModules;
+    }) => void;
+    readonly get: (modelName: string, ctx: LoadModelCtx) => Promise<mongoose.Model<any, {}, {}, {}, any, any, any>>;
+    readonly getGlobal: (modelName: string, ctx: LoadModelCtx) => Promise<mongoose.Model<any, {}, {}, {}, any, any, any>>;
+};
+//# sourceMappingURL=modelsApi.d.ts.map

package/dist/modelsApi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelsApi.d.ts","sourceRoot":"","sources":["../src/modelsApi.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAA;AAOpC,MAAM,MAAM,YAAY,GAAG;IACzB,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;AA0BF,eAAO,MAAM,MAAM;;;cAcq1B,CAAC;;8BAXh1B,MAAM,OAAO,YAAY;oCAMnB,MAAM,OAAO,YAAY;CAI9C,CAAA"}

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;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"}
+{"version":3,"file":"registerModels.d.ts","sourceRoot":"","sources":["../src/registerModels.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAU/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;AA8DxD,eAAO,MAAM,cAAc,GAAI,oBAAoB;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,MAAM,CAAC,EAAE,YAAY,CAAA;CAAE,SAmDjG,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,OAAO,WAAW,sBAKrD,CAAA;AAED,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../src/schema/extension.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../src/schema/extension.ts"],"names":[],"mappings":"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"}

package/dist/tenantFilesystemDb.d.ts

@@ -1,5 +1,5 @@
 import { default as mongoose } from '../../vite/node_modules/mongoose';
-import { LoadModelCtx } from './loadModel';
+import { LoadModelCtx } from './modelsApi';
 export declare const getTenantFilesystemDbName: (tenantId: string) => string;
 export declare const getTenantFilesystemDb: (tenantId: string) => Promise<mongoose.Connection>;
 export declare const getTenantFilesystemDbFromCtx: (ctx: LoadModelCtx) => Promise<mongoose.Connection>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/db",
-  "version": "0.33.0",
+  "version": "0.35.0",
   "type": "module",
   "files": [
     "dist"
@@ -69,7 +69,7 @@
   },
   "dependencies": {
     "@casl/ability": "6.7.5",
-    "@casl/mongoose": "8.0.3"
+    "@casl/mongoose": "8.0.4"
   },
   "devDependencies": {
     "@types/node": "25.0.3",

package/dist/loadModel.d.ts

@@ -1,15 +0,0 @@
-import { default as mongoose } from '../../vite/node_modules/mongoose';
-type LoadModelCtx = {
-    req: {
-        session?: {
-            user?: {
-                currentTenantId?: string;
-            };
-        } | null;
-    };
-};
-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 +0,0 @@
-{"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/rbModelScopes.d.ts

@@ -1,6 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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"}