@ldo/solid-react 0.0.1-alpha.27 → 0.0.1-alpha.29

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.
package/dist/index.d.ts CHANGED
@@ -4,4 +4,6 @@ export * from "./SolidAuthContext";
4
4
  export { useLdo } from "./SolidLdoProvider";
5
5
  export * from "./useResource";
6
6
  export * from "./useSubject";
7
+ export * from "./useMatchSubject";
8
+ export * from "./useMatchObject";
7
9
  export * from "./useRootContainer";
package/dist/index.js CHANGED
@@ -22,5 +22,7 @@ var SolidLdoProvider_1 = require("./SolidLdoProvider");
22
22
  Object.defineProperty(exports, "useLdo", { enumerable: true, get: function () { return SolidLdoProvider_1.useLdo; } });
23
23
  __exportStar(require("./useResource"), exports);
24
24
  __exportStar(require("./useSubject"), exports);
25
+ __exportStar(require("./useMatchSubject"), exports);
26
+ __exportStar(require("./useMatchObject"), exports);
25
27
  __exportStar(require("./useRootContainer"), exports);
26
28
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4DAA0C;AAC1C,oEAAkD;AAClD,qDAAmC;AAEnC,uDAA4C;AAAnC,0GAAA,MAAM,OAAA;AAGf,gDAA8B;AAC9B,+CAA6B;AAC7B,qDAAmC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4DAA0C;AAC1C,oEAAkD;AAClD,qDAAmC;AAEnC,uDAA4C;AAAnC,0GAAA,MAAM,OAAA;AAGf,gDAA8B;AAC9B,+CAA6B;AAC7B,oDAAkC;AAClC,mDAAiC;AACjC,qDAAmC"}
@@ -0,0 +1,3 @@
1
+ import type { LdoBase, ShapeType } from "@ldo/ldo";
2
+ import type { QuadMatch } from "@ldo/rdf-utils";
3
+ export declare function useMatchObject<Type extends LdoBase>(shapeType: ShapeType<Type>, subject?: QuadMatch[0] | string, predicate?: QuadMatch[1] | string, graph?: QuadMatch[3] | string): Type[];
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.useMatchObject = void 0;
4
+ const react_1 = require("react");
5
+ const useTrackingProxy_1 = require("./util/useTrackingProxy");
6
+ function useMatchObject(shapeType, subject, predicate, graph) {
7
+ const matchObject = (0, react_1.useCallback)((builder) => {
8
+ return builder.matchObject(subject, predicate, graph);
9
+ }, [subject, predicate, graph]);
10
+ return (0, useTrackingProxy_1.useTrackingProxy)(shapeType, matchObject);
11
+ }
12
+ exports.useMatchObject = useMatchObject;
13
+ //# sourceMappingURL=useMatchObject.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"useMatchObject.js","sourceRoot":"","sources":["../src/useMatchObject.ts"],"names":[],"mappings":";;;AAGA,iCAAoC;AACpC,8DAA2D;AAE3D,SAAgB,cAAc,CAC5B,SAA0B,EAC1B,OAA+B,EAC/B,SAAiC,EACjC,KAA6B;IAE7B,MAAM,WAAW,GAAG,IAAA,mBAAW,EAC7B,CAAC,OAAyB,EAAE,EAAE;QAC5B,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IACxD,CAAC,EACD,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAC5B,CAAC;IAEF,OAAO,IAAA,mCAAgB,EAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAClD,CAAC;AAdD,wCAcC"}
@@ -0,0 +1,3 @@
1
+ import type { LdoBase, ShapeType } from "@ldo/ldo";
2
+ import type { QuadMatch } from "@ldo/rdf-utils";
3
+ export declare function useMatchSubject<Type extends LdoBase>(shapeType: ShapeType<Type>, predicate?: QuadMatch[1] | string, object?: QuadMatch[2] | string, graph?: QuadMatch[3] | string): Type[];
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.useMatchSubject = void 0;
4
+ const react_1 = require("react");
5
+ const useTrackingProxy_1 = require("./util/useTrackingProxy");
6
+ function useMatchSubject(shapeType, predicate, object, graph) {
7
+ const matchSubject = (0, react_1.useCallback)((builder) => {
8
+ return builder.matchSubject(predicate, object, graph);
9
+ }, [predicate, object, graph]);
10
+ return (0, useTrackingProxy_1.useTrackingProxy)(shapeType, matchSubject);
11
+ }
12
+ exports.useMatchSubject = useMatchSubject;
13
+ //# sourceMappingURL=useMatchSubject.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"useMatchSubject.js","sourceRoot":"","sources":["../src/useMatchSubject.ts"],"names":[],"mappings":";;;AAGA,iCAAoC;AACpC,8DAA2D;AAE3D,SAAgB,eAAe,CAC7B,SAA0B,EAC1B,SAAiC,EACjC,MAA8B,EAC9B,KAA6B;IAE7B,MAAM,YAAY,GAAG,IAAA,mBAAW,EAC9B,CAAC,OAAyB,EAAE,EAAE;QAC5B,OAAO,OAAO,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IACxD,CAAC,EACD,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAC3B,CAAC;IAEF,OAAO,IAAA,mCAAgB,EAAC,SAAS,EAAE,YAAY,CAAC,CAAC;AACnD,CAAC;AAdD,0CAcC"}
@@ -2,6 +2,7 @@ import type { Container, ContainerUri, LeafUri, Leaf } from "@ldo/solid";
2
2
  export interface UseResourceOptions {
3
3
  suppressInitialRead?: boolean;
4
4
  reloadOnMount?: boolean;
5
+ subscribe?: boolean;
5
6
  }
6
7
  export declare function useResource(uri: ContainerUri, options?: UseResourceOptions): Container;
7
8
  export declare function useResource(uri: LeafUri, options?: UseResourceOptions): Leaf;
@@ -5,6 +5,7 @@ const react_1 = require("react");
5
5
  const SolidLdoProvider_1 = require("./SolidLdoProvider");
6
6
  function useResource(uri, options) {
7
7
  const { getResource } = (0, SolidLdoProvider_1.useLdo)();
8
+ const subscriptionIdRef = (0, react_1.useRef)();
8
9
  const resource = (0, react_1.useMemo)(() => {
9
10
  if (uri) {
10
11
  const resource = getResource(uri);
@@ -22,6 +23,20 @@ function useResource(uri, options) {
22
23
  }, [getResource, uri]);
23
24
  const [resourceRepresentation, setResourceRepresentation] = (0, react_1.useState)(resource);
24
25
  const pastResource = (0, react_1.useRef)();
26
+ (0, react_1.useEffect)(() => {
27
+ if (options?.subscribe) {
28
+ resource
29
+ ?.subscribeToNotifications()
30
+ .then((subscriptionId) => (subscriptionIdRef.current = subscriptionId));
31
+ }
32
+ else if (subscriptionIdRef.current) {
33
+ resource?.unsubscribeFromNotifications(subscriptionIdRef.current);
34
+ }
35
+ return () => {
36
+ if (subscriptionIdRef.current)
37
+ resource?.unsubscribeFromNotifications(subscriptionIdRef.current);
38
+ };
39
+ }, [resource, options?.subscribe]);
25
40
  const forceReload = (0, react_1.useCallback)(() => {
26
41
  if (resource)
27
42
  setResourceRepresentation(new Proxy(resource, {}));
@@ -1 +1 @@
1
- {"version":3,"file":"useResource.js","sourceRoot":"","sources":["../src/useResource.ts"],"names":[],"mappings":";;;AAAA,iCAA0E;AAQ1E,yDAA4C;AA4B5C,SAAgB,WAAW,CACzB,GAAY,EACZ,OAA4B;IAE5B,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,yBAAM,GAAE,CAAC;IAGjC,MAAM,QAAQ,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAC5B,IAAI,GAAG,EAAE;YACP,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YAElC,IAAI,CAAC,OAAO,EAAE,mBAAmB,EAAE;gBACjC,IAAI,OAAO,EAAE,aAAa,EAAE;oBAC1B,QAAQ,CAAC,IAAI,EAAE,CAAC;iBACjB;qBAAM;oBACL,QAAQ,CAAC,eAAe,EAAE,CAAC;iBAC5B;aACF;YACD,OAAO,QAAQ,CAAC;SACjB;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;IACvB,MAAM,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,GACvD,IAAA,gBAAQ,EAAC,QAAQ,CAAC,CAAC;IACrB,MAAM,YAAY,GAAG,IAAA,cAAM,GAExB,CAAC;IAGJ,MAAM,WAAW,GAAG,IAAA,mBAAW,EAE7B,GAAG,EAAE;QACH,IAAI,QAAQ;YAAE,yBAAyB,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QAEb,IAAI,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE;YAClC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAC/B,QAAQ,EACR,YAAY,CAAC,OAAO,CAAC,QAAQ,CAC9B,CAAC;SACH;QAED,YAAY,CAAC,OAAO,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;QAC3D,IAAI,QAAQ,EAAE;YAEZ,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YACnC,yBAAyB,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;YAGnD,OAAO,GAAG,EAAE;gBACV,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YACtC,CAAC,CAAC;SACH;aAAM;YACL,yBAAyB,CAAC,SAAS,CAAC,CAAC;SACtC;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACf,OAAO,sBAAsB,CAAC;AAChC,CAAC;AA7DD,kCA6DC"}
1
+ {"version":3,"file":"useResource.js","sourceRoot":"","sources":["../src/useResource.ts"],"names":[],"mappings":";;;AAAA,iCAA0E;AAQ1E,yDAA4C;AA6B5C,SAAgB,WAAW,CACzB,GAAY,EACZ,OAA4B;IAE5B,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,yBAAM,GAAE,CAAC;IACjC,MAAM,iBAAiB,GAAG,IAAA,cAAM,GAAsB,CAAC;IAGvD,MAAM,QAAQ,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAC5B,IAAI,GAAG,EAAE;YACP,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YAElC,IAAI,CAAC,OAAO,EAAE,mBAAmB,EAAE;gBACjC,IAAI,OAAO,EAAE,aAAa,EAAE;oBAC1B,QAAQ,CAAC,IAAI,EAAE,CAAC;iBACjB;qBAAM;oBACL,QAAQ,CAAC,eAAe,EAAE,CAAC;iBAC5B;aACF;YACD,OAAO,QAAQ,CAAC;SACjB;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;IACvB,MAAM,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,GACvD,IAAA,gBAAQ,EAAC,QAAQ,CAAC,CAAC;IACrB,MAAM,YAAY,GAAG,IAAA,cAAM,GAExB,CAAC;IAEJ,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,OAAO,EAAE,SAAS,EAAE;YACtB,QAAQ;gBACN,EAAE,wBAAwB,EAAE;iBAC3B,IAAI,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC;SAC3E;aAAM,IAAI,iBAAiB,CAAC,OAAO,EAAE;YACpC,QAAQ,EAAE,4BAA4B,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;SACnE;QACD,OAAO,GAAG,EAAE;YACV,IAAI,iBAAiB,CAAC,OAAO;gBAC3B,QAAQ,EAAE,4BAA4B,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACtE,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;IAGnC,MAAM,WAAW,GAAG,IAAA,mBAAW,EAE7B,GAAG,EAAE;QACH,IAAI,QAAQ;YAAE,yBAAyB,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QAEb,IAAI,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE;YAClC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAC/B,QAAQ,EACR,YAAY,CAAC,OAAO,CAAC,QAAQ,CAC9B,CAAC;SACH;QAED,YAAY,CAAC,OAAO,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;QAC3D,IAAI,QAAQ,EAAE;YAEZ,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YACnC,yBAAyB,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;YAGnD,OAAO,GAAG,EAAE;gBACV,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YACtC,CAAC,CAAC;SACH;aAAM;YACL,yBAAyB,CAAC,SAAS,CAAC,CAAC;SACtC;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACf,OAAO,sBAAsB,CAAC;AAChC,CAAC;AA5ED,kCA4EC"}
@@ -1,36 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.useSubject = void 0;
4
- const jsonld_dataset_proxy_1 = require("@ldo/jsonld-dataset-proxy");
5
- const ldo_1 = require("@ldo/ldo");
6
- const SolidLdoProvider_1 = require("./SolidLdoProvider");
7
4
  const react_1 = require("react");
8
- const TrackingProxyContext_1 = require("./util/TrackingProxyContext");
9
- const data_model_1 = require("@rdfjs/data-model");
5
+ const useTrackingProxy_1 = require("./util/useTrackingProxy");
10
6
  function useSubject(shapeType, subject) {
11
- const { dataset } = (0, SolidLdoProvider_1.useLdo)();
12
- const [forceUpdateCounter, setForceUpdateCounter] = (0, react_1.useState)(0);
13
- const forceUpdate = (0, react_1.useCallback)(() => setForceUpdateCounter((val) => val + 1), []);
14
- const linkedDataObject = (0, react_1.useMemo)(() => {
7
+ const fromSubject = (0, react_1.useCallback)((builder) => {
15
8
  if (!subject)
16
9
  return;
17
- dataset.removeListenerFromAllEvents(forceUpdate);
18
- const contextUtil = new jsonld_dataset_proxy_1.ContextUtil(shapeType.context);
19
- const proxyContext = new TrackingProxyContext_1.TrackingProxyContext({
20
- dataset,
21
- contextUtil,
22
- writeGraphs: [(0, data_model_1.defaultGraph)()],
23
- languageOrdering: ["none", "en", "other"],
24
- }, forceUpdate);
25
- const builder = new ldo_1.LdoBuilder(new jsonld_dataset_proxy_1.JsonldDatasetProxyBuilder(proxyContext), shapeType);
26
10
  return builder.fromSubject(subject);
27
- }, [shapeType, subject, dataset, forceUpdateCounter, forceUpdate]);
28
- (0, react_1.useEffect)(() => {
29
- return () => {
30
- dataset.removeListenerFromAllEvents(forceUpdate);
31
- };
32
- }, [shapeType, subject]);
33
- return linkedDataObject;
11
+ }, [subject]);
12
+ return (0, useTrackingProxy_1.useTrackingProxy)(shapeType, fromSubject);
34
13
  }
35
14
  exports.useSubject = useSubject;
36
15
  //# sourceMappingURL=useSubject.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useSubject.js","sourceRoot":"","sources":["../src/useSubject.ts"],"names":[],"mappings":";;;AACA,oEAGmC;AAEnC,kCAAsC;AAEtC,yDAA4C;AAC5C,iCAAkE;AAClE,sEAAmE;AACnE,kDAAiD;AAUjD,SAAgB,UAAU,CACxB,SAA0B,EAC1B,OAA8B;IAE9B,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,yBAAM,GAAE,CAAC;IAE7B,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC;IAChE,MAAM,WAAW,GAAG,IAAA,mBAAW,EAC7B,GAAG,EAAE,CAAC,qBAAqB,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,EAC7C,EAAE,CACH,CAAC;IAGF,MAAM,gBAAgB,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QACpC,IAAI,CAAC,OAAO;YAAE,OAAO;QAGrB,OAAO,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;QAGjD,MAAM,WAAW,GAAG,IAAI,kCAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,IAAI,2CAAoB,CAC3C;YACE,OAAO;YACP,WAAW;YACX,WAAW,EAAE,CAAC,IAAA,yBAAY,GAAE,CAAC;YAC7B,gBAAgB,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC;SAC1C,EACD,WAAW,CACZ,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,gBAAU,CAC5B,IAAI,gDAAyB,CAAC,YAAY,CAAC,EAC3C,SAAS,CACV,CAAC;QACF,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,WAAW,CAAC,CAAC,CAAC;IAEnE,IAAA,iBAAS,EAAC,GAAG,EAAE;QAEb,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;QACnD,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;IAEzB,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AA7CD,gCA6CC"}
1
+ {"version":3,"file":"useSubject.js","sourceRoot":"","sources":["../src/useSubject.ts"],"names":[],"mappings":";;;AAIA,iCAAoC;AAEpC,8DAA2D;AAU3D,SAAgB,UAAU,CACxB,SAA0B,EAC1B,OAA8B;IAE9B,MAAM,WAAW,GAAG,IAAA,mBAAW,EAC7B,CAAC,OAAyB,EAAE,EAAE;QAC5B,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC,EACD,CAAC,OAAO,CAAC,CACV,CAAC;IAEF,OAAO,IAAA,mCAAgB,EAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAClD,CAAC;AAbD,gCAaC"}
@@ -0,0 +1 @@
1
+ export declare function useSubscribeToResource(...uris: string[]): void;
@@ -0,0 +1,40 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.useSubscribeToResource = void 0;
4
+ const SolidLdoProvider_1 = require("./SolidLdoProvider");
5
+ const react_1 = require("react");
6
+ function useSubscribeToResource(...uris) {
7
+ const { dataset } = (0, SolidLdoProvider_1.useLdo)();
8
+ const currentlySubscribed = (0, react_1.useRef)({});
9
+ (0, react_1.useEffect)(() => {
10
+ const resources = uris.map((uri) => dataset.getResource(uri));
11
+ const previousSubscriptions = { ...currentlySubscribed.current };
12
+ Promise.all(resources.map(async (resource) => {
13
+ if (!previousSubscriptions[resource.uri]) {
14
+ currentlySubscribed.current[resource.uri] = "AWAITING";
15
+ await resource.readIfUnfetched();
16
+ currentlySubscribed.current[resource.uri] =
17
+ await resource.subscribeToNotifications();
18
+ }
19
+ else {
20
+ delete previousSubscriptions[resource.uri];
21
+ }
22
+ })).then(async () => {
23
+ await Promise.all(Object.entries(previousSubscriptions).map(async ([resourceUri, subscriptionId]) => {
24
+ delete currentlySubscribed.current[resourceUri];
25
+ const resource = dataset.getResource(resourceUri);
26
+ await resource.unsubscribeFromNotifications(subscriptionId);
27
+ }));
28
+ });
29
+ }, [uris]);
30
+ (0, react_1.useEffect)(() => {
31
+ return () => {
32
+ Promise.all(Object.entries(currentlySubscribed.current).map(async ([resourceUri, subscriptionId]) => {
33
+ const resource = dataset.getResource(resourceUri);
34
+ await resource.unsubscribeFromNotifications(subscriptionId);
35
+ }));
36
+ };
37
+ }, []);
38
+ }
39
+ exports.useSubscribeToResource = useSubscribeToResource;
40
+ //# sourceMappingURL=useSubscribeToResource.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"useSubscribeToResource.js","sourceRoot":"","sources":["../src/useSubscribeToResource.ts"],"names":[],"mappings":";;;AAAA,yDAA4C;AAC5C,iCAA0C;AAE1C,SAAgB,sBAAsB,CAAC,GAAG,IAAc;IACtD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,yBAAM,GAAE,CAAC;IAC7B,MAAM,mBAAmB,GAAG,IAAA,cAAM,EAAyB,EAAE,CAAC,CAAC;IAC/D,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9D,MAAM,qBAAqB,GAAG,EAAE,GAAG,mBAAmB,CAAC,OAAO,EAAE,CAAC;QACjE,OAAO,CAAC,GAAG,CACT,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YAC/B,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAGxC,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;gBAEvD,MAAM,QAAQ,CAAC,eAAe,EAAE,CAAC;gBACjC,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;oBACvC,MAAM,QAAQ,CAAC,wBAAwB,EAAE,CAAC;aAC7C;iBAAM;gBACL,OAAO,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aAC5C;QACH,CAAC,CAAC,CACH,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAEhB,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,GAAG,CACvC,KAAK,EAAE,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,EAAE;gBAEtC,OAAO,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBAChD,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gBAClD,MAAM,QAAQ,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;YAC9D,CAAC,CACF,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAGX,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CACT,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,GAAG,CAC7C,KAAK,EAAE,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,EAAE;gBACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gBAClD,MAAM,QAAQ,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;YAC9D,CAAC,CACF,CACF,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAhDD,wDAgDC"}
@@ -20,13 +20,14 @@ class TrackingProxyContext extends jsonld_dataset_proxy_1.ProxyContext {
20
20
  const oldGetFunction = baseHandler.get;
21
21
  const newGetFunction = (target, key, receiver) => {
22
22
  const subject = target["@id"];
23
+ const rdfTypes = this.getRdfType(subject);
23
24
  if (typeof key === "symbol") {
24
25
  }
25
26
  else if (key === "@id") {
26
27
  this.addListener([subject, null, null, null]);
27
28
  }
28
- else if (!this.contextUtil.isArray(key)) {
29
- const predicate = (0, data_model_1.namedNode)(this.contextUtil.keyToIri(key));
29
+ else if (!this.contextUtil.isArray(key, rdfTypes)) {
30
+ const predicate = (0, data_model_1.namedNode)(this.contextUtil.keyToIri(key, rdfTypes));
30
31
  this.addListener([subject, predicate, null, null]);
31
32
  }
32
33
  return oldGetFunction && oldGetFunction(target, key, receiver);
@@ -1 +1 @@
1
- {"version":3,"file":"TrackingProxyContext.js","sourceRoot":"","sources":["../../src/util/TrackingProxyContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TrackingProxyContext.js","sourceRoot":"","sources":["../../src/util/TrackingProxyContext.ts"],"names":[],"mappings":";;;AAKA,oEAAyD;AAGzD,kDAA8C;AAiB9C,MAAa,oBAAqB,SAAQ,mCAAY;IAIpD,YAAY,OAAoC,EAAE,QAAoB;QACpE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAGO,WAAW,CAAC,SAAoB;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAChE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACtC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvD;IACH,CAAC;IAES,oBAAoB;QAC5B,MAAM,WAAW,GAAG,KAAK,CAAC,oBAAoB,EAAE,CAAC;QACjD,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC;QACvC,MAAM,cAAc,GAA4C,CAC9D,MAA0B,EAC1B,GAAoB,EACpB,QAAQ,EACR,EAAE;YACF,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;aAE5B;iBAAM,IAAI,GAAG,KAAK,KAAK,EAAE;gBACxB,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;aAC/C;iBAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE;gBACnD,MAAM,SAAS,GAAG,IAAA,sBAAS,EAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;gBACtE,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;aACpD;YACD,OAAO,cAAc,IAAI,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QACjE,CAAC,CAAC;QACF,WAAW,CAAC,GAAG,GAAG,cAAc,CAAC;QACjC,WAAW,CAAC,GAAG,GAAG,GAAG,EAAE;YACrB,OAAO,CAAC,IAAI,CACV,0PAA0P,CAC3P,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC;IAES,kBAAkB;QAC1B,MAAM,WAAW,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC/C,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC;QACvC,MAAM,cAAc,GAA0C,CAC5D,MAAwB,EACxB,GAAoB,EACpB,QAAQ,EACR,EAAE;YACF,IAAI,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAClC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;aACpE;YACD,OAAO,cAAc,IAAI,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QACjE,CAAC,CAAC;QACF,WAAW,CAAC,GAAG,GAAG,cAAc,CAAC;QACjC,OAAO,WAAW,CAAC;IACrB,CAAC;CACF;AAhED,oDAgEC;AAED,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC;IACpC,SAAS;IACT,KAAK;IACL,QAAQ;IACR,MAAM,CAAC,QAAQ;IACf,SAAS;IACT,OAAO;IACP,QAAQ;IACR,MAAM;IACN,WAAW;IACX,UAAU;IACV,eAAe;IACf,mBAAmB;IACnB,MAAM;IACN,aAAa;IACb,aAAa;IACb,MAAM;IACN,QAAQ;CACT,CAAC,CAAC"}
@@ -0,0 +1,3 @@
1
+ import { LdoBuilder } from "@ldo/ldo";
2
+ import type { LdoBase, ShapeType } from "@ldo/ldo";
3
+ export declare function useTrackingProxy<Type extends LdoBase, ReturnType>(shapeType: ShapeType<Type>, createLdo: (builder: LdoBuilder<Type>) => ReturnType): ReturnType;
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.useTrackingProxy = void 0;
4
+ const jsonld_dataset_proxy_1 = require("@ldo/jsonld-dataset-proxy");
5
+ const ldo_1 = require("@ldo/ldo");
6
+ const react_1 = require("react");
7
+ const TrackingProxyContext_1 = require("./TrackingProxyContext");
8
+ const data_model_1 = require("@rdfjs/data-model");
9
+ const SolidLdoProvider_1 = require("../SolidLdoProvider");
10
+ function useTrackingProxy(shapeType, createLdo) {
11
+ const { dataset } = (0, SolidLdoProvider_1.useLdo)();
12
+ const [forceUpdateCounter, setForceUpdateCounter] = (0, react_1.useState)(0);
13
+ const forceUpdate = (0, react_1.useCallback)(() => setForceUpdateCounter((val) => val + 1), []);
14
+ const linkedDataObject = (0, react_1.useMemo)(() => {
15
+ dataset.removeListenerFromAllEvents(forceUpdate);
16
+ const contextUtil = new jsonld_dataset_proxy_1.ContextUtil(shapeType.context);
17
+ const proxyContext = new TrackingProxyContext_1.TrackingProxyContext({
18
+ dataset,
19
+ contextUtil,
20
+ writeGraphs: [(0, data_model_1.defaultGraph)()],
21
+ languageOrdering: ["none", "en", "other"],
22
+ }, forceUpdate);
23
+ const builder = new ldo_1.LdoBuilder(new jsonld_dataset_proxy_1.JsonldDatasetProxyBuilder(proxyContext), shapeType);
24
+ return createLdo(builder);
25
+ }, [shapeType, dataset, forceUpdateCounter, forceUpdate, createLdo]);
26
+ (0, react_1.useEffect)(() => {
27
+ return () => {
28
+ dataset.removeListenerFromAllEvents(forceUpdate);
29
+ };
30
+ }, [shapeType]);
31
+ return linkedDataObject;
32
+ }
33
+ exports.useTrackingProxy = useTrackingProxy;
34
+ //# sourceMappingURL=useTrackingProxy.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"useTrackingProxy.js","sourceRoot":"","sources":["../../src/util/useTrackingProxy.ts"],"names":[],"mappings":";;;AAAA,oEAGmC;AACnC,kCAAsC;AAEtC,iCAAkE;AAClE,iEAA8D;AAC9D,kDAAiD;AACjD,0DAA6C;AAE7C,SAAgB,gBAAgB,CAC9B,SAA0B,EAC1B,SAAoD;IAEpD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,yBAAM,GAAE,CAAC;IAE7B,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC;IAChE,MAAM,WAAW,GAAG,IAAA,mBAAW,EAC7B,GAAG,EAAE,CAAC,qBAAqB,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,EAC7C,EAAE,CACH,CAAC;IAGF,MAAM,gBAAgB,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAEpC,OAAO,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;QAGjD,MAAM,WAAW,GAAG,IAAI,kCAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,IAAI,2CAAoB,CAC3C;YACE,OAAO;YACP,WAAW;YACX,WAAW,EAAE,CAAC,IAAA,yBAAY,GAAE,CAAC;YAC7B,gBAAgB,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC;SAC1C,EACD,WAAW,CACZ,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,gBAAU,CAC5B,IAAI,gDAAyB,CAAC,YAAY,CAAC,EAC3C,SAAS,CACV,CAAC;QACF,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;IAErE,IAAA,iBAAS,EAAC,GAAG,EAAE;QAEb,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;QACnD,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AA3CD,4CA2CC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ldo/solid-react",
3
- "version": "0.0.1-alpha.27",
3
+ "version": "0.0.1-alpha.29",
4
4
  "description": "A React library for LDO and Solid",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -11,7 +11,7 @@
11
11
  "prepublishOnly": "npm run test && npm run build",
12
12
  "build:ldo": "ldo build --input src/shapes --output src/ldo",
13
13
  "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
14
- "test:integration": "start-server-and-test start-test-server http://localhost:3001 start-integration-test",
14
+ "test:integration": "start-server-and-test start-test-server http://localhost:3002 start-integration-test",
15
15
  "start-test-server": "ts-node ./test/test-server/runServer.ts",
16
16
  "start-integration-test": "jest --coverage"
17
17
  },
@@ -38,9 +38,9 @@
38
38
  "dependencies": {
39
39
  "@inrupt/solid-client-authn-browser": "^2.0.0",
40
40
  "@ldo/dataset": "^0.0.1-alpha.24",
41
- "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24",
42
- "@ldo/ldo": "^0.0.1-alpha.26",
43
- "@ldo/solid": "^0.0.1-alpha.26",
41
+ "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.29",
42
+ "@ldo/ldo": "^0.0.1-alpha.29",
43
+ "@ldo/solid": "^0.0.1-alpha.29",
44
44
  "@ldo/subscribable-dataset": "^0.0.1-alpha.24",
45
45
  "@rdfjs/data-model": "^1.2.0",
46
46
  "cross-fetch": "^3.1.6"
@@ -52,5 +52,5 @@
52
52
  "publishConfig": {
53
53
  "access": "public"
54
54
  },
55
- "gitHead": "e4f41174c2b249dc0ff52d3e509b3878a17fe279"
55
+ "gitHead": "56f78cef2b1b0d668c47d356c5f13517fe714505"
56
56
  }
package/src/index.ts CHANGED
@@ -7,4 +7,6 @@ export { useLdo } from "./SolidLdoProvider";
7
7
  // hooks
8
8
  export * from "./useResource";
9
9
  export * from "./useSubject";
10
+ export * from "./useMatchSubject";
11
+ export * from "./useMatchObject";
10
12
  export * from "./useRootContainer";
@@ -0,0 +1,21 @@
1
+ import type { LdoBase, ShapeType } from "@ldo/ldo";
2
+ import type { QuadMatch } from "@ldo/rdf-utils";
3
+ import type { LdoBuilder } from "@ldo/ldo";
4
+ import { useCallback } from "react";
5
+ import { useTrackingProxy } from "./util/useTrackingProxy";
6
+
7
+ export function useMatchObject<Type extends LdoBase>(
8
+ shapeType: ShapeType<Type>,
9
+ subject?: QuadMatch[0] | string,
10
+ predicate?: QuadMatch[1] | string,
11
+ graph?: QuadMatch[3] | string,
12
+ ): Type[] {
13
+ const matchObject = useCallback(
14
+ (builder: LdoBuilder<Type>) => {
15
+ return builder.matchObject(subject, predicate, graph);
16
+ },
17
+ [subject, predicate, graph],
18
+ );
19
+
20
+ return useTrackingProxy(shapeType, matchObject);
21
+ }
@@ -0,0 +1,21 @@
1
+ import type { LdoBase, ShapeType } from "@ldo/ldo";
2
+ import type { QuadMatch } from "@ldo/rdf-utils";
3
+ import type { LdoBuilder } from "@ldo/ldo";
4
+ import { useCallback } from "react";
5
+ import { useTrackingProxy } from "./util/useTrackingProxy";
6
+
7
+ export function useMatchSubject<Type extends LdoBase>(
8
+ shapeType: ShapeType<Type>,
9
+ predicate?: QuadMatch[1] | string,
10
+ object?: QuadMatch[2] | string,
11
+ graph?: QuadMatch[3] | string,
12
+ ): Type[] {
13
+ const matchSubject = useCallback(
14
+ (builder: LdoBuilder<Type>) => {
15
+ return builder.matchSubject(predicate, object, graph);
16
+ },
17
+ [predicate, object, graph],
18
+ );
19
+
20
+ return useTrackingProxy(shapeType, matchSubject);
21
+ }
@@ -11,6 +11,7 @@ import { useLdo } from "./SolidLdoProvider";
11
11
  export interface UseResourceOptions {
12
12
  suppressInitialRead?: boolean;
13
13
  reloadOnMount?: boolean;
14
+ subscribe?: boolean;
14
15
  }
15
16
 
16
17
  export function useResource(
@@ -39,6 +40,7 @@ export function useResource(
39
40
  options?: UseResourceOptions,
40
41
  ): Leaf | Container | undefined {
41
42
  const { getResource } = useLdo();
43
+ const subscriptionIdRef = useRef<string | undefined>();
42
44
 
43
45
  // Get the resource
44
46
  const resource = useMemo(() => {
@@ -62,6 +64,20 @@ export function useResource(
62
64
  { resource?: Resource; callback: () => void } | undefined
63
65
  >();
64
66
 
67
+ useEffect(() => {
68
+ if (options?.subscribe) {
69
+ resource
70
+ ?.subscribeToNotifications()
71
+ .then((subscriptionId) => (subscriptionIdRef.current = subscriptionId));
72
+ } else if (subscriptionIdRef.current) {
73
+ resource?.unsubscribeFromNotifications(subscriptionIdRef.current);
74
+ }
75
+ return () => {
76
+ if (subscriptionIdRef.current)
77
+ resource?.unsubscribeFromNotifications(subscriptionIdRef.current);
78
+ };
79
+ }, [resource, options?.subscribe]);
80
+
65
81
  // Callback function to force the react dom to reload.
66
82
  const forceReload = useCallback(
67
83
  // Wrap the resource in a proxy so it's techically a different object
package/src/useSubject.ts CHANGED
@@ -1,15 +1,10 @@
1
1
  import type { SubjectNode } from "@ldo/rdf-utils";
2
- import {
3
- ContextUtil,
4
- JsonldDatasetProxyBuilder,
5
- } from "@ldo/jsonld-dataset-proxy";
6
2
  import type { ShapeType } from "@ldo/ldo";
7
- import { LdoBuilder } from "@ldo/ldo";
3
+ import type { LdoBuilder } from "@ldo/ldo";
8
4
  import type { LdoBase } from "@ldo/ldo";
9
- import { useLdo } from "./SolidLdoProvider";
10
- import { useCallback, useEffect, useMemo, useState } from "react";
11
- import { TrackingProxyContext } from "./util/TrackingProxyContext";
12
- import { defaultGraph } from "@rdfjs/data-model";
5
+ import { useCallback } from "react";
6
+
7
+ import { useTrackingProxy } from "./util/useTrackingProxy";
13
8
 
14
9
  export function useSubject<Type extends LdoBase>(
15
10
  shapeType: ShapeType<Type>,
@@ -23,45 +18,13 @@ export function useSubject<Type extends LdoBase>(
23
18
  shapeType: ShapeType<Type>,
24
19
  subject?: string | SubjectNode,
25
20
  ): Type | undefined {
26
- const { dataset } = useLdo();
27
-
28
- const [forceUpdateCounter, setForceUpdateCounter] = useState(0);
29
- const forceUpdate = useCallback(
30
- () => setForceUpdateCounter((val) => val + 1),
31
- [],
21
+ const fromSubject = useCallback(
22
+ (builder: LdoBuilder<Type>) => {
23
+ if (!subject) return;
24
+ return builder.fromSubject(subject);
25
+ },
26
+ [subject],
32
27
  );
33
28
 
34
- // The main linked data object
35
- const linkedDataObject = useMemo(() => {
36
- if (!subject) return;
37
-
38
- // Remove all current subscriptions
39
- dataset.removeListenerFromAllEvents(forceUpdate);
40
-
41
- // Rebuild the LdoBuilder from scratch to inject TrackingProxyContext
42
- const contextUtil = new ContextUtil(shapeType.context);
43
- const proxyContext = new TrackingProxyContext(
44
- {
45
- dataset,
46
- contextUtil,
47
- writeGraphs: [defaultGraph()],
48
- languageOrdering: ["none", "en", "other"],
49
- },
50
- forceUpdate,
51
- );
52
- const builder = new LdoBuilder(
53
- new JsonldDatasetProxyBuilder(proxyContext),
54
- shapeType,
55
- );
56
- return builder.fromSubject(subject);
57
- }, [shapeType, subject, dataset, forceUpdateCounter, forceUpdate]);
58
-
59
- useEffect(() => {
60
- // Unregister force update listener upon unmount
61
- return () => {
62
- dataset.removeListenerFromAllEvents(forceUpdate);
63
- };
64
- }, [shapeType, subject]);
65
-
66
- return linkedDataObject;
29
+ return useTrackingProxy(shapeType, fromSubject);
67
30
  }
@@ -0,0 +1,52 @@
1
+ import { useLdo } from "./SolidLdoProvider";
2
+ import { useEffect, useRef } from "react";
3
+
4
+ export function useSubscribeToResource(...uris: string[]): void {
5
+ const { dataset } = useLdo();
6
+ const currentlySubscribed = useRef<Record<string, string>>({});
7
+ useEffect(() => {
8
+ const resources = uris.map((uri) => dataset.getResource(uri));
9
+ const previousSubscriptions = { ...currentlySubscribed.current };
10
+ Promise.all<void>(
11
+ resources.map(async (resource) => {
12
+ if (!previousSubscriptions[resource.uri]) {
13
+ // Prevent multiple triggers from created subscriptions while waiting
14
+ // for connection
15
+ currentlySubscribed.current[resource.uri] = "AWAITING";
16
+ // Read and subscribe
17
+ await resource.readIfUnfetched();
18
+ currentlySubscribed.current[resource.uri] =
19
+ await resource.subscribeToNotifications();
20
+ } else {
21
+ delete previousSubscriptions[resource.uri];
22
+ }
23
+ }),
24
+ ).then(async () => {
25
+ // Unsubscribe from all remaining previous subscriptions
26
+ await Promise.all(
27
+ Object.entries(previousSubscriptions).map(
28
+ async ([resourceUri, subscriptionId]) => {
29
+ // Unsubscribe
30
+ delete currentlySubscribed.current[resourceUri];
31
+ const resource = dataset.getResource(resourceUri);
32
+ await resource.unsubscribeFromNotifications(subscriptionId);
33
+ },
34
+ ),
35
+ );
36
+ });
37
+ }, [uris]);
38
+
39
+ // Cleanup Subscriptions
40
+ useEffect(() => {
41
+ return () => {
42
+ Promise.all(
43
+ Object.entries(currentlySubscribed.current).map(
44
+ async ([resourceUri, subscriptionId]) => {
45
+ const resource = dataset.getResource(resourceUri);
46
+ await resource.unsubscribeFromNotifications(subscriptionId);
47
+ },
48
+ ),
49
+ );
50
+ };
51
+ }, []);
52
+ }
@@ -50,12 +50,13 @@ export class TrackingProxyContext extends ProxyContext {
50
50
  receiver,
51
51
  ) => {
52
52
  const subject = target["@id"];
53
+ const rdfTypes = this.getRdfType(subject);
53
54
  if (typeof key === "symbol") {
54
55
  // Do Nothing
55
56
  } else if (key === "@id") {
56
57
  this.addListener([subject, null, null, null]);
57
- } else if (!this.contextUtil.isArray(key)) {
58
- const predicate = namedNode(this.contextUtil.keyToIri(key));
58
+ } else if (!this.contextUtil.isArray(key, rdfTypes)) {
59
+ const predicate = namedNode(this.contextUtil.keyToIri(key, rdfTypes));
59
60
  this.addListener([subject, predicate, null, null]);
60
61
  }
61
62
  return oldGetFunction && oldGetFunction(target, key, receiver);
@@ -0,0 +1,55 @@
1
+ import {
2
+ ContextUtil,
3
+ JsonldDatasetProxyBuilder,
4
+ } from "@ldo/jsonld-dataset-proxy";
5
+ import { LdoBuilder } from "@ldo/ldo";
6
+ import type { LdoBase, ShapeType } from "@ldo/ldo";
7
+ import { useCallback, useEffect, useMemo, useState } from "react";
8
+ import { TrackingProxyContext } from "./TrackingProxyContext";
9
+ import { defaultGraph } from "@rdfjs/data-model";
10
+ import { useLdo } from "../SolidLdoProvider";
11
+
12
+ export function useTrackingProxy<Type extends LdoBase, ReturnType>(
13
+ shapeType: ShapeType<Type>,
14
+ createLdo: (builder: LdoBuilder<Type>) => ReturnType,
15
+ ): ReturnType {
16
+ const { dataset } = useLdo();
17
+
18
+ const [forceUpdateCounter, setForceUpdateCounter] = useState(0);
19
+ const forceUpdate = useCallback(
20
+ () => setForceUpdateCounter((val) => val + 1),
21
+ [],
22
+ );
23
+
24
+ // The main linked data object
25
+ const linkedDataObject = useMemo(() => {
26
+ // Remove all current subscriptions
27
+ dataset.removeListenerFromAllEvents(forceUpdate);
28
+
29
+ // Rebuild the LdoBuilder from scratch to inject TrackingProxyContext
30
+ const contextUtil = new ContextUtil(shapeType.context);
31
+ const proxyContext = new TrackingProxyContext(
32
+ {
33
+ dataset,
34
+ contextUtil,
35
+ writeGraphs: [defaultGraph()],
36
+ languageOrdering: ["none", "en", "other"],
37
+ },
38
+ forceUpdate,
39
+ );
40
+ const builder = new LdoBuilder(
41
+ new JsonldDatasetProxyBuilder(proxyContext),
42
+ shapeType,
43
+ );
44
+ return createLdo(builder);
45
+ }, [shapeType, dataset, forceUpdateCounter, forceUpdate, createLdo]);
46
+
47
+ useEffect(() => {
48
+ // Unregister force update listener upon unmount
49
+ return () => {
50
+ dataset.removeListenerFromAllEvents(forceUpdate);
51
+ };
52
+ }, [shapeType]);
53
+
54
+ return linkedDataObject;
55
+ }