@bookshop/hugo-engine 3.4.0-beta.2 → 3.4.0-beta.3

package/.nyc_output/processinfo/{0d71b778-7933-4ad7-b3a3-a0ab8fb25087.json → 344d16a6-acc4-4349-b4c7-ffdc41d3e64f.json}

@@ -1 +1 @@
-{"parent":"288189b4-5618-4616-9a86-8209c52bfa78","pid":5524,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1670976826633,"ppid":5513,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/0d71b778-7933-4ad7-b3a3-a0ab8fb25087.json","externalId":"","uuid":"0d71b778-7933-4ad7-b3a3-a0ab8fb25087","files":[]}
+{"parent":"c1702c73-10b3-4031-a62b-78de0f5a0eda","pid":5464,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1671138230217,"ppid":5424,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/344d16a6-acc4-4349-b4c7-ffdc41d3e64f.json","externalId":"","uuid":"344d16a6-acc4-4349-b4c7-ffdc41d3e64f","files":[]}

package/.nyc_output/processinfo/{3a20cbf5-03a8-4e28-9134-bcbe4e3999da.json → ad191300-a822-422a-892c-f6bdd9f65622.json}

@@ -1 +1 @@
-{"parent":"288189b4-5618-4616-9a86-8209c52bfa78","pid":5547,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1670976826988,"ppid":5513,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/3a20cbf5-03a8-4e28-9134-bcbe4e3999da.json","externalId":"","uuid":"3a20cbf5-03a8-4e28-9134-bcbe4e3999da","files":[]}
+{"parent":"c1702c73-10b3-4031-a62b-78de0f5a0eda","pid":5441,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1671138229848,"ppid":5424,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/ad191300-a822-422a-892c-f6bdd9f65622.json","externalId":"","uuid":"ad191300-a822-422a-892c-f6bdd9f65622","files":[]}

package/.nyc_output/processinfo/{440df8ed-01d8-4b4a-86a4-141986b1c583.json → b63e9a5b-2daa-4333-9cbc-511e31b8dec0.json}

@@ -1 +1 @@
-{"parent":"288189b4-5618-4616-9a86-8209c52bfa78","pid":5530,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1670976826639,"ppid":5513,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/440df8ed-01d8-4b4a-86a4-141986b1c583.json","externalId":"","uuid":"440df8ed-01d8-4b4a-86a4-141986b1c583","files":[]}
+{"parent":"c1702c73-10b3-4031-a62b-78de0f5a0eda","pid":5435,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1671138229841,"ppid":5424,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/b63e9a5b-2daa-4333-9cbc-511e31b8dec0.json","externalId":"","uuid":"b63e9a5b-2daa-4333-9cbc-511e31b8dec0","files":[]}

package/.nyc_output/processinfo/c1702c73-10b3-4031-a62b-78de0f5a0eda.json

@@ -0,0 +1 @@
+{"parent":null,"pid":5424,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/cli.js","-v"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1671138229402,"ppid":5413,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/c1702c73-10b3-4031-a62b-78de0f5a0eda.json","externalId":"","uuid":"c1702c73-10b3-4031-a62b-78de0f5a0eda","files":[]}

package/.nyc_output/processinfo/{df2bb669-e900-4e87-9cf0-f9673bdda2d5.json → d9c4bafc-f898-4591-b134-c70616d033a8.json}

@@ -1 +1 @@
-{"parent":"288189b4-5618-4616-9a86-8209c52bfa78","pid":5546,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1670976826985,"ppid":5513,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/df2bb669-e900-4e87-9cf0-f9673bdda2d5.json","externalId":"","uuid":"df2bb669-e900-4e87-9cf0-f9673bdda2d5","files":[]}
+{"parent":"c1702c73-10b3-4031-a62b-78de0f5a0eda","pid":5457,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1671138230206,"ppid":5424,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/d9c4bafc-f898-4591-b134-c70616d033a8.json","externalId":"","uuid":"d9c4bafc-f898-4591-b134-c70616d033a8","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"0d71b778-7933-4ad7-b3a3-a0ab8fb25087":{"parent":"288189b4-5618-4616-9a86-8209c52bfa78","children":[]},"288189b4-5618-4616-9a86-8209c52bfa78":{"parent":null,"children":["0d71b778-7933-4ad7-b3a3-a0ab8fb25087","3a20cbf5-03a8-4e28-9134-bcbe4e3999da","440df8ed-01d8-4b4a-86a4-141986b1c583","df2bb669-e900-4e87-9cf0-f9673bdda2d5"]},"3a20cbf5-03a8-4e28-9134-bcbe4e3999da":{"parent":"288189b4-5618-4616-9a86-8209c52bfa78","children":[]},"440df8ed-01d8-4b4a-86a4-141986b1c583":{"parent":"288189b4-5618-4616-9a86-8209c52bfa78","children":[]},"df2bb669-e900-4e87-9cf0-f9673bdda2d5":{"parent":"288189b4-5618-4616-9a86-8209c52bfa78","children":[]}},"files":{},"externalIds":{}}
+{"processes":{"344d16a6-acc4-4349-b4c7-ffdc41d3e64f":{"parent":"c1702c73-10b3-4031-a62b-78de0f5a0eda","children":[]},"ad191300-a822-422a-892c-f6bdd9f65622":{"parent":"c1702c73-10b3-4031-a62b-78de0f5a0eda","children":[]},"b63e9a5b-2daa-4333-9cbc-511e31b8dec0":{"parent":"c1702c73-10b3-4031-a62b-78de0f5a0eda","children":[]},"c1702c73-10b3-4031-a62b-78de0f5a0eda":{"parent":null,"children":["344d16a6-acc4-4349-b4c7-ffdc41d3e64f","ad191300-a822-422a-892c-f6bdd9f65622","b63e9a5b-2daa-4333-9cbc-511e31b8dec0","d9c4bafc-f898-4591-b134-c70616d033a8"]},"d9c4bafc-f898-4591-b134-c70616d033a8":{"parent":"c1702c73-10b3-4031-a62b-78de0f5a0eda","children":[]}},"files":{},"externalIds":{}}

package/lib/engine.js

@@ -15,6 +15,22 @@ const dig = (obj, path) => {
     return obj;
 }
 
+let mapHugoVariablesToParams = (obj, path) => {
+    let resolved = {};
+    for (let [k,v] of Object.entries(obj)) {
+        if (k.startsWith('$')) {
+            const remapped = `__bksh_${k.substring(1)}`;
+            obj[remapped] = v;
+            resolved[k] = `${path}.${remapped}`;
+        } else {
+            if (typeof v === 'object' && !Array.isArray(v)) {
+                resolved = {...resolved, ...mapHugoVariablesToParams(v, `${path}.${k}`)}
+            }
+        }
+    }
+    return resolved
+}
+
 export class Engine {
     constructor(options) {
         options = {
@@ -224,24 +240,69 @@ export class Engine {
         }
     }
 
-    async eval(str, props = [{}]) {
+    async eval(str, props = [{}], logger) {
         while (!window.buildHugo) await sleep(10);
         let props_obj = props.reduce((a, b) => { return { ...a, ...b } });
+        let full_props = props_obj;
 
         // We're capable of looking up a simple variable
         // (and it's hard to pass to wasm since we store variables on the context)
         if (/^\$/.test(str)) {
-            return props_obj[str] ?? null;
+            logger?.log?.(`Trying to short circuit to return a variable`);
+            if (props_obj[str]) return props_obj[str];
         }
 
         // If we have assigned a root scope we need to pass that in as the context
-        if (props_obj["."]) props_obj = props_obj["."];
+        if (props_obj["."]) {
+            logger?.log?.(`Nesting the props object into its dot scope`);
+            props_obj = props_obj["."];
+        }
+
+        if (str === ".") {
+            logger?.log?.(`Short circuiting dot notation to return the scope`);
+            return props_obj;
+        }
+
+        let normalized = this.normalize(str);
+        if (typeof normalized === 'object') {
+            logger?.log?.(`Digging into the object ${JSON.stringify(normalized)}`);
+            const process = async (obj)  => {
+                for (const [k,v] of Object.entries(obj)) {
+                    if (typeof v === "string") {
+                        if (/^".*"$/.test(v)) {
+                            // Normalized strings look like "\"string\""
+                            logger?.log?.(`Unwrapping the string ${k}: ${v}`);
+                            obj[k] = JSON.parse(v);
+                        } else {
+                            // No inner quotes means it needs to be evaled again
+                            logger?.log?.(`Evaluating the inner ${k}: ${v}`);
+                            obj[k] = await this.eval(v, [props_obj], logger.nested());
+                        }
+                    } else if (typeof v === "object") {
+                        logger?.log?.(`Processing the inner object ${k}`);
+                    }
+                }
+            }
+            await process(normalized);
+            return normalized;
+        }
+        if (/^\w+(\.\w+)*$/.test(normalized)) {
+            logger?.log?.(`Trying to short circuit to return the dot notation ${normalized}`);
+            // We're capable of looking up a simple dot notation access
+            const result = dig(props_obj, normalized);
+            if (result !== undefined) return result
+        }
 
         // Rewrite array.0 into index array 0
         str = str.replace(/(.*)\.(\d+)$/, (_, obj, index) => {
             return `index (${obj}) ${index}`;
         })
 
+        const variable_pairs = mapHugoVariablesToParams(full_props, ".Params.full_props");
+        const variable_decl = Object.entries(variable_pairs).map(([k,v]) => {
+            return `{{ ${k} := ${v} }}`
+        }).join('');
+
         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.Unmarshal ) "a" }}`
@@ -251,10 +312,10 @@ export class Engine {
                 return `{{ ${key} := ${JSON.stringify(value)} }}`
             }
         }).join('');
-        const eval_str = `{{ with .Params.props }}${assignments}{{ jsonify (${str}) }}{{ end }}`;
+        const eval_str = `${variable_decl}{{ with .Params.props }}${assignments}{{ jsonify (${str}) }}{{ end }}`;
         window.writeHugoFiles(JSON.stringify({
             "layouts/index.html": eval_str,
-            "content/_index.md": JSON.stringify({ props: props_obj }, null, 2)
+            "content/_index.md": JSON.stringify({ props: props_obj, full_props: full_props }, null, 2)
         }));
 
         const buildError = window.buildHugo();

package/lib/hugoIdentifierParser.js

@@ -36,11 +36,6 @@ export class IdentifierParser {
       return `${variable}.${index}`;
     }
 
-    // strip the leading .Params. from basic variable references
-    // if (/^\s*\./.test(this.input)) {
-    //   return this.input.replace(/^\s*\.Params\.([^\.\s])/, '$1');
-    // }
-
     // strip the leading . from basic variable references
     if (/^\s*\./.test(this.input)) {
       return this.input.replace(/^\s*\.([^\.\s])/, '$1');

package/package.json

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

package/.nyc_output/processinfo/288189b4-5618-4616-9a86-8209c52bfa78.json

@@ -1 +0,0 @@
-{"parent":null,"pid":5513,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/cli.js","-v"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1670976826223,"ppid":5502,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/288189b4-5618-4616-9a86-8209c52bfa78.json","externalId":"","uuid":"288189b4-5618-4616-9a86-8209c52bfa78","files":[]}