solid-js 2.0.0-experimental.4 → 2.0.0-experimental.5

package/dist/dev.cjs

@@ -9,8 +9,8 @@ function onMount(fn) {
 function createContext(defaultValue, options) {
   const id = Symbol(options && options.name || "");
   function provider(props) {
-    return signals.createMemo(() => {
-      signals.setContext(provider, signals.untrack(() => props.value));
+    return signals.createRoot(() => {
+      signals.setContext(provider, props.value);
       return children(() => props.children);
     });
   }
@@ -101,43 +101,19 @@ const sharedConfig = {
   context: undefined,
   registry: undefined,
   done: false,
-  getContextId() {
-    return getContextId(this.context.count);
-  },
   getNextContextId() {
-    return getContextId(this.context.count++);
+    const o = signals.getOwner();
+    if (!o) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    return o.getNextChildId();
   }
 };
-function getContextId(count) {
-  const num = String(count),
-    len = num.length - 1;
-  return sharedConfig.context.id + (len ? String.fromCharCode(96 + len) : "") + num;
-}
 function setHydrateContext(context) {
   sharedConfig.context = context;
 }
-function nextHydrateContext() {
-  return {
-    ...sharedConfig.context,
-    id: sharedConfig.getNextContextId(),
-    count: 0
-  };
-}
 
-let hydrationEnabled = false;
 function enableHydration() {
-  hydrationEnabled = true;
 }
 function createComponent(Comp, props) {
-  if (hydrationEnabled) {
-    if (sharedConfig.context) {
-      const c = sharedConfig.context;
-      setHydrateContext(nextHydrateContext());
-      const r = devComponent(Comp, props || {}) ;
-      setHydrateContext(c);
-      return r;
-    }
-  }
   return devComponent(Comp, props || {});
 }
 function lazy(fn) {
@@ -275,7 +251,12 @@ function ErrorBoundary(props) {
 function Suspense(props) {
   return signals.createSuspense(() => props.children, () => props.fallback);
 }
+function Boundary(props) {
+  return signals.createBoundary(() => props.children, () => props.mode);
+}
 
+function ssrHandleError() {}
+function ssrRunInScope() {}
 const DevHooks = {};
 const DEV = {
   hooks: DevHooks,
@@ -297,10 +278,6 @@ Object.defineProperty(exports, "$TRACK", {
   enumerable: true,
   get: function () { return signals.$TRACK; }
 });
-Object.defineProperty(exports, "catchError", {
-  enumerable: true,
-  get: function () { return signals.catchError; }
-});
 Object.defineProperty(exports, "createAsync", {
   enumerable: true,
   get: function () { return signals.createAsync; }
@@ -401,6 +378,10 @@ Object.defineProperty(exports, "runWithOwner", {
   enumerable: true,
   get: function () { return signals.runWithOwner; }
 });
+Object.defineProperty(exports, "tryCatch", {
+  enumerable: true,
+  get: function () { return signals.tryCatch; }
+});
 Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return signals.untrack; }
@@ -410,6 +391,7 @@ Object.defineProperty(exports, "unwrap", {
   get: function () { return signals.unwrap; }
 });
 exports.$DEVCOMP = $DEVCOMP;
+exports.Boundary = Boundary;
 exports.DEV = DEV;
 exports.ErrorBoundary = ErrorBoundary;
 exports.For = For;
@@ -428,4 +410,6 @@ exports.lazy = lazy;
 exports.observable = observable;
 exports.onMount = onMount;
 exports.sharedConfig = sharedConfig;
+exports.ssrHandleError = ssrHandleError;
+exports.ssrRunInScope = ssrRunInScope;
 exports.useContext = useContext;

package/dist/dev.js

@@ -1,66 +1,15 @@
-import {
-  createEffect,
-  getContext,
-  createMemo,
-  flatten,
-  setContext,
-  untrack,
-  createRoot,
-  getOwner,
-  onCleanup,
-  createSignal,
-  createAsync,
-  mapArray,
-  repeat,
-  createErrorBoundary,
-  createSuspense
-} from "@solidjs/signals";
-export {
-  $PROXY,
-  $RAW,
-  $TRACK,
-  catchError,
-  createAsync,
-  createEffect,
-  createMemo,
-  createProjection,
-  createRenderEffect,
-  createRoot,
-  createSignal,
-  createStore,
-  flatten,
-  flushSync,
-  getObserver,
-  getOwner,
-  isEqual,
-  isPending,
-  isWrappable,
-  latest,
-  mapArray,
-  merge,
-  omit,
-  onCleanup,
-  reconcile,
-  repeat,
-  resolve,
-  runWithObserver,
-  runWithOwner,
-  untrack,
-  unwrap
-} from "@solidjs/signals";
+import { createEffect, getContext, createMemo, flatten, createRoot, setContext, getOwner, untrack, onCleanup, createSignal, createAsync, mapArray, repeat, createErrorBoundary, createSuspense, createBoundary } from '@solidjs/signals';
+export { $PROXY, $RAW, $TRACK, createAsync, createEffect, createMemo, createProjection, createRenderEffect, createRoot, createSignal, createStore, flatten, flushSync, getObserver, getOwner, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, repeat, resolve, runWithObserver, runWithOwner, tryCatch, untrack, unwrap } from '@solidjs/signals';
 
-const $DEVCOMP = Symbol("COMPONENT_DEV");
+const $DEVCOMP = Symbol("COMPONENT_DEV" );
 function onMount(fn) {
   createEffect(() => null, fn);
 }
 function createContext(defaultValue, options) {
-  const id = Symbol((options && options.name) || "");
+  const id = Symbol(options && options.name || "");
   function provider(props) {
-    return createMemo(() => {
-      setContext(
-        provider,
-        untrack(() => props.value)
-      );
+    return createRoot(() => {
+      setContext(provider, props.value);
       return children(() => props.children);
     });
   }
@@ -75,7 +24,7 @@ function children(fn) {
   const children = createMemo(fn);
   const memo = createMemo(() => flatten(children()), undefined, {
     name: "children"
-  });
+  }) ;
   memo.toArray = () => {
     const c = memo();
     return Array.isArray(c) ? c : c != null ? [c] : [];
@@ -99,8 +48,7 @@ function devComponent(Comp, props) {
 function registerGraph(value) {
   const owner = getOwner();
   if (!owner) return;
-  if (owner.sourceMap) owner.sourceMap.push(value);
-  else owner.sourceMap = [value];
+  if (owner.sourceMap) owner.sourceMap.push(value);else owner.sourceMap = [value];
   value.graph = owner;
 }
 
@@ -110,20 +58,16 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler =
-        typeof observer === "function" ? observer : observer.next && observer.next.bind(observer);
+      const handler = typeof observer === "function" ? observer : observer.next && observer.next.bind(observer);
       if (!handler) {
         return {
           unsubscribe() {}
         };
       }
       const dispose = createRoot(disposer => {
-        createEffect(
-          () => input(),
-          v => {
-            handler(v);
-          }
-        );
+        createEffect(() => input(), v => {
+          handler(v);
+        });
         return disposer;
       });
       if (getOwner()) onCleanup(dispose);
@@ -144,7 +88,7 @@ function from(producer, initialValue = undefined) {
   });
   if ("subscribe" in producer) {
     const unsub = producer.subscribe(v => set(() => v));
-    onCleanup(() => ("unsubscribe" in unsub ? unsub.unsubscribe() : unsub()));
+    onCleanup(() => "unsubscribe" in unsub ? unsub.unsubscribe() : unsub());
   } else {
     const clean = producer(set);
     onCleanup(clean);
@@ -156,43 +100,19 @@ const sharedConfig = {
   context: undefined,
   registry: undefined,
   done: false,
-  getContextId() {
-    return getContextId(this.context.count);
-  },
   getNextContextId() {
-    return getContextId(this.context.count++);
+    const o = getOwner();
+    if (!o) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    return o.getNextChildId();
   }
 };
-function getContextId(count) {
-  const num = String(count),
-    len = num.length - 1;
-  return sharedConfig.context.id + (len ? String.fromCharCode(96 + len) : "") + num;
-}
 function setHydrateContext(context) {
   sharedConfig.context = context;
 }
-function nextHydrateContext() {
-  return {
-    ...sharedConfig.context,
-    id: sharedConfig.getNextContextId(),
-    count: 0
-  };
-}
 
-let hydrationEnabled = false;
 function enableHydration() {
-  hydrationEnabled = true;
 }
 function createComponent(Comp, props) {
-  if (hydrationEnabled) {
-    if (sharedConfig.context) {
-      const c = sharedConfig.context;
-      setHydrateContext(nextHydrateContext());
-      const r = devComponent(Comp, props || {});
-      setHydrateContext(c);
-      return r;
-    }
-  }
   return devComponent(Comp, props || {});
 }
 function lazy(fn) {
@@ -216,23 +136,19 @@ function lazy(fn) {
       comp = s;
     }
     let Comp;
-    return createMemo(() =>
-      (Comp = comp())
-        ? untrack(() => {
-            Object.assign(Comp, {
-              [$DEVCOMP]: true
-            });
-            if (!ctx || sharedConfig.done) return Comp(props);
-            const c = sharedConfig.context;
-            setHydrateContext(ctx);
-            const r = Comp(props);
-            setHydrateContext(c);
-            return r;
-          })
-        : ""
-    );
+    return createMemo(() => (Comp = comp()) ? untrack(() => {
+      Object.assign(Comp, {
+        [$DEVCOMP]: true
+      });
+      if (!ctx || sharedConfig.done) return Comp(props);
+      const c = sharedConfig.context;
+      setHydrateContext(ctx);
+      const r = Comp(props);
+      setHydrateContext(c);
+      return r;
+    }) : "");
   };
-  wrap.preload = () => p || ((p = fn()).then(mod => (comp = () => mod.default)), p);
+  wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
   return wrap;
 }
 let counter = 0;
@@ -241,79 +157,50 @@ function createUniqueId() {
   return ctx ? sharedConfig.getNextContextId() : `cl-${counter++}`;
 }
 
-const narrowedError = name =>
-  `Attempting to access a stale value from <${name}> that could possibly be undefined. This may occur because you are reading the accessor returned from the component at a time where it has already been unmounted. We recommend cleaning up any stale timers or async, or reading from the initial condition.`;
+const narrowedError = name => `Attempting to access a stale value from <${name}> that could possibly be undefined. This may occur because you are reading the accessor returned from the component at a time where it has already been unmounted. We recommend cleaning up any stale timers or async, or reading from the initial condition.` ;
 function For(props) {
-  const options =
-    "fallback" in props
-      ? {
-          keyed: props.keyed,
-          fallback: () => props.fallback
-        }
-      : {
-          keyed: props.keyed
-        };
-  return createMemo(
-    mapArray(() => props.each, props.children, options),
-    undefined,
-    {
-      name: "value"
-    }
-  );
+  const options = "fallback" in props ? {
+    keyed: props.keyed,
+    fallback: () => props.fallback
+  } : {
+    keyed: props.keyed
+  };
+  return createMemo(mapArray(() => props.each, props.children, options), undefined, {
+    name: "value"
+  }) ;
 }
 function Repeat(props) {
-  const options =
-    "fallback" in props
-      ? {
-          fallback: () => props.fallback
-        }
-      : {};
+  const options = "fallback" in props ? {
+    fallback: () => props.fallback
+  } : {};
   options.from = () => props.from;
-  return createMemo(
-    repeat(
-      () => props.count,
-      index => (typeof props.children === "function" ? props.children(index) : props.children),
-      options
-    ),
-    undefined,
-    {
-      name: "value"
-    }
-  );
+  return createMemo(repeat(() => props.count, index => typeof props.children === "function" ? props.children(index) : props.children, options), undefined, {
+    name: "value"
+  }) ;
 }
 function Show(props) {
   const keyed = props.keyed;
   const conditionValue = createMemo(() => props.when, undefined, {
     name: "condition value"
-  });
-  const condition = keyed
-    ? conditionValue
-    : createMemo(conditionValue, undefined, {
-        equals: (a, b) => !a === !b,
-        name: "condition"
-      });
-  return createMemo(
-    () => {
-      const c = condition();
-      if (c) {
-        const child = props.children;
-        const fn = typeof child === "function" && child.length > 0;
-        return fn
-          ? untrack(() =>
-              child(() => {
-                if (!untrack(condition)) throw narrowedError("Show");
-                return conditionValue();
-              })
-            )
-          : child;
-      }
-      return props.fallback;
-    },
-    undefined,
-    {
-      name: "value"
+  } );
+  const condition = keyed ? conditionValue : createMemo(conditionValue, undefined, {
+    equals: (a, b) => !a === !b,
+    name: "condition"
+  } );
+  return createMemo(() => {
+    const c = condition();
+    if (c) {
+      const child = props.children;
+      const fn = typeof child === "function" && child.length > 0;
+      return fn ? untrack(() => child(() => {
+        if (!untrack(condition)) throw narrowedError("Show");
+        return conditionValue();
+      })) : child;
     }
-  );
+    return props.fallback;
+  }, undefined, {
+    name: "value"
+  } );
 }
 function Switch(props) {
   const chs = children(() => props.children);
@@ -325,93 +212,57 @@ function Switch(props) {
       const index = i;
       const mp = mps[i];
       const prevFunc = func;
-      const conditionValue = createMemo(() => (prevFunc() ? undefined : mp.when), undefined, {
+      const conditionValue = createMemo(() => prevFunc() ? undefined : mp.when, undefined, {
         name: "condition value"
-      });
-      const condition = mp.keyed
-        ? conditionValue
-        : createMemo(conditionValue, undefined, {
-            equals: (a, b) => !a === !b,
-            name: "condition"
-          });
+      } );
+      const condition = mp.keyed ? conditionValue : createMemo(conditionValue, undefined, {
+        equals: (a, b) => !a === !b,
+        name: "condition"
+      } );
       func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
     }
     return func;
   });
-  return createMemo(
-    () => {
-      const sel = switchFunc()();
-      if (!sel) return props.fallback;
-      const [index, conditionValue, mp] = sel;
-      const child = mp.children;
-      const fn = typeof child === "function" && child.length > 0;
-      return fn
-        ? untrack(() =>
-            child(() => {
-              if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
-              return conditionValue();
-            })
-          )
-        : child;
-    },
-    undefined,
-    {
-      name: "eval conditions"
-    }
-  );
+  return createMemo(() => {
+    const sel = switchFunc()();
+    if (!sel) return props.fallback;
+    const [index, conditionValue, mp] = sel;
+    const child = mp.children;
+    const fn = typeof child === "function" && child.length > 0;
+    return fn ? untrack(() => child(() => {
+      if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+      return conditionValue();
+    })) : child;
+  }, undefined, {
+    name: "eval conditions"
+  } );
 }
 function Match(props) {
   return props;
 }
 function ErrorBoundary(props) {
-  return createErrorBoundary(
-    () => props.children,
-    (err, reset) => {
-      const f = props.fallback;
-      if (typeof f !== "function" || f.length == 0) console.error(err);
-      return typeof f === "function" && f.length ? f(err, reset) : f;
-    }
-  );
+  return createErrorBoundary(() => props.children, (err, reset) => {
+    const f = props.fallback;
+    if ((typeof f !== "function" || f.length == 0)) console.error(err);
+    return typeof f === "function" && f.length ? f(err, reset) : f;
+  });
 }
 function Suspense(props) {
-  return createSuspense(
-    () => props.children,
-    () => props.fallback
-  );
+  return createSuspense(() => props.children, () => props.fallback);
+}
+function Boundary(props) {
+  return createBoundary(() => props.children, () => props.mode);
 }
 
+function ssrHandleError() {}
+function ssrRunInScope() {}
 const DevHooks = {};
 const DEV = {
   hooks: DevHooks,
   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."
-    );
+  if (!globalThis.Solid$$) globalThis.Solid$$ = true;else console.warn("You appear to have multiple instances of Solid. This can lead to unexpected behavior.");
 }
 
-export {
-  $DEVCOMP,
-  DEV,
-  ErrorBoundary,
-  For,
-  Match,
-  Repeat,
-  Show,
-  Suspense,
-  Switch,
-  children,
-  createComponent,
-  createContext,
-  createUniqueId,
-  enableHydration,
-  from,
-  lazy,
-  observable,
-  onMount,
-  sharedConfig,
-  useContext
-};
+export { $DEVCOMP, Boundary, DEV, ErrorBoundary, For, Match, Repeat, Show, Suspense, Switch, children, createComponent, createContext, createUniqueId, enableHydration, from, lazy, observable, onMount, sharedConfig, ssrHandleError, ssrRunInScope, useContext };