Allow comments and trailing commas in hypermode.json (#173)

Author: mattjohnsonpint

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Add CORS support to all endpoints [#171](https://github.com/gohypermode/runtime/pull/171)
 - Replace hyphens with underscores in environment variables [#172](https://github.com/gohypermode/runtime/pull/172)
+- Allow comments and trailing commas in `hypermode.json` [#173](https://github.com/gohypermode/runtime/pull/173)
 
 ## 2024-05-02 - Version 0.6.3
 

go.mod

@@ -21,6 +21,7 @@ require (
 	github.com/rs/xid v1.5.0
 	github.com/rs/zerolog v1.32.0
 	github.com/stretchr/testify v1.9.0
+	github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a
 	github.com/tetratelabs/wazero v1.7.1
 	github.com/wundergraph/graphql-go-tools/execution v1.0.1
 	github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.31

go.sum

@@ -182,6 +182,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a h1:SJy1Pu0eH1C29XwJucQo73FrleVK6t4kYz4NVhp34Yw=
+github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a/go.mod h1:DFSS3NAGHthKo1gTlmEcSBiZrRJXi28rLNd/1udP1c8=
 github.com/tetratelabs/wazero v1.7.1 h1:QtSfd6KLc41DIMpDYlJdoMc6k7QTN246DM2+n2Y/Dx8=
 github.com/tetratelabs/wazero v1.7.1/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y=
 github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=

manifest/management.go

@@ -11,6 +11,8 @@ import (
 	"hmruntime/logger"
 	"hmruntime/storage"
 	"hmruntime/utils"
+
+	"github.com/tailscale/hujson"
 )
 
 func MonitorAppDataFiles() {
@@ -49,6 +51,15 @@ func loadAppData(ctx context.Context, filename string) error {
 
 	_, ok := manifestFiles[filename]
 	if ok {
+
+		// We allow comments and trailing commas in the JSON files.
+		// This removes them, resulting in standard JSON.
+		bytes, err := standardizeJSON(bytes)
+		if err != nil {
+			return err
+		}
+
+		// Now parse the JSON
 		err = json.Unmarshal(bytes, manifestFiles[filename])
 		if err != nil {
 			return err
@@ -57,3 +68,12 @@ func loadAppData(ctx context.Context, filename string) error {
 
 	return nil
 }
+
+func standardizeJSON(b []byte) ([]byte, error) {
+	ast, err := hujson.Parse(b)
+	if err != nil {
+		return b, err
+	}
+	ast.Standardize()
+	return ast.Pack(), nil
+}

manifest/manifest.go

@@ -6,11 +6,9 @@ package manifest
 
 var manifestFiles = map[string]Manifest{
 	"hypermode.json": &HypermodeData,
-	"models.json":    &ModelData,
 }
 
 var HypermodeData HypermodeManifest = HypermodeManifest{}
-var ModelData ModelsManifest = ModelsManifest{}
 
 type Manifest any
 
@@ -22,10 +20,6 @@ type HypermodeManifest struct {
 	Manifest
 }
 
-type ModelsManifest struct {
-	Manifest
-}
-
 type ModelTask string
 
 const (