solid-js 1.6.11 → 1.7.0-beta.0

package/dist/dev.cjs

@@ -154,7 +154,10 @@ let Listener = null;
 let Updates = null;
 let Effects = null;
 let ExecCount = 0;
-let rootCount = 0;
+const DevHooks = {
+  afterUpdate: null,
+  afterCreateOwner: null
+};
 const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
@@ -174,10 +177,7 @@ function createRoot(fn, detachedOwner) {
     updateFn = unowned ? () => fn(() => {
       throw new Error("Dispose method must be an explicit argument to createRoot function");
     })  : () => fn(() => untrack(() => cleanNode(root)));
-  {
-    if (owner) root.name = `${owner.name}-r${rootCount++}`;
-    globalThis._$afterCreateRoot && globalThis._$afterCreateRoot(root);
-  }
+  DevHooks.afterCreateOwner && DevHooks.afterCreateOwner(root);
   Owner = root;
   Listener = null;
   try {
@@ -195,7 +195,10 @@ function createSignal(value, options) {
     observerSlots: null,
     comparator: options.equals || undefined
   };
-  if (!options.internal) s.name = registerGraph(options.name || hashValue(value), s);
+  if (!options.internal) {
+    if (options.name) s.name = options.name;
+    registerGraph(s);
+  }
   const setter = value => {
     if (typeof value === "function") {
       if (Transition && Transition.running && Transition.sources.has(s)) value = value(s.tValue);else value = value(s.value);
@@ -536,45 +539,10 @@ function devComponent(Comp, props) {
   updateComputation(c);
   return c.tValue !== undefined ? c.tValue : c.value;
 }
-function hashValue(v) {
-  const s = new Set();
-  return `s${typeof v === "string" ? hash(v) : hash(untrack(() => JSON.stringify(v, (k, v) => {
-    if (typeof v === "object" && v != null) {
-      if (s.has(v)) return;
-      s.add(v);
-      const keys = Object.keys(v);
-      const desc = Object.getOwnPropertyDescriptors(v);
-      const newDesc = keys.reduce((memo, key) => {
-        const value = desc[key];
-        if (!value.get) memo[key] = value;
-        return memo;
-      }, {});
-      v = Object.create({}, newDesc);
-    }
-    if (typeof v === "bigint") {
-      return `${v.toString()}n`;
-    }
-    return v;
-  }) || ""))}`;
-}
-function registerGraph(name, value) {
-  let tryName = name;
-  if (Owner) {
-    let i = 0;
-    Owner.sourceMap || (Owner.sourceMap = {});
-    while (Owner.sourceMap[tryName]) tryName = `${name}-${++i}`;
-    Owner.sourceMap[tryName] = value;
-    value.graph = Owner;
-  }
-  return tryName;
-}
-function serializeGraph(owner) {
-  owner || (owner = Owner);
-  if (!owner) return {};
-  return {
-    ...serializeValues(owner.sourceMap),
-    ...(owner.owned ? serializeChildren(owner) : {})
-  };
+function registerGraph(value) {
+  if (!Owner) return;
+  if (Owner.sourceMap) Owner.sourceMap.push(value);else Owner.sourceMap = [value];
+  value.graph = Owner;
 }
 function createContext(defaultValue, options) {
   const id = Symbol("context");
@@ -757,8 +725,8 @@ function createComputation(fn, init, pure, state = STALE, options) {
     } else {
       if (!Owner.owned) Owner.owned = [c];else Owner.owned.push(c);
     }
-    c.name = options && options.name || `${Owner.name || "c"}-${(Owner.owned || Owner.tOwned).length}`;
   }
+  if (options && options.name) c.name = options.name;
   if (ExternalSourceFactory) {
     const [track, trigger] = createSignal(undefined, {
       equals: false
@@ -772,6 +740,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
       return Transition && Transition.running ? inTransition.track(x) : ordinary.track(x);
     };
   }
+  DevHooks.afterCreateOwner && DevHooks.afterCreateOwner(c);
   return c;
 }
 function runTop(node) {
@@ -861,7 +830,7 @@ function completeUpdates(wait) {
   }
   const e = Effects;
   Effects = null;
-  if (e.length) runUpdates(() => runEffects(e), false);else globalThis._$afterUpdate && globalThis._$afterUpdate();
+  if (e.length) runUpdates(() => runEffects(e), false);else DevHooks.afterUpdate && DevHooks.afterUpdate();
   if (res) res();
 }
 function runQueue(queue) {
@@ -963,22 +932,24 @@ function reset(node, top) {
   }
 }
 function castError(err) {
-  if (err instanceof Error || typeof err === "string") return err;
-  return new Error("Unknown error");
+  if (err instanceof Error) return err;
+  return new Error(typeof err === "string" ? err : "Unknown error", {
+    cause: err
+  });
 }
 function runErrors(fns, err) {
   for (const f of fns) f(err);
 }
 function handleError(err) {
-  err = castError(err);
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
+  const error = castError(err);
   if (Effects) Effects.push({
     fn() {
-      runErrors(fns, err);
+      runErrors(fns, error);
     },
     state: STALE
-  });else runErrors(fns, err);
+  });else runErrors(fns, error);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1007,30 +978,6 @@ function createProvider(id, options) {
     return res;
   };
 }
-function hash(s) {
-  for (var i = 0, h = 9; i < s.length;) h = Math.imul(h ^ s.charCodeAt(i++), 9 ** 9);
-  return `${h ^ h >>> 9}`;
-}
-function serializeValues(sources = {}) {
-  const k = Object.keys(sources);
-  const result = {};
-  for (let i = 0; i < k.length; i++) {
-    const key = k[i];
-    result[key] = sources[key].value;
-  }
-  return result;
-}
-function serializeChildren(root) {
-  const result = {};
-  for (let i = 0, len = root.owned.length; i < len; i++) {
-    const node = root.owned[i];
-    result[node.componentName ? `${node.componentName}:${node.name}` : node.name] = {
-      ...serializeValues(node.sourceMap),
-      ...(node.owned ? serializeChildren(node) : {})
-    };
-  }
-  return result;
-}
 
 function observable(input) {
   return {
@@ -1450,10 +1397,9 @@ function Index(props) {
   }) ;
 }
 function Show(props) {
-  let strictEqual = false;
   const keyed = props.keyed;
   const condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => strictEqual ? a === b : !a === !b,
+    equals: (a, b) => keyed ? a === b : !a === !b,
     name: "condition"
   } );
   return createMemo(() => {
@@ -1461,8 +1407,7 @@ function Show(props) {
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      strictEqual = keyed || fn;
-      return fn ? untrack(() => child(c)) : child;
+      return fn ? untrack(() => child(keyed ? c : () => props.when)) : child;
     }
     return props.fallback;
   }, undefined, {
@@ -1470,9 +1415,8 @@ function Show(props) {
   } );
 }
 function Switch(props) {
-  let strictEqual = false;
   let keyed = false;
-  const equals = (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
+  const equals = (a, b) => a[0] === b[0] && (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
     evalConditions = createMemo(() => {
       let conds = conditions();
@@ -1494,8 +1438,7 @@ function Switch(props) {
     if (index < 0) return props.fallback;
     const c = cond.children;
     const fn = typeof c === "function" && c.length > 0;
-    strictEqual = keyed || fn;
-    return fn ? untrack(() => c(when)) : c;
+    return fn ? untrack(() => c(keyed ? when : () => cond.when)) : c;
   }, undefined, {
     name: "value"
   } );
@@ -1700,14 +1643,11 @@ function Suspense(props) {
 }
 
 exports.DEV = void 0;
-{
-  exports.DEV = {
-    writeSignal,
-    serializeGraph,
-    registerGraph,
-    hashValue
-  };
-}
+exports.DEV = {
+  hooks: DevHooks,
+  writeSignal,
+  registerGraph
+};
 if (globalThis) {
   if (!globalThis.Solid$$) globalThis.Solid$$ = true;else console.warn("You appear to have multiple instances of Solid. This can lead to unexpected behavior.");
 }

package/dist/dev.js

@@ -152,7 +152,10 @@ let Listener = null;
 let Updates = null;
 let Effects = null;
 let ExecCount = 0;
-let rootCount = 0;
+const DevHooks = {
+  afterUpdate: null,
+  afterCreateOwner: null
+};
 const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
@@ -172,10 +175,7 @@ function createRoot(fn, detachedOwner) {
     updateFn = unowned ? () => fn(() => {
       throw new Error("Dispose method must be an explicit argument to createRoot function");
     })  : () => fn(() => untrack(() => cleanNode(root)));
-  {
-    if (owner) root.name = `${owner.name}-r${rootCount++}`;
-    globalThis._$afterCreateRoot && globalThis._$afterCreateRoot(root);
-  }
+  DevHooks.afterCreateOwner && DevHooks.afterCreateOwner(root);
   Owner = root;
   Listener = null;
   try {
@@ -193,7 +193,10 @@ function createSignal(value, options) {
     observerSlots: null,
     comparator: options.equals || undefined
   };
-  if (!options.internal) s.name = registerGraph(options.name || hashValue(value), s);
+  if (!options.internal) {
+    if (options.name) s.name = options.name;
+    registerGraph(s);
+  }
   const setter = value => {
     if (typeof value === "function") {
       if (Transition && Transition.running && Transition.sources.has(s)) value = value(s.tValue);else value = value(s.value);
@@ -534,45 +537,10 @@ function devComponent(Comp, props) {
   updateComputation(c);
   return c.tValue !== undefined ? c.tValue : c.value;
 }
-function hashValue(v) {
-  const s = new Set();
-  return `s${typeof v === "string" ? hash(v) : hash(untrack(() => JSON.stringify(v, (k, v) => {
-    if (typeof v === "object" && v != null) {
-      if (s.has(v)) return;
-      s.add(v);
-      const keys = Object.keys(v);
-      const desc = Object.getOwnPropertyDescriptors(v);
-      const newDesc = keys.reduce((memo, key) => {
-        const value = desc[key];
-        if (!value.get) memo[key] = value;
-        return memo;
-      }, {});
-      v = Object.create({}, newDesc);
-    }
-    if (typeof v === "bigint") {
-      return `${v.toString()}n`;
-    }
-    return v;
-  }) || ""))}`;
-}
-function registerGraph(name, value) {
-  let tryName = name;
-  if (Owner) {
-    let i = 0;
-    Owner.sourceMap || (Owner.sourceMap = {});
-    while (Owner.sourceMap[tryName]) tryName = `${name}-${++i}`;
-    Owner.sourceMap[tryName] = value;
-    value.graph = Owner;
-  }
-  return tryName;
-}
-function serializeGraph(owner) {
-  owner || (owner = Owner);
-  if (!owner) return {};
-  return {
-    ...serializeValues(owner.sourceMap),
-    ...(owner.owned ? serializeChildren(owner) : {})
-  };
+function registerGraph(value) {
+  if (!Owner) return;
+  if (Owner.sourceMap) Owner.sourceMap.push(value);else Owner.sourceMap = [value];
+  value.graph = Owner;
 }
 function createContext(defaultValue, options) {
   const id = Symbol("context");
@@ -755,8 +723,8 @@ function createComputation(fn, init, pure, state = STALE, options) {
     } else {
       if (!Owner.owned) Owner.owned = [c];else Owner.owned.push(c);
     }
-    c.name = options && options.name || `${Owner.name || "c"}-${(Owner.owned || Owner.tOwned).length}`;
   }
+  if (options && options.name) c.name = options.name;
   if (ExternalSourceFactory) {
     const [track, trigger] = createSignal(undefined, {
       equals: false
@@ -770,6 +738,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
       return Transition && Transition.running ? inTransition.track(x) : ordinary.track(x);
     };
   }
+  DevHooks.afterCreateOwner && DevHooks.afterCreateOwner(c);
   return c;
 }
 function runTop(node) {
@@ -859,7 +828,7 @@ function completeUpdates(wait) {
   }
   const e = Effects;
   Effects = null;
-  if (e.length) runUpdates(() => runEffects(e), false);else globalThis._$afterUpdate && globalThis._$afterUpdate();
+  if (e.length) runUpdates(() => runEffects(e), false);else DevHooks.afterUpdate && DevHooks.afterUpdate();
   if (res) res();
 }
 function runQueue(queue) {
@@ -961,22 +930,24 @@ function reset(node, top) {
   }
 }
 function castError(err) {
-  if (err instanceof Error || typeof err === "string") return err;
-  return new Error("Unknown error");
+  if (err instanceof Error) return err;
+  return new Error(typeof err === "string" ? err : "Unknown error", {
+    cause: err
+  });
 }
 function runErrors(fns, err) {
   for (const f of fns) f(err);
 }
 function handleError(err) {
-  err = castError(err);
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
+  const error = castError(err);
   if (Effects) Effects.push({
     fn() {
-      runErrors(fns, err);
+      runErrors(fns, error);
     },
     state: STALE
-  });else runErrors(fns, err);
+  });else runErrors(fns, error);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1005,30 +976,6 @@ function createProvider(id, options) {
     return res;
   };
 }
-function hash(s) {
-  for (var i = 0, h = 9; i < s.length;) h = Math.imul(h ^ s.charCodeAt(i++), 9 ** 9);
-  return `${h ^ h >>> 9}`;
-}
-function serializeValues(sources = {}) {
-  const k = Object.keys(sources);
-  const result = {};
-  for (let i = 0; i < k.length; i++) {
-    const key = k[i];
-    result[key] = sources[key].value;
-  }
-  return result;
-}
-function serializeChildren(root) {
-  const result = {};
-  for (let i = 0, len = root.owned.length; i < len; i++) {
-    const node = root.owned[i];
-    result[node.componentName ? `${node.componentName}:${node.name}` : node.name] = {
-      ...serializeValues(node.sourceMap),
-      ...(node.owned ? serializeChildren(node) : {})
-    };
-  }
-  return result;
-}
 
 function observable(input) {
   return {
@@ -1448,10 +1395,9 @@ function Index(props) {
   }) ;
 }
 function Show(props) {
-  let strictEqual = false;
   const keyed = props.keyed;
   const condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => strictEqual ? a === b : !a === !b,
+    equals: (a, b) => keyed ? a === b : !a === !b,
     name: "condition"
   } );
   return createMemo(() => {
@@ -1459,8 +1405,7 @@ function Show(props) {
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      strictEqual = keyed || fn;
-      return fn ? untrack(() => child(c)) : child;
+      return fn ? untrack(() => child(keyed ? c : () => props.when)) : child;
     }
     return props.fallback;
   }, undefined, {
@@ -1468,9 +1413,8 @@ function Show(props) {
   } );
 }
 function Switch(props) {
-  let strictEqual = false;
   let keyed = false;
-  const equals = (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
+  const equals = (a, b) => a[0] === b[0] && (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
     evalConditions = createMemo(() => {
       let conds = conditions();
@@ -1492,8 +1436,7 @@ function Switch(props) {
     if (index < 0) return props.fallback;
     const c = cond.children;
     const fn = typeof c === "function" && c.length > 0;
-    strictEqual = keyed || fn;
-    return fn ? untrack(() => c(when)) : c;
+    return fn ? untrack(() => c(keyed ? when : () => cond.when)) : c;
   }, undefined, {
     name: "value"
   } );
@@ -1698,14 +1641,11 @@ function Suspense(props) {
 }
 
 let DEV;
-{
-  DEV = {
-    writeSignal,
-    serializeGraph,
-    registerGraph,
-    hashValue
-  };
-}
+DEV = {
+  hooks: DevHooks,
+  writeSignal,
+  registerGraph
+};
 if (globalThis) {
   if (!globalThis.Solid$$) globalThis.Solid$$ = true;else console.warn("You appear to have multiple instances of Solid. This can lead to unexpected behavior.");
 }

package/dist/server.cjs

@@ -4,18 +4,20 @@ const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
 const $TRACK = Symbol("solid-track");
 const $DEVCOMP = Symbol("solid-dev-component");
-const DEV = {};
+const DEV = undefined;
 const ERROR = Symbol("error");
 const BRANCH = Symbol("branch");
 function castError(err) {
-  if (err instanceof Error || typeof err === "string") return err;
-  return new Error("Unknown error");
+  if (err instanceof Error) return err;
+  return new Error(typeof err === "string" ? err : "Unknown error", {
+    cause: err
+  });
 }
 function handleError(err) {
-  err = castError(err);
+  const error = castError(err);
   const fns = lookup(Owner, ERROR);
-  if (!fns) throw err;
-  for (const f of fns) f(err);
+  if (!fns) throw error;
+  for (const f of fns) f(error);
 }
 const UNOWNED = {
   context: null,

package/dist/server.js

@@ -2,18 +2,20 @@ const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
 const $TRACK = Symbol("solid-track");
 const $DEVCOMP = Symbol("solid-dev-component");
-const DEV = {};
+const DEV = undefined;
 const ERROR = Symbol("error");
 const BRANCH = Symbol("branch");
 function castError(err) {
-  if (err instanceof Error || typeof err === "string") return err;
-  return new Error("Unknown error");
+  if (err instanceof Error) return err;
+  return new Error(typeof err === "string" ? err : "Unknown error", {
+    cause: err
+  });
 }
 function handleError(err) {
-  err = castError(err);
+  const error = castError(err);
   const fns = lookup(Owner, ERROR);
-  if (!fns) throw err;
-  for (const f of fns) f(err);
+  if (!fns) throw error;
+  for (const f of fns) f(error);
 }
 const UNOWNED = {
   context: null,

package/dist/solid.cjs

@@ -892,22 +892,24 @@ function reset(node, top) {
   }
 }
 function castError(err) {
-  if (err instanceof Error || typeof err === "string") return err;
-  return new Error("Unknown error");
+  if (err instanceof Error) return err;
+  return new Error(typeof err === "string" ? err : "Unknown error", {
+    cause: err
+  });
 }
 function runErrors(fns, err) {
   for (const f of fns) f(err);
 }
 function handleError(err) {
-  err = castError(err);
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
+  const error = castError(err);
   if (Effects) Effects.push({
     fn() {
-      runErrors(fns, err);
+      runErrors(fns, error);
     },
     state: STALE
-  });else runErrors(fns, err);
+  });else runErrors(fns, error);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1345,26 +1347,23 @@ function Index(props) {
   return createMemo(indexArray(() => props.each, props.children, fallback || undefined));
 }
 function Show(props) {
-  let strictEqual = false;
   const keyed = props.keyed;
   const condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => strictEqual ? a === b : !a === !b
+    equals: (a, b) => keyed ? a === b : !a === !b
   });
   return createMemo(() => {
     const c = condition();
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      strictEqual = keyed || fn;
-      return fn ? untrack(() => child(c)) : child;
+      return fn ? untrack(() => child(keyed ? c : () => props.when)) : child;
     }
     return props.fallback;
   }, undefined, undefined);
 }
 function Switch(props) {
-  let strictEqual = false;
   let keyed = false;
-  const equals = (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
+  const equals = (a, b) => a[0] === b[0] && (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
     evalConditions = createMemo(() => {
       let conds = conditions();
@@ -1385,8 +1384,7 @@ function Switch(props) {
     if (index < 0) return props.fallback;
     const c = cond.children;
     const fn = typeof c === "function" && c.length > 0;
-    strictEqual = keyed || fn;
-    return fn ? untrack(() => c(when)) : c;
+    return fn ? untrack(() => c(keyed ? when : () => cond.when)) : c;
   }, undefined, undefined);
 }
 function Match(props) {

package/dist/solid.js

@@ -890,22 +890,24 @@ function reset(node, top) {
   }
 }
 function castError(err) {
-  if (err instanceof Error || typeof err === "string") return err;
-  return new Error("Unknown error");
+  if (err instanceof Error) return err;
+  return new Error(typeof err === "string" ? err : "Unknown error", {
+    cause: err
+  });
 }
 function runErrors(fns, err) {
   for (const f of fns) f(err);
 }
 function handleError(err) {
-  err = castError(err);
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
+  const error = castError(err);
   if (Effects) Effects.push({
     fn() {
-      runErrors(fns, err);
+      runErrors(fns, error);
     },
     state: STALE
-  });else runErrors(fns, err);
+  });else runErrors(fns, error);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1343,26 +1345,23 @@ function Index(props) {
   return createMemo(indexArray(() => props.each, props.children, fallback || undefined));
 }
 function Show(props) {
-  let strictEqual = false;
   const keyed = props.keyed;
   const condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => strictEqual ? a === b : !a === !b
+    equals: (a, b) => keyed ? a === b : !a === !b
   });
   return createMemo(() => {
     const c = condition();
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      strictEqual = keyed || fn;
-      return fn ? untrack(() => child(c)) : child;
+      return fn ? untrack(() => child(keyed ? c : () => props.when)) : child;
     }
     return props.fallback;
   }, undefined, undefined);
 }
 function Switch(props) {
-  let strictEqual = false;
   let keyed = false;
-  const equals = (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
+  const equals = (a, b) => a[0] === b[0] && (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
     evalConditions = createMemo(() => {
       let conds = conditions();
@@ -1383,8 +1382,7 @@ function Switch(props) {
     if (index < 0) return props.fallback;
     const c = cond.children;
     const fn = typeof c === "function" && c.length > 0;
-    strictEqual = keyed || fn;
-    return fn ? untrack(() => c(when)) : c;
+    return fn ? untrack(() => c(keyed ? when : () => cond.when)) : c;
   }, undefined, undefined);
 }
 function Match(props) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.6.11",
+  "version": "1.7.0-beta.0",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",

package/store/dist/dev.cjs

@@ -3,9 +3,11 @@
 var solidJs = require('solid-js');
 
 const $RAW = Symbol("store-raw"),
-  $NODE = Symbol("store-node"),
-  $NAME = Symbol("store-name");
-function wrap$1(value, name) {
+  $NODE = Symbol("store-node");
+const DevHooks = {
+  onStoreNodeUpdate: null
+};
+function wrap$1(value) {
   let p = value[solidJs.$PROXY];
   if (!p) {
     Object.defineProperty(value, solidJs.$PROXY, {
@@ -24,9 +26,6 @@ function wrap$1(value, name) {
         }
       }
     }
-    if (name) Object.defineProperty(value, $NAME, {
-      value: name
-    });
   }
   return p;
 }
@@ -69,7 +68,7 @@ function getDataNode(nodes, property, value) {
 }
 function proxyDescriptor$1(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || !desc.configurable || property === solidJs.$PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || !desc.configurable || property === solidJs.$PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[solidJs.$PROXY][property];
@@ -109,7 +108,7 @@ const proxyTraps$1 = {
       const desc = Object.getOwnPropertyDescriptor(target, property);
       if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();
     }
-    return isWrappable(value) ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
+    return isWrappable(value) ? wrap$1(value) : value;
   },
   has(target, property) {
     if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
@@ -131,7 +130,7 @@ function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
   const prev = state[property],
     len = state.length;
-  if (globalThis._$onStoreNodeUpdate) globalThis._$onStoreNodeUpdate(state, property, value, prev);
+  DevHooks.onStoreNodeUpdate && DevHooks.onStoreNodeUpdate(state, property, value, prev);
   if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
     node;
@@ -209,13 +208,11 @@ function createStore(...[store, options]) {
   const unwrappedStore = unwrap(store || {});
   const isArray = Array.isArray(unwrappedStore);
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createStore'. Expected an object.`);
-  const wrappedStore = wrap$1(unwrappedStore, (options && options.name || solidJs.DEV.hashValue(unwrappedStore)));
-  {
-    const name = options && options.name || solidJs.DEV.hashValue(unwrappedStore);
-    solidJs.DEV.registerGraph(name, {
-      value: unwrappedStore
-    });
-  }
+  const wrappedStore = wrap$1(unwrappedStore);
+  solidJs.DEV.registerGraph({
+    value: unwrappedStore,
+    name: options && options.name
+  });
   function setStore(...args) {
     solidJs.batch(() => {
       isArray && args.length === 1 ? updateArray(unwrappedStore, args[0]) : updatePath(unwrappedStore, args);
@@ -226,7 +223,7 @@ function createStore(...[store, options]) {
 
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || desc.set || !desc.configurable || property === solidJs.$PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || desc.set || !desc.configurable || property === solidJs.$PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[solidJs.$PROXY][property];
@@ -252,7 +249,7 @@ const proxyTraps = {
         return (...args) => solidJs.batch(() => Array.prototype[property].apply(receiver, args));
       }
     }
-    return isWrappable(value) ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
+    return isWrappable(value) ? wrap(value) : value;
   },
   has(target, property) {
     if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
@@ -270,7 +267,7 @@ const proxyTraps = {
   ownKeys: ownKeys,
   getOwnPropertyDescriptor: proxyDescriptor
 };
-function wrap(value, name) {
+function wrap(value) {
   let p = value[solidJs.$PROXY];
   if (!p) {
     Object.defineProperty(value, solidJs.$PROXY, {
@@ -294,22 +291,17 @@ function wrap(value, name) {
         });
       }
     }
-    if (name) Object.defineProperty(value, $NAME, {
-      value: name
-    });
   }
   return p;
 }
 function createMutable(state, options) {
   const unwrappedStore = unwrap(state || {});
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createMutable'. Expected an object.`);
-  const wrappedStore = wrap(unwrappedStore, (options && options.name || solidJs.DEV.hashValue(unwrappedStore)));
-  {
-    const name = options && options.name || solidJs.DEV.hashValue(unwrappedStore);
-    solidJs.DEV.registerGraph(name, {
-      value: unwrappedStore
-    });
-  }
+  const wrappedStore = wrap(unwrappedStore);
+  solidJs.DEV.registerGraph({
+    value: unwrappedStore,
+    name: options && options.name
+  });
   return wrappedStore;
 }
 function modifyMutable(state, modifier) {
@@ -432,14 +424,14 @@ function produce(fn) {
   };
 }
 
-const DEV = {
-  $NAME,
+exports.DEV = void 0;
+exports.DEV = {
   $NODE,
-  isWrappable
-} ;
+  isWrappable,
+  hooks: DevHooks
+};
 
 exports.$RAW = $RAW;
-exports.DEV = DEV;
 exports.createMutable = createMutable;
 exports.createStore = createStore;
 exports.modifyMutable = modifyMutable;

package/store/dist/dev.js

@@ -1,9 +1,11 @@
 import { $PROXY, DEV as DEV$1, $TRACK, getListener, batch, createSignal } from 'solid-js';
 
 const $RAW = Symbol("store-raw"),
-  $NODE = Symbol("store-node"),
-  $NAME = Symbol("store-name");
-function wrap$1(value, name) {
+  $NODE = Symbol("store-node");
+const DevHooks = {
+  onStoreNodeUpdate: null
+};
+function wrap$1(value) {
   let p = value[$PROXY];
   if (!p) {
     Object.defineProperty(value, $PROXY, {
@@ -22,9 +24,6 @@ function wrap$1(value, name) {
         }
       }
     }
-    if (name) Object.defineProperty(value, $NAME, {
-      value: name
-    });
   }
   return p;
 }
@@ -67,7 +66,7 @@ function getDataNode(nodes, property, value) {
 }
 function proxyDescriptor$1(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || !desc.configurable || property === $PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || !desc.configurable || property === $PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[$PROXY][property];
@@ -107,7 +106,7 @@ const proxyTraps$1 = {
       const desc = Object.getOwnPropertyDescriptor(target, property);
       if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();
     }
-    return isWrappable(value) ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
+    return isWrappable(value) ? wrap$1(value) : value;
   },
   has(target, property) {
     if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
@@ -129,7 +128,7 @@ function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
   const prev = state[property],
     len = state.length;
-  if (globalThis._$onStoreNodeUpdate) globalThis._$onStoreNodeUpdate(state, property, value, prev);
+  DevHooks.onStoreNodeUpdate && DevHooks.onStoreNodeUpdate(state, property, value, prev);
   if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
     node;
@@ -207,13 +206,11 @@ function createStore(...[store, options]) {
   const unwrappedStore = unwrap(store || {});
   const isArray = Array.isArray(unwrappedStore);
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createStore'. Expected an object.`);
-  const wrappedStore = wrap$1(unwrappedStore, (options && options.name || DEV$1.hashValue(unwrappedStore)));
-  {
-    const name = options && options.name || DEV$1.hashValue(unwrappedStore);
-    DEV$1.registerGraph(name, {
-      value: unwrappedStore
-    });
-  }
+  const wrappedStore = wrap$1(unwrappedStore);
+  DEV$1.registerGraph({
+    value: unwrappedStore,
+    name: options && options.name
+  });
   function setStore(...args) {
     batch(() => {
       isArray && args.length === 1 ? updateArray(unwrappedStore, args[0]) : updatePath(unwrappedStore, args);
@@ -224,7 +221,7 @@ function createStore(...[store, options]) {
 
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || desc.set || !desc.configurable || property === $PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || desc.set || !desc.configurable || property === $PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[$PROXY][property];
@@ -250,7 +247,7 @@ const proxyTraps = {
         return (...args) => batch(() => Array.prototype[property].apply(receiver, args));
       }
     }
-    return isWrappable(value) ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
+    return isWrappable(value) ? wrap(value) : value;
   },
   has(target, property) {
     if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
@@ -268,7 +265,7 @@ const proxyTraps = {
   ownKeys: ownKeys,
   getOwnPropertyDescriptor: proxyDescriptor
 };
-function wrap(value, name) {
+function wrap(value) {
   let p = value[$PROXY];
   if (!p) {
     Object.defineProperty(value, $PROXY, {
@@ -292,22 +289,17 @@ function wrap(value, name) {
         });
       }
     }
-    if (name) Object.defineProperty(value, $NAME, {
-      value: name
-    });
   }
   return p;
 }
 function createMutable(state, options) {
   const unwrappedStore = unwrap(state || {});
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createMutable'. Expected an object.`);
-  const wrappedStore = wrap(unwrappedStore, (options && options.name || DEV$1.hashValue(unwrappedStore)));
-  {
-    const name = options && options.name || DEV$1.hashValue(unwrappedStore);
-    DEV$1.registerGraph(name, {
-      value: unwrappedStore
-    });
-  }
+  const wrappedStore = wrap(unwrappedStore);
+  DEV$1.registerGraph({
+    value: unwrappedStore,
+    name: options && options.name
+  });
   return wrappedStore;
 }
 function modifyMutable(state, modifier) {
@@ -430,10 +422,11 @@ function produce(fn) {
   };
 }
 
-const DEV = {
-  $NAME,
+let DEV;
+DEV = {
   $NODE,
-  isWrappable
-} ;
+  isWrappable,
+  hooks: DevHooks
+};
 
 export { $RAW, DEV, createMutable, createStore, modifyMutable, produce, reconcile, unwrap };

package/store/dist/store.cjs

@@ -3,9 +3,8 @@
 var solidJs = require('solid-js');
 
 const $RAW = Symbol("store-raw"),
-  $NODE = Symbol("store-node"),
-  $NAME = Symbol("store-name");
-function wrap$1(value, name) {
+  $NODE = Symbol("store-node");
+function wrap$1(value) {
   let p = value[solidJs.$PROXY];
   if (!p) {
     Object.defineProperty(value, solidJs.$PROXY, {
@@ -66,7 +65,7 @@ function getDataNode(nodes, property, value) {
 }
 function proxyDescriptor$1(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || !desc.configurable || property === solidJs.$PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || !desc.configurable || property === solidJs.$PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[solidJs.$PROXY][property];
@@ -213,7 +212,7 @@ function createStore(...[store, options]) {
 
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || desc.set || !desc.configurable || property === solidJs.$PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || desc.set || !desc.configurable || property === solidJs.$PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[solidJs.$PROXY][property];
@@ -257,7 +256,7 @@ const proxyTraps = {
   ownKeys: ownKeys,
   getOwnPropertyDescriptor: proxyDescriptor
 };
-function wrap(value, name) {
+function wrap(value) {
   let p = value[solidJs.$PROXY];
   if (!p) {
     Object.defineProperty(value, solidJs.$PROXY, {
@@ -409,7 +408,7 @@ function produce(fn) {
   };
 }
 
-const DEV = undefined;
+let DEV;
 
 exports.$RAW = $RAW;
 exports.DEV = DEV;

package/store/dist/store.js

@@ -1,9 +1,8 @@
 import { $PROXY, $TRACK, getListener, batch, createSignal } from 'solid-js';
 
 const $RAW = Symbol("store-raw"),
-  $NODE = Symbol("store-node"),
-  $NAME = Symbol("store-name");
-function wrap$1(value, name) {
+  $NODE = Symbol("store-node");
+function wrap$1(value) {
   let p = value[$PROXY];
   if (!p) {
     Object.defineProperty(value, $PROXY, {
@@ -64,7 +63,7 @@ function getDataNode(nodes, property, value) {
 }
 function proxyDescriptor$1(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || !desc.configurable || property === $PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || !desc.configurable || property === $PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[$PROXY][property];
@@ -211,7 +210,7 @@ function createStore(...[store, options]) {
 
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || desc.set || !desc.configurable || property === $PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || desc.set || !desc.configurable || property === $PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[$PROXY][property];
@@ -255,7 +254,7 @@ const proxyTraps = {
   ownKeys: ownKeys,
   getOwnPropertyDescriptor: proxyDescriptor
 };
-function wrap(value, name) {
+function wrap(value) {
   let p = value[$PROXY];
   if (!p) {
     Object.defineProperty(value, $PROXY, {
@@ -407,6 +406,6 @@ function produce(fn) {
   };
 }
 
-const DEV = undefined;
+let DEV;
 
 export { $RAW, DEV, createMutable, createStore, modifyMutable, produce, reconcile, unwrap };

package/store/types/index.d.ts

@@ -1,10 +1,11 @@
-export { createStore, unwrap, $RAW } from "./store.js";
-export type { Store, SetStoreFunction, NotWrappable, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, Part, DeepReadonly, DeepMutable } from "./store.js";
+export { $RAW, createStore, unwrap } from "./store.js";
+export type { ArrayFilterFn, DeepMutable, DeepReadonly, NotWrappable, Part, SetStoreFunction, SolidStore, Store, StoreNode, StorePathRange, StoreSetter } from "./store.js";
 export * from "./mutable.js";
 export * from "./modifiers.js";
-import { $NAME, $NODE, isWrappable } from "./store.js";
-export declare const DEV: {
-    readonly $NAME: typeof $NAME;
-    readonly $NODE: typeof $NODE;
-    readonly isWrappable: typeof isWrappable;
+import { $NODE, isWrappable, DevHooks } from "./store.js";
+declare let DEV: {
+    $NODE: typeof $NODE;
+    isWrappable: typeof isWrappable;
+    hooks: typeof DevHooks;
 } | undefined;
+export { DEV };

package/store/types/store.d.ts

@@ -1,7 +1,7 @@
-export declare const $RAW: unique symbol, $NODE: unique symbol, $NAME: unique symbol;
-declare global {
-    var _$onStoreNodeUpdate: OnStoreNodeUpdate | undefined;
-}
+export declare const $RAW: unique symbol, $NODE: unique symbol;
+export declare const DevHooks: {
+    onStoreNodeUpdate: OnStoreNodeUpdate | null;
+};
 type DataNode = {
     (): any;
     $(value?: any): void;
@@ -9,7 +9,6 @@ type DataNode = {
 type DataNodes = Record<PropertyKey, DataNode>;
 export type OnStoreNodeUpdate = (state: StoreNode, property: PropertyKey, value: StoreNode | NotWrappable, prev: StoreNode | NotWrappable) => void;
 export interface StoreNode {
-    [$NAME]?: string;
     [$NODE]?: DataNodes;
     [key: PropertyKey]: any;
 }
@@ -68,7 +67,9 @@ export type ArrayFilterFn<T> = (item: T, index: number) => boolean;
 export type StoreSetter<T, U extends PropertyKey[] = []> = T | CustomPartial<T> | ((prevState: T, traversed: U) => T | CustomPartial<T>);
 export type Part<T, K extends KeyOf<T> = KeyOf<T>> = K | ([K] extends [never] ? never : readonly K[]) | ([T] extends [readonly unknown[]] ? ArrayFilterFn<T[number]> | StorePathRange : never);
 type W<T> = Exclude<T, NotWrappable>;
-type KeyOf<T> = number extends keyof T ? 0 extends 1 & T ? keyof T : [T] extends [readonly unknown[]] ? number : [T] extends [never] ? never : keyof T : keyof T;
+type KeyOf<T> = number extends keyof T ? 0 extends 1 & T ? keyof T : [T] extends [never] ? never : [
+    T
+] extends [readonly unknown[]] ? number : keyof T : keyof T;
 type MutableKeyOf<T> = KeyOf<T> & keyof PickMutable<T>;
 type Rest<T, U extends PropertyKey[], K extends KeyOf<T> = KeyOf<T>> = [T] extends [never] ? never : K extends MutableKeyOf<T> ? [Part<T, K>, ...RestSetterOrContinue<T[K], [K, ...U]>] : K extends KeyOf<T> ? [Part<T, K>, ...RestContinue<T[K], [K, ...U]>] : never;
 type RestContinue<T, U extends PropertyKey[]> = 0 extends 1 & T ? [...Part<any>[], StoreSetter<any, PropertyKey[]>] : Rest<W<T>, U>;

package/types/index.d.ts

@@ -7,13 +7,12 @@ export * from "./render/index.js";
 import type { JSX } from "./jsx.js";
 type JSXElement = JSX.Element;
 export type { JSXElement, JSX };
-import { hashValue, registerGraph, serializeGraph, writeSignal } from "./reactive/signal.js";
+import { registerGraph, writeSignal, DevHooks } from "./reactive/signal.js";
 declare let DEV: {
-    writeSignal: typeof writeSignal;
-    serializeGraph: typeof serializeGraph;
-    registerGraph: typeof registerGraph;
-    hashValue: typeof hashValue;
-};
+    readonly hooks: typeof DevHooks;
+    readonly writeSignal: typeof writeSignal;
+    readonly registerGraph: typeof registerGraph;
+} | undefined;
 export { DEV };
 declare global {
     var Solid$$: boolean;

package/types/jsx.d.ts

@@ -12,16 +12,12 @@ export namespace JSX {
   type Element =
     | Node
     | ArrayElement
-    | FunctionElement
     | (string & {})
     | number
     | boolean
     | null
     | undefined;
   interface ArrayElement extends Array<Element> {}
-  interface FunctionElement {
-    (): Element;
-  }
   interface ElementClass {
     // empty, libs can define requirements downstream
   }

package/types/reactive/signal.d.ts

@@ -8,13 +8,15 @@ export declare const $DEVCOMP: unique symbol;
 export declare var Owner: Owner | null;
 export declare let Transition: TransitionState | null;
 declare let ExternalSourceFactory: ExternalSourceFactory | null;
-declare global {
-    var _$afterUpdate: (() => void) | undefined;
-    var _$afterCreateRoot: ((root: Owner) => void) | undefined;
-}
+/** Object storing callbacks for debugging during development */
+export declare const DevHooks: {
+    afterUpdate: (() => void) | null;
+    afterCreateOwner: ((owner: Owner) => void) | null;
+};
 export type ComputationState = 0 | 1 | 2;
 export interface SourceMapValue {
     value: unknown;
+    name?: string;
     graph?: Owner;
 }
 export interface SignalState<T> extends SourceMapValue {
@@ -23,16 +25,14 @@ export interface SignalState<T> extends SourceMapValue {
     observerSlots: number[] | null;
     tValue?: T;
     comparator?: (prev: T, next: T) => boolean;
-    name?: string;
 }
 export interface Owner {
     owned: Computation<any>[] | null;
     cleanups: (() => void)[] | null;
     owner: Owner | null;
     context: any | null;
-    sourceMap?: Record<string, SourceMapValue>;
+    sourceMap?: SourceMapValue[];
     name?: string;
-    componentName?: string;
 }
 export interface Computation<Init, Next extends Init = Init> extends Owner {
     fn: EffectFunction<Init, Next>;
@@ -425,7 +425,7 @@ export declare function onCleanup<T extends () => any>(fn: T): T;
  *
  * @description https://www.solidjs.com/docs/latest/api#onerror
  */
-export declare function onError(fn: (err: any) => void): void;
+export declare function onError(fn: (err: Error) => void): void;
 export declare function getListener(): Computation<any, any> | null;
 export declare function getOwner(): Owner | null;
 export declare function runWithOwner<T>(o: typeof Owner, fn: () => T): T | undefined;
@@ -450,17 +450,12 @@ export type Transition = [Accessor<boolean>, (fn: () => void) => Promise<void>];
  */
 export declare function useTransition(): Transition;
 export declare function resumeEffects(e: Computation<any>[]): void;
-export interface DevComponent<T> extends Memo<JSX.Element> {
+export interface DevComponent<T> extends Memo<unknown> {
     props: T;
     componentName: string;
 }
-export declare function devComponent<T>(Comp: (props: T) => JSX.Element, props: T): JSX.Element;
-export declare function hashValue(v: any): string;
-export declare function registerGraph(name: string, value: SourceMapValue): string;
-interface GraphRecord {
-    [k: string]: GraphRecord | unknown;
-}
-export declare function serializeGraph(owner?: Owner | null): GraphRecord;
+export declare function devComponent<P, V>(Comp: (props: P) => V, props: P): V;
+export declare function registerGraph(value: SourceMapValue): void;
 export type ContextProviderComponent<T> = FlowComponent<{
     value: T;
 }>;
@@ -499,7 +494,7 @@ export declare function createContext<T>(defaultValue: T, options?: EffectOption
  * @description https://www.solidjs.com/docs/latest/api#usecontext
  */
 export declare function useContext<T>(context: Context<T>): T;
-export type ResolvedJSXElement = Exclude<JSX.Element, JSX.ArrayElement | JSX.FunctionElement>;
+export type ResolvedJSXElement = Exclude<JSX.Element, JSX.ArrayElement>;
 export type ResolvedChildren = ResolvedJSXElement | ResolvedJSXElement[];
 export type ChildrenReturn = Accessor<ResolvedChildren> & {
     toArray: () => ResolvedJSXElement[];

package/types/render/flow.d.ts

@@ -17,7 +17,7 @@ export declare function For<T extends readonly any[], U extends JSX.Element>(pro
     each: T | undefined | null | false;
     fallback?: JSX.Element;
     children: (item: T[number], index: Accessor<number>) => U;
-}): Accessor<U[]>;
+}): JSX.Element;
 /**
  * Non-keyed iteration over a list creating elements from its items
  *
@@ -35,7 +35,7 @@ export declare function Index<T extends readonly any[], U extends JSX.Element>(p
     each: T | undefined | null | false;
     fallback?: JSX.Element;
     children: (item: Accessor<T[number]>, index: number) => U;
-}): Accessor<U[]>;
+}): JSX.Element;
 /**
  * Conditionally render its children or an optional fallback component
  * @description https://www.solidjs.com/docs/latest/api#show
@@ -45,13 +45,13 @@ export declare function Show<T>(props: {
     keyed: true;
     fallback?: JSX.Element;
     children: JSX.Element | ((item: NonNullable<T>) => JSX.Element);
-}): () => JSX.Element;
+}): JSX.Element;
 export declare function Show<T>(props: {
     when: T | undefined | null | false;
     keyed?: false;
     fallback?: JSX.Element;
-    children: JSX.Element;
-}): () => JSX.Element;
+    children: JSX.Element | ((item: Accessor<NonNullable<T>>) => JSX.Element);
+}): JSX.Element;
 /**
  * switches between content based on mutually exclusive conditions
  * ```typescript
@@ -69,7 +69,7 @@ export declare function Show<T>(props: {
 export declare function Switch(props: {
     fallback?: JSX.Element;
     children: JSX.Element;
-}): Accessor<JSX.Element>;
+}): JSX.Element;
 export type MatchProps<T> = {
     when: T | undefined | null | false;
     keyed?: boolean;
@@ -113,4 +113,4 @@ export declare function resetErrorBoundaries(): void;
 export declare function ErrorBoundary(props: {
     fallback: JSX.Element | ((err: any, reset: () => void) => JSX.Element);
     children: JSX.Element;
-}): Accessor<JSX.Element>;
+}): JSX.Element;

package/types/server/reactive.d.ts

@@ -2,12 +2,12 @@ export declare const equalFn: <T>(a: T, b: T) => boolean;
 export declare const $PROXY: unique symbol;
 export declare const $TRACK: unique symbol;
 export declare const $DEVCOMP: unique symbol;
-export declare const DEV: {};
+export declare const DEV: undefined;
 export type Accessor<T> = () => T;
 export type Setter<T> = undefined extends T ? <U extends T>(value?: (U extends Function ? never : U) | ((prev?: T) => U)) => U : <U extends T>(value: (U extends Function ? never : U) | ((prev: T) => U)) => U;
 export type Signal<T> = [get: Accessor<T>, set: Setter<T>];
 export declare const BRANCH: unique symbol;
-export declare function castError(err: any): string | Error;
+export declare function castError(err: unknown): Error;
 export declare let Owner: Owner | null;
 interface Owner {
     owner: Owner | null;
@@ -35,7 +35,7 @@ export declare function onCleanup(fn: () => void): () => void;
 export declare function cleanNode(node: {
     cleanups?: Function[] | null;
 }): void;
-export declare function onError(fn: (err: any) => void): void;
+export declare function onError(fn: (err: Error) => void): void;
 export declare function getListener(): null;
 export interface Context<T> {
     id: symbol;

package/types/server/rendering.d.ts

@@ -146,7 +146,7 @@ export declare function SuspenseList(props: {
 export declare function Suspense(props: {
     fallback?: string;
     children: string;
-}): string | number | boolean | Node | JSX.ArrayElement | JSX.FunctionElement | {
+}): string | number | boolean | Node | JSX.ArrayElement | {
     t: string;
 } | null | undefined;
 export {};

package/web/types/index.d.ts

@@ -1,5 +1,5 @@
 import { hydrate as hydrateCore } from "./client.js";
-import { JSX, Accessor, ComponentProps, ValidComponent } from "solid-js";
+import { JSX, ComponentProps, ValidComponent } from "solid-js";
 export * from "./client.js";
 export { For, Show, Suspense, SuspenseList, Switch, Match, Index, ErrorBoundary, mergeProps } from "solid-js";
 export * from "./server-mock.js";
@@ -33,4 +33,4 @@ export type DynamicProps<T extends ValidComponent, P = ComponentProps<T>> = {
  * ```
  * @description https://www.solidjs.com/docs/latest/api#dynamic
  */
-export declare function Dynamic<T extends ValidComponent>(props: DynamicProps<T>): Accessor<JSX.Element>;
+export declare function Dynamic<T extends ValidComponent>(props: DynamicProps<T>): JSX.Element;