solid-js - npm Package Compare versions

Comparing version 1.9.14 to 1.9.15

dist/dev.cjs

@@ -453,3 +453,3 @@ 'use strict';
       for (const c of val.values()) {
-        c.state = STALE;
+        if (Transition && Transition.running) c.tState = STALE;else c.state = STALE;
         if (c.pure) Updates.push(c);else Effects.push(c);
@@ -817,2 +817,3 @@ }
     let inTransition;
+    let trackedOrdinary = false;
     const triggerInTransition = () => startTransition(trigger).then(() => {
@@ -822,2 +823,3 @@ if (inTransition) {
         inTransition = undefined;
+        if (!trackedOrdinary) trigger();
       }
@@ -831,2 +833,3 @@ });
       }
+      trackedOrdinary = true;
       return ordinary.track(x);
@@ -1445,12 +1448,14 @@ };
     const blocked = len > 1 ? keys.flat() : keys[0];
+    const claimed = new Set();
     const res = keys.map(k => {
+      const owned = k.filter(property => !claimed.has(property) && (claimed.add(property), true));
       return new Proxy({
         get(property) {
-          return k.includes(property) ? props[property] : undefined;
+          return owned.includes(property) ? props[property] : undefined;
         },
         has(property) {
-          return k.includes(property) && property in props;
+          return owned.includes(property) && property in props;
         },
         keys() {
-          return k.filter(property => property in props);
+          return owned.filter(property => property in props);
         }
@@ -1493,2 +1498,13 @@ }, propTraps);
   let p;
+  const load = () => {
+    if (!p) {
+      const cur = p = fn();
+      cur.then(mod => {
+        comp = () => mod.default;
+      }, () => {
+        if (p === cur) p = undefined;
+      });
+    }
+    return p;
+  };
   const wrap = props => {
@@ -1500,3 +1516,3 @@ const ctx = sharedConfig.context;
       sharedConfig.count++;
-      (p || (p = fn())).then(mod => {
+      load().then(mod => {
         !sharedConfig.done && setHydrateContext(ctx);
@@ -1506,6 +1522,13 @@ sharedConfig.count--;
         setHydrateContext();
+      }, err => {
+        !sharedConfig.done && setHydrateContext(ctx);
+        sharedConfig.count--;
+        set(() => () => {
+          throw err;
+        });
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
+      const [s] = createResource(() => load().then(mod => mod.default));
       comp = s;
@@ -1527,3 +1550,3 @@ onCleanup(() => comp = undefined);
   };
-  wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
+  wrap.preload = () => load();
   return wrap;
@@ -1530,0 +1553,0 @@ }

dist/dev.js

@@ -451,3 +451,3 @@ let taskIdCounter = 1,
       for (const c of val.values()) {
-        c.state = STALE;
+        if (Transition && Transition.running) c.tState = STALE;else c.state = STALE;
         if (c.pure) Updates.push(c);else Effects.push(c);
@@ -815,2 +815,3 @@ }
     let inTransition;
+    let trackedOrdinary = false;
     const triggerInTransition = () => startTransition(trigger).then(() => {
@@ -820,2 +821,3 @@ if (inTransition) {
         inTransition = undefined;
+        if (!trackedOrdinary) trigger();
       }
@@ -829,2 +831,3 @@ });
       }
+      trackedOrdinary = true;
       return ordinary.track(x);
@@ -1443,12 +1446,14 @@ };
     const blocked = len > 1 ? keys.flat() : keys[0];
+    const claimed = new Set();
     const res = keys.map(k => {
+      const owned = k.filter(property => !claimed.has(property) && (claimed.add(property), true));
       return new Proxy({
         get(property) {
-          return k.includes(property) ? props[property] : undefined;
+          return owned.includes(property) ? props[property] : undefined;
         },
         has(property) {
-          return k.includes(property) && property in props;
+          return owned.includes(property) && property in props;
         },
         keys() {
-          return k.filter(property => property in props);
+          return owned.filter(property => property in props);
         }
@@ -1491,2 +1496,13 @@ }, propTraps);
   let p;
+  const load = () => {
+    if (!p) {
+      const cur = p = fn();
+      cur.then(mod => {
+        comp = () => mod.default;
+      }, () => {
+        if (p === cur) p = undefined;
+      });
+    }
+    return p;
+  };
   const wrap = props => {
@@ -1498,3 +1514,3 @@ const ctx = sharedConfig.context;
       sharedConfig.count++;
-      (p || (p = fn())).then(mod => {
+      load().then(mod => {
         !sharedConfig.done && setHydrateContext(ctx);
@@ -1504,6 +1520,13 @@ sharedConfig.count--;
         setHydrateContext();
+      }, err => {
+        !sharedConfig.done && setHydrateContext(ctx);
+        sharedConfig.count--;
+        set(() => () => {
+          throw err;
+        });
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
+      const [s] = createResource(() => load().then(mod => mod.default));
       comp = s;
@@ -1525,3 +1548,3 @@ onCleanup(() => comp = undefined);
   };
-  wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
+  wrap.preload = () => load();
   return wrap;
@@ -1528,0 +1551,0 @@ }

dist/server.cjs

@@ -634,5 +634,8 @@ 'use strict';
     if (!p) {
-      p = fn();
-      p.then(mod => p.resolved = mod.default);
-      if (id) sharedConfig.context.lazy[id] = p;
+      const cur = p = fn();
+      cur.then(mod => cur.resolved = mod.default, err => {
+        cur.error = castError(err);
+        if (p === cur) p = undefined;
+      });
+      if (id) sharedConfig.context.lazy[id] = cur;
     }
@@ -644,5 +647,5 @@ return p;
     const id = sharedConfig.context.id;
-    let ref = sharedConfig.context.lazy[id];
-    if (ref) p = ref;else load(id);
-    if (p.resolved) return p.resolved(props);
+    const current = sharedConfig.context.lazy[id] || load(id);
+    if (current.resolved) return current.resolved(props);
+    if (current.error) throw current.error;
     const ctx = useContext(SuspenseContext);
@@ -658,5 +661,9 @@ const track = {
     if (sharedConfig.context.async) {
-      sharedConfig.context.block(p.then(() => {
+      sharedConfig.context.block(current.then(() => {
         track._loading = false;
         notifySuspense(contexts);
+      }, err => {
+        track._loading = false;
+        track.error = castError(err);
+        notifySuspense(contexts);
       }));
@@ -663,0 +670,0 @@ }

dist/server.js

@@ -632,5 +632,8 @@ const equalFn = (a, b) => a === b;
     if (!p) {
-      p = fn();
-      p.then(mod => p.resolved = mod.default);
-      if (id) sharedConfig.context.lazy[id] = p;
+      const cur = p = fn();
+      cur.then(mod => cur.resolved = mod.default, err => {
+        cur.error = castError(err);
+        if (p === cur) p = undefined;
+      });
+      if (id) sharedConfig.context.lazy[id] = cur;
     }
@@ -642,5 +645,5 @@ return p;
     const id = sharedConfig.context.id;
-    let ref = sharedConfig.context.lazy[id];
-    if (ref) p = ref;else load(id);
-    if (p.resolved) return p.resolved(props);
+    const current = sharedConfig.context.lazy[id] || load(id);
+    if (current.resolved) return current.resolved(props);
+    if (current.error) throw current.error;
     const ctx = useContext(SuspenseContext);
@@ -656,5 +659,9 @@ const track = {
     if (sharedConfig.context.async) {
-      sharedConfig.context.block(p.then(() => {
+      sharedConfig.context.block(current.then(() => {
         track._loading = false;
         notifySuspense(contexts);
+      }, err => {
+        track._loading = false;
+        track.error = castError(err);
+        notifySuspense(contexts);
       }));
@@ -661,0 +668,0 @@ }

dist/solid.cjs

@@ -434,3 +434,3 @@ 'use strict';
       for (const c of val.values()) {
-        c.state = STALE;
+        if (Transition && Transition.running) c.tState = STALE;else c.state = STALE;
         if (c.pure) Updates.push(c);else Effects.push(c);
@@ -773,2 +773,3 @@ }
     let inTransition;
+    let trackedOrdinary = false;
     const triggerInTransition = () => startTransition(trigger).then(() => {
@@ -778,2 +779,3 @@ if (inTransition) {
         inTransition = undefined;
+        if (!trackedOrdinary) trigger();
       }
@@ -787,2 +789,3 @@ });
       }
+      trackedOrdinary = true;
       return ordinary.track(x);
@@ -1395,12 +1398,14 @@ };
     const blocked = len > 1 ? keys.flat() : keys[0];
+    const claimed = new Set();
     const res = keys.map(k => {
+      const owned = k.filter(property => !claimed.has(property) && (claimed.add(property), true));
       return new Proxy({
         get(property) {
-          return k.includes(property) ? props[property] : undefined;
+          return owned.includes(property) ? props[property] : undefined;
         },
         has(property) {
-          return k.includes(property) && property in props;
+          return owned.includes(property) && property in props;
         },
         keys() {
-          return k.filter(property => property in props);
+          return owned.filter(property => property in props);
         }
@@ -1443,2 +1448,13 @@ }, propTraps);
   let p;
+  const load = () => {
+    if (!p) {
+      const cur = p = fn();
+      cur.then(mod => {
+        comp = () => mod.default;
+      }, () => {
+        if (p === cur) p = undefined;
+      });
+    }
+    return p;
+  };
   const wrap = props => {
@@ -1450,3 +1466,3 @@ const ctx = sharedConfig.context;
       sharedConfig.count++;
-      (p || (p = fn())).then(mod => {
+      load().then(mod => {
         !sharedConfig.done && setHydrateContext(ctx);
@@ -1456,6 +1472,13 @@ sharedConfig.count--;
         setHydrateContext();
+      }, err => {
+        !sharedConfig.done && setHydrateContext(ctx);
+        sharedConfig.count--;
+        set(() => () => {
+          throw err;
+        });
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
+      const [s] = createResource(() => load().then(mod => mod.default));
       comp = s;
@@ -1475,3 +1498,3 @@ onCleanup(() => comp = undefined);
   };
-  wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
+  wrap.preload = () => load();
   return wrap;
@@ -1478,0 +1501,0 @@ }

dist/solid.js

@@ -432,3 +432,3 @@ let taskIdCounter = 1,
       for (const c of val.values()) {
-        c.state = STALE;
+        if (Transition && Transition.running) c.tState = STALE;else c.state = STALE;
         if (c.pure) Updates.push(c);else Effects.push(c);
@@ -771,2 +771,3 @@ }
     let inTransition;
+    let trackedOrdinary = false;
     const triggerInTransition = () => startTransition(trigger).then(() => {
@@ -776,2 +777,3 @@ if (inTransition) {
         inTransition = undefined;
+        if (!trackedOrdinary) trigger();
       }
@@ -785,2 +787,3 @@ });
       }
+      trackedOrdinary = true;
       return ordinary.track(x);
@@ -1393,12 +1396,14 @@ };
     const blocked = len > 1 ? keys.flat() : keys[0];
+    const claimed = new Set();
     const res = keys.map(k => {
+      const owned = k.filter(property => !claimed.has(property) && (claimed.add(property), true));
       return new Proxy({
         get(property) {
-          return k.includes(property) ? props[property] : undefined;
+          return owned.includes(property) ? props[property] : undefined;
         },
         has(property) {
-          return k.includes(property) && property in props;
+          return owned.includes(property) && property in props;
         },
         keys() {
-          return k.filter(property => property in props);
+          return owned.filter(property => property in props);
         }
@@ -1441,2 +1446,13 @@ }, propTraps);
   let p;
+  const load = () => {
+    if (!p) {
+      const cur = p = fn();
+      cur.then(mod => {
+        comp = () => mod.default;
+      }, () => {
+        if (p === cur) p = undefined;
+      });
+    }
+    return p;
+  };
   const wrap = props => {
@@ -1448,3 +1464,3 @@ const ctx = sharedConfig.context;
       sharedConfig.count++;
-      (p || (p = fn())).then(mod => {
+      load().then(mod => {
         !sharedConfig.done && setHydrateContext(ctx);
@@ -1454,6 +1470,13 @@ sharedConfig.count--;
         setHydrateContext();
+      }, err => {
+        !sharedConfig.done && setHydrateContext(ctx);
+        sharedConfig.count--;
+        set(() => () => {
+          throw err;
+        });
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
+      const [s] = createResource(() => load().then(mod => mod.default));
       comp = s;
@@ -1473,3 +1496,3 @@ onCleanup(() => comp = undefined);
   };
-  wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
+  wrap.preload = () => load();
   return wrap;
@@ -1476,0 +1499,0 @@ }

package.json

 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.9.14",
+  "version": "1.9.15",
   "author": "Ryan Carniato",
@@ -239,3 +239,3 @@ "license": "MIT",
     "link": "symlink-dir . node_modules/solid-js",
-    "test": "vitest run",
+    "test": "vitest run && vitest run --config vitest.server.config.mjs",
     "coverage": "vitest run --coverage",
@@ -242,0 +242,0 @@ "test-types": "tsc --project tsconfig.test.json"

web/dist/dev.cjs

@@ -238,3 +238,3 @@ 'use strict';
   if (isHydrating(node)) return;
-  node[name] = value;
+  if ((name === "value" || name === "defaultValue") && (node.nodeName === "INPUT" || node.nodeName === "TEXTAREA")) node[name] = value ?? "";else node[name] = value;
 }
@@ -480,3 +480,4 @@ function setAttribute(node, name, value) {
     } else if (isHydrating(node)) return value;
-    if (prop === "class" || prop === "className") className(node, value);else if (isCE && !isProp && !isChildProp) node[toPropertyName(prop)] = value;else node[propAlias || prop] = value;
+    if (prop === "class" || prop === "className") className(node, value);else if (isCE && !isProp && !isChildProp) node[toPropertyName(prop)] = value;else if ((prop === "value" || prop === "defaultValue") && (node.nodeName === "INPUT" || node.nodeName === "TEXTAREA"))
+      node[propAlias || prop] = value ?? "";else node[propAlias || prop] = value;
   } else {
@@ -483,0 +484,0 @@ const ns = isSVG && prop.indexOf(":") > -1 && SVGNamespace[prop.split(":")[0]];

web/dist/dev.js

@@ -237,3 +237,3 @@ import { createMemo, sharedConfig, createRenderEffect, createRoot, untrack, splitProps, getOwner, createEffect, runWithOwner, createSignal, onCleanup, $DEVCOMP, enableHydration } from 'solid-js';
   if (isHydrating(node)) return;
-  node[name] = value;
+  if ((name === "value" || name === "defaultValue") && (node.nodeName === "INPUT" || node.nodeName === "TEXTAREA")) node[name] = value ?? "";else node[name] = value;
 }
@@ -479,3 +479,4 @@ function setAttribute(node, name, value) {
     } else if (isHydrating(node)) return value;
-    if (prop === "class" || prop === "className") className(node, value);else if (isCE && !isProp && !isChildProp) node[toPropertyName(prop)] = value;else node[propAlias || prop] = value;
+    if (prop === "class" || prop === "className") className(node, value);else if (isCE && !isProp && !isChildProp) node[toPropertyName(prop)] = value;else if ((prop === "value" || prop === "defaultValue") && (node.nodeName === "INPUT" || node.nodeName === "TEXTAREA"))
+      node[propAlias || prop] = value ?? "";else node[propAlias || prop] = value;
   } else {
@@ -482,0 +483,0 @@ const ns = isSVG && prop.indexOf(":") > -1 && SVGNamespace[prop.split(":")[0]];

web/dist/server.cjs

@@ -554,3 +554,7 @@ 'use strict';
     }
-    if (attr && t === "boolean") return String(s);
+    if (attr) {
+      if (t === "boolean") return String(s);
+      if (s == null || t === "number") return s;
+      return escape(String(s), attr);
+    }
     return s;
@@ -557,0 +561,0 @@ }

web/dist/server.js

@@ -553,3 +553,7 @@ import { createMemo, sharedConfig, createRoot, splitProps } from 'solid-js';
     }
-    if (attr && t === "boolean") return String(s);
+    if (attr) {
+      if (t === "boolean") return String(s);
+      if (s == null || t === "number") return s;
+      return escape(String(s), attr);
+    }
     return s;
@@ -556,0 +560,0 @@ }

web/dist/web.cjs

@@ -234,3 +234,3 @@ 'use strict';
   if (isHydrating(node)) return;
-  node[name] = value;
+  if ((name === "value" || name === "defaultValue") && (node.nodeName === "INPUT" || node.nodeName === "TEXTAREA")) node[name] = value ?? "";else node[name] = value;
 }
@@ -472,3 +472,4 @@ function setAttribute(node, name, value) {
     } else if (isHydrating(node)) return value;
-    if (prop === "class" || prop === "className") className(node, value);else if (isCE && !isProp && !isChildProp) node[toPropertyName(prop)] = value;else node[propAlias || prop] = value;
+    if (prop === "class" || prop === "className") className(node, value);else if (isCE && !isProp && !isChildProp) node[toPropertyName(prop)] = value;else if ((prop === "value" || prop === "defaultValue") && (node.nodeName === "INPUT" || node.nodeName === "TEXTAREA"))
+      node[propAlias || prop] = value ?? "";else node[propAlias || prop] = value;
   } else {
@@ -475,0 +476,0 @@ const ns = isSVG && prop.indexOf(":") > -1 && SVGNamespace[prop.split(":")[0]];

web/dist/web.js

@@ -233,3 +233,3 @@ import { createMemo, sharedConfig, createRenderEffect, createRoot, untrack, splitProps, getOwner, createEffect, runWithOwner, createSignal, onCleanup, enableHydration } from 'solid-js';
   if (isHydrating(node)) return;
-  node[name] = value;
+  if ((name === "value" || name === "defaultValue") && (node.nodeName === "INPUT" || node.nodeName === "TEXTAREA")) node[name] = value ?? "";else node[name] = value;
 }
@@ -471,3 +471,4 @@ function setAttribute(node, name, value) {
     } else if (isHydrating(node)) return value;
-    if (prop === "class" || prop === "className") className(node, value);else if (isCE && !isProp && !isChildProp) node[toPropertyName(prop)] = value;else node[propAlias || prop] = value;
+    if (prop === "class" || prop === "className") className(node, value);else if (isCE && !isProp && !isChildProp) node[toPropertyName(prop)] = value;else if ((prop === "value" || prop === "defaultValue") && (node.nodeName === "INPUT" || node.nodeName === "TEXTAREA"))
+      node[propAlias || prop] = value ?? "";else node[propAlias || prop] = value;
   } else {
@@ -474,0 +475,0 @@ const ns = isSVG && prop.indexOf(":") > -1 && SVGNamespace[prop.split(":")[0]];

New alerts

AI-detected potential code anomaly

Supply chain risk

AI has identified unusual behaviors that may pose a security risk.

Fixed alerts

AI-detected potential code anomaly

Supply chain risk

AI has identified unusual behaviors that may pose a security risk.

Improved metrics

Total package byte prevSize

1073001

0.43%

Lines of code

28523

0.42%

No dependency changes