Fix validation of CMW

Fixes #23

Signed-off-by: Yogesh Deshpande <[email protected]>

Minor correction

Signed-off-by: Yogesh Deshpande <[email protected]>

Further correction

Signed-off-by: Yogesh Deshpande <[email protected]>

Author: yogeshbdeshpande

cmw.go

@@ -160,6 +160,18 @@ func (o CMW) ValidateCollection() error {
 	return o.collection.validate()
 }
 
+// Valid checks whether a CMW is a valid CMW or not?
+func (o CMW) Valid() error {
+	switch o.kind {
+	case KindMonad:
+		return o.monad.valid()
+	case KindCollection:
+		return o.ValidateCollection()
+	default:
+		return fmt.Errorf("unknown kind: %s", o.kind.String())
+	}
+}
+
 type Meta struct {
 	Key  any
 	Kind Kind

cmw_test.go

@@ -180,3 +180,19 @@ func Test_GetCollectionGet(t *testing.T) {
 	assert.EqualError(t, err, `item not found for key "uh?"`)
 	assert.Nil(t, itemNotFound)
 }
+
+func Test_Valid(t *testing.T) {
+	typ := "text/plain; charset=utf-8"
+	val := []byte{0xff}
+	ind := Indicator(Evidence)
+
+	cmw, err := NewMonad(typ, val, ind)
+	require.NoError(t, err)
+	err = cmw.Valid()
+	require.NoError(t, err)
+
+	cmw = makeCMWCollection()
+	require.NoError(t, err)
+	err = cmw.Valid()
+	require.NoError(t, err)
+}

collection.go

@@ -30,6 +30,9 @@ func (o collection) validate() error {
 	}
 
 	for k, v := range o.cmap {
+		if v.kind != KindCollection {
+			continue
+		}
 		if err := v.validate(); err != nil {
 			return fmt.Errorf("invalid collection at key %q: %w", k, err)
 		}

example_test.go

@@ -147,7 +147,10 @@ func Example_roundtrip_JSON_collection() {
 	if err != nil {
 		log.Fatalf("unmarshal JSON collection failed: %v", err)
 	}
-
+	err = o.ValidateCollection()
+	if err != nil {
+		log.Fatalf("validate JSON collection failed: %v", err)
+	}
 	b, err := o.MarshalJSON()
 	if err != nil {
 		log.Fatalf("marshal collection to JSON failed: %v", err)

monad.go

@@ -2,6 +2,7 @@ package cmw
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 
 	"github.com/fxamacker/cbor/v2"
@@ -28,7 +29,7 @@ func (o *monad) UnmarshalJSON(b []byte) error {
 
 	o.format = FormatJSONRecord
 
-	return nil
+	return o.valid()
 }
 
 func (o monad) MarshalCBOR() ([]byte, error) {
@@ -59,6 +60,20 @@ func (o *monad) UnmarshalCBOR(b []byte) error {
 		panic(fmt.Sprintf("want CBOR Tag or CBOR array, got 0x%02x", b[0]))
 	}
 
+	return o.valid()
+}
+
+func (o monad) valid() error {
+	f := o.format.String()
+	switch f {
+	case "unknown":
+	case "JSON collection":
+	case "CBOR collection":
+		return fmt.Errorf("invalid monad format: %s", f)
+	}
+	if !o.typ.IsSet() {
+		return errors.New("type not set")
+	}
 	return nil
 }
 

monad_test.go

@@ -88,7 +88,8 @@ func Test_Deserialize_monad_ok(t *testing.T) {
 
 			err := actual.Deserialize(tt.tv)
 			assert.NoError(t, err)
-
+			err = actual.monad.valid()
+			assert.NoError(t, err)
 			assert.Equal(t, KindMonad, actual.GetKind())
 			assert.Equal(t, tt.exp.format, actual.GetFormat())
 			assert.Equal(t, tt.exp, actual.monad)