@easy-cms/drizzle 0.9.0 → 0.10.0

package/dist/index.d.ts

@@ -58,11 +58,18 @@ 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;
+    /**
+     * True when a JSON column contains `pattern` (Postgres `@>`, which can skip unpacking arrays).
+     * Optional: without it, equality inside blocks uses `someElement`.
+     */
+    jsonContains?(column: AnyColumn, pattern: unknown): 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;
+    /** SQL that copies the whole database to a file while it is in use (SQLite: `VACUUM INTO`). */
+    backupSQL?(file: string): string;
     /** Placeholder for the n-th parameter (1-based) in raw SQL. */
     param(n: number): string;
     /** CREATE TABLE IF NOT EXISTS for the migrations table. */
@@ -85,6 +92,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

@@ -300,7 +300,10 @@ function buildTable(builder, name, kind, fields, options) {
     add("id", dialect.serial("id"), "id:int");
     add("created_at", dialect.text("created_at").notNull(), "text!");
     add("updated_at", dialect.text("updated_at").notNull(), "text!");
-    if (options.drafts) add("status", dialect.text("status").notNull().default("draft"), "status");
+    if (options.drafts) {
+      add("status", dialect.text("status").notNull().default("draft"), "status");
+      indexes.push({ column: "status", unique: false });
+    }
     indexes.push({ column: "created_at", unique: false });
   } else {
     const parentKind = options.parentIdKind ?? "integer";
@@ -937,9 +940,33 @@ var WhereBuilder = class {
       if (inner === null) return void 0;
       return operatorSQL(this.dialect, el.get(inner, type), field, op, value, path);
     };
+    const contains = this.containment(target, op, value);
+    if (contains) return contains;
     const some = this.dialect.someElement(target.column, (el) => match(el, 0));
     return inner === null && value === false ? not(some) : some;
   }
+  /**
+   * `equals` and `in` as JSON containment where the database has it: `layout.items.title = x`
+   * becomes `layout @> [{"items": [{"title": x}]}]`, which matches exactly the same documents
+   * without unpacking every array.
+   */
+  containment(target, op, value) {
+    const { jsonContains } = this.dialect;
+    const { lists, path, type, field } = target.value;
+    if (!jsonContains || !path) return void 0;
+    const values = op === "equals" ? [value] : op === "in" && Array.isArray(value) ? value : null;
+    if (!values || values.length === 0 || values.some((v) => v === null || v === void 0))
+      return void 0;
+    const nest = (segments, inner) => segments.reduceRight((acc, segment) => ({ [segment]: acc }), inner);
+    const patterns = values.map((raw) => {
+      const coerced = coerce(field, raw);
+      let pattern = type === "text" && typeof coerced !== "string" ? String(coerced) : coerced;
+      pattern = nest(path, pattern);
+      for (const list of [...lists].reverse()) pattern = nest(list, [pattern]);
+      return jsonContains(target.column, [pattern]);
+    });
+    return patterns.length === 1 ? patterns[0] : or(...patterns);
+  }
   /** Conditions on array rows or hasMany values become (NOT) EXISTS subqueries. */
   child(parent, child, rest, op, value, path, locale) {
     const table = child.table;
@@ -993,6 +1020,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 {
@@ -1084,12 +1112,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(() => retryWhileBusy(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;
   }
@@ -1150,30 +1189,17 @@ var DrizzleDatabase = class {
   migrationStatus() {
     return this.migrator.status();
   }
+  get backup() {
+    const { backupSQL } = this.dialect;
+    if (!backupSQL) return void 0;
+    return (file) => this.write(async () => {
+      await this.connection.runner.query(backupSQL(file));
+    });
+  }
   async destroy() {
     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.9.0",
+  "version": "0.10.0",
   "description": "Shared Drizzle ORM layer for Easy CMS database adapters",
   "license": "MIT",
   "type": "module",
@@ -23,17 +23,17 @@
     "drizzle-orm": "0.45.3"
   },
   "peerDependencies": {
-    "@easy-cms/core": "^0.9.0"
+    "@easy-cms/core": "^0.10.0"
   },
   "devDependencies": {
-    "@easy-cms/core": "^0.9.0"
+    "@easy-cms/core": "^0.10.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/maritonx/easy-crm.git",
+    "url": "git+https://github.com/maritonx/easy-cms.git",
     "directory": "packages/drizzle"
   },
   "keywords": [