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

package/.nyc_output/processinfo/1d5809f2-cba1-446b-bc0b-63d23a5c8b40.json

@@ -0,0 +1 @@
+{"parent":"75cca8a8-62fb-45f2-abfc-b9b1eb7092fa","pid":5443,"argv":["/opt/hostedtoolcache/node/16.19.0/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":1675127175845,"ppid":5426,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/1d5809f2-cba1-446b-bc0b-63d23a5c8b40.json","externalId":"","uuid":"1d5809f2-cba1-446b-bc0b-63d23a5c8b40","files":[]}

package/.nyc_output/processinfo/273b516c-98df-4cd5-ae7c-0a3e443463ad.json

@@ -0,0 +1 @@
+{"parent":"75cca8a8-62fb-45f2-abfc-b9b1eb7092fa","pid":5459,"argv":["/opt/hostedtoolcache/node/16.19.0/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":1675127176251,"ppid":5426,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/273b516c-98df-4cd5-ae7c-0a3e443463ad.json","externalId":"","uuid":"273b516c-98df-4cd5-ae7c-0a3e443463ad","files":[]}

package/.nyc_output/processinfo/6f96ab1c-b912-46da-bc10-4f63fdb94fa1.json

@@ -0,0 +1 @@
+{"parent":"75cca8a8-62fb-45f2-abfc-b9b1eb7092fa","pid":5465,"argv":["/opt/hostedtoolcache/node/16.19.0/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":1675127176263,"ppid":5426,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/6f96ab1c-b912-46da-bc10-4f63fdb94fa1.json","externalId":"","uuid":"6f96ab1c-b912-46da-bc10-4f63fdb94fa1","files":[]}

package/.nyc_output/processinfo/75cca8a8-62fb-45f2-abfc-b9b1eb7092fa.json

@@ -0,0 +1 @@
+{"parent":null,"pid":5426,"argv":["/opt/hostedtoolcache/node/16.19.0/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":1675127175377,"ppid":5415,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/75cca8a8-62fb-45f2-abfc-b9b1eb7092fa.json","externalId":"","uuid":"75cca8a8-62fb-45f2-abfc-b9b1eb7092fa","files":[]}

package/.nyc_output/processinfo/e639ed1a-a856-4b76-858a-dcea8f30f006.json

@@ -0,0 +1 @@
+{"parent":"75cca8a8-62fb-45f2-abfc-b9b1eb7092fa","pid":5437,"argv":["/opt/hostedtoolcache/node/16.19.0/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":1675127175838,"ppid":5426,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/e639ed1a-a856-4b76-858a-dcea8f30f006.json","externalId":"","uuid":"e639ed1a-a856-4b76-858a-dcea8f30f006","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"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":{}}
+{"processes":{"1d5809f2-cba1-446b-bc0b-63d23a5c8b40":{"parent":"75cca8a8-62fb-45f2-abfc-b9b1eb7092fa","children":[]},"273b516c-98df-4cd5-ae7c-0a3e443463ad":{"parent":"75cca8a8-62fb-45f2-abfc-b9b1eb7092fa","children":[]},"6f96ab1c-b912-46da-bc10-4f63fdb94fa1":{"parent":"75cca8a8-62fb-45f2-abfc-b9b1eb7092fa","children":[]},"75cca8a8-62fb-45f2-abfc-b9b1eb7092fa":{"parent":null,"children":["1d5809f2-cba1-446b-bc0b-63d23a5c8b40","273b516c-98df-4cd5-ae7c-0a3e443463ad","6f96ab1c-b912-46da-bc10-4f63fdb94fa1","e639ed1a-a856-4b76-858a-dcea8f30f006"]},"e639ed1a-a856-4b76-858a-dcea8f30f006":{"parent":"75cca8a8-62fb-45f2-abfc-b9b1eb7092fa","children":[]}},"files":{},"externalIds":{}}

package/lib/engine.js

@@ -17,14 +17,14 @@ const dig = (obj, path) => {
 
 let mapHugoVariablesToParams = (obj, path) => {
     let resolved = {};
-    for (let [k,v] of Object.entries(obj)) {
+    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}`)}
+            if (v && typeof v === 'object' && !Array.isArray(v)) {
+                resolved = { ...resolved, ...mapHugoVariablesToParams(v, `${path}.${k}`) }
             }
         }
     }
@@ -83,10 +83,27 @@ export class Engine {
 
     async initializeLocalCompressedHugo() {
         try {
+
+            let prefetched = {};
+            if (typeof window !== "undefined" && window?.CloudCannon && window?.CloudCannon?.prefetchedFiles) {
+                prefetched = await window.CloudCannon.prefetchedFiles?.();
+                this.availablePrefetchKeys = Object.keys(prefetched);
+            }
+
             const go = new Go();
             const compressedWasmOrigin = this.origin.replace(/\/[^\.\/]+\.(min\.)?js/, compressedHugoWasm.replace(/^\./, ''));
-            const compressedResponse = await fetch(compressedWasmOrigin);
-            const compressedBuffer = await compressedResponse.arrayBuffer();
+            const compressedWasmPath = (new URL(compressedWasmOrigin)).pathname;
+
+            let compressedBuffer;
+            if (prefetched[compressedWasmPath]) {
+                compressedBuffer = prefetched[compressedWasmPath]?.arrayBuffer();
+                this.loadedFrom = "prefetch";
+            } else {
+                const compressedResponse = await fetch(compressedWasmOrigin);
+                compressedBuffer = await compressedResponse.arrayBuffer();
+                this.loadedFrom = "network";
+            }
+
             const renderer = gunzipSync(new Uint8Array(compressedBuffer));
 
             // Check the magic word at the start of the buffer as a way to verify the CDN download worked.
@@ -266,8 +283,8 @@ export class Engine {
         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)) {
+            const process = async (obj) => {
+                for (const [k, v] of Object.entries(obj)) {
                     if (typeof v === "string") {
                         if (/^".*"$/.test(v)) {
                             // Normalized strings look like "\"string\""
@@ -299,7 +316,7 @@ export class Engine {
         })
 
         const variable_pairs = mapHugoVariablesToParams(full_props, ".Params.full_props");
-        const variable_decl = Object.entries(variable_pairs).map(([k,v]) => {
+        const variable_decl = Object.entries(variable_pairs).map(([k, v]) => {
             return `{{ ${k} := ${v} }}`
         }).join('');
 

package/package.json

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

package/.nyc_output/processinfo/344d16a6-acc4-4349-b4c7-ffdc41d3e64f.json

@@ -1 +0,0 @@
-{"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/ad191300-a822-422a-892c-f6bdd9f65622.json

@@ -1 +0,0 @@
-{"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/b63e9a5b-2daa-4333-9cbc-511e31b8dec0.json

@@ -1 +0,0 @@
-{"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

@@ -1 +0,0 @@
-{"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/d9c4bafc-f898-4591-b134-c70616d033a8.json

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