solid-js 1.7.6 → 1.7.8

package/dist/dev.cjs

@@ -880,7 +880,18 @@ function runUserEffects(queue) {
     const e = queue[i];
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
-  if (sharedConfig.context) setHydrateContext();
+  if (sharedConfig.context) {
+    if (sharedConfig.count) {
+      sharedConfig.effects || (sharedConfig.effects = []);
+      sharedConfig.effects.push(...queue.slice(0, userLength));
+      return;
+    } else if (sharedConfig.effects) {
+      queue = [...sharedConfig.effects, ...queue];
+      userLength += sharedConfig.effects.length;
+      delete sharedConfig.effects;
+    }
+    setHydrateContext();
+  }
   for (i = 0; i < userLength; i++) runTop(queue[i]);
 }
 function lookUpstream(node, ignore) {
@@ -958,19 +969,23 @@ function castError(err) {
     cause: err
   });
 }
-function runErrors(fns, err) {
-  for (const f of fns) f(err);
+function runErrors(err, fns, owner) {
+  try {
+    for (const f of fns) f(err);
+  } catch (e) {
+    handleError(e, owner && owner.owner || null);
+  }
 }
-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);
+      runErrors(error, fns, owner);
     },
     state: STALE
-  });else runErrors(fns, error);
+  });else runErrors(error, fns, owner);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1301,28 +1316,29 @@ function mergeProps(...sources) {
   }
   const target = {};
   const sourcesMap = {};
-  let someNonTargetKey = false;
+  const defined = new Set();
   for (let i = sources.length - 1; i >= 0; i--) {
     const source = sources[i];
     if (!source) continue;
     const sourceKeys = Object.getOwnPropertyNames(source);
-    someNonTargetKey = someNonTargetKey || i !== 0 && !!sourceKeys.length;
     for (let i = 0, length = sourceKeys.length; i < length; i++) {
       const key = sourceKeys[i];
-      if (key === "__proto__" || key === "constructor") {
-        continue;
-      } else if (!(key in target)) {
-        const desc = Object.getOwnPropertyDescriptor(source, key);
+      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 target[key] = desc.value;
+        } else {
+          if (desc.value !== undefined) defined.add(key);
+          target[key] = desc.value;
+        }
       } else {
         const sources = sourcesMap[key];
-        const desc = Object.getOwnPropertyDescriptor(source, key);
         if (sources) {
           if (desc.get) {
             sources.push(desc.get.bind(source));
@@ -1391,8 +1407,11 @@ function lazy(fn) {
     const ctx = sharedConfig.context;
     if (ctx) {
       const [s, set] = createSignal();
+      sharedConfig.count || (sharedConfig.count = 0);
+      sharedConfig.count++;
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
+        sharedConfig.count--;
         set(() => mod.default);
         setHydrateContext();
       });

package/dist/dev.js

@@ -878,7 +878,18 @@ function runUserEffects(queue) {
     const e = queue[i];
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
-  if (sharedConfig.context) setHydrateContext();
+  if (sharedConfig.context) {
+    if (sharedConfig.count) {
+      sharedConfig.effects || (sharedConfig.effects = []);
+      sharedConfig.effects.push(...queue.slice(0, userLength));
+      return;
+    } else if (sharedConfig.effects) {
+      queue = [...sharedConfig.effects, ...queue];
+      userLength += sharedConfig.effects.length;
+      delete sharedConfig.effects;
+    }
+    setHydrateContext();
+  }
   for (i = 0; i < userLength; i++) runTop(queue[i]);
 }
 function lookUpstream(node, ignore) {
@@ -956,19 +967,23 @@ function castError(err) {
     cause: err
   });
 }
-function runErrors(fns, err) {
-  for (const f of fns) f(err);
+function runErrors(err, fns, owner) {
+  try {
+    for (const f of fns) f(err);
+  } catch (e) {
+    handleError(e, owner && owner.owner || null);
+  }
 }
-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);
+      runErrors(error, fns, owner);
     },
     state: STALE
-  });else runErrors(fns, error);
+  });else runErrors(error, fns, owner);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1299,28 +1314,29 @@ function mergeProps(...sources) {
   }
   const target = {};
   const sourcesMap = {};
-  let someNonTargetKey = false;
+  const defined = new Set();
   for (let i = sources.length - 1; i >= 0; i--) {
     const source = sources[i];
     if (!source) continue;
     const sourceKeys = Object.getOwnPropertyNames(source);
-    someNonTargetKey = someNonTargetKey || i !== 0 && !!sourceKeys.length;
     for (let i = 0, length = sourceKeys.length; i < length; i++) {
       const key = sourceKeys[i];
-      if (key === "__proto__" || key === "constructor") {
-        continue;
-      } else if (!(key in target)) {
-        const desc = Object.getOwnPropertyDescriptor(source, key);
+      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 target[key] = desc.value;
+        } else {
+          if (desc.value !== undefined) defined.add(key);
+          target[key] = desc.value;
+        }
       } else {
         const sources = sourcesMap[key];
-        const desc = Object.getOwnPropertyDescriptor(source, key);
         if (sources) {
           if (desc.get) {
             sources.push(desc.get.bind(source));
@@ -1389,8 +1405,11 @@ function lazy(fn) {
     const ctx = sharedConfig.context;
     if (ctx) {
       const [s, set] = createSignal();
+      sharedConfig.count || (sharedConfig.count = 0);
+      sharedConfig.count++;
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
+        sharedConfig.count--;
         set(() => mod.default);
         setHydrateContext();
       });

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.owner || null);
+  }
 }
 const UNOWNED = {
   context: null,
@@ -420,7 +424,7 @@ function ErrorBoundary(props) {
   if (error) return displayFallback();
   sync = false;
   return {
-    t: `<!!$e${id}>${resolveSSRNode(res)}<!!$/e${id}>`
+    t: `<!--!$e${id}-->${resolveSSRNode(res)}<!--!$/e${id}-->`
   };
 }
 const SuspenseContext = createContext();
@@ -631,7 +635,7 @@ function Suspense(props) {
         noHydrate: true
       });
       const res = {
-        t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!pl-${id}>`
+        t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!--pl-${id}-->`
       };
       setHydrateContext(ctx);
       return res;

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.owner || null);
+  }
 }
 const UNOWNED = {
   context: null,
@@ -418,7 +422,7 @@ function ErrorBoundary(props) {
   if (error) return displayFallback();
   sync = false;
   return {
-    t: `<!!$e${id}>${resolveSSRNode(res)}<!!$/e${id}>`
+    t: `<!--!$e${id}-->${resolveSSRNode(res)}<!--!$/e${id}-->`
   };
 }
 const SuspenseContext = createContext();
@@ -629,7 +633,7 @@ function Suspense(props) {
         noHydrate: true
       });
       const res = {
-        t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!pl-${id}>`
+        t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!--pl-${id}-->`
       };
       setHydrateContext(ctx);
       return res;

package/dist/solid.cjs

@@ -840,7 +840,18 @@ function runUserEffects(queue) {
     const e = queue[i];
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
-  if (sharedConfig.context) setHydrateContext();
+  if (sharedConfig.context) {
+    if (sharedConfig.count) {
+      sharedConfig.effects || (sharedConfig.effects = []);
+      sharedConfig.effects.push(...queue.slice(0, userLength));
+      return;
+    } else if (sharedConfig.effects) {
+      queue = [...sharedConfig.effects, ...queue];
+      userLength += sharedConfig.effects.length;
+      delete sharedConfig.effects;
+    }
+    setHydrateContext();
+  }
   for (i = 0; i < userLength; i++) runTop(queue[i]);
 }
 function lookUpstream(node, ignore) {
@@ -917,19 +928,23 @@ function castError(err) {
     cause: err
   });
 }
-function runErrors(fns, err) {
-  for (const f of fns) f(err);
+function runErrors(err, fns, owner) {
+  try {
+    for (const f of fns) f(err);
+  } catch (e) {
+    handleError(e, owner && owner.owner || null);
+  }
 }
-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);
+      runErrors(error, fns, owner);
     },
     state: STALE
-  });else runErrors(fns, error);
+  });else runErrors(error, fns, owner);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1256,28 +1271,29 @@ function mergeProps(...sources) {
   }
   const target = {};
   const sourcesMap = {};
-  let someNonTargetKey = false;
+  const defined = new Set();
   for (let i = sources.length - 1; i >= 0; i--) {
     const source = sources[i];
     if (!source) continue;
     const sourceKeys = Object.getOwnPropertyNames(source);
-    someNonTargetKey = someNonTargetKey || i !== 0 && !!sourceKeys.length;
     for (let i = 0, length = sourceKeys.length; i < length; i++) {
       const key = sourceKeys[i];
-      if (key === "__proto__" || key === "constructor") {
-        continue;
-      } else if (!(key in target)) {
-        const desc = Object.getOwnPropertyDescriptor(source, key);
+      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 target[key] = desc.value;
+        } else {
+          if (desc.value !== undefined) defined.add(key);
+          target[key] = desc.value;
+        }
       } else {
         const sources = sourcesMap[key];
-        const desc = Object.getOwnPropertyDescriptor(source, key);
         if (sources) {
           if (desc.get) {
             sources.push(desc.get.bind(source));
@@ -1346,8 +1362,11 @@ function lazy(fn) {
     const ctx = sharedConfig.context;
     if (ctx) {
       const [s, set] = createSignal();
+      sharedConfig.count || (sharedConfig.count = 0);
+      sharedConfig.count++;
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
+        sharedConfig.count--;
         set(() => mod.default);
         setHydrateContext();
       });

package/dist/solid.js

@@ -838,7 +838,18 @@ function runUserEffects(queue) {
     const e = queue[i];
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
-  if (sharedConfig.context) setHydrateContext();
+  if (sharedConfig.context) {
+    if (sharedConfig.count) {
+      sharedConfig.effects || (sharedConfig.effects = []);
+      sharedConfig.effects.push(...queue.slice(0, userLength));
+      return;
+    } else if (sharedConfig.effects) {
+      queue = [...sharedConfig.effects, ...queue];
+      userLength += sharedConfig.effects.length;
+      delete sharedConfig.effects;
+    }
+    setHydrateContext();
+  }
   for (i = 0; i < userLength; i++) runTop(queue[i]);
 }
 function lookUpstream(node, ignore) {
@@ -915,19 +926,23 @@ function castError(err) {
     cause: err
   });
 }
-function runErrors(fns, err) {
-  for (const f of fns) f(err);
+function runErrors(err, fns, owner) {
+  try {
+    for (const f of fns) f(err);
+  } catch (e) {
+    handleError(e, owner && owner.owner || null);
+  }
 }
-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);
+      runErrors(error, fns, owner);
     },
     state: STALE
-  });else runErrors(fns, error);
+  });else runErrors(error, fns, owner);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1254,28 +1269,29 @@ function mergeProps(...sources) {
   }
   const target = {};
   const sourcesMap = {};
-  let someNonTargetKey = false;
+  const defined = new Set();
   for (let i = sources.length - 1; i >= 0; i--) {
     const source = sources[i];
     if (!source) continue;
     const sourceKeys = Object.getOwnPropertyNames(source);
-    someNonTargetKey = someNonTargetKey || i !== 0 && !!sourceKeys.length;
     for (let i = 0, length = sourceKeys.length; i < length; i++) {
       const key = sourceKeys[i];
-      if (key === "__proto__" || key === "constructor") {
-        continue;
-      } else if (!(key in target)) {
-        const desc = Object.getOwnPropertyDescriptor(source, key);
+      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 target[key] = desc.value;
+        } else {
+          if (desc.value !== undefined) defined.add(key);
+          target[key] = desc.value;
+        }
       } else {
         const sources = sourcesMap[key];
-        const desc = Object.getOwnPropertyDescriptor(source, key);
         if (sources) {
           if (desc.get) {
             sources.push(desc.get.bind(source));
@@ -1344,8 +1360,11 @@ function lazy(fn) {
     const ctx = sharedConfig.context;
     if (ctx) {
       const [s, set] = createSignal();
+      sharedConfig.count || (sharedConfig.count = 0);
+      sharedConfig.count++;
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
+        sharedConfig.count--;
         set(() => mod.default);
         setHydrateContext();
       });