solid-js 2.0.0-beta.10 → 2.0.0-beta.12

package/dist/server.js

@@ -1,5 +1,5 @@
-import { getOwner, getContext, getNextChildId, createOwner, NotReadyError, runWithOwner, onCleanup, isWrappable, setContext, flatten, createRoot } from '@solidjs/signals';
-export { $PROXY, $REFRESH, $TRACK, NotReadyError, createOwner, createRoot, enableExternalSource, enforceLoadingBoundary, flatten, getNextChildId, getOwner, isDisposed, isEqual, isWrappable, merge, omit, onCleanup, runWithOwner, snapshot, storePath } from '@solidjs/signals';
+import { NotReadyError, $REFRESH, merge as merge$1, isWrappable, NoOwnerError, ContextNotFoundError, $PROXY, flatten } from '@solidjs/signals';
+export { $PROXY, $REFRESH, $TRACK, NotReadyError, enableExternalSource, enforceLoadingBoundary, flatten, isEqual, isWrappable, omit, snapshot, storePath } from '@solidjs/signals';
 
 const NoHydrateContext = {
   id: Symbol("NoHydrateContext"),
@@ -14,6 +14,147 @@ const sharedConfig = {
   }
 };
 
+const defaultSSRContext = {};
+let currentOwner = null;
+const OWNER_POOL_MAX = 4096;
+const ownerPool = [];
+function formatChildId(prefix, id) {
+  const num = id.toString(36);
+  const len = num.length - 1;
+  return prefix + (len ? String.fromCharCode(64 + len) : "") + num;
+}
+function nextChildIdFor(owner, consume) {
+  let counter = owner;
+  while (counter._transparent && counter._parent) counter = counter._parent;
+  if (counter.id != null) {
+    return formatChildId(counter.id, counter._childCount++ );
+  }
+  throw new Error("Cannot get child id from owner without an id");
+}
+function consumeClientComputedSlot(owner) {
+  if (owner?.id != null) nextChildIdFor(owner);
+}
+function getNextChildId(owner) {
+  return nextChildIdFor(owner);
+}
+function createOwner(options) {
+  const parent = currentOwner;
+  const transparent = options?.transparent ?? false;
+  const id = options?.id ?? (transparent ? parent?.id : parent?.id != null ? nextChildIdFor(parent) : undefined);
+  const ctx = parent?._context ?? defaultSSRContext;
+  let owner;
+  if (ownerPool.length) {
+    owner = ownerPool.pop();
+    owner.id = id;
+    owner._transparent = transparent;
+    owner._disposal = null;
+    owner._parent = parent;
+    owner._context = ctx;
+    owner._childCount = 0;
+    owner._firstChild = null;
+    owner._nextSibling = null;
+    owner._disposed = false;
+  } else {
+    owner = {
+      id,
+      _transparent: transparent,
+      _disposal: null,
+      _parent: parent,
+      _context: ctx,
+      _childCount: 0,
+      _firstChild: null,
+      _nextSibling: null,
+      _disposed: false
+    };
+  }
+  if (parent) {
+    const lastChild = parent._firstChild;
+    if (lastChild) owner._nextSibling = lastChild;
+    parent._firstChild = owner;
+  }
+  return owner;
+}
+function runWithOwner(owner, fn) {
+  const prev = currentOwner;
+  currentOwner = owner;
+  try {
+    return fn();
+  } finally {
+    currentOwner = prev;
+  }
+}
+function getOwner() {
+  return currentOwner;
+}
+function isDisposed(owner) {
+  return owner._disposed;
+}
+function onCleanup(fn) {
+  const o = currentOwner;
+  if (!o) return fn;
+  if (!o._disposal) o._disposal = fn;else if (Array.isArray(o._disposal)) o._disposal.push(fn);else o._disposal = [o._disposal, fn];
+  return fn;
+}
+function getContext(context, owner = currentOwner) {
+  if (!owner) throw new NoOwnerError();
+  const map = owner._context;
+  const stored = map[context.id];
+  const value = stored !== undefined ? stored : context.defaultValue;
+  if (value === undefined) throw new ContextNotFoundError();
+  return value;
+}
+function setContext(context, value, owner = currentOwner) {
+  if (!owner) throw new NoOwnerError();
+  const o = owner;
+  o._context = {
+    ...o._context,
+    [context.id]: value === undefined ? context.defaultValue : value
+  };
+}
+function disposeOwner(owner, self = true) {
+  const node = owner;
+  if (node._disposed) return;
+  if (!node._firstChild && !node._disposal) {
+    if (self) {
+      node._disposed = true;
+      if (ownerPool.length < OWNER_POOL_MAX) {
+        node.id = undefined;
+        node._parent = null;
+        node._nextSibling = null;
+        ownerPool.push(node);
+      }
+    }
+    return;
+  }
+  if (self) node._disposed = true;
+  let child = node._firstChild;
+  while (child) {
+    const next = child._nextSibling;
+    disposeOwner(child, true);
+    child = next;
+  }
+  node._firstChild = null;
+  node._childCount = 0;
+  const d = node._disposal;
+  if (d) {
+    if (Array.isArray(d)) {
+      for (let i = 0, len = d.length; i < len; i++) d[i]();
+    } else {
+      d();
+    }
+    node._disposal = null;
+  }
+  if (self && ownerPool.length < OWNER_POOL_MAX) {
+    node.id = undefined;
+    node._parent = null;
+    node._nextSibling = null;
+    ownerPool.push(node);
+  }
+}
+function createRoot(init, options) {
+  const owner = createOwner(options);
+  return runWithOwner(owner, () => init(() => disposeOwner(owner)));
+}
 let Observer = null;
 function runWithObserver(comp, fn) {
   const prev = Observer;
@@ -98,6 +239,9 @@ function createSignal(first, second) {
   }];
 }
 function createMemo(compute, options) {
+  if (options?.sync) {
+    return createSyncMemo(compute, options);
+  }
   const ctx = sharedConfig.context;
   const owner = createOwner();
   const comp = {
@@ -133,7 +277,7 @@ function createMemo(compute, options) {
   } else if (!options?.lazy) {
     update();
   }
-  return () => {
+  const read = () => {
     if (!comp.computed) {
       update();
     }
@@ -142,6 +286,44 @@ function createMemo(compute, options) {
     }
     return comp.value;
   };
+  read[$REFRESH] = comp;
+  return read;
+}
+function createSyncMemo(compute, options) {
+  const owner = createOwner();
+  let value;
+  let error;
+  let cached = false;
+  function pull() {
+    const prev = currentOwner;
+    currentOwner = owner;
+    try {
+      value = compute(value);
+      error = undefined;
+      cached = true;
+      return value;
+    } catch (err) {
+      if (err instanceof NotReadyError) throw err;
+      error = err;
+      cached = true;
+      throw err;
+    } finally {
+      currentOwner = prev;
+    }
+  }
+  if (!options?.lazy) {
+    try {
+      pull();
+    } catch {
+    }
+  }
+  return () => {
+    if (cached) {
+      if (error !== undefined) throw error;
+      return value;
+    }
+    return pull();
+  };
 }
 function createDeepProxy(target, patches, basePath = []) {
   const childProxies = new Map();
@@ -566,46 +748,104 @@ function reconcile(value) {
 function deep(store) {
   return store;
 }
+function proxySource(read) {
+  return new Proxy({}, {
+    get(_, property, receiver) {
+      if (property === $PROXY) return receiver;
+      const source = read() || {};
+      return source[property];
+    },
+    has(_, property) {
+      if (property === $PROXY) return true;
+      return property in (read() || {});
+    },
+    ownKeys() {
+      return Object.keys(read() || {});
+    },
+    getOwnPropertyDescriptor(_, property) {
+      return {
+        configurable: true,
+        enumerable: true,
+        get() {
+          return (read() || {})[property];
+        }
+      };
+    }
+  });
+}
+function merge(...sources) {
+  for (let i = 0; i < sources.length; i++) {
+    if (typeof sources[i] === "function") {
+      sources[i] = proxySource(createMemo(sources[i]));
+    }
+  }
+  return merge$1(...sources);
+}
 function mapArray(list, mapFn, options = {}) {
-  const parent = createOwner();
-  return createMemo(() => {
+  const indexes = mapFn.length > 1;
+  const parent = currentOwner;
+  const read = createMemo(() => {
     const items = list();
-    let s = [];
+    const s = [];
     if (items && items.length) {
-      runWithOwner(parent, () => {
+      const parent = currentOwner;
+      const origId = parent.id;
+      const origChildCount = parent._childCount;
+      try {
         for (let i = 0, len = items.length; i < len; i++) {
-          const o = createOwner();
-          s.push(runWithOwner(o, () => mapFn(() => items[i], () => i)));
+          if (origId !== undefined) {
+            parent.id = formatChildId(origId, origChildCount + i);
+          }
+          parent._childCount = 0;
+          s.push(options.keyed === false ? indexes ? mapFn(() => items[i], i) : mapFn(() => items[i]) : typeof options.keyed === "function" ? indexes ? mapFn(() => items[i], () => i) : mapFn(() => items[i]) : indexes ? mapFn(items[i], () => i) : mapFn(items[i]));
         }
-      });
+      } finally {
+        parent.id = origId;
+        parent._childCount = origChildCount + items.length;
+      }
     } else if (options.fallback) {
-      s = [runWithOwner(parent, () => {
-        const fo = createOwner();
-        return runWithOwner(fo, () => options.fallback());
-      })];
+      const fo = createOwner();
+      s.push(runWithOwner(fo, () => options.fallback()));
     }
     return s;
+  }, {
+    sync: true
   });
+  consumeClientComputedSlot(parent);
+  return read;
 }
 function repeat(count, mapFn, options = {}) {
-  const owner = createOwner();
-  return createMemo(() => {
+  const parent = currentOwner;
+  const read = createMemo(() => {
     const len = count();
     const offset = options.from?.() || 0;
     if (!len) {
       if (!options.fallback) return [];
-      return [runWithOwner(owner, () => {
-        const fallbackOwner = createOwner();
-        return runWithOwner(fallbackOwner, () => options.fallback());
-      })];
+      const fo = createOwner();
+      return [runWithOwner(fo, () => options.fallback())];
     }
-    return runWithOwner(owner, () => Array.from({
-      length: len
-    }, (_, i) => {
-      const itemOwner = createOwner();
-      return runWithOwner(itemOwner, () => mapFn(i + offset));
-    }));
+    const out = new Array(len);
+    const parent = currentOwner;
+    const origId = parent.id;
+    const origChildCount = parent._childCount;
+    try {
+      for (let i = 0; i < len; i++) {
+        if (origId !== undefined) {
+          parent.id = formatChildId(origId, origChildCount + i);
+        }
+        parent._childCount = 0;
+        out[i] = mapFn(i + offset);
+      }
+    } finally {
+      parent.id = origId;
+      parent._childCount = origChildCount + len;
+    }
+    return out;
+  }, {
+    sync: true
   });
+  consumeClientComputedSlot(parent);
+  return read;
 }
 const ErrorContext = {
   id: Symbol("ErrorContext"),
@@ -656,7 +896,7 @@ function createErrorBoundary(fn, fallback) {
   return () => {
     let result;
     let handled = false;
-    if (ctx) owner.dispose(false);
+    if (ctx) disposeOwner(owner, false);
     try {
       result = ctx ? runWithBoundaryErrorContext(owner, resolve, err => {
         if (err instanceof NotReadyError) throw err;
@@ -710,8 +950,8 @@ function latest(fn) {
 function isRefreshing() {
   return false;
 }
-function refresh(fn) {
-  return fn();
+function refresh(_target) {
+  return undefined;
 }
 function action(fn) {
   return fn;
@@ -742,7 +982,8 @@ function children(fn) {
     lazy: true
   });
   const memo = createMemo(() => flatten(c()), {
-    lazy: true
+    lazy: true,
+    sync: true
   });
   memo.toArray = () => {
     const v = memo();
@@ -750,11 +991,6 @@ function children(fn) {
   };
   return memo;
 }
-function ssrRunInScope(fn) {
-  const owner = getOwner();
-  if (!owner) return fn;
-  return Array.isArray(fn) ? fn.map(hole => () => runWithOwner(owner, hole)) : () => runWithOwner(owner, fn);
-}
 
 function enableHydration() {}
 function createComponent(Comp, props) {
@@ -798,6 +1034,8 @@ function lazy(fn, moduleUrl) {
     return createMemo(() => {
       if (!p.v) throw new NotReadyError(p);
       return p.v(props);
+    }, {
+      sync: true
     });
   };
   wrap.preload = load;
@@ -881,7 +1119,7 @@ function createLoadingBoundary(fn, fallback, options) {
     }
   }
   function runDiscovery() {
-    o.dispose(false);
+    disposeOwner(o, false);
     serializeBuffer = [];
     retryPromise = undefined;
     return runLoadingPhase(() => {
@@ -928,12 +1166,13 @@ function createLoadingBoundary(fn, fallback, options) {
           ret = runDiscovery();
         }
         commitBoundaryState();
-        while (ret.p.length) {
-          await Promise.all(ret.p).catch(() => {});
-          ret = runLoadingPhase(() => ctx.ssr(ret.t, ...ret.h));
+        while (ret && ret.p && ret.p.length) {
+          const pending = ret;
+          await Promise.all(pending.p).catch(() => {});
+          ret = runLoadingPhase(() => ctx.ssr(pending.t, ...pending.h));
         }
         flushSerializeBuffer();
-        done(ret.t[0]);
+        done(ret && Array.isArray(ret.t) ? ret.t[0] : ret && ret.t);
         if (revealGroup) revealGroup.onResolved(id);
       } catch (err) {
         finalizeError(err);
@@ -990,11 +1229,13 @@ function Show(props) {
     if (when) {
       const child = props.children;
       if (typeof child === "function" && child.length > 0) {
-        return child(() => when);
+        return props.keyed ? child(when) : child(() => when);
       }
       return child;
     }
     return props.fallback;
+  }, {
+    sync: true
   });
 }
 function Switch(props) {
@@ -1008,10 +1249,12 @@ function Switch(props) {
       const w = conds[i].when;
       if (w) {
         const c = conds[i].children;
-        return typeof c === "function" && c.length > 0 ? c(() => w) : c;
+        return typeof c === "function" && c.length > 0 ? conds[i].keyed ? c(w) : c(() => w) : c;
       }
     }
     return props.fallback;
+  }, {
+    sync: true
   });
 }
 function Match(props) {
@@ -1201,4 +1444,4 @@ function Reveal(props) {
 
 const DEV = undefined;
 
-export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Reveal, Show, Switch, action, children, createComponent, createContext, createDeepProxy, createEffect, createErrorBoundary, createLoadingBoundary, createMemo, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createRevealOrder, createSignal, createStore, createTrackedEffect, createUniqueId, deep, enableHydration, flush, getObserver, isPending, isRefreshing, latest, lazy, mapArray, onSettled, reconcile, refresh, repeat, resolve, sharedConfig, ssrHandleError, ssrRunInScope, untrack, useContext };
+export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Reveal, Show, Switch, action, children, createComponent, createContext, createDeepProxy, createEffect, createErrorBoundary, createLoadingBoundary, createMemo, createOptimistic, createOptimisticStore, createOwner, createProjection, createReaction, createRenderEffect, createRevealOrder, createRoot, createSignal, createStore, createTrackedEffect, createUniqueId, deep, enableHydration, flush, getNextChildId, getObserver, getOwner, isDisposed, isPending, isRefreshing, latest, lazy, mapArray, merge, onCleanup, onSettled, reconcile, refresh, repeat, resolve, runWithOwner, sharedConfig, ssrHandleError, untrack, useContext };

package/dist/solid.cjs

@@ -24,7 +24,8 @@ function children(fn) {
     lazy: true
   });
   const memo = signals.createMemo(() => signals.flatten(c()), {
-    lazy: true
+    lazy: true,
+    sync: true
   });
   memo.toArray = () => {
     const v = memo();
@@ -741,7 +742,9 @@ function lazy(fn, moduleUrl) {
     let Comp;
     return signals.createMemo(() => (Comp = comp()) ? signals.untrack(() => {
       return Comp(props);
-    }) : "");
+    }) : "", {
+      sync: true
+    });
   };
   wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
   wrap.moduleUrl = moduleUrl;
@@ -773,20 +776,23 @@ function Show(props) {
   const keyed = props.keyed;
   const conditionValue = signals.createMemo(() => props.when, undefined);
   const condition = keyed ? conditionValue : signals.createMemo(conditionValue, {
-    equals: (a, b) => !a === !b
+    equals: (a, b) => !a === !b,
+    sync: true
   });
   return signals.createMemo(() => {
     const c = condition();
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      return fn ? signals.untrack(() => child(() => {
+      return fn ? keyed ? signals.untrack(() => child(c), IS_DEV) : signals.untrack(() => child(() => {
         if (!signals.untrack(condition)) throw narrowedError("Show");
         return conditionValue();
       }), IS_DEV) : child;
     }
     return props.fallback;
-  }, undefined);
+  }, {
+    sync: true
+  });
 }
 function Switch(props) {
   const chs = children(() => props.children);
@@ -799,23 +805,33 @@ function Switch(props) {
       const prevFunc = func;
       const conditionValue = signals.createMemo(() => prevFunc() ? undefined : mp.when, undefined);
       const condition = mp.keyed ? conditionValue : signals.createMemo(conditionValue, {
-        equals: (a, b) => !a === !b
+        equals: (a, b) => !a === !b,
+        sync: true
       });
-      func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
+      func = () => {
+        const prev = prevFunc();
+        if (prev) return prev;
+        const c = condition();
+        return c ? [index, c, conditionValue, mp] : undefined;
+      };
     }
     return func;
+  }, {
+    sync: true
   });
   return signals.createMemo(() => {
     const sel = switchFunc()();
     if (!sel) return props.fallback;
-    const [index, conditionValue, mp] = sel;
+    const [index, value, conditionValue, mp] = sel;
     const child = mp.children;
     const fn = typeof child === "function" && child.length > 0;
-    return fn ? signals.untrack(() => child(() => {
+    return fn ? mp.keyed ? signals.untrack(() => child(value), IS_DEV) : signals.untrack(() => child(() => {
       if (signals.untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
       return conditionValue();
     }), IS_DEV) : child;
-  }, undefined);
+  }, {
+    sync: true
+  });
 }
 function Match(props) {
   return props;
@@ -840,7 +856,6 @@ function Reveal(props) {
 }
 
 function ssrHandleError() {}
-function ssrRunInScope() {}
 const DEV = undefined;
 
 Object.defineProperty(exports, "$PROXY", {
@@ -1022,5 +1037,4 @@ exports.enableHydration = enableHydration;
 exports.lazy = lazy;
 exports.sharedConfig = sharedConfig;
 exports.ssrHandleError = ssrHandleError;
-exports.ssrRunInScope = ssrRunInScope;
 exports.useContext = useContext;

package/dist/solid.js

@@ -23,7 +23,8 @@ function children(fn) {
     lazy: true
   });
   const memo = createMemo$1(() => flatten(c()), {
-    lazy: true
+    lazy: true,
+    sync: true
   });
   memo.toArray = () => {
     const v = memo();
@@ -740,7 +741,9 @@ function lazy(fn, moduleUrl) {
     let Comp;
     return createMemo$1(() => (Comp = comp()) ? untrack(() => {
       return Comp(props);
-    }) : "");
+    }) : "", {
+      sync: true
+    });
   };
   wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
   wrap.moduleUrl = moduleUrl;
@@ -772,20 +775,23 @@ function Show(props) {
   const keyed = props.keyed;
   const conditionValue = createMemo$1(() => props.when, undefined);
   const condition = keyed ? conditionValue : createMemo$1(conditionValue, {
-    equals: (a, b) => !a === !b
+    equals: (a, b) => !a === !b,
+    sync: true
   });
   return createMemo$1(() => {
     const c = condition();
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      return fn ? untrack(() => child(() => {
+      return fn ? keyed ? untrack(() => child(c), IS_DEV) : untrack(() => child(() => {
         if (!untrack(condition)) throw narrowedError("Show");
         return conditionValue();
       }), IS_DEV) : child;
     }
     return props.fallback;
-  }, undefined);
+  }, {
+    sync: true
+  });
 }
 function Switch(props) {
   const chs = children(() => props.children);
@@ -798,23 +804,33 @@ function Switch(props) {
       const prevFunc = func;
       const conditionValue = createMemo$1(() => prevFunc() ? undefined : mp.when, undefined);
       const condition = mp.keyed ? conditionValue : createMemo$1(conditionValue, {
-        equals: (a, b) => !a === !b
+        equals: (a, b) => !a === !b,
+        sync: true
       });
-      func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
+      func = () => {
+        const prev = prevFunc();
+        if (prev) return prev;
+        const c = condition();
+        return c ? [index, c, conditionValue, mp] : undefined;
+      };
     }
     return func;
+  }, {
+    sync: true
   });
   return createMemo$1(() => {
     const sel = switchFunc()();
     if (!sel) return props.fallback;
-    const [index, conditionValue, mp] = sel;
+    const [index, value, conditionValue, mp] = sel;
     const child = mp.children;
     const fn = typeof child === "function" && child.length > 0;
-    return fn ? untrack(() => child(() => {
+    return fn ? mp.keyed ? untrack(() => child(value), IS_DEV) : untrack(() => child(() => {
       if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
       return conditionValue();
     }), IS_DEV) : child;
-  }, undefined);
+  }, {
+    sync: true
+  });
 }
 function Match(props) {
   return props;
@@ -839,7 +855,6 @@ function Reveal(props) {
 }
 
 function ssrHandleError() {}
-function ssrRunInScope() {}
 const DEV = undefined;
 
-export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Reveal, Show, Switch, children, createComponent, createContext, createEffect, createErrorBoundary, createLoadingBoundary, createMemo, createOptimistic, createOptimisticStore, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };
+export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Reveal, Show, Switch, children, createComponent, createContext, createEffect, createErrorBoundary, createLoadingBoundary, createMemo, createOptimistic, createOptimisticStore, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, useContext };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "Reactive JavaScript library for building user interfaces. Compiles JSX to real DOM with fine-grained signal-based updates — no virtual DOM.",
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.12",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -107,7 +107,7 @@
     "performance"
   ],
   "dependencies": {
-    "@solidjs/signals": "^2.0.0-beta.10",
+    "@solidjs/signals": "^2.0.0-beta.12",
     "csstype": "^3.1.0",
     "seroval": "~1.5.0",
     "seroval-plugins": "~1.5.0"