@ldo/jsonld-dataset-proxy 0.0.1-alpha.24 → 1.0.0-alpha.1

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 (113) hide show
  1. package/README.md +86 -71
  2. package/dist/ContextUtil.d.ts +12 -7
  3. package/dist/ContextUtil.js +69 -31
  4. package/dist/ContextUtil.js.map +1 -1
  5. package/dist/JsonldDatasetProxyBuilder.d.ts +4 -3
  6. package/dist/JsonldDatasetProxyBuilder.js +2 -2
  7. package/dist/JsonldDatasetProxyBuilder.js.map +1 -1
  8. package/dist/ProxyContext.d.ts +9 -9
  9. package/dist/ProxyContext.js +23 -25
  10. package/dist/ProxyContext.js.map +1 -1
  11. package/dist/arrayProxy/modifyArray.js +2 -2
  12. package/dist/arrayProxy/modifyArray.js.map +1 -1
  13. package/dist/graphOf.d.ts +2 -1
  14. package/dist/graphOf.js +4 -16
  15. package/dist/graphOf.js.map +1 -1
  16. package/dist/index.d.ts +7 -5
  17. package/dist/index.js +7 -5
  18. package/dist/index.js.map +1 -1
  19. package/dist/jsonldDatasetProxy.d.ts +2 -1
  20. package/dist/jsonldDatasetProxy.js.map +1 -1
  21. package/dist/language/languagesOf.d.ts +2 -1
  22. package/dist/language/languagesOf.js +3 -2
  23. package/dist/language/languagesOf.js.map +1 -1
  24. package/dist/setProxy/ObjectSetProxy.d.ts +17 -0
  25. package/dist/setProxy/ObjectSetProxy.js +31 -0
  26. package/dist/setProxy/ObjectSetProxy.js.map +1 -0
  27. package/dist/setProxy/SetProxy.d.ts +29 -0
  28. package/dist/setProxy/SetProxy.js +72 -0
  29. package/dist/setProxy/SetProxy.js.map +1 -0
  30. package/dist/setProxy/SubjectSetProxy.d.ts +15 -0
  31. package/dist/setProxy/SubjectSetProxy.js +38 -0
  32. package/dist/setProxy/SubjectSetProxy.js.map +1 -0
  33. package/dist/setProxy/WildcardObjectSetProxy.d.ts +20 -0
  34. package/dist/setProxy/WildcardObjectSetProxy.js +49 -0
  35. package/dist/setProxy/WildcardObjectSetProxy.js.map +1 -0
  36. package/dist/setProxy/WildcardSubjectSetProxy.d.ts +19 -0
  37. package/dist/setProxy/WildcardSubjectSetProxy.js +31 -0
  38. package/dist/setProxy/WildcardSubjectSetProxy.js.map +1 -0
  39. package/dist/setProxy/createNewSetProxy.d.ts +5 -0
  40. package/dist/setProxy/createNewSetProxy.js +27 -0
  41. package/dist/setProxy/createNewSetProxy.js.map +1 -0
  42. package/dist/setProxy/isSetProxy.d.ts +2 -0
  43. package/dist/setProxy/isSetProxy.js +13 -0
  44. package/dist/setProxy/isSetProxy.js.map +1 -0
  45. package/dist/setProxy/ldSet/BasicLdSet.d.ts +36 -0
  46. package/dist/setProxy/ldSet/BasicLdSet.js +193 -0
  47. package/dist/setProxy/ldSet/BasicLdSet.js.map +1 -0
  48. package/dist/setProxy/ldSet/LdSet.d.ts +30 -0
  49. package/dist/setProxy/ldSet/LdSet.js +3 -0
  50. package/dist/setProxy/ldSet/LdSet.js.map +1 -0
  51. package/dist/setProxy/set.d.ts +2 -0
  52. package/dist/setProxy/set.js +9 -0
  53. package/dist/setProxy/set.js.map +1 -0
  54. package/dist/subjectProxy/SubjectProxy.d.ts +1 -1
  55. package/dist/subjectProxy/createSubjectHandler.js +7 -5
  56. package/dist/subjectProxy/createSubjectHandler.js.map +1 -1
  57. package/dist/subjectProxy/deleteFromDataset.js +6 -25
  58. package/dist/subjectProxy/deleteFromDataset.js.map +1 -1
  59. package/dist/subjectProxy/getValueForKey.d.ts +2 -2
  60. package/dist/subjectProxy/getValueForKey.js +7 -9
  61. package/dist/subjectProxy/getValueForKey.js.map +1 -1
  62. package/dist/types.d.ts +2 -2
  63. package/dist/types.js +2 -3
  64. package/dist/types.js.map +1 -1
  65. package/dist/util/NodeSet.d.ts +0 -2
  66. package/dist/util/NodeSet.js +0 -10
  67. package/dist/util/NodeSet.js.map +1 -1
  68. package/dist/util/RawObject.d.ts +3 -2
  69. package/dist/util/addObjectToDataset.js +9 -9
  70. package/dist/util/addObjectToDataset.js.map +1 -1
  71. package/dist/util/getNodeFromRaw.d.ts +1 -1
  72. package/dist/util/getNodeFromRaw.js +10 -4
  73. package/dist/util/getNodeFromRaw.js.map +1 -1
  74. package/dist/util/isProxy.d.ts +4 -3
  75. package/dist/util/isProxy.js +2 -2
  76. package/dist/util/isProxy.js.map +1 -1
  77. package/dist/util/nodeToJsonldRepresentation.d.ts +3 -2
  78. package/dist/util/nodeToJsonldRepresentation.js.map +1 -1
  79. package/package.json +5 -5
  80. package/src/ContextUtil.ts +118 -35
  81. package/src/JsonldDatasetProxyBuilder.ts +14 -13
  82. package/src/LdoJsonldContext.ts +14 -0
  83. package/src/ProxyContext.ts +47 -39
  84. package/src/graphOf.ts +16 -27
  85. package/src/index.ts +7 -5
  86. package/src/jsonldDatasetProxy.ts +2 -1
  87. package/src/language/languagesOf.ts +7 -3
  88. package/src/setProxy/ObjectSetProxy.ts +66 -0
  89. package/src/setProxy/SetProxy.ts +141 -0
  90. package/src/setProxy/SubjectSetProxy.ts +85 -0
  91. package/src/setProxy/WildcardObjectSetProxy.ts +89 -0
  92. package/src/setProxy/WildcardSubjectSetProxy.ts +58 -0
  93. package/src/setProxy/createNewSetProxy.ts +47 -0
  94. package/src/setProxy/isSetProxy.ts +7 -0
  95. package/src/setProxy/ldSet/BasicLdSet.ts +266 -0
  96. package/src/setProxy/ldSet/LdSet.ts +189 -0
  97. package/src/setProxy/set.ts +14 -0
  98. package/src/subjectProxy/SubjectProxy.ts +1 -1
  99. package/src/subjectProxy/createSubjectHandler.ts +15 -6
  100. package/src/subjectProxy/deleteFromDataset.ts +12 -23
  101. package/src/subjectProxy/getValueForKey.ts +12 -12
  102. package/src/types.ts +2 -2
  103. package/src/util/NodeSet.ts +0 -12
  104. package/src/util/RawObject.ts +10 -2
  105. package/src/util/addObjectToDataset.ts +15 -9
  106. package/src/util/getNodeFromRaw.ts +14 -5
  107. package/src/util/isProxy.ts +7 -6
  108. package/src/util/nodeToJsonldRepresentation.ts +3 -2
  109. package/src/arrayProxy/ArrayProxy.ts +0 -20
  110. package/src/arrayProxy/arrayMethods.ts +0 -219
  111. package/src/arrayProxy/createArrayHandler.ts +0 -177
  112. package/src/arrayProxy/isArrayProxy.ts +0 -23
  113. package/src/arrayProxy/modifyArray.ts +0 -133
@@ -6,6 +6,4 @@ export declare class NodeSet {
6
6
  private map;
7
7
  add(node: ObjectNode): void;
8
8
  has(node: ObjectNode): boolean;
9
- delete(node: ObjectNode): boolean;
10
- toArray(): ObjectNode[];
11
9
  }
@@ -30,16 +30,6 @@ class NodeSet {
30
30
  has(node) {
31
31
  return this.set.has(nodeToString(node));
32
32
  }
33
- delete(node) {
34
- const key = nodeToString(node);
35
- delete this.map[key];
36
- return this.set.delete(nodeToString(node));
37
- }
38
- toArray() {
39
- return Array.from(this.set).map((stringVal) => {
40
- return this.map[stringVal];
41
- });
42
- }
43
33
  }
44
34
  exports.NodeSet = NodeSet;
45
35
  //# sourceMappingURL=NodeSet.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"NodeSet.js","sourceRoot":"","sources":["../../src/util/NodeSet.ts"],"names":[],"mappings":";;;AAGA,SAAgB,YAAY,CAC1B,IAAuE;IAEvE,IAAI,IAAI,IAAI,IAAI,EAAE;QAChB,OAAO,MAAM,CAAC;KACf;IACD,QAAQ,IAAI,CAAC,QAAQ,EAAE;QACrB,KAAK,WAAW;YACd,OAAO,aAAa,IAAI,CAAC,KAAK,GAAG,CAAC;QACpC,KAAK,WAAW;YACd,OAAO,aAAa,IAAI,CAAC,KAAK,GAAG,CAAC;QACpC,KAAK,SAAS;YACZ,OAAO,WAAW,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC;QACzD,KAAK,cAAc;YACjB,OAAO,gBAAgB,CAAC;KAC3B;AACH,CAAC;AAhBD,oCAgBC;AAED,MAAa,OAAO;IAApB;QACU,QAAG,GAAgB,IAAI,GAAG,EAAE,CAAC;QAC7B,QAAG,GAA+B,EAAE,CAAC;IAuB/C,CAAC;IArBC,GAAG,CAAC,IAAgB;QAClB,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,IAAgB;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,CAAC,IAAgB;QACrB,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO;QACL,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC5C,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAzBD,0BAyBC"}
1
+ {"version":3,"file":"NodeSet.js","sourceRoot":"","sources":["../../src/util/NodeSet.ts"],"names":[],"mappings":";;;AAGA,SAAgB,YAAY,CAC1B,IAAuE;IAEvE,IAAI,IAAI,IAAI,IAAI,EAAE;QAChB,OAAO,MAAM,CAAC;KACf;IACD,QAAQ,IAAI,CAAC,QAAQ,EAAE;QACrB,KAAK,WAAW;YACd,OAAO,aAAa,IAAI,CAAC,KAAK,GAAG,CAAC;QACpC,KAAK,WAAW;YACd,OAAO,aAAa,IAAI,CAAC,KAAK,GAAG,CAAC;QACpC,KAAK,SAAS;YACZ,OAAO,WAAW,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC;QACzD,KAAK,cAAc;YACjB,OAAO,gBAAgB,CAAC;KAC3B;AACH,CAAC;AAhBD,oCAgBC;AAED,MAAa,OAAO;IAApB;QACU,QAAG,GAAgB,IAAI,GAAG,EAAE,CAAC;QAC7B,QAAG,GAA+B,EAAE,CAAC;IAW/C,CAAC;IATC,GAAG,CAAC,IAAgB;QAClB,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,IAAgB;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1C,CAAC;CACF;AAbD,0BAaC"}
@@ -1,8 +1,9 @@
1
1
  import type { BlankNode, NamedNode } from "@rdfjs/types";
2
+ import type { LdSet } from "../setProxy/ldSet/LdSet";
2
3
  import type { SubjectProxy } from "../subjectProxy/SubjectProxy";
3
4
  export type RawObject = ({
4
5
  "@id"?: string | NamedNode | BlankNode;
5
6
  } & {
6
- [key: string | symbol | number]: RawValue | RawValue[];
7
+ [key: string | symbol | number]: RawValue | LdSet<RawValue>;
7
8
  }) | SubjectProxy;
8
- export type RawValue = string | boolean | number | RawObject | undefined;
9
+ export type RawValue = string | boolean | number | RawObject | NamedNode | BlankNode | undefined;
@@ -6,16 +6,18 @@ const getNodeFromRaw_1 = require("./getNodeFromRaw");
6
6
  const isSubjectProxy_1 = require("../subjectProxy/isSubjectProxy");
7
7
  const NodeSet_1 = require("./NodeSet");
8
8
  const languageUtils_1 = require("../language/languageUtils");
9
+ const BasicLdSet_1 = require("../setProxy/ldSet/BasicLdSet");
9
10
  function addRawValueToDatasetRecursive(subject, key, value, visitedObjects, shouldDeleteOldTriples, proxyContext) {
10
11
  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);
12
+ const rdfType = proxyContext.getRdfType(subject);
13
+ const predicate = (0, data_model_1.namedNode)(contextUtil.keyToIri(key, rdfType));
14
+ const object = (0, getNodeFromRaw_1.getNodeFromRawValue)(value, proxyContext, contextUtil.getDataType(key, rdfType));
13
15
  if (object == undefined) {
14
16
  dataset.deleteMatches(subject, predicate);
15
17
  }
16
18
  else if (object.termType === "Literal") {
17
19
  let languageAppliedObject = object;
18
- if (contextUtil.isLangString(key)) {
20
+ if (contextUtil.isLangString(key, rdfType)) {
19
21
  const languageKey = (0, languageUtils_1.getLanguageKeyForWriteOperation)(proxyContext.languageOrdering);
20
22
  if (!languageKey)
21
23
  return;
@@ -39,11 +41,9 @@ function addRawValueToDatasetRecursive(subject, key, value, visitedObjects, shou
39
41
  }
40
42
  exports.addRawValueToDatasetRecursive = addRawValueToDatasetRecursive;
41
43
  function addRawObjectToDatasetRecursive(item, visitedObjects, shouldDeleteOldTriples, proxyContext) {
42
- if ((0, isSubjectProxy_1.isSubjectProxy)(item)) {
43
- return item;
44
- }
45
44
  const { dataset } = proxyContext;
46
45
  const subject = (0, getNodeFromRaw_1.getNodeFromRawObject)(item, proxyContext.contextUtil);
46
+ const rdfType = proxyContext.getRdfType(subject);
47
47
  if (visitedObjects.has(subject)) {
48
48
  return proxyContext.createSubjectProxy(subject);
49
49
  }
@@ -52,9 +52,9 @@ function addRawObjectToDatasetRecursive(item, visitedObjects, shouldDeleteOldTri
52
52
  if (key === "@id") {
53
53
  return;
54
54
  }
55
- const predicate = (0, data_model_1.namedNode)(proxyContext.contextUtil.keyToIri(key));
55
+ const predicate = (0, data_model_1.namedNode)(proxyContext.contextUtil.keyToIri(key, rdfType));
56
56
  if (shouldDeleteOldTriples) {
57
- if (proxyContext.contextUtil.isLangString(key)) {
57
+ if (proxyContext.contextUtil.isLangString(key, rdfType)) {
58
58
  const languageKey = (0, languageUtils_1.getLanguageKeyForWriteOperation)(proxyContext.languageOrdering);
59
59
  if (languageKey) {
60
60
  (0, languageUtils_1.languageDeleteMatch)(dataset, subject, predicate, languageKey);
@@ -64,7 +64,7 @@ function addRawObjectToDatasetRecursive(item, visitedObjects, shouldDeleteOldTri
64
64
  dataset.deleteMatches(subject, predicate);
65
65
  }
66
66
  }
67
- if (Array.isArray(value)) {
67
+ if (value instanceof BasicLdSet_1.BasicLdSet) {
68
68
  value.forEach((valueItem) => {
69
69
  addRawValueToDatasetRecursive(subject, key, valueItem, visitedObjects, true, proxyContext);
70
70
  });
@@ -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(value: RawValue, proxyContext: ProxyContext, datatype?: string): BlankNode | NamedNode | Literal | undefined;
@@ -11,28 +11,34 @@ 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(value, proxyContext, datatype) {
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);
29
- if (datatype === "@id") {
28
+ if (!datatype) {
29
+ return undefined;
30
+ }
31
+ else if (datatype === "@id") {
30
32
  return (0, data_model_1.namedNode)(value.toString());
31
33
  }
32
34
  else {
33
35
  return (0, data_model_1.literal)(value.toString(), datatype);
34
36
  }
35
37
  }
38
+ else if (typeof value.termType === "string" &&
39
+ (value.termType === "NamedNode" || value.termType === "BlankNode")) {
40
+ return value;
41
+ }
36
42
  else {
37
43
  return getNodeFromRawObject(value, proxyContext.contextUtil);
38
44
  }
@@ -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,KAAe,EACf,YAA0B,EAE1B,QAAiB;IAGjB,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,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,SAAS,CAAC;SAClB;aAAM,IAAI,QAAQ,KAAK,KAAK,EAAE;YAC7B,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,IACL,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ;QAClC,CAAC,KAAK,CAAC,QAAQ,KAAK,WAAW,IAAI,KAAK,CAAC,QAAQ,KAAK,WAAW,CAAC,EAClE;QACA,OAAO,KAA8B,CAAC;KACvC;SAAM;QACL,OAAO,oBAAoB,CAAC,KAAkB,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;KAC3E;AACH,CAAC;AA7BD,kDA6BC"}
@@ -1,5 +1,6 @@
1
- import type { ArrayProxy } from "../arrayProxy/ArrayProxy";
1
+ import type { LdSet } from "../setProxy/ldSet/LdSet";
2
+ import type { SetProxy } from "../setProxy/SetProxy";
2
3
  import type { SubjectProxy } from "../subjectProxy/SubjectProxy";
3
4
  import type { ObjectLike } from "../types";
4
- export declare function isProxy(someObject?: unknown): someObject is ArrayProxy | SubjectProxy;
5
- export declare function getProxyFromObject(object: ObjectLike | ObjectLike[]): SubjectProxy | ArrayProxy;
5
+ export declare function isProxy(someObject?: unknown): someObject is SetProxy | SubjectProxy;
6
+ export declare function getProxyFromObject(object: ObjectLike | LdSet<ObjectLike>): SubjectProxy | SetProxy;
@@ -1,10 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getProxyFromObject = exports.isProxy = void 0;
4
- const isArrayProxy_1 = require("../arrayProxy/isArrayProxy");
4
+ const isSetProxy_1 = require("../setProxy/isSetProxy");
5
5
  const isSubjectProxy_1 = require("../subjectProxy/isSubjectProxy");
6
6
  function isProxy(someObject) {
7
- return (0, isSubjectProxy_1.isSubjectProxy)(someObject) || (0, isArrayProxy_1.isArrayProxy)(someObject);
7
+ return (0, isSubjectProxy_1.isSubjectProxy)(someObject) || (0, isSetProxy_1.isSetProxy)(someObject);
8
8
  }
9
9
  exports.isProxy = isProxy;
10
10
  function getProxyFromObject(object) {
@@ -1 +1 @@
1
- {"version":3,"file":"isProxy.js","sourceRoot":"","sources":["../../src/util/isProxy.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAC1D,mEAAgE;AAIhE,SAAgB,OAAO,CACrB,UAAoB;IAEpB,OAAO,IAAA,+BAAc,EAAC,UAAU,CAAC,IAAI,IAAA,2BAAY,EAAC,UAAU,CAAC,CAAC;AAChE,CAAC;AAJD,0BAIC;AAED,SAAgB,kBAAkB,CAChC,MAAiC;IAEjC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,gCAAgC,CAAC,CAAC;KAC5D;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAPD,gDAOC"}
1
+ {"version":3,"file":"isProxy.js","sourceRoot":"","sources":["../../src/util/isProxy.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AAGpD,mEAAgE;AAIhE,SAAgB,OAAO,CACrB,UAAoB;IAEpB,OAAO,IAAA,+BAAc,EAAC,UAAU,CAAC,IAAI,IAAA,uBAAU,EAAC,UAAU,CAAC,CAAC;AAC9D,CAAC;AAJD,0BAIC;AAED,SAAgB,kBAAkB,CAChC,MAAsC;IAEtC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,gCAAgC,CAAC,CAAC;KAC5D;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAPD,gDAOC"}
@@ -1,6 +1,7 @@
1
1
  import type { Literal, Quad_Object } from "@rdfjs/types";
2
2
  import type { ProxyContext } from "../ProxyContext";
3
3
  import type { SubjectProxy } from "../subjectProxy/SubjectProxy";
4
- export type ObjectJsonRepresentation = string | number | boolean | SubjectProxy;
4
+ import type { LiteralLike } from "../types";
5
+ export type ObjectJsonRepresentation = LiteralLike | SubjectProxy;
5
6
  export declare function literalToJsonldRepresentation(literal: Literal): string | number | boolean;
6
- export declare function nodeToJsonldRepresentation(node: Quad_Object, proxyContext: ProxyContext): string | number | boolean | SubjectProxy;
7
+ export declare function nodeToJsonldRepresentation(node: Quad_Object, proxyContext: ProxyContext): ObjectJsonRepresentation;
@@ -1 +1 @@
1
- {"version":3,"file":"nodeToJsonldRepresentation.js","sourceRoot":"","sources":["../../src/util/nodeToJsonldRepresentation.ts"],"names":[],"mappings":";;;AAMA,SAAgB,6BAA6B,CAAC,OAAgB;IAC5D,QAAQ,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE;QAC9B,KAAK,yCAAyC,CAAC;QAC/C,KAAK,2CAA2C,CAAC;QACjD,KAAK,yCAAyC,CAAC;QAC/C,KAAK,qCAAqC,CAAC;QAC3C,KAAK,wCAAwC,CAAC;QAC9C,KAAK,yCAAyC,CAAC;QAC/C,KAAK,2CAA2C,CAAC;QACjD,KAAK,uCAAuC,CAAC;QAC7C,KAAK,yCAAyC,CAAC;QAC/C,KAAK,0CAA0C,CAAC;QAChD,KAAK,2CAA2C,CAAC;QACjD,KAAK,mDAAmD,CAAC;QACzD,KAAK,wCAAwC,CAAC;QAC9C,KAAK,wCAAwC;YAC3C,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,KAAK,uCAAuC,CAAC;QAC7C,KAAK,2CAA2C,CAAC;QACjD,KAAK,2CAA2C,CAAC;QACjD,KAAK,uCAAuC,CAAC;QAC7C,KAAK,yCAAyC,CAAC;QAC/C,KAAK,4CAA4C,CAAC;QAClD,KAAK,wCAAwC,CAAC;QAC9C,KAAK,6CAA6C,CAAC;QACnD,KAAK,uCAAuC;YAC1C,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,KAAK,0CAA0C,CAAC;QAChD,KAAK,uCAAuC,CAAC;QAC7C,KAAK,0CAA0C,CAAC;QAChD,KAAK,yCAAyC,CAAC;QAC/C,KAAK,sCAAsC,CAAC;QAC5C,KAAK,uCAAuC,CAAC;QAC7C,KAAK,kDAAkD,CAAC;QACxD,KAAK,qDAAqD,CAAC;QAC3D,KAAK,qDAAqD,CAAC;QAC3D,KAAK,kDAAkD,CAAC;QACxD,KAAK,wCAAwC,CAAC;QAC9C,KAAK,+CAA+C,CAAC;QACrD,KAAK,8CAA8C,CAAC;QACpD,KAAK,gDAAgD,CAAC;QACtD,KAAK,+CAA+C;YAClD,OAAO,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACnC,KAAK,0CAA0C;YAC7C,OAAO,OAAO,CAAC,KAAK,KAAK,MAAM,CAAC;QAClC,KAAK,4CAA4C;YAC/C,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,KAAK,yCAAyC;YAC5C,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,KAAK,iDAAiD,CAAC;QACvD,KAAK,yDAAyD,CAAC;QAC/D,KAAK,uDAAuD,CAAC;QAC7D,KAAK,iDAAiD;YACpD,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB;YACE,OAAO,OAAO,CAAC,KAAK,CAAC;KACxB;AACH,CAAC;AAzDD,sEAyDC;AAED,SAAgB,0BAA0B,CACxC,IAAiB,EACjB,YAA0B;IAE1B,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;QAC/B,OAAO,6BAA6B,CAAC,IAAI,CAAC,CAAC;KAC5C;SAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE;QACzE,OAAO,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;KAC1E;AACH,CAAC;AAXD,gEAWC"}
1
+ {"version":3,"file":"nodeToJsonldRepresentation.js","sourceRoot":"","sources":["../../src/util/nodeToJsonldRepresentation.ts"],"names":[],"mappings":";;;AAOA,SAAgB,6BAA6B,CAAC,OAAgB;IAC5D,QAAQ,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE;QAC9B,KAAK,yCAAyC,CAAC;QAC/C,KAAK,2CAA2C,CAAC;QACjD,KAAK,yCAAyC,CAAC;QAC/C,KAAK,qCAAqC,CAAC;QAC3C,KAAK,wCAAwC,CAAC;QAC9C,KAAK,yCAAyC,CAAC;QAC/C,KAAK,2CAA2C,CAAC;QACjD,KAAK,uCAAuC,CAAC;QAC7C,KAAK,yCAAyC,CAAC;QAC/C,KAAK,0CAA0C,CAAC;QAChD,KAAK,2CAA2C,CAAC;QACjD,KAAK,mDAAmD,CAAC;QACzD,KAAK,wCAAwC,CAAC;QAC9C,KAAK,wCAAwC;YAC3C,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,KAAK,uCAAuC,CAAC;QAC7C,KAAK,2CAA2C,CAAC;QACjD,KAAK,2CAA2C,CAAC;QACjD,KAAK,uCAAuC,CAAC;QAC7C,KAAK,yCAAyC,CAAC;QAC/C,KAAK,4CAA4C,CAAC;QAClD,KAAK,wCAAwC,CAAC;QAC9C,KAAK,6CAA6C,CAAC;QACnD,KAAK,uCAAuC;YAC1C,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,KAAK,0CAA0C,CAAC;QAChD,KAAK,uCAAuC,CAAC;QAC7C,KAAK,0CAA0C,CAAC;QAChD,KAAK,yCAAyC,CAAC;QAC/C,KAAK,sCAAsC,CAAC;QAC5C,KAAK,uCAAuC,CAAC;QAC7C,KAAK,kDAAkD,CAAC;QACxD,KAAK,qDAAqD,CAAC;QAC3D,KAAK,qDAAqD,CAAC;QAC3D,KAAK,kDAAkD,CAAC;QACxD,KAAK,wCAAwC,CAAC;QAC9C,KAAK,+CAA+C,CAAC;QACrD,KAAK,8CAA8C,CAAC;QACpD,KAAK,gDAAgD,CAAC;QACtD,KAAK,+CAA+C;YAClD,OAAO,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACnC,KAAK,0CAA0C;YAC7C,OAAO,OAAO,CAAC,KAAK,KAAK,MAAM,CAAC;QAClC,KAAK,4CAA4C;YAC/C,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,KAAK,yCAAyC;YAC5C,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,KAAK,iDAAiD,CAAC;QACvD,KAAK,yDAAyD,CAAC;QAC/D,KAAK,uDAAuD,CAAC;QAC7D,KAAK,iDAAiD;YACpD,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB;YACE,OAAO,OAAO,CAAC,KAAK,CAAC;KACxB;AACH,CAAC;AAzDD,sEAyDC;AAED,SAAgB,0BAA0B,CACxC,IAAiB,EACjB,YAA0B;IAE1B,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;QAC/B,OAAO,6BAA6B,CAAC,IAAI,CAAC,CAAC;KAC5C;SAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE;QACzE,OAAO,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;KAC1E;AACH,CAAC;AAXD,gEAWC"}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@ldo/jsonld-dataset-proxy",
3
- "version": "0.0.1-alpha.24",
3
+ "version": "1.0.0-alpha.1",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
7
7
  "build": "tsc --project tsconfig.build.json",
8
8
  "build:watch": "tsc-watch",
9
- "test": "jest --coverage",
9
+ "test": "NODE_NO_WARNINGS=1 jest --coverage",
10
10
  "prepublishOnly": "npm run test && npm run build",
11
11
  "start": "ts-node ./example/example.ts",
12
12
  "start:lang": "ts-node ./example/languageExample.ts",
@@ -40,8 +40,8 @@
40
40
  "src"
41
41
  ],
42
42
  "dependencies": {
43
- "@ldo/rdf-utils": "^0.0.1-alpha.24",
44
- "@ldo/subscribable-dataset": "^0.0.1-alpha.24",
43
+ "@ldo/rdf-utils": "^1.0.0-alpha.1",
44
+ "@ldo/subscribable-dataset": "^1.0.0-alpha.1",
45
45
  "@rdfjs/data-model": "^1.2.0",
46
46
  "@rdfjs/dataset": "^1.1.0",
47
47
  "jsonld2graphobject": "^0.0.4"
@@ -49,5 +49,5 @@
49
49
  "publishConfig": {
50
50
  "access": "public"
51
51
  },
52
- "gitHead": "5c04bf2a604538dd5279e78e42f4fbdefc52ce80"
52
+ "gitHead": "d9e4f2c416d20d16e84ce93744f0dbc79a39349a"
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 isSet(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
  }
@@ -3,7 +3,8 @@ import type { BlankNode, NamedNode } from "@rdfjs/types";
3
3
  import type { GraphNode, QuadMatch } from "@ldo/rdf-utils";
4
4
  import type { LanguageOrdering } from "./language/languageTypes";
5
5
  import type { ProxyContext } from "./ProxyContext";
6
- import type { ObjectLike } from "./types";
6
+ import type { LiteralLike, ObjectLike } from "./types";
7
+ import type { LdSet } from "./setProxy/ldSet/LdSet";
7
8
 
8
9
  /**
9
10
  * Helps build JSON LD Dataset Proxies for a specific dataset and context
@@ -56,14 +57,14 @@ export class JsonldDatasetProxyBuilder {
56
57
  * @param graph The graph to match
57
58
  */
58
59
  matchSubject<T extends ObjectLike>(
59
- predicate?: QuadMatch[1],
60
- object?: QuadMatch[2],
61
- graph?: QuadMatch[3],
62
- ): T[] {
63
- return this.proxyContext.createArrayProxy(
60
+ predicate?: QuadMatch[1] | undefined | null,
61
+ object?: QuadMatch[2] | undefined | null,
62
+ graph?: QuadMatch[3] | undefined | null,
63
+ ): LdSet<T> {
64
+ return this.proxyContext.createSetProxy(
64
65
  [null, predicate, object, graph],
65
66
  true,
66
- ) as unknown as T[];
67
+ ) as unknown as LdSet<T>;
67
68
  }
68
69
 
69
70
  /**
@@ -73,17 +74,17 @@ export class JsonldDatasetProxyBuilder {
73
74
  * @param predicate The predicate to match
74
75
  * @param graph The graph to match
75
76
  */
76
- matchObject<T extends ObjectLike>(
77
- subject?: QuadMatch[0],
77
+ matchObject<T extends ObjectLike | LiteralLike>(
78
+ subject?: QuadMatch[0] | undefined | null,
78
79
  predicate?: QuadMatch[1],
79
- graph?: QuadMatch[3],
80
- ): T[] {
81
- return this.proxyContext.createArrayProxy([
80
+ graph?: QuadMatch[3] | undefined | null,
81
+ ): LdSet<T> {
82
+ return this.proxyContext.createSetProxy([
82
83
  subject,
83
84
  predicate,
84
85
  null,
85
86
  graph,
86
- ]) as unknown as T[];
87
+ ]) as unknown as LdSet<T>;
87
88
  }
88
89
 
89
90
  /**
@@ -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
+ };