marko 6.0.0-next.3.57 → 6.0.0-next.3.59

package/dist/debug/dom.mjs

@@ -158,168 +158,197 @@ var DEFAULT_RENDER_ID = "_";
 
 // src/dom/resume.ts
 var registeredValues = {};
-var Render = class {
-  ___scopeStack = [];
-  ___scopeLookup = {};
-  ___serializeContext = {
-    _: registeredValues
-  };
-  constructor(renders, runtimeId, renderId) {
-    Object.assign(this, renders[renderId]);
-    this.___renders = renders;
-    this.___runtimeId = runtimeId;
-    this.___renderId = renderId;
-    this.___walk = this.w;
-    this.___resume();
-    this.w = () => {
-      this.___walk();
-      this.___resume();
-    };
-  }
-  ___resume() {
-    const serializeContext = this.___serializeContext;
-    const scopeLookup = this.___scopeLookup;
-    const visits = this.v;
-    const branchIds = /* @__PURE__ */ new Set();
-    const parentBranchIds = /* @__PURE__ */ new Map();
-    if (visits.length) {
-      const commentPrefix = this.i;
-      const commentPrefixLen = commentPrefix.length;
-      const closestBranchMarkers = /* @__PURE__ */ new Map();
-      const visitNodes = new Set(visits);
-      let lastEndNode;
-      this.v = [];
-      const branchEnd = (branchId, visit, reference) => {
-        const branch = scopeLookup[branchId] ||= {};
-        let endNode = reference;
-        while (visitNodes.has(endNode = endNode.previousSibling)) ;
-        if (endNode === lastEndNode) {
-          endNode = reference.parentNode.insertBefore(new Text(), reference);
-        }
-        branch.___endNode = lastEndNode = endNode;
-        branch.___startNode ||= endNode;
-        for (const [markerScopeId, markerNode] of closestBranchMarkers) {
-          if (branch.___startNode.compareDocumentPosition(markerNode) & 4 && reference.compareDocumentPosition(markerNode) & 2) {
-            parentBranchIds.set(markerScopeId, branchId);
-            closestBranchMarkers.delete(markerScopeId);
-          }
-        }
-        branchIds.add(branchId);
-        closestBranchMarkers.set(branchId, visit);
-        return branch;
-      };
-      for (const visit of visits) {
-        const commentText = visit.data;
-        const dataIndex = commentText.indexOf(" ") + 1;
-        const scopeId = commentText.slice(
-          commentPrefixLen + 1,
-          dataIndex ? dataIndex - 1 : commentText.length
-        );
-        const scope = scopeLookup[scopeId] ||= { ___id: +scopeId };
-        const data2 = dataIndex ? commentText.slice(dataIndex) : "";
-        const token = commentText[commentPrefixLen];
-        if (token === "*" /* Node */) {
-          const node = scope[data2] = visit.previousSibling;
-          scope[data2 + ">" /* Getter */] = () => node;
-        } else if (token === "$" /* ClosestBranch */) {
-          closestBranchMarkers.set(scopeId, visit);
-        } else if (token === "[" /* BranchStart */) {
-          if (this.___currentScopeId) {
-            if (dataIndex) {
-              branchEnd(this.___currentScopeId, visit, visit);
-            }
-            this.___scopeStack.push(this.___currentScopeId);
-          }
-          this.___currentScopeId = scopeId;
-          scope.___startNode = visit;
-        } else if (token === "]" /* BranchEnd */) {
-          scope[data2] = visit;
-          const curParent = visit.parentNode;
-          const startNode = branchEnd(
-            this.___currentScopeId,
-            visit,
-            visit
-          ).___startNode;
-          if (curParent !== startNode.parentNode) {
-            curParent.prepend(startNode);
-          }
-          this.___currentScopeId = this.___scopeStack.pop();
-        } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
-          let next = data2.indexOf(" ");
-          let curNode = visit;
-          scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
-          while (~next) {
-            const start = next + 1;
-            next = data2.indexOf(" ", start);
-            const childScopeId = data2.slice(start, ~next ? next : data2.length);
-            curNode = branchEnd(childScopeId, visit, curNode).___endNode;
-          }
-        }
-      }
+function init(runtimeId = DEFAULT_RUNTIME_ID) {
+  if (true) {
+    if (!runtimeId.match(/^[_$a-z][_$a-z0-9]*$/i)) {
+      throw new Error(
+        `Invalid runtimeId: "${runtimeId}". The runtimeId must be a valid JavaScript identifier.`
+      );
     }
-    const resumes = this.r;
-    if (resumes) {
-      this.r = [];
-      const len = resumes.length;
-      let i = 0;
-      try {
-        isResuming = true;
-        while (i < len) {
-          const resumeData = resumes[i++];
-          if (typeof resumeData === "function") {
-            const scopes = resumeData(serializeContext);
-            let { $global } = scopeLookup;
-            if (!$global) {
-              scopeLookup.$global = $global = scopes.$ || {};
-              $global.runtimeId = this.___runtimeId;
-              $global.renderId = this.___renderId;
-              $global.___nextScopeId = 1e6;
-            }
-            for (const scopeId in scopes) {
-              if (scopeId !== "$") {
-                const scope = scopes[scopeId];
-                const prevScope = scopeLookup[scopeId];
-                scope.$global = $global;
-                scope.___id = +scopeId;
-                if (prevScope !== scope) {
-                  scopeLookup[scopeId] = Object.assign(
-                    scope,
-                    prevScope
-                  );
-                }
-                const parentBranchId = parentBranchIds.get(scopeId);
-                if (parentBranchId) {
-                  scope.___closestBranch = scopes[parentBranchId];
+    const descriptor = Object.getOwnPropertyDescriptor(window, runtimeId);
+    if (descriptor && (descriptor.set || descriptor.configurable === false)) {
+      throw new Error(
+        `Marko initialized multiple times with the same $global.runtimeId of ${JSON.stringify(runtimeId)}. It could be that there are multiple copies of Marko running on the page.`
+      );
+    }
+  }
+  const renders = window[runtimeId];
+  const defineRuntime = (desc) => Object.defineProperty(window, runtimeId, desc);
+  let resumeRender;
+  const initRuntime = (renders2) => {
+    defineRuntime({
+      value: resumeRender = (renderId) => {
+        const render = resumeRender[renderId] = renders2[renderId] || renders2(renderId);
+        const walk2 = render.w;
+        const commentPrefixLen = render.i.length;
+        const scopeStack = [];
+        const scopeLookup = render.s = {};
+        const serializeContext = {
+          _: registeredValues
+        };
+        const branchIds = /* @__PURE__ */ new Set();
+        const parentBranchIds = /* @__PURE__ */ new Map();
+        const closestBranchMarkers = /* @__PURE__ */ new Map();
+        let currentScopeId;
+        render.w = () => {
+          walk2.call(render);
+          const visits = render.v;
+          const resumes = render.r;
+          if (visits.length) {
+            const visitNodes = new Set(visits);
+            let lastEndNode;
+            render.v = [];
+            const branchEnd = (branchId, visit, reference) => {
+              const branch = scopeLookup[branchId] ||= {};
+              let endNode = reference;
+              while (visitNodes.has(endNode = endNode.previousSibling)) ;
+              if (endNode === lastEndNode) {
+                endNode = reference.parentNode.insertBefore(
+                  new Text(),
+                  reference
+                );
+              }
+              branch.___endNode = lastEndNode = endNode;
+              branch.___startNode ||= endNode;
+              for (const [markerScopeId, markerNode] of closestBranchMarkers) {
+                if (branch.___startNode.compareDocumentPosition(markerNode) & 4 && reference.compareDocumentPosition(markerNode) & 2) {
+                  parentBranchIds.set(markerScopeId, branchId);
+                  closestBranchMarkers.delete(markerScopeId);
                 }
-                if (branchIds.has(scopeId)) {
-                  const branch = scope;
-                  const parentBranch = branch.___closestBranch;
-                  scope.___closestBranch = branch;
-                  if (parentBranch) {
-                    branch.___parentBranch = parentBranch;
-                    (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(branch);
+              }
+              branchIds.add(branchId);
+              closestBranchMarkers.set(branchId, visit);
+              return branch;
+            };
+            for (const visit of visits) {
+              const commentText = visit.data;
+              const dataIndex = commentText.indexOf(" ") + 1;
+              const scopeId = commentText.slice(
+                commentPrefixLen + 1,
+                dataIndex ? dataIndex - 1 : commentText.length
+              );
+              const scope = scopeLookup[scopeId] ||= {
+                ___id: +scopeId
+              };
+              const data2 = dataIndex ? commentText.slice(dataIndex) : "";
+              const token = commentText[commentPrefixLen];
+              if (token === "*" /* Node */) {
+                const node = scope[data2] = visit.previousSibling;
+                scope[data2 + ">" /* Getter */] = () => node;
+              } else if (token === "$" /* ClosestBranch */) {
+                closestBranchMarkers.set(scopeId, visit);
+              } else if (token === "[" /* BranchStart */) {
+                if (currentScopeId) {
+                  if (dataIndex) {
+                    branchEnd(currentScopeId, visit, visit);
                   }
+                  scopeStack.push(currentScopeId);
                 }
-                if (true) {
-                  scope.___debugId = "server-" + scopeId;
+                currentScopeId = scopeId;
+                scope.___startNode = visit;
+              } else if (token === "]" /* BranchEnd */) {
+                scope[data2] = visit;
+                const curParent = visit.parentNode;
+                const startNode = branchEnd(
+                  currentScopeId,
+                  visit,
+                  visit
+                ).___startNode;
+                if (curParent !== startNode.parentNode) {
+                  curParent.prepend(startNode);
+                }
+                currentScopeId = scopeStack.pop();
+              } else if (token === "|" /* BranchSingleNode */ || token === "=" /* BranchSingleNodeOnlyChildInParent */) {
+                let next = data2.indexOf(" ");
+                let curNode = visit;
+                scope[~next ? data2.slice(0, next) : data2] = token === "=" /* BranchSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
+                while (~next) {
+                  const start = next + 1;
+                  next = data2.indexOf(" ", start);
+                  const childScopeId = data2.slice(
+                    start,
+                    ~next ? next : data2.length
+                  );
+                  curNode = branchEnd(childScopeId, visit, curNode).___endNode;
                 }
               }
             }
-          } else if (i === len || typeof resumes[i] !== "string") {
-            delete this.___renders[this.___renderId];
-          } else {
-            registeredValues[resumes[i++]](
-              scopeLookup[resumeData],
-              scopeLookup[resumeData]
-            );
           }
-        }
-      } finally {
-        isResuming = false;
+          if (resumes) {
+            try {
+              render.r = [];
+              isResuming = true;
+              for (let i = 0; i < resumes.length; i++) {
+                const serialized = resumes[i];
+                if (typeof serialized === "function") {
+                  const scopes = serialized(serializeContext);
+                  let { $global } = scopeLookup;
+                  if (!$global) {
+                    scopeLookup.$global = $global = scopes.$ || {};
+                    $global.runtimeId = runtimeId;
+                    $global.renderId = renderId;
+                    $global.___nextScopeId = 1e6;
+                  }
+                  for (const scopeId in scopes) {
+                    if (scopeId !== "$") {
+                      const scope = scopes[scopeId];
+                      const prevScope = scopeLookup[scopeId];
+                      scope.$global = $global;
+                      scope.___id = +scopeId;
+                      if (prevScope !== scope) {
+                        scopeLookup[scopeId] = Object.assign(
+                          scope,
+                          prevScope
+                        );
+                      }
+                      const parentBranchId = parentBranchIds.get(scopeId);
+                      if (parentBranchId) {
+                        scope.___closestBranch = scopes[parentBranchId];
+                      }
+                      if (branchIds.has(scopeId)) {
+                        const branch = scope;
+                        const parentBranch = branch.___closestBranch;
+                        scope.___closestBranch = branch;
+                        if (parentBranch) {
+                          branch.___parentBranch = parentBranch;
+                          (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(
+                            branch
+                          );
+                        }
+                      }
+                      if (true) {
+                        scope.___debugId = "server-" + scopeId;
+                      }
+                    }
+                  }
+                } else {
+                  registeredValues[resumes[++i]](
+                    scopeLookup[serialized],
+                    scopeLookup[serialized]
+                  );
+                }
+              }
+            } finally {
+              isResuming = false;
+            }
+          }
+        };
+        return render;
       }
+    });
+  };
+  if (renders) {
+    initRuntime(renders);
+    for (const renderId in renders) {
+      resumeRender(renderId).w();
     }
+  } else {
+    defineRuntime({
+      configurable: true,
+      set: initRuntime
+    });
   }
-};
+}
 var isResuming = false;
 function register(id, obj) {
   registeredValues[id] = obj;
@@ -333,42 +362,6 @@ function getRegisteredWithScope(id, scope) {
   const val = registeredValues[id];
   return scope ? val(scope) : val;
 }
-function init(runtimeId = DEFAULT_RUNTIME_ID) {
-  if (true) {
-    if (!runtimeId.match(/^[_$a-z][_$a-z0-9]*$/i)) {
-      throw new Error(
-        `Invalid runtimeId: "${runtimeId}". The runtimeId must be a valid JavaScript identifier.`
-      );
-    }
-  }
-  const resumeRender = (renderId) => resumeRender[renderId] = renders[renderId] = new Render(renders, runtimeId, renderId);
-  let renders;
-  if (window[runtimeId]) {
-    setRenders(window[runtimeId]);
-  } else {
-    Object.defineProperty(window, runtimeId, {
-      configurable: true,
-      set: setRenders
-    });
-  }
-  function setRenders(v) {
-    if (true) {
-      if (renders) {
-        throw new Error(
-          "Marko tried to initialize multiple times. It could be that there are multiple instances of Marko running on the page."
-        );
-      }
-    }
-    renders = v;
-    for (const renderId in v) {
-      resumeRender(renderId);
-    }
-    Object.defineProperty(window, runtimeId, {
-      configurable: true,
-      value: resumeRender
-    });
-  }
-}
 function nodeRef(id, key) {
   return register(id, (scope) => () => scope[key]());
 }
@@ -1888,7 +1881,7 @@ var compat = {
     if (Array.isArray(value2) && typeof value2[0] === "string") {
       return getRegisteredWithScope(
         value2[0],
-        value2.length === 2 && window[runtimeId]?.[componentIdPrefix === "s" ? "_" : componentIdPrefix]?.___scopeLookup[value2[1]]
+        value2.length === 2 && window[runtimeId]?.[componentIdPrefix === "s" ? "_" : componentIdPrefix]?.s[value2[1]]
       );
     }
     return value2;

package/dist/debug/html.js

@@ -2190,9 +2190,6 @@ function prepareChunk(chunk) {
     hasWalk = true;
     resumes = resumes ? resumes + "," + effects : effects;
   }
-  if (boundary.done && (resumes || state.hasWrittenResume)) {
-    resumes = resumes ? resumes + ",0" : "0";
-  }
   if (resumes) {
     if (state.hasWrittenResume) {
       scripts = concatScripts(

package/dist/debug/html.mjs

@@ -2106,9 +2106,6 @@ function prepareChunk(chunk) {
     hasWalk = true;
     resumes = resumes ? resumes + "," + effects : effects;
   }
-  if (boundary.done && (resumes || state.hasWrittenResume)) {
-    resumes = resumes ? resumes + ",0" : "0";
-  }
   if (resumes) {
     if (state.hasWrittenResume) {
       scripts = concatScripts(

package/dist/dom/resume.d.ts

@@ -1,8 +1,8 @@
 import { type Scope } from "../common/types";
 import type { Signal } from "./signals";
+export declare function init(runtimeId?: string): void;
 export declare let isResuming: boolean;
 export declare function register<T>(id: string, obj: T): T;
 export declare function registerBoundSignal<T extends Signal<unknown>>(id: string, signal: T): T;
 export declare function getRegisteredWithScope(id: string, scope?: Scope): unknown;
-export declare function init(runtimeId?: string): void;
 export declare function nodeRef(id: string, key: string): (scope: Scope) => () => any;