@onyx.dev/onyx-database 1.0.0 → 1.0.3

package/dist/schema/cli/schema.cjs

@@ -78,7 +78,7 @@ function readEnv(targetId) {
   return res;
 }
 async function readProjectFile(databaseId) {
-  if (!isNode) return {};
+  if (!isNode) return { config: {} };
   const fs = await nodeImport("node:fs/promises");
   const path2 = await nodeImport("node:path");
   const cwd = gProcess?.cwd?.() ?? ".";
@@ -87,7 +87,7 @@ async function readProjectFile(databaseId) {
     const sanitized = txt.replace(/[\r\n]+/g, "");
     const json = dropUndefined(JSON.parse(sanitized));
     dbg("project file:", p, "\u2192", mask(json));
-    return json;
+    return { config: json, path: p };
   };
   if (databaseId) {
     const specific = path2.resolve(cwd, `onyx-database-${databaseId}.json`);
@@ -102,11 +102,11 @@ async function readProjectFile(databaseId) {
     return await tryRead(fallback);
   } catch {
     dbg("project file not found:", fallback);
-    return {};
+    return { config: {} };
   }
 }
 async function readHomeProfile(databaseId) {
-  if (!isNode) return {};
+  if (!isNode) return { config: {} };
   const fs = await nodeImport("node:fs/promises");
   const os = await nodeImport("node:os");
   const path2 = await nodeImport("node:path");
@@ -126,7 +126,7 @@ async function readHomeProfile(databaseId) {
       const sanitized = txt.replace(/[\r\n]+/g, "");
       const json = dropUndefined(JSON.parse(sanitized));
       dbg("home profile used:", p, "\u2192", mask(json));
-      return json;
+      return { config: json, path: p };
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       throw new OnyxConfigError(`Failed to read ${p}: ${msg}`);
@@ -145,7 +145,7 @@ async function readHomeProfile(databaseId) {
   dbg("no home-root fallback:", defaultInHome);
   if (!await fileExists(dir)) {
     dbg("~/.onyx does not exist:", dir);
-    return {};
+    return { config: {} };
   }
   const files = await fs.readdir(dir).catch(() => []);
   const matches = files.filter((f) => f.startsWith("onyx-database-") && f.endsWith(".json"));
@@ -159,10 +159,10 @@ async function readHomeProfile(databaseId) {
     );
   }
   dbg("no usable home profiles found in", dir);
-  return {};
+  return { config: {} };
 }
 async function readConfigPath(p) {
-  if (!isNode) return {};
+  if (!isNode) return { config: {} };
   const fs = await nodeImport("node:fs/promises");
   const path2 = await nodeImport("node:path");
   const cwd = gProcess?.cwd?.() ?? ".";
@@ -172,7 +172,7 @@ async function readConfigPath(p) {
     const sanitized = txt.replace(/[\r\n]+/g, "");
     const json = dropUndefined(JSON.parse(sanitized));
     dbg("config path:", resolved, "\u2192", mask(json));
-    return json;
+    return { config: json, path: resolved };
   } catch (e) {
     const msg = e instanceof Error ? e.message : String(e);
     throw new OnyxConfigError(`Failed to read ${resolved}: ${msg}`);
@@ -183,7 +183,8 @@ async function resolveConfig(input) {
   const env = readEnv(input?.databaseId);
   let cfgPath = {};
   if (configPath) {
-    cfgPath = await readConfigPath(configPath);
+    const cfgRes = await readConfigPath(configPath);
+    cfgPath = cfgRes.config;
   }
   const targetId = input?.databaseId ?? env.databaseId ?? cfgPath.databaseId;
   let haveDbId = !!(input?.databaseId ?? env.databaseId ?? cfgPath.databaseId);
@@ -191,14 +192,16 @@ async function resolveConfig(input) {
   let haveApiSecret = !!(input?.apiSecret ?? env.apiSecret ?? cfgPath.apiSecret);
   let project = {};
   if (!(haveDbId && haveApiKey && haveApiSecret)) {
-    project = await readProjectFile(targetId);
+    const projRes = await readProjectFile(targetId);
+    project = projRes.config;
     if (project.databaseId) haveDbId = true;
     if (project.apiKey) haveApiKey = true;
     if (project.apiSecret) haveApiSecret = true;
   }
   let home = {};
   if (!(haveDbId && haveApiKey && haveApiSecret)) {
-    home = await readHomeProfile(targetId);
+    const homeRes = await readHomeProfile(targetId);
+    home = homeRes.config;
   }
   const merged = {
     baseUrl: DEFAULT_BASE_URL,
@@ -217,6 +220,10 @@ async function resolveConfig(input) {
   const fetchImpl = merged.fetch ?? (typeof gfetch === "function" ? (u, i) => gfetch(u, i) : async () => {
     throw new OnyxConfigError("No fetch available; provide OnyxConfig.fetch");
   });
+  const retryConfig = input?.retry ?? env.retry ?? cfgPath.retry ?? project.retry ?? home.retry ?? {};
+  const retryEnabled = retryConfig.enabled ?? true;
+  const maxRetries = retryConfig.maxRetries ?? 3;
+  const retryInitialDelayMs = retryConfig.initialDelayMs ?? 300;
   const missing = [];
   if (!databaseId) missing.push("databaseId");
   if (!apiKey) missing.push("apiKey");
@@ -239,7 +246,16 @@ async function resolveConfig(input) {
       `Missing required config: ${missing.join(", ")}. Sources: ${sources.join(", ")}`
     );
   }
-  const resolved = { baseUrl, databaseId, apiKey, apiSecret, fetch: fetchImpl };
+  const resolved = {
+    baseUrl,
+    databaseId,
+    apiKey,
+    apiSecret,
+    fetch: fetchImpl,
+    retryEnabled,
+    maxRetries,
+    retryInitialDelayMs
+  };
   const source = {
     databaseId: input?.databaseId ? "explicit config" : env.databaseId ? "env" : cfgPath.databaseId ? "env ONYX_CONFIG_PATH" : project.databaseId ? "project file" : home.databaseId ? "home profile" : "unknown",
     apiKey: input?.apiKey ? "explicit config" : env.apiKey ? "env" : cfgPath.apiKey ? "env ONYX_CONFIG_PATH" : project.apiKey ? "project file" : home.apiKey ? "home profile" : "unknown",
@@ -249,6 +265,27 @@ async function resolveConfig(input) {
   dbg("resolved:", mask(resolved));
   return resolved;
 }
+async function resolveConfigWithSource(input) {
+  const configPathEnv = gProcess?.env?.ONYX_CONFIG_PATH;
+  const env = readEnv(input?.databaseId);
+  const cfgPathRes = configPathEnv ? await readConfigPath(configPathEnv) : { config: {} };
+  const cfgPath = cfgPathRes.config;
+  const projectRes = await readProjectFile(env.databaseId ?? cfgPath.databaseId);
+  const project = projectRes.config;
+  const homeRes = await readHomeProfile(env.databaseId ?? cfgPath.databaseId);
+  const home = homeRes.config;
+  const base = await resolveConfig(input);
+  const sources = {
+    baseUrl: input?.baseUrl ? "explicit config" : env.baseUrl ? "env" : cfgPath.baseUrl ? "env ONYX_CONFIG_PATH" : project.baseUrl ? "project file" : home.baseUrl ? "home profile" : "default",
+    databaseId: input?.databaseId ? "explicit config" : env.databaseId ? "env" : cfgPath.databaseId ? "env ONYX_CONFIG_PATH" : project.databaseId ? "project file" : home.databaseId ? "home profile" : "unknown",
+    apiKey: input?.apiKey ? "explicit config" : env.apiKey ? "env" : cfgPath.apiKey ? "env ONYX_CONFIG_PATH" : project.apiKey ? "project file" : home.apiKey ? "home profile" : "unknown",
+    apiSecret: input?.apiSecret ? "explicit config" : env.apiSecret ? "env" : cfgPath.apiSecret ? "env ONYX_CONFIG_PATH" : project.apiSecret ? "project file" : home.apiSecret ? "home profile" : "unknown",
+    configPath: cfgPathRes.path,
+    projectFile: projectRes.path,
+    homeProfile: homeRes.path
+  };
+  return { ...base, sources };
+}
 function mask(obj) {
   if (!obj) return obj;
   const clone = { ...obj };
@@ -296,7 +333,7 @@ function parseJsonAllowNaN(txt) {
     return JSON.parse(fixed);
   }
 }
-var HttpClient = class {
+var HttpClient = class _HttpClient {
   baseUrl;
   apiKey;
   apiSecret;
@@ -304,6 +341,25 @@ var HttpClient = class {
   defaults;
   requestLoggingEnabled;
   responseLoggingEnabled;
+  retryEnabled;
+  maxRetries;
+  retryInitialDelayMs;
+  shouldRetry;
+  static parseRetryAfter(header) {
+    if (!header) return null;
+    const trimmed = header.trim();
+    if (trimmed === "") return null;
+    const seconds = Number(trimmed);
+    if (Number.isFinite(seconds)) {
+      return Math.max(0, seconds * 1e3);
+    }
+    const dateMs = Date.parse(trimmed);
+    if (!Number.isNaN(dateMs)) {
+      const now = Date.now();
+      return Math.max(0, dateMs - now);
+    }
+    return null;
+  }
   constructor(opts) {
     if (!opts.baseUrl || opts.baseUrl.trim() === "") {
       throw new OnyxConfigError("baseUrl is required");
@@ -328,6 +384,10 @@ var HttpClient = class {
     const envDebug = globalThis.process?.env?.ONYX_DEBUG === "true";
     this.requestLoggingEnabled = !!opts.requestLoggingEnabled || envDebug;
     this.responseLoggingEnabled = !!opts.responseLoggingEnabled || envDebug;
+    this.retryEnabled = opts.retryEnabled ?? true;
+    this.maxRetries = Math.max(0, opts.maxRetries ?? 2);
+    this.retryInitialDelayMs = Math.max(0, opts.retryInitialDelayMs ?? 100);
+    this.shouldRetry = (method, path2) => method === "GET" || path2.startsWith("/query/");
   }
   headers(extra) {
     const extras = { ...extra ?? {} };
@@ -368,9 +428,8 @@ var HttpClient = class {
       headers,
       body: payload
     };
-    const isQuery = path2.includes("/query/") && !/\/query\/(?:update|delete)\//.test(path2);
-    const canRetry = method === "GET" || isQuery;
-    const maxAttempts = canRetry ? 3 : 1;
+    const canRetry = this.retryEnabled && this.shouldRetry(method, path2);
+    const maxAttempts = canRetry ? this.maxRetries + 1 : 1;
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       try {
         const res = await this.fetchImpl(url, init);
@@ -388,7 +447,10 @@ var HttpClient = class {
         if (!res.ok) {
           const msg = typeof data === "object" && data !== null && "error" in data && typeof data.error?.message === "string" ? String(data.error.message) : `${res.status} ${res.statusText}`;
           if (canRetry && res.status >= 500 && attempt + 1 < maxAttempts) {
-            await new Promise((r) => setTimeout(r, 100 * 2 ** attempt));
+            const serverRetry = _HttpClient.parseRetryAfter(res.headers.get("retry-after"));
+            const backoff = this.retryInitialDelayMs * 2 ** attempt;
+            const delay = serverRetry ?? backoff;
+            await new Promise((r) => setTimeout(r, delay));
             continue;
           }
           throw new OnyxHttpError(msg, res.status, res.statusText, data, raw);
@@ -397,7 +459,8 @@ var HttpClient = class {
       } catch (err) {
         const retryable = canRetry && (!(err instanceof OnyxHttpError) || err.status >= 500);
         if (attempt + 1 < maxAttempts && retryable) {
-          await new Promise((r) => setTimeout(r, 100 * 2 ** attempt));
+          const delay = this.retryInitialDelayMs * 2 ** attempt;
+          await new Promise((r) => setTimeout(r, delay));
           continue;
         }
         throw err;
@@ -958,31 +1021,299 @@ var CascadeRelationshipBuilder = class {
   }
 };
 
-// src/errors/onyx-error.ts
-var OnyxError = class extends Error {
-  name = "OnyxError";
-  constructor(message) {
-    super(message);
+// src/helpers/schema-diff.ts
+function mapByName(items) {
+  const map = /* @__PURE__ */ new Map();
+  for (const item of items ?? []) {
+    if (!item?.name) continue;
+    map.set(item.name, item);
   }
-};
-
-// src/impl/onyx.ts
-var DEFAULT_CACHE_TTL = 5 * 60 * 1e3;
-var cachedCfg = null;
-function resolveConfigWithCache(config) {
-  const ttl = config?.ttl ?? DEFAULT_CACHE_TTL;
-  const now = Date.now();
-  if (cachedCfg && cachedCfg.expires > now) {
-    return cachedCfg.promise;
-  }
-  const { ttl: _ttl, requestLoggingEnabled: _reqLog, responseLoggingEnabled: _resLog, ...rest } = config ?? {};
-  const promise = resolveConfig(rest);
-  cachedCfg = { promise, expires: now + ttl };
-  return promise;
+  return map;
+}
+function normalizeEntities(schema) {
+  if (Array.isArray(schema.entities)) {
+    return schema.entities ?? [];
+  }
+  const tables = schema.tables;
+  if (!Array.isArray(tables)) return [];
+  return tables.map((table) => ({
+    name: table.name,
+    attributes: table.attributes ?? []
+  }));
+}
+function normalizePartition(partition) {
+  if (partition == null) return "";
+  const trimmed = partition.trim();
+  return trimmed;
+}
+function identifiersEqual(a, b) {
+  if (!a && !b) return true;
+  if (!a || !b) return false;
+  return a.name === b.name && a.generator === b.generator && a.type === b.type;
+}
+function diffAttributes(apiAttrs, localAttrs) {
+  const apiMap = mapByName(apiAttrs);
+  const localMap = mapByName(localAttrs);
+  const added = [];
+  const removed = [];
+  const changed = [];
+  for (const [name, local] of localMap.entries()) {
+    if (!apiMap.has(name)) {
+      added.push(local);
+      continue;
+    }
+    const api = apiMap.get(name);
+    const apiNull = Boolean(api.isNullable);
+    const localNull = Boolean(local.isNullable);
+    if (api.type !== local.type || apiNull !== localNull) {
+      changed.push({
+        name,
+        from: { type: api.type, isNullable: apiNull },
+        to: { type: local.type, isNullable: localNull }
+      });
+    }
+  }
+  for (const name of apiMap.keys()) {
+    if (!localMap.has(name)) removed.push(name);
+  }
+  added.sort((a, b) => a.name.localeCompare(b.name));
+  removed.sort();
+  changed.sort((a, b) => a.name.localeCompare(b.name));
+  if (!added.length && !removed.length && !changed.length) return null;
+  return { added, removed, changed };
+}
+function diffIndexes(apiIndexes, localIndexes) {
+  const apiMap = mapByName(apiIndexes);
+  const localMap = mapByName(localIndexes);
+  const added = [];
+  const removed = [];
+  const changed = [];
+  for (const [name, local] of localMap.entries()) {
+    if (!apiMap.has(name)) {
+      added.push(local);
+      continue;
+    }
+    const api = apiMap.get(name);
+    const apiType = api.type ?? "DEFAULT";
+    const localType = local.type ?? "DEFAULT";
+    const apiScore = api.minimumScore;
+    const localScore = local.minimumScore;
+    if (apiType !== localType || apiScore !== localScore) {
+      changed.push({ name, from: api, to: local });
+    }
+  }
+  for (const name of apiMap.keys()) {
+    if (!localMap.has(name)) removed.push(name);
+  }
+  added.sort((a, b) => a.name.localeCompare(b.name));
+  removed.sort();
+  changed.sort((a, b) => a.name.localeCompare(b.name));
+  if (!added.length && !removed.length && !changed.length) return null;
+  return { added, removed, changed };
+}
+function diffResolvers(apiResolvers, localResolvers) {
+  const apiMap = mapByName(apiResolvers);
+  const localMap = mapByName(localResolvers);
+  const added = [];
+  const removed = [];
+  const changed = [];
+  for (const [name, local] of localMap.entries()) {
+    if (!apiMap.has(name)) {
+      added.push(local);
+      continue;
+    }
+    const api = apiMap.get(name);
+    if (api.resolver !== local.resolver) {
+      changed.push({ name, from: api, to: local });
+    }
+  }
+  for (const name of apiMap.keys()) {
+    if (!localMap.has(name)) removed.push(name);
+  }
+  added.sort((a, b) => a.name.localeCompare(b.name));
+  removed.sort();
+  changed.sort((a, b) => a.name.localeCompare(b.name));
+  if (!added.length && !removed.length && !changed.length) return null;
+  return { added, removed, changed };
+}
+function diffTriggers(apiTriggers, localTriggers) {
+  const apiMap = mapByName(apiTriggers);
+  const localMap = mapByName(localTriggers);
+  const added = [];
+  const removed = [];
+  const changed = [];
+  for (const [name, local] of localMap.entries()) {
+    if (!apiMap.has(name)) {
+      added.push(local);
+      continue;
+    }
+    const api = apiMap.get(name);
+    if (api.event !== local.event || api.trigger !== local.trigger) {
+      changed.push({ name, from: api, to: local });
+    }
+  }
+  for (const name of apiMap.keys()) {
+    if (!localMap.has(name)) removed.push(name);
+  }
+  added.sort((a, b) => a.name.localeCompare(b.name));
+  removed.sort();
+  changed.sort((a, b) => a.name.localeCompare(b.name));
+  if (!added.length && !removed.length && !changed.length) return null;
+  return { added, removed, changed };
+}
+function computeSchemaDiff(apiSchema, localSchema) {
+  const apiEntities = normalizeEntities(apiSchema);
+  const localEntities = normalizeEntities(localSchema);
+  const apiMap = mapByName(apiEntities);
+  const localMap = mapByName(localEntities);
+  const newTables = [];
+  const removedTables = [];
+  const changedTables = [];
+  for (const [name, localEntity] of localMap.entries()) {
+    if (!apiMap.has(name)) {
+      newTables.push(name);
+      continue;
+    }
+    const apiEntity = apiMap.get(name);
+    const tableDiff = { name };
+    const partitionFrom = normalizePartition(apiEntity.partition);
+    const partitionTo = normalizePartition(localEntity.partition);
+    if (partitionFrom !== partitionTo) {
+      tableDiff.partition = { from: partitionFrom || null, to: partitionTo || null };
+    }
+    if (!identifiersEqual(apiEntity.identifier, localEntity.identifier)) {
+      tableDiff.identifier = {
+        from: apiEntity.identifier ?? null,
+        to: localEntity.identifier ?? null
+      };
+    }
+    const attrs = diffAttributes(apiEntity.attributes, localEntity.attributes);
+    if (attrs) tableDiff.attributes = attrs;
+    const indexes = diffIndexes(apiEntity.indexes, localEntity.indexes);
+    if (indexes) tableDiff.indexes = indexes;
+    const resolvers = diffResolvers(apiEntity.resolvers, localEntity.resolvers);
+    if (resolvers) tableDiff.resolvers = resolvers;
+    const triggers = diffTriggers(apiEntity.triggers, localEntity.triggers);
+    if (triggers) tableDiff.triggers = triggers;
+    const hasChange = tableDiff.partition || tableDiff.identifier || tableDiff.attributes || tableDiff.indexes || tableDiff.resolvers || tableDiff.triggers;
+    if (hasChange) {
+      changedTables.push(tableDiff);
+    }
+  }
+  for (const name of apiMap.keys()) {
+    if (!localMap.has(name)) removedTables.push(name);
+  }
+  newTables.sort();
+  removedTables.sort();
+  changedTables.sort((a, b) => a.name.localeCompare(b.name));
+  return { newTables, removedTables, changedTables };
+}
+function isScalar(value) {
+  return value == null || value instanceof Date || typeof value === "string" || typeof value === "number" || typeof value === "boolean";
+}
+function formatScalar(value) {
+  if (value === null || value === void 0) return "null";
+  if (value instanceof Date) return JSON.stringify(value.toISOString());
+  if (typeof value === "string") return JSON.stringify(value);
+  return String(value);
+}
+function isRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value) && !(value instanceof Date);
+}
+function toYamlLines(value, indent = 0) {
+  const pad = " ".repeat(indent);
+  if (Array.isArray(value)) {
+    if (!value.length) return [`${pad}[]`];
+    const lines = [];
+    for (const item of value) {
+      if (isScalar(item)) {
+        lines.push(`${pad}- ${formatScalar(item)}`);
+        continue;
+      }
+      const nested = toYamlLines(item, indent + 2);
+      const [first, ...rest] = nested;
+      lines.push(`${pad}- ${first ? first.trimStart() : "{}"}`);
+      for (const line of rest) lines.push(line);
+    }
+    return lines;
+  }
+  if (isRecord(value)) {
+    const entries = Object.entries(value).filter(([, v]) => v !== void 0);
+    if (!entries.length) return [`${pad}{}`];
+    const lines = [];
+    for (const [key, val] of entries) {
+      if (Array.isArray(val) && val.length === 0) {
+        lines.push(`${pad}${key}: []`);
+        continue;
+      }
+      if (isScalar(val)) {
+        lines.push(`${pad}${key}: ${formatScalar(val)}`);
+      } else {
+        lines.push(`${pad}${key}:`);
+        lines.push(...toYamlLines(val, indent + 2));
+      }
+    }
+    return lines;
+  }
+  return [`${pad}${formatScalar(value)}`];
+}
+function pruneTableDiff(table) {
+  const pruned = { name: table.name };
+  if (table.partition && table.partition.from !== table.partition.to) {
+    pruned.partition = table.partition;
+  }
+  if (table.identifier && !identifiersEqual(table.identifier.from ?? void 0, table.identifier.to ?? void 0)) {
+    pruned.identifier = table.identifier;
+  }
+  if (table.attributes) {
+    const { added = [], removed = [], changed = [] } = table.attributes;
+    if (added.length || removed.length || changed.length) {
+      pruned.attributes = { added, removed, changed };
+    }
+  }
+  if (table.indexes) {
+    const { added = [], removed = [], changed = [] } = table.indexes;
+    if (added.length || removed.length || changed.length) {
+      pruned.indexes = { added, removed, changed };
+    }
+  }
+  if (table.resolvers) {
+    const { added = [], removed = [], changed = [] } = table.resolvers;
+    if (added.length || removed.length || changed.length) {
+      pruned.resolvers = { added, removed, changed };
+    }
+  }
+  if (table.triggers) {
+    const { added = [], removed = [], changed = [] } = table.triggers;
+    if (added.length || removed.length || changed.length) {
+      pruned.triggers = { added, removed, changed };
+    }
+  }
+  const hasChange = pruned.partition || pruned.identifier || pruned.attributes && (pruned.attributes.added.length || pruned.attributes.removed.length || pruned.attributes.changed.length) || pruned.indexes && (pruned.indexes.added.length || pruned.indexes.removed.length || pruned.indexes.changed.length) || pruned.resolvers && (pruned.resolvers.added.length || pruned.resolvers.removed.length || pruned.resolvers.changed.length) || pruned.triggers && (pruned.triggers.added.length || pruned.triggers.removed.length || pruned.triggers.changed.length);
+  return hasChange ? pruned : null;
 }
-function clearCacheConfig() {
-  cachedCfg = null;
+function formatSchemaDiff(diff, filePath) {
+  const hasChanges = diff.newTables.length || diff.removedTables.length || diff.changedTables.length;
+  if (!hasChanges) {
+    return `No differences found between API schema and ${filePath ?? "local schema"}.
+`;
+  }
+  const header = filePath ? `# Diff between API schema and ${filePath}
+` : "# Schema diff";
+  const prunedTables = diff.changedTables.map(pruneTableDiff).filter((t) => Boolean(t));
+  const yamlObject = {
+    newTables: [...diff.newTables],
+    removedTables: [...diff.removedTables],
+    changedTables: prunedTables
+  };
+  const bodyLines = toYamlLines(yamlObject);
+  return `${header}
+${bodyLines.join("\n")}
+`;
 }
+
+// src/impl/onyx-core.ts
+var DEFAULT_CACHE_TTL = 5 * 60 * 1e3;
 function toSingleCondition(criteria) {
   return { conditionType: "SingleCondition", criteria };
 }
@@ -1036,7 +1367,20 @@ function normalizeDate(value) {
   return Number.isNaN(ts.getTime()) ? void 0 : ts;
 }
 function normalizeSchemaRevision(input, fallbackDatabaseId) {
-  const { meta, createdAt, publishedAt, revisionId, entityText, ...rest } = input;
+  const {
+    meta,
+    createdAt,
+    publishedAt,
+    revisionId,
+    entityText,
+    databaseId,
+    entities,
+    revisionDescription,
+    ...rest
+  } = input;
+  const dbId = typeof databaseId === "string" ? databaseId : fallbackDatabaseId;
+  const entityList = Array.isArray(entities) ? entities : [];
+  const revisionDesc = typeof revisionDescription === "string" ? revisionDescription : void 0;
   const mergedMeta = {
     revisionId: meta?.revisionId ?? revisionId,
     createdAt: normalizeDate(meta?.createdAt ?? createdAt),
@@ -1044,10 +1388,11 @@ function normalizeSchemaRevision(input, fallbackDatabaseId) {
   };
   const cleanedMeta = mergedMeta.revisionId || mergedMeta.createdAt || mergedMeta.publishedAt ? mergedMeta : void 0;
   return {
-    ...rest,
-    databaseId: input.databaseId ?? fallbackDatabaseId,
+    databaseId: dbId,
+    revisionDescription: revisionDesc,
+    entities: entityList,
     meta: cleanedMeta,
-    entities: input.entities ?? []
+    ...rest
   };
 }
 var OnyxDatabaseImpl = class {
@@ -1058,7 +1403,7 @@ var OnyxDatabaseImpl = class {
   requestLoggingEnabled;
   responseLoggingEnabled;
   defaultPartition;
-  constructor(config) {
+  constructor(config, resolveConfigWithCache) {
     this.requestLoggingEnabled = !!config?.requestLoggingEnabled;
     this.responseLoggingEnabled = !!config?.responseLoggingEnabled;
     this.defaultPartition = config?.partition;
@@ -1075,7 +1420,10 @@ var OnyxDatabaseImpl = class {
         apiSecret: this.resolved.apiSecret,
         fetchImpl: this.resolved.fetch,
         requestLoggingEnabled: this.requestLoggingEnabled,
-        responseLoggingEnabled: this.responseLoggingEnabled
+        responseLoggingEnabled: this.responseLoggingEnabled,
+        retryEnabled: this.resolved.retryEnabled,
+        maxRetries: this.resolved.maxRetries,
+        retryInitialDelayMs: this.resolved.retryInitialDelayMs
       });
     }
     return {
@@ -1159,7 +1507,8 @@ var OnyxDatabaseImpl = class {
     const path2 = `/data/${encodeURIComponent(databaseId)}/${encodeURIComponent(
       table
     )}/${encodeURIComponent(primaryKey)}${params.toString() ? `?${params.toString()}` : ""}`;
-    return http.request("DELETE", path2);
+    await http.request("DELETE", path2);
+    return true;
   }
   async saveDocument(doc) {
     const { http, databaseId } = await this.ensureClient();
@@ -1202,6 +1551,10 @@ var OnyxDatabaseImpl = class {
     const res = await http.request("GET", path2);
     return Array.isArray(res) ? res.map((entry) => normalizeSchemaRevision(entry, databaseId)) : [];
   }
+  async diffSchema(localSchema) {
+    const apiSchema = await this.getSchema();
+    return computeSchemaDiff(apiSchema, localSchema);
+  }
   async updateSchema(schema, options) {
     const { http, databaseId } = await this.ensureClient();
     const params = new URLSearchParams();
@@ -1535,7 +1888,6 @@ var QueryBuilderImpl = class {
   }
   async firstOrNull() {
     if (this.mode !== "select") throw new Error("Cannot call firstOrNull() in update mode.");
-    if (!this.conditions) throw new OnyxError("firstOrNull() requires a where() clause.");
     this.limitValue = 1;
     const pg = await this.page();
     return Array.isArray(pg.records) && pg.records.length > 0 ? pg.records[0] : null;
@@ -1627,219 +1979,33 @@ var CascadeBuilderImpl = class {
     return this.db.delete(table, primaryKey, opts);
   }
 };
-var onyx = {
-  init(config) {
-    return new OnyxDatabaseImpl(config);
-  },
-  clearCacheConfig
-};
-
-// schema/cli/diff.ts
-function mapByName(items) {
-  const map = /* @__PURE__ */ new Map();
-  for (const item of items ?? []) {
-    if (!item?.name) continue;
-    map.set(item.name, item);
-  }
-  return map;
-}
-function normalizeEntities(schema) {
-  if (Array.isArray(schema.entities)) {
-    return schema.entities ?? [];
-  }
-  const tables = schema.tables;
-  if (!Array.isArray(tables)) return [];
-  return tables.map((table) => ({
-    name: table.name,
-    attributes: table.attributes ?? []
-  }));
-}
-function formatIdentifier(id) {
-  if (!id) return "";
-  const parts = [id.name ? `name=${id.name}` : null, id.generator ? `generator=${id.generator}` : null, id.type ? `type=${id.type}` : null].filter(Boolean);
-  return parts.join(", ");
-}
-function describeIdentifierChange(api, local) {
-  if (!api && !local) return null;
-  if (!api && local) return "identifier removed";
-  if (api && !local) return "identifier added";
-  if (!api || !local) return null;
-  if (api.name === local.name && api.generator === local.generator && api.type === local.type) {
-    return null;
-  }
-  return `identifier: ${formatIdentifier(api) || "none"} -> ${formatIdentifier(local) || "none"}`;
-}
-function describePartitionChange(api, local) {
-  const norm = (v) => v == null || v === "" ? "" : v;
-  if (norm(api) === norm(local)) return null;
-  return `partition: ${norm(api) || "none"} -> ${norm(local) || "none"}`;
-}
-function describeAttribute(attr) {
-  const nullable = attr.isNullable ? "true" : "false";
-  return `${attr.name} (${attr.type ?? "unknown"}, nullable: ${nullable})`;
-}
-function describeAttributeChange(api, local) {
-  const diffs = [];
-  if (api.type !== local.type) {
-    diffs.push(`type ${api.type ?? "unknown"} -> ${local.type ?? "unknown"}`);
-  }
-  const apiNull = Boolean(api.isNullable);
-  const localNull = Boolean(local.isNullable);
-  if (apiNull !== localNull) {
-    diffs.push(`nullable ${apiNull} -> ${localNull}`);
-  }
-  if (!diffs.length) return null;
-  return `${local.name}: ${diffs.join("; ")}`;
-}
-function describeIndex(idx) {
-  const parts = [`type: ${idx.type ?? "DEFAULT"}`];
-  if (idx.minimumScore != null) parts.push(`minScore: ${idx.minimumScore}`);
-  return `${idx.name} (${parts.join(", ")})`;
-}
-function describeIndexChange(api, local) {
-  const diffs = [];
-  if (api.type !== local.type) {
-    diffs.push(`type ${api.type ?? "DEFAULT"} -> ${local.type ?? "DEFAULT"}`);
-  }
-  if (api.minimumScore !== local.minimumScore) {
-    diffs.push(`minScore ${api.minimumScore ?? "none"} -> ${local.minimumScore ?? "none"}`);
-  }
-  if (!diffs.length) return null;
-  return `${local.name}: ${diffs.join("; ")}`;
-}
-function describeResolverChange(api, local) {
-  if (api.resolver === local.resolver) return null;
-  return `${local.name}: resolver changed`;
-}
-function describeTrigger(trigger) {
-  return `${trigger.name} (${trigger.event})`;
-}
-function describeTriggerChange(api, local) {
-  const diffs = [];
-  if (api.event !== local.event) {
-    diffs.push(`event ${api.event ?? "none"} -> ${local.event ?? "none"}`);
-  }
-  if (api.trigger !== local.trigger) {
-    diffs.push("trigger changed");
-  }
-  if (!diffs.length) return null;
-  return `${local.name}: ${diffs.join("; ")}`;
-}
-function diffCollections(apiItems, localItems, describeAdd, describeChange) {
-  const apiMap = mapByName(apiItems);
-  const localMap = mapByName(localItems);
-  const added = [];
-  const removed = [];
-  const changed = [];
-  for (const [name, local] of localMap.entries()) {
-    if (!apiMap.has(name)) {
-      added.push(describeAdd(local));
-      continue;
-    }
-    if (describeChange) {
-      const detail = describeChange(apiMap.get(name), local);
-      if (detail) changed.push(detail);
-    }
-  }
-  for (const name of apiMap.keys()) {
-    if (!localMap.has(name)) removed.push(name);
-  }
-  return { added, removed, changed };
-}
-function computeSchemaDiff(apiSchema, localSchema) {
-  const apiEntities = normalizeEntities(apiSchema);
-  const localEntities = normalizeEntities(localSchema);
-  const apiMap = mapByName(apiEntities);
-  const localMap = mapByName(localEntities);
-  const newTables = [];
-  const removedTables = [];
-  const changedTables = [];
-  for (const [name, localEntity] of localMap.entries()) {
-    if (!apiMap.has(name)) {
-      newTables.push(name);
-      continue;
-    }
-    const apiEntity = apiMap.get(name);
-    const details = [];
-    const partitionChange = describePartitionChange(apiEntity.partition, localEntity.partition);
-    if (partitionChange) details.push(partitionChange);
-    const idChange = describeIdentifierChange(apiEntity.identifier, localEntity.identifier);
-    if (idChange) details.push(idChange);
-    const attrDiff = diffCollections(apiEntity.attributes, localEntity.attributes, (attr) => `+ ${describeAttribute(attr)}`, describeAttributeChange);
-    if (attrDiff.added.length || attrDiff.removed.length || attrDiff.changed.length) {
-      details.push("attributes:");
-      for (const a of attrDiff.added) details.push(`  ${a}`);
-      for (const c of attrDiff.changed) details.push(`  ~ ${c}`);
-      for (const r of attrDiff.removed) details.push(`  - ${r}`);
-    }
-    const idxDiff = diffCollections(apiEntity.indexes, localEntity.indexes, (idx) => `+ ${describeIndex(idx)}`, describeIndexChange);
-    if (idxDiff.added.length || idxDiff.removed.length || idxDiff.changed.length) {
-      details.push("indexes:");
-      for (const a of idxDiff.added) details.push(`  ${a}`);
-      for (const c of idxDiff.changed) details.push(`  ~ ${c}`);
-      for (const r of idxDiff.removed) details.push(`  - ${r}`);
-    }
-    const resolverDiff = diffCollections(apiEntity.resolvers, localEntity.resolvers, (resolver) => `+ ${resolver.name}`, describeResolverChange);
-    if (resolverDiff.added.length || resolverDiff.removed.length || resolverDiff.changed.length) {
-      details.push("resolvers:");
-      for (const a of resolverDiff.added) details.push(`  ${a}`);
-      for (const c of resolverDiff.changed) details.push(`  ~ ${c}`);
-      for (const r of resolverDiff.removed) details.push(`  - ${r}`);
-    }
-    const triggerDiff = diffCollections(apiEntity.triggers, localEntity.triggers, (trigger) => `+ ${describeTrigger(trigger)}`, describeTriggerChange);
-    if (triggerDiff.added.length || triggerDiff.removed.length || triggerDiff.changed.length) {
-      details.push("triggers:");
-      for (const a of triggerDiff.added) details.push(`  ${a}`);
-      for (const c of triggerDiff.changed) details.push(`  ~ ${c}`);
-      for (const r of triggerDiff.removed) details.push(`  - ${r}`);
+function createOnyxFacade(resolveConfig2) {
+  let cachedCfg = null;
+  function resolveConfigWithCache(config) {
+    const ttl = config?.ttl ?? DEFAULT_CACHE_TTL;
+    const now = Date.now();
+    if (cachedCfg && cachedCfg.expires > now) {
+      return cachedCfg.promise;
     }
-    if (details.length) {
-      changedTables.push({ name, details });
-    }
-  }
-  for (const name of apiMap.keys()) {
-    if (!localMap.has(name)) removedTables.push(name);
-  }
-  newTables.sort();
-  removedTables.sort();
-  changedTables.sort((a, b) => a.name.localeCompare(b.name));
-  return { newTables, removedTables, changedTables };
-}
-function formatSchemaDiff(diff, filePath) {
-  const lines = [];
-  const hasChanges = diff.newTables.length || diff.removedTables.length || diff.changedTables.length;
-  if (!hasChanges) {
-    return `No differences found between API schema and ${filePath ?? "local file"}.
-`;
+    const { ttl: _ttl, requestLoggingEnabled: _reqLog, responseLoggingEnabled: _resLog, ...rest } = config ?? {};
+    const promise = resolveConfig2(rest);
+    cachedCfg = { promise, expires: now + ttl };
+    return promise;
   }
-  if (filePath) lines.push(`Comparing API schema to ${filePath}`);
-  lines.push("New Tables:");
-  if (diff.newTables.length) {
-    for (const t of diff.newTables) lines.push(`  ${t}`);
-  } else {
-    lines.push("  (none)");
-  }
-  lines.push("Removed Tables:");
-  if (diff.removedTables.length) {
-    for (const t of diff.removedTables) lines.push(`  ${t}`);
-  } else {
-    lines.push("  (none)");
-  }
-  lines.push("Changes:");
-  if (diff.changedTables.length) {
-    for (const table of diff.changedTables) {
-      lines.push(`  ${table.name}`);
-      for (const detail of table.details) {
-        lines.push(`      ${detail}`);
-      }
-    }
-  } else {
-    lines.push("  (none)");
+  function clearCacheConfig() {
+    cachedCfg = null;
   }
-  return `${lines.join("\n")}
-`;
+  return {
+    init(config) {
+      return new OnyxDatabaseImpl(config, resolveConfigWithCache);
+    },
+    clearCacheConfig
+  };
 }
 
+// src/impl/onyx.ts
+var onyx = createOnyxFacade((config) => resolveConfig(config));
+
 // schema/cli/schema.ts
 var DEFAULT_SCHEMA_PATH = "./onyx.schema.json";
 function printHelp() {
@@ -1850,10 +2016,12 @@ Usage:
   onyx-schema get [file] [--tables tableA,tableB]
   onyx-schema validate [file]
   onyx-schema diff [file]
+  onyx-schema info
 
 Options:
   [file]                 Path to schema JSON (default: ./onyx.schema.json)
   --tables <list>        Comma-separated list of tables to fetch (for get)
+  --print                Print the fetched schema to stdout instead of writing a file
   -h, --help             Show this help message
 `);
 }
@@ -1865,7 +2033,7 @@ function parseTables(value) {
 function parseArgs(argv) {
   const cmd = (argv[2] ?? "").toLowerCase();
   let command = "help";
-  if (cmd === "publish" || cmd === "get" || cmd === "validate" || cmd === "diff") {
+  if (cmd === "publish" || cmd === "get" || cmd === "validate" || cmd === "diff" || cmd === "info") {
     command = cmd;
   }
   let idx = 3;
@@ -1875,6 +2043,7 @@ function parseArgs(argv) {
     idx++;
   }
   let tables;
+  let print = false;
   for (; idx < argv.length; idx++) {
     const arg = argv[idx];
     switch (arg) {
@@ -1882,6 +2051,9 @@ function parseArgs(argv) {
         tables = parseTables(argv[idx + 1]);
         idx++;
         break;
+      case "--print":
+        print = true;
+        break;
       case "-h":
       case "--help":
         command = "help";
@@ -1896,7 +2068,7 @@ function parseArgs(argv) {
       }
     }
   }
-  return { command, filePath, tables };
+  return { command, filePath, tables, print };
 }
 async function readFileJson(filePath) {
   const fs = await import('fs/promises');
@@ -1911,10 +2083,10 @@ async function writeFileJson(filePath, data) {
 `;
   await fs.writeFile(resolved, serialized, "utf8");
 }
-async function fetchSchema(filePath, tables) {
+async function fetchSchema(filePath, tables, print) {
   const db = onyx.init();
   const schema = await db.getSchema({ tables });
-  if (tables?.length) {
+  if (tables?.length || print) {
     process__default.default.stdout.write(`${JSON.stringify(schema, null, 2)}
 `);
     return;
@@ -1952,14 +2124,45 @@ ${formatSchemaErrors(result.errors)}`);
 }
 async function diffSchema(filePath) {
   const db = onyx.init();
-  const [apiSchema, localSchema] = await Promise.all([
-    db.getSchema(),
-    readFileJson(filePath)
-  ]);
-  const diff = computeSchemaDiff(apiSchema, localSchema);
+  const localSchema = await readFileJson(filePath);
+  const diff = await db.diffSchema(localSchema);
   const output = formatSchemaDiff(diff, filePath);
   process__default.default.stdout.write(output);
 }
+function maskValue(value) {
+  if (!value) return "";
+  if (value.length <= 4) return value;
+  return `${value.slice(0, 2)}...${value.slice(-2)}`;
+}
+function formatSource(source) {
+  if (!source) return "unknown";
+  if (source.includes("env")) return "env";
+  if (source.includes("file") || source.includes("profile") || source.includes("config")) return "file";
+  if (source === "explicit config") return "explicit";
+  return source;
+}
+async function printInfo() {
+  const resolved = await resolveConfigWithSource();
+  const db = onyx.init();
+  const cfgFile = resolved.sources.configPath ?? resolved.sources.projectFile ?? resolved.sources.homeProfile ?? "(none)";
+  let connection = "ok";
+  try {
+    await db.getSchema({ tables: [] });
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    connection = msg;
+  }
+  const lines = [
+    `Database ID: ${resolved.databaseId} (source: ${formatSource(resolved.sources.databaseId)})`,
+    `Base URL   : ${resolved.baseUrl} (source: ${formatSource(resolved.sources.baseUrl)})`,
+    `API Key    : ${maskValue(resolved.apiKey)} (source: ${formatSource(resolved.sources.apiKey)})`,
+    `API Secret : ${maskValue(resolved.apiSecret)} (source: ${formatSource(resolved.sources.apiSecret)})`,
+    `Config file: ${cfgFile}`,
+    `Connection : ${connection}`
+  ];
+  process__default.default.stdout.write(`${lines.join("\n")}
+`);
+}
 (async () => {
   try {
     const parsed = parseArgs(process__default.default.argv);
@@ -1968,7 +2171,7 @@ async function diffSchema(filePath) {
         await publishSchema(parsed.filePath);
         break;
       case "get":
-        await fetchSchema(parsed.filePath, parsed.tables);
+        await fetchSchema(parsed.filePath, parsed.tables, parsed.print);
         break;
       case "validate":
         await validateSchema(parsed.filePath);
@@ -1976,6 +2179,9 @@ async function diffSchema(filePath) {
       case "diff":
         await diffSchema(parsed.filePath);
         break;
+      case "info":
+        await printInfo();
+        break;
       default:
         printHelp();
         return;