@riboseinc/anafero-cli 0.0.65 → 0.0.67

package/bootstrap.js

@@ -72214,12 +72214,48 @@ schema (${ast._tag}): ${ast}`;
 
   // ../anafero/search.mts
   function preprocessStringForIndexing(text) {
-    return text.normalize("NFKD").replace(/\p{Diacritic}/gu, "").trim();
+    return text.normalize("NFKD").replace(/\p{Diacritic}/gu, "").replace(/[\p{P}$+<=>^`|~]/gu, " ").replace(/[\u200B-\u200D\uFEFF]/g, "").trim();
   }
-  function extractRelationsForIndexing(uri, graph, isDefinedSubject) {
-    return graph.filter(
-      ([s, p, o2]) => p === "hasPart" && (s === uri || s === ROOT_SUBJECT) && !o2.startsWith("data:") && (!isURIString(o2) || !isDefinedSubject(o2))
+  function extractRelationsForIndexing(uri, graph, isIndexable, isAlreadyIndexed, _seen, _log) {
+    const seen = _seen ?? /* @__PURE__ */ new Set();
+    seen.add(uri);
+    const nonData = graph.filter(
+      ([, , o2]) => !o2.startsWith("data:")
     );
+    const immediateGraph = nonData.filter(
+      ([s, ,]) => s === uri || s === ROOT_SUBJECT
+    );
+    const references = immediateGraph.filter(
+      ([, , o2]) => isURIString(o2)
+    );
+    const indexable = immediateGraph.filter(
+      ([s, p, o2]) => !isURIString(o2) && isIndexable([s, p, o2])
+    ).map(([, , o2]) => o2).filter((o2) => o2.trim() !== "");
+    for (const [, , o2] of references) {
+      if (_log) {
+        console.debug(
+          "search: processing triple object",
+          { o: o2, isAlreadyIndexed: isAlreadyIndexed(o2) }
+        );
+      }
+      if (!isAlreadyIndexed(o2) && !seen.has(o2)) {
+        indexable.push(...extractRelationsForIndexing(
+          o2,
+          graph,
+          isIndexable,
+          isAlreadyIndexed,
+          seen,
+          _log
+        ));
+      }
+    }
+    if (_log) {
+      console.debug(
+        "search: obtained indexable from graph",
+        { uri, graph, indexable }
+      );
+    }
+    return indexable;
   }
   var init_search = __esm({
     "../anafero/search.mts"() {
@@ -109636,7 +109672,7 @@ schema (${ast._tag}): ${ast}`;
       const debouncedQueryTrimmed = debouncedQuery.trim();
       if (index && debouncedQueryTrimmed !== "") {
         const normalizedQuery = preprocessStringForIndexing(
-          debouncedQuery.replace(/:/g, " ").replace(/\*/g, " ")
+          debouncedQuery.replace(/\*/g, " ")
         );
         const tokens = import_lunr.default.tokenizer(normalizedQuery);
         console.debug("Search: tokens", tokens);
@@ -110916,15 +110952,15 @@ schema (${ast._tag}): ${ast}`;
       }
     }, [locateResource, state.activeResourceURI]);
     const [resourceContainerElement, setResourceContainerElement] = (0, import_react212.useState)(null);
-    const setUpInterceptor = (0, import_react212.useCallback)((resourcesRef) => {
-      if (resourcesRef) {
-        setResourceContainerElement(resourcesRef);
+    (0, import_react212.useEffect)(() => {
+      if (!resourceContainerElement || !getVersionRelativePath) {
+        return;
       }
-      intercept_nav_default(resourcesRef, {
+      const cleanUpInterceptor = intercept_nav_default(resourceContainerElement, {
         // shadowDom: true,
       }, function handleIntercept(evt, el) {
         const href = el.getAttribute("href");
-        if (!href || !getVersionRelativePath) {
+        if (!href) {
           return;
         }
         const url2 = new URL(href, document.baseURI);
@@ -110944,7 +110980,18 @@ schema (${ast._tag}): ${ast}`;
           return true;
         }
       });
-    }, [reverseResource, getVersionRelativePath, getContainingPageResourceURI]);
+      return cleanUpInterceptor;
+    }, [
+      resourceContainerElement,
+      reverseResource,
+      getVersionRelativePath,
+      getContainingPageResourceURI
+    ]);
+    const refResourceContainerElement = (0, import_react212.useCallback)((resourcesRef) => {
+      if (resourcesRef) {
+        setResourceContainerElement(resourcesRef);
+      }
+    }, [setResourceContainerElement]);
     const [queuedFragment, setQueuedFragment] = (0, import_react212.useState)("");
     const jumpTo = (0, import_react212.useCallback)((uri) => {
       if (getContainingPageResourceURI(uri) === uri) {
@@ -110959,7 +111006,7 @@ schema (${ast._tag}): ${ast}`;
         console.error("Unable to reverse resource URI for path", path);
         throw new Error("Unable to reverse resource URI for path");
       }
-      console.debug("Navigating & activating resource", resourceURI);
+      console.debug("Navigating & activating resource via router", resourceURI);
       dispatch({ type: "activated_resource", uri: resourceURI, pageURI: getContainingPageResourceURI(resourceURI) });
     }, [reverseResource, jumpTo, getContainingPageResourceURI]);
     const pageMap = (0, import_react212.useMemo)(
@@ -111129,7 +111176,7 @@ schema (${ast._tag}): ${ast}`;
           type: "deactivated_browsing_mode"
         }), [])
       }
-    ), /* @__PURE__ */ import_react212.default.createElement("main", { id: "resources", ref: setUpInterceptor }, /* @__PURE__ */ import_react212.default.createElement($7167f8da3cce35e4$export$2881499e37b75b9a, { theme: $bf24a13e98395dd3$export$bca14c5b3b88a9c9, locale }, state.visibleResourceURIs.map((uri, idx) => {
+    ), /* @__PURE__ */ import_react212.default.createElement("main", { id: "resources", ref: refResourceContainerElement }, /* @__PURE__ */ import_react212.default.createElement($7167f8da3cce35e4$export$2881499e37b75b9a, { theme: $bf24a13e98395dd3$export$bca14c5b3b88a9c9, locale }, state.visibleResourceURIs.map((uri, idx) => {
       const isActive2 = uri === activePageResourceURI;
       const isOnlyOneShown = state.visibleResourceURIs.length < 2;
       const isMarkedActive = !isOnlyOneShown && isActive2;
@@ -111280,7 +111327,10 @@ schema (${ast._tag}): ${ast}`;
     if (!parentPath) {
       throw new Error("getAdjacentResource: missing parentPath");
     }
-    const parentNavPath = [parentPath, "resource-nav.json"].join("/");
+    const parentNavPath = [
+      parentPath === "/" ? "" : parentPath,
+      "resource-nav.json"
+    ].join("/");
     const parentNav = decodeUnknownSync(ResourceNavSchema)(await (await fetch(parentNavPath, { signal })).json());
     const currentPathTail = currentPath.slice(currentPath.lastIndexOf("/") + 1);
     const children = parentNav.children.map(
@@ -111331,16 +111381,14 @@ schema (${ast._tag}): ${ast}`;
 
   // bootstrap.tsx
   patchLunr();
-  getExtensionImports().then(setUpExtensionImportMap).then(initApp);
-  function initApp() {
+  getExtensionImports().then(setUpExtensionImportMap).then(hydrateApp);
+  function hydrateApp() {
     const appRoot = document.getElementById("app");
     if (!appRoot) {
       console.error("Can\u2019t initialize the app: missing root");
       return;
     }
-    const useStrictMode2 = document.documentElement.dataset.useReactStrict === "true";
     const originalHTML = appRoot.innerHTML;
-    document.body.style.height = `${appRoot.clientHeight}px`;
     const app = /* @__PURE__ */ import_react213.default.createElement(ErrorBoundaryWithCustomView_default, { fallback: /* @__PURE__ */ import_react213.default.createElement(
       "div",
       {
@@ -111348,17 +111396,23 @@ schema (${ast._tag}): ${ast}`;
         suppressHydrationWarning: true
       }
     ) }, /* @__PURE__ */ import_react213.default.createElement(AppLoader, null));
+    holdBodyHeightUntilHydrationIsComplete(appRoot.clientHeight);
+    const useStrictMode2 = document.documentElement.dataset.useReactStrict === "true";
     (0, import_client.hydrateRoot)(
       appRoot,
       useStrictMode2 ? /* @__PURE__ */ import_react213.default.createElement(import_react214.StrictMode, null, app) : app
     );
-    const observer = new MutationObserver(function cleanUpLoad() {
+  }
+  function holdBodyHeightUntilHydrationIsComplete(heightInPx) {
+    document.body.style.height = `${heightInPx}px`;
+    function unsetHeightAndDisconnectObserverIfHydrated() {
       const hasInitialized = !!document.documentElement.getAttribute("data-react-helmet");
       if (hasInitialized) {
         setTimeout(() => document.body.style.removeProperty("height"), 500);
         observer.disconnect();
       }
-    });
+    }
+    const observer = new MutationObserver(unsetHeightAndDisconnectObserverIfHydrated);
     observer.observe(document.documentElement, {
       attributes: true,
       childList: false,