Skip to content

Commit 1194d91

Browse files
committed
Add location the JSON nodes
1 parent ee294fa commit 1194d91

File tree

10 files changed

+147
-81
lines changed

10 files changed

+147
-81
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"vitest": "*"
4646
},
4747
"dependencies": {
48+
"@hyperjump/json-pointer": "^1.1.1",
4849
"@hyperjump/uri": "^1.3.0",
4950
"content-type": "^1.0.5",
5051
"moo": "^0.5.2",

src/hyperjump/hyperjump.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export class Hyperjump {
9999
/** @type (node: T) => Promise<JsonNode<T>> */
100100
async #followReferences(node) {
101101
if ("jrefType" in node) {
102-
return this.get(node.href, { referencedFrom: node.documentUri });
102+
return this.get(node.href, { referencedFrom: toAbsoluteIri(node.location) });
103103
} else {
104104
return /** @type JsonNode<T> */ (node);
105105
}

src/jref/jref-ast.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
export interface JrefReferenceNode {
1414
jrefType: "jref-reference";
1515
href: string;
16-
documentUri: string;
1716
};
1817

1918
// eslint-disable-next-line @typescript-eslint/consistent-type-definitions

src/jref/jref-util.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,13 @@ const defaultReviver = (value) => value;
3737
* @type API.fromJref
3838
*/
3939
export const fromJref = (jref, uri, reviver = defaultReviver) => {
40-
return fromJson(jref, (node, key) => {
40+
return fromJson(jref, uri, (node, key) => {
4141
const jrefNode = /** @type JsonNode<JrefJrefNode> */ (node);
4242

4343
const returned = { uri: "" };
4444
if (isReference(jrefNode, returned)) {
4545
jrefNode.jrefType = "jref-reference";
4646
jrefNode.href = resolveIri(returned.uri, uri);
47-
jrefNode.documentUri = uri;
4847
}
4948

5049
node.type = "jref";

0 commit comments

Comments
 (0)