solid-js 2.0.0-experimental.1 → 2.0.0-experimental.3

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2023 Ryan Carniato
+Copyright (c) 2016-2025 Ryan Carniato
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/dev.cjs

@@ -83,8 +83,8 @@ function observable(input) {
     }
   };
 }
-function from(producer) {
-  const [s, set] = signals.createSignal(undefined, {
+function from(producer, initialValue = undefined) {
+  const [s, set] = signals.createSignal(() => initialValue, initialValue, {
     equals: false
   });
   if ("subscribe" in producer) {
@@ -204,8 +204,11 @@ function Repeat(props) {
 }
 function Show(props) {
   const keyed = props.keyed;
-  const condition = signals.createMemo(() => props.when, undefined, {
-    equals: (a, b) => keyed ? a === b : !a === !b,
+  const conditionValue = signals.createMemo(() => props.when, undefined, {
+    name: "condition value"
+  } );
+  const condition = keyed ? conditionValue : signals.createMemo(conditionValue, undefined, {
+    equals: (a, b) => !a === !b,
     name: "condition"
   } );
   return signals.createMemo(() => {
@@ -215,7 +218,7 @@ function Show(props) {
       const fn = typeof child === "function" && child.length > 0;
       return fn ? signals.untrack(() => child(() => {
         if (!signals.untrack(condition)) throw narrowedError("Show");
-        return props.when;
+        return conditionValue();
       })) : child;
     }
     return props.fallback;
@@ -224,35 +227,38 @@ function Show(props) {
   } );
 }
 function Switch(props) {
-  let keyed = false;
-  const equals = (a, b) => (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
-  const conditions = children(() => props.children),
-    evalConditions = signals.createMemo(() => {
-      let conds = conditions();
-      if (!Array.isArray(conds)) conds = [conds];
-      for (let i = 0; i < conds.length; i++) {
-        const c = conds[i].when;
-        if (c) {
-          keyed = !!conds[i].keyed;
-          return [i, c, conds[i]];
-        }
-      }
-      return [-1];
-    }, undefined, {
-      equals,
-      name: "eval conditions"
-    } );
+  const chs = children(() => props.children);
+  const switchFunc = signals.createMemo(() => {
+    const ch = chs();
+    const mps = Array.isArray(ch) ? ch : [ch];
+    let func = () => undefined;
+    for (let i = 0; i < mps.length; i++) {
+      const index = i;
+      const mp = mps[i];
+      const prevFunc = func;
+      const conditionValue = signals.createMemo(() => prevFunc() ? undefined : mp.when, undefined, {
+        name: "condition value"
+      } );
+      const condition = mp.keyed ? conditionValue : signals.createMemo(conditionValue, undefined, {
+        equals: (a, b) => !a === !b,
+        name: "condition"
+      } );
+      func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
+    }
+    return func;
+  });
   return signals.createMemo(() => {
-    const [index, when, cond] = evalConditions();
-    if (index < 0) return props.fallback;
-    const c = cond.children;
-    const fn = typeof c === "function" && c.length > 0;
-    return fn ? signals.untrack(() => c(() => {
-      if (signals.untrack(evalConditions)[0] !== index) throw narrowedError("Match");
-      return cond.when;
-    })) : c;
+    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 ? signals.untrack(() => child(() => {
+      if (signals.untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+      return conditionValue();
+    })) : child;
   }, undefined, {
-    name: "value"
+    name: "eval conditions"
   } );
 }
 function Match(props) {
@@ -310,10 +316,6 @@ Object.defineProperty(exports, "createProjection", {
   enumerable: true,
   get: function () { return signals.createProjection; }
 });
-Object.defineProperty(exports, "createReaction", {
-  enumerable: true,
-  get: function () { return signals.createReaction; }
-});
 Object.defineProperty(exports, "createRenderEffect", {
   enumerable: true,
   get: function () { return signals.createRenderEffect; }
@@ -350,9 +352,9 @@ Object.defineProperty(exports, "isEqual", {
   enumerable: true,
   get: function () { return signals.isEqual; }
 });
-Object.defineProperty(exports, "isStale", {
+Object.defineProperty(exports, "isPending", {
   enumerable: true,
-  get: function () { return signals.isStale; }
+  get: function () { return signals.isPending; }
 });
 Object.defineProperty(exports, "isWrappable", {
   enumerable: true,
@@ -390,6 +392,10 @@ Object.defineProperty(exports, "resolve", {
   enumerable: true,
   get: function () { return signals.resolve; }
 });
+Object.defineProperty(exports, "runWithObserver", {
+  enumerable: true,
+  get: function () { return signals.runWithObserver; }
+});
 Object.defineProperty(exports, "runWithOwner", {
   enumerable: true,
   get: function () { return signals.runWithOwner; }

package/dist/dev.js

@@ -1,15 +1,66 @@
-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, createReaction, createRenderEffect, createRoot, createSignal, createStore, flatten, flushSync, getObserver, getOwner, isEqual, isStale, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, repeat, resolve, runWithOwner, untrack, unwrap } from '@solidjs/signals';
+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";
 
-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));
+      setContext(
+        provider,
+        untrack(() => props.value)
+      );
       return children(() => props.children);
     });
   }
@@ -24,7 +75,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] : [];
@@ -48,7 +99,8 @@ 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;
 }
 
@@ -58,16 +110,20 @@ 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);
@@ -82,13 +138,13 @@ function observable(input) {
     }
   };
 }
-function from(producer) {
-  const [s, set] = createSignal(undefined, {
+function from(producer, initialValue = undefined) {
+  const [s, set] = createSignal(() => initialValue, initialValue, {
     equals: false
   });
   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);
@@ -132,7 +188,7 @@ function createComponent(Comp, props) {
     if (sharedConfig.context) {
       const c = sharedConfig.context;
       setHydrateContext(nextHydrateContext());
-      const r = devComponent(Comp, props || {}) ;
+      const r = devComponent(Comp, props || {});
       setHydrateContext(c);
       return r;
     }
@@ -160,19 +216,23 @@ 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;
@@ -181,100 +241,176 @@ 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
-  } : {};
-  return createMemo(repeat(() => props.count, index => typeof props.children === "function" ? props.children(index) : props.children, options), undefined, {
-    name: "value"
-  }) ;
+  const options =
+    "fallback" in props
+      ? {
+          fallback: () => props.fallback
+        }
+      : {};
+  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 condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => keyed ? 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 props.when;
-      })) : child;
+  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"
     }
-    return props.fallback;
-  }, undefined, {
-    name: "value"
-  } );
+  );
 }
 function Switch(props) {
-  let keyed = false;
-  const equals = (a, b) => (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
-  const conditions = children(() => props.children),
-    evalConditions = createMemo(() => {
-      let conds = conditions();
-      if (!Array.isArray(conds)) conds = [conds];
-      for (let i = 0; i < conds.length; i++) {
-        const c = conds[i].when;
-        if (c) {
-          keyed = !!conds[i].keyed;
-          return [i, c, conds[i]];
-        }
-      }
-      return [-1];
-    }, undefined, {
-      equals,
+  const chs = children(() => props.children);
+  const switchFunc = createMemo(() => {
+    const ch = chs();
+    const mps = Array.isArray(ch) ? ch : [ch];
+    let func = () => undefined;
+    for (let i = 0; i < mps.length; i++) {
+      const index = i;
+      const mp = mps[i];
+      const prevFunc = func;
+      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"
+          });
+      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 [index, when, cond] = evalConditions();
-    if (index < 0) return props.fallback;
-    const c = cond.children;
-    const fn = typeof c === "function" && c.length > 0;
-    return fn ? untrack(() => c(() => {
-      if (untrack(evalConditions)[0] !== index) throw narrowedError("Match");
-      return cond.when;
-    })) : c;
-  }, undefined, {
-    name: "value"
-  } );
+    }
+  );
 }
 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
+  );
 }
 
 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,
+  DEV,
+  ErrorBoundary,
+  For,
+  Match,
+  Repeat,
+  Show,
+  Suspense,
+  Switch,
+  children,
+  createComponent,
+  createContext,
+  createUniqueId,
+  enableHydration,
+  from,
+  lazy,
+  observable,
+  onMount,
+  sharedConfig,
+  useContext
+};