solid-ui 2.4.14-bbf45639 → 2.4.14-bbf45639-e81d3e08

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

@@ -1,550 +1,786 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDbpediaDetails = exports.getWikidataLocation = exports.getWikidataDetailsOld = exports.getWikidataDetails = exports.loadPublicDataThing = exports.queryPublicDataConstruct = exports.queryPublicDataSelect = exports.queryPublicDataByName = exports.queryESCODataByName = exports.ESCOResultToBindings = exports.loadFromBindings = exports.bindingToTerm = exports.variableNameToPredicateMap = exports.wikidataIncomingClassMap = exports.wikidataParameters = exports.wikidataOutgoingClassMap = exports.dbPediaTypeMap = exports.dbpediaParameters = exports.escoParameters = exports.fetcherOptionsJsonPublicData = exports.instituteDetailsWikidataQuery = exports.wikidataClasses = exports.AUTOCOMPLETE_LIMIT = void 0;
+exports.AUTOCOMPLETE_LIMIT = void 0;
+exports.ESCOResultToBindings = ESCOResultToBindings;
+exports.bindingToTerm = bindingToTerm;
+exports.fetcherOptionsJsonPublicData = exports.escoParameters = exports.dbpediaParameters = exports.dbPediaTypeMap = void 0;
+exports.getDbpediaDetails = getDbpediaDetails;
+exports.getWikidataDetails = getWikidataDetails;
+exports.getWikidataDetailsOld = getWikidataDetailsOld;
+exports.getWikidataLocation = getWikidataLocation;
+exports.instituteDetailsWikidataQuery = void 0;
+exports.loadFromBindings = loadFromBindings;
+exports.loadPublicDataThing = loadPublicDataThing;
+exports.queryESCODataByName = queryESCODataByName;
+exports.queryPublicDataByName = queryPublicDataByName;
+exports.queryPublicDataConstruct = queryPublicDataConstruct;
+exports.queryPublicDataSelect = queryPublicDataSelect;
+exports.wikidataParameters = exports.wikidataOutgoingClassMap = exports.wikidataIncomingClassMap = exports.wikidataClasses = exports.variableNameToPredicateMap = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _rdflib = require("rdflib");
+
+var debug = _interopRequireWildcard(require("../../../debug"));
+
+var ns = _interopRequireWildcard(require("../../../ns"));
+
+var _logic = require("../../../logic");
+
+var _language = require("./language");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 /* Logic to access public data stores
 *
 * including filtering resut by natural language etc
 * See https://solidos.solidcommunity.net/public/2021/01%20Building%20Solid%20Apps%20which%20use%20Public%20Data.html
 */
+
 /* eslint-disable no-console */
-var rdflib_1 = require("rdflib");
-var debug = __importStar(require("../../../debug"));
-var ns = __importStar(require("../../../ns"));
-var logic_1 = require("../../../logic");
 // import  * as logic from '../../../logic'
-var language_1 = require("./language");
-exports.AUTOCOMPLETE_LIMIT = 200; // How many to get from server
+var AUTOCOMPLETE_LIMIT = 200; // How many to get from server
 // With 3000 we could exceed the wikidata timeout
+
+exports.AUTOCOMPLETE_LIMIT = AUTOCOMPLETE_LIMIT;
 var subjectRegexp = /\$\(subject\)/g;
 // Schema.org seems to suggest NGOs are non-profit and Corporaions are for-profit
 // but doesn't have explicit classes
-exports.wikidataClasses = {
-    Corporation: 'http://www.wikidata.org/entity/Q6881511',
-    EducationalOrganization: 'http://www.wikidata.org/entity/Q178706',
-    GovernmentOrganization: 'http://www.wikidata.org/entity/Q327333',
-    MedicalOrganization: 'http://www.wikidata.org/entity/Q4287745',
-    MusicGroup: 'http://www.wikidata.org/entity/Q32178211',
-    NGO: 'http://www.wikidata.org/entity/Q163740',
-    Occupation: 'http://www.wikidata.org/entity/Q28640',
-    // Organization: 'http://www.wikidata.org/entity/Q43229',
-    Project: 'http://www.wikidata.org/entity/Q170584',
-    SportsOrganization: 'http://www.wikidata.org/entity/Q4438121'
+var wikidataClasses = {
+  Corporation: 'http://www.wikidata.org/entity/Q6881511',
+  // Enterprise is for-profit
+  EducationalOrganization: 'http://www.wikidata.org/entity/Q178706',
+  // insitution
+  GovernmentOrganization: 'http://www.wikidata.org/entity/Q327333',
+  // government agency
+  MedicalOrganization: 'http://www.wikidata.org/entity/Q4287745',
+  MusicGroup: 'http://www.wikidata.org/entity/Q32178211',
+  // music organization
+  NGO: 'http://www.wikidata.org/entity/Q163740',
+  // nonprofit organization @@
+  Occupation: 'http://www.wikidata.org/entity/Q28640',
+  // Profession
+  // Organization: 'http://www.wikidata.org/entity/Q43229',
+  Project: 'http://www.wikidata.org/entity/Q170584',
+  SportsOrganization: 'http://www.wikidata.org/entity/Q4438121'
 };
-exports.instituteDetailsWikidataQuery = "prefix vcard: <http://www.w3.org/2006/vcard/ns#>\nCONSTRUCT\n{  wd:Q49108 vcard:fn ?itemLabel.\nwd:Q49108 rdf:type ?klass. ?klass rdfs:label ?klassLabel; rdfs:comment ?klassDescription .\nwd:Q49108 schema:logo ?logo;\n   schema:image ?image;\n   schema:logo  ?sealImage;\n   schema:subOrganization  ?subsidiary .\n      ?subsidiary rdfs:label ?subsidiaryLabel .\n ?supersidiary schema:subOrganization wd:Q49108 .\n      ?supersidiary rdfs:label ?supersidiaryLabel .\n  wd:Q49108 schema:location ?location .\n     ?location  schema:elevation  ?elevation .\n     ?location  wdt:P131  ?region .  ?region rdfs:label ?regionLabel .\n     ?location wdt:P625 ?coordinates .\n     ?location  schema:country  ?country . ?country rdfs:label ?countryLabel .\n}\nWHERE\n{  optional {wd:Q49108 rdfs:label ?itemLabel} .\n  optional {wd:Q49108 wdt:P154 ?logo .}\n  optional {wd:Q49108 wdt:P31 ?klass .}\n  optional {wd:Q49108 wdt:P158  ?sealImage .}\n  optional {wd:Q49108 wdt:P18 ?image .}\n\n  optional { wd:Q49108       wdt:P355 ?subsidiary . }\n  optional { ?supersidiary   wdt:P355 wd:Q49108. }\n\n  optional { wd:Q49108 wdt:P276 ?location .\n\n    optional { ?location  schema:eleveation  ?elevation }\n    optional { ?location  wdt:P131  ?region }\n    optional { ?location wdt:P625 ?coordinates }\n    optional {  ?location  wdt:P17  ?country }\n  }\n  SERVICE wikibase:label { bd:serviceParam wikibase:language \"fr,en,de,it\". }\n}";
-exports.fetcherOptionsJsonPublicData = {
-    credentials: 'omit',
-    headers: new Headers({ Accept: 'application/json' })
+exports.wikidataClasses = wikidataClasses;
+var instituteDetailsWikidataQuery = "prefix vcard: <http://www.w3.org/2006/vcard/ns#>\nCONSTRUCT\n{  wd:Q49108 vcard:fn ?itemLabel.\nwd:Q49108 rdf:type ?klass. ?klass rdfs:label ?klassLabel; rdfs:comment ?klassDescription .\nwd:Q49108 schema:logo ?logo;\n   schema:image ?image;\n   schema:logo  ?sealImage;\n   schema:subOrganization  ?subsidiary .\n      ?subsidiary rdfs:label ?subsidiaryLabel .\n ?supersidiary schema:subOrganization wd:Q49108 .\n      ?supersidiary rdfs:label ?supersidiaryLabel .\n  wd:Q49108 schema:location ?location .\n     ?location  schema:elevation  ?elevation .\n     ?location  wdt:P131  ?region .  ?region rdfs:label ?regionLabel .\n     ?location wdt:P625 ?coordinates .\n     ?location  schema:country  ?country . ?country rdfs:label ?countryLabel .\n}\nWHERE\n{  optional {wd:Q49108 rdfs:label ?itemLabel} .\n  optional {wd:Q49108 wdt:P154 ?logo .}\n  optional {wd:Q49108 wdt:P31 ?klass .}\n  optional {wd:Q49108 wdt:P158  ?sealImage .}\n  optional {wd:Q49108 wdt:P18 ?image .}\n\n  optional { wd:Q49108       wdt:P355 ?subsidiary . }\n  optional { ?supersidiary   wdt:P355 wd:Q49108. }\n\n  optional { wd:Q49108 wdt:P276 ?location .\n\n    optional { ?location  schema:eleveation  ?elevation }\n    optional { ?location  wdt:P131  ?region }\n    optional { ?location wdt:P625 ?coordinates }\n    optional {  ?location  wdt:P17  ?country }\n  }\n  SERVICE wikibase:label { bd:serviceParam wikibase:language \"fr,en,de,it\". }\n}";
+exports.instituteDetailsWikidataQuery = instituteDetailsWikidataQuery;
+var fetcherOptionsJsonPublicData = {
+  credentials: 'omit',
+  // try to avoid CORS problems. Data is public so no auth
+  headers: new Headers({
+    Accept: 'application/json'
+  })
 };
-exports.escoParameters = {
-    label: 'ESCO',
-    logo: logic_1.kb.sym('https://ec.europa.eu/esco/portal/static_resource2/images/logo/logo_en.gif'),
-    searchByNameURI: 'https://ec.europa.eu/esco/api/search?language=$(language)&type=occupation&text=$(name)'
-    // endpoint: undefined
-    // returnFormat: 'ESCO',
-    // targetClass: {}
+exports.fetcherOptionsJsonPublicData = fetcherOptionsJsonPublicData;
+var escoParameters = {
+  label: 'ESCO',
+  logo: _logic.kb.sym('https://ec.europa.eu/esco/portal/static_resource2/images/logo/logo_en.gif'),
+  searchByNameURI: 'https://ec.europa.eu/esco/api/search?language=$(language)&type=occupation&text=$(name)' // endpoint: undefined
+  // returnFormat: 'ESCO',
+  // targetClass: {}
+
 };
-exports.dbpediaParameters = {
-    label: 'DBPedia',
-    logo: logic_1.kb.sym('https://upload.wikimedia.org/wikipedia/commons/thumb/7/73/DBpediaLogo.svg/263px-DBpediaLogo.svg.png'),
-    searchByNameQuery: "select distinct ?subject, ?name where {\n    ?subject a $(targetClass); rdfs:label ?name\n    FILTER regex(?name, \"$(name)\", \"i\")\n  } LIMIT $(limit)",
-    endpoint: 'https://dbpedia.org/sparql/'
+exports.escoParameters = escoParameters;
+var dbpediaParameters = {
+  label: 'DBPedia',
+  logo: _logic.kb.sym('https://upload.wikimedia.org/wikipedia/commons/thumb/7/73/DBpediaLogo.svg/263px-DBpediaLogo.svg.png'),
+  searchByNameQuery: "select distinct ?subject, ?name where {\n    ?subject a $(targetClass); rdfs:label ?name\n    FILTER regex(?name, \"$(name)\", \"i\")\n  } LIMIT $(limit)",
+  endpoint: 'https://dbpedia.org/sparql/'
 };
-exports.dbPediaTypeMap = { AcademicInsitution: 'http://umbel.org/umbel/rc/EducationalOrganization' };
-exports.wikidataOutgoingClassMap = {
-    AcademicInsitution: 'http://www.wikidata.org/entity/Q4671277',
-    Enterprise: 'http://www.wikidata.org/entity/Q6881511',
-    Business: 'http://www.wikidata.org/entity/Q4830453',
-    NGO: 'http://www.wikidata.org/entity/Q79913',
-    CharitableOrganization: 'http://www.wikidata.org/entity/Q708676',
-    Insitute: 'http://www.wikidata.org/entity/Q1664720'
+exports.dbpediaParameters = dbpediaParameters;
+var dbPediaTypeMap = {
+  AcademicInsitution: 'http://umbel.org/umbel/rc/EducationalOrganization'
 };
-exports.wikidataParameters = {
-    label: 'WikiData',
-    limit: 3000,
-    logo: logic_1.kb.sym('https://www.wikimedia.org/static/images/project-logos/wikidatawiki.png'),
-    endpoint: 'https://query.wikidata.org/sparql',
-    searchByNameQuery: "SELECT ?subject ?name\n  WHERE {\n    ?klass wdt:P279* $(targetClass) .\n    ?subject wdt:P31 ?klass .\n    ?subject rdfs:label ?name.\n    FILTER regex(?name, \"$(name)\", \"i\")\n  } LIMIT $(limit) ",
-    insitituteDetailsQuery: "CONSTRUCT\n{  wd:Q49108 schema:name ?itemLabel;\n             schema:logo ?logo;\n              schema:logo  ?sealImage;\n             schema:subOrganization  ?subsidiary .\n                 ?subsidiary schema:name ?subsidiaryLabel .\n}\nWHERE\n{\n   wd:Q49108 # rdfs:label ?itemLabel ;\n             wdt:P154 ?logo;\n              wdt:P158  ?sealImage ;\n             wdt:P355  ?subsidiary .\n          #  ?subsidiary rdfs:label ?subsidiaryLabel .\n\n  SERVICE wikibase:label { bd:serviceParam wikibase:language \"[AUTO_LANGUAGE], fr\". }\n}"
+exports.dbPediaTypeMap = dbPediaTypeMap;
+var wikidataOutgoingClassMap = {
+  AcademicInsitution: 'http://www.wikidata.org/entity/Q4671277',
+  Enterprise: 'http://www.wikidata.org/entity/Q6881511',
+  Business: 'http://www.wikidata.org/entity/Q4830453',
+  NGO: 'http://www.wikidata.org/entity/Q79913',
+  CharitableOrganization: 'http://www.wikidata.org/entity/Q708676',
+  Insitute: 'http://www.wikidata.org/entity/Q1664720'
 };
-exports.wikidataIncomingClassMap = {
-    'http://www.wikidata.org/entity/Q15936437': ns.schema('CollegeOrUniversity'),
-    'http://www.wikidata.org/entity/Q1664720': ns.schema('EducationalOrganization'),
-    'http://www.wikidata.org/entity/Q43229': ns.schema('Organization'),
-    'http://www.wikidata.org/entity/Q3918': ns.schema('CollegeOrUniversity'),
-    'http://www.wikidata.org/entity/Q170584': ns.schema('Project'),
-    'http://www.wikidata.org/entity/Q327333': ns.schema('GovernmentOrganization'),
-    'http://www.wikidata.org/entity/Q2221906': ns.schema('Place'),
-    'http://www.wikidata.org/entity/Q167037': ns.schema('Corporation') // Corporation
+exports.wikidataOutgoingClassMap = wikidataOutgoingClassMap;
+var wikidataParameters = {
+  label: 'WikiData',
+  limit: 3000,
+  // Need a high one as very many items, and many languages
+  logo: _logic.kb.sym('https://www.wikimedia.org/static/images/project-logos/wikidatawiki.png'),
+  endpoint: 'https://query.wikidata.org/sparql',
+  searchByNameQuery: "SELECT ?subject ?name\n  WHERE {\n    ?klass wdt:P279* $(targetClass) .\n    ?subject wdt:P31 ?klass .\n    ?subject rdfs:label ?name.\n    FILTER regex(?name, \"$(name)\", \"i\")\n  } LIMIT $(limit) ",
+  // was SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en" }
+  insitituteDetailsQuery: "CONSTRUCT\n{  wd:Q49108 schema:name ?itemLabel;\n             schema:logo ?logo;\n              schema:logo  ?sealImage;\n             schema:subOrganization  ?subsidiary .\n                 ?subsidiary schema:name ?subsidiaryLabel .\n}\nWHERE\n{\n   wd:Q49108 # rdfs:label ?itemLabel ;\n             wdt:P154 ?logo;\n              wdt:P158  ?sealImage ;\n             wdt:P355  ?subsidiary .\n          #  ?subsidiary rdfs:label ?subsidiaryLabel .\n\n  SERVICE wikibase:label { bd:serviceParam wikibase:language \"[AUTO_LANGUAGE], fr\". }\n}"
 };
-exports.variableNameToPredicateMap = {
-    // wikidata:
-    targetClass: ns.rdf('type'),
-    // logo: ns.schema('logo'),
-    sealImage: ns.schema('logo'),
-    // image: ns.schema('image'),   defaults to shema
-    shortName: ns.foaf('nick'),
-    subsidiary: ns.schema('subOrganization'),
-    // dbpedia - :
-    city: ns.vcard('locality'),
-    state: ns.vcard('region'),
-    country: ns.vcard('country-name'),
-    homepage: ns.foaf('homepage'),
-    lat: ns.schema('latitude'),
-    long: ns.schema('longitude')
+exports.wikidataParameters = wikidataParameters;
+var wikidataIncomingClassMap = {
+  'http://www.wikidata.org/entity/Q15936437': ns.schema('CollegeOrUniversity'),
+  // research university
+  'http://www.wikidata.org/entity/Q1664720': ns.schema('EducationalOrganization'),
+  // insitute @@
+  'http://www.wikidata.org/entity/Q43229': ns.schema('Organization'),
+  // research university
+  'http://www.wikidata.org/entity/Q3918': ns.schema('CollegeOrUniversity'),
+  // university
+  'http://www.wikidata.org/entity/Q170584': ns.schema('Project'),
+  // university
+  'http://www.wikidata.org/entity/Q327333': ns.schema('GovernmentOrganization'),
+  // govt agency
+  'http://www.wikidata.org/entity/Q2221906': ns.schema('Place'),
+  // geographic location
+  'http://www.wikidata.org/entity/Q167037': ns.schema('Corporation') // Corporation
+
 };
+exports.wikidataIncomingClassMap = wikidataIncomingClassMap;
+var variableNameToPredicateMap = {
+  // allow other mappings to be added in theory hence var
+  // wikidata:
+  targetClass: ns.rdf('type'),
+  // logo: ns.schema('logo'),
+  sealImage: ns.schema('logo'),
+  // image: ns.schema('image'),   defaults to shema
+  shortName: ns.foaf('nick'),
+  subsidiary: ns.schema('subOrganization'),
+  // dbpedia - :
+  city: ns.vcard('locality'),
+  state: ns.vcard('region'),
+  country: ns.vcard('country-name'),
+  homepage: ns.foaf('homepage'),
+  lat: ns.schema('latitude'),
+  "long": ns.schema('longitude')
+};
+exports.variableNameToPredicateMap = variableNameToPredicateMap;
+
 function bindingToTerm(item) {
-    var typ = item.type.toLowerCase();
-    if (typ === 'uri' || typ === 'iri') {
-        return logic_1.kb.sym(item.value);
-    }
-    else if (typ === 'literal') {
-        if (item['xml:lang']) {
-            return new rdflib_1.Literal(item.value, item['xml:lang']);
-        }
-        else {
-            return new rdflib_1.Literal(item.value);
-        }
-    }
-    else {
-        throw new Error("bindingToTerm: Unexpected type \"".concat(item.type, "\" in sparql binding}"));
+  var typ = item.type.toLowerCase();
+
+  if (typ === 'uri' || typ === 'iri') {
+    return _logic.kb.sym(item.value);
+  } else if (typ === 'literal') {
+    if (item['xml:lang']) {
+      return new _rdflib.Literal(item.value, item['xml:lang']);
+    } else {
+      return new _rdflib.Literal(item.value);
     }
+  } else {
+    throw new Error("bindingToTerm: Unexpected type \"".concat(item.type, "\" in sparql binding}"));
+  }
 }
-exports.bindingToTerm = bindingToTerm;
-function loadFromBindings(kb, solidSubject, bindings, doc, predMap) {
-    if (predMap === void 0) { predMap = exports.variableNameToPredicateMap; }
-    var results = {};
-    debug.log("loadFromBindings:  subject: ".concat(solidSubject));
-    debug.log("                       doc: ".concat(doc));
-    bindings.forEach(function (binding) {
-        for (var key in binding) {
-            var result = binding[key];
-            var combined = JSON.stringify(result); // ( result.type, result.value )
-            results[key] = results[key] || new Set();
-            results[key].add(combined); // remove duplicates
+
+function loadFromBindings(kb, solidSubject, bindings, doc) {
+  var predMap = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : variableNameToPredicateMap;
+  var results = {};
+  debug.log("loadFromBindings:  subject: ".concat(solidSubject));
+  debug.log("                       doc: ".concat(doc));
+  bindings.forEach(function (binding) {
+    for (var key in binding) {
+      var result = binding[key];
+      var combined = JSON.stringify(result); // ( result.type, result.value )
+
+      results[key] = results[key] || new Set();
+      results[key].add(combined); // remove duplicates
+    }
+  });
+
+  var _loop = function _loop(key) {
+    var values = results[key];
+    debug.log("    results ".concat(key, " -> ").concat(values));
+    values.forEach(function (combined) {
+      var result = JSON.parse(combined);
+      var type = result.type,
+          value = result.value;
+      var obj;
+
+      if (type === 'uri') {
+        obj = kb.sym(value);
+      } else if (type === 'literal') {
+        obj = new _rdflib.Literal(value, result.language, result.datatype);
+      } else {
+        throw new Error("loadFromBindings:  unexpected type: ".concat(type));
+      }
+
+      if (key === 'type') {
+        if (wikidataIncomingClassMap[value]) {
+          obj = wikidataIncomingClassMap[value];
+        } else {
+          debug.warn('Unmapped Wikidata Class: ' + value);
+        }
+      } else if (key === 'coordinates') {
+        // const latlong = value // Like 'Point(-71.106111111 42.375)'
+        debug.log('         @@@ hey a point: ' + value); // const regexp = /.*\(([-0-9\.-]*) ([-0-9\.-]*)\)/
+
+        var regexp = /.*\(([-0-9.-]*) ([-0-9.-]*)\)/;
+        var match = regexp.exec(value);
+
+        if (match) {
+          var _float = ns.xsd('float');
+
+          var latitude = new _rdflib.Literal(match[1], null, _float);
+          var longitude = new _rdflib.Literal(match[2], null, _float);
+          kb.add(solidSubject, ns.schema('longitude'), longitude, doc);
+          kb.add(solidSubject, ns.schema('latitude'), latitude, doc);
+        } else {
+          debug.log('Bad coordinates syntax: ' + value);
         }
+      } else {
+        var pred = predMap[key] || ns.schema(key); // fallback to just using schema.org
+
+        kb.add(solidSubject, pred, obj, doc); // @@ deal with non-string and objects
+
+        debug.log("  public data ".concat(pred, " ").concat(obj, "."));
+      }
     });
-    var _loop_1 = function (key) {
-        var values = results[key];
-        debug.log("    results ".concat(key, " -> ").concat(values));
-        values.forEach(function (combined) {
-            var result = JSON.parse(combined);
-            var type = result.type, value = result.value;
-            var obj;
-            if (type === 'uri') {
-                obj = kb.sym(value);
-            }
-            else if (type === 'literal') {
-                obj = new rdflib_1.Literal(value, result.language, result.datatype);
-            }
-            else {
-                throw new Error("loadFromBindings:  unexpected type: ".concat(type));
-            }
-            if (key === 'type') {
-                if (exports.wikidataIncomingClassMap[value]) {
-                    obj = exports.wikidataIncomingClassMap[value];
-                }
-                else {
-                    debug.warn('Unmapped Wikidata Class: ' + value);
-                }
-            }
-            else if (key === 'coordinates') {
-                // const latlong = value // Like 'Point(-71.106111111 42.375)'
-                debug.log('         @@@ hey a point: ' + value);
-                // const regexp = /.*\(([-0-9\.-]*) ([-0-9\.-]*)\)/
-                var regexp = /.*\(([-0-9.-]*) ([-0-9.-]*)\)/;
-                var match = regexp.exec(value);
-                if (match) {
-                    var float = ns.xsd('float');
-                    var latitude = new rdflib_1.Literal(match[1], null, float);
-                    var longitude = new rdflib_1.Literal(match[2], null, float);
-                    kb.add(solidSubject, ns.schema('longitude'), longitude, doc);
-                    kb.add(solidSubject, ns.schema('latitude'), latitude, doc);
-                }
-                else {
-                    debug.log('Bad coordinates syntax: ' + value);
-                }
-            }
-            else {
-                var pred = predMap[key] || ns.schema(key); // fallback to just using schema.org
-                kb.add(solidSubject, pred, obj, doc); // @@ deal with non-string and objects
-                debug.log("  public data ".concat(pred, " ").concat(obj, "."));
-            }
-        });
-    };
-    for (var key in results) {
-        _loop_1(key);
-    }
+  };
+
+  for (var key in results) {
+    _loop(key);
+  }
 }
-exports.loadFromBindings = loadFromBindings;
 /* ESCO sopecific
 */
+
+
 function ESCOResultToBindings(json) {
-    var results = json._embedded.results; // Array
-    var bindings = results.map(function (result) {
-        var name = result.title;
-        var uri = result.uri; // like http://data.europa.eu/esco/occupation/57af9090-55b4-4911-b2d0-86db01c00b02
-        return { name: { value: name, type: 'literal' }, subject: { type: 'IRI', value: uri } }; // simulate SPARQL bindings
-    });
-    return bindings;
+  var results = json._embedded.results; // Array
+
+  var bindings = results.map(function (result) {
+    var name = result.title;
+    var uri = result.uri; // like http://data.europa.eu/esco/occupation/57af9090-55b4-4911-b2d0-86db01c00b02
+
+    return {
+      name: {
+        value: name,
+        type: 'literal'
+      },
+      subject: {
+        type: 'IRI',
+        value: uri
+      }
+    }; // simulate SPARQL bindings
+  });
+  return bindings;
 }
-exports.ESCOResultToBindings = ESCOResultToBindings;
 /*  Query all entities of given class and partially matching name
 */
-function queryESCODataByName(filter, theClass, queryTarget) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function () {
-        var limit, queryURI, response, text, json;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (!queryTarget.searchByNameURI)
-                        throw new Error('Missing queryTarget.searchByNameURI on queryESCODataByName');
-                    limit = queryTarget.limit || exports.AUTOCOMPLETE_LIMIT;
-                    queryURI = queryTarget.searchByNameURI
-                        .replace('$(name)', filter)
-                        .replace('$(limit)', '' + limit)
-                        .replace('$(targetClass)', theClass.toNT());
-                    debug.log('Querying ESCO data - uri: ' + queryURI);
-                    return [4 /*yield*/, ((_a = logic_1.kb.fetcher) === null || _a === void 0 ? void 0 : _a.webOperation('GET', queryURI, exports.fetcherOptionsJsonPublicData))];
-                case 1:
-                    response = _b.sent();
-                    text = (response === null || response === void 0 ? void 0 : response.responseText) || '';
-                    debug.log('    Query result  text' + text.slice(0, 500) + '...');
-                    if (text.length === 0)
-                        throw new Error('Wot no text back from ESCO query ' + queryURI);
-                    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 [2 /*return*/, ESCOResultToBindings(json)];
-            }
-        });
-    });
+
+
+function queryESCODataByName(_x, _x2, _x3) {
+  return _queryESCODataByName.apply(this, arguments);
 }
-exports.queryESCODataByName = queryESCODataByName;
 /* Cope ithe syntax probelm in wikidata timeout responses
 *
 * Wikidata bug: https://phabricator.wikimedia.org/T283962
 * This will not be needed whn that  WDQS bug fixed.
 * This is aptured in https://github.com/solid/solid-ui/issues/403
 */
+
+
+function _queryESCODataByName() {
+  _queryESCODataByName = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(filter, theClass, queryTarget) {
+    var _kb$fetcher;
+
+    var limit, queryURI, response, text, json;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (queryTarget.searchByNameURI) {
+              _context.next = 2;
+              break;
+            }
+
+            throw new Error('Missing queryTarget.searchByNameURI on queryESCODataByName');
+
+          case 2:
+            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;
+            return (_kb$fetcher = _logic.kb.fetcher) === null || _kb$fetcher === void 0 ? void 0 : _kb$fetcher.webOperation('GET', queryURI, fetcherOptionsJsonPublicData);
+
+          case 7:
+            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;
+              break;
+            }
+
+            throw new Error('Wot no text back from ESCO query ' + queryURI);
+
+          case 12:
+            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 "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _queryESCODataByName.apply(this, arguments);
+}
+
 function fixWikidataJSON(str) {
-    var syntaxProblem = str.indexOf('SPARQL-QUERY');
-    if (syntaxProblem < 0)
-        return str;
-    // console.log('@@ fixWikidataJSON FIXING')
-    debug.warn('  ### Fixing JSON with wikidata error code injection ' + str.slice(syntaxProblem, syntaxProblem + 200));
-    var goodness = str.lastIndexOf('}, {');
-    return str.slice(0, goodness) + ' } ] } } '; // Close binding, array, bindings, results, root object
+  var syntaxProblem = str.indexOf('SPARQL-QUERY');
+  if (syntaxProblem < 0) return str; // console.log('@@ fixWikidataJSON FIXING')
+
+  debug.warn('  ### Fixing JSON with wikidata error code injection ' + str.slice(syntaxProblem, syntaxProblem + 200));
+  var goodness = str.lastIndexOf('}, {');
+  return str.slice(0, goodness) + ' } ] } } '; // Close binding, array, bindings, results, root object
 }
 /*  Query all entities of given class and partially matching name
 */
-function queryPublicDataByName(filter, theClass, languages, queryTarget) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function () {
-        function substituteStrings(template) {
-            var limit = queryTarget.limit || exports.AUTOCOMPLETE_LIMIT;
-            var u1 = template.replace('$(name)', filter)
-                .replace('$(limit)', '' + limit)
-                .replace('$(language)', language);
-            return u1.replace('$(targetClass)', theClass.toNT());
-        }
-        var languagePrefs, language, sparql, queryURI, response, err_1, text, text2, json, bindings;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (!theClass) {
-                        throw new Error('queryPublicDataByName: No class provided');
-                    }
-                    return [4 /*yield*/, (0, language_1.getPreferredLanguages)()];
-                case 1:
-                    languagePrefs = (_b.sent()) || language_1.defaultPreferredLanguages;
-                    language = languagePrefs[0] || 'en';
-                    if (!queryTarget.searchByNameQuery) return [3 /*break*/, 2];
-                    sparql = substituteStrings(queryTarget.searchByNameQuery);
-                    debug.log('Querying public data - sparql: ' + sparql);
-                    return [2 /*return*/, queryPublicDataSelect(sparql, queryTarget)];
-                case 2:
-                    if (!queryTarget.searchByNameURI) return [3 /*break*/, 7];
-                    queryURI = substituteStrings(queryTarget.searchByNameURI);
-                    response = void 0;
-                    _b.label = 3;
-                case 3:
-                    _b.trys.push([3, 5, , 6]);
-                    return [4 /*yield*/, ((_a = logic_1.kb.fetcher) === null || _a === void 0 ? void 0 : _a.webOperation('GET', queryURI, exports.fetcherOptionsJsonPublicData))];
-                case 4:
-                    response = _b.sent();
-                    return [3 /*break*/, 6];
-                case 5:
-                    err_1 = _b.sent();
-                    throw new Error("Exception when trying to fetch ".concat(queryURI, " \n ").concat(err_1));
-                case 6:
-                    text = response.responseText || '' // ts
-                    ;
-                    if (response.status !== 200) {
-                        throw new Error("HTTP error status ".concat(response.status, " trying to fetch ").concat(queryURI, " "));
-                    }
-                    debug.log('    Query result  text' + text.slice(0, 500) + '...');
-                    if (text.length === 0)
-                        throw new Error('queryPublicDataByName: No text back from public data query ' + queryURI);
-                    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) {
-                        debug.log('      Looks like ESCO');
-                        bindings = ESCOResultToBindings(json);
-                        return [2 /*return*/, bindings];
-                    }
-                    else {
-                        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)));
-                    }
-                    return [3 /*break*/, 8];
-                case 7: throw new Error('Query source must have either rest API or SPARQL endpoint.');
-                case 8: return [2 /*return*/];
-            }
-        });
-    });
+
+
+function queryPublicDataByName(_x4, _x5, _x6, _x7) {
+  return _queryPublicDataByName.apply(this, arguments);
 }
-exports.queryPublicDataByName = queryPublicDataByName;
 /* Query a database using SPARQL SELECT
 */
-function queryPublicDataSelect(sparql, queryTarget) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function () {
-        var myUrlWithParams, queryURI, headers, options, response, text, text2, json, bindings;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (!queryTarget.endpoint)
-                        throw new Error('Missing queryTarget.endpoint required for queryPublicDataSelect');
-                    myUrlWithParams = new URL(queryTarget.endpoint);
-                    myUrlWithParams.searchParams.append('query', sparql);
-                    queryURI = myUrlWithParams.href;
-                    debug.log(' queryPublicDataSelect uri: ' + queryURI);
-                    headers = new Headers();
-                    headers.append('Accept', 'application/json');
-                    options = {
-                        credentials: 'omit',
-                        headers: headers
-                    };
-                    return [4 /*yield*/, ((_a = logic_1.kb.fetcher) === null || _a === void 0 ? void 0 : _a.webOperation('GET', queryURI, options))];
-                case 1:
-                    response = _b.sent();
-                    text = (response === null || response === void 0 ? void 0 : response.responseText) || '';
-                    if (text.length === 0)
-                        throw new Error('No text back from query ' + queryURI);
-                    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 [2 /*return*/, bindings];
+
+
+function _queryPublicDataByName() {
+  _queryPublicDataByName = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(filter, theClass, languages, queryTarget) {
+    var substituteStrings, languagePrefs, language, sparql, queryURI, response, _kb$fetcher2, text, text2, json, bindings;
+
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            substituteStrings = function _substituteStrings(template) {
+              var limit = queryTarget.limit || AUTOCOMPLETE_LIMIT;
+              var u1 = template.replace('$(name)', filter).replace('$(limit)', '' + limit).replace('$(language)', language);
+              return u1.replace('$(targetClass)', theClass.toNT());
+            };
+
+            if (theClass) {
+              _context2.next = 3;
+              break;
             }
-        });
-    });
+
+            throw new Error('queryPublicDataByName: No class provided');
+
+          case 3:
+            _context2.next = 5;
+            return (0, _language.getPreferredLanguages)();
+
+          case 5:
+            _context2.t0 = _context2.sent;
+
+            if (_context2.t0) {
+              _context2.next = 8;
+              break;
+            }
+
+            _context2.t0 = _language.defaultPreferredLanguages;
+
+          case 8:
+            languagePrefs = _context2.t0;
+            language = languagePrefs[0] || 'en';
+
+            if (!queryTarget.searchByNameQuery) {
+              _context2.next = 16;
+              break;
+            }
+
+            sparql = substituteStrings(queryTarget.searchByNameQuery);
+            debug.log('Querying public data - sparql: ' + sparql);
+            return _context2.abrupt("return", queryPublicDataSelect(sparql, queryTarget));
+
+          case 16:
+            if (!queryTarget.searchByNameURI) {
+              _context2.next = 46;
+              break;
+            }
+
+            // not sparql - random API
+            queryURI = substituteStrings(queryTarget.searchByNameURI);
+            _context2.prev = 18;
+            _context2.next = 21;
+            return (_kb$fetcher2 = _logic.kb.fetcher) === null || _kb$fetcher2 === void 0 ? void 0 : _kb$fetcher2.webOperation('GET', queryURI, fetcherOptionsJsonPublicData);
+
+          case 21:
+            response = _context2.sent;
+            _context2.next = 27;
+            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:
+            text = response.responseText || ''; // ts
+
+            if (!(response.status !== 200)) {
+              _context2.next = 30;
+              break;
+            }
+
+            throw new Error("HTTP error status ".concat(response.status, " trying to fetch ").concat(queryURI, " "));
+
+          case 30:
+            debug.log('    Query result  text' + text.slice(0, 500) + '...');
+
+            if (!(text.length === 0)) {
+              _context2.next = 33;
+              break;
+            }
+
+            throw new Error('queryPublicDataByName: No text back from public data query ' + queryURI);
+
+          case 33:
+            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;
+              break;
+            }
+
+            debug.log('      Looks like ESCO');
+            bindings = ESCOResultToBindings(json);
+            return _context2.abrupt("return", bindings);
+
+          case 42:
+            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;
+            break;
+
+          case 46:
+            throw new Error('Query source must have either rest API or SPARQL endpoint.');
+
+          case 47:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2, null, [[18, 24]]);
+  }));
+  return _queryPublicDataByName.apply(this, arguments);
+}
+
+function queryPublicDataSelect(_x8, _x9) {
+  return _queryPublicDataSelect.apply(this, arguments);
 }
-exports.queryPublicDataSelect = queryPublicDataSelect;
 /* Load from a database using SPARQL CONSTRUCT
 */
-function queryPublicDataConstruct(sparql, pubicId, queryTarget) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function () {
-        var myUrlWithParams, queryURI, headers, options, response, text, report;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    debug.log('queryPublicDataConstruct: sparql:', sparql);
-                    if (!queryTarget.endpoint)
-                        throw new Error('Missing queryTarget.endpoint required for queryPublicDataConstruct');
-                    myUrlWithParams = new URL(queryTarget.endpoint);
-                    myUrlWithParams.searchParams.append('query', sparql);
-                    queryURI = myUrlWithParams.href;
-                    debug.log(' queryPublicDataConstruct uri: ' + queryURI);
-                    headers = new Headers();
-                    headers.append('Accept', 'text/turtle');
-                    options = {
-                        credentials: 'omit',
-                        headers: headers // ({ Accept: 'text/turtle' } as Headers)
-                    };
-                    return [4 /*yield*/, ((_a = logic_1.kb.fetcher) === null || _a === void 0 ? void 0 : _a.webOperation('GET', queryURI, options))];
-                case 1:
-                    response = _b.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)
-                        throw new Error('queryPublicDataConstruct: No text back from construct query:' + queryURI);
-                    (0, rdflib_1.parse)(text, logic_1.kb, pubicId.uri, 'text/turtle');
-                    return [2 /*return*/];
+
+
+function _queryPublicDataSelect() {
+  _queryPublicDataSelect = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(sparql, queryTarget) {
+    var _kb$fetcher3;
+
+    var myUrlWithParams, queryURI, headers, options, response, text, text2, json, bindings;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            if (queryTarget.endpoint) {
+              _context3.next = 2;
+              break;
             }
-        });
-    });
-}
-exports.queryPublicDataConstruct = queryPublicDataConstruct;
-function loadPublicDataThing(kb, subject, publicDataID) {
-    return __awaiter(this, void 0, void 0, function () {
-        var iDToFetch, headers;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!publicDataID.uri.startsWith('https://dbpedia.org/resource/')) return [3 /*break*/, 1];
-                    return [2 /*return*/, getDbpediaDetails(kb, subject, publicDataID)];
-                case 1:
-                    if (!publicDataID.uri.match(/^https?:\/\/www\.wikidata\.org\/entity\/.*/)) return [3 /*break*/, 3];
-                    // const QId = publicDataID.uri.split('/')[4]
-                    // const dataURI = `http://www.wikidata.org/wiki/Special:EntityData/${QId}.ttl`
-                    // In fact loading the data URI gives much too much irrelevant data, from wikidata, so we do a query.
-                    return [4 /*yield*/, getWikidataDetails(kb, subject, publicDataID)
-                        // await getWikidataLocation(kb, subject, publicDataID)  -- should get that in the details query now
-                    ];
-                case 2:
-                    // const QId = publicDataID.uri.split('/')[4]
-                    // const dataURI = `http://www.wikidata.org/wiki/Special:EntityData/${QId}.ttl`
-                    // In fact loading the data URI gives much too much irrelevant data, from wikidata, so we do a query.
-                    _a.sent();
-                    return [3 /*break*/, 4];
-                case 3:
-                    iDToFetch = publicDataID.uri.startsWith('http:')
-                        ? kb.sym('https:' + publicDataID.uri.slice(5))
-                        : publicDataID;
-                    headers = new Headers();
-                    headers.append('Accept', 'text/turtle');
-                    return [2 /*return*/, kb.fetcher.load(iDToFetch, {
-                            credentials: 'omit',
-                            headers: headers
-                        })];
-                case 4: return [2 /*return*/];
+
+            throw new Error('Missing queryTarget.endpoint required for queryPublicDataSelect');
+
+          case 2:
+            myUrlWithParams = new URL(queryTarget.endpoint);
+            myUrlWithParams.searchParams.append('query', sparql);
+            queryURI = myUrlWithParams.href;
+            debug.log(' queryPublicDataSelect uri: ' + queryURI);
+            headers = new Headers();
+            headers.append('Accept', 'application/json');
+            options = {
+              credentials: 'omit',
+              // CORS - as we know it is public
+              headers: headers
+            };
+            _context3.next = 11;
+            return (_kb$fetcher3 = _logic.kb.fetcher) === null || _kb$fetcher3 === void 0 ? void 0 : _kb$fetcher3.webOperation('GET', queryURI, options);
+
+          case 11:
+            response = _context3.sent;
+            text = (response === null || response === void 0 ? void 0 : response.responseText) || '';
+
+            if (!(text.length === 0)) {
+              _context3.next = 15;
+              break;
             }
-        });
-    });
+
+            throw new Error('No text back from query ' + queryURI);
+
+          case 15:
+            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 "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+  return _queryPublicDataSelect.apply(this, arguments);
 }
-exports.loadPublicDataThing = loadPublicDataThing;
-function getWikidataDetails(kb, solidSubject, publicDataID) {
-    return __awaiter(this, void 0, void 0, function () {
-        var subjRegexp, sparql;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    subjRegexp = /wd:Q49108/g;
-                    sparql = exports.instituteDetailsWikidataQuery.replace(subjRegexp, publicDataID.toNT());
-                    return [4 /*yield*/, queryPublicDataConstruct(sparql, publicDataID, exports.wikidataParameters)];
-                case 1:
-                    _a.sent();
-                    debug.log('getWikidataDetails: loaded.', publicDataID);
-                    return [2 /*return*/];
-            }
-        });
-    });
+
+function queryPublicDataConstruct(_x10, _x11, _x12) {
+  return _queryPublicDataConstruct.apply(this, arguments);
 }
-exports.getWikidataDetails = getWikidataDetails;
-function getWikidataDetailsOld(kb, solidSubject, publicDataID) {
-    return __awaiter(this, void 0, void 0, function () {
-        var sparql, bindings;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                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());
-                    return [4 /*yield*/, queryPublicDataSelect(sparql, exports.wikidataParameters)];
-                case 1:
-                    bindings = _a.sent();
-                    loadFromBindings(kb, publicDataID, bindings, publicDataID.doc()); // arg2 was solidSubject
-                    return [2 /*return*/];
+
+function _queryPublicDataConstruct() {
+  _queryPublicDataConstruct = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(sparql, pubicId, queryTarget) {
+    var _kb$fetcher4;
+
+    var myUrlWithParams, queryURI, headers, options, response, text, report;
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            debug.log('queryPublicDataConstruct: sparql:', sparql);
+
+            if (queryTarget.endpoint) {
+              _context4.next = 3;
+              break;
             }
-        });
-    });
-}
-exports.getWikidataDetailsOld = getWikidataDetailsOld;
-function getWikidataLocation(kb, solidSubject, publicDataID) {
-    return __awaiter(this, void 0, void 0, function () {
-        var sparql, bindings;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                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);
-                    return [4 /*yield*/, queryPublicDataSelect(sparql, exports.wikidataParameters)];
-                case 1:
-                    bindings = _a.sent();
-                    debug.log(' location query bindings:', bindings);
-                    loadFromBindings(kb, publicDataID, bindings, publicDataID.doc()); // was solidSubject
-                    return [2 /*return*/];
+
+            throw new Error('Missing queryTarget.endpoint required for queryPublicDataConstruct');
+
+          case 3:
+            myUrlWithParams = new URL(queryTarget.endpoint);
+            myUrlWithParams.searchParams.append('query', sparql);
+            queryURI = myUrlWithParams.href;
+            debug.log(' queryPublicDataConstruct uri: ' + queryURI);
+            headers = new Headers();
+            headers.append('Accept', 'text/turtle');
+            options = {
+              credentials: 'omit',
+              // CORS // @tsc pain
+              headers: headers // ({ Accept: 'text/turtle' } as Headers)
+
+            };
+            _context4.next = 12;
+            return (_kb$fetcher4 = _logic.kb.fetcher) === null || _kb$fetcher4 === void 0 ? void 0 : _kb$fetcher4.webOperation('GET', queryURI, options);
+
+          case 12:
+            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;
+              break;
             }
-        });
-    });
+
+            throw new Error('queryPublicDataConstruct: No text back from construct query:' + queryURI);
+
+          case 18:
+            (0, _rdflib.parse)(text, _logic.kb, pubicId.uri, 'text/turtle');
+
+          case 19:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4);
+  }));
+  return _queryPublicDataConstruct.apply(this, arguments);
 }
-exports.getWikidataLocation = getWikidataLocation;
-function getDbpediaDetails(kb, solidSubject, publicDataID) {
-    return __awaiter(this, void 0, void 0, function () {
-        var sparql, bindings;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    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   }");
-                    return [4 /*yield*/, queryPublicDataSelect(sparql, exports.dbpediaParameters)];
-                case 1:
-                    bindings = _a.sent();
-                    loadFromBindings(kb, publicDataID, bindings, publicDataID.doc());
-                    debug.log('Finished getDbpediaDetails.');
-                    return [2 /*return*/];
+
+function loadPublicDataThing(_x13, _x14, _x15) {
+  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) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            if (!publicDataID.uri.startsWith('https://dbpedia.org/resource/')) {
+              _context5.next = 4;
+              break;
             }
-        });
-    });
+
+            return _context5.abrupt("return", getDbpediaDetails(kb, subject, publicDataID));
+
+          case 4:
+            if (!publicDataID.uri.match(/^https?:\/\/www\.wikidata\.org\/entity\/.*/)) {
+              _context5.next = 9;
+              break;
+            }
+
+            _context5.next = 7;
+            return getWikidataDetails(kb, subject, publicDataID);
+
+          case 7:
+            _context5.next = 13;
+            break;
+
+          case 9:
+            iDToFetch = publicDataID.uri.startsWith('http:') ? kb.sym('https:' + publicDataID.uri.slice(5)) : publicDataID;
+            headers = new Headers();
+            headers.append('Accept', 'text/turtle');
+            return _context5.abrupt("return", kb.fetcher.load(iDToFetch, {
+              credentials: 'omit',
+              headers: headers
+            }));
+
+          case 13:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5);
+  }));
+  return _loadPublicDataThing.apply(this, arguments);
+}
+
+function getWikidataDetails(_x16, _x17, _x18) {
+  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) {
+      while (1) {
+        switch (_context6.prev = _context6.next) {
+          case 0:
+            subjRegexp = /wd:Q49108/g;
+            sparql = instituteDetailsWikidataQuery.replace(subjRegexp, publicDataID.toNT());
+            _context6.next = 4;
+            return queryPublicDataConstruct(sparql, publicDataID, wikidataParameters);
+
+          case 4:
+            debug.log('getWikidataDetails: loaded.', publicDataID);
+
+          case 5:
+          case "end":
+            return _context6.stop();
+        }
+      }
+    }, _callee6);
+  }));
+  return _getWikidataDetails.apply(this, arguments);
+}
+
+function getWikidataDetailsOld(_x19, _x20, _x21) {
+  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) {
+      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;
+            return queryPublicDataSelect(sparql, wikidataParameters);
+
+          case 3:
+            bindings = _context7.sent;
+            loadFromBindings(kb, publicDataID, bindings, publicDataID.doc()); // arg2 was solidSubject
+
+          case 5:
+          case "end":
+            return _context7.stop();
+        }
+      }
+    }, _callee7);
+  }));
+  return _getWikidataDetailsOld.apply(this, arguments);
+}
+
+function getWikidataLocation(_x22, _x23, _x24) {
+  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) {
+      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;
+            return queryPublicDataSelect(sparql, wikidataParameters);
+
+          case 4:
+            bindings = _context8.sent;
+            debug.log(' location query bindings:', bindings);
+            loadFromBindings(kb, publicDataID, bindings, publicDataID.doc()); // was solidSubject
+
+          case 7:
+          case "end":
+            return _context8.stop();
+        }
+      }
+    }, _callee8);
+  }));
+  return _getWikidataLocation.apply(this, arguments);
+}
+
+function getDbpediaDetails(_x25, _x26, _x27) {
+  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) {
+      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;
+            return queryPublicDataSelect(sparql, dbpediaParameters);
+
+          case 3:
+            bindings = _context9.sent;
+            loadFromBindings(kb, publicDataID, bindings, publicDataID.doc());
+            debug.log('Finished getDbpediaDetails.');
+
+          case 6:
+          case "end":
+            return _context9.stop();
+        }
+      }
+    }, _callee9);
+  }));
+  return _getDbpediaDetails.apply(this, arguments);
 }
-exports.getDbpediaDetails = getDbpediaDetails;
 //# sourceMappingURL=publicData.js.map