marko 6.0.0-next.3.59 → 6.0.0-next.3.60

package/dist/common/types.d.ts

@@ -45,7 +45,13 @@ export declare enum AccessorChar {
     ControlledValue = ":",
     ControlledHandler = ";",
     ControlledType = "=",
-    Getter = ">"
+    Getter = ">",
+    BranchAccessor = "*",
+    CatchContent = "^",
+    PlaceholderContent = "%",
+    PlaceholderBranch = "#",
+    PendingCount = ".",
+    Promise = "?"
 }
 export declare enum NodeType {
     Element = 1,

package/dist/debug/dom.js

@@ -25,6 +25,7 @@ __export(dom_exports, {
   attrTags: () => attrTags,
   attrs: () => attrs,
   attrsEvents: () => attrsEvents,
+  awaitTag: () => awaitTag,
   classAttr: () => classAttr,
   compat: () => compat,
   conditional: () => conditional,
@@ -44,11 +45,13 @@ __export(dom_exports, {
   createContent: () => createContent,
   createRenderer: () => createRenderer,
   createTemplate: () => createTemplate,
+  createTry: () => createTry,
   data: () => data,
   dynamicClosure: () => dynamicClosure,
   dynamicClosureRead: () => dynamicClosureRead,
   dynamicTag: () => dynamicTag,
   effect: () => effect,
+  enableCatch: () => enableCatch,
   forIn: () => forIn,
   forOf: () => forOf,
   forTo: () => forTo,
@@ -1028,134 +1031,15 @@ function insertBranchBefore(branch, parentNode, nextSibling) {
     branch.___endNode
   );
 }
-
-// src/dom/queue.ts
-var pendingRenders = [];
-var pendingRendersLookup = /* @__PURE__ */ new Map();
-var pendingEffects = [];
-var rendering = false;
-var scopeKeyOffset = 1e3;
-function queueRender(scope, signal, signalKey, value2, scopeKey = scope.___id) {
-  const key = scopeKey * scopeKeyOffset + signalKey;
-  const existingRender = signalKey >= 0 && pendingRendersLookup.get(key);
-  if (existingRender) {
-    existingRender.___value = value2;
-  } else {
-    const render = {
-      ___key: key,
-      ___scope: scope,
-      ___signal: signal,
-      ___value: value2
-    };
-    let i = pendingRenders.push(render) - 1;
-    while (i) {
-      const parentIndex = i - 1 >> 1;
-      const parent = pendingRenders[parentIndex];
-      if (key - parent.___key >= 0) break;
-      pendingRenders[i] = parent;
-      i = parentIndex;
-    }
-    signalKey >= 0 && pendingRendersLookup.set(key, render);
-    pendingRenders[i] = render;
-  }
-}
-function queueEffect(scope, fn) {
-  pendingEffects.push(fn, scope);
-}
-function run() {
-  const effects = pendingEffects;
-  try {
-    rendering = true;
-    runRenders();
-  } finally {
-    pendingRenders = [];
-    pendingRendersLookup = /* @__PURE__ */ new Map();
-    pendingEffects = [];
-    rendering = false;
-  }
-  runEffects(effects);
-}
-function prepareEffects(fn) {
-  const prevRenders = pendingRenders;
-  const prevRendersLookup = pendingRendersLookup;
-  const prevEffects = pendingEffects;
-  const preparedEffects = pendingEffects = [];
-  pendingRenders = [];
-  pendingRendersLookup = /* @__PURE__ */ new Map();
-  try {
-    rendering = true;
-    fn();
-    runRenders();
-  } finally {
-    rendering = false;
-    pendingRenders = prevRenders;
-    pendingRendersLookup = prevRendersLookup;
-    pendingEffects = prevEffects;
-  }
-  return preparedEffects;
-}
-function runEffects(effects) {
-  for (let i = 0, scope; i < effects.length; ) {
-    effects[i++](
-      scope = effects[i++],
-      scope
-    );
-  }
-}
-function runRenders() {
-  while (pendingRenders.length) {
-    const render = pendingRenders[0];
-    const item = pendingRenders.pop();
-    if (render !== item) {
-      let i = 0;
-      const mid = pendingRenders.length >> 1;
-      const key = (pendingRenders[0] = item).___key;
-      while (i < mid) {
-        let bestChild = (i << 1) + 1;
-        const right = bestChild + 1;
-        if (right < pendingRenders.length && pendingRenders[right].___key - pendingRenders[bestChild].___key < 0) {
-          bestChild = right;
-        }
-        if (pendingRenders[bestChild].___key - key >= 0) {
-          break;
-        } else {
-          pendingRenders[i] = pendingRenders[bestChild];
-          i = bestChild;
-        }
-      }
-      pendingRenders[i] = item;
-    }
-    if (!render.___scope.___closestBranch?.___destroyed) {
-      render.___signal(render.___scope, render.___value);
-    }
-  }
-  finishPendingScopes();
-}
-
-// src/dom/abort-signal.ts
-function resetAbortSignal(scope, id) {
-  const ctrl = scope.___abortControllers?.[id];
-  if (ctrl) {
-    queueEffect(ctrl, abort);
-    scope.___abortControllers[id] = void 0;
-  }
-}
-function getAbortSignal(scope, id) {
-  if (scope.___closestBranch) {
-    (scope.___closestBranch.___abortScopes ||= /* @__PURE__ */ new Set()).add(scope);
-  }
-  return ((scope.___abortControllers ||= {})[id] ||= new AbortController()).signal;
-}
-function abort(ctrl) {
-  ctrl.abort();
+function tempDetatchBranch(branch) {
+  insertChildNodes(
+    branch.___startNode.ownerDocument.createDocumentFragment(),
+    null,
+    branch.___startNode,
+    branch.___endNode
+  );
 }
 
-// src/common/compat-meta.ts
-var prefix = true ? "$compat_" : "$C_";
-var RENDERER_REGISTER_ID = prefix + (true ? "renderer" : "r");
-var SET_SCOPE_REGISTER_ID = prefix + (true ? "setScope" : "s");
-var RENDER_BODY_ID = prefix + (true ? "renderBody" : "b");
-
 // src/dom/reconcile.ts
 var WRONG_POS = 2147483647;
 function reconcile(parent, oldBranches, newBranches, afterReference) {
@@ -1732,6 +1616,132 @@ function hoist(...path) {
 }
 
 // src/dom/control-flow.ts
+function awaitTag(nodeAccessor, renderer) {
+  const promiseAccessor = nodeAccessor + "?" /* Promise */;
+  const branchAccessor = nodeAccessor + "!" /* ConditionalScope */;
+  return (scope, promise) => {
+    let tryBranch = scope.___closestBranch;
+    let awaitBranch = scope[branchAccessor];
+    const referenceNode = scope[nodeAccessor];
+    const namespaceNode = (awaitBranch?.___startNode ?? referenceNode).parentNode;
+    while (tryBranch && !tryBranch["%" /* PlaceholderContent */]) {
+      tryBranch = tryBranch.___parentBranch;
+    }
+    const thisPromise = scope[promiseAccessor] = promise.then((data2) => {
+      if (scope.___closestBranch?.___destroyed || scope[promiseAccessor] !== thisPromise) {
+        return;
+      }
+      scope[promiseAccessor] = void 0;
+      const effects = prepareEffects(() => {
+        if (!awaitBranch || !tryBranch) {
+          insertBranchBefore(
+            awaitBranch ??= scope[branchAccessor] = createAndSetupBranch(
+              scope.$global,
+              renderer,
+              scope,
+              namespaceNode
+            ),
+            referenceNode.parentNode,
+            referenceNode
+          );
+          referenceNode.remove();
+        }
+        renderer.___params?.(awaitBranch, [data2]);
+      });
+      if (tryBranch) {
+        if (!--tryBranch["." /* PendingCount */]) {
+          const placeholderBranch = tryBranch["#" /* PlaceholderBranch */];
+          if (placeholderBranch) {
+            insertBranchBefore(
+              tryBranch,
+              placeholderBranch.___startNode.parentNode,
+              placeholderBranch.___startNode
+            );
+            removeAndDestroyBranch(placeholderBranch);
+          } else {
+            insertBranchBefore(
+              tryBranch,
+              referenceNode.parentNode,
+              referenceNode
+            );
+          }
+        }
+      } else {
+        runEffects(effects);
+      }
+    }).catch((error) => {
+      let tryBranch2 = scope.___closestBranch;
+      while (tryBranch2 && !tryBranch2["^" /* CatchContent */]) {
+        tryBranch2 = tryBranch2.___parentBranch;
+      }
+      if (!tryBranch2) {
+        setTimeout(() => {
+          throw error;
+        });
+      } else {
+        setConditionalRenderer(
+          tryBranch2._,
+          tryBranch2["*" /* BranchAccessor */],
+          tryBranch2["^" /* CatchContent */],
+          createAndSetupBranch
+        );
+        tryBranch2["^" /* CatchContent */].___params?.(
+          tryBranch2._[tryBranch2["*" /* BranchAccessor */] + "!" /* ConditionalScope */],
+          [error]
+        );
+      }
+    });
+    if (tryBranch) {
+      if (!tryBranch["." /* PendingCount */]) {
+        tryBranch["." /* PendingCount */] = 0;
+        requestAnimationFrame(() => {
+          if (tryBranch["." /* PendingCount */] && !tryBranch.___destroyed) {
+            const placeholderBranch = tryBranch["#" /* PlaceholderBranch */] = createAndSetupBranch(
+              scope.$global,
+              tryBranch["%" /* PlaceholderContent */],
+              tryBranch._,
+              tryBranch.___startNode.parentNode
+            );
+            insertBranchBefore(
+              placeholderBranch,
+              tryBranch.___startNode.parentNode,
+              tryBranch.___startNode
+            );
+            tempDetatchBranch(tryBranch);
+          }
+        });
+      }
+      tryBranch["." /* PendingCount */]++;
+    } else if (awaitBranch) {
+      awaitBranch.___startNode.parentNode.insertBefore(
+        referenceNode,
+        awaitBranch.___startNode
+      );
+      tempDetatchBranch(awaitBranch);
+    }
+  };
+}
+function createTry(nodeAccessor, tryContent) {
+  const branchAccessor = nodeAccessor + "!" /* ConditionalScope */;
+  return (scope, input) => {
+    if (!scope[branchAccessor]) {
+      setConditionalRenderer(
+        scope,
+        nodeAccessor,
+        tryContent,
+        createAndSetupBranch
+      );
+    }
+    const branch = scope[branchAccessor];
+    if (branch) {
+      branch["*" /* BranchAccessor */] = nodeAccessor;
+      branch["^" /* CatchContent */] = normalizeDynamicRenderer(input.catch);
+      branch["%" /* PlaceholderContent */] = normalizeDynamicRenderer(
+        input.placeholder
+      );
+    }
+  };
+}
 function conditional(nodeAccessor, ...branches) {
   const branchAccessor = nodeAccessor + "(" /* ConditionalRenderer */;
   return (scope, newBranch) => {
@@ -1927,6 +1937,161 @@ function byFirstArg(name) {
   return name;
 }
 
+// src/dom/queue.ts
+var pendingRenders = [];
+var pendingRendersLookup = /* @__PURE__ */ new Map();
+var pendingEffects = [];
+var rendering = false;
+var scopeKeyOffset = 1e3;
+function queueRender(scope, signal, signalKey, value2, scopeKey = scope.___id) {
+  const key = scopeKey * scopeKeyOffset + signalKey;
+  const existingRender = signalKey >= 0 && pendingRendersLookup.get(key);
+  if (existingRender) {
+    existingRender.___value = value2;
+  } else {
+    const render = {
+      ___key: key,
+      ___scope: scope,
+      ___signal: signal,
+      ___value: value2
+    };
+    let i = pendingRenders.push(render) - 1;
+    while (i) {
+      const parentIndex = i - 1 >> 1;
+      const parent = pendingRenders[parentIndex];
+      if (key - parent.___key >= 0) break;
+      pendingRenders[i] = parent;
+      i = parentIndex;
+    }
+    signalKey >= 0 && pendingRendersLookup.set(key, render);
+    pendingRenders[i] = render;
+  }
+}
+function queueEffect(scope, fn) {
+  pendingEffects.push(fn, scope);
+}
+function run() {
+  const effects = pendingEffects;
+  try {
+    rendering = true;
+    runRenders();
+  } finally {
+    pendingRenders = [];
+    pendingRendersLookup = /* @__PURE__ */ new Map();
+    pendingEffects = [];
+    rendering = false;
+  }
+  runEffects(effects);
+}
+function prepareEffects(fn) {
+  const prevRenders = pendingRenders;
+  const prevRendersLookup = pendingRendersLookup;
+  const prevEffects = pendingEffects;
+  const preparedEffects = pendingEffects = [];
+  pendingRenders = [];
+  pendingRendersLookup = /* @__PURE__ */ new Map();
+  try {
+    rendering = true;
+    fn();
+    runRenders();
+  } finally {
+    rendering = false;
+    pendingRenders = prevRenders;
+    pendingRendersLookup = prevRendersLookup;
+    pendingEffects = prevEffects;
+  }
+  return preparedEffects;
+}
+function runEffects(effects) {
+  for (let i = 0, scope; i < effects.length; ) {
+    effects[i++](
+      scope = effects[i++],
+      scope
+    );
+  }
+}
+function runRenders() {
+  while (pendingRenders.length) {
+    const render = pendingRenders[0];
+    const item = pendingRenders.pop();
+    if (render !== item) {
+      let i = 0;
+      const mid = pendingRenders.length >> 1;
+      const key = (pendingRenders[0] = item).___key;
+      while (i < mid) {
+        let bestChild = (i << 1) + 1;
+        const right = bestChild + 1;
+        if (right < pendingRenders.length && pendingRenders[right].___key - pendingRenders[bestChild].___key < 0) {
+          bestChild = right;
+        }
+        if (pendingRenders[bestChild].___key - key >= 0) {
+          break;
+        } else {
+          pendingRenders[i] = pendingRenders[bestChild];
+          i = bestChild;
+        }
+      }
+      pendingRenders[i] = item;
+    }
+    if (!render.___scope.___closestBranch?.___destroyed) {
+      runRender(render);
+    }
+  }
+  finishPendingScopes();
+}
+var runRender = (render) => render.___signal(render.___scope, render.___value);
+var enableCatch = () => {
+  enableCatch = () => {
+  };
+  runRender = /* @__PURE__ */ ((runRender2) => (render) => {
+    try {
+      runRender2(render);
+    } catch (error) {
+      let branch = render.___scope.___closestBranch;
+      while (branch && !branch["^" /* CatchContent */])
+        branch = branch.___parentBranch;
+      if (!branch) {
+        throw error;
+      } else {
+        setConditionalRenderer(
+          branch._,
+          branch["*" /* BranchAccessor */],
+          branch["^" /* CatchContent */],
+          createAndSetupBranch
+        );
+        branch["^" /* CatchContent */].___params?.(
+          branch._[branch["*" /* BranchAccessor */] + "!" /* ConditionalScope */],
+          [error]
+        );
+      }
+    }
+  })(runRender);
+};
+
+// src/dom/abort-signal.ts
+function resetAbortSignal(scope, id) {
+  const ctrl = scope.___abortControllers?.[id];
+  if (ctrl) {
+    queueEffect(ctrl, abort);
+    scope.___abortControllers[id] = void 0;
+  }
+}
+function getAbortSignal(scope, id) {
+  if (scope.___closestBranch) {
+    (scope.___closestBranch.___abortScopes ||= /* @__PURE__ */ new Set()).add(scope);
+  }
+  return ((scope.___abortControllers ||= {})[id] ||= new AbortController()).signal;
+}
+function abort(ctrl) {
+  ctrl.abort();
+}
+
+// src/common/compat-meta.ts
+var prefix = true ? "$compat_" : "$C_";
+var RENDERER_REGISTER_ID = prefix + (true ? "renderer" : "r");
+var SET_SCOPE_REGISTER_ID = prefix + (true ? "setScope" : "s");
+var RENDER_BODY_ID = prefix + (true ? "renderBody" : "b");
+
 // src/dom/compat.ts
 var classIdToBranch = /* @__PURE__ */ new Map();
 var compat = {