@jxsuite/runtime 4.0.3 → 4.1.0

package/dist/runtime.js

@@ -3036,7 +3036,9 @@ function evaluateAttrTemplate(str, state) {
 }
 var _moduleCache = new Map;
 var _moduleLoaders = new Map;
+var _hostSeeded = new Set;
 function preloadModule(specifier, mod) {
+  _hostSeeded.add(specifier);
   if (typeof mod === "function") {
     _moduleCache.delete(specifier);
     _moduleLoaders.set(specifier, mod);
@@ -4290,32 +4292,32 @@ async function resolveViaDevProxy(def, state, key, base) {
   }
   return s;
 }
+function latestServerCall(s, invoke, label) {
+  let seq = 0;
+  return (args) => {
+    seq += 1;
+    const n = seq;
+    new Promise((settle) => {
+      settle(invoke(args));
+    }).then((result) => {
+      if (n === seq) {
+        s.value = result;
+      }
+    }).catch((error) => {
+      if (n === seq) {
+        console.error(label, error);
+      }
+    });
+  };
+}
 async function resolveServerFunction(def, state, key, base) {
   const src = def.$src;
   const exportName = def.$export;
-  let mod;
-  const seeded = seededModule(src);
-  if (seeded instanceof Promise) {
-    mod = await seeded;
-  } else if (seeded) {
-    mod = seeded;
-  } else {
-    try {
-      mod = await import(src);
-    } catch {
-      if (base) {
-        try {
-          const resolvedSrc = new URL(src, base).href;
-          mod = await import(resolvedSrc);
-        } catch {
-          return resolveServerFunctionViaProxy(def, state, key, base);
-        }
-      } else {
-        return resolveServerFunctionViaProxy(def, state, key, base);
-      }
-    }
-    _moduleCache.set(src, mod);
+  const seeded = _hostSeeded.has(src) ? seededModule(src) : undefined;
+  if (!seeded) {
+    return resolveServerFunctionViaProxy(def, state, key, base);
   }
+  const mod = seeded instanceof Promise ? await seeded : seeded;
   const candidate = mod[exportName] ?? mod.default?.[exportName];
   if (!candidate) {
     throw new Error(`Jx: export "${exportName}" not found in "${src}" for "${key}"`);
@@ -4335,12 +4337,11 @@ async function resolveServerFunction(def, state, key, base) {
   };
   const s = ref(null);
   if (hasReactiveArg) {
+    const call = latestServerCall(s, fn, "Jx server function:");
     effect(() => {
       const args = resolveArgs();
       onEffectCleanup(() => {});
-      fn(args).then((result) => {
-        s.value = result;
-      }).catch(() => {});
+      call(args);
     });
   } else {
     s.value = await fn(resolveArgs());
@@ -4373,18 +4374,15 @@ async function resolveServerFunctionViaProxy(def, state, key, base) {
     return r.json();
   });
   const s = ref(null);
+  const call = latestServerCall(s, doResolve, "Jx server proxy:");
   if (hasReactiveArg) {
     effect(() => {
       const args = resolveArgs();
       onEffectCleanup(() => {});
-      doResolve(args).then((result) => {
-        s.value = result;
-      }).catch((error) => console.error("Jx server proxy:", error));
+      call(args);
     });
   } else {
-    doResolve(resolveArgs()).then((result) => {
-      s.value = result;
-    }).catch((error) => console.error("Jx server proxy:", error));
+    call(resolveArgs());
   }
   return s;
 }
@@ -4941,5 +4939,5 @@ export {
   transposeCanvasUnits
 };
 
-//# debugId=AA34AE79F7363B3164756E2164756E21
+//# debugId=9BAF2C3B31911D4B64756E2164756E21
 //# sourceMappingURL=runtime.js.map