@bookshop/hugo-engine 2.4.2 → 2.6.1

package/.nyc_output/processinfo/{1c8dd4f5-9b2f-4218-9c39-615aa7a79f1a.json → 51df4d42-a45e-4cd8-8872-46e9147299bf.json}

@@ -1 +1 @@
-{"parent":"05c20625-d974-4cff-8627-ffd39eb87964","pid":94691,"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":1643783907793,"ppid":94690,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/1c8dd4f5-9b2f-4218-9c39-615aa7a79f1a.json","externalId":"","uuid":"1c8dd4f5-9b2f-4218-9c39-615aa7a79f1a","files":[]}
+{"parent":"ac095d2d-5d4a-449e-82ae-0e0f0dd32b01","pid":32141,"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":1646349109338,"ppid":32139,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/51df4d42-a45e-4cd8-8872-46e9147299bf.json","externalId":"","uuid":"51df4d42-a45e-4cd8-8872-46e9147299bf","files":[]}

package/.nyc_output/processinfo/{55d11bd3-216d-42c2-970e-55360a3aa1f7.json → 8ff4b2d0-5848-4ba6-9e8b-455ac526027c.json}

@@ -1 +1 @@
-{"parent":"05c20625-d974-4cff-8627-ffd39eb87964","pid":94693,"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":1643783907804,"ppid":94690,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/55d11bd3-216d-42c2-970e-55360a3aa1f7.json","externalId":"","uuid":"55d11bd3-216d-42c2-970e-55360a3aa1f7","files":[]}
+{"parent":"ac095d2d-5d4a-449e-82ae-0e0f0dd32b01","pid":32140,"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":1646349109337,"ppid":32139,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/8ff4b2d0-5848-4ba6-9e8b-455ac526027c.json","externalId":"","uuid":"8ff4b2d0-5848-4ba6-9e8b-455ac526027c","files":[]}

package/.nyc_output/processinfo/{bb3f1e57-7efe-4f35-852c-6971836aa288.json → 970a6ddf-4bc1-4741-8913-f05ce8e287c6.json}

@@ -1 +1 @@
-{"parent":"05c20625-d974-4cff-8627-ffd39eb87964","pid":94692,"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":1643783907805,"ppid":94690,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/bb3f1e57-7efe-4f35-852c-6971836aa288.json","externalId":"","uuid":"bb3f1e57-7efe-4f35-852c-6971836aa288","files":[]}
+{"parent":"ac095d2d-5d4a-449e-82ae-0e0f0dd32b01","pid":32143,"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":1646349109350,"ppid":32139,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/970a6ddf-4bc1-4741-8913-f05ce8e287c6.json","externalId":"","uuid":"970a6ddf-4bc1-4741-8913-f05ce8e287c6","files":[]}

package/.nyc_output/processinfo/ac095d2d-5d4a-449e-82ae-0e0f0dd32b01.json

@@ -0,0 +1 @@
+{"parent":null,"pid":32139,"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":1646349108851,"ppid":32138,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/ac095d2d-5d4a-449e-82ae-0e0f0dd32b01.json","externalId":"","uuid":"ac095d2d-5d4a-449e-82ae-0e0f0dd32b01","files":[]}

package/.nyc_output/processinfo/{e6440686-4e4c-487d-9abc-bb15eb8663e1.json → f5e4f4d9-24b3-4cb7-a369-95e27032d6ba.json}

@@ -1 +1 @@
-{"parent":"05c20625-d974-4cff-8627-ffd39eb87964","pid":94694,"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":1643783907813,"ppid":94690,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/e6440686-4e4c-487d-9abc-bb15eb8663e1.json","externalId":"","uuid":"e6440686-4e4c-487d-9abc-bb15eb8663e1","files":[]}
+{"parent":"ac095d2d-5d4a-449e-82ae-0e0f0dd32b01","pid":32142,"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":1646349109342,"ppid":32139,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/f5e4f4d9-24b3-4cb7-a369-95e27032d6ba.json","externalId":"","uuid":"f5e4f4d9-24b3-4cb7-a369-95e27032d6ba","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"05c20625-d974-4cff-8627-ffd39eb87964":{"parent":null,"children":["1c8dd4f5-9b2f-4218-9c39-615aa7a79f1a","55d11bd3-216d-42c2-970e-55360a3aa1f7","bb3f1e57-7efe-4f35-852c-6971836aa288","e6440686-4e4c-487d-9abc-bb15eb8663e1"]},"1c8dd4f5-9b2f-4218-9c39-615aa7a79f1a":{"parent":"05c20625-d974-4cff-8627-ffd39eb87964","children":[]},"55d11bd3-216d-42c2-970e-55360a3aa1f7":{"parent":"05c20625-d974-4cff-8627-ffd39eb87964","children":[]},"bb3f1e57-7efe-4f35-852c-6971836aa288":{"parent":"05c20625-d974-4cff-8627-ffd39eb87964","children":[]},"e6440686-4e4c-487d-9abc-bb15eb8663e1":{"parent":"05c20625-d974-4cff-8627-ffd39eb87964","children":[]}},"files":{},"externalIds":{}}
+{"processes":{"51df4d42-a45e-4cd8-8872-46e9147299bf":{"parent":"ac095d2d-5d4a-449e-82ae-0e0f0dd32b01","children":[]},"8ff4b2d0-5848-4ba6-9e8b-455ac526027c":{"parent":"ac095d2d-5d4a-449e-82ae-0e0f0dd32b01","children":[]},"970a6ddf-4bc1-4741-8913-f05ce8e287c6":{"parent":"ac095d2d-5d4a-449e-82ae-0e0f0dd32b01","children":[]},"ac095d2d-5d4a-449e-82ae-0e0f0dd32b01":{"parent":null,"children":["51df4d42-a45e-4cd8-8872-46e9147299bf","8ff4b2d0-5848-4ba6-9e8b-455ac526027c","970a6ddf-4bc1-4741-8913-f05ce8e287c6","f5e4f4d9-24b3-4cb7-a369-95e27032d6ba"]},"f5e4f4d9-24b3-4cb7-a369-95e27032d6ba":{"parent":"ac095d2d-5d4a-449e-82ae-0e0f0dd32b01","children":[]}},"files":{},"externalIds":{}}

package/hugo-renderer/helpers/bookshop_modified_content.go

@@ -18,6 +18,7 @@
 package helpers
 
 import (
+	"bytes"
 	"html/template"
 	"strings"
 	"unicode"
@@ -25,6 +26,13 @@ import (
 	bp "github.com/gohugoio/hugo/bufferpool"
 )
 
+var (
+	openingPTag        = []byte("<p>")
+	closingPTag        = []byte("</p>")
+	paragraphIndicator = []byte("<p")
+	closingIndicator   = []byte("</")
+)
+
 var stripHTMLReplacer = strings.NewReplacer("\n", " ", "</p>", "\n", "<br>", "\n", "<br />", "\n")
 
 // StripHTML accepts a string, strips out all HTML tags and returns it.
@@ -68,3 +76,23 @@ func StripHTML(s string) string {
 func BytesToHTML(b []byte) template.HTML {
 	return template.HTML(string(b))
 }
+
+// TrimShortHTML removes the <p>/</p> tags from HTML input in the situation
+// where said tags are the only <p> tags in the input and enclose the content
+// of the input (whitespace excluded).
+// Bookshop: Changed this to _not_ be a method of *ContentSpec
+func TrimShortHTML(input []byte) []byte {
+	firstOpeningP := bytes.Index(input, paragraphIndicator)
+	lastOpeningP := bytes.LastIndex(input, paragraphIndicator)
+
+	lastClosingP := bytes.LastIndex(input, closingPTag)
+	lastClosing := bytes.LastIndex(input, closingIndicator)
+
+	if firstOpeningP == lastOpeningP && lastClosingP == lastClosing {
+		input = bytes.TrimSpace(input)
+		input = bytes.TrimPrefix(input, openingPTag)
+		input = bytes.TrimSuffix(input, closingPTag)
+		input = bytes.TrimSpace(input)
+	}
+	return input
+}

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/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/hugo-renderer/tpl/transform/transform.go

@@ -99,6 +99,9 @@ func (ns *Namespace) Markdownify(s interface{}) (template.HTML, error) {
 	// This includes using a different (smaller) markdown implementation.
 	output := markdown.ToHTML([]byte(ss), nil, nil)
 
+	// Strip if this is a short inline type of text.
+	output = helpers.TrimShortHTML(output)
+
 	return helpers.BytesToHTML(output), nil
 }
 

package/lib/builder.js

@@ -6,11 +6,11 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 export const extensions = [".hugo.html"];
 
-export const esbuildConfigFn = (esbuildConfig) => {
+export const esbuildConfigFn = (esbuildConfig, options) => {
     esbuildConfig.loader = {
         ...esbuildConfig.loader,
         ".hugo.html": "text",
-        ".wasm": "file"
+        ".wasm": options?.hosted ? "file" : "binary"
     };
 
     const wasm_exec_banner = fs.readFileSync(path.join(__dirname, "../hugo-renderer/wasm_exec.js"));

package/lib/engine.js

@@ -31,10 +31,15 @@ export class Engine {
     }
 
     async initializeHugo() {
-        if (window.CloudCannon?.isMocked) {
-            await this.initializeLocalHugo();
+        // 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 {
-            await this.initializeRemoteHugo();
+            if (window.CloudCannon?.isMocked) {
+                await this.initializeLocalHugo();
+            } else {
+                await this.initializeRemoteHugo();
+            }
         }
 
         // TODO: Tidy
@@ -75,6 +80,13 @@ export class Engine {
         go.run(result.instance);
     }
 
+    async initializeInlineHugo() {
+        const go = new Go();
+        const buffer = hugoWasm.buffer;
+        const result = await WebAssembly.instantiate(buffer, go.importObject);
+        go.run(result.instance);
+    }
+
     getShared(name) {
         const key = `shared/hugo/${name}.hugo.html`
         return this.files?.[key];
@@ -150,13 +162,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,53 @@ 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);
+    } 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 := 0 }}`,
             `${outputToken.text}`,
-            `{{ (printf \`<!--bookshop-live context(.: (index (${iterator}) %d))-->\` $bookshop__live__iterator) | safeHTML }}`,
+            `{{${r[0]} (printf \`<!--bookshop-live context(.: (index (${tidy(iterator)}) %d))-->\` $bookshop__live__iterator)${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 +91,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 => {
@@ -68,7 +72,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 +80,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 }}
@@ -108,6 +118,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.4.2",
+  "version": "2.6.1",
   "description": "Bookshop frontend Hugo renderer",
   "type": "module",
   "sideEffects": false,
@@ -29,7 +29,7 @@
     "nyc": "^15.1.0"
   },
   "dependencies": {
-    "@bookshop/helpers": "2.4.2",
+    "@bookshop/helpers": "2.6.1",
     "esbuild": "^0.13.10",
     "liquidjs": "9.28.0"
   },

package/.nyc_output/processinfo/05c20625-d974-4cff-8627-ffd39eb87964.json

@@ -1 +0,0 @@
-{"parent":null,"pid":94690,"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":1643783907226,"ppid":94689,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/05c20625-d974-4cff-8627-ffd39eb87964.json","externalId":"","uuid":"05c20625-d974-4cff-8627-ffd39eb87964","files":[]}