marko 6.0.92 → 6.0.94

package/dist/common/errors.d.ts

@@ -0,0 +1,3 @@
+export declare function _el_read_error(): void;
+export declare function _hoist_read_error(): void;
+export declare function _assert_hoist(value: unknown): void;

package/dist/common/types.d.ts

@@ -13,9 +13,7 @@ export interface BranchScope extends Scope {
     ___effects: unknown[] | undefined;
 }
 export interface Scope {
-    $global: Record<string, unknown> & {
-        ___nextScopeId: number;
-    };
+    $global: Record<string, unknown>;
     _: Scope | undefined;
     ___id: number;
     ___args: unknown;

package/dist/debug/dom.js

@@ -22,6 +22,7 @@ var dom_exports = {};
 __export(dom_exports, {
   $signal: () => $signal,
   $signalReset: () => $signalReset,
+  _assert_hoist: () => _assert_hoist,
   _attr: () => _attr,
   _attr_class: () => _attr_class,
   _attr_class_item: () => _attr_class_item,
@@ -60,6 +61,7 @@ __export(dom_exports, {
   _content_resume: () => _content_resume,
   _dynamic_tag: () => _dynamic_tag,
   _el: () => _el,
+  _el_read: () => _el_read,
   _enable_catch: () => _enable_catch,
   _for_closure: () => _for_closure,
   _for_in: () => _for_in,
@@ -122,6 +124,29 @@ function* attrTagIterator() {
   yield* this[rest];
 }
 
+// src/common/errors.ts
+function _el_read_error() {
+  if (true) {
+    throw new Error(
+      "Element references can only be read in scripts and event handlers."
+    );
+  }
+}
+function _hoist_read_error() {
+  if (true) {
+    throw new Error(
+      "Hoisted values can only be read in scripts and event handlers."
+    );
+  }
+}
+function _assert_hoist(value) {
+  if (typeof value !== "function") {
+    throw new Error(
+      `Hoisted values must be functions, received type "${typeof value}".`
+    );
+  }
+}
+
 // src/common/for.ts
 function forIn(obj, cb) {
   for (const key in obj) {
@@ -280,9 +305,10 @@ var DEFAULT_RUNTIME_ID = "M";
 var DEFAULT_RENDER_ID = "_";
 
 // src/dom/scope.ts
+var nextScopeId = 1e6;
 function createScope($global, closestBranch) {
   const scope = {
-    ___id: $global.___nextScopeId++,
+    ___id: nextScopeId++,
     ___creating: 1,
     ___closestBranch: closestBranch,
     $global
@@ -290,8 +316,8 @@ function createScope($global, closestBranch) {
   pendingScopes.push(scope);
   return scope;
 }
-function skipScope(scope) {
-  return scope.$global.___nextScopeId++;
+function skipScope() {
+  return nextScopeId++;
 }
 function findBranchWithKey(scope, key) {
   let branch = scope.___closestBranch;
@@ -309,7 +335,7 @@ function destroyNestedBranches(branch) {
   branch.___branchScopes?.forEach(destroyNestedBranches);
   branch.___abortScopes?.forEach((scope) => {
     for (const id in scope.___abortControllers) {
-      scope.___abortControllers[id]?.abort();
+      $signalReset(scope, id);
     }
   });
 }
@@ -355,7 +381,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
         walker.currentNode = scope[true ? getDebugKey(currentScopeIndex++, "#text") : currentScopeIndex++] = new Text()
       );
       if (value === 49 /* DynamicTagWithVar */) {
-        scope[true ? getDebugKey(currentScopeIndex++, "#scopeOffset") : currentScopeIndex++] = skipScope(scope);
+        scope[true ? getDebugKey(currentScopeIndex++, "#scopeOffset") : currentScopeIndex++] = skipScope();
       }
     } else if (value === 38 /* EndChild */) {
       return currentWalkIndex;
@@ -366,7 +392,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
         scope[true ? getDebugKey(currentScopeIndex++, "#childScope") : currentScopeIndex++] = createScope(scope.$global, scope.___closestBranch)
       );
       if (value === 48 /* BeginChildWithVar */) {
-        scope[true ? getDebugKey(currentScopeIndex++, "#scopeOffset") : currentScopeIndex++] = skipScope(scope);
+        scope[true ? getDebugKey(currentScopeIndex++, "#scopeOffset") : currentScopeIndex++] = skipScope();
       }
     } else if (value < 91 /* NextEnd */ + 1) {
       value = 20 /* Next */ * currentMultiplier + value - 67 /* Next */;
@@ -478,9 +504,11 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 branchStarts.push(visit);
               } else {
                 visitScope[
-                  nextToken()
+                  "Getter:" /* Getter */ + nextToken()
                   /* read accessor */
-                ] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
+                ] = /* @__PURE__ */ ((node) => () => node)(
+                  visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit
+                );
                 nextToken();
                 endBranch(
                   visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */
@@ -550,7 +578,6 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                     $global = scope || {};
                     $global.runtimeId = runtimeId;
                     $global.renderId = renderId;
-                    $global.___nextScopeId = 1e6;
                   } else if (typeof scope === "number") {
                     lastScopeId += scope;
                   } else {
@@ -953,7 +980,7 @@ function _let(valueAccessor, fn) {
   };
   return (scope, value, valueChange) => {
     if (rendering) {
-      if ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || !(valueAccessor in scope)) {
+      if ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || scope.___creating) {
         scope[valueAccessor] = value;
         fn && fn(scope, value);
       }
@@ -1118,7 +1145,16 @@ function _script(id, fn) {
     queueEffect(scope, fn);
   };
 }
+function _el_read(value) {
+  if (rendering) {
+    _el_read_error();
+  }
+  return value;
+}
 function* traverseAllHoisted(scope, path, curIndex = path.length - 1) {
+  if (rendering) {
+    _hoist_read_error();
+  }
   if (scope) {
     if (Symbol.iterator in scope) {
       for (const s of scope instanceof Map ? scope.values() : scope) {
@@ -1133,7 +1169,7 @@ function* traverseAllHoisted(scope, path, curIndex = path.length - 1) {
 }
 function _hoist(...path) {
   return (scope) => {
-    const getOne = (...args) => iterator().next().value(...args);
+    const getOne = (...args) => iterator().next().value?.(...args);
     const iterator = getOne[Symbol.iterator] = () => traverseAllHoisted(scope, path);
     return getOne;
   };
@@ -1769,11 +1805,13 @@ function _await(nodeAccessor, renderer) {
                     );
                     removeAndDestroyBranch(placeholderBranch);
                   }
-                  const pendingEffects2 = tryWithPlaceholder.___effects;
-                  if (pendingEffects2) {
-                    tryWithPlaceholder.___effects = [];
-                    runEffects(pendingEffects2, true);
-                  }
+                  queueEffect(tryWithPlaceholder, (scope2) => {
+                    const pendingEffects2 = scope2.___effects;
+                    if (pendingEffects2) {
+                      scope2.___effects = [];
+                      runEffects(pendingEffects2, true);
+                    }
+                  });
                 }
               }
             },
@@ -2298,7 +2336,6 @@ var compat = {
     component.effects = prepareEffects(() => {
       if (!branch) {
         created = 1;
-        out.global.___nextScopeId ||= 0;
         branch = component.scope = createAndSetupBranch(
           out.global,
           renderer,
@@ -2342,7 +2379,6 @@ function mount(input = {}, reference, position) {
   if ($global) {
     ({ $global, ...input } = input);
     $global = {
-      ___nextScopeId: 0,
       runtimeId: DEFAULT_RUNTIME_ID,
       renderId: DEFAULT_RENDER_ID,
       ...$global
@@ -2361,7 +2397,6 @@ function mount(input = {}, reference, position) {
     }
   } else {
     $global = {
-      ___nextScopeId: 0,
       runtimeId: DEFAULT_RUNTIME_ID,
       renderId: DEFAULT_RENDER_ID
     };

package/dist/debug/dom.mjs

@@ -22,6 +22,29 @@ function* attrTagIterator() {
   yield* this[rest];
 }
 
+// src/common/errors.ts
+function _el_read_error() {
+  if (true) {
+    throw new Error(
+      "Element references can only be read in scripts and event handlers."
+    );
+  }
+}
+function _hoist_read_error() {
+  if (true) {
+    throw new Error(
+      "Hoisted values can only be read in scripts and event handlers."
+    );
+  }
+}
+function _assert_hoist(value) {
+  if (typeof value !== "function") {
+    throw new Error(
+      `Hoisted values must be functions, received type "${typeof value}".`
+    );
+  }
+}
+
 // src/common/for.ts
 function forIn(obj, cb) {
   for (const key in obj) {
@@ -180,9 +203,10 @@ var DEFAULT_RUNTIME_ID = "M";
 var DEFAULT_RENDER_ID = "_";
 
 // src/dom/scope.ts
+var nextScopeId = 1e6;
 function createScope($global, closestBranch) {
   const scope = {
-    ___id: $global.___nextScopeId++,
+    ___id: nextScopeId++,
     ___creating: 1,
     ___closestBranch: closestBranch,
     $global
@@ -190,8 +214,8 @@ function createScope($global, closestBranch) {
   pendingScopes.push(scope);
   return scope;
 }
-function skipScope(scope) {
-  return scope.$global.___nextScopeId++;
+function skipScope() {
+  return nextScopeId++;
 }
 function findBranchWithKey(scope, key) {
   let branch = scope.___closestBranch;
@@ -209,7 +233,7 @@ function destroyNestedBranches(branch) {
   branch.___branchScopes?.forEach(destroyNestedBranches);
   branch.___abortScopes?.forEach((scope) => {
     for (const id in scope.___abortControllers) {
-      scope.___abortControllers[id]?.abort();
+      $signalReset(scope, id);
     }
   });
 }
@@ -255,7 +279,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
         walker.currentNode = scope[true ? getDebugKey(currentScopeIndex++, "#text") : currentScopeIndex++] = new Text()
       );
       if (value === 49 /* DynamicTagWithVar */) {
-        scope[true ? getDebugKey(currentScopeIndex++, "#scopeOffset") : currentScopeIndex++] = skipScope(scope);
+        scope[true ? getDebugKey(currentScopeIndex++, "#scopeOffset") : currentScopeIndex++] = skipScope();
       }
     } else if (value === 38 /* EndChild */) {
       return currentWalkIndex;
@@ -266,7 +290,7 @@ function walkInternal(currentWalkIndex, walkCodes, scope) {
         scope[true ? getDebugKey(currentScopeIndex++, "#childScope") : currentScopeIndex++] = createScope(scope.$global, scope.___closestBranch)
       );
       if (value === 48 /* BeginChildWithVar */) {
-        scope[true ? getDebugKey(currentScopeIndex++, "#scopeOffset") : currentScopeIndex++] = skipScope(scope);
+        scope[true ? getDebugKey(currentScopeIndex++, "#scopeOffset") : currentScopeIndex++] = skipScope();
       }
     } else if (value < 91 /* NextEnd */ + 1) {
       value = 20 /* Next */ * currentMultiplier + value - 67 /* Next */;
@@ -378,9 +402,11 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 branchStarts.push(visit);
               } else {
                 visitScope[
-                  nextToken()
+                  "Getter:" /* Getter */ + nextToken()
                   /* read accessor */
-                ] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit;
+                ] = /* @__PURE__ */ ((node) => () => node)(
+                  visitScope[lastToken] = visitType === ")" /* BranchEndOnlyChildInParent */ || visitType === "}" /* BranchEndSingleNodeOnlyChildInParent */ ? visit.parentNode : visit
+                );
                 nextToken();
                 endBranch(
                   visitType !== "]" /* BranchEnd */ && visitType !== ")" /* BranchEndOnlyChildInParent */
@@ -450,7 +476,6 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                     $global = scope || {};
                     $global.runtimeId = runtimeId;
                     $global.renderId = renderId;
-                    $global.___nextScopeId = 1e6;
                   } else if (typeof scope === "number") {
                     lastScopeId += scope;
                   } else {
@@ -853,7 +878,7 @@ function _let(valueAccessor, fn) {
   };
   return (scope, value, valueChange) => {
     if (rendering) {
-      if ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || !(valueAccessor in scope)) {
+      if ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || scope.___creating) {
         scope[valueAccessor] = value;
         fn && fn(scope, value);
       }
@@ -1018,7 +1043,16 @@ function _script(id, fn) {
     queueEffect(scope, fn);
   };
 }
+function _el_read(value) {
+  if (rendering) {
+    _el_read_error();
+  }
+  return value;
+}
 function* traverseAllHoisted(scope, path, curIndex = path.length - 1) {
+  if (rendering) {
+    _hoist_read_error();
+  }
   if (scope) {
     if (Symbol.iterator in scope) {
       for (const s of scope instanceof Map ? scope.values() : scope) {
@@ -1033,7 +1067,7 @@ function* traverseAllHoisted(scope, path, curIndex = path.length - 1) {
 }
 function _hoist(...path) {
   return (scope) => {
-    const getOne = (...args) => iterator().next().value(...args);
+    const getOne = (...args) => iterator().next().value?.(...args);
     const iterator = getOne[Symbol.iterator] = () => traverseAllHoisted(scope, path);
     return getOne;
   };
@@ -1669,11 +1703,13 @@ function _await(nodeAccessor, renderer) {
                     );
                     removeAndDestroyBranch(placeholderBranch);
                   }
-                  const pendingEffects2 = tryWithPlaceholder.___effects;
-                  if (pendingEffects2) {
-                    tryWithPlaceholder.___effects = [];
-                    runEffects(pendingEffects2, true);
-                  }
+                  queueEffect(tryWithPlaceholder, (scope2) => {
+                    const pendingEffects2 = scope2.___effects;
+                    if (pendingEffects2) {
+                      scope2.___effects = [];
+                      runEffects(pendingEffects2, true);
+                    }
+                  });
                 }
               }
             },
@@ -2198,7 +2234,6 @@ var compat = {
     component.effects = prepareEffects(() => {
       if (!branch) {
         created = 1;
-        out.global.___nextScopeId ||= 0;
         branch = component.scope = createAndSetupBranch(
           out.global,
           renderer,
@@ -2242,7 +2277,6 @@ function mount(input = {}, reference, position) {
   if ($global) {
     ({ $global, ...input } = input);
     $global = {
-      ___nextScopeId: 0,
       runtimeId: DEFAULT_RUNTIME_ID,
       renderId: DEFAULT_RENDER_ID,
       ...$global
@@ -2261,7 +2295,6 @@ function mount(input = {}, reference, position) {
     }
   } else {
     $global = {
-      ___nextScopeId: 0,
       runtimeId: DEFAULT_RUNTIME_ID,
       renderId: DEFAULT_RENDER_ID
     };
@@ -2325,6 +2358,7 @@ function mount(input = {}, reference, position) {
 export {
   $signal,
   $signalReset,
+  _assert_hoist,
   _attr,
   _attr_class,
   _attr_class_item,
@@ -2363,6 +2397,7 @@ export {
   _content_resume,
   _dynamic_tag,
   _el,
+  _el_read,
   _enable_catch,
   _for_closure,
   _for_in,

package/dist/debug/html.js

@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var html_exports = {};
 __export(html_exports, {
   $global: () => $global,
+  _assert_hoist: () => _assert_hoist,
   _attr: () => _attr,
   _attr_class: () => _attr_class,
   _attr_content: () => _attr_content,
@@ -42,6 +43,7 @@ __export(html_exports, {
   _content_resume: () => _content_resume,
   _dynamic_tag: () => _dynamic_tag,
   _el: () => _el,
+  _el_read_error: () => _el_read_error,
   _el_resume: () => _el_resume,
   _escape: () => _escape,
   _escape_script: () => _escape_script,
@@ -53,6 +55,7 @@ __export(html_exports, {
   _for_to: () => _for_to,
   _for_until: () => _for_until,
   _hoist: () => _hoist,
+  _hoist_read_error: () => _hoist_read_error,
   _html: () => _html,
   _id: () => _id,
   _if: () => _if,
@@ -111,6 +114,29 @@ function* attrTagIterator() {
   yield* this[rest];
 }
 
+// src/common/errors.ts
+function _el_read_error() {
+  if (true) {
+    throw new Error(
+      "Element references can only be read in scripts and event handlers."
+    );
+  }
+}
+function _hoist_read_error() {
+  if (true) {
+    throw new Error(
+      "Hoisted values can only be read in scripts and event handlers."
+    );
+  }
+}
+function _assert_hoist(value) {
+  if (typeof value !== "function") {
+    throw new Error(
+      `Hoisted values must be functions, received type "${typeof value}".`
+    );
+  }
+}
+
 // src/common/helpers.ts
 function classValue(classValue2) {
   return toDelimitedString(classValue2, " ", stringifyClassObject);
@@ -1835,21 +1861,12 @@ function _sep(shouldResume) {
   return shouldResume === 0 ? "" : "<!>";
 }
 function _el(scopeId, id) {
-  const getter = () => {
-    if (true) {
-      throw new Error("Cannot read a node reference on the server.");
-    }
-  };
-  return id ? _resume(getter, id, scopeId) : getter;
+  return _resume(() => _el_read_error(), id, scopeId);
 }
 function _hoist(scopeId, id) {
-  const getter = () => {
-    if (true) {
-      throw new Error("Cannot read a hoisted value on the server.");
-    }
-  };
-  getter[Symbol.iterator] = getter;
-  return id ? _resume(getter, id, scopeId) : getter;
+  const getter = () => _hoist_read_error();
+  getter[Symbol.iterator] = _hoist_read_error;
+  return _resume(getter, id, scopeId);
 }
 function _resume_branch(scopeId) {
   const branchId = $chunk.context?.[branchIdKey];
@@ -3505,6 +3522,7 @@ function NOOP3() {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   $global,
+  _assert_hoist,
   _attr,
   _attr_class,
   _attr_content,
@@ -3526,6 +3544,7 @@ function NOOP3() {
   _content_resume,
   _dynamic_tag,
   _el,
+  _el_read_error,
   _el_resume,
   _escape,
   _escape_script,
@@ -3537,6 +3556,7 @@ function NOOP3() {
   _for_to,
   _for_until,
   _hoist,
+  _hoist_read_error,
   _html,
   _id,
   _if,

package/dist/debug/html.mjs

@@ -22,6 +22,29 @@ function* attrTagIterator() {
   yield* this[rest];
 }
 
+// src/common/errors.ts
+function _el_read_error() {
+  if (true) {
+    throw new Error(
+      "Element references can only be read in scripts and event handlers."
+    );
+  }
+}
+function _hoist_read_error() {
+  if (true) {
+    throw new Error(
+      "Hoisted values can only be read in scripts and event handlers."
+    );
+  }
+}
+function _assert_hoist(value) {
+  if (typeof value !== "function") {
+    throw new Error(
+      `Hoisted values must be functions, received type "${typeof value}".`
+    );
+  }
+}
+
 // src/common/helpers.ts
 function classValue(classValue2) {
   return toDelimitedString(classValue2, " ", stringifyClassObject);
@@ -1746,21 +1769,12 @@ function _sep(shouldResume) {
   return shouldResume === 0 ? "" : "<!>";
 }
 function _el(scopeId, id) {
-  const getter = () => {
-    if (true) {
-      throw new Error("Cannot read a node reference on the server.");
-    }
-  };
-  return id ? _resume(getter, id, scopeId) : getter;
+  return _resume(() => _el_read_error(), id, scopeId);
 }
 function _hoist(scopeId, id) {
-  const getter = () => {
-    if (true) {
-      throw new Error("Cannot read a hoisted value on the server.");
-    }
-  };
-  getter[Symbol.iterator] = getter;
-  return id ? _resume(getter, id, scopeId) : getter;
+  const getter = () => _hoist_read_error();
+  getter[Symbol.iterator] = _hoist_read_error;
+  return _resume(getter, id, scopeId);
 }
 function _resume_branch(scopeId) {
   const branchId = $chunk.context?.[branchIdKey];
@@ -3415,6 +3429,7 @@ function NOOP3() {
 }
 export {
   $global,
+  _assert_hoist,
   _attr,
   _attr_class,
   _attr_content,
@@ -3436,6 +3451,7 @@ export {
   _content_resume,
   _dynamic_tag,
   _el,
+  _el_read_error,
   _el_resume,
   _escape,
   _escape_script,
@@ -3447,6 +3463,7 @@ export {
   _for_to,
   _for_until,
   _hoist,
+  _hoist_read_error,
   _html,
   _id,
   _if,

package/dist/dom/scope.d.ts

@@ -1,6 +1,6 @@
 import type { BranchScope, Scope } from "../common/types";
 export declare function createScope($global: Scope["$global"], closestBranch?: BranchScope): Scope;
-export declare function skipScope(scope: Scope): number;
+export declare function skipScope(): number;
 export declare function findBranchWithKey(scope: Scope, key: string): BranchScope | undefined;
 export declare function destroyBranch(branch: BranchScope): void;
 export declare function removeAndDestroyBranch(branch: BranchScope): void;

package/dist/dom/signals.d.ts

@@ -28,4 +28,5 @@ export declare function _return_change(scope: Scope, changeHandler?: ((value: un
 export declare const _var_change: (scope: Scope, value: unknown, name?: string) => void;
 export declare function _id({ $global }: Scope): string;
 export declare function _script(id: string, fn: (scope: Scope) => void): (scope: Scope) => void;
+export declare function _el_read<T>(value: T): T;
 export declare function _hoist(...path: Accessor[]): (scope: Scope) => (...args: unknown[]) => any;

package/dist/dom.d.ts

@@ -1,4 +1,5 @@
 export { attrTag, attrTags } from "./common/attr-tag";
+export { _assert_hoist } from "./common/errors";
 export { forIn, forOf, forTo, forUntil } from "./common/for";
 export { $signal, $signalReset } from "./dom/abort-signal";
 export { compat } from "./dom/compat";
@@ -9,5 +10,5 @@ export { _on } from "./dom/event";
 export { _enable_catch as _enable_catch, run } from "./dom/queue";
 export { _content, _content_branch, _content_closures, _content_resume, } from "./dom/renderer";
 export { _el, _resume, _var_resume, init } from "./dom/resume";
-export { _child_setup, _closure, _closure_get, _const, _for_closure, _hoist, _id, _if_closure, _let, _or, _return, _return_change, _script, _var, _var_change, } from "./dom/signals";
+export { _child_setup, _closure, _closure_get, _const, _el_read, _for_closure, _hoist, _id, _if_closure, _let, _or, _return, _return_change, _script, _var, _var_change, } from "./dom/signals";
 export { _template } from "./dom/template";