marko 6.0.101 → 6.0.103

package/dist/debug/html.js

@@ -136,6 +136,55 @@ function _assert_hoist(value) {
     );
   }
 }
+function assertExclusiveAttrs(attrs, onError = throwErr) {
+  if (attrs) {
+    let exclusiveAttrs;
+    if (attrs.checkedChange) {
+      (exclusiveAttrs ||= []).push("checkedChange");
+    }
+    if (attrs.checkedValue) {
+      (exclusiveAttrs ||= []).push("checkedValue");
+      if (attrs.checked) {
+        exclusiveAttrs.push("checked");
+      }
+    } else if (attrs.checkedValueChange) {
+      (exclusiveAttrs ||= []).push("checkedValueChange");
+      if (attrs.checked) {
+        exclusiveAttrs.push("checked");
+      }
+    }
+    if (attrs.valueChange) {
+      (exclusiveAttrs ||= []).push("valueChange");
+    }
+    if (exclusiveAttrs && exclusiveAttrs.length > 1) {
+      onError(
+        `The attributes ${joinWithAnd(exclusiveAttrs)} are mutually exclusive.`
+      );
+    }
+  }
+}
+function assertValidTagName(tagName) {
+  if (!/^[a-z][a-z0-9._-]*$/i.test(tagName)) {
+    throw new Error(
+      `Invalid tag name: "${tagName}". Tag names must start with a letter and contain only letters, numbers, periods, hyphens, and underscores.`
+    );
+  }
+}
+function throwErr(msg) {
+  throw new Error(msg);
+}
+function joinWithAnd(a) {
+  switch (a.length) {
+    case 0:
+      return "";
+    case 1:
+      return a[0];
+    case 2:
+      return `${a[0]} and ${a[1]}`;
+    default:
+      return `${a.slice(0, -1).join(", ")}, and ${a[a.length - 1]}`;
+  }
+}
 
 // src/common/helpers.ts
 function classValue(classValue2) {
@@ -2848,6 +2897,9 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
   let events;
   switch (tagName) {
     case "input":
+      if (true) {
+        assertExclusiveAttrs(data);
+      }
       if (data.checkedChange) {
         result += _attr_input_checked(
           scopeId,
@@ -3003,6 +3055,7 @@ var RENDER_BODY_ID = prefix + (true ? "renderBody" : "b");
 // src/common/meta.ts
 var DEFAULT_RUNTIME_ID = "M";
 var DEFAULT_RENDER_ID = "_";
+var DYNAMIC_TAG_SCRIPT_REGISTER_ID = true ? "_dynamicTagScript" : "d";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
@@ -3019,11 +3072,14 @@ var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
   let rendered = false;
   let result;
   if (typeof renderer === "string") {
+    if (true) {
+      assertValidTagName(renderer);
+    }
     const input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
     rendered = true;
     _scope_id();
     _html(
-      `<${renderer}${_attrs(input, true ? `#${renderer}/0` : 0, branchId, renderer)}>`
+      `<${renderer}${_attrs(input, true ? `#${renderer}/0` : "a", branchId, renderer)}>`
     );
     if (!voidElementsReg.test(renderer)) {
       const renderContent = content || normalizeDynamicRenderer(input.content);
@@ -3036,7 +3092,7 @@ var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
         _html(
           _attr_textarea_value(
             branchId,
-            true ? `#${renderer}/0` : 0,
+            true ? `#${renderer}/0` : "a",
             input.value,
             input.valueChange
           )
@@ -3050,7 +3106,7 @@ var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
         if (renderer === "select" && ("value" in input || "valueChange" in input)) {
           _attr_select_value(
             branchId,
-            true ? `#${renderer}/0` : 0,
+            true ? `#${renderer}/0` : "a",
             input.value,
             input.valueChange,
             renderContent
@@ -3058,7 +3114,7 @@ var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
         } else {
           _dynamic_tag(
             branchId,
-            true ? `#${renderer}/0` : 0,
+            true ? `#${renderer}/0` : "a",
             renderContent,
             [],
             0,
@@ -3073,6 +3129,11 @@ var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
         `Body content is not supported for the \`<${renderer}>\` tag.`
       );
     }
+    const childScope = getScopeById(branchId);
+    if (childScope && (childScope["EventAttributes:" /* EventAttributes */ + (true ? `#${renderer}/0` : "a")] || childScope["ControlledHandler:" /* ControlledHandler */ + (true ? `#${renderer}/0` : "a")])) {
+      childScope["#Renderer" /* Renderer */] = renderer;
+      _script(branchId, DYNAMIC_TAG_SCRIPT_REGISTER_ID);
+    }
     if (shouldResume) {
       _html(
         state.mark(

package/dist/debug/html.mjs

@@ -44,6 +44,55 @@ function _assert_hoist(value) {
     );
   }
 }
+function assertExclusiveAttrs(attrs, onError = throwErr) {
+  if (attrs) {
+    let exclusiveAttrs;
+    if (attrs.checkedChange) {
+      (exclusiveAttrs ||= []).push("checkedChange");
+    }
+    if (attrs.checkedValue) {
+      (exclusiveAttrs ||= []).push("checkedValue");
+      if (attrs.checked) {
+        exclusiveAttrs.push("checked");
+      }
+    } else if (attrs.checkedValueChange) {
+      (exclusiveAttrs ||= []).push("checkedValueChange");
+      if (attrs.checked) {
+        exclusiveAttrs.push("checked");
+      }
+    }
+    if (attrs.valueChange) {
+      (exclusiveAttrs ||= []).push("valueChange");
+    }
+    if (exclusiveAttrs && exclusiveAttrs.length > 1) {
+      onError(
+        `The attributes ${joinWithAnd(exclusiveAttrs)} are mutually exclusive.`
+      );
+    }
+  }
+}
+function assertValidTagName(tagName) {
+  if (!/^[a-z][a-z0-9._-]*$/i.test(tagName)) {
+    throw new Error(
+      `Invalid tag name: "${tagName}". Tag names must start with a letter and contain only letters, numbers, periods, hyphens, and underscores.`
+    );
+  }
+}
+function throwErr(msg) {
+  throw new Error(msg);
+}
+function joinWithAnd(a) {
+  switch (a.length) {
+    case 0:
+      return "";
+    case 1:
+      return a[0];
+    case 2:
+      return `${a[0]} and ${a[1]}`;
+    default:
+      return `${a.slice(0, -1).join(", ")}, and ${a[a.length - 1]}`;
+  }
+}
 
 // src/common/helpers.ts
 function classValue(classValue2) {
@@ -2756,6 +2805,9 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
   let events;
   switch (tagName) {
     case "input":
+      if (true) {
+        assertExclusiveAttrs(data);
+      }
       if (data.checkedChange) {
         result += _attr_input_checked(
           scopeId,
@@ -2911,6 +2963,7 @@ var RENDER_BODY_ID = prefix + (true ? "renderBody" : "b");
 // src/common/meta.ts
 var DEFAULT_RUNTIME_ID = "M";
 var DEFAULT_RENDER_ID = "_";
+var DYNAMIC_TAG_SCRIPT_REGISTER_ID = true ? "_dynamicTagScript" : "d";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
@@ -2927,11 +2980,14 @@ var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
   let rendered = false;
   let result;
   if (typeof renderer === "string") {
+    if (true) {
+      assertValidTagName(renderer);
+    }
     const input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
     rendered = true;
     _scope_id();
     _html(
-      `<${renderer}${_attrs(input, true ? `#${renderer}/0` : 0, branchId, renderer)}>`
+      `<${renderer}${_attrs(input, true ? `#${renderer}/0` : "a", branchId, renderer)}>`
     );
     if (!voidElementsReg.test(renderer)) {
       const renderContent = content || normalizeDynamicRenderer(input.content);
@@ -2944,7 +3000,7 @@ var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
         _html(
           _attr_textarea_value(
             branchId,
-            true ? `#${renderer}/0` : 0,
+            true ? `#${renderer}/0` : "a",
             input.value,
             input.valueChange
           )
@@ -2958,7 +3014,7 @@ var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
         if (renderer === "select" && ("value" in input || "valueChange" in input)) {
           _attr_select_value(
             branchId,
-            true ? `#${renderer}/0` : 0,
+            true ? `#${renderer}/0` : "a",
             input.value,
             input.valueChange,
             renderContent
@@ -2966,7 +3022,7 @@ var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
         } else {
           _dynamic_tag(
             branchId,
-            true ? `#${renderer}/0` : 0,
+            true ? `#${renderer}/0` : "a",
             renderContent,
             [],
             0,
@@ -2981,6 +3037,11 @@ var _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
         `Body content is not supported for the \`<${renderer}>\` tag.`
       );
     }
+    const childScope = getScopeById(branchId);
+    if (childScope && (childScope["EventAttributes:" /* EventAttributes */ + (true ? `#${renderer}/0` : "a")] || childScope["ControlledHandler:" /* ControlledHandler */ + (true ? `#${renderer}/0` : "a")])) {
+      childScope["#Renderer" /* Renderer */] = renderer;
+      _script(branchId, DYNAMIC_TAG_SCRIPT_REGISTER_ID);
+    }
     if (shouldResume) {
       _html(
         state.mark(

package/dist/dom/abort-signal.d.ts

@@ -1,3 +1,3 @@
-import type { Scope } from "../common/types";
+import { type Scope } from "../common/types";
 export declare function $signalReset(scope: Scope, id: string | number): void;
 export declare function $signal(scope: Scope, id: string | number): AbortSignal;

package/dist/dom/control-flow.d.ts

@@ -1,16 +1,17 @@
-import { type Accessor, type BranchScope, type Scope } from "../common/types";
+import { type Accessor, AccessorProp, type BranchScope, type EncodedAccessor, type Scope } from "../common/types";
 import { type Renderer } from "./renderer";
 import { type Signal } from "./signals";
-export declare function _await(nodeAccessor: Accessor, renderer: Renderer): (scope: Scope, promise: Promise<unknown>) => void;
-export declare function _try(nodeAccessor: Accessor, content: Renderer): (scope: Scope, input: {
+export declare function _await(nodeAccessor: EncodedAccessor, renderer: Renderer): (scope: Scope, promise: Promise<unknown>) => void;
+export declare function _try(nodeAccessor: EncodedAccessor, content: Renderer): (scope: Scope, input: {
     catch: unknown;
     placeholder: unknown;
 }) => void;
 export declare function renderCatch(scope: Scope, error: unknown): void;
-export declare function _if(nodeAccessor: Accessor, ...branches: Renderer[]): (scope: Scope, newBranch: number) => void;
+export declare function _if(nodeAccessor: EncodedAccessor, ...branches: Renderer[]): (scope: Scope, newBranch: number) => void;
 export declare function patchDynamicTag(fn: <T extends typeof _dynamic_tag>(cond: T) => T): void;
-export declare let _dynamic_tag: (nodeAccessor: Accessor, getContent?: ((scope: Scope) => Renderer) | 0, getTagVar?: (() => Signal<unknown>) | 0, inputIsArgs?: 1) => Signal<Renderer | string | undefined>;
-export declare function setConditionalRenderer<T>(scope: Scope, nodeAccessor: Accessor, newRenderer: T, createBranch: ($global: Scope["$global"], renderer: NonNullable<T>, parentScope: Scope, parentNode: ParentNode) => BranchScope): void;
+export declare let _dynamic_tag: (nodeAccessor: EncodedAccessor, getContent?: ((scope: Scope) => Renderer) | 0, getTagVar?: (() => Signal<unknown>) | 0, inputIsArgs?: 1) => Signal<Renderer | string | undefined>;
+export declare function _resume_dynamic_tag(): void;
+export declare function setConditionalRenderer<T>(scope: Scope, nodeAccessor: Accessor, newRenderer: T, createBranch: ($global: Scope[AccessorProp.Global], renderer: NonNullable<T>, parentScope: Scope, parentNode: ParentNode) => BranchScope): void;
 export declare function _for_of(nodeAccessor: Accessor, renderer: Renderer): (scope: Scope, value: [all: unknown[], by?: ((item: unknown, index: number) => unknown) | undefined]) => void;
 export declare function _for_in(nodeAccessor: Accessor, renderer: Renderer): (scope: Scope, value: [obj: {}, by?: ((key: string, v: unknown) => unknown) | undefined]) => void;
 export declare function _for_to(nodeAccessor: Accessor, renderer: Renderer): (scope: Scope, value: [to: number, from: number, step: number, by?: ((v: number) => unknown) | undefined]) => void;

package/dist/dom/queue.d.ts

@@ -1,4 +1,4 @@
-import type { Scope } from "../common/types";
+import { type Scope } from "../common/types";
 import type { Signal } from "./signals";
 type ExecFn<S extends Scope = Scope> = (scope: S, arg?: any) => void;
 export declare const caughtError: WeakSet<unknown[]>;

package/dist/dom/reconcile.d.ts

@@ -1,2 +1,2 @@
-import type { BranchScope } from "../common/types";
+import { type BranchScope } from "../common/types";
 export declare function reconcile(parent: ParentNode, oldBranches: BranchScope[], newBranches: BranchScope[], afterReference: Node | null): void;

package/dist/dom/renderer.d.ts

@@ -1,4 +1,4 @@
-import { type Accessor, type BranchScope, type Scope } from "../common/types";
+import { type Accessor, AccessorProp, type BranchScope, type Scope } from "../common/types";
 import { type Signal, type SignalFn } from "./signals";
 export type Renderer = {
     ___id: string;
@@ -11,8 +11,8 @@ export type Renderer = {
     ___localClosureValues?: Record<Accessor, unknown>;
 };
 type SetupFn = (scope: Scope) => void;
-export declare function createBranch($global: Scope["$global"], renderer: Renderer | string, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
-export declare function createAndSetupBranch($global: Scope["$global"], renderer: Renderer, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
+export declare function createBranch($global: Scope[AccessorProp.Global], renderer: Renderer | string, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
+export declare function createAndSetupBranch($global: Scope[AccessorProp.Global], renderer: Renderer, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
 export declare function setupBranch(renderer: Renderer, branch: BranchScope): BranchScope;
 export declare function _content(id: string, template: string | 0, walks?: string | 0, setup?: {
     _: Signal<unknown>;

package/dist/dom/resume.d.ts

@@ -1,9 +1,9 @@
-import { type Scope } from "../common/types";
+import { type EncodedAccessor, type Scope } from "../common/types";
 import type { Signal } from "./signals";
 export declare function enableBranches(): void;
 export declare function init(runtimeId?: string): void;
 export declare let isResuming: undefined | 0 | 1;
+export declare function getRegisteredWithScope(id: string, scope?: Scope): unknown;
 export declare function _resume<T>(id: string, obj: T): T;
 export declare function _var_resume<T extends Signal<unknown>>(id: string, signal: T): T;
-export declare function getRegisteredWithScope(id: string, scope?: Scope): unknown;
-export declare function _el(id: string, key: string): (scope: Scope) => () => any;
+export declare function _el(id: string, accessor: EncodedAccessor): (scope: Scope) => () => any;

package/dist/dom/scope.d.ts

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

package/dist/dom/signals.d.ts

@@ -1,16 +1,16 @@
-import { type Accessor, type Scope } from "../common/types";
+import { type Accessor, AccessorProp, type EncodedAccessor, type Scope } from "../common/types";
 export type SignalFn = (scope: Scope) => void;
 export type Signal<T> = ((scope: Scope, value: T) => void) & {
     ___subscribe?(scope: Scope): void;
 };
-export declare function _let<T>(valueAccessor: Accessor, fn?: SignalFn): (scope: Scope, value: T, valueChange?: (v: T) => void) => T;
-export declare function _const<T>(valueAccessor: Accessor, fn?: SignalFn): Signal<T>;
+export declare function _let<T>(id: EncodedAccessor, fn?: SignalFn): (scope: Scope, value: T, valueChange?: (v: T) => void) => T;
+export declare function _const<T>(valueAccessor: EncodedAccessor, fn?: SignalFn): Signal<T>;
 export declare function _or(id: number, fn: SignalFn, defaultPending?: number, scopeIdAccessor?: Accessor): Signal<never>;
-export declare function _for_closure(ownerLoopNodeAccessor: Accessor, fn: SignalFn): SignalFn;
-export declare function _if_closure(ownerConditionalNodeAccessor: Accessor, branch: number, fn: SignalFn): SignalFn;
+export declare function _for_closure(ownerLoopNodeAccessor: EncodedAccessor, fn: SignalFn): SignalFn;
+export declare function _if_closure(ownerConditionalNodeAccessor: EncodedAccessor, branch: number, fn: SignalFn): SignalFn;
 export declare function subscribeToScopeSet(ownerScope: Scope, accessor: Accessor, scope: Scope): void;
 export declare function _closure(...closureSignals: ReturnType<typeof _closure_get>[]): (scope: Scope) => void;
-export declare function _closure_get(valueAccessor: Accessor, fn: SignalFn, getOwnerScope?: (scope: Scope) => Scope): SignalFn & {
+export declare function _closure_get(valueAccessor: EncodedAccessor, fn: SignalFn, getOwnerScope?: (scope: Scope) => Scope): SignalFn & {
     ___scopeInstancesAccessor: string;
     ___signalIndexAccessor: string;
     ___index: number;
@@ -22,11 +22,11 @@ export declare function _child_setup(setup: Signal<never> & {
 } & {
     _: Signal<Scope>;
 };
-export declare function _var(scope: Scope, childAccessor: Accessor, signal: Signal<unknown>): void;
+export declare function _var(scope: Scope, childAccessor: EncodedAccessor, signal: Signal<unknown>): void;
 export declare const _return: (scope: Scope, value: unknown) => any;
 export declare function _return_change(scope: Scope, changeHandler?: ((value: unknown) => void) | null | false): void;
 export declare const _var_change: (scope: Scope, value: unknown, name?: string) => void;
-export declare function _id({ $global }: Scope): string;
+export declare function _id({ [AccessorProp.Global]: $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

@@ -4,7 +4,7 @@ export { forIn, forOf, forTo, forUntil } from "./common/for";
 export { _call } from "./common/helpers";
 export { $signal, $signalReset } from "./dom/abort-signal";
 export { compat } from "./dom/compat";
-export { _await, _dynamic_tag, _for_in, _for_of, _for_to, _for_until, _if, _try, } from "./dom/control-flow";
+export { _await, _dynamic_tag, _for_in, _for_of, _for_to, _for_until, _if, _resume_dynamic_tag, _try, } from "./dom/control-flow";
 export { _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open_script as _attr_details_open_script, _attr_details_or_dialog_open as _attr_dialog_open, _attr_details_or_dialog_open_script as _attr_dialog_open_script, _attr_input_checked, _attr_input_checked_script, _attr_input_checkedValue, _attr_input_checkedValue_script, _attr_input_value, _attr_input_value_script, _attr_select_value, _attr_select_value_script, _attr_textarea_value, _attr_textarea_value_script, } from "./dom/controllable";
 export { _attr, _attr_class, _attr_class_item, _attr_class_items, _attr_content, _attr_style, _attr_style_item, _attr_style_items, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _attrs_script, _html, _lifecycle, _text, _text_content, } from "./dom/dom";
 export { _on } from "./dom/event";