@riboseinc/anafero-cli 0.0.24 → 0.0.26

package/build-site.css

@@ -31078,6 +31078,9 @@ tbody.vars_bd693cb4_hm005a_spectrum-Table-body .vars_bd693cb4_hm005a_spectrum-Ta
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  display: flex;
+  align-items: center;
+  gap: 1em;
   transition: margin-left .5s ease-in-out;
   &.style_withNav {
     margin-left: 330px !important;
@@ -31191,14 +31194,6 @@ tbody.vars_bd693cb4_hm005a_spectrum-Table-body .vars_bd693cb4_hm005a_spectrum-Ta
       overflow: hidden;
       text-align: right;
       text-overflow: ellipsis;
-      html[lang=ja] & {
-        transform: unset;
-        width: unset;
-        height: unset;
-        text-align: unset;
-        writing-mode: vertical-rl;
-        margin-top: 20px;
-      }
     }
   }
   .style_browserBarToolbar[data-orientation=vertical] {

package/build-site.mjs

@@ -294340,7 +294340,7 @@ function makeDummyInMemoryCache() {
     has: (key) => {
       return cache3[key] !== void 0;
     },
-    get: (key, page) => {
+    get: (key) => {
       if (cache3[key] !== void 0) {
         return cache3[key];
       } else {
@@ -321476,28 +321476,54 @@ var build2 = Command_exports2.make(
     ...reportingOptions
   },
   ({ targetDirectoryPath, pathPrefix, verbose, debug: debug3, revision, omitRevisionsNewerThanCurrent, currentRevision }) => pipe(
-    Effect_exports.try(() => parseReportingConfig({ verbose, debug: debug3 })),
-    Effect_exports.flatMap((reportingConfig) => pipe(
+    Effect_exports.try(() => {
+      const config2 = parseReportingConfig({ verbose, debug: debug3 });
+      return [
+        config2,
+        makeDummyInMemoryCache()
+      ];
+    }),
+    Effect_exports.flatMap(([reportingConfig, cache3]) => pipe(
       Effect_exports.tryPromise({
         try: () => new Promise((resolve4, reject) => {
           const prefix = unpackOption(pathPrefix);
           if (prefix && (!prefix.startsWith("/") || prefix.endsWith("/"))) {
             throw new Error("Path prefix must have a leading slash and no trailing slash");
           }
+          function maybeDumpCache() {
+            if (debug3) {
+              try {
+                console.warn("Dumping cache to cacheDump.json");
+                fs4.writeFileSync(
+                  "cacheDump.json",
+                  JSON.stringify(cache3.dump(), null, 2),
+                  { encoding: "utf-8" }
+                );
+              } catch (e2) {
+                console.error("Cache dump could not be written!", e2);
+              }
+            }
+          }
+          process.on("SIGINT", maybeDumpCache);
           render_default(/* @__PURE__ */ import_react128.default.createElement(Processor, { rootTaskName: "build site", onStart: async function({ onProgress }) {
             try {
-              const generator = generateSite({
-                revision: unpackOption(revision),
-                omitRevisionsNewerThanCurrent: unpackOption(omitRevisionsNewerThanCurrent),
-                currentRevision: unpackOption(currentRevision)
-              }, (task, progress) => onProgress(`build site|${task}`, progress), {
-                pathPrefix: prefix,
-                debug: {
-                  dumpCache: debug3 || false,
-                  reactDevTools: debug3 || false,
-                  reactStrictMode: debug3 || false
+              const generator = generateSite(
+                {
+                  revision: unpackOption(revision),
+                  omitRevisionsNewerThanCurrent: unpackOption(omitRevisionsNewerThanCurrent),
+                  currentRevision: unpackOption(currentRevision)
+                },
+                (task, progress) => onProgress(`build site|${task}`, progress),
+                cache3,
+                {
+                  pathPrefix: prefix,
+                  debug: {
+                    //dumpCache: debug || false,
+                    reactDevTools: debug3 || false,
+                    reactStrictMode: debug3 || false
+                  }
                 }
-              });
+              );
               const [writeProgress, writingSubtask] = onProgress("build site|write files");
               for await (const blobchunk of generator) {
                 const [subtask] = writingSubtask(Object.keys(blobchunk).join(",").replaceAll("|", ":"), { state: "writing" });
@@ -321509,6 +321535,9 @@ var build2 = Command_exports2.make(
               resolve4(void 0);
             } catch (e2) {
               reject(e2);
+            } finally {
+              maybeDumpCache();
+              process.removeListener("SIGINT", maybeDumpCache);
             }
           } }));
         }),
@@ -321646,7 +321675,7 @@ global.document ??= {
   evaluate: import_xpath2.default.evaluate
 };
 global.XPathResult ??= import_xpath2.default.XPathResult;
-async function* generateSite(revisionsToBuild, onProgress, opts) {
+async function* generateSite(revisionsToBuild, onProgress, cache3, opts) {
   if (revisionsToBuild !== void 0) {
     const [versionProgress] = onProgress("determine versions to build", {});
     if (!await areWeInGitRepoRoot()) {
@@ -321685,56 +321714,40 @@ async function* generateSite(revisionsToBuild, onProgress, opts) {
         join8(PACKAGE_ROOT, "./bootstrap.css")
       )
     };
-    const cache3 = makeDummyInMemoryCache();
-    try {
-      yield* generateStaticSiteAssets(
-        refsToBuild,
-        revisionsToBuild.currentRevision,
-        {
-          reportProgress: onProgress,
-          fetchBlob: readObject,
-          fetchDependency,
-          getDependencyCSS: (modID) => {
-            const maybeCSS = getDependencySupportingFiles()[modID]?.["index.css"];
-            return maybeCSS ?? null;
-          },
-          getDependencySource: (modID) => {
-            const source = getDependencySources()[modID];
-            if (!source) {
-              console.error("Requested dependency source was not found", modID);
-              throw new Error("Requested dependency source was not found");
-            }
-            return source;
-          },
-          getDOMStub: () => new import_jsdom2.JSDOM("<html></html>").window.document,
-          cache: cache3,
-          debug: {
-            reactStrictMode: opts?.debug?.reactStrictMode || false,
-            reactDevTools: opts?.debug?.reactDevTools || false
-          },
-          pathPrefix: opts?.pathPrefix,
-          decodeXML: (blob) => new import_jsdom2.JSDOM(
-            decoder3.decode(blob).replace("xmlns", "wtf"),
-            // xpath
-            { contentType: "application/xhtml+xml" }
-          ).window.document,
-          getConfigOverride: async () => null
-        }
-      );
-    } finally {
-      if (opts?.debug?.dumpCache) {
-        try {
-          fs4.writeFileSync(
-            "cacheDump.json",
-            JSON.stringify(cache3.dump(), null, 2),
-            { encoding: "utf-8" }
-          );
-          console.info("cacheDump.json was written for content reader work inspection");
-        } catch (e2) {
-          console.warn("cacheDump.json could not be written");
-        }
+    yield* generateStaticSiteAssets(
+      refsToBuild,
+      revisionsToBuild.currentRevision,
+      {
+        reportProgress: onProgress,
+        fetchBlob: readObject,
+        fetchDependency,
+        getDependencyCSS: (modID) => {
+          const maybeCSS = getDependencySupportingFiles()[modID]?.["index.css"];
+          return maybeCSS ?? null;
+        },
+        getDependencySource: (modID) => {
+          const source = getDependencySources()[modID];
+          if (!source) {
+            console.error("Requested dependency source was not found", modID);
+            throw new Error("Requested dependency source was not found");
+          }
+          return source;
+        },
+        getDOMStub: () => new import_jsdom2.JSDOM("<html></html>").window.document,
+        cache: cache3,
+        debug: {
+          reactStrictMode: opts?.debug?.reactStrictMode || false,
+          reactDevTools: opts?.debug?.reactDevTools || false
+        },
+        pathPrefix: opts?.pathPrefix,
+        decodeXML: (blob) => new import_jsdom2.JSDOM(
+          decoder3.decode(blob).replace("xmlns", "wtf"),
+          // xpath
+          { contentType: "application/xhtml+xml" }
+        ).window.document,
+        getConfigOverride: async () => null
       }
-    }
+    );
   } else {
     throw new Error("Unversioned build is not supported yet");
   }

package/generate-to-filesystem.tsx

@@ -27,7 +27,7 @@ import React from 'react';
 import { render } from 'ink';
 import { Processor } from './CLI.jsx';
 import { type TaskProgressCallback } from 'anafero/progress.mjs';
-import { makeDummyInMemoryCache } from 'anafero/cache.mjs';
+import { type Cache, makeDummyInMemoryCache } from 'anafero/cache.mjs';
 
 import { JSDOM } from 'jsdom';
 import xpath from 'xpath';
@@ -96,28 +96,57 @@ const build = Command.
       ...reportingOptions,
     },
     ({ targetDirectoryPath, pathPrefix, verbose, debug, revision, omitRevisionsNewerThanCurrent, currentRevision }) => pipe(
-      Effect.try(() => parseReportingConfig({ verbose, debug })),
-      Effect.flatMap(reportingConfig => pipe(
+      Effect.try(() => {
+        const config = parseReportingConfig({ verbose, debug })
+        return [
+          config,
+          makeDummyInMemoryCache(),
+        ] as [
+          ReturnType<typeof parseReportingConfig>,
+          ReturnType<typeof makeDummyInMemoryCache>,
+        ];
+      }),
+      Effect.flatMap(([reportingConfig, cache]) => pipe(
         Effect.tryPromise({
           try: () => new Promise((resolve, reject) => {
             const prefix = unpackOption(pathPrefix);
             if (prefix && (!prefix.startsWith('/') || prefix.endsWith('/'))) {
               throw new Error("Path prefix must have a leading slash and no trailing slash");
             }
+            function maybeDumpCache() {
+              if (debug) {
+                try {
+                  console.warn("Dumping cache to cacheDump.json");
+                  fs.writeFileSync(
+                    'cacheDump.json',
+                    JSON.stringify(cache.dump(), null, 2),
+                    { encoding: 'utf-8' },
+                  );
+                } catch (e) {
+                  console.error("Cache dump could not be written!", e);
+                }
+              }
+            }
+            process.on('SIGINT', maybeDumpCache);
             render(<Processor rootTaskName="build site" onStart={async function ({ onProgress }) {
               try {
-                const generator = generateSite({
-                  revision: unpackOption(revision)!,
-                  omitRevisionsNewerThanCurrent: unpackOption(omitRevisionsNewerThanCurrent)!,
-                  currentRevision: unpackOption(currentRevision)!,
-                }, (task, progress) => onProgress(`build site|${task}`, progress), {
-                  pathPrefix: prefix,
-                  debug: {
-                    dumpCache: debug || false,
-                    reactDevTools: debug || false,
-                    reactStrictMode: debug || false,
+                const generator = generateSite(
+                  {
+                    revision: unpackOption(revision)!,
+                    omitRevisionsNewerThanCurrent: unpackOption(omitRevisionsNewerThanCurrent)!,
+                    currentRevision: unpackOption(currentRevision)!,
                   },
-                });
+                  (task, progress) => onProgress(`build site|${task}`, progress),
+                  cache,
+                  {
+                    pathPrefix: prefix,
+                    debug: {
+                      //dumpCache: debug || false,
+                      reactDevTools: debug || false,
+                      reactStrictMode: debug || false,
+                    },
+                  },
+                );
                 const [writeProgress, writingSubtask] = onProgress('build site|write files');
                 for await (const blobchunk of generator) {
                   const [subtask] = writingSubtask(Object.keys(blobchunk).join(',').replaceAll('|', ':'), { state: 'writing' });
@@ -129,6 +158,9 @@ const build = Command.
                 resolve(void 0);
               } catch (e) {
                 reject(e);
+              } finally {
+                maybeDumpCache();
+                process.removeListener('SIGINT', maybeDumpCache);
               }
             }} />);
           }),
@@ -354,10 +386,11 @@ async function getRefsToBuild(revisionsToBuild: VersionBuildConfig) {
 async function * generateSite(
   revisionsToBuild: VersionBuildConfig | undefined,
   onProgress: TaskProgressCallback,
+  cache: Cache,
   opts?: {
     pathPrefix?: string | undefined;
     debug?: {
-      dumpCache?: boolean;
+      //dumpCache?: boolean;
       reactDevTools?: boolean;
       reactStrictMode?: boolean;
     };
@@ -404,57 +437,40 @@ async function * generateSite(
         join(PACKAGE_ROOT, './bootstrap.css')),
     };
 
-    const cache = makeDummyInMemoryCache();
-
-    try {
-      yield * generateStaticSiteAssets(
-        refsToBuild,
-        revisionsToBuild.currentRevision,
-        {
-          reportProgress: onProgress,
-          fetchBlob: readObject,
-          fetchDependency,
-          getDependencyCSS: (modID) => {
-            const maybeCSS = getDependencySupportingFiles()[modID]?.['index.css'];
-            return maybeCSS ?? null;
-          },
-          getDependencySource: (modID) => {
-            const source = getDependencySources()[modID];
-            if (!source) {
-              console.error("Requested dependency source was not found", modID);
-              throw new Error("Requested dependency source was not found");
-            }
-            return source;
-          },
-          getDOMStub: (() => (new JSDOM('<html></html>')).window.document),
-          cache,
-          debug: {
-            reactStrictMode: opts?.debug?.reactStrictMode || false,
-            reactDevTools: opts?.debug?.reactDevTools || false,
-          },
-          pathPrefix: opts?.pathPrefix,
-          decodeXML: (blob) =>
-            new JSDOM(
-              decoder.decode(blob).replace('xmlns', 'wtf'), // xpath
-              { contentType: 'application/xhtml+xml' },
-            ).window.document,
-          getConfigOverride: async () => null,
+    yield * generateStaticSiteAssets(
+      refsToBuild,
+      revisionsToBuild.currentRevision,
+      {
+        reportProgress: onProgress,
+        fetchBlob: readObject,
+        fetchDependency,
+        getDependencyCSS: (modID) => {
+          const maybeCSS = getDependencySupportingFiles()[modID]?.['index.css'];
+          return maybeCSS ?? null;
         },
-      );
-    } finally {
-      if (opts?.debug?.dumpCache) {
-        try {
-          fs.writeFileSync(
-            'cacheDump.json',
-            JSON.stringify(cache.dump(), null, 2),
-            { encoding: 'utf-8' },
-          );
-          console.info("cacheDump.json was written for content reader work inspection");
-        } catch (e) {
-          console.warn("cacheDump.json could not be written");
-        }
-      }
-    }
+        getDependencySource: (modID) => {
+          const source = getDependencySources()[modID];
+          if (!source) {
+            console.error("Requested dependency source was not found", modID);
+            throw new Error("Requested dependency source was not found");
+          }
+          return source;
+        },
+        getDOMStub: (() => (new JSDOM('<html></html>')).window.document),
+        cache,
+        debug: {
+          reactStrictMode: opts?.debug?.reactStrictMode || false,
+          reactDevTools: opts?.debug?.reactDevTools || false,
+        },
+        pathPrefix: opts?.pathPrefix,
+        decodeXML: (blob) =>
+          new JSDOM(
+            decoder.decode(blob).replace('xmlns', 'wtf'), // xpath
+            { contentType: 'application/xhtml+xml' },
+          ).window.document,
+        getConfigOverride: async () => null,
+      },
+    );
   } else {
     throw new Error("Unversioned build is not supported yet");
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@riboseinc/anafero-cli",
   "type": "module",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "packageManager": "yarn@4.5.0",
   "bin": {
     "build-site": "build-site.mjs"