deal with link or string

Author: michielbdejong

movies/vanilla/README.md

@@ -1,5 +1,9 @@
 # Solid Data Module for Movies
 
+Data schemas supported:
+* Media Kraken as-is
+* Media Kraken with correctly typed links
+
 ### Usage
 Set up a typescript project, install [solid-data-module-tasks](https://www.npmjs.com/package/solid-data-module-tasks) from NPM, and create a `.env` file like this:
 ```env

movies/vanilla/src/jsonld.ts

@@ -1,10 +1,22 @@
+export function getJsonLdFields(
+  entry: object,
+  pred: string,
+  subPred: string,
+): string[] {
+  if (Array.isArray(entry[pred])) {
+    return entry[pred].map(obj => obj[subPred]);
+  }
+  return [];
+}
+
 export function getJsonLdField(
   entry: object,
   pred: string,
   subPred: string,
 ): string | undefined {
-  if (Array.isArray(entry[pred]) && entry[pred].length === 1) {
-    return entry[pred][0][subPred];
+  const results = getJsonLdFields(entry, pred, subPred);
+  if (results.length === 1) {
+    return results[0];
   }
   return undefined;
 }
@@ -46,6 +58,19 @@ export function getJsonLdStringField(
   return getJsonLdField(entry, pred, '@value');
 }
 
+// use this function to deal with cases where
+// links might be incorrectly stored as strings
+export function getJsonLdLinkOrStringField(
+  entry: object,
+  pred: string,
+): string | undefined {
+  let ret = getJsonLdLinkField(entry, pred);
+  if (typeof ret === 'undefined') {
+    ret = getJsonLdStringField(entry, pred);
+  }
+  return ret;
+}
+
 export function getJsonLdStringFieldMulti(
   entry: object,
   pred: string,

movies/vanilla/src/movies.ts

@@ -1,6 +1,6 @@
 import {
   getJsonLdDateField,
-  getJsonLdLinkField,
+  getJsonLdLinkOrStringField,
   getJsonLdStringField,
 } from './jsonld.js';
 
@@ -75,11 +75,11 @@ export async function fetchList(
                 thing,
                 'https://schema.org/description',
               ),
-              image: getJsonLdStringField(thing, 'https://schema.org/image'), // sic: string instead of link here
+              image: getJsonLdLinkOrStringField(thing, 'https://schema.org/image'),
               name: getJsonLdStringField(thing, 'https://schema.org/name'),
               sameAs: thing['https://schema.org/sameAs'].map(
-                (x) => x['@value'],
-              ) as string[], // sic: string instead of link here
+                (x) => (x['@id'] || x['@value']),
+              ) as string[],
             },
           });
         } else if (
@@ -95,7 +95,7 @@ export async function fetchList(
               'https://schema.org/startTime',
             ),
             endTime: getJsonLdDateField(thing, 'https://schema.org/endTime'),
-            listingId: getJsonLdLinkField(thing, 'https://schema.org/object'),
+            listingId: getJsonLdLinkOrStringField(thing, 'https://schema.org/object'),
           });
         } else {
           console.log('thing type not recognised', thing);

tasks/README.md

@@ -2,6 +2,8 @@
 
 To use this Solid Data Module you need an authenticated fetch function. In Node.JS, when working against a CSS or Pivot server such as solidcommnunity.net, you can use [css-authn](https://www.npmjs.com/package/css-authn#usage) for this. In the browser, you can use [Inrupt Solid Client](https://docs.inrupt.com/developer-tools/javascript/client-libraries/authentication/).
 
+Data schemas supported:
+* Solid OS Issue Pane
 
 ### Usage
 Set up a typescript project, install [solid-data-module-tasks](https://www.npmjs.com/package/solid-data-module-tasks) from NPM, and create a `.env` file like this: