solid-js 1.4.2 → 1.4.5

package/dist/solid.cjs

@@ -160,16 +160,18 @@ let ExecCount = 0;
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
-        root = fn.length === 0 && !false ? UNOWNED : {
+        unowned = fn.length === 0,
+        root = unowned && !false ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
     owner: detachedOwner || owner
-  };
+  },
+        updateFn = unowned ? fn : () => fn(() => cleanNode(root));
   Owner = root;
   Listener = null;
   try {
-    return runUpdates(() => fn(() => cleanNode(root)), true);
+    return runUpdates(updateFn, true);
   } finally {
     Listener = listener;
     Owner = owner;
@@ -767,14 +769,16 @@ function completeUpdates(wait) {
       return;
     }
     const sources = Transition.sources;
+    const disposed = Transition.disposed;
     res = Transition.resolve;
-    Effects.forEach(e => {
+    for (const e of Effects) {
       "tState" in e && (e.state = e.tState);
       delete e.tState;
-    });
+    }
     Transition = null;
     batch(() => {
-      sources.forEach(v => {
+      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]);
@@ -783,7 +787,7 @@ function completeUpdates(wait) {
         delete v.tValue;
         delete v.tOwned;
         v.tState = 0;
-      });
+      }
       setTransPending(false);
     });
   }
@@ -901,7 +905,7 @@ function reset(node, top) {
 function handleError(err) {
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
-  fns.forEach(f => f(err));
+  for (const f of fns) f(err);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1331,23 +1335,24 @@ function Match(props) {
   return props;
 }
 let Errors;
+const NoErrors = {};
 function resetErrorBoundaries() {
-  Errors && [...Errors].forEach(fn => fn());
+  Errors && [...Errors].forEach(fn => fn(NoErrors));
 }
 function ErrorBoundary(props) {
-  let err = undefined;
+  let err = NoErrors;
   if (sharedConfig.context && sharedConfig.load) {
-    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
+    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count) || NoErrors;
   }
   const [errored, setErrored] = createSignal(err);
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
-  let e;
   return createMemo(() => {
-    if ((e = errored()) != null) {
+    let e;
+    if ((e = errored()) !== NoErrors) {
       const f = props.fallback;
-      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(null))) : f;
+      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(NoErrors))) : f;
     }
     onError(setErrored);
     return props.children;
@@ -1356,27 +1361,24 @@ function ErrorBoundary(props) {
 
 const SuspenseListContext = createContext();
 function SuspenseList(props) {
-  let index = 0,
-      suspenseSetter,
-      showContent,
-      showFallback;
+  let suspenseSetter, showContent, showFallback;
   const listContext = useContext(SuspenseListContext);
   if (listContext) {
     const [inFallback, setFallback] = createSignal(false);
     suspenseSetter = setFallback;
     [showContent, showFallback] = listContext.register(inFallback);
   }
-  const registry = [],
+  const [registry, setRegistry] = createSignal([]),
         comp = createComponent(SuspenseListContext.Provider, {
     value: {
       register: inFallback => {
         const [showingContent, showContent] = createSignal(false),
               [showingFallback, showFallback] = createSignal(false);
-        registry[index++] = {
+        setRegistry(registry => [...registry, {
           inFallback,
           showContent,
           showFallback
-        };
+        }]);
         return [showingContent, showingFallback];
       }
     },
@@ -1389,31 +1391,32 @@ function SuspenseList(props) {
           tail = props.tail,
           visibleContent = showContent ? showContent() : true,
           visibleFallback = showFallback ? showFallback() : true,
+          reg = registry(),
           reverse = reveal === "backwards";
     if (reveal === "together") {
-      const all = registry.every(i => !i.inFallback());
+      const all = reg.every(i => !i.inFallback());
       suspenseSetter && suspenseSetter(!all);
-      registry.forEach(i => {
+      reg.forEach(i => {
         i.showContent(all && visibleContent);
         i.showFallback(visibleFallback);
       });
       return;
     }
     let stop = false;
-    for (let i = 0, len = registry.length; i < len; i++) {
+    for (let i = 0, len = reg.length; i < len; i++) {
       const n = reverse ? len - i - 1 : i,
-            s = registry[n].inFallback();
+            s = reg[n].inFallback();
       if (!stop && !s) {
-        registry[n].showContent(visibleContent);
-        registry[n].showFallback(visibleFallback);
+        reg[n].showContent(visibleContent);
+        reg[n].showFallback(visibleFallback);
       } else {
         const next = !stop;
         if (next && suspenseSetter) suspenseSetter(true);
         if (!tail || next && tail === "collapsed") {
-          registry[n].showFallback(visibleFallback);
-        } else registry[n].showFallback(false);
+          reg[n].showFallback(visibleFallback);
+        } else reg[n].showFallback(false);
         stop = true;
-        registry[n].showContent(next);
+        reg[n].showContent(next);
       }
     }
     if (!stop && suspenseSetter) suspenseSetter(false);
@@ -1442,7 +1445,7 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
-  if (sharedConfig.context) {
+  if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
@@ -1475,7 +1478,7 @@ function Suspense(props) {
           return flicker = undefined;
         }
         if (ctx && p === undefined) setHydrateContext();
-        const rendered = untrack(() => props.children);
+        const rendered = createMemo(() => props.children);
         return createMemo(() => {
           const inFallback = store.inFallback(),
                 visibleContent = showContent ? showContent() : true,
@@ -1485,7 +1488,7 @@ function Suspense(props) {
             store.resolved = true;
             ctx = p = undefined;
             resumeEffects(store.effects);
-            return rendered;
+            return rendered();
           }
           if (!visibleFallback) return;
           return createRoot(disposer => {

package/dist/solid.js

@@ -156,16 +156,18 @@ let ExecCount = 0;
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
-        root = fn.length === 0 && !false ? UNOWNED : {
+        unowned = fn.length === 0,
+        root = unowned && !false ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
     owner: detachedOwner || owner
-  };
+  },
+        updateFn = unowned ? fn : () => fn(() => cleanNode(root));
   Owner = root;
   Listener = null;
   try {
-    return runUpdates(() => fn(() => cleanNode(root)), true);
+    return runUpdates(updateFn, true);
   } finally {
     Listener = listener;
     Owner = owner;
@@ -763,14 +765,16 @@ function completeUpdates(wait) {
       return;
     }
     const sources = Transition.sources;
+    const disposed = Transition.disposed;
     res = Transition.resolve;
-    Effects.forEach(e => {
+    for (const e of Effects) {
       "tState" in e && (e.state = e.tState);
       delete e.tState;
-    });
+    }
     Transition = null;
     batch(() => {
-      sources.forEach(v => {
+      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]);
@@ -779,7 +783,7 @@ function completeUpdates(wait) {
         delete v.tValue;
         delete v.tOwned;
         v.tState = 0;
-      });
+      }
       setTransPending(false);
     });
   }
@@ -897,7 +901,7 @@ function reset(node, top) {
 function handleError(err) {
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
-  fns.forEach(f => f(err));
+  for (const f of fns) f(err);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1327,23 +1331,24 @@ function Match(props) {
   return props;
 }
 let Errors;
+const NoErrors = {};
 function resetErrorBoundaries() {
-  Errors && [...Errors].forEach(fn => fn());
+  Errors && [...Errors].forEach(fn => fn(NoErrors));
 }
 function ErrorBoundary(props) {
-  let err = undefined;
+  let err = NoErrors;
   if (sharedConfig.context && sharedConfig.load) {
-    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
+    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count) || NoErrors;
   }
   const [errored, setErrored] = createSignal(err);
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
-  let e;
   return createMemo(() => {
-    if ((e = errored()) != null) {
+    let e;
+    if ((e = errored()) !== NoErrors) {
       const f = props.fallback;
-      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(null))) : f;
+      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(NoErrors))) : f;
     }
     onError(setErrored);
     return props.children;
@@ -1352,27 +1357,24 @@ function ErrorBoundary(props) {
 
 const SuspenseListContext = createContext();
 function SuspenseList(props) {
-  let index = 0,
-      suspenseSetter,
-      showContent,
-      showFallback;
+  let suspenseSetter, showContent, showFallback;
   const listContext = useContext(SuspenseListContext);
   if (listContext) {
     const [inFallback, setFallback] = createSignal(false);
     suspenseSetter = setFallback;
     [showContent, showFallback] = listContext.register(inFallback);
   }
-  const registry = [],
+  const [registry, setRegistry] = createSignal([]),
         comp = createComponent(SuspenseListContext.Provider, {
     value: {
       register: inFallback => {
         const [showingContent, showContent] = createSignal(false),
               [showingFallback, showFallback] = createSignal(false);
-        registry[index++] = {
+        setRegistry(registry => [...registry, {
           inFallback,
           showContent,
           showFallback
-        };
+        }]);
         return [showingContent, showingFallback];
       }
     },
@@ -1385,31 +1387,32 @@ function SuspenseList(props) {
           tail = props.tail,
           visibleContent = showContent ? showContent() : true,
           visibleFallback = showFallback ? showFallback() : true,
+          reg = registry(),
           reverse = reveal === "backwards";
     if (reveal === "together") {
-      const all = registry.every(i => !i.inFallback());
+      const all = reg.every(i => !i.inFallback());
       suspenseSetter && suspenseSetter(!all);
-      registry.forEach(i => {
+      reg.forEach(i => {
         i.showContent(all && visibleContent);
         i.showFallback(visibleFallback);
       });
       return;
     }
     let stop = false;
-    for (let i = 0, len = registry.length; i < len; i++) {
+    for (let i = 0, len = reg.length; i < len; i++) {
       const n = reverse ? len - i - 1 : i,
-            s = registry[n].inFallback();
+            s = reg[n].inFallback();
       if (!stop && !s) {
-        registry[n].showContent(visibleContent);
-        registry[n].showFallback(visibleFallback);
+        reg[n].showContent(visibleContent);
+        reg[n].showFallback(visibleFallback);
       } else {
         const next = !stop;
         if (next && suspenseSetter) suspenseSetter(true);
         if (!tail || next && tail === "collapsed") {
-          registry[n].showFallback(visibleFallback);
-        } else registry[n].showFallback(false);
+          reg[n].showFallback(visibleFallback);
+        } else reg[n].showFallback(false);
         stop = true;
-        registry[n].showContent(next);
+        reg[n].showContent(next);
       }
     }
     if (!stop && suspenseSetter) suspenseSetter(false);
@@ -1438,7 +1441,7 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
-  if (sharedConfig.context) {
+  if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
@@ -1471,7 +1474,7 @@ function Suspense(props) {
           return flicker = undefined;
         }
         if (ctx && p === undefined) setHydrateContext();
-        const rendered = untrack(() => props.children);
+        const rendered = createMemo(() => props.children);
         return createMemo(() => {
           const inFallback = store.inFallback(),
                 visibleContent = showContent ? showContent() : true,
@@ -1481,7 +1484,7 @@ function Suspense(props) {
             store.resolved = true;
             ctx = p = undefined;
             resumeEffects(store.effects);
-            return rendered;
+            return rendered();
           }
           if (!visibleFallback) return;
           return createRoot(disposer => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.4.2",
+  "version": "1.4.5",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -151,5 +151,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "f17df5c7042425aa8d363be261bd9a9e5345c188"
+  "gitHead": "2c2252d6e4bd0d59f9164da32d6b6afc65dd4220"
 }

package/store/README.md

@@ -2,7 +2,7 @@
 
 This submodules contains the means for handling deeps nested reactivity. It provides 2 main primitives `createStore` and `createMutable` which leverage proxies to create dynamic nested reactive structures.
 
-This also contains helper methods `produce` and `reconcile` which augment the behavior of the store setter method to allow for localized mutationa and data diffing.
+This also contains helper methods `produce` and `reconcile` which augment the behavior of the store setter method to allow for localized mutation and data diffing.
 
 For full documentation, check out the [website](https://www.solidjs.com/docs/latest/api).
 
@@ -20,4 +20,4 @@ const [store, setStore] = createStore({
 
 // update store.user.firstName
 setStore("user", "firstName", "Will");
-```
+```

package/store/dist/dev.cjs

@@ -31,7 +31,8 @@ function wrap$1(value, name) {
   return p;
 }
 function isWrappable(obj) {
-  return obj != null && typeof obj === "object" && (obj[solidJs.$PROXY] || !obj.__proto__ || obj.__proto__ === Object.prototype || Array.isArray(obj));
+  let proto;
+  return obj != null && typeof obj === "object" && (obj[solidJs.$PROXY] || !(proto = Object.getPrototypeOf(obj)) || proto === Object.prototype || Array.isArray(obj));
 }
 function unwrap(item, set = new Set()) {
   let result, unwrapped, v, prop;
@@ -143,14 +144,16 @@ function mergeStoreNode(state, value) {
 function updateArray(current, next) {
   if (typeof next === "function") next = next(current);
   next = unwrap(next);
-  if (current === next) return;
-  let i = 0,
-      len = next.length;
-  for (; i < len; i++) {
-    const value = next[i];
-    if (current[i] !== value) setProperty(current, i, value);
-  }
-  setProperty(current, "length", len);
+  if (Array.isArray(next)) {
+    if (current === next) return;
+    let i = 0,
+        len = next.length;
+    for (; i < len; i++) {
+      const value = next[i];
+      if (current[i] !== value) setProperty(current, i, value);
+    }
+    setProperty(current, "length", len);
+  } else mergeStoreNode(current, next);
 }
 function updatePath(current, path, traversed = []) {
   let part,
@@ -197,7 +200,7 @@ function updatePath(current, path, traversed = []) {
     mergeStoreNode(prev, value);
   } else setProperty(current, part, value);
 }
-function createStore(store, options) {
+function createStore(...[store, options]) {
   const unwrappedStore = unwrap(store || {});
   const isArray = Array.isArray(unwrappedStore);
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createStore'. Expected an object.`);
@@ -291,11 +294,15 @@ function modifyMutable(state, modifier) {
   solidJs.batch(() => modifier(unwrap(state)));
 }
 
+const $ROOT = Symbol("store-root");
 function applyState(target, parent, property, merge, key) {
   const previous = parent[property];
   if (target === previous) return;
   if (!isWrappable(target) || !isWrappable(previous) || key && target[key] !== previous[key]) {
-    target !== previous && setProperty(parent, property, target);
+    if (target !== previous) {
+      if (property === $ROOT) return target;
+      setProperty(parent, property, target);
+    }
     return;
   }
   if (Array.isArray(target)) {
@@ -367,17 +374,19 @@ function reconcile(value, options = {}) {
         v = unwrap(value);
   return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
-    solidJs.batch(() => applyState(v, {
-      state
-    }, "state", merge, key));
-    return state;
+    const res = applyState(v, {
+      [$ROOT]: state
+    }, $ROOT, merge, key);
+    return res === undefined ? state : res;
   };
 }
+const producers = new WeakMap();
 const setterTraps = {
   get(target, property) {
     if (property === $RAW) return target;
     const value = target[property];
-    return isWrappable(value) ? new Proxy(value, setterTraps) : value;
+    let proxy;
+    return isWrappable(value) ? producers.get(value) || (producers.set(value, proxy = new Proxy(value, setterTraps)), proxy) : value;
   },
   set(target, property, value) {
     setProperty(target, property, unwrap(value));
@@ -390,7 +399,13 @@ const setterTraps = {
 };
 function produce(fn) {
   return state => {
-    if (isWrappable(state)) fn(new Proxy(state, setterTraps));
+    if (isWrappable(state)) {
+      let proxy;
+      if (!(proxy = producers.get(state))) {
+        producers.set(state, proxy = new Proxy(state, setterTraps));
+      }
+      fn(proxy);
+    }
     return state;
   };
 }

package/store/dist/dev.js

@@ -27,7 +27,8 @@ function wrap$1(value, name) {
   return p;
 }
 function isWrappable(obj) {
-  return obj != null && typeof obj === "object" && (obj[$PROXY] || !obj.__proto__ || obj.__proto__ === Object.prototype || Array.isArray(obj));
+  let proto;
+  return obj != null && typeof obj === "object" && (obj[$PROXY] || !(proto = Object.getPrototypeOf(obj)) || proto === Object.prototype || Array.isArray(obj));
 }
 function unwrap(item, set = new Set()) {
   let result, unwrapped, v, prop;
@@ -139,14 +140,16 @@ function mergeStoreNode(state, value) {
 function updateArray(current, next) {
   if (typeof next === "function") next = next(current);
   next = unwrap(next);
-  if (current === next) return;
-  let i = 0,
-      len = next.length;
-  for (; i < len; i++) {
-    const value = next[i];
-    if (current[i] !== value) setProperty(current, i, value);
-  }
-  setProperty(current, "length", len);
+  if (Array.isArray(next)) {
+    if (current === next) return;
+    let i = 0,
+        len = next.length;
+    for (; i < len; i++) {
+      const value = next[i];
+      if (current[i] !== value) setProperty(current, i, value);
+    }
+    setProperty(current, "length", len);
+  } else mergeStoreNode(current, next);
 }
 function updatePath(current, path, traversed = []) {
   let part,
@@ -193,7 +196,7 @@ function updatePath(current, path, traversed = []) {
     mergeStoreNode(prev, value);
   } else setProperty(current, part, value);
 }
-function createStore(store, options) {
+function createStore(...[store, options]) {
   const unwrappedStore = unwrap(store || {});
   const isArray = Array.isArray(unwrappedStore);
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createStore'. Expected an object.`);
@@ -287,11 +290,15 @@ function modifyMutable(state, modifier) {
   batch(() => modifier(unwrap(state)));
 }
 
+const $ROOT = Symbol("store-root");
 function applyState(target, parent, property, merge, key) {
   const previous = parent[property];
   if (target === previous) return;
   if (!isWrappable(target) || !isWrappable(previous) || key && target[key] !== previous[key]) {
-    target !== previous && setProperty(parent, property, target);
+    if (target !== previous) {
+      if (property === $ROOT) return target;
+      setProperty(parent, property, target);
+    }
     return;
   }
   if (Array.isArray(target)) {
@@ -363,17 +370,19 @@ function reconcile(value, options = {}) {
         v = unwrap(value);
   return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
-    batch(() => applyState(v, {
-      state
-    }, "state", merge, key));
-    return state;
+    const res = applyState(v, {
+      [$ROOT]: state
+    }, $ROOT, merge, key);
+    return res === undefined ? state : res;
   };
 }
+const producers = new WeakMap();
 const setterTraps = {
   get(target, property) {
     if (property === $RAW) return target;
     const value = target[property];
-    return isWrappable(value) ? new Proxy(value, setterTraps) : value;
+    let proxy;
+    return isWrappable(value) ? producers.get(value) || (producers.set(value, proxy = new Proxy(value, setterTraps)), proxy) : value;
   },
   set(target, property, value) {
     setProperty(target, property, unwrap(value));
@@ -386,7 +395,13 @@ const setterTraps = {
 };
 function produce(fn) {
   return state => {
-    if (isWrappable(state)) fn(new Proxy(state, setterTraps));
+    if (isWrappable(state)) {
+      let proxy;
+      if (!(proxy = producers.get(state))) {
+        producers.set(state, proxy = new Proxy(state, setterTraps));
+      }
+      fn(proxy);
+    }
     return state;
   };
 }

package/store/dist/server.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const $RAW = Symbol("state-raw");
 function isWrappable(obj) {
-  return obj != null && typeof obj === "object" && (obj.__proto__ === Object.prototype || Array.isArray(obj));
+  return obj != null && typeof obj === "object" && (Object.getPrototypeOf(obj) === Object.prototype || Array.isArray(obj));
 }
 function unwrap(item) {
   return item;
@@ -22,6 +22,19 @@ function mergeStoreNode(state, value, force) {
     setProperty(state, key, value[key], force);
   }
 }
+function updateArray(current, next) {
+  if (typeof next === "function") next = next(current);
+  if (Array.isArray(next)) {
+    if (current === next) return;
+    let i = 0,
+        len = next.length;
+    for (; i < len; i++) {
+      const value = next[i];
+      if (current[i] !== value) setProperty(current, i, value);
+    }
+    setProperty(current, "length", len);
+  } else mergeStoreNode(current, next);
+}
 function updatePath(current, path, traversed = []) {
   let part,
       next = current;
@@ -67,8 +80,9 @@ function updatePath(current, path, traversed = []) {
   } else setProperty(current, part, value);
 }
 function createStore(state) {
+  const isArray = Array.isArray(state);
   function setStore(...args) {
-    updatePath(state, args);
+    isArray && args.length === 1 ? updateArray(state, args[0]) : updatePath(state, args);
   }
   return [state, setStore];
 }