@natilon/cms-server 0.10.0 → 0.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@natilon/cms-server",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Express-based CMS server with pluggable adapters for content, media, auth, and build.",
   "license": "MIT",
   "repository": {
@@ -20,7 +20,7 @@
     "natilon-cms": "./bin/natilon-cms.mjs"
   },
   "scripts": {
-    "test": "node --test test/"
+    "test": "node --test 'test/**/*.test.mjs'"
   },
   "exports": {
     ".": "./src/index.mjs",
@@ -35,7 +35,7 @@
     "bin"
   ],
   "dependencies": {
-    "@natilon/admin-ui": ">=0.5.0",
+    "@natilon/admin-ui": ">=0.10.0",
     "express": "^4.21.0"
   },
   "peerDependencies": {

package/src/adapters/_shared.mjs

@@ -25,6 +25,18 @@ export function safeFileName(name) {
   return name;
 }
 
+/**
+ * True when a filename is a content entry (and not a generated manifest such
+ * as `_index.json`). Manifest/index files are list projections, not entries,
+ * so every directory-scan that enumerates entries must exclude them.
+ *
+ * @param {string} file
+ * @returns {boolean}
+ */
+export function isEntryFile(file) {
+  return typeof file === "string" && file.endsWith(".json") && !file.startsWith("_");
+}
+
 /**
  * Sorts a pages array in-place and returns it.
  *

package/src/adapters/fs-json-content.mjs

@@ -1,7 +1,7 @@
 import fs from "fs";
 import path from "path";
 import { execSync } from "child_process";
-import { sanitize, safeFileName, sortPages, buildDuplicateData, listScheduledDue, buildListEntry, relationFields } from "./_shared.mjs";
+import { sanitize, safeFileName, sortPages, buildDuplicateData, listScheduledDue, buildListEntry, relationFields, isEntryFile } from "./_shared.mjs";
 
 const HISTORY_KEEP = 50; // max revisions kept per file
 
@@ -65,7 +65,7 @@ export function createFsJsonContent({
       return dirs.map((dir) => {
         const files = fs
           .readdirSync(path.join(PAGES_DIR, dir))
-          .filter((f) => f.endsWith(".json"));
+          .filter(isEntryFile);
         return { name: dir, count: files.length };
       });
     },
@@ -84,7 +84,7 @@ export function createFsJsonContent({
         if (!fs.existsSync(targetDir)) continue;
         const table = {};
         for (const f of fs.readdirSync(targetDir)) {
-          if (!f.endsWith(".json") || f === "_index.json") continue;
+          if (!isEntryFile(f)) continue;
           try {
             const d = JSON.parse(fs.readFileSync(path.join(targetDir, f), "utf-8"));
             if (d.slug) table[d.slug] = d.meta?.title || d.meta?.name || d.slug;
@@ -95,7 +95,7 @@ export function createFsJsonContent({
         lookups[target] = table;
       }
 
-      const files = fs.readdirSync(dir).filter((f) => f.endsWith(".json"));
+      const files = fs.readdirSync(dir).filter(isEntryFile);
       const pages = files.map((file) => {
         const data = JSON.parse(fs.readFileSync(path.join(dir, file), "utf-8"));
         return buildListEntry(collections[collection], collection, file, data, lookups);
@@ -122,6 +122,13 @@ export function createFsJsonContent({
       const slug = data.slug || data.id || `new-${Date.now()}`;
       const fileName = `${sanitize(data.lang || "en")}-${sanitize(slug)}.json`;
       const filePath = pagePath(collection, fileName);
+      if (fs.existsSync(filePath)) {
+        const err = new Error(
+          `An entry already exists for "${data.lang || "en"}/${slug}". Change the slug or language.`,
+        );
+        err.status = 409;
+        throw err;
+      }
       const dir = path.dirname(filePath);
       if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
       fs.writeFileSync(filePath, JSON.stringify(data, null, 2), "utf-8");

package/src/adapters/github-content.mjs

@@ -254,6 +254,13 @@ export function createGitHubContent({ token, owner, repo, branch, pagesDir, comm
       const slug = data.slug || data.id || `new-${Date.now()}`;
       const fileName = `${sanitize(data.lang || "en")}-${sanitize(slug)}.json`;
       const path = contentPath(collection, fileName);
+      if (await getFileSha(path)) {
+        const err = new Error(
+          `An entry already exists for "${data.lang || "en"}/${slug}". Change the slug or language.`,
+        );
+        err.status = 409;
+        throw err;
+      }
       const result = await apiPut(`/contents/${path}`, {
         message: commitMsg(commitMessage),
         content: encodeContent(data),

package/src/routes.mjs

@@ -150,8 +150,13 @@ export const apiRoutes = [
     path: "/api/collections/:collection",
     auth: "any",
     handler: async ({ adapters, params, body }) => {
-      const result = await adapters.content.createPage(params.collection, body);
-      return ok({ ok: true, file: result.file });
+      try {
+        const result = await adapters.content.createPage(params.collection, body);
+        return ok({ ok: true, file: result.file });
+      } catch (err) {
+        if (err.status === 409) return { status: 409, json: { error: err.message } };
+        throw err;
+      }
     },
   },