Skip to content

Commit f1c8f0c

Browse files
kazarenakazarena
authored
Merge pull request #93 from michaeladler/feat/export-fields
fix: restore external access to Context fields
2 parents cc92bba + 61cacf0 commit f1c8f0c

File tree

3 files changed

+243
-243
lines changed

3 files changed

+243
-243
lines changed

‎ld/api_compact.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ func (api *JsonLdApi) Compact(activeCtx *Context, activeProperty string, element
4949
}
5050

5151
// use any scoped context on activeProperty
52-
if td := activeCtx.GetTermDefinition(activeProperty); td != nil && td.hasContext {
53-
newCtx, err := activeCtx.parse(td.context, make([]string, 0), false, true, false, true)
52+
if td := activeCtx.GetTermDefinition(activeProperty); td != nil && td.HasContext {
53+
newCtx, err := activeCtx.parse(td.Context, make([]string, 0), false, true, false, true)
5454
if err != nil {
5555
return nil, err
5656
}
@@ -68,7 +68,7 @@ func (api *JsonLdApi) Compact(activeCtx *Context, activeProperty string, element
6868

6969
propType := ""
7070
if td := activeCtx.GetTermDefinition(activeProperty); td != nil {
71-
propType = td.typ
71+
propType = td.Type
7272
}
7373
if _, isMap := compactedValue.(map[string]interface{}); !isMap || propType == "@json" {
7474
return compactedValue, nil
@@ -97,8 +97,8 @@ func (api *JsonLdApi) Compact(activeCtx *Context, activeProperty string, element
9797
}
9898

9999
// apply property-scoped context after reverting term-scoped context
100-
if td := inputCtx.GetTermDefinition(activeProperty); td != nil && td.context != nil {
101-
newCtx, err := activeCtx.parse(td.context, nil, false, true, false, true)
100+
if td := inputCtx.GetTermDefinition(activeProperty); td != nil && td.Context != nil {
101+
newCtx, err := activeCtx.parse(td.Context, nil, false, true, false, true)
102102
if err != nil {
103103
return nil, err
104104
}
@@ -124,8 +124,8 @@ func (api *JsonLdApi) Compact(activeCtx *Context, activeProperty string, element
124124
// process in lexicographical order, see https://github.com/json-ld/json-ld.org/issues/616
125125
sort.Strings(types)
126126
for _, tt := range types {
127-
if td := inputCtx.GetTermDefinition(tt); td != nil && td.hasContext {
128-
newCtx, err := activeCtx.parse(td.context, nil, false, false, false, false)
127+
if td := inputCtx.GetTermDefinition(tt); td != nil && td.HasContext {
128+
newCtx, err := activeCtx.parse(td.Context, nil, false, false, false, false)
129129
if err != nil {
130130
return nil, err
131131
}
@@ -274,8 +274,8 @@ func (api *JsonLdApi) Compact(activeCtx *Context, activeProperty string, element
274274
}
275275

276276
nestResult := result
277-
if td := activeCtx.GetTermDefinition(itemActiveProperty); td != nil && td.nest != "" {
278-
nestProperty := td.nest
277+
if td := activeCtx.GetTermDefinition(itemActiveProperty); td != nil && td.Nest != "" {
278+
nestProperty := td.Nest
279279
if err := api.checkNestProperty(activeCtx, nestProperty); err != nil {
280280
return nil, err
281281
}
@@ -304,8 +304,8 @@ func (api *JsonLdApi) Compact(activeCtx *Context, activeProperty string, element
304304
// if itemActiveProperty is a @nest property, add values to nestResult, otherwise result
305305
nestResult := result
306306

307-
if td := activeCtx.GetTermDefinition(itemActiveProperty); td != nil && td.nest != "" {
308-
nestProperty := td.nest
307+
if td := activeCtx.GetTermDefinition(itemActiveProperty); td != nil && td.Nest != "" {
308+
nestProperty := td.Nest
309309
if err := api.checkNestProperty(activeCtx, nestProperty); err != nil {
310310
return nil, err
311311
}
@@ -475,8 +475,8 @@ func (api *JsonLdApi) Compact(activeCtx *Context, activeProperty string, element
475475
} else if isIndexContainer {
476476

477477
indexKey := "@index"
478-
if td := activeCtx.GetTermDefinition(itemActiveProperty); td != nil && td.index != "" {
479-
indexKey = td.index
478+
if td := activeCtx.GetTermDefinition(itemActiveProperty); td != nil && td.Index != "" {
479+
indexKey = td.Index
480480
}
481481

482482
containerKey, err := activeCtx.CompactIri(indexKey, nil, true, false)

‎ld/api_expand.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (api *JsonLdApi) Expand(activeCtx *Context, activeProperty string, element
8888
// Get any property-scoped context for activeProperty
8989
var propertyScopedCtx interface{}
9090
if td := activeCtx.GetTermDefinition(activeProperty); td != nil {
91-
propertyScopedCtx = td.context
91+
propertyScopedCtx = td.Context
9292
}
9393

9494
// second, determine if any type-scoped context should be reverted; it
@@ -182,8 +182,8 @@ func (api *JsonLdApi) Expand(activeCtx *Context, activeProperty string, element
182182
}
183183

184184
for _, tt := range types {
185-
if td := typeScopedContext.GetTermDefinition(tt); td != nil && td.hasContext {
186-
newCtx, err := activeCtx.parse(td.context, nil, false, false, false, false)
185+
if td := typeScopedContext.GetTermDefinition(tt); td != nil && td.HasContext {
186+
newCtx, err := activeCtx.parse(td.Context, nil, false, false, false, false)
187187
if err != nil {
188188
return nil, err
189189
}
@@ -669,10 +669,10 @@ func (api *JsonLdApi) expandObject(activeCtx *Context, activeProperty string, ex
669669
// use potential scoped context for key
670670
termCtx := activeCtx
671671
td := activeCtx.GetTermDefinition(key)
672-
if td != nil && td.hasContext {
672+
if td != nil && td.HasContext {
673673
// TODO: fix calling a private method
674674
//termCtx, err = activeCtx.Parse(ctx)
675-
termCtx, err = activeCtx.parse(td.context, make([]string, 0), false, true, false, true)
675+
termCtx, err = activeCtx.parse(td.Context, make([]string, 0), false, true, false, true)
676676
if err != nil {
677677
return err
678678
}
@@ -682,7 +682,7 @@ func (api *JsonLdApi) expandObject(activeCtx *Context, activeProperty string, ex
682682
if termCtx.HasContainerMapping(key, "@language") && isMap {
683683
var expandedValueList []interface{}
684684

685-
dir, hasDir := td.direction, td.hasDirection
685+
dir, hasDir := td.Direction, td.HasDirection
686686

687687
for _, language := range GetOrderedKeys(valueMap) {
688688
expandedLanguage, err := termCtx.ExpandIri(language, false, true, nil, nil)
@@ -710,7 +710,7 @@ func (api *JsonLdApi) expandObject(activeCtx *Context, activeProperty string, ex
710710
if dir != nil {
711711
v["@direction"] = dir
712712
}
713-
} else if defaultDir := termCtx.values.direction; defaultDir != "" {
713+
} else if defaultDir := termCtx.Values.Direction; defaultDir != "" {
714714
v["@direction"] = defaultDir
715715
}
716716
expandedValueList = append(expandedValueList, v)
@@ -720,8 +720,8 @@ func (api *JsonLdApi) expandObject(activeCtx *Context, activeProperty string, ex
720720
} else if termCtx.HasContainerMapping(key, "@index") && isMap { // 7.6)
721721
asGraph := termCtx.HasContainerMapping(key, "@graph")
722722
indexKey := "@index"
723-
if tdKey := termCtx.GetTermDefinition(key); tdKey != nil && tdKey.index != "" {
724-
indexKey = tdKey.index
723+
if tdKey := termCtx.GetTermDefinition(key); tdKey != nil && tdKey.Index != "" {
724+
indexKey = tdKey.Index
725725
}
726726
var propertyIndex string
727727
if indexKey != "@index" {
@@ -761,7 +761,7 @@ func (api *JsonLdApi) expandObject(activeCtx *Context, activeProperty string, ex
761761
if err != nil {
762762
return err
763763
}
764-
} else if tdKey != nil && tdKey.typ == "@json" {
764+
} else if tdKey != nil && tdKey.Type == "@json" {
765765
expandedValue = map[string]interface{}{
766766
"@type": "@json",
767767
"@value": value,
@@ -913,8 +913,8 @@ func (api *JsonLdApi) expandIndexMap(activeCtx *Context, activeProperty string,
913913

914914
indexCtx := activeCtx
915915
// if indexKey is @type, there may be a context defined for it
916-
if td := activeCtx.GetTermDefinition(key); indexKey == "@type" && td != nil && td.hasContext {
917-
newCtx, err := activeCtx.Parse(td.context)
916+
if td := activeCtx.GetTermDefinition(key); indexKey == "@type" && td != nil && td.HasContext {
917+
newCtx, err := activeCtx.Parse(td.Context)
918918
if err != nil {
919919
return nil, err
920920
}

0 commit comments

Comments
 (0)