solid-panes 3.5.19 → 3.5.21

package/lib/outline/userInput.js

@@ -1,33 +1,24 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var UI = _interopRequireWildcard(require("solid-ui"));
 
-/* istanbul ignore file */
-// Original author: kennyluck
-//
-// Kenny's Notes:
-
-/* places to generate SPARQL update: clearInputAndSave() pasteFromClipboard()->insertTermTo();
-                                  undetermined statement generated formUndetStat()
-                                                                 ->fillInRequest()
-   ontological issues
-    temporarily using the tabont namespace
-    clipboard: 'predicates' 'objects' 'all'(internal)
-    request: 'from' 'to' 'message' 'Request'
-*/
-var UI = require('solid-ui');
+var _solidLogic = require("solid-logic");
 
-var $rdf = UI.rdf;
+var panes = _interopRequireWildcard(require("pane-registry"));
 
-var panes = require('pane-registry');
+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; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+var $rdf = UI.rdf;
 var UserInputFormula; // Formula to store references of user's work
 
 var TempFormula; // Formula to store incomplete triples (Requests),
 // temporarily disjoint with kb to avoid bugs
 
 module.exports = function UserInput(outline) {
-  var kb = UI.store;
   var myDocument = outline.document; // is this ok?
   // UI.log.warn("myDocument when it's set is "+myDocument.location);
 
@@ -63,16 +54,16 @@ module.exports = function UserInput(outline) {
 
   if (!UserInputFormula) {
     UserInputFormula = new UI.rdf.Formula();
-    UserInputFormula.superFormula = kb; // UserInputFormula.registerFormula("Your Work");
+    UserInputFormula.superFormula = _solidLogic.store; // UserInputFormula.registerFormula("Your Work");
   }
 
   if (!TempFormula) TempFormula = new UI.rdf.IndexedFormula(); // Use RDFIndexedFormula so add returns the statement
 
   TempFormula.name = 'TempFormula';
-  if (!UI.store.updater) UI.store.updater = new UI.rdf.UpdateManager(kb);
+  if (!_solidLogic.store.updater) _solidLogic.store.updater = new UI.rdf.UpdateManager(_solidLogic.store);
   return {
     // updateService: updateService,
-    sparqler: UI.store.updater,
+    sparqler: _solidLogic.store.updater,
     lastModified: null,
     // the last <input> being modified, .isNew indicates whether it's a new input
     lastModifiedStat: null,
@@ -107,8 +98,10 @@ module.exports = function UserInput(outline) {
         This.formUndetStat(insertTr, preStat.subject, reqTerm1, reqTerm2, preStat.why, false);
       } else {
         // no previous row: write to the document defining the subject
-        var subject = UI.utils.getAbout(kb, UI.utils.ancestor(target.parentNode.parentNode, 'TD'));
-        var doc = kb.sym(UI.rdf.Util.uri.docpart(subject.uri));
+        var subject = UI.utils.getAbout(_solidLogic.store, UI.utils.ancestor(target.parentNode.parentNode, 'TD'));
+
+        var doc = _solidLogic.store.sym(UI.rdf.Util.uri.docpart(subject.uri));
+
         This.formUndetStat(insertTr, subject, reqTerm1, reqTerm2, doc, false);
       }
 
@@ -286,7 +279,7 @@ module.exports = function UserInput(outline) {
         obj = UI.utils.getTerm(target);
         trNode = UI.utils.ancestor(target, 'TR');
       } catch (e) {
-        UI.log.warn('userinput.js: ' + e + UI.utils.getAbout(kb, selectedTd));
+        UI.log.warn('userinput.js: ' + e + UI.utils.getAbout(_solidLogic.store, selectedTd));
         UI.log.error(target + ' getStatement Error:' + e);
       }
 
@@ -401,13 +394,13 @@ module.exports = function UserInput(outline) {
           this.clearInputAndSave();
           return;
         } else if (this.lastModified.isNew) {
-          s = new UI.rdf.Statement(s.subject, s.predicate, kb.literal(this.lastModified.value), s.why); // TODO: DEFINE ERROR CALLBACK
+          s = new UI.rdf.Statement(s.subject, s.predicate, _solidLogic.store.literal(this.lastModified.value), s.why); // TODO: DEFINE ERROR CALLBACK
 
           defaultpropview = this.views.defaults[s.predicate.uri];
           trCache = UI.utils.ancestor(this.lastModified, 'TR');
 
           try {
-            UI.store.updater.update([], [s], function (uri, success, errorBody) {
+            _solidLogic.store.updater.update([], [s], function (uri, success, errorBody) {
               if (!success) {
                 UI.log.error('Error occurs while inserting ' + s + '\n\n' + errorBody + '\n'); // UI.log.warn("Error occurs while inserting "+s+'\n\n'+errorBody);
 
@@ -419,7 +412,7 @@ module.exports = function UserInput(outline) {
             return;
           }
 
-          s = kb.add(s.subject, s.predicate, kb.literal(this.lastModified.value), s.why);
+          s = _solidLogic.store.add(s.subject, s.predicate, _solidLogic.store.literal(this.lastModified.value), s.why);
         } else {
           if (this.statIsInverse) {
             UI.log.error("Invalid Input: a literal can't be a subject in RDF/XML");
@@ -437,10 +430,10 @@ module.exports = function UserInput(outline) {
                 var valueCache = this.lastModified.value;
                 trCache = UI.utils.ancestor(this.lastModified, 'TR');
                 var oldValue = this.lastModified.defaultValue;
-                s2 = $rdf.st(s.subject, s.predicate, kb.literal(this.lastModified.value), s.why);
+                s2 = $rdf.st(s.subject, s.predicate, _solidLogic.store.literal(this.lastModified.value), s.why);
 
                 try {
-                  UI.store.updater.update([s], [s2], function (uri, success, errorBody) {
+                  _solidLogic.store.updater.update([s], [s2], function (uri, success, errorBody) {
                     if (success) {
                       obj.value = valueCache;
                     } else {
@@ -464,13 +457,14 @@ module.exports = function UserInput(outline) {
               {
                 // a request refill with text
                 // var newStat
-                var textTerm = kb.literal(this.lastModified.value, ''); // <Feature about="labelChoice">
+                var textTerm = _solidLogic.store.literal(this.lastModified.value, ''); // <Feature about="labelChoice">
+
 
                 if (s.predicate.termType === 'Collection') {
                   // case: add triple   ????????? Weird - tbl
                   var selectedPredicate = s.predicate.elements[0]; //    @@ TBL elements is a list on the predicate??
 
-                  if (kb.any(undefined, selectedPredicate, textTerm)) {
+                  if (_solidLogic.store.any(undefined, selectedPredicate, textTerm)) {
                     if (!e) {
                       // keyboard
                       var tdNode = this.lastModified.parentNode;
@@ -480,20 +474,22 @@ module.exports = function UserInput(outline) {
                     }
 
                     this.showMenu(e, 'DidYouMeanDialog', undefined, {
-                      dialogTerm: kb.any(undefined, selectedPredicate, textTerm),
+                      dialogTerm: _solidLogic.store.any(undefined, selectedPredicate, textTerm),
                       bnodeTerm: s.subject
                     });
                   } else {
                     s1 = UI.utils.ancestor(UI.utils.ancestor(this.lastModified, 'TR').parentNode, 'TR').AJAR_statement;
                     s2 = $rdf.st(s.subject, selectedPredicate, textTerm, s.why);
-                    var type = kb.the(s.subject, rdf('type'));
-                    s3 = kb.anyStatementMatching(s.subject, rdf('type'), type, s.why); // TODO: DEFINE ERROR CALLBACK
+
+                    var type = _solidLogic.store.the(s.subject, rdf('type'));
+
+                    s3 = _solidLogic.store.anyStatementMatching(s.subject, rdf('type'), type, s.why); // TODO: DEFINE ERROR CALLBACK
                     // because the table is repainted, so...
 
                     trCache = UI.utils.ancestor(UI.utils.ancestor(this.lastModified, 'TR'), 'TD').parentNode;
 
                     try {
-                      UI.store.updater.update([], [s1, s2, s3], function (uri, success, errorBody) {
+                      _solidLogic.store.updater.update([], [s1, s2, s3], function (uri, success, errorBody) {
                         if (!success) {
                           console.log('Error occurs while editing ' + s1 + '\n\n' + errorBody);
                           outline.UserInput.deleteTriple(trCache.lastChild, true); // @@@@ This
@@ -504,10 +500,12 @@ module.exports = function UserInput(outline) {
                       return;
                     }
 
-                    kb.remove(s);
-                    kb.add(s.subject, selectedPredicate, textTerm, s.why); // was: newStat =
+                    _solidLogic.store.remove(s);
+
+                    _solidLogic.store.add(s.subject, selectedPredicate, textTerm, s.why); // was: newStat =
                     // a subtle bug occurs here, if foaf:nick hasn't been dereferneced,
                     // this add will cause a repainting
+
                   }
 
                   var enclosingTd = UI.utils.ancestor(this.lastModified.parentNode.parentNode, 'TD');
@@ -519,7 +517,7 @@ module.exports = function UserInput(outline) {
                   });
                   outline.walk('right', outline.focusTd); // </Feature>
                 } else {
-                  this.fillInRequest('object', this.lastModified.parentNode, kb.literal(this.lastModified.value));
+                  this.fillInRequest('object', this.lastModified.parentNode, _solidLogic.store.literal(this.lastModified.value));
                   return; // The new Td is already generated by fillInRequest, so it's done.
                 }
 
@@ -539,7 +537,8 @@ module.exports = function UserInput(outline) {
 
         return;
       } else if (s.predicate.termType === 'Collection') {
-        kb.removeMany(s.subject);
+        _solidLogic.store.removeMany(s.subject);
+
         var upperTr = UI.utils.ancestor(UI.utils.ancestor(this.lastModified, 'TR').parentNode, 'TR');
         preStat = upperTr.AJAR_statement;
         reqTerm = this.generateRequest('(To be determined. Re-type of drag an object onto this field)');
@@ -571,7 +570,7 @@ module.exports = function UserInput(outline) {
       if (!this.statIsInverse) {
         // this is for an old feature
         // outline.replaceTD(outline.outlineObjectTD(s.object, defaultpropview),trNode.lastChild);
-        outline.replaceTD(outline.outlineObjectTD(kb.literal(this.lastModified.value), defaultpropview), trNode.lastChild);
+        outline.replaceTD(outline.outlineObjectTD(_solidLogic.store.literal(this.lastModified.value), defaultpropview), trNode.lastChild);
       } else {
         outline.replaceTD(outline.outlineObjectTD(s.subject, defaultpropview), trNode.lastChild);
       }
@@ -600,12 +599,12 @@ module.exports = function UserInput(outline) {
 
       var s = this.getStatementAbout(selectedTd);
 
-      if (!isBackOut && !kb.whether(s.object, rdf('type'), UI.ns.link('Request')) && // Better to check whether provenance is internal?
-      !kb.whether(s.predicate, rdf('type'), UI.ns.link('Request')) && !kb.whether(s.subject, rdf('type'), UI.ns.link('Request'))) {
+      if (!isBackOut && !_solidLogic.store.whether(s.object, rdf('type'), UI.ns.link('Request')) && // Better to check whether provenance is internal?
+      !_solidLogic.store.whether(s.predicate, rdf('type'), UI.ns.link('Request')) && !_solidLogic.store.whether(s.subject, rdf('type'), UI.ns.link('Request'))) {
         UI.log.debug('about to send SPARQLUpdate');
 
         try {
-          UI.store.updater.update([s], [], function (uri, success, errorBody) {
+          _solidLogic.store.updater.update([s], [], function (uri, success, errorBody) {
             if (success) {
               removefromview();
             } else {
@@ -614,6 +613,7 @@ module.exports = function UserInput(outline) {
               selectedTd.className = selectedTd.className.replace(/ pendingedit/g, '');
             }
           });
+
           selectedTd.className += ' pendingedit';
         } catch (e) {
           UI.log.error(e);
@@ -728,13 +728,13 @@ module.exports = function UserInput(outline) {
             var isInverse = selectedTd.parentNode.AJAR_inverse;
 
             if (!isInverse) {
-              insertTr.AJAR_statement = kb.add(preStat.subject, preStat.predicate, term, preStat.why);
+              insertTr.AJAR_statement = _solidLogic.store.add(preStat.subject, preStat.predicate, term, preStat.why);
             } else {
-              insertTr.AJAR_statemnet = kb.add(term, preStat.predicate, preStat.object, preStat.why);
+              insertTr.AJAR_statemnet = _solidLogic.store.add(term, preStat.predicate, preStat.object, preStat.why);
             }
 
             try {
-              UI.store.updater.update([], [insertTr.AJAR_statement], function (uri, success, errorBody) {
+              _solidLogic.store.updater.update([], [insertTr.AJAR_statement], function (uri, success, errorBody) {
                 if (!success) {
                   UI.log.error('userinput.js (pred selected): Fail trying to insert statement ' + insertTr.AJAR_statement + ': ' + errorBody);
                 }
@@ -818,14 +818,14 @@ module.exports = function UserInput(outline) {
                    ?pred rdfs:domain ?subjectClass.
                 }
             */
-          subject = UI.utils.getAbout(kb, UI.utils.ancestor(selectedTd, 'TABLE').parentNode);
-          subjectClass = kb.any(subject, rdf('type'));
+          subject = UI.utils.getAbout(_solidLogic.store, UI.utils.ancestor(selectedTd, 'TABLE').parentNode);
+          subjectClass = _solidLogic.store.any(subject, rdf('type'));
           sparqlText = [];
           var endl = '.\n';
           sparqlText[0] = 'SELECT ?pred WHERE{\n?pred ' + rdf('type') + rdf('Property') + '.\n' + '?pred ' + UI.ns.rdfs('domain') + subjectClass + '.}'; // \n is required? SPARQL parser bug?
 
           sparqlText[1] = 'SELECT ?pred ?class\nWHERE{\n' + '?pred ' + rdf('type') + rdf('Property') + '.\n' + subjectClass + UI.ns.rdfs('subClassOf') + ' ?class.\n' + '?pred ' + UI.ns.rdfs('domain') + ' ?class.\n}';
-          sparqlText[2] = 'SELECT ?pred WHERE{\n' + subject + rdf('type') + kb.variable('subjectClass') + endl + kb.variable('pred') + UI.ns.rdfs('domain') + kb.variable('subjectClass') + endl + '}';
+          sparqlText[2] = 'SELECT ?pred WHERE{\n' + subject + rdf('type') + _solidLogic.store.variable('subjectClass') + endl + _solidLogic.store.variable('pred') + UI.ns.rdfs('domain') + _solidLogic.store.variable('subjectClass') + endl + '}';
           predicateQuery = sparqlText.map($rdf.SPARQLToQuery);
         } else {
           // ------selector
@@ -846,8 +846,8 @@ module.exports = function UserInput(outline) {
                    ?pred rdfs:domain ?subjectClass.
                    ?pred rdfs:range ?objectClass.
             */
-          subject = UI.utils.getAbout(kb, UI.utils.ancestor(selectedTd, 'TABLE').parentNode);
-          subjectClass = kb.any(subject, rdf('type'));
+          subject = UI.utils.getAbout(_solidLogic.store, UI.utils.ancestor(selectedTd, 'TABLE').parentNode);
+          subjectClass = _solidLogic.store.any(subject, rdf('type'));
           var object = selectedTd.parentNode.AJAR_statement.object; // var objectClass = (object.termType === 'Literal') ? UI.ns.rdfs('Literal') : kb.any(object, rdf('type'))
           // var sparqlText="SELECT ?pred WHERE{\n?pred "+rdf('type')+rdf('Property')+".\n"+
           //               "?pred "+UI.ns.rdfs('domain')+subjectClass+".\n"+
@@ -868,7 +868,7 @@ module.exports = function UserInput(outline) {
         // objectTd
         var predicateTerm = selectedTd.parentNode.AJAR_statement.predicate;
 
-        if (kb.whether(predicateTerm, rdf('type'), UI.ns.owl('DatatypeProperty')) || predicateTerm.termType === 'Collection' || kb.whether(predicateTerm, UI.ns.rdfs('range'), UI.ns.rdfs('Literal'))) {
+        if (_solidLogic.store.whether(predicateTerm, rdf('type'), UI.ns.owl('DatatypeProperty')) || predicateTerm.termType === 'Collection' || _solidLogic.store.whether(predicateTerm, UI.ns.rdfs('range'), UI.ns.rdfs('Literal'))) {
           selectedTd.className = '';
           UI.utils.emptyNode(selectedTd);
           this.lastModified = this.createInputBoxIn(selectedTd, ' (Please Input) ');
@@ -933,7 +933,7 @@ module.exports = function UserInput(outline) {
           if (menu.lastHighlight) menu.lastHighlight.className = '';
           menu.lastHighlight = item;
           menu.lastHighlight.className = 'activeItem';
-          outline.showURI(UI.utils.getAbout(kb, menu.lastHighlight));
+          outline.showURI(UI.utils.getAbout(_solidLogic.store, menu.lastHighlight));
         }
 
         if (enterEvent) {
@@ -1005,7 +1005,7 @@ module.exports = function UserInput(outline) {
                     return 'asGivenTxt';
                   }
 
-                  var inputTerm = UI.utils.getAbout(kb, menu.lastHighlight);
+                  var inputTerm = UI.utils.getAbout(_solidLogic.store, menu.lastHighlight);
                   var fillInType = mode === 'predicate' ? 'predicate' : 'object';
                   outline.UserInput.clearMenu();
                   outline.UserInput.fillInRequest(fillInType, InputBox.parentNode, inputTerm); // if (outline.UserInput.fillInRequest(fillInType,InputBox.parentNode,inputTerm))
@@ -1131,7 +1131,7 @@ module.exports = function UserInput(outline) {
 
           qp('at end of handler\n^^^^^^^^^^^^^^^^^\n\n');
           setHighlightItem(menu.firstChild.firstChild);
-          outline.showURI(UI.utils.getAbout(kb, menu.lastHighlight));
+          outline.showURI(UI.utils.getAbout(_solidLogic.store, menu.lastHighlight));
           return 'nothing to return';
         }
       }; // end of return function
@@ -1252,9 +1252,9 @@ module.exports = function UserInput(outline) {
       if (selectedTd.nextSibling) return 'predicate';
       var predicateTerm = this.getStatementAbout(selectedTd).predicate; // var predicateTerm=selectedTd.parentNode.AJAR_statement.predicate;
 
-      if (kb.whether(predicateTerm, UI.ns.rdf('type'), UI.ns.owl('DatatypeProperty')) || kb.whether(predicateTerm, UI.ns.rdfs('range'), UI.ns.rdfs('Literal')) || predicateTerm.termType === 'Collection') {
+      if (_solidLogic.store.whether(predicateTerm, UI.ns.rdf('type'), UI.ns.owl('DatatypeProperty')) || _solidLogic.store.whether(predicateTerm, UI.ns.rdfs('range'), UI.ns.rdfs('Literal')) || predicateTerm.termType === 'Collection') {
         return 'DatatypeProperty-like';
-      } else if (kb.whether(predicateTerm, rdf('type'), UI.ns.owl('ObjectProperty'))) {
+      } else if (_solidLogic.store.whether(predicateTerm, rdf('type'), UI.ns.owl('ObjectProperty'))) {
         return 'ObjectProperty-like';
       } else {
         return 'no-idea';
@@ -1310,7 +1310,9 @@ module.exports = function UserInput(outline) {
       outline.UserInput.clearMenu();
       var selectedTd = outline.getSelection()[0];
       var targetdoc = selectedTd.parentNode.AJAR_statement.why;
-      var newTerm = kb.nextSymbol(targetdoc);
+
+      var newTerm = _solidLogic.store.nextSymbol(targetdoc);
+
       outline.UserInput.fillInRequest('object', selectedTd, newTerm); // selection is changed
 
       outline.outlineExpand(outline.getSelection()[0], newTerm);
@@ -1336,7 +1338,7 @@ module.exports = function UserInput(outline) {
             if (this.value !== tiptext) {
               var newuri = this.value; // @@ Removed URI "fixup" code
 
-              This.fillInRequest('object', selectedTd, kb.sym(newuri));
+              This.fillInRequest('object', selectedTd, _solidLogic.store.sym(newuri));
             }
 
         }
@@ -1399,7 +1401,7 @@ module.exports = function UserInput(outline) {
       return insertTr;
     },
     bnode2symbol: function bnode2symbol(bnode, symbol) {
-      kb.copyTo(bnode, symbol, ['two-direction', 'delete']);
+      _solidLogic.store.copyTo(bnode, symbol, ['two-direction', 'delete']);
     },
     generateRequest: function generateRequest(tipText, trNew, isPredicate, notShow) {
       var trNode;
@@ -1544,7 +1546,8 @@ module.exports = function UserInput(outline) {
 
             if (target.childNodes.length === 2 && target.nextSibling) {
               // Yes
-              kb.add(bnodeTerm, IDpredicate, IDterm); // used to connect the two
+              _solidLogic.store.add(bnodeTerm, IDpredicate, IDterm); // used to connect the two
+
 
               outline.UserInput.clearMenu();
             } else if (target.childNodes.length === 2) {
@@ -1560,7 +1563,7 @@ module.exports = function UserInput(outline) {
 
             selectItem = function selectItem(e) {
               qp('LIMITED P SELECT ITEM!!!!');
-              var selectedPredicate = UI.utils.getAbout(kb, UI.utils.getTarget(e));
+              var selectedPredicate = UI.utils.getAbout(_solidLogic.store, UI.utils.getTarget(e));
               var predicateChoices = clickedTd.parentNode.AJAR_statement.predicate.elements;
 
               for (var i = 0; i < predicateChoices.length; i++) {
@@ -1594,7 +1597,7 @@ module.exports = function UserInput(outline) {
 
             selectItem = function selectItem(e) {
               qp('WOOHOO');
-              var inputTerm = UI.utils.getAbout(kb, UI.utils.getTarget(e));
+              var inputTerm = UI.utils.getAbout(_solidLogic.store, UI.utils.getTarget(e));
               qp('GENERAL SELECT ITEM!!!!!!=' + inputTerm);
               qp('target=' + UI.utils.getTarget(e));
 
@@ -1628,7 +1631,7 @@ module.exports = function UserInput(outline) {
 
       var NameSpaces = {}; // for each (ontology in ontologies)
 
-      kb.each(undefined, UI.ns.rdf('type'), UI.ns.owl('Ontology')).forEach(function (ontology) {
+      _solidLogic.store.each(undefined, UI.ns.rdf('type'), UI.ns.owl('Ontology')).forEach(function (ontology) {
         var label = UI.utils.label(ontology);
         if (!label) return; // this is like extracting metadata from URI. Maybe it's better not to take the abbrevs.
 
@@ -1697,18 +1700,20 @@ module.exports = function UserInput(outline) {
             var h1 = table.appendChild(myDocument.createElement('tr'));
             var h1th = h1.appendChild(myDocument.createElement('th'));
             h1th.appendChild(myDocument.createTextNode('Did you mean...'));
-            var plist = kb.statementsMatching(dialogTerm);
+
+            var plist = _solidLogic.store.statementsMatching(dialogTerm);
+
             var i;
 
             for (i = 0; i < plist.length; i++) {
-              if (kb.whether(plist[i].predicate, rdf('type'), UI.ns.owl('InverseFunctionalProperty'))) {
+              if (_solidLogic.store.whether(plist[i].predicate, rdf('type'), UI.ns.owl('InverseFunctionalProperty'))) {
                 break;
               }
             }
 
             var _IDpredicate = plist[i].predicate;
 
-            var _IDterm = kb.any(dialogTerm, plist[i].predicate);
+            var _IDterm = _solidLogic.store.any(dialogTerm, plist[i].predicate);
 
             var text = UI.utils.label(dialogTerm) + ' who has ' + UI.utils.label(_IDpredicate) + ' ' + _IDterm + '?';
             var h2 = table.appendChild(myDocument.createElement('tr'));
@@ -1742,7 +1747,7 @@ module.exports = function UserInput(outline) {
             tempQuery.vars = [];
             tempQuery.vars.push('Kenny');
             var tempBinding = {};
-            tempBinding.Kenny = kb.fromNT(predicates[_i].NT);
+            tempBinding.Kenny = _solidLogic.store.fromNT(predicates[_i].NT);
 
             try {
               addPredicateChoice(tempQuery)(tempBinding);
@@ -1837,12 +1842,15 @@ module.exports = function UserInput(outline) {
             console.log('testing searching text= ' + inputText + ' =====\n');
             console.log('\n===start JournalTitleAutoComplete\n'); // Gets all the URI's with type Journal in the knowledge base
 
-            var juris = kb.each(undefined, rdf('type'), bibo('Journal'));
+            var juris = _solidLogic.store.each(undefined, rdf('type'), bibo('Journal'));
+
             var matchedtitle = []; // debugging display before inserts into menu
 
             for (var _i4 = 0; _i4 < juris.length; _i4++) {
               var juri = juris[_i4];
-              var jtitle = kb.each(juri, dcelems('title'), undefined);
+
+              var jtitle = _solidLogic.store.each(juri, dcelems('title'), undefined);
+
               var jtstr = jtitle + '';
               var matchstr = inputText.toLowerCase();
               var jTitleLowerCase = jtstr.toLowerCase(); // If the inputText as a whole is contained in a journal title
@@ -1871,11 +1879,12 @@ module.exports = function UserInput(outline) {
 
         case 'LimitedPredicateChoice':
           {
-            var choiceTerm = UI.utils.getAbout(kb, extraInformation.clickedTd); // because getAbout relies on kb.fromNT, which does not deal with
+            var choiceTerm = UI.utils.getAbout(_solidLogic.store, extraInformation.clickedTd); // because getAbout relies on kb.fromNT, which does not deal with
             // the 'Collection' termType. This termType is ambiguous anyway.
 
             choiceTerm.termType = 'Collection';
-            var choices = kb.each(choiceTerm, UI.ns.link('element'));
+
+            var choices = _solidLogic.store.each(choiceTerm, UI.ns.link('element'));
 
             for (var _i5 = 0; _i5 < choices.length; _i5++) {
               addMenuItem(choices[_i5]);
@@ -1899,7 +1908,7 @@ module.exports = function UserInput(outline) {
             switch (inputQuery.constructor.name) {
               case 'Array':
                 for (var _i6 = 0; _i6 < inputQuery.length; _i6++) {
-                  kb.query(inputQuery[_i6], addPredicateChoice(inputQuery[_i6]), nullFetcher);
+                  _solidLogic.store.query(inputQuery[_i6], addPredicateChoice(inputQuery[_i6]), nullFetcher);
                 }
 
                 break;
@@ -1909,7 +1918,8 @@ module.exports = function UserInput(outline) {
               // break
 
               default:
-                kb.query(inputQuery, addPredicateChoice(inputQuery), nullFetcher);
+                _solidLogic.store.query(inputQuery, addPredicateChoice(inputQuery), nullFetcher);
+
             }
           }
       }
@@ -1931,7 +1941,7 @@ module.exports = function UserInput(outline) {
 
       var eventhandler;
 
-      if (kb.any(reqTerm, UI.ns.link('onfillin'))) {
+      if (_solidLogic.store.any(reqTerm, UI.ns.link('onfillin'))) {
         /*    2017 -- Not sure what is supposed to happen here -- timbl @@@@
         eventhandler = function(subject) {
           return kb.any(reqTerm, UI.ns.link('onfillin')).value)
@@ -1947,9 +1957,9 @@ module.exports = function UserInput(outline) {
           var s = new UI.rdf.Statement(stat.subject, inputTerm, stat.object, stat.why);
 
           try {
-            UI.store.updater.update([], [s], function (uri, success, errorBody) {
+            _solidLogic.store.updater.update([], [s], function (uri, success, errorBody) {
               if (success) {
-                newStat = kb.anyStatementMatching(stat.subject, inputTerm, stat.object, stat.why);
+                newStat = _solidLogic.store.anyStatementMatching(stat.subject, inputTerm, stat.object, stat.why);
                 tr.AJAR_statement = newStat;
                 newTd.className = newTd.className.replace(/ pendingedit/g, '');
               } else {
@@ -1991,7 +2001,7 @@ module.exports = function UserInput(outline) {
           }
 
           try {
-            UI.store.updater.update([], [_s], function (uri, success, _errorBody) {
+            _solidLogic.store.updater.update([], [_s], function (uri, success, _errorBody) {
               UI.log.info('@@ usinput.js (object) callback ok=' + success + ' for statement:' + _s + '\n ');
               var newStats;
 
@@ -1999,9 +2009,9 @@ module.exports = function UserInput(outline) {
                 _newTd.className = _newTd.className.replace(/ pendingedit/g, ''); // User feedback
 
                 if (!isInverse) {
-                  newStats = kb.statementsMatching(stat.subject, stat.predicate, inputTerm, stat.why);
+                  newStats = _solidLogic.store.statementsMatching(stat.subject, stat.predicate, inputTerm, stat.why);
                 } else {
-                  newStats = kb.statementsMatching(inputTerm, stat.predicate, stat.object, stat.why);
+                  newStats = _solidLogic.store.statementsMatching(inputTerm, stat.predicate, stat.object, stat.why);
                 }
 
                 if (!newStats.length) {