@solidjs/web 2.0.0-experimental.0 → 2.0.0-experimental.10

package/dist/web.js

@@ -1,487 +1,24 @@
-import {
-  createRoot,
-  untrack,
-  createRenderEffect,
-  sharedConfig,
-  flatten,
-  enableHydration,
-  createMemo,
-  omit
-} from "solid-js";
-export {
-  ErrorBoundary,
-  For,
-  Match,
-  Show,
-  Suspense,
-  Switch,
-  createComponent,
-  createRenderEffect as effect,
-  getOwner,
-  createMemo as memo,
-  merge as mergeProps,
-  untrack
-} from "solid-js";
+import { createMemo, createRoot, flatten, untrack, createRenderEffect, sharedConfig, enableHydration, omit } from 'solid-js';
+export { ErrorBoundary, For, Match, Show, Suspense, Switch, createComponent, createRenderEffect as effect, getOwner, merge as mergeProps, untrack } from 'solid-js';
 
-const booleans = [
-  "allowfullscreen",
-  "async",
-  "autofocus",
-  "autoplay",
-  "checked",
-  "controls",
-  "default",
-  "disabled",
-  "formnovalidate",
-  "hidden",
-  "indeterminate",
-  "inert",
-  "ismap",
-  "loop",
-  "multiple",
-  "muted",
-  "nomodule",
-  "novalidate",
-  "open",
-  "playsinline",
-  "readonly",
-  "required",
-  "reversed",
-  "seamless",
-  "selected"
-];
-const Properties = /*#__PURE__*/ new Set([
-  "value",
-  "readOnly",
-  "formNoValidate",
-  "isMap",
-  "noModule",
-  "playsInline",
-  ...booleans
-]);
-const ChildProperties = /*#__PURE__*/ new Set([
-  "innerHTML",
-  "textContent",
-  "innerText",
-  "children"
-]);
-const PropAliases = /*#__PURE__*/ Object.assign(Object.create(null), {
-  class: "className",
-  formnovalidate: {
-    $: "formNoValidate",
-    BUTTON: 1,
-    INPUT: 1
-  },
-  ismap: {
-    $: "isMap",
-    IMG: 1
-  },
-  nomodule: {
-    $: "noModule",
-    SCRIPT: 1
-  },
-  playsinline: {
-    $: "playsInline",
-    VIDEO: 1
-  },
-  readonly: {
-    $: "readOnly",
-    INPUT: 1,
-    TEXTAREA: 1
-  }
-});
-function getPropAlias(prop, tagName) {
-  const a = PropAliases[prop];
-  return typeof a === "object" ? (a[tagName] ? a["$"] : undefined) : a;
-}
-const DelegatedEvents = /*#__PURE__*/ new Set([
-  "beforeinput",
-  "click",
-  "dblclick",
-  "contextmenu",
-  "focusin",
-  "focusout",
-  "input",
-  "keydown",
-  "keyup",
-  "mousedown",
-  "mousemove",
-  "mouseout",
-  "mouseover",
-  "mouseup",
-  "pointerdown",
-  "pointermove",
-  "pointerout",
-  "pointerover",
-  "pointerup",
-  "touchend",
-  "touchmove",
-  "touchstart"
-]);
-const SVGElements = /*#__PURE__*/ new Set([
-  "altGlyph",
-  "altGlyphDef",
-  "altGlyphItem",
-  "animate",
-  "animateColor",
-  "animateMotion",
-  "animateTransform",
-  "circle",
-  "clipPath",
-  "color-profile",
-  "cursor",
-  "defs",
-  "desc",
-  "ellipse",
-  "feBlend",
-  "feColorMatrix",
-  "feComponentTransfer",
-  "feComposite",
-  "feConvolveMatrix",
-  "feDiffuseLighting",
-  "feDisplacementMap",
-  "feDistantLight",
-  "feDropShadow",
-  "feFlood",
-  "feFuncA",
-  "feFuncB",
-  "feFuncG",
-  "feFuncR",
-  "feGaussianBlur",
-  "feImage",
-  "feMerge",
-  "feMergeNode",
-  "feMorphology",
-  "feOffset",
-  "fePointLight",
-  "feSpecularLighting",
-  "feSpotLight",
-  "feTile",
-  "feTurbulence",
-  "filter",
-  "font",
-  "font-face",
-  "font-face-format",
-  "font-face-name",
-  "font-face-src",
-  "font-face-uri",
-  "foreignObject",
-  "g",
-  "glyph",
-  "glyphRef",
-  "hkern",
-  "image",
-  "line",
-  "linearGradient",
-  "marker",
-  "mask",
-  "metadata",
-  "missing-glyph",
-  "mpath",
-  "path",
-  "pattern",
-  "polygon",
-  "polyline",
-  "radialGradient",
-  "rect",
-  "set",
-  "stop",
-  "svg",
-  "switch",
-  "symbol",
-  "text",
-  "textPath",
-  "tref",
-  "tspan",
-  "use",
-  "view",
-  "vkern"
-]);
+const Properties = /*#__PURE__*/new Set([
+"value", "checked", "selected", "muted"]);
+const ChildProperties = /*#__PURE__*/new Set(["innerHTML", "textContent", "innerText", "children"]);
+const DelegatedEvents = /*#__PURE__*/new Set(["beforeinput", "click", "dblclick", "contextmenu", "focusin", "focusout", "input", "keydown", "keyup", "mousedown", "mousemove", "mouseout", "mouseover", "mouseup", "pointerdown", "pointermove", "pointerout", "pointerover", "pointerup", "touchend", "touchmove", "touchstart"]);
+const SVGElements = /*#__PURE__*/new Set([
+"altGlyph", "altGlyphDef", "altGlyphItem", "animate", "animateColor", "animateMotion", "animateTransform", "circle", "clipPath", "color-profile", "cursor", "defs", "desc", "ellipse", "feBlend", "feColorMatrix", "feComponentTransfer", "feComposite", "feConvolveMatrix", "feDiffuseLighting", "feDisplacementMap", "feDistantLight", "feDropShadow", "feFlood", "feFuncA", "feFuncB", "feFuncG", "feFuncR", "feGaussianBlur", "feImage", "feMerge", "feMergeNode", "feMorphology", "feOffset", "fePointLight", "feSpecularLighting", "feSpotLight", "feTile", "feTurbulence", "filter", "font", "font-face", "font-face-format", "font-face-name", "font-face-src", "font-face-uri", "foreignObject", "g", "glyph", "glyphRef", "hkern", "image", "line", "linearGradient", "marker", "mask", "metadata", "missing-glyph", "mpath", "path", "pattern", "polygon", "polyline", "radialGradient", "rect",
+"set", "stop",
+"svg", "switch", "symbol", "text", "textPath",
+"tref", "tspan", "use", "view", "vkern"]);
 const SVGNamespace = {
   xlink: "http://www.w3.org/1999/xlink",
   xml: "http://www.w3.org/XML/1998/namespace"
 };
-const DOMElements = /*#__PURE__*/ new Set([
-  "html",
-  "base",
-  "head",
-  "link",
-  "meta",
-  "style",
-  "title",
-  "body",
-  "address",
-  "article",
-  "aside",
-  "footer",
-  "header",
-  "main",
-  "nav",
-  "section",
-  "body",
-  "blockquote",
-  "dd",
-  "div",
-  "dl",
-  "dt",
-  "figcaption",
-  "figure",
-  "hr",
-  "li",
-  "ol",
-  "p",
-  "pre",
-  "ul",
-  "a",
-  "abbr",
-  "b",
-  "bdi",
-  "bdo",
-  "br",
-  "cite",
-  "code",
-  "data",
-  "dfn",
-  "em",
-  "i",
-  "kbd",
-  "mark",
-  "q",
-  "rp",
-  "rt",
-  "ruby",
-  "s",
-  "samp",
-  "small",
-  "span",
-  "strong",
-  "sub",
-  "sup",
-  "time",
-  "u",
-  "var",
-  "wbr",
-  "area",
-  "audio",
-  "img",
-  "map",
-  "track",
-  "video",
-  "embed",
-  "iframe",
-  "object",
-  "param",
-  "picture",
-  "portal",
-  "source",
-  "svg",
-  "math",
-  "canvas",
-  "noscript",
-  "script",
-  "del",
-  "ins",
-  "caption",
-  "col",
-  "colgroup",
-  "table",
-  "tbody",
-  "td",
-  "tfoot",
-  "th",
-  "thead",
-  "tr",
-  "button",
-  "datalist",
-  "fieldset",
-  "form",
-  "input",
-  "label",
-  "legend",
-  "meter",
-  "optgroup",
-  "option",
-  "output",
-  "progress",
-  "select",
-  "textarea",
-  "details",
-  "dialog",
-  "menu",
-  "summary",
-  "details",
-  "slot",
-  "template",
-  "acronym",
-  "applet",
-  "basefont",
-  "bgsound",
-  "big",
-  "blink",
-  "center",
-  "content",
-  "dir",
-  "font",
-  "frame",
-  "frameset",
-  "hgroup",
-  "image",
-  "keygen",
-  "marquee",
-  "menuitem",
-  "nobr",
-  "noembed",
-  "noframes",
-  "plaintext",
-  "rb",
-  "rtc",
-  "shadow",
-  "spacer",
-  "strike",
-  "tt",
-  "xmp",
-  "a",
-  "abbr",
-  "acronym",
-  "address",
-  "applet",
-  "area",
-  "article",
-  "aside",
-  "audio",
-  "b",
-  "base",
-  "basefont",
-  "bdi",
-  "bdo",
-  "bgsound",
-  "big",
-  "blink",
-  "blockquote",
-  "body",
-  "br",
-  "button",
-  "canvas",
-  "caption",
-  "center",
-  "cite",
-  "code",
-  "col",
-  "colgroup",
-  "content",
-  "data",
-  "datalist",
-  "dd",
-  "del",
-  "details",
-  "dfn",
-  "dialog",
-  "dir",
-  "div",
-  "dl",
-  "dt",
-  "em",
-  "embed",
-  "fieldset",
-  "figcaption",
-  "figure",
-  "font",
-  "footer",
-  "form",
-  "frame",
-  "frameset",
-  "head",
-  "header",
-  "hgroup",
-  "hr",
-  "html",
-  "i",
-  "iframe",
-  "image",
-  "img",
-  "input",
-  "ins",
-  "kbd",
-  "keygen",
-  "label",
-  "legend",
-  "li",
-  "link",
-  "main",
-  "map",
-  "mark",
-  "marquee",
-  "menu",
-  "menuitem",
-  "meta",
-  "meter",
-  "nav",
-  "nobr",
-  "noembed",
-  "noframes",
-  "noscript",
-  "object",
-  "ol",
-  "optgroup",
-  "option",
-  "output",
-  "p",
-  "param",
-  "picture",
-  "plaintext",
-  "portal",
-  "pre",
-  "progress",
-  "q",
-  "rb",
-  "rp",
-  "rt",
-  "rtc",
-  "ruby",
-  "s",
-  "samp",
-  "script",
-  "section",
-  "select",
-  "shadow",
-  "slot",
-  "small",
-  "source",
-  "spacer",
-  "span",
-  "strike",
-  "strong",
-  "style",
-  "sub",
-  "summary",
-  "sup",
-  "table",
-  "tbody",
-  "td",
-  "template",
-  "textarea",
-  "tfoot",
-  "th",
-  "thead",
-  "time",
-  "title",
-  "tr",
-  "track",
-  "tt",
-  "u",
-  "ul",
-  "var",
-  "video",
-  "wbr",
-  "xmp",
-  "input",
-  "h1",
-  "h2",
-  "h3",
-  "h4",
-  "h5",
-  "h6"
-]);
+const DOMElements = /*#__PURE__*/new Set(["html", "base", "head", "link", "meta", "style", "title", "body", "address", "article", "aside", "footer", "header", "main", "nav", "section", "body", "blockquote", "dd", "div", "dl", "dt", "figcaption", "figure", "hr", "li", "ol", "p", "pre", "ul", "a", "abbr", "b", "bdi", "bdo", "br", "cite", "code", "data", "dfn", "em", "i", "kbd", "mark", "q", "rp", "rt", "ruby", "s", "samp", "small", "span", "strong", "sub", "sup", "time", "u", "var", "wbr", "area", "audio", "img", "map", "track", "video", "embed", "iframe", "object", "param", "picture", "portal", "source", "svg", "math", "canvas", "noscript", "script", "del", "ins", "caption", "col", "colgroup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "button", "datalist", "fieldset", "form", "input", "label", "legend", "meter", "optgroup", "option", "output", "progress", "select", "textarea", "details", "dialog", "menu", "summary", "details", "slot", "template", "acronym", "applet", "basefont", "bgsound", "big", "blink", "center", "content", "dir", "font", "frame", "frameset", "hgroup", "image", "keygen", "marquee", "menuitem", "nobr", "noembed", "noframes", "plaintext", "rb", "rtc", "shadow", "spacer", "strike", "tt", "xmp", "a", "abbr", "acronym", "address", "applet", "area", "article", "aside", "audio", "b", "base", "basefont", "bdi", "bdo", "bgsound", "big", "blink", "blockquote", "body", "br", "button", "canvas", "caption", "center", "cite", "code", "col", "colgroup", "content", "data", "datalist", "dd", "del", "details", "dfn", "dialog", "dir", "div", "dl", "dt", "em", "embed", "fieldset", "figcaption", "figure", "font", "footer", "form", "frame", "frameset", "head", "header", "hgroup", "hr", "html", "i", "iframe", "image", "img", "input", "ins", "kbd", "keygen", "label", "legend", "li", "link", "main", "map", "mark", "marquee", "menu", "menuitem", "meta", "meter", "nav", "nobr", "noembed", "noframes", "noscript", "object", "ol", "optgroup", "option", "output", "p", "param", "picture", "plaintext", "portal", "pre", "progress", "q", "rb", "rp", "rt", "rtc", "ruby", "s", "samp", "script", "section", "select", "shadow", "slot", "small", "source", "spacer", "span", "strike", "strong", "style", "sub", "summary", "sup", "table", "tbody", "td", "template", "textarea", "tfoot", "th", "thead", "time", "title", "tr", "track", "tt", "u", "ul", "var", "video", "wbr", "xmp", "input", "h1", "h2", "h3", "h4", "h5", "h6",
+"webview",
+"isindex", "listing", "multicol", "nextid", "noindex", "search"]);
+
+const memo = fn => createMemo(() => fn());
 
 function reconcileArrays(parentNode, a, b) {
   let bLength = b.length,
@@ -502,7 +39,7 @@ function reconcileArrays(parentNode, a, b) {
       bEnd--;
     }
     if (aEnd === aStart) {
-      const node = bEnd < bLength ? (bStart ? b[bStart - 1].nextSibling : b[bEnd - bStart]) : after;
+      const node = bEnd < bLength ? bStart ? b[bStart - 1].nextSibling : b[bEnd - bStart] : after;
       while (bStart < bEnd) parentNode.insertBefore(b[bStart++], node);
     } else if (bEnd === bStart) {
       while (aStart < aEnd) {
@@ -545,10 +82,10 @@ function render(code, element, init, options = {}) {
   let disposer;
   createRoot(dispose => {
     disposer = dispose;
-    element === document
-      ? code()
-      : insert(element, code(), element.firstChild ? null : undefined, init);
-  }, options.owner);
+    element === document ? flatten(code) : insert(element, code(), element.firstChild ? null : undefined, init);
+  }, {
+    id: options.renderId
+  });
   return () => {
     disposer();
     element.textContent = "";
@@ -557,15 +94,11 @@ function render(code, element, init, options = {}) {
 function template(html, isImportNode, isSVG, isMathML) {
   let node;
   const create = () => {
-    const t = isMathML
-      ? document.createElementNS("http://www.w3.org/1998/Math/MathML", "template")
-      : document.createElement("template");
+    const t = isMathML ? document.createElementNS("http://www.w3.org/1998/Math/MathML", "template") : document.createElement("template");
     t.innerHTML = html;
     return isSVG ? t.content.firstChild.firstChild : isMathML ? t.firstChild : t.content.firstChild;
   };
-  return isImportNode
-    ? () => untrack(() => document.importNode(node || (node = create()), true))
-    : () => (node || (node = create())).cloneNode(true);
+  return isImportNode ? () => untrack(() => document.importNode(node || (node = create()), true)) : () => (node || (node = create())).cloneNode(true);
 }
 function delegateEvents(eventNames, document = window.document) {
   const e = document[$$EVENTS] || (document[$$EVENTS] = new Set());
@@ -584,27 +117,25 @@ function clearDelegatedEvents(document = window.document) {
   }
 }
 function setProperty(node, name, value) {
+  if (isHydrating(node)) return;
   node[name] = value;
 }
 function setAttribute(node, name, value) {
-  if (value == null) node.removeAttribute(name);
-  else node.setAttribute(name, value);
+  if (isHydrating(node)) return;
+  if (value == null || value === false) node.removeAttribute(name);else node.setAttribute(name, value === true ? "" : value);
 }
 function setAttributeNS(node, namespace, name, value) {
-  if (value == null) node.removeAttributeNS(namespace, name);
-  else node.setAttributeNS(namespace, name, value);
-}
-function setBoolAttribute(node, name, value) {
   if (isHydrating(node)) return;
-  value ? node.setAttribute(name, "") : node.removeAttribute(name);
+  if (value == null) node.removeAttributeNS(namespace, name);else node.setAttributeNS(namespace, name, value);
 }
 function className(node, value, isSVG, prev) {
-  if (value == null) {
+  if (isHydrating(node)) return;
+  if (value == null || value === false) {
     prev && node.removeAttribute("class");
     return;
   }
   if (typeof value === "string") {
-    value !== prev && (isSVG ? node.setAttribute("class", value) : (node.className = value));
+    value !== prev && (isSVG ? node.setAttribute("class", value) : node.className = value);
     return;
   }
   if (typeof prev === "string") {
@@ -635,7 +166,7 @@ function addEventListener(node, name, handler, delegate) {
     } else node[`$$${name}`] = handler;
   } else if (Array.isArray(handler)) {
     const handlerFn = handler[0];
-    node.addEventListener(name, (handler[0] = e => handlerFn.call(node, handler[1], e)));
+    node.addEventListener(name, handler[0] = e => handlerFn.call(node, handler[1], e));
   } else node.addEventListener(name, handler, typeof handler !== "function" && handler);
 }
 function style(node, value, prev) {
@@ -644,7 +175,7 @@ function style(node, value, prev) {
     return;
   }
   const nodeStyle = node.style;
-  if (typeof value === "string") return (nodeStyle.cssText = value);
+  if (typeof value === "string") return nodeStyle.cssText = value;
   typeof prev === "string" && (nodeStyle.cssText = prev = undefined);
   prev || (prev = {});
   value || (value = {});
@@ -656,32 +187,26 @@ function style(node, value, prev) {
   }
   for (s in prev) value[s] == null && nodeStyle.removeProperty(s);
 }
+function setStyleProperty(node, name, value) {
+  value != null ? node.style.setProperty(name, value) : node.style.removeProperty(name);
+}
 function spread(node, props = {}, isSVG, skipChildren) {
   const prevProps = {};
   if (!skipChildren) {
-    createRenderEffect(
-      () => normalize(props.children, prevProps.children),
-      value => {
-        insertExpression(node, value, prevProps.children);
-        prevProps.children = value;
-      }
-    );
+    createRenderEffect(() => normalize(props.children, prevProps.children), value => {
+      insertExpression(node, value, prevProps.children);
+      prevProps.children = value;
+    });
   }
-  createRenderEffect(
-    () => typeof props.ref === "function" && use(props.ref, node),
-    () => {}
-  );
-  createRenderEffect(
-    () => {
-      const newProps = {};
-      for (const prop in props) {
-        if (prop === "children" || prop === "ref") continue;
-        newProps[prop] = props[prop];
-      }
-      return newProps;
-    },
-    props => assign(node, props, isSVG, true, prevProps, true)
-  );
+  createRenderEffect(() => typeof props.ref === "function" && use(props.ref, node), () => {});
+  createRenderEffect(() => {
+    const newProps = {};
+    for (const prop in props) {
+      if (prop === "children" || prop === "ref") continue;
+      newProps[prop] = props[prop];
+    }
+    return newProps;
+  }, props => assign(node, props, isSVG, true, prevProps, true));
   return prevProps;
 }
 function dynamicProperty(props, key) {
@@ -704,11 +229,7 @@ function insert(parent, accessor, marker, initial) {
     accessor = normalize(accessor, initial, multi, true);
     if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
   }
-  createRenderEffect(
-    prev => normalize(accessor, prev, multi),
-    (value, current) => insertExpression(parent, value, current, marker),
-    initial
-  );
+  createRenderEffect(prev => normalize(accessor, prev, multi), (value, current) => insertExpression(parent, value, current, marker), initial);
 }
 function assign(node, props, isSVG, skipChildren, prevProps = {}, skipRef = false) {
   props || (props = {});
@@ -729,28 +250,26 @@ function assign(node, props, isSVG, skipChildren, prevProps = {}, skipRef = fals
 }
 function hydrate$1(code, element, options = {}) {
   if (globalThis._$HY.done) return render(code, element, [...element.childNodes], options);
+  options.renderId ||= "";
   sharedConfig.completed = globalThis._$HY.completed;
   sharedConfig.events = globalThis._$HY.events;
   sharedConfig.load = id => globalThis._$HY.r[id];
   sharedConfig.has = id => id in globalThis._$HY.r;
   sharedConfig.gather = root => gatherHydratable(element, root);
   sharedConfig.registry = new Map();
-  sharedConfig.context = {
-    id: options.renderId || "",
-    count: 0
-  };
+  sharedConfig.hydrating = true;
   try {
     gatherHydratable(element, options.renderId);
     return render(code, element, [...element.childNodes], options);
   } finally {
-    sharedConfig.context = null;
+    sharedConfig.hydrating = false;
   }
 }
 function getNextElement(template) {
   let node,
     key,
     hydrating = isHydrating();
-  if (!hydrating || !(node = sharedConfig.registry.get((key = getHydrationKey())))) {
+  if (!hydrating || !(node = sharedConfig.registry.get(key = getHydrationKey()))) {
     return template();
   }
   if (sharedConfig.completed) sharedConfig.completed.add(node);
@@ -769,8 +288,7 @@ function getNextMarker(start) {
     while (end) {
       if (end.nodeType === 8) {
         const v = end.nodeValue;
-        if (v === "$") count++;
-        else if (v === "/") {
+        if (v === "$") count++;else if (v === "/") {
           if (count === 0) return [end, current];
           count--;
         }
@@ -784,7 +302,10 @@ function getNextMarker(start) {
 function runHydrationEvents() {
   if (sharedConfig.events && !sharedConfig.events.queued) {
     queueMicrotask(() => {
-      const { completed, events } = sharedConfig;
+      const {
+        completed,
+        events
+      } = sharedConfig;
       if (!events) return;
       events.queued = false;
       while (events.length) {
@@ -802,27 +323,28 @@ function runHydrationEvents() {
   }
 }
 function isHydrating(node) {
-  return !!sharedConfig.context && !sharedConfig.done && (!node || node.isConnected);
+  return sharedConfig.hydrating && !sharedConfig.done && (!node || node.isConnected);
 }
 function toggleClassKey(node, key, value) {
   const classNames = key.trim().split(/\s+/);
-  for (let i = 0, nameLen = classNames.length; i < nameLen; i++)
-    node.classList.toggle(classNames[i], value);
+  for (let i = 0, nameLen = classNames.length; i < nameLen; i++) node.classList.toggle(classNames[i], value);
 }
 function classListToObject(classList) {
   if (Array.isArray(classList)) {
     const result = {};
-    for (let i = 0, len = classList.length; i < len; i++) {
-      const key = classList[i];
-      if (typeof key === "object" && key != null) Object.assign(result, key);
-      else if (key || key === 0) result[key] = true;
-    }
+    flattenClassList(classList, result);
     return result;
   }
   return classList;
 }
+function flattenClassList(list, result) {
+  for (let i = 0, len = list.length; i < len; i++) {
+    const item = list[i];
+    if (Array.isArray(item)) flattenClassList(item, result);else if (typeof item === "object" && item != null) Object.assign(result, item);else if (item || item === 0) result[item] = true;
+  }
+}
 function assignProp(node, prop, value, prev, isSVG, skipRef) {
-  let propAlias, forceProp;
+  let forceProp;
   if (prop === "style") return style(node, value, prev), value;
   if (prop === "class") return className(node, value, isSVG, prev), value;
   if (value === prev) return prev;
@@ -843,22 +365,12 @@ function assignProp(node, prop, value, prev, isSVG, skipRef) {
       addEventListener(node, name, value, delegate);
       delegate && delegateEvents([name]);
     }
-  } else if (prop.slice(0, 5) === "attr:") {
-    setAttribute(node, prop.slice(5), value);
-  } else if (prop.slice(0, 5) === "bool:") {
-    setBoolAttribute(node, prop.slice(5), value);
-  } else if (
-    (forceProp = prop.slice(0, 5) === "prop:") ||
-    ChildProperties.has(prop) ||
-    (!isSVG && (propAlias = getPropAlias(prop, node.tagName))) ||
-    Properties.has(prop)
-  ) {
-    if (forceProp) prop = prop.slice(5);
-    else node[propAlias || prop] = value;
+  } else if ((forceProp = prop.slice(0, 5) === "prop:") || ChildProperties.has(prop) || !isSVG && Properties.has(prop)) {
+    if (forceProp) prop = prop.slice(5);else if (isHydrating(node)) return value;
+    if (prop === "value" && node.nodeName === "SELECT") queueMicrotask(() => node.value = value) || (node.value = value);else node[prop] = value;
   } else {
     const ns = isSVG && prop.indexOf(":") > -1 && SVGNamespace[prop.split(":")[0]];
-    if (ns) setAttributeNS(node, ns, prop, value);
-    else setAttribute(node, prop, value);
+    if (ns) setAttributeNS(node, ns, prop, value);else setAttribute(node, prop, value);
   }
   return value;
 }
@@ -870,11 +382,10 @@ function eventHandler(e) {
   const key = `$$${e.type}`;
   const oriTarget = e.target;
   const oriCurrentTarget = e.currentTarget;
-  const retarget = value =>
-    Object.defineProperty(e, "target", {
-      configurable: true,
-      value
-    });
+  const retarget = value => Object.defineProperty(e, "target", {
+    configurable: true,
+    value
+  });
   const handleNode = () => {
     const handler = node[key];
     if (handler && !node.disabled) {
@@ -882,11 +393,7 @@ function eventHandler(e) {
       data !== undefined ? handler.call(node, data, e) : handler.call(node, e);
       if (e.cancelBubble) return;
     }
-    node.host &&
-      typeof node.host !== "string" &&
-      !node.host._$host &&
-      node.contains(e.target) &&
-      retarget(node.host);
+    node.host && typeof node.host !== "string" && !node.host._$host && node.contains(e.target) && retarget(node.host);
     return true;
   };
   const walkUpTree = () => {
@@ -914,10 +421,12 @@ function eventHandler(e) {
         break;
       }
     }
-  } else walkUpTree();
+  }
+  else walkUpTree();
   retarget(oriTarget);
 }
 function insertExpression(parent, value, current, marker) {
+  if (isHydrating(parent)) return;
   if (value === current) return;
   const t = typeof value,
     multi = marker !== undefined;
@@ -946,7 +455,7 @@ function insertExpression(parent, value, current, marker) {
       current && cleanChildren(parent);
       appendNodes(parent, value);
     }
-  } else;
+  } else ;
 }
 function normalize(value, current, multi, doNotUnwrap) {
   value = flatten(value, {
@@ -954,15 +463,13 @@ function normalize(value, current, multi, doNotUnwrap) {
     doNotUnwrap
   });
   if (doNotUnwrap && typeof value === "function") return value;
-  if (multi && value != null && !Array.isArray(value)) value = [value];
+  if (multi && !Array.isArray(value)) value = [value != null ? value : ""];
   if (Array.isArray(value)) {
     for (let i = 0, len = value.length; i < len; i++) {
       const item = value[i],
         prev = current && current[i],
         t = typeof item;
-      if (t === "string" || t === "number")
-        value[i] =
-          prev && prev.nodeType === 3 && prev.data === item ? prev : document.createTextNode(item);
+      if (t === "string" || t === "number") value[i] = prev && prev.nodeType === 3 && prev.data === item ? prev : document.createTextNode(item);
     }
   }
   return value;
@@ -971,36 +478,31 @@ function appendNodes(parent, array, marker = null) {
   for (let i = 0, len = array.length; i < len; i++) parent.insertBefore(array[i], marker);
 }
 function cleanChildren(parent, current, marker, replacement) {
-  if (marker === undefined) return (parent.textContent = "");
+  if (marker === undefined) return parent.textContent = "";
   if (current.length) {
     let inserted = false;
     for (let i = current.length - 1; i >= 0; i--) {
       const el = current[i];
       if (replacement !== el) {
         const isParent = el.parentNode === parent;
-        if (replacement && !inserted && !i)
-          isParent
-            ? parent.replaceChild(replacement, el)
-            : parent.insertBefore(replacement, marker);
-        else isParent && el.remove();
+        if (replacement && !inserted && !i) isParent ? parent.replaceChild(replacement, el) : parent.insertBefore(replacement, marker);else isParent && el.remove();
       } else inserted = true;
     }
   } else if (replacement) parent.insertBefore(replacement, marker);
 }
 function gatherHydratable(element, root) {
-  const templates = element.querySelectorAll(`*[data-hk]`);
+  const templates = element.querySelectorAll(`*[_hk]`);
   for (let i = 0; i < templates.length; i++) {
     const node = templates[i];
-    const key = node.getAttribute("data-hk");
-    if ((!root || key.startsWith(root)) && !sharedConfig.registry.has(key))
-      sharedConfig.registry.set(key, node);
+    const key = node.getAttribute("_hk");
+    if ((!root || key.startsWith(root)) && !sharedConfig.registry.has(key)) sharedConfig.registry.set(key, node);
   }
 }
 function getHydrationKey() {
   return sharedConfig.getNextContextId();
 }
 function NoHydration(props) {
-  return sharedConfig.context ? undefined : props.children;
+  return sharedConfig.hydrating ? undefined : props.children;
 }
 function Hydration(props) {
   return props.children;
@@ -1033,8 +535,10 @@ function escape(html) {}
 const isServer = false;
 const isDev = false;
 const SVG_NAMESPACE = "http://www.w3.org/2000/svg";
-function createElement(tagName, isSVG = false) {
-  return isSVG ? document.createElementNS(SVG_NAMESPACE, tagName) : document.createElement(tagName);
+function createElement(tagName, isSVG = false, is = undefined) {
+  return isSVG ? document.createElementNS(SVG_NAMESPACE, tagName) : document.createElement(tagName, {
+    is
+  });
 }
 const hydrate = (...args) => {
   enableHydration();
@@ -1046,21 +550,18 @@ function Portal(props) {
     endMarker = document.createTextNode(""),
     mount = () => createElementProxy(props.mount || document.body, treeMarker);
   let content = createMemo(() => [startMarker, props.children]);
-  createRenderEffect(
-    () => [mount(), content()],
-    ([m, c]) => {
-      m.appendChild(endMarker);
-      insert(m, c, endMarker);
-      return () => {
-        let c = startMarker;
-        while (c && c !== endMarker) {
-          const n = c.nextSibling;
-          m.removeChild(c);
-          c = n;
-        }
-      };
-    }
-  );
+  createRenderEffect(() => [mount(), content()], ([m, c]) => {
+    m.appendChild(endMarker);
+    insert(m, c, endMarker);
+    return () => {
+      let c = startMarker;
+      while (c && c !== endMarker) {
+        const n = c.nextSibling;
+        m.removeChild(c);
+        c = n;
+      }
+    };
+  });
   return treeMarker;
 }
 function createElementProxy(el, marker) {
@@ -1080,75 +581,24 @@ function createElementProxy(el, marker) {
     }
   });
 }
-function Dynamic(props) {
-  const others = omit(props, "component");
-  const cached = createMemo(() => props.component);
+function createDynamic(component, props) {
+  const cached = createMemo(component);
   return createMemo(() => {
     const component = cached();
     switch (typeof component) {
       case "function":
-        return untrack(() => component(others));
+        return untrack(() => component(props));
       case "string":
         const isSvg = SVGElements.has(component);
-        const el = sharedConfig.context ? getNextElement() : createElement(component, isSvg);
-        spread(el, others, isSvg);
+        const el = sharedConfig.hydrating ? getNextElement() : createElement(component, isSvg, untrack(() => props.is));
+        spread(el, props, isSvg);
         return el;
     }
   });
 }
+function Dynamic(props) {
+  const others = omit(props, "component");
+  return createDynamic(() => props.component, others);
+}
 
-export {
-  voidFn as Assets,
-  ChildProperties,
-  DOMElements,
-  DelegatedEvents,
-  Dynamic,
-  Hydration,
-  voidFn as HydrationScript,
-  NoHydration,
-  Portal,
-  Properties,
-  RequestContext,
-  SVGElements,
-  SVGNamespace,
-  addEventListener,
-  assign,
-  className,
-  clearDelegatedEvents,
-  delegateEvents,
-  dynamicProperty,
-  escape,
-  voidFn as generateHydrationScript,
-  voidFn as getAssets,
-  getHydrationKey,
-  getNextElement,
-  getNextMarker,
-  getNextMatch,
-  getPropAlias,
-  voidFn as getRequestEvent,
-  hydrate,
-  insert,
-  isDev,
-  isServer,
-  render,
-  renderToStream,
-  renderToString,
-  renderToStringAsync,
-  resolveSSRNode,
-  runHydrationEvents,
-  setAttribute,
-  setAttributeNS,
-  setBoolAttribute,
-  setProperty,
-  spread,
-  ssr,
-  ssrAttribute,
-  ssrClassList,
-  ssrElement,
-  ssrHydrationKey,
-  ssrStyle,
-  style,
-  template,
-  use,
-  voidFn as useAssets
-};
+export { voidFn as Assets, ChildProperties, DOMElements, DelegatedEvents, Dynamic, Hydration, voidFn as HydrationScript, NoHydration, Portal, Properties, RequestContext, SVGElements, SVGNamespace, addEventListener, assign, className, clearDelegatedEvents, createDynamic, delegateEvents, dynamicProperty, escape, voidFn as generateHydrationScript, voidFn as getAssets, getHydrationKey, getNextElement, getNextMarker, getNextMatch, voidFn as getRequestEvent, hydrate, insert, isDev, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, setProperty, setStyleProperty, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrStyle, style, template, use, voidFn as useAssets };