@solidjs/web 2.0.0-rc.1 → 2.0.0-rc.3

package/dist/web.cjs

@@ -57,23 +57,16 @@ const transparentOptions = {
 const syncOptions = {
   sync: true
 };
-const effect = (fn, effectFn, options) => solidJs.createRenderEffect(fn, effectFn, options ? {
-  sync: true,
-  ...options,
-  transparent: !options.scope
-} : transparentOptions);
-const memo = fn => solidJs.createMemo(() => fn(), syncOptions);
-const assetGates = new WeakMap();
-const waitAsset = promise => {
-  let gate = assetGates.get(promise);
-  if (!gate) {
-    solidJs.runWithOwner(null, () => {
-      gate = solidJs.createMemo(() => promise);
-    });
-    assetGates.set(promise, gate);
-  }
-  gate();
-};
+function effect(fn, effectFn, options) {
+  solidJs.createRenderEffect(fn, effectFn, options ? {
+    sync: true,
+    ...options,
+    transparent: !options.scope
+  } : transparentOptions);
+}
+function memo(fn) {
+  return solidJs.createMemo(() => fn(), syncOptions);
+}
 
 function reconcileArrays(parentNode, a, b, marker) {
   let bLength = b.length,
@@ -87,13 +80,18 @@ function reconcileArrays(parentNode, a, b, marker) {
     map = null,
     anchor,
     anchorTag;
+  const isLive = n => {
+    if (!n) return false;
+    const tag = n[$$SLOT];
+    return n.parentNode === parentNode && (!tag || tag === marker);
+  };
   while (aStart < aEnd || bStart < bEnd) {
-    if (a[aStart] === b[bStart]) {
+    if (a[aStart] === b[bStart] && isLive(a[aStart])) {
       aStart++;
       bStart++;
       continue;
     }
-    while (a[aEnd - 1] === b[bEnd - 1]) {
+    while (a[aEnd - 1] === b[bEnd - 1] && isLive(a[aEnd - 1])) {
       aEnd--;
       bEnd--;
     }
@@ -324,11 +322,30 @@ function getServerFunctionRPC() {
   return globalThis[SERVER_FUNCTION_RPC];
 }
 
-const $$EVENT_OWNER = "_$DX_EVENT_OWNER";
+const assetGates = new WeakMap();
+const waitAsset = promise => {
+  let gate = assetGates.get(promise);
+  if (!gate) {
+    solidJs.runWithOwner(null, () => {
+      gate = solidJs.createMemo(() => promise);
+    });
+    assetGates.set(promise, gate);
+  }
+  gate();
+};
+const $$EVENT_OWNER = "_$SOLID_EVENT_OWNER";
 const INNER_OWNED = {};
 const delegatedEvents = new Set();
 const delegatedContainers = new Map();
-function render$1(code, element, init, options = {}) {
+function voidFn() {}
+function generateHydrationScript(_options) {
+  return "";
+}
+function HydrationScript(_props) {
+  return null;
+}
+const getRequestEvent = voidFn;
+function render(code, element, init, options = {}) {
   let disposer;
   registerDelegatedRoot(element);
   try {
@@ -339,15 +356,20 @@ function render$1(code, element, init, options = {}) {
         effect(() => solidJs.flatten(tree), () => {});
       } else {
         const tree = code();
-        insert(element, () => tree, element.firstChild ? null : undefined, init, options.insertOptions);
+        insert(element, () => tree, element.firstChild ? null : undefined, init, {
+          ...options.insertOptions,
+          schedule: true
+        });
       }
     }, {
       id: options.renderId
     });
+    solidJs.flush();
   } catch (err) {
     if (disposer) disposer();
     unregisterDelegatedRoot(element);
     throw err;
+  } finally {
   }
   return () => {
     disposer();
@@ -432,7 +454,7 @@ function setProperty(node, name, value) {
   node[name] = value;
 }
 let claimHandlers = null;
-const CLAIM_SEAM = Symbol.for("dom-expressions.element-claims");
+const CLAIM_SEAM = Symbol.for("solid.element-claims");
 function registerElementClaim(handler) {
   (claimHandlers || (claimHandlers = globalThis[CLAIM_SEAM] = [])).push(handler);
   return () => {
@@ -586,6 +608,11 @@ function ref(fn, element) {
   const resolved = solidJs.untrack(fn);
   solidJs.runWithOwner(null, () => applyRef(resolved, element));
 }
+const PURE_ROW = Symbol.for("solid.pure-row");
+function rowProof(fn) {
+  fn[PURE_ROW] = true;
+  return fn;
+}
 function scope(fn) {
   fn.$s = true;
   return fn;
@@ -649,6 +676,11 @@ function stripTextSeparators(nodes) {
   nodes.length = j;
   return nodes;
 }
+function patchDriver(subject, body) {
+  {
+    effect(() => body(subject, subject, false), () => body(subject, undefined, true));
+  }
+}
 function insert(parent, accessor, marker, initial, options) {
   const multi = marker !== undefined;
   const host = options && options.host;
@@ -889,7 +921,7 @@ function initHeadRegistry() {
   headOwned = new Map();
   headApplied = new Map();
   const t = document.querySelector("title");
-  headFallbackTitle = t && !t.hasAttribute("data-dh") ? t.textContent : null;
+  headFallbackTitle = t ? t.hasAttribute("data-dh") ? t.getAttribute("data-dhf") : t.textContent : null;
   if (globalThis._$HY) globalThis._$HY.h = applyServerHeadOps;
 }
 function applyServerHeadOps(ops) {
@@ -944,7 +976,11 @@ function flushHeadRegistry() {
     headOwned.delete(identity);
     headApplied.delete(identity);
     if (identity === "title") {
-      if (headFallbackTitle != null) setHeadTitle(headFallbackTitle).removeAttribute("data-dh");
+      if (headFallbackTitle != null) {
+        const el = setHeadTitle(headFallbackTitle);
+        el.removeAttribute("data-dh");
+        el.removeAttribute("data-dhf");
+      }
     } else {
       for (let i = 0; i < els.length; i++) els[i].remove();
     }
@@ -1108,7 +1144,7 @@ function loadModuleAssets(mapping) {
   const pending = [];
   for (const key in mapping) {
     if (hy.modules[key]) continue;
-    const entryUrl = mapping[key];
+    const entryUrl = new URL(mapping[key], document.baseURI).href;
     if (!hy.loading[key]) {
       hy.loading[key] = import(entryUrl).then(mod => {
         hy.modules[key] = mod;
@@ -1121,9 +1157,10 @@ function loadModuleAssets(mapping) {
   }
   return pending.length ? Promise.all(pending).then(() => {}) : undefined;
 }
-function hydrate$1(code, element, options = {}) {
+function hydrate(code, element, options = {}) {
+  solidJs.enableHydration();
   installHydrationRuntime();
-  if (globalThis._$HY.done) return render$1(code, element, [...element.childNodes], options);
+  if (globalThis._$HY.done) return render(code, element, [...element.childNodes], options);
   options.renderId ||= "";
   if (!globalThis._$HY.modules) globalThis._$HY.modules = {};
   if (!globalThis._$HY.loading) globalThis._$HY.loading = {};
@@ -1172,7 +1209,7 @@ function hydrate$1(code, element, options = {}) {
         solidJs.sharedConfig.gather = gather;
         solidJs.sharedConfig.hydrating = true;
         try {
-          disposer = render$1(code, element, [...element.childNodes], options);
+          disposer = render(code, element, [...element.childNodes], options);
         } finally {
           solidJs.sharedConfig.hydrating = false;
         }
@@ -1180,14 +1217,14 @@ function hydrate$1(code, element, options = {}) {
         console.error("Hydration module preload failed, falling back to client render:", err);
         solidJs.sharedConfig.hydrating = false;
         solidJs.sharedConfig.registry = undefined;
-        disposer = render$1(code, element, [...element.childNodes], options);
+        disposer = render(code, element, [...element.childNodes], options);
       });
       return () => disposer && disposer();
     }
   }
   try {
     gatherHydratable(element, options.renderId);
-    return render$1(code, element, [...element.childNodes], options);
+    return render(code, element, [...element.childNodes], options);
   } finally {
     solidJs.sharedConfig.hydrating = false;
   }
@@ -1372,7 +1409,11 @@ function eventHandler(e, container, state) {
     value
   });
   const handleNode = () => {
-    const handler = node[key];
+    let handler = node[key];
+    if (handler === undefined && node.hasAttribute && node.hasAttribute("_bnd")) {
+      const seam = globalThis[Symbol.for("solid.bnd")];
+      if (seam) handler = seam.resolve(node, e.type);
+    }
     if (handler && !node.disabled) {
       const data = node[`${key}Data`];
       data !== undefined ? handler.call(node, data, e) : handler.call(node, e);
@@ -1419,7 +1460,16 @@ function eventHandler(e, container, state) {
 }
 function insertExpression(parent, value, current, marker) {
   if (hydrationRt !== null && isHydrating(parent)) {
-    if (value && value !== current) for (const n of Array.isArray(value) ? value : [value]) if (n && n.nodeType && !isHydrating(n)) return current;
+    if (value && value !== current) {
+      const arr = Array.isArray(value);
+      for (const n of arr ? value : [value]) {
+        if (n && n.nodeType) {
+          if (!isHydrating(n)) return current;
+        } else if (arr && (typeof n === "string" || typeof n === "number")) {
+          return current;
+        }
+      }
+    }
     return value;
   }
   if (value === current) return value;
@@ -1450,6 +1500,17 @@ function insertExpression(parent, value, current, marker) {
     if (marker) value[$$SLOT] = marker;
   } else if (Array.isArray(value)) {
     const currentArray = current && Array.isArray(current);
+    for (let i = 0, len = value.length; i < len; i++) {
+      const item = value[i],
+        t = typeof item;
+      if (t === "string" || t === "number") {
+        const prev = currentArray ? current[i] : undefined;
+        if (prev && prev.nodeType === 3) {
+          if (prev.data !== "" + item) prev.data = item;
+          value[i] = prev;
+        } else value[i] = document.createTextNode(item);
+      }
+    }
     if (value.length === 0) {
       cleanChildren(parent, current, marker);
     } else if (currentArray) {
@@ -1470,12 +1531,12 @@ function normalize(value, current, multi, doNotUnwrap) {
   });
   if (doNotUnwrap && typeof value === "function") return value;
   if (multi && !Array.isArray(value)) value = [value != null ? value : ""];
-  if (Array.isArray(value)) {
+  if (solidJs.sharedConfig.hydrating && 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 && (solidJs.sharedConfig.hydrating || prev.data === "" + item) ? prev : document.createTextNode(item);
+      if ((t === "string" || t === "number") && prev && prev.nodeType === 3) value[i] = prev;
     }
   }
   return value;
@@ -1556,7 +1617,6 @@ function gatherHydratable(element, root) {
 function getHydrationKey() {
   return solidJs.sharedConfig.getNextContextId();
 }
-const voidFn = () => undefined;
 const RequestContext = Symbol();
 
 function throwInBrowser(func) {
@@ -1632,11 +1692,14 @@ function isSafeError(value) {
   return !!(value && (typeof value === "object" || typeof value === "function") && value[SAFE_ERROR]);
 }
 const REVALIDATE_HEADER = "X-Revalidate";
-function initWithRevalidate(init) {
+function initWithRevalidate(init = {}) {
+  const resolved = typeof init === "number" ? {
+    status: init
+  } : init;
   const {
     revalidate,
     ...responseInit
-  } = init;
+  } = resolved;
   let headers;
   if (responseInit.headers && responseInit.headers.getSetCookie) {
     headers = new Headers();
@@ -1662,9 +1725,7 @@ function redirect(url, init = 302) {
   const {
     responseInit,
     headers
-  } = initWithRevalidate(typeof init === "number" ? {
-    status: init
-  } : init);
+  } = initWithRevalidate(init);
   if (responseInit.status === undefined) {
     responseInit.status = 302;
   }
@@ -1696,26 +1757,8 @@ function respond(value, init = {}) {
   }), value);
 }
 
-const mergeProps = solidJs.merge;
 const isServer = false;
 const isDev = false;
-function render(code, element, init, options = {}) {
-  try {
-    const dispose = render$1(code, element, init, {
-      ...options,
-      insertOptions: {
-        schedule: true
-      }
-    });
-    solidJs.flush();
-    return dispose;
-  } finally {
-  }
-}
-const hydrate = (...args) => {
-  solidJs.enableHydration();
-  return hydrate$1(...args);
-};
 function Portal(props) {
   return solidJs.runWithOwner(solidJs.createOwner(), () => portalImpl(props));
 }
@@ -1768,7 +1811,7 @@ function portalImpl(props) {
   });
   return treeMarker;
 }
-const COMPONENT_BINDING = Symbol.for("dom-expressions.component-binding");
+const COMPONENT_BINDING = Symbol.for("solid.component-binding");
 function bindingOf(value) {
   return value !== null && (typeof value === "function" || typeof value === "object") && value[COMPONENT_BINDING] || undefined;
 }
@@ -1905,6 +1948,10 @@ Object.defineProperty(exports, "getOwner", {
   enumerable: true,
   get: function () { return solidJs.getOwner; }
 });
+Object.defineProperty(exports, "mergeProps", {
+  enumerable: true,
+  get: function () { return solidJs.merge; }
+});
 Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return solidJs.untrack; }
@@ -1915,7 +1962,7 @@ exports.DOMWithState = DOMWithState;
 exports.DelegatedEvents = DelegatedEvents;
 exports.Dynamic = Dynamic;
 exports.HREF = HREF;
-exports.HydrationScript = voidFn;
+exports.HydrationScript = HydrationScript;
 exports.MathMLElements = MathMLElements;
 exports.Namespaces = Namespaces;
 exports.Portal = Portal;
@@ -1945,7 +1992,7 @@ exports.dynamic = dynamic;
 exports.dynamicProperty = dynamicProperty;
 exports.effect = effect;
 exports.escape = escape;
-exports.generateHydrationScript = voidFn;
+exports.generateHydrationScript = generateHydrationScript;
 exports.getDelegatedRoot = getDelegatedRoot;
 exports.getExpectedRedirectStatus = getExpectedRedirectStatus;
 exports.getFirstChild = getFirstChild;
@@ -1954,7 +2001,7 @@ exports.getNextElement = getNextElement;
 exports.getNextMarker = getNextMarker;
 exports.getNextMatch = getNextMatch;
 exports.getNextSibling = getNextSibling;
-exports.getRequestEvent = voidFn;
+exports.getRequestEvent = getRequestEvent;
 exports.getServerFunctionMetadata = getServerFunctionMetadata;
 exports.getServerFunctionRPC = getServerFunctionRPC;
 exports.hasFlashCookie = hasFlashCookie;
@@ -1971,8 +2018,8 @@ exports.isServer = isServer;
 exports.isServerFunction = isServerFunction;
 exports.markSafeError = markSafeError;
 exports.memo = memo;
-exports.mergeProps = mergeProps;
 exports.parseCookieHeader = parseCookieHeader;
+exports.patchDriver = patchDriver;
 exports.redirect = redirect;
 exports.ref = ref;
 exports.registerDelegatedContainer = registerDelegatedContainer;
@@ -1984,6 +2031,7 @@ exports.renderToStream = renderToStream;
 exports.renderToString = renderToString;
 exports.resolveSSRNode = resolveSSRNode;
 exports.respond = respond;
+exports.rowProof = rowProof;
 exports.runHydrationEvents = runHydrationEvents;
 exports.scope = scope;
 exports.serializeCookie = serializeCookie;
@@ -2005,4 +2053,5 @@ exports.template = template;
 exports.unregisterDelegatedContainer = unregisterDelegatedContainer;
 exports.unregisterDelegatedRoot = unregisterDelegatedRoot;
 exports.useHead = useHead;
+exports.waitAsset = waitAsset;
 exports.warmAsset = warmAsset;