@riboseinc/anafero-cli 0.0.57 → 0.0.59

package/build-site.css

@@ -31748,13 +31748,13 @@ tbody.table_0cdc494a_hm005a_spectrum-Table-body .table_0cdc494a_hm005a_spectrum-
     @media (prefers-color-scheme: light) {
       & {
         color-scheme: light;
-        background: rgb(230, 230, 230);
+        background: rgb(213, 213, 213);
       }
     }
     @media (prefers-color-scheme: dark) {
       & {
         color-scheme: dark;
-        background: rgb(48, 48, 48);
+        background: rgb(0, 0, 0);
       }
     }
   }
@@ -31820,7 +31820,7 @@ tbody.table_0cdc494a_hm005a_spectrum-Table-body .table_0cdc494a_hm005a_spectrum-
     background-color: #f06;
     color: white;
   }
-  padding: 0 2em 2em;
+  padding: 0;
   font-size: 16px;
   font-weight: 330;
   overflow-x: auto;
@@ -31859,16 +31859,21 @@ tbody.table_0cdc494a_hm005a_spectrum-Table-body .table_0cdc494a_hm005a_spectrum-
     }
   }
   .style_resourceBreadcrumbsNav {
-    margin: 0.5em 0;
+    margin: 0;
+    padding: 0.5em 2em 0 2em;
     list-style: none;
-    padding: 0;
-    color: var(--spectrum-alias-text-color-disabled);
+    background-image:
+      linear-gradient(
+        178deg,
+        transparent,
+        var(--spectrum-alias-highlight-hover) 2rem);
+    color: var(--spectrum-accent-color-1300);
     > li {
       display: inline-block;
       > a {
         &:link,
         &:visited {
-          color: var(--spectrum-alias-text-color-disabled);
+          color: var(--spectrum-accent-color-1300);
           text-decoration: none;
         }
         &:hover {
@@ -31876,7 +31881,7 @@ tbody.table_0cdc494a_hm005a_spectrum-Table-body .table_0cdc494a_hm005a_spectrum-
         }
       }
       &:first-child {
-        font-weight: 400;
+        font-weight: bold;
       }
       &::after {
         margin: 0 0.5em;
@@ -31887,6 +31892,11 @@ tbody.table_0cdc494a_hm005a_spectrum-Table-body .table_0cdc494a_hm005a_spectrum-
 }
 .style_navListView {
   background: var(--spectrum-alias-background-color-default);
+  background-image:
+    linear-gradient(
+      100deg,
+      var(--spectrum-alias-background-color-default) 20%,
+      var(--spectrum-alias-pasteboard-background-color) 180%);
   border: none;
   border-radius: 0;
   .style_navListViewItemWithLink {
@@ -31911,9 +31921,22 @@ tbody.table_0cdc494a_hm005a_spectrum-Table-body .table_0cdc494a_hm005a_spectrum-
   width: 58px;
   display: flex;
   flex-flow: column nowrap;
-  background-color: var(--spectrum-alias-background-color-disabled);
+  background-color: var(--spectrum-alias-pasteboard-background-color);
+  background-image:
+    linear-gradient(
+      91deg,
+      var(--spectrum-alias-background-color-disabled) 10%,
+      transparent 70%);
   color: var(--spectrum-alias-text-color);
   z-index: 22;
+  &.style_browserBarExpanded {
+    background-color: var(--spectrum-alias-background-color-default);
+    background-image:
+      linear-gradient(
+        91deg,
+        var(--spectrum-alias-background-color-disabled) 10%,
+        transparent 70%);
+  }
   .style_browserBarTitle {
     flex: 1;
     overflow: hidden;

package/build-site.mjs

@@ -294383,7 +294383,8 @@ var Tasks = function({ tasks }) {
 };
 var TaskTree = function({ task, progress, error: error4, subtasks }) {
   const hasProgressEstimate = progress && progress.total !== void 0 && progress.done !== void 0;
-  return /* @__PURE__ */ import_react54.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react54.default.createElement(Box_default, { height: hasProgressEstimate ? 2 : 1, flexDirection: "column" }, progress ? /* @__PURE__ */ import_react54.default.createElement(import_react54.default.Fragment, null, /* @__PURE__ */ import_react54.default.createElement(Box_default, { height: 1, gap: 2, flexGrow: 0 }, /* @__PURE__ */ import_react54.default.createElement(Spinner, { label: task }), /* @__PURE__ */ import_react54.default.createElement(Box_default, { flexGrow: 0 }, /* @__PURE__ */ import_react54.default.createElement(Text, null, progress.state ?? "working\u2026"))), /* @__PURE__ */ import_react54.default.createElement(Box_default, { height: 1, flexGrow: 0 }, hasProgressEstimate ? /* @__PURE__ */ import_react54.default.createElement(ProgressBar, { value: 100 / progress.total * progress.done }) : null)) : error4 ? /* @__PURE__ */ import_react54.default.createElement(StatusMessage, { variant: "error" }, task, ": ", error4) : /* @__PURE__ */ import_react54.default.createElement(StatusMessage, { variant: "success" }, task)), Object.keys(subtasks ?? []).length > 0 ? /* @__PURE__ */ import_react54.default.createElement(Box_default, { marginLeft: 2, flexDirection: "column" }, /* @__PURE__ */ import_react54.default.createElement(Tasks, { tasks: subtasks })) : null);
+  const progressLabel = hasProgressEstimate ? `${task}: ${progress.done} of ${progress.total}` : task;
+  return /* @__PURE__ */ import_react54.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react54.default.createElement(Box_default, { height: hasProgressEstimate ? 2 : 1, flexDirection: "column" }, progress ? /* @__PURE__ */ import_react54.default.createElement(import_react54.default.Fragment, null, /* @__PURE__ */ import_react54.default.createElement(Box_default, { height: 1, gap: 2, flexGrow: 0 }, /* @__PURE__ */ import_react54.default.createElement(Spinner, { label: progressLabel }), /* @__PURE__ */ import_react54.default.createElement(Box_default, { flexGrow: 0 }, /* @__PURE__ */ import_react54.default.createElement(Text, null, progress.state ?? "working\u2026"))), /* @__PURE__ */ import_react54.default.createElement(Box_default, { height: 1, flexGrow: 0 }, hasProgressEstimate ? /* @__PURE__ */ import_react54.default.createElement(ProgressBar, { value: 100 / progress.total * progress.done }) : null)) : error4 ? /* @__PURE__ */ import_react54.default.createElement(StatusMessage, { variant: "error" }, task, ": ", error4) : /* @__PURE__ */ import_react54.default.createElement(StatusMessage, { variant: "success" }, task)), Object.keys(subtasks ?? []).length > 0 ? /* @__PURE__ */ import_react54.default.createElement(Box_default, { marginLeft: 2, flexDirection: "column" }, /* @__PURE__ */ import_react54.default.createElement(Tasks, { tasks: subtasks })) : null);
 };
 
 // ../anafero/cache.mts
@@ -313497,6 +313498,7 @@ __export(anafero_exports, {
   VersioningSchema: () => VersioningSchema,
   dedupeGraph: () => dedupeGraph,
   dedupeResourceRelationList: () => dedupeResourceRelationList,
+  extractRelationsForIndexing: () => extractRelationsForIndexing,
   fillInLocale: () => fillInLocale,
   gatherDescribedResourcesFromJsonifiedProseMirrorNode: () => gatherDescribedResourcesFromJsonifiedProseMirrorNode,
   gatherTextFromJsonifiedProseMirrorNode: () => gatherTextFromJsonifiedProseMirrorNode,
@@ -313505,6 +313507,7 @@ __export(anafero_exports, {
   isURIString: () => isURIString,
   makeDummyInMemoryCache: () => makeDummyInMemoryCache,
   parseModuleRef: () => parseModuleRef,
+  preprocessStringForIndexing: () => preprocessStringForIndexing,
   resolveChain: () => resolveChain,
   stripLeadingSlash: () => stripLeadingSlash,
   stripTrailingSlash: () => stripTrailingSlash,
@@ -313642,6 +313645,17 @@ function getTextContent(graph, subject, partPredicate) {
   return allSubparts;
 }
 
+// ../anafero/search.mts
+init_cjs_shim();
+function preprocessStringForIndexing(text9) {
+  return text9.normalize("NFKD").replace(/\p{Diacritic}/gu, "").trim();
+}
+function extractRelationsForIndexing(uri, graph, isDefinedSubject) {
+  return graph.filter(
+    ([s2, p3, o2]) => p3 === "hasPart" && (s2 === uri || s2 === ROOT_SUBJECT) && !o2.startsWith("data:") && (!isURIString(o2) || !isDefinedSubject(o2))
+  );
+}
+
 // ../firelight-gui/loader.mts
 init_cjs_shim();
 
@@ -316534,6 +316548,7 @@ var style_default = {
   navListView: "style_navListView",
   navListViewItemWithLink: "style_navListViewItemWithLink",
   browserBar: "style_browserBar",
+  browserBarExpanded: "style_browserBarExpanded",
   browserBarTitle: "style_browserBarTitle",
   browserBarTitleLink: "style_browserBarTitleLink",
   browserBarToolbar: "style_browserBarToolbar",
@@ -316569,7 +316584,10 @@ var BrowserBar = function({
     }
     return;
   }, [!!loadProgress]);
-  return /* @__PURE__ */ import_react124.default.createElement($7167f8da3cce35e4$export$2881499e37b75b9a, { theme: $bf24a13e98395dd3$export$bca14c5b3b88a9c9, ...providerProps }, /* @__PURE__ */ import_react124.default.createElement("div", { className: style_default.browserBar }, /* @__PURE__ */ import_react124.default.createElement("header", { className: style_default.browserBarTitle }, /* @__PURE__ */ import_react124.default.createElement("h1", null, /* @__PURE__ */ import_react124.default.createElement("a", { href: rootURL, className: style_default.browserBarTitleLink }, title))), showToolbar ? /* @__PURE__ */ import_react124.default.createElement(
+  return /* @__PURE__ */ import_react124.default.createElement($7167f8da3cce35e4$export$2881499e37b75b9a, { theme: $bf24a13e98395dd3$export$bca14c5b3b88a9c9, ...providerProps }, /* @__PURE__ */ import_react124.default.createElement("div", { className: `
+        ${style_default.browserBar}
+        ${activeBrowsingMode ? style_default.browserBarExpanded : ""}
+      ` }, /* @__PURE__ */ import_react124.default.createElement("header", { className: style_default.browserBarTitle }, /* @__PURE__ */ import_react124.default.createElement("h1", null, /* @__PURE__ */ import_react124.default.createElement("a", { href: rootURL, className: style_default.browserBarTitleLink }, title))), showToolbar ? /* @__PURE__ */ import_react124.default.createElement(
     $13c3c67164f4d5be$export$4c260019440d418f,
     {
       "aria-label": "Tools",
@@ -316679,6 +316697,7 @@ var Resource = import_react127.default.forwardRef(function({
   className,
   requestedResourceURI,
   searchQueryText,
+  hideBreadcrumbs,
   useDependency,
   locateResource,
   document: document2,
@@ -316830,7 +316849,7 @@ var Resource = import_react127.default.forwardRef(function({
       className: `${style_default.resource} ${className ?? ""}`,
       "aria-selected": ariaSelected
     },
-    /* @__PURE__ */ import_react127.default.createElement(ResourceBreadcrumbs, { parents: resourceNav.breadcrumbs }),
+    !hideBreadcrumbs && resourceNav.breadcrumbs.length > 0 ? /* @__PURE__ */ import_react127.default.createElement(ResourceBreadcrumbs, { parents: resourceNav.breadcrumbs }) : null,
     content.content ? /* @__PURE__ */ import_react127.default.createElement(ResourceHelmet, { ...content.content }) : null,
     /* @__PURE__ */ import_react127.default.createElement(
       Layout,
@@ -317201,6 +317220,7 @@ var makeContentReader = async function(entryPointURI, storeAdapters, findContent
     if (!cache3.has(`graphs/${resourceURI}`)) {
       cache3.add(`graphs/${resourceURI}`, []);
       const contentAdapter = getAdapter(resourceURI);
+      const seen = /* @__PURE__ */ new Set();
       const queue = [resourceURI];
       while (queue.length > 0) {
         const currentResource = queue.pop();
@@ -317218,9 +317238,19 @@ var makeContentReader = async function(entryPointURI, storeAdapters, findContent
               target
             ])
           );
-          const newTargets = relations.filter(({ target }) => isURIString(target)).filter(
+          const rels = relations.filter(({ target }) => isURIString(target)).filter(
             (rel) => !isInPageHierarchy(rel.target) && !contentAdapter.crossReferences?.(rel)
-          ).filter((rel) => !queue.includes(rel.target)).map(({ target }) => target);
+          ).filter((rel) => !queue.includes(rel.target));
+          const newTargets = [];
+          for (const rel of rels) {
+            const seenKey = JSON.stringify({ currentResource, rel });
+            if (!seen.has(seenKey)) {
+              seen.add(seenKey);
+              newTargets.push(rel.target);
+            } else {
+              console.warn("Duplicate rel", currentResource, rel);
+            }
+          }
           queue.push(...newTargets);
         }
       }
@@ -317295,10 +317325,12 @@ var makeContentReader = async function(entryPointURI, storeAdapters, findContent
   function* generateAllPaths() {
     for (const path3 of cache3.iterate("all-paths")) {
       const resourceURI = getCachedResourceURIForPath(path3);
+      const graph = getResourceGraph(resourceURI);
       yield {
         path: path3,
         resourceURI,
         meta: describeResource(resourceURI),
+        graph,
         directDescendants: cache3.has(`${path3}/direct-descendants`) ? cache3.list(`${path3}/direct-descendants`).map((path4) => {
           const res = getCachedResourceURIForPath(path4);
           return [`/${path4}`, res, describeResource(res)];
@@ -317540,8 +317572,8 @@ ${inject.head ?? ""}`;
   }
   const resourceMap = {};
   const resourceGraph = [];
+  const searchableResources = { pages: {}, resources: {} };
   const resourceDescriptions = {};
-  const contentCache = {};
   const assetsToWrite = {};
   const rootMeta = reader.describeRoot();
   const maybePrimaryLanguageID = rootMeta.primaryLanguageID ?? "en";
@@ -317560,7 +317592,7 @@ ${inject.head ?? ""}`;
   let done11 = 0;
   const [allPathProgress, pathSubtask] = reportProgress("build page content", { total: totalPaths, done: done11 });
   const hierarchicalResources = reader.generatePaths();
-  for (const { path: path3, resourceURI, meta, parentChain, directDescendants } of hierarchicalResources) {
+  for (const { path: path3, resourceURI, meta, graph, parentChain, directDescendants } of hierarchicalResources) {
     done11 += 1;
     allPathProgress({ total: totalPaths, done: done11 });
     if (path3.startsWith("/")) {
@@ -317573,62 +317605,89 @@ ${inject.head ?? ""}`;
     }
     const [pathProgress] = pathSubtask(`${resourceURI.replaceAll("|", ":")}`, { state: "resolving relations" });
     const resourceMeta = meta;
-    const relations = reader.resolve(resourceURI);
+    const relations = graph;
     pathProgress({ state: "generating resource page content" });
-    const content = function generateContent(graph, metadata, uri, cache4) {
-      if (!cache4[uri]) {
-        let content2;
-        const maybeAdapter = findContentAdapter(uri);
-        if (maybeAdapter) {
-          try {
-            content2 = maybeAdapter[1].generateContent(graph) ?? null;
-          } catch (e3) {
-            console.error(
-              "Failed to generate resource content",
-              path3,
-              uri,
-              graph.slice(0, 40).join("\n")
-            );
-            throw e3;
-          }
-          if (content2) {
-            contentCache[uri] = {
-              adapterID: maybeAdapter[0],
-              content: { ...metadata, ...content2 }
-            };
-            if (metadata.primaryLanguageID) {
-              allLanguages.add(metadata.primaryLanguageID);
-            }
-            const describedResourceIDs = gatherDescribedResourcesFromJsonifiedProseMirrorNode(content2.contentDoc);
-            for (const inPageResourceID of describedResourceIDs) {
-              if (reader.exists(inPageResourceID)) {
-                const pathWithFragment = `${path3}#${encodeURIComponent(inPageResourceID)}`;
-                resourceMap[pathWithFragment] = inPageResourceID;
-                resourceGraph.push([inPageResourceID, "isDefinedBy", `${path3}/resource.json`]);
-                resourceDescriptions[inPageResourceID] = reader.describe(inPageResourceID);
-              } else {
-                console.warn(
-                  "Subresource on page does not exist in the graph",
-                  path3,
-                  inPageResourceID
-                );
-              }
-            }
-          }
+    const content = function generateContent(uri, metadata, graph2) {
+      let result;
+      let content2;
+      const maybeAdapter = findContentAdapter(uri);
+      if (maybeAdapter) {
+        try {
+          content2 = maybeAdapter[1].generateContent(graph2) ?? null;
+        } catch (e3) {
+          console.error(
+            "Failed to generate resource content",
+            path3,
+            uri,
+            graph2.slice(0, 40).join("\n")
+          );
+          throw e3;
+        }
+        if (content2) {
+          result = {
+            adapterID: maybeAdapter[0],
+            content: { ...metadata, ...content2 }
+          };
         } else {
-          console.warn("No adapter found to render", uri);
-          return null;
+          console.warn("No content was generated", uri);
+          result = null;
         }
       } else {
-        console.debug("contentCache hit", uri);
+        console.warn("No adapter found to render", uri);
+        result = null;
       }
-      return cache4[uri];
-    }(relations, meta, resourceURI, contentCache);
+      return result;
+    }(
+      resourceURI,
+      meta,
+      relations
+    );
     pathProgress({ state: "generating page content & assets" });
-    if (content !== null) {
+    if (content?.content) {
+      if (meta.primaryLanguageID) {
+        allLanguages.add(meta.primaryLanguageID);
+      }
       resourceMap[path3] = resourceURI;
       resourceGraph.push([resourceURI, "isDefinedBy", `${path3}/resource.json`]);
       resourceDescriptions[resourceURI] = resourceMeta;
+      searchableResources.pages[resourceURI] = {
+        name: resourceURI,
+        title: preprocessStringForIndexing(meta.labelInPlainText),
+        lang: meta.primaryLanguageID || "",
+        body: preprocessStringForIndexing(
+          extractRelationsForIndexing(resourceURI, relations, reader.exists).join("").trim()
+        )
+      };
+      pathProgress({ state: "processing on-page subresources" });
+      const describedResourceIDs = gatherDescribedResourcesFromJsonifiedProseMirrorNode(
+        content.content.contentDoc
+      );
+      for (const inPageResourceID of describedResourceIDs) {
+        if (reader.exists(inPageResourceID)) {
+          const pathWithFragment = `${path3}#${encodeURIComponent(inPageResourceID)}`;
+          const meta2 = reader.describe(inPageResourceID);
+          const graph2 = reader.resolve(inPageResourceID);
+          resourceMap[pathWithFragment] = inPageResourceID;
+          resourceGraph.push([inPageResourceID, "isDefinedBy", `${path3}/resource.json`]);
+          resourceDescriptions[inPageResourceID] = meta2;
+          if (inPageResourceID !== resourceURI) {
+            searchableResources.resources[inPageResourceID] = {
+              name: inPageResourceID,
+              title: preprocessStringForIndexing(meta2.labelInPlainText),
+              lang: meta2.primaryLanguageID || "",
+              body: preprocessStringForIndexing(
+                extractRelationsForIndexing(inPageResourceID, graph2, reader.exists).join("").trim()
+              )
+            };
+          }
+        } else {
+          console.warn(
+            "Subresource on page does not exist in the graph",
+            path3,
+            inPageResourceID
+          );
+        }
+      }
       pathProgress({ state: "processing resource assets" });
       for (const [, , o2] of relations) {
         if (o2.startsWith("file:")) {
@@ -317737,44 +317796,20 @@ ${inject.head ?? ""}`;
     this.ref("name");
     this.field("title", { boost: 2 });
     this.field("body");
+    this.field("lang");
     let done12 = 0;
-    const total = Object.keys(contentCache).length + Object.keys(resourceDescriptions).length;
-    console.debug("Index pipeline functions during", this.pipeline._stack.map((f3) => f3.label));
-    console.debug("Index search pipeline functions during", this.searchPipeline._stack.map((f3) => f3.label));
-    const searchableResources = { pages: [], resources: [] };
-    for (const [uri, meta] of Object.entries(resourceDescriptions)) {
+    const total = Object.keys(searchableResources.pages).length + Object.keys(searchableResources.resources).length;
+    for (const entry of Object.values(searchableResources.pages)) {
       done12 += 1;
-      indexProgress({ state: "adding entries for subresources", total, done: done12 });
-      const rels = reader.resolve(uri);
-      const relationsExcludingReferences = rels.filter(
-        ([s2, p3, o2]) => p3 === "hasPart" && (s2 === ROOT_SUBJECT || s2 === uri) && !o2.startsWith("data:") && (!isURIString(o2) || !reader.exists(o2))
-      );
-      const body = relationsExcludingReferences.map(([, , o2]) => o2).join("").trim().normalize("NFKD").replace(/\p{Diacritic}/gu, "").trim();
-      const title = meta.labelInPlainText.normalize("NFKD").replace(/\p{Diacritic}/gu, "").trim();
-      if (body || title) {
-        const entry = {
-          name: uri,
-          body,
-          title,
-          lang: meta.primaryLanguageID ?? ""
-        };
-        if (contentCache[uri]) {
-          searchableResources.pages.push(entry);
-        } else {
-          searchableResources.resources.push(entry);
-        }
-      } else {
-      }
-    }
-    for (const entry of searchableResources.pages) {
+      indexProgress({ state: "adding entries for pages", total, done: done12 });
       this.add(entry, { boost: 2 });
     }
-    for (const entry of searchableResources.resources) {
+    for (const entry of Object.values(searchableResources.resources)) {
+      done12 += 1;
+      indexProgress({ state: "adding entries for subresources", total, done: done12 });
       this.add(entry);
     }
   });
-  console.debug("Index pipeline functions after", lunrIndex.pipeline._stack.map((f3) => f3.label));
-  console.debug("Index search pipeline functions after", lunrIndex.searchPipeline?._stack?.map((f3) => f3.label));
   indexProgress(null);
   yield { "/search-index.json": encoder.encode(JSON.stringify(lunrIndex, null, 4)) };
 }

package/package.json

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