solid-js 1.6.3 → 1.6.5

package/dist/dev.cjs

@@ -1266,7 +1266,13 @@ function resolveSource(s) {
   return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
-  if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
+  let proxy = false;
+  for (let i = 0; i < sources.length; i++) {
+    const s = sources[i];
+    proxy = proxy || !!s && $PROXY in s;
+    sources[i] = typeof s === "function" ? (proxy = true, createMemo(s)) : s;
+  }
+  if (proxy) {
     return new Proxy({
       get(property) {
         for (let i = sources.length - 1; i >= 0; i--) {
@@ -1360,9 +1366,6 @@ function lazy(fn) {
     } else if (!comp) {
       const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
-    } else {
-      const c = comp();
-      if (c) return c(props);
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {

package/dist/dev.js

@@ -1262,7 +1262,13 @@ function resolveSource(s) {
   return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
-  if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
+  let proxy = false;
+  for (let i = 0; i < sources.length; i++) {
+    const s = sources[i];
+    proxy = proxy || !!s && $PROXY in s;
+    sources[i] = typeof s === "function" ? (proxy = true, createMemo(s)) : s;
+  }
+  if (proxy) {
     return new Proxy({
       get(property) {
         for (let i = sources.length - 1; i >= 0; i--) {
@@ -1356,9 +1362,6 @@ function lazy(fn) {
     } else if (!comp) {
       const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
-    } else {
-      const c = comp();
-      if (c) return c(props);
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {

package/dist/server.cjs

@@ -299,7 +299,9 @@ function mergeProps(...sources) {
           enumerable: true,
           get() {
             for (let i = sources.length - 1; i >= 0; i--) {
-              const v = (sources[i] || {})[key];
+              let s = sources[i] || {};
+              if (typeof s === "function") s = s();
+              const v = s[key];
               if (v !== undefined) return v;
             }
           }

package/dist/server.js

@@ -295,7 +295,9 @@ function mergeProps(...sources) {
           enumerable: true,
           get() {
             for (let i = sources.length - 1; i >= 0; i--) {
-              const v = (sources[i] || {})[key];
+              let s = sources[i] || {};
+              if (typeof s === "function") s = s();
+              const v = s[key];
               if (v !== undefined) return v;
             }
           }

package/dist/solid.cjs

@@ -1174,7 +1174,13 @@ function resolveSource(s) {
   return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
-  if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
+  let proxy = false;
+  for (let i = 0; i < sources.length; i++) {
+    const s = sources[i];
+    proxy = proxy || !!s && $PROXY in s;
+    sources[i] = typeof s === "function" ? (proxy = true, createMemo(s)) : s;
+  }
+  if (proxy) {
     return new Proxy({
       get(property) {
         for (let i = sources.length - 1; i >= 0; i--) {
@@ -1268,9 +1274,6 @@ function lazy(fn) {
     } else if (!comp) {
       const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
-    } else {
-      const c = comp();
-      if (c) return c(props);
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {

package/dist/solid.js

@@ -1170,7 +1170,13 @@ function resolveSource(s) {
   return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
-  if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
+  let proxy = false;
+  for (let i = 0; i < sources.length; i++) {
+    const s = sources[i];
+    proxy = proxy || !!s && $PROXY in s;
+    sources[i] = typeof s === "function" ? (proxy = true, createMemo(s)) : s;
+  }
+  if (proxy) {
     return new Proxy({
       get(property) {
         for (let i = sources.length - 1; i >= 0; i--) {
@@ -1264,9 +1270,6 @@ function lazy(fn) {
     } else if (!comp) {
       const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
-    } else {
-      const c = comp();
-      if (c) return c(props);
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",

package/store/dist/dev.cjs

@@ -331,14 +331,14 @@ function applyState(target, parent, property, merge, key) {
     return;
   }
   if (Array.isArray(target)) {
-    if (target.length && previous.length && (!merge || key && target[0][key] != null)) {
+    if (target.length && previous.length && (!merge || key && target[0] && target[0][key] != null)) {
       let i, j, start, end, newEnd, item, newIndicesNext, keyVal;
-      for (start = 0, end = Math.min(previous.length, target.length); start < end && (previous[start] === target[start] || key && previous[start][key] === target[start][key]); start++) {
+      for (start = 0, end = Math.min(previous.length, target.length); start < end && (previous[start] === target[start] || key && previous[start] && target[start] && previous[start][key] === target[start][key]); start++) {
         applyState(target[start], previous, start, merge, key);
       }
       const temp = new Array(target.length),
             newIndices = new Map();
-      for (end = previous.length - 1, newEnd = target.length - 1; end >= start && newEnd >= start && (previous[end] === target[newEnd] || key && previous[end][key] === target[newEnd][key]); end--, newEnd--) {
+      for (end = previous.length - 1, newEnd = target.length - 1; end >= start && newEnd >= start && (previous[end] === target[newEnd] || key && previous[start] && target[start] && previous[end][key] === target[newEnd][key]); end--, newEnd--) {
         temp[newEnd] = previous[end];
       }
       if (start > newEnd || start > end) {
@@ -353,14 +353,14 @@ function applyState(target, parent, property, merge, key) {
       newIndicesNext = new Array(newEnd + 1);
       for (j = newEnd; j >= start; j--) {
         item = target[j];
-        keyVal = key ? item[key] : item;
+        keyVal = key && item ? item[key] : item;
         i = newIndices.get(keyVal);
         newIndicesNext[j] = i === undefined ? -1 : i;
         newIndices.set(keyVal, j);
       }
       for (i = start; i <= end; i++) {
         item = previous[i];
-        keyVal = key ? item[key] : item;
+        keyVal = key && item ? item[key] : item;
         j = newIndices.get(keyVal);
         if (j !== undefined && j !== -1) {
           temp[j] = previous[i];

package/store/dist/dev.js

@@ -327,14 +327,14 @@ function applyState(target, parent, property, merge, key) {
     return;
   }
   if (Array.isArray(target)) {
-    if (target.length && previous.length && (!merge || key && target[0][key] != null)) {
+    if (target.length && previous.length && (!merge || key && target[0] && target[0][key] != null)) {
       let i, j, start, end, newEnd, item, newIndicesNext, keyVal;
-      for (start = 0, end = Math.min(previous.length, target.length); start < end && (previous[start] === target[start] || key && previous[start][key] === target[start][key]); start++) {
+      for (start = 0, end = Math.min(previous.length, target.length); start < end && (previous[start] === target[start] || key && previous[start] && target[start] && previous[start][key] === target[start][key]); start++) {
         applyState(target[start], previous, start, merge, key);
       }
       const temp = new Array(target.length),
             newIndices = new Map();
-      for (end = previous.length - 1, newEnd = target.length - 1; end >= start && newEnd >= start && (previous[end] === target[newEnd] || key && previous[end][key] === target[newEnd][key]); end--, newEnd--) {
+      for (end = previous.length - 1, newEnd = target.length - 1; end >= start && newEnd >= start && (previous[end] === target[newEnd] || key && previous[start] && target[start] && previous[end][key] === target[newEnd][key]); end--, newEnd--) {
         temp[newEnd] = previous[end];
       }
       if (start > newEnd || start > end) {
@@ -349,14 +349,14 @@ function applyState(target, parent, property, merge, key) {
       newIndicesNext = new Array(newEnd + 1);
       for (j = newEnd; j >= start; j--) {
         item = target[j];
-        keyVal = key ? item[key] : item;
+        keyVal = key && item ? item[key] : item;
         i = newIndices.get(keyVal);
         newIndicesNext[j] = i === undefined ? -1 : i;
         newIndices.set(keyVal, j);
       }
       for (i = start; i <= end; i++) {
         item = previous[i];
-        keyVal = key ? item[key] : item;
+        keyVal = key && item ? item[key] : item;
         j = newIndices.get(keyVal);
         if (j !== undefined && j !== -1) {
           temp[j] = previous[i];

package/store/dist/store.cjs

@@ -308,14 +308,14 @@ function applyState(target, parent, property, merge, key) {
     return;
   }
   if (Array.isArray(target)) {
-    if (target.length && previous.length && (!merge || key && target[0][key] != null)) {
+    if (target.length && previous.length && (!merge || key && target[0] && target[0][key] != null)) {
       let i, j, start, end, newEnd, item, newIndicesNext, keyVal;
-      for (start = 0, end = Math.min(previous.length, target.length); start < end && (previous[start] === target[start] || key && previous[start][key] === target[start][key]); start++) {
+      for (start = 0, end = Math.min(previous.length, target.length); start < end && (previous[start] === target[start] || key && previous[start] && target[start] && previous[start][key] === target[start][key]); start++) {
         applyState(target[start], previous, start, merge, key);
       }
       const temp = new Array(target.length),
             newIndices = new Map();
-      for (end = previous.length - 1, newEnd = target.length - 1; end >= start && newEnd >= start && (previous[end] === target[newEnd] || key && previous[end][key] === target[newEnd][key]); end--, newEnd--) {
+      for (end = previous.length - 1, newEnd = target.length - 1; end >= start && newEnd >= start && (previous[end] === target[newEnd] || key && previous[start] && target[start] && previous[end][key] === target[newEnd][key]); end--, newEnd--) {
         temp[newEnd] = previous[end];
       }
       if (start > newEnd || start > end) {
@@ -330,14 +330,14 @@ function applyState(target, parent, property, merge, key) {
       newIndicesNext = new Array(newEnd + 1);
       for (j = newEnd; j >= start; j--) {
         item = target[j];
-        keyVal = key ? item[key] : item;
+        keyVal = key && item ? item[key] : item;
         i = newIndices.get(keyVal);
         newIndicesNext[j] = i === undefined ? -1 : i;
         newIndices.set(keyVal, j);
       }
       for (i = start; i <= end; i++) {
         item = previous[i];
-        keyVal = key ? item[key] : item;
+        keyVal = key && item ? item[key] : item;
         j = newIndices.get(keyVal);
         if (j !== undefined && j !== -1) {
           temp[j] = previous[i];

package/store/dist/store.js

@@ -304,14 +304,14 @@ function applyState(target, parent, property, merge, key) {
     return;
   }
   if (Array.isArray(target)) {
-    if (target.length && previous.length && (!merge || key && target[0][key] != null)) {
+    if (target.length && previous.length && (!merge || key && target[0] && target[0][key] != null)) {
       let i, j, start, end, newEnd, item, newIndicesNext, keyVal;
-      for (start = 0, end = Math.min(previous.length, target.length); start < end && (previous[start] === target[start] || key && previous[start][key] === target[start][key]); start++) {
+      for (start = 0, end = Math.min(previous.length, target.length); start < end && (previous[start] === target[start] || key && previous[start] && target[start] && previous[start][key] === target[start][key]); start++) {
         applyState(target[start], previous, start, merge, key);
       }
       const temp = new Array(target.length),
             newIndices = new Map();
-      for (end = previous.length - 1, newEnd = target.length - 1; end >= start && newEnd >= start && (previous[end] === target[newEnd] || key && previous[end][key] === target[newEnd][key]); end--, newEnd--) {
+      for (end = previous.length - 1, newEnd = target.length - 1; end >= start && newEnd >= start && (previous[end] === target[newEnd] || key && previous[start] && target[start] && previous[end][key] === target[newEnd][key]); end--, newEnd--) {
         temp[newEnd] = previous[end];
       }
       if (start > newEnd || start > end) {
@@ -326,14 +326,14 @@ function applyState(target, parent, property, merge, key) {
       newIndicesNext = new Array(newEnd + 1);
       for (j = newEnd; j >= start; j--) {
         item = target[j];
-        keyVal = key ? item[key] : item;
+        keyVal = key && item ? item[key] : item;
         i = newIndices.get(keyVal);
         newIndicesNext[j] = i === undefined ? -1 : i;
         newIndices.set(keyVal, j);
       }
       for (i = start; i <= end; i++) {
         item = previous[i];
-        keyVal = key ? item[key] : item;
+        keyVal = key && item ? item[key] : item;
         j = newIndices.get(keyVal);
         if (j !== undefined && j !== -1) {
           temp[j] = previous[i];