@cancia/astro 0.8.0 → 0.9.0

package/dist/{chunk-L2VKQJPY.js → chunk-2NVZWZPE.js}

@@ -67,6 +67,52 @@ function hashRev(value) {
 import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, existsSync as existsSync2, mkdirSync as mkdirSync2, readdirSync, rmSync } from "fs";
 import { dirname as dirname2, join } from "path";
 import { randomUUID } from "crypto";
+
+// src/storage/order.ts
+function applyOrder(order, ids) {
+  const result = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const id of order) {
+    if (ids.has(id)) {
+      result.push(id);
+      seen.add(id);
+    }
+  }
+  const extras = [...ids].filter((id) => !seen.has(id)).sort();
+  return [...result, ...extras];
+}
+function orderAfterCreate(order, id) {
+  return order.includes(id) ? order : [...order, id];
+}
+function orderAfterDelete(order, id, stillExistsElsewhere) {
+  if (stillExistsElsewhere) return order;
+  const next = order.filter((existingId) => existingId !== id);
+  return next.length === order.length ? order : next;
+}
+var UnknownEntryError = class extends Error {
+  constructor(id, listName) {
+    super(`Cannot reorder: entry "${id}" not found in "${listName}"`);
+    this.id = id;
+    this.listName = listName;
+    this.name = "UnknownEntryError";
+  }
+};
+function planReorder(ids, allIds, listName) {
+  for (const id of ids) {
+    if (!allIds.has(id)) throw new UnknownEntryError(id, listName);
+  }
+  const keep = new Set(ids);
+  const dropped = [...allIds].filter((id) => !keep.has(id));
+  return { order: ids, dropped };
+}
+function entryExistsMessage(id, listName, locale) {
+  return `List entry "${id}" already exists in "${listName}" (${locale})`;
+}
+function entryNotFoundMessage(id, listName, locale) {
+  return `List entry "${id}" not found in "${listName}" (${locale})`;
+}
+
+// src/storage/json-file-v2.ts
 function readJsonFile(filePath, fallback) {
   if (!existsSync2(filePath)) return fallback;
   try {
@@ -168,18 +214,6 @@ function makeListStore(listsDir) {
   function writeEntry(site, listName, locale, entry) {
     writeJsonFile(entryPath(listsDir, listName, site, locale, entry.id), entry);
   }
-  function applyOrder(order, ids) {
-    const result = [];
-    const seen = /* @__PURE__ */ new Set();
-    for (const id of order) {
-      if (ids.has(id)) {
-        result.push(id);
-        seen.add(id);
-      }
-    }
-    const extras = [...ids].filter((id) => !seen.has(id)).sort();
-    return [...result, ...extras];
-  }
   return {
     async list(site, listName, locale) {
       const order = readOrder(listsDir, listName, site);
@@ -218,7 +252,7 @@ function makeListStore(listsDir) {
       const finalId = id ?? randomUUID();
       const existing = readEntry(site, listName, finalId, locale);
       if (existing) {
-        throw new Error(`List entry "${finalId}" already exists in "${listName}" (${locale})`);
+        throw new Error(entryExistsMessage(finalId, listName, locale));
       }
       const now = (/* @__PURE__ */ new Date()).toISOString();
       const entry = {
@@ -230,15 +264,14 @@ function makeListStore(listsDir) {
       };
       writeEntry(site, listName, locale, entry);
       const order = readOrder(listsDir, listName, site);
-      if (!order.includes(finalId)) {
-        writeOrder(listsDir, listName, site, [...order, finalId]);
-      }
+      const nextOrder = orderAfterCreate(order, finalId);
+      if (nextOrder !== order) writeOrder(listsDir, listName, site, nextOrder);
       return toEntry(entry);
     },
     async update(site, listName, id, locale, data, rev) {
       const existing = readEntry(site, listName, id, locale);
       if (!existing) {
-        throw new Error(`List entry "${id}" not found in "${listName}" (${locale})`);
+        throw new Error(entryNotFoundMessage(id, listName, locale));
       }
       if (hashRev(existing.data) !== rev) throw new RevConflictError();
       const updated = {
@@ -254,13 +287,9 @@ function makeListStore(listsDir) {
       if (!existsSync2(path)) return;
       rmSync(path);
       const stillExists = listLocales(listsDir, listName, site).some((loc) => existsSync2(entryPath(listsDir, listName, site, loc, id)));
-      if (!stillExists) {
-        const order = readOrder(listsDir, listName, site);
-        const next = order.filter((existingId) => existingId !== id);
-        if (next.length !== order.length) {
-          writeOrder(listsDir, listName, site, next);
-        }
-      }
+      const order = readOrder(listsDir, listName, site);
+      const next = orderAfterDelete(order, id, stillExists);
+      if (next !== order) writeOrder(listsDir, listName, site, next);
     },
     async reorder(site, listName, ids) {
       const locales = listLocales(listsDir, listName, site);
@@ -270,20 +299,14 @@ function makeListStore(listsDir) {
           allIds.add(id);
         }
       }
-      for (const id of ids) {
-        if (!allIds.has(id)) {
-          throw new Error(`Cannot reorder: entry "${id}" not found in "${listName}"`);
-        }
-      }
-      const supplied = new Set(ids);
-      for (const id of allIds) {
-        if (supplied.has(id)) continue;
+      const { order, dropped } = planReorder(ids, allIds, listName);
+      for (const id of dropped) {
         for (const loc of locales) {
           const path = entryPath(listsDir, listName, site, loc, id);
           if (existsSync2(path)) rmSync(path);
         }
       }
-      writeOrder(listsDir, listName, site, ids);
+      writeOrder(listsDir, listName, site, order);
     },
     async translations(site, listName) {
       const locales = listLocales(listsDir, listName, site);
@@ -320,5 +343,11 @@ export {
   createJsonFileAdapter,
   canonicalize,
   hashRev,
+  applyOrder,
+  orderAfterCreate,
+  orderAfterDelete,
+  planReorder,
+  entryExistsMessage,
+  entryNotFoundMessage,
   createJsonFileAdapterV2
 };

package/dist/{chunk-3B3CXOMK.js → chunk-GBTFXQEA.js}

@@ -1,6 +1,6 @@
 import {
   createJsonFileAdapterV2
-} from "./chunk-L2VKQJPY.js";
+} from "./chunk-2NVZWZPE.js";
 import {
   isDraft
 } from "./chunk-WVHTCFE6.js";

package/dist/chunk-GJIX7MWC.js

@@ -0,0 +1,55 @@
+// src/auth-core.ts
+var MAX_FAILURES = 5;
+var WINDOW_MS = 6e4;
+function createRateLimiter() {
+  return /* @__PURE__ */ new Map();
+}
+function getIp(req) {
+  return req.headers.get("x-forwarded-for")?.split(",")[0].trim() ?? req.headers.get("x-real-ip") ?? "unknown";
+}
+function isRateLimited(limiter, ip, now = Date.now()) {
+  const bucket = limiter.get(ip);
+  if (!bucket || now > bucket.resetAt) return false;
+  return bucket.failures >= MAX_FAILURES;
+}
+function recordFailure(limiter, ip, now = Date.now()) {
+  const bucket = limiter.get(ip);
+  if (!bucket || now > bucket.resetAt) {
+    limiter.set(ip, { failures: 1, resetAt: now + WINDOW_MS });
+  } else {
+    bucket.failures += 1;
+  }
+}
+function clearFailures(limiter, ip) {
+  limiter.delete(ip);
+}
+var json = (body, status) => new Response(JSON.stringify(body), {
+  status,
+  headers: { "Content-Type": "application/json" }
+});
+async function runAuth(cfg) {
+  const { request, secret, limiter } = cfg;
+  const now = cfg.now ?? Date.now();
+  const ip = getIp(request);
+  if (isRateLimited(limiter, ip, now)) {
+    return json({ error: "Too many attempts. Try again in a minute." }, 429);
+  }
+  let token;
+  try {
+    const body = await request.json();
+    token = body?.token;
+  } catch {
+    return json({ error: "Invalid request body" }, 400);
+  }
+  if (!token || !secret || token !== secret) {
+    recordFailure(limiter, ip, now);
+    return json({ error: "Invalid token" }, 401);
+  }
+  clearFailures(limiter, ip);
+  return json({ ok: true }, 200);
+}
+
+export {
+  createRateLimiter,
+  runAuth
+};

package/dist/{chunk-AGNPUTKS.js → chunk-LJSSPOSW.js}

@@ -5,11 +5,11 @@ import {
 import {
   createGitBackedAdapter,
   createSqliteAdapterV2
-} from "./chunk-GNWD7EL2.js";
+} from "./chunk-MXVOJRAM.js";
 import {
   createJsonFileAdapter,
   createJsonFileAdapterV2
-} from "./chunk-L2VKQJPY.js";
+} from "./chunk-2NVZWZPE.js";
 
 // src/routes/upload.ts
 import { writeFile, mkdir } from "fs/promises";

package/dist/{chunk-GNWD7EL2.js → chunk-MXVOJRAM.js}

@@ -2,8 +2,14 @@ import {
   createGitHubClient
 } from "./chunk-U7V53JX7.js";
 import {
-  hashRev
-} from "./chunk-L2VKQJPY.js";
+  applyOrder,
+  entryExistsMessage,
+  entryNotFoundMessage,
+  hashRev,
+  orderAfterCreate,
+  orderAfterDelete,
+  planReorder
+} from "./chunk-2NVZWZPE.js";
 import {
   RevConflictError
 } from "./chunk-7IA5B5CF.js";
@@ -119,18 +125,6 @@ function rowToEntry(row) {
     _rev: hashRev(data)
   };
 }
-function applyOrder(order, ids) {
-  const result = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const id of order) {
-    if (ids.has(id)) {
-      result.push(id);
-      seen.add(id);
-    }
-  }
-  const extras = [...ids].filter((id) => !seen.has(id)).sort();
-  return [...result, ...extras];
-}
 function makeListStore(db) {
   const getOrderStmt = db.prepare("SELECT ids FROM list_order WHERE site=? AND list=?");
   const upsertOrderStmt = db.prepare(
@@ -178,32 +172,25 @@ function makeListStore(db) {
     (site, listName, id, locale, dataJson, now) => {
       insertEntryStmt.run(site, listName, id, locale, dataJson, now, now);
       const order = readOrder(site, listName);
-      if (!order.includes(id)) {
-        writeOrder(site, listName, [...order, id]);
-      }
+      const next = orderAfterCreate(order, id);
+      if (next !== order) writeOrder(site, listName, next);
     }
   );
   const deleteTx = db.transaction((site, listName, id, locale) => {
     deleteEntryStmt.run(site, listName, id, locale);
     const stillExists = distinctIds(site, listName).has(id);
-    if (!stillExists) {
-      const order = readOrder(site, listName);
-      const next = order.filter((existingId) => existingId !== id);
-      if (next.length !== order.length) {
-        writeOrder(site, listName, next);
-      }
-    }
+    const order = readOrder(site, listName);
+    const next = orderAfterDelete(order, id, stillExists);
+    if (next !== order) writeOrder(site, listName, next);
   });
-  const reorderTx = db.transaction((site, listName, ids) => {
-    const all = distinctIds(site, listName);
-    const supplied = new Set(ids);
-    for (const id of all) {
-      if (!supplied.has(id)) {
+  const reorderTx = db.transaction(
+    (site, listName, order, dropped) => {
+      for (const id of dropped) {
         deleteEntryAllLocalesStmt.run(site, listName, id);
       }
+      writeOrder(site, listName, order);
     }
-    writeOrder(site, listName, ids);
-  });
+  );
   return {
     async list(site, listName, locale) {
       const order = readOrder(site, listName);
@@ -244,7 +231,7 @@ function makeListStore(db) {
       const finalId = id ?? randomUUID();
       const existing = getEntryStmt.get(site, listName, finalId, locale);
       if (existing) {
-        throw new Error(`List entry "${finalId}" already exists in "${listName}" (${locale})`);
+        throw new Error(entryExistsMessage(finalId, listName, locale));
       }
       const now = (/* @__PURE__ */ new Date()).toISOString();
       createTx(site, listName, finalId, locale, JSON.stringify(data), now);
@@ -260,7 +247,7 @@ function makeListStore(db) {
     async update(site, listName, id, locale, data, rev) {
       const existing = getEntryStmt.get(site, listName, id, locale);
       if (!existing) {
-        throw new Error(`List entry "${id}" not found in "${listName}" (${locale})`);
+        throw new Error(entryNotFoundMessage(id, listName, locale));
       }
       const existingData = JSON.parse(existing.data);
       if (hashRev(existingData) !== rev) throw new RevConflictError();
@@ -282,12 +269,8 @@ function makeListStore(db) {
     },
     async reorder(site, listName, ids) {
       const all = distinctIds(site, listName);
-      for (const id of ids) {
-        if (!all.has(id)) {
-          throw new Error(`Cannot reorder: entry "${id}" not found in "${listName}"`);
-        }
-      }
-      reorderTx(site, listName, ids);
+      const { order, dropped } = planReorder(ids, all, listName);
+      reorderTx(site, listName, order, dropped);
     },
     async translations(site, listName) {
       const rows = allEntriesStmt.all(site, listName);

package/dist/content.js

@@ -2,9 +2,9 @@ import "./chunk-FOSOWSXV.js";
 import "./chunk-CJDIVWO3.js";
 import {
   createSqliteAdapterV2
-} from "./chunk-GNWD7EL2.js";
+} from "./chunk-MXVOJRAM.js";
 import "./chunk-U7V53JX7.js";
-import "./chunk-L2VKQJPY.js";
+import "./chunk-2NVZWZPE.js";
 import "./chunk-7IA5B5CF.js";
 
 // src/content.ts

package/dist/endpoints/auth.js

@@ -1,55 +1,14 @@
+import {
+  createRateLimiter,
+  runAuth
+} from "../chunk-GJIX7MWC.js";
+
 // src/endpoints/auth.ts
 import { getCanciaRuntime } from "virtual:cancia/runtime";
-var buckets = /* @__PURE__ */ new Map();
-var MAX_FAILURES = 5;
-var WINDOW_MS = 6e4;
-function getIp(req) {
-  return req.headers.get("x-forwarded-for")?.split(",")[0].trim() ?? req.headers.get("x-real-ip") ?? "unknown";
-}
-function isRateLimited(ip) {
-  const bucket = buckets.get(ip);
-  if (!bucket || Date.now() > bucket.resetAt) return false;
-  return bucket.failures >= MAX_FAILURES;
-}
-function recordFailure(ip) {
-  const now = Date.now();
-  const bucket = buckets.get(ip);
-  if (!bucket || now > bucket.resetAt) {
-    buckets.set(ip, { failures: 1, resetAt: now + WINDOW_MS });
-  } else {
-    bucket.failures += 1;
-  }
-}
+var limiter = createRateLimiter();
 async function POST({ request }) {
   const { secret } = getCanciaRuntime();
-  const ip = getIp(request);
-  if (isRateLimited(ip))
-    return new Response(
-      JSON.stringify({ error: "Too many attempts. Try again in a minute." }),
-      { status: 429, headers: { "Content-Type": "application/json" } }
-    );
-  let token;
-  try {
-    const body = await request.json();
-    token = body?.token;
-  } catch {
-    return new Response(
-      JSON.stringify({ error: "Invalid request body" }),
-      { status: 400, headers: { "Content-Type": "application/json" } }
-    );
-  }
-  if (!token || token !== secret) {
-    recordFailure(ip);
-    return new Response(
-      JSON.stringify({ error: "Invalid token" }),
-      { status: 401, headers: { "Content-Type": "application/json" } }
-    );
-  }
-  buckets.delete(ip);
-  return new Response(
-    JSON.stringify({ ok: true }),
-    { status: 200, headers: { "Content-Type": "application/json" } }
-  );
+  return runAuth({ request, secret, limiter });
 }
 export {
   POST

package/dist/index.js

@@ -4,6 +4,10 @@ import {
 import {
   runPublish
 } from "./chunk-5RCLBWRH.js";
+import {
+  createRateLimiter,
+  runAuth
+} from "./chunk-GJIX7MWC.js";
 import {
   makeListsRoutes
 } from "./chunk-DIV2FFYX.js";
@@ -12,7 +16,7 @@ import {
   makeR2UploadHandler,
   makeUploadRoute,
   setCanciaRuntime
-} from "./chunk-AGNPUTKS.js";
+} from "./chunk-LJSSPOSW.js";
 import "./chunk-5IPHDIC6.js";
 import {
   createSQLiteAdapter
@@ -21,16 +25,16 @@ import {
   closeSqliteAdapterV2,
   createGitBackedAdapter,
   createSqliteAdapterV2
-} from "./chunk-GNWD7EL2.js";
+} from "./chunk-MXVOJRAM.js";
 import "./chunk-U7V53JX7.js";
 import "./chunk-VL6FO446.js";
 import {
   canciaLoader
-} from "./chunk-3B3CXOMK.js";
+} from "./chunk-GBTFXQEA.js";
 import {
   createJsonFileAdapter,
   createJsonFileAdapterV2
-} from "./chunk-L2VKQJPY.js";
+} from "./chunk-2NVZWZPE.js";
 import {
   RevConflictError
 } from "./chunk-7IA5B5CF.js";
@@ -115,61 +119,10 @@ function makePublishRoute(deployHook, secret, hookOptions, dispatch, mode) {
 }
 
 // src/routes/auth.ts
-var buckets = /* @__PURE__ */ new Map();
-var MAX_FAILURES = 5;
-var WINDOW_MS = 6e4;
-function getIp(req) {
-  return req.headers.get("x-forwarded-for")?.split(",")[0].trim() ?? req.headers.get("x-real-ip") ?? "unknown";
-}
-function isRateLimited(ip) {
-  const now = Date.now();
-  const bucket = buckets.get(ip);
-  if (!bucket || now > bucket.resetAt) return false;
-  return bucket.failures >= MAX_FAILURES;
-}
-function recordFailure(ip) {
-  const now = Date.now();
-  const bucket = buckets.get(ip);
-  if (!bucket || now > bucket.resetAt) {
-    buckets.set(ip, { failures: 1, resetAt: now + WINDOW_MS });
-  } else {
-    bucket.failures += 1;
-  }
-}
-function clearFailures(ip) {
-  buckets.delete(ip);
-}
 function makeAuthRoute(secret) {
+  const limiter = createRateLimiter();
   return async function authRoute(req) {
-    const ip = getIp(req);
-    if (isRateLimited(ip)) {
-      return new Response(
-        JSON.stringify({ error: "Too many attempts. Try again in a minute." }),
-        { status: 429, headers: { "Content-Type": "application/json" } }
-      );
-    }
-    let token;
-    try {
-      const body = await req.json();
-      token = body?.token;
-    } catch {
-      return new Response(
-        JSON.stringify({ error: "Invalid request body" }),
-        { status: 400, headers: { "Content-Type": "application/json" } }
-      );
-    }
-    if (!token || token !== secret) {
-      recordFailure(ip);
-      return new Response(
-        JSON.stringify({ error: "Invalid token" }),
-        { status: 401, headers: { "Content-Type": "application/json" } }
-      );
-    }
-    clearFailures(ip);
-    return new Response(
-      JSON.stringify({ ok: true }),
-      { status: 200, headers: { "Content-Type": "application/json" } }
-    );
+    return runAuth({ request: req, secret, limiter });
   };
 }
 

package/dist/loader/index.js

@@ -1,7 +1,7 @@
 import {
   canciaLoader
-} from "../chunk-3B3CXOMK.js";
-import "../chunk-L2VKQJPY.js";
+} from "../chunk-GBTFXQEA.js";
+import "../chunk-2NVZWZPE.js";
 import "../chunk-7IA5B5CF.js";
 import "../chunk-WVHTCFE6.js";
 import "../chunk-KHCFVVYV.js";

package/dist/runtime.js

@@ -3,11 +3,11 @@ import {
   getCanciaRuntime,
   setBakedConfig,
   setCanciaRuntime
-} from "./chunk-AGNPUTKS.js";
+} from "./chunk-LJSSPOSW.js";
 import "./chunk-5IPHDIC6.js";
-import "./chunk-GNWD7EL2.js";
+import "./chunk-MXVOJRAM.js";
 import "./chunk-U7V53JX7.js";
-import "./chunk-L2VKQJPY.js";
+import "./chunk-2NVZWZPE.js";
 import "./chunk-7IA5B5CF.js";
 export {
   __resetRuntimeForTests,

package/dist/schema/index.d.ts

@@ -123,7 +123,9 @@ interface ListSchema<TFields extends Record<string, z.ZodTypeAny> = Record<strin
  * to "published", matching the field's own default and keeping entries that
  * predate the draftField visible.
  */
-declare function isDraft(schema: Pick<ListSchema, "draftField">, data: Record<string, unknown>): boolean;
+declare function isDraft(schema: {
+    draftField?: string;
+}, data: Record<string, unknown>): boolean;
 declare function defineList<TFields extends Record<string, z.ZodTypeAny>>(opts: ListSchemaOptions<TFields>): ListSchema<TFields>;
 /**
  * One field as seen by the modal form. Plain JSON, no Zod refs.

package/dist/storage/index.js

@@ -6,7 +6,7 @@ import {
   closeSqliteAdapterV2,
   createGitBackedAdapter,
   createSqliteAdapterV2
-} from "../chunk-GNWD7EL2.js";
+} from "../chunk-MXVOJRAM.js";
 import {
   createGitHubClient
 } from "../chunk-U7V53JX7.js";
@@ -15,7 +15,7 @@ import {
   createJsonFileAdapter,
   createJsonFileAdapterV2,
   hashRev
-} from "../chunk-L2VKQJPY.js";
+} from "../chunk-2NVZWZPE.js";
 import {
   RevConflictError
 } from "../chunk-7IA5B5CF.js";

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@cancia/astro",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Astro integration for Cancia CMS — inline editing with zero separate server",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/ninuzdellalb/cancia",
+    "url": "git+https://github.com/ninuzdellalb/cancia.git",
     "directory": "packages/astro"
   },
   "type": "module",