solid-logic 2.0.1 → 2.1.0

package/lib/inbox/inboxLogic.js

@@ -41,7 +41,7 @@ var utils_1 = require("../util/utils");
 function createInboxLogic(store, profileLogic, utilityLogic, containerLogic, aclLogic) {
     function createInboxFor(peerWebId, nick) {
         return __awaiter(this, void 0, void 0, function () {
-            var myWebId, podRoot, ourInbox, aclDocUrl;
+            var myWebId, podRoot, ourInbox;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, profileLogic.loadMe()];
@@ -54,16 +54,15 @@ function createInboxLogic(store, profileLogic, utilityLogic, containerLogic, acl
                         return [4 /*yield*/, containerLogic.createContainer(ourInbox)];
                     case 3:
                         _a.sent();
-                        return [4 /*yield*/, aclLogic.findAclDocUrl(ourInbox)];
-                    case 4:
-                        aclDocUrl = _a.sent();
+                        // const aclDocUrl = await aclLogic.findAclDocUrl(ourInbox);
                         return [4 /*yield*/, utilityLogic.setSinglePeerAccess({
                                 ownerWebId: myWebId.value,
                                 peerWebId: peerWebId,
                                 accessToModes: 'acl:Append',
                                 target: ourInbox
                             })];
-                    case 5:
+                    case 4:
+                        // const aclDocUrl = await aclLogic.findAclDocUrl(ourInbox);
                         _a.sent();
                         return [2 /*return*/, ourInbox];
                 }

package/lib/inbox/inboxLogic.js.map

@@ -1 +1 @@
-{"version":3,"file":"inboxLogic.js","sourceRoot":"","sources":["../../src/inbox/inboxLogic.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,uCAA8C;AAE9C,SAAgB,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,QAAQ;IAExF,SAAe,cAAc,CAAC,SAAiB,EAAE,IAAY;;;;;4BAChC,qBAAM,YAAY,CAAC,MAAM,EAAE,EAAA;;wBAAhD,OAAO,GAAc,SAA2B;wBAC3B,qBAAM,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,EAAA;;wBAA3D,OAAO,GAAc,SAAsC;wBAC3D,QAAQ,GAAG,UAAG,OAAO,CAAC,KAAK,yBAAe,kBAAkB,CAAC,IAAI,CAAC,MAAG,CAAC;wBAC5E,qBAAM,cAAc,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAA;;wBAA9C,SAA8C,CAAC;wBAC7B,qBAAM,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAA;;wBAAlD,SAAS,GAAG,SAAsC;wBACxD,qBAAM,YAAY,CAAC,mBAAmB,CAAC;gCACrC,UAAU,EAAE,OAAO,CAAC,KAAK;gCACzB,SAAS,WAAA;gCACT,aAAa,EAAE,YAAY;gCAC3B,MAAM,EAAE,QAAQ;6BACjB,CAAC,EAAA;;wBALF,SAKE,CAAC;wBACH,sBAAO,QAAQ,EAAC;;;;KACnB;IAED,SAAe,cAAc,CACzB,IAAgB;;;;;;6BAEZ,CAAC,IAAI,EAAL,wBAAK;wBACA,qBAAM,YAAY,CAAC,MAAM,EAAE,EAAA;;wBAAlC,IAAI,GAAG,SAA2B,CAAC;;4BAEvB,qBAAM,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,EAAA;;wBAA7C,KAAK,GAAG,SAAqC;wBACtC,qBAAM,cAAc,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAA;;wBAA5D,IAAI,GAAG,SAAqD;wBAClE,sBAAO,IAAI,CAAC,MAAM,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,EAAhC,CAAgC,CAAC,EAAC;;;;KAC/D;IAED,SAAe,UAAU,CAAC,GAAW,EAAE,IAAU;;;;;;4BAC5B,qBAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAA;;wBAA5C,UAAU,GAAG,SAA+B;wBAClD,IAAI,UAAU,CAAC,MAAM,KAAK,GAAG,EAAE;4BAC7B,MAAM,IAAI,KAAK,CAAC,kBAAW,GAAG,CAAE,CAAC,CAAC;yBACnC;wBACK,UAAU,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;;4BAE1C,MAAM,EAAE,KAAK;;wBACP,qBAAM,UAAU,CAAC,IAAI,EAAE,EAAA;;wBAFzB,OAAO,IAEX,OAAI,GAAE,SAAuB;4BAC7B,UAAO,GAAE;gCACP,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,0BAA0B,CAAC;6BACvF;+BACF;wBACgB,qBAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,EAAA;;wBAA1D,QAAQ,GAAG,SAA+C;6BAC5D,CAAA,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAA,EAArC,wBAAqC;wBACvC,qBAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;gCAC9B,MAAM,EAAE,QAAQ;6BACjB,CAAC,EAAA;;wBAFF,SAEE,CAAC;;;;;;KAEN;IACD,OAAO;QACL,cAAc,gBAAA;QACd,cAAc,gBAAA;QACd,UAAU,YAAA;KACX,CAAA;AACH,CAAC;AArDD,4CAqDC"}
+{"version":3,"file":"inboxLogic.js","sourceRoot":"","sources":["../../src/inbox/inboxLogic.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,uCAA8C;AAE9C,SAAgB,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,QAAQ;IAExF,SAAe,cAAc,CAAC,SAAiB,EAAE,IAAY;;;;;4BAChC,qBAAM,YAAY,CAAC,MAAM,EAAE,EAAA;;wBAAhD,OAAO,GAAc,SAA2B;wBAC3B,qBAAM,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,EAAA;;wBAA3D,OAAO,GAAc,SAAsC;wBAC3D,QAAQ,GAAG,UAAG,OAAO,CAAC,KAAK,yBAAe,kBAAkB,CAAC,IAAI,CAAC,MAAG,CAAC;wBAC5E,qBAAM,cAAc,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAA;;wBAA9C,SAA8C,CAAC;wBAC/C,4DAA4D;wBAC5D,qBAAM,YAAY,CAAC,mBAAmB,CAAC;gCACrC,UAAU,EAAE,OAAO,CAAC,KAAK;gCACzB,SAAS,WAAA;gCACT,aAAa,EAAE,YAAY;gCAC3B,MAAM,EAAE,QAAQ;6BACjB,CAAC,EAAA;;wBANF,4DAA4D;wBAC5D,SAKE,CAAC;wBACH,sBAAO,QAAQ,EAAC;;;;KACnB;IAED,SAAe,cAAc,CACzB,IAAgB;;;;;;6BAEZ,CAAC,IAAI,EAAL,wBAAK;wBACA,qBAAM,YAAY,CAAC,MAAM,EAAE,EAAA;;wBAAlC,IAAI,GAAG,SAA2B,CAAC;;4BAEvB,qBAAM,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,EAAA;;wBAA7C,KAAK,GAAG,SAAqC;wBACtC,qBAAM,cAAc,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAA;;wBAA5D,IAAI,GAAG,SAAqD;wBAClE,sBAAO,IAAI,CAAC,MAAM,CAAC,UAAA,GAAG,IAAI,OAAA,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,EAAhC,CAAgC,CAAC,EAAC;;;;KAC/D;IAED,SAAe,UAAU,CAAC,GAAW,EAAE,IAAU;;;;;;4BAC5B,qBAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAA;;wBAA5C,UAAU,GAAG,SAA+B;wBAClD,IAAI,UAAU,CAAC,MAAM,KAAK,GAAG,EAAE;4BAC7B,MAAM,IAAI,KAAK,CAAC,kBAAW,GAAG,CAAE,CAAC,CAAC;yBACnC;wBACK,UAAU,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;;4BAE1C,MAAM,EAAE,KAAK;;wBACP,qBAAM,UAAU,CAAC,IAAI,EAAE,EAAA;;wBAFzB,OAAO,IAEX,OAAI,GAAE,SAAuB;4BAC7B,UAAO,GAAE;gCACP,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,0BAA0B,CAAC;6BACvF;+BACF;wBACgB,qBAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,EAAA;;wBAA1D,QAAQ,GAAG,SAA+C;6BAC5D,CAAA,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAA,EAArC,wBAAqC;wBACvC,qBAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;gCAC9B,MAAM,EAAE,QAAQ;6BACjB,CAAC,EAAA;;wBAFF,SAEE,CAAC;;;;;;KAEN;IACD,OAAO;QACL,cAAc,gBAAA;QACd,cAAc,gBAAA;QACd,UAAU,YAAA;KACX,CAAA;AACH,CAAC;AArDD,4CAqDC"}

package/lib/profile/profileLogic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"profileLogic.d.ts","sourceRoot":"","sources":["../../src/profile/profileLogic.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAEvC,wBAAgB,kBAAkB,CAAC,KAAK,KAAA,EAAE,KAAK,KAAA,EAAE,YAAY,KAAA,GAAG,YAAY,CAqH3E"}
+{"version":3,"file":"profileLogic.d.ts","sourceRoot":"","sources":["../../src/profile/profileLogic.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAEvC,wBAAgB,kBAAkB,CAAC,KAAK,KAAA,EAAE,KAAK,KAAA,EAAE,YAAY,KAAA,GAAG,YAAY,CAoH3E"}

package/lib/profile/profileLogic.js

@@ -97,7 +97,7 @@ function createProfileLogic(store, authn, utilityLogic) {
      */
     function loadPreferences(user) {
         return __awaiter(this, void 0, void 0, function () {
-            var possiblePreferencesFile, preferencesFile, err_2, message, response, err_3, msg;
+            var possiblePreferencesFile, preferencesFile, err_2, message, err_3, msg;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, loadProfile(user)];
@@ -139,7 +139,7 @@ function createProfileLogic(store, authn, utilityLogic) {
                         _a.trys.push([5, 7, , 8]);
                         return [4 /*yield*/, store.fetcher.load(preferencesFile)];
                     case 6:
-                        response = _a.sent();
+                        _a.sent();
                         return [3 /*break*/, 8];
                     case 7:
                         err_3 = _a.sent();

package/lib/profile/profileLogic.js.map

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

package/lib/typeIndex/typeIndexLogic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeIndexLogic.d.ts","sourceRoot":"","sources":["../../src/typeIndex/typeIndexLogic.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,cAAc,EAAkB,MAAM,UAAU,CAAA;AAKpE,wBAAgB,oBAAoB,CAAC,KAAK,KAAA,EAAE,KAAK,KAAA,EAAE,YAAY,KAAA,EAAE,YAAY,KAAA,GAAG,cAAc,CA2L7F"}
+{"version":3,"file":"typeIndexLogic.d.ts","sourceRoot":"","sources":["../../src/typeIndex/typeIndexLogic.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,cAAc,EAAkB,MAAM,UAAU,CAAA;AAKpE,wBAAgB,oBAAoB,CAAC,KAAK,KAAA,EAAE,KAAK,KAAA,EAAE,YAAY,KAAA,EAAE,YAAY,KAAA,GAAG,cAAc,CA4L7F"}

package/lib/typeIndex/typeIndexLogic.js

@@ -322,38 +322,49 @@ function createTypeIndexLogic(store, authn, profileLogic, utilityLogic) {
     }
     function getScopedAppsFromIndex(scope, theClass) {
         return __awaiter(this, void 0, void 0, function () {
-            var index, registrations, relevant, directInstances, instances, instanceContainers, containers, i, cont, contents;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var index, results, registrations, _i, registrations_1, reg, klass, instances, _a, instances_1, instance, containers, _b, containers_1, cont, contents, _c, contents_1, instance;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         index = scope.index;
+                        results = [];
                         registrations = store.statementsMatching(null, ns.solid('instance'), null, index)
                             .concat(store.statementsMatching(null, ns.solid('instanceContainer'), null, index))
                             .map(function (st) { return st.subject; });
-                        relevant = theClass ? registrations.filter(function (reg) { var _a; return (_a = store.any(reg, ns.solid('forClass'), null, index)) === null || _a === void 0 ? void 0 : _a.sameTerm(theClass); })
-                            : registrations;
-                        directInstances = relevant.map(function (reg) { return store.each(reg, ns.solid('instance'), null, index).map(function (one) { return (0, rdflib_1.sym)(one.value); }); }).flat();
-                        instances = (0, utils_1.uniqueNodes)(directInstances);
-                        instanceContainers = relevant.map(function (reg) { return store.each(reg, ns.solid('instanceContainer'), null, index).map(function (one) { return (0, rdflib_1.sym)(one.value); }); }).flat();
-                        containers = (0, utils_1.uniqueNodes)(instanceContainers);
-                        if (containers.length > 0) {
-                            console.log('@@ getScopedAppsFromIndex containers ', containers);
-                        }
-                        i = 0;
-                        _a.label = 1;
+                        _i = 0, registrations_1 = registrations;
+                        _d.label = 1;
                     case 1:
-                        if (!(i < containers.length)) return [3 /*break*/, 4];
-                        cont = containers[i];
-                        return [4 /*yield*/, store.fetcher.load(cont)];
+                        if (!(_i < registrations_1.length)) return [3 /*break*/, 6];
+                        reg = registrations_1[_i];
+                        klass = store.any(reg, ns.solid('forClass'), null, index);
+                        if (!(!theClass || klass.sameTerm(theClass))) return [3 /*break*/, 5];
+                        instances = store.each(reg, ns.solid('instance'), null, index);
+                        for (_a = 0, instances_1 = instances; _a < instances_1.length; _a++) {
+                            instance = instances_1[_a];
+                            results.push({ instance: instance, type: klass, scope: scope });
+                        }
+                        containers = store.each(reg, ns.solid('instanceContainer'), null, index);
+                        _b = 0, containers_1 = containers;
+                        _d.label = 2;
                     case 2:
-                        _a.sent();
-                        contents = store.each(cont, ns.ldp('contains'), null, cont).map(function (one) { return (0, rdflib_1.sym)(one.value); });
-                        instances = instances.concat(contents);
-                        _a.label = 3;
+                        if (!(_b < containers_1.length)) return [3 /*break*/, 5];
+                        cont = containers_1[_b];
+                        return [4 /*yield*/, store.fetcher.load(cont)];
                     case 3:
-                        i++;
+                        _d.sent();
+                        contents = store.each(cont, ns.ldp('contains'), null, cont).map(function (one) { return (0, rdflib_1.sym)(one.value); });
+                        for (_c = 0, contents_1 = contents; _c < contents_1.length; _c++) {
+                            instance = contents_1[_c];
+                            results.push({ instance: (0, rdflib_1.sym)(instance.value), type: klass, scope: scope });
+                        }
+                        _d.label = 4;
+                    case 4:
+                        _b++;
+                        return [3 /*break*/, 2];
+                    case 5:
+                        _i++;
                         return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, instances.map(function (instance) { return { instance: instance, scope: scope }; })];
+                    case 6: return [2 /*return*/, results];
                 }
             });
         });

package/lib/typeIndex/typeIndexLogic.js.map

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

package/lib/types.d.ts

@@ -35,6 +35,7 @@ export declare type TypeIndexScope = {
 };
 export declare type ScopedApp = {
     instance: NamedNode;
+    type: NamedNode;
     scope: TypeIndexScope;
 };
 export interface NewPaneOptions {

package/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAExD,oBAAY,UAAU,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,oBAAY,qBAAqB,GAAG;IAChC,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;IAC7B,GAAG,CAAC,EAAE,WAAW,CAAA;IACjB,GAAG,CAAC,EAAE,YAAY,CAAA;IAClB,KAAK,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,CAAA;KAAE,CAAA;IAC3C,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;IAC5B,EAAE,CAAC,EAAE,SAAS,GAAG,IAAI,CAAA;IACrB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,eAAe,CAAC,EAAE,SAAS,CAAA;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,aAAa,CAAC,EAAE,SAAS,CAAA;IACzB,UAAU,CAAC,EAAE,WAAW,CAAA;CAC3B,CAAA;AAED,MAAM,WAAW,UAAU;IACvB,WAAW,EAAE,OAAO,CAAA;IACpB,WAAW,EAAE,MAAM,SAAS,GAAG,IAAI,CAAA;IACnC,SAAS,EAAE,CAAC,CAAC,EAAE,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI,KAAK,CAAC,KAAK,OAAO,CAAC,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;IAC9F,QAAQ,EAAE,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,EACvC,OAAO,CAAC,EAAE,qBAAqB,KAAK,SAAS,GAAG,IAAI,CAAA;CAC3D;AAED,MAAM,WAAW,cAAc;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,SAAS,CAAA;CAC7C;AAED,oBAAY,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,CAAA;AAClF,oBAAY,SAAS,GAAG;IAAE,QAAQ,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,cAAc,CAAA;CAAE,CAAA;AAEvF,MAAM,WAAW,cAAc;IAC3B,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACnC,WAAW,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,WAAW,SAAS;IACtB,MAAM,EAAE,CAAC,aAAa,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvF,qBAAqB,EAAE,CAAC,SAAS,KAAA,EAAE,EAAE,KAAA,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,QAAQ,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,eAAe,EAAE,CAAC,aAAa,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACjF,OAAO,EAAE,CAAC,cAAc,EAAE,cAAc,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACzE,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,KAAA,KAAK,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IACpE,UAAU,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,KAAK,IAAI,CAAA;CACjE;AAED,MAAM,WAAW,IAAI;IACjB,EAAE,EAAE,SAAS,CAAC;IACd,aAAa,EAAE,SAAS,CAAC;IACzB,MAAM,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,YAAY;IACzB,uBAAuB,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAC7E,eAAe,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACzD,WAAW,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACrD,MAAM,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;IACjC,UAAU,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,SAAS,CAAC;IAC3C,YAAY,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACtD,WAAW,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,GAAG,IAAI,CAAA;CAC9C;AAED,MAAM,WAAW,QAAQ;IACrB,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7C,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAC5C,OAAO,EAAE;QACL,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,MAAM,CAAC,EAAE,EAAE,CAAA;KACd,KACA,OAAO,CAAC,SAAS,CAAC,CAAC;IACxB,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EACtD,OAAO,EAAE;QACL,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,MAAM,CAAC,EAAE,EAAE,CAAA;KACd,KACA,MAAM,GAAG,SAAS,CAAA;CAC1B;AAED,MAAM,WAAW,UAAU;IACvB,cAAc,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrE,cAAc,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACxD,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,KAAK,IAAI,CAAA;CAChD;AAED,MAAM,WAAW,cAAc;IAC3B,gBAAgB,EAAE,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA,KAAK,IAAI,EAAE,CAAC;IACjD,kBAAkB,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;IACxE,wBAAwB,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAC3E,kBAAkB,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;IACxE,qBAAqB,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IACnF,eAAe,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IAC5D,sBAAsB,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,SAAS,CAAC;IACrD,uBAAuB,EAAE,CAAC,eAAe,EAAE,SAAS,KAAK,SAAS,CAAC;IACnE,mBAAmB,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IAC/G,2BAA2B,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACzD,sBAAsB,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,GAAG,IAAI,KAAK,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;CACtG;AAED,MAAM,WAAW,UAAU;IACvB,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,EAAE,UAAU,CAAC;IAClB,GAAG,EAAE,QAAQ,CAAC;IACd,OAAO,EAAE,YAAY,CAAC;IACtB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,cAAc,CAAC;IAC1B,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,CAAC,GAAG,EAAE,SAAS,GAAG,SAAS,EAAE,GAAG,MAAM,KAAK,IAAI,CAAC;IACtD,aAAa,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,UAAU,EAAE,MAAM,IAAI,CAAA;CACzB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-logic",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Core business logic of Solid OS",
   "main": "lib/index.js",
   "scripts": {

package/src/inbox/inboxLogic.ts

@@ -3,13 +3,13 @@ import { InboxLogic } from "../types";
 import { getArchiveUrl } from "../util/utils";
 
 export function createInboxLogic(store, profileLogic, utilityLogic, containerLogic, aclLogic): InboxLogic {
-  
+
     async function createInboxFor(peerWebId: string, nick: string) {
       const myWebId: NamedNode = await profileLogic.loadMe();
       const podRoot: NamedNode = await profileLogic.getPodRoot(myWebId);
       const ourInbox = `${podRoot.value}p2p-inboxes/${encodeURIComponent(nick)}/`;
       await containerLogic.createContainer(ourInbox);
-      const aclDocUrl = await aclLogic.findAclDocUrl(ourInbox);
+      // const aclDocUrl = await aclLogic.findAclDocUrl(ourInbox);
       await utilityLogic.setSinglePeerAccess({
         ownerWebId: myWebId.value,
         peerWebId,
@@ -55,4 +55,4 @@ export function createInboxLogic(store, profileLogic, utilityLogic, containerLog
     getNewMessages,
     markAsRead
   }
-}
+}

package/src/profile/profileLogic.ts

@@ -11,7 +11,7 @@ export function createProfileLogic(store, authn, utilityLogic): ProfileLogic {
     /**
      * loads the preference without throwing errors - if it can create it it does so.
      * remark: it still throws error if it cannot load profile.
-     * @param user 
+     * @param user
      * @returns undefined if preferenceFile cannot be returned or NamedNode if it can find it or create it
      */
     async function silencedLoadPreferences(user: NamedNode): Promise <NamedNode | undefined> {
@@ -25,7 +25,7 @@ export function createProfileLogic(store, authn, utilityLogic): ProfileLogic {
     /**
      * loads the preference without returning different errors if it cannot create or load it.
      * remark: it also throws error if it cannot load profile.
-     * @param user 
+     * @param user
      * @returns undefined if preferenceFile cannot be an Error or NamedNode if it can find it or create it
      */
     async function loadPreferences (user: NamedNode): Promise <NamedNode> {
@@ -48,9 +48,8 @@ export function createProfileLogic(store, authn, utilityLogic): ProfileLogic {
             throw err
         }
 
-        let response
         try {
-            response = await store.fetcher.load(preferencesFile as NamedNode)
+            await store.fetcher.load(preferencesFile as NamedNode)
         } catch (err) { // Maybe a permission problem or origin problem
             const msg = `Unable to load preference of user ${user}: ${err}`
             debug.warn(msg)
@@ -123,4 +122,3 @@ export function createProfileLogic(store, authn, utilityLogic): ProfileLogic {
         silencedLoadPreferences
     }
 }
-

package/src/typeIndex/typeIndexLogic.ts

@@ -2,7 +2,7 @@ import { NamedNode, st, sym } from 'rdflib'
 import { ScopedApp, TypeIndexLogic, TypeIndexScope } from '../types'
 import * as debug from "../util/debug"
 import { ns as namespace } from '../util/ns'
-import { newThing, uniqueNodes } from "../util/utils"
+import { newThing } from "../util/utils"
 
 export function createTypeIndexLogic(store, authn, profileLogic, utilityLogic): TypeIndexLogic {
     const ns = namespace
@@ -155,29 +155,30 @@ export function createTypeIndexLogic(store, authn, profileLogic, utilityLogic):
 
     async function getScopedAppsFromIndex(scope: TypeIndexScope, theClass: NamedNode | null): Promise<ScopedApp[]> {
         const index = scope.index
+        const results: ScopedApp[] = []
         const registrations = store.statementsMatching(null, ns.solid('instance'), null, index)
             .concat(store.statementsMatching(null, ns.solid('instanceContainer'), null, index))
             .map(st => st.subject)
-        const relevant = theClass ? registrations.filter(reg => store.any(reg, ns.solid('forClass'), null, index)?.sameTerm(theClass))
-            : registrations
-        const directInstances = relevant.map(reg => store.each(reg, ns.solid('instance'), null, index).map(one => sym(one.value))).flat()
-        let instances = uniqueNodes(directInstances)
-
-        const instanceContainers = relevant.map(
-            reg => store.each(reg, ns.solid('instanceContainer'), null, index).map(one => sym(one.value))).flat()
-
-        //  instanceContainers may be deprocatable if no one has used them
-        const containers = uniqueNodes(instanceContainers)
-        if (containers.length > 0) { console.log('@@ getScopedAppsFromIndex containers ', containers) }
-        for (let i = 0; i < containers.length; i++) {
-            const cont = containers[i]
-            await store.fetcher.load(cont)
-            const contents = store.each(cont, ns.ldp('contains'), null, cont).map(one => sym(one.value))
-            instances = instances.concat(contents)
+        for (const reg of registrations) {
+          const klass = store.any(reg, ns.solid('forClass'), null, index)
+          if (!theClass || klass.sameTerm(theClass)) {
+            const instances = store.each(reg, ns.solid('instance'), null, index)
+            for (const instance of instances) {
+              results.push({ instance, type: klass, scope })
+            }
+            const containers = store.each(reg, ns.solid('instanceContainer'), null, index)
+            for (const cont of containers) {
+              await store.fetcher.load(cont)
+              const contents = store.each(cont, ns.ldp('contains'), null, cont).map(one => sym(one.value))
+              for (const instance of contents) {
+                results.push({ instance: sym(instance.value), type: klass,  scope })
+              }
+            }
+          }
         }
-        return instances.map(instance => { return { instance, scope } })
+        return results
     }
-    
+
     return {
         registerInTypeIndex,
         getRegistrations,

package/src/types.ts

@@ -33,7 +33,7 @@ export interface SolidNamespace {
 }
 
 export type TypeIndexScope = { label: string, index: NamedNode, agent: NamedNode }
-export type ScopedApp = { instance: NamedNode, scope: TypeIndexScope }
+export type ScopedApp = { instance: NamedNode, type: NamedNode, scope: TypeIndexScope }
 
 export interface NewPaneOptions {
     me?: NamedNode;
@@ -119,4 +119,3 @@ export interface SolidLogic {
     updatePromise: (del: Array<Statement>, ins: Array<Statement>) => Promise<void>,
     clearStore: () => void
 }
-

package/test/typeIndexLogic.test.ts

@@ -1,6 +1,6 @@
 /**
 * @jest-environment jsdom
-* 
+*
 */
 import { Fetcher, Store, sym, UpdateManager } from "rdflib";
 import { createAclLogic } from "../src/acl/aclLogic";
@@ -45,7 +45,7 @@ describe("TypeIndex logic NEW", () => {
             return alice;
         },
     };
-    
+
     beforeEach(() => {
         fetchMock.resetMocks();
         requests = []
@@ -80,7 +80,7 @@ describe("TypeIndex logic NEW", () => {
             body: 'Not Found'
         }
         })
-        
+
         store = new Store()
         store.fetcher = new Fetcher(store, { fetch: fetch });
         store.updater = new UpdateManager(store);
@@ -173,209 +173,7 @@ describe("TypeIndex logic NEW", () => {
         })
     })
 
-    const AliceAndClubScopes =
-    [
-    {
-        "instance":  {
-        "classOrder": 5,
-        "termType": "NamedNode",
-        "value": "https://alice.example.com/publicStuff/actionItems.ttl#this",
-        },
-        "scope":  {
-        "agent":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/profile/card.ttl#me",
-        },
-        "index":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/profile/public-type-index.ttl",
-        },
-        "label": "public",
-        },
-    },
-    {
-        "instance":  {
-        "classOrder": 5,
-        "termType": "NamedNode",
-        "value": "https://alice.example.com/project4/issues.ttl#this",
-        },
-        "scope": {
-        "agent":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/profile/card.ttl#me",
-        },
-        "index": {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/profile/public-type-index.ttl",
-        },
-        "label": "public",
-        },
-    },
-    {
-        "instance":  {
-        "classOrder": 5,
-        "termType": "NamedNode",
-        "value": "https://alice.example.com/privateStuff/ToDo.ttl#this",
-        },
-        "scope":  {
-        "agent": {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/profile/card.ttl#me",
-        },
-        "index":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/settings/private-type-index.ttl",
-        },
-        "label": "private",
-        },
-    },
-    {
-        "instance":  {
-        "classOrder": 5,
-        "termType": "NamedNode",
-        "value": "https://alice.example.com/privateStuff/Goals.ttl#this",
-        },
-        "scope": {
-        "agent":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/profile/card.ttl#me",
-        },
-        "index":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/settings/private-type-index.ttl",
-        },
-        "label": "private",
-        },
-    },
-    {
-        "instance":  {
-        "classOrder": 5,
-        "termType": "NamedNode",
-        "value": "https://alice.example.com/privateStuff/workingOn.ttl#this",
-        },
-        "scope":  {
-        "agent":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/profile/card.ttl#me",
-        },
-        "index":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/settings/private-type-index.ttl",
-        },
-        "label": "private",
-        },
-    },
-    {
-        "instance":  {
-        "classOrder": 5,
-        "termType": "NamedNode",
-        "value": "https://club.example.com/publicStuff/actionItems.ttl#this",
-        },
-        "scope": {
-        "agent":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/profile/card.ttl#it",
-        },
-        "index":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/profile/public-type-index.ttl",
-        },
-        "label": "public",
-        },
-    },
-    {
-        "instance":  {
-        "classOrder": 5,
-        "termType": "NamedNode",
-        "value": "https://club.example.com/project4/clubIssues.ttl#this",
-        },
-        "scope":  {
-        "agent": {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/profile/card.ttl#it",
-        },
-        "index":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/profile/public-type-index.ttl",
-        },
-        "label": "public",
-        },
-    },
-    {
-        "instance": {
-        "classOrder": 5,
-        "termType": "NamedNode",
-        "value": "https://club.example.com/privateStuff/ToDo.ttl#this",
-        },
-        "scope":  {
-        "agent":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/profile/card.ttl#it",
-        },
-        "index":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/settings/private-type-index.ttl",
-        },
-        "label": "private",
-        },
-    },
-    {
-        "instance":  {
-        "classOrder": 5,
-        "termType": "NamedNode",
-        "value": "https://club.example.com/privateStuff/Goals.ttl#this",
-        },
-        "scope":  {
-        "agent":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/profile/card.ttl#it",
-        },
-        "index":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/settings/private-type-index.ttl",
-        },
-        "label": "private",
-        },
-    },
-    {
-        "instance":  {
-        "classOrder": 5,
-        "termType": "NamedNode",
-        "value": "https://club.example.com/privateStuff/tasks.ttl#this",
-        },
-        "scope":  {
-        "agent":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/profile/card.ttl#it",
-        },
-        "index":  {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/settings/private-type-index.ttl",
-        },
-        "label": "private",
-        },
-    },
-    ]
+    const AliceAndClubScopes =  [{"instance": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/publicStuff/actionItems.ttl#this"}, "scope": {"agent": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/profile/card.ttl#me"}, "index": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/profile/public-type-index.ttl"}, "label": "public"}, "type": {"classOrder": 5, "termType": "NamedNode", "value": "http://www.w3.org/2005/01/wf/flow#Tracker"}}, {"instance": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/project4/issues.ttl#this"}, "scope": {"agent": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/profile/card.ttl#me"}, "index": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/profile/public-type-index.ttl"}, "label": "public"}, "type": {"classOrder": 5, "termType": "NamedNode", "value": "http://www.w3.org/2005/01/wf/flow#Tracker"}}, {"instance": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/privateStuff/ToDo.ttl#this"}, "scope": {"agent": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/profile/card.ttl#me"}, "index": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/settings/private-type-index.ttl"}, "label": "private"}, "type": {"classOrder": 5, "termType": "NamedNode", "value": "http://www.w3.org/2005/01/wf/flow#Tracker"}}, {"instance": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/privateStuff/Goals.ttl#this"}, "scope": {"agent": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/profile/card.ttl#me"}, "index": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/settings/private-type-index.ttl"}, "label": "private"}, "type": {"classOrder": 5, "termType": "NamedNode", "value": "http://www.w3.org/2005/01/wf/flow#Tracker"}}, {"instance": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/privateStuff/workingOn.ttl#this"}, "scope": {"agent": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/profile/card.ttl#me"}, "index": {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/settings/private-type-index.ttl"}, "label": "private"}, "type": {"classOrder": 5, "termType": "NamedNode", "value": "http://www.w3.org/2005/01/wf/flow#Tracker"}}, {"instance": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/publicStuff/actionItems.ttl#this"}, "scope": {"agent": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/profile/card.ttl#it"}, "index": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/profile/public-type-index.ttl"}, "label": "public"}, "type": {"classOrder": 5, "termType": "NamedNode", "value": "http://www.w3.org/2005/01/wf/flow#Tracker"}}, {"instance": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/project4/clubIssues.ttl#this"}, "scope": {"agent": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/profile/card.ttl#it"}, "index": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/profile/public-type-index.ttl"}, "label": "public"}, "type": {"classOrder": 5, "termType": "NamedNode", "value": "http://www.w3.org/2005/01/wf/flow#Tracker"}}, {"instance": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/privateStuff/ToDo.ttl#this"}, "scope": {"agent": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/profile/card.ttl#it"}, "index": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/settings/private-type-index.ttl"}, "label": "private"}, "type": {"classOrder": 5, "termType": "NamedNode", "value": "http://www.w3.org/2005/01/wf/flow#Tracker"}}, {"instance": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/privateStuff/Goals.ttl#this"}, "scope": {"agent": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/profile/card.ttl#it"}, "index": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/settings/private-type-index.ttl"}, "label": "private"}, "type": {"classOrder": 5, "termType": "NamedNode", "value": "http://www.w3.org/2005/01/wf/flow#Tracker"}}, {"instance": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/privateStuff/tasks.ttl#this"}, "scope": {"agent": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/profile/card.ttl#it"}, "index": {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/settings/private-type-index.ttl"}, "label": "private"}, "type": {"classOrder": 5, "termType": "NamedNode", "value": "http://www.w3.org/2005/01/wf/flow#Tracker"}}]
 
     describe('getScopedAppInstances', () => {
         it('exists', () => {
@@ -383,7 +181,7 @@ describe("TypeIndex logic NEW", () => {
         })
         it('pulls in users scopes and also community ones', async () => {
         const result = await typeIndexLogic.getScopedAppInstances(Tracker, alice)
-        expect(result).toEqual(AliceAndClubScopes)
+        expect(result).toEqual(AliceAndClubScopes) // @@ AliceAndClubScopes
         })
         it('creates new preferenceFile and typeIndex files where they dont exist', async () => {
         const result = await typeIndexLogic.getScopedAppInstances(Tracker, bob)
@@ -412,58 +210,16 @@ describe("TypeIndex logic NEW", () => {
     })
 
     const TRACKERS =
-        [
-        {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/publicStuff/actionItems.ttl#this",
-        },
-        {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/project4/issues.ttl#this",
-        },
-        {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/privateStuff/ToDo.ttl#this",
-        },
-        {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/privateStuff/Goals.ttl#this",
-        },
-        {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://alice.example.com/privateStuff/workingOn.ttl#this",
-        },
-        {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/publicStuff/actionItems.ttl#this",
-        },
-        {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/project4/clubIssues.ttl#this",
-        },
-        {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/privateStuff/ToDo.ttl#this",
-        },
-        {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/privateStuff/Goals.ttl#this",
-        },
-        {
-            "classOrder": 5,
-            "termType": "NamedNode",
-            "value": "https://club.example.com/privateStuff/tasks.ttl#this",
-        },
-        ]
+[{"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/publicStuff/actionItems.ttl#this"},
+ {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/project4/issues.ttl#this"},
+ {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/privateStuff/ToDo.ttl#this"},
+ {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/privateStuff/Goals.ttl#this"},
+ {"classOrder": 5, "termType": "NamedNode", "value": "https://alice.example.com/privateStuff/workingOn.ttl#this"},
+ {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/publicStuff/actionItems.ttl#this"},
+ {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/project4/clubIssues.ttl#this"},
+ {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/privateStuff/ToDo.ttl#this"},
+ {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/privateStuff/Goals.ttl#this"},
+ {"classOrder": 5, "termType": "NamedNode", "value": "https://club.example.com/privateStuff/tasks.ttl#this"} ]
 
     describe('getAppInstances', () => {
         it('exists', () => {
@@ -471,7 +227,7 @@ describe("TypeIndex logic NEW", () => {
         })
         it('finds trackers', async () => {
         const result = await typeIndexLogic.getAppInstances(Tracker)
-        expect(result).toEqual(TRACKERS)
+        expect(result).toEqual(TRACKERS) // TRACKERS @@
         expect(result).toEqual(uniqueNodes(result)) // shoud have no dups
         })
         it('finds images in containers', async () => {