drizzle-multitenant 1.0.1 → 1.0.2

package/.claude/settings.local.json

@@ -8,7 +8,9 @@
       "Bash(tree:*)",
       "Bash(find:*)",
       "Bash(mkdir:*)",
-      "Bash(node ./bin/drizzle-multitenant.js:*)"
+      "Bash(node ./bin/drizzle-multitenant.js:*)",
+      "Bash(ls:*)",
+      "Bash(npm run test:*)"
     ]
   }
 }

package/dist/integrations/nestjs/index.js

@@ -9478,18 +9478,50 @@ function createTenantProviders() {
       },
       inject: [TENANT_MODULE_OPTIONS]
     },
-    // TenantDb - request scoped
+    // TenantDb - request scoped with lazy resolution via Proxy
+    // This fixes the timing issue where TENANT_DB is resolved before TenantGuard executes
     {
       provide: TENANT_DB,
       scope: Scope.REQUEST,
-      useFactory: (request, manager) => {
-        const tenantId = request.tenantContext?.tenantId ?? request.tenantId;
-        if (!tenantId) {
-          return null;
-        }
-        return manager.getDb(tenantId);
+      useFactory: (request, manager, options) => {
+        return new Proxy({}, {
+          get(_target, prop) {
+            let tenantId = request.tenantContext?.tenantId ?? request.tenantId;
+            if (!tenantId && options.extractTenantId) {
+              const extracted = options.extractTenantId(request);
+              if (typeof extracted === "string") {
+                tenantId = extracted;
+              }
+            }
+            if (!tenantId) {
+              throw new Error(
+                "[drizzle-multitenant] No tenant context found. Ensure the route has a tenant ID or use @PublicRoute() decorator."
+              );
+            }
+            const db = manager.getDb(tenantId);
+            return db[prop];
+          },
+          has(_target, prop) {
+            const tenantId = request.tenantContext?.tenantId ?? request.tenantId;
+            if (!tenantId) return false;
+            const db = manager.getDb(tenantId);
+            return prop in db;
+          },
+          ownKeys() {
+            const tenantId = request.tenantContext?.tenantId ?? request.tenantId;
+            if (!tenantId) return [];
+            const db = manager.getDb(tenantId);
+            return Reflect.ownKeys(db);
+          },
+          getOwnPropertyDescriptor(_target, prop) {
+            const tenantId = request.tenantContext?.tenantId ?? request.tenantId;
+            if (!tenantId) return void 0;
+            const db = manager.getDb(tenantId);
+            return Object.getOwnPropertyDescriptor(db, prop);
+          }
+        });
       },
-      inject: [REQUEST, TENANT_MANAGER]
+      inject: [REQUEST, TENANT_MANAGER, TENANT_MODULE_OPTIONS]
     },
     // SharedDb - singleton (doesn't need request scope)
     {
@@ -9499,14 +9531,57 @@ function createTenantProviders() {
       },
       inject: [TENANT_MANAGER]
     },
-    // TenantContext - request scoped
+    // TenantContext - request scoped with lazy resolution via Proxy
+    // This fixes the timing issue where TENANT_CONTEXT is resolved before TenantGuard executes
     {
       provide: TENANT_CONTEXT,
       scope: Scope.REQUEST,
-      useFactory: (request) => {
-        return request.tenantContext ?? null;
+      useFactory: (request, manager, options) => {
+        return new Proxy({}, {
+          get(_target, prop) {
+            if (request.tenantContext) {
+              return request.tenantContext[prop];
+            }
+            let tenantId = request.tenantId;
+            if (!tenantId && options.extractTenantId) {
+              const extracted = options.extractTenantId(request);
+              if (typeof extracted === "string") {
+                tenantId = extracted;
+              }
+            }
+            if (!tenantId) {
+              throw new Error(
+                "[drizzle-multitenant] No tenant context found. Ensure the route has a tenant ID or use @PublicRoute() decorator."
+              );
+            }
+            const schemaName = manager.getSchemaName(tenantId);
+            const context = { tenantId, schemaName };
+            return context[prop];
+          },
+          has(_target, prop) {
+            if (request.tenantContext) {
+              return prop in request.tenantContext;
+            }
+            return prop === "tenantId" || prop === "schemaName";
+          },
+          ownKeys() {
+            if (request.tenantContext) {
+              return Reflect.ownKeys(request.tenantContext);
+            }
+            return ["tenantId", "schemaName"];
+          },
+          getOwnPropertyDescriptor(_target, prop) {
+            if (request.tenantContext) {
+              return Object.getOwnPropertyDescriptor(request.tenantContext, prop);
+            }
+            if (prop === "tenantId" || prop === "schemaName") {
+              return { configurable: true, enumerable: true, writable: true };
+            }
+            return void 0;
+          }
+        });
       },
-      inject: [REQUEST]
+      inject: [REQUEST, TENANT_MANAGER, TENANT_MODULE_OPTIONS]
     }
   ];
 }