Skip to content

Commit

Permalink
encoding/toml: add first implementation of an encoder
Browse files Browse the repository at this point in the history
For now, all we test is that it can re-encode all the decoder test cases
because it does not yet aim to keep any comments, style, order,
or structure from the original CUE value.
The go-toml library we use is not able to encode its AST nodes to TOML,
so for now we encode as Go "any" values which drop that information.

This will be resolved in the near future via an encoder that produces
TOML syntax directly without going through an "any" phase first.
For the time being, this basic encoder works,
even if it produces unnecessarily verbose output such as

    [foo]
    [foo.bar]
    [foo.bar.'baz.zzz zzz']
    one = '1'

rather than the shorter

    [foo.bar.'baz.zzz zzz']
    one = "1"

Updates #68.

Signed-off-by: Daniel Martí <[email protected]>
Change-Id: I5012bba77fb77b8bf1dd1d73615d34c3438cd147
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1198539
Reviewed-by: Roger Peppe <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>
  • Loading branch information
mvdan committed Jul 30, 2024
1 parent 34739e9 commit 54f2cce
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 0 deletions.
17 changes: 17 additions & 0 deletions encoding/toml/decode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,23 @@ line two.\
qt.Assert(t, qt.IsNil(err))
t.Logf("json.Marshal via CUE:\t%s\n", jsonCUE)
qt.Assert(t, qt.JSONEquals(jsonCUE, unmarshalTOML))

// Ensure that the decoded CUE can be re-encoded as TOML,
// and the resulting TOML is still JSON-equivalent.
t.Run("reencode", func(t *testing.T) {
sb := new(strings.Builder)
enc := toml.NewEncoder(sb)

err := enc.Encode(val)
qt.Assert(t, qt.IsNil(err))
cueTOML := sb.String()
t.Logf("reencoded TOML:\n%s", cueTOML)

var unmarshalCueTOML any
err = gotoml.Unmarshal([]byte(cueTOML), &unmarshalCueTOML)
qt.Assert(t, qt.IsNil(err))
qt.Assert(t, qt.JSONEquals(jsonCUE, unmarshalCueTOML))
})
})
}
}
47 changes: 47 additions & 0 deletions encoding/toml/encode.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// Copyright 2024 The CUE Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package toml

import (
"io"

"github.com/pelletier/go-toml/v2"

"cuelang.org/go/cue"
)

// TODO(mvdan): encode options

// TODO(mvdan): the encoder below is based on map[string]any since go-toml/v2/unstable
// does not support printing or encoding Nodes; this means no support for comments,
// positions such as empty lines, or the relative order of fields.

// NewEncoder creates an encoder to stream encoded TOML bytes.
func NewEncoder(w io.Writer) *Encoder {
return &Encoder{encoder: toml.NewEncoder(w)}
}

// Encoder implements the encoding state.
type Encoder struct {
encoder *toml.Encoder
}

func (e *Encoder) Encode(val cue.Value) error {
var v any
if err := val.Decode(&v); err != nil {
return err
}
return e.encoder.Encode(v)
}

0 comments on commit 54f2cce

Please sign in to comment.