solid-js 1.9.4 → 1.9.6

package/dist/solid.js

@@ -144,6 +144,7 @@ function nextHydrateContext() {
   };
 }
 
+const IS_DEV = false;
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
 const SUPPORTS_PROXY = typeof Proxy === "function";
@@ -407,12 +408,13 @@ function createResource(pSource, pFetcher, pOptions) {
       }
     }
   });
-  if (dynamic) createComputed(() => load(false));
+  let owner = Owner;
+  if (dynamic) createComputed(() => ((owner = Owner), load(false)));
   else load(false);
   return [
     read,
     {
-      refetch: load,
+      refetch: info => runWithOwner(owner, () => load(info)),
       mutate: setValue
     }
   ];
@@ -712,7 +714,7 @@ function writeSignal(node, value, isComp) {
         }
         if (Updates.length > 10e5) {
           Updates = [];
-          if (false);
+          if (IS_DEV);
           throw new Error();
         }
       }, false);
@@ -1138,8 +1140,8 @@ function observable(input) {
     }
   };
 }
-function from(producer) {
-  const [s, set] = createSignal(undefined, {
+function from(producer, initalValue = undefined) {
+  const [s, set] = createSignal(initalValue, {
     equals: false
   });
   if ("subscribe" in producer) {
@@ -1531,7 +1533,7 @@ function lazy(fn) {
     return createMemo(() =>
       (Comp = comp())
         ? untrack(() => {
-            if (false);
+            if (IS_DEV);
             if (!ctx || sharedConfig.done) return Comp(props);
             const c = sharedConfig.context;
             setHydrateContext(ctx);
@@ -1566,9 +1568,12 @@ function Index(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();
@@ -1582,7 +1587,7 @@ function Show(props) {
                   ? c
                   : () => {
                       if (!untrack(condition)) throw narrowedError("Show");
-                      return props.when;
+                      return conditionValue();
                     }
               )
             )
@@ -1595,45 +1600,48 @@ 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(
-              keyed
-                ? when
+            child(
+              mp.keyed
+                ? conditionValue()
                 : () => {
-                    if (untrack(evalConditions)[0] !== index) throw narrowedError("Match");
-                    return cond.when;
+                    if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+                    return conditionValue();
                   }
             )
           )
-        : c;
+        : child;
     },
     undefined,
     undefined