Skip to content

Commit 754c551

Browse files
davidlehndavidlehn
committed
Remove prepending @base and @vocab events.
- More appropriate events are already emitted for the real data issues. - This may be useful in the future for a debug mode.
1 parent 353c192 commit 754c551

File tree

2 files changed

+78
-72
lines changed

2 files changed

+78
-72
lines changed

‎lib/context.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,6 +1106,8 @@ function _expandIri(activeCtx, value, relativeTo, localCtx, defined, options) {
11061106
if(relativeTo.vocab && '@vocab' in activeCtx) {
11071107
// prepend vocab
11081108
const prependedResult = activeCtx['@vocab'] + value;
1109+
// FIXME: needed? may be better as debug event.
1110+
/*
11091111
if(options && options.eventHandler) {
11101112
_handleEvent({
11111113
event: {
@@ -1124,6 +1126,7 @@ function _expandIri(activeCtx, value, relativeTo, localCtx, defined, options) {
11241126
options
11251127
});
11261128
}
1129+
*/
11271130
// the null case preserves value as potentially relative
11281131
value = prependedResult;
11291132
} else if(relativeTo.base) {
@@ -1142,6 +1145,8 @@ function _expandIri(activeCtx, value, relativeTo, localCtx, defined, options) {
11421145
base = options.base;
11431146
prependedResult = prependBase(options.base, value);
11441147
}
1148+
// FIXME: needed? may be better as debug event.
1149+
/*
11451150
if(options && options.eventHandler) {
11461151
_handleEvent({
11471152
event: {
@@ -1160,6 +1165,7 @@ function _expandIri(activeCtx, value, relativeTo, localCtx, defined, options) {
11601165
options
11611166
});
11621167
}
1168+
*/
11631169
// the null case preserves value as potentially relative
11641170
value = prependedResult;
11651171
}

‎tests/misc.js

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -2248,8 +2248,8 @@ _:b0 <ex:p> "v" .
22482248
input,
22492249
expected,
22502250
eventCodeLog: [
2251-
'prepending @base during expansion',
2252-
// .. 'relativeiri'
2251+
//'prepending @base during expansion',
2252+
//// .. 'relativeiri'
22532253
'relative @id reference',
22542254
// .. 'relativeiri'
22552255
'object with only @id'
@@ -2283,8 +2283,8 @@ _:b0 <ex:p> "v" .
22832283
input,
22842284
expected,
22852285
eventCodeLog: [
2286-
'prepending @base during expansion',
2287-
// .. 'relativeiri'
2286+
////'prepending @base during expansion',
2287+
//// .. 'relativeiri'
22882288
'relative @id reference'
22892289
// .. 'relativeiri'
22902290
],
@@ -2320,8 +2320,8 @@ _:b0 <ex:p> "v" .
23202320
input,
23212321
expected,
23222322
eventCodeLog: [
2323-
'prepending @base during expansion',
2324-
// .. 'relativeiri'
2323+
//'prepending @base during expansion',
2324+
//// .. 'relativeiri'
23252325
'relative @id reference'
23262326
// .. 'relativeiri'
23272327
],
@@ -2359,8 +2359,8 @@ _:b0 <ex:p> "v" .
23592359
input,
23602360
expected,
23612361
eventCodeLog: [
2362-
'prepending @base during expansion',
2363-
// .. 'relativeiri'
2362+
//'prepending @base during expansion',
2363+
//// .. 'relativeiri'
23642364
'relative @id reference'
23652365
// .. 'relativeiri'
23662366
],
@@ -2397,8 +2397,8 @@ _:b0 <ex:p> "v" .
23972397
input,
23982398
expected,
23992399
eventCodeLog: [
2400-
'prepending @base during expansion',
2401-
// .. 'relativeiri'
2400+
//'prepending @base during expansion',
2401+
//// .. 'relativeiri'
24022402
'relative @id reference'
24032403
// .. 'relativeiri'
24042404
],
@@ -2437,8 +2437,8 @@ _:b0 <ex:p> "v" .
24372437
input,
24382438
expected,
24392439
eventCodeLog: [
2440-
'prepending @base during expansion',
2441-
// .. 'relativeiri'
2440+
//'prepending @base during expansion',
2441+
//// .. 'relativeiri'
24422442
'relative @type reference',
24432443
// .. 'relativeiri'
24442444
'invalid property'
@@ -2490,8 +2490,8 @@ _:b0 <ex:p> "v" .
24902490
input,
24912491
expected,
24922492
eventCodeLog: [
2493-
'prepending @base during expansion',
2494-
// .. 'relativeiri'
2493+
//'prepending @base during expansion',
2494+
//// .. 'relativeiri'
24952495
'relative @type reference',
24962496
// .. 'relativeiri'
24972497
'invalid property'
@@ -2534,12 +2534,12 @@ _:b0 <ex:p> "v" .
25342534
input,
25352535
expected,
25362536
eventCodeLog: [
2537-
'prepending @base during expansion',
2538-
// .. 'relativeiri'
2537+
//'prepending @base during expansion',
2538+
//// .. 'relativeiri'
25392539
'relative @type reference',
25402540
// .. 'relativeiri'
2541-
'prepending @base during expansion',
2542-
// .. 'anotherRelativeiri'
2541+
//'prepending @base during expansion',
2542+
//// .. 'anotherRelativeiri'
25432543
'relative @type reference',
25442544
// .. 'anotherRelativeiri'
25452545
'invalid property'
@@ -2592,12 +2592,12 @@ _:b0 <ex:p> "v" .
25922592
input,
25932593
expected,
25942594
eventCodeLog: [
2595-
'prepending @base during expansion',
2596-
// .. 'relativeiri'
2595+
//'prepending @base during expansion',
2596+
//// .. 'relativeiri'
25972597
'relative @type reference',
25982598
// .. 'relativeiri'
2599-
'prepending @base during expansion',
2600-
// .. 'anotherRelativeiri'
2599+
//'prepending @base during expansion',
2600+
//// .. 'anotherRelativeiri'
26012601
'relative @type reference',
26022602
// .. 'anotherRelativeiri'
26032603
'invalid property'
@@ -2640,8 +2640,8 @@ _:b0 <ex:p> "v" .
26402640
input,
26412641
expected,
26422642
eventCodeLog: [
2643-
'prepending @base during expansion',
2644-
// .. 'relativeiri'
2643+
//'prepending @base during expansion',
2644+
//// .. 'relativeiri'
26452645
'relative @type reference',
26462646
// .. 'relativeiri'
26472647
'invalid property'
@@ -2684,8 +2684,8 @@ _:b0 <ex:p> "v" .
26842684
eventCodeLog: [
26852685
'invalid property',
26862686
// .. 'relativeiri'
2687-
'prepending @base during expansion',
2688-
// .. 'relativeiri'
2687+
//'prepending @base during expansion',
2688+
//// .. 'relativeiri'
26892689
'relative @type reference'
26902690
// .. 'id'
26912691
],
@@ -2713,8 +2713,8 @@ _:b0 <ex:p> "v" .
27132713
input,
27142714
expected,
27152715
eventCodeLog: [
2716-
'prepending @base during expansion',
2717-
// .. 'relativeiri'
2716+
//'prepending @base during expansion',
2717+
//// .. 'relativeiri'
27182718
'relative @id reference',
27192719
// .. 'relativeiri'
27202720
'object with only @id'
@@ -2743,8 +2743,8 @@ _:b0 <ex:p> "v" .
27432743
input,
27442744
expected,
27452745
eventCodeLog: [
2746-
'prepending @base during expansion',
2747-
// .. 'relativeiri'
2746+
//'prepending @base during expansion',
2747+
//// .. 'relativeiri'
27482748
'relative @id reference',
27492749
// .. 'relativeiri'
27502750
'object with only @id'
@@ -2778,8 +2778,8 @@ _:b0 <ex:p> "v" .
27782778
input,
27792779
expected,
27802780
eventCodeLog: [
2781-
'prepending @base during expansion',
2782-
// .. 'relativeiri'
2781+
//'prepending @base during expansion',
2782+
//// .. 'relativeiri'
27832783
'relative @type reference',
27842784
// .. 'relativeiri'
27852785
],
@@ -2812,14 +2812,14 @@ _:b0 <ex:p> "v" .
28122812
input,
28132813
expected,
28142814
eventCodeLog: [
2815-
'prepending @base during expansion',
2816-
// .. './'
2815+
//'prepending @base during expansion',
2816+
//// .. './'
28172817
'relative @vocab reference',
28182818
// .. './'
2819-
'prepending @vocab during expansion',
2820-
// .. 'relativeiri'
2821-
'prepending @vocab during expansion',
2822-
// .. 'relativeiri'
2819+
//'prepending @vocab during expansion',
2820+
//// .. 'relativeiri'
2821+
//'prepending @vocab during expansion',
2822+
//// .. 'relativeiri'
28232823
'relative @type reference'
28242824
// .. 'relativeiri'
28252825
],
@@ -2855,14 +2855,14 @@ _:b0 <ex:p> "v" .
28552855
input,
28562856
expected,
28572857
eventCodeLog: [
2858-
'prepending @vocab during expansion',
2859-
// .. 'term'
2860-
'prepending @vocab during expansion',
2861-
// .. 'term'
2862-
'prepending @vocab during expansion',
2863-
// .. 'term'
2864-
'prepending @vocab during expansion'
2865-
// .. 'term'
2858+
//'prepending @vocab during expansion',
2859+
//// .. 'term'
2860+
//'prepending @vocab during expansion',
2861+
//// .. 'term'
2862+
//'prepending @vocab during expansion',
2863+
//// .. 'term'
2864+
//'prepending @vocab during expansion'
2865+
//// .. 'term'
28662866
],
28672867
testSafe: true
28682868
});
@@ -2893,10 +2893,10 @@ _:b0 <ex:p> "v" .
28932893
input,
28942894
expected,
28952895
eventCodeLog: [
2896-
'prepending @vocab during expansion',
2897-
// .. 'relativeIri'
2898-
'prepending @vocab during expansion'
2899-
// .. 'relativeIri'
2896+
//'prepending @vocab during expansion',
2897+
//// .. 'relativeIri'
2898+
//'prepending @vocab during expansion'
2899+
//// .. 'relativeIri'
29002900
],
29012901
testSafe: true
29022902
});
@@ -2928,10 +2928,10 @@ _:b0 <ex:p> "v" .
29282928
input,
29292929
expected,
29302930
eventCodeLog: [
2931-
'prepending @vocab during expansion',
2932-
// .. 'relativeIri'
2933-
'prepending @vocab during expansion'
2934-
// .. 'relativeIri'
2931+
//'prepending @vocab during expansion',
2932+
//// .. 'relativeIri'
2933+
//'prepending @vocab during expansion'
2934+
//// .. 'relativeIri'
29352935
],
29362936
testSafe: true
29372937
});
@@ -2974,16 +2974,16 @@ _:b0 <ex:p> "v" .
29742974
input,
29752975
expected,
29762976
eventCodeLog: [
2977-
'prepending @vocab during expansion',
2978-
// .. 'ta'
2979-
'prepending @vocab during expansion',
2980-
// .. 'ta'
2981-
'prepending @vocab during expansion',
2982-
// .. 'rel/'
2983-
'prepending @vocab during expansion',
2984-
// .. 'tb'
2985-
'prepending @vocab during expansion'
2986-
// .. 'tb'
2977+
//'prepending @vocab during expansion',
2978+
//// .. 'ta'
2979+
//'prepending @vocab during expansion',
2980+
//// .. 'ta'
2981+
//'prepending @vocab during expansion',
2982+
//// .. 'rel/'
2983+
//'prepending @vocab during expansion',
2984+
//// .. 'tb'
2985+
//'prepending @vocab during expansion'
2986+
//// .. 'tb'
29872987
],
29882988
testSafe: true
29892989
});
@@ -3009,8 +3009,8 @@ _:b0 <ex:p> "v" .
30093009
input,
30103010
expected,
30113011
eventCodeLog: [
3012-
'prepending @base during expansion',
3013-
// .. 'relativeIri'
3012+
//'prepending @base during expansion',
3013+
//// .. 'relativeIri'
30143014
'object with only @id'
30153015
],
30163016
testNotSafe: true
@@ -3038,8 +3038,8 @@ _:b0 <ex:p> "v" .
30383038
input,
30393039
expected,
30403040
eventCodeLog: [
3041-
'prepending @base during expansion',
3042-
// .. 'relativeIri'
3041+
//'prepending @base during expansion',
3042+
//// .. 'relativeIri'
30433043
'object with only @id'
30443044
],
30453045
testNotSafe: true
@@ -3071,8 +3071,8 @@ _:b0 <ex:p> "v" .
30713071
input,
30723072
expected,
30733073
eventCodeLog: [
3074-
'prepending @base during expansion'
3075-
// .. 'relativeIri'
3074+
//'prepending @base during expansion'
3075+
//// .. 'relativeIri'
30763076
],
30773077
// FIXME
30783078
testSafe: true
@@ -3105,8 +3105,8 @@ _:b0 <ex:p> "v" .
31053105
input,
31063106
expected,
31073107
eventCodeLog: [
3108-
'prepending @base during expansion'
3109-
// .. 'relativeIri'
3108+
//'prepending @base during expansion'
3109+
//// .. 'relativeIri'
31103110
],
31113111
testSafe: true
31123112
});

0 commit comments

Comments
 (0)