@rr0/cms 0.3.58 → 0.3.59

package/dist/search/SearchIndexStep.js

@@ -1,5 +1,6 @@
 import fs from "fs";
 import { writeFile } from "@javarome/fileutil";
+import path from "path";
 /**
  * Saves the index file collected by the SearchCommand.
  */
@@ -24,17 +25,15 @@ export class SearchIndexStep {
         try {
             existingIndex = JSON.parse(fs.readFileSync(this.fileName, { encoding: this.encoding }));
             const newPages = newIndex.pages;
-            const existingPages = existingIndex.pages;
-            for (let newPage of newPages) {
-                const alreadyIndexedPage = existingPages.find(existingPage => existingPage.url === newPage.url);
-                if (alreadyIndexedPage) {
-                    Object.assign(alreadyIndexedPage, newPage);
-                }
-                else {
-                    existingPages.push(newPage);
-                }
+            const contentRoot = path.dirname(path.dirname(this.fileName));
+            const pagesByUrl = new Map(existingIndex.pages
+                .filter(page => fs.existsSync(path.resolve(contentRoot, page.url)))
+                .map(page => [page.url, page]));
+            for (const newPage of newPages) {
+                pagesByUrl.set(newPage.url, newPage);
             }
-            existingPages.sort((pageInfo1, pageInfo2) => pageInfo1.title > pageInfo2.title ? 1 : pageInfo1.title < pageInfo2.title ? -1 : 0);
+            existingIndex.pages = Array.from(pagesByUrl.values());
+            existingIndex.pages.sort((pageInfo1, pageInfo2) => pageInfo1.title > pageInfo2.title ? 1 : pageInfo1.title < pageInfo2.title ? -1 : 0);
         }
         catch (e) {
             if (e.errno !== -2) {

package/dist/search/SearchIndexStep.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/search/SearchIndexStep.test.js

@@ -0,0 +1,47 @@
+import { describe, expect, test } from "@javarome/testscript";
+import fs from "fs";
+import os from "os";
+import path from "path";
+import { SearchIndexStep } from "./SearchIndexStep.js";
+describe("SearchIndexStep", () => {
+    test("removes missing and duplicate pages while updating the current pages", async () => {
+        const root = fs.mkdtempSync(path.join(os.tmpdir(), "rr0-search-index-"));
+        try {
+            const searchDir = path.join(root, "search");
+            fs.mkdirSync(searchDir);
+            fs.writeFileSync(path.join(root, "current.html"), "");
+            const fileName = path.join(searchDir, "index.json");
+            const existingIndex = {
+                pages: [
+                    { title: "Old current title", url: "current.html", time: "" },
+                    { title: "Duplicate current title", url: "current.html", time: "" },
+                    { title: "Moved page", url: "old/path.html", time: "" }
+                ],
+                words: {}
+            };
+            fs.writeFileSync(fileName, JSON.stringify(existingIndex));
+            const newIndex = {
+                pages: [
+                    { title: "Current title", url: "current.html", time: "" },
+                    { title: "New page", url: "new.html", time: "" }
+                ],
+                words: {}
+            };
+            const visitor = { index: newIndex };
+            const context = {
+                setVar() { },
+                log() { },
+                warn() { }
+            };
+            await new SearchIndexStep(fileName, visitor).execute(context);
+            const savedIndex = JSON.parse(fs.readFileSync(fileName, "utf8"));
+            expect(savedIndex.pages).toEqual([
+                { title: "Current title", url: "current.html", time: "" },
+                { title: "New page", url: "new.html", time: "" }
+            ]);
+        }
+        finally {
+            fs.rmSync(root, { recursive: true, force: true });
+        }
+    });
+});

package/package.json

@@ -2,7 +2,7 @@
   "name": "@rr0/cms",
   "type": "module",
   "author": "Jérôme Beau <rr0@rr0.org> (https://rr0.org)",
-  "version": "0.3.58",
+  "version": "0.3.59",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",