solid-js 1.6.6 → 1.6.7

package/dist/dev.cjs

@@ -159,7 +159,12 @@ function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
         unowned = fn.length === 0,
-        root = unowned && !"_SOLID_DEV_" ? UNOWNED : {
+        root = unowned ? {
+    owned: null,
+    cleanups: null,
+    context: null,
+    owner: null
+  }  : {
     owned: null,
     cleanups: null,
     context: null,
@@ -468,6 +473,8 @@ function runWithOwner(o, fn) {
   Owner = o;
   try {
     return runUpdates(fn, true);
+  } catch (err) {
+    handleError(err);
   } finally {
     Owner = prev;
   }
@@ -1005,7 +1012,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = typeof observer === 'function' ? observer : observer.next && observer.next.bind(observer);
+      const handler = typeof observer === "function" ? observer : observer.next && observer.next.bind(observer);
       if (!handler) {
         return {
           unsubscribe() {}
@@ -1314,14 +1321,40 @@ function mergeProps(...sources) {
 }
 function splitProps(props, ...keys) {
   const blocked = new Set(keys.flat());
+  if ($PROXY in props) {
+    const res = keys.map(k => {
+      return new Proxy({
+        get(property) {
+          return k.includes(property) ? props[property] : undefined;
+        },
+        has(property) {
+          return k.includes(property) && property in props;
+        },
+        keys() {
+          return k.filter(property => property in props);
+        }
+      }, propTraps);
+    });
+    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;
+  }
   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 => {
+  keys.push(Object.keys(descriptors).filter(k => !blocked.has(k)));
+  return keys.map(k => {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
       const key = k[i];
-      if (!isProxy && !(key in props)) continue;
+      if (!(key in props)) continue;
       Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
         get() {
           return props[key];
@@ -1334,20 +1367,6 @@ function splitProps(props, ...keys) {
     }
     return clone;
   });
-  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) {
   let comp;

package/dist/dev.js

@@ -157,7 +157,12 @@ function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
         unowned = fn.length === 0,
-        root = unowned && !"_SOLID_DEV_" ? UNOWNED : {
+        root = unowned ? {
+    owned: null,
+    cleanups: null,
+    context: null,
+    owner: null
+  }  : {
     owned: null,
     cleanups: null,
     context: null,
@@ -466,6 +471,8 @@ function runWithOwner(o, fn) {
   Owner = o;
   try {
     return runUpdates(fn, true);
+  } catch (err) {
+    handleError(err);
   } finally {
     Owner = prev;
   }
@@ -1003,7 +1010,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = typeof observer === 'function' ? observer : observer.next && observer.next.bind(observer);
+      const handler = typeof observer === "function" ? observer : observer.next && observer.next.bind(observer);
       if (!handler) {
         return {
           unsubscribe() {}
@@ -1312,14 +1319,40 @@ function mergeProps(...sources) {
 }
 function splitProps(props, ...keys) {
   const blocked = new Set(keys.flat());
+  if ($PROXY in props) {
+    const res = keys.map(k => {
+      return new Proxy({
+        get(property) {
+          return k.includes(property) ? props[property] : undefined;
+        },
+        has(property) {
+          return k.includes(property) && property in props;
+        },
+        keys() {
+          return k.filter(property => property in props);
+        }
+      }, propTraps);
+    });
+    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;
+  }
   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 => {
+  keys.push(Object.keys(descriptors).filter(k => !blocked.has(k)));
+  return keys.map(k => {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
       const key = k[i];
-      if (!isProxy && !(key in props)) continue;
+      if (!(key in props)) continue;
       Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
         get() {
           return props[key];
@@ -1332,20 +1365,6 @@ function splitProps(props, ...keys) {
     }
     return clone;
   });
-  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) {
   let comp;

package/dist/server.cjs

@@ -496,8 +496,15 @@ function createResource(source, fetcher, options = {}) {
 function lazy(fn) {
   let resolved;
   let p;
-  let load = () => {
+  let load = id => {
     if (!p) {
+      if (id) {
+        let ref = sharedConfig.context.resources[id] = {
+          ref: p = fn()
+        };
+        p.then(mod => ref.data = resolved = mod.default);
+        return p;
+      }
       p = fn();
       p.then(mod => resolved = mod.default);
     }
@@ -505,8 +512,12 @@ function lazy(fn) {
   };
   const contexts = new Set();
   const wrap = props => {
-    load();
     const id = sharedConfig.context.id.slice(0, -1);
+    let ref = sharedConfig.context.resources[id];
+    if (ref) {
+      p = ref.ref;
+      resolved = ref.data;
+    } else load(id);
     if (resolved) return resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {

package/dist/server.js

@@ -494,8 +494,15 @@ function createResource(source, fetcher, options = {}) {
 function lazy(fn) {
   let resolved;
   let p;
-  let load = () => {
+  let load = id => {
     if (!p) {
+      if (id) {
+        let ref = sharedConfig.context.resources[id] = {
+          ref: p = fn()
+        };
+        p.then(mod => ref.data = resolved = mod.default);
+        return p;
+      }
       p = fn();
       p.then(mod => resolved = mod.default);
     }
@@ -503,8 +510,12 @@ function lazy(fn) {
   };
   const contexts = new Set();
   const wrap = props => {
-    load();
     const id = sharedConfig.context.id.slice(0, -1);
+    let ref = sharedConfig.context.resources[id];
+    if (ref) {
+      p = ref.ref;
+      resolved = ref.data;
+    } else load(id);
     if (resolved) return resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {

package/dist/solid.cjs

@@ -158,7 +158,7 @@ function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
         unowned = fn.length === 0,
-        root = unowned && !false ? UNOWNED : {
+        root = unowned ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
@@ -460,6 +460,8 @@ function runWithOwner(o, fn) {
   Owner = o;
   try {
     return runUpdates(fn, true);
+  } catch (err) {
+    handleError(err);
   } finally {
     Owner = prev;
   }
@@ -917,7 +919,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = typeof observer === 'function' ? observer : observer.next && observer.next.bind(observer);
+      const handler = typeof observer === "function" ? observer : observer.next && observer.next.bind(observer);
       if (!handler) {
         return {
           unsubscribe() {}
@@ -1222,14 +1224,40 @@ function mergeProps(...sources) {
 }
 function splitProps(props, ...keys) {
   const blocked = new Set(keys.flat());
+  if ($PROXY in props) {
+    const res = keys.map(k => {
+      return new Proxy({
+        get(property) {
+          return k.includes(property) ? props[property] : undefined;
+        },
+        has(property) {
+          return k.includes(property) && property in props;
+        },
+        keys() {
+          return k.filter(property => property in props);
+        }
+      }, propTraps);
+    });
+    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;
+  }
   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 => {
+  keys.push(Object.keys(descriptors).filter(k => !blocked.has(k)));
+  return keys.map(k => {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
       const key = k[i];
-      if (!isProxy && !(key in props)) continue;
+      if (!(key in props)) continue;
       Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
         get() {
           return props[key];
@@ -1242,20 +1270,6 @@ function splitProps(props, ...keys) {
     }
     return clone;
   });
-  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) {
   let comp;

package/dist/solid.js

@@ -156,7 +156,7 @@ function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
         unowned = fn.length === 0,
-        root = unowned && !false ? UNOWNED : {
+        root = unowned ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
@@ -458,6 +458,8 @@ function runWithOwner(o, fn) {
   Owner = o;
   try {
     return runUpdates(fn, true);
+  } catch (err) {
+    handleError(err);
   } finally {
     Owner = prev;
   }
@@ -915,7 +917,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = typeof observer === 'function' ? observer : observer.next && observer.next.bind(observer);
+      const handler = typeof observer === "function" ? observer : observer.next && observer.next.bind(observer);
       if (!handler) {
         return {
           unsubscribe() {}
@@ -1220,14 +1222,40 @@ function mergeProps(...sources) {
 }
 function splitProps(props, ...keys) {
   const blocked = new Set(keys.flat());
+  if ($PROXY in props) {
+    const res = keys.map(k => {
+      return new Proxy({
+        get(property) {
+          return k.includes(property) ? props[property] : undefined;
+        },
+        has(property) {
+          return k.includes(property) && property in props;
+        },
+        keys() {
+          return k.filter(property => property in props);
+        }
+      }, propTraps);
+    });
+    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;
+  }
   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 => {
+  keys.push(Object.keys(descriptors).filter(k => !blocked.has(k)));
+  return keys.map(k => {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
       const key = k[i];
-      if (!isProxy && !(key in props)) continue;
+      if (!(key in props)) continue;
       Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
         get() {
           return props[key];
@@ -1240,20 +1268,6 @@ function splitProps(props, ...keys) {
     }
     return clone;
   });
-  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) {
   let comp;