File tree 4 files changed +22
-7
lines changed
apidom-json-pointer-relative/src
4 files changed +22
-7
lines changed Original file line number Diff line number Diff line change 1
- import { compile as compileJsonPointer } from '@swagger-api/apidom-json-pointer' ;
1
+ import { compile as compileJsonPointer } from '@swagger-api/apidom-json-pointer/modern ' ;
2
2
3
3
import { RelativeJsonPointer } from './types.ts' ;
4
4
import CompilationRelativeJsonPointerError from './errors/CompilationRelativeJsonPointerError.ts' ;
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ import {
13
13
import {
14
14
compile as compileJsonPointer ,
15
15
evaluate as evaluateJsonPointer ,
16
- } from '@swagger-api/apidom-json-pointer' ;
16
+ } from '@swagger-api/apidom-json-pointer/modern ' ;
17
17
import { last } from 'ramda' ;
18
18
19
19
import EvaluationRelativeJsonPointerError from './errors/EvaluationRelativeJsonPointerError.ts' ;
@@ -28,7 +28,7 @@ const evaluate = <T extends Element, U extends Element>(
28
28
relativePointer : string ,
29
29
currentElement : T ,
30
30
rootElement : U ,
31
- ) : Element => {
31
+ ) : Element | undefined => {
32
32
let ancestorLineage : Element [ ] = [ ] ;
33
33
let cursor : Element | undefined = currentElement ;
34
34
@@ -148,7 +148,7 @@ const evaluate = <T extends Element, U extends Element>(
148
148
if ( Array . isArray ( relativeJsonPointer . jsonPointerTokens ) ) {
149
149
// <json-pointer>
150
150
const jsonPointer = compileJsonPointer ( relativeJsonPointer . jsonPointerTokens ) ;
151
- cursor = evaluateJsonPointer ( jsonPointer , cursor ) ;
151
+ cursor = evaluateJsonPointer ( cursor , jsonPointer ) ;
152
152
} else if ( relativeJsonPointer . hashCharacter ) {
153
153
// "#"
154
154
if ( cursor === rootElement ) {
Original file line number Diff line number Diff line change 1
- import { parse as parseJsonPointer } from '@swagger-api/apidom-json-pointer' ;
1
+ import { parse as parseJsonPointer } from '@swagger-api/apidom-json-pointer/modern ' ;
2
2
3
3
import InvalidRelativeJsonPointerError from './errors/InvalidRelativeJsonPointerError.ts' ;
4
4
import { RelativeJsonPointer } from './types.ts' ;
@@ -41,7 +41,7 @@ const parse = (relativePointer: string): RelativeJsonPointer => {
41
41
// <json-pointer>
42
42
const jsonPointerTokens =
43
43
typeof match . groups . jsonPointer === 'string'
44
- ? parseJsonPointer ( match . groups . jsonPointer )
44
+ ? parseJsonPointer ( match . groups . jsonPointer ) . tree
45
45
: undefined ;
46
46
// "#"
47
47
const hashCharacter = typeof match . groups . hashCharacter === 'string' ;
Original file line number Diff line number Diff line change @@ -11,6 +11,14 @@ export {
11
11
CSTTranslator ,
12
12
ASTTranslator ,
13
13
XMLTranslator ,
14
+ /**
15
+ * Testing
16
+ */
17
+ testJSONPointer ,
18
+ testReferenceToken ,
19
+ testArrayLocation ,
20
+ testArrayIndex ,
21
+ testArrayDash ,
14
22
/**
15
23
* Compiling
16
24
*/
@@ -20,6 +28,10 @@ export {
20
28
*/
21
29
escape ,
22
30
unescape ,
31
+ /**
32
+ * Grammar
33
+ */
34
+ Grammar ,
23
35
/**
24
36
* Errors
25
37
*/
@@ -32,7 +44,10 @@ export {
32
44
JSONPointerIndexError ,
33
45
} from '@swaggerexpert/json-pointer' ;
34
46
/**
35
- * Evaluation
47
+ * Contextual Evaluation for ApiDOM
36
48
*/
37
49
export { evaluate } from '@swaggerexpert/json-pointer/evaluate/realms/apidom' ;
50
+ /**
51
+ * Re-export all types
52
+ */
38
53
export type * from '@swaggerexpert/json-pointer' ;
You can’t perform that action at this time.
0 commit comments