@onyx.dev/onyx-database 2.0.1 → 2.1.1

package/dist/gen/cli/generate.cjs

@@ -231,7 +231,6 @@ async function resolveConfig(input) {
   const maxRetries = retryConfig.maxRetries ?? 3;
   const retryInitialDelayMs = retryConfig.initialDelayMs ?? 300;
   const missing = [];
-  if (!databaseId) missing.push("databaseId");
   if (!apiKey) missing.push("apiKey");
   if (!apiSecret) missing.push("apiSecret");
   if (missing.length) {
@@ -2218,20 +2217,38 @@ var AiChatClientImpl = class {
   }
 };
 function createOnyxFacade(resolveConfig2) {
-  let cachedCfg = null;
+  const cachedCfgs = /* @__PURE__ */ new Map();
+  const cacheKey = (databaseId, apiKey) => {
+    const id = typeof databaseId === "string" && databaseId.trim() !== "" ? databaseId.trim() : null;
+    const key = typeof apiKey === "string" && apiKey.trim() !== "" ? apiKey.trim() : null;
+    return id && key ? `${id}-${key}` : null;
+  };
   function resolveConfigWithCache(config) {
     const ttl = config?.ttl ?? DEFAULT_CACHE_TTL;
     const now = Date.now();
-    if (cachedCfg && cachedCfg.expires > now) {
-      return cachedCfg.promise;
+    const hintKey = cacheKey(config?.databaseId, config?.apiKey) ?? "__default__";
+    const existing = cachedCfgs.get(hintKey);
+    if (existing && existing.expires > now) {
+      return existing.promise;
     }
+    if (existing) cachedCfgs.delete(hintKey);
     const { ttl: _ttl, requestLoggingEnabled: _reqLog, responseLoggingEnabled: _resLog, ...rest } = config ?? {};
-    const promise = resolveConfig2(rest);
-    cachedCfg = { promise, expires: now + ttl };
+    const expires = now + ttl;
+    const promise = resolveConfig2(rest).then((resolved) => {
+      const resolvedKey = cacheKey(resolved.databaseId, resolved.apiKey) ?? hintKey;
+      const nextExpires = Date.now() + ttl;
+      cachedCfgs.set(resolvedKey, { promise, expires: nextExpires });
+      if (resolvedKey !== hintKey) {
+        const stale = cachedCfgs.get(hintKey);
+        if (stale && stale.promise === promise) cachedCfgs.delete(hintKey);
+      }
+      return resolved;
+    });
+    cachedCfgs.set(hintKey, { promise, expires });
     return promise;
   }
   function clearCacheConfig() {
-    cachedCfg = null;
+    cachedCfgs.clear();
   }
   return {
     init(config) {
@@ -2335,7 +2352,7 @@ function normalizeIntrospection(raw) {
 async function fetchSchemaFromApi(config) {
   const db = onyx.init({
     baseUrl: config.baseUrl,
-    databaseId: config.databaseId,
+    ...config.databaseId ? { databaseId: config.databaseId } : {},
     apiKey: config.apiKey,
     apiSecret: config.apiSecret,
     fetch: config.fetch
@@ -2358,12 +2375,11 @@ async function generateTypes(options) {
   if (!schemaInput) {
     if (opts.source === "file") throw new Error("Failed to read schema from file");
     const cfg = await resolveConfig({});
-    if (!cfg.databaseId) {
-      throw new Error("Missing databaseId. Set ONYX_DATABASE_ID or pass to onyx.init().");
-    }
-    if (!opts.quiet)
-      process__default.default.stderr.write(`[onyx-gen] fetching schema from API for db ${cfg.databaseId}
+    if (!opts.quiet) {
+      const target = cfg.databaseId ? `db ${cfg.databaseId}` : "default database context";
+      process__default.default.stderr.write(`[onyx-gen] fetching schema from API for ${target}
 `);
+    }
     schemaInput = await fetchSchemaFromApi(cfg);
   }
   const schema = normalizeIntrospection(schemaInput);