solid-js 1.7.5 → 1.7.7

package/dist/dev.cjs

@@ -287,7 +287,7 @@ function createResource(pSource, pFetcher, pOptions) {
   function loadEnd(p, v, error, key) {
     if (pr === p) {
       pr = null;
-      resolved = true;
+      key !== undefined && (resolved = true);
       if ((p === initP || v === initP) && options.onHydrated) queueMicrotask(() => options.onHydrated(key, {
         value: v
       }));
@@ -306,7 +306,7 @@ function createResource(pSource, pFetcher, pOptions) {
   function completeLoad(v, err) {
     runUpdates(() => {
       if (err === undefined) setValue(() => v);
-      setState(err !== undefined ? "errored" : "ready");
+      setState(err !== undefined ? "errored" : resolved ? "ready" : "unresolved");
       setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -958,19 +958,26 @@ function castError(err) {
     cause: err
   });
 }
-function runErrors(fns, err) {
-  for (const f of fns) f(err);
-}
-function handleError(err) {
-  const fns = ERROR && lookup(Owner, ERROR);
-  if (!fns) throw err;
+function handleError(err, owner = Owner) {
+  const fns = ERROR && lookup(owner, ERROR);
   const error = castError(err);
+  if (!fns) throw error;
   if (Effects) Effects.push({
     fn() {
-      runErrors(fns, error);
+      try {
+        for (const f of fns) f(error);
+      } catch (e) {
+        handleError(e, owner?.owner || null);
+      }
     },
     state: STALE
-  });else runErrors(fns, error);
+  });else {
+    try {
+      for (const f of fns) f(error);
+    } catch (e) {
+      handleError(e, owner?.owner || null);
+    }
+  }
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1265,6 +1272,12 @@ const propTraps = {
 function resolveSource(s) {
   return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
+function resolveSources() {
+  for (let i = 0, length = this.length; i < length; ++i) {
+    const v = this[i]();
+    if (v !== undefined) return v;
+  }
+}
 function mergeProps(...sources) {
   let proxy = false;
   for (let i = 0; i < sources.length; i++) {
@@ -1294,28 +1307,45 @@ function mergeProps(...sources) {
     }, propTraps);
   }
   const target = {};
+  const sourcesMap = {};
+  const defined = new Set();
   for (let i = sources.length - 1; i >= 0; i--) {
-    if (sources[i]) {
-      const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-      for (const key in descriptors) {
-        if (key in target) continue;
-        Object.defineProperty(target, key, {
-          enumerable: true,
-          get() {
-            for (let i = sources.length - 1; i >= 0; i--) {
-              const v = (sources[i] || {})[key];
-              if (v !== undefined) return v;
-            }
+    const source = sources[i];
+    if (!source) continue;
+    const sourceKeys = Object.getOwnPropertyNames(source);
+    for (let i = 0, length = sourceKeys.length; i < length; i++) {
+      const key = sourceKeys[i];
+      if (key === "__proto__" || key === "constructor") continue;
+      const desc = Object.getOwnPropertyDescriptor(source, key);
+      if (!defined.has(key)) {
+        if (desc.get) {
+          defined.add(key);
+          Object.defineProperty(target, key, {
+            enumerable: true,
+            configurable: true,
+            get: resolveSources.bind(sourcesMap[key] = [desc.get.bind(source)])
+          });
+        } else {
+          if (desc.value !== undefined) defined.add(key);
+          target[key] = desc.value;
+        }
+      } else {
+        const sources = sourcesMap[key];
+        if (sources) {
+          if (desc.get) {
+            sources.push(desc.get.bind(source));
+          } else if (desc.value !== undefined) {
+            sources.push(() => desc.value);
           }
-        });
+        } else if (target[key] === undefined) target[key] = desc.value;
       }
     }
   }
   return target;
 }
 function splitProps(props, ...keys) {
-  const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
   if ($PROXY in props) {
+    const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
     const res = keys.map(k => {
       return new Proxy({
         get(property) {
@@ -1342,25 +1372,25 @@ function splitProps(props, ...keys) {
     }, propTraps));
     return res;
   }
-  const descriptors = Object.getOwnPropertyDescriptors(props);
-  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 (!(key in props)) continue;
-      Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
-        get() {
-          return props[key];
-        },
-        set() {
-          return true;
-        },
-        enumerable: true
-      });
+  const otherObject = {};
+  const objects = keys.map(() => ({}));
+  for (const propName of Object.getOwnPropertyNames(props)) {
+    const desc = Object.getOwnPropertyDescriptor(props, propName);
+    const isDefaultDesc = !desc.get && !desc.set && desc.enumerable && desc.writable && desc.configurable;
+    let blocked = false;
+    let objectIndex = 0;
+    for (const k of keys) {
+      if (k.includes(propName)) {
+        blocked = true;
+        isDefaultDesc ? objects[objectIndex][propName] = desc.value : Object.defineProperty(objects[objectIndex], propName, desc);
+      }
+      ++objectIndex;
     }
-    return clone;
-  });
+    if (!blocked) {
+      isDefaultDesc ? otherObject[propName] = desc.value : Object.defineProperty(otherObject, propName, desc);
+    }
+  }
+  return [...objects, otherObject];
 }
 function lazy(fn) {
   let comp;

package/dist/dev.js

@@ -285,7 +285,7 @@ function createResource(pSource, pFetcher, pOptions) {
   function loadEnd(p, v, error, key) {
     if (pr === p) {
       pr = null;
-      resolved = true;
+      key !== undefined && (resolved = true);
       if ((p === initP || v === initP) && options.onHydrated) queueMicrotask(() => options.onHydrated(key, {
         value: v
       }));
@@ -304,7 +304,7 @@ function createResource(pSource, pFetcher, pOptions) {
   function completeLoad(v, err) {
     runUpdates(() => {
       if (err === undefined) setValue(() => v);
-      setState(err !== undefined ? "errored" : "ready");
+      setState(err !== undefined ? "errored" : resolved ? "ready" : "unresolved");
       setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -956,19 +956,26 @@ function castError(err) {
     cause: err
   });
 }
-function runErrors(fns, err) {
-  for (const f of fns) f(err);
-}
-function handleError(err) {
-  const fns = ERROR && lookup(Owner, ERROR);
-  if (!fns) throw err;
+function handleError(err, owner = Owner) {
+  const fns = ERROR && lookup(owner, ERROR);
   const error = castError(err);
+  if (!fns) throw error;
   if (Effects) Effects.push({
     fn() {
-      runErrors(fns, error);
+      try {
+        for (const f of fns) f(error);
+      } catch (e) {
+        handleError(e, owner?.owner || null);
+      }
     },
     state: STALE
-  });else runErrors(fns, error);
+  });else {
+    try {
+      for (const f of fns) f(error);
+    } catch (e) {
+      handleError(e, owner?.owner || null);
+    }
+  }
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1263,6 +1270,12 @@ const propTraps = {
 function resolveSource(s) {
   return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
+function resolveSources() {
+  for (let i = 0, length = this.length; i < length; ++i) {
+    const v = this[i]();
+    if (v !== undefined) return v;
+  }
+}
 function mergeProps(...sources) {
   let proxy = false;
   for (let i = 0; i < sources.length; i++) {
@@ -1292,28 +1305,45 @@ function mergeProps(...sources) {
     }, propTraps);
   }
   const target = {};
+  const sourcesMap = {};
+  const defined = new Set();
   for (let i = sources.length - 1; i >= 0; i--) {
-    if (sources[i]) {
-      const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-      for (const key in descriptors) {
-        if (key in target) continue;
-        Object.defineProperty(target, key, {
-          enumerable: true,
-          get() {
-            for (let i = sources.length - 1; i >= 0; i--) {
-              const v = (sources[i] || {})[key];
-              if (v !== undefined) return v;
-            }
+    const source = sources[i];
+    if (!source) continue;
+    const sourceKeys = Object.getOwnPropertyNames(source);
+    for (let i = 0, length = sourceKeys.length; i < length; i++) {
+      const key = sourceKeys[i];
+      if (key === "__proto__" || key === "constructor") continue;
+      const desc = Object.getOwnPropertyDescriptor(source, key);
+      if (!defined.has(key)) {
+        if (desc.get) {
+          defined.add(key);
+          Object.defineProperty(target, key, {
+            enumerable: true,
+            configurable: true,
+            get: resolveSources.bind(sourcesMap[key] = [desc.get.bind(source)])
+          });
+        } else {
+          if (desc.value !== undefined) defined.add(key);
+          target[key] = desc.value;
+        }
+      } else {
+        const sources = sourcesMap[key];
+        if (sources) {
+          if (desc.get) {
+            sources.push(desc.get.bind(source));
+          } else if (desc.value !== undefined) {
+            sources.push(() => desc.value);
           }
-        });
+        } else if (target[key] === undefined) target[key] = desc.value;
       }
     }
   }
   return target;
 }
 function splitProps(props, ...keys) {
-  const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
   if ($PROXY in props) {
+    const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
     const res = keys.map(k => {
       return new Proxy({
         get(property) {
@@ -1340,25 +1370,25 @@ function splitProps(props, ...keys) {
     }, propTraps));
     return res;
   }
-  const descriptors = Object.getOwnPropertyDescriptors(props);
-  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 (!(key in props)) continue;
-      Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
-        get() {
-          return props[key];
-        },
-        set() {
-          return true;
-        },
-        enumerable: true
-      });
+  const otherObject = {};
+  const objects = keys.map(() => ({}));
+  for (const propName of Object.getOwnPropertyNames(props)) {
+    const desc = Object.getOwnPropertyDescriptor(props, propName);
+    const isDefaultDesc = !desc.get && !desc.set && desc.enumerable && desc.writable && desc.configurable;
+    let blocked = false;
+    let objectIndex = 0;
+    for (const k of keys) {
+      if (k.includes(propName)) {
+        blocked = true;
+        isDefaultDesc ? objects[objectIndex][propName] = desc.value : Object.defineProperty(objects[objectIndex], propName, desc);
+      }
+      ++objectIndex;
     }
-    return clone;
-  });
+    if (!blocked) {
+      isDefaultDesc ? otherObject[propName] = desc.value : Object.defineProperty(otherObject, propName, desc);
+    }
+  }
+  return [...objects, otherObject];
 }
 function lazy(fn) {
   let comp;

package/dist/server.cjs

@@ -12,11 +12,15 @@ function castError(err) {
     cause: err
   });
 }
-function handleError(err) {
+function handleError(err, owner = Owner) {
+  const fns = lookup(owner, ERROR);
   const error = castError(err);
-  const fns = lookup(Owner, ERROR);
   if (!fns) throw error;
-  for (const f of fns) f(error);
+  try {
+    for (const f of fns) f(error);
+  } catch (e) {
+    handleError(e, owner?.owner || null);
+  }
 }
 const UNOWNED = {
   context: null,

package/dist/server.js

@@ -10,11 +10,15 @@ function castError(err) {
     cause: err
   });
 }
-function handleError(err) {
+function handleError(err, owner = Owner) {
+  const fns = lookup(owner, ERROR);
   const error = castError(err);
-  const fns = lookup(Owner, ERROR);
   if (!fns) throw error;
-  for (const f of fns) f(error);
+  try {
+    for (const f of fns) f(error);
+  } catch (e) {
+    handleError(e, owner?.owner || null);
+  }
 }
 const UNOWNED = {
   context: null,

package/dist/solid.cjs

@@ -271,7 +271,7 @@ function createResource(pSource, pFetcher, pOptions) {
   function loadEnd(p, v, error, key) {
     if (pr === p) {
       pr = null;
-      resolved = true;
+      key !== undefined && (resolved = true);
       if ((p === initP || v === initP) && options.onHydrated) queueMicrotask(() => options.onHydrated(key, {
         value: v
       }));
@@ -290,7 +290,7 @@ function createResource(pSource, pFetcher, pOptions) {
   function completeLoad(v, err) {
     runUpdates(() => {
       if (err === undefined) setValue(() => v);
-      setState(err !== undefined ? "errored" : "ready");
+      setState(err !== undefined ? "errored" : resolved ? "ready" : "unresolved");
       setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -917,19 +917,26 @@ function castError(err) {
     cause: err
   });
 }
-function runErrors(fns, err) {
-  for (const f of fns) f(err);
-}
-function handleError(err) {
-  const fns = ERROR && lookup(Owner, ERROR);
-  if (!fns) throw err;
+function handleError(err, owner = Owner) {
+  const fns = ERROR && lookup(owner, ERROR);
   const error = castError(err);
+  if (!fns) throw error;
   if (Effects) Effects.push({
     fn() {
-      runErrors(fns, error);
+      try {
+        for (const f of fns) f(error);
+      } catch (e) {
+        handleError(e, owner?.owner || null);
+      }
     },
     state: STALE
-  });else runErrors(fns, error);
+  });else {
+    try {
+      for (const f of fns) f(error);
+    } catch (e) {
+      handleError(e, owner?.owner || null);
+    }
+  }
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1220,6 +1227,12 @@ const propTraps = {
 function resolveSource(s) {
   return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
+function resolveSources() {
+  for (let i = 0, length = this.length; i < length; ++i) {
+    const v = this[i]();
+    if (v !== undefined) return v;
+  }
+}
 function mergeProps(...sources) {
   let proxy = false;
   for (let i = 0; i < sources.length; i++) {
@@ -1249,28 +1262,45 @@ function mergeProps(...sources) {
     }, propTraps);
   }
   const target = {};
+  const sourcesMap = {};
+  const defined = new Set();
   for (let i = sources.length - 1; i >= 0; i--) {
-    if (sources[i]) {
-      const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-      for (const key in descriptors) {
-        if (key in target) continue;
-        Object.defineProperty(target, key, {
-          enumerable: true,
-          get() {
-            for (let i = sources.length - 1; i >= 0; i--) {
-              const v = (sources[i] || {})[key];
-              if (v !== undefined) return v;
-            }
+    const source = sources[i];
+    if (!source) continue;
+    const sourceKeys = Object.getOwnPropertyNames(source);
+    for (let i = 0, length = sourceKeys.length; i < length; i++) {
+      const key = sourceKeys[i];
+      if (key === "__proto__" || key === "constructor") continue;
+      const desc = Object.getOwnPropertyDescriptor(source, key);
+      if (!defined.has(key)) {
+        if (desc.get) {
+          defined.add(key);
+          Object.defineProperty(target, key, {
+            enumerable: true,
+            configurable: true,
+            get: resolveSources.bind(sourcesMap[key] = [desc.get.bind(source)])
+          });
+        } else {
+          if (desc.value !== undefined) defined.add(key);
+          target[key] = desc.value;
+        }
+      } else {
+        const sources = sourcesMap[key];
+        if (sources) {
+          if (desc.get) {
+            sources.push(desc.get.bind(source));
+          } else if (desc.value !== undefined) {
+            sources.push(() => desc.value);
           }
-        });
+        } else if (target[key] === undefined) target[key] = desc.value;
       }
     }
   }
   return target;
 }
 function splitProps(props, ...keys) {
-  const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
   if ($PROXY in props) {
+    const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
     const res = keys.map(k => {
       return new Proxy({
         get(property) {
@@ -1297,25 +1327,25 @@ function splitProps(props, ...keys) {
     }, propTraps));
     return res;
   }
-  const descriptors = Object.getOwnPropertyDescriptors(props);
-  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 (!(key in props)) continue;
-      Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
-        get() {
-          return props[key];
-        },
-        set() {
-          return true;
-        },
-        enumerable: true
-      });
+  const otherObject = {};
+  const objects = keys.map(() => ({}));
+  for (const propName of Object.getOwnPropertyNames(props)) {
+    const desc = Object.getOwnPropertyDescriptor(props, propName);
+    const isDefaultDesc = !desc.get && !desc.set && desc.enumerable && desc.writable && desc.configurable;
+    let blocked = false;
+    let objectIndex = 0;
+    for (const k of keys) {
+      if (k.includes(propName)) {
+        blocked = true;
+        isDefaultDesc ? objects[objectIndex][propName] = desc.value : Object.defineProperty(objects[objectIndex], propName, desc);
+      }
+      ++objectIndex;
     }
-    return clone;
-  });
+    if (!blocked) {
+      isDefaultDesc ? otherObject[propName] = desc.value : Object.defineProperty(otherObject, propName, desc);
+    }
+  }
+  return [...objects, otherObject];
 }
 function lazy(fn) {
   let comp;