marko 6.0.3 → 6.0.5

package/dist/common/helpers.d.ts

@@ -1,5 +1,5 @@
-export declare function classValue(value: unknown): string;
-export declare function styleValue(value: unknown): string;
+export declare function classValue(classValue: unknown): string;
+export declare function styleValue(styleValue: unknown): string;
 export declare function isEventHandler(name: string): name is `on${string}`;
 export declare function getEventHandlerName(name: `on${string}`): string;
 export declare function isVoid(value: unknown): value is false | null | undefined;

package/dist/debug/dom.js

@@ -27,6 +27,8 @@ __export(dom_exports, {
   attrsEvents: () => attrsEvents,
   awaitTag: () => awaitTag,
   classAttr: () => classAttr,
+  classItem: () => classItem,
+  classItems: () => classItems,
   compat: () => compat,
   conditional: () => conditional,
   conditionalClosure: () => conditionalClosure,
@@ -79,6 +81,9 @@ __export(dom_exports, {
   setTagVarChange: () => setTagVarChange,
   state: () => state,
   styleAttr: () => styleAttr,
+  styleItem: () => styleItem,
+  styleItemValue: () => styleItemValue,
+  styleItems: () => styleItems,
   tagVarSignal: () => tagVarSignal,
   tagVarSignalChange: () => tagVarSignalChange,
   textContent: () => textContent,
@@ -133,48 +138,44 @@ function forTo(to, from, step, cb) {
 }
 
 // src/common/helpers.ts
-function classValue(value2) {
-  return toDelimitedString(value2, " ", stringifyClassObject);
+function classValue(classValue2) {
+  return toDelimitedString(classValue2, " ", stringifyClassObject);
 }
 function stringifyClassObject(name, value2) {
   return value2 ? name : "";
 }
-function styleValue(value2) {
-  return toDelimitedString(value2, ";", stringifyStyleObject);
+function styleValue(styleValue2) {
+  return toDelimitedString(styleValue2, ";", stringifyStyleObject);
 }
 function stringifyStyleObject(name, value2) {
-  return value2 || value2 === 0 ? `${name}:${typeof value2 === "number" && value2 && !/^(--|ta|or|li|z)|cou|nk|it|ag|we|do|w$/.test(name) ? value2 + "px" : value2}` : "";
+  return value2 || value2 === 0 ? `${name}:${value2 && typeof value2 === "number" && !/^(--|ta|or|li|z)|cou|nk|it|ag|we|do|w$/.test(name) ? value2 + "px" : value2}` : "";
 }
 function toDelimitedString(val, delimiter, stringify) {
-  switch (typeof val) {
-    case "string":
-      return val;
-    case "object":
-      if (val !== null) {
-        let result = "";
-        let curDelimiter = "";
-        if (Array.isArray(val)) {
-          for (const v of val) {
-            const part = toDelimitedString(v, delimiter, stringify);
-            if (part !== "") {
-              result += curDelimiter + part;
-              curDelimiter = delimiter;
-            }
-          }
-        } else {
-          for (const name in val) {
-            const v = val[name];
-            const part = stringify(name, v);
-            if (part !== "") {
-              result += curDelimiter + part;
-              curDelimiter = delimiter;
-            }
-          }
+  let str = "";
+  let sep = "";
+  let part;
+  if (val) {
+    if (typeof val !== "object") {
+      str += val;
+    } else if (Array.isArray(val)) {
+      for (const v of val) {
+        part = toDelimitedString(v, delimiter, stringify);
+        if (part) {
+          str += sep + part;
+          sep = delimiter;
+        }
+      }
+    } else {
+      for (const name in val) {
+        part = stringify(name, val[name]);
+        if (part) {
+          str += sep + part;
+          sep = delimiter;
         }
-        return result;
       }
+    }
   }
-  return "";
+  return str;
 }
 function isEventHandler(name) {
   return /^on[A-Z-]/.test(name);
@@ -253,15 +254,15 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         `Invalid runtimeId: "${runtimeId}". The runtimeId must be a valid JavaScript identifier.`
       );
     }
-    const descriptor = Object.getOwnPropertyDescriptor(window, runtimeId);
+    const descriptor = Object.getOwnPropertyDescriptor(self, 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);
+  const renders = self[runtimeId];
+  const defineRuntime = (desc) => Object.defineProperty(self, runtimeId, desc);
   let resumeRender;
   const initRuntime = (renders2) => {
     defineRuntime({
@@ -276,34 +277,28 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
         };
         const branchIds = /* @__PURE__ */ new Set();
         const parentBranchIds = /* @__PURE__ */ new Map();
-        let lastEffect;
+        const branchEnd = (branchId, reference) => {
+          const branch = scopeLookup[branchId] ||= {};
+          let endNode = reference;
+          let prevNode;
+          while ((prevNode = endNode.previousSibling) !== branch.___startNode && ~visits.indexOf(endNode = prevNode)) ;
+          branch.___endNode = lastEndNode = endNode === lastEndNode ? reference.parentNode.insertBefore(new Text(), reference) : endNode;
+          branch.___startNode ||= lastEndNode;
+          branchIds.add(branchId);
+          return branch;
+        };
         let currentBranchId;
         let $global;
         let lastScopeId = 0;
+        let lastEffect;
+        let lastEndNode;
+        let visits;
+        let resumes;
         render.w = () => {
-          walk2.call(render);
-          const visits = render.v;
-          const resumes = render.r;
-          if (visits.length) {
-            const visitNodes = new Set(visits);
-            let lastEndNode;
-            visits.length = 0;
-            const branchEnd = (branchId, reference) => {
-              const branch = scopeLookup[branchId] ||= {};
-              let endNode = reference;
-              while (endNode.previousSibling !== branch.___startNode && visitNodes.has(endNode = endNode.previousSibling)) ;
-              if (endNode === lastEndNode) {
-                endNode = reference.parentNode.insertBefore(
-                  new Text(),
-                  reference
-                );
-              }
-              branch.___endNode = lastEndNode = endNode;
-              branch.___startNode ||= endNode;
-              branchIds.add(branchId);
-              return branch;
-            };
-            for (const visit of visitNodes) {
+          try {
+            walk2.call(render);
+            isResuming = 1;
+            for (const visit of visits = render.v) {
               const commentText = visit.data;
               const dataIndex = commentText.indexOf(" ") + 1;
               const scopeId = +commentText.slice(
@@ -356,67 +351,58 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 }
               }
             }
-          }
-          if (resumes) {
-            try {
-              render.r = [];
-              isResuming = 1;
-              for (let i = 0; i < resumes.length; i++) {
-                let serialized = resumes[i];
-                if (typeof serialized === "function") {
-                  for (const scope of serialized(serializeContext)) {
-                    if (!$global) {
-                      $global = scope || {};
-                      $global.runtimeId = runtimeId;
-                      $global.renderId = renderId;
-                      $global.___nextScopeId = 1e6;
-                    } else if (typeof scope === "number") {
-                      lastScopeId += scope;
-                    } else {
-                      const scopeId = ++lastScopeId;
-                      const prevScope = scopeLookup[scopeId];
-                      scope.$global = $global;
-                      scope.___id = scopeId;
-                      if (prevScope !== scope) {
-                        scopeLookup[scopeId] = Object.assign(
-                          scope,
-                          prevScope
+            for (const serialized of resumes = render.r || []) {
+              if (typeof serialized === "string") {
+                lastEffect = serialized;
+              } else if (typeof serialized === "number") {
+                registeredValues[lastEffect](
+                  scopeLookup[serialized],
+                  scopeLookup[serialized]
+                );
+              } else {
+                for (const scope of serialized(serializeContext)) {
+                  if (!$global) {
+                    $global = scope || {};
+                    $global.runtimeId = runtimeId;
+                    $global.renderId = renderId;
+                    $global.___nextScopeId = 1e6;
+                  } else if (typeof scope === "number") {
+                    lastScopeId += scope;
+                  } else {
+                    const scopeId = ++lastScopeId;
+                    const prevScope = scopeLookup[scopeId];
+                    scope.$global = $global;
+                    scope.___id = scopeId;
+                    if (prevScope !== scope) {
+                      scopeLookup[scopeId] = Object.assign(
+                        scope,
+                        prevScope
+                      );
+                    }
+                    const parentBranchId = scope["#ClosestBranchId" /* ClosestBranchId */] || parentBranchIds.get(scopeId);
+                    if (parentBranchId) {
+                      scope.___closestBranch = scopeLookup[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
                         );
                       }
-                      const parentBranchId = scope["#ClosestBranchId" /* ClosestBranchId */] || parentBranchIds.get(scopeId);
-                      if (parentBranchId) {
-                        scope.___closestBranch = scopeLookup[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;
-                      }
+                    }
+                    if (true) {
+                      scope.___debugId = "server-" + scopeId;
                     }
                   }
-                } else {
-                  if (typeof serialized === "string") {
-                    lastEffect = serialized;
-                    serialized = resumes[++i];
-                  }
-                  registeredValues[lastEffect](
-                    scopeLookup[serialized],
-                    scopeLookup[serialized]
-                  );
                 }
               }
-            } finally {
-              isResuming = 0;
             }
+          } finally {
+            isResuming = visits.length = resumes.length = 0;
           }
         };
         return render;
@@ -748,9 +734,28 @@ function setAttribute(element, name, value2) {
 function classAttr(element, value2) {
   setAttribute(element, "class", classValue(value2) || void 0);
 }
+function classItems(element, items) {
+  for (const key in items) {
+    classItem(element, key, items[key]);
+  }
+}
+function classItem(element, name, value2) {
+  element.classList.toggle(name, !!value2);
+}
 function styleAttr(element, value2) {
   setAttribute(element, "style", styleValue(value2) || void 0);
 }
+function styleItems(element, items) {
+  for (const key in items) {
+    styleItem(element, key, items[key]);
+  }
+}
+function styleItem(element, name, value2) {
+  element.style.setProperty(name, value2 || value2 === 0 ? value2 + "" : "");
+}
+function styleItemValue(value2) {
+  return value2 && typeof value2 === "number" ? value2 + "px" : value2;
+}
 function data(node, value2) {
   const normalizedValue = normalizeString(value2);
   if (node.data !== normalizedValue) {
@@ -983,7 +988,6 @@ function toInsertNode(startNode, endNode) {
 }
 
 // src/dom/scope.ts
-var pendingScopes = [];
 function createScope($global, closestBranch) {
   const scope = {
     ___id: $global.___nextScopeId++,
@@ -997,12 +1001,6 @@ function createScope($global, closestBranch) {
 function skipScope(scope) {
   return scope.$global.___nextScopeId++;
 }
-function finishPendingScopes() {
-  for (const scope of pendingScopes) {
-    scope.___creating = 0;
-  }
-  pendingScopes = [];
-}
 function findBranchWithKey(scope, key) {
   let branch = scope.___closestBranch;
   while (branch && !branch[key]) {
@@ -1386,21 +1384,8 @@ function createCloneableHTML(html2, ns) {
 
 // src/dom/schedule.ts
 var runTask;
-var port2 = /* @__PURE__ */ (() => {
-  const { port1, port2: port22 } = new MessageChannel();
-  port1.onmessage = () => {
-    isScheduled = 0;
-    if (true) {
-      const run2 = runTask;
-      runTask = void 0;
-      run2();
-    } else {
-      run();
-    }
-  };
-  return port22;
-})();
 var isScheduled;
+var channel;
 function schedule() {
   if (!isScheduled) {
     if (true) {
@@ -1424,7 +1409,20 @@ function flushAndWaitFrame() {
   requestAnimationFrame(triggerMacroTask);
 }
 function triggerMacroTask() {
-  port2.postMessage(0);
+  if (!channel) {
+    channel = new MessageChannel();
+    channel.port1.onmessage = () => {
+      isScheduled = 0;
+      if (true) {
+        const run2 = runTask;
+        runTask = void 0;
+        run2();
+      } else {
+        run();
+      }
+    };
+  }
+  channel.port2.postMessage(0);
 }
 
 // src/dom/signals.ts
@@ -1969,6 +1967,7 @@ var pendingRendersLookup = /* @__PURE__ */ new Map();
 var caughtError = /* @__PURE__ */ new WeakSet();
 var placeholderShown = /* @__PURE__ */ new WeakSet();
 var pendingEffects = [];
+var pendingScopes = [];
 var rendering;
 var scopeKeyOffset = 1e3;
 function queueRender(scope, signal, signalKey, value2, scopeKey = scope.___id) {
@@ -2065,7 +2064,10 @@ function runRenders() {
       runRender(render);
     }
   }
-  finishPendingScopes();
+  for (const scope of pendingScopes) {
+    scope.___creating = 0;
+  }
+  pendingScopes = [];
 }
 var runRender = (render) => render.___signal(render.___scope, render.___value);
 var enableCatch = () => {
@@ -2169,7 +2171,7 @@ var compat = {
     if (Array.isArray(value2) && typeof value2[0] === "string") {
       return getRegisteredWithScope(
         value2[0],
-        value2.length === 2 && window[runtimeId]?.[componentIdPrefix === "s" ? "_" : componentIdPrefix]?.s[value2[1]]
+        value2.length === 2 && self[runtimeId]?.[componentIdPrefix === "s" ? "_" : componentIdPrefix]?.s[value2[1]]
       );
     }
     return value2;