@easy-cms/drizzle 0.8.0 → 0.9.1

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. */
@@ -82,6 +85,11 @@ interface DrizzleAdapterOptions {
 interface Connection {
     readonly db: DrizzleDb;
     readonly runner: SqlRunner;
+    /**
+     * With a single-writer dialect: identifies the database (e.g. the SQLite file), so every
+     * instance in this process that writes to it shares one queue.
+     */
+    readonly writeQueue?: string;
     close(): Promise<void>;
 }
 /**

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}"`);
   }
@@ -992,6 +993,7 @@ var WhereBuilder = class {
 // src/database.ts
 var DEFAULT_TABLE_PREFIX = "ecms_";
 var DEFAULT_MIGRATION_DIR = "easy-cms/migrations";
+var writeQueues = /* @__PURE__ */ new Map();
 async function connectDatabase(dialect, connection, args, options = {}) {
   const prefix = options.tablePrefix ?? DEFAULT_TABLE_PREFIX;
   try {
@@ -1083,12 +1085,23 @@ var DrizzleDatabase = class {
     const [row] = await this.db.select({ total: count() }).from(model.root.table).where(this.where(args.collection, args.where));
     return Number(row?.total ?? 0);
   }
-  writing = Promise.resolve();
-  /** Runs a write; with a single-writer database, after the writes before it are done. */
+  /**
+   * Runs a write; with a single-writer database, after the writes before it in this process are
+   * done. (Other processes are waited for by the database's busy timeout.)
+   */
   write(run) {
     if (!this.dialect.singleWriter) return run();
-    const result = this.writing.then(run);
-    this.writing = result.catch(() => {
+    const key = this.connection.writeQueue ?? "";
+    const result = (writeQueues.get(key) ?? Promise.resolve()).then(run);
+    const settled = result.then(
+      () => {
+      },
+      () => {
+      }
+    );
+    writeQueues.set(key, settled);
+    void settled.then(() => {
+      if (writeQueues.get(key) === settled) writeQueues.delete(key);
     });
     return result;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easy-cms/drizzle",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "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.1"
   },
   "devDependencies": {
-    "@easy-cms/core": "^0.8.0"
+    "@easy-cms/core": "^0.9.1"
   },
   "publishConfig": {
     "access": "public"