fetch from container and tracker

Author: michielbdejong

tasks/vanilla/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-data-module-tasks",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Solid Data Module for tasks and issue tracking",
   "type": "module",
   "engines": {

tasks/vanilla/src/example.ts

@@ -1,12 +1,12 @@
 import 'dotenv/config';
 import { v7 } from 'css-authn';
-import { fetchContainer } from 'solid-data-module-tasks';
+import { fetchContainerAndTracker } from 'solid-data-module-tasks';
 
 const authenticatedFetch = await v7.getAuthenticatedFetch({
   email: process.env.SOLID_EMAIL,
   password: process.env.SOLID_PASSWORD,
   provider: process.env.SOLID_SERVER,
 });
 const containerUrl = 'https://michielbdejong.solidcommunity.net/tasks/';
-const output = await fetchContainer(containerUrl, authenticatedFetch);
+const output = await fetchContainerAndTracker(containerUrl, authenticatedFetch);
 console.log(output);

tasks/vanilla/src/tasks.ts

@@ -96,11 +96,11 @@ export type InterpretedComment = {
 
 export type InterpretedIssue = {
   uri: string;
-  author: string;
-  title: string;
-  created: Date;
+  author?: string;
+  title?: string;
+  created?: Date;
   description: string;
-  trackerIndexUri: string;
+  trackerIndexUri?: string;
   commentUris: string[];
 };
 
@@ -115,7 +115,7 @@ export type InterpretedTracker = {
 };
 
 export type Interpretation = {
-  tracker: InterpretedTracker;
+  tracker?: InterpretedTracker;
   issues: {
     [uri: string]: InterpretedIssue;
   };
@@ -240,16 +240,23 @@ function interpret({
   return ret;
 }
 
-export async function fetchTracker(
+async function getJsonLd(
   uri: string,
   authenticatedFetcher: typeof globalThis.fetch,
-): Promise<Interpretation> {
-  const indexRet = await authenticatedFetcher(uri, {
+): Promise<object[]> {
+  const res = await authenticatedFetcher(uri, {
     headers: {
       Accept: 'application/ld+json',
     },
   });
-  const index: TrackerIndex = await indexRet.json();
+  return res.json();
+}
+
+export async function fetchTracker(
+  uri: string,
+  authenticatedFetcher: typeof globalThis.fetch,
+): Promise<Interpretation> {
+  const index = await getJsonLd(uri, authenticatedFetcher) as TrackerIndex;
   const stateDocUri =
     index[0]['http://www.w3.org/2005/01/wf/flow#stateStore'][0]['@id'];
   const stateRet = await authenticatedFetcher(stateDocUri, {
@@ -265,13 +272,40 @@ export async function fetchContainer(
   uri: string,
   authenticatedFetcher: typeof globalThis.fetch,
 ): Promise<Interpretation> {
-  const indexRet = await authenticatedFetcher(uri, {
-    headers: {
-      Accept: 'application/ld+json',
-    },
+  const jsonld = await getJsonLd(uri, authenticatedFetcher);
+  const docs = jsonld.map(entry => entry['@id']);
+  const ret: Interpretation = {
+    issues: {},
+  };
+  await Promise.all(docs.map(async docUri => {
+    if ((docUri === uri) || (docUri === `${uri}index.ttl`) || (docUri === `${uri}state.ttl`)) {
+      return;
+    }
+    const docContents = await getJsonLd(docUri, authenticatedFetcher);
+    docContents.forEach(thing => {
+      const uri = getJsonLdId(thing);
+      if (typeof uri === 'string' && getJsonLdType(thing) === 'https://schema.org/Action') {
+        ret.issues[uri] = {
+          uri,
+          description: getJsonLdStringField(thing, 'https://schema.org/description'),
+          commentUris: [],
+        };
+      }
+    })
+  }));
+  return ret;
+}
+
+export async function fetchContainerAndTracker(
+  uri: string,
+  authenticatedFetcher: typeof globalThis.fetch,
+): Promise<Interpretation> {
+  const ret = await fetchTracker(`${uri}index.ttl#this`, authenticatedFetcher);
+  const fromContainer = await fetchContainer(uri, authenticatedFetcher);
+  Object.keys(fromContainer.issues).forEach(key => {
+    ret.issues[key] = fromContainer.issues[key];
   });
-  const docs = await indexRet.json();
-  return docs;
+  return ret;
 }
 
 export async function addIssue(