solid-js 1.5.6 → 1.6.0-beta.0

package/dist/dev.cjs

@@ -287,10 +287,6 @@ function createResource(pSource, pFetcher, pOptions) {
         loadedUnderTransition = false;
         runUpdates(() => {
           Transition.running = true;
-          if (!Transition.promises.size) {
-            Effects.push.apply(Effects, Transition.effects);
-            Transition.effects = [];
-          }
           completeLoad(v, error);
         }, false);
       } else completeLoad(v, error);
@@ -315,7 +311,7 @@ function createResource(pSource, pFetcher, pOptions) {
       createComputed(() => {
         track();
         if (pr) {
-          if (c.resolved && Transition) Transition.promises.add(pr);else if (!contexts.has(c)) {
+          if (c.resolved && Transition && Transition.running) Transition.promises.add(pr);else if (!contexts.has(c)) {
             c.increment();
             contexts.add(c);
           }
@@ -686,7 +682,9 @@ function updateComputation(node) {
     queueMicrotask(() => {
       runUpdates(() => {
         Transition && (Transition.running = true);
+        Listener = Owner = node;
         runComputation(node, node.tValue, time);
+        Listener = Owner = null;
       }, false);
     });
   }
@@ -803,36 +801,38 @@ function completeUpdates(wait) {
   }
   if (wait) return;
   let res;
-  if (Transition && Transition.running) {
-    if (Transition.promises.size || Transition.queue.size) {
+  if (Transition) {
+    if (!Transition.promises.size && !Transition.queue.size) {
+      const sources = Transition.sources;
+      const disposed = Transition.disposed;
+      Effects.push.apply(Effects, Transition.effects);
+      res = Transition.resolve;
+      for (const e of Effects) {
+        "tState" in e && (e.state = e.tState);
+        delete e.tState;
+      }
+      Transition = null;
+      runUpdates(() => {
+        for (const d of disposed) cleanNode(d);
+        for (const v of sources) {
+          v.value = v.tValue;
+          if (v.owned) {
+            for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
+          }
+          if (v.tOwned) v.owned = v.tOwned;
+          delete v.tValue;
+          delete v.tOwned;
+          v.tState = 0;
+        }
+        setTransPending(false);
+      }, false);
+    } else if (Transition.running) {
       Transition.running = false;
       Transition.effects.push.apply(Transition.effects, Effects);
       Effects = null;
       setTransPending(true);
       return;
     }
-    const sources = Transition.sources;
-    const disposed = Transition.disposed;
-    res = Transition.resolve;
-    for (const e of Effects) {
-      "tState" in e && (e.state = e.tState);
-      delete e.tState;
-    }
-    Transition = null;
-    runUpdates(() => {
-      for (const d of disposed) cleanNode(d);
-      for (const v of sources) {
-        v.value = v.tValue;
-        if (v.owned) {
-          for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
-        }
-        if (v.tOwned) v.owned = v.tOwned;
-        delete v.tValue;
-        delete v.tOwned;
-        v.tState = 0;
-      }
-      setTransPending(false);
-    }, false);
   }
   const e = Effects;
   Effects = null;
@@ -853,10 +853,6 @@ function scheduleQueue(queue) {
         runUpdates(() => {
           Transition.running = true;
           runTop(item);
-          if (!tasks.size) {
-            Effects.push.apply(Effects, Transition.effects);
-            Transition.effects = [];
-          }
         }, false);
         Transition && (Transition.running = false);
       });
@@ -1263,29 +1259,41 @@ function resolveSource(s) {
   return (s = typeof s === "function" ? s() : s) == null ? {} : s;
 }
 function mergeProps(...sources) {
-  return new Proxy({
-    get(property) {
-      for (let i = sources.length - 1; i >= 0; i--) {
-        const v = resolveSource(sources[i])[property];
-        if (v !== undefined) return v;
-      }
-    },
-    has(property) {
-      for (let i = sources.length - 1; i >= 0; i--) {
-        if (property in resolveSource(sources[i])) return true;
+  if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
+    return new Proxy({
+      get(property) {
+        for (let i = sources.length - 1; i >= 0; i--) {
+          const v = resolveSource(sources[i])[property];
+          if (v !== undefined) return v;
+        }
+      },
+      has(property) {
+        for (let i = sources.length - 1; i >= 0; i--) {
+          if (property in resolveSource(sources[i])) return true;
+        }
+        return false;
+      },
+      keys() {
+        const keys = [];
+        for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(resolveSource(sources[i])));
+        return [...new Set(keys)];
       }
-      return false;
-    },
-    keys() {
-      const keys = [];
-      for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(resolveSource(sources[i])));
-      return [...new Set(keys)];
+    }, propTraps);
+  }
+  const target = {};
+  for (let i = 0; i < sources.length; i++) {
+    if (sources[i]) {
+      const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
+      Object.defineProperties(target, descriptors);
     }
-  }, propTraps);
+  }
+  return target;
 }
 function splitProps(props, ...keys) {
   const blocked = new Set(keys.flat());
   const descriptors = Object.getOwnPropertyDescriptors(props);
+  const isProxy = ($PROXY in props);
+  if (!isProxy) keys.push(Object.keys(descriptors).filter(k => !blocked.has(k)));
   const res = keys.map(k => {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
@@ -1301,17 +1309,19 @@ function splitProps(props, ...keys) {
     }
     return clone;
   });
-  res.push(new Proxy({
-    get(property) {
-      return blocked.has(property) ? undefined : props[property];
-    },
-    has(property) {
-      return blocked.has(property) ? false : property in props;
-    },
-    keys() {
-      return Object.keys(props).filter(k => !blocked.has(k));
-    }
-  }, propTraps));
+  if (isProxy) {
+    res.push(new Proxy({
+      get(property) {
+        return blocked.has(property) ? undefined : props[property];
+      },
+      has(property) {
+        return blocked.has(property) ? false : property in props;
+      },
+      keys() {
+        return Object.keys(props).filter(k => !blocked.has(k));
+      }
+    }, propTraps));
+  }
   return res;
 }
 function lazy(fn) {

package/dist/dev.js

@@ -283,10 +283,6 @@ function createResource(pSource, pFetcher, pOptions) {
         loadedUnderTransition = false;
         runUpdates(() => {
           Transition.running = true;
-          if (!Transition.promises.size) {
-            Effects.push.apply(Effects, Transition.effects);
-            Transition.effects = [];
-          }
           completeLoad(v, error);
         }, false);
       } else completeLoad(v, error);
@@ -311,7 +307,7 @@ function createResource(pSource, pFetcher, pOptions) {
       createComputed(() => {
         track();
         if (pr) {
-          if (c.resolved && Transition) Transition.promises.add(pr);else if (!contexts.has(c)) {
+          if (c.resolved && Transition && Transition.running) Transition.promises.add(pr);else if (!contexts.has(c)) {
             c.increment();
             contexts.add(c);
           }
@@ -682,7 +678,9 @@ function updateComputation(node) {
     queueMicrotask(() => {
       runUpdates(() => {
         Transition && (Transition.running = true);
+        Listener = Owner = node;
         runComputation(node, node.tValue, time);
+        Listener = Owner = null;
       }, false);
     });
   }
@@ -799,36 +797,38 @@ function completeUpdates(wait) {
   }
   if (wait) return;
   let res;
-  if (Transition && Transition.running) {
-    if (Transition.promises.size || Transition.queue.size) {
+  if (Transition) {
+    if (!Transition.promises.size && !Transition.queue.size) {
+      const sources = Transition.sources;
+      const disposed = Transition.disposed;
+      Effects.push.apply(Effects, Transition.effects);
+      res = Transition.resolve;
+      for (const e of Effects) {
+        "tState" in e && (e.state = e.tState);
+        delete e.tState;
+      }
+      Transition = null;
+      runUpdates(() => {
+        for (const d of disposed) cleanNode(d);
+        for (const v of sources) {
+          v.value = v.tValue;
+          if (v.owned) {
+            for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
+          }
+          if (v.tOwned) v.owned = v.tOwned;
+          delete v.tValue;
+          delete v.tOwned;
+          v.tState = 0;
+        }
+        setTransPending(false);
+      }, false);
+    } else if (Transition.running) {
       Transition.running = false;
       Transition.effects.push.apply(Transition.effects, Effects);
       Effects = null;
       setTransPending(true);
       return;
     }
-    const sources = Transition.sources;
-    const disposed = Transition.disposed;
-    res = Transition.resolve;
-    for (const e of Effects) {
-      "tState" in e && (e.state = e.tState);
-      delete e.tState;
-    }
-    Transition = null;
-    runUpdates(() => {
-      for (const d of disposed) cleanNode(d);
-      for (const v of sources) {
-        v.value = v.tValue;
-        if (v.owned) {
-          for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
-        }
-        if (v.tOwned) v.owned = v.tOwned;
-        delete v.tValue;
-        delete v.tOwned;
-        v.tState = 0;
-      }
-      setTransPending(false);
-    }, false);
   }
   const e = Effects;
   Effects = null;
@@ -849,10 +849,6 @@ function scheduleQueue(queue) {
         runUpdates(() => {
           Transition.running = true;
           runTop(item);
-          if (!tasks.size) {
-            Effects.push.apply(Effects, Transition.effects);
-            Transition.effects = [];
-          }
         }, false);
         Transition && (Transition.running = false);
       });
@@ -1259,29 +1255,41 @@ function resolveSource(s) {
   return (s = typeof s === "function" ? s() : s) == null ? {} : s;
 }
 function mergeProps(...sources) {
-  return new Proxy({
-    get(property) {
-      for (let i = sources.length - 1; i >= 0; i--) {
-        const v = resolveSource(sources[i])[property];
-        if (v !== undefined) return v;
-      }
-    },
-    has(property) {
-      for (let i = sources.length - 1; i >= 0; i--) {
-        if (property in resolveSource(sources[i])) return true;
+  if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
+    return new Proxy({
+      get(property) {
+        for (let i = sources.length - 1; i >= 0; i--) {
+          const v = resolveSource(sources[i])[property];
+          if (v !== undefined) return v;
+        }
+      },
+      has(property) {
+        for (let i = sources.length - 1; i >= 0; i--) {
+          if (property in resolveSource(sources[i])) return true;
+        }
+        return false;
+      },
+      keys() {
+        const keys = [];
+        for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(resolveSource(sources[i])));
+        return [...new Set(keys)];
       }
-      return false;
-    },
-    keys() {
-      const keys = [];
-      for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(resolveSource(sources[i])));
-      return [...new Set(keys)];
+    }, propTraps);
+  }
+  const target = {};
+  for (let i = 0; i < sources.length; i++) {
+    if (sources[i]) {
+      const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
+      Object.defineProperties(target, descriptors);
     }
-  }, propTraps);
+  }
+  return target;
 }
 function splitProps(props, ...keys) {
   const blocked = new Set(keys.flat());
   const descriptors = Object.getOwnPropertyDescriptors(props);
+  const isProxy = ($PROXY in props);
+  if (!isProxy) keys.push(Object.keys(descriptors).filter(k => !blocked.has(k)));
   const res = keys.map(k => {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
@@ -1297,17 +1305,19 @@ function splitProps(props, ...keys) {
     }
     return clone;
   });
-  res.push(new Proxy({
-    get(property) {
-      return blocked.has(property) ? undefined : props[property];
-    },
-    has(property) {
-      return blocked.has(property) ? false : property in props;
-    },
-    keys() {
-      return Object.keys(props).filter(k => !blocked.has(k));
-    }
-  }, propTraps));
+  if (isProxy) {
+    res.push(new Proxy({
+      get(property) {
+        return blocked.has(property) ? undefined : props[property];
+      },
+      has(property) {
+        return blocked.has(property) ? false : property in props;
+      },
+      keys() {
+        return Object.keys(props).filter(k => !blocked.has(k));
+      }
+    }, propTraps));
+  }
   return res;
 }
 function lazy(fn) {

package/dist/solid.cjs

@@ -279,10 +279,6 @@ function createResource(pSource, pFetcher, pOptions) {
         loadedUnderTransition = false;
         runUpdates(() => {
           Transition.running = true;
-          if (!Transition.promises.size) {
-            Effects.push.apply(Effects, Transition.effects);
-            Transition.effects = [];
-          }
           completeLoad(v, error);
         }, false);
       } else completeLoad(v, error);
@@ -307,7 +303,7 @@ function createResource(pSource, pFetcher, pOptions) {
       createComputed(() => {
         track();
         if (pr) {
-          if (c.resolved && Transition) Transition.promises.add(pr);else if (!contexts.has(c)) {
+          if (c.resolved && Transition && Transition.running) Transition.promises.add(pr);else if (!contexts.has(c)) {
             c.increment();
             contexts.add(c);
           }
@@ -625,7 +621,9 @@ function updateComputation(node) {
     queueMicrotask(() => {
       runUpdates(() => {
         Transition && (Transition.running = true);
+        Listener = Owner = node;
         runComputation(node, node.tValue, time);
+        Listener = Owner = null;
       }, false);
     });
   }
@@ -741,36 +739,38 @@ function completeUpdates(wait) {
   }
   if (wait) return;
   let res;
-  if (Transition && Transition.running) {
-    if (Transition.promises.size || Transition.queue.size) {
+  if (Transition) {
+    if (!Transition.promises.size && !Transition.queue.size) {
+      const sources = Transition.sources;
+      const disposed = Transition.disposed;
+      Effects.push.apply(Effects, Transition.effects);
+      res = Transition.resolve;
+      for (const e of Effects) {
+        "tState" in e && (e.state = e.tState);
+        delete e.tState;
+      }
+      Transition = null;
+      runUpdates(() => {
+        for (const d of disposed) cleanNode(d);
+        for (const v of sources) {
+          v.value = v.tValue;
+          if (v.owned) {
+            for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
+          }
+          if (v.tOwned) v.owned = v.tOwned;
+          delete v.tValue;
+          delete v.tOwned;
+          v.tState = 0;
+        }
+        setTransPending(false);
+      }, false);
+    } else if (Transition.running) {
       Transition.running = false;
       Transition.effects.push.apply(Transition.effects, Effects);
       Effects = null;
       setTransPending(true);
       return;
     }
-    const sources = Transition.sources;
-    const disposed = Transition.disposed;
-    res = Transition.resolve;
-    for (const e of Effects) {
-      "tState" in e && (e.state = e.tState);
-      delete e.tState;
-    }
-    Transition = null;
-    runUpdates(() => {
-      for (const d of disposed) cleanNode(d);
-      for (const v of sources) {
-        v.value = v.tValue;
-        if (v.owned) {
-          for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
-        }
-        if (v.tOwned) v.owned = v.tOwned;
-        delete v.tValue;
-        delete v.tOwned;
-        v.tState = 0;
-      }
-      setTransPending(false);
-    }, false);
   }
   const e = Effects;
   Effects = null;
@@ -791,10 +791,6 @@ function scheduleQueue(queue) {
         runUpdates(() => {
           Transition.running = true;
           runTop(item);
-          if (!tasks.size) {
-            Effects.push.apply(Effects, Transition.effects);
-            Transition.effects = [];
-          }
         }, false);
         Transition && (Transition.running = false);
       });
@@ -1177,29 +1173,41 @@ function resolveSource(s) {
   return (s = typeof s === "function" ? s() : s) == null ? {} : s;
 }
 function mergeProps(...sources) {
-  return new Proxy({
-    get(property) {
-      for (let i = sources.length - 1; i >= 0; i--) {
-        const v = resolveSource(sources[i])[property];
-        if (v !== undefined) return v;
-      }
-    },
-    has(property) {
-      for (let i = sources.length - 1; i >= 0; i--) {
-        if (property in resolveSource(sources[i])) return true;
+  if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
+    return new Proxy({
+      get(property) {
+        for (let i = sources.length - 1; i >= 0; i--) {
+          const v = resolveSource(sources[i])[property];
+          if (v !== undefined) return v;
+        }
+      },
+      has(property) {
+        for (let i = sources.length - 1; i >= 0; i--) {
+          if (property in resolveSource(sources[i])) return true;
+        }
+        return false;
+      },
+      keys() {
+        const keys = [];
+        for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(resolveSource(sources[i])));
+        return [...new Set(keys)];
       }
-      return false;
-    },
-    keys() {
-      const keys = [];
-      for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(resolveSource(sources[i])));
-      return [...new Set(keys)];
+    }, propTraps);
+  }
+  const target = {};
+  for (let i = 0; i < sources.length; i++) {
+    if (sources[i]) {
+      const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
+      Object.defineProperties(target, descriptors);
     }
-  }, propTraps);
+  }
+  return target;
 }
 function splitProps(props, ...keys) {
   const blocked = new Set(keys.flat());
   const descriptors = Object.getOwnPropertyDescriptors(props);
+  const isProxy = ($PROXY in props);
+  if (!isProxy) keys.push(Object.keys(descriptors).filter(k => !blocked.has(k)));
   const res = keys.map(k => {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
@@ -1215,17 +1223,19 @@ function splitProps(props, ...keys) {
     }
     return clone;
   });
-  res.push(new Proxy({
-    get(property) {
-      return blocked.has(property) ? undefined : props[property];
-    },
-    has(property) {
-      return blocked.has(property) ? false : property in props;
-    },
-    keys() {
-      return Object.keys(props).filter(k => !blocked.has(k));
-    }
-  }, propTraps));
+  if (isProxy) {
+    res.push(new Proxy({
+      get(property) {
+        return blocked.has(property) ? undefined : props[property];
+      },
+      has(property) {
+        return blocked.has(property) ? false : property in props;
+      },
+      keys() {
+        return Object.keys(props).filter(k => !blocked.has(k));
+      }
+    }, propTraps));
+  }
   return res;
 }
 function lazy(fn) {