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

package/README.md

@@ -1,30 +1,22 @@
-# @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 { drizzleDatabase } from "@usebetterdev/tenant/drizzle"; // or prismaDatabase
 
-const adapter = drizzleAdapter(db);
 const tenant = betterTenant({
-  adapter,
+  database: drizzleDatabase(db),
   tenantResolver: { header: "x-tenant-id" },
-  tenantTables: ["projects", "tasks"],
-  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:
@@ -36,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?).                                         |
-| `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.                              |
-| `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
 
@@ -59,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/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;
@@ -13,8 +13,10 @@ 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(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 +26,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;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,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 } 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,23 +16,20 @@ 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>;
-    resolveTenant: (request: ResolvableRequest) => string | undefined;
-    resolveTenantAsync: (request: ResolvableRequest) => Promise<string | undefined>;
+    runAs: <T>(tenantId: string, fn: (database: TDb) => Promise<T>) => Promise<T>;
+    runAsSystem: <T>(fn: (database: SDb) => Promise<T>) => Promise<T>;
+    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(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,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"}