@bookshop/hugo-engine 2.5.0 → 3.0.0-beta.0

package/.nyc_output/processinfo/{3912b392-2912-48cc-9cca-bf322bf0d4e6.json → 0a7e2ebb-5cd8-42e1-8a75-1a844a599cb3.json}

@@ -1 +1 @@
-{"parent":"90c0d905-7a53-48a0-9c22-a39b1b831857","pid":36200,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1645506759846,"ppid":36197,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/3912b392-2912-48cc-9cca-bf322bf0d4e6.json","externalId":"","uuid":"3912b392-2912-48cc-9cca-bf322bf0d4e6","files":[]}
+{"parent":"db445aca-7b0a-4fbd-b378-8f81807219e8","pid":41226,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1648442969710,"ppid":41179,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/0a7e2ebb-5cd8-42e1-8a75-1a844a599cb3.json","externalId":"","uuid":"0a7e2ebb-5cd8-42e1-8a75-1a844a599cb3","files":[]}

package/.nyc_output/processinfo/{73434d66-94ab-46e8-a516-e2fb6d961625.json → 1792cc95-23bc-4475-8a0a-5349fa6ea252.json}

@@ -1 +1 @@
-{"parent":"90c0d905-7a53-48a0-9c22-a39b1b831857","pid":36198,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1645506759839,"ppid":36197,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/73434d66-94ab-46e8-a516-e2fb6d961625.json","externalId":"","uuid":"73434d66-94ab-46e8-a516-e2fb6d961625","files":[]}
+{"parent":"db445aca-7b0a-4fbd-b378-8f81807219e8","pid":41228,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1648442969727,"ppid":41179,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/1792cc95-23bc-4475-8a0a-5349fa6ea252.json","externalId":"","uuid":"1792cc95-23bc-4475-8a0a-5349fa6ea252","files":[]}

package/.nyc_output/processinfo/{81517a6e-3da5-4c5a-85fb-c3782bc44a31.json → 23b4d867-eb11-4139-958c-db9fba067b6b.json}

@@ -1 +1 @@
-{"parent":"90c0d905-7a53-48a0-9c22-a39b1b831857","pid":36201,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1645506759852,"ppid":36197,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/81517a6e-3da5-4c5a-85fb-c3782bc44a31.json","externalId":"","uuid":"81517a6e-3da5-4c5a-85fb-c3782bc44a31","files":[]}
+{"parent":"db445aca-7b0a-4fbd-b378-8f81807219e8","pid":41225,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1648442969705,"ppid":41179,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/23b4d867-eb11-4139-958c-db9fba067b6b.json","externalId":"","uuid":"23b4d867-eb11-4139-958c-db9fba067b6b","files":[]}

package/.nyc_output/processinfo/{c8f28bb3-0364-45d6-858b-7fe760a39c33.json → 480921e8-42bb-45b3-a743-dc9866e1335b.json}

@@ -1 +1 @@
-{"parent":"90c0d905-7a53-48a0-9c22-a39b1b831857","pid":36199,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1645506759846,"ppid":36197,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/c8f28bb3-0364-45d6-858b-7fe760a39c33.json","externalId":"","uuid":"c8f28bb3-0364-45d6-858b-7fe760a39c33","files":[]}
+{"parent":"db445aca-7b0a-4fbd-b378-8f81807219e8","pid":41227,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1648442969715,"ppid":41179,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/480921e8-42bb-45b3-a743-dc9866e1335b.json","externalId":"","uuid":"480921e8-42bb-45b3-a743-dc9866e1335b","files":[]}

package/.nyc_output/processinfo/db445aca-7b0a-4fbd-b378-8f81807219e8.json

@@ -0,0 +1 @@
+{"parent":null,"pid":41179,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/cli.js","-v"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1648442969247,"ppid":41160,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/db445aca-7b0a-4fbd-b378-8f81807219e8.json","externalId":"","uuid":"db445aca-7b0a-4fbd-b378-8f81807219e8","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"3912b392-2912-48cc-9cca-bf322bf0d4e6":{"parent":"90c0d905-7a53-48a0-9c22-a39b1b831857","children":[]},"73434d66-94ab-46e8-a516-e2fb6d961625":{"parent":"90c0d905-7a53-48a0-9c22-a39b1b831857","children":[]},"81517a6e-3da5-4c5a-85fb-c3782bc44a31":{"parent":"90c0d905-7a53-48a0-9c22-a39b1b831857","children":[]},"90c0d905-7a53-48a0-9c22-a39b1b831857":{"parent":null,"children":["3912b392-2912-48cc-9cca-bf322bf0d4e6","73434d66-94ab-46e8-a516-e2fb6d961625","81517a6e-3da5-4c5a-85fb-c3782bc44a31","c8f28bb3-0364-45d6-858b-7fe760a39c33"]},"c8f28bb3-0364-45d6-858b-7fe760a39c33":{"parent":"90c0d905-7a53-48a0-9c22-a39b1b831857","children":[]}},"files":{},"externalIds":{}}
+{"processes":{"0a7e2ebb-5cd8-42e1-8a75-1a844a599cb3":{"parent":"db445aca-7b0a-4fbd-b378-8f81807219e8","children":[]},"1792cc95-23bc-4475-8a0a-5349fa6ea252":{"parent":"db445aca-7b0a-4fbd-b378-8f81807219e8","children":[]},"23b4d867-eb11-4139-958c-db9fba067b6b":{"parent":"db445aca-7b0a-4fbd-b378-8f81807219e8","children":[]},"480921e8-42bb-45b3-a743-dc9866e1335b":{"parent":"db445aca-7b0a-4fbd-b378-8f81807219e8","children":[]},"db445aca-7b0a-4fbd-b378-8f81807219e8":{"parent":null,"children":["0a7e2ebb-5cd8-42e1-8a75-1a844a599cb3","1792cc95-23bc-4475-8a0a-5349fa6ea252","23b4d867-eb11-4139-958c-db9fba067b6b","480921e8-42bb-45b3-a743-dc9866e1335b"]}},"files":{},"externalIds":{}}

package/hugo-renderer/main.go

@@ -11,6 +11,8 @@ func main() {
 	c := make(chan struct{}, 0)
 	js.Global().Set("renderHugo", js.FuncOf(renderHugo))
 	js.Global().Set("loadHugoBookshopPartials", js.FuncOf(loadHugoBookshopPartials))
+	js.Global().Set("loadHugoBookshopData", js.FuncOf(loadHugoBookshopData))
+	js.Global().Set("loadHugoBookshopMeta", js.FuncOf(loadHugoBookshopMeta))
 	<-c
 }
 
@@ -26,3 +28,15 @@ func loadHugoBookshopPartials(this js.Value, args []js.Value) interface{} {
 
 	return library.LoadHugoBookshopPartials(bookshopPartials)
 }
+
+func loadHugoBookshopData(this js.Value, args []js.Value) interface{} {
+	bookshopData := args[0].String()
+
+	return library.LoadHugoBookshopData(bookshopData)
+}
+
+func loadHugoBookshopMeta(this js.Value, args []js.Value) interface{} {
+	bookshopMeta := args[0].String()
+
+	return library.LoadHugoBookshopMeta(bookshopMeta)
+}

package/hugo-renderer/tpl/bookshop_engine/bookshop_func_importer.go

@@ -24,9 +24,10 @@ import (
 	_ "hugo-renderer/tpl/reflect"
 
 	// _ "hugo-renderer/tpl/resources" // ——————————— ⏭️ NTBI: Bookshop components won't support resources
-	_ "hugo-renderer/tpl/safe" // ——————————————————— 🥴 TODO: `SanitizeURL` NYI — helpers require is too large
-	// _ "hugo-renderer/tpl/site" // ———————————————— ❗ TODO: Should this be stubbed out ??
+	_ "hugo-renderer/tpl/safe"    // ———————————————— 🥴 TODO: `SanitizeURL` NYI — helpers require is too large
+	_ "hugo-renderer/tpl/site"    // ———————————————— 🥴 TODO: Partially stubbing out site variables. WIP
 	_ "hugo-renderer/tpl/strings" // ———————————————— 🥴 TODO: Only the "Go" title formatting is supported
+
 	// _ "hugo-renderer/tpl/templates" // ——————————— ❗ TODO: Maybe a rabbit hole
 	// _ "hugo-renderer/tpl/time" // ———————————————— ❗ TODO: This relies on lang stuff that is thus far excluded
 	_ "hugo-renderer/tpl/transform" // —————————————— 🥴 TODO: Highlight, unmarshal, commonmark compat

package/hugo-renderer/tpl/bookshop_library/bookshop_components.go

@@ -86,14 +86,24 @@ func UnwrapBookshopComponent(context interface{}) (string, interface{}) {
 			key := fmt.Sprintf("components/%s/%s.hugo.html", component.(string), component.(string))
 			return key, context
 		}
+		return "err_no_bookshop_name_key", context
 	}
 	if componentData, ok := context.([]interface{}); ok {
 		if component, ok := componentData[0].(string); ok {
 			key := fmt.Sprintf("components/%s/%s.hugo.html", component, component)
 			return key, componentData[1]
 		}
+		return "err_slice_zero_not_string", context
 	}
-	return "err_no_bookshop_name", context
+	if componentData, ok := context.([]string); ok {
+		key := fmt.Sprintf("components/%s/%s.hugo.html", componentData[0], componentData[0])
+		return key, componentData[1]
+	}
+	if componentName, ok := context.(string); ok {
+		key := fmt.Sprintf("components/%s/%s.hugo.html", componentName, componentName)
+		return key, nil
+	}
+	return "err_not_map_slice_or_string", context
 }
 
 func UnwrapBookshopPartial(context interface{}) (string, interface{}) {
@@ -102,6 +112,11 @@ func UnwrapBookshopPartial(context interface{}) (string, interface{}) {
 			key := fmt.Sprintf("shared/hugo/%s.hugo.html", partial)
 			return key, partialData[1]
 		}
+		return "err_slice_zero_not_string", context
+	}
+	if partialName, ok := context.(string); ok {
+		key := fmt.Sprintf("shared/hugo/%s.hugo.html", partialName)
+		return key, nil
 	}
-	return "err_no_bookshop_name", context
+	return "err_not_slice_or_string", context
 }

package/hugo-renderer/tpl/bookshop_library/bookshop_data.go

@@ -0,0 +1,53 @@
+package bookshop_library
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+)
+
+type bookshopData struct {
+	Data map[string]interface{} `json:"data"`
+}
+
+var bookshopDataStorage bookshopData
+
+// loadHugoBookshopData takes any data that the @bookshop/hugo-engine
+// was given from info.json and stashes it all away
+// on this side of the wasm boundary, for the site
+// function to use.
+func LoadHugoBookshopData(data string) interface{} {
+	err := json.Unmarshal([]byte(data), &bookshopDataStorage)
+	if err != nil {
+		buf := bytes.NewBufferString(fmt.Sprintf("bad json unmarshal: %s", err.Error()))
+		return buf.String()
+	}
+
+	buf := bytes.NewBufferString("loaded Bookshop site data")
+	return buf.String()
+}
+
+func RetrieveHugoBookshopData() *bookshopData {
+	return &bookshopDataStorage
+}
+
+var bookshopMetaStorage map[string]interface{}
+
+// loadHugoBookshopMeta takes any data that hugo/bookshop
+// injected into the template and stashes it all away
+// on this side of the wasm boundary, for the site
+// function to use.
+func LoadHugoBookshopMeta(data string) interface{} {
+	err := json.Unmarshal([]byte(data), &bookshopMetaStorage)
+	if err != nil {
+		buf := bytes.NewBufferString(fmt.Sprintf("bad json unmarshal: %s", err.Error()))
+		return buf.String()
+	}
+
+	buf := bytes.NewBufferString("loaded Bookshop site data")
+	return buf.String()
+}
+
+func RetrieveHugoBookshopMeta() map[string]interface{} {
+	return bookshopMetaStorage
+}

package/hugo-renderer/tpl/site/bookshop_site.go

@@ -0,0 +1,59 @@
+// Copyright 2017 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 site stubs out some of the Hugo site functions for use in Bookshop live editing.
+package site
+
+import (
+	"hugo-renderer/deps"
+	library "hugo-renderer/tpl/bookshop_library"
+)
+
+func New(deps *deps.Deps) *Namespace {
+	return &Namespace{
+		deps: deps,
+	}
+}
+
+type Namespace struct {
+	deps *deps.Deps
+}
+
+// Data returns any data that was present in the _cloudcannon/info.json
+// This will require `data_config: true` in the site cloudcannon.config.yml
+func (ns *Namespace) Data() (map[string]interface{}, error) {
+	data := library.RetrieveHugoBookshopData()
+
+	return data.Data, nil
+}
+
+// site.Title should have been stashed inside a Bookshop meta comment
+func (ns *Namespace) Title() (interface{}, error) {
+	meta := library.RetrieveHugoBookshopMeta()
+
+	return meta["title"], nil
+}
+
+// site.Copyright should have been stashed inside a Bookshop meta comment
+func (ns *Namespace) Copyright() (interface{}, error) {
+	meta := library.RetrieveHugoBookshopMeta()
+
+	return meta["copyright"], nil
+}
+
+// site.BaseURL should have been stashed inside a Bookshop meta comment
+func (ns *Namespace) BaseURL() (interface{}, error) {
+	meta := library.RetrieveHugoBookshopMeta()
+
+	return meta["baseurl"], nil
+}

package/hugo-renderer/tpl/site/init.go

@@ -0,0 +1,41 @@
+// Copyright 2017 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 site
+
+import (
+	"hugo-renderer/deps"
+	"hugo-renderer/tpl/internal"
+)
+
+const name = "site"
+
+func init() {
+	f := func(d *deps.Deps) *internal.TemplateFuncsNamespace {
+		ctx := New(d)
+
+		ns := &internal.TemplateFuncsNamespace{
+			Name:    name,
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
+		}
+
+		ns.AddMethodMapping(ctx.Data,
+			[]string{},
+			[][2]string{},
+		)
+
+		return ns
+	}
+
+	internal.AddTemplateFuncsNamespace(f)
+}

package/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")
+}

package/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
 	}
 

package/lib/engine.js

@@ -31,11 +31,12 @@ export class Engine {
     }
 
     async initializeHugo() {
+        const useLocalHugo = window.CloudCannon?.isMocked || /localhost|127\.0\.0\.1/i.test(window.location.host);
         // When this script is run locally, the hugo wasm is loaded as binary rather than output as a file.
         if (hugoWasm?.constructor === Uint8Array) {
             await this.initializeInlineHugo();
         } else {
-            if (window.CloudCannon?.isMocked) {
+            if (useLocalHugo) {
                 await this.initializeLocalHugo();
             } else {
                 await this.initializeRemoteHugo();
@@ -73,7 +74,7 @@ export class Engine {
 
     async initializeLocalHugo() {
         const go = new Go();
-        const wasmOrigin = this.origin.replace(/\/[^\.\/]+\.js$/, hugoWasm.replace(/^\./, ''));
+        const wasmOrigin = this.origin.replace(/\/[^\.\/]+\.js/, hugoWasm.replace(/^\./, ''));
         const response = await fetch(wasmOrigin);
         const buffer = await response.arrayBuffer();
         const result = await WebAssembly.instantiate(buffer, go.importObject);
@@ -119,8 +120,25 @@ export class Engine {
         };
     }
 
-    async render(target, name, props, globals) {
-        while (!window.renderHugo) await sleep(10);
+    async storeMeta(meta = {}) {
+        while (!window.loadHugoBookshopMeta) {
+            await sleep(100);
+        };
+        window.loadHugoBookshopMeta(JSON.stringify(meta));
+    }
+
+    async storeInfo(info = {}) {
+        while (!window.loadHugoBookshopData) {
+            await sleep(100);
+        };
+        window.loadHugoBookshopData(JSON.stringify(info));
+    }
+
+    async render(target, name, props, globals, logger) {
+        while (!window.renderHugo) {
+            logger?.log?.(`Waiting for the Hugo WASM to be available...`);
+            await sleep(100);
+        };
 
         let source = this.getComponent(name);
         // TODO: Remove the below check and update the live comments to denote shared
@@ -129,8 +147,10 @@ export class Engine {
             console.warn(`[hugo-engine] No component found for ${name}`);
             return "";
         }
+        logger?.log?.(`Going to render ${name}`);
         // TODO: this template already exists on the other side of the wasm bounary
         source = translateTextTemplate(source, {});
+        logger?.log?.(`Rewritten the template for ${name}`);
         if (!globals || typeof globals !== "object") globals = {};
         props = { ...globals, ...props };
 
@@ -138,8 +158,10 @@ export class Engine {
         if (props["."]) props = props["."];
         const output = window.renderHugo(source, JSON.stringify(props));
         if (/BKSHERR/.test(output)) {
+            logger?.log?.(`Failed to render ${output}`);
             console.error(output);
         } else {
+            logger?.log?.(`Rendered ${name}`);
             target.innerHTML = output;
         }
     }
@@ -162,13 +184,22 @@ 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 {
             return JSON.parse(output);
         } catch (e) {
-            console.error(`Error evaluating \`${str}\` in the Hugo engine`, output);
+            console.warn(`Error evaluating \`${str}\` in the Hugo engine`, output);
             return null;
         }
     }

package/lib/hugoIdentifierParser.js

@@ -1,7 +1,7 @@
 const TOKENS = {
   DELIM: /"|'|`/,
   ESCAPE: /\\/,
-  SPACE: /\s/,
+  SPACE: /\s|\r|\n/,
   INSCOPE: /\(/,
   OUTSCOPE: /\)/,
   SCOPE: /\./,

package/lib/hugoIdentifierParser.test.js

@@ -88,4 +88,23 @@ test(`Converts a dot index into a JS object property`, async t => {
     ident = `(index . 1234)`;
     output = (new IdentifierParser(ident)).build();
     t.deepEqual(output, `1234`);
+});
+
+test(`Multiline dicts and slices`, async t => {
+    const ident = `(dict 
+"contents" 
+(slice 1 "2" 
+    (dict 
+        "a" .Params.b)
+) "len" (
+    len
+    .some_array
+))`;
+    const output = (new IdentifierParser(ident)).build();
+    t.deepEqual(output, {
+        "contents": ["1", `"2"`, {
+            "a": "Params.b"
+        }],
+        "len": `(\n    len\n    .some_array\n)`
+    });
 });

package/lib/translateTextTemplate.js

@@ -1,17 +1,26 @@
 import { Tokenizer } from 'liquidjs';
 
+// Homebrewed pretty-regex writer
 const tokens = {
-    END: /{{\s*end\s*}}/,
-    BEGIN: /{{\s*(if)/,
-    BEGIN_SCOPED: /{{\s*(range|with|define|block|template)/,
-    LOOP: /{{\s*range\s+(.+?)\s*}}/,
-    INDEX_LOOP: /{{\s*range\s+(\$.+), \$.+ := (.+?)\s*}}/,
-    ASSIGN: /{{\s*(\$\S+)\s+:=\s+(.+?)\s*}}/,
-    WITH: /{{\s*with\s+(.+?)\s*}}/,
-    BOOKSHOP: /{{\s*partial\s+"bookshop"\s+\(\s*slice\s+"(.+?)" (.+?)\s*\)\s*}}/,
-    BOOKSHOP_SCOPED: /{{\s*partial\s+"bookshop"\s+\(?\s*\.\s*\)?\s*}}/,
+    END: `{{ end }}`,
+    BEGIN: `{{ (if)`,
+    BEGIN_SCOPED: `{{ (range|with|define|block|template)`,
+    LOOP: `{{ range  () }}`,
+    INDEX_LOOP: `{{ range  (\\$.+), \\$.+ := () }}`,
+    ASSIGN: `{{ (\\$\\S+)  :=  () }}`,
+    REASSIGN: `{{ (\\$\\S+)  =  () }}`,
+    WITH: `{{ with  () }}`,
+    BOOKSHOP: `{{ partial  "bookshop"  \\( slice "()" () \\) }}`,
+    BOOKSHOP_SCOPED: `{{ partial  "bookshop"  \\(? \\. \\)? }}`,
 }
 
+const TOKENS = {};
+Object.entries(tokens).forEach(([name, r]) => {
+    TOKENS[name] = new RegExp(r
+        .replace(/\(\)/g, '([\\S\\s]+?)')        // Empty capturing group defaults to lazy multiline capture
+        .replace(/  /g, '[\\n\\r\\s]+')     // Two spaces actually means one or more blanks
+        .replace(/ /g, '[\\n\\r\\s]*'));    // One space means zero or more blanks
+});
 /**
  * Parse a go text/template using the liquidjs parser
  * that we already have in the bundle.
@@ -25,44 +34,56 @@ const rewriteTag = function (token, src, endTags, liveMarkup) {
 
     // Skip non-value tags
     if (token.kind !== 8) return outputToken;
-    if (tokens.END.test(raw)) {
+    if (TOKENS.END.test(raw)) {
         endTags.push(outputToken);
         return outputToken;
     }
 
-    if (tokens.BEGIN.test(raw)) {
+    if (TOKENS.BEGIN.test(raw)) {
         endTags.pop();
     }
 
-    if (tokens.BEGIN_SCOPED.test(raw)) {
+    if (TOKENS.BEGIN_SCOPED.test(raw)) {
         outputToken.text = `${outputToken.text}{{ \`<!--bookshop-live stack-->\` | safeHTML }}`;
 
         let matchingEnd = endTags.pop();
         matchingEnd.text = `{{ \`<!--bookshop-live unstack-->\` | safeHTML }}${matchingEnd.text}`;
     }
 
-    if (liveMarkup && tokens.INDEX_LOOP.test(raw)) {
-        let [, index_variable, iterator] = raw.match(tokens.INDEX_LOOP);
+    if (liveMarkup && TOKENS.INDEX_LOOP.test(raw)) {
+        let [, index_variable, iterator] = raw.match(TOKENS.INDEX_LOOP);
+        const r = required_wrapper_hugo_func(iterator);
         outputToken.text = [`${outputToken.text}`,
-        `{{ (printf \`<!--bookshop-live context(.: (index (${iterator}) %d))-->\` ${index_variable}) | safeHTML }}`
+        `{{${r[0]} (printf \`<!--bookshop-live context(.: (index (${tidy(iterator)}) %v))-->\` (jsonify ${index_variable}))${r[1]} | safeHTML }}`
         ].join('')
-    } else if (liveMarkup && tokens.LOOP.test(raw)) {
-        let [, iterator] = raw.match(tokens.LOOP);
-        outputToken.text = [`{{ $bookshop__live__iterator := 0 }}`,
+    } else if (liveMarkup && TOKENS.LOOP.test(raw)) {
+        let [, iterator] = raw.match(TOKENS.LOOP);
+        const r = required_wrapper_hugo_func(iterator);
+        outputToken.text = [`{{ $bookshop__live__iterator__keys := (slice) }}`,
+            `{{ range $i, $e := (${tidy(iterator)}) }}{{ $bookshop__live__iterator__keys = $bookshop__live__iterator__keys | append $i }}{{ end }}`,
+            `{{ $bookshop__live__iterator := 0 }}`,
             `${outputToken.text}`,
-            `{{ (printf \`<!--bookshop-live context(.: (index (${iterator}) %d))-->\` $bookshop__live__iterator) | safeHTML }}`,
+            `{{ $bookshop__live__iterator__key := (index ($bookshop__live__iterator__keys) $bookshop__live__iterator) }}`,
+            `{{${r[0]} (printf \`<!--bookshop-live context(.: (index (${tidy(iterator)}) %v))-->\` (jsonify $bookshop__live__iterator__key))${r[1]} | safeHTML }}`,
             `{{ $bookshop__live__iterator = (add $bookshop__live__iterator 1) }}`
         ].join('')
-    } else if (liveMarkup && tokens.ASSIGN.test(raw)) {
-        let [, identifier, value] = raw.match(tokens.ASSIGN);
-        outputToken.text = `${outputToken.text}{{ \`<!--bookshop-live context(${identifier}: (${value}))-->\` | safeHTML }}`
-    } else if (liveMarkup && tokens.WITH.test(raw)) {
-        let [, value] = raw.match(tokens.WITH);
-        outputToken.text = `${outputToken.text}{{ \`<!--bookshop-live context(.: (${value}))-->\` | safeHTML }}`
-    } else if (liveMarkup && tokens.BOOKSHOP.test(raw)) {
-        let [, name, params] = raw.match(tokens.BOOKSHOP);
-        outputToken.text = `{{ \`<!--bookshop-live name(${name}) params(.: (${params}))-->\` | safeHTML }}${outputToken.text}{{ \`<!--bookshop-live end-->\` | safeHTML }}`
-    } else if (liveMarkup && tokens.BOOKSHOP_SCOPED.test(raw)) {
+    } else if (liveMarkup && TOKENS.ASSIGN.test(raw)) {
+        let [, identifier, value] = raw.match(TOKENS.ASSIGN);
+        const r = required_wrapper_hugo_func(value);
+        outputToken.text = `${outputToken.text}{{${r[0]} \`<!--bookshop-live context(${identifier}: (${tidy(value)}))-->\`${r[1]} | safeHTML }}`
+    } else if (liveMarkup && TOKENS.REASSIGN.test(raw)) {
+        let [, identifier, value] = raw.match(TOKENS.REASSIGN);
+        const r = required_wrapper_hugo_func(value);
+        outputToken.text = `${outputToken.text}{{${r[0]} \`<!--bookshop-live reassign(${identifier}: (${tidy(value)}))-->\`${r[1]} | safeHTML }}`
+    } else if (liveMarkup && TOKENS.WITH.test(raw)) {
+        let [, value] = raw.match(TOKENS.WITH);
+        const r = required_wrapper_hugo_func(value);
+        outputToken.text = `${outputToken.text}{{${r[0]} \`<!--bookshop-live context(.: (${tidy(value)}))-->\`${r[1]} | safeHTML }}`
+    } else if (liveMarkup && TOKENS.BOOKSHOP.test(raw)) {
+        let [, name, params] = raw.match(TOKENS.BOOKSHOP);
+        const r = required_wrapper_hugo_func(params);
+        outputToken.text = `{{${r[0]} \`<!--bookshop-live name(${name}) params(.: (${tidy(params)}))-->\`${r[1]} | safeHTML }}${outputToken.text}{{ \`<!--bookshop-live end-->\` | safeHTML }}`
+    } else if (liveMarkup && TOKENS.BOOKSHOP_SCOPED.test(raw)) {
         outputToken.text = [`{{ if reflect.IsSlice . }}{{ (printf \`<!--bookshop-live name(%s) params(.: .)-->\` (index . 0)) | safeHTML }}`,
             `{{- else if reflect.IsMap . -}}{{ (printf \`<!--bookshop-live name(%s) params(.: .)-->\` ._bookshop_name) | safeHTML }}{{ end }}`,
             `${outputToken.text}`,
@@ -73,6 +94,12 @@ const rewriteTag = function (token, src, endTags, liveMarkup) {
     return outputToken;
 }
 
+// limit comments to one line & escape backticks to something we undo later
+const tidy = val => val.replace(/[\r\n]/g, ' ').replace(/`/g, 'BKSH_BACKTICK');
+
+// The replace function we need to add to undo the backtick tidy above
+const required_wrapper_hugo_func = val => /`/.test(val) ? [` replace`, ` "BKSH_BACKTICK" "\`"`] : [``, ``];
+
 export default function (text, opts) {
     opts = {
         liveMarkup: true,

package/lib/translateTextTemplate.test.js

@@ -36,6 +36,10 @@ test("add live markup to assigns", t => {
     input = `{{ $a := .b | chomp }}`;
     expected = `{{ $a := .b | chomp }}{{ \`<!--bookshop-live context($a: (.b | chomp))-->\` | safeHTML }}`;
     t.is(translateTextTemplate(input, {}), expected);
+
+    input = `{{ $a = .b }}`;
+    expected = `{{ $a = .b }}{{ \`<!--bookshop-live reassign($a: (.b))-->\` | safeHTML }}`;
+    t.is(translateTextTemplate(input, {}), expected);
 });
 
 test("add live markup to withs", t => {
@@ -52,10 +56,13 @@ test("add live markup to withs", t => {
 
 test("add live markup to loops", t => {
     const input = `{{ range .items }}<p>{{ . }}</p>{{ end }}`;
-    const expected = [`{{ $bookshop__live__iterator := 0 }}`,
+    const expected = [`{{ $bookshop__live__iterator__keys := (slice) }}`,
+        `{{ range $i, $e := (.items) }}{{ $bookshop__live__iterator__keys = $bookshop__live__iterator__keys | append $i }}{{ end }}`,
+        `{{ $bookshop__live__iterator := 0 }}`,
         `{{ range .items }}`,
         `{{ \`<!--bookshop-live stack-->\` | safeHTML }}`,
-        `{{ (printf \`<!--bookshop-live context(.: (index (.items) %d))-->\` $bookshop__live__iterator) | safeHTML }}`,
+        `{{ $bookshop__live__iterator__key := (index ($bookshop__live__iterator__keys) $bookshop__live__iterator) }}`,
+        `{{ (printf \`<!--bookshop-live context(.: (index (.items) %v))-->\` (jsonify $bookshop__live__iterator__key)) | safeHTML }}`,
         `{{ $bookshop__live__iterator = (add $bookshop__live__iterator 1) }}`,
         `<p>{{ . }}</p>`,
         `{{ \`<!--bookshop-live unstack-->\` | safeHTML }}`,
@@ -68,7 +75,7 @@ test("add live markup to loops with iterators", t => {
     const input = `{{range $loop_index, $element := .columns}}<p>{{$element}}</p>{{ end }}`;
     const expected = [`{{range $loop_index, $element := .columns}}`,
         `{{ \`<!--bookshop-live stack-->\` | safeHTML }}`,
-        `{{ (printf \`<!--bookshop-live context(.: (index (.columns) %d))-->\` $loop_index) | safeHTML }}`,
+        `{{ (printf \`<!--bookshop-live context(.: (index (.columns) %v))-->\` (jsonify $loop_index)) | safeHTML }}`,
         `<p>{{$element}}</p>`,
         `{{ \`<!--bookshop-live unstack-->\` | safeHTML }}`,
         `{{ end }}`
@@ -76,6 +83,12 @@ test("add live markup to loops with iterators", t => {
     t.is(translateTextTemplate(input, {}), expected);
 });
 
+test("escape backticks in values", t => {
+    let input = `{{ $a := "hi\`:)" }}`;
+    let expected = `{{ $a := "hi\`:)" }}{{ replace \`<!--bookshop-live context($a: ("hiBKSH_BACKTICK:)"))-->\` "BKSH_BACKTICK" "\`" | safeHTML }}`;
+    t.is(translateTextTemplate(input, {}), expected);
+});
+
 test("add live markup to complex end structures", t => {
     const input = `
 {{ range .items }}
@@ -94,7 +107,7 @@ test("add live markup to complex end structures", t => {
 
 {{ end }}`;
     const expected = `
-{{ $bookshop__live__iterator := 0 }}{{ range .items }}{{ \`<!--bookshop-live stack-->\` | safeHTML }}{{ (printf \`<!--bookshop-live context(.: (index (.items) %d))-->\` $bookshop__live__iterator) | safeHTML }}{{ $bookshop__live__iterator = (add $bookshop__live__iterator 1) }}
+{{ $bookshop__live__iterator__keys := (slice) }}{{ range $i, $e := (.items) }}{{ $bookshop__live__iterator__keys = $bookshop__live__iterator__keys | append $i }}{{ end }}{{ $bookshop__live__iterator := 0 }}{{ range .items }}{{ \`<!--bookshop-live stack-->\` | safeHTML }}{{ $bookshop__live__iterator__key := (index ($bookshop__live__iterator__keys) $bookshop__live__iterator) }}{{ (printf \`<!--bookshop-live context(.: (index (.items) %v))-->\` (jsonify $bookshop__live__iterator__key)) | safeHTML }}{{ $bookshop__live__iterator = (add $bookshop__live__iterator 1) }}
 
     {{with .text}}{{ \`<!--bookshop-live stack-->\` | safeHTML }}{{ \`<!--bookshop-live context(.: (.text))-->\` | safeHTML }}
     <p>{{ . }}</p>
@@ -108,6 +121,52 @@ test("add live markup to complex end structures", t => {
         {{ \`<!--bookshop-live unstack-->\` | safeHTML }}{{end}}
     {{ end }}
 
+{{ \`<!--bookshop-live unstack-->\` | safeHTML }}{{ end }}`;
+    t.is(translateTextTemplate(input, {}), expected);
+});
+
+test("add live markup to complex components", t => {
+    const input = `
+{{ $level := default 2 .level }}
+{{ $level = string
+    $level }}
+{{ $level_classes := dict 
+    "1" "border-b py-8 text-4xl"
+    "2" "border-b py-6 text-3xl"
+    "3" "border-b py-4 text-2xl font-bold"
+    "4" "border-b text-xl font-bold"
+}}
+{{ $level_class := "lg" }}
+{{ with index $level_classes $level }}
+    {{ $level_class = . }}
+{{ end }}
+{{ $open := printf \`<h%s class="%s">\` $level $level_class }}
+{{ $close := printf \`</h%s>\` $level }}
+{{ with .copy }}
+    {{ safeHTML $open }}
+    {{ markdownify . }} | bookshop
+    {{ safeHTML $close }}
+{{ end }}`;
+    const expected = `
+{{ $level := default 2 .level }}{{ \`<!--bookshop-live context($level: (default 2 .level))-->\` | safeHTML }}
+{{ $level = string
+    $level }}{{ \`<!--bookshop-live reassign($level: (string     $level))-->\` | safeHTML }}
+{{ $level_classes := dict 
+    "1" "border-b py-8 text-4xl"
+    "2" "border-b py-6 text-3xl"
+    "3" "border-b py-4 text-2xl font-bold"
+    "4" "border-b text-xl font-bold"
+}}{{ \`<!--bookshop-live context($level_classes: (dict      "1" "border-b py-8 text-4xl"     "2" "border-b py-6 text-3xl"     "3" "border-b py-4 text-2xl font-bold"     "4" "border-b text-xl font-bold"))-->\` | safeHTML }}
+{{ $level_class := "lg" }}{{ \`<!--bookshop-live context($level_class: ("lg"))-->\` | safeHTML }}
+{{ with index $level_classes $level }}{{ \`<!--bookshop-live stack-->\` | safeHTML }}{{ \`<!--bookshop-live context(.: (index $level_classes $level))-->\` | safeHTML }}
+    {{ $level_class = . }}{{ \`<!--bookshop-live reassign($level_class: (.))-->\` | safeHTML }}
+{{ \`<!--bookshop-live unstack-->\` | safeHTML }}{{ end }}
+{{ $open := printf \`<h%s class="%s">\` $level $level_class }}{{ replace \`<!--bookshop-live context($open: (printf BKSH_BACKTICK<h%s class="%s">BKSH_BACKTICK $level $level_class))-->\` "BKSH_BACKTICK" "\`" | safeHTML }}
+{{ $close := printf \`</h%s>\` $level }}{{ replace \`<!--bookshop-live context($close: (printf BKSH_BACKTICK</h%s>BKSH_BACKTICK $level))-->\` "BKSH_BACKTICK" "\`" | safeHTML }}
+{{ with .copy }}{{ \`<!--bookshop-live stack-->\` | safeHTML }}{{ \`<!--bookshop-live context(.: (.copy))-->\` | safeHTML }}
+    {{ safeHTML $open }}
+    {{ markdownify . }} | bookshop
+    {{ safeHTML $close }}
 {{ \`<!--bookshop-live unstack-->\` | safeHTML }}{{ end }}`;
     t.is(translateTextTemplate(input, {}), expected);
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bookshop/hugo-engine",
   "packageManager": "yarn@3.0.0",
-  "version": "2.5.0",
+  "version": "3.0.0-beta.0",
   "description": "Bookshop frontend Hugo renderer",
   "type": "module",
   "sideEffects": false,
@@ -29,7 +29,7 @@
     "nyc": "^15.1.0"
   },
   "dependencies": {
-    "@bookshop/helpers": "2.5.0",
+    "@bookshop/helpers": "3.0.0-beta.0",
     "esbuild": "^0.13.10",
     "liquidjs": "9.28.0"
   },

package/.nyc_output/processinfo/90c0d905-7a53-48a0-9c22-a39b1b831857.json

@@ -1 +0,0 @@
-{"parent":null,"pid":36197,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/cli.js","-v"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1645506759370,"ppid":36196,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/90c0d905-7a53-48a0-9c22-a39b1b831857.json","externalId":"","uuid":"90c0d905-7a53-48a0-9c22-a39b1b831857","files":[]}