@easy-cms/drizzle 0.44.0 → 0.46.0

package/dist/index.js

@@ -1,10 +1,10 @@
 // src/database.ts
 import { resolve } from "path";
 import { QueryError as QueryError2 } from "@easy-cms/core";
-import { asc as asc3, count, eq as eq3, getTableColumns, getTableName, inArray as inArray3 } from "drizzle-orm";
+import { and as and3, asc as asc3, count, eq as eq3, getTableColumns, getTableName, inArray as inArray3, sql as sql2 } from "drizzle-orm";
 
 // src/documents.ts
-import { asc, eq, inArray } from "drizzle-orm";
+import { and, asc, eq, inArray } from "drizzle-orm";
 var col = (model, name) => model.table[name];
 function getAt(data, path) {
   let current = data;
@@ -154,10 +154,12 @@ async function insertDocument(db, model, data, drafts) {
   await insertChildren(db, model, id, data);
   return id;
 }
-async function replaceDocument(db, model, id, data, drafts) {
-  await db.update(model.table).set({ ...dataToRow(model, data), ...systemRow(data, drafts) }).where(eq(col(model, "id"), id));
+async function replaceDocument(db, model, id, data, drafts, condition) {
+  const updated = await db.update(model.table).set({ ...dataToRow(model, data), ...systemRow(data, drafts) }).where(condition ? and(eq(col(model, "id"), id), condition) : eq(col(model, "id"), id)).returning({ id: col(model, "id") });
+  if (updated.length === 0) return false;
   await deleteChildren(db, model, [id]);
   await insertChildren(db, model, id, data);
+  return true;
 }
 async function deleteDocument(db, model, id) {
   await deleteChildren(db, model, [id]);
@@ -387,7 +389,12 @@ function buildTable(builder, name, kind, fields, options) {
             }
           );
           if (topLevel && kind === "root" && (field.unique || field.type === "slug") && field.uniqueWithin !== void 0) {
-            indexes.push({ column, unique: true, within: snake(field.uniqueWithin) });
+            const within = [field.uniqueWithin].flat().map(snake);
+            indexes.push({
+              column,
+              unique: true,
+              within: within.length === 1 ? within[0] : within
+            });
             indexes.push({ column, unique: false });
           } else if (topLevel && kind === "root" && (field.unique || field.type === "slug")) {
             indexes.push({ column, unique: true });
@@ -404,8 +411,10 @@ function buildTable(builder, name, kind, fields, options) {
     columns,
     (t) => indexes.map(({ column, unique, within }) => {
       const col3 = t[column];
-      if (within)
-        return dialect.uniqueIndex(`${name}_${within}_${column}_unique`).on(t[within], col3);
+      if (within) {
+        const columns2 = [within].flat();
+        return dialect.uniqueIndex(`${name}_${columns2.join("_")}_${column}_unique`).on(...columns2.map((w) => t[w]), col3);
+      }
       return unique ? dialect.uniqueIndex(`${name}_${column}_unique`).on(col3) : dialect.index(`${name}_${column}_idx`).on(col3);
     })
   );
@@ -563,7 +572,7 @@ var Migrator = class {
       this.options.logger.warn("Schema push drops tables or columns; data in them is lost.");
     }
     await this.runner.transaction([
-      ...statements.map((sql2) => ({ sql: sql2 })),
+      ...statements.map((sql3) => ({ sql: sql3 })),
       this.record(DEV_PUSH, this.options.schema.hash, cur, true)
     ]);
     if (statements.length > 0)
@@ -632,7 +641,7 @@ ${BREAKPOINT}
     for (const migration of pending) {
       try {
         await this.runner.transaction([
-          ...migration.statements.map((sql2) => ({ sql: sql2 })),
+          ...migration.statements.map((sql3) => ({ sql: sql3 })),
           this.record(migration.name, migration.hash, migration.snapshot, false)
         ]);
       } catch (error) {
@@ -683,7 +692,7 @@ function timestamp() {
 // src/query.ts
 import { parseId, QueryError } from "@easy-cms/core";
 import {
-  and,
+  and as and2,
   asc as asc2,
   desc,
   eq as eq2,
@@ -903,12 +912,12 @@ var WhereBuilder = class {
       if (key === "and" || key === "or") {
         if (!Array.isArray(value)) throw new QueryError(`"${key}" must be an array`);
         const inner = value.map((w) => this.build(model, w)).filter((s) => s !== void 0);
-        if (inner.length > 0) parts.push(key === "and" ? and(...inner) : or(...inner));
+        if (inner.length > 0) parts.push(key === "and" ? and2(...inner) : or(...inner));
         continue;
       }
       parts.push(this.field(model, key, value));
     }
-    return parts.length === 0 ? void 0 : parts.length === 1 ? parts[0] : and(...parts);
+    return parts.length === 0 ? void 0 : parts.length === 1 ? parts[0] : and2(...parts);
   }
   field(model, path, operators) {
     if (typeof operators !== "object" || operators === null || Array.isArray(operators)) {
@@ -929,7 +938,7 @@ var WhereBuilder = class {
       if (target.kind === "blocks") return this.blocks(target, op, value, path);
       return this.child(model, target.child, target.rest, op, value, path, target.locale);
     });
-    return parts.length === 1 ? parts[0] : and(...parts);
+    return parts.length === 1 ? parts[0] : and2(...parts);
   }
   /**
    * Conditions inside blocks test the JSON rows: some block (and, for nested lists, some row in
@@ -976,9 +985,9 @@ var WhereBuilder = class {
   child(parent, child, rest, op, value, path, locale) {
     const table = child.table;
     const parentLink = eq2(col2(table, "_parent_id"), col2(parent, "id"));
-    const link = locale === void 0 ? parentLink : and(parentLink, eq2(col2(table, "_locale"), locale));
+    const link = locale === void 0 ? parentLink : and2(parentLink, eq2(col2(table, "_locale"), locale));
     const subquery = (condition) => exists(
-      this.db.select({ one: sql`1` }).from(table.table).where(condition ? and(link, condition) : link)
+      this.db.select({ one: sql`1` }).from(table.table).where(condition ? and2(link, condition) : link)
     );
     if (child.kind === "values") {
       if (rest.length > 0) throw new QueryError(`Cannot query inside "${path}"`);
@@ -1150,13 +1159,43 @@ var DrizzleDatabase = class {
   }
   async update(args) {
     const model = this.model(args.collection);
-    await this.write(
+    const condition = args.where ? this.where(args.collection, args.where) : void 0;
+    const written = await this.write(
       () => this.db.transaction(
-        (tx) => replaceDocument(tx, model.root, args.id, args.data, model.config.drafts === true)
+        (tx) => replaceDocument(
+          tx,
+          model.root,
+          args.id,
+          args.data,
+          model.config.drafts === true,
+          condition
+        )
       )
     );
+    if (!written) return null;
     return await this.findById({ collection: args.collection, id: args.id });
   }
+  async increment(args) {
+    const model = this.model(args.collection);
+    const target = model.root.columns.find(
+      (c) => c.locale === void 0 && c.path.length === 1 && c.path[0] === args.field
+    );
+    if (target?.field.type !== "number")
+      throw new QueryError2(
+        `"${args.field}" of "${args.collection}" is not a top-level number field`
+      );
+    if (!Number.isFinite(args.by)) throw new QueryError2('increment: "by" must be a number');
+    const column = model.root.table[target.column];
+    const next = sql2`coalesce(${column}, 0) + ${args.by}`;
+    const conditions = [eq3(model.root.table.id, args.id)];
+    if (args.min !== void 0) conditions.push(sql2`${next} >= ${args.min}`);
+    if (args.max !== void 0) conditions.push(sql2`${next} <= ${args.max}`);
+    const rows = await this.write(
+      () => this.db.update(model.root.table).set({ [target.column]: next }).where(and3(...conditions)).returning({ value: column })
+    );
+    const [row] = rows;
+    return row ? Number(row.value) : null;
+  }
   async delete(args) {
     const model = this.model(args.collection);
     await this.write(

package/package.json

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