@riboseinc/anafero-cli 0.0.27 → 0.0.29

package/build-generator.mts

@@ -7,7 +7,7 @@
  */
 
 import { resolve, isAbsolute, join } from 'node:path';
-import { readFile } from 'node:fs/promises';
+import { readFile, writeFile } from 'node:fs/promises';
 
 import { Logger, Effect } from 'effect';
 import { NodeContext, NodeRuntime } from '@effect/platform-node';
@@ -66,7 +66,8 @@ Effect.
 
 async function buildBootstrapScript(opts: ReportingOptions) {
   const { logLevel } = opts;
-  return await esbuild({
+  const outfile = join(PACKAGE_ROOT, 'bootstrap.js');
+  const result = await esbuild({
     entryPoints: [
       './bootstrap.tsx',
       //join(PACKAGE_ROOT, 'site', 'index.tsx'),
@@ -81,7 +82,7 @@ async function buildBootstrapScript(opts: ReportingOptions) {
     treeShaking: true,
     sourcemap: true,
     platform: 'browser',
-    outfile: join(PACKAGE_ROOT, 'bootstrap.js'),
+    outfile,
     //outdir: 'layout',
     write: true,
     loader: {
@@ -92,6 +93,23 @@ async function buildBootstrapScript(opts: ReportingOptions) {
     },
     logLevel,
   });
+
+
+  // This unbreaks react-aria’s virtualizer ScrollView
+  // interfering with ProseMirror
+  //
+  // Ideally, this could be an esbuild plugin.
+  // Even more ideally, a proper package manager patch
+  // (yarn patch didn’t work for me).
+  console.debug("Patching ProseMirror");
+  let contents = await readFile(outfile, 'utf8');
+  contents = contents.replace(
+    'if (!runCustomHandler(view, event)',
+    'if (event && !runCustomHandler(view, event)',
+  );
+  await writeFile(outfile, contents);
+
+  return result;
 }
 
 /**

package/build-site.css

@@ -31050,6 +31050,9 @@ tbody.vars_bd693cb4_hm005a_spectrum-Table-body .vars_bd693cb4_hm005a_spectrum-Ta
   #resources > * {
     background: transparent;
   }
+  #resources {
+    padding-bottom: 40vh;
+  }
 }
 .style_floatingSubresourceLink {
   .style_floatingSubresourceLinkAnchor {
@@ -31164,6 +31167,11 @@ tbody.vars_bd693cb4_hm005a_spectrum-Table-body .vars_bd693cb4_hm005a_spectrum-Ta
     }
   }
 }
+.style_navListView {
+  background: var(--spectrum-alias-background-color-default);
+  border: none;
+  border-radius: 0;
+}
 .style_browserBar {
   position: fixed;
   left: 0;

package/build-site.mjs

@@ -28274,7 +28274,7 @@ var require_parser = __commonJS({
           }
         }
         function fromCodePoint() {
-          var MAX_SIZE2 = 16384;
+          var MAX_SIZE = 16384;
           var codeUnits = [];
           var highSurrogate;
           var lowSurrogate;
@@ -28294,7 +28294,7 @@ var require_parser = __commonJS({
               lowSurrogate = codePoint % 1024 + 56320;
               codeUnits.push(highSurrogate, lowSurrogate);
             }
-            if (index + 1 == length3 || codeUnits.length > MAX_SIZE2) {
+            if (index + 1 == length3 || codeUnits.length > MAX_SIZE) {
               result += String.fromCharCode.apply(null, codeUnits);
               codeUnits.length = 0;
             }
@@ -312877,6 +312877,17 @@ function gatherDescribedResourcesFromJsonifiedProseMirrorNode(jsonifiedNode, _ac
   }
   return accumulator;
 }
+function gatherTextFromJsonifiedProseMirrorNode(jsonifiedNode) {
+  if (jsonifiedNode?.type === "text") {
+    return typeof jsonifiedNode.text === "string" ? jsonifiedNode.text ?? "" : "";
+  } else {
+    if (Array.isArray(jsonifiedNode?.content) && jsonifiedNode.content.length > 0) {
+      return jsonifiedNode.content.map(gatherTextFromJsonifiedProseMirrorNode).join("\n");
+    } else {
+      return "";
+    }
+  }
+}
 function fillInLocale(langID) {
   if (langID.indexOf("-") >= 1) {
     return langID;
@@ -313046,44 +313057,15 @@ __export(anafero_exports, {
   VersioningSchema: () => VersioningSchema,
   dedupeGraph: () => dedupeGraph,
   dedupeResourceRelationList: () => dedupeResourceRelationList,
-  enableNewLunrJaTokenizer: () => enableNewLunrJaTokenizer,
   fillInLocale: () => fillInLocale,
   gatherDescribedResourcesFromJsonifiedProseMirrorNode: () => gatherDescribedResourcesFromJsonifiedProseMirrorNode,
+  gatherTextFromJsonifiedProseMirrorNode: () => gatherTextFromJsonifiedProseMirrorNode,
   makeDummyInMemoryCache: () => makeDummyInMemoryCache,
   parseModuleRef: () => parseModuleRef,
   titleSchema: () => titleSchema
 });
 init_cjs_shim();
 
-// ../anafero/search.mts
-init_cjs_shim();
-var MIN_SIZE = 2;
-var MAX_SIZE = 6;
-function enableNewLunrJaTokenizer(lunr2) {
-  lunr2.ja.tokenizer = function(obj) {
-    if (!arguments.length || obj == null || obj === void 0) return [];
-    let str = obj.toString().toLowerCase().replace(/^\s+/, "").replace(/\s+$/, "");
-    if (str.length === 0) return [];
-    const ngrams = (text9, minSize = 2, maxSize = 6) => {
-      let results = [];
-      for (let size17 = minSize; size17 <= maxSize; size17++) {
-        for (let i2 = 0; i2 <= text9.length - size17; i2++) {
-          let token = text9.substring(i2, i2 + size17);
-          results.push({
-            str: token,
-            metadata: { position: [i2, i2 + size17 - 1], index: i2 }
-          });
-        }
-      }
-      return results;
-    };
-    const tokens = ngrams(str, MIN_SIZE, Math.min(MAX_SIZE, str.length));
-    return tokens.map(
-      (tokenData) => new lunr2.Token(tokenData.str, tokenData.metadata)
-    );
-  };
-}
-
 // ../anafero/TitleSchema.mts
 init_cjs_shim();
 var titleSchema = new Schema({
@@ -316012,6 +315994,7 @@ var style_default = {
   active: "style_active",
   "is-disabled": "style_is-disabled",
   resourceBreadcrumbsNav: "style_resourceBreadcrumbsNav",
+  navListView: "style_navListView",
   browserBar: "style_browserBar",
   browserBarTitle: "style_browserBarTitle",
   browserBarToolbar: "style_browserBarToolbar",
@@ -316074,6 +316057,7 @@ var BrowserBar = function({
     {
       "aria-label": "Loading\u2026",
       minValue: 0,
+      isIndeterminate: loadProgress.total - 0.1 < loadProgress.total - loadProgress.done || loadProgress.total - loadProgress.done < 0.1,
       maxValue: loadProgress.total,
       value: loadProgress.done
     }
@@ -316556,7 +316540,8 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
       if (isURIString(rel.target) && !contentAdapter.crossReferences?.(rel)) {
         const key = JSON.stringify({ rel, resourceURI, containingResourcePath });
         if (seen.has(key)) {
-          throw new Error(`Duplicate ${rel.predicate} to ${rel.target} from ${resourceURI} at ${containingResourcePath}`);
+          console.warn(`Ignoring duplicate relation ${rel.predicate} to ${rel.target} from ${resourceURI} at ${containingResourcePath}`);
+          continue;
         } else {
           seen.add(key);
           processResourceContents(rel.target, containingResourcePath, seen);
@@ -316629,6 +316614,17 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
         return [];
       }
     },
+    exists: function exists4(resourceURI) {
+      return cache3.has(`path-for/${resourceURI}`);
+    },
+    findContainingPageResourceURI: function findPageURI(resourceURI) {
+      const path3 = cache3.get(`path-for/${resourceURI}`);
+      if (path3.indexOf("#")) {
+        return cache3.get(path3.split("#")[0]);
+      } else {
+        return resourceURI;
+      }
+    },
     findURL: function findURL(resourceURI) {
       const maybePath = cache3.get(`path-for/${resourceURI}`);
       if (maybePath) {
@@ -316674,9 +316670,10 @@ function joinFileURI(baseFileURI, fileURI) {
 // ../anafero/process.mts
 (0, import_lunr_stemmer.default)(import_lunr.default);
 (0, import_tinyseg.default)(import_lunr.default);
-(0, import_lunr2.default)(import_lunr.default);
-(0, import_lunr3.default)(import_lunr.default);
-(0, import_lunr4.default)(import_lunr.default);
+var lunrLanguageSupport = {
+  ja: import_lunr3.default,
+  fr: import_lunr2.default
+};
 var encoder = new TextEncoder();
 var decoder = new TextDecoder();
 function* generateResourceAssets(resourceURI, relations, parentChain, directDescendants, resourceProps, expandVersionedPath, getDOMStub, inject, workspaceTitle, primaryLanguageID, describe, generateContent) {
@@ -316863,6 +316860,12 @@ ${inject.head ?? ""}`;
     }
     if (!maybePrimaryLanguageID) {
       if (resourceMeta.primaryLanguageID) {
+        console.debug(
+          "Setting primary language ID:",
+          resourceMeta.primaryLanguageID,
+          "based on resource",
+          resourceURI
+        );
         maybePrimaryLanguageID = resourceMeta.primaryLanguageID;
       }
     } else if (!resourceMeta.primaryLanguageID) {
@@ -316936,13 +316939,21 @@ ${inject.head ?? ""}`;
             if (content) {
               const describedResourceIDs = gatherDescribedResourcesFromJsonifiedProseMirrorNode(content.contentDoc);
               for (const inPageResourceID of describedResourceIDs) {
-                const pathWithFragment = `${path3}#${encodeURIComponent(inPageResourceID)}`;
-                resourceMap[pathWithFragment] = inPageResourceID;
-                resourceGraph.push([inPageResourceID, "isDefinedBy", `${path3}/resource.json`]);
-                resourceDescriptions[inPageResourceID] = {
-                  primaryLanguageID: maybePrimaryLanguageID,
-                  ...contentAdapter.describe(relativeGraph(relations2, inPageResourceID))
-                };
+                if (reader.exists(inPageResourceID)) {
+                  const pathWithFragment = `${path3}#${encodeURIComponent(inPageResourceID)}`;
+                  resourceMap[pathWithFragment] = inPageResourceID;
+                  resourceGraph.push([inPageResourceID, "isDefinedBy", `${path3}/resource.json`]);
+                  resourceDescriptions[inPageResourceID] = {
+                    primaryLanguageID: maybePrimaryLanguageID,
+                    ...contentAdapter.describe(relativeGraph(relations2, inPageResourceID))
+                  };
+                } else {
+                  console.warn(
+                    "Subresource on page does not exist in the graph",
+                    path3,
+                    inPageResourceID
+                  );
+                }
               }
             }
           } else {
@@ -316973,8 +316984,11 @@ ${inject.head ?? ""}`;
   const [indexProgress] = reportProgress("build search index");
   import_lunr.default.utils.warn = console.warn;
   const lunrIndex = (0, import_lunr.default)(function() {
-    if (maybePrimaryLanguageID && import_lunr.default.hasOwnProperty(maybePrimaryLanguageID)) {
-      console.debug(`Primary language is \u201C${maybePrimaryLanguageID}\u201D, enabling multi-language Lunr mode & mixed tokenizer`);
+    console.debug(`Search index: primary language is \u201C${maybePrimaryLanguageID}\u201D`);
+    if (maybePrimaryLanguageID && maybePrimaryLanguageID !== "en" && lunrLanguageSupport[maybePrimaryLanguageID]) {
+      console.debug("Search index: enabling multi-language Lunr mode & mixed tokenizer");
+      lunrLanguageSupport[maybePrimaryLanguageID](import_lunr.default);
+      (0, import_lunr4.default)(import_lunr.default);
       this.use(import_lunr.default.multiLanguage("en", maybePrimaryLanguageID));
       this.tokenizer = function(x2) {
         return import_lunr.default.tokenizer(x2).concat(import_lunr.default[maybePrimaryLanguageID].tokenizer(x2));
@@ -316982,37 +316996,31 @@ ${inject.head ?? ""}`;
     }
     this.ref("name");
     this.field("body");
-    for (const [uri, content] of Object.entries(contentCache)) {
+    for (const [uri, desc] of Object.entries(resourceDescriptions)) {
       indexProgress({ state: `adding entry for ${uri}` });
-      const lang = resourceDescriptions[uri]?.primaryLanguageID;
+      const lang = desc.primaryLanguageID;
       if (lang && lang !== maybePrimaryLanguageID && lang !== "en" && import_lunr.default.hasOwnProperty(lang)) {
         console.warn("Resource language is different from primary language, this may not work");
         this.use(import_lunr.default.multiLanguage("en", lang));
       }
-      if (content?.content) {
-        const { contentDoc, labelInPlainText } = content.content;
+      const rels = reader.resolve(uri);
+      const relationsExcludingReferences = rels.filter(
+        ([s2, p3, o]) => p3 === "hasPart" && (s2 === ROOT_SUBJECT || s2 === uri) && !o.startsWith("data:") && (!isURIString(o) || !reader.exists(o))
+      );
+      const body = relationsExcludingReferences.map(([s2, p3, o]) => o).join("").trim();
+      if (body) {
         const entry = {
           name: uri,
-          body: `${labelInPlainText} \u2014 ${gatherTextFromJsonifiedProseMirrorNode(contentDoc)}`
+          body
         };
         this.add(entry);
+      } else {
       }
     }
   });
   indexProgress(null);
   yield { "/search-index.json": encoder.encode(JSON.stringify(lunrIndex, null, 4)) };
 }
-function gatherTextFromJsonifiedProseMirrorNode(jsonifiedNode) {
-  if (jsonifiedNode?.type === "text") {
-    return typeof jsonifiedNode.text === "string" ? jsonifiedNode.text ?? "" : "";
-  } else {
-    if (Array.isArray(jsonifiedNode?.content) && jsonifiedNode.content.length > 0) {
-      return jsonifiedNode.content.map(gatherTextFromJsonifiedProseMirrorNode).join("\n");
-    } else {
-      return "";
-    }
-  }
-}
 async function* generateStaticSiteAssets(versions, currentVersionID, opts) {
   const versionIDsSorted = Array.from(Object.entries(versions)).toSorted(
     ([, ver1], [, ver2]) => ver2.timestamp.getTime() - ver1.timestamp.getTime()

package/package.json

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