@ldo/jsonld-dataset-proxy 0.0.1-alpha.24 → 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.
Files changed (42) hide show
  1. package/dist/ContextUtil.d.ts +12 -7
  2. package/dist/ContextUtil.js +69 -31
  3. package/dist/ContextUtil.js.map +1 -1
  4. package/dist/ProxyContext.d.ts +2 -1
  5. package/dist/ProxyContext.js +9 -0
  6. package/dist/ProxyContext.js.map +1 -1
  7. package/dist/arrayProxy/modifyArray.js +2 -2
  8. package/dist/arrayProxy/modifyArray.js.map +1 -1
  9. package/dist/graphOf.js +1 -1
  10. package/dist/graphOf.js.map +1 -1
  11. package/dist/index.d.ts +1 -0
  12. package/dist/index.js +1 -0
  13. package/dist/index.js.map +1 -1
  14. package/dist/jsonldDatasetProxy.d.ts +2 -1
  15. package/dist/jsonldDatasetProxy.js.map +1 -1
  16. package/dist/language/languagesOf.js +3 -2
  17. package/dist/language/languagesOf.js.map +1 -1
  18. package/dist/subjectProxy/createSubjectHandler.js +1 -1
  19. package/dist/subjectProxy/createSubjectHandler.js.map +1 -1
  20. package/dist/subjectProxy/deleteFromDataset.js +1 -1
  21. package/dist/subjectProxy/deleteFromDataset.js.map +1 -1
  22. package/dist/subjectProxy/getValueForKey.js +6 -5
  23. package/dist/subjectProxy/getValueForKey.js.map +1 -1
  24. package/dist/util/addObjectToDataset.js +7 -5
  25. package/dist/util/addObjectToDataset.js.map +1 -1
  26. package/dist/util/getNodeFromRaw.d.ts +1 -1
  27. package/dist/util/getNodeFromRaw.js +3 -3
  28. package/dist/util/getNodeFromRaw.js.map +1 -1
  29. package/package.json +2 -2
  30. package/src/ContextUtil.ts +118 -35
  31. package/src/LdoJsonldContext.ts +14 -0
  32. package/src/ProxyContext.ts +12 -1
  33. package/src/arrayProxy/modifyArray.ts +10 -2
  34. package/src/graphOf.ts +4 -1
  35. package/src/index.ts +1 -0
  36. package/src/jsonldDatasetProxy.ts +2 -1
  37. package/src/language/languagesOf.ts +5 -2
  38. package/src/subjectProxy/createSubjectHandler.ts +6 -1
  39. package/src/subjectProxy/deleteFromDataset.ts +3 -1
  40. package/src/subjectProxy/getValueForKey.ts +8 -5
  41. package/src/util/addObjectToDataset.ts +9 -5
  42. package/src/util/getNodeFromRaw.ts +6 -2
@@ -1,12 +1,17 @@
1
1
  import type { ContextDefinition } from "jsonld";
2
+ import type { LdoJsonldContext } from "./LdoJsonldContext";
3
+ import type { NamedNode } from "@rdfjs/types";
2
4
  export declare class ContextUtil {
3
- readonly context: ContextDefinition;
5
+ readonly context: ContextDefinition | LdoJsonldContext;
4
6
  private iriToKeyMap;
5
- constructor(context: ContextDefinition);
6
- keyToIri(key: string): string;
7
+ private typeNameToIriToKeyMap;
8
+ constructor(context: ContextDefinition | LdoJsonldContext);
9
+ private createIriToKeyMap;
10
+ private getRelevantContext;
7
11
  private keyIdToIri;
8
- iriToKey(iri: string): string;
9
- getType(key: string): string;
10
- isArray(key: string): boolean;
11
- isLangString(key: string): boolean;
12
+ keyToIri(key: string, typeName: NamedNode[]): string;
13
+ iriToKey(iri: string, typeNames: NamedNode[]): string;
14
+ getDataType(key: string, typeName: NamedNode[]): string;
15
+ isArray(key: string, typeName: NamedNode[]): boolean;
16
+ isLangString(key: string, typeName: NamedNode[]): boolean;
12
17
  }
@@ -8,28 +8,42 @@ class ContextUtil {
8
8
  constructor(context) {
9
9
  this.context = context;
10
10
  this.iriToKeyMap = {};
11
+ this.iriToKeyMap = this.createIriToKeyMap(context);
12
+ this.typeNameToIriToKeyMap = {};
13
+ Object.entries(context).forEach(([contextKey, contextValue]) => {
14
+ if (typeof contextValue === "object" &&
15
+ contextValue !== null &&
16
+ !!contextValue["@id"] &&
17
+ contextValue["@context"]) {
18
+ this.typeNameToIriToKeyMap[contextKey] = this.createIriToKeyMap(contextValue["@context"]);
19
+ }
20
+ });
21
+ }
22
+ createIriToKeyMap(context) {
23
+ const iriToKeyMap = {};
11
24
  Object.entries(context).forEach(([contextKey, contextValue]) => {
12
25
  if (typeof contextValue === "string") {
13
- this.iriToKeyMap[this.keyIdToIri(contextValue)] = contextKey;
26
+ iriToKeyMap[this.keyIdToIri(contextValue)] = contextKey;
14
27
  }
15
28
  else if (typeof contextValue === "object" &&
16
- contextValue["@id"]) {
17
- this.iriToKeyMap[this.keyIdToIri(contextValue["@id"])] =
18
- contextKey;
29
+ contextValue !== null &&
30
+ !!contextValue["@id"]) {
31
+ const iri = this.keyIdToIri(contextValue["@id"]);
32
+ iriToKeyMap[iri] = contextKey;
19
33
  }
20
34
  });
35
+ return iriToKeyMap;
21
36
  }
22
- keyToIri(key) {
23
- if (!this.context[key]) {
24
- return key;
25
- }
26
- else if (typeof this.context[key] === "string") {
27
- return this.keyIdToIri(this.context[key]);
28
- }
29
- else if (this.context[key] && this.context[key]["@id"]) {
30
- return this.keyIdToIri(this.context[key]["@id"]);
37
+ getRelevantContext(key, typeNames) {
38
+ for (const typeNameNode of typeNames) {
39
+ const typeName = this.iriToKey(typeNameNode.value, []);
40
+ if (typeof this.context[typeName] === "object" &&
41
+ this.context[typeName]?.["@context"] &&
42
+ this.context[typeName]?.["@context"][key]) {
43
+ return this.context[typeName]?.["@context"];
44
+ }
31
45
  }
32
- return key;
46
+ return this.context;
33
47
  }
34
48
  keyIdToIri(keyId) {
35
49
  if (shorthandToIriMap[keyId]) {
@@ -39,30 +53,54 @@ class ContextUtil {
39
53
  return keyId;
40
54
  }
41
55
  }
42
- iriToKey(iri) {
43
- if (this.iriToKeyMap[iri]) {
44
- return this.iriToKeyMap[iri];
56
+ keyToIri(key, typeName) {
57
+ const relevantContext = this.getRelevantContext(key, typeName);
58
+ if (!relevantContext[key]) {
59
+ return key;
60
+ }
61
+ else if (typeof relevantContext[key] === "string") {
62
+ return this.keyIdToIri(relevantContext[key]);
63
+ }
64
+ else if (relevantContext[key] && relevantContext[key]["@id"]) {
65
+ return this.keyIdToIri(relevantContext[key]["@id"]);
66
+ }
67
+ return key;
68
+ }
69
+ iriToKey(iri, typeNames) {
70
+ let relevantMap = this.iriToKeyMap;
71
+ for (const typeNameNode of typeNames) {
72
+ const typeName = this.iriToKey(typeNameNode.value, []);
73
+ relevantMap = this.typeNameToIriToKeyMap[typeName]?.[iri]
74
+ ? this.typeNameToIriToKeyMap[typeName]
75
+ : this.iriToKeyMap;
76
+ }
77
+ if (relevantMap[iri]) {
78
+ return relevantMap[iri];
45
79
  }
46
80
  return iri;
47
81
  }
48
- getType(key) {
49
- if (typeof this.context[key] === "object" &&
50
- this.context[key]["@type"]) {
51
- return this.context[key]["@type"];
82
+ getDataType(key, typeName) {
83
+ const relevantContext = this.getRelevantContext(key, typeName);
84
+ if (typeof relevantContext[key] === "object" &&
85
+ relevantContext[key]["@type"]) {
86
+ return relevantContext[key]["@type"];
52
87
  }
53
88
  return "http://www.w3.org/2001/XMLSchema#string";
54
89
  }
55
- isArray(key) {
56
- return !!(this.context[key] &&
57
- typeof this.context[key] === "object" &&
58
- this.context[key]["@container"] &&
59
- this.context[key]["@container"] === "@set");
90
+ isArray(key, typeName) {
91
+ const relevantContext = this.getRelevantContext(key, typeName);
92
+ return !!(relevantContext[key] &&
93
+ typeof relevantContext[key] === "object" &&
94
+ (relevantContext[key]["@container"] ===
95
+ "@set" ||
96
+ relevantContext[key]["@isCollection"]));
60
97
  }
61
- isLangString(key) {
62
- return !!(this.context[key] &&
63
- typeof this.context[key] === "object" &&
64
- this.context[key]["@type"] &&
65
- this.context[key]["@type"] ===
98
+ isLangString(key, typeName) {
99
+ const relevantContext = this.getRelevantContext(key, typeName);
100
+ return !!(relevantContext[key] &&
101
+ typeof relevantContext[key] === "object" &&
102
+ relevantContext[key]["@type"] &&
103
+ relevantContext[key]["@type"] ===
66
104
  "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString");
67
105
  }
68
106
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ContextUtil.js","sourceRoot":"","sources":["../src/ContextUtil.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ContextUtil.js","sourceRoot":"","sources":["../src/ContextUtil.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { GraphNode, QuadMatch } from "@ldo/rdf-utils";
1
+ import type { GraphNode, QuadMatch, SubjectNode } from "@ldo/rdf-utils";
2
2
  import type { BlankNode, Dataset, NamedNode } from "@rdfjs/types";
3
3
  import type { ArrayProxyTarget } from "./arrayProxy/createArrayHandler";
4
4
  import type { SubjectProxy } from "./subjectProxy/SubjectProxy";
@@ -28,4 +28,5 @@ export declare class ProxyContext {
28
28
  createArrayProxy(quadMatch: QuadMatch, isSubjectOriented?: boolean, initialTarget?: ArrayProxyTarget, isLangStringArray?: boolean): ArrayProxy;
29
29
  protected createArrayHandler(): ProxyHandler<ArrayProxyTarget>;
30
30
  duplicate(alternativeOptions: Partial<ProxyContextOptions>): ProxyContext;
31
+ getRdfType(subjectNode: SubjectNode): NamedNode[];
31
32
  }
@@ -4,6 +4,8 @@ exports.ProxyContext = void 0;
4
4
  const createArrayHandler_1 = require("./arrayProxy/createArrayHandler");
5
5
  const createSubjectHandler_1 = require("./subjectProxy/createSubjectHandler");
6
6
  const types_1 = require("./types");
7
+ const data_model_1 = require("@rdfjs/data-model");
8
+ const rdfType = (0, data_model_1.namedNode)("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
7
9
  class ProxyContext {
8
10
  constructor(options) {
9
11
  this.subjectMap = new Map();
@@ -60,6 +62,13 @@ class ProxyContext {
60
62
  };
61
63
  return new ProxyContext(fullOptions);
62
64
  }
65
+ getRdfType(subjectNode) {
66
+ return this.dataset
67
+ .match(subjectNode, rdfType)
68
+ .toArray()
69
+ .map((quad) => quad.object)
70
+ .filter((object) => object.termType === "NamedNode");
71
+ }
63
72
  }
64
73
  exports.ProxyContext = ProxyContext;
65
74
  //# sourceMappingURL=ProxyContext.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ProxyContext.js","sourceRoot":"","sources":["../src/ProxyContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ProxyContext.js","sourceRoot":"","sources":["../src/ProxyContext.ts"],"names":[],"mappings":"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"}
@@ -57,13 +57,13 @@ function modifyArray(config, proxyContext) {
57
57
  if (!target[2] && target[0][0] && target[0][1] && added) {
58
58
  (0, addObjectToDataset_1.addObjectToDataset)({
59
59
  "@id": target[0][0],
60
- [contextUtil.iriToKey(target[0][1].value)]: added,
60
+ [contextUtil.iriToKey(target[0][1].value, proxyContext.getRdfType(target[0][0]))]: added,
61
61
  }, false, proxyContext);
62
62
  }
63
63
  const addedNodes = added
64
64
  ? added
65
65
  .map((addedValue) => {
66
- return (0, getNodeFromRaw_1.getNodeFromRawValue)(key, addedValue, proxyContext);
66
+ return (0, getNodeFromRaw_1.getNodeFromRawValue)(key, addedValue, target[0][0] ? proxyContext.getRdfType(target[0][0]) : [], proxyContext);
67
67
  })
68
68
  .filter((val) => val != undefined)
69
69
  : [];
@@ -1 +1 @@
1
- {"version":3,"file":"modifyArray.js","sourceRoot":"","sources":["../../src/arrayProxy/modifyArray.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"modifyArray.js","sourceRoot":"","sources":["../../src/arrayProxy/modifyArray.ts"],"names":[],"mappings":"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"}
package/dist/graphOf.js CHANGED
@@ -8,7 +8,7 @@ function graphOf(subject, predicate, object) {
8
8
  const subjectProxy = (0, isSubjectProxy_1.getSubjectProxyFromObject)(subject);
9
9
  const proxyContext = subjectProxy[types_1._proxyContext];
10
10
  const subjectNode = subjectProxy[types_1._getUnderlyingNode];
11
- const predicateNode = (0, data_model_1.namedNode)(proxyContext.contextUtil.keyToIri(predicate));
11
+ const predicateNode = (0, data_model_1.namedNode)(proxyContext.contextUtil.keyToIri(predicate, proxyContext.getRdfType(subjectNode)));
12
12
  let objectNode;
13
13
  if (object == null) {
14
14
  objectNode = null;
@@ -1 +1 @@
1
- {"version":3,"file":"graphOf.js","sourceRoot":"","sources":["../src/graphOf.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAC9C,kEAGuC;AAEvC,mCAMiB;AASjB,SAAgB,OAAO,CACrB,OAAgB,EAChB,SAAc,EACd,MAEc;IAEd,MAAM,YAAY,GAAG,IAAA,0CAAyB,EAAC,OAAO,CAAC,CAAC;IACxD,MAAM,YAAY,GAAG,YAAY,CAAC,qBAAa,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,YAAY,CAAC,0BAAkB,CAAC,CAAC;IACrD,MAAM,aAAa,GAAG,IAAA,sBAAS,EAC7B,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAmB,CAAC,CACvD,CAAC;IACF,IAAI,UAA6B,CAAC;IAClC,IAAI,MAAM,IAAI,IAAI,EAAE;QAClB,UAAU,GAAG,IAAI,CAAC;KACnB;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACrC,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,CAAC,2BAAmB,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,QAAQ,MAAM,CAAC,SAAS,CAAC,QAAQ,OAAO,mBAAmB,CAC5D,CAAC;SACH;QACD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,kBAAkB,CAAC,CAAC;SACpD;QACD,IAAI,IAAA,+BAAc,EAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE;YACtC,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SACpC;QACD,UAAU,GAAG,UAAU,CAAC,uBAAe,CAAC,CAAC,MAAM,CAAC,CAAC;KAClD;SAAM;QACL,MAAM,WAAW,GAAG,IAAA,0CAAyB,EAAC,MAAM,CAAC,CAAC;QACtD,UAAU,GAAG,WAAW,CAAC,0BAAkB,CAAC,CAAC;KAC9C;IACD,MAAM,KAAK,GAAG,YAAY,CAAC,6BAAqB,CAAC,CAAC,KAAK,CACrD,WAAW,EACX,aAAa,EACb,UAAU,CACX,CAAC;IACF,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAa,EAAE,CAAC,IAAI,CAAC,KAAkB,CAAC,CAAC;AAC3E,CAAC;AAxCD,0BAwCC"}
1
+ {"version":3,"file":"graphOf.js","sourceRoot":"","sources":["../src/graphOf.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAC9C,kEAGuC;AAEvC,mCAMiB;AASjB,SAAgB,OAAO,CACrB,OAAgB,EAChB,SAAc,EACd,MAEc;IAEd,MAAM,YAAY,GAAG,IAAA,0CAAyB,EAAC,OAAO,CAAC,CAAC;IACxD,MAAM,YAAY,GAAG,YAAY,CAAC,qBAAa,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,YAAY,CAAC,0BAAkB,CAAC,CAAC;IACrD,MAAM,aAAa,GAAG,IAAA,sBAAS,EAC7B,YAAY,CAAC,WAAW,CAAC,QAAQ,CAC/B,SAAmB,EACnB,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CACrC,CACF,CAAC;IACF,IAAI,UAA6B,CAAC;IAClC,IAAI,MAAM,IAAI,IAAI,EAAE;QAClB,UAAU,GAAG,IAAI,CAAC;KACnB;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACrC,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,CAAC,2BAAmB,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,QAAQ,MAAM,CAAC,SAAS,CAAC,QAAQ,OAAO,mBAAmB,CAC5D,CAAC;SACH;QACD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,kBAAkB,CAAC,CAAC;SACpD;QACD,IAAI,IAAA,+BAAc,EAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE;YACtC,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SACpC;QACD,UAAU,GAAG,UAAU,CAAC,uBAAe,CAAC,CAAC,MAAM,CAAC,CAAC;KAClD;SAAM;QACL,MAAM,WAAW,GAAG,IAAA,0CAAyB,EAAC,MAAM,CAAC,CAAC;QACtD,UAAU,GAAG,WAAW,CAAC,0BAAkB,CAAC,CAAC;KAC9C;IACD,MAAM,KAAK,GAAG,YAAY,CAAC,6BAAqB,CAAC,CAAC,KAAK,CACrD,WAAW,EACX,aAAa,EACb,UAAU,CACX,CAAC;IACF,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAa,EAAE,CAAC,IAAI,CAAC,KAAkB,CAAC,CAAC;AAC3E,CAAC;AA3CD,0BA2CC"}
package/dist/index.d.ts CHANGED
@@ -8,6 +8,7 @@ export * from "./jsonldDatasetProxy";
8
8
  export * from "./write";
9
9
  export * from "./graphOf";
10
10
  export * from "./setLanguagePreferences";
11
+ export * from "./LdoJsonldContext";
11
12
  export * from "./language/languagesOf";
12
13
  export * from "./language/languageMapProxy";
13
14
  export * from "./language/languageSet";
package/dist/index.js CHANGED
@@ -24,6 +24,7 @@ __exportStar(require("./jsonldDatasetProxy"), exports);
24
24
  __exportStar(require("./write"), exports);
25
25
  __exportStar(require("./graphOf"), exports);
26
26
  __exportStar(require("./setLanguagePreferences"), exports);
27
+ __exportStar(require("./LdoJsonldContext"), exports);
27
28
  __exportStar(require("./language/languagesOf"), exports);
28
29
  __exportStar(require("./language/languageMapProxy"), exports);
29
30
  __exportStar(require("./language/languageSet"), exports);
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6DAA0D;AAE1D,kBAAe,uCAAkB,CAAC;AAClC,0CAAwB;AACxB,gDAA8B;AAC9B,iDAA+B;AAC/B,8DAA4C;AAC5C,uDAAqC;AACrC,0CAAwB;AACxB,4CAA0B;AAC1B,2DAAyC;AAEzC,yDAAuC;AACvC,8DAA4C;AAC5C,yDAAuC;AACvC,2DAAyC;AACzC,2DAAyC;AAEzC,kEAAgD;AAChD,4DAA0C;AAC1C,0DAAwC;AACxC,2DAAyC;AACzC,4DAA0C;AAE1C,sEAAoD;AACpD,8DAA4C;AAC5C,gEAA8C;AAC9C,mEAAiD;AACjD,gEAA8C;AAE9C,4DAA0C;AAC1C,oEAAkD;AAClD,mDAAiC;AACjC,wDAAsC;AACtC,iDAA+B;AAC/B,iDAA+B;AAC/B,+DAA6C"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6DAA0D;AAE1D,kBAAe,uCAAkB,CAAC;AAClC,0CAAwB;AACxB,gDAA8B;AAC9B,iDAA+B;AAC/B,8DAA4C;AAC5C,uDAAqC;AACrC,0CAAwB;AACxB,4CAA0B;AAC1B,2DAAyC;AACzC,qDAAmC;AAEnC,yDAAuC;AACvC,8DAA4C;AAC5C,yDAAuC;AACvC,2DAAyC;AACzC,2DAAyC;AAEzC,kEAAgD;AAChD,4DAA0C;AAC1C,0DAAwC;AACxC,2DAAyC;AACzC,4DAA0C;AAE1C,sEAAoD;AACpD,8DAA4C;AAC5C,gEAA8C;AAC9C,mEAAiD;AACjD,gEAA8C;AAE9C,4DAA0C;AAC1C,oEAAkD;AAClD,mDAAiC;AACjC,wDAAsC;AACtC,iDAA+B;AAC/B,iDAA+B;AAC/B,+DAA6C"}
@@ -1,4 +1,5 @@
1
1
  import type { Dataset } from "@rdfjs/types";
2
2
  import type { ContextDefinition } from "jsonld";
3
3
  import { JsonldDatasetProxyBuilder } from "./JsonldDatasetProxyBuilder";
4
- export declare function jsonldDatasetProxy(inputDataset: Dataset, context: ContextDefinition): JsonldDatasetProxyBuilder;
4
+ import type { LdoJsonldContext } from "./LdoJsonldContext";
5
+ export declare function jsonldDatasetProxy(inputDataset: Dataset, context: ContextDefinition | LdoJsonldContext): JsonldDatasetProxyBuilder;
@@ -1 +1 @@
1
- {"version":3,"file":"jsonldDatasetProxy.js","sourceRoot":"","sources":["../src/jsonldDatasetProxy.ts"],"names":[],"mappings":";;;AAAA,kDAAiD;AAGjD,+CAA4C;AAC5C,2EAAwE;AACxE,iDAA8C;AAS9C,SAAgB,kBAAkB,CAChC,YAAqB,EACrB,OAA0B;IAE1B,MAAM,WAAW,GAAG,IAAI,yBAAW,CAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC;QACpC,OAAO,EAAE,YAAY;QACrB,WAAW;QACX,WAAW,EAAE,CAAC,IAAA,yBAAY,GAAE,CAAC;QAC7B,gBAAgB,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC;KAC1C,CAAC,CAAC;IACH,OAAO,IAAI,qDAAyB,CAAC,YAAY,CAAC,CAAC;AACrD,CAAC;AAZD,gDAYC"}
1
+ {"version":3,"file":"jsonldDatasetProxy.js","sourceRoot":"","sources":["../src/jsonldDatasetProxy.ts"],"names":[],"mappings":";;;AAAA,kDAAiD;AAGjD,+CAA4C;AAC5C,2EAAwE;AACxE,iDAA8C;AAU9C,SAAgB,kBAAkB,CAChC,YAAqB,EACrB,OAA6C;IAE7C,MAAM,WAAW,GAAG,IAAI,yBAAW,CAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC;QACpC,OAAO,EAAE,YAAY;QACrB,WAAW;QACX,WAAW,EAAE,CAAC,IAAA,yBAAY,GAAE,CAAC;QAC7B,gBAAgB,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC;KAC1C,CAAC,CAAC;IACH,OAAO,IAAI,qDAAyB,CAAC,YAAY,CAAC,CAAC;AACrD,CAAC;AAZD,gDAYC"}
@@ -9,8 +9,9 @@ function languagesOf(subjectObject, key) {
9
9
  const proxy = (0, isSubjectProxy_1.getSubjectProxyFromObject)(subjectObject);
10
10
  const proxyContext = proxy[types_1._proxyContext];
11
11
  const subject = proxy[types_1._getUnderlyingNode];
12
- const predicate = (0, data_model_1.namedNode)(proxyContext.contextUtil.keyToIri(key));
13
- return (0, languageMapProxy_1.createLanguageMapProxy)(subject, predicate, proxyContext, proxyContext.contextUtil.isArray(key));
12
+ const rdfTypes = proxyContext.getRdfType(subject);
13
+ const predicate = (0, data_model_1.namedNode)(proxyContext.contextUtil.keyToIri(key, rdfTypes));
14
+ return (0, languageMapProxy_1.createLanguageMapProxy)(subject, predicate, proxyContext, proxyContext.contextUtil.isArray(key, rdfTypes));
14
15
  }
15
16
  exports.languagesOf = languagesOf;
16
17
  //# sourceMappingURL=languagesOf.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"languagesOf.js","sourceRoot":"","sources":["../../src/language/languagesOf.ts"],"names":[],"mappings":";;;AAAA,kDAA8C;AAC9C,mEAA2E;AAE3E,oCAA6D;AAC7D,yDAA4D;AAuC5D,SAAgB,WAAW,CAIzB,aAA4B,EAC5B,GAAQ;IAER,MAAM,KAAK,GAAG,IAAA,0CAAyB,EAAC,aAAa,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,KAAK,CAAC,qBAAa,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,KAAK,CAAC,0BAAkB,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,IAAA,sBAAS,EAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAa,CAAC,CAAC,CAAC;IAC9E,OAAO,IAAA,yCAAsB,EAC3B,OAAO,EACP,SAAS,EACT,YAAY,EACZ,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,GAAa,CAAC,CACG,CAAC;AACvD,CAAC;AAjBD,kCAiBC"}
1
+ {"version":3,"file":"languagesOf.js","sourceRoot":"","sources":["../../src/language/languagesOf.ts"],"names":[],"mappings":";;;AAAA,kDAA8C;AAC9C,mEAA2E;AAE3E,oCAA6D;AAC7D,yDAA4D;AAuC5D,SAAgB,WAAW,CAIzB,aAA4B,EAC5B,GAAQ;IAER,MAAM,KAAK,GAAG,IAAA,0CAAyB,EAAC,aAAa,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,KAAK,CAAC,qBAAa,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,KAAK,CAAC,0BAAkB,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,SAAS,GAAG,IAAA,sBAAS,EACzB,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAa,EAAE,QAAQ,CAAC,CAC3D,CAAC;IACF,OAAO,IAAA,yCAAsB,EAC3B,OAAO,EACP,SAAS,EACT,YAAY,EACZ,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,GAAa,EAAE,QAAQ,CAAC,CACP,CAAC;AACvD,CAAC;AApBD,kCAoBC"}
@@ -37,7 +37,7 @@ function createSubjectHandler(initialProxyContext) {
37
37
  const tripleDataset = proxyContext.dataset.match(subject);
38
38
  const keys = new Set(["@id"]);
39
39
  tripleDataset.toArray().forEach((quad) => {
40
- keys.add(proxyContext.contextUtil.iriToKey(quad.predicate.value));
40
+ keys.add(proxyContext.contextUtil.iriToKey(quad.predicate.value, proxyContext.getRdfType(subject)));
41
41
  });
42
42
  return Array.from(keys);
43
43
  },
@@ -1 +1 @@
1
- {"version":3,"file":"createSubjectHandler.js","sourceRoot":"","sources":["../../src/subjectProxy/createSubjectHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createSubjectHandler.js","sourceRoot":"","sources":["../../src/subjectProxy/createSubjectHandler.ts"],"names":[],"mappings":"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"}
@@ -14,7 +14,7 @@ function deleteValueFromDataset(target, key, proxyContext) {
14
14
  return true;
15
15
  }
16
16
  const subject = target["@id"];
17
- const predicate = (0, data_model_1.namedNode)(proxyContext.contextUtil.keyToIri(key));
17
+ const predicate = (0, data_model_1.namedNode)(proxyContext.contextUtil.keyToIri(key, proxyContext.getRdfType(subject)));
18
18
  if (key === "@id") {
19
19
  nodesToRemove.push(target["@id"]);
20
20
  }
@@ -1 +1 @@
1
- {"version":3,"file":"deleteFromDataset.js","sourceRoot":"","sources":["../../src/subjectProxy/deleteFromDataset.ts"],"names":[],"mappings":";;;AAAA,kDAAoD;AAKpD,SAAgB,sBAAsB,CACpC,MAA0B,EAC1B,GAAoB,EACpB,YAA0B;IAE1B,MAAM,aAAa,GAAW,EAAE,CAAC;IACjC,IAAI,GAAG,KAAK,UAAU,EAAE;QACtB,OAAO,IAAI,CAAC;KACb;IACD,IAAI,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,MAAM,CAAC,WAAW,EAAE;QACpD,OAAO,IAAI,CAAC;KACb;IACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,OAAO,IAAI,CAAC;KACb;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,MAAM,SAAS,GAAG,IAAA,sBAAS,EAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACpE,IAAI,GAAG,KAAK,KAAK,EAAE;QACjB,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;KACnC;SAAM;QACL,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACrE,IAAI,aAAa,CAAC,IAAI,KAAK,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC;SACb;aAAM;YACL,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3E;KACF;IACD,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7B,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;YAC/B,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAA,iBAAI,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC;SACb;aAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE;YACxC,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YAC/D,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;YAC/D,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC;AAtCD,wDAsCC"}
1
+ {"version":3,"file":"deleteFromDataset.js","sourceRoot":"","sources":["../../src/subjectProxy/deleteFromDataset.ts"],"names":[],"mappings":";;;AAAA,kDAAoD;AAKpD,SAAgB,sBAAsB,CACpC,MAA0B,EAC1B,GAAoB,EACpB,YAA0B;IAE1B,MAAM,aAAa,GAAW,EAAE,CAAC;IACjC,IAAI,GAAG,KAAK,UAAU,EAAE;QACtB,OAAO,IAAI,CAAC;KACb;IACD,IAAI,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,MAAM,CAAC,WAAW,EAAE;QACpD,OAAO,IAAI,CAAC;KACb;IACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,OAAO,IAAI,CAAC;KACb;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,MAAM,SAAS,GAAG,IAAA,sBAAS,EACzB,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CACzE,CAAC;IACF,IAAI,GAAG,KAAK,KAAK,EAAE;QACjB,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;KACnC;SAAM;QACL,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACrE,IAAI,aAAa,CAAC,IAAI,KAAK,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC;SACb;aAAM;YACL,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3E;KACF;IACD,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7B,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;YAC/B,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAA,iBAAI,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC;SACb;aAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE;YACxC,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YAC/D,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;YAC/D,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC;AAxCD,wDAwCC"}
@@ -10,7 +10,7 @@ function getValueForKey(target, key, proxyContext) {
10
10
  if (target["@id"].termType === "BlankNode") {
11
11
  return undefined;
12
12
  }
13
- return contextUtil.iriToKey(target["@id"].value);
13
+ return contextUtil.iriToKey(target["@id"].value, []);
14
14
  }
15
15
  if (key === "toString" || key === Symbol.toStringTag) {
16
16
  return Reflect.get(target, "toString");
@@ -19,13 +19,14 @@ function getValueForKey(target, key, proxyContext) {
19
19
  return;
20
20
  }
21
21
  const subject = target["@id"];
22
- const predicate = (0, data_model_1.namedNode)(contextUtil.keyToIri(key));
23
- if (contextUtil.isArray(key)) {
24
- const arrayProxy = proxyContext.createArrayProxy([subject, predicate, null, null], false, undefined, contextUtil.isLangString(key));
22
+ const rdfType = proxyContext.getRdfType(subject);
23
+ const predicate = (0, data_model_1.namedNode)(contextUtil.keyToIri(key, rdfType));
24
+ if (contextUtil.isArray(key, rdfType)) {
25
+ const arrayProxy = proxyContext.createArrayProxy([subject, predicate, null, null], false, undefined, contextUtil.isLangString(key, rdfType));
25
26
  return arrayProxy;
26
27
  }
27
28
  let objectDataset = dataset.match(subject, predicate);
28
- if (contextUtil.isLangString(key)) {
29
+ if (contextUtil.isLangString(key, rdfType)) {
29
30
  objectDataset = (0, languageUtils_1.filterQuadsByLanguageOrdering)(objectDataset, proxyContext.languageOrdering);
30
31
  }
31
32
  if (objectDataset.size === 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"getValueForKey.js","sourceRoot":"","sources":["../../src/subjectProxy/getValueForKey.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAC9C,mFAAgF;AAIhF,6DAA0E;AAK1E,SAAgB,cAAc,CAC5B,MAA0B,EAC1B,GAAoB,EACpB,YAA0B;IAE1B,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IAC9C,IAAI,GAAG,KAAK,KAAK,EAAE;QACjB,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC1C,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;KAClD;IACD,IAAI,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,MAAM,CAAC,WAAW,EAAE;QAIpD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;KACxC;IACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,OAAO;KACR;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,MAAM,SAAS,GAAG,IAAA,sBAAS,EAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACvD,IAAI,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC5B,MAAM,UAAU,GAAG,YAAY,CAAC,gBAAgB,CAC9C,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,EAChC,KAAK,EACL,SAAS,EACT,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAC9B,CAAC;QACF,OAAO,UAAU,CAAC;KACnB;IACD,IAAI,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACtD,IAAI,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE;QACjC,aAAa,GAAG,IAAA,6CAA6B,EAC3C,aAAa,EACb,YAAY,CAAC,gBAAgB,CAC9B,CAAC;KACH;IACD,IAAI,aAAa,CAAC,IAAI,KAAK,CAAC,EAAE;QAC5B,OAAO,SAAS,CAAC;KAClB;SAAM,IAAI,aAAa,CAAC,IAAI,KAAK,CAAC,EAAE;QACnC,MAAM,KAAK,GAAG,IAAA,uDAA0B,EACtC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,EACjC,YAAY,CACb,CAAC;QACF,OAAO,KAAK,CAAC;KACd;SAAM;QACL,OAAO,YAAY,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;KACxE;AACH,CAAC;AAlDD,wCAkDC"}
1
+ {"version":3,"file":"getValueForKey.js","sourceRoot":"","sources":["../../src/subjectProxy/getValueForKey.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAC9C,mFAAgF;AAIhF,6DAA0E;AAK1E,SAAgB,cAAc,CAC5B,MAA0B,EAC1B,GAAoB,EACpB,YAA0B;IAE1B,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IAC9C,IAAI,GAAG,KAAK,KAAK,EAAE;QACjB,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC1C,OAAO,SAAS,CAAC;SAClB;QAGD,OAAO,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;KACtD;IACD,IAAI,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,MAAM,CAAC,WAAW,EAAE;QAIpD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;KACxC;IACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,OAAO;KACR;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,IAAA,sBAAS,EAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAChE,IAAI,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE;QACrC,MAAM,UAAU,GAAG,YAAY,CAAC,gBAAgB,CAC9C,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,EAChC,KAAK,EACL,SAAS,EACT,WAAW,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CACvC,CAAC;QACF,OAAO,UAAU,CAAC;KACnB;IACD,IAAI,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACtD,IAAI,WAAW,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE;QAC1C,aAAa,GAAG,IAAA,6CAA6B,EAC3C,aAAa,EACb,YAAY,CAAC,gBAAgB,CAC9B,CAAC;KACH;IACD,IAAI,aAAa,CAAC,IAAI,KAAK,CAAC,EAAE;QAC5B,OAAO,SAAS,CAAC;KAClB;SAAM,IAAI,aAAa,CAAC,IAAI,KAAK,CAAC,EAAE;QACnC,MAAM,KAAK,GAAG,IAAA,uDAA0B,EACtC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,EACjC,YAAY,CACb,CAAC;QACF,OAAO,KAAK,CAAC;KACd;SAAM;QACL,OAAO,YAAY,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;KACxE;AACH,CAAC;AArDD,wCAqDC"}
@@ -8,14 +8,15 @@ const NodeSet_1 = require("./NodeSet");
8
8
  const languageUtils_1 = require("../language/languageUtils");
9
9
  function addRawValueToDatasetRecursive(subject, key, value, visitedObjects, shouldDeleteOldTriples, proxyContext) {
10
10
  const { dataset, contextUtil } = proxyContext;
11
- const predicate = (0, data_model_1.namedNode)(contextUtil.keyToIri(key));
12
- const object = (0, getNodeFromRaw_1.getNodeFromRawValue)(key, value, proxyContext);
11
+ const rdfType = proxyContext.getRdfType(subject);
12
+ const predicate = (0, data_model_1.namedNode)(contextUtil.keyToIri(key, rdfType));
13
+ const object = (0, getNodeFromRaw_1.getNodeFromRawValue)(key, value, rdfType, proxyContext);
13
14
  if (object == undefined) {
14
15
  dataset.deleteMatches(subject, predicate);
15
16
  }
16
17
  else if (object.termType === "Literal") {
17
18
  let languageAppliedObject = object;
18
- if (contextUtil.isLangString(key)) {
19
+ if (contextUtil.isLangString(key, rdfType)) {
19
20
  const languageKey = (0, languageUtils_1.getLanguageKeyForWriteOperation)(proxyContext.languageOrdering);
20
21
  if (!languageKey)
21
22
  return;
@@ -44,6 +45,7 @@ function addRawObjectToDatasetRecursive(item, visitedObjects, shouldDeleteOldTri
44
45
  }
45
46
  const { dataset } = proxyContext;
46
47
  const subject = (0, getNodeFromRaw_1.getNodeFromRawObject)(item, proxyContext.contextUtil);
48
+ const rdfType = proxyContext.getRdfType(subject);
47
49
  if (visitedObjects.has(subject)) {
48
50
  return proxyContext.createSubjectProxy(subject);
49
51
  }
@@ -52,9 +54,9 @@ function addRawObjectToDatasetRecursive(item, visitedObjects, shouldDeleteOldTri
52
54
  if (key === "@id") {
53
55
  return;
54
56
  }
55
- const predicate = (0, data_model_1.namedNode)(proxyContext.contextUtil.keyToIri(key));
57
+ const predicate = (0, data_model_1.namedNode)(proxyContext.contextUtil.keyToIri(key, rdfType));
56
58
  if (shouldDeleteOldTriples) {
57
- if (proxyContext.contextUtil.isLangString(key)) {
59
+ if (proxyContext.contextUtil.isLangString(key, rdfType)) {
58
60
  const languageKey = (0, languageUtils_1.getLanguageKeyForWriteOperation)(proxyContext.languageOrdering);
59
61
  if (languageKey) {
60
62
  (0, languageUtils_1.languageDeleteMatch)(dataset, subject, predicate, languageKey);
@@ -1 +1 @@
1
- {"version":3,"file":"addObjectToDataset.js","sourceRoot":"","sources":["../../src/util/addObjectToDataset.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"addObjectToDataset.js","sourceRoot":"","sources":["../../src/util/addObjectToDataset.ts"],"names":[],"mappings":"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"}
@@ -3,4 +3,4 @@ import type { ContextUtil } from "../ContextUtil";
3
3
  import type { RawObject, RawValue } from "./RawObject";
4
4
  import type { ProxyContext } from "../ProxyContext";
5
5
  export declare function getNodeFromRawObject(item: RawObject, contextUtil: ContextUtil): NamedNode | BlankNode;
6
- export declare function getNodeFromRawValue(key: string, value: RawValue, proxyContext: ProxyContext): BlankNode | NamedNode | Literal | undefined;
6
+ export declare function getNodeFromRawValue(key: string, value: RawValue, rdfTypes: NamedNode[], proxyContext: ProxyContext): BlankNode | NamedNode | Literal | undefined;
@@ -11,21 +11,21 @@ function getNodeFromRawObject(item, contextUtil) {
11
11
  return (0, data_model_1.blankNode)();
12
12
  }
13
13
  else if (typeof item["@id"] === "string") {
14
- return (0, data_model_1.namedNode)(contextUtil.keyToIri(item["@id"]));
14
+ return (0, data_model_1.namedNode)(contextUtil.keyToIri(item["@id"], []));
15
15
  }
16
16
  else {
17
17
  return item["@id"];
18
18
  }
19
19
  }
20
20
  exports.getNodeFromRawObject = getNodeFromRawObject;
21
- function getNodeFromRawValue(key, value, proxyContext) {
21
+ function getNodeFromRawValue(key, value, rdfTypes, proxyContext) {
22
22
  if (value == undefined) {
23
23
  return undefined;
24
24
  }
25
25
  else if (typeof value === "string" ||
26
26
  typeof value === "boolean" ||
27
27
  typeof value === "number") {
28
- const datatype = proxyContext.contextUtil.getType(key);
28
+ const datatype = proxyContext.contextUtil.getDataType(key, rdfTypes);
29
29
  if (datatype === "@id") {
30
30
  return (0, data_model_1.namedNode)(value.toString());
31
31
  }
@@ -1 +1 @@
1
- {"version":3,"file":"getNodeFromRaw.js","sourceRoot":"","sources":["../../src/util/getNodeFromRaw.ts"],"names":[],"mappings":";;;AACA,kDAAkE;AAElE,oCAA8C;AAI9C,SAAgB,oBAAoB,CAClC,IAAe,EACf,WAAwB;IAExB,IAAI,IAAI,CAAC,0BAAkB,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC,0BAAkB,CAA0B,CAAC;KAC1D;SAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACvB,OAAO,IAAA,sBAAS,GAAE,CAAC;KACpB;SAAM,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,QAAQ,EAAE;QAC1C,OAAO,IAAA,sBAAS,EAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACrD;SAAM;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;KACpB;AACH,CAAC;AAbD,oDAaC;AAED,SAAgB,mBAAmB,CACjC,GAAW,EACX,KAAe,EACf,YAA0B;IAG1B,IAAI,KAAK,IAAI,SAAS,EAAE;QACtB,OAAO,SAAS,CAAC;KAClB;SAAM,IACL,OAAO,KAAK,KAAK,QAAQ;QACzB,OAAO,KAAK,KAAK,SAAS;QAC1B,OAAO,KAAK,KAAK,QAAQ,EACzB;QACA,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,QAAQ,KAAK,KAAK,EAAE;YACtB,OAAO,IAAA,sBAAS,EAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;SACpC;aAAM;YACL,OAAO,IAAA,oBAAO,EAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;SAC5C;KACF;SAAM;QACL,OAAO,oBAAoB,CAAC,KAAK,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;KAC9D;AACH,CAAC;AAtBD,kDAsBC"}
1
+ {"version":3,"file":"getNodeFromRaw.js","sourceRoot":"","sources":["../../src/util/getNodeFromRaw.ts"],"names":[],"mappings":";;;AACA,kDAAkE;AAElE,oCAA8C;AAI9C,SAAgB,oBAAoB,CAClC,IAAe,EACf,WAAwB;IAExB,IAAI,IAAI,CAAC,0BAAkB,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC,0BAAkB,CAA0B,CAAC;KAC1D;SAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACvB,OAAO,IAAA,sBAAS,GAAE,CAAC;KACpB;SAAM,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,QAAQ,EAAE;QAG1C,OAAO,IAAA,sBAAS,EAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;KACpB;AACH,CAAC;AAfD,oDAeC;AAED,SAAgB,mBAAmB,CACjC,GAAW,EACX,KAAe,EACf,QAAqB,EACrB,YAA0B;IAG1B,IAAI,KAAK,IAAI,SAAS,EAAE;QACtB,OAAO,SAAS,CAAC;KAClB;SAAM,IACL,OAAO,KAAK,KAAK,QAAQ;QACzB,OAAO,KAAK,KAAK,SAAS;QAC1B,OAAO,KAAK,KAAK,QAAQ,EACzB;QAEA,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrE,IAAI,QAAQ,KAAK,KAAK,EAAE;YACtB,OAAO,IAAA,sBAAS,EAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;SACpC;aAAM;YACL,OAAO,IAAA,oBAAO,EAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;SAC5C;KACF;SAAM;QACL,OAAO,oBAAoB,CAAC,KAAK,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;KAC9D;AACH,CAAC;AAxBD,kDAwBC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ldo/jsonld-dataset-proxy",
3
- "version": "0.0.1-alpha.24",
3
+ "version": "0.0.1-alpha.29",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -49,5 +49,5 @@
49
49
  "publishConfig": {
50
50
  "access": "public"
51
51
  },
52
- "gitHead": "5c04bf2a604538dd5279e78e42f4fbdefc52ce80"
52
+ "gitHead": "56f78cef2b1b0d668c47d356c5f13517fe714505"
53
53
  }
@@ -1,4 +1,9 @@
1
1
  import type { ContextDefinition, ExpandedTermDefinition } from "jsonld";
2
+ import type {
3
+ LdoJsonldContext,
4
+ LdoJsonldContextExpandedTermDefinition,
5
+ } from "./LdoJsonldContext";
6
+ import type { NamedNode } from "@rdfjs/types";
2
7
 
3
8
  // Create JSONLD Shorthands
4
9
  const shorthandToIriMap: Record<string, string> = {
@@ -10,40 +15,74 @@ const shorthandToIriMap: Record<string, string> = {
10
15
  * Handles the JSON-LD context and allows conversion between IRIs and terms
11
16
  */
12
17
  export class ContextUtil {
13
- public readonly context: ContextDefinition;
18
+ public readonly context: ContextDefinition | LdoJsonldContext;
14
19
  private iriToKeyMap: Record<string, string>;
20
+ private typeNameToIriToKeyMap: Record<string, Record<string, string>>;
15
21
 
16
- constructor(context: ContextDefinition) {
22
+ constructor(context: ContextDefinition | LdoJsonldContext) {
17
23
  this.context = context;
18
24
  this.iriToKeyMap = {};
25
+
26
+ // Create the iriToKeyMap
27
+ this.iriToKeyMap = this.createIriToKeyMap(context);
28
+ this.typeNameToIriToKeyMap = {};
29
+ Object.entries(context).forEach(([contextKey, contextValue]) => {
30
+ if (
31
+ typeof contextValue === "object" &&
32
+ contextValue !== null &&
33
+ !!contextValue["@id"] &&
34
+ (contextValue as ExpandedTermDefinition)["@context"]
35
+ ) {
36
+ this.typeNameToIriToKeyMap[contextKey] = this.createIriToKeyMap(
37
+ contextValue["@context"],
38
+ );
39
+ }
40
+ });
41
+ }
42
+
43
+ private createIriToKeyMap(
44
+ context: ContextDefinition,
45
+ ): Record<string, string> {
46
+ const iriToKeyMap = {};
19
47
  Object.entries(context).forEach(([contextKey, contextValue]) => {
20
48
  if (typeof contextValue === "string") {
21
- this.iriToKeyMap[this.keyIdToIri(contextValue)] = contextKey;
49
+ iriToKeyMap[this.keyIdToIri(contextValue)] = contextKey;
22
50
  } else if (
23
51
  typeof contextValue === "object" &&
24
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
25
- (contextValue as any)["@id"]
52
+ contextValue !== null &&
53
+ !!contextValue["@id"]
26
54
  ) {
27
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
28
- this.iriToKeyMap[this.keyIdToIri((contextValue as any)["@id"])] =
29
- contextKey;
55
+ const iri = this.keyIdToIri(contextValue["@id"]);
56
+ iriToKeyMap[iri] = contextKey;
30
57
  }
31
58
  });
59
+ return iriToKeyMap;
32
60
  }
33
61
 
34
- public keyToIri(key: string): string {
35
- if (!this.context[key]) {
36
- return key;
37
- } else if (typeof this.context[key] === "string") {
38
- return this.keyIdToIri(this.context[key] as string);
39
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
40
- } else if (this.context[key] && (this.context[key] as any)["@id"]) {
41
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
42
- return this.keyIdToIri((this.context[key] as any)["@id"]);
62
+ /**
63
+ * Helper method that gets the relevant context to use if a typename is
64
+ * provided
65
+ */
66
+ private getRelevantContext(
67
+ key: string,
68
+ typeNames: NamedNode[],
69
+ ): ContextDefinition | LdoJsonldContext {
70
+ for (const typeNameNode of typeNames) {
71
+ const typeName = this.iriToKey((typeNameNode as NamedNode).value, []);
72
+ if (
73
+ typeof this.context[typeName] === "object" &&
74
+ this.context[typeName]?.["@context"] &&
75
+ this.context[typeName]?.["@context"][key]
76
+ ) {
77
+ return this.context[typeName]?.["@context"];
78
+ }
43
79
  }
44
- return key;
80
+ return this.context;
45
81
  }
46
82
 
83
+ /**
84
+ * Helper function that applies shorthands to keys
85
+ */
47
86
  private keyIdToIri(keyId: string) {
48
87
  if (shorthandToIriMap[keyId]) {
49
88
  return shorthandToIriMap[keyId];
@@ -52,38 +91,82 @@ export class ContextUtil {
52
91
  }
53
92
  }
54
93
 
55
- public iriToKey(iri: string): string {
56
- if (this.iriToKeyMap[iri]) {
57
- return this.iriToKeyMap[iri];
94
+ /**
95
+ * Converts a given JsonLd key into an RDF IRI
96
+ */
97
+ public keyToIri(key: string, typeName: NamedNode[]): string {
98
+ const relevantContext = this.getRelevantContext(key, typeName);
99
+ if (!relevantContext[key]) {
100
+ return key;
101
+ } else if (typeof relevantContext[key] === "string") {
102
+ return this.keyIdToIri(relevantContext[key] as string);
103
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
104
+ } else if (relevantContext[key] && (relevantContext[key] as any)["@id"]) {
105
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
106
+ return this.keyIdToIri((relevantContext[key] as any)["@id"]);
107
+ }
108
+ return key;
109
+ }
110
+
111
+ /**
112
+ * Converts a given RDF IRI into the JsonLd key
113
+ */
114
+ public iriToKey(iri: string, typeNames: NamedNode[]): string {
115
+ let relevantMap = this.iriToKeyMap;
116
+ for (const typeNameNode of typeNames) {
117
+ const typeName = this.iriToKey((typeNameNode as NamedNode).value, []);
118
+ relevantMap = this.typeNameToIriToKeyMap[typeName]?.[iri]
119
+ ? this.typeNameToIriToKeyMap[typeName]
120
+ : this.iriToKeyMap;
121
+ }
122
+ if (relevantMap[iri]) {
123
+ return relevantMap[iri];
58
124
  }
59
125
  return iri;
60
126
  }
61
127
 
62
- public getType(key: string): string {
128
+ /**
129
+ * Returns the IRI of a datatype of a specific object
130
+ */
131
+ public getDataType(key: string, typeName: NamedNode[]): string {
132
+ const relevantContext = this.getRelevantContext(key, typeName);
63
133
  if (
64
- typeof this.context[key] === "object" &&
65
- (this.context[key] as ExpandedTermDefinition)["@type"]
134
+ typeof relevantContext[key] === "object" &&
135
+ (relevantContext[key] as ExpandedTermDefinition)["@type"]
66
136
  ) {
67
- return (this.context[key] as ExpandedTermDefinition)["@type"] as string;
137
+ return (relevantContext[key] as ExpandedTermDefinition)[
138
+ "@type"
139
+ ] as string;
68
140
  }
69
141
  return "http://www.w3.org/2001/XMLSchema#string";
70
142
  }
71
143
 
72
- public isArray(key: string): boolean {
144
+ /**
145
+ * Returns true if the object is a collection
146
+ */
147
+ public isArray(key: string, typeName: NamedNode[]): boolean {
148
+ const relevantContext = this.getRelevantContext(key, typeName);
73
149
  return !!(
74
- this.context[key] &&
75
- typeof this.context[key] === "object" &&
76
- (this.context[key] as ExpandedTermDefinition)["@container"] &&
77
- (this.context[key] as ExpandedTermDefinition)["@container"] === "@set"
150
+ relevantContext[key] &&
151
+ typeof relevantContext[key] === "object" &&
152
+ ((relevantContext[key] as ExpandedTermDefinition)["@container"] ===
153
+ "@set" ||
154
+ (relevantContext[key] as LdoJsonldContextExpandedTermDefinition)[
155
+ "@isCollection"
156
+ ])
78
157
  );
79
158
  }
80
159
 
81
- public isLangString(key: string): boolean {
160
+ /**
161
+ * Returns true if the object is a language string
162
+ */
163
+ public isLangString(key: string, typeName: NamedNode[]): boolean {
164
+ const relevantContext = this.getRelevantContext(key, typeName);
82
165
  return !!(
83
- this.context[key] &&
84
- typeof this.context[key] === "object" &&
85
- (this.context[key] as ExpandedTermDefinition)["@type"] &&
86
- (this.context[key] as ExpandedTermDefinition)["@type"] ===
166
+ relevantContext[key] &&
167
+ typeof relevantContext[key] === "object" &&
168
+ (relevantContext[key] as ExpandedTermDefinition)["@type"] &&
169
+ (relevantContext[key] as ExpandedTermDefinition)["@type"] ===
87
170
  "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
88
171
  );
89
172
  }
@@ -0,0 +1,14 @@
1
+ import type { ContextDefinition, ExpandedTermDefinition } from "jsonld";
2
+
3
+ export interface LdoJsonldContext extends ContextDefinition {
4
+ [key: string]:
5
+ | null
6
+ | string
7
+ | LdoJsonldContextExpandedTermDefinition
8
+ | LdoJsonldContext[keyof LdoJsonldContext];
9
+ }
10
+
11
+ export type LdoJsonldContextExpandedTermDefinition = ExpandedTermDefinition & {
12
+ "@context"?: LdoJsonldContext | undefined;
13
+ "@isCollection"?: boolean | undefined;
14
+ };
@@ -1,4 +1,4 @@
1
- import type { GraphNode, QuadMatch } from "@ldo/rdf-utils";
1
+ import type { GraphNode, QuadMatch, SubjectNode } from "@ldo/rdf-utils";
2
2
  import type { BlankNode, Dataset, NamedNode } from "@rdfjs/types";
3
3
  import type { ArrayProxyTarget } from "./arrayProxy/createArrayHandler";
4
4
  import { createArrayHandler } from "./arrayProxy/createArrayHandler";
@@ -8,6 +8,7 @@ import type { ArrayProxy } from "./arrayProxy/ArrayProxy";
8
8
  import { _getUnderlyingArrayTarget } from "./types";
9
9
  import type { ContextUtil } from "./ContextUtil";
10
10
  import type { LanguageOrdering } from "./language/languageTypes";
11
+ import { namedNode } from "@rdfjs/data-model";
11
12
 
12
13
  export interface ProxyContextOptions {
13
14
  dataset: Dataset;
@@ -18,6 +19,8 @@ export interface ProxyContextOptions {
18
19
  state?: Record<string, unknown>;
19
20
  }
20
21
 
22
+ const rdfType = namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
23
+
21
24
  /**
22
25
  * This file keeps track of the target objects used in the proxies.
23
26
  * The reason is so that JSON.stringify does not recurse inifinitely
@@ -107,4 +110,12 @@ export class ProxyContext {
107
110
  };
108
111
  return new ProxyContext(fullOptions);
109
112
  }
113
+
114
+ public getRdfType(subjectNode: SubjectNode): NamedNode[] {
115
+ return this.dataset
116
+ .match(subjectNode, rdfType)
117
+ .toArray()
118
+ .map((quad) => quad.object)
119
+ .filter((object): object is NamedNode => object.termType === "NamedNode");
120
+ }
110
121
  }
@@ -114,7 +114,10 @@ export function modifyArray<ReturnType>(
114
114
  addObjectToDataset(
115
115
  {
116
116
  "@id": target[0][0],
117
- [contextUtil.iriToKey(target[0][1].value)]: added,
117
+ [contextUtil.iriToKey(
118
+ target[0][1].value,
119
+ proxyContext.getRdfType(target[0][0]),
120
+ )]: added,
118
121
  } as RawObject,
119
122
  false,
120
123
  proxyContext,
@@ -123,7 +126,12 @@ export function modifyArray<ReturnType>(
123
126
  const addedNodes = added
124
127
  ? (added
125
128
  .map((addedValue) => {
126
- return getNodeFromRawValue(key, addedValue, proxyContext);
129
+ return getNodeFromRawValue(
130
+ key,
131
+ addedValue,
132
+ target[0][0] ? proxyContext.getRdfType(target[0][0]) : [],
133
+ proxyContext,
134
+ );
127
135
  })
128
136
  .filter((val) => val != undefined) as ObjectNode[])
129
137
  : [];
package/src/graphOf.ts CHANGED
@@ -31,7 +31,10 @@ export function graphOf<Subject extends ObjectLike, Key extends keyof Subject>(
31
31
  const proxyContext = subjectProxy[_proxyContext];
32
32
  const subjectNode = subjectProxy[_getUnderlyingNode];
33
33
  const predicateNode = namedNode(
34
- proxyContext.contextUtil.keyToIri(predicate as string),
34
+ proxyContext.contextUtil.keyToIri(
35
+ predicate as string,
36
+ proxyContext.getRdfType(subjectNode),
37
+ ),
35
38
  );
36
39
  let objectNode: ObjectNode | null;
37
40
  if (object == null) {
package/src/index.ts CHANGED
@@ -9,6 +9,7 @@ export * from "./jsonldDatasetProxy";
9
9
  export * from "./write";
10
10
  export * from "./graphOf";
11
11
  export * from "./setLanguagePreferences";
12
+ export * from "./LdoJsonldContext";
12
13
 
13
14
  export * from "./language/languagesOf";
14
15
  export * from "./language/languageMapProxy";
@@ -4,6 +4,7 @@ import type { ContextDefinition } from "jsonld";
4
4
  import { ContextUtil } from "./ContextUtil";
5
5
  import { JsonldDatasetProxyBuilder } from "./JsonldDatasetProxyBuilder";
6
6
  import { ProxyContext } from "./ProxyContext";
7
+ import type { LdoJsonldContext } from "./LdoJsonldContext";
7
8
 
8
9
  /**
9
10
  * Creates a JSON-LD Dataset Proxy
@@ -14,7 +15,7 @@ import { ProxyContext } from "./ProxyContext";
14
15
  */
15
16
  export function jsonldDatasetProxy(
16
17
  inputDataset: Dataset,
17
- context: ContextDefinition,
18
+ context: ContextDefinition | LdoJsonldContext,
18
19
  ): JsonldDatasetProxyBuilder {
19
20
  const contextUtil = new ContextUtil(context);
20
21
  const proxyContext = new ProxyContext({
@@ -51,11 +51,14 @@ export function languagesOf<
51
51
  const proxy = getSubjectProxyFromObject(subjectObject);
52
52
  const proxyContext = proxy[_proxyContext];
53
53
  const subject = proxy[_getUnderlyingNode];
54
- const predicate = namedNode(proxyContext.contextUtil.keyToIri(key as string));
54
+ const rdfTypes = proxyContext.getRdfType(subject);
55
+ const predicate = namedNode(
56
+ proxyContext.contextUtil.keyToIri(key as string, rdfTypes),
57
+ );
55
58
  return createLanguageMapProxy<LanguageMap>(
56
59
  subject,
57
60
  predicate,
58
61
  proxyContext,
59
- proxyContext.contextUtil.isArray(key as string),
62
+ proxyContext.contextUtil.isArray(key as string, rdfTypes),
60
63
  ) as LanguageOfConditionalReturn<SubjectObject, Key>;
61
64
  }
@@ -48,7 +48,12 @@ export function createSubjectHandler(
48
48
  const tripleDataset = proxyContext.dataset.match(subject);
49
49
  const keys: Set<string> = new Set(["@id"]);
50
50
  tripleDataset.toArray().forEach((quad) => {
51
- keys.add(proxyContext.contextUtil.iriToKey(quad.predicate.value));
51
+ keys.add(
52
+ proxyContext.contextUtil.iriToKey(
53
+ quad.predicate.value,
54
+ proxyContext.getRdfType(subject),
55
+ ),
56
+ );
52
57
  });
53
58
  return Array.from(keys);
54
59
  },
@@ -19,7 +19,9 @@ export function deleteValueFromDataset(
19
19
  return true;
20
20
  }
21
21
  const subject = target["@id"];
22
- const predicate = namedNode(proxyContext.contextUtil.keyToIri(key));
22
+ const predicate = namedNode(
23
+ proxyContext.contextUtil.keyToIri(key, proxyContext.getRdfType(subject)),
24
+ );
23
25
  if (key === "@id") {
24
26
  nodesToRemove.push(target["@id"]);
25
27
  } else {
@@ -19,7 +19,9 @@ export function getValueForKey(
19
19
  if (target["@id"].termType === "BlankNode") {
20
20
  return undefined;
21
21
  }
22
- return contextUtil.iriToKey(target["@id"].value);
22
+ // Purposly don't provide a typeName because we don't want to use the nested
23
+ // context
24
+ return contextUtil.iriToKey(target["@id"].value, []);
23
25
  }
24
26
  if (key === "toString" || key === Symbol.toStringTag) {
25
27
  // TODO: this toString method right now returns [object Object],
@@ -31,18 +33,19 @@ export function getValueForKey(
31
33
  return;
32
34
  }
33
35
  const subject = target["@id"];
34
- const predicate = namedNode(contextUtil.keyToIri(key));
35
- if (contextUtil.isArray(key)) {
36
+ const rdfType = proxyContext.getRdfType(subject);
37
+ const predicate = namedNode(contextUtil.keyToIri(key, rdfType));
38
+ if (contextUtil.isArray(key, rdfType)) {
36
39
  const arrayProxy = proxyContext.createArrayProxy(
37
40
  [subject, predicate, null, null],
38
41
  false,
39
42
  undefined,
40
- contextUtil.isLangString(key),
43
+ contextUtil.isLangString(key, rdfType),
41
44
  );
42
45
  return arrayProxy;
43
46
  }
44
47
  let objectDataset = dataset.match(subject, predicate);
45
- if (contextUtil.isLangString(key)) {
48
+ if (contextUtil.isLangString(key, rdfType)) {
46
49
  objectDataset = filterQuadsByLanguageOrdering(
47
50
  objectDataset,
48
51
  proxyContext.languageOrdering,
@@ -22,15 +22,16 @@ export function addRawValueToDatasetRecursive(
22
22
  proxyContext: ProxyContext,
23
23
  ): void {
24
24
  const { dataset, contextUtil } = proxyContext;
25
- const predicate = namedNode(contextUtil.keyToIri(key));
25
+ const rdfType = proxyContext.getRdfType(subject);
26
+ const predicate = namedNode(contextUtil.keyToIri(key, rdfType));
26
27
  // Get the Object Node
27
- const object = getNodeFromRawValue(key, value, proxyContext);
28
+ const object = getNodeFromRawValue(key, value, rdfType, proxyContext);
28
29
  if (object == undefined) {
29
30
  dataset.deleteMatches(subject, predicate);
30
31
  } else if (object.termType === "Literal") {
31
32
  let languageAppliedObject = object;
32
33
  // Handle language use case
33
- if (contextUtil.isLangString(key)) {
34
+ if (contextUtil.isLangString(key, rdfType)) {
34
35
  const languageKey = getLanguageKeyForWriteOperation(
35
36
  proxyContext.languageOrdering,
36
37
  );
@@ -81,6 +82,7 @@ export function addRawObjectToDatasetRecursive(
81
82
  }
82
83
  const { dataset } = proxyContext;
83
84
  const subject = getNodeFromRawObject(item, proxyContext.contextUtil);
85
+ const rdfType = proxyContext.getRdfType(subject);
84
86
  if (visitedObjects.has(subject)) {
85
87
  return proxyContext.createSubjectProxy(subject);
86
88
  }
@@ -89,9 +91,11 @@ export function addRawObjectToDatasetRecursive(
89
91
  if (key === "@id") {
90
92
  return;
91
93
  }
92
- const predicate = namedNode(proxyContext.contextUtil.keyToIri(key));
94
+ const predicate = namedNode(
95
+ proxyContext.contextUtil.keyToIri(key, rdfType),
96
+ );
93
97
  if (shouldDeleteOldTriples) {
94
- if (proxyContext.contextUtil.isLangString(key)) {
98
+ if (proxyContext.contextUtil.isLangString(key, rdfType)) {
95
99
  const languageKey = getLanguageKeyForWriteOperation(
96
100
  proxyContext.languageOrdering,
97
101
  );
@@ -14,7 +14,9 @@ export function getNodeFromRawObject(
14
14
  } else if (!item["@id"]) {
15
15
  return blankNode();
16
16
  } else if (typeof item["@id"] === "string") {
17
- return namedNode(contextUtil.keyToIri(item["@id"]));
17
+ // Purposly do not include typeName because we don't want to reference
18
+ // nested context
19
+ return namedNode(contextUtil.keyToIri(item["@id"], []));
18
20
  } else {
19
21
  return item["@id"];
20
22
  }
@@ -23,6 +25,7 @@ export function getNodeFromRawObject(
23
25
  export function getNodeFromRawValue(
24
26
  key: string,
25
27
  value: RawValue,
28
+ rdfTypes: NamedNode[],
26
29
  proxyContext: ProxyContext,
27
30
  ): BlankNode | NamedNode | Literal | undefined {
28
31
  // Get the Object Node
@@ -33,7 +36,8 @@ export function getNodeFromRawValue(
33
36
  typeof value === "boolean" ||
34
37
  typeof value === "number"
35
38
  ) {
36
- const datatype = proxyContext.contextUtil.getType(key);
39
+ // PICKUP: figure out how to handle looking for the RDF Types of a raw value
40
+ const datatype = proxyContext.contextUtil.getDataType(key, rdfTypes);
37
41
  if (datatype === "@id") {
38
42
  return namedNode(value.toString());
39
43
  } else {