@bookshop/hugo-engine 2.4.1 → 2.6.0

package/hugo-renderer/tpl/collections/collections.go

@@ -380,6 +380,7 @@ func (ns *Namespace) IsSet(a interface{}, key interface{}) (bool, error) {
 			return av.MapIndex(kv).IsValid(), nil
 		}
 	default:
+		// Bookshop: Removed deep Hugo function.
 		// helpers.DistinctErrorLog.Printf("WARNING: calling IsSet with unsupported type %q (%T) will always return false.\n", av.Kind(), a)
 	}
 

package/hugo-renderer/tpl/fmt/fmt.go

@@ -20,6 +20,8 @@ import (
 	"hugo-renderer/deps"
 )
 
+// Bookshop: This file has been stripped due to irrelevancy with live editing.
+
 // New returns a new instance of the fmt-namespaced template functions.
 func New(d *deps.Deps) *Namespace {
 	return &Namespace{}

package/hugo-renderer/tpl/partials/partials.go

@@ -26,6 +26,8 @@ import (
 	"hugo-renderer/deps"
 )
 
+// Bookshop: This file has been stripped to only support Bookshop partials when live editing.
+
 // New returns a new instance of the templates-namespaced template functions.
 func New(deps *deps.Deps) *Namespace {
 	return &Namespace{}

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

@@ -0,0 +1,113 @@
+// 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 transform
+
+import (
+	"hugo-renderer/deps"
+	"hugo-renderer/tpl/internal"
+)
+
+const name = "transform"
+
+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.Emojify,
+			[]string{"emojify"},
+			[][2]string{
+				{`{{ "I :heart: Hugo" | emojify }}`, `I ❤️ Hugo`},
+			},
+		)
+
+		ns.AddMethodMapping(ctx.Highlight,
+			[]string{"highlight"},
+			[][2]string{},
+		)
+
+		ns.AddMethodMapping(ctx.HTMLEscape,
+			[]string{"htmlEscape"},
+			[][2]string{
+				{
+					`{{ htmlEscape "Cathal Garvey & The Sunshine Band <cathal@foo.bar>" | safeHTML}}`,
+					`Cathal Garvey &amp; The Sunshine Band &lt;cathal@foo.bar&gt;`,
+				},
+				{
+					`{{ htmlEscape "Cathal Garvey & The Sunshine Band <cathal@foo.bar>"}}`,
+					`Cathal Garvey &amp;amp; The Sunshine Band &amp;lt;cathal@foo.bar&amp;gt;`,
+				},
+				{
+					`{{ htmlEscape "Cathal Garvey & The Sunshine Band <cathal@foo.bar>" | htmlUnescape | safeHTML }}`,
+					`Cathal Garvey & The Sunshine Band <cathal@foo.bar>`,
+				},
+			},
+		)
+
+		ns.AddMethodMapping(ctx.HTMLUnescape,
+			[]string{"htmlUnescape"},
+			[][2]string{
+				{
+					`{{ htmlUnescape "Cathal Garvey &amp; The Sunshine Band &lt;cathal@foo.bar&gt;" | safeHTML}}`,
+					`Cathal Garvey & The Sunshine Band <cathal@foo.bar>`,
+				},
+				{
+					`{{"Cathal Garvey &amp;amp; The Sunshine Band &amp;lt;cathal@foo.bar&amp;gt;" | htmlUnescape | htmlUnescape | safeHTML}}`,
+					`Cathal Garvey & The Sunshine Band <cathal@foo.bar>`,
+				},
+				{
+					`{{"Cathal Garvey &amp;amp; The Sunshine Band &amp;lt;cathal@foo.bar&amp;gt;" | htmlUnescape | htmlUnescape }}`,
+					`Cathal Garvey &amp; The Sunshine Band &lt;cathal@foo.bar&gt;`,
+				},
+				{
+					`{{ htmlUnescape "Cathal Garvey &amp; The Sunshine Band &lt;cathal@foo.bar&gt;" | htmlEscape | safeHTML }}`,
+					`Cathal Garvey &amp; The Sunshine Band &lt;cathal@foo.bar&gt;`,
+				},
+			},
+		)
+
+		ns.AddMethodMapping(ctx.Markdownify,
+			[]string{"markdownify"},
+			[][2]string{
+				{`{{ .Title | markdownify}}`, `<strong>BatMan</strong>`},
+			},
+		)
+
+		ns.AddMethodMapping(ctx.Plainify,
+			[]string{"plainify"},
+			[][2]string{
+				{`{{ plainify  "Hello <strong>world</strong>, gophers!" }}`, `Hello world, gophers!`},
+			},
+		)
+
+		// Bookshop: remarshal has been intentionally removed due to instability
+
+		// 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
+	}
+
+	internal.AddTemplateFuncsNamespace(f)
+}

package/hugo-renderer/tpl/transform/transform.go

@@ -0,0 +1,116 @@
+// 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 transform provides template functions for transforming content.
+package transform
+
+import (
+	"html"
+	"html/template"
+
+	"github.com/gomarkdown/markdown"
+
+	"hugo-renderer/deps"
+
+	"hugo-renderer/helpers"
+
+	"github.com/spf13/cast"
+)
+
+// New returns a new instance of the transform-namespaced template functions.
+func New(deps *deps.Deps) *Namespace {
+	// Bookshop: Build listeners & cache intentionally removed
+
+	return &Namespace{
+		deps: deps,
+	}
+}
+
+// Namespace provides template functions for the "transform" namespace.
+type Namespace struct {
+	// Bookshop: Build listeners & cache intentionally removed
+	deps *deps.Deps
+}
+
+// Emojify returns a copy of s with all emoji codes replaced with actual emojis.
+//
+// See http://www.emoji-cheat-sheet.com/
+func (ns *Namespace) Emojify(s interface{}) (template.HTML, error) {
+	ss, err := cast.ToStringE(s)
+	if err != nil {
+		return "", err
+	}
+
+	return template.HTML(helpers.Emojify([]byte(ss))), nil
+}
+
+// Highlight returns a copy of s as an HTML string with syntax
+// highlighting applied.
+func (ns *Namespace) Highlight(s interface{}, lang string, opts ...interface{}) (template.HTML, error) {
+	ss, err := cast.ToStringE(s)
+	if err != nil {
+		return "", err
+	}
+
+	// Bookshop: Highlighting logic intentionally removed for bloat
+
+	return template.HTML(ss), nil
+}
+
+// HTMLEscape returns a copy of s with reserved HTML characters escaped.
+func (ns *Namespace) HTMLEscape(s interface{}) (string, error) {
+	ss, err := cast.ToStringE(s)
+	if err != nil {
+		return "", err
+	}
+
+	return html.EscapeString(ss), nil
+}
+
+// HTMLUnescape returns a copy of with HTML escape requences converted to plain
+// text.
+func (ns *Namespace) HTMLUnescape(s interface{}) (string, error) {
+	ss, err := cast.ToStringE(s)
+	if err != nil {
+		return "", err
+	}
+
+	return html.UnescapeString(ss), nil
+}
+
+// Markdownify renders a given input from Markdown to HTML.
+func (ns *Namespace) Markdownify(s interface{}) (template.HTML, error) {
+	ss, err := cast.ToStringE(s)
+	if err != nil {
+		return "", err
+	}
+
+	// Bookshop: markdownify implementation has been intentionally modified for bloat
+	// 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
+}
+
+// Plainify returns a copy of s with all HTML tags removed.
+func (ns *Namespace) Plainify(s interface{}) (string, error) {
+	ss, err := cast.ToStringE(s)
+	if err != nil {
+		return "", err
+	}
+
+	return helpers.StripHTML(ss), nil
+}

package/hugo-renderer/update-from-hugo.sh

@@ -0,0 +1,19 @@
+cd tpl
+HUGO_LOC="../../../../../../../Scratchpad/hugo/tpl"
+
+# Check Hugo loc
+if [ ! -d $HUGO_LOC ]; then
+    echo "ERROR: hugo repo does not exist (on Liam's machine)"
+    exit 1
+fi
+
+for LOCAL_FILE in **/*.go; do
+    if [[ ! $LOCAL_FILE == *bookshop* ]]; then
+        HUGO_FILE="$HUGO_LOC/$LOCAL_FILE"
+        if [ ! -f $HUGO_FILE ]; then
+            echo "WARN: File $LOCAL_FILE doesn't exist in Hugo as $HUGO_FILE"
+        else
+            cp $HUGO_FILE $LOCAL_FILE
+        fi
+    fi
+done

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.1",
+  "version": "2.6.0",
   "description": "Bookshop frontend Hugo renderer",
   "type": "module",
   "sideEffects": false,
@@ -29,7 +29,7 @@
     "nyc": "^15.1.0"
   },
   "dependencies": {
-    "@bookshop/helpers": "2.4.1",
+    "@bookshop/helpers": "2.6.0",
     "esbuild": "^0.13.10",
     "liquidjs": "9.28.0"
   },

package/.nyc_output/processinfo/222873c9-9975-439a-a423-1e8cdec80767.json

@@ -1 +0,0 @@
-{"parent":null,"pid":37256,"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":1643741987817,"ppid":37255,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/222873c9-9975-439a-a423-1e8cdec80767.json","externalId":"","uuid":"222873c9-9975-439a-a423-1e8cdec80767","files":[]}