@apidevtools/json-schema-ref-parser 10.0.0 → 10.1.0

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 (103) hide show
  1. package/dist/lib/bundle.d.ts +10 -0
  2. package/dist/lib/bundle.js +265 -0
  3. package/dist/lib/dereference.d.ts +9 -0
  4. package/dist/lib/dereference.js +206 -0
  5. package/dist/lib/index.d.ts +206 -0
  6. package/dist/lib/index.js +223 -0
  7. package/dist/lib/normalize-args.d.ts +10 -0
  8. package/dist/lib/normalize-args.js +42 -0
  9. package/dist/lib/options.d.ts +77 -0
  10. package/dist/lib/options.js +119 -0
  11. package/dist/lib/parse.d.ts +8 -0
  12. package/dist/lib/parse.js +177 -0
  13. package/dist/lib/parsers/binary.d.ts +3 -0
  14. package/dist/lib/parsers/binary.js +35 -0
  15. package/dist/lib/parsers/json.d.ts +3 -0
  16. package/dist/lib/parsers/json.js +57 -0
  17. package/dist/lib/parsers/text.d.ts +3 -0
  18. package/dist/lib/parsers/text.js +42 -0
  19. package/dist/lib/parsers/yaml.d.ts +3 -0
  20. package/dist/lib/parsers/yaml.js +65 -0
  21. package/dist/lib/pointer.d.ts +87 -0
  22. package/dist/lib/pointer.js +256 -0
  23. package/dist/lib/ref.d.ts +181 -0
  24. package/dist/lib/ref.js +239 -0
  25. package/dist/lib/refs.d.ts +127 -0
  26. package/dist/lib/refs.js +223 -0
  27. package/dist/lib/resolve-external.d.ts +14 -0
  28. package/dist/lib/resolve-external.js +148 -0
  29. package/dist/lib/resolvers/file.d.ts +3 -0
  30. package/dist/lib/resolvers/file.js +76 -0
  31. package/dist/lib/resolvers/http.d.ts +3 -0
  32. package/dist/lib/resolvers/http.js +159 -0
  33. package/dist/lib/types/index.d.ts +104 -0
  34. package/dist/lib/types/index.js +2 -0
  35. package/dist/lib/util/errors.d.ts +50 -0
  36. package/dist/lib/util/errors.js +106 -0
  37. package/dist/lib/util/maybe.d.ts +3 -0
  38. package/dist/lib/util/maybe.js +24 -0
  39. package/dist/lib/util/next.d.ts +2 -0
  40. package/dist/lib/util/next.js +16 -0
  41. package/dist/lib/util/plugins.d.ts +36 -0
  42. package/dist/lib/util/plugins.js +144 -0
  43. package/dist/lib/util/url.d.ts +93 -0
  44. package/{cjs → dist/lib}/util/url.js +134 -102
  45. package/dist/vite.config.d.ts +2 -0
  46. package/dist/vite.config.js +23 -0
  47. package/lib/{bundle.js → bundle.ts} +105 -101
  48. package/lib/{dereference.js → dereference.ts} +113 -52
  49. package/lib/index.ts +413 -0
  50. package/lib/{normalize-args.js → normalize-args.ts} +7 -14
  51. package/lib/options.ts +202 -0
  52. package/lib/parse.ts +153 -0
  53. package/lib/parsers/binary.ts +39 -0
  54. package/lib/parsers/{json.js → json.ts} +9 -22
  55. package/lib/parsers/text.ts +46 -0
  56. package/lib/parsers/{yaml.js → yaml.ts} +15 -19
  57. package/lib/pointer.ts +296 -0
  58. package/lib/ref.ts +288 -0
  59. package/lib/refs.ts +238 -0
  60. package/lib/{resolve-external.js → resolve-external.ts} +39 -36
  61. package/lib/resolvers/file.ts +40 -0
  62. package/lib/resolvers/http.ts +136 -0
  63. package/lib/tsconfig.json +103 -0
  64. package/lib/types/index.ts +135 -0
  65. package/lib/util/errors.ts +141 -0
  66. package/lib/util/maybe.ts +22 -0
  67. package/lib/util/next.ts +13 -0
  68. package/lib/util/{plugins.js → plugins.ts} +58 -57
  69. package/lib/util/{url.js → url.ts} +64 -83
  70. package/package.json +44 -45
  71. package/cjs/bundle.js +0 -304
  72. package/cjs/dereference.js +0 -258
  73. package/cjs/index.js +0 -603
  74. package/cjs/normalize-args.js +0 -64
  75. package/cjs/options.js +0 -125
  76. package/cjs/package.json +0 -3
  77. package/cjs/parse.js +0 -338
  78. package/cjs/parsers/binary.js +0 -54
  79. package/cjs/parsers/json.js +0 -199
  80. package/cjs/parsers/text.js +0 -61
  81. package/cjs/parsers/yaml.js +0 -239
  82. package/cjs/pointer.js +0 -290
  83. package/cjs/ref.js +0 -333
  84. package/cjs/refs.js +0 -214
  85. package/cjs/resolve-external.js +0 -333
  86. package/cjs/resolvers/file.js +0 -106
  87. package/cjs/resolvers/http.js +0 -184
  88. package/cjs/util/errors.js +0 -401
  89. package/cjs/util/plugins.js +0 -159
  90. package/cjs/util/projectDir.cjs +0 -6
  91. package/lib/index.d.ts +0 -496
  92. package/lib/index.js +0 -290
  93. package/lib/options.js +0 -128
  94. package/lib/parse.js +0 -162
  95. package/lib/parsers/binary.js +0 -53
  96. package/lib/parsers/text.js +0 -64
  97. package/lib/pointer.js +0 -293
  98. package/lib/ref.js +0 -292
  99. package/lib/refs.js +0 -196
  100. package/lib/resolvers/file.js +0 -63
  101. package/lib/resolvers/http.js +0 -155
  102. package/lib/util/errors.js +0 -134
  103. package/lib/util/projectDir.cjs +0 -6
@@ -1,6 +1,8 @@
1
1
  import $Ref from "./ref.js";
2
2
  import Pointer from "./pointer.js";
3
3
  import * as url from "./util/url.js";
4
+ import type $RefParserOptions from "./options.js";
5
+ import type $Refs from "./refs.js";
4
6
 
5
7
  export default bundle;
6
8
 
@@ -9,14 +11,14 @@ export default bundle;
9
11
  * only has *internal* references, not any *external* references.
10
12
  * This method mutates the JSON schema object, adding new references and re-mapping existing ones.
11
13
  *
12
- * @param {$RefParser} parser
13
- * @param {$RefParserOptions} options
14
+ * @param parser
15
+ * @param options
14
16
  */
15
- function bundle (parser, options) {
17
+ function bundle(parser: any, options: any) {
16
18
  // console.log('Bundling $ref pointers in %s', parser.$refs._root$Ref.path);
17
19
 
18
20
  // Build an inventory of all $ref pointers in the JSON Schema
19
- let inventory = [];
21
+ const inventory: any = [];
20
22
  crawl(parser, "schema", parser.$refs._root$Ref.path + "#", "#", 0, inventory, parser.$refs, options);
21
23
 
22
24
  // Remap all $ref pointers
@@ -26,52 +28,58 @@ function bundle (parser, options) {
26
28
  /**
27
29
  * Recursively crawls the given value, and inventories all JSON references.
28
30
  *
29
- * @param {object} parent - The object containing the value to crawl. If the value is not an object or array, it will be ignored.
30
- * @param {string} key - The property key of `parent` to be crawled
31
- * @param {string} path - The full path of the property being crawled, possibly with a JSON Pointer in the hash
32
- * @param {string} pathFromRoot - The path of the property being crawled, from the schema root
33
- * @param {object[]} inventory - An array of already-inventoried $ref pointers
34
- * @param {$Refs} $refs
35
- * @param {$RefParserOptions} options
31
+ * @param parent - The object containing the value to crawl. If the value is not an object or array, it will be ignored.
32
+ * @param key - The property key of `parent` to be crawled
33
+ * @param path - The full path of the property being crawled, possibly with a JSON Pointer in the hash
34
+ * @param pathFromRoot - The path of the property being crawled, from the schema root
35
+ * @param inventory - An array of already-inventoried $ref pointers
36
+ * @param $refs
37
+ * @param options
36
38
  */
37
- function crawl (parent, key, path, pathFromRoot, indirections, inventory, $refs, options) {
38
- let obj = key === null ? parent : parent[key];
39
+ function crawl(
40
+ parent: any,
41
+ key: any,
42
+ path: any,
43
+ pathFromRoot: any,
44
+ indirections: any,
45
+ inventory: any,
46
+ $refs: any,
47
+ options: any,
48
+ ) {
49
+ const obj = key === null ? parent : parent[key];
39
50
 
40
51
  if (obj && typeof obj === "object" && !ArrayBuffer.isView(obj)) {
52
+ // @ts-expect-error TS(2554): Expected 2 arguments, but got 1.
41
53
  if ($Ref.isAllowed$Ref(obj)) {
42
54
  inventory$Ref(parent, key, path, pathFromRoot, indirections, inventory, $refs, options);
43
- }
44
- else {
55
+ } else {
45
56
  // Crawl the object in a specific order that's optimized for bundling.
46
57
  // This is important because it determines how `pathFromRoot` gets built,
47
58
  // which later determines which keys get dereferenced and which ones get remapped
48
- let keys = Object.keys(obj)
49
- .sort((a, b) => {
50
- // Most people will expect references to be bundled into the the "definitions" property,
51
- // so we always crawl that property first, if it exists.
52
- if (a === "definitions") {
53
- return -1;
54
- }
55
- else if (b === "definitions") {
56
- return 1;
57
- }
58
- else {
59
- // Otherwise, crawl the keys based on their length.
60
- // This produces the shortest possible bundled references
61
- return a.length - b.length;
62
- }
63
- });
59
+ const keys = Object.keys(obj).sort((a, b) => {
60
+ // Most people will expect references to be bundled into the the "definitions" property,
61
+ // so we always crawl that property first, if it exists.
62
+ if (a === "definitions") {
63
+ return -1;
64
+ } else if (b === "definitions") {
65
+ return 1;
66
+ } else {
67
+ // Otherwise, crawl the keys based on their length.
68
+ // This produces the shortest possible bundled references
69
+ return a.length - b.length;
70
+ }
71
+ });
64
72
 
65
73
  // eslint-disable-next-line no-shadow
66
- for (let key of keys) {
67
- let keyPath = Pointer.join(path, key);
68
- let keyPathFromRoot = Pointer.join(pathFromRoot, key);
69
- let value = obj[key];
74
+ for (const key of keys) {
75
+ const keyPath = Pointer.join(path, key);
76
+ const keyPathFromRoot = Pointer.join(pathFromRoot, key);
77
+ const value = obj[key];
70
78
 
79
+ // @ts-expect-error TS(2554): Expected 2 arguments, but got 1.
71
80
  if ($Ref.isAllowed$Ref(value)) {
72
81
  inventory$Ref(obj, key, path, keyPathFromRoot, indirections, inventory, $refs, options);
73
- }
74
- else {
82
+ } else {
75
83
  crawl(obj, key, keyPath, keyPathFromRoot, indirections, inventory, $refs, options);
76
84
  }
77
85
  }
@@ -83,53 +91,60 @@ function crawl (parent, key, path, pathFromRoot, indirections, inventory, $refs,
83
91
  * Inventories the given JSON Reference (i.e. records detailed information about it so we can
84
92
  * optimize all $refs in the schema), and then crawls the resolved value.
85
93
  *
86
- * @param {object} $refParent - The object that contains a JSON Reference as one of its keys
87
- * @param {string} $refKey - The key in `$refParent` that is a JSON Reference
88
- * @param {string} path - The full path of the JSON Reference at `$refKey`, possibly with a JSON Pointer in the hash
89
- * @param {string} pathFromRoot - The path of the JSON Reference at `$refKey`, from the schema root
90
- * @param {object[]} inventory - An array of already-inventoried $ref pointers
91
- * @param {$Refs} $refs
92
- * @param {$RefParserOptions} options
94
+ * @param $refParent - The object that contains a JSON Reference as one of its keys
95
+ * @param $refKey - The key in `$refParent` that is a JSON Reference
96
+ * @param path - The full path of the JSON Reference at `$refKey`, possibly with a JSON Pointer in the hash
97
+ * @param pathFromRoot - The path of the JSON Reference at `$refKey`, from the schema root
98
+ * @param inventory - An array of already-inventoried $ref pointers
99
+ * @param $refs
100
+ * @param options
93
101
  */
94
- function inventory$Ref ($refParent, $refKey, path, pathFromRoot, indirections, inventory, $refs, options) {
95
- let $ref = $refKey === null ? $refParent : $refParent[$refKey];
96
- let $refPath = url.resolve(path, $ref.$ref);
97
- let pointer = $refs._resolve($refPath, pathFromRoot, options);
102
+ function inventory$Ref(
103
+ $refParent: any,
104
+ $refKey: any,
105
+ path: string,
106
+ pathFromRoot: any,
107
+ indirections: any,
108
+ inventory: any,
109
+ $refs: $Refs,
110
+ options: $RefParserOptions,
111
+ ) {
112
+ const $ref = $refKey === null ? $refParent : $refParent[$refKey];
113
+ const $refPath = url.resolve(path, $ref.$ref);
114
+ const pointer = $refs._resolve($refPath, pathFromRoot, options);
98
115
  if (pointer === null) {
99
116
  return;
100
117
  }
101
-
102
- let depth = Pointer.parse(pathFromRoot).length;
103
- let file = url.stripHash(pointer.path);
104
- let hash = url.getHash(pointer.path);
105
- let external = file !== $refs._root$Ref.path;
106
- let extended = $Ref.isExtended$Ref($ref);
118
+ const depth = Pointer.parse(pathFromRoot).length;
119
+ const file = url.stripHash(pointer.path);
120
+ const hash = url.getHash(pointer.path);
121
+ const external = file !== $refs._root$Ref.path;
122
+ const extended = $Ref.isExtended$Ref($ref);
107
123
  indirections += pointer.indirections;
108
124
 
109
- let existingEntry = findInInventory(inventory, $refParent, $refKey);
125
+ const existingEntry = findInInventory(inventory, $refParent, $refKey);
110
126
  if (existingEntry) {
111
127
  // This $Ref has already been inventoried, so we don't need to process it again
112
128
  if (depth < existingEntry.depth || indirections < existingEntry.indirections) {
113
129
  removeFromInventory(inventory, existingEntry);
114
- }
115
- else {
130
+ } else {
116
131
  return;
117
132
  }
118
133
  }
119
134
 
120
135
  inventory.push({
121
- $ref, // The JSON Reference (e.g. {$ref: string})
122
- parent: $refParent, // The object that contains this $ref pointer
123
- key: $refKey, // The key in `parent` that is the $ref pointer
124
- pathFromRoot, // The path to the $ref pointer, from the JSON Schema root
125
- depth, // How far from the JSON Schema root is this $ref pointer?
126
- file, // The file that the $ref pointer resolves to
127
- hash, // The hash within `file` that the $ref pointer resolves to
128
- value: pointer.value, // The resolved value of the $ref pointer
129
- circular: pointer.circular, // Is this $ref pointer DIRECTLY circular? (i.e. it references itself)
130
- extended, // Does this $ref extend its resolved value? (i.e. it has extra properties, in addition to "$ref")
131
- external, // Does this $ref pointer point to a file other than the main JSON Schema file?
132
- indirections, // The number of indirect references that were traversed to resolve the value
136
+ $ref, // The JSON Reference (e.g. {$ref: string})
137
+ parent: $refParent, // The object that contains this $ref pointer
138
+ key: $refKey, // The key in `parent` that is the $ref pointer
139
+ pathFromRoot, // The path to the $ref pointer, from the JSON Schema root
140
+ depth, // How far from the JSON Schema root is this $ref pointer?
141
+ file, // The file that the $ref pointer resolves to
142
+ hash, // The hash within `file` that the $ref pointer resolves to
143
+ value: pointer.value, // The resolved value of the $ref pointer
144
+ circular: pointer.circular, // Is this $ref pointer DIRECTLY circular? (i.e. it references itself)
145
+ extended, // Does this $ref extend its resolved value? (i.e. it has extra properties, in addition to "$ref")
146
+ external, // Does this $ref pointer point to a file other than the main JSON Schema file?
147
+ indirections, // The number of indirect references that were traversed to resolve the value
133
148
  });
134
149
 
135
150
  // Recursively crawl the resolved value
@@ -143,8 +158,7 @@ function inventory$Ref ($refParent, $refKey, path, pathFromRoot, indirections, i
143
158
  * Each referenced value is dereferenced EXACTLY ONCE. All subsequent references to the same
144
159
  * value are re-mapped to point to the first reference.
145
160
  *
146
- * @example:
147
- * {
161
+ * @example: {
148
162
  * first: { $ref: somefile.json#/some/part },
149
163
  * second: { $ref: somefile.json#/another/part },
150
164
  * third: { $ref: somefile.json },
@@ -159,46 +173,39 @@ function inventory$Ref ($refParent, $refKey, path, pathFromRoot, indirections, i
159
173
  * to be dereferenced, since they point to different parts of the file. The fourth reference does NOT
160
174
  * need to be dereferenced, because it can be remapped to point inside the first one.
161
175
  *
162
- * @param {object[]} inventory
176
+ * @param inventory
163
177
  */
164
- function remap (inventory) {
178
+ function remap(inventory: any) {
165
179
  // Group & sort all the $ref pointers, so they're in the order that we need to dereference/remap them
166
- inventory.sort((a, b) => {
180
+ inventory.sort((a: any, b: any) => {
167
181
  if (a.file !== b.file) {
168
182
  // Group all the $refs that point to the same file
169
183
  return a.file < b.file ? -1 : +1;
170
- }
171
- else if (a.hash !== b.hash) {
184
+ } else if (a.hash !== b.hash) {
172
185
  // Group all the $refs that point to the same part of the file
173
186
  return a.hash < b.hash ? -1 : +1;
174
- }
175
- else if (a.circular !== b.circular) {
187
+ } else if (a.circular !== b.circular) {
176
188
  // If the $ref points to itself, then sort it higher than other $refs that point to this $ref
177
189
  return a.circular ? -1 : +1;
178
- }
179
- else if (a.extended !== b.extended) {
190
+ } else if (a.extended !== b.extended) {
180
191
  // If the $ref extends the resolved value, then sort it lower than other $refs that don't extend the value
181
192
  return a.extended ? +1 : -1;
182
- }
183
- else if (a.indirections !== b.indirections) {
193
+ } else if (a.indirections !== b.indirections) {
184
194
  // Sort direct references higher than indirect references
185
195
  return a.indirections - b.indirections;
186
- }
187
- else if (a.depth !== b.depth) {
196
+ } else if (a.depth !== b.depth) {
188
197
  // Sort $refs by how close they are to the JSON Schema root
189
198
  return a.depth - b.depth;
190
- }
191
- else {
199
+ } else {
192
200
  // Determine how far each $ref is from the "definitions" property.
193
201
  // Most people will expect references to be bundled into the the "definitions" property if possible.
194
- let aDefinitionsIndex = a.pathFromRoot.lastIndexOf("/definitions");
195
- let bDefinitionsIndex = b.pathFromRoot.lastIndexOf("/definitions");
202
+ const aDefinitionsIndex = a.pathFromRoot.lastIndexOf("/definitions");
203
+ const bDefinitionsIndex = b.pathFromRoot.lastIndexOf("/definitions");
196
204
 
197
205
  if (aDefinitionsIndex !== bDefinitionsIndex) {
198
206
  // Give higher priority to the $ref that's closer to the "definitions" property
199
207
  return bDefinitionsIndex - aDefinitionsIndex;
200
- }
201
- else {
208
+ } else {
202
209
  // All else is equal, so use the shorter path, which will produce the shortest possible reference
203
210
  return a.pathFromRoot.length - b.pathFromRoot.length;
204
211
  }
@@ -206,22 +213,19 @@ function remap (inventory) {
206
213
  });
207
214
 
208
215
  let file, hash, pathFromRoot;
209
- for (let entry of inventory) {
216
+ for (const entry of inventory) {
210
217
  // console.log('Re-mapping $ref pointer "%s" at %s', entry.$ref.$ref, entry.pathFromRoot);
211
218
 
212
219
  if (!entry.external) {
213
220
  // This $ref already resolves to the main JSON Schema file
214
221
  entry.$ref.$ref = entry.hash;
215
- }
216
- else if (entry.file === file && entry.hash === hash) {
222
+ } else if (entry.file === file && entry.hash === hash) {
217
223
  // This $ref points to the same value as the prevous $ref, so remap it to the same path
218
224
  entry.$ref.$ref = pathFromRoot;
219
- }
220
- else if (entry.file === file && entry.hash.indexOf(hash + "/") === 0) {
225
+ } else if (entry.file === file && entry.hash.indexOf(hash + "/") === 0) {
221
226
  // This $ref points to a sub-value of the prevous $ref, so remap it beneath that path
222
227
  entry.$ref.$ref = Pointer.join(pathFromRoot, Pointer.parse(entry.hash.replace(hash, "#")));
223
- }
224
- else {
228
+ } else {
225
229
  // We've moved to a new file or new hash
226
230
  file = entry.file;
227
231
  hash = entry.hash;
@@ -244,16 +248,16 @@ function remap (inventory) {
244
248
  /**
245
249
  * TODO
246
250
  */
247
- function findInInventory (inventory, $refParent, $refKey) {
251
+ function findInInventory(inventory: any, $refParent: any, $refKey: any) {
248
252
  for (let i = 0; i < inventory.length; i++) {
249
- let existingEntry = inventory[i];
253
+ const existingEntry = inventory[i];
250
254
  if (existingEntry.parent === $refParent && existingEntry.key === $refKey) {
251
255
  return existingEntry;
252
256
  }
253
257
  }
254
258
  }
255
259
 
256
- function removeFromInventory (inventory, entry) {
257
- let index = inventory.indexOf(entry);
260
+ function removeFromInventory(inventory: any, entry: any) {
261
+ const index = inventory.indexOf(entry);
258
262
  inventory.splice(index, 1);
259
263
  }
@@ -2,6 +2,8 @@ import $Ref from "./ref.js";
2
2
  import Pointer from "./pointer.js";
3
3
  import { ono } from "@jsdevtools/ono";
4
4
  import * as url from "./util/url.js";
5
+ import type $Refs from "./refs.js";
6
+ import type $RefParserOptions from "./options.js";
5
7
 
6
8
  export default dereference;
7
9
 
@@ -9,12 +11,21 @@ export default dereference;
9
11
  * Crawls the JSON schema, finds all JSON references, and dereferences them.
10
12
  * This method mutates the JSON schema object, replacing JSON references with their resolved value.
11
13
  *
12
- * @param {$RefParser} parser
13
- * @param {$RefParserOptions} options
14
+ * @param parser
15
+ * @param options
14
16
  */
15
- function dereference (parser, options) {
17
+ function dereference(parser: any, options: any) {
16
18
  // console.log('Dereferencing $ref pointers in %s', parser.$refs._root$Ref.path);
17
- let dereferenced = crawl(parser.schema, parser.$refs._root$Ref.path, "#", new Set(), new Set(), new Map(), parser.$refs, options);
19
+ const dereferenced = crawl(
20
+ parser.schema,
21
+ parser.$refs._root$Ref.path,
22
+ "#",
23
+ new Set(),
24
+ new Set(),
25
+ new Map(),
26
+ parser.$refs,
27
+ options,
28
+ );
18
29
  parser.$refs.circular = dereferenced.circular;
19
30
  parser.schema = dereferenced.value;
20
31
  }
@@ -22,24 +33,33 @@ function dereference (parser, options) {
22
33
  /**
23
34
  * Recursively crawls the given value, and dereferences any JSON references.
24
35
  *
25
- * @param {*} obj - The value to crawl. If it's not an object or array, it will be ignored.
26
- * @param {string} path - The full path of `obj`, possibly with a JSON Pointer in the hash
27
- * @param {string} pathFromRoot - The path of `obj` from the schema root
28
- * @param {Set<object>} parents - An array of the parent objects that have already been dereferenced
29
- * @param {Set<object>} processedObjects - An array of all the objects that have already been processed
30
- * @param {Map<string,object>} dereferencedCache - An map of all the dereferenced objects
31
- * @param {$Refs} $refs
32
- * @param {$RefParserOptions} options
33
- * @returns {{value: object, circular: boolean}}
36
+ * @param obj - The value to crawl. If it's not an object or array, it will be ignored.
37
+ * @param path - The full path of `obj`, possibly with a JSON Pointer in the hash
38
+ * @param pathFromRoot - The path of `obj` from the schema root
39
+ * @param parents - An array of the parent objects that have already been dereferenced
40
+ * @param processedObjects - An array of all the objects that have already been processed
41
+ * @param dereferencedCache - An map of all the dereferenced objects
42
+ * @param $refs
43
+ * @param options
44
+ * @returns
34
45
  */
35
- function crawl (obj, path, pathFromRoot, parents, processedObjects, dereferencedCache, $refs, options) {
46
+ function crawl(
47
+ obj: any,
48
+ path: string,
49
+ pathFromRoot: string,
50
+ parents: Set<any>,
51
+ processedObjects: Set<any>,
52
+ dereferencedCache: any,
53
+ $refs: $Refs,
54
+ options: $RefParserOptions,
55
+ ) {
36
56
  let dereferenced;
37
- let result = {
57
+ const result = {
38
58
  value: obj,
39
- circular: false
59
+ circular: false,
40
60
  };
41
61
 
42
- let isExcludedPath = options.dereference.excludedPathMatcher;
62
+ const isExcludedPath = options.dereference.excludedPathMatcher || (() => false);
43
63
 
44
64
  if (options.dereference.circular === "ignore" || !processedObjects.has(obj)) {
45
65
  if (obj && typeof obj === "object" && !ArrayBuffer.isView(obj) && !isExcludedPath(pathFromRoot)) {
@@ -47,24 +67,41 @@ function crawl (obj, path, pathFromRoot, parents, processedObjects, dereferenced
47
67
  processedObjects.add(obj);
48
68
 
49
69
  if ($Ref.isAllowed$Ref(obj, options)) {
50
- dereferenced = dereference$Ref(obj, path, pathFromRoot, parents, processedObjects, dereferencedCache, $refs, options);
70
+ dereferenced = dereference$Ref(
71
+ obj,
72
+ path,
73
+ pathFromRoot,
74
+ parents,
75
+ processedObjects,
76
+ dereferencedCache,
77
+ $refs,
78
+ options,
79
+ );
51
80
  result.circular = dereferenced.circular;
52
81
  result.value = dereferenced.value;
53
- }
54
- else {
82
+ } else {
55
83
  for (const key of Object.keys(obj)) {
56
- let keyPath = Pointer.join(path, key);
57
- let keyPathFromRoot = Pointer.join(pathFromRoot, key);
84
+ const keyPath = Pointer.join(path, key);
85
+ const keyPathFromRoot = Pointer.join(pathFromRoot, key);
58
86
 
59
87
  if (isExcludedPath(keyPathFromRoot)) {
60
88
  continue;
61
89
  }
62
90
 
63
- let value = obj[key];
91
+ const value = obj[key];
64
92
  let circular = false;
65
93
 
66
94
  if ($Ref.isAllowed$Ref(value, options)) {
67
- dereferenced = dereference$Ref(value, keyPath, keyPathFromRoot, parents, processedObjects, dereferencedCache, $refs, options);
95
+ dereferenced = dereference$Ref(
96
+ value,
97
+ keyPath,
98
+ keyPathFromRoot,
99
+ parents,
100
+ processedObjects,
101
+ dereferencedCache,
102
+ $refs,
103
+ options,
104
+ );
68
105
  circular = dereferenced.circular;
69
106
  // Avoid pointless mutations; breaks frozen objects to no profit
70
107
  if (obj[key] !== dereferenced.value) {
@@ -73,17 +110,24 @@ function crawl (obj, path, pathFromRoot, parents, processedObjects, dereferenced
73
110
  options.dereference.onDereference(value.$ref, obj[key]);
74
111
  }
75
112
  }
76
- }
77
- else {
113
+ } else {
78
114
  if (!parents.has(value)) {
79
- dereferenced = crawl(value, keyPath, keyPathFromRoot, parents, processedObjects, dereferencedCache, $refs, options);
115
+ dereferenced = crawl(
116
+ value,
117
+ keyPath,
118
+ keyPathFromRoot,
119
+ parents,
120
+ processedObjects,
121
+ dereferencedCache,
122
+ $refs,
123
+ options,
124
+ );
80
125
  circular = dereferenced.circular;
81
126
  // Avoid pointless mutations; breaks frozen objects to no profit
82
127
  if (obj[key] !== dereferenced.value) {
83
128
  obj[key] = dereferenced.value;
84
129
  }
85
- }
86
- else {
130
+ } else {
87
131
  circular = foundCircularReference(keyPath, $refs, options);
88
132
  }
89
133
  }
@@ -103,28 +147,38 @@ function crawl (obj, path, pathFromRoot, parents, processedObjects, dereferenced
103
147
  /**
104
148
  * Dereferences the given JSON Reference, and then crawls the resulting value.
105
149
  *
106
- * @param {{$ref: string}} $ref - The JSON Reference to resolve
107
- * @param {string} path - The full path of `$ref`, possibly with a JSON Pointer in the hash
108
- * @param {string} pathFromRoot - The path of `$ref` from the schema root
109
- * @param {Set<object>} parents - An array of the parent objects that have already been dereferenced
110
- * @param {Set<object>} processedObjects - An array of all the objects that have already been dereferenced
111
- * @param {Map<string,object>} dereferencedCache - An map of all the dereferenced objects
112
- * @param {$Refs} $refs
113
- * @param {$RefParserOptions} options
114
- * @returns {{value: object, circular: boolean}}
150
+ * @param $ref - The JSON Reference to resolve
151
+ * @param path - The full path of `$ref`, possibly with a JSON Pointer in the hash
152
+ * @param pathFromRoot - The path of `$ref` from the schema root
153
+ * @param parents - An array of the parent objects that have already been dereferenced
154
+ * @param processedObjects - An array of all the objects that have already been dereferenced
155
+ * @param dereferencedCache - An map of all the dereferenced objects
156
+ * @param $refs
157
+ * @param options
158
+ * @returns
115
159
  */
116
- function dereference$Ref ($ref, path, pathFromRoot, parents, processedObjects, dereferencedCache, $refs, options) {
160
+ function dereference$Ref(
161
+ $ref: any,
162
+ path: any,
163
+ pathFromRoot: any,
164
+ parents: any,
165
+ processedObjects: any,
166
+ dereferencedCache: any,
167
+ $refs: any,
168
+ options: any,
169
+ ) {
117
170
  // console.log('Dereferencing $ref pointer "%s" at %s', $ref.$ref, path);
118
171
 
119
- let $refPath = url.resolve(path, $ref.$ref);
172
+ const $refPath = url.resolve(path, $ref.$ref);
120
173
 
121
174
  const cache = dereferencedCache.get($refPath);
122
175
  if (cache) {
123
176
  const refKeys = Object.keys($ref);
124
177
  if (refKeys.length > 1) {
125
178
  const extraKeys = {};
126
- for (let key of refKeys) {
179
+ for (const key of refKeys) {
127
180
  if (key !== "$ref" && !(key in cache.value)) {
181
+ // @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
128
182
  extraKeys[key] = $ref[key];
129
183
  }
130
184
  }
@@ -137,8 +191,7 @@ function dereference$Ref ($ref, path, pathFromRoot, parents, processedObjects, d
137
191
  return cache;
138
192
  }
139
193
 
140
-
141
- let pointer = $refs._resolve($refPath, path, options);
194
+ const pointer = $refs._resolve($refPath, path, options);
142
195
 
143
196
  if (pointer === null) {
144
197
  return {
@@ -148,7 +201,7 @@ function dereference$Ref ($ref, path, pathFromRoot, parents, processedObjects, d
148
201
  }
149
202
 
150
203
  // Check for circular references
151
- let directCircular = pointer.circular;
204
+ const directCircular = pointer.circular;
152
205
  let circular = directCircular || parents.has(pointer.value);
153
206
  circular && foundCircularReference(path, $refs, options);
154
207
 
@@ -158,7 +211,16 @@ function dereference$Ref ($ref, path, pathFromRoot, parents, processedObjects, d
158
211
  // Crawl the dereferenced value (unless it's circular)
159
212
  if (!circular) {
160
213
  // Determine if the dereferenced value is circular
161
- let dereferenced = crawl(dereferencedValue, pointer.path, pathFromRoot, parents, processedObjects, dereferencedCache, $refs, options);
214
+ const dereferenced = crawl(
215
+ dereferencedValue,
216
+ pointer.path,
217
+ pathFromRoot,
218
+ parents,
219
+ processedObjects,
220
+ dereferencedCache,
221
+ $refs,
222
+ options,
223
+ );
162
224
  circular = dereferenced.circular;
163
225
  dereferencedValue = dereferenced.value;
164
226
  }
@@ -174,10 +236,9 @@ function dereference$Ref ($ref, path, pathFromRoot, parents, processedObjects, d
174
236
  dereferencedValue.$ref = pathFromRoot;
175
237
  }
176
238
 
177
-
178
239
  const dereferencedObject = {
179
240
  circular,
180
- value: dereferencedValue
241
+ value: dereferencedValue,
181
242
  };
182
243
 
183
244
  // only cache if no extra properties than $ref
@@ -192,12 +253,12 @@ function dereference$Ref ($ref, path, pathFromRoot, parents, processedObjects, d
192
253
  * Called when a circular reference is found.
193
254
  * It sets the {@link $Refs#circular} flag, and throws an error if options.dereference.circular is false.
194
255
  *
195
- * @param {string} keyPath - The JSON Reference path of the circular reference
196
- * @param {$Refs} $refs
197
- * @param {$RefParserOptions} options
198
- * @returns {boolean} - always returns true, to indicate that a circular reference was found
256
+ * @param keyPath - The JSON Reference path of the circular reference
257
+ * @param $refs
258
+ * @param options
259
+ * @returns - always returns true, to indicate that a circular reference was found
199
260
  */
200
- function foundCircularReference (keyPath, $refs, options) {
261
+ function foundCircularReference(keyPath: any, $refs: any, options: any) {
201
262
  $refs.circular = true;
202
263
  if (!options.dereference.circular) {
203
264
  throw ono.reference(`Circular $ref pointer found at ${keyPath}`);