contacts-pane 2.6.0 → 2.6.1-10be7ce5

package/.github/workflows/ci.yml

@@ -3,10 +3,11 @@ name: CI
 on:
   push:
     branches:
-      - main
+      - "**"
   pull_request:
     branches:
-      - main
+      - "**"  
+  workflow_dispatch:
 
 jobs:
   test:
@@ -16,7 +17,7 @@ jobs:
         node-version:
           - 12.x
           - 14.x
-          - 15.x
+          - 16.x
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}

package/babel.config.js

@@ -0,0 +1,13 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        targets: {
+          node: 'current'
+        }
+      }
+    ],
+    '@babel/preset-typescript'
+  ]
+}

package/contactLogic.js

@@ -1,12 +1,13 @@
 // Logic for solid contacts
 
 import * as UI from 'solid-ui'
+import { store } from 'solid-logic'
 import { getPersonas } from './webidControl'
 
 const ns = UI.ns
 const $rdf = UI.rdf
 const utils = UI.utils
-const kb = UI.store
+const kb = store
 const updater = kb.updater
 
 /** Perform updates on more than one document   @@ Move to rdflib!

package/contactsPane.js

@@ -14,11 +14,12 @@ to change its state according to an ontology, comment on it, etc.
 */
 /* global alert, confirm */
 
+import { authn } from 'solid-logic'
+import { addPersonToGroup, saveNewContact, saveNewGroup } from './contactLogic'
 import * as UI from 'solid-ui'
-import { toolsPane } from './toolsPane'
 import { mintNewAddressBook } from './mintNewAddressBook'
 import { renderIndividual } from './individual'
-import { saveNewContact, saveNewGroup, addPersonToGroup } from './contactLogic'
+import { toolsPane } from './toolsPane'
 
 // const $rdf = UI.rdf
 const ns = UI.ns
@@ -63,7 +64,7 @@ export default {
 
     //  Reproduction: Spawn a new instance of this app
     function newAddressBookButton (thisAddressBook) {
-      return UI.authn.newAppInstance(
+      return UI.login.newAppInstance(
         dom,
         { noun: 'address book', appPathSegment: 'contactorator.timbl.com' },
         function (ws, newBase) {
@@ -79,7 +80,7 @@ export default {
     const dom = dataBrowserContext.dom
     const kb = dataBrowserContext.session.store
     const div = dom.createElement('div')
-    const me = UI.authn.currentUser() // If already logged on
+    const me = authn.currentUser() // If already logged on
 
     UI.aclControl.preventBrowserDropEvents(dom) // protect drag and drop
 
@@ -96,7 +97,7 @@ export default {
 
       const t = kb.findTypeURIs(subject)
 
-      let me = UI.authn.currentUser()
+      let me = authn.currentUser()
 
       const context = {
         target: subject,
@@ -777,7 +778,7 @@ export default {
         const container = dom.createElement('div')
         newContactButton.setAttribute('type', 'button')
         if (!me) newContactButton.setAttribute('disabled', 'true')
-        UI.authn.checkUser().then(webId => {
+        authn.checkUser().then(webId => {
           if (webId) {
             me = webId
             newContactButton.removeAttribute('disabled')
@@ -793,7 +794,7 @@ export default {
         const container2 = dom.createElement('div')
         newOrganizationButton.setAttribute('type', 'button')
         if (!me) newOrganizationButton.setAttribute('disabled', 'true')
-        UI.authn.checkUser().then(webId => {
+        authn.checkUser().then(webId => {
           if (webId) {
             me = webId
             newOrganizationButton.removeAttribute('disabled')
@@ -860,7 +861,7 @@ export default {
         //          Render a Group instance
       } else if (t[ns.vcard('Group').uri]) {
         // If we have a main address book, then render this group as a guest group within it
-        UI.authn
+        UI.login
           .findAppInstances(context, ns.vcard('AddressBook'))
           .then(function (context) {
             const addressBooks = context.instances
@@ -888,12 +889,12 @@ export default {
         )
       }
 
-      me = UI.authn.currentUser()
+      me = authn.currentUser()
       if (!me) {
         console.log(
           '(You do not have your Web Id set. Sign in or sign up to make changes.)'
         )
-        UI.authn.logInLoadProfile(context).then(
+        UI.login.ensureLoadedProfile(context).then(
           context => {
             console.log('Logged in as ' + context.me)
             me = context.me

package/dev/context.ts

@@ -0,0 +1,20 @@
+import { DataBrowserContext, PaneRegistry } from "pane-registry";
+import { LiveStore } from "rdflib"
+import { store, solidLogicSingleton } from "solid-logic";
+import { default as contactsPane } from "../contactsPane";
+
+export const context: DataBrowserContext = {
+  session: {
+    store: store as LiveStore,
+    paneRegistry: {
+      byName: (name: string) => {
+        return contactsPane
+      }
+    } as PaneRegistry,
+    logic: solidLogicSingleton
+  },
+  dom: document,
+  getOutliner: () => null,
+};
+
+export const fetcher = store.fetcher;

package/dev/index.html

@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8"/>
+    <title>contacts-pane dev server</title>
+    <style>
+        body {
+            margin: 0;
+            font-family: sans-serif;
+        }
+        h1 {
+            padding: 0.5rem;
+            margin: 0;
+            color: #666;
+        }
+        #loginBanner {
+            display: grid;
+            padding: 0.5rem;
+            grid-gap: 1rem;
+            grid-auto-flow: column;
+            justify-content: flex-start;
+            align-items: center;
+        }
+        .banner {
+            margin: 0;
+            height: 1rem;
+            width: 100%;
+            background: repeating-linear-gradient(
+                    -45deg,
+                    #ffffff,
+                    #d8d9d5 20px,
+                    #d41717 20px,
+                    #984646 40px
+            );
+        }
+    </style>
+</head>
+<body>
+<h1>pane under development</h1>
+<div>
+    <div id="webId"></div>
+  </div>
+<div id="loginBanner"></div>
+<div class="banner"></div>
+<div id="app">Rendering...</div>
+</body>
+</html>

package/dev/index.ts

@@ -0,0 +1,34 @@
+import { sym } from "rdflib";
+import { default as pane } from "../contactsPane"
+import { context, fetcher } from "./context"
+import { login } from "solid-ui"
+import { authn } from "solid-logic"
+
+const loginBanner = document.getElementById("loginBanner");
+const webId = document.getElementById("webId");
+
+loginBanner.appendChild(login.loginStatusBox(document, null, {}));
+
+async function finishLogin() {
+  await authn.authSession.handleIncomingRedirect();
+  const session = authn.authSession;
+  if (session.info.isLoggedIn) {
+    // Update the page with the status.
+    webId.innerHTML = "Logged in as: " + authn.currentUser().uri;
+  } else {
+    webId.innerHTML = "";
+  }
+}
+
+// const webIdToShow = "https://angelo.veltens.org/profile/card#me";
+const webIdToShow = "https://testingsolidos.solidcommunity.net/profile/card#me";
+// const addressBookToShow = "https://sstratsianis.solidcommunity.net/private/Friends/index.ttl#this"
+const addressBookToShow = "https://timbl.com/timbl/Public/Test/Contacts/index.ttl#this";
+
+finishLogin().then(() => { fetcher.load(webIdToShow).then(() => {
+  fetcher.load(addressBookToShow).then(() => {
+    const app = pane.render(sym(addressBookToShow), context);
+    document.getElementById("app").replaceWith(app)
+  })
+})
+})

package/groupMembershipControl.js

@@ -7,7 +7,6 @@ const ns = UI.ns
 // const buttons = UI.buttonsn  no
 // const widgets = UI.widgets
 const utils = UI.utils
-// const kb = UI.store
 // const style = UI.style
 
 // Groups the person is a member of

package/individual.js

@@ -1,4 +1,5 @@
 import * as UI from 'solid-ui'
+import { authn, store } from 'solid-logic'
 import { renderMugshotGallery } from './mugshotGallery'
 import { renderWebIdControl, renderPublicIdControl } from './webidControl'
 import { renderGroupMemberships } from './groupMembershipControl.js'
@@ -7,7 +8,7 @@ import VCARD_ONTOLOGY_TEXT from './lib/vcard.js'
 
 const $rdf = UI.rdf
 const ns = UI.ns
-const kb = UI.store
+const kb = store
 const style = UI.style
 
 export function loadTurtleText (kb, thing, text) {
@@ -68,7 +69,7 @@ export async function renderIndividual (dom, div, subject, dataBrowserContext) {
 
   div.style = style.paneDivStyle || 'padding: 0.5em 1.5em 1em 1.5em;'
 
-  UI.authn.checkUser() // kick off async operation @@@ use async version
+  authn.checkUser() // kick off async operation @@@ use async version
 
   div.appendChild(renderMugshotGallery(dom, subject))
 

package/jest.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  testEnvironment: 'jsdom',
+  setupFilesAfterEnv: ['./jest.setup.ts'],
+  transformIgnorePatterns: ['/node_modules/(?!lit-html).+\\.js']
+}

package/jest.setup.ts

@@ -0,0 +1,4 @@
+import "@testing-library/jest-dom";
+import fetchMock from "jest-fetch-mock";
+
+fetchMock.enableMocks();

package/lib/autocompleteBar.js

@@ -36,18 +36,18 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderAutocompleteControl = void 0;
+var solid_logic_1 = require("solid-logic");
 var solid_ui_1 = require("solid-ui");
-var UI = require("solid-ui");
 var autocompletePicker_1 = require("./autocompletePicker"); // dbpediaParameters
 var publicData_1 = require("./publicData");
 var WEBID_NOUN = 'Solid ID';
-var kb = solid_ui_1.store;
+var kb = solid_logic_1.store;
 var AUTOCOMPLETE_THRESHOLD = 4; // don't check until this many characters typed
 var AUTOCOMPLETE_ROWS = 12; // 20?
-var GREEN_PLUS = UI.icons.iconBase + 'noun_34653_green.svg';
-var SEARCH_ICON = UI.icons.iconBase + 'noun_Search_875351.svg';
+var GREEN_PLUS = solid_ui_1.icons.iconBase + 'noun_34653_green.svg';
+var SEARCH_ICON = solid_ui_1.icons.iconBase + 'noun_Search_875351.svg';
 function renderAutocompleteControl(dom, person, options, addOneIdAndRefresh) {
     return __awaiter(this, void 0, void 0, function () {
         function autoCompleteDone(object, _name) {
@@ -65,7 +65,7 @@ function renderAutocompleteControl(dom, person, options, addOneIdAndRefresh) {
                 var webid;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, solid_ui_1.widgets.askName(dom, solid_ui_1.store, creationArea, solid_ui_1.ns.vcard('url'), null, WEBID_NOUN)];
+                        case 0: return [4 /*yield*/, solid_ui_1.widgets.askName(dom, solid_logic_1.store, creationArea, solid_ui_1.ns.vcard('url'), null, WEBID_NOUN)];
                         case 1:
                             webid = _a.sent();
                             if (!webid) {
@@ -134,10 +134,10 @@ function renderAutocompleteControl(dom, person, options, addOneIdAndRefresh) {
             queryParams = options.queryParameters || publicData_1.wikidataParameters;
             acceptButton = solid_ui_1.widgets.continueButton(dom);
             cancelButton = solid_ui_1.widgets.cancelButton(dom, removeDecorated);
-            klass = options["class"];
+            klass = options.class;
             acOptions = {
                 queryParams: queryParams,
-                "class": klass,
+                class: klass,
                 acceptButton: acceptButton,
                 cancelButton: cancelButton
             };
@@ -162,3 +162,4 @@ function renderAutocompleteControl(dom, person, options, addOneIdAndRefresh) {
 } // renderAutocompleteControl
 exports.renderAutocompleteControl = renderAutocompleteControl;
 // ends
+//# sourceMappingURL=autocompleteBar.js.map

package/lib/autocompleteBar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"autocompleteBar.js","sourceRoot":"","sources":["../src/autocompleteBar.ts"],"names":[],"mappings":"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"}

package/lib/autocompleteField.js

@@ -35,14 +35,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteField = void 0;
 /* Form field for doing autocompleete
  */
+var rdflib_1 = require("rdflib");
+var solid_logic_1 = require("solid-logic");
 var solid_ui_1 = require("solid-ui");
 var autocompletePicker_1 = require("./autocompletePicker"); // dbpediaParameters
-var rdflib_1 = require("rdflib");
-var kb = solid_ui_1.store;
 var AUTOCOMPLETE_THRESHOLD = 4; // don't check until this many characters typed
 var AUTOCOMPLETE_ROWS = 12; // 20?
 /**
@@ -97,7 +97,7 @@ dom, container, already, subject, form, doc, callbackFunction) {
             });
         });
     }
-    var kb = solid_ui_1.store;
+    var kb = solid_logic_1.store;
     var formDoc = form.doc ? form.doc() : null; // @@ if blank no way to know
     var box = dom.createElement('tr');
     if (container)
@@ -151,10 +151,10 @@ dom, container, already, subject, form, doc, callbackFunction) {
     queryParams.endPoint = endPoint.uri;
     var searchByNameQuery = kb.the(form, solid_ui_1.ns.ui('searchByNameQuery'), null, formDoc);
     queryParams.searchByNameQuery = searchByNameQuery;
-    var queryParams = { label: 'from form', logo: '', "class": klass, endPoint: endPoint, searchByNameQuery: searchByNameQuery };
+    var queryParams = { label: 'from form', logo: '', class: klass, endPoint: endPoint, searchByNameQuery: searchByNameQuery };
     var options = {
         // acceptButton?: HTMLElement,
-        "class": klass,
+        class: klass,
         queryParams: queryParams
     };
     // const acWiget = rhs.appendChild(await renderAutoComplete(dom, options, addOneIdAndRefresh))
@@ -195,3 +195,4 @@ dom, container, already, subject, form, doc, callbackFunction) {
 }
 exports.autocompleteField = autocompleteField;
 // ends
+//# sourceMappingURL=autocompleteField.js.map

package/lib/autocompleteField.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"autocompleteField.js","sourceRoot":"","sources":["../src/autocompleteField.ts"],"names":[],"mappings":"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"}

package/lib/autocompletePicker.js

@@ -35,16 +35,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderAutoComplete = void 0;
-/* Create and edit data using public data
-**
-** organization conveys many distinct types of thing.
-**
-*/
+var solid_logic_1 = require("solid-logic");
 var solid_ui_1 = require("solid-ui");
 var publicData_1 = require("./publicData");
-var kb = solid_ui_1.store;
 var AUTOCOMPLETE_THRESHOLD = 4; // don't check until this many characters typed
 var AUTOCOMPLETE_ROWS = 20; // 20?
 var AUTOCOMPLETE_ROWS_STRETCH = 40;
@@ -146,8 +141,8 @@ callback) {
                 }
             }
             if (hits == 1) { // Maybe require green confirmation button be clicked?
-                console.log("  auto complete elimination:  \"".concat(filter, "\" -> \"").concat(pickedName, "\""));
-                gotIt(kb.sym(pick), pickedName); // uri, name
+                console.log("  auto complete elimination:  \"" + filter + "\" -> \"" + pickedName + "\"");
+                gotIt(solid_logic_1.store.sym(pick), pickedName); // uri, name
             }
         }
         function clearList() {
@@ -174,7 +169,7 @@ callback) {
                     switch (_a.label) {
                         case 0:
                             if (inputEventHandlerLock) {
-                                console.log("Ignoring \"".concat(searchInput.value, "\" because of lock "));
+                                console.log("Ignoring \"" + searchInput.value + "\" because of lock ");
                                 return [2 /*return*/];
                             }
                             inputEventHandlerLock = true;
@@ -222,7 +217,7 @@ callback) {
                                 numberOfRows = slimmed.length; // stretch if it means we get all items
                             }
                             allDisplayed = loadedEnough && slimmed.length <= numberOfRows;
-                            console.log(" Filter:\"".concat(filter, "\" bindings: ").concat(bindings.length, ", slimmed to ").concat(slimmed.length, "; rows: ").concat(numberOfRows, ", Enough? ").concat(loadedEnough, ", All displayed? ").concat(allDisplayed));
+                            console.log(" Filter:\"" + filter + "\" bindings: " + bindings.length + ", slimmed to " + slimmed.length + "; rows: " + numberOfRows + ", Enough? " + loadedEnough + ", All displayed? " + allDisplayed);
                             slimmed.slice(0, numberOfRows).forEach(function (binding) {
                                 var row = table.appendChild(dom.createElement('tr'));
                                 solid_ui_1.style.setStyle(row, 'autocompleteRowStyle');
@@ -236,7 +231,7 @@ callback) {
                                     return __generator(this, function (_a) {
                                         console.log('       click row textContent: ' + row.textContent);
                                         console.log('       click name: ' + name);
-                                        gotIt(kb.sym(uri), name);
+                                        gotIt(solid_logic_1.store.sym(uri), name);
                                         return [2 /*return*/];
                                     });
                                 }); });
@@ -256,13 +251,13 @@ callback) {
         */
         function sparqlForSearch(name, theType) {
             var clean = name.replace(/\W/g, ''); // Remove non alphanum so as to protect regexp
-            var sparql = "select distinct ?subject, ?name where {\n      ?subject a <".concat(theType.uri, ">; rdfs:label ?name\n      FILTER regex(?name, \"").concat(clean, "\", \"i\")\n    } LIMIT ").concat(publicData_1.AUTOCOMPLETE_LIMIT);
+            var sparql = "select distinct ?subject, ?name where {\n      ?subject a <" + theType.uri + ">; rdfs:label ?name\n      FILTER regex(?name, \"" + clean + "\", \"i\")\n    } LIMIT " + publicData_1.AUTOCOMPLETE_LIMIT;
             return sparql;
         }
         var queryParams, OrgClass, candidatesLoaded, runningTimeout, inputEventHandlerLock, allDisplayed, lastFilter, numberOfRows, div, foundName, foundObject, table, head, cell, searchInput, searchInputStyle;
         return __generator(this, function (_a) {
             queryParams = options.queryParams;
-            OrgClass = options["class"] // kb.sym('http://umbel.org/umbel/rc/EducationalOrganization') // @@@ other
+            OrgClass = options.class // kb.sym('http://umbel.org/umbel/rc/EducationalOrganization') // @@@ other
             ;
             if (options.acceptButton) {
                 options.acceptButton.addEventListener('click', acceptButtonHandler, false);
@@ -303,3 +298,4 @@ callback) {
 } // renderAutoComplete
 exports.renderAutoComplete = renderAutoComplete;
 var ends = 'ENDS';
+//# sourceMappingURL=autocompletePicker.js.map

package/lib/autocompletePicker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"autocompletePicker.js","sourceRoot":"","sources":["../src/autocompletePicker.ts"],"names":[],"mappings":"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"}

package/lib/publicData.js

@@ -35,16 +35,16 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-exports.__esModule = 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.loadFromBindings = exports.predMap = exports.wikidataClassMap = exports.filterByLanguage = exports.wikidataParameters = exports.dbpediaParameters = exports.escoParameters = exports.getPreferredLanguages = exports.wikidataClasses = exports.AUTOCOMPLETE_LIMIT = void 0;
 /* Logic to access public data stores
 *
 * including filtering resut by natural language etc
 */
 var rdflib_1 = require("rdflib");
+var solid_logic_1 = require("solid-logic");
 var solid_ui_1 = require("solid-ui");
 var instituteDetailsQuery = require("../lib/instituteDetailsQuery.js");
-var kb = solid_ui_1.store;
 exports.AUTOCOMPLETE_LIMIT = 3000; // How many to get from server
 var subjectRegexp = /\$\(subject\)/g;
 // Schema.org seems to suggest NGOs are non-profit and Corporaions are for-profit
@@ -59,7 +59,7 @@ exports.wikidataClasses = {
     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'
+    SportsOrganization: 'http://www.wikidata.org/entity/Q4438121',
 };
 function getPreferredLanguages() {
     return __awaiter(this, void 0, void 0, function () {
@@ -75,25 +75,25 @@ exports.escoParameters = {
     searchByNameQuery: null,
     searchByNameURI: 'https://ec.europa.eu/esco/api/search?language=$(language)&type=occupation&text=$(name)',
     endpoint: null,
-    "class": {}
+    class: {}
 };
 exports.dbpediaParameters = {
     label: 'DBPedia',
     logo: 'https://upload.wikimedia.org/wikipedia/commons/thumb/7/73/DBpediaLogo.svg/263px-DBpediaLogo.svg.png',
     searchByNameQuery: "select distinct ?subject, ?name where {\n    ?subject a $(class); rdfs:label ?name\n    FILTER regex(?name, \"$(name)\", \"i\")\n  } LIMIT $(limit)",
     endpoint: 'https://dbpedia.org/sparql/',
-    "class": { AcademicInsitution: 'http://umbel.org/umbel/rc/EducationalOrganization' }
+    class: { AcademicInsitution: 'http://umbel.org/umbel/rc/EducationalOrganization' }
 };
 exports.wikidataParameters = {
     label: 'WikiData',
     logo: 'https://www.wikimedia.org/static/images/project-logos/wikidatawiki.png',
     endpoint: 'https://query.wikidata.org/sparql',
-    "class": { AcademicInsitution: 'http://www.wikidata.org/entity/Q4671277',
+    class: { 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'
+        Insitute: 'http://www.wikidata.org/entity/Q1664720',
     },
     searchByNameQuery: "SELECT ?subject ?name\n  WHERE {\n    ?klass wdt:P279* $(class) .\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}"
@@ -121,7 +121,7 @@ function filterByLanguage(bindings, languagePrefs) {
         sortMe.reverse(); // best at the top
         slimmed.push(sortMe[0][1]);
     } // map u
-    console.log(" Filter by language: ".concat(bindings.length, " -> ").concat(slimmed.length));
+    console.log(" Filter by language: " + bindings.length + " -> " + slimmed.length);
     return slimmed;
 }
 exports.filterByLanguage = filterByLanguage;
@@ -132,10 +132,10 @@ exports.wikidataClassMap = {
     'http://www.wikidata.org/entity/Q3918': solid_ui_1.ns.schema('CollegeOrUniversity'),
     'http://www.wikidata.org/entity/Q170584': solid_ui_1.ns.schema('Project'),
     'http://www.wikidata.org/entity/Q327333': solid_ui_1.ns.schema('GovernmentOrganization'),
-    'http://www.wikidata.org/entity/Q2221906': solid_ui_1.ns.schema('Place')
+    'http://www.wikidata.org/entity/Q2221906': solid_ui_1.ns.schema('Place'), // geographic location
 };
 exports.predMap = {
-    "class": solid_ui_1.ns.rdf('type'),
+    class: solid_ui_1.ns.rdf('type'),
     // logo: ns.schema('logo'),
     sealImage: solid_ui_1.ns.schema('logo'),
     //image: ns.schema('image'),   defaults to shema
@@ -144,8 +144,8 @@ exports.predMap = {
 };
 function loadFromBindings(kb, solidSubject, bindings, doc) {
     var results = {};
-    console.log("loadFromBindings:  subject: ".concat(solidSubject));
-    console.log("                       doc: ".concat(doc));
+    console.log("loadFromBindings:  subject: " + solidSubject);
+    console.log("                       doc: " + doc);
     bindings.forEach(function (binding) {
         for (var key in binding) {
             var result = binding[key];
@@ -156,7 +156,7 @@ function loadFromBindings(kb, solidSubject, bindings, doc) {
     });
     var _loop_1 = function (key) {
         var values = results[key];
-        console.log("    results ".concat(key, " -> ").concat(values));
+        console.log("    results " + key + " -> " + values);
         values.forEach(function (combined) {
             var result = JSON.parse(combined);
             var type = result.type, value = result.value;
@@ -168,7 +168,7 @@ function loadFromBindings(kb, solidSubject, bindings, doc) {
                 obj = new rdflib_1.Literal(value, result.language, result.datatype);
             }
             else {
-                throw new Error("loadFromBindings:  unexpected type: ".concat(type));
+                throw new Error("loadFromBindings:  unexpected type: " + type);
             }
             if (key == 'type') {
                 if (exports.wikidataClassMap[value]) {
@@ -192,7 +192,7 @@ function loadFromBindings(kb, solidSubject, bindings, doc) {
             else if (exports.predMap[key]) {
                 var pred = exports.predMap[key] || solid_ui_1.ns.schema(key); // fallback to just using schema.org
                 kb.add(solidSubject, pred, obj, doc); // @@ deal with non-string and objects
-                console.log("  public data ".concat(pred, " ").concat(obj, "."));
+                console.log("  public data " + pred + " " + obj + ".");
             }
         });
     };
@@ -220,7 +220,7 @@ function queryESCODataByName(filter, theClass, queryTarget) {
                         headers: { 'Accept': 'application/json' }
                     } // CORS
                     ;
-                    return [4 /*yield*/, kb.fetcher.webOperation('GET', queryURI, options)
+                    return [4 /*yield*/, solid_logic_1.store.fetcher.webOperation('GET', queryURI, options)
                         //complain('Error querying db of organizations: ' + err)
                     ];
                 case 1:
@@ -276,7 +276,7 @@ function queryPublicDataSelect(sparql, queryTarget) {
                         headers: { 'Accept': 'application/json' }
                     } // CORS
                     ;
-                    return [4 /*yield*/, kb.fetcher.webOperation('GET', queryURI, options)
+                    return [4 /*yield*/, solid_logic_1.store.fetcher.webOperation('GET', queryURI, options)
                         //complain('Error querying db of organizations: ' + err)
                     ];
                 case 1:
@@ -308,7 +308,7 @@ function queryPublicDataConstruct(sparql, pubicId, queryTarget) {
                     options = { credentials: 'omit',
                         headers: { 'Accept': 'text/turtle' }
                     };
-                    return [4 /*yield*/, kb.fetcher.webOperation('GET', queryURI, options)];
+                    return [4 /*yield*/, solid_logic_1.store.fetcher.webOperation('GET', queryURI, options)];
                 case 1:
                     response = _a.sent();
                     text = response.responseText;
@@ -316,7 +316,7 @@ function queryPublicDataConstruct(sparql, pubicId, queryTarget) {
                     console.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, kb, pubicId.uri, 'text/turtle');
+                    (0, rdflib_1.parse)(text, solid_logic_1.store, pubicId.uri, 'text/turtle');
                     return [2 /*return*/];
             }
         });
@@ -334,7 +334,7 @@ function loadPublicDataThing(kb, subject, publicDataID) {
                 case 1:
                     if (!publicDataID.uri.match(/^https?:\/\/www\.wikidata\.org\/entity\/.*/)) return [3 /*break*/, 3];
                     QId = publicDataID.uri.split('/')[4];
-                    dataURI = "http://www.wikidata.org/wiki/Special:EntityData/".concat(QId, ".ttl");
+                    dataURI = "http://www.wikidata.org/wiki/Special:EntityData/" + QId + ".ttl";
                     // In fact loading the data URI gives much to much irrelevant data, from wikidata.
                     return [4 /*yield*/, getWikidataDetails(kb, subject, publicDataID)
                         // await getWikidataLocation(kb, subject, publicDataID)  -- should get that in the details query now
@@ -416,14 +416,14 @@ function getDbpediaDetails(kb, solidSubject, publicDataID) {
         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   }");
+                    sparql = "select distinct ?city, ?state, ?country, ?homepage, ?logo, ?lat, ?long,  WHERE {\n    OPTIONAL { <" + publicDataID + "> <http://dbpedia.org/ontology/city> ?city }\n    OPTIONAL { " + publicDataID + " <http://dbpedia.org/ontology/state> ?state }\n    OPTIONAL { " + publicDataID + " <http://dbpedia.org/ontology/country> ?country }\n    OPTIONAL { " + publicDataID + " foaf:homepage ?homepage }\n    OPTIONAL { " + publicDataID + " foaf:lat ?lat; foaf:long ?long }\n    OPTIONAL { " + publicDataID + " <http://dbpedia.org/ontology/country> ?country }\n   }";
                     predMap = {
                         city: solid_ui_1.ns.vcard('locality'),
                         state: solid_ui_1.ns.vcard('region'),
                         country: solid_ui_1.ns.vcard('country-name'),
                         homepage: solid_ui_1.ns.foaf('homepage'),
                         lat: solid_ui_1.ns.geo('latitude'),
-                        long: solid_ui_1.ns.geo('longitude')
+                        long: solid_ui_1.ns.geo('longitude'),
                     };
                     return [4 /*yield*/, queryPublicDataSelect(sparql, exports.dbpediaParameters)];
                 case 1:
@@ -438,3 +438,4 @@ function getDbpediaDetails(kb, solidSubject, publicDataID) {
     });
 }
 exports.getDbpediaDetails = getDbpediaDetails;
+//# sourceMappingURL=publicData.js.map

package/lib/publicData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"publicData.js","sourceRoot":"","sources":["../src/publicData.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;EAGE;AACF,iCAAkD;AAClD,2CAAmC;AACnC,qCAA6B;AAC7B,uEAAwE;AAE3D,QAAA,kBAAkB,GAAG,IAAI,CAAA,CAAC,8BAA8B;AAErE,IAAM,aAAa,GAAG,gBAAgB,CAAA;AA0BtC,iFAAiF;AACjF,oCAAoC;AACvB,QAAA,eAAe,GAAG;IAC7B,WAAW,EAAE,yCAAyC;IACtD,uBAAuB,EAAE,wCAAwC;IACjE,sBAAsB,EAAE,wCAAwC;IAChE,mBAAmB,EAAE,yCAAyC;IAC9D,UAAU,EAAE,0CAA0C;IACtD,GAAG,EAAE,wCAAwC;IAC7C,UAAU,EAAE,uCAAuC;IACnD,yDAAyD;IACzD,OAAO,EAAE,wCAAwC;IACjD,kBAAkB,EAAE,yCAAyC;CAC9D,CAAA;AAED,SAAsB,qBAAqB;;;YACzC,sBAAO,CAAE,IAAI,EAAE,IAAI,EAAG,IAAI,EAAE,IAAI,CAAC,EAAA,CAAC,mCAAmC;;;CACtE;AAFD,sDAEC;AACY,QAAA,cAAc,GAAmB;IAC5C,KAAK,EAAE,MAAM;IACb,IAAI,EAAE,2EAA2E;IACjF,iBAAiB,EAAE,IAAI;IACvB,eAAe,EAAE,wFAAwF;IACzG,QAAQ,EAAE,IAAI;IACZ,KAAK,EAAE,EAAE;CACZ,CAAA;AAEY,QAAA,iBAAiB,GAAmB;IAC/C,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,qGAAqG;IAC3G,iBAAiB,EAAE,qJAGF;IACjB,QAAQ,EAAE,6BAA6B;IACrC,KAAK,EAAE,EAAE,kBAAkB,EAAE,mDAAmD,EAAC;CACpF,CAAA;AAEY,QAAA,kBAAkB,GAAG;IAChC,KAAK,EAAE,UAAU;IACjB,IAAI,EAAE,wEAAwE;IAC9E,QAAQ,EAAE,mCAAmC;IAC7C,KAAK,EAAE,EAAG,kBAAkB,EAAE,yCAAyC;QAC7D,UAAU,EAAS,yCAAyC;QAC5D,QAAQ,EAAW,yCAAyC;QAC5D,GAAG,EAAgB,uCAAuC;QAC1D,sBAAsB,EAAE,wCAAwC;QAChE,QAAQ,EAAE,yCAAyC;KAC5D;IACD,iBAAiB,EAAE,oMAMD;IAElB,sBAAsB,EAAE,giBAgBxB;CACD,CAAA;AAED;;;EAGE;AACF,SAAgB,gBAAgB,CAAE,QAAQ,EAAE,aAAa;IACvD,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,QAAQ,CAAC,OAAO,CAAC,UAAA,OAAO;QACtB,IAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAA;QACjC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;QAC3B,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACzB,CAAC,CAAC,CAAA;IAEF,IAAI,cAAc,GAAG,aAAa,CAAA;IAClC,cAAc,CAAC,OAAO,EAAE,CAAA,CAAC,gBAAgB;IAEzC,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,KAAK,IAAM,CAAC,IAAI,IAAI,EAAE,EAAE,yBAAyB;QAC/C,IAAM,UAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QACxB,IAAM,MAAM,GAAI,UAAQ,CAAC,GAAG,CAAC,UAAA,OAAO;YAClC,OAAO,CAAE,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;QACrE,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,EAAE,CAAA,CAAC,qBAAqB;QACnC,MAAM,CAAC,OAAO,EAAE,CAAA,CAAC,kBAAkB;QACnC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAC3B,CAAC,QAAQ;IACV,OAAO,CAAC,GAAG,CAAC,0BAAwB,QAAQ,CAAC,MAAM,YAAO,OAAO,CAAC,MAAQ,CAAC,CAAA;IAC3E,OAAO,OAAO,CAAA;AAChB,CAAC;AAvBD,4CAuBC;AAEU,QAAA,gBAAgB,GAAG;IAC5B,0CAA0C,EAAE,aAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC;IAC5E,yCAAyC,EAAE,aAAE,CAAC,MAAM,CAAC,yBAAyB,CAAC;IAC/E,uCAAuC,EAAE,aAAE,CAAC,MAAM,CAAC,cAAc,CAAC;IAClE,sCAAsC,EAAE,aAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC;IACxE,wCAAwC,EAAE,aAAE,CAAC,MAAM,CAAC,SAAS,CAAC;IAC9D,wCAAwC,EAAE,aAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC;IAC7E,yCAAyC,EAAE,aAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,sBAAsB;CAEtF,CAAA;AACU,QAAA,OAAO,GAAG;IACnB,KAAK,EAAE,aAAE,CAAC,GAAG,CAAC,MAAM,CAAC;IACrB,2BAA2B;IAC3B,SAAS,EAAE,aAAE,CAAC,MAAM,CAAC,MAAM,CAAC;IAC5B,gDAAgD;IAChD,SAAS,EAAC,aAAE,CAAC,IAAI,CAAC,MAAM,CAAC;IACzB,UAAU,EAAE,aAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC;CACzC,CAAA;AAED,SAAgB,gBAAgB,CAAE,EAAE,EAAE,YAAsB,EAAE,QAAQ,EAAE,GAAG;IACzE,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,CAAC,GAAG,CAAC,iCAA+B,YAAc,CAAC,CAAA;IAC1D,OAAO,CAAC,GAAG,CAAC,iCAA+B,GAAK,CAAC,CAAA;IACjD,QAAQ,CAAC,OAAO,CAAC,UAAA,OAAO;QACtB,KAAK,IAAM,GAAG,IAAI,OAAO,EAAE;YACzB,IAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;YAC3B,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA,CAAC,gCAAgC;YACxE,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,EAAE,CAAA;YACxC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA,CAAC,oBAAoB;SAChD;IACH,CAAC,CAAC,CAAA;4BACS,GAAG;QACZ,IAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;QAC3B,OAAO,CAAC,GAAG,CAAC,iBAAe,GAAG,YAAO,MAAQ,CAAC,CAAA;QAC9C,MAAM,CAAC,OAAO,CAAC,UAAA,QAAQ;YACrB,IAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YAC3B,IAAA,IAAI,GAAY,MAAM,KAAlB,EAAE,KAAK,GAAK,MAAM,MAAX,CAAW;YAC9B,IAAI,GAAG,CAAA;YACP,IAAI,IAAI,KAAK,KAAK,EAAE;gBAClB,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;aACpB;iBAAM,IAAI,IAAI,KAAK,SAAS,EAAE;gBAC7B,GAAG,GAAG,IAAI,gBAAO,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA;aAC3D;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,yCAAuC,IAAM,CAAC,CAAA;aAC/D;YACD,IAAI,GAAG,IAAI,MAAM,EAAE;gBACjB,IAAI,wBAAgB,CAAC,KAAK,CAAC,EAAE;oBAC3B,GAAG,GAAG,wBAAgB,CAAC,KAAK,CAAC,CAAA;iBAC9B;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,2BAA2B,GAAG,KAAK,CAAC,CAAA;iBAClD;aACF;iBAAM,IAAI,GAAG,KAAK,aAAa,EAAE;gBAChC,8DAA8D;gBAC9D,OAAO,CAAC,GAAG,CAAC,4BAA4B,GAAG,KAAK,CAAC,CAAA;gBACjD,IAAM,MAAM,GAAE,iCAAiC,CAAA;gBAC/C,IAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBAChC,IAAM,KAAK,GAAG,aAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAC7B,IAAM,QAAQ,GAAG,IAAI,gBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;gBACnD,IAAM,SAAS,GAAG,IAAI,gBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;gBACpD,EAAE,CAAC,GAAG,CAAC,YAAY,EAAE,aAAE,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;gBAC5D,EAAE,CAAC,GAAG,CAAC,YAAY,EAAE,aAAE,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAA;aAC3D;iBAAM,IAAI,eAAO,CAAC,GAAG,CAAC,EAAE;gBACvB,IAAM,IAAI,GAAG,eAAO,CAAC,GAAG,CAAC,IAAI,aAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA,CAAC,oCAAoC;gBAChF,EAAE,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA,CAAC,sCAAsC;gBAC3E,OAAO,CAAC,GAAG,CAAC,mBAAiB,IAAI,SAAI,GAAG,MAAG,CAAC,CAAA;aAC7C;QACH,CAAC,CAAC,CAAA;;IAnCJ,KAAK,IAAM,GAAG,IAAI,OAAO;gBAAd,GAAG;KAoCb;AACH,CAAC;AAjDD,4CAiDC;AAED;EACE;AAEF;EACE;AACF,SAAsB,mBAAmB,CAAE,MAAc,EAAE,QAAkB,EAAE,WAA4B;;;;;;oBACnG,QAAQ,GAAG,WAAW,CAAC,eAAe;yBACzC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC;yBAC1B,OAAO,CAAC,UAAU,EAAE,EAAE,GAAG,0BAAkB,CAAC;yBAC5C,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;oBAChC,OAAO,CAAC,GAAG,CAAC,4BAA4B,GAAG,QAAQ,CAAC,CAAA;oBAE9C,OAAO,GAAG,EAAE,WAAW,EAAE,MAAM;wBACnC,OAAO,EAAE,EAAE,QAAQ,EAAE,kBAAkB,EAAC;qBACzC,CAAC,OAAO;oBAAR,CAAA;oBAEU,qBAAM,mBAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC;wBACrE,wDAAwD;sBADa;;oBAArE,QAAQ,GAAG,SAA0D,CAAA;oBAE/D,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAA;oBAClC,OAAO,CAAC,GAAG,CAAC,wBAAwB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAA;oBACjE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;wBAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,QAAQ,CAAC,CAAA;oBAChF,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;oBAC7B,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAA;oBAEnF,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ;oBAAT,CAAA;oBAChC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,UAAA,MAAM;wBACjC,IAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAA;wBACzB,IAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA,CAAC,kFAAkF;wBACzG,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAC,EAAE,GAAG,EAAE,EAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAC,EAAC,CAAA,CAAC,2BAA2B;oBAC7G,CAAC,CAAC,CAAA;oBACF,sBAAO,QAAQ;wBACf,oDAAoD;sBADrC;;;;CAEhB;AA3BD,kDA2BC;AAGD;EACE;AACF,SAAsB,qBAAqB,CAAE,MAAc,EAAE,QAAkB,EAAE,WAA4B;;;;YACrG,MAAM,GAAG,WAAW,CAAC,iBAAiB;iBACzC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC;iBAC1B,OAAO,CAAC,UAAU,EAAE,EAAE,GAAG,0BAAkB,CAAC;iBAC5C,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;YAChC,OAAO,CAAC,GAAG,CAAC,iCAAiC,GAAG,MAAM,CAAC,CAAA;YACvD,sBAAO,qBAAqB,CAAC,MAAM,EAAE,WAAW,CAAC,EAAA;;;CAClD;AAPD,sDAOC;AAED,SAAsB,qBAAqB,CAAE,MAAc,EAAE,WAA4B;;;;;;oBACjF,eAAe,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;oBACtD,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;oBAC/C,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAA;oBACrC,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAG,QAAQ,CAAC,CAAC;oBAEjD,OAAO,GAAG,EAAE,WAAW,EAAE,MAAM;wBACnC,OAAO,EAAE,EAAE,QAAQ,EAAE,kBAAkB,EAAC;qBACzC,CAAC,OAAO;oBAAR,CAAA;oBAEU,qBAAM,mBAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC;wBACrE,wDAAwD;sBADa;;oBAArE,QAAQ,GAAG,SAA0D,CAAA;oBAE/D,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAA;oBAClC,oEAAoE;oBACpE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;wBAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,GAAG,QAAQ,CAAC,CAAA;oBAC3E,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;oBAC7B,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAA;oBACnF,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAA;oBACtC,sBAAO,QAAQ,EAAA;;;;CAChB;AAnBD,sDAmBC;AAED,SAAsB,wBAAwB,CAAE,MAAc,EAAE,OAAkB,EAAE,WAA4B;;;;;;oBAC9G,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,MAAM,CAAC,CAAA;oBAClD,eAAe,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;oBACtD,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;oBAC/C,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAA;oBACrC,OAAO,CAAC,GAAG,CAAC,iCAAiC,GAAG,QAAQ,CAAC,CAAC;oBACpD,OAAO,GAAG,EAAE,WAAW,EAAE,MAAM;wBACnC,OAAO,EAAE,EAAE,QAAQ,EAAE,aAAa,EAAC;qBACpC,CAAA;oBACgB,qBAAM,mBAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAA;;oBAArE,QAAQ,GAAG,SAA0D;oBACrE,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAA;oBAC5B,MAAM,GAAG,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAC,GAAG,CAAC,GAAG,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;oBACvF,OAAO,CAAC,GAAG,CAAC,2CAA2C,GAAG,MAAM,CAAC,CAAA;oBACjE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;wBAAE,MAAM,IAAI,KAAK,CAAC,8DAA8D,GAAG,QAAQ,CAAC,CAAA;oBACjH,IAAA,cAAK,EAAC,IAAI,EAAE,mBAAK,EAAE,OAAO,CAAC,GAAG,EAAE,aAAa,CAAC,CAAA;oBAC9C,sBAAM;;;;CACP;AAhBD,4DAgBC;AAED,SAAsB,mBAAmB,CAAE,EAAE,EAAE,OAAkB,EAAE,YAAuB;;;;;;yBAEpF,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,+BAA+B,CAAC,EAA5D,wBAA4D;oBAC9D,sBAAO,iBAAiB,CAAC,EAAE,EAAE,OAAO,EAAE,YAAY,CAAC,EAAA;;yBAC1C,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,4CAA4C,CAAC,EAApE,wBAAoE;oBACvE,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;oBACpC,OAAO,GAAG,qDAAmD,GAAG,SAAM,CAAA;oBAC5E,kFAAkF;oBAClF,qBAAM,kBAAkB,CAAC,EAAE,EAAE,OAAO,EAAE,YAAY,CAAC;wBACnD,oGAAoG;sBADjD;;oBADnD,kFAAkF;oBAClF,SAAmD,CAAA;;;oBAG7C,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBACpG,CAAC,CAAC,YAAY,CAAA;oBACf,sBAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,MAAM;4BACnD,OAAO,EAAE,EAAE,QAAQ,EAAE,aAAa,EAAC;yBACtC,CAAC,EAAA;;;;;CAEL;AAjBD,kDAiBC;AAED,SAAsB,kBAAkB,CAAE,EAAE,EAAE,YAAsB,EAAE,YAAsB;;;;;;oBACpF,UAAU,GAAG,YAAY,CAAA;oBACzB,MAAM,GAAG,qBAAqB,CAAC,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;oBACtE,qBAAM,wBAAwB,CAAC,MAAM,EAAE,YAAY,EAAE,0BAAkB,CAAC,EAAA;;oBAAxE,SAAwE,CAAA;oBACxE,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,YAAY,CAAC,CAAA;;;;;CACzD;AALD,gDAKC;AAED,SAAsB,qBAAqB,CAAE,EAAE,EAAE,YAAsB,EAAE,YAAsB;;;;;;oBACvF,MAAM,GAAG,4fAYf;yBACC,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,CAAA;oBACpB,qBAAM,qBAAqB,CAAC,MAAM,EAAE,0BAAkB,CAAC,EAAA;;oBAAlE,QAAQ,GAAG,SAAuD;oBACxE,gBAAgB,CAAE,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,CAAC,GAAG,EAAE,CAAC,CAAA,CAAC,uBAAuB;;;;;CAC1F;AAjBD,sDAiBC;AAED,SAAsB,mBAAmB,CAAE,EAAE,EAAE,YAAsB,EAAE,YAAsB;;;;;;oBACrF,MAAM,GAAG,kVAUf,CAAC,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,CAAA;oBACrC,OAAO,CAAC,GAAG,CAAE,yBAAyB,GAAI,MAAM,CAAC,CAAA;oBAChC,qBAAM,qBAAqB,CAAC,MAAM,EAAE,0BAAkB,CAAC,EAAA;;oBAAlE,QAAQ,GAAG,SAAuD;oBACxE,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,QAAQ,CAAC,CAAA;oBAClD,gBAAgB,CAAE,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,CAAC,GAAG,EAAE,CAAC,CAAA,CAAC,mBAAmB;;;;;CACtF;AAhBD,kDAgBC;AAGD,SAAsB,iBAAiB,CAAE,EAAE,EAAE,YAAsB,EAAE,YAAsB;;;;;;oBAEnF,MAAM,GAAG,uGACC,YAAY,qEACb,YAAY,sEACZ,YAAY,0EACZ,YAAY,mDACZ,YAAY,0DACZ,YAAY,4DACxB,CAAA;oBACI,OAAO,GAAG;wBACd,IAAI,EAAE,aAAE,CAAC,KAAK,CAAC,UAAU,CAAC;wBAC1B,KAAK,EAAE,aAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;wBACzB,OAAO,EAAE,aAAE,CAAC,KAAK,CAAC,cAAc,CAAC;wBACjC,QAAQ,EAAE,aAAE,CAAC,IAAI,CAAC,UAAU,CAAC;wBAC7B,GAAG,EAAE,aAAE,CAAC,GAAG,CAAC,UAAU,CAAC;wBACvB,IAAI,EAAE,aAAE,CAAC,GAAG,CAAC,WAAW,CAAC;qBAC1B,CAAA;oBACe,qBAAM,qBAAqB,CAAC,MAAM,EAAE,yBAAiB,CAAC,EAAA;;oBAAjE,QAAQ,GAAG,SAAsD;oBACvE,QAAQ,CAAC,OAAO,CAAC,UAAA,OAAO;wBACtB,IAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAA,CAAC,mBAAmB;wBACrD,IAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAA;oBACjC,CAAC,CAAC,CAAA;;;;;CACH;AAvBD,8CAuBC"}

package/mintNewAddressBook.js

@@ -1,4 +1,5 @@
-const UI = require('solid-ui')
+import * as UI from 'solid-ui'
+import { setACLUserPublic } from 'solid-logic'
 
 // const mime = require('mime-types')
 // const toolsPane0 = require('./toolsPane')
@@ -12,7 +13,7 @@ const $rdf = UI.rdf
 
 export function mintNewAddressBook (dataBrowserContext, context) {
   return new Promise(function (resolve, reject) {
-    UI.authn.logInLoadProfile(context).then(
+    UI.login.ensureLoadedProfile(context).then(
       context => {
         // 20180713
         console.log('Logged in as ' + context.me)
@@ -120,8 +121,7 @@ export function mintNewAddressBook (dataBrowserContext, context) {
               return reject(new Error('Error writing new file ' + task.to))
             }
 
-            UI.authn
-              .setACLUserPublic(dest, me, aclOptions)
+            setACLUserPublic(dest, me, aclOptions)
               .then(() => doNextTask())
               .catch(err => {
                 const message =

package/mugshotGallery.js

@@ -1,10 +1,11 @@
 import * as UI from 'solid-ui'
+import { store } from 'solid-logic'
 import * as mime from 'mime-types'
 
 const $rdf = UI.rdf
 const ns = UI.ns
 const utils = UI.utils
-const kb = UI.store
+const kb = store
 
 /*  Mugshot Gallery
 *
@@ -116,7 +117,7 @@ export function renderMugshotGallery (dom, subject) {
   // When a set of URIs are dropped on
   async function handleURIsDroppedOnMugshot (uris) {
     for (const u of uris) {
-      var thing = $rdf.sym(u) // Attachment needs text label to disinguish I think not icon.
+      let thing = $rdf.sym(u) // Attachment needs text label to disinguish I think not icon.
       console.log('Dropped on mugshot thing ' + thing) // icon was: UI.icons.iconBase + 'noun_25830.svg'
       if (u.startsWith('http') && u.indexOf('#') < 0) {
         // Plain document
@@ -125,8 +126,9 @@ export function renderMugshotGallery (dom, subject) {
           thing = $rdf.sym('https:' + u.slice(5))
         }
         const options = { withCredentials: false, credentials: 'omit' }
+        let result
         try {
-          var result = await kb.fetcher.webOperation('GET', thing.uri, options)
+          result = await kb.fetcher.webOperation('GET', thing.uri, options)
         } catch (err) {
           complain(
             `Gallery: fetch error trying to read picture ${thing} data: ${err}`

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "contacts-pane",
-  "version": "2.6.0",
+  "version": "2.6.1-10be7ce5",
   "description": "Contacts Pane: Contacts manager for Address Book, Groups, and Individuals.",
   "main": "./contactsPane.js",
   "scripts": {
+    "start": "webpack serve --config webpack.dev.config.js",
     "build": "npm run clean && npm run build-lib",
     "clean": "rm -rf lib",
     "build-lib": "mkdir lib && npx eslint *.js && make && npx tsc-transpile-only src/*.ts --outDir lib",
     "lint": "eslint '*.js'",
     "lint-fix": "eslint '*.js' --fix",
     "test": "npm run lint",
-    "prepublishOnly": "npm test && npm run build",
-    "postpublish": "git push origin master --follow-tags"
+    "ignore:prepublishOnly": "npm test && npm run build",
+    "ignore:postpublish": "git push origin master --follow-tags"
   },
   "repository": {
     "type": "git",
@@ -37,16 +38,38 @@
   },
   "homepage": "https://github.com/solid/contacts-pane",
   "dependencies": {
-    "pane-registry": "^2.4.6",
+    "pane-registry": "^2.4.7",
     "rdflib": "^2.2.17",
-    "solid-ui": "^2.4.15"
+    "solid-logic": "^1.3.14",
+    "solid-ui": "^2.4.19",
+    "lit-html": "^2.0.2",
+    "validate-color": "^2.2.1"
   },
   "devDependencies": {
+    "@babel/core": "^7.16.0",
+    "@babel/preset-env": "^7.16.0",
+    "@babel/preset-typescript": "^7.16.0",
+    "@testing-library/dom": "^8.11.0",
+    "@testing-library/jest-dom": "^5.15.0",
+    "@types/jest": "^27.0.2",
+    "@typescript-eslint/eslint-plugin": "^5.3.1",
+    "@typescript-eslint/parser": "^5.3.1",
+    "babel-jest": "^27.3.1",
+    "babel-loader": "^8.2.3",
+    "html-webpack-plugin": "^5.5.0",
+    "jest": "^27.3.1",
+    "jest-fetch-mock": "^3.0.3",
+    "node-polyfill-webpack-plugin": "^1.1.4",
+    "prettier": "^2.4.1",
+    "solid-logic": "^1.3.10",
     "eslint": "^7.32.0",
     "husky": "^7.0.4",
     "lint-staged": "^11.2.6",
     "standard": "^16.0.4",
     "typescript": "^4.4.4",
+    "webpack": "^5.63.0",
+    "webpack-cli": "^4.9.1",
+    "webpack-dev-server": "^4.4.0",
     "typescript-transpile-only": "^0.0.4"
   },
   "husky": {

package/src/autocompleteBar.ts

@@ -1,13 +1,11 @@
 // The Control with decorations
 
-import { icons, ns, style, widgets, store } from 'solid-ui'
-
-import * as UI from 'solid-ui'
+import { NamedNode } from 'rdflib'
+import { store } from 'solid-logic'
+import { ns, widgets, icons } from 'solid-ui'
 import { renderAutoComplete } from './autocompletePicker' // dbpediaParameters
+import { wikidataParameters } from './publicData'
 
-import { NamedNode, Store, st } from 'rdflib'
-import { queryPublicDataByName, filterByLanguage, wikidataParameters,
-  AUTOCOMPLETE_LIMIT, QueryParameters, getPreferredLanguages } from './publicData'
 
 const WEBID_NOUN = 'Solid ID'
 
@@ -16,8 +14,8 @@ const kb = store
 const AUTOCOMPLETE_THRESHOLD = 4 // don't check until this many characters typed
 const AUTOCOMPLETE_ROWS = 12 // 20?
 
-const GREEN_PLUS = UI.icons.iconBase + 'noun_34653_green.svg'
-const SEARCH_ICON = UI.icons.iconBase + 'noun_Search_875351.svg'
+const GREEN_PLUS = icons.iconBase + 'noun_34653_green.svg'
+const SEARCH_ICON = icons.iconBase + 'noun_Search_875351.svg'
 
 export async function renderAutocompleteControl (dom:HTMLDocument,
    person:NamedNode, options, addOneIdAndRefresh): Promise<HTMLElement> {

package/src/autocompleteField.ts

@@ -1,16 +1,10 @@
 /* Form field for doing autocompleete
  */
-import { icons, ns, style, widgets, store } from 'solid-ui'
-
+import { BlankNode, NamedNode, st, Variable } from 'rdflib'
+import { store } from 'solid-logic'
+import { ns, style, widgets } from 'solid-ui'
 import { renderAutoComplete } from './autocompletePicker' // dbpediaParameters
 
-import { NamedNode, BlankNode, Variable, Store, st } from 'rdflib'
-import { queryPublicDataByName, filterByLanguage, wikidataParameters,
-  AUTOCOMPLETE_LIMIT, QueryParameters, getPreferredLanguages } from './publicData'
-
-
-const kb = store
-
 const AUTOCOMPLETE_THRESHOLD = 4 // don't check until this many characters typed
 const AUTOCOMPLETE_ROWS = 12 // 20?
 

package/src/autocompletePicker.ts

@@ -3,12 +3,12 @@
 ** organization conveys many distinct types of thing.
 **
 */
-import { icons, ns, style, widgets, store } from 'solid-ui'
-import { NamedNode, Store, st } from 'rdflib'
-import { queryPublicDataByName, filterByLanguage, wikidataParameters,
-  AUTOCOMPLETE_LIMIT, QueryParameters, getPreferredLanguages } from './publicData'
-
-const kb = store
+import { NamedNode } from 'rdflib'
+import { store } from 'solid-logic'
+import { style, widgets } from 'solid-ui'
+import {
+  AUTOCOMPLETE_LIMIT, filterByLanguage, getPreferredLanguages, QueryParameters, queryPublicDataByName
+} from './publicData'
 
 const AUTOCOMPLETE_THRESHOLD = 4 // don't check until this many characters typed
 const AUTOCOMPLETE_ROWS = 20 // 20?
@@ -120,7 +120,7 @@ export async function renderAutoComplete (dom: HTMLDocument, options:Autocomplet
     }
     if (hits == 1) { // Maybe require green confirmation button be clicked?
       console.log(`  auto complete elimination:  "${filter}" -> "${pickedName}"`)
-      gotIt(kb.sym(pick), pickedName) // uri, name
+      gotIt(store.sym(pick), pickedName) // uri, name
     }
   }
 
@@ -190,7 +190,7 @@ export async function renderAutoComplete (dom: HTMLDocument, options:Autocomplet
         row.addEventListener('click', async _event => {
           console.log('       click row textContent: ' + row.textContent)
           console.log('       click name: ' + name)
-          gotIt(kb.sym(uri), name)
+          gotIt(store.sym(uri), name)
         })
       })
     }

package/src/publicData.ts

@@ -2,13 +2,11 @@
 *
 * including filtering resut by natural language etc
 */
-import { NamedNode, Store, st, Literal, parse } from 'rdflib'
-
-import { icons, ns, style, widgets, store } from 'solid-ui'
+import { Literal, NamedNode, parse } from 'rdflib'
+import { store } from 'solid-logic'
+import { ns } from 'solid-ui'
 import * as instituteDetailsQuery from '../lib/instituteDetailsQuery.js'
 
-const kb = store
-
 export const AUTOCOMPLETE_LIMIT = 3000 // How many to get from server
 
 const subjectRegexp = /\$\(subject\)/g
@@ -228,7 +226,7 @@ export async function queryESCODataByName (filter: string, theClass:NamedNode, q
     headers: { 'Accept': 'application/json'}
   } // CORS
   var response
-  response = await kb.fetcher.webOperation('GET', queryURI, options)
+  response = await store.fetcher.webOperation('GET', queryURI, options)
   //complain('Error querying db of organizations: ' + err)
   const text = response.responseText
   console.log('    Query result  text' + text.slice(0,500) + '...')
@@ -268,7 +266,7 @@ export async function queryPublicDataSelect (sparql: string, queryTarget: QueryP
     headers: { 'Accept': 'application/json'}
   } // CORS
   var response
-  response = await kb.fetcher.webOperation('GET', queryURI, options)
+  response = await store.fetcher.webOperation('GET', queryURI, options)
   //complain('Error querying db of organizations: ' + err)
   const text = response.responseText
   // console.log('    Query result  text' + text.slice(0,100) + '...')
@@ -288,12 +286,12 @@ export async function queryPublicDataConstruct (sparql: string, pubicId: NamedNo
   const options = { credentials: 'omit', // CORS
     headers: { 'Accept': 'text/turtle'}
   }
-  const response = await kb.fetcher.webOperation('GET', queryURI, options)
+  const response = await store.fetcher.webOperation('GET', queryURI, options)
   const text = response.responseText
   const report = text.lenth > 500 ? text.slice(0,200) + ' ... ' + text.slice(-200) : text
   console.log('    queryPublicDataConstruct result text:' + report)
   if (text.length === 0) throw new Error('queryPublicDataConstruct: No text back from construct query:' + queryURI)
-  parse(text, kb, pubicId.uri, 'text/turtle')
+  parse(text, store, pubicId.uri, 'text/turtle')
   return
 }
 

package/toolsPane.js

@@ -3,6 +3,7 @@
 /* global confirm, $rdf */
 
 import * as UI from 'solid-ui'
+import { store } from 'solid-logic'
 import { saveNewGroup, addPersonToGroup } from './contactLogic'
 export function toolsPane (
   selectAllGroups,
@@ -13,7 +14,7 @@ export function toolsPane (
   me
 ) {
   const dom = dataBrowserContext.dom
-  const kb = UI.store
+  const kb = store
   const ns = UI.ns
   const VCARD = ns.vcard
 
@@ -68,7 +69,7 @@ export function toolsPane (
 
     //
     try {
-      await UI.authn.registrationControl(context, book, ns.vcard('AddressBook'))
+      await UI.login.registrationControl(context, book, ns.vcard('AddressBook'))
     } catch (e) {
       UI.widgets.complain(context, 'registrationControl: ' + e)
     }
@@ -160,7 +161,7 @@ export function toolsPane (
       stats.nameEmailIndex = kb.any(book, ns.vcard('nameEmailIndex'))
       log('Loading name index...')
 
-      UI.store.fetcher.nowOrWhenFetched(
+      store.fetcher.nowOrWhenFetched(
         stats.nameEmailIndex,
         undefined,
         function (_ok, _message) {

package/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "strict": false,
+    "outDir": "lib",
+    "sourceMap": true
+  },
+  "include": [
+    "./src/**/*"
+  ],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts"]
+}

package/webidControl.js

@@ -1,6 +1,7 @@
 // Render a control to record the webids we have for this agent
 /* eslint-disable multiline-ternary */
 import * as UI from 'solid-ui'
+import { store } from 'solid-logic'
 import { updateMany } from './contactLogic'
 // import { renderAutoComplete } from './lib/autocompletePicker' // dbpediaParameters
 import { renderAutocompleteControl } from './lib/autocompleteBar'
@@ -10,7 +11,7 @@ const $rdf = UI.rdf
 const ns = UI.ns
 const widgets = UI.widgets
 const utils = UI.utils
-const kb = UI.store
+const kb = store
 const style = UI.style
 
 const wikidataClasses = widgets.publicData.wikidataClasses // @@ move to solid-logic

package/webpack.dev.config.js

@@ -0,0 +1,36 @@
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const path = require('path')
+const NodePolyfillPlugin = require('node-polyfill-webpack-plugin')
+
+module.exports = [
+  {
+    mode: 'development',
+    entry: ['./dev/index.ts'],
+    output: {
+      path: path.resolve(__dirname, 'dist'),
+      filename: 'dev.bundle.js'
+    },
+    plugins: [
+      new NodePolyfillPlugin(),
+      new HtmlWebpackPlugin({ template: './dev/index.html' })
+    ],
+    module: {
+      rules: [
+        {
+          test: /\.(js|ts)$/,
+          exclude: /node_modules/,
+          use: ['babel-loader']
+        }
+      ]
+    },
+    resolve: {
+      extensions: ['*', '.js', '.ts']
+    },
+    devServer: {
+      static: {
+        directory: path.join(__dirname, 'dist')
+      }
+    },
+    devtool: 'source-map'
+  }
+]