solid-ui 2.5.0 → 2.5.1-1d1fdc21

package/lib/widgets/forms/autocomplete/language.js

@@ -16,8 +16,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var debug = _interopRequireWildcard(require("../../../debug"));
 var _solidLogic = require("solid-logic");
 var ns = _interopRequireWildcard(require("../../../ns"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 /* Logic to access public data stores
 *
 * including filtering resut by natural language etc
@@ -53,20 +52,20 @@ function _getPreferredLanguagesFor() {
   _getPreferredLanguagesFor = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(person) {
     var _store$fetcher;
     var doc, list, languageCodeArray;
-    return _regenerator["default"].wrap(function _callee$(_context) {
+    return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           doc = person.doc();
-          _context.next = 3;
+          _context.next = 1;
           return (_store$fetcher = _solidLogic.store.fetcher) === null || _store$fetcher === void 0 ? void 0 : _store$fetcher.load(doc);
-        case 3:
+        case 1:
           list = _solidLogic.store.any(person, ns.schema('knowsLanguage'), null, doc);
           if (list) {
-            _context.next = 6;
+            _context.next = 2;
             break;
           }
           return _context.abrupt("return", defaultPreferredLanguages);
-        case 6:
+        case 2:
           languageCodeArray = [];
           list.elements.forEach(function (item) {
             // console.log('@@ item ' + item)
@@ -83,14 +82,14 @@ function _getPreferredLanguagesFor() {
             languageCodeArray.push(code);
           });
           if (!(languageCodeArray.length > 0)) {
-            _context.next = 11;
+            _context.next = 3;
             break;
           }
           console.log("     User knows languages with codes: \"".concat(languageCodeArray.join(','), "\""));
           return _context.abrupt("return", addDefaults(languageCodeArray));
-        case 11:
+        case 3:
           return _context.abrupt("return", null);
-        case 12:
+        case 4:
         case "end":
           return _context.stop();
       }
@@ -108,47 +107,47 @@ function getPreferredLanguages() {
 function _getPreferredLanguages() {
   _getPreferredLanguages = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
     var me, solidLanguagePrefs;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
+    return _regenerator["default"].wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          _context2.next = 2;
+          _context2.next = 1;
           return _solidLogic.authn.currentUser();
-        case 2:
+        case 1:
           me = _context2.sent;
           if (!me) {
-            _context2.next = 9;
+            _context2.next = 3;
             break;
           }
-          _context2.next = 6;
+          _context2.next = 2;
           return getPreferredLanguagesFor(me);
-        case 6:
+        case 2:
           solidLanguagePrefs = _context2.sent;
           if (!solidLanguagePrefs) {
-            _context2.next = 9;
+            _context2.next = 3;
             break;
           }
           return _context2.abrupt("return", solidLanguagePrefs);
-        case 9:
+        case 3:
           if (!(typeof navigator !== 'undefined')) {
-            _context2.next = 14;
+            _context2.next = 5;
             break;
           }
           if (!navigator.languages) {
-            _context2.next = 12;
+            _context2.next = 4;
             break;
           }
           return _context2.abrupt("return", addDefaults(navigator.languages.map(function (longForm) {
             return longForm.split('-')[0];
           })));
-        case 12:
+        case 4:
           if (!navigator.language) {
-            _context2.next = 14;
+            _context2.next = 5;
             break;
           }
           return _context2.abrupt("return", addDefaults([navigator.language.split('-')[0]]));
-        case 14:
+        case 5:
           return _context2.abrupt("return", defaultPreferredLanguages);
-        case 15:
+        case 6:
         case "end":
           return _context2.stop();
       }

package/lib/widgets/forms/autocomplete/language.js.map

@@ -1 +1 @@
-{"version":3,"file":"language.js","names":["debug","_interopRequireWildcard","require","_solidLogic","ns","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","_typeof","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","languageCodeURIBase","exports","defaultPreferredLanguages","addDefaults","array","concat","filter","code","includes","getPreferredLanguagesFor","_x","_getPreferredLanguagesFor","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee","person","_store$fetcher","doc","list","languageCodeArray","wrap","_callee$","_context","prev","next","store","fetcher","load","any","schema","abrupt","elements","forEach","item","lang","solid","console","warn","value","startsWith","error","slice","length","push","log","join","stop","getPreferredLanguages","_getPreferredLanguages","_callee2","me","solidLanguagePrefs","_callee2$","_context2","authn","currentUser","sent","navigator","languages","map","longForm","split","language","filterByLanguage","bindings","languagePrefs","uris","binding","uri","subject","languagePrefs2","reverse","slimmed","sortMe","name","index","indexOf","pair","sort"],"sources":["../../../../src/widgets/forms/autocomplete/language.ts"],"sourcesContent":["/* Logic to access public data stores\n*\n* including filtering resut by natural language etc\n* See https://solidos.solidcommunity.net/public/2021/01%20Building%20Solid%20Apps%20which%20use%20Public%20Data.html\n*/\n/* eslint-disable no-console */\nimport * as debug from '../../../debug'\n// import * as logic from '../index'\n// import { authn } from '../../../authn/index'\nimport { authn, store } from 'solid-logic'\nimport * as ns from '../../../ns'\nimport { Collection, NamedNode, Node } from 'rdflib'\n// import { Binding } from '../widgets/forms/autocomplete/publicData'\n// import { nativeNameForLanguageCode, englishNameForLanguageCode } from './nativeNameForLanguageCode'\n\n// const { currentUser } = logic.authn\n\nexport interface Binding {\n  subject: Node;\n  name?: Node\n  location?: Node\n  coordinates?: Node\n}\n\nexport const languageCodeURIBase = 'https://www.w3.org/ns/iana/language-code/' /// @@ unsupported on the web (2021)\n\nexport const defaultPreferredLanguages = ['en', 'fr', 'de', 'it', 'ar']\n\nexport function addDefaults (array) {\n  if (!array) array = []\n  return array.concat(defaultPreferredLanguages.filter(code => !array.includes(code)))\n}\n\nexport async function getPreferredLanguagesFor (person: NamedNode) {\n  const doc = person.doc()\n  await store.fetcher?.load(doc)\n  const list = store.any(person, ns.schema('knowsLanguage'), null, doc) as Collection | undefined\n  if (!list) {\n    // console.log(`User ${person} has not set their languages in their profile.`)\n    return defaultPreferredLanguages\n  }\n  const languageCodeArray: string[] = []\n  list.elements.forEach(item => {\n    // console.log('@@ item ' + item)\n    const lang = store.any(item as any, ns.solid('publicId'), null, doc)\n    if (!lang) {\n      console.warn('getPreferredLanguages: No publiID of language.')\n      return\n    }\n    if (!lang.value.startsWith(languageCodeURIBase)) {\n      console.error(`What should be a language code ${lang.value} does not start with ${languageCodeURIBase}`)\n      return\n    }\n    const code = lang.value.slice(languageCodeURIBase.length)\n    languageCodeArray.push(code)\n  })\n\n  if (languageCodeArray.length > 0) {\n    console.log(`     User knows languages with codes: \"${languageCodeArray.join(',')}\"`)\n    return addDefaults(languageCodeArray)\n  }\n  return null\n}\n/* Get the preferred langauges for the user\n *\n *  Either from solid preferences or browser preferences or default\n */\nexport async function getPreferredLanguages () {\n  // In future:  cache in the login session for speed, but get from profile and private prefs\n  // We append the defaults so if someone's first choice is not available they don't get something very obscure\n  // See https://github.com/solidos/solidos/issues/42\n  const me = await authn.currentUser() as NamedNode\n  if (me) { // If logged in\n    const solidLanguagePrefs = await getPreferredLanguagesFor(me)\n    if (solidLanguagePrefs) return solidLanguagePrefs\n  }\n  if (typeof navigator !== 'undefined') { // use browser settings\n    if (navigator.languages) {\n      return addDefaults(navigator.languages.map(longForm => longForm.split('-')[0]))\n    }\n    if (navigator.language) {\n      return addDefaults([navigator.language.split('-')[0]])\n    }\n  }\n  return defaultPreferredLanguages\n}\n\n/* From an array of bindings with a names for each row,\n * remove dupliacte names for the same thing, leaving the user's\n * preferred language version\n*/\n\nexport function filterByLanguage (bindings, languagePrefs) {\n  const uris = {}\n  bindings.forEach(binding => { // Organize names by their subject\n    const uri = binding.subject.value\n    uris[uri] = uris[uri] || []\n    uris[uri].push(binding)\n  })\n\n  const languagePrefs2 = languagePrefs || defaultPreferredLanguages\n  languagePrefs2.reverse() // Preferred last\n\n  const slimmed = ([] as Array<Binding>)\n  // console.log(` @@ {languagePrefs2 ${languagePrefs2}`)\n  for (const u in uris) { // needs hasOwnProperty ?\n    const bindings = uris[u]\n    const sortMe = bindings.map(binding => {\n      const lang = binding.name['xml:lang']\n      const index = languagePrefs2.indexOf(lang)\n      const pair = [index, binding]\n      // console.log(`   @@ lang: ${lang}, index: ${index}`)\n      return pair\n    })\n    sortMe.sort() // best at th ebottom\n    sortMe.reverse() // best at the top\n    // console.debug('@@ sortMe:', sortMe)\n    slimmed.push((sortMe[0][1] as any))\n  } // map u\n  debug.log(` Filter by language: ${bindings.length} -> ${slimmed.length}`)\n  return slimmed\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"language.js","names":["debug","_interopRequireWildcard","require","_solidLogic","ns","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","_typeof","has","get","set","_t","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","languageCodeURIBase","exports","defaultPreferredLanguages","addDefaults","array","concat","filter","code","includes","getPreferredLanguagesFor","_x","_getPreferredLanguagesFor","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee","person","_store$fetcher","doc","list","languageCodeArray","wrap","_context","prev","next","store","fetcher","load","any","schema","abrupt","elements","forEach","item","lang","solid","console","warn","value","startsWith","error","slice","length","push","log","join","stop","getPreferredLanguages","_getPreferredLanguages","_callee2","me","solidLanguagePrefs","_context2","authn","currentUser","sent","navigator","languages","map","longForm","split","language","filterByLanguage","bindings","languagePrefs","uris","binding","uri","subject","languagePrefs2","reverse","slimmed","u","sortMe","name","index","indexOf","pair","sort"],"sources":["../../../../src/widgets/forms/autocomplete/language.ts"],"sourcesContent":["/* Logic to access public data stores\n*\n* including filtering resut by natural language etc\n* See https://solidos.solidcommunity.net/public/2021/01%20Building%20Solid%20Apps%20which%20use%20Public%20Data.html\n*/\n/* eslint-disable no-console */\nimport * as debug from '../../../debug'\n// import * as logic from '../index'\n// import { authn } from '../../../authn/index'\nimport { authn, store } from 'solid-logic'\nimport * as ns from '../../../ns'\nimport { Collection, NamedNode, Node } from 'rdflib'\n// import { Binding } from '../widgets/forms/autocomplete/publicData'\n// import { nativeNameForLanguageCode, englishNameForLanguageCode } from './nativeNameForLanguageCode'\n\n// const { currentUser } = logic.authn\n\nexport interface Binding {\n  subject: Node;\n  name?: Node\n  location?: Node\n  coordinates?: Node\n}\n\nexport const languageCodeURIBase = 'https://www.w3.org/ns/iana/language-code/' /// @@ unsupported on the web (2021)\n\nexport const defaultPreferredLanguages = ['en', 'fr', 'de', 'it', 'ar']\n\nexport function addDefaults (array) {\n  if (!array) array = []\n  return array.concat(defaultPreferredLanguages.filter(code => !array.includes(code)))\n}\n\nexport async function getPreferredLanguagesFor (person: NamedNode) {\n  const doc = person.doc()\n  await store.fetcher?.load(doc)\n  const list = store.any(person, ns.schema('knowsLanguage'), null, doc) as Collection | undefined\n  if (!list) {\n    // console.log(`User ${person} has not set their languages in their profile.`)\n    return defaultPreferredLanguages\n  }\n  const languageCodeArray: string[] = []\n  list.elements.forEach(item => {\n    // console.log('@@ item ' + item)\n    const lang = store.any(item as any, ns.solid('publicId'), null, doc)\n    if (!lang) {\n      console.warn('getPreferredLanguages: No publiID of language.')\n      return\n    }\n    if (!lang.value.startsWith(languageCodeURIBase)) {\n      console.error(`What should be a language code ${lang.value} does not start with ${languageCodeURIBase}`)\n      return\n    }\n    const code = lang.value.slice(languageCodeURIBase.length)\n    languageCodeArray.push(code)\n  })\n\n  if (languageCodeArray.length > 0) {\n    console.log(`     User knows languages with codes: \"${languageCodeArray.join(',')}\"`)\n    return addDefaults(languageCodeArray)\n  }\n  return null\n}\n/* Get the preferred langauges for the user\n *\n *  Either from solid preferences or browser preferences or default\n */\nexport async function getPreferredLanguages () {\n  // In future:  cache in the login session for speed, but get from profile and private prefs\n  // We append the defaults so if someone's first choice is not available they don't get something very obscure\n  // See https://github.com/solidos/solidos/issues/42\n  const me = await authn.currentUser() as NamedNode\n  if (me) { // If logged in\n    const solidLanguagePrefs = await getPreferredLanguagesFor(me)\n    if (solidLanguagePrefs) return solidLanguagePrefs\n  }\n  if (typeof navigator !== 'undefined') { // use browser settings\n    if (navigator.languages) {\n      return addDefaults(navigator.languages.map(longForm => longForm.split('-')[0]))\n    }\n    if (navigator.language) {\n      return addDefaults([navigator.language.split('-')[0]])\n    }\n  }\n  return defaultPreferredLanguages\n}\n\n/* From an array of bindings with a names for each row,\n * remove dupliacte names for the same thing, leaving the user's\n * preferred language version\n*/\n\nexport function filterByLanguage (bindings, languagePrefs) {\n  const uris = {}\n  bindings.forEach(binding => { // Organize names by their subject\n    const uri = binding.subject.value\n    uris[uri] = uris[uri] || []\n    uris[uri].push(binding)\n  })\n\n  const languagePrefs2 = languagePrefs || defaultPreferredLanguages\n  languagePrefs2.reverse() // Preferred last\n\n  const slimmed = ([] as Array<Binding>)\n  // console.log(` @@ {languagePrefs2 ${languagePrefs2}`)\n  for (const u in uris) { // needs hasOwnProperty ?\n    const bindings = uris[u]\n    const sortMe = bindings.map(binding => {\n      const lang = binding.name['xml:lang']\n      const index = languagePrefs2.indexOf(lang)\n      const pair = [index, binding]\n      // console.log(`   @@ lang: ${lang}, index: ${index}`)\n      return pair\n    })\n    sortMe.sort() // best at th ebottom\n    sortMe.reverse() // best at the top\n    // console.debug('@@ sortMe:', sortMe)\n    slimmed.push((sortMe[0][1] as any))\n  } // map u\n  debug.log(` Filter by language: ${bindings.length} -> ${slimmed.length}`)\n  return slimmed\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/widgets/forms/autocomplete/publicData.js

@@ -28,8 +28,7 @@ var _solidLogic = require("solid-logic");
 var debug = _interopRequireWildcard(require("../../../debug"));
 var ns = _interopRequireWildcard(require("../../../ns"));
 var _language = require("./language");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t3 in e) "default" !== _t3 && {}.hasOwnProperty.call(e, _t3) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t3)) && (i.get || i.set) ? o(f, _t3, i) : f[_t3] = e[_t3]); return f; })(e, t); }
 /* Logic to access public data stores
 *
 * including filtering resut by natural language etc
@@ -251,34 +250,34 @@ function _queryESCODataByName() {
   _queryESCODataByName = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(filter, theClass, queryTarget) {
     var _store$fetcher;
     var limit, queryURI, response, text, json;
-    return _regenerator["default"].wrap(function _callee$(_context) {
+    return _regenerator["default"].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           if (queryTarget.searchByNameURI) {
-            _context.next = 2;
+            _context.next = 1;
             break;
           }
           throw new Error('Missing queryTarget.searchByNameURI on queryESCODataByName');
-        case 2:
+        case 1:
           limit = queryTarget.limit || AUTOCOMPLETE_LIMIT;
           queryURI = queryTarget.searchByNameURI.replace('$(name)', filter).replace('$(limit)', '' + limit).replace('$(targetClass)', theClass.toNT());
           debug.log('Querying ESCO data - uri: ' + queryURI);
-          _context.next = 7;
+          _context.next = 2;
           return (_store$fetcher = _solidLogic.store.fetcher) === null || _store$fetcher === void 0 ? void 0 : _store$fetcher.webOperation('GET', queryURI, fetcherOptionsJsonPublicData);
-        case 7:
+        case 2:
           response = _context.sent;
           text = (response === null || response === void 0 ? void 0 : response.responseText) || '';
           debug.log('    Query result  text' + text.slice(0, 500) + '...');
           if (!(text.length === 0)) {
-            _context.next = 12;
+            _context.next = 3;
             break;
           }
           throw new Error('Wot no text back from ESCO query ' + queryURI);
-        case 12:
+        case 3:
           json = JSON.parse(text); // console.log('Whole JSON return object', json)
           debug.log('    ESCO Query result JSON' + JSON.stringify(json, null, 4).slice(0, 500) + '...');
           return _context.abrupt("return", ESCOResultToBindings(json));
-        case 15:
+        case 4:
         case "end":
           return _context.stop();
       }
@@ -303,8 +302,8 @@ function queryPublicDataByName(_x4, _x5, _x6, _x7) {
 */
 function _queryPublicDataByName() {
   _queryPublicDataByName = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(filter, theClass, languages, queryTarget) {
-    var substituteStrings, languagePrefs, language, sparql, queryURI, response, _store$fetcher2, text, text2, json, bindings;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
+    var substituteStrings, languagePrefs, language, sparql, queryURI, response, _store$fetcher2, text, text2, json, bindings, _t, _t2;
+    return _regenerator["default"].wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           substituteStrings = function _substituteStrings(template) {
@@ -313,86 +312,86 @@ function _queryPublicDataByName() {
             return u1.replace('$(targetClass)', theClass.toNT());
           };
           if (theClass) {
-            _context2.next = 3;
+            _context2.next = 1;
             break;
           }
           throw new Error('queryPublicDataByName: No class provided');
-        case 3:
-          _context2.next = 5;
+        case 1:
+          _context2.next = 2;
           return (0, _language.getPreferredLanguages)();
-        case 5:
-          _context2.t0 = _context2.sent;
-          if (_context2.t0) {
-            _context2.next = 8;
+        case 2:
+          _t = _context2.sent;
+          if (_t) {
+            _context2.next = 3;
             break;
           }
-          _context2.t0 = _language.defaultPreferredLanguages;
-        case 8:
-          languagePrefs = _context2.t0;
+          _t = _language.defaultPreferredLanguages;
+        case 3:
+          languagePrefs = _t;
           language = languagePrefs[0] || 'en';
           if (!queryTarget.searchByNameQuery) {
-            _context2.next = 16;
+            _context2.next = 4;
             break;
           }
           sparql = substituteStrings(queryTarget.searchByNameQuery);
           debug.log('Querying public data - sparql: ' + sparql);
           return _context2.abrupt("return", queryPublicDataSelect(sparql, queryTarget));
-        case 16:
+        case 4:
           if (!queryTarget.searchByNameURI) {
-            _context2.next = 46;
+            _context2.next = 13;
             break;
           }
           // not sparql - random API
           queryURI = substituteStrings(queryTarget.searchByNameURI);
-          _context2.prev = 18;
-          _context2.next = 21;
+          _context2.prev = 5;
+          _context2.next = 6;
           return (_store$fetcher2 = _solidLogic.store.fetcher) === null || _store$fetcher2 === void 0 ? void 0 : _store$fetcher2.webOperation('GET', queryURI, fetcherOptionsJsonPublicData);
-        case 21:
+        case 6:
           response = _context2.sent;
-          _context2.next = 27;
+          _context2.next = 8;
           break;
-        case 24:
-          _context2.prev = 24;
-          _context2.t1 = _context2["catch"](18);
-          throw new Error("Exception when trying to fetch ".concat(queryURI, " \n ").concat(_context2.t1));
-        case 27:
+        case 7:
+          _context2.prev = 7;
+          _t2 = _context2["catch"](5);
+          throw new Error("Exception when trying to fetch ".concat(queryURI, " \n ").concat(_t2));
+        case 8:
           text = response.responseText || ''; // ts
           if (!(response.status !== 200)) {
-            _context2.next = 30;
+            _context2.next = 9;
             break;
           }
           throw new Error("HTTP error status ".concat(response.status, " trying to fetch ").concat(queryURI, " "));
-        case 30:
+        case 9:
           debug.log('    Query result  text' + text.slice(0, 500) + '...');
           if (!(text.length === 0)) {
-            _context2.next = 33;
+            _context2.next = 10;
             break;
           }
           throw new Error('queryPublicDataByName: No text back from public data query ' + queryURI);
-        case 33:
+        case 10:
           text2 = fixWikidataJSON(text); // Kludge: strip of interrupting error message
           json = JSON.parse(text2);
           debug.log('    API Query result JSON' + JSON.stringify(json, null, 4).slice(0, 500) + '...');
           if (!json._embedded) {
-            _context2.next = 42;
+            _context2.next = 11;
             break;
           }
           debug.log('      Looks like ESCO');
           bindings = ESCOResultToBindings(json);
           return _context2.abrupt("return", bindings);
-        case 42:
+        case 11:
           alert('Code me: unrecognized API return format');
           throw new Error("*** Need to add code to parse unrecognized API JSON return\n".concat(JSON.stringify(json, null, 4)));
-        case 44:
-          _context2.next = 47;
+        case 12:
+          _context2.next = 14;
           break;
-        case 46:
+        case 13:
           throw new Error('Query source must have either rest API or SPARQL endpoint.');
-        case 47:
+        case 14:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[18, 24]]);
+    }, _callee2, null, [[5, 7]]);
   }));
   return _queryPublicDataByName.apply(this, arguments);
 }
@@ -405,15 +404,15 @@ function _queryPublicDataSelect() {
   _queryPublicDataSelect = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(sparql, queryTarget) {
     var _store$fetcher3;
     var myUrlWithParams, queryURI, headers, options, response, text, text2, json, bindings;
-    return _regenerator["default"].wrap(function _callee3$(_context3) {
+    return _regenerator["default"].wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           if (queryTarget.endpoint) {
-            _context3.next = 2;
+            _context3.next = 1;
             break;
           }
           throw new Error('Missing queryTarget.endpoint required for queryPublicDataSelect');
-        case 2:
+        case 1:
           myUrlWithParams = new URL(queryTarget.endpoint);
           myUrlWithParams.searchParams.append('query', sparql);
           queryURI = myUrlWithParams.href;
@@ -425,23 +424,23 @@ function _queryPublicDataSelect() {
             // CORS - as we know it is public
             headers: headers
           };
-          _context3.next = 11;
+          _context3.next = 2;
           return (_store$fetcher3 = _solidLogic.store.fetcher) === null || _store$fetcher3 === void 0 ? void 0 : _store$fetcher3.webOperation('GET', queryURI, options);
-        case 11:
+        case 2:
           response = _context3.sent;
           text = (response === null || response === void 0 ? void 0 : response.responseText) || '';
           if (!(text.length === 0)) {
-            _context3.next = 15;
+            _context3.next = 3;
             break;
           }
           throw new Error('No text back from query ' + queryURI);
-        case 15:
+        case 3:
           text2 = fixWikidataJSON(text);
           json = JSON.parse(text2);
           debug.log('    Query result JSON' + JSON.stringify(json, null, 4).slice(0, 100) + '...');
           bindings = json.results.bindings;
           return _context3.abrupt("return", bindings);
-        case 20:
+        case 4:
         case "end":
           return _context3.stop();
       }
@@ -449,23 +448,23 @@ function _queryPublicDataSelect() {
   }));
   return _queryPublicDataSelect.apply(this, arguments);
 }
-function queryPublicDataConstruct(_x10, _x11, _x12) {
+function queryPublicDataConstruct(_x0, _x1, _x10) {
   return _queryPublicDataConstruct.apply(this, arguments);
 }
 function _queryPublicDataConstruct() {
   _queryPublicDataConstruct = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(sparql, pubicId, queryTarget) {
     var _store$fetcher4;
     var myUrlWithParams, queryURI, headers, options, response, text, report;
-    return _regenerator["default"].wrap(function _callee4$(_context4) {
+    return _regenerator["default"].wrap(function (_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           debug.log('queryPublicDataConstruct: sparql:', sparql);
           if (queryTarget.endpoint) {
-            _context4.next = 3;
+            _context4.next = 1;
             break;
           }
           throw new Error('Missing queryTarget.endpoint required for queryPublicDataConstruct');
-        case 3:
+        case 1:
           myUrlWithParams = new URL(queryTarget.endpoint);
           myUrlWithParams.searchParams.append('query', sparql);
           queryURI = myUrlWithParams.href;
@@ -477,21 +476,21 @@ function _queryPublicDataConstruct() {
             // CORS // @tsc pain
             headers: headers // ({ Accept: 'text/turtle' } as Headers)
           };
-          _context4.next = 12;
+          _context4.next = 2;
           return (_store$fetcher4 = _solidLogic.store.fetcher) === null || _store$fetcher4 === void 0 ? void 0 : _store$fetcher4.webOperation('GET', queryURI, options);
-        case 12:
+        case 2:
           response = _context4.sent;
           text = (response === null || response === void 0 ? void 0 : response.responseText) || 'No response text?';
           report = text.length > 500 ? text.slice(0, 200) + ' ... ' + text.slice(-200) : text;
           debug.log('    queryPublicDataConstruct result text:' + report);
           if (!(text.length === 0)) {
-            _context4.next = 18;
+            _context4.next = 3;
             break;
           }
           throw new Error('queryPublicDataConstruct: No text back from construct query:' + queryURI);
-        case 18:
+        case 3:
           (0, _rdflib.parse)(text, _solidLogic.store, pubicId.uri, 'text/turtle');
-        case 19:
+        case 4:
         case "end":
           return _context4.stop();
       }
@@ -499,31 +498,31 @@ function _queryPublicDataConstruct() {
   }));
   return _queryPublicDataConstruct.apply(this, arguments);
 }
-function loadPublicDataThing(_x13, _x14, _x15) {
+function loadPublicDataThing(_x11, _x12, _x13) {
   return _loadPublicDataThing.apply(this, arguments);
 }
 function _loadPublicDataThing() {
   _loadPublicDataThing = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(kb, subject, publicDataID) {
     var iDToFetch, headers;
-    return _regenerator["default"].wrap(function _callee5$(_context5) {
+    return _regenerator["default"].wrap(function (_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
           if (!publicDataID.uri.startsWith('https://dbpedia.org/resource/')) {
-            _context5.next = 4;
+            _context5.next = 1;
             break;
           }
           return _context5.abrupt("return", getDbpediaDetails(kb, subject, publicDataID));
-        case 4:
+        case 1:
           if (!publicDataID.uri.match(/^https?:\/\/www\.wikidata\.org\/entity\/.*/)) {
-            _context5.next = 9;
+            _context5.next = 3;
             break;
           }
-          _context5.next = 7;
+          _context5.next = 2;
           return getWikidataDetails(kb, subject, publicDataID);
-        case 7:
-          _context5.next = 13;
+        case 2:
+          _context5.next = 4;
           break;
-        case 9:
+        case 3:
           iDToFetch = publicDataID.uri.startsWith('http:') ? kb.sym('https:' + publicDataID.uri.slice(5)) : publicDataID;
           headers = new Headers();
           headers.append('Accept', 'text/turtle');
@@ -531,7 +530,7 @@ function _loadPublicDataThing() {
             credentials: 'omit',
             headers: headers
           }));
-        case 13:
+        case 4:
         case "end":
           return _context5.stop();
       }
@@ -539,22 +538,22 @@ function _loadPublicDataThing() {
   }));
   return _loadPublicDataThing.apply(this, arguments);
 }
-function getWikidataDetails(_x16, _x17, _x18) {
+function getWikidataDetails(_x14, _x15, _x16) {
   return _getWikidataDetails.apply(this, arguments);
 }
 function _getWikidataDetails() {
   _getWikidataDetails = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(kb, solidSubject, publicDataID) {
     var subjRegexp, sparql;
-    return _regenerator["default"].wrap(function _callee6$(_context6) {
+    return _regenerator["default"].wrap(function (_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
           subjRegexp = /wd:Q49108/g;
           sparql = instituteDetailsWikidataQuery.replace(subjRegexp, publicDataID.toNT());
-          _context6.next = 4;
+          _context6.next = 1;
           return queryPublicDataConstruct(sparql, publicDataID, wikidataParameters);
-        case 4:
+        case 1:
           debug.log('getWikidataDetails: loaded.', publicDataID);
-        case 5:
+        case 2:
         case "end":
           return _context6.stop();
       }
@@ -562,22 +561,22 @@ function _getWikidataDetails() {
   }));
   return _getWikidataDetails.apply(this, arguments);
 }
-function getWikidataDetailsOld(_x19, _x20, _x21) {
+function getWikidataDetailsOld(_x17, _x18, _x19) {
   return _getWikidataDetailsOld.apply(this, arguments);
 }
 function _getWikidataDetailsOld() {
   _getWikidataDetailsOld = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(kb, solidSubject, publicDataID) {
     var sparql, bindings;
-    return _regenerator["default"].wrap(function _callee7$(_context7) {
+    return _regenerator["default"].wrap(function (_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
           sparql = "select distinct *  where {\n  optional { $(subject)  wdt:P31  ?targetClass } # instance of\n  optional { $(subject)  wdt:P154  ?logo }\n  optional { $(subject)  wdt:P158  ?sealImage }\n# optional { $(subject)  wdt:P159  ?headquartersLocation }\n\noptional { $(subject)  wdt:P17  ?country }\noptional { $(subject)  wdt:P18  ?image }\noptional { $(subject)  wdt:P1813  ?shortName }\n\noptional { $(subject)  wdt:P355  ?subsidiary }\n# SERVICE wikibase:label { bd:serviceParam wikibase:language \"fr,en,de,it\" }\n}".replace(subjectRegexp, publicDataID.toNT());
-          _context7.next = 3;
+          _context7.next = 1;
           return queryPublicDataSelect(sparql, wikidataParameters);
-        case 3:
+        case 1:
           bindings = _context7.sent;
           loadFromBindings(kb, publicDataID, bindings, publicDataID.doc()); // arg2 was solidSubject
-        case 5:
+        case 2:
         case "end":
           return _context7.stop();
       }
@@ -585,24 +584,24 @@ function _getWikidataDetailsOld() {
   }));
   return _getWikidataDetailsOld.apply(this, arguments);
 }
-function getWikidataLocation(_x22, _x23, _x24) {
+function getWikidataLocation(_x20, _x21, _x22) {
   return _getWikidataLocation.apply(this, arguments);
 }
 function _getWikidataLocation() {
   _getWikidataLocation = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(kb, solidSubject, publicDataID) {
     var sparql, bindings;
-    return _regenerator["default"].wrap(function _callee8$(_context8) {
+    return _regenerator["default"].wrap(function (_context8) {
       while (1) switch (_context8.prev = _context8.next) {
         case 0:
           sparql = "select distinct *  where {\n\n  $(subject) wdt:P276 ?location .\n\n  optional { ?location  wdt:P2044  ?elevation }\n  optional { ?location  wdt:P131  ?region }\n  optional { ?location wdt:P625 ?coordinates }\noptional {  ?location  wdt:P17  ?country }\n\n# SERVICE wikibase:label { bd:serviceParam wikibase:language \"fr,en,de,it\" }\n}".replace(subjectRegexp, publicDataID.toNT());
           debug.log(' location query sparql:' + sparql);
-          _context8.next = 4;
+          _context8.next = 1;
           return queryPublicDataSelect(sparql, wikidataParameters);
-        case 4:
+        case 1:
           bindings = _context8.sent;
           debug.log(' location query bindings:', bindings);
           loadFromBindings(kb, publicDataID, bindings, publicDataID.doc()); // was solidSubject
-        case 7:
+        case 2:
         case "end":
           return _context8.stop();
       }
@@ -610,24 +609,24 @@ function _getWikidataLocation() {
   }));
   return _getWikidataLocation.apply(this, arguments);
 }
-function getDbpediaDetails(_x25, _x26, _x27) {
+function getDbpediaDetails(_x23, _x24, _x25) {
   return _getDbpediaDetails.apply(this, arguments);
 }
 function _getDbpediaDetails() {
   _getDbpediaDetails = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(kb, solidSubject, publicDataID) {
     var sparql, bindings;
-    return _regenerator["default"].wrap(function _callee9$(_context9) {
+    return _regenerator["default"].wrap(function (_context9) {
       while (1) switch (_context9.prev = _context9.next) {
         case 0:
           // Note below the string form of the named node with <> works in SPARQL
           sparql = "select distinct ?city, ?state, ?country, ?homepage, ?logo, ?lat, ?long,  WHERE {\n    OPTIONAL { <".concat(publicDataID, "> <http://dbpedia.org/ontology/city> ?city }\n    OPTIONAL { ").concat(publicDataID, " <http://dbpedia.org/ontology/state> ?state }\n    OPTIONAL { ").concat(publicDataID, " <http://dbpedia.org/ontology/country> ?country }\n    OPTIONAL { ").concat(publicDataID, " foaf:homepage ?homepage }\n    OPTIONAL { ").concat(publicDataID, " foaf:lat ?lat; foaf:long ?long }\n    OPTIONAL { ").concat(publicDataID, " <http://dbpedia.org/ontology/country> ?country }\n   }");
-          _context9.next = 3;
+          _context9.next = 1;
           return queryPublicDataSelect(sparql, dbpediaParameters);
-        case 3:
+        case 1:
           bindings = _context9.sent;
           loadFromBindings(kb, publicDataID, bindings, publicDataID.doc());
           debug.log('Finished getDbpediaDetails.');
-        case 6:
+        case 2:
         case "end":
           return _context9.stop();
       }