@jxsuite/runtime 6.0.2 → 6.2.0

package/dist/runtime.js

@@ -2790,11 +2790,22 @@ async function resolve(source, ctx) {
     if (contentType.includes("text/html")) {
       throw new Error(`Jx: ${source} returned HTML, not a document — the host answered a missing file with its ` + `app shell (a single-page fallback), so this path is not served.`);
     }
+    if (JXN_URL.test(source) && !contentType.includes("json")) {
+      if (!_documentParser) {
+        throw new Error(`Jx: ${source} is a .jxn file and this page has no parser for it. Serve it from a Jx ` + `site, which answers JSON, or call setDocumentParser(parseJxn) with parseJxn from ` + `@jxsuite/schema/jxn.`);
+      }
+      return _documentParser(await res.text(), source);
+    }
     return await res.json();
   });
   _resolveCache.set(source, p);
   return p;
 }
+var JXN_URL = /\.jxn(?:[?#]|$)/iu;
+var _documentParser = null;
+function setDocumentParser(parser) {
+  _documentParser = parser;
+}
 var SCHEMA_KEYWORDS2 = new Set([
   "type",
   "properties",
@@ -3143,16 +3154,51 @@ var _templateErrorHandler = null;
 function setTemplateErrorHandler(handler) {
   _templateErrorHandler = handler;
 }
+function warnTemplateError(source, error) {
+  if (!reportedTemplates.has(source)) {
+    reportedTemplates.add(source);
+    console.warn(`jx: template ${JSON.stringify(source)} threw:`, error);
+  }
+}
+var pendingLookups = 0;
+var heldTemplateErrors = new Map;
+var lookupWaiters = [];
+function holdTemplateErrorsFor(lookup) {
+  pendingLookups += 1;
+  lookup.finally(() => {
+    pendingLookups -= 1;
+    if (pendingLookups === 0) {
+      for (const { error, source } of heldTemplateErrors.values()) {
+        warnTemplateError(source, error);
+      }
+      heldTemplateErrors.clear();
+      for (const wake of lookupWaiters.splice(0)) {
+        wake();
+      }
+    }
+  });
+}
+function lookupsSettled() {
+  if (pendingLookups === 0) {
+    return Promise.resolve();
+  }
+  return new Promise((wake) => {
+    lookupWaiters.push(wake);
+  });
+}
 function bindTemplate(source, run, fallback) {
   effect(() => {
     try {
       run();
+      heldTemplateErrors.delete(run);
     } catch (error) {
+      const thrown = error instanceof Error ? error : new Error(String(error));
       if (_templateErrorHandler) {
-        _templateErrorHandler(error instanceof Error ? error : new Error(String(error)), source);
-      } else if (!reportedTemplates.has(source)) {
-        reportedTemplates.add(source);
-        console.warn(`jx: template ${JSON.stringify(source)} threw:`, error);
+        _templateErrorHandler(thrown, source);
+      } else if (pendingLookups > 0) {
+        heldTemplateErrors.set(run, { error: thrown, source });
+      } else {
+        warnTemplateError(source, thrown);
       }
       fallback?.();
     }
@@ -3344,7 +3390,27 @@ var RESERVED_KEYS = new Set([
   "observedAttributes"
 ]);
 function inheritScope(parent) {
-  return Object.create(parent);
+  const local = Object.create(parent);
+  return new Proxy(local, {
+    set(target, key, value) {
+      if (Object.hasOwn(target, key)) {
+        return Reflect.set(target, key, value);
+      }
+      if (key in parent) {
+        return Reflect.set(parent, key, value);
+      }
+      bindLocal(target, key, value);
+      return true;
+    }
+  });
+}
+function bindLocal(scope, key, value) {
+  Object.defineProperty(scope, key, {
+    configurable: true,
+    enumerable: true,
+    value,
+    writable: true
+  });
 }
 function scopeMedia(state) {
   return state["$media"] ?? {};
@@ -3390,7 +3456,7 @@ function renderNode(def, state, options) {
       if (localState === state) {
         localState = inheritScope(state);
       }
-      localState[key] = isRef2(val) ? resolveRef(val.$ref, state) : val;
+      bindLocal(localState, key, isRef2(val) ? resolveRef(val.$ref, state) : val);
     }
   }
   if ("$ref" in def && !def.tagName) {
@@ -3441,9 +3507,44 @@ function renderNode(def, state, options) {
         el.append(renderNode(child, localState, childOpts));
       }
     }
+  } else if (isTemplateString(kids)) {
+    renderComputedChildren(el, kids, localState, {
+      ...options,
+      _ns: childNs,
+      _path: [...path, "children"]
+    });
   }
   return el;
 }
+function renderComputedChildren(el, template, state, options) {
+  const path = options._path ?? [];
+  let live = null;
+  const retire = () => {
+    el.replaceChildren();
+    live?.stop();
+    live = null;
+  };
+  bindTemplate(template, () => {
+    const nodes = evaluateValueTemplate(template, state);
+    retire();
+    if (!Array.isArray(nodes)) {
+      return;
+    }
+    const scope = effectScope(true);
+    live = scope;
+    pauseTracking();
+    try {
+      scope.run(() => {
+        for (const [i, child] of nodes.entries()) {
+          el.append(renderNode(child, state, { ...options, _path: [...path, i] }));
+        }
+      });
+    } finally {
+      resetTracking();
+    }
+  }, retire);
+  onScopeDispose(() => live?.stop(), true);
+}
 function applyProperties(el, def, state) {
   for (const [key, val] of Object.entries(def)) {
     if (RESERVED_KEYS.has(key)) {
@@ -3886,7 +3987,7 @@ function renderMappedArrayInto(parentEl, arrayDef, state, options) {
   const createRow = (key, item, index) => {
     const map = shallowReactive({ index, item });
     const child = inheritScope(state);
-    child.$map = map;
+    bindLocal(child, "$map", map);
     Object.defineProperty(child, "$map/item", { enumerable: true, get: () => map.item });
     Object.defineProperty(child, "$map/index", { enumerable: true, get: () => map.index });
     const scope = effectScope(true);
@@ -4114,20 +4215,22 @@ async function resolvePrototype(def, state, key, base, ctx) {
               clearTimeout(debounceTimer);
             }
           });
-          const doFetch = () => fetch(url, {
-            method: def.method ?? "GET",
-            signal: controller.signal,
-            ...def.headers && { headers: def.headers },
-            ...def.body && {
-              body: isNonNullObject(def.body) ? JSON.stringify(def.body) : def.body
-            }
-          }).then((r) => r.ok ? r.json() : Promise.reject(r.statusText)).then((d) => {
-            s.value = d;
-          }).catch((error) => {
-            if (!(error instanceof Error && error.name === "AbortError")) {
-              s.value = { error: String(error) };
-            }
-          });
+          const doFetch = () => {
+            holdTemplateErrorsFor(fetch(url, {
+              method: def.method ?? "GET",
+              signal: controller.signal,
+              ...def.headers && { headers: def.headers },
+              ...def.body && {
+                body: isNonNullObject(def.body) ? JSON.stringify(def.body) : def.body
+              }
+            }).then((r) => r.ok ? r.json() : Promise.reject(r.statusText)).then((d) => {
+              s.value = d;
+            }).catch((error) => {
+              if (!(error instanceof Error && error.name === "AbortError")) {
+                s.value = { error: String(error) };
+              }
+            }));
+          };
           if (debounceMs > 0) {
             debounceTimer = setTimeout(doFetch, debounceMs);
           } else {
@@ -4454,20 +4557,21 @@ async function resolveViaDevProxy(def, state, key, base) {
     return r.json();
   });
   const s = ref(null);
+  const resolveInto = (resolvedConfig) => {
+    holdTemplateErrorsFor(doResolve(resolvedConfig).then((value) => {
+      s.value = value;
+    }).catch((error) => console.error("Jx dev proxy:", error)));
+  };
   if (hasTemplates) {
     effect(() => {
       const resolvedConfig = {};
       for (const [k, v] of Object.entries(config)) {
         resolvedConfig[k] = isTemplateString(v) ? evaluateTemplate(v, state) : v;
       }
-      doResolve(resolvedConfig).then((value) => {
-        s.value = value;
-      }).catch((error) => console.error("Jx dev proxy:", error));
+      resolveInto(resolvedConfig);
     });
   } else {
-    doResolve(config).then((value) => {
-      s.value = value;
-    }).catch((error) => console.error("Jx dev proxy:", error));
+    resolveInto(config);
   }
   return s;
 }
@@ -4476,7 +4580,7 @@ function latestServerCall(s, invoke, label) {
   return (args) => {
     seq += 1;
     const n = seq;
-    new Promise((settle) => {
+    holdTemplateErrorsFor(new Promise((settle) => {
       settle(invoke(args));
     }).then((result) => {
       if (n === seq) {
@@ -4486,7 +4590,7 @@ function latestServerCall(s, invoke, label) {
       if (n === seq) {
         console.error(label, error);
       }
-    });
+    }));
   };
 }
 async function resolveServerFunction(def, state, key, base) {
@@ -4664,7 +4768,7 @@ function mergeProps(def, parentState) {
     if (refusePrivateProp(k, "$props")) {
       continue;
     }
-    child[k] = isRef2(v) ? resolveRef(v.$ref, parentState) : v;
+    bindLocal(child, k, isRef2(v) ? resolveRef(v.$ref, parentState) : v);
   }
   return child;
 }
@@ -5223,6 +5327,7 @@ export {
   isNestedSelectorKey,
   isSignal,
   isSingleExpression,
+  lookupsSettled,
   mount,
   observeScope,
   preloadDocument,
@@ -5246,6 +5351,7 @@ export {
   setCanvasDelinkCommands,
   setCanvasDelinkPopovers,
   setCanvasViewportTranspose,
+  setDocumentParser,
   setNpmModuleResolver,
   setResolveToken,
   setRootMedia,
@@ -5261,5 +5367,5 @@ export {
   transposeCanvasUnits
 };
 
-//# debugId=938A15203F1CC52664756E2164756E21
+//# debugId=16998FE20281F1D164756E2164756E21
 //# sourceMappingURL=runtime.js.map