@beechcms/api 0.6.0 → 0.6.1

package/dist/index.js

@@ -36,10 +36,10 @@ function parseLoginBody(body) {
   const password = obj.password;
   if (typeof email !== "string" || typeof password !== "string") return null;
   if (!email.trim() || !password) return null;
-  return { email: email.trim(), password };
+  return { email: email.trim().toLowerCase(), password };
 }
 function validateLoginInput(email, password) {
-  return email.length <= MAX_EMAIL_LENGTH && EMAIL_REGEX.test(email) && password.trim().length >= MIN_PASSWORD_LENGTH && password.length <= MAX_PASSWORD_LENGTH && new TextEncoder().encode(password).length <= MAX_PASSWORD_BYTES;
+  return email.length <= MAX_EMAIL_LENGTH && EMAIL_REGEX.test(email) && password.length >= MIN_PASSWORD_LENGTH && password.length <= MAX_PASSWORD_LENGTH && new TextEncoder().encode(password).length <= MAX_PASSWORD_BYTES;
 }
 async function verifyPassword(plainPassword, hash, hashProvider) {
   return hashProvider.verify(plainPassword, hash);
@@ -336,9 +336,9 @@ async function buildRelationsMap(context, seed, entries) {
       });
       const map = {};
       for (const item of items) {
-        const id = item.id;
-        const data = item.data;
-        const label = data[labelAlias];
+        const row = item;
+        const id = row.id;
+        const label = row[labelAlias];
         map[id] = label != null && label !== "" ? String(label) : id;
       }
       relations[branch.alias] = map;
@@ -1150,7 +1150,7 @@ async function bulkHandler(context) {
 }
 
 // src/features/content/handlers/kanban-position.ts
-import { resolveKanbanConfig as resolveKanbanConfig2 } from "@beechcms/core";
+import { resolveKanbanConfig as resolveKanbanConfig2, EntryNotFoundError as EntryNotFoundError3 } from "@beechcms/core";
 async function kanbanPositionHandler(context) {
   const slug = context.req.param("slug");
   const id = context.req.param("id");
@@ -1175,9 +1175,13 @@ async function kanbanPositionHandler(context) {
   if (!compat.compatible || !compat.candidates.some((c) => c.branchId === axisBranchId)) {
     return publicProblem(context, { type: "content-invalid-kanban-axis", title: "Bad Request", status: 400, detail: "axisBranchId is not a valid kanban candidate for this seed" });
   }
-  const entry = await context.get("repository").findById(seed, id);
-  if (!entry) {
-    return publicProblem(context, { type: "content-not-found", title: "Not Found", status: 404, detail: CONTENT_ERRORS.NOT_FOUND });
+  try {
+    await context.get("repository").findById(seed, id);
+  } catch (error) {
+    if (error instanceof EntryNotFoundError3) {
+      return publicProblem(context, { type: "content-not-found", title: "Not Found", status: 404, detail: CONTENT_ERRORS.NOT_FOUND });
+    }
+    throw error;
   }
   await context.get("kanbanPositionRepository").setPosition(slug, id, axisBranchId, position);
   return context.json({ success: true });
@@ -1231,7 +1235,7 @@ async function kanbanMoveHandler(context) {
       const currentTags = current[axisBranch.alias] ?? [];
       const { oldValue, newValue } = body.axis;
       const withoutOld = oldValue !== null ? currentTags.filter((t) => t !== oldValue) : currentTags;
-      const nextTags = newValue !== null ? [...withoutOld, newValue] : withoutOld;
+      const nextTags = newValue !== null && !withoutOld.includes(newValue) ? [...withoutOld, newValue] : withoutOld;
       patch = { [axisBranch.alias]: nextTags };
     }
     const validation = validateAndSanitizeSeedPayload3(seed, patch, {
@@ -1504,7 +1508,7 @@ widgetApp.get("/distribution/:seed", async (context) => {
 
 // src/features/rotate-field/rotate-field.handler.ts
 import { Hono as Hono3 } from "hono";
-import { resolvePolicies as resolvePolicies4, verifyHashField, sha256hex as sha256hex2, validateAndSanitizeSeedPayload as validateAndSanitizeSeedPayload4, EntryNotFoundError as EntryNotFoundError3 } from "@beechcms/core";
+import { resolvePolicies as resolvePolicies4, verifyHashField, sha256hex as sha256hex2, validateAndSanitizeSeedPayload as validateAndSanitizeSeedPayload4, EntryNotFoundError as EntryNotFoundError4 } from "@beechcms/core";
 
 // src/features/rotate-field/rotate-field.schema.ts
 import { z } from "zod";
@@ -1571,7 +1575,7 @@ rotateFieldApp.post("/:slug/:id/rotate-field", async (context) => {
   try {
     contentRecord = await context.get("repository").findById(seed, entryId);
   } catch (error) {
-    if (error instanceof EntryNotFoundError3) {
+    if (error instanceof EntryNotFoundError4) {
       return publicProblem(context, {
         type: "content-not-found",
         title: "Not Found",
@@ -2274,7 +2278,7 @@ import {
 
 // src/features/draft/draft.middleware.ts
 import { createMiddleware } from "hono/factory";
-import { EntryNotFoundError as EntryNotFoundError4 } from "@beechcms/core";
+import { EntryNotFoundError as EntryNotFoundError5 } from "@beechcms/core";
 var draftGuard = createMiddleware(async (context, next) => {
   const slug = context.req.param("slug");
   const id = context.req.param("id");
@@ -2307,7 +2311,7 @@ var draftGuard = createMiddleware(async (context, next) => {
   try {
     await repository.findById(seed, id);
   } catch (error) {
-    if (error instanceof EntryNotFoundError4) {
+    if (error instanceof EntryNotFoundError5) {
       return publicProblem(context, {
         type: "content-not-found",
         title: "Not Found",
@@ -5294,7 +5298,15 @@ function publicRateLimitMiddleware() {
   return async (c, next) => {
     const readMethod = isReadMethod2(c.req.method);
     const limiterName = readMethod ? "publicApiRead" : "publicApiWrite";
-    const seed = c.req.param("seed") ?? "no-seed";
+    const path = c.req.path;
+    let seed = "no-seed";
+    if (path.startsWith("/api/v1/public/")) {
+      const remaining = path.slice("/api/v1/public/".length);
+      const firstSegment = remaining.split("/")[0];
+      if (firstSegment && firstSegment !== "health" && firstSegment !== "schema" && firstSegment !== "schema.html") {
+        seed = firstSegment;
+      }
+    }
     const key = `${getClientIp(c.req)}:${seed}:${limiterName}`;
     const result = await c.get("rateLimiters").getLimiter(limiterName).checkLimit(key);
     if (!result.isAllowed) {
@@ -5364,7 +5376,7 @@ function withCachedResponse(edgeCache, cacheKey, response) {
 }
 
 // src/public/read-single.ts
-import { EntryNotFoundError as EntryNotFoundError5 } from "@beechcms/core";
+import { EntryNotFoundError as EntryNotFoundError6 } from "@beechcms/core";
 
 // src/public/entry-projection.ts
 import { resolvePolicies as resolvePolicies7 } from "@beechcms/core";
@@ -5427,7 +5439,7 @@ async function readSingleEntry(input) {
       meta: buildPublicSingleMeta(seedSlug)
     };
   } catch (error) {
-    if (error instanceof EntryNotFoundError5) {
+    if (error instanceof EntryNotFoundError6) {
       return { ok: false, detail: `Entry '${label}' not found for content type '${seedSlug}'.` };
     }
     throw error;
@@ -5554,6 +5566,7 @@ async function readListEntries(input) {
   const sortDir = (cleanStr(query.orderDir) ?? "desc").toLowerCase() === "asc" ? "ASC" : "DESC";
   const { items, total } = await repository.findMany(seed, {
     filters: engineFilters,
+    filterLogic: parsedFilter?.logic,
     search: search || void 0,
     status: publishedOnly ? "published" : null,
     pagination: {
@@ -5761,7 +5774,7 @@ async function publicAddHandler(context) {
 }
 
 // src/public/public-edit.ts
-import { isValidContentStatus as isValidContentStatus4, resolvePolicies as resolvePolicies8, EntryNotFoundError as EntryNotFoundError6 } from "@beechcms/core";
+import { isValidContentStatus as isValidContentStatus4, resolvePolicies as resolvePolicies8, EntryNotFoundError as EntryNotFoundError7 } from "@beechcms/core";
 var UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 function errorMessage(context, error) {
   if (context.env.ENV !== "production" && error instanceof Error) return error.message;
@@ -5869,7 +5882,7 @@ async function publicEditHandler(context) {
     });
     return context.json({ success: true, id, slug: slugResult.value.nextSlug }, 200);
   } catch (error) {
-    if (error instanceof EntryNotFoundError6) {
+    if (error instanceof EntryNotFoundError7) {
       return publicProblem(context, { type: "entry-not-found", title: "Not Found", status: 404, detail: `Entry '${id}' not found for content type '${seedSlug}'.` });
     }
     console.error("Public edit error:", error);
@@ -6092,7 +6105,7 @@ import { createMiddleware as createMiddleware2 } from "hono/factory";
 
 // src/shared/db/repositories/content.repository.d1.ts
 import {
-  EntryNotFoundError as EntryNotFoundError7,
+  EntryNotFoundError as EntryNotFoundError8,
   RepositoryError as RepositoryError2,
   SlugConflictError as SlugConflictError4,
   RelationTargetNotFoundError as RelationTargetNotFoundError2,
@@ -6120,7 +6133,7 @@ var BaseD1Repository = class {
    */
   mapError(error, context) {
     const message = error?.message || "Unknown database error";
-    if (message.includes("UNIQUE constraint failed:") && message.includes(".slug")) {
+    if (message.includes("UNIQUE constraint failed") && message.includes("slug")) {
       return new SlugConflictError3(`${context}: ${message}`);
     }
     return new RepositoryError(`${context}: ${message}`, error);
@@ -6274,13 +6287,13 @@ var D1ContentRepository = class extends BaseD1Repository {
       const tableName = this.getTableName(seed.slug);
       const entryRow = await this.database.prepare(`SELECT * FROM ${tableName} WHERE id = ? LIMIT 1`).bind(id).first();
       if (!entryRow) {
-        throw new EntryNotFoundError7(`Entry ${id} not found in ${seed.slug}`);
+        throw new EntryNotFoundError8(`Entry ${id} not found in ${seed.slug}`);
       }
       const data = this.rowToData(seed, entryRow);
       await this.attachMultiRelations(seed, id, data);
       return data;
     } catch (error) {
-      if (error instanceof EntryNotFoundError7) throw error;
+      if (error instanceof EntryNotFoundError8) throw error;
       throw this.mapError(error, `findById(${seed.slug}, ${id})`);
     }
   }
@@ -6294,13 +6307,13 @@ var D1ContentRepository = class extends BaseD1Repository {
       const tableName = this.getTableName(seed.slug);
       const entryRow = await this.database.prepare(`SELECT * FROM ${tableName} WHERE slug = ? LIMIT 1`).bind(slug).first();
       if (!entryRow) {
-        throw new EntryNotFoundError7(`Entry with slug "${slug}" not found in ${seed.slug}`);
+        throw new EntryNotFoundError8(`Entry with slug "${slug}" not found in ${seed.slug}`);
       }
       const data = this.rowToData(seed, entryRow);
       await this.attachMultiRelations(seed, entryRow.id, data);
       return data;
     } catch (error) {
-      if (error instanceof EntryNotFoundError7) throw error;
+      if (error instanceof EntryNotFoundError8) throw error;
       throw this.mapError(error, `findBySlug(${seed.slug}, ${slug})`);
     }
   }
@@ -6616,16 +6629,16 @@ var D1ContentRepository = class extends BaseD1Repository {
       if (batchStmts.length === 1) {
         const updateResult = await batchStmts[0].run();
         if (updateResult.meta.changes === 0) {
-          throw new EntryNotFoundError7(`Entry ${id} not found in ${seed.slug}`);
+          throw new EntryNotFoundError8(`Entry ${id} not found in ${seed.slug}`);
         }
       } else if (batchStmts.length > 1) {
         const results = await this.database.batch(batchStmts);
         if (stmt && (results[0].meta?.changes ?? 0) === 0) {
-          throw new EntryNotFoundError7(`Entry ${id} not found in ${seed.slug}`);
+          throw new EntryNotFoundError8(`Entry ${id} not found in ${seed.slug}`);
         }
       }
     } catch (error) {
-      if (error instanceof EntryNotFoundError7) throw error;
+      if (error instanceof EntryNotFoundError8) throw error;
       throw this.mapError(error, `update(${seed.slug}, ${id})`);
     }
     if (this.hooks?.afterUpdate) {
@@ -6650,12 +6663,12 @@ var D1ContentRepository = class extends BaseD1Repository {
       const tableName = this.getTableName(seed.slug);
       const entryRow = await this.database.prepare(`SELECT * FROM ${tableName} WHERE id = ?`).bind(id).first();
       if (!entryRow) {
-        throw new EntryNotFoundError7(`Entry ${id} not found in ${seed.slug}`);
+        throw new EntryNotFoundError8(`Entry ${id} not found in ${seed.slug}`);
       }
       await this.database.prepare(`DELETE FROM ${tableName} WHERE id = ?`).bind(id).run();
       row = this.rowToData(seed, entryRow);
     } catch (error) {
-      if (error instanceof EntryNotFoundError7) throw error;
+      if (error instanceof EntryNotFoundError8) throw error;
       throw this.mapError(error, `delete(${seed.slug}, ${id})`);
     }
     if (this.hooks?.afterDelete) {
@@ -6909,7 +6922,7 @@ var D1ContentRepository = class extends BaseD1Repository {
       const liveTableName = this.getTableName(seed.slug);
       const draftRow = await this.database.prepare(`SELECT * FROM ${draftTableName} WHERE entry_id = ?`).bind(entryId).first();
       if (!draftRow) {
-        throw new EntryNotFoundError7(`No draft found for ${entryId} in ${seed.slug}`);
+        throw new EntryNotFoundError8(`No draft found for ${entryId} in ${seed.slug}`);
       }
       let touchedFields = [];
       if (draftRow && typeof draftRow["_touched_fields"] === "string") {
@@ -6964,7 +6977,7 @@ var D1ContentRepository = class extends BaseD1Repository {
       }
       await this.database.batch(batchStmts);
     } catch (error) {
-      if (error instanceof EntryNotFoundError7) throw error;
+      if (error instanceof EntryNotFoundError8) throw error;
       if (error instanceof RelationTargetNotFoundError2) throw error;
       throw this.mapError(error, `publishDraft(${seed.slug}, ${entryId})`);
     }
@@ -10172,8 +10185,8 @@ function createBeechApp(config) {
         }
         return null;
       },
-      allowMethods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
-      allowHeaders: ["Content-Type", "Authorization", "X-API-Key"],
+      allowMethods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
+      allowHeaders: ["Content-Type", "Authorization", "X-API-Key", "Idempotency-Key"],
       credentials: true
     })(context, next);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beechcms/api",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/factory.d.ts",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.995.0",
     "@aws-sdk/s3-request-presigner": "^3.995.0",
-    "@beechcms/core": "^0.6.0",
+    "@beechcms/core": "^0.6.1",
     "@upstash/qstash": "^2.11.0",
     "bcryptjs": "^2.4.3",
     "hono": "^4.12.21",