@onyx.dev/onyx-database 1.0.2 → 1.1.0

package/dist/index.js

@@ -209,6 +209,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");
@@ -231,7 +235,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",
@@ -288,7 +301,7 @@ function parseJsonAllowNaN(txt) {
     return JSON.parse(fixed);
   }
 }
-var HttpClient = class {
+var HttpClient = class _HttpClient {
   baseUrl;
   apiKey;
   apiSecret;
@@ -296,6 +309,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");
@@ -320,6 +352,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, path) => method === "GET" || path.startsWith("/query/");
   }
   headers(extra) {
     const extras = { ...extra ?? {} };
@@ -360,9 +396,8 @@ var HttpClient = class {
       headers,
       body: payload
     };
-    const isQuery = path.includes("/query/") && !/\/query\/(?:update|delete)\//.test(path);
-    const canRetry = method === "GET" || isQuery;
-    const maxAttempts = canRetry ? 3 : 1;
+    const canRetry = this.retryEnabled && this.shouldRetry(method, path);
+    const maxAttempts = canRetry ? this.maxRetries + 1 : 1;
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       try {
         const res = await this.fetchImpl(url, init);
@@ -380,7 +415,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);
@@ -389,7 +427,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;
@@ -950,14 +989,6 @@ 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();
@@ -1146,23 +1177,8 @@ function computeSchemaDiff(apiSchema, localSchema) {
   return { newTables, removedTables, changedTables };
 }
 
-// src/impl/onyx.ts
+// src/impl/onyx-core.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;
-}
-function clearCacheConfig() {
-  cachedCfg = null;
-}
 function toSingleCondition(criteria) {
   return { conditionType: "SingleCondition", criteria };
 }
@@ -1252,7 +1268,7 @@ var OnyxDatabaseImpl = class {
   requestLoggingEnabled;
   responseLoggingEnabled;
   defaultPartition;
-  constructor(config) {
+  constructor(config, resolveConfigWithCache) {
     this.requestLoggingEnabled = !!config?.requestLoggingEnabled;
     this.responseLoggingEnabled = !!config?.responseLoggingEnabled;
     this.defaultPartition = config?.partition;
@@ -1269,7 +1285,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 {
@@ -1304,6 +1323,14 @@ var OnyxDatabaseImpl = class {
     qb.select(...fields);
     return qb;
   }
+  search(queryText, minScore) {
+    const qb = new QueryBuilderImpl(
+      this,
+      "ALL",
+      this.defaultPartition
+    );
+    return qb.search(queryText, minScore);
+  }
   cascade(...relationships) {
     const cb = new CascadeBuilderImpl(this);
     return cb.cascade(...relationships);
@@ -1590,6 +1617,7 @@ var QueryBuilderImpl = class {
   toSelectQuery() {
     return {
       type: "SelectQuery",
+      table: this.table,
       fields: this.fields,
       conditions: this.serializableConditions(),
       sort: this.sort,
@@ -1629,6 +1657,13 @@ var QueryBuilderImpl = class {
     this.resolvers = flat.length > 0 ? flat : null;
     return this;
   }
+  search(queryText, minScore) {
+    return this.and({
+      field: "__full_text__",
+      operator: "MATCHES",
+      value: { queryText, minScore: minScore ?? null }
+    });
+  }
   where(condition) {
     const c2 = toCondition(condition);
     if (!this.conditions) {
@@ -1734,7 +1769,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;
@@ -1826,12 +1860,32 @@ var CascadeBuilderImpl = class {
     return this.db.delete(table, primaryKey, opts);
   }
 };
-var onyx = {
-  init(config) {
-    return new OnyxDatabaseImpl(config);
-  },
-  clearCacheConfig
-};
+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;
+    }
+    const { ttl: _ttl, requestLoggingEnabled: _reqLog, responseLoggingEnabled: _resLog, ...rest } = config ?? {};
+    const promise = resolveConfig2(rest);
+    cachedCfg = { promise, expires: now + ttl };
+    return promise;
+  }
+  function clearCacheConfig() {
+    cachedCfg = null;
+  }
+  return {
+    init(config) {
+      return new OnyxDatabaseImpl(config, resolveConfigWithCache);
+    },
+    clearCacheConfig
+  };
+}
+
+// src/impl/onyx.ts
+var onyx = createOnyxFacade((config) => resolveConfig(config));
 
 // src/helpers/sort.ts
 var asc = (field) => ({ field, order: "ASC" });
@@ -1961,6 +2015,10 @@ var ConditionBuilderImpl = class {
 
 // src/helpers/conditions.ts
 var c = (field, operator, value) => new ConditionBuilderImpl({ field, operator, value });
+var fullText = (queryText, minScore) => ({
+  queryText,
+  minScore: minScore ?? null
+});
 var eq = (field, value) => c(field, "EQUAL", value);
 var neq = (field, value) => c(field, "NOT_EQUAL", value);
 function inOp(field, values) {
@@ -1983,6 +2041,7 @@ var gte = (field, value) => c(field, "GREATER_THAN_EQUAL", value);
 var lt = (field, value) => c(field, "LESS_THAN", value);
 var lte = (field, value) => c(field, "LESS_THAN_EQUAL", value);
 var matches = (field, regex) => c(field, "MATCHES", regex);
+var search = (queryText, minScore) => c("__full_text__", "MATCHES", fullText(queryText, minScore));
 var notMatches = (field, regex) => c(field, "NOT_MATCHES", regex);
 var like = (field, pattern) => c(field, "LIKE", pattern);
 var notLike = (field, pattern) => c(field, "NOT_LIKE", pattern);
@@ -2014,6 +2073,6 @@ var percentile = (attribute, p) => `percentile(${attribute}, ${p})`;
 var sdkName = "@onyx.dev/onyx-database";
 var sdkVersion = "0.1.0";
 
-export { QueryResults, asc, avg, between, contains, containsIgnoreCase, count, desc, eq, gt, gte, inOp, isNull, like, lower, lt, lte, matches, max, median, min, neq, notContains, notContainsIgnoreCase, notIn, notLike, notMatches, notNull, notStartsWith, notWithin, onyx, percentile, replace, sdkName, sdkVersion, startsWith, std, substring, sum, upper, variance, within };
+export { QueryResults, asc, avg, between, contains, containsIgnoreCase, count, desc, eq, gt, gte, inOp, isNull, like, lower, lt, lte, matches, max, median, min, neq, notContains, notContainsIgnoreCase, notIn, notLike, notMatches, notNull, notStartsWith, notWithin, onyx, percentile, replace, sdkName, sdkVersion, search, startsWith, std, substring, sum, upper, variance, within };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map