@usebetterdev/tenant-core 0.1.0 → 0.2.0-beta.11

package/README.md

@@ -1,24 +1,23 @@
-# @better-tenant/core
+# @usebetterdev/tenant-core
 
-Core library for request-scoped multi-tenancy with Postgres RLS. Provides tenant context (AsyncLocalStorage), resolver strategies, adapter contract, and tenant API. No database driver dependency — use with [@usebetterdev/tenant-drizzle](https://github.com/usebetter-dev/usebetter) or a custom adapter.
+Core library for request-scoped multi-tenancy with Postgres RLS. Provides tenant context (AsyncLocalStorage), resolver strategies, adapter contract, and tenant API. No database driver dependency — use with the Drizzle adapter or a custom adapter.
 
 ## Install
 
 ```bash
-pnpm add @better-tenant/core
+pnpm add @usebetterdev/tenant
 ```
 
 ## Quick start
 
 ```ts
-import { betterTenant, getContext, getDatabase } from "@better-tenant/core";
-import { drizzleAdapter } from "better-tenant/drizzle"; // or your adapter
+import { betterTenant } from "@usebetterdev/tenant";
+import { drizzleAdapter } from "@usebetterdev/tenant/drizzle"; // or your adapter
 
 const adapter = drizzleAdapter(db);
 const tenant = betterTenant({
   adapter,
   tenantResolver: { header: "x-tenant-id" },
-  tenantTables: ["projects", "tasks"],
   getTenantRepository: (database) => ({ create, update, list, delete }), // adapter provides this
 });
 
@@ -38,9 +37,9 @@ const database = tenant.getDatabase();     // tenant-scoped DB handle (use only
 | ------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
 | `betterTenant(config)`                                  | Create instance with adapter, resolver, optional `getTenantRepository`.                                      |
 | `getContext()`                                          | Current `TenantContext \| undefined` (tenantId, tenant?, database?).                                         |
-| `getDatabase()`                                         | Tenant-scoped database handle, or `undefined` outside request scope. Use only this for tenant-scoped tables. |
+| `tenant.getDatabase()`                                  | Tenant-scoped database handle, or `undefined` outside request scope. Use only this for tenant-scoped tables. |
 | `runWithTenant(tenantId, fn)`                           | Run `fn` with context only (no DB). For tests or when adapter not used.                                      |
-| `runWithTenantAndDatabase(tenantId, adapter, fn)`       | Set context and run `fn` with adapter’s tenant-scoped DB. Call from middleware.                              |
+| `runWithTenantAndDatabase(tenantId, adapter, fn)`       | Set context and run `fn` with adapter's tenant-scoped DB. Call from middleware.                              |
 | `resolveTenant(request, config)` / `resolveTenantAsync` | Resolve tenant id from request (header, path, subdomain, jwt, custom).                                       |
 | `runAs(tenantId, adapter, fn)`                          | Same as request flow; use for cron or per-tenant jobs.                                                       |
 | `runAsSystem(fn)`                                       | Run with RLS bypass (adapter must implement `runAsSystem`).                                                  |

package/dist/adapter.d.ts

@@ -1,4 +1,4 @@
-import type { TenantAdapter, TenantScopedDatabase, RunWithTenantAndDatabaseOptions } from "./types.js";
+import type { TenantAdapter, RunWithTenantAndDatabaseOptions } from "./types.js";
 /**
  * Returns the tenant-scoped database handle when inside a runWithTenantAndDatabase (or runAs) scope.
  *
@@ -6,7 +6,7 @@ import type { TenantAdapter, TenantScopedDatabase, RunWithTenantAndDatabaseOptio
  * Config requires an adapter when tenant-scoped DB is used; getDatabase() is then available inside
  * request handlers that ran via runWithTenantAndDatabase(tenantId, adapter, next).
  */
-export declare function getDatabase(): TenantScopedDatabase | undefined;
+export declare function getDatabase(): unknown;
 /**
  * Sets AsyncLocalStorage context and runs fn with the adapter's tenant-scoped DB.
  *
@@ -20,5 +20,5 @@ export declare function getDatabase(): TenantScopedDatabase | undefined;
  * When options.loadTenant is true and options.getTenantRepository and adapter.runAsSystem are set,
  * loads the full Tenant row into context so getContext().tenant is available (or undefined if not found).
  */
-export declare function runWithTenantAndDatabase<T>(tenantId: string, adapter: TenantAdapter, fn: (database: TenantScopedDatabase) => Promise<T>, options?: RunWithTenantAndDatabaseOptions): Promise<T>;
+export declare function runWithTenantAndDatabase<TDb, SDb, T>(tenantId: string, adapter: TenantAdapter<TDb, SDb>, fn: (database: TDb) => Promise<T>, options?: RunWithTenantAndDatabaseOptions<SDb>): Promise<T>;
 //# sourceMappingURL=adapter.d.ts.map

package/dist/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,+BAA+B,EAChC,MAAM,YAAY,CAAC;AAGpB;;;;;;GAMG;AACH,wBAAgB,WAAW,IAAI,oBAAoB,GAAG,SAAS,CAG9D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,wBAAwB,CAAC,CAAC,EAC9C,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,aAAa,EACtB,EAAE,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,OAAO,CAAC,CAAC,CAAC,EAClD,OAAO,CAAC,EAAE,+BAA+B,GACxC,OAAO,CAAC,CAAC,CAAC,CAgBZ"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,+BAA+B,EAChC,MAAM,YAAY,CAAC;AAGpB;;;;;;GAMG;AACH,wBAAgB,WAAW,IAAI,OAAO,CAGrC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EACxD,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAChC,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,EACjC,OAAO,CAAC,EAAE,+BAA+B,CAAC,GAAG,CAAC,GAC7C,OAAO,CAAC,CAAC,CAAC,CAiBZ"}

package/dist/api.d.ts

@@ -1,4 +1,4 @@
-import type { TenantAdapter, Tenant, SystemDatabase, TenantScopedDatabase, TenantRepository } from "./types.js";
+import type { TenantAdapter, Tenant, TenantRepository } from "./types.js";
 export interface CreateTenantData {
     name: string;
     slug: string;
@@ -14,7 +14,7 @@ export interface ListTenantsOptions {
 /**
  * Tenant CRUD API. All methods run via adapter.runAsSystem and getTenantRepository.
  */
-export declare function createTenantApi(adapter: TenantAdapter, getTenantRepository: (database: SystemDatabase) => TenantRepository): {
+export declare function createTenantApi<TDb, SDb>(adapter: TenantAdapter<TDb, SDb>, getTenantRepository: (database: SDb) => TenantRepository): {
     createTenant(data: CreateTenantData): Promise<Tenant>;
     updateTenant(tenantId: string, data: UpdateTenantData): Promise<Tenant>;
     listTenants(options?: ListTenantsOptions): Promise<Tenant[]>;
@@ -24,10 +24,10 @@ export declare function createTenantApi(adapter: TenantAdapter, getTenantReposit
  * runAs(tenantId, fn): same as request flow — set context + run inside adapter.runWithTenant
  * so code can use getDatabase() and run tenant-scoped queries. Use for cron, per-tenant migrations.
  */
-export declare function runAs<T>(tenantId: string, adapter: TenantAdapter, fn: (database: TenantScopedDatabase) => Promise<T>): Promise<T>;
+export declare function runAs<TDb, T>(tenantId: string, adapter: TenantAdapter<TDb>, fn: (database: TDb) => Promise<T>): Promise<T>;
 /**
  * runAsSystem(fn): run fn with a DB handle that has RLS bypass.
  * Optionally set context so getContext() reflects system mode.
  */
-export declare function runAsSystem<T>(adapter: TenantAdapter, fn: (database: SystemDatabase) => Promise<T>): Promise<T>;
+export declare function runAsSystem<SDb, T>(adapter: TenantAdapter<unknown, SDb>, fn: (database: SDb) => Promise<T>): Promise<T>;
 //# sourceMappingURL=api.d.ts.map

package/dist/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,MAAM,EACN,cAAc,EACd,oBAAoB,EACpB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAOpB,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAwBD;;GAEG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,aAAa,EACtB,mBAAmB,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,gBAAgB;uBAMxC,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;2BAgB/C,MAAM,QACV,gBAAgB,GACrB,OAAO,CAAC,MAAM,CAAC;0BAYS,kBAAkB,GAAQ,OAAO,CAAC,MAAM,EAAE,CAAC;2BAWzC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;EAStD;AAED;;;GAGG;AACH,wBAAsB,KAAK,CAAC,CAAC,EAC3B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,aAAa,EACtB,EAAE,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,OAAO,CAAC,CAAC,CAAC,GACjD,OAAO,CAAC,CAAC,CAAC,CAEZ;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,CAAC,EACjC,OAAO,EAAE,aAAa,EACtB,EAAE,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,CAAC,CAAC,GAC3C,OAAO,CAAC,CAAC,CAAC,CAKZ"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAO1E,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAwBD;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,EACtC,OAAO,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAChC,mBAAmB,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,gBAAgB;uBAM7B,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;2BAgB/C,MAAM,QACV,gBAAgB,GACrB,OAAO,CAAC,MAAM,CAAC;0BAYS,kBAAkB,GAAQ,OAAO,CAAC,MAAM,EAAE,CAAC;2BAWzC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;EAStD;AAED;;;GAGG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,CAAC,EAChC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,EAC3B,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,GAChC,OAAO,CAAC,CAAC,CAAC,CAEZ;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,CAAC,EACtC,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,GAAG,CAAC,EACpC,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,GAChC,OAAO,CAAC,CAAC,CAAC,CAGZ"}

package/dist/better-tenant.d.ts

@@ -1,8 +1,6 @@
-import type { BetterTenantConfig, Tenant, ResolvableRequest, SystemDatabase } from "./types.js";
-import { getContext, runWithTenant } from "./context.js";
-import { getDatabase, runWithTenantAndDatabase } from "./adapter.js";
+import type { BetterTenantConfig, Tenant, ResolvableRequest, TenantContext, TenantAdapter, RunWithTenantAndDatabaseOptions } from "./types.js";
+import { runWithTenant } from "./context.js";
 import { type HandleRequestOptions } from "./handle-request.js";
-import { runAs } from "./api.js";
 export interface TenantApi {
     createTenant(data: {
         name: string;
@@ -18,13 +16,13 @@ export interface TenantApi {
     }): Promise<Tenant[]>;
     deleteTenant(tenantId: string): Promise<void>;
 }
-export interface BetterTenantInstance {
-    getContext: typeof getContext;
-    getDatabase: typeof getDatabase;
+export interface BetterTenantInstance<TDb = unknown, SDb = unknown> {
+    getContext: () => TenantContext | undefined;
+    getDatabase: () => TDb | undefined;
     runWithTenant: typeof runWithTenant;
-    runWithTenantAndDatabase: typeof runWithTenantAndDatabase;
-    runAs: typeof runAs;
-    runAsSystem: <T>(fn: (database: SystemDatabase) => Promise<T>) => Promise<T>;
+    runWithTenantAndDatabase: <T>(tenantId: string, adapter: TenantAdapter<TDb, SDb>, fn: (database: TDb) => Promise<T>, options?: RunWithTenantAndDatabaseOptions<SDb>) => Promise<T>;
+    runAs: <T>(tenantId: string, adapter: TenantAdapter<TDb>, fn: (database: TDb) => Promise<T>) => Promise<T>;
+    runAsSystem: <T>(fn: (database: SDb) => Promise<T>) => Promise<T>;
     resolveTenant: (request: ResolvableRequest) => string | undefined;
     resolveTenantAsync: (request: ResolvableRequest) => Promise<string | undefined>;
     handleRequest: <Req extends ResolvableRequest, Result>(request: Req, next: () => Promise<Result>, options?: Omit<HandleRequestOptions<Req, Result>, "resolveTenant" | "adapter">) => Promise<Result>;
@@ -36,5 +34,5 @@ export interface BetterTenantInstance {
  * Creates the Better Tenant instance. Config must include adapter and tenantResolver.
  * When getTenantRepository is provided, tenant.api is available for CRUD on the tenants table.
  */
-export declare function betterTenant(config: BetterTenantConfig): BetterTenantInstance;
+export declare function betterTenant<TDb, SDb>(config: BetterTenantConfig<TDb, SDb>): BetterTenantInstance<TDb, SDb>;
 //# sourceMappingURL=better-tenant.d.ts.map

package/dist/better-tenant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"better-tenant.d.ts","sourceRoot":"","sources":["../src/better-tenant.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,MAAM,EACN,iBAAiB,EACjB,cAAc,EACf,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,KAAK,EAEN,MAAM,UAAU,CAAC;AAGlB,MAAM,WAAW,SAAS;IACxB,YAAY,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACpE,YAAY,CACV,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GACrC,OAAO,CAAC,MAAM,CAAC,CAAC;IACnB,WAAW,CAAC,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9E,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,OAAO,UAAU,CAAC;IAC9B,WAAW,EAAE,OAAO,WAAW,CAAC;IAChC,aAAa,EAAE,OAAO,aAAa,CAAC;IACpC,wBAAwB,EAAE,OAAO,wBAAwB,CAAC;IAC1D,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7E,aAAa,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,MAAM,GAAG,SAAS,CAAC;IAClE,kBAAkB,EAAE,CAClB,OAAO,EAAE,iBAAiB,KACvB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACjC,aAAa,EAAE,CAAC,GAAG,SAAS,iBAAiB,EAAE,MAAM,EACnD,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC3B,OAAO,CAAC,EAAE,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC,KAC3E,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,MAAM,EAAE;QAAE,GAAG,EAAE,SAAS,CAAA;KAAE,CAAC;CAC5B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,oBAAoB,CAmC7E"}
+{"version":3,"file":"better-tenant.d.ts","sourceRoot":"","sources":["../src/better-tenant.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,MAAM,EACN,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,+BAA+B,EAChC,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAc,aAAa,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,qBAAqB,CAAC;AAQ7B,MAAM,WAAW,SAAS;IACxB,YAAY,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACpE,YAAY,CACV,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GACrC,OAAO,CAAC,MAAM,CAAC,CAAC;IACnB,WAAW,CAAC,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9E,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,oBAAoB,CAAC,GAAG,GAAG,OAAO,EAAE,GAAG,GAAG,OAAO;IAChE,UAAU,EAAE,MAAM,aAAa,GAAG,SAAS,CAAC;IAC5C,WAAW,EAAE,MAAM,GAAG,GAAG,SAAS,CAAC;IACnC,aAAa,EAAE,OAAO,aAAa,CAAC;IACpC,wBAAwB,EAAE,CAAC,CAAC,EAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAChC,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,EACjC,OAAO,CAAC,EAAE,+BAA+B,CAAC,GAAG,CAAC,KAC3C,OAAO,CAAC,CAAC,CAAC,CAAC;IAChB,KAAK,EAAE,CAAC,CAAC,EACP,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,EAC3B,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,KAC9B,OAAO,CAAC,CAAC,CAAC,CAAC;IAChB,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAClE,aAAa,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,MAAM,GAAG,SAAS,CAAC;IAClE,kBAAkB,EAAE,CAClB,OAAO,EAAE,iBAAiB,KACvB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACjC,aAAa,EAAE,CAAC,GAAG,SAAS,iBAAiB,EAAE,MAAM,EACnD,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC3B,OAAO,CAAC,EAAE,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC,KAC3E,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,MAAM,EAAE;QAAE,GAAG,EAAE,SAAS,CAAA;KAAE,CAAC;CAC5B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,CAmC3G"}

package/dist/index.cjs

@@ -25,7 +25,6 @@ __export(index_exports, {
   betterTenant: () => betterTenant,
   createTenantApi: () => createTenantApi,
   getContext: () => getContext,
-  getDatabase: () => getDatabase,
   handleRequest: () => handleRequest,
   resolveTenant: () => resolveTenant,
   resolveTenantAsync: () => resolveTenantAsync,
@@ -55,7 +54,7 @@ function getTelemetryTenantConfig(config) {
       jwt: !!r.jwt,
       custom: !!r.custom
     },
-    tenantTablesCount: config.tenantTables?.length ?? 0,
+    tenantTablesCount: 0,
     hasGetTenantRepository: !!config.getTenantRepository,
     loadTenant: config.loadTenant,
     basePathSet: !!config.basePath,
@@ -72,7 +71,9 @@ function getTelemetryCliConfig(config) {
 function getAnonymousId(cwd) {
   try {
     const pkgPath = (0, import_node_path.join)(cwd, "package.json");
-    if (!(0, import_node_fs.existsSync)(pkgPath)) return void 0;
+    if (!(0, import_node_fs.existsSync)(pkgPath)) {
+      return void 0;
+    }
     const pkg = JSON.parse((0, import_node_fs.readFileSync)(pkgPath, "utf-8"));
     const name = typeof pkg?.name === "string" ? pkg.name : "";
     const basePath = typeof pkg?.betterTenant?.basePath === "string" ? pkg.betterTenant.basePath : "";
@@ -101,22 +102,34 @@ function detectRuntime() {
 }
 function detectEnvironment() {
   const env = process.env.NODE_ENV || "development";
-  if (env === "test") return "test";
+  if (env === "test") {
+    return "test";
+  }
   if (process.env.CI === "true" || process.env.GITHUB_ACTIONS === "true" || process.env.GITLAB_CI === "true" || process.env.CIRCLECI === "true") {
     return "ci";
   }
-  if (env === "production") return "production";
+  if (env === "production") {
+    return "production";
+  }
   return "development";
 }
 function detectFramework(cwd) {
   try {
     const pkgPath = (0, import_node_path.join)(cwd, "package.json");
-    if (!(0, import_node_fs.existsSync)(pkgPath)) return void 0;
+    if (!(0, import_node_fs.existsSync)(pkgPath)) {
+      return void 0;
+    }
     const pkg = JSON.parse((0, import_node_fs.readFileSync)(pkgPath, "utf-8"));
     const deps = { ...pkg?.dependencies, ...pkg?.devDependencies };
-    if (deps["next"]) return { name: "next", version: deps["next"] };
-    if (deps["hono"]) return { name: "hono", version: deps["hono"] };
-    if (deps["express"]) return { name: "express", version: deps["express"] };
+    if (deps["next"]) {
+      return { name: "next", version: deps["next"] };
+    }
+    if (deps["hono"]) {
+      return { name: "hono", version: deps["hono"] };
+    }
+    if (deps["express"]) {
+      return { name: "express", version: deps["express"] };
+    }
     return void 0;
   } catch {
     return void 0;
@@ -125,12 +138,17 @@ function detectFramework(cwd) {
 function detectDatabase(cwd) {
   try {
     const pkgPath = (0, import_node_path.join)(cwd, "package.json");
-    if (!(0, import_node_fs.existsSync)(pkgPath)) return void 0;
+    if (!(0, import_node_fs.existsSync)(pkgPath)) {
+      return void 0;
+    }
     const pkg = JSON.parse((0, import_node_fs.readFileSync)(pkgPath, "utf-8"));
     const deps = { ...pkg?.dependencies, ...pkg?.devDependencies };
-    if (deps["drizzle-orm"])
+    if (deps["drizzle-orm"]) {
       return { name: "drizzle", version: deps["drizzle-orm"] };
-    if (deps["prisma"]) return { name: "prisma", version: deps["prisma"] };
+    }
+    if (deps["prisma"]) {
+      return { name: "prisma", version: deps["prisma"] };
+    }
     return void 0;
   } catch {
     return void 0;
@@ -151,31 +169,46 @@ function detectSystem() {
 }
 function detectPackageManager() {
   const ua = process.env.npm_config_user_agent;
-  if (!ua || typeof ua !== "string") return void 0;
+  if (!ua || typeof ua !== "string") {
+    return void 0;
+  }
   const match = ua.match(/^(.+?)\/(\d+\.\d+\.\d+.*?)(?:\s|$)/);
   if (match) {
     const name = (match[1] ?? "unknown").toLowerCase();
     const version = match[2];
     return version ? { name, version } : { name };
   }
-  if (ua.includes("pnpm")) return { name: "pnpm" };
-  if (ua.includes("yarn")) return { name: "yarn" };
+  if (ua.includes("pnpm")) {
+    return { name: "pnpm" };
+  }
+  if (ua.includes("yarn")) {
+    return { name: "yarn" };
+  }
   return { name: "npm" };
 }
 function isTelemetryEnabled(options) {
-  if (process.env.NODE_ENV === "test") return false;
+  if (process.env.NODE_ENV === "test") {
+    return false;
+  }
   const env = process.env.BETTER_TENANT_TELEMETRY;
-  if (env === "0" || env?.toLowerCase() === "false") return false;
-  if (env === "1" || env?.toLowerCase() === "true") return true;
+  if (env === "0" || env?.toLowerCase() === "false") {
+    return false;
+  }
+  if (env === "1" || env?.toLowerCase() === "true") {
+    return true;
+  }
   return options?.enabled !== false;
 }
 function isDebugMode(options) {
-  if (process.env.BETTER_TENANT_TELEMETRY_DEBUG === "1") return true;
+  if (process.env.BETTER_TENANT_TELEMETRY_DEBUG === "1") {
+    return true;
+  }
   return options?.debug === true;
 }
 function sendTelemetry(type, payload, options) {
-  if (!isTelemetryEnabled(options))
+  if (!isTelemetryEnabled(options)) {
     return options?.wait ? Promise.resolve() : void 0;
+  }
   const fullPayload = {
     library: LIBRARY_ID,
     type,
@@ -273,9 +306,10 @@ function getDatabase() {
 async function runWithTenantAndDatabase(tenantId, adapter, fn, options) {
   const result = await adapter.runWithTenant(tenantId, async (database) => {
     let context = { tenantId, database };
-    if (options?.loadTenant && options.getTenantRepository && adapter.runAsSystem) {
+    const getTenantRepository = options?.getTenantRepository;
+    if (options?.loadTenant && getTenantRepository && adapter.runAsSystem) {
       const tenant = await adapter.runAsSystem(
-        (systemDb) => options.getTenantRepository(systemDb).getById(tenantId)
+        (systemDb) => getTenantRepository(systemDb).getById(tenantId)
       );
       context = tenant != null ? { ...context, tenant } : context;
     }
@@ -402,10 +436,7 @@ async function runAs(tenantId, adapter, fn) {
 }
 async function runAsSystem(adapter, fn) {
   const run = requireRunAsSystem(adapter);
-  return runWithContext(
-    { tenantId: "", isSystem: true },
-    () => run(fn)
-  );
+  return runWithContext({ tenantId: "", isSystem: true }, () => run(fn));
 }
 
 // src/resolver.ts
@@ -416,17 +447,23 @@ function getHeader(headers, name) {
     return value2?.trim() || void 0;
   }
   const raw = headers[key] ?? headers[name];
-  if (raw === void 0) return void 0;
+  if (raw === void 0) {
+    return void 0;
+  }
   const value = Array.isArray(raw) ? raw[0] : raw;
   return (typeof value === "string" ? value : "").trim() || void 0;
 }
 function resolveFromHeader(request, headerName) {
-  if (!headerName) return void 0;
+  if (!headerName) {
+    return void 0;
+  }
   return getHeader(request.headers, headerName);
 }
 function resolveFromPath(request, pathConfig) {
   const pathOrUrl = request.path ?? request.url;
-  if (!pathOrUrl) return void 0;
+  if (!pathOrUrl) {
+    return void 0;
+  }
   let path;
   try {
     path = pathOrUrl.startsWith("http") ? new URL(pathOrUrl).pathname : pathOrUrl;
@@ -446,11 +483,17 @@ function parseTenantSegmentIndex(pattern) {
 }
 function resolveFromSubdomain(request, config) {
   const host = request.host ?? (request.url ? new URL(request.url).host : "");
-  if (!host) return void 0;
+  if (!host) {
+    return void 0;
+  }
   const hostname = host.split(":")[0];
-  if (!hostname) return void 0;
+  if (!hostname) {
+    return void 0;
+  }
   const parts = hostname.split(".");
-  if (parts.length <= 2) return void 0;
+  if (parts.length <= 2) {
+    return void 0;
+  }
   const index = config === true ? 0 : typeof config === "object" && config.segmentIndex !== void 0 ? config.segmentIndex : 0;
   const value = parts[index];
   return typeof value === "string" && value.length > 0 ? value : void 0;
@@ -458,86 +501,146 @@ function resolveFromSubdomain(request, config) {
 function decodeJwtPayload(token) {
   try {
     const parts = token.split(".");
-    if (parts.length < 2) return null;
+    if (parts.length < 2) {
+      return null;
+    }
     const payload = parts[1];
-    if (!payload) return null;
+    if (!payload) {
+      return null;
+    }
     const decoded = atob(payload.replace(/-/g, "+").replace(/_/g, "/"));
-    return JSON.parse(decoded);
+    const parsed = JSON.parse(decoded);
+    if (typeof parsed !== "object" || parsed === null) {
+      return null;
+    }
+    return parsed;
   } catch {
     return null;
   }
 }
 function resolveFromJwt(request, config) {
   const getToken = request.getToken;
-  if (!getToken) return void 0;
+  if (!getToken) {
+    return void 0;
+  }
   const token = typeof getToken === "function" ? getToken() : getToken;
   const value = token instanceof Promise ? void 0 : token ?? void 0;
   const resolved = value ?? void 0;
-  if (!resolved) return void 0;
+  if (!resolved) {
+    return void 0;
+  }
   const claim = typeof config === "string" ? config : config.claim;
-  if (!claim) return void 0;
-  const payload = decodeJwtPayload(resolved);
-  if (!payload) return void 0;
+  if (!claim) {
+    return void 0;
+  }
+  const verifyToken = typeof config === "object" ? config.verifyToken : void 0;
+  let payload;
+  if (verifyToken) {
+    const result = verifyToken(resolved);
+    if (result instanceof Promise) {
+      return void 0;
+    }
+    payload = result;
+  } else {
+    payload = decodeJwtPayload(resolved);
+  }
+  if (!payload) {
+    return void 0;
+  }
   const claimValue = payload[claim];
   return typeof claimValue === "string" && claimValue.length > 0 ? claimValue : void 0;
 }
 async function resolveFromJwtAsync(request, config) {
   const getToken = request.getToken;
-  if (!getToken) return void 0;
+  if (!getToken) {
+    return void 0;
+  }
   const token = typeof getToken === "function" ? getToken() : getToken;
   const value = token instanceof Promise ? await token : token;
   const resolved = value ?? void 0;
-  if (!resolved) return void 0;
+  if (!resolved) {
+    return void 0;
+  }
   const claim = typeof config === "string" ? config : config.claim;
-  if (!claim) return void 0;
-  const payload = decodeJwtPayload(resolved);
-  if (!payload) return void 0;
+  if (!claim) {
+    return void 0;
+  }
+  const verifyToken = typeof config === "object" ? config.verifyToken : void 0;
+  let payload;
+  if (verifyToken) {
+    payload = await verifyToken(resolved);
+  } else {
+    payload = decodeJwtPayload(resolved);
+  }
+  if (!payload) {
+    return void 0;
+  }
   const claimValue = payload[claim];
   return typeof claimValue === "string" && claimValue.length > 0 ? claimValue : void 0;
 }
 function resolveTenant(request, config) {
   if (config.header !== void 0) {
     const v = resolveFromHeader(request, config.header);
-    if (v !== void 0) return v;
+    if (v !== void 0) {
+      return v;
+    }
   }
   if (config.path !== void 0) {
     const v = resolveFromPath(request, config.path);
-    if (v !== void 0) return v;
+    if (v !== void 0) {
+      return v;
+    }
   }
   if (config.subdomain !== void 0 && config.subdomain !== false) {
     const v = resolveFromSubdomain(request, config.subdomain);
-    if (v !== void 0) return v;
+    if (v !== void 0) {
+      return v;
+    }
   }
   if (config.jwt !== void 0) {
     const v = resolveFromJwt(request, config.jwt);
-    if (v !== void 0) return v;
+    if (v !== void 0) {
+      return v;
+    }
   }
   if (config.custom !== void 0) {
     const v = config.custom(request);
-    if (typeof v === "string" && v.length > 0) return v;
+    if (typeof v === "string" && v.length > 0) {
+      return v;
+    }
   }
   return void 0;
 }
 async function resolveTenantAsync(request, config) {
   if (config.header !== void 0) {
     const v = resolveFromHeader(request, config.header);
-    if (v !== void 0) return v;
+    if (v !== void 0) {
+      return v;
+    }
   }
   if (config.path !== void 0) {
     const v = resolveFromPath(request, config.path);
-    if (v !== void 0) return v;
+    if (v !== void 0) {
+      return v;
+    }
   }
   if (config.subdomain !== void 0 && config.subdomain !== false) {
     const v = resolveFromSubdomain(request, config.subdomain);
-    if (v !== void 0) return v;
+    if (v !== void 0) {
+      return v;
+    }
   }
   if (config.jwt !== void 0) {
     const v = await resolveFromJwtAsync(request, config.jwt);
-    if (v !== void 0) return v;
+    if (v !== void 0) {
+      return v;
+    }
   }
   if (config.custom !== void 0) {
     const v = await Promise.resolve(config.custom(request));
-    if (typeof v === "string" && v.length > 0) return v;
+    if (typeof v === "string" && v.length > 0) {
+      return v;
+    }
   }
   return void 0;
 }
@@ -551,7 +654,7 @@ function betterTenant(config) {
   const runWithTenantAndDatabaseOptions = shouldLoadTenant ? { loadTenant: true, getTenantRepository } : void 0;
   return {
     getContext,
-    getDatabase,
+    getDatabase: () => getDatabase(),
     runWithTenant,
     runWithTenantAndDatabase: (tenantId, _adapter, fn) => runWithTenantAndDatabase(tenantId, adapter, fn, runWithTenantAndDatabaseOptions),
     runAs: (tenantId, _adapter, fn) => runAs(tenantId, adapter, fn),
@@ -585,12 +688,16 @@ function isFetchRequest(input) {
   return typeof Request !== "undefined" && input instanceof Request;
 }
 function normalizeHost(raw) {
-  if (!raw) return void 0;
+  if (!raw) {
+    return void 0;
+  }
   const value = raw.split(":")[0]?.trim();
   return value || void 0;
 }
 function normalizeHeaders(headers) {
-  if (!headers) return {};
+  if (!headers) {
+    return {};
+  }
   const normalized = {};
   for (const [key, value] of Object.entries(headers)) {
     const normalizedKey = key.toLowerCase();
@@ -607,7 +714,9 @@ function normalizeHeaders(headers) {
   return normalized;
 }
 function pathWithoutQuery(value) {
-  if (!value) return void 0;
+  if (!value) {
+    return void 0;
+  }
   const [pathname] = value.split("?");
   return pathname || void 0;
 }
@@ -641,7 +750,9 @@ function toResolvableRequest(request) {
   const hostFromHeaders = headers.host;
   const hostValue = Array.isArray(hostFromHeaders) ? hostFromHeaders[0] : hostFromHeaders;
   const host = normalizeHost(request.hostname ?? request.host ?? hostValue);
-  const path = pathWithoutQuery(request.path ?? request.originalUrl ?? request.url);
+  const path = pathWithoutQuery(
+    request.path ?? request.originalUrl ?? request.url
+  );
   const resolved = {
     headers
   };
@@ -663,7 +774,6 @@ function toResolvableRequest(request) {
   betterTenant,
   createTenantApi,
   getContext,
-  getDatabase,
   handleRequest,
   resolveTenant,
   resolveTenantAsync,