unhead 1.10.2 → 1.10.4

package/dist/index.cjs

@@ -537,7 +537,7 @@ function useScript(_input, _options) {
   const id = resolveScriptKey(input);
   const prevScript = head._scripts?.[id];
   if (prevScript) {
-    prevScript.updateTrigger(options.trigger);
+    prevScript.setupTriggerHandler(options.trigger);
     return prevScript;
   }
   options.beforeInit?.();
@@ -600,6 +600,8 @@ function useScript(_input, _options) {
       return false;
     },
     load(cb) {
+      script._triggerAbortController?.abort();
+      script._triggerPromises = [];
       if (!script.entry) {
         syncStatus("loading");
         const defaults = {
@@ -624,20 +626,23 @@ function useScript(_input, _options) {
     onError(cb) {
       return _registerCb("error", cb);
     },
-    updateTrigger(trigger) {
-      script._triggerAbortController?.abort();
+    setupTriggerHandler(trigger) {
+      if (script.status !== "awaitingLoad") {
+        return;
+      }
       if ((typeof trigger === "undefined" || trigger === "client") && !head.ssr || trigger === "server") {
         script.load();
       } else if (trigger instanceof Promise) {
-        script._triggerAbortController = new AbortController();
-        Promise.race([
+        script._triggerAbortController = script._triggerAbortController || new AbortController();
+        script._triggerPromises = script._triggerPromises || [];
+        script._triggerPromises.push(Promise.race([
           trigger.then(() => script.load),
           new Promise((resolve) => {
             script._triggerAbortController.signal.addEventListener("abort", () => resolve());
           })
         ]).then((res2) => {
           res2?.();
-        });
+        }));
       } else if (typeof trigger === "function") {
         trigger(script.load);
       }
@@ -655,7 +660,7 @@ function useScript(_input, _options) {
     _cbs.error = null;
   });
   const hookCtx = { script };
-  script.updateTrigger(options.trigger);
+  script.setupTriggerHandler(options.trigger);
   script.$script = script;
   const proxyChain = (instance, accessor, accessors) => {
     return new Proxy((!accessor ? instance : instance?.[accessor]) || scriptProxy, {
@@ -694,7 +699,7 @@ function useScript(_input, _options) {
   script.proxy = proxyChain(script.instance);
   const res = new Proxy(script, {
     get(_, k) {
-      const target = k in script ? script : script.proxy;
+      const target = k in script || String(k)[0] === "_" ? script : script.proxy;
       if (k === "then" || k === "catch") {
         return script[k].bind(script);
       }

package/dist/index.mjs

@@ -536,7 +536,7 @@ function useScript(_input, _options) {
   const id = resolveScriptKey(input);
   const prevScript = head._scripts?.[id];
   if (prevScript) {
-    prevScript.updateTrigger(options.trigger);
+    prevScript.setupTriggerHandler(options.trigger);
     return prevScript;
   }
   options.beforeInit?.();
@@ -599,6 +599,8 @@ function useScript(_input, _options) {
       return false;
     },
     load(cb) {
+      script._triggerAbortController?.abort();
+      script._triggerPromises = [];
       if (!script.entry) {
         syncStatus("loading");
         const defaults = {
@@ -623,20 +625,23 @@ function useScript(_input, _options) {
     onError(cb) {
       return _registerCb("error", cb);
     },
-    updateTrigger(trigger) {
-      script._triggerAbortController?.abort();
+    setupTriggerHandler(trigger) {
+      if (script.status !== "awaitingLoad") {
+        return;
+      }
       if ((typeof trigger === "undefined" || trigger === "client") && !head.ssr || trigger === "server") {
         script.load();
       } else if (trigger instanceof Promise) {
-        script._triggerAbortController = new AbortController();
-        Promise.race([
+        script._triggerAbortController = script._triggerAbortController || new AbortController();
+        script._triggerPromises = script._triggerPromises || [];
+        script._triggerPromises.push(Promise.race([
           trigger.then(() => script.load),
           new Promise((resolve) => {
             script._triggerAbortController.signal.addEventListener("abort", () => resolve());
           })
         ]).then((res2) => {
           res2?.();
-        });
+        }));
       } else if (typeof trigger === "function") {
         trigger(script.load);
       }
@@ -654,7 +659,7 @@ function useScript(_input, _options) {
     _cbs.error = null;
   });
   const hookCtx = { script };
-  script.updateTrigger(options.trigger);
+  script.setupTriggerHandler(options.trigger);
   script.$script = script;
   const proxyChain = (instance, accessor, accessors) => {
     return new Proxy((!accessor ? instance : instance?.[accessor]) || scriptProxy, {
@@ -693,7 +698,7 @@ function useScript(_input, _options) {
   script.proxy = proxyChain(script.instance);
   const res = new Proxy(script, {
     get(_, k) {
-      const target = k in script ? script : script.proxy;
+      const target = k in script || String(k)[0] === "_" ? script : script.proxy;
       if (k === "then" || k === "catch") {
         return script[k].bind(script);
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unhead",
   "type": "module",
-  "version": "1.10.2",
+  "version": "1.10.4",
   "author": {
     "name": "Harlan Wilton",
     "email": "harlan@harlanzw.com",
@@ -34,9 +34,9 @@
   ],
   "dependencies": {
     "hookable": "^5.5.3",
-    "@unhead/dom": "1.10.2",
-    "@unhead/shared": "1.10.2",
-    "@unhead/schema": "1.10.2"
+    "@unhead/dom": "1.10.4",
+    "@unhead/shared": "1.10.4",
+    "@unhead/schema": "1.10.4"
   },
   "scripts": {
     "build": "unbuild .",