@riboseinc/anafero-cli 0.0.5 → 0.0.7

package/CLI.tsx

@@ -138,9 +138,9 @@ function ({ task, progress, error, subtasks }) {
       <Box height={hasProgressEstimate ? 2 : 1} flexDirection="column">
         {progress
           ? <>
-              <Box height={1} gap={2} flexGrow={0}>
+              <Box height={2} gap={2} flexGrow={0}>
                 <Spinner label={task} />
-                <Box flexGrow={0}>
+                <Box flexGrow={0} height={2}>
                   <Text>{progress.state ?? 'working…'}</Text>
                 </Box>
               </Box>

package/bootstrap.js

@@ -80794,102 +80794,12 @@ var init_dist2 = __esm({
   }
 });
 
-// ../anafero/ResourceReader.mts
-var ResourceRelationSchema;
-var init_ResourceReader = __esm({
-  "../anafero/ResourceReader.mts"() {
-    "use strict";
-    init_Schema2();
-    init_relations();
-    ResourceRelationSchema = Struct2({
-      /**
-       * Describes the type of relation.
-       * Currently, a plain descriptive label.
-       * In future may be a URI resolved to relation metadata.
-       *
-       * An example can be “hasPart”.
-       *
-       * “hasPart” relation is respected for the purposes of generating
-       * a hierarchy of resources.
-       */
-      predicate: String$2.pipe(nonEmptyString3()),
-      /**
-       * Object of the relation.
-       * Could be a root-relative slash-prepended path to another resource,
-       * or an URI.
-       *
-       * It could be a `file:` URI if relation points to another local file.
-       */
-      target: String$2.pipe(nonEmptyString3())
-      // /**
-      //  * A reader can output relations that are not encoded in the source
-      //  * but were computed by the adapter. Example: hasNext, seeAlso.
-      //  */
-      // synthetic: S.Boolean.pipe(S.optional),
-    });
-  }
-});
-
-// ../anafero/relations.mts
-function dedupeGraph(graph) {
-  const seen = /* @__PURE__ */ new Set();
-  const newGraph = [];
-  for (const triple of graph) {
-    const key = triple.join(" ");
-    if (!seen.has(key)) {
-      seen.add(key);
-      if (triple[0] !== triple[2]) {
-        newGraph.push(triple);
-      }
-    } else {
-    }
-  }
-  return newGraph;
-}
-function dedupeResourceRelationList(rels) {
-  const seen = /* @__PURE__ */ new Set();
-  const newRels = [];
-  for (const rel of rels) {
-    const key = JSON.stringify(rel);
-    if (!seen.has(key)) {
-      seen.add(key);
-      newRels.push(rel);
-    } else {
-    }
-  }
-  return newRels;
-}
-var ROOT_SUBJECT, RelationTripleSchema, RelationGraphAsListSchema;
-var init_relations = __esm({
-  "../anafero/relations.mts"() {
-    "use strict";
-    init_Schema2();
-    init_ResourceReader();
-    ROOT_SUBJECT = "_:root";
-    RelationTripleSchema = Tuple2(
-      // TODO: Named tuple elements with Effect Schema—possible?
-      // These annotations do not carry to typing hints.
-      element2(String$2.pipe(nonEmptyString3())).annotations({
-        title: "Object being described (subject of the relation)"
-      }),
-      element2(String$2.pipe(nonEmptyString3())).annotations({
-        title: "Predicate of the relation (property name)"
-      }),
-      element2(String$2).annotations({
-        title: "Object or target of the relation (property value)"
-      })
-    );
-    RelationGraphAsListSchema = mutable4(Array$2(RelationTripleSchema));
-  }
-});
-
 // ../anafero/Layout.mts
 var NavLinkSchema, ResourceNavSchema;
 var init_Layout = __esm({
   "../anafero/Layout.mts"() {
     "use strict";
     init_Schema2();
-    init_relations();
     NavLinkSchema = Struct2({
       path: String$2,
       plainTitle: String$2
@@ -92068,7 +91978,96 @@ var init_esm = __esm({
   }
 });
 
-// ../anafero/ContentGenerator.mts
+// ../anafero/relations.mts
+function dedupeGraph(graph) {
+  const seen = /* @__PURE__ */ new Set();
+  const newGraph = [];
+  for (const triple of graph) {
+    const key = triple.join(" ");
+    if (!seen.has(key)) {
+      seen.add(key);
+      if (triple[0] !== triple[2]) {
+        newGraph.push(triple);
+      }
+    } else {
+    }
+  }
+  return newGraph;
+}
+function dedupeResourceRelationList(rels) {
+  const seen = /* @__PURE__ */ new Set();
+  const newRels = [];
+  for (const rel of rels) {
+    const key = JSON.stringify(rel);
+    if (!seen.has(key)) {
+      seen.add(key);
+      newRels.push(rel);
+    } else {
+    }
+  }
+  return newRels;
+}
+var ROOT_SUBJECT, RelationTripleSchema, RelationGraphAsListSchema;
+var init_relations = __esm({
+  "../anafero/relations.mts"() {
+    "use strict";
+    init_Schema2();
+    init_StoreAdapter();
+    ROOT_SUBJECT = "_:root";
+    RelationTripleSchema = Tuple2(
+      // TODO: Named tuple elements with Effect Schema—possible?
+      // These annotations do not carry to typing hints.
+      element2(String$2.pipe(nonEmptyString3())).annotations({
+        title: "Object being described (subject of the relation)"
+      }),
+      element2(String$2.pipe(nonEmptyString3())).annotations({
+        title: "Predicate of the relation (property name)"
+      }),
+      element2(String$2).annotations({
+        title: "Object or target of the relation (property value)"
+      })
+    );
+    RelationGraphAsListSchema = mutable4(Array$2(RelationTripleSchema));
+  }
+});
+
+// ../anafero/StoreAdapter.mts
+var ResourceRelationSchema;
+var init_StoreAdapter = __esm({
+  "../anafero/StoreAdapter.mts"() {
+    "use strict";
+    init_Schema2();
+    init_relations();
+    ResourceRelationSchema = Struct2({
+      /**
+       * Describes the type of relation.
+       * Currently, a plain descriptive label.
+       * In future may be a URI resolved to relation metadata.
+       *
+       * An example can be “hasPart”.
+       *
+       * “hasPart” relation is respected for the purposes of generating
+       * a hierarchy of resources.
+       */
+      predicate: String$2.pipe(nonEmptyString3()),
+      /**
+       * Object of the relation.
+       * Could be a root-relative slash-prepended path to another resource,
+       * or an URI.
+       *
+       * It could be a `file:` URI if relation points to another local file.
+       */
+      target: String$2.pipe(nonEmptyString3())
+      // /**
+      //  * A reader can output relations that are not encoded in the source
+      //  * but were computed by the adapter. Example: hasNext, seeAlso.
+      //  */
+      // synthetic: S.Boolean.pipe(S.optional),
+    });
+  }
+});
+
+// ../anafero/ContentAdapter.mts
 function gatherDescribedResourcesFromJsonifiedProseMirrorNode(jsonifiedNode, _accum) {
   const accumulator = _accum ?? /* @__PURE__ */ new Set();
   const maybeResourceID = jsonifiedNode?.attrs?.resourceID;
@@ -92092,12 +92091,12 @@ function fillInLocale(langID) {
   }
 }
 var ResourceMetadataSchema, DEFAULT_LOCALE, ResourceContentSchema, AdapterGeneratedResourceContentSchema;
-var init_ContentGenerator = __esm({
-  "../anafero/ContentGenerator.mts"() {
+var init_ContentAdapter = __esm({
+  "../anafero/ContentAdapter.mts"() {
     "use strict";
     init_Schema2();
     init_esm();
-    init_ResourceReader();
+    init_StoreAdapter();
     init_relations();
     ResourceMetadataSchema = mutable4(Struct2({
       // TODO: rich ProseMirror labels?
@@ -92199,8 +92198,8 @@ var init_Config2 = __esm({
   "../anafero/Config.mts"() {
     "use strict";
     init_Schema2();
-    init_ResourceReader();
-    init_ContentGenerator();
+    init_StoreAdapter();
+    init_ContentAdapter();
     init_Layout();
     BuildConfigSchema = Struct2({
       version: Literal4("0.1"),
@@ -95202,8 +95201,8 @@ var init_anafero = __esm({
     init_Layout();
     init_search();
     init_TitleSchema();
-    init_ContentGenerator();
-    init_ResourceReader();
+    init_ContentAdapter();
+    init_StoreAdapter();
     init_relations();
     init_versioning();
     init_Config2();
@@ -131496,7 +131495,7 @@ init_dist4();
 init_esm();
 init_Config2();
 init_relations();
-init_ContentGenerator();
+init_ContentAdapter();
 init_Layout();
 init_ResourceNavigationContext();
 
@@ -131530,7 +131529,6 @@ var Resource = import_react213.default.forwardRef(function({
   "aria-selected": ariaSelected
 }, ref) {
   const adapter2 = useDependency(content.adapterID);
-  const categorizedRelations = useCategorizedRelations(graph, adapter2);
   const schema = useProseMirrorSchema(
     content.content?.contentSchemaID ?? "",
     adapter2
@@ -131674,7 +131672,6 @@ var Resource = import_react213.default.forwardRef(function({
         ref: layoutRef,
         ResourceLink: () => "",
         nav: resourceNav,
-        relations: categorizedRelations.nonContent,
         locateResource,
         resourceTitle: ""
       },
@@ -131695,26 +131692,6 @@ var Resource = import_react213.default.forwardRef(function({
     )
   );
 });
-function useCategorizedRelations(relations, adapter2) {
-  return (0, import_react213.useMemo)(() => {
-    if (relations.length < 1 || !adapter2) {
-      return { content: [], nonContent: [] };
-    }
-    return relations.map(([subj, predicate, target]) => [
-      [subj, predicate, target],
-      adapter2.contributesToContent(
-        { predicate, target },
-        relations.filter(([s]) => s === target)
-      )
-    ]).reduce((accumulator, [rel, isContent]) => ({
-      content: isContent ? [...accumulator.content, rel] : accumulator.content,
-      nonContent: !isContent ? [...accumulator.nonContent, rel] : accumulator.nonContent
-    }), {
-      content: [],
-      nonContent: []
-    });
-  }, [adapter2, relations]);
-}
 function useProseMirrorSchema(schemaID, adapter2) {
   return (0, import_react213.useMemo)(() => {
     if (!adapter2) {
@@ -132354,7 +132331,7 @@ var AppLoader = function() {
     });
   }, [nonCurrentActiveVersionID, sharedDeps?.["/versions.json"]]);
   const versionPrefix = nonCurrentActiveVersionID === void 0 ? void 0 : nonCurrentActiveVersionID ? `/${nonCurrentActiveVersionID}` : "";
-  const getVersionedPath = (0, import_react217.useMemo)(() => versionPrefix !== void 0 ? function(slashPrependedPath) {
+  const getVersionedPath = (0, import_react217.useMemo)(() => versionPrefix !== void 0 || pathPrefix !== "" ? function(slashPrependedPath) {
     const versioned = `${pathPrefix}${versionPrefix}${slashPrependedPath}`;
     return versioned;
   } : void 0, [pathPrefix, versionPrefix]);
@@ -132403,7 +132380,7 @@ var AppLoader = function() {
       if (rpath.includes("#")) {
         throw new Error("Will not return data asset paths for a resource that does not have its own page");
       }
-      return Object.entries(RESOURCE_DATA_PATHS).map(([propID, path]) => ({ [propID]: `${rpath}/${path}` })).reduce(
+      return Object.entries(RESOURCE_DATA_PATHS).map(([propID, path]) => ({ [propID]: [rpath === "/" ? "" : rpath, path].join("/") })).reduce(
         (prev, curr) => ({ ...prev, ...curr }),
         {}
       );
@@ -132613,7 +132590,7 @@ var VersionWorkspace = function({
   }, [dependencies]);
   const expandResourcePath = (0, import_react217.useCallback)((rpath) => {
     const hasFragment = rpath.indexOf("#") >= 1;
-    const withTrailing = `${rpath}${rpath !== "" ? "/" : ""}`;
+    const withTrailing = `${rpath}${rpath !== "" && rpath !== "/" ? "/" : ""}`;
     return [
       withTrailing,
       hasFragment ? `#${rpath.split("#")[1]}` : null