javascript-solid-server 0.0.146 → 0.0.148

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "javascript-solid-server",
-  "version": "0.0.146",
+  "version": "0.0.148",
   "description": "A minimal, fast Solid server",
   "main": "src/index.js",
   "type": "module",

package/src/handlers/container.js

@@ -182,10 +182,10 @@ export async function createPodStructure(name, webId, podUri, issuer, defaultQuo
   await storage.write(`${podPath}settings/prefs.jsonld`, serialize(prefs));
 
   // Generate and write type indexes
-  const publicTypeIndex = generateTypeIndex(`${podUri}settings/publicTypeIndex.jsonld`);
+  const publicTypeIndex = generateTypeIndex(`${podUri}settings/publicTypeIndex.jsonld`, { listed: true });
   await storage.write(`${podPath}settings/publicTypeIndex.jsonld`, serialize(publicTypeIndex));
 
-  const privateTypeIndex = generateTypeIndex(`${podUri}settings/privateTypeIndex.jsonld`);
+  const privateTypeIndex = generateTypeIndex(`${podUri}settings/privateTypeIndex.jsonld`, { listed: false });
   await storage.write(`${podPath}settings/privateTypeIndex.jsonld`, serialize(privateTypeIndex));
 
   // Create default ACL files

package/src/server.js

@@ -606,10 +606,10 @@ export function createServer(options = {}) {
     const prefs = generatePreferences({ webId, podUri });
     await storage.write('/settings/prefs.jsonld', serialize(prefs));
 
-    const publicTypeIndex = generateTypeIndex(`${podUri}settings/publicTypeIndex.jsonld`);
+    const publicTypeIndex = generateTypeIndex(`${podUri}settings/publicTypeIndex.jsonld`, { listed: true });
     await storage.write('/settings/publicTypeIndex.jsonld', serialize(publicTypeIndex));
 
-    const privateTypeIndex = generateTypeIndex(`${podUri}settings/privateTypeIndex.jsonld`);
+    const privateTypeIndex = generateTypeIndex(`${podUri}settings/privateTypeIndex.jsonld`, { listed: false });
     await storage.write('/settings/privateTypeIndex.jsonld', serialize(privateTypeIndex));
 
     // ACL files

package/src/webid/profile.js

@@ -24,7 +24,6 @@ const PIM = 'http://www.w3.org/ns/pim/space#';
  */
 export function generateProfileJsonLd({ webId, name, podUri, issuer }) {
   const pod = podUri.endsWith('/') ? podUri : podUri + '/';
-  const profileDoc = webId.split('#')[0];
 
   return {
     '@context': {
@@ -39,12 +38,14 @@ export function generateProfileJsonLd({ webId, name, podUri, issuer }) {
       'preferencesFile': { '@id': 'pim:preferencesFile', '@type': '@id' },
       'publicTypeIndex': { '@id': 'solid:publicTypeIndex', '@type': '@id' },
       'privateTypeIndex': { '@id': 'solid:privateTypeIndex', '@type': '@id' },
+      'isPrimaryTopicOf': { '@id': 'foaf:isPrimaryTopicOf', '@type': '@id' },
       'mainEntityOfPage': { '@id': 'schema:mainEntityOfPage', '@type': '@id' }
     },
     '@id': webId,
     '@type': ['foaf:Person', 'schema:Person'],
     'foaf:name': name,
-    'mainEntityOfPage': profileDoc,
+    'isPrimaryTopicOf': '',
+    'mainEntityOfPage': '',
     'inbox': `${pod}inbox/`,
     'storage': pod,
     'oidcIssuer': issuer,
@@ -97,17 +98,25 @@ export function generatePreferences({ webId, podUri }) {
 }
 
 /**
- * Generate an empty type index
+ * Generate an empty type index.
+ * Per the Solid Type Indexes spec, a public index is additionally typed
+ * `solid:ListedDocument` and a private one `solid:UnlistedDocument`.
  * @param {string} uri - URI of the type index
+ * @param {object} [opts]
+ * @param {boolean} [opts.listed] - true for publicTypeIndex, false for privateTypeIndex.
+ *   If omitted, only `solid:TypeIndex` is set (back-compat).
  * @returns {object} JSON-LD type index document
  */
-export function generateTypeIndex(uri) {
+export function generateTypeIndex(uri, opts = {}) {
+  const types = ['solid:TypeIndex'];
+  if (opts.listed === true) types.push('solid:ListedDocument');
+  else if (opts.listed === false) types.push('solid:UnlistedDocument');
   return {
     '@context': {
       'solid': SOLID
     },
     '@id': uri,
-    '@type': 'solid:TypeIndex'
+    '@type': types.length === 1 ? types[0] : types
   };
 }
 

package/test/pod.test.js

@@ -131,5 +131,33 @@ describe('Pod Lifecycle', () => {
       const prefs = await request('/elsa/settings/prefs.jsonld');
       assertStatus(prefs, 401);
     });
+
+    it('should mark type indexes as ListedDocument / UnlistedDocument', async () => {
+      await createTestPod('frida');
+
+      const pub = await request('/frida/settings/publicTypeIndex.jsonld');
+      assertStatus(pub, 200);
+      const pubBody = await pub.json();
+      assert.ok(
+        Array.isArray(pubBody['@type']) && pubBody['@type'].includes('solid:ListedDocument'),
+        'publicTypeIndex should be solid:ListedDocument'
+      );
+      assert.ok(
+        Array.isArray(pubBody['@type']) && pubBody['@type'].includes('solid:TypeIndex'),
+        'publicTypeIndex should be solid:TypeIndex'
+      );
+
+      const priv = await request('/frida/settings/privateTypeIndex.jsonld', { auth: 'frida' });
+      assertStatus(priv, 200);
+      const privBody = await priv.json();
+      assert.ok(
+        Array.isArray(privBody['@type']) && privBody['@type'].includes('solid:UnlistedDocument'),
+        'privateTypeIndex should be solid:UnlistedDocument'
+      );
+      assert.ok(
+        Array.isArray(privBody['@type']) && privBody['@type'].includes('solid:TypeIndex'),
+        'privateTypeIndex should be solid:TypeIndex'
+      );
+    });
   });
 });

package/test/webid.test.js

@@ -83,11 +83,20 @@ describe('WebID Profile', () => {
       assert.ok(jsonLd['inbox'].endsWith('/webidtest/inbox/'), 'Should have inbox');
     });
 
-    it('should have mainEntityOfPage', async () => {
+    it('should have mainEntityOfPage pointing to the document', async () => {
       const res = await request(profilePath);
       const jsonLd = await res.json();
 
-      assert.ok(jsonLd['mainEntityOfPage'], 'Should have mainEntityOfPage');
+      // Empty string is a relative URI reference to the document itself (JSON-LD)
+      assert.strictEqual(jsonLd['mainEntityOfPage'], '', 'mainEntityOfPage should be "" (self)');
+    });
+
+    it('should have isPrimaryTopicOf pointing to the document', async () => {
+      const res = await request(profilePath);
+      const jsonLd = await res.json();
+
+      // Empty string is a relative URI reference to the document itself (JSON-LD)
+      assert.strictEqual(jsonLd['isPrimaryTopicOf'], '', 'isPrimaryTopicOf should be "" (self)');
     });
   });