solid-js 1.5.6 → 1.5.7

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);
           }
@@ -803,36 +799,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 +851,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);
       });

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);
           }
@@ -799,36 +795,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 +847,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);
       });

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);
           }
@@ -741,36 +737,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 +789,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);
       });

package/dist/solid.js

@@ -275,10 +275,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);
@@ -303,7 +299,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);
           }
@@ -737,36 +733,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;
@@ -787,10 +785,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);
       });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -44,6 +44,13 @@
   ],
   "exports": {
     ".": {
+      "worker": {
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/server.js"
+        },
+        "require": "./dist/server.cjs"
+      },
       "browser": {
         "development": {
           "import": {
@@ -65,13 +72,6 @@
         },
         "require": "./dist/server.cjs"
       },
-      "worker": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/server.js"
-        },
-        "require": "./dist/server.cjs"
-      },
       "node": {
         "import": {
           "types": "./types/index.d.ts",
@@ -98,6 +98,13 @@
       "default": "./dist/solid.js"
     },
     "./store": {
+      "worker": {
+        "import": {
+          "types": "./store/types/index.d.ts",
+          "default": "./store/dist/server.js"
+        },
+        "require": "./store/dist/server.cjs"
+      },
       "browser": {
         "development": {
           "import": {
@@ -119,13 +126,6 @@
         },
         "require": "./store/dist/server.cjs"
       },
-      "worker": {
-        "import": {
-          "types": "./store/types/index.d.ts",
-          "default": "./store/dist/server.js"
-        },
-        "require": "./store/dist/server.cjs"
-      },
       "node": {
         "import": {
           "types": "./store/types/index.d.ts",
@@ -148,6 +148,13 @@
     },
     "./store/dist/*": "./store/dist/*",
     "./web": {
+      "worker": {
+        "import": {
+          "types": "./web/types/index.d.ts",
+          "default": "./web/dist/server.js"
+        },
+        "require": "./web/dist/server.cjs"
+      },
       "browser": {
         "development": {
           "import": {
@@ -169,13 +176,6 @@
         },
         "require": "./web/dist/server.cjs"
       },
-      "worker": {
-        "import": {
-          "types": "./web/types/index.d.ts",
-          "default": "./web/dist/server.js"
-        },
-        "require": "./web/dist/server.cjs"
-      },
       "node": {
         "import": {
           "types": "./web/types/index.d.ts",

package/store/package.json

@@ -12,6 +12,13 @@
   "sideEffects": false,
   "exports": {
     ".": {
+      "worker": {
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/server.js"
+        },
+        "require": "./dist/server.cjs"
+      },
       "browser": {
         "development": {
           "import": {
@@ -33,13 +40,6 @@
         },
         "require": "./dist/server.cjs"
       },
-      "worker": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/server.js"
-        },
-        "require": "./dist/server.cjs"
-      },
       "node": {
         "import": {
           "types": "./types/index.d.ts",

package/web/dist/dev.cjs

@@ -169,11 +169,12 @@ function classList(node, value, prev = {}) {
   }
   return prev;
 }
-function style(node, value, prev = {}) {
+function style(node, value, prev) {
+  if (!value) return prev ? setAttribute(node, "style") : value;
   const nodeStyle = node.style;
-  const prevString = typeof prev === "string";
-  if (value == null && prevString || typeof value === "string") return nodeStyle.cssText = value;
-  prevString && (nodeStyle.cssText = undefined, prev = {});
+  if (typeof value === "string") return nodeStyle.cssText = value;
+  typeof prev === "string" && (nodeStyle.cssText = prev = undefined);
+  prev || (prev = {});
   value || (value = {});
   let v, s;
   for (s in prev) {
@@ -220,7 +221,7 @@ function assign(node, props, isSVG, skipChildren, prevProps = {}, skipRef = fals
   for (const prop in prevProps) {
     if (!(prop in props)) {
       if (prop === "children") continue;
-      assignProp(node, prop, null, prevProps[prop], isSVG, skipRef);
+      prevProps[prop] = assignProp(node, prop, null, prevProps[prop], isSVG, skipRef);
     }
   }
   for (const prop in props) {

package/web/dist/dev.js

@@ -166,11 +166,12 @@ function classList(node, value, prev = {}) {
   }
   return prev;
 }
-function style(node, value, prev = {}) {
+function style(node, value, prev) {
+  if (!value) return prev ? setAttribute(node, "style") : value;
   const nodeStyle = node.style;
-  const prevString = typeof prev === "string";
-  if (value == null && prevString || typeof value === "string") return nodeStyle.cssText = value;
-  prevString && (nodeStyle.cssText = undefined, prev = {});
+  if (typeof value === "string") return nodeStyle.cssText = value;
+  typeof prev === "string" && (nodeStyle.cssText = prev = undefined);
+  prev || (prev = {});
   value || (value = {});
   let v, s;
   for (s in prev) {
@@ -217,7 +218,7 @@ function assign(node, props, isSVG, skipChildren, prevProps = {}, skipRef = fals
   for (const prop in prevProps) {
     if (!(prop in props)) {
       if (prop === "children") continue;
-      assignProp(node, prop, null, prevProps[prop], isSVG, skipRef);
+      prevProps[prop] = assignProp(node, prop, null, prevProps[prop], isSVG, skipRef);
     }
   }
   for (const prop in props) {

package/web/dist/web.cjs

@@ -168,11 +168,12 @@ function classList(node, value, prev = {}) {
   }
   return prev;
 }
-function style(node, value, prev = {}) {
+function style(node, value, prev) {
+  if (!value) return prev ? setAttribute(node, "style") : value;
   const nodeStyle = node.style;
-  const prevString = typeof prev === "string";
-  if (value == null && prevString || typeof value === "string") return nodeStyle.cssText = value;
-  prevString && (nodeStyle.cssText = undefined, prev = {});
+  if (typeof value === "string") return nodeStyle.cssText = value;
+  typeof prev === "string" && (nodeStyle.cssText = prev = undefined);
+  prev || (prev = {});
   value || (value = {});
   let v, s;
   for (s in prev) {
@@ -219,7 +220,7 @@ function assign(node, props, isSVG, skipChildren, prevProps = {}, skipRef = fals
   for (const prop in prevProps) {
     if (!(prop in props)) {
       if (prop === "children") continue;
-      assignProp(node, prop, null, prevProps[prop], isSVG, skipRef);
+      prevProps[prop] = assignProp(node, prop, null, prevProps[prop], isSVG, skipRef);
     }
   }
   for (const prop in props) {

package/web/dist/web.js

@@ -165,11 +165,12 @@ function classList(node, value, prev = {}) {
   }
   return prev;
 }
-function style(node, value, prev = {}) {
+function style(node, value, prev) {
+  if (!value) return prev ? setAttribute(node, "style") : value;
   const nodeStyle = node.style;
-  const prevString = typeof prev === "string";
-  if (value == null && prevString || typeof value === "string") return nodeStyle.cssText = value;
-  prevString && (nodeStyle.cssText = undefined, prev = {});
+  if (typeof value === "string") return nodeStyle.cssText = value;
+  typeof prev === "string" && (nodeStyle.cssText = prev = undefined);
+  prev || (prev = {});
   value || (value = {});
   let v, s;
   for (s in prev) {
@@ -216,7 +217,7 @@ function assign(node, props, isSVG, skipChildren, prevProps = {}, skipRef = fals
   for (const prop in prevProps) {
     if (!(prop in props)) {
       if (prop === "children") continue;
-      assignProp(node, prop, null, prevProps[prop], isSVG, skipRef);
+      prevProps[prop] = assignProp(node, prop, null, prevProps[prop], isSVG, skipRef);
     }
   }
   for (const prop in props) {

package/web/package.json

@@ -12,6 +12,13 @@
   "sideEffects": false,
   "exports": {
     ".": {
+      "worker": {
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/server.js"
+        },
+        "require": "./dist/server.cjs"
+      },
       "browser": {
         "development": {
           "import": {
@@ -33,13 +40,6 @@
         },
         "require": "./dist/server.cjs"
       },
-      "worker": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/server.js"
-        },
-        "require": "./dist/server.cjs"
-      },
       "node": {
         "import": {
           "types": "./types/index.d.ts",

package/web/types/index.d.ts

@@ -21,7 +21,9 @@ export declare function Portal<T extends boolean = false, S extends boolean = fa
     } : {}) & (S extends true ? SVGGElement : HTMLDivElement)) => void);
     children: JSX.Element;
 }): Text;
-declare type DynamicProps<T extends ValidComponent> = ComponentProps<T> & {
+declare type DynamicProps<T extends ValidComponent, P = ComponentProps<T>> = {
+    [K in keyof P]: P[K];
+} & {
     component: T | undefined;
 };
 /**