solid-js 1.6.10 → 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,
@@ -169,15 +172,12 @@ function createRoot(fn, detachedOwner) {
       owned: null,
       cleanups: null,
       context: null,
-      owner: detachedOwner || owner
+      owner: detachedOwner === undefined ? owner : 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);
@@ -299,8 +302,8 @@ function createResource(pSource, pFetcher, pOptions) {
   }
   function completeLoad(v, err) {
     runUpdates(() => {
-      if (!err) setValue(() => v);
-      setState(err ? "errored" : "ready");
+      if (err === undefined) setValue(() => v);
+      setState(err !== undefined ? "errored" : "ready");
       setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -310,7 +313,7 @@ function createResource(pSource, pFetcher, pOptions) {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
       v = value(),
       err = error();
-    if (err && !pr) throw err;
+    if (err !== undefined && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -423,6 +426,7 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
+  if (Listener === null) return fn();
   const listener = Listener;
   Listener = null;
   try {
@@ -535,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");
@@ -756,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
@@ -771,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) {
@@ -813,7 +783,7 @@ function runUpdates(fn, init) {
     completeUpdates(wait);
     return res;
   } catch (err) {
-    if (!Updates) Effects = null;
+    if (!wait) Effects = null;
     Updates = null;
     handleError(err);
   }
@@ -860,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) {
@@ -962,14 +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;
-  for (const f of fns) f(err);
+  const error = castError(err);
+  if (Effects) Effects.push({
+    fn() {
+      runErrors(fns, error);
+    },
+    state: STALE
+  });else runErrors(fns, error);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -998,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 {
@@ -1441,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(() => {
@@ -1452,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, {
@@ -1461,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();
@@ -1485,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"
   } );
@@ -1691,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,
@@ -167,15 +170,12 @@ function createRoot(fn, detachedOwner) {
       owned: null,
       cleanups: null,
       context: null,
-      owner: detachedOwner || owner
+      owner: detachedOwner === undefined ? owner : 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);
@@ -297,8 +300,8 @@ function createResource(pSource, pFetcher, pOptions) {
   }
   function completeLoad(v, err) {
     runUpdates(() => {
-      if (!err) setValue(() => v);
-      setState(err ? "errored" : "ready");
+      if (err === undefined) setValue(() => v);
+      setState(err !== undefined ? "errored" : "ready");
       setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -308,7 +311,7 @@ function createResource(pSource, pFetcher, pOptions) {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
       v = value(),
       err = error();
-    if (err && !pr) throw err;
+    if (err !== undefined && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -421,6 +424,7 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
+  if (Listener === null) return fn();
   const listener = Listener;
   Listener = null;
   try {
@@ -533,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");
@@ -754,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
@@ -769,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) {
@@ -811,7 +781,7 @@ function runUpdates(fn, init) {
     completeUpdates(wait);
     return res;
   } catch (err) {
-    if (!Updates) Effects = null;
+    if (!wait) Effects = null;
     Updates = null;
     handleError(err);
   }
@@ -858,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) {
@@ -960,14 +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;
-  for (const f of fns) f(err);
+  const error = castError(err);
+  if (Effects) Effects.push({
+    fn() {
+      runErrors(fns, error);
+    },
+    state: STALE
+  });else runErrors(fns, error);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -996,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 {
@@ -1439,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(() => {
@@ -1450,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, {
@@ -1459,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();
@@ -1483,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"
   } );
@@ -1689,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,
@@ -23,11 +25,10 @@ const UNOWNED = {
 };
 let Owner = null;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const owner = Owner,
     root = fn.length === 0 ? UNOWNED : {
       context: null,
-      owner
+      owner: detachedOwner === undefined ? owner : detachedOwner
     };
   Owner = root;
   let result;

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,
@@ -21,11 +23,10 @@ const UNOWNED = {
 };
 let Owner = null;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const owner = Owner,
     root = fn.length === 0 ? UNOWNED : {
       context: null,
-      owner
+      owner: detachedOwner === undefined ? owner : detachedOwner
     };
   Owner = root;
   let result;