@easy-cms/drizzle 0.8.0 → 0.9.0

package/dist/index.d.ts

@@ -58,8 +58,11 @@ interface Dialect {
      * (any element when it returns undefined). Anything but an array has no elements.
      */
     someElement(array: AnyColumn | SQL, condition: (el: JsonElement) => SQL | undefined): SQL;
-    /** The value at `path` in the first element of a JSON array that has one, for sorting. */
-    firstElementValue(array: AnyColumn | SQL, path: readonly string[], type: JsonValueType): SQL;
+    /**
+     * For sorting: the value at `path` in the first element that has one, stepping through the
+     * nested `lists` in each element (in order) like `someElement`.
+     */
+    firstElementValue(array: AnyColumn | SQL, lists: readonly (readonly string[])[], path: readonly string[], type: JsonValueType): SQL;
     /** Placeholder for the n-th parameter (1-based) in raw SQL. */
     param(n: number): string;
     /** CREATE TABLE IF NOT EXISTS for the migrations table. */

package/dist/index.js

@@ -968,11 +968,12 @@ var WhereBuilder = class {
     }
     return subquery(this.build(table, { [rest.join(".")]: { [op]: value } }));
   }
-  /** A column, or the value in the first block that has it. */
+  /** A column, or the first value in blocks (and the lists in them, in order) that has it. */
   sortValue(target, path) {
     if (target.kind === "column") return target.column;
-    if (target.kind === "blocks" && target.value.lists.length === 0 && target.value.path) {
-      return this.dialect.firstElementValue(target.column, target.value.path, target.value.type);
+    if (target.kind === "blocks" && target.value.path) {
+      const { lists, path: inner, type } = target.value;
+      return this.dialect.firstElementValue(target.column, lists, inner, type);
     }
     throw new QueryError(`Cannot sort by "${path}"`);
   }
@@ -1087,7 +1088,7 @@ var DrizzleDatabase = class {
   /** Runs a write; with a single-writer database, after the writes before it are done. */
   write(run) {
     if (!this.dialect.singleWriter) return run();
-    const result = this.writing.then(run);
+    const result = this.writing.then(() => retryWhileBusy(run));
     this.writing = result.catch(() => {
     });
     return result;
@@ -1153,6 +1154,26 @@ var DrizzleDatabase = class {
     await this.connection.close();
   }
 };
+var BUSY_TIMEOUT = 1e4;
+async function retryWhileBusy(run) {
+  const until = Date.now() + BUSY_TIMEOUT;
+  for (let delay = 5; ; delay = Math.min(delay * 2, 250)) {
+    try {
+      return await run();
+    } catch (error) {
+      if (!isBusy(error) || Date.now() + delay > until) throw error;
+      await new Promise((resolve2) => setTimeout(resolve2, delay + Math.random() * delay));
+    }
+  }
+}
+function isBusy(error) {
+  for (let e = error; e; e = e.cause) {
+    const code = e.code;
+    if (typeof code === "string" && code.startsWith("SQLITE_BUSY")) return true;
+    if (e === e.cause) break;
+  }
+  return false;
+}
 export {
   DEFAULT_MIGRATION_DIR,
   DEFAULT_TABLE_PREFIX,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easy-cms/drizzle",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Shared Drizzle ORM layer for Easy CMS database adapters",
   "license": "MIT",
   "type": "module",
@@ -23,10 +23,10 @@
     "drizzle-orm": "0.45.3"
   },
   "peerDependencies": {
-    "@easy-cms/core": "^0.8.0"
+    "@easy-cms/core": "^0.9.0"
   },
   "devDependencies": {
-    "@easy-cms/core": "^0.8.0"
+    "@easy-cms/core": "^0.9.0"
   },
   "publishConfig": {
     "access": "public"