Output the @context key when marshalling

Changes

3 changed files (+28/-18)

• jsonld/context.go
  • @@ -17,7 +17,7 @@ type Ref string
    // Terms are case sensitive and any valid string that is not a reserved JSON-LD // keyword can be used as a term. type Context struct { - URL Ref `jsonld:"@url"` + URL Ref `jsonld:"@url,omitempty,collapsible"` Language ap.LangRef `jsonld:"@language,omitempty,collapsible"` }
• jsonld/encode.go
  • @@ -35,7 +35,7 @@ const (
    ) type payloadWithContext struct { - Context *Context `jsonld:"@context,omitempty,collapsible"` + Context *Context `jsonld:"@context,collapsible"` Obj *interface{} }
  • @@ -195,6 +195,12 @@ func JSONLdName(n string, tag jsonLdTag) string {
    return n } + // An UnsupportedTypeError is returned by Marshal when attempting + // to encode an unsupported value type. + type UnsupportedTypeError struct { + Type reflect.Type + } + // Marshal returns the JSON encoding of v. // // Marshal traverses the value v recursively.
  • @@ -326,28 +332,29 @@ func JSONLdName(n string, tag jsonLdTag) string {
    // func Marshal(v interface{}) ([]byte, error) { e := &encodeState{} - ctx := Ctx + + if Ctx != nil { + a := payloadWithContext{ + Context: Ctx, + Obj: nil, + } + //errC := e.marshal(ctx, encOpts{escapeHTML: true}) + //if errC != nil { + // return nil, errC + //} + err := e.marshal(a, encOpts{escapeHTML: true}) + if err != nil { + return nil, err + } + } + err := e.marshal(v, encOpts{escapeHTML: true}) if err != nil { return nil, err } - if ctx == nil { - return e.Bytes(), nil - } - errC := e.marshal(ctx, encOpts{escapeHTML: true}) - if errC != nil { - return nil, errC - } output := e.Bytes() - return bytes.Replace(output, []byte("}{"), []byte(", "), 1), nil - - } - - // An UnsupportedTypeError is returned by Marshal when attempting - // to encode an unsupported value type. - type UnsupportedTypeError struct { - Type reflect.Type + return bytes.Replace(output, []byte(`,"Obj":null}{`), []byte(","), 1), nil } func (e *UnsupportedTypeError) Error() string {
• jsonld/encode_test.go
  • @@ -32,6 +32,9 @@ func TestMarshal(t *testing.T) {
    if err != nil { t.Errorf("%s", err) } + if !strings.Contains(string(out), "@context") { + t.Errorf("Context name not found '%s' in %s", "@context", out) + } if !strings.Contains(string(out), url) { t.Errorf("Context url not found '%s' in %s", url, out) }