fix(hugo): reduce errors when using assigned variables in components

Author: bglw

javascript-modules/engines/hugo-engine/hugo-renderer/tpl/transform/bookshop_unmarshal.go

@@ -0,0 +1,39 @@
+// Copyright 2019 The Hugo Authors. All rights reserved.
+//
+// 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 transform
+
+import (
+	"encoding/json"
+
+	"github.com/pkg/errors"
+)
+
+// Unmarshal unmarshals the data given, which can be either a string, json.RawMessage
+// or a Resource. Supported formats are JSON, TOML, YAML, and CSV.
+// You can optionally provide an options map as the first argument.
+func (ns *Namespace) BookshopUnmarshal(args ...interface{}) (interface{}, error) {
+	if len(args) != 1 {
+		return nil, errors.New("Bookshop unmarshal takes 1 argument")
+	}
+
+	var data interface{}
+
+	if r, ok := args[0].(string); ok {
+		if err := json.Unmarshal([]byte(r), &data); err != nil {
+			return nil, err
+		}
+		return data, nil
+	}
+	return nil, errors.New("Needed a string")
+}

javascript-modules/engines/hugo-engine/hugo-renderer/tpl/transform/init.go

@@ -99,6 +99,13 @@ func init() {
 
 		// Bookshop: unmarshal has been removed (for now) due to tendrils
 
+		ns.AddMethodMapping(ctx.BookshopUnmarshal,
+			[]string{"bookshopunmarshal"},
+			[][2]string{
+				{`{{ "{ hello = \"Hello World\" }" | transform.BookshopUnmarshal }}`, "map[hello:Hello World]"},
+			},
+		)
+
 		return ns
 	}
 

javascript-modules/engines/hugo-engine/lib/engine.js

@@ -162,7 +162,16 @@ export class Engine {
             return `index (${obj}) ${index}`;
         })
 
-        const eval_str = `{{ jsonify (${str}) }}`;
+        const assignments = Object.entries(props_obj).filter(([key]) => key.startsWith('$')).map(([key, value]) => {
+            if (Array.isArray(value)) {
+                return `{{ ${key} := index ( \`{"a": ${JSON.stringify(value)}}\` | transform.BookshopUnmarshal ) "a" }}`
+            } else if (typeof value === 'object') {
+                return `{{ ${key} := \`${JSON.stringify(value)}\` | transform.BookshopUnmarshal }}`
+            } else {
+                return `{{ ${key} := ${JSON.stringify(value)} }}`
+            }
+        }).join('');
+        const eval_str = `${assignments}{{ jsonify (${str}) }}`;
         const output = window.renderHugo(eval_str, JSON.stringify(props_obj));
 
         try {