@ldo/jsonld-dataset-proxy 0.0.1-alpha.29 → 1.0.0-alpha.2

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 (112) 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/languageMapProxy.js.map +1 -1
  18. package/dist/language/languageSet.js +1 -1
  19. package/dist/language/languageSet.js.map +1 -1
  20. package/dist/language/languageUtils.js.map +1 -1
  21. package/dist/language/languagesOf.d.ts +2 -1
  22. package/dist/language/languagesOf.js +1 -1
  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 +6 -4
  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 +3 -6
  61. package/dist/subjectProxy/getValueForKey.js.map +1 -1
  62. package/dist/subjectProxy/isSubjectProxy.js.map +1 -1
  63. package/dist/types.d.ts +2 -2
  64. package/dist/types.js +2 -3
  65. package/dist/types.js.map +1 -1
  66. package/dist/util/NodeSet.d.ts +0 -2
  67. package/dist/util/NodeSet.js +0 -10
  68. package/dist/util/NodeSet.js.map +1 -1
  69. package/dist/util/RawObject.d.ts +3 -2
  70. package/dist/util/addObjectToDataset.js +3 -5
  71. package/dist/util/addObjectToDataset.js.map +1 -1
  72. package/dist/util/getNodeFromRaw.d.ts +1 -1
  73. package/dist/util/getNodeFromRaw.js +9 -3
  74. package/dist/util/getNodeFromRaw.js.map +1 -1
  75. package/dist/util/isProxy.d.ts +4 -3
  76. package/dist/util/isProxy.js +2 -2
  77. package/dist/util/isProxy.js.map +1 -1
  78. package/dist/util/nodeToJsonldRepresentation.d.ts +3 -2
  79. package/dist/util/nodeToJsonldRepresentation.js.map +1 -1
  80. package/package.json +5 -8
  81. package/src/ContextUtil.ts +1 -1
  82. package/src/JsonldDatasetProxyBuilder.ts +14 -13
  83. package/src/ProxyContext.ts +35 -38
  84. package/src/graphOf.ts +12 -26
  85. package/src/index.ts +6 -5
  86. package/src/language/languagesOf.ts +3 -2
  87. package/src/setProxy/ObjectSetProxy.ts +66 -0
  88. package/src/setProxy/SetProxy.ts +141 -0
  89. package/src/setProxy/SubjectSetProxy.ts +85 -0
  90. package/src/setProxy/WildcardObjectSetProxy.ts +89 -0
  91. package/src/setProxy/WildcardSubjectSetProxy.ts +58 -0
  92. package/src/setProxy/createNewSetProxy.ts +47 -0
  93. package/src/setProxy/isSetProxy.ts +7 -0
  94. package/src/setProxy/ldSet/BasicLdSet.ts +266 -0
  95. package/src/setProxy/ldSet/LdSet.ts +189 -0
  96. package/src/setProxy/set.ts +14 -0
  97. package/src/subjectProxy/SubjectProxy.ts +1 -1
  98. package/src/subjectProxy/createSubjectHandler.ts +9 -5
  99. package/src/subjectProxy/deleteFromDataset.ts +12 -25
  100. package/src/subjectProxy/getValueForKey.ts +5 -8
  101. package/src/types.ts +2 -2
  102. package/src/util/NodeSet.ts +0 -12
  103. package/src/util/RawObject.ts +10 -2
  104. package/src/util/addObjectToDataset.ts +7 -5
  105. package/src/util/getNodeFromRaw.ts +11 -6
  106. package/src/util/isProxy.ts +7 -6
  107. package/src/util/nodeToJsonldRepresentation.ts +3 -2
  108. package/src/arrayProxy/ArrayProxy.ts +0 -20
  109. package/src/arrayProxy/arrayMethods.ts +0 -219
  110. package/src/arrayProxy/createArrayHandler.ts +0 -177
  111. package/src/arrayProxy/isArrayProxy.ts +0 -23
  112. package/src/arrayProxy/modifyArray.ts +0 -141
package/README.md CHANGED
@@ -10,7 +10,7 @@ const person = jsonldDatasetProxy(
10
10
  PersonContext
11
11
  ).fromSubject<IPerson>(namedNode("http://example.com/Person1"));
12
12
  person.age = 23;
13
- person.name.push("John");
13
+ person.name.add("John");
14
14
  ```
15
15
 
16
16
  are equivalent to:
@@ -47,9 +47,9 @@ npm install @ldo/jsonld-dataset-proxy
47
47
 
48
48
  ## Simple Example
49
49
  ```typescript
50
- import jsonldDatasetProxy, { write } from "jsonld-dataset-proxy";
50
+ import jsonldDatasetProxy, { write, LdSet } from "jsonld-dataset-proxy";
51
51
  import { ContextDefinition } from "jsonld";
52
- import { serializedToDataset } from "o-dataset-pack";
52
+ import { serializedToDataset } from "@ldo/dataset";
53
53
  import { namedNode } from "@rdfjs/data-model";
54
54
 
55
55
  async function start() {
@@ -72,9 +72,9 @@ async function start() {
72
72
  ).fromSubject<IPerson>(namedNode("http://example.com/Person1"));
73
73
  // Make Modifications
74
74
  person.age = 23;
75
- person.name.push("John");
75
+ person.name.add("John");
76
76
  write(namedNode("http://example.com/otherGraph")).using(person);
77
- person.name.push("Smith");
77
+ person.name.add("Smith");
78
78
 
79
79
  console.log(dataset.toString());
80
80
  // Logs:
@@ -86,7 +86,7 @@ async function start() {
86
86
 
87
87
  // Person Typescript Typing
88
88
  interface IPerson {
89
- name: string[];
89
+ name: LdSet<string>;
90
90
  age: number;
91
91
  }
92
92
 
@@ -117,7 +117,7 @@ start();
117
117
  - [Getting Field Values and Traversing](#getting-field-values-and-traversing)
118
118
  - [Setting a Primitive](#setting-a-primitive)
119
119
  - [Setting an Object](#setting-an-object)
120
- - [Array Methods](#array-methods)
120
+ - [Set Methods](#set-methods)
121
121
  - [Overwriting an Object](#overwriting-an-object)
122
122
  - [Changing an Object's Id](#changing-an-objects-id)
123
123
  - [Removing an Object Connection](#removing-an-object-connection)
@@ -129,23 +129,23 @@ start();
129
129
  - [`write(...graphs).usingCopy(...jsonldDatasetProxies)`](#writegraphsusingcopyjsonlddatasetproxies)
130
130
  - [Detecting a the graph of specific information](#detecting-a-the-graph-of-specific-information)
131
131
 
132
- For the most part, a JSONLD Dataset Proxy has parity with JavaScript Object Literals. However, there are a few differences to highlight. This section details how you would do different tasks.
132
+ For the most part, you can think of a JSONLD Dataset Proxy as a JavaScript Object Literal with "Sets" instead of arrays.
133
133
 
134
134
  ### Defining a Context and Type
135
- The first step to getting a JSONLD Dataset Proxy is defining the JSONLD Context and TypeScript Typings. This can either be done through a [generator](https://github.com/o-development/shexj2typeandcontext) or defining them manually.
135
+ The first step to getting a JSONLD Dataset Proxy is defining the JSONLD Context and TypeScript Typings. This can either be done through a [generator](https://ldo.js.org/latest/api/cli/build/) or defining them manually.
136
136
 
137
137
  In this example typescript typing `IPerson` is an interface that represents a person. Notice the `@id` and `@context` fields. Be sure to include them in your interfaces if you wish to use those properties.
138
138
 
139
139
  ```typescript
140
- import { ContextDefinition } from "jsonld";
140
+ import { LdoJsonldContext, LdSet } from "@ldo/jsonld-dataset-proxy";
141
141
 
142
142
  interface IPerson {
143
143
  "@id"?: string;
144
- "@context"?: ContextDefinition;
145
- name?: string[];
144
+ "@context"?: LdoJsonldContext;
145
+ name?: LdSet<string>;
146
146
  age?: number;
147
147
  bestFriend?: IPerson;
148
- knows?: IPerson[];
148
+ knows?: LdSet<IPerson>;
149
149
  }
150
150
  ```
151
151
 
@@ -250,12 +250,14 @@ friendsOfPerson1.forEach((person) => {
250
250
  `fromJson` will take any regular Json, add the information to the dataset, and return a Jsonld Dataset Proxy representing the given data.
251
251
 
252
252
  ```typescript
253
+ import { jsonldDatasetProxy, set } from "@ldo/jsonld-dataset-proxy";
254
+
253
255
  const person2 = jsonldDatasetProxy(
254
256
  dataset,
255
257
  PersonContext
256
258
  ).fromJson<IPerson>({
257
259
  "@id": "http://example.com/Person2",
258
- name: ["Jane", "Doe"],
260
+ name: set("Jane", "Doe"),
259
261
  birthdate: "1990/11/03",
260
262
  age: 33,
261
263
  });
@@ -300,7 +302,7 @@ console.log(person.name?.reduce((agg, cur) => agg + cur, "")); // JonathanJohn
300
302
  // But this isn't recommened. The library will do its best to maintain the
301
303
  // ordering in the array, but as datasets have no concept of order, this is
302
304
  // not always accurate.
303
- console.log(person.name?.[1]); // John
305
+ console.log(person.name?.toArray()[0]); // John
304
306
  // Get the id of the object
305
307
  // (If the node is a blankNode the @id will be undefined)
306
308
  console.log(person.bestFriend?.["@id"]); // "http://example.com/Person2"
@@ -328,6 +330,8 @@ console.log(dataset.toString());
328
330
  Setting a field to a JavaScript object literal will recursively add all parts of the object literal to the dataset.
329
331
 
330
332
  ```typescript
333
+ import { set } from "@ldo/jsonld-dataset-pack";
334
+
331
335
  const dataset = createDataset();
332
336
  const person = jsonldDatasetProxy(
333
337
  dataset,
@@ -335,10 +339,10 @@ const person = jsonldDatasetProxy(
335
339
  ).fromSubject<IPerson>(namedNode("http://example.com/Person1"));
336
340
  person.bestFriend = {
337
341
  "@id": "http://example.com/Person2",
338
- name: ["Alice"],
342
+ name: set("Alice"),
339
343
  bestFriend: {
340
344
  "@id": "http://example.com/Person3",
341
- name: ["Bob"],
345
+ name: set("Bob"),
342
346
  },
343
347
  };
344
348
  console.log(dataset.toString());
@@ -348,8 +352,9 @@ console.log(dataset.toString());
348
352
  // <http://example.com/Person3> <http://xmlns.com/foaf/0.1/name> "Bob" .
349
353
  ```
350
354
 
351
- ### Array Methods
352
- Any methods that modify arrays work as expected.
355
+ ### Set Methods
356
+ Any methods that on a [JavaScript Set](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set) are available.
357
+
353
358
 
354
359
  ```typescript
355
360
  const dataset = await serializedToDataset(`
@@ -364,13 +369,48 @@ const person = jsonldDatasetProxy(
364
369
  dataset,
365
370
  PersonContext
366
371
  ).fromSubject<IPerson>(namedNode("http://example.com/Person1"));
367
- person.name?.push("Ferguson");
372
+ person.name?.add("Ferguson");
368
373
  console.log(dataset.toString());
369
374
  // <http://example.com/Person1> <http://xmlns.com/foaf/0.1/name> "Garrett" .
370
375
  // <http://example.com/Person1> <http://xmlns.com/foaf/0.1/name> "Bobby" .
371
376
  // <http://example.com/Person1> <http://xmlns.com/foaf/0.1/name> "Ferguson" .
372
377
  ```
373
378
 
379
+ For convenience, some methods commonly used on arrays have been added. The methods available on Sets are defined as follows:
380
+
381
+ ```typescript
382
+ LdSet<T> {
383
+ add(value: T): this;
384
+ clear(): void;
385
+ delete(value: T): boolean;
386
+ has(value: T): boolean;
387
+ readonly size: number;
388
+ [Symbol.iterator](): IterableIterator<T>;
389
+ entries(): IterableIterator<[T, T]>;
390
+ keys(): IterableIterator<T>;
391
+ values(): IterableIterator<T>;
392
+ every<S extends T>(predicate: (value: T, set: LdSet<T>) => value is S, thisArg?: any): this is LdSet<S>;
393
+ every(predicate: (value: T, set: LdSet<T>) => unknown, thisArg?: any): boolean;
394
+ some(predicate: (value: T, set: LdSet<T>) => unknown, thisArg?: any): boolean;
395
+ forEach(callbackfn: (value: T, value2: T, set: LdSet<T>) => void, thisArg?: any): void;
396
+ map<U>(callbackfn: (value: T, set: LdSet<T>) => U, thisArg?: any): U[];
397
+ filter<S extends T>(predicate: (value: T, set: LdSet<T>) => value is S, thisArg?: any): LdSet<S>;
398
+ filter(predicate: (value: T, set: LdSet<T>) => unknown, thisArg?: any): LdSet<T>;
399
+ reduce(callbackfn: (previousValue: T, currentValue: T, set: LdSet<T>) => T): T;
400
+ reduce(callbackfn: (previousValue: T, currentValue: T, set: LdSet<T>) => T, initialValue: T): T;
401
+ reduce<U>(callbackfn: (previousValue: U, currentValue: T, array: LdSet<T>) => U, initialValue: U): U;
402
+ toArray(): T[];
403
+ toJSON(): T[];
404
+ difference(other: Set<T>): LdSet<T>;
405
+ intersection(other: Set<T>): LdSet<T>;
406
+ isDisjointFrom(other: Set<T>): boolean;
407
+ isSubsetOf(other: Set<T>): boolean;
408
+ isSupersetOf(other: Set<T>): boolean;
409
+ symmetricDifference(other: Set<T>): LdSet<T>;
410
+ union(other: Set<T>): LdSet<T>;
411
+ }
412
+ ```
413
+
374
414
  ### Overwriting an Object
375
415
  If an object literal is set and the id is equivalent to an existing id, that node will be overwritten. All triples from the previous object are removed and replaced with triples from the new object.
376
416
 
@@ -390,7 +430,7 @@ const person = jsonldDatasetProxy(
390
430
  ).fromSubject<IPerson>(namedNode("http://example.com/Person1"));
391
431
  person.bestFriend = {
392
432
  "@id": "http://example.com/Person2",
393
- name: ["Jane"],
433
+ name: set("Jane"),
394
434
  };
395
435
  console.log(dataset.toString());
396
436
  // <http://example.com/Person2> <http://xmlns.com/foaf/0.1/name> "Jane" .
@@ -398,7 +438,7 @@ console.log(dataset.toString());
398
438
  ```
399
439
 
400
440
  ### Changing an Object's Id
401
- You can rename an object by setting its `@id` field. This will update all triples that reference the id to the new id.
441
+ You can rename an object by setting its `@id` field. This will update all triples that reference the id to the new id. Setting the `@id` field to `undefined` will turn it into a blank node.
402
442
 
403
443
  ```typescript
404
444
  const dataset = await serializedToDataset(`
@@ -425,7 +465,7 @@ console.log(dataset.toString());
425
465
  ```
426
466
 
427
467
  ### Removing an Object Connection
428
- Removing one triple can be done by setting a property to `undefined`;
468
+ Removing a connection between nodes can be done by setting a field to `undefined` or using the `delete` operator. Values can be removed from a set by using the `delete` method or the `clear` method to remove all connections.
429
469
 
430
470
  ```typescript
431
471
  const dataset = await serializedToDataset(`
@@ -445,41 +485,16 @@ const person = jsonldDatasetProxy(
445
485
  dataset,
446
486
  PersonContext
447
487
  ).fromSubject<IPerson>(namedNode("http://example.com/Person1"));
488
+ perons.bestFriend.name.delete("Bob");
448
489
  person.bestFriend = undefined;
449
490
  console.log(dataset.toString());
450
491
  // <http://example.com/Person1> <http://xmlns.com/foaf/0.1/name> "Alice" .
451
- // <http://example.com/Person2> <http://xmlns.com/foaf/0.1/name> "Bob" .
452
492
  // <http://example.com/Person2> <http://xmlns.com/foaf/0.1/bestFriend> <http://example.com/Person1> .
453
493
  ```
454
494
 
455
495
  ### Deleting an Entire Object
456
- If you want to delete all triples represented by an object, there are two ways using the `delete` operator.
457
-
458
- First, you can call `delete` on a specific property:
459
- ```typescript
460
- const dataset = await serializedToDataset(`
461
- @prefix example: <http://example.com/> .
462
- @prefix foaf: <http://xmlns.com/foaf/0.1/> .
463
- @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
464
-
465
- example:Person1
466
- foaf:name "Alice"^^xsd:string;
467
- foaf:bestFriend example:Person2.
468
-
469
- example:Person2
470
- foaf:name "Bob"^^xsd:string;
471
- foaf:bestFriend example:Person1.
472
- `);
473
- const person = jsonldDatasetProxy(
474
- dataset,
475
- PersonContext
476
- ).fromSubject<IPerson>(namedNode("http://example.com/Person1"));
477
- delete person.bestFriend;
478
- console.log(dataset.toString());
479
- // <http://example.com/Person1> <http://xmlns.com/foaf/0.1/name> "Alice" .
480
- ```
496
+ If you want to delete all triples represented by an object you can call `delete` on the `@id` property.
481
497
 
482
- And secondly, you can call `delete` on the `@id` property.
483
498
  ```typescript
484
499
  const dataset = await serializedToDataset(`
485
500
  @prefix example: <http://example.com/> .
@@ -512,7 +527,7 @@ const person = jsonldDatasetProxy(
512
527
  PersonContext
513
528
  ).fromSubject<IPerson>(namedNode("http://example.com/Person1"));
514
529
  person.bestFriend = {
515
- name: ["Charlie"],
530
+ name: set("Charlie"),
516
531
  };
517
532
  console.log(dataset.toString());
518
533
  // <http://example.com/Person1> <http://xmlns.com/foaf/0.1/bestFriend> _:b1 .
@@ -536,7 +551,7 @@ const person = jsonldDatasetProxy(
536
551
  PersonContext,
537
552
  ).fromSubject<IPerson>(namedNode("http://example.com/Person1"));
538
553
 
539
- const alice = person.knows?.[0];
554
+ const alice = person.knows?.toArray()[0];
540
555
  person.bestFriend = alice;
541
556
  console.log(dataset.toString());
542
557
  // _:n3-0 <http://xmlns.com/foaf/0.1/name> "Alice" .
@@ -556,7 +571,7 @@ The write graph can be set upon creating a jsonld dataset proxy by using the `wr
556
571
  const person1 = jsonldDatasetProxy(dataset, PersonContext)
557
572
  .write(namedNode("http://example.com/ExampleGraph"))
558
573
  .fromSubject<IPerson>(namedNode("http://example.com/Person1"));
559
- person1.name.push("Jack");
574
+ person1.name.add("Jack");
560
575
  console.log(dataset.toString());
561
576
  // Logs:
562
577
  // <http://example.com/Person1> <http://xmlns.com/foaf/0.1/name> "Jack" <http://example.com/ExampleGraph> .
@@ -574,10 +589,10 @@ const person1 = jsonldDatasetProxy(
574
589
  ).fromSubject<IPerson>(namedNode("http://example.com/Person1"));
575
590
  // Now all additions with person1 will be on ExampleGraph1
576
591
  write(namedNode("http://example.com/ExampleGraph1")).using(person1);
577
- person1.name.push("Jack");
592
+ person1.name.add("Jack");
578
593
  // Now all additions with person1 will be on ExampleGraph2
579
594
  write(namedNode("http://example.com/ExampleGraph2")).using(person1);
580
- person1.name.push("Spicer");
595
+ person1.name.add("Spicer");
581
596
 
582
597
  console.log(dataset.toString());
583
598
  // Logs:
@@ -592,19 +607,19 @@ const person1 = jsonldDatasetProxy(
592
607
  dataset,
593
608
  PersonContext
594
609
  ).fromSubject<IPerson>(namedNode("http://example.com/Person1"));
595
- person1.name.push("default");
610
+ person1.name.add("default");
596
611
  const end1 = write(namedNode("http://example.com/Graph1")).using(person1);
597
- person1.name.push("1");
612
+ person1.name.add("1");
598
613
  const end2 = write(namedNode("http://example.com/Graph2")).using(person1);
599
- person1.name.push("2");
614
+ person1.name.add("2");
600
615
  const end3 = write(namedNode("http://example.com/Graph3")).using(person1);
601
- person1.name.push("3");
616
+ person1.name.add("3");
602
617
  end3();
603
- person1.name.push("2 again");
618
+ person1.name.add("2 again");
604
619
  end2();
605
- person1.name.push("1 again");
620
+ person1.name.add("1 again");
606
621
  end1();
607
- person1.name.push("default again");
622
+ person1.name.add("default again");
608
623
  console.log(dataset.toString());
609
624
  // Logs:
610
625
  // <http://example.com/Person1> <http://xmlns.com/foaf/0.1/name> "default" .
@@ -627,8 +642,8 @@ const person1 = jsonldDatasetProxy(
627
642
  const [person1WritingToNewGraph] = write(
628
643
  namedNode("http://example.com/NewGraph")
629
644
  ).usingCopy(person1);
630
- person1WritingToNewGraph.name.push("Brandon");
631
- person1.name.push("Sanderson");
645
+ person1WritingToNewGraph.name.add("Brandon");
646
+ person1.name.add("Sanderson");
632
647
  console.log(dataset.toString());
633
648
  // Logs:
634
649
  // <http://example.com/Person1> <http://xmlns.com/foaf/0.1/name> "Brandon" <http://example.com/NewGraph> .
@@ -641,10 +656,10 @@ The graph of specific information can be detected using the `graphOf(subject, pr
641
656
 
642
657
  - `subject`: A Jsonld Dataset Proxy that represents the subject of a quad.
643
658
  - `predicate`: A string key
644
- - `object?`: An optional parameter that represents the direct object of a statement. This could be a Jsonld Dataset Proxy or a number to indicate the location in an array. This argument can be left blank if the given field is not an array.
659
+ - `object?`: A representation of the direct object of the triple in question. This could be a jsonld-dataset-proxy or simply and object with an `@id` field.
645
660
 
646
661
  ```typescript
647
- graphOf(person, "name", 0); // returns defaultGraph()
662
+ graphOf(person, "name", "Bob"); // returns defaultGraph()
648
663
  graphOf(person, "age"); // returns defaultGraph()
649
664
  ```
650
665
 
@@ -723,17 +738,17 @@ const hospitalInfo = jsonldDatasetProxy(dataset, PersonContext)
723
738
  .fromSubject<IThing>(namedNode("http://example.com/Hospital"));
724
739
 
725
740
  console.log(hospitalInfo.label); // Logs "병원"
726
- console.log(hospitalInfo.description.length); // Logs "2" for the 2 korean entries
727
- console.log(hospitalInfo.description[0]); // Logs "환자를 치료하다"
728
- console.log(hospitalInfo.description[1]); // Logs "의사 있음"
741
+ console.log(hospitalInfo.description.size); // Logs "2" for the 2 korean entries
742
+ console.log(hospitalInfo.description.toArray()[0]); // Logs "환자를 치료하다"
743
+ console.log(hospitalInfo.description.toArray()[1]); // Logs "의사 있음"
729
744
 
730
745
  // Adds a string to the description in spanish, because spanish if the first
731
746
  // language in the language preference
732
- hospitalInfo.description.push("Cura a las pacientes");
747
+ hospitalInfo.description.add("Cura a las pacientes");
733
748
 
734
749
  // Now that a spanish entry exists, JSON-LD dataset proxy focuses on that
735
750
  console.log(hospitalInfo.description.length); // Logs "1" for the 1 spanish entry
736
- console.log(hospitalInfo.description[0]); // Logs "Cura a las pacientes"
751
+ console.log(hospitalInfo.description.toArray()[0]); // Logs "Cura a las pacientes"
737
752
  ```
738
753
 
739
754
  ### `setLanguagePreferences(...languagePreferences).using(...jsonldDatasetProxies)`
@@ -12,6 +12,6 @@ export declare class ContextUtil {
12
12
  keyToIri(key: string, typeName: NamedNode[]): string;
13
13
  iriToKey(iri: string, typeNames: NamedNode[]): string;
14
14
  getDataType(key: string, typeName: NamedNode[]): string;
15
- isArray(key: string, typeName: NamedNode[]): boolean;
15
+ isSet(key: string, typeName: NamedNode[]): boolean;
16
16
  isLangString(key: string, typeName: NamedNode[]): boolean;
17
17
  }
@@ -87,7 +87,7 @@ class ContextUtil {
87
87
  }
88
88
  return "http://www.w3.org/2001/XMLSchema#string";
89
89
  }
90
- isArray(key, typeName) {
90
+ isSet(key, typeName) {
91
91
  const relevantContext = this.getRelevantContext(key, typeName);
92
92
  return !!(relevantContext[key] &&
93
93
  typeof relevantContext[key] === "object" &&
@@ -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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"}
@@ -2,14 +2,15 @@ import type { BlankNode, NamedNode } from "@rdfjs/types";
2
2
  import type { GraphNode, QuadMatch } from "@ldo/rdf-utils";
3
3
  import type { LanguageOrdering } from "./language/languageTypes";
4
4
  import type { ProxyContext } from "./ProxyContext";
5
- import type { ObjectLike } from "./types";
5
+ import type { LiteralLike, ObjectLike } from "./types";
6
+ import type { LdSet } from "./setProxy/ldSet/LdSet";
6
7
  export declare class JsonldDatasetProxyBuilder {
7
8
  private proxyContext;
8
9
  constructor(proxyContext: ProxyContext);
9
10
  write(...graphs: GraphNode[]): JsonldDatasetProxyBuilder;
10
11
  setLanguagePreferences(...languageOrdering: LanguageOrdering): JsonldDatasetProxyBuilder;
11
12
  fromSubject<T extends ObjectLike>(subject: NamedNode | BlankNode): T;
12
- matchSubject<T extends ObjectLike>(predicate?: QuadMatch[1], object?: QuadMatch[2], graph?: QuadMatch[3]): T[];
13
- matchObject<T extends ObjectLike>(subject?: QuadMatch[0], predicate?: QuadMatch[1], graph?: QuadMatch[3]): T[];
13
+ matchSubject<T extends ObjectLike>(predicate?: QuadMatch[1] | undefined | null, object?: QuadMatch[2] | undefined | null, graph?: QuadMatch[3] | undefined | null): LdSet<T>;
14
+ matchObject<T extends ObjectLike | LiteralLike>(subject?: QuadMatch[0] | undefined | null, predicate?: QuadMatch[1], graph?: QuadMatch[3] | undefined | null): LdSet<T>;
14
15
  fromJson<T extends ObjectLike>(inputData: T): T;
15
16
  }
@@ -16,10 +16,10 @@ class JsonldDatasetProxyBuilder {
16
16
  return this.proxyContext.createSubjectProxy(subject);
17
17
  }
18
18
  matchSubject(predicate, object, graph) {
19
- return this.proxyContext.createArrayProxy([null, predicate, object, graph], true);
19
+ return this.proxyContext.createSetProxy([null, predicate, object, graph], true);
20
20
  }
21
21
  matchObject(subject, predicate, graph) {
22
- return this.proxyContext.createArrayProxy([
22
+ return this.proxyContext.createSetProxy([
23
23
  subject,
24
24
  predicate,
25
25
  null,
@@ -1 +1 @@
1
- {"version":3,"file":"JsonldDatasetProxyBuilder.js","sourceRoot":"","sources":["../src/JsonldDatasetProxyBuilder.ts"],"names":[],"mappings":";;;AAAA,kDAAyD;AAUzD,MAAa,yBAAyB;IAGpC,YAAY,YAA0B;QACpC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAMD,KAAK,CAAC,GAAG,MAAmB;QAC1B,OAAO,IAAI,yBAAyB,CAClC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CACrD,CAAC;IACJ,CAAC;IASD,sBAAsB,CACpB,GAAG,gBAAkC;QAErC,OAAO,IAAI,yBAAyB,CAClC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAClD,CAAC;IACJ,CAAC;IAMD,WAAW,CAAuB,OAA8B;QAC9D,OAAO,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAiB,CAAC;IACvE,CAAC;IASD,YAAY,CACV,SAAwB,EACxB,MAAqB,EACrB,KAAoB;QAEpB,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CACvC,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAChC,IAAI,CACa,CAAC;IACtB,CAAC;IASD,WAAW,CACT,OAAsB,EACtB,SAAwB,EACxB,KAAoB;QAEpB,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC;YACxC,OAAO;YACP,SAAS;YACT,IAAI;YACJ,KAAK;SACN,CAAmB,CAAC;IACvB,CAAC;IASD,QAAQ,CAAuB,SAAY;QACzC,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC;YAChC,CAAC,CAAC,IAAA,sBAAS,EAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC,CAAC,IAAA,sBAAS,GAAE,CAAC;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAI,SAAS,CAAC,CAAC;QAC7C,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACjD,KAAK,CAAU,GAAG,CAAC,GAAG,KAAK,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA/FD,8DA+FC"}
1
+ {"version":3,"file":"JsonldDatasetProxyBuilder.js","sourceRoot":"","sources":["../src/JsonldDatasetProxyBuilder.ts"],"names":[],"mappings":";;;AAAA,kDAAyD;AAWzD,MAAa,yBAAyB;IAGpC,YAAY,YAA0B;QACpC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAMD,KAAK,CAAC,GAAG,MAAmB;QAC1B,OAAO,IAAI,yBAAyB,CAClC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CACrD,CAAC;IACJ,CAAC;IASD,sBAAsB,CACpB,GAAG,gBAAkC;QAErC,OAAO,IAAI,yBAAyB,CAClC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAClD,CAAC;IACJ,CAAC;IAMD,WAAW,CAAuB,OAA8B;QAC9D,OAAO,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAiB,CAAC;IACvE,CAAC;IASD,YAAY,CACV,SAA2C,EAC3C,MAAwC,EACxC,KAAuC;QAEvC,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc,CACrC,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAChC,IAAI,CACkB,CAAC;IAC3B,CAAC;IASD,WAAW,CACT,OAAyC,EACzC,SAAwB,EACxB,KAAuC;QAEvC,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC;YACtC,OAAO;YACP,SAAS;YACT,IAAI;YACJ,KAAK;SACN,CAAwB,CAAC;IAC5B,CAAC;IASD,QAAQ,CAAuB,SAAY;QACzC,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC;YAChC,CAAC,CAAC,IAAA,sBAAS,EAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC,CAAC,IAAA,sBAAS,GAAE,CAAC;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAI,SAAS,CAAC,CAAC;QAC7C,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACjD,KAAK,CAAU,GAAG,CAAC,GAAG,KAAK,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA/FD,8DA+FC"}
@@ -1,21 +1,20 @@
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
3
  import type { SubjectProxy } from "./subjectProxy/SubjectProxy";
5
- import type { ArrayProxy } from "./arrayProxy/ArrayProxy";
4
+ import type { SetProxy } from "./setProxy/SetProxy";
6
5
  import type { ContextUtil } from "./ContextUtil";
7
6
  import type { LanguageOrdering } from "./language/languageTypes";
7
+ import type { RawValue } from "./util/RawObject";
8
8
  export interface ProxyContextOptions {
9
9
  dataset: Dataset;
10
10
  contextUtil: ContextUtil;
11
11
  writeGraphs: GraphNode[];
12
12
  languageOrdering: LanguageOrdering;
13
- prefilledArrayTargets?: ArrayProxyTarget[];
14
13
  state?: Record<string, unknown>;
15
14
  }
16
15
  export declare class ProxyContext {
17
16
  private subjectMap;
18
- private arrayMap;
17
+ private setMap;
19
18
  readonly dataset: Dataset;
20
19
  readonly contextUtil: ContextUtil;
21
20
  readonly writeGraphs: GraphNode[];
@@ -23,10 +22,10 @@ export declare class ProxyContext {
23
22
  state: Record<string, unknown>;
24
23
  constructor(options: ProxyContextOptions);
25
24
  createSubjectProxy(node: NamedNode | BlankNode): SubjectProxy;
26
- protected createSubjectHandler(): ProxyHandler<import("./subjectProxy/createSubjectHandler").SubjectProxyTarget>;
27
- private getArrayKey;
28
- createArrayProxy(quadMatch: QuadMatch, isSubjectOriented?: boolean, initialTarget?: ArrayProxyTarget, isLangStringArray?: boolean): ArrayProxy;
29
- protected createArrayHandler(): ProxyHandler<ArrayProxyTarget>;
25
+ protected createNewSubjectProxy(node: NamedNode | BlankNode): SubjectProxy;
26
+ private getSetKey;
27
+ createSetProxy(quadMatch: QuadMatch, isSubjectOriented?: boolean, isLangStringSet?: boolean): SetProxy;
28
+ protected createNewSetProxy(quadMatch: QuadMatch, isSubjectOriented?: boolean, isLangStringSet?: boolean): SetProxy<NonNullable<RawValue>>;
30
29
  duplicate(alternativeOptions: Partial<ProxyContextOptions>): ProxyContext;
31
30
  getRdfType(subjectNode: SubjectNode): NamedNode[];
32
31
  }
@@ -1,62 +1,51 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ProxyContext = void 0;
4
- const createArrayHandler_1 = require("./arrayProxy/createArrayHandler");
5
4
  const createSubjectHandler_1 = require("./subjectProxy/createSubjectHandler");
6
- const types_1 = require("./types");
7
5
  const data_model_1 = require("@rdfjs/data-model");
6
+ const createNewSetProxy_1 = require("./setProxy/createNewSetProxy");
8
7
  const rdfType = (0, data_model_1.namedNode)("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
9
8
  class ProxyContext {
10
9
  constructor(options) {
11
10
  this.subjectMap = new Map();
12
- this.arrayMap = new Map();
11
+ this.setMap = new Map();
13
12
  this.dataset = options.dataset;
14
13
  this.contextUtil = options.contextUtil;
15
14
  this.writeGraphs = options.writeGraphs;
16
15
  this.languageOrdering = options.languageOrdering;
17
16
  this.state = options.state || {};
18
- if (options.prefilledArrayTargets) {
19
- options.prefilledArrayTargets.forEach((target) => {
20
- this.createArrayProxy(target[0], target[2], target);
21
- });
22
- }
23
17
  }
24
18
  createSubjectProxy(node) {
25
19
  if (!this.subjectMap.has(node.value)) {
26
- const proxy = new Proxy({ "@id": node }, this.createSubjectHandler());
20
+ const proxy = this.createNewSubjectProxy(node);
27
21
  this.subjectMap.set(node.value, proxy);
28
22
  }
29
23
  return this.subjectMap.get(node.value);
30
24
  }
31
- createSubjectHandler() {
32
- return (0, createSubjectHandler_1.createSubjectHandler)(this);
25
+ createNewSubjectProxy(node) {
26
+ return new Proxy({ "@id": node }, (0, createSubjectHandler_1.createSubjectHandler)(this));
33
27
  }
34
- getArrayKey(...quadMatch) {
28
+ getSetKey(...quadMatch) {
35
29
  return `${quadMatch[0]?.value || "undefined"}|${quadMatch[1]?.value || "undefined"}|${quadMatch[2]?.value || "undefined"}|${quadMatch[3]?.value || "undefined"}`;
36
30
  }
37
- createArrayProxy(quadMatch, isSubjectOriented = false, initialTarget, isLangStringArray) {
38
- const key = this.getArrayKey(...quadMatch);
39
- if (!this.arrayMap.has(key)) {
40
- const proxy = new Proxy(initialTarget || [quadMatch, [], isSubjectOriented, isLangStringArray], this.createArrayHandler());
41
- this.arrayMap.set(key, proxy);
31
+ createSetProxy(quadMatch, isSubjectOriented, isLangStringSet) {
32
+ const key = this.getSetKey(...quadMatch);
33
+ if (!this.setMap.has(key)) {
34
+ const proxy = this.createNewSetProxy(quadMatch, isSubjectOriented, isLangStringSet);
35
+ this.setMap.set(key, proxy);
42
36
  }
43
- return this.arrayMap.get(key);
37
+ return this.setMap.get(key);
44
38
  }
45
- createArrayHandler() {
46
- return (0, createArrayHandler_1.createArrayHandler)(this);
39
+ createNewSetProxy(quadMatch, isSubjectOriented, isLangStringSet) {
40
+ return (0, createNewSetProxy_1.createNewSetProxy)(quadMatch, isSubjectOriented ?? false, this, isLangStringSet);
47
41
  }
48
42
  duplicate(alternativeOptions) {
49
- const prefilledArrayTargets = [];
50
- this.arrayMap.forEach((value) => {
51
- prefilledArrayTargets.push(value[types_1._getUnderlyingArrayTarget]);
52
- });
53
43
  const fullOptions = {
54
44
  ...{
55
45
  dataset: this.dataset,
56
46
  contextUtil: this.contextUtil,
57
47
  writeGraphs: this.writeGraphs,
58
48
  languageOrdering: this.languageOrdering,
59
- prefilledArrayTargets,
60
49
  },
61
50
  ...alternativeOptions,
62
51
  };
@@ -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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"}
package/dist/graphOf.d.ts CHANGED
@@ -1,3 +1,4 @@
1
1
  import type { GraphNode } from "@ldo/rdf-utils";
2
2
  import type { ObjectLike } from "./types";
3
- export declare function graphOf<Subject extends ObjectLike, Key extends keyof Subject>(subject: Subject, predicate: Key, object?: NonNullable<Subject[Key]> extends Array<unknown> ? number | ObjectLike : ObjectLike): GraphNode[];
3
+ import type { LdSet } from "./setProxy/ldSet/LdSet";
4
+ export declare function graphOf<Subject extends ObjectLike, Key extends keyof Subject>(subject: Subject, predicate: Key, object?: NonNullable<Subject[Key]> extends LdSet<infer T> ? T : Subject[Key]): GraphNode[];
package/dist/graphOf.js CHANGED
@@ -4,6 +4,7 @@ exports.graphOf = void 0;
4
4
  const data_model_1 = require("@rdfjs/data-model");
5
5
  const isSubjectProxy_1 = require("./subjectProxy/isSubjectProxy");
6
6
  const types_1 = require("./types");
7
+ const getNodeFromRaw_1 = require("./util/getNodeFromRaw");
7
8
  function graphOf(subject, predicate, object) {
8
9
  const subjectProxy = (0, isSubjectProxy_1.getSubjectProxyFromObject)(subject);
9
10
  const proxyContext = subjectProxy[types_1._proxyContext];
@@ -13,22 +14,9 @@ function graphOf(subject, predicate, object) {
13
14
  if (object == null) {
14
15
  objectNode = null;
15
16
  }
16
- else if (typeof object === "number") {
17
- const proxyArray = subject[predicate];
18
- if (!proxyArray[types_1._getUnderlyingMatch]) {
19
- throw new Error(`Key "${String(predicate)}" of ${subject} is not an array.`);
20
- }
21
- if (!proxyArray[object]) {
22
- throw new Error(`Index ${object} does not exist.`);
23
- }
24
- if ((0, isSubjectProxy_1.isSubjectProxy)(proxyArray[object])) {
25
- objectNode = proxyArray[object][1];
26
- }
27
- objectNode = proxyArray[types_1._getNodeAtIndex](object);
28
- }
29
17
  else {
30
- const objectProxy = (0, isSubjectProxy_1.getSubjectProxyFromObject)(object);
31
- objectNode = objectProxy[types_1._getUnderlyingNode];
18
+ const datatype = proxyContext.contextUtil.getDataType(predicate, proxyContext.getRdfType(subjectNode));
19
+ objectNode = (0, getNodeFromRaw_1.getNodeFromRawValue)(object, proxyContext, datatype);
32
20
  }
33
21
  const quads = subjectProxy[types_1._getUnderlyingDataset].match(subjectNode, predicateNode, objectNode);
34
22
  return quads.toArray().map((quad) => quad.graph);
@@ -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,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"}
1
+ {"version":3,"file":"graphOf.js","sourceRoot":"","sources":["../src/graphOf.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAC9C,kEAA0E;AAE1E,mCAKiB;AAEjB,0DAA4D;AAU5D,SAAgB,OAAO,CACrB,OAAgB,EAChB,SAAc,EACd,MAA4E;IAE5E,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,UAAyC,CAAC;IAC9C,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;QACnB,UAAU,GAAG,IAAI,CAAC;IACpB,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,WAAW,CACnD,SAAmB,EACnB,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CACrC,CAAC;QACF,UAAU,GAAG,IAAA,oCAAmB,EAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IACnE,CAAC;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;AA9BD,0BA8BC"}