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

package/dist/index.js

@@ -15,7 +15,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,
@@ -32,7 +32,9 @@ function getTelemetryCliConfig(config) {
 function getAnonymousId(cwd) {
   try {
     const pkgPath = join(cwd, "package.json");
-    if (!existsSync(pkgPath)) return void 0;
+    if (!existsSync(pkgPath)) {
+      return void 0;
+    }
     const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
     const name = typeof pkg?.name === "string" ? pkg.name : "";
     const basePath = typeof pkg?.betterTenant?.basePath === "string" ? pkg.betterTenant.basePath : "";
@@ -61,22 +63,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 = join(cwd, "package.json");
-    if (!existsSync(pkgPath)) return void 0;
+    if (!existsSync(pkgPath)) {
+      return void 0;
+    }
     const pkg = JSON.parse(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;
@@ -85,12 +99,17 @@ function detectFramework(cwd) {
 function detectDatabase(cwd) {
   try {
     const pkgPath = join(cwd, "package.json");
-    if (!existsSync(pkgPath)) return void 0;
+    if (!existsSync(pkgPath)) {
+      return void 0;
+    }
     const pkg = JSON.parse(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;
@@ -111,31 +130,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,
@@ -233,9 +267,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;
     }
@@ -362,10 +397,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
@@ -376,17 +408,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;
@@ -406,11 +444,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;
@@ -418,86 +462,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;
 }
@@ -511,7 +615,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),
@@ -545,12 +649,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();
@@ -567,7 +675,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;
 }
@@ -601,7 +711,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
   };
@@ -622,7 +734,6 @@ export {
   betterTenant,
   createTenantApi,
   getContext,
-  getDatabase,
   handleRequest,
   resolveTenant,
   resolveTenantAsync,