solid-js 2.0.0-experimental.0 → 2.0.0-experimental.2

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

@@ -24,7 +24,6 @@ export {
   createEffect,
   createMemo,
   createProjection,
-  createReaction,
   createRenderEffect,
   createRoot,
   createSignal,
@@ -34,7 +33,7 @@ export {
   getObserver,
   getOwner,
   isEqual,
-  isStale,
+  isPending,
   isWrappable,
   latest,
   mapArray,
@@ -44,6 +43,7 @@ export {
   reconcile,
   repeat,
   resolve,
+  runWithObserver,
   runWithOwner,
   untrack,
   unwrap
@@ -138,8 +138,8 @@ 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) {
@@ -282,10 +282,15 @@ function Repeat(props) {
 }
 function Show(props) {
   const keyed = props.keyed;
-  const condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => (keyed ? a === b : !a === !b),
-    name: "condition"
+  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();
@@ -296,7 +301,7 @@ function Show(props) {
           ? untrack(() =>
               child(() => {
                 if (!untrack(condition)) throw narrowedError("Show");
-                return props.when;
+                return conditionValue();
               })
             )
           : child;
@@ -310,46 +315,47 @@ 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 = 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 = 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 [index, when, cond] = evalConditions();
-      if (index < 0) return props.fallback;
-      const c = cond.children;
-      const fn = typeof c === "function" && c.length > 0;
+      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(() =>
-            c(() => {
-              if (untrack(evalConditions)[0] !== index) throw narrowedError("Match");
-              return cond.when;
+            child(() => {
+              if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+              return conditionValue();
             })
           )
-        : c;
+        : child;
     },
     undefined,
     {
-      name: "value"
+      name: "eval conditions"
     }
   );
 }

package/dist/solid.cjs

@@ -61,8 +61,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) {
@@ -175,8 +175,9 @@ 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, undefined);
+  const condition = keyed ? conditionValue : signals.createMemo(conditionValue, undefined, {
+    equals: (a, b) => !a === !b
   });
   return signals.createMemo(() => {
     const c = condition();
@@ -185,39 +186,40 @@ 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;
   }, undefined, undefined);
 }
 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
-    });
+  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, undefined);
+      const condition = mp.keyed ? conditionValue : signals.createMemo(conditionValue, undefined, {
+        equals: (a, b) => !a === !b
+      });
+      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, undefined);
 }
 function Match(props) {
@@ -267,10 +269,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; }
@@ -307,9 +305,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,
@@ -347,6 +345,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/solid.js

@@ -24,7 +24,6 @@ export {
   createEffect,
   createMemo,
   createProjection,
-  createReaction,
   createRenderEffect,
   createRoot,
   createSignal,
@@ -34,7 +33,7 @@ export {
   getObserver,
   getOwner,
   isEqual,
-  isStale,
+  isPending,
   isWrappable,
   latest,
   mapArray,
@@ -44,6 +43,7 @@ export {
   reconcile,
   repeat,
   resolve,
+  runWithObserver,
   runWithOwner,
   untrack,
   unwrap
@@ -115,8 +115,8 @@ 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) {
@@ -245,9 +245,12 @@ function Repeat(props) {
 }
 function Show(props) {
   const keyed = props.keyed;
-  const condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => (keyed ? a === b : !a === !b)
-  });
+  const conditionValue = createMemo(() => props.when, undefined, undefined);
+  const condition = keyed
+    ? conditionValue
+    : createMemo(conditionValue, undefined, {
+        equals: (a, b) => !a === !b
+      });
   return createMemo(
     () => {
       const c = condition();
@@ -258,7 +261,7 @@ function Show(props) {
           ? untrack(() =>
               child(() => {
                 if (!untrack(condition)) throw narrowedError("Show");
-                return props.when;
+                return conditionValue();
               })
             )
           : child;
@@ -270,41 +273,44 @@ 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 = 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,
+        undefined
+      );
+      const condition = mp.keyed
+        ? conditionValue
+        : createMemo(conditionValue, undefined, {
+            equals: (a, b) => !a === !b
+          });
+      func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
+    }
+    return func;
+  });
   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;
+      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(() =>
-            c(() => {
-              if (untrack(evalConditions)[0] !== index) throw narrowedError("Match");
-              return cond.when;
+            child(() => {
+              if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+              return conditionValue();
             })
           )
-        : c;
+        : child;
     },
     undefined,
     undefined

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "2.0.0-experimental.0",
+  "version": "2.0.0-experimental.2",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -79,7 +79,7 @@
     "performance"
   ],
   "dependencies": {
-    "@solidjs/signals": "^0.0.10",
+    "@solidjs/signals": "^0.2.1",
     "csstype": "^3.1.0"
   },
   "scripts": {

package/types/client/observable.d.ts

@@ -28,15 +28,15 @@ export type ObservableObserver<T> =
  * description https://docs.solidjs.com/reference/reactive-utilities/observable
  */
 export declare function observable<T>(input: Accessor<T>): Observable<T>;
-export declare function from<T>(
-  producer:
-    | ((setter: Setter<T | undefined>) => () => void)
-    | {
-        subscribe: (fn: (v: T) => void) =>
-          | (() => void)
-          | {
-              unsubscribe: () => void;
-            };
-      }
-): Accessor<T | undefined>;
+type Producer<T> =
+  | ((setter: Setter<T>) => () => void)
+  | {
+      subscribe: (fn: (v: T) => void) =>
+        | (() => void)
+        | {
+            unsubscribe: () => void;
+          };
+    };
+export declare function from<T>(producer: Producer<T>, initalValue: T): Accessor<T>;
+export declare function from<T>(producer: Producer<T | undefined>): Accessor<T | undefined>;
 export {};

package/types/index.d.ts

@@ -7,7 +7,6 @@ export {
   createEffect,
   createMemo,
   createProjection,
-  createReaction,
   createRenderEffect,
   createRoot,
   createSignal,
@@ -17,7 +16,7 @@ export {
   getObserver,
   getOwner,
   isEqual,
-  isStale,
+  isPending,
   isWrappable,
   latest,
   mapArray,
@@ -27,6 +26,7 @@ export {
   reconcile,
   repeat,
   resolve,
+  runWithObserver,
   runWithOwner,
   untrack,
   unwrap