@bookshop/hugo-engine 2.4.0-hugo.2 → 2.4.1

package/.nyc_output/processinfo/{b63b1b97-4b16-4cde-9e6e-60a2ff0c075f.json → 0285db3a-0bb1-48c5-a949-061f568eaab6.json}

@@ -1 +1 @@
-{"parent":"f5078748-1e55-4d0b-ae19-a8a1cb800295","pid":33683,"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":1643512427698,"ppid":33681,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/b63b1b97-4b16-4cde-9e6e-60a2ff0c075f.json","externalId":"","uuid":"b63b1b97-4b16-4cde-9e6e-60a2ff0c075f","files":[]}
+{"parent":"222873c9-9975-439a-a423-1e8cdec80767","pid":37259,"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":1643741988315,"ppid":37256,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/0285db3a-0bb1-48c5-a949-061f568eaab6.json","externalId":"","uuid":"0285db3a-0bb1-48c5-a949-061f568eaab6","files":[]}

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

@@ -0,0 +1 @@
+{"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":[]}

package/.nyc_output/processinfo/{bc05c575-6f03-4c35-bddb-43fcb1616060.json → 3abd89cc-3259-442a-a584-30ba1c47f41f.json}

@@ -1 +1 @@
-{"parent":"f5078748-1e55-4d0b-ae19-a8a1cb800295","pid":33684,"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":1643512427701,"ppid":33681,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/bc05c575-6f03-4c35-bddb-43fcb1616060.json","externalId":"","uuid":"bc05c575-6f03-4c35-bddb-43fcb1616060","files":[]}
+{"parent":"222873c9-9975-439a-a423-1e8cdec80767","pid":37260,"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":1643741988320,"ppid":37256,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/3abd89cc-3259-442a-a584-30ba1c47f41f.json","externalId":"","uuid":"3abd89cc-3259-442a-a584-30ba1c47f41f","files":[]}

package/.nyc_output/processinfo/{bc613327-aa07-4b95-a1fc-bbf3c9e29952.json → 72cd08d5-81da-4a01-af7e-b82f5c58bfe2.json}

@@ -1 +1 @@
-{"parent":"f5078748-1e55-4d0b-ae19-a8a1cb800295","pid":33685,"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":1643512427708,"ppid":33681,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/bc613327-aa07-4b95-a1fc-bbf3c9e29952.json","externalId":"","uuid":"bc613327-aa07-4b95-a1fc-bbf3c9e29952","files":[]}
+{"parent":"222873c9-9975-439a-a423-1e8cdec80767","pid":37258,"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":1643741988310,"ppid":37256,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/72cd08d5-81da-4a01-af7e-b82f5c58bfe2.json","externalId":"","uuid":"72cd08d5-81da-4a01-af7e-b82f5c58bfe2","files":[]}

package/.nyc_output/processinfo/{dc9d7295-1c20-414a-9d4b-db9ba1048bff.json → 85ee537c-1dd7-4a62-96e1-954d77437eb0.json}

@@ -1 +1 @@
-{"parent":"f5078748-1e55-4d0b-ae19-a8a1cb800295","pid":33682,"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":1643512427693,"ppid":33681,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/dc9d7295-1c20-414a-9d4b-db9ba1048bff.json","externalId":"","uuid":"dc9d7295-1c20-414a-9d4b-db9ba1048bff","files":[]}
+{"parent":"222873c9-9975-439a-a423-1e8cdec80767","pid":37257,"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":1643741988307,"ppid":37256,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/85ee537c-1dd7-4a62-96e1-954d77437eb0.json","externalId":"","uuid":"85ee537c-1dd7-4a62-96e1-954d77437eb0","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"b63b1b97-4b16-4cde-9e6e-60a2ff0c075f":{"parent":"f5078748-1e55-4d0b-ae19-a8a1cb800295","children":[]},"bc05c575-6f03-4c35-bddb-43fcb1616060":{"parent":"f5078748-1e55-4d0b-ae19-a8a1cb800295","children":[]},"bc613327-aa07-4b95-a1fc-bbf3c9e29952":{"parent":"f5078748-1e55-4d0b-ae19-a8a1cb800295","children":[]},"dc9d7295-1c20-414a-9d4b-db9ba1048bff":{"parent":"f5078748-1e55-4d0b-ae19-a8a1cb800295","children":[]},"f5078748-1e55-4d0b-ae19-a8a1cb800295":{"parent":null,"children":["b63b1b97-4b16-4cde-9e6e-60a2ff0c075f","bc05c575-6f03-4c35-bddb-43fcb1616060","bc613327-aa07-4b95-a1fc-bbf3c9e29952","dc9d7295-1c20-414a-9d4b-db9ba1048bff"]}},"files":{},"externalIds":{}}
+{"processes":{"0285db3a-0bb1-48c5-a949-061f568eaab6":{"parent":"222873c9-9975-439a-a423-1e8cdec80767","children":[]},"222873c9-9975-439a-a423-1e8cdec80767":{"parent":null,"children":["0285db3a-0bb1-48c5-a949-061f568eaab6","3abd89cc-3259-442a-a584-30ba1c47f41f","72cd08d5-81da-4a01-af7e-b82f5c58bfe2","85ee537c-1dd7-4a62-96e1-954d77437eb0"]},"3abd89cc-3259-442a-a584-30ba1c47f41f":{"parent":"222873c9-9975-439a-a423-1e8cdec80767","children":[]},"72cd08d5-81da-4a01-af7e-b82f5c58bfe2":{"parent":"222873c9-9975-439a-a423-1e8cdec80767","children":[]},"85ee537c-1dd7-4a62-96e1-954d77437eb0":{"parent":"222873c9-9975-439a-a423-1e8cdec80767","children":[]}},"files":{},"externalIds":{}}

package/hugo-renderer/build.sh

@@ -1,16 +1,57 @@
-rm -f hugo_renderer.wasm
-FILENAME="hugo_renderer_$(date +%s).wasm"
-GOOS=js GOARCH=wasm go build -tags nodeploy -o $FILENAME
-printf "Built Hugo WASM via $FILENAME : "
-ls -lh $FILENAME | awk '{print $5}'
-if [ -f hugo_renderer.wasm ]; then
-    echo "ERROR: previous hugo_renderer.wasm still in directory"
+if [[ -z "${BOOKSHOP_VERSION}" ]]; then
+    echo "ERROR: BOOKSHOP_VERSION environment variable does not exist"
     exit 1
 fi
-mv $FILENAME hugo_renderer.wasm
-if [ ! -f hugo_renderer.wasm ]; then
+
+TMPFILENAME="hugo_renderer_$(date +%s).wasm"
+OUTPUTFILENAME="hugo_renderer.wasm"
+CDNFILENAME="../../../../../bookshopcdn/hugo/hugo_renderer_$BOOKSHOP_VERSION.wasm"
+
+# Clean
+rm -f $OUTPUTFILENAME
+if [ -f $OUTPUTFILENAME ]; then
+    echo "ERROR: previous $OUTPUTFILENAME still in directory"
+    exit 1
+fi
+
+# Build temp module
+GOOS=js GOARCH=wasm go build -tags nodeploy -o $TMPFILENAME
+printf "Built Hugo WASM via $TMPFILENAME : "
+ls -lh $TMPFILENAME | awk '{print $5}'
+
+# Link repo module
+mv $TMPFILENAME $OUTPUTFILENAME
+if [ ! -f $OUTPUTFILENAME ]; then
     echo "ERROR: hugo_renderer.wasm not complete"
     exit 1
 fi
-echo "Done. Hugo WASM available at hugo_renderer.wasm"
+echo "Done. Repo Hugo WASM available at hugo_renderer.wasm"
+
+# If we're just in a test run we don't want to touch the CDN repo
+if [[ -z "${PUBLISH_BOOKSHOP_CDN}" ]]; then
+    echo "Not publishing to CDN."
+    exit 0
+fi
+
+# Check CDN
+if [ ! -d ../../../../../bookshopcdn/hugo ]; then
+    echo "ERROR: bookshopcdn repo does not exist alongside bookshop repo"
+    exit 1
+fi
+
+# Link CDN module
+cp $OUTPUTFILENAME $CDNFILENAME
+if [ ! -f $CDNFILENAME ]; then
+    echo "ERROR: $CDNFILENAME not complete"
+    exit 1
+fi
+echo "Done. CDN Hugo WASM available at $CDNFILENAME"
+
+cd ../../../../../bookshopcdn
+
+git add -A \
+&& git commit -m "build: releasing $BOOKSHOP_VERSION" \
+&& git tag -a v$BOOKSHOP_VERSION -m "build: releasing $BOOKSHOP_VERSION" \
+&& git push --tags && git push
+
 exit 0

package/lib/engine.js

@@ -1,6 +1,7 @@
 import hugoWasm from "../hugo-renderer/hugo_renderer.wasm";
 import translateTextTemplate from './translateTextTemplate.js';
 import { IdentifierParser } from './hugoIdentifierParser.js';
+import { version } from '../package.json';
 
 const sleep = (ms = 0) => {
     return new Promise(r => setTimeout(r, ms));
@@ -24,18 +25,17 @@ export class Engine {
         this.key = 'hugo';
         this.name = options.name;
         this.files = options.files;
+        this.origin = document.currentScript?.src || `/bookshop.js`;
 
         this.initializeHugo();
     }
 
     async initializeHugo() {
-        const scriptOrigin = document.currentScript?.src || `/bookshop.js`;
-        const wasmOrigin = scriptOrigin.replace(/\/[^\.\/]+\.js$/, hugoWasm.replace(/^\./, ''));
-        const go = new Go();
-        const response = await fetch(wasmOrigin);
-        const buffer = await response.arrayBuffer();
-        const result = await WebAssembly.instantiate(buffer, go.importObject);
-        go.run(result.instance)
+        if (window.CloudCannon?.isMocked) {
+            await this.initializeLocalHugo();
+        } else {
+            await this.initializeRemoteHugo();
+        }
 
         // TODO: Tidy
         const mappedFiles = {};
@@ -48,6 +48,33 @@ export class Engine {
         const success = window.loadHugoBookshopPartials(JSON.stringify(mappedFiles));
     }
 
+    async initializeRemoteHugo() {
+        try {
+            const go = new Go();
+            const remoteWasmOrigin = `https://cdn.bookshop.build/hugo/hugo_renderer_${version}.wasm`;
+            const remoteResponse = await fetch(remoteWasmOrigin);
+            const remoteBuffer = await remoteResponse.arrayBuffer();
+
+            // Check the magic word at the start of the buffer as a way to verify the CDN download worked.
+            const isWasm = ([...new Uint8Array(remoteBuffer, 0, 4)]).map(g => g.toString(16).padStart(2, '0')).join('') === "0061736d";
+            if (!isWasm) throw "Not WASM";
+
+            const remoteResult = await WebAssembly.instantiate(remoteBuffer, go.importObject);
+            go.run(remoteResult.instance);
+        } catch (e) {
+            await this.initializeLocalHugo();
+        }
+    }
+
+    async initializeLocalHugo() {
+        const go = new Go();
+        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);
+        go.run(result.instance);
+    }
+
     getShared(name) {
         const key = `shared/hugo/${name}.hugo.html`
         return this.files?.[key];

package/lib/hugoIdentifierParser.js

@@ -22,6 +22,13 @@ export class IdentifierParser {
 
   // Some short-circuits for easy to regex patterns to skip the parser
   tryShortCircuit() {
+    // change an index of . to be only the index
+    const indexDotFunc = /^\s*\(\s*index\s+(?:\(\s*\.\s*\)|\.)\s+(\d+)\s*\)\s*$/
+    if (indexDotFunc.test(this.input)) {
+      const [, index] = this.input.match(indexDotFunc);
+      return `${index}`;
+    }
+
     // change the index function into Bookshop dot notation
     const indexFunc = /^\s*\(\s*index\s+\(?\.?(.+?)\)?\s+(\d+)\s*\)\s*$/
     if (indexFunc.test(this.input)) {
@@ -30,7 +37,6 @@ export class IdentifierParser {
     }
 
     // strip the leading . from basic variable references
-    const variableDot = /^\s*\.([^\.\s])/;
     if (/^\s*\./.test(this.input)) {
       return this.input.replace(/^\s*\.([^\.\s])/, '$1');
     }

package/lib/hugoIdentifierParser.test.js

@@ -66,7 +66,26 @@ test(`Nested dicts and slices`, async t => {
 });
 
 test(`Converts an index into dot notation`, async t => {
-    const ident = `(index (.items) 5)`;
-    const output = (new IdentifierParser(ident)).build();
+    let ident = `(index (.items) 5)`;
+    let output = (new IdentifierParser(ident)).build();
     t.deepEqual(output, `items.5`);
+
+    ident = `(index .array 5)`;
+    output = (new IdentifierParser(ident)).build();
+    t.deepEqual(output, `array.5`);
+
+    ident = `(index $variable 5)`;
+    output = (new IdentifierParser(ident)).build();
+    t.deepEqual(output, `$variable.5`);
+});
+
+
+test(`Converts a dot index into a JS object property`, async t => {
+    let ident = `(index (.) 5)`;
+    let output = (new IdentifierParser(ident)).build();
+    t.deepEqual(output, `5`);
+
+    ident = `(index . 1234)`;
+    output = (new IdentifierParser(ident)).build();
+    t.deepEqual(output, `1234`);
 });

package/lib/translateTextTemplate.js

@@ -5,9 +5,11 @@ const tokens = {
     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(?:_partial)?"\s+\(\s*slice\s+"(.+?)" (.+?)\s*\)\s*}}/,
+    BOOKSHOP: /{{\s*partial\s+"bookshop"\s+\(\s*slice\s+"(.+?)" (.+?)\s*\)\s*}}/,
+    BOOKSHOP_SCOPED: /{{\s*partial\s+"bookshop"\s+\(?\s*\.\s*\)?\s*}}/,
 }
 
 /**
@@ -39,7 +41,12 @@ const rewriteTag = function (token, src, endTags, liveMarkup) {
         matchingEnd.text = `{{ \`<!--bookshop-live unstack-->\` | safeHTML }}${matchingEnd.text}`;
     }
 
-    if (liveMarkup && tokens.LOOP.test(raw)) {
+    if (liveMarkup && tokens.INDEX_LOOP.test(raw)) {
+        let [, index_variable, iterator] = raw.match(tokens.INDEX_LOOP);
+        outputToken.text = [`${outputToken.text}`,
+        `{{ (printf \`<!--bookshop-live context(.: (index (${iterator}) %d))-->\` ${index_variable}) | safeHTML }}`
+        ].join('')
+    } else if (liveMarkup && tokens.LOOP.test(raw)) {
         let [, iterator] = raw.match(tokens.LOOP);
         outputToken.text = [`{{ $bookshop__live__iterator := 0 }}`,
             `${outputToken.text}`,
@@ -48,13 +55,19 @@ const rewriteTag = function (token, src, endTags, liveMarkup) {
         ].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 }}`
+        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 }}`
+        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 }}`
+        outputToken.text = `{{ \`<!--bookshop-live name(${name}) params(.: (${params}))-->\` | 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}`,
+            `{{ \`<!--bookshop-live end-->\` | safeHTML }}`
+        ].join('');
     }
 
     return outputToken;

package/lib/translateTextTemplate.test.js

@@ -4,26 +4,37 @@ import translateTextTemplate from './translateTextTemplate.js';
 test("add live markup to bookshop tags", t => {
     const input = `{{ partial "bookshop" (slice "content" (dict "content_html" .Params.note_html "type" "note")) }}`;
     const expected = [
-        `{{ \`<!--bookshop-live name(content) params(.: (dict "content_html" .Params.note_html "type" "note"))-->\` | safeHTML }}`,
+        `{{ \`<!--bookshop-live name(content) params(.: ((dict "content_html" .Params.note_html "type" "note")))-->\` | safeHTML }}`,
         `{{ partial "bookshop" (slice "content" (dict "content_html" .Params.note_html "type" "note")) }}`,
         `{{ \`<!--bookshop-live end-->\` | safeHTML }}`
     ].join('');
     t.is(translateTextTemplate(input, {}), expected);
 });
 
-test("add live markup to bookshop_partial tags", t => {
-    const input = `{{ partial "bookshop_partial" (slice "helper" (dict "text" "input")) }}`;
+test("add live markup to scoped bookshop tags", t => {
+    const input = `{{ partial "bookshop" . }}`;
     const expected = [
-        `{{ \`<!--bookshop-live name(helper) params(.: (dict "text" "input"))-->\` | safeHTML }}`,
-        `{{ partial "bookshop_partial" (slice "helper" (dict "text" "input")) }}`,
+        `{{ 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 }}`,
+        `{{ partial "bookshop" . }}`,
         `{{ \`<!--bookshop-live end-->\` | safeHTML }}`
     ].join('');
     t.is(translateTextTemplate(input, {}), expected);
 });
 
+test("don't add live markup to bookshop_partial tags", t => {
+    const input = `{{ partial "bookshop_partial" (slice "helper" (dict "text" "input")) }}`;
+    const expected = `{{ partial "bookshop_partial" (slice "helper" (dict "text" "input")) }}`;
+    t.is(translateTextTemplate(input, {}), expected);
+});
+
 test("add live markup to assigns", t => {
-    const input = `{{ $a := .b }}`;
-    const expected = `{{ $a := .b }}{{ \`<!--bookshop-live context($a: .b)-->\` | safeHTML }}`;
+    let input = `{{ $a := .b }}`;
+    let expected = `{{ $a := .b }}{{ \`<!--bookshop-live context($a: (.b))-->\` | safeHTML }}`;
+    t.is(translateTextTemplate(input, {}), expected);
+
+    input = `{{ $a := .b | chomp }}`;
+    expected = `{{ $a := .b | chomp }}{{ \`<!--bookshop-live context($a: (.b | chomp))-->\` | safeHTML }}`;
     t.is(translateTextTemplate(input, {}), expected);
 });
 
@@ -31,7 +42,7 @@ test("add live markup to withs", t => {
     const input = `{{ with .b }}<p>{{.}}</p>{{ end }}`;
     const expected = [`{{ with .b }}`,
         `{{ \`<!--bookshop-live stack-->\` | safeHTML }}`,
-        `{{ \`<!--bookshop-live context(.: .b)-->\` | safeHTML }}`,
+        `{{ \`<!--bookshop-live context(.: (.b))-->\` | safeHTML }}`,
         `<p>{{.}}</p>`,
         `{{ \`<!--bookshop-live unstack-->\` | safeHTML }}`,
         `{{ end }}`
@@ -53,6 +64,18 @@ test("add live markup to loops", t => {
     t.is(translateTextTemplate(input, {}), expected);
 });
 
+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 }}`,
+        `<p>{{$element}}</p>`,
+        `{{ \`<!--bookshop-live unstack-->\` | safeHTML }}`,
+        `{{ end }}`
+    ].join('');
+    t.is(translateTextTemplate(input, {}), expected);
+});
+
 test("add live markup to complex end structures", t => {
     const input = `
 {{ range .items }}
@@ -73,14 +96,14 @@ test("add live markup to complex end structures", t => {
     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) }}
 
-    {{with .text}}{{ \`<!--bookshop-live stack-->\` | safeHTML }}{{ \`<!--bookshop-live context(.: .text)-->\` | safeHTML }}
+    {{with .text}}{{ \`<!--bookshop-live stack-->\` | safeHTML }}{{ \`<!--bookshop-live context(.: (.text))-->\` | safeHTML }}
     <p>{{ . }}</p>
     {{ \`<!--bookshop-live unstack-->\` | safeHTML }}{{ end }}
 
     {{ if .subtitle }}
         <h2>{{ .subtitle }}</h2>
     {{ else }}
-        {{ with .excerpt }}{{ \`<!--bookshop-live stack-->\` | safeHTML }}{{ \`<!--bookshop-live context(.: .excerpt)-->\` | safeHTML }}
+        {{ with .excerpt }}{{ \`<!--bookshop-live stack-->\` | safeHTML }}{{ \`<!--bookshop-live context(.: (.excerpt))-->\` | safeHTML }}
         <p>{{ . }}</p>
         {{ \`<!--bookshop-live unstack-->\` | safeHTML }}{{end}}
     {{ end }}

package/package.json

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

package/.nyc_output/processinfo/f5078748-1e55-4d0b-ae19-a8a1cb800295.json

@@ -1 +0,0 @@
-{"parent":null,"pid":33681,"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":1643512427154,"ppid":33680,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/f5078748-1e55-4d0b-ae19-a8a1cb800295.json","externalId":"","uuid":"f5078748-1e55-4d0b-ae19-a8a1cb800295","files":[]}