@ldo/jsonld-dataset-proxy 0.0.1-alpha.29 → 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 (107) hide show
  1. package/README.md +86 -71
  2. package/dist/ContextUtil.d.ts +1 -1
  3. package/dist/ContextUtil.js +1 -1
  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 +7 -8
  9. package/dist/ProxyContext.js +14 -25
  10. package/dist/ProxyContext.js.map +1 -1
  11. package/dist/graphOf.d.ts +2 -1
  12. package/dist/graphOf.js +3 -15
  13. package/dist/graphOf.js.map +1 -1
  14. package/dist/index.d.ts +6 -5
  15. package/dist/index.js +6 -5
  16. package/dist/index.js.map +1 -1
  17. package/dist/language/languagesOf.d.ts +2 -1
  18. package/dist/language/languagesOf.js +1 -1
  19. package/dist/language/languagesOf.js.map +1 -1
  20. package/dist/setProxy/ObjectSetProxy.d.ts +17 -0
  21. package/dist/setProxy/ObjectSetProxy.js +31 -0
  22. package/dist/setProxy/ObjectSetProxy.js.map +1 -0
  23. package/dist/setProxy/SetProxy.d.ts +29 -0
  24. package/dist/setProxy/SetProxy.js +72 -0
  25. package/dist/setProxy/SetProxy.js.map +1 -0
  26. package/dist/setProxy/SubjectSetProxy.d.ts +15 -0
  27. package/dist/setProxy/SubjectSetProxy.js +38 -0
  28. package/dist/setProxy/SubjectSetProxy.js.map +1 -0
  29. package/dist/setProxy/WildcardObjectSetProxy.d.ts +20 -0
  30. package/dist/setProxy/WildcardObjectSetProxy.js +49 -0
  31. package/dist/setProxy/WildcardObjectSetProxy.js.map +1 -0
  32. package/dist/setProxy/WildcardSubjectSetProxy.d.ts +19 -0
  33. package/dist/setProxy/WildcardSubjectSetProxy.js +31 -0
  34. package/dist/setProxy/WildcardSubjectSetProxy.js.map +1 -0
  35. package/dist/setProxy/createNewSetProxy.d.ts +5 -0
  36. package/dist/setProxy/createNewSetProxy.js +27 -0
  37. package/dist/setProxy/createNewSetProxy.js.map +1 -0
  38. package/dist/setProxy/isSetProxy.d.ts +2 -0
  39. package/dist/setProxy/isSetProxy.js +13 -0
  40. package/dist/setProxy/isSetProxy.js.map +1 -0
  41. package/dist/setProxy/ldSet/BasicLdSet.d.ts +36 -0
  42. package/dist/setProxy/ldSet/BasicLdSet.js +193 -0
  43. package/dist/setProxy/ldSet/BasicLdSet.js.map +1 -0
  44. package/dist/setProxy/ldSet/LdSet.d.ts +30 -0
  45. package/dist/setProxy/ldSet/LdSet.js +3 -0
  46. package/dist/setProxy/ldSet/LdSet.js.map +1 -0
  47. package/dist/setProxy/set.d.ts +2 -0
  48. package/dist/setProxy/set.js +9 -0
  49. package/dist/setProxy/set.js.map +1 -0
  50. package/dist/subjectProxy/SubjectProxy.d.ts +1 -1
  51. package/dist/subjectProxy/createSubjectHandler.js +6 -4
  52. package/dist/subjectProxy/createSubjectHandler.js.map +1 -1
  53. package/dist/subjectProxy/deleteFromDataset.js +6 -25
  54. package/dist/subjectProxy/deleteFromDataset.js.map +1 -1
  55. package/dist/subjectProxy/getValueForKey.d.ts +2 -2
  56. package/dist/subjectProxy/getValueForKey.js +3 -6
  57. package/dist/subjectProxy/getValueForKey.js.map +1 -1
  58. package/dist/types.d.ts +2 -2
  59. package/dist/types.js +2 -3
  60. package/dist/types.js.map +1 -1
  61. package/dist/util/NodeSet.d.ts +0 -2
  62. package/dist/util/NodeSet.js +0 -10
  63. package/dist/util/NodeSet.js.map +1 -1
  64. package/dist/util/RawObject.d.ts +3 -2
  65. package/dist/util/addObjectToDataset.js +3 -5
  66. package/dist/util/addObjectToDataset.js.map +1 -1
  67. package/dist/util/getNodeFromRaw.d.ts +1 -1
  68. package/dist/util/getNodeFromRaw.js +9 -3
  69. package/dist/util/getNodeFromRaw.js.map +1 -1
  70. package/dist/util/isProxy.d.ts +4 -3
  71. package/dist/util/isProxy.js +2 -2
  72. package/dist/util/isProxy.js.map +1 -1
  73. package/dist/util/nodeToJsonldRepresentation.d.ts +3 -2
  74. package/dist/util/nodeToJsonldRepresentation.js.map +1 -1
  75. package/package.json +5 -5
  76. package/src/ContextUtil.ts +1 -1
  77. package/src/JsonldDatasetProxyBuilder.ts +14 -13
  78. package/src/ProxyContext.ts +35 -38
  79. package/src/graphOf.ts +12 -26
  80. package/src/index.ts +6 -5
  81. package/src/language/languagesOf.ts +3 -2
  82. package/src/setProxy/ObjectSetProxy.ts +66 -0
  83. package/src/setProxy/SetProxy.ts +141 -0
  84. package/src/setProxy/SubjectSetProxy.ts +85 -0
  85. package/src/setProxy/WildcardObjectSetProxy.ts +89 -0
  86. package/src/setProxy/WildcardSubjectSetProxy.ts +58 -0
  87. package/src/setProxy/createNewSetProxy.ts +47 -0
  88. package/src/setProxy/isSetProxy.ts +7 -0
  89. package/src/setProxy/ldSet/BasicLdSet.ts +266 -0
  90. package/src/setProxy/ldSet/LdSet.ts +189 -0
  91. package/src/setProxy/set.ts +14 -0
  92. package/src/subjectProxy/SubjectProxy.ts +1 -1
  93. package/src/subjectProxy/createSubjectHandler.ts +9 -5
  94. package/src/subjectProxy/deleteFromDataset.ts +12 -25
  95. package/src/subjectProxy/getValueForKey.ts +5 -8
  96. package/src/types.ts +2 -2
  97. package/src/util/NodeSet.ts +0 -12
  98. package/src/util/RawObject.ts +10 -2
  99. package/src/util/addObjectToDataset.ts +7 -5
  100. package/src/util/getNodeFromRaw.ts +11 -6
  101. package/src/util/isProxy.ts +7 -6
  102. package/src/util/nodeToJsonldRepresentation.ts +3 -2
  103. package/src/arrayProxy/ArrayProxy.ts +0 -20
  104. package/src/arrayProxy/arrayMethods.ts +0 -219
  105. package/src/arrayProxy/createArrayHandler.ts +0 -177
  106. package/src/arrayProxy/isArrayProxy.ts +0 -23
  107. package/src/arrayProxy/modifyArray.ts +0 -141
@@ -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.29",
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": "56f78cef2b1b0d668c47d356c5f13517fe714505"
52
+ "gitHead": "d9e4f2c416d20d16e84ce93744f0dbc79a39349a"
53
53
  }
@@ -144,7 +144,7 @@ export class ContextUtil {
144
144
  /**
145
145
  * Returns true if the object is a collection
146
146
  */
147
- public isArray(key: string, typeName: NamedNode[]): boolean {
147
+ public isSet(key: string, typeName: NamedNode[]): boolean {
148
148
  const relevantContext = this.getRelevantContext(key, typeName);
149
149
  return !!(
150
150
  relevantContext[key] &&
@@ -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
  /**
@@ -1,21 +1,19 @@
1
1
  import type { GraphNode, QuadMatch, SubjectNode } from "@ldo/rdf-utils";
2
2
  import type { BlankNode, Dataset, NamedNode } from "@rdfjs/types";
3
- import type { ArrayProxyTarget } from "./arrayProxy/createArrayHandler";
4
- import { createArrayHandler } from "./arrayProxy/createArrayHandler";
5
3
  import { createSubjectHandler } from "./subjectProxy/createSubjectHandler";
6
4
  import type { SubjectProxy } from "./subjectProxy/SubjectProxy";
7
- import type { ArrayProxy } from "./arrayProxy/ArrayProxy";
8
- import { _getUnderlyingArrayTarget } from "./types";
5
+ import type { SetProxy } from "./setProxy/SetProxy";
9
6
  import type { ContextUtil } from "./ContextUtil";
10
7
  import type { LanguageOrdering } from "./language/languageTypes";
11
8
  import { namedNode } from "@rdfjs/data-model";
9
+ import type { RawValue } from "./util/RawObject";
10
+ import { createNewSetProxy } from "./setProxy/createNewSetProxy";
12
11
 
13
12
  export interface ProxyContextOptions {
14
13
  dataset: Dataset;
15
14
  contextUtil: ContextUtil;
16
15
  writeGraphs: GraphNode[];
17
16
  languageOrdering: LanguageOrdering;
18
- prefilledArrayTargets?: ArrayProxyTarget[];
19
17
  state?: Record<string, unknown>;
20
18
  }
21
19
 
@@ -28,7 +26,7 @@ const rdfType = namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
28
26
  */
29
27
  export class ProxyContext {
30
28
  private subjectMap: Map<string, SubjectProxy> = new Map();
31
- private arrayMap: Map<string, ArrayProxy> = new Map();
29
+ private setMap: Map<string, SetProxy<NonNullable<RawValue>>> = new Map();
32
30
 
33
31
  readonly dataset: Dataset;
34
32
  readonly contextUtil: ContextUtil;
@@ -42,29 +40,24 @@ export class ProxyContext {
42
40
  this.writeGraphs = options.writeGraphs;
43
41
  this.languageOrdering = options.languageOrdering;
44
42
  this.state = options.state || {};
45
- if (options.prefilledArrayTargets) {
46
- options.prefilledArrayTargets.forEach((target) => {
47
- this.createArrayProxy(target[0], target[2], target);
48
- });
49
- }
50
43
  }
51
44
 
52
45
  public createSubjectProxy(node: NamedNode | BlankNode): SubjectProxy {
53
46
  if (!this.subjectMap.has(node.value)) {
54
- const proxy = new Proxy(
55
- { "@id": node },
56
- this.createSubjectHandler(),
57
- ) as unknown as SubjectProxy;
47
+ const proxy = this.createNewSubjectProxy(node);
58
48
  this.subjectMap.set(node.value, proxy);
59
49
  }
60
50
  return this.subjectMap.get(node.value) as SubjectProxy;
61
51
  }
62
52
 
63
- protected createSubjectHandler() {
64
- return createSubjectHandler(this);
53
+ protected createNewSubjectProxy(node: NamedNode | BlankNode): SubjectProxy {
54
+ return new Proxy(
55
+ { "@id": node },
56
+ createSubjectHandler(this),
57
+ ) as unknown as SubjectProxy;
65
58
  }
66
59
 
67
- private getArrayKey(...quadMatch: QuadMatch) {
60
+ private getSetKey(...quadMatch: QuadMatch) {
68
61
  return `${quadMatch[0]?.value || "undefined"}|${
69
62
  quadMatch[1]?.value || "undefined"
70
63
  }|${quadMatch[2]?.value || "undefined"}|${
@@ -72,39 +65,43 @@ export class ProxyContext {
72
65
  }`;
73
66
  }
74
67
 
75
- public createArrayProxy(
68
+ public createSetProxy(
76
69
  quadMatch: QuadMatch,
77
- isSubjectOriented = false,
78
- initialTarget?: ArrayProxyTarget,
79
- isLangStringArray?: boolean,
80
- ): ArrayProxy {
81
- const key = this.getArrayKey(...quadMatch);
82
- if (!this.arrayMap.has(key)) {
83
- const proxy = new Proxy(
84
- initialTarget || [quadMatch, [], isSubjectOriented, isLangStringArray],
85
- this.createArrayHandler(),
86
- ) as unknown as ArrayProxy;
87
- this.arrayMap.set(key, proxy);
70
+ isSubjectOriented?: boolean,
71
+ isLangStringSet?: boolean,
72
+ ): SetProxy {
73
+ const key = this.getSetKey(...quadMatch);
74
+ if (!this.setMap.has(key)) {
75
+ const proxy = this.createNewSetProxy(
76
+ quadMatch,
77
+ isSubjectOriented,
78
+ isLangStringSet,
79
+ );
80
+ this.setMap.set(key, proxy);
88
81
  }
89
- return this.arrayMap.get(key) as ArrayProxy;
82
+ return this.setMap.get(key)!;
90
83
  }
91
84
 
92
- protected createArrayHandler() {
93
- return createArrayHandler(this);
85
+ protected createNewSetProxy(
86
+ quadMatch: QuadMatch,
87
+ isSubjectOriented?: boolean,
88
+ isLangStringSet?: boolean,
89
+ ) {
90
+ return createNewSetProxy(
91
+ quadMatch,
92
+ isSubjectOriented ?? false,
93
+ this,
94
+ isLangStringSet,
95
+ );
94
96
  }
95
97
 
96
98
  public duplicate(alternativeOptions: Partial<ProxyContextOptions>) {
97
- const prefilledArrayTargets: ArrayProxyTarget[] = [];
98
- this.arrayMap.forEach((value) => {
99
- prefilledArrayTargets.push(value[_getUnderlyingArrayTarget]);
100
- });
101
99
  const fullOptions: ProxyContextOptions = {
102
100
  ...{
103
101
  dataset: this.dataset,
104
102
  contextUtil: this.contextUtil,
105
103
  writeGraphs: this.writeGraphs,
106
104
  languageOrdering: this.languageOrdering,
107
- prefilledArrayTargets,
108
105
  },
109
106
  ...alternativeOptions,
110
107
  };
package/src/graphOf.ts CHANGED
@@ -1,31 +1,28 @@
1
1
  import type { ObjectNode, GraphNode } from "@ldo/rdf-utils";
2
2
  import { namedNode } from "@rdfjs/data-model";
3
- import {
4
- getSubjectProxyFromObject,
5
- isSubjectProxy,
6
- } from "./subjectProxy/isSubjectProxy";
3
+ import { getSubjectProxyFromObject } from "./subjectProxy/isSubjectProxy";
7
4
  import type { ObjectLike } from "./types";
8
5
  import {
9
- _getNodeAtIndex,
10
6
  _getUnderlyingDataset,
11
7
  _getUnderlyingMatch,
12
8
  _getUnderlyingNode,
13
9
  _proxyContext,
14
10
  } from "./types";
11
+ import type { LdSet } from "./setProxy/ldSet/LdSet";
12
+ import { getNodeFromRawValue } from "./util/getNodeFromRaw";
15
13
 
16
14
  /**
17
15
  * Returns the graph for which a defined triple is a member
18
16
  * @param subject A JsonldDatasetProxy that represents the subject
19
17
  * @param predicate The key on the JsonldDatasetProxy
20
- * @param object The direct object. This can be a JsonldDatasetProxy or the index
18
+ * @param object The direct object. This can be a JsonldDatasetProxy. This field
19
+ * is optional.
21
20
  * @returns a list of graphs for which the triples are members
22
21
  */
23
22
  export function graphOf<Subject extends ObjectLike, Key extends keyof Subject>(
24
23
  subject: Subject,
25
24
  predicate: Key,
26
- object?: NonNullable<Subject[Key]> extends Array<unknown>
27
- ? number | ObjectLike
28
- : ObjectLike,
25
+ object?: NonNullable<Subject[Key]> extends LdSet<infer T> ? T : Subject[Key],
29
26
  ): GraphNode[] {
30
27
  const subjectProxy = getSubjectProxyFromObject(subject);
31
28
  const proxyContext = subjectProxy[_proxyContext];
@@ -36,26 +33,15 @@ export function graphOf<Subject extends ObjectLike, Key extends keyof Subject>(
36
33
  proxyContext.getRdfType(subjectNode),
37
34
  ),
38
35
  );
39
- let objectNode: ObjectNode | null;
36
+ let objectNode: ObjectNode | undefined | null;
40
37
  if (object == null) {
41
38
  objectNode = null;
42
- } else if (typeof object === "number") {
43
- const proxyArray = subject[predicate];
44
- if (!proxyArray[_getUnderlyingMatch]) {
45
- throw new Error(
46
- `Key "${String(predicate)}" of ${subject} is not an array.`,
47
- );
48
- }
49
- if (!proxyArray[object]) {
50
- throw new Error(`Index ${object} does not exist.`);
51
- }
52
- if (isSubjectProxy(proxyArray[object])) {
53
- objectNode = proxyArray[object][1];
54
- }
55
- objectNode = proxyArray[_getNodeAtIndex](object);
56
39
  } else {
57
- const objectProxy = getSubjectProxyFromObject(object);
58
- objectNode = objectProxy[_getUnderlyingNode];
40
+ const datatype = proxyContext.contextUtil.getDataType(
41
+ predicate as string,
42
+ proxyContext.getRdfType(subjectNode),
43
+ );
44
+ objectNode = getNodeFromRawValue(object, proxyContext, datatype);
59
45
  }
60
46
  const quads = subjectProxy[_getUnderlyingDataset].match(
61
47
  subjectNode,
package/src/index.ts CHANGED
@@ -17,11 +17,12 @@ export * from "./language/languageSet";
17
17
  export * from "./language/languageTypes";
18
18
  export * from "./language/languageUtils";
19
19
 
20
- export * from "./arrayProxy/createArrayHandler";
21
- export * from "./arrayProxy/arrayMethods";
22
- export * from "./arrayProxy/ArrayProxy";
23
- export * from "./arrayProxy/modifyArray";
24
- export * from "./arrayProxy/isArrayProxy";
20
+ export * from "./setProxy/createNewSetProxy";
21
+ export * from "./setProxy/isSetProxy";
22
+ export * from "./setProxy/SetProxy";
23
+ export * from "./setProxy/set";
24
+ export * from "./setProxy/ldSet/LdSet";
25
+ export * from "./setProxy/ldSet/BasicLdSet";
25
26
 
26
27
  export * from "./subjectProxy/createSubjectHandler";
27
28
  export * from "./subjectProxy/SubjectProxy";
@@ -3,6 +3,7 @@ import { getSubjectProxyFromObject } from "../subjectProxy/isSubjectProxy";
3
3
  import type { ObjectLike } from "../types";
4
4
  import { _getUnderlyingNode, _proxyContext } from "../types";
5
5
  import { createLanguageMapProxy } from "./languageMapProxy";
6
+ import type { LdSet } from "../setProxy/ldSet/LdSet";
6
7
 
7
8
  /**
8
9
  * -----------------------------------------------------------------------------
@@ -25,7 +26,7 @@ export type LanguageSet = Set<string>;
25
26
  export type LanguageOfConditionalReturn<
26
27
  SubjectObject extends ObjectLike,
27
28
  Key extends keyof SubjectObject,
28
- > = NonNullable<SubjectObject[Key]> extends Array<unknown>
29
+ > = NonNullable<SubjectObject[Key]> extends LdSet<unknown>
29
30
  ? LanguageSetMap
30
31
  : LanguageMap;
31
32
 
@@ -59,6 +60,6 @@ export function languagesOf<
59
60
  subject,
60
61
  predicate,
61
62
  proxyContext,
62
- proxyContext.contextUtil.isArray(key as string, rdfTypes),
63
+ proxyContext.contextUtil.isSet(key as string, rdfTypes),
63
64
  ) as LanguageOfConditionalReturn<SubjectObject, Key>;
64
65
  }
@@ -0,0 +1,66 @@
1
+ import type { GraphNode, PredicateNode, SubjectNode } from "@ldo/rdf-utils";
2
+ import type { RawObject, RawValue } from "../util/RawObject";
3
+ import { WildcardObjectSetProxy } from "./WildcardObjectSetProxy";
4
+ import { addObjectToDataset } from "../util/addObjectToDataset";
5
+ import type { ProxyContext } from "../ProxyContext";
6
+
7
+ export type ObjectSetProxyQuadMatch = [
8
+ SubjectNode,
9
+ PredicateNode,
10
+ undefined | null,
11
+ GraphNode | undefined | null,
12
+ ];
13
+
14
+ export class ObjectSetProxy<
15
+ T extends NonNullable<RawValue>,
16
+ > extends WildcardObjectSetProxy<T> {
17
+ protected quadMatch: ObjectSetProxyQuadMatch;
18
+
19
+ constructor(
20
+ context: ProxyContext,
21
+ quadMatch: ObjectSetProxyQuadMatch,
22
+ isLangSet?: boolean,
23
+ ) {
24
+ super(context, quadMatch, isLangSet);
25
+ this.quadMatch = quadMatch;
26
+ }
27
+
28
+ /**
29
+ * Appends a new element with a specified value to the end of the Set.
30
+ */
31
+ add(value: T): this {
32
+ addObjectToDataset(
33
+ {
34
+ "@id": this.quadMatch[0],
35
+ [this.context.contextUtil.iriToKey(
36
+ this.quadMatch[1].value,
37
+ this.context.getRdfType(this.quadMatch[0]),
38
+ )]: value,
39
+ } as RawObject,
40
+ false,
41
+ this.context,
42
+ );
43
+ return this;
44
+ }
45
+
46
+ /**
47
+ * Clears the set of all values
48
+ */
49
+ clear(): void {
50
+ for (const value of this) {
51
+ this.delete(value);
52
+ }
53
+ }
54
+
55
+ /**
56
+ * Deletes an item for the set
57
+ * @param value the item to delete
58
+ * @returns true if the item was present before deletion
59
+ */
60
+ delete(value: T): boolean {
61
+ const { dataset } = this.context;
62
+ const quads = this.getQuads(value);
63
+ quads.forEach((quad) => dataset.delete(quad));
64
+ return quads.size > 0;
65
+ }
66
+ }
@@ -0,0 +1,141 @@
1
+ /**
2
+ * This file handles the underlying functionality of a set, including hidden
3
+ * helper methods
4
+ */
5
+ import type { Dataset, Quad } from "@rdfjs/types";
6
+ import type {
7
+ GraphNode,
8
+ ObjectNode,
9
+ QuadMatch,
10
+ SubjectNode,
11
+ } from "@ldo/rdf-utils";
12
+ import {
13
+ _isSubjectOriented,
14
+ _getUnderlyingDataset,
15
+ _proxyContext,
16
+ _isLangString,
17
+ _getUnderlyingMatch,
18
+ _getUnderlyingNode,
19
+ _writeGraphs,
20
+ } from "../types";
21
+ import type { ProxyContext } from "../ProxyContext";
22
+ import type { RawValue } from "../util/RawObject";
23
+ import { nodeToJsonldRepresentation } from "../util/nodeToJsonldRepresentation";
24
+ import { BasicLdSet } from "./ldSet/BasicLdSet";
25
+
26
+ /**
27
+ * A Set Proxy represents a set of items in a dataset and is a proxy for
28
+ * accessing those items in the dataset.
29
+ */
30
+ export abstract class SetProxy<
31
+ T extends NonNullable<RawValue> = NonNullable<RawValue>,
32
+ > extends BasicLdSet<T> {
33
+ protected quadMatch: QuadMatch;
34
+ protected context: ProxyContext;
35
+
36
+ constructor(context: ProxyContext, quadMatch: QuadMatch) {
37
+ super();
38
+ this.context = context;
39
+ this.quadMatch = quadMatch;
40
+ }
41
+
42
+ /**
43
+ * Gets the subject, predicate and object for this set
44
+ */
45
+ protected abstract getQuads(value?: T): Dataset<Quad, Quad>;
46
+
47
+ protected abstract getNodeOfFocus(quad: Quad): SubjectNode | ObjectNode;
48
+
49
+ /**
50
+ * The add method on a wildcard set does nothing.
51
+ * @deprecated You cannot add data to a wildcard set as it is simply a proxy to an underlying dataset
52
+ */
53
+ add(_value: T) {
54
+ console.warn(
55
+ 'You\'ve attempted to call "add" on a wildcard set. You cannot add data to a wildcard set as it is simply a proxy to an underlying dataset',
56
+ );
57
+ return this;
58
+ }
59
+
60
+ /**
61
+ * The clear method on an abstract set does nothing.
62
+ * @deprecated You cannot clear data from an abstract set as it is simply a proxy to an underlying dataset
63
+ */
64
+ clear(): void {
65
+ console.warn(
66
+ 'You\'ve attempted to call "clear" on an abstract set. You cannot clear data from an abstract set as it is simply a proxy to an underlying dataset',
67
+ );
68
+ return;
69
+ }
70
+
71
+ /**
72
+ * The delete method on an abstract set does nothing.
73
+ * @deprecated You cannot delete data from an abstract set as it is simply a proxy to an underlying dataset
74
+ */
75
+ delete(_value: T): boolean {
76
+ console.warn(
77
+ 'You\'ve attempted to call "clear" on an abstract set. You cannot delete data from an abstract set as it is simply a proxy to an underlying dataset',
78
+ );
79
+ return false;
80
+ }
81
+
82
+ has(value: T): boolean {
83
+ return this.getQuads(value).size > 0;
84
+ }
85
+
86
+ get size() {
87
+ return this.getQuads().size;
88
+ }
89
+
90
+ entries(): IterableIterator<[T, T]> {
91
+ const iteratorSet = new Set<[T, T]>();
92
+ for (const value of this) {
93
+ iteratorSet.add([value, value]);
94
+ }
95
+ return iteratorSet[Symbol.iterator]();
96
+ }
97
+
98
+ keys(): IterableIterator<T> {
99
+ return this.values();
100
+ }
101
+
102
+ values(): IterableIterator<T> {
103
+ return this[Symbol.iterator]();
104
+ }
105
+
106
+ [Symbol.iterator](): IterableIterator<T> {
107
+ const quads = this.getQuads();
108
+ const collection: T[] = quads.toArray().map((quad) => {
109
+ const quadSubject = this.getNodeOfFocus(quad);
110
+ return nodeToJsonldRepresentation(quadSubject, this.context) as T;
111
+ });
112
+ return new Set(collection)[Symbol.iterator]();
113
+ }
114
+
115
+ get [Symbol.toStringTag]() {
116
+ // TODO: Change this to be human readable.
117
+ return "LdSet";
118
+ }
119
+
120
+ get [_getUnderlyingDataset](): Dataset {
121
+ return this.context.dataset;
122
+ }
123
+
124
+ get [_getUnderlyingMatch](): QuadMatch {
125
+ return this.quadMatch;
126
+ }
127
+
128
+ get [_proxyContext](): ProxyContext {
129
+ return this.context;
130
+ }
131
+
132
+ set [_proxyContext](newContext: ProxyContext) {
133
+ this.context = newContext;
134
+ }
135
+
136
+ get [_writeGraphs](): GraphNode[] {
137
+ return this.context.writeGraphs;
138
+ }
139
+
140
+ abstract get [_isSubjectOriented](): boolean;
141
+ }