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

package/README.md

@@ -12,18 +12,11 @@ pnpm add @usebetterdev/tenant
 
 ```ts
 import { betterTenant } from "@usebetterdev/tenant";
-import { drizzleAdapter } from "@usebetterdev/tenant/drizzle"; // or your adapter
+import { drizzleDatabase } from "@usebetterdev/tenant/drizzle"; // or prismaDatabase
 
-const adapter = drizzleAdapter(db);
 const tenant = betterTenant({
-  adapter,
+  database: drizzleDatabase(db),
   tenantResolver: { header: "x-tenant-id" },
-  getTenantRepository: (database) => ({ create, update, list, delete }), // adapter provides this
-});
-
-// In middleware: resolve tenantId (e.g. tenant.resolveTenant(request)), then:
-await tenant.runWithTenantAndDatabase(tenantId, adapter, async () => {
-  await next();
 });
 
 // In handlers:
@@ -35,15 +28,16 @@ const database = tenant.getDatabase();     // tenant-scoped DB handle (use only
 
 | API                                                     | Description                                                                                                  |
 | ------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
-| `betterTenant(config)`                                  | Create instance with adapter, resolver, optional `getTenantRepository`.                                      |
+| `betterTenant(config)`                                  | Create instance with `database` provider and resolver.                                                       |
 | `getContext()`                                          | Current `TenantContext \| undefined` (tenantId, tenant?, database?).                                         |
 | `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.                              |
-| `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.                                                       |
+| `tenant.runWithTenantAndDatabase(tenantId, fn)`         | Set context and run `fn` with adapter's tenant-scoped DB. Call from middleware.                              |
+| `resolveTenant(request, config)`                        | Resolve tenant id from request (header, path, subdomain, jwt, custom). Returns `Promise<string \| undefined>`. |
+| `tenant.runAs(tenantId, fn)`                            | Same as request flow; use for cron or per-tenant jobs.                                                       |
 | `runAsSystem(fn)`                                       | Run with RLS bypass (adapter must implement `runAsSystem`).                                                  |
-| `tenant.api`                                            | `createTenant`, `updateTenant`, `listTenants`, `deleteTenant` (when `getTenantRepository` is set).           |
+| `tenant.api`                                            | `createTenant`, `updateTenant`, `listTenants`, `deleteTenant`.                                               |
+| `TenantRepository.getBySlug(slug)`                      | Look up a tenant by slug. Used internally for slug-to-UUID auto-resolution. Returns `Tenant \| null`.        |
 
 ## Adapter contract
 
@@ -58,6 +52,26 @@ Types: `TenantScopedDatabase` (opaque handle), `SystemDatabase` (opaque handle f
 
 Resolution order: **header → path → subdomain → jwt → custom**. Configure `tenantResolver` with e.g. `header: "x-tenant-id"`, `path: "/t/:tenantId"`, `subdomain: true`, `jwt: { claim: "tenant_id" }`, or `custom: (req) => ...`.
 
+### Slug-to-UUID resolution
+
+After the resolver extracts an identifier, it is automatically normalized to a UUID:
+
+- **UUID** — passes through unchanged.
+- **Slug** (e.g. `"acme"`) — looked up in the tenants table via `getBySlug`.
+- **Custom transform** — if `resolveToId` is set, it is called instead of the above (takes full precedence).
+
+This means subdomain resolution (`"acme"`) or header-based slugs automatically resolve to UUIDs.
+
+### `resolveToId`
+
+Optional transform added to `TenantResolverConfig`:
+
+```ts
+resolveToId?: (identifier: string) => string | Promise<string>;
+```
+
+Use this to map custom domains, external IDs, or any non-slug identifier to a tenant UUID.
+
 ## Telemetry
 
 Anonymous telemetry is **on by default** to help improve the library. Data is sent to `https://telemetry.usebetter.dev` and includes runtime, framework, and redacted config (no PII or secrets). Telemetry is disabled in `NODE_ENV=test`.

package/dist/api.d.ts

@@ -13,6 +13,8 @@ export interface ListTenantsOptions {
 }
 /**
  * Tenant CRUD API. All methods run via adapter.runAsSystem and getTenantRepository.
+ * The runAsSystem check is deferred to call time so that betterTenant() can be
+ * constructed with adapters that don't implement runAsSystem (e.g. test mocks).
  */
 export declare function createTenantApi<TDb, SDb>(adapter: TenantAdapter<TDb, SDb>, getTenantRepository: (database: SDb) => TenantRepository): {
     createTenant(data: CreateTenantData): Promise<Tenant>;

package/dist/api.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"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;AAaD;;;;GAIG;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;uBAG7B,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;2BAiB/C,MAAM,QACV,gBAAgB,GACrB,OAAO,CAAC,MAAM,CAAC;0BAaS,kBAAkB,GAAQ,OAAO,CAAC,MAAM,EAAE,CAAC;2BAYzC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;EAUtD;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,4 +1,4 @@
-import type { BetterTenantConfig, Tenant, ResolvableRequest, TenantContext, TenantAdapter, RunWithTenantAndDatabaseOptions } from "./types.js";
+import type { BetterTenantConfig, Tenant, ResolvableRequest, TenantContext } from "./types.js";
 import { runWithTenant } from "./context.js";
 import { type HandleRequestOptions } from "./handle-request.js";
 export interface TenantApi {
@@ -20,19 +20,16 @@ export interface BetterTenantInstance<TDb = unknown, SDb = unknown> {
     getContext: () => TenantContext | undefined;
     getDatabase: () => TDb | undefined;
     runWithTenant: typeof runWithTenant;
-    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>;
+    runAs: <T>(tenantId: string, 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>;
+    resolveTenant: (request: ResolvableRequest) => Promise<string | undefined>;
+    /** Human-readable descriptions of the configured resolution strategies. */
+    resolverStrategies: string[];
     handleRequest: <Req extends ResolvableRequest, Result>(request: Req, next: () => Promise<Result>, options?: Omit<HandleRequestOptions<Req, Result>, "resolveTenant" | "adapter">) => Promise<Result>;
-    tenant: {
-        api: TenantApi;
-    };
+    api: TenantApi;
 }
 /**
- * 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.
+ * Creates the Better Tenant instance. Config must include adapter, tenantResolver, and getTenantRepository.
  */
 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,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"}
+{"version":3,"file":"better-tenant.d.ts","sourceRoot":"","sources":["../src/better-tenant.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,MAAM,EAIN,iBAAiB,EACjB,aAAa,EAEd,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAc,aAAa,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,qBAAqB,CAAC;AAwC7B,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,KAAK,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAC9E,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,CACb,OAAO,EAAE,iBAAiB,KACvB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACjC,2EAA2E;IAC3E,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,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,CACZ,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,EACjC,eAAe,GAAG,SAAS,CAC5B,KACE,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,GAAG,EAAE,SAAS,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EACnC,MAAM,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,GACnC,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,CAqDhC"}

package/dist/index.cjs

@@ -24,14 +24,13 @@ __export(index_exports, {
   TenantNotResolvedError: () => TenantNotResolvedError,
   betterTenant: () => betterTenant,
   createTenantApi: () => createTenantApi,
+  describeStrategies: () => describeStrategies,
   getContext: () => getContext,
   handleRequest: () => handleRequest,
   resolveTenant: () => resolveTenant,
-  resolveTenantAsync: () => resolveTenantAsync,
   runAs: () => runAs,
   runAsSystem: () => runAsSystem,
   runWithTenant: () => runWithTenant,
-  runWithTenantAndDatabase: () => runWithTenantAndDatabase,
   sendCliTelemetry: () => sendCliTelemetry,
   toResolvableRequest: () => toResolvableRequest
 });
@@ -55,7 +54,6 @@ function getTelemetryTenantConfig(config) {
       custom: !!r.custom
     },
     tenantTablesCount: 0,
-    hasGetTenantRepository: !!config.getTenantRepository,
     loadTenant: config.loadTenant,
     basePathSet: !!config.basePath,
     plugins: (config.plugins ?? []).map((p) => String(p.id))
@@ -374,17 +372,7 @@ function requireRunAsSystem(adapter) {
   }
   return adapter.runAsSystem;
 }
-function requireTenantRepository(getTenantRepository) {
-  if (!getTenantRepository) {
-    throw new Error(
-      "better-tenant: tenant.api requires getTenantRepository in config (adapter provides CRUD for tenants table)"
-    );
-  }
-  return getTenantRepository;
-}
 function createTenantApi(adapter, getTenantRepository) {
-  const runAsSystem2 = requireRunAsSystem(adapter);
-  const getRepository = requireTenantRepository(getTenantRepository);
   return {
     async createTenant(data) {
       if (!data.name?.trim()) {
@@ -393,8 +381,9 @@ function createTenantApi(adapter, getTenantRepository) {
       if (!data.slug?.trim()) {
         throw new Error("better-tenant: createTenant requires slug");
       }
+      const runAsSystem2 = requireRunAsSystem(adapter);
       return runAsSystem2(
-        (database) => getRepository(database).create({
+        (database) => getTenantRepository(database).create({
           name: data.name.trim(),
           slug: data.slug.trim()
         })
@@ -404,8 +393,9 @@ function createTenantApi(adapter, getTenantRepository) {
       if (!tenantId?.trim()) {
         throw new Error("better-tenant: updateTenant requires tenantId");
       }
+      const runAsSystem2 = requireRunAsSystem(adapter);
       return runAsSystem2(
-        (database) => getRepository(database).update(tenantId, {
+        (database) => getTenantRepository(database).update(tenantId, {
           ...data.name !== void 0 && { name: data.name },
           ...data.slug !== void 0 && { slug: data.slug }
         })
@@ -417,16 +407,18 @@ function createTenantApi(adapter, getTenantRepository) {
         MAX_LIST_LIMIT
       );
       const offset = Math.max(0, options.offset ?? 0);
+      const runAsSystem2 = requireRunAsSystem(adapter);
       return runAsSystem2(
-        (database) => getRepository(database).list({ limit, offset })
+        (database) => getTenantRepository(database).list({ limit, offset })
       );
     },
     async deleteTenant(tenantId) {
       if (!tenantId?.trim()) {
         throw new Error("better-tenant: deleteTenant requires tenantId");
       }
+      const runAsSystem2 = requireRunAsSystem(adapter);
       return runAsSystem2(
-        (database) => getRepository(database).delete(tenantId)
+        (database) => getTenantRepository(database).delete(tenantId)
       );
     }
   };
@@ -436,7 +428,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({ isSystem: true }, () => run(fn));
 }
 
 // src/resolver.ts
@@ -518,39 +510,7 @@ function decodeJwtPayload(token) {
     return null;
   }
 }
-function resolveFromJwt(request, config) {
-  const getToken = request.getToken;
-  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;
-  }
-  const claim = typeof config === "string" ? config : config.claim;
-  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) {
+async function resolveFromJwt(request, config) {
   const getToken = request.getToken;
   if (!getToken) {
     return void 0;
@@ -578,40 +538,28 @@ async function resolveFromJwtAsync(request, config) {
   const claimValue = payload[claim];
   return typeof claimValue === "string" && claimValue.length > 0 ? claimValue : void 0;
 }
-function resolveTenant(request, config) {
+function describeStrategies(config) {
+  const strategies = [];
   if (config.header !== void 0) {
-    const v = resolveFromHeader(request, config.header);
-    if (v !== void 0) {
-      return v;
-    }
+    strategies.push(`header '${config.header}'`);
   }
   if (config.path !== void 0) {
-    const v = resolveFromPath(request, config.path);
-    if (v !== void 0) {
-      return v;
-    }
+    const pattern = typeof config.path === "string" ? config.path : config.path.pattern;
+    strategies.push(`path '${pattern}'`);
   }
   if (config.subdomain !== void 0 && config.subdomain !== false) {
-    const v = resolveFromSubdomain(request, config.subdomain);
-    if (v !== void 0) {
-      return v;
-    }
+    strategies.push("subdomain");
   }
   if (config.jwt !== void 0) {
-    const v = resolveFromJwt(request, config.jwt);
-    if (v !== void 0) {
-      return v;
-    }
+    const claim = typeof config.jwt === "string" ? config.jwt : config.jwt.claim;
+    strategies.push(`jwt claim '${claim}'`);
   }
   if (config.custom !== void 0) {
-    const v = config.custom(request);
-    if (typeof v === "string" && v.length > 0) {
-      return v;
-    }
+    strategies.push("custom resolver");
   }
-  return void 0;
+  return strategies;
 }
-async function resolveTenantAsync(request, config) {
+async function resolveTenant(request, config) {
   if (config.header !== void 0) {
     const v = resolveFromHeader(request, config.header);
     if (v !== void 0) {
@@ -631,7 +579,7 @@ async function resolveTenantAsync(request, config) {
     }
   }
   if (config.jwt !== void 0) {
-    const v = await resolveFromJwtAsync(request, config.jwt);
+    const v = await resolveFromJwt(request, config.jwt);
     if (v !== void 0) {
       return v;
     }
@@ -646,40 +594,58 @@ async function resolveTenantAsync(request, config) {
 }
 
 // src/better-tenant.ts
+var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+async function resolveIdentifierToId(identifier, resolverConfig, adapter, getTenantRepository) {
+  if (resolverConfig.resolveToId) {
+    return resolverConfig.resolveToId(identifier);
+  }
+  if (UUID_RE.test(identifier)) {
+    return identifier;
+  }
+  if (adapter.runAsSystem) {
+    const tenant = await adapter.runAsSystem(
+      (systemDb) => getTenantRepository(systemDb).getBySlug(identifier)
+    );
+    return tenant?.id;
+  }
+  return identifier;
+}
 function betterTenant(config) {
-  const { adapter, tenantResolver, getTenantRepository, loadTenant } = config;
+  const { database, tenantResolver, loadTenant } = config;
+  const { adapter, getTenantRepository } = database;
   sendInitTelemetry(config, config.telemetry);
-  const api = getTenantRepository ? createTenantApi(adapter, getTenantRepository) : createStubTenantApi();
-  const shouldLoadTenant = getTenantRepository != null && loadTenant !== false;
-  const runWithTenantAndDatabaseOptions = shouldLoadTenant ? { loadTenant: true, getTenantRepository } : void 0;
+  const api = createTenantApi(adapter, getTenantRepository);
+  const runWithTenantAndDatabaseOptions = loadTenant !== false ? { loadTenant: true, getTenantRepository } : void 0;
+  const resolverStrategies = describeStrategies(tenantResolver);
+  async function resolveAndNormalize(request) {
+    const raw = await resolveTenant(request, tenantResolver);
+    if (!raw) return void 0;
+    return resolveIdentifierToId(
+      raw,
+      tenantResolver,
+      adapter,
+      getTenantRepository
+    );
+  }
   return {
     getContext,
     getDatabase: () => getDatabase(),
     runWithTenant,
-    runWithTenantAndDatabase: (tenantId, _adapter, fn) => runWithTenantAndDatabase(tenantId, adapter, fn, runWithTenantAndDatabaseOptions),
-    runAs: (tenantId, _adapter, fn) => runAs(tenantId, adapter, fn),
+    runAs: (tenantId, fn) => runWithTenantAndDatabase(
+      tenantId,
+      adapter,
+      fn,
+      runWithTenantAndDatabaseOptions
+    ),
     runAsSystem: (fn) => runAsSystem(adapter, fn),
-    resolveTenant: (request) => resolveTenant(request, tenantResolver),
-    resolveTenantAsync: (request) => resolveTenantAsync(request, tenantResolver),
+    resolveTenant: resolveAndNormalize,
+    resolverStrategies,
     handleRequest: (request, next, options) => handleRequest(request, next, {
       ...options,
-      resolveTenant: (input) => resolveTenantAsync(input, tenantResolver),
+      resolveTenant: resolveAndNormalize,
       adapter
     }),
-    tenant: { api }
-  };
-}
-function createStubTenantApi() {
-  const err = () => {
-    throw new Error(
-      "better-tenant: tenant.api requires getTenantRepository in config"
-    );
-  };
-  return {
-    createTenant: () => err(),
-    updateTenant: () => err(),
-    listTenants: () => err(),
-    deleteTenant: () => err()
+    api
   };
 }
 
@@ -773,14 +739,13 @@ function toResolvableRequest(request) {
   TenantNotResolvedError,
   betterTenant,
   createTenantApi,
+  describeStrategies,
   getContext,
   handleRequest,
   resolveTenant,
-  resolveTenantAsync,
   runAs,
   runAsSystem,
   runWithTenant,
-  runWithTenantAndDatabase,
   sendCliTelemetry,
   toResolvableRequest
 });