npm - solid-js - Versions diffs - 1.6.0 → 1.6.1 - Mend

solid-js 1.6.0 → 1.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/dev.cjs CHANGED Viewed

@@ -296,8 +296,8 @@ function createResource(pSource, pFetcher, pOptions) {
   function completeLoad(v, err) {
     runUpdates(() => {
       if (!err) setValue(() => v);
-      setError(err);
       setState(err ? "errored" : "ready");
+      setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
@@ -1281,10 +1281,21 @@ function mergeProps(...sources) {
     }, propTraps);
   }
   const target = {};
-  for (let i = 0; i < sources.length; i++) {
+  for (let i = sources.length - 1; i >= 0; i--) {
     if (sources[i]) {
       const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-      Object.defineProperties(target, descriptors);
+      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;
+            }
+          }
+        });
+      }
     }
   }
   return target;
@@ -1298,13 +1309,15 @@ function splitProps(props, ...keys) {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
       const key = k[i];
+      if (!isProxy && !(key in props)) continue;
       Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
         get() {
           return props[key];
         },
         set() {
           return true;
-        }
+        },
+        enumerable: true
       });
     }
     return clone;

package/dist/dev.js CHANGED Viewed

@@ -292,8 +292,8 @@ function createResource(pSource, pFetcher, pOptions) {
   function completeLoad(v, err) {
     runUpdates(() => {
       if (!err) setValue(() => v);
-      setError(err);
       setState(err ? "errored" : "ready");
+      setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
@@ -1277,10 +1277,21 @@ function mergeProps(...sources) {
     }, propTraps);
   }
   const target = {};
-  for (let i = 0; i < sources.length; i++) {
+  for (let i = sources.length - 1; i >= 0; i--) {
     if (sources[i]) {
       const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-      Object.defineProperties(target, descriptors);
+      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;
+            }
+          }
+        });
+      }
     }
   }
   return target;
@@ -1294,13 +1305,15 @@ function splitProps(props, ...keys) {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
       const key = k[i];
+      if (!isProxy && !(key in props)) continue;
       Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
         get() {
           return props[key];
         },
         set() {
           return true;
-        }
+        },
+        enumerable: true
       });
     }
     return clone;

package/dist/solid.cjs CHANGED Viewed

@@ -288,8 +288,8 @@ function createResource(pSource, pFetcher, pOptions) {
   function completeLoad(v, err) {
     runUpdates(() => {
       if (!err) setValue(() => v);
-      setError(err);
       setState(err ? "errored" : "ready");
+      setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
@@ -1195,10 +1195,21 @@ function mergeProps(...sources) {
     }, propTraps);
   }
   const target = {};
-  for (let i = 0; i < sources.length; i++) {
+  for (let i = sources.length - 1; i >= 0; i--) {
     if (sources[i]) {
       const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-      Object.defineProperties(target, descriptors);
+      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;
+            }
+          }
+        });
+      }
     }
   }
   return target;
@@ -1212,13 +1223,15 @@ function splitProps(props, ...keys) {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
       const key = k[i];
+      if (!isProxy && !(key in props)) continue;
       Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
         get() {
           return props[key];
         },
         set() {
           return true;
-        }
+        },
+        enumerable: true
       });
     }
     return clone;

package/dist/solid.js CHANGED Viewed

@@ -284,8 +284,8 @@ function createResource(pSource, pFetcher, pOptions) {
   function completeLoad(v, err) {
     runUpdates(() => {
       if (!err) setValue(() => v);
-      setError(err);
       setState(err ? "errored" : "ready");
+      setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
@@ -1191,10 +1191,21 @@ function mergeProps(...sources) {
     }, propTraps);
   }
   const target = {};
-  for (let i = 0; i < sources.length; i++) {
+  for (let i = sources.length - 1; i >= 0; i--) {
     if (sources[i]) {
       const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-      Object.defineProperties(target, descriptors);
+      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;
+            }
+          }
+        });
+      }
     }
   }
   return target;
@@ -1208,13 +1219,15 @@ function splitProps(props, ...keys) {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
       const key = k[i];
+      if (!isProxy && !(key in props)) continue;
       Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
         get() {
           return props[key];
         },
         set() {
           return true;
-        }
+        },
+        enumerable: true
       });
     }
     return clone;

package/package.json CHANGED Viewed

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

package/store/dist/dev.cjs CHANGED Viewed

@@ -21,6 +21,7 @@ function wrap$1(value, name) {
         if (desc[prop].get) {
           const get = desc[prop].get.bind(p);
           Object.defineProperty(value, prop, {
+            enumerable: desc[prop].enumerable,
             get
           });
         }

package/store/dist/dev.js CHANGED Viewed

@@ -17,6 +17,7 @@ function wrap$1(value, name) {
         if (desc[prop].get) {
           const get = desc[prop].get.bind(p);
           Object.defineProperty(value, prop, {
+            enumerable: desc[prop].enumerable,
             get
           });
         }

package/store/dist/store.cjs CHANGED Viewed

@@ -21,6 +21,7 @@ function wrap$1(value, name) {
         if (desc[prop].get) {
           const get = desc[prop].get.bind(p);
           Object.defineProperty(value, prop, {
+            enumerable: desc[prop].enumerable,
             get
           });
         }

package/store/dist/store.js CHANGED Viewed

@@ -17,6 +17,7 @@ function wrap$1(value, name) {
         if (desc[prop].get) {
           const get = desc[prop].get.bind(p);
           Object.defineProperty(value, prop, {
+            enumerable: desc[prop].enumerable,
             get
           });
         }