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

package/dist/web.js

@@ -1,5 +1,5 @@
-import { createRenderEffect, createMemo, runWithOwner, sharedConfig, untrack, flatten, createRoot, merge, createComponent, omit, createOwner, createSignal, onCleanup, enableHydration, flush, getOwner, createEffect } from 'solid-js';
-export { Errored, For, Hydration, Loading, Match, NoHydration, Repeat, Reveal, Show, Switch, createComponent, getOwner, untrack } from 'solid-js';
+import { createRenderEffect, createMemo, sharedConfig, enableHydration, untrack, runWithOwner, createRoot, flatten, flush, createComponent, omit, createOwner, createSignal, onCleanup, getOwner, createEffect } from 'solid-js';
+export { Errored, For, Hydration, Loading, Match, NoHydration, Repeat, Reveal, Show, Switch, createComponent, getOwner, merge as mergeProps, untrack } from 'solid-js';
 
 const DOMWithState = {
   INPUT: {
@@ -56,23 +56,16 @@ const transparentOptions = {
 const syncOptions = {
   sync: true
 };
-const effect = (fn, effectFn, options) => createRenderEffect(fn, effectFn, options ? {
-  sync: true,
-  ...options,
-  transparent: !options.scope
-} : transparentOptions);
-const memo = fn => createMemo(() => fn(), syncOptions);
-const assetGates = new WeakMap();
-const waitAsset = promise => {
-  let gate = assetGates.get(promise);
-  if (!gate) {
-    runWithOwner(null, () => {
-      gate = createMemo(() => promise);
-    });
-    assetGates.set(promise, gate);
-  }
-  gate();
-};
+function effect(fn, effectFn, options) {
+  createRenderEffect(fn, effectFn, options ? {
+    sync: true,
+    ...options,
+    transparent: !options.scope
+  } : transparentOptions);
+}
+function memo(fn) {
+  return createMemo(() => fn(), syncOptions);
+}
 
 function reconcileArrays(parentNode, a, b, marker) {
   let bLength = b.length,
@@ -328,11 +321,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) {
+    runWithOwner(null, () => {
+      gate = 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 {
@@ -343,15 +355,20 @@ function render$1(code, element, init, options = {}) {
         effect(() => 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
     });
+    flush();
   } catch (err) {
     if (disposer) disposer();
     unregisterDelegatedRoot(element);
     throw err;
+  } finally {
   }
   return () => {
     disposer();
@@ -436,7 +453,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 () => {
@@ -1139,9 +1156,10 @@ function loadModuleAssets(mapping) {
   }
   return pending.length ? Promise.all(pending).then(() => {}) : undefined;
 }
-function hydrate$1(code, element, options = {}) {
+function hydrate(code, element, options = {}) {
+  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 = {};
@@ -1190,7 +1208,7 @@ function hydrate$1(code, element, options = {}) {
         sharedConfig.gather = gather;
         sharedConfig.hydrating = true;
         try {
-          disposer = render$1(code, element, [...element.childNodes], options);
+          disposer = render(code, element, [...element.childNodes], options);
         } finally {
           sharedConfig.hydrating = false;
         }
@@ -1198,14 +1216,14 @@ function hydrate$1(code, element, options = {}) {
         console.error("Hydration module preload failed, falling back to client render:", err);
         sharedConfig.hydrating = false;
         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 {
     sharedConfig.hydrating = false;
   }
@@ -1392,7 +1410,7 @@ function eventHandler(e, container, state) {
   const handleNode = () => {
     let handler = node[key];
     if (handler === undefined && node.hasAttribute && node.hasAttribute("_bnd")) {
-      const seam = globalThis[Symbol.for("dx.bnd")];
+      const seam = globalThis[Symbol.for("solid.bnd")];
       if (seam) handler = seam.resolve(node, e.type);
     }
     if (handler && !node.disabled) {
@@ -1441,7 +1459,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;
@@ -1472,6 +1499,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) {
@@ -1492,12 +1530,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 (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 && (sharedConfig.hydrating || prev.data === "" + item) ? prev : document.createTextNode(item);
+      if ((t === "string" || t === "number") && prev && prev.nodeType === 3) value[i] = prev;
     }
   }
   return value;
@@ -1578,7 +1616,6 @@ function gatherHydratable(element, root) {
 function getHydrationKey() {
   return sharedConfig.getNextContextId();
 }
-const voidFn = () => undefined;
 const RequestContext = Symbol();
 
 function throwInBrowser(func) {
@@ -1654,11 +1691,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();
@@ -1684,9 +1724,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;
   }
@@ -1718,26 +1756,8 @@ function respond(value, init = {}) {
   }), value);
 }
 
-const mergeProps = 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
-      }
-    });
-    flush();
-    return dispose;
-  } finally {
-  }
-}
-const hydrate = (...args) => {
-  enableHydration();
-  return hydrate$1(...args);
-};
 function Portal(props) {
   return runWithOwner(createOwner(), () => portalImpl(props));
 }
@@ -1790,7 +1810,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;
 }
@@ -1879,4 +1899,4 @@ _moduleUrl) {
 function httpStatus(_code, _text) {}
 function httpHeader(_name, _value, _options) {}
 
-export { ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, HREF, voidFn as HydrationScript, MathMLElements, Namespaces, Portal, REVALIDATE_HEADER, RawTextElements, RequestContext, ResponseEnvelope, SAFE_ERROR, SVGElements, VoidElements, acquireAsset, addEvent, applyRef, assign, claimElement, claimElementTree, className, clearFlashCookie, clientOnly, commitEventResponse, composeMiddleware, createRequestEvent, createResponseStub, createSSRResponse, delegateEvents, dynamic, dynamicProperty, effect, escape, voidFn as generateHydrationScript, getDelegatedRoot, getExpectedRedirectStatus, getFirstChild, getHydrationKey, getNextElement, getNextMarker, getNextMatch, getNextSibling, voidFn as getRequestEvent, getServerFunctionMetadata, getServerFunctionRPC, hasFlashCookie, httpHeader, httpStatus, hydrate, insert, installHydrationRuntime, isDev, isHref, isResponseEnvelope, isSafeError, isServer, isServerFunction, markSafeError, memo, mergeProps, parseCookieHeader, patchDriver, redirect, ref, registerDelegatedContainer, registerDelegatedRoot, registerElementClaim, reload, render, renderToStream, renderToString, resolveSSRNode, respond, rowProof, runHydrationEvents, scope, serializeCookie, setAttribute, setAttributeNS, setProperty, setStyleProperty, spread, ssr, ssrAttribute, ssrClassName, ssrElement, ssrGroup, ssrHydrationKey, ssrStyle, ssrStyleProperty, style, template, unregisterDelegatedContainer, unregisterDelegatedRoot, useHead, warmAsset };
+export { ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, HREF, HydrationScript, MathMLElements, Namespaces, Portal, REVALIDATE_HEADER, RawTextElements, RequestContext, ResponseEnvelope, SAFE_ERROR, SVGElements, VoidElements, acquireAsset, addEvent, applyRef, assign, claimElement, claimElementTree, className, clearFlashCookie, clientOnly, commitEventResponse, composeMiddleware, createRequestEvent, createResponseStub, createSSRResponse, delegateEvents, dynamic, dynamicProperty, effect, escape, generateHydrationScript, getDelegatedRoot, getExpectedRedirectStatus, getFirstChild, getHydrationKey, getNextElement, getNextMarker, getNextMatch, getNextSibling, getRequestEvent, getServerFunctionMetadata, getServerFunctionRPC, hasFlashCookie, httpHeader, httpStatus, hydrate, insert, installHydrationRuntime, isDev, isHref, isResponseEnvelope, isSafeError, isServer, isServerFunction, markSafeError, memo, parseCookieHeader, patchDriver, redirect, ref, registerDelegatedContainer, registerDelegatedRoot, registerElementClaim, reload, render, renderToStream, renderToString, resolveSSRNode, respond, rowProof, runHydrationEvents, scope, serializeCookie, setAttribute, setAttributeNS, setProperty, setStyleProperty, spread, ssr, ssrAttribute, ssrClassName, ssrElement, ssrGroup, ssrHydrationKey, ssrStyle, ssrStyleProperty, style, template, unregisterDelegatedContainer, unregisterDelegatedRoot, useHead, waitAsset, warmAsset };

package/frames/dist/client.cjs

@@ -7,7 +7,7 @@ var client = require('@solidjs/web/server-functions/client');
 const ELEMENT_NODE = 1;
 const TEXT_NODE = 3;
 const COMMENT_NODE = 8;
-const CLAIM_SEAM = Symbol.for("dom-expressions.element-claims");
+const CLAIM_SEAM = Symbol.for("solid.element-claims");
 const CLAIMED_ELEMENTS = "a[href], form[action]";
 function claimHandlers() {
   const handlers = globalThis[CLAIM_SEAM];
@@ -17,7 +17,7 @@ function claimNode(handlers, el) {
   for (let i = 0; i < handlers.length; i++) handlers[i](el);
 }
 const claimedAttr = name => name === "href" || name === "action";
-const BOUND_SEAM = Symbol.for("dx.bnd");
+const BOUND_SEAM = Symbol.for("solid.bnd");
 const boundSeam = globalThis[BOUND_SEAM] || (globalThis[BOUND_SEAM] = {});
 const BND_ATTR = "_bnd";
 const BND_SELECTOR = "[_bnd]";
@@ -845,7 +845,7 @@ class FrameImpl {
 function createFrame(boundary, options) {
   return new FrameImpl(boundary, null, null, options);
 }
-const FRAME_TAG = "dx-frame";
+const FRAME_TAG = "solid-frame";
 const FRAME_ID_ATTR = "data-fid";
 function createFrameElement(options) {
   const el = makeFrameElement(options.id);
@@ -1300,9 +1300,9 @@ async function applyFrameResponse(response, host, options = {}) {
   }
   return as !== undefined ? as : rootId;
 }
-const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("dom-expressions.server-component");
-const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("dom-expressions.server-component-address");
-const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("dom-expressions.component-binding");
+const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("solid.server-component");
+const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("solid.server-component-address");
+const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("solid.component-binding");
 let resolveServerComponent;
 function parseServerComponent(value, ctx) {
   return {
@@ -1311,7 +1311,7 @@ function parseServerComponent(value, ctx) {
   };
 }
 const ServerComponentPlugin = {
-  tag: "dom-expressions/server-component",
+  tag: "solid/server-component",
   test(value) {
     return typeof value === "function" && SERVER_COMPONENT in value;
   },
@@ -1457,7 +1457,7 @@ function createServerComponentHandler({
   }
 }
 
-const STATE = Symbol.for("dom-expressions.container-trace-state");
+const STATE = Symbol.for("solid.container-trace-state");
 const state = globalThis[STATE] || (globalThis[STATE] = {
   materialized: new WeakMap(),
   materializedValues: new WeakSet()

package/frames/dist/client.dev.cjs

@@ -7,7 +7,7 @@ var client = require('@solidjs/web/server-functions/client');
 const ELEMENT_NODE = 1;
 const TEXT_NODE = 3;
 const COMMENT_NODE = 8;
-const CLAIM_SEAM = Symbol.for("dom-expressions.element-claims");
+const CLAIM_SEAM = Symbol.for("solid.element-claims");
 const CLAIMED_ELEMENTS = "a[href], form[action]";
 function claimHandlers() {
   const handlers = globalThis[CLAIM_SEAM];
@@ -17,7 +17,7 @@ function claimNode(handlers, el) {
   for (let i = 0; i < handlers.length; i++) handlers[i](el);
 }
 const claimedAttr = name => name === "href" || name === "action";
-const BOUND_SEAM = Symbol.for("dx.bnd");
+const BOUND_SEAM = Symbol.for("solid.bnd");
 const boundSeam = globalThis[BOUND_SEAM] || (globalThis[BOUND_SEAM] = {});
 const BND_ATTR = "_bnd";
 const BND_SELECTOR = "[_bnd]";
@@ -855,7 +855,7 @@ class FrameImpl {
 function createFrame(boundary, options) {
   return new FrameImpl(boundary, null, null, options);
 }
-const FRAME_TAG = "dx-frame";
+const FRAME_TAG = "solid-frame";
 const FRAME_ID_ATTR = "data-fid";
 function createFrameElement(options) {
   const el = makeFrameElement(options.id);
@@ -1320,9 +1320,9 @@ async function applyFrameResponse(response, host, options = {}) {
   }
   return as !== undefined ? as : rootId;
 }
-const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("dom-expressions.server-component");
-const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("dom-expressions.server-component-address");
-const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("dom-expressions.component-binding");
+const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("solid.server-component");
+const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("solid.server-component-address");
+const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("solid.component-binding");
 let resolveServerComponent;
 function parseServerComponent(value, ctx) {
   return {
@@ -1331,7 +1331,7 @@ function parseServerComponent(value, ctx) {
   };
 }
 const ServerComponentPlugin = {
-  tag: "dom-expressions/server-component",
+  tag: "solid/server-component",
   test(value) {
     return typeof value === "function" && SERVER_COMPONENT in value;
   },
@@ -1477,7 +1477,7 @@ function createServerComponentHandler({
   }
 }
 
-const STATE = Symbol.for("dom-expressions.container-trace-state");
+const STATE = Symbol.for("solid.container-trace-state");
 const state = globalThis[STATE] || (globalThis[STATE] = {
   materialized: new WeakMap(),
   materializedValues: new WeakSet()

package/frames/dist/client.dev.js

@@ -5,7 +5,7 @@ import { ChunkReader, frameAddress, SINGLE_FLIGHT_HEADER, deserializeStream, get
 const ELEMENT_NODE = 1;
 const TEXT_NODE = 3;
 const COMMENT_NODE = 8;
-const CLAIM_SEAM = Symbol.for("dom-expressions.element-claims");
+const CLAIM_SEAM = Symbol.for("solid.element-claims");
 const CLAIMED_ELEMENTS = "a[href], form[action]";
 function claimHandlers() {
   const handlers = globalThis[CLAIM_SEAM];
@@ -15,7 +15,7 @@ function claimNode(handlers, el) {
   for (let i = 0; i < handlers.length; i++) handlers[i](el);
 }
 const claimedAttr = name => name === "href" || name === "action";
-const BOUND_SEAM = Symbol.for("dx.bnd");
+const BOUND_SEAM = Symbol.for("solid.bnd");
 const boundSeam = globalThis[BOUND_SEAM] || (globalThis[BOUND_SEAM] = {});
 const BND_ATTR = "_bnd";
 const BND_SELECTOR = "[_bnd]";
@@ -853,7 +853,7 @@ class FrameImpl {
 function createFrame(boundary, options) {
   return new FrameImpl(boundary, null, null, options);
 }
-const FRAME_TAG = "dx-frame";
+const FRAME_TAG = "solid-frame";
 const FRAME_ID_ATTR = "data-fid";
 function createFrameElement(options) {
   const el = makeFrameElement(options.id);
@@ -1318,9 +1318,9 @@ async function applyFrameResponse(response, host, options = {}) {
   }
   return as !== undefined ? as : rootId;
 }
-const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("dom-expressions.server-component");
-const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("dom-expressions.server-component-address");
-const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("dom-expressions.component-binding");
+const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("solid.server-component");
+const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("solid.server-component-address");
+const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("solid.component-binding");
 let resolveServerComponent;
 function parseServerComponent(value, ctx) {
   return {
@@ -1329,7 +1329,7 @@ function parseServerComponent(value, ctx) {
   };
 }
 const ServerComponentPlugin = {
-  tag: "dom-expressions/server-component",
+  tag: "solid/server-component",
   test(value) {
     return typeof value === "function" && SERVER_COMPONENT in value;
   },
@@ -1475,7 +1475,7 @@ function createServerComponentHandler({
   }
 }
 
-const STATE = Symbol.for("dom-expressions.container-trace-state");
+const STATE = Symbol.for("solid.container-trace-state");
 const state = globalThis[STATE] || (globalThis[STATE] = {
   materialized: new WeakMap(),
   materializedValues: new WeakSet()

package/frames/dist/client.js

@@ -5,7 +5,7 @@ import { ChunkReader, frameAddress, SINGLE_FLIGHT_HEADER, deserializeStream, get
 const ELEMENT_NODE = 1;
 const TEXT_NODE = 3;
 const COMMENT_NODE = 8;
-const CLAIM_SEAM = Symbol.for("dom-expressions.element-claims");
+const CLAIM_SEAM = Symbol.for("solid.element-claims");
 const CLAIMED_ELEMENTS = "a[href], form[action]";
 function claimHandlers() {
   const handlers = globalThis[CLAIM_SEAM];
@@ -15,7 +15,7 @@ function claimNode(handlers, el) {
   for (let i = 0; i < handlers.length; i++) handlers[i](el);
 }
 const claimedAttr = name => name === "href" || name === "action";
-const BOUND_SEAM = Symbol.for("dx.bnd");
+const BOUND_SEAM = Symbol.for("solid.bnd");
 const boundSeam = globalThis[BOUND_SEAM] || (globalThis[BOUND_SEAM] = {});
 const BND_ATTR = "_bnd";
 const BND_SELECTOR = "[_bnd]";
@@ -843,7 +843,7 @@ class FrameImpl {
 function createFrame(boundary, options) {
   return new FrameImpl(boundary, null, null, options);
 }
-const FRAME_TAG = "dx-frame";
+const FRAME_TAG = "solid-frame";
 const FRAME_ID_ATTR = "data-fid";
 function createFrameElement(options) {
   const el = makeFrameElement(options.id);
@@ -1298,9 +1298,9 @@ async function applyFrameResponse(response, host, options = {}) {
   }
   return as !== undefined ? as : rootId;
 }
-const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("dom-expressions.server-component");
-const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("dom-expressions.server-component-address");
-const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("dom-expressions.component-binding");
+const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("solid.server-component");
+const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("solid.server-component-address");
+const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("solid.component-binding");
 let resolveServerComponent;
 function parseServerComponent(value, ctx) {
   return {
@@ -1309,7 +1309,7 @@ function parseServerComponent(value, ctx) {
   };
 }
 const ServerComponentPlugin = {
-  tag: "dom-expressions/server-component",
+  tag: "solid/server-component",
   test(value) {
     return typeof value === "function" && SERVER_COMPONENT in value;
   },
@@ -1455,7 +1455,7 @@ function createServerComponentHandler({
   }
 }
 
-const STATE = Symbol.for("dom-expressions.container-trace-state");
+const STATE = Symbol.for("solid.container-trace-state");
 const state = globalThis[STATE] || (globalThis[STATE] = {
   materialized: new WeakMap(),
   materializedValues: new WeakSet()

package/frames/dist/server.cjs

@@ -4,7 +4,7 @@ var solidJs = require('solid-js');
 var seroval = require('seroval');
 var web = require('seroval-plugins/web');
 
-const STATE = Symbol.for("dom-expressions.container-trace-state");
+const STATE = Symbol.for("solid.container-trace-state");
 const state = globalThis[STATE] || (globalThis[STATE] = {
   materialized: new WeakMap(),
   materializedValues: new WeakSet()
@@ -19,7 +19,7 @@ function isContainerTraced(value) {
   const resolve = state.resolveTrace;
   return !!(resolve && value && typeof value === "object" && resolve(value));
 }
-const TRACE = Symbol.for("dom-expressions.container-trace");
+const TRACE = Symbol.for("solid.container-trace");
 function envelopeContainerTraces(value) {
   if (!state.resolveTrace || value == null || typeof value !== "object") return value;
   const trace = state.resolveTrace(value);
@@ -70,7 +70,7 @@ function parseTrace(value, ctx) {
   };
 }
 const ContainerTracePlugin = {
-  tag: "dom-expressions/container-trace",
+  tag: "solid/container-trace",
   test(value) {
     return value != null && typeof value === "object" && TRACE in value;
   },
@@ -101,13 +101,6 @@ const ContainerTracePlugin = {
   }
 };
 
-const runWithHydrationScope = (id, fn) => solidJs.runWithOwner(solidJs.createOwner({
-  id
-}), fn);
-const ssrAsyncValue = value => solidJs.createMemo(() => value, {
-  serialize: false
-});
-
 setContainerTraceStreamMint(iterable => {
   const stream = seroval.createStream();
   (async () => {
@@ -1818,6 +1811,15 @@ function createLiveHoles(sink, scoped) {
   const stamp = typeof solidJs.creationStamp === "function" ? solidJs.creationStamp : () => 0;
   const inScope = scoped && typeof solidJs.inServerComponentScope === "function" ? solidJs.inServerComponentScope : null;
   const stripMarkers = html => html.replace(/<!--lh:\/?\d+-->/g, "");
+  const swept = (owner, ctx, fn) => {
+    const prev = solidJs.sharedConfig.context;
+    solidJs.sharedConfig.context = ctx;
+    try {
+      return owner ? solidJs.runWithOwner(owner, fn) : fn();
+    } finally {
+      solidJs.sharedConfig.context = prev;
+    }
+  };
   function resolveHoleValue(hole) {
     const result = {
       t: [""],
@@ -1883,6 +1885,7 @@ function createLiveHoles(sink, scoped) {
       const recordsBefore = engine.recordStamp;
       const ownersBefore = stamp();
       const owner = solidJs.getOwner();
+      const holeCtx = solidJs.sharedConfig.context;
       const b = {
         key: null,
         children: [],
@@ -1896,7 +1899,7 @@ function createLiveHoles(sink, scoped) {
           const sweepOwnersBefore = stamp();
           let res;
           try {
-            res = owner ? solidJs.runWithOwner(owner, () => resolveHoleValue(hole)) : resolveHoleValue(hole);
+            res = swept(owner, holeCtx, () => resolveHoleValue(hole));
           } catch (err) {
             b.closed = true;
             sink.closeBinding(b.key);
@@ -2004,6 +2007,7 @@ function createLiveHoles(sink, scoped) {
     },
     attr(cap) {
       const owner = solidJs.getOwner();
+      const holeCtx = solidJs.sharedConfig.context;
       const b = {
         key: "lha:" + cap.id,
         children: [],
@@ -2039,7 +2043,7 @@ function createLiveHoles(sink, scoped) {
                 if (vt === "string" || vt === "number") html += v;
               }
             };
-            owner ? solidJs.runWithOwner(owner, run) : run();
+            swept(owner, holeCtx, run);
           } catch (err) {
             if (solidJs.ssrHandleError(err, true)) return;
             b.closed = true;
@@ -2299,7 +2303,7 @@ function ssr(t) {
   };
   return result;
 }
-const CLAIM_PROP = /*#__PURE__*/Symbol.for("dom-expressions.claim-prop");
+const CLAIM_PROP = /*#__PURE__*/Symbol.for("solid.claim-prop");
 const CLAIMS_STREAM = 1;
 const CLAIMS_DOCUMENT = 2;
 function resolveSSRSelectValues(html) {
@@ -2670,9 +2674,9 @@ const FRAME_STREAM_HEADER = "X-Frame-Stream";
 function isFrameStreamResponse(response) {
   return response.headers.has(FRAME_STREAM_HEADER);
 }
-const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("dom-expressions.server-component");
-const SERVER_COMPONENT_SOURCE = /*#__PURE__*/Symbol.for("dom-expressions.server-component-source");
-const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("dom-expressions.server-component-address");
+const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("solid.server-component");
+const SERVER_COMPONENT_SOURCE = /*#__PURE__*/Symbol.for("solid.server-component-source");
+const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("solid.server-component-address");
 let serverComponentRegistryExpr;
 function setServerComponentBootstrap(resolve) {
   serverComponentRegistryExpr = resolve;
@@ -2684,7 +2688,7 @@ function parseServerComponent(value, ctx) {
   };
 }
 const ServerComponentPlugin = {
-  tag: "dom-expressions/server-component",
+  tag: "solid/server-component",
   test(value) {
     return typeof value === "function" && SERVER_COMPONENT in value;
   },
@@ -2717,6 +2721,12 @@ function flightCodec(codec) {
   };
 }
 
+const runWithHydrationScope = (id, fn) => solidJs.runWithOwner(solidJs.createOwner({
+  id
+}), fn);
+const ssrAsyncValue = value => solidJs.createMemo(() => value, {
+  serialize: false
+});
 const scopeStamp = typeof solidJs.creationStamp === "function" ? solidJs.creationStamp : () => 0;
 function serverOwned(render) {
   return solidJs.NoHydration ? solidJs.NoHydration({
@@ -3295,7 +3305,7 @@ function createDocumentSlotProps(clientProps, frameId) {
     }
   });
 }
-const FRAME_TAG = "dx-frame";
+const FRAME_TAG = "solid-frame";
 const FRAME_ID_ATTR = "data-fid";
 function frameElementOpen(id) {
   const escaped = solidJs.sharedConfig.context ? solidJs.sharedConfig.context.escape(String(id), true) : String(id);