Allow specifying the revision to pull files from

[GitWikiWeb] / build.js

diff --git a/build.js b/build.js
index 0544a03217e4407eb18863058ac0486933f7cb8f..bd8ff27ba2c0fe3743ba4132236fd65237c8cfbc 100644 (file)
--- a/build.js
+++ b/build.js
@@ -20,7 +20,7 @@
 //     export GITWIKIWEB=/srv/git/GitWikiWeb
 //     git archive --remote=$GITWIKIWEB HEAD build.js \
 //       | tar -xO \
 //     export GITWIKIWEB=/srv/git/GitWikiWeb
 //     git archive --remote=$GITWIKIWEB HEAD build.js \
 //       | tar -xO \

-//       | deno run -A - ~/public/wiki $GITWIKIWEB
+//       | deno run -A - ~/public/wiki $GITWIKIWEB current

 //
 // The directory `~/public/wiki` (or whatever you specify as the first
 // argument to `deno run -A -`) **will be deleted** and a new static
 //
 // The directory `~/public/wiki` (or whatever you specify as the first
 // argument to `deno run -A -`) **will be deleted** and a new static


@@ -37,7 +37,11 @@
 import {
   emptyDir,
   ensureDir,
 import {
   emptyDir,
   ensureDir,

-} from "https://deno.land/std@0.195.0/fs/mod.ts";
+} from "https://deno.land/std@0.196.0/fs/mod.ts";
+import {
+  JSON_SCHEMA,
+  parse as parseYaml,
+} from "https://deno.land/std@0.196.0/yaml/mod.ts";

 import djot from "npm:@djot/djot@0.2.3";
 import { Parser } from "npm:htmlparser2@9.0.0";
 import { DomHandler, Element, Text } from "npm:domhandler@5.0.3";
 import djot from "npm:@djot/djot@0.2.3";
 import { Parser } from "npm:htmlparser2@9.0.0";
 import { DomHandler, Element, Text } from "npm:domhandler@5.0.3";


@@ -46,6 +50,7 @@ import domSerializer from "npm:dom-serializer@2.0.0";
 
 const DESTINATION = Deno.args[0] ?? "~/public/wiki";
 const REMOTE = Deno.args[1] ?? "/srv/git/GitWikiWeb";
 
 const DESTINATION = Deno.args[0] ?? "~/public/wiki";
 const REMOTE = Deno.args[1] ?? "/srv/git/GitWikiWeb";

+const REV = Deno.args[2] ?? "HEAD";

 
 const READ_ONLY = {
   configurable: false,
 
 const READ_ONLY = {
   configurable: false,


@@ -89,7 +94,7 @@ const getDOM = (source) => {
 
 const getRemoteContent = async (pathName) => {
   const getArchive = new Deno.Command("git", {
 
 const getRemoteContent = async (pathName) => {
   const getArchive = new Deno.Command("git", {

-    args: ["archive", `--remote=${REMOTE}`, "HEAD", pathName],
+    args: ["archive", `--remote=${REMOTE}`, REV, pathName],

     stdout: "piped",
     stderr: "piped",
   }).spawn();
     stdout: "piped",
     stderr: "piped",
   }).spawn();


@@ -173,7 +178,7 @@ const listOfInternalLinks = (references, wrapper = ($) => $) => ({
   ),
 });
 
   ),
 });
 

-const diffReferences = async (hash) => {
+const diffReferences = async (hash, againstHead = false) => {

   const diff = new Deno.Command("git", {
     args: [
       "diff-tree",
   const diff = new Deno.Command("git", {
     args: [
       "diff-tree",


@@ -182,7 +187,7 @@ const diffReferences = async (hash) => {
       "--name-only",
       "--no-renames",
       "--diff-filter=AM",
       "--name-only",
       "--no-renames",
       "--diff-filter=AM",

-      hash,
+      ...(againstHead ? [hash, "HEAD"] : [hash]),

     ],
     stdout: "piped",
     stderr: "piped",
     ],
     stdout: "piped",
     stderr: "piped",


@@ -217,7 +222,7 @@ class GitWikiWebPage {
   #internalLinks = new Set();
   #externalLinks = new Map();
 
   #internalLinks = new Set();
   #externalLinks = new Map();
 

-  constructor(namespace, name, ast, source) {
+  constructor(namespace, name, ast, source, config) {

     const internalLinks = this.#internalLinks;
     const externalLinks = this.#externalLinks;
     const sections = Object.create(null);
     const internalLinks = this.#internalLinks;
     const externalLinks = this.#externalLinks;
     const sections = Object.create(null);


@@ -471,6 +476,20 @@ class GitWikiWebPage {
           },
           exit: (_) => {},
         },
           },
           exit: (_) => {},
         },

+        symb: {
+          enter: (e) => {
+            const { alias } = e;
+            const codepoint = /^U\+([0-9A-Fa-f]+)$/u.exec(alias)?.[1];
+            if (codepoint) {
+              return str`${
+                String.fromCodePoint(parseInt(codepoint, 16))
+              }`;
+            } else {
+              const resolved = config.symbols?.[alias];
+              return resolved != null ? str`${resolved}` : e;
+            }
+          },
+        },

       };
     });
     Object.defineProperties(this, {
       };
     });
     Object.defineProperties(this, {


@@ -495,8 +514,11 @@ class GitWikiWebPage {
 }
 
 {
 }
 
 {

+  const config = await getRemoteContent("config.yaml").then((yaml) =>
+    parseYaml(yaml, { schema: JSON_SCHEMA })
+  );

   const ls = new Deno.Command("git", {
   const ls = new Deno.Command("git", {

-    args: ["ls-tree", "-rz", "live"],
+    args: ["ls-tree", "-rz", "HEAD"],

     stdout: "piped",
     stderr: "piped",
   }).spawn();
     stdout: "piped",
     stderr: "piped",
   }).spawn();


@@ -568,6 +590,7 @@ class GitWikiWebPage {
                     console.warn(`Djot(${reference}): ${$.render()}`),
                 }),
                 source,
                     console.warn(`Djot(${reference}): ${$.render()}`),
                 }),
                 source,

+                config,

               );
               const reference = `${namespace}:${pageName}`;
               pages.set(reference, page);
               );
               const reference = `${namespace}:${pageName}`;
               pages.set(reference, page);


@@ -589,6 +612,7 @@ class GitWikiWebPage {
             console.warn(`Djot(${reference}): ${$.render()}`),
         }),
         source,
             console.warn(`Djot(${reference}): ${$.render()}`),
         }),
         source,

+        config,

       );
       pages.set(reference, page);
     }
       );
       pages.set(reference, page);
     }


@@ -663,7 +687,9 @@ class GitWikiWebPage {
           ]).then(logErrorsAndCollectResults);
           const refs = [];
           current = hash;
           ]).then(logErrorsAndCollectResults);
           const refs = [];
           current = hash;

-          for (const ref of (await diffReferences(current))) {
+          for (
+            const ref of (await diffReferences(current, !recency))
+          ) {

             if (seen.has(ref)) {
               /* do nothing */
             } else {
             if (seen.has(ref)) {
               /* do nothing */
             } else {


@@ -671,7 +697,7 @@ class GitWikiWebPage {
               seen.add(ref);
             }
           }
               seen.add(ref);
             }
           }

-          results[recency] = { dateTime, humanReadable, refs };
+          results[recency] = { dateTime, hash, humanReadable, refs };

         } while (recency-- > 0 && current && current != commit);
         return results;
       })(),
         } while (recency-- > 0 && current && current != commit);
         return results;
       })(),