solid-logic 2.0.1-d73984d5 → 2.1.0-10fd747d

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/typeIndex/typeIndexLogic.d.ts.map +1 -1
  2. package/lib/typeIndex/typeIndexLogic.js +10 -14
  3. package/lib/typeIndex/typeIndexLogic.js.map +1 -1
  4. package/package.json +1 -1
  5. package/src/typeIndex/typeIndexLogic.ts +2 -5
  6. package/test/typeIndexLogic.test.ts +3 -3
package/lib/typeIndex/typeIndexLogic.d.ts.map CHANGED
@@ -1 +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,CA4L7F"}
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,CAyL7F"}
package/lib/typeIndex/typeIndexLogic.js CHANGED
@@ -322,9 +322,9 @@ function createTypeIndexLogic(store, authn, profileLogic, utilityLogic) {
322
322
  }
323
323
  function getScopedAppsFromIndex(scope, theClass) {
324
324
  return __awaiter(this, void 0, void 0, function () {
325
- var index, results, registrations, _i, registrations_1, reg, klass, instances, _a, instances_1, instance, containers, _b, containers_1, cont, contents, _c, contents_1, instance;
326
- return __generator(this, function (_d) {
327
- switch (_d.label) {
325
+ var index, results, registrations, _i, registrations_1, reg, klass, instances, _a, instances_1, instance, containers, _b, containers_1, instance;
326
+ return __generator(this, function (_c) {
327
+ switch (_c.label) {
328
328
  case 0:
329
329
  index = scope.index;
330
330
  results = [];
@@ -332,7 +332,7 @@ function createTypeIndexLogic(store, authn, profileLogic, utilityLogic) {
332
332
  .concat(store.statementsMatching(null, ns.solid('instanceContainer'), null, index))
333
333
  .map(function (st) { return st.subject; });
334
334
  _i = 0, registrations_1 = registrations;
335
- _d.label = 1;
335
+ _c.label = 1;
336
336
  case 1:
337
337
  if (!(_i < registrations_1.length)) return [3 /*break*/, 6];
338
338
  reg = registrations_1[_i];
@@ -345,19 +345,15 @@ function createTypeIndexLogic(store, authn, profileLogic, utilityLogic) {
345
345
  }
346
346
  containers = store.each(reg, ns.solid('instanceContainer'), null, index);
347
347
  _b = 0, containers_1 = containers;
348
- _d.label = 2;
348
+ _c.label = 2;
349
349
  case 2:
350
350
  if (!(_b < containers_1.length)) return [3 /*break*/, 5];
351
- cont = containers_1[_b];
352
- return [4 /*yield*/, store.fetcher.load(cont)];
351
+ instance = containers_1[_b];
352
+ return [4 /*yield*/, store.fetcher.load(instance)];
353
353
  case 3:
354
- _d.sent();
355
- contents = store.each(cont, ns.ldp('contains'), null, cont).map(function (one) { return (0, rdflib_1.sym)(one.value); });
356
- for (_c = 0, contents_1 = contents; _c < contents_1.length; _c++) {
357
- instance = contents_1[_c];
358
- results.push({ instance: (0, rdflib_1.sym)(instance.value), type: klass, scope: scope });
359
- }
360
- _d.label = 4;
354
+ _c.sent();
355
+ results.push({ instance: (0, rdflib_1.sym)(instance.value), type: klass, scope: scope });
356
+ _c.label = 4;
361
357
  case 4:
362
358
  _b++;
363
359
  return [3 /*break*/, 2];
package/lib/typeIndex/typeIndexLogic.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"typeIndexLogic.js","sourceRoot":"","sources":["../../src/typeIndex/typeIndexLogic.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"typeIndexLogic.js","sourceRoot":"","sources":["../../src/typeIndex/typeIndexLogic.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "solid-logic",
3
- "version": "2.0.1-d73984d5",
3
+ "version": "2.1.0-10fd747d",
4
4
  "description": "Core business logic of Solid OS",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
package/src/typeIndex/typeIndexLogic.ts CHANGED
@@ -167,12 +167,9 @@ export function createTypeIndexLogic(store, authn, profileLogic, utilityLogic):
167
167
  results.push({ instance, type: klass, scope })
168
168
  }
169
169
  const containers = store.each(reg, ns.solid('instanceContainer'), null, index)
170
- for (const cont of containers) {
171
- await store.fetcher.load(cont)
172
- const contents = store.each(cont, ns.ldp('contains'), null, cont).map(one => sym(one.value))
173
- for (const instance of contents) {
170
+ for (const instance of containers) {
171
+ await store.fetcher.load(instance)
174
172
  results.push({ instance: sym(instance.value), type: klass, scope })
175
- }
176
173
  }
177
174
  }
178
175
  }
package/test/typeIndexLogic.test.ts CHANGED
@@ -230,11 +230,11 @@ describe("TypeIndex logic NEW", () => {
230
230
  expect(result).toEqual(TRACKERS) // TRACKERS @@
231
231
  expect(result).toEqual(uniqueNodes(result)) // shoud have no dups
232
232
  })
233
- it('finds images in containers', async () => {
233
+ it('finds containers', async () => {
234
234
  const result = await typeIndexLogic.getAppInstances(Image)
235
- expect(result.length).toEqual(3)
235
+ expect(result.length).toEqual(1)
236
236
  expect(result).toEqual(uniqueNodes(result)) // shoud have no dups
237
- expect(result.map(x => x.uri).join()).toEqual("https://alice.example.com/profile/Photos/photo1.png,https://alice.example.com/profile/Photos/photo2.png,https://alice.example.com/profile/Photos/photo3.png")
237
+ expect(result.map(x => x.uri).join()).toEqual("https://alice.example.com/profile/Photos/")
238
238
  })
239
239
  })
240
240