solid-js 1.9.12 → 1.9.13

package/dist/dev.cjs

@@ -666,20 +666,23 @@ function readSignal() {
     }
   }
   if (Listener) {
-    const sSlot = this.observers ? this.observers.length : 0;
-    if (!Listener.sources) {
-      Listener.sources = [this];
-      Listener.sourceSlots = [sSlot];
-    } else {
-      Listener.sources.push(this);
-      Listener.sourceSlots.push(sSlot);
-    }
-    if (!this.observers) {
-      this.observers = [Listener];
-      this.observerSlots = [Listener.sources.length - 1];
-    } else {
-      this.observers.push(Listener);
-      this.observerSlots.push(Listener.sources.length - 1);
+    const observers = this.observers;
+    if (!observers || observers[observers.length - 1] !== Listener) {
+      const sSlot = observers ? observers.length : 0;
+      if (!Listener.sources) {
+        Listener.sources = [this];
+        Listener.sourceSlots = [sSlot];
+      } else {
+        Listener.sources.push(this);
+        Listener.sourceSlots.push(sSlot);
+      }
+      if (!observers) {
+        this.observers = [Listener];
+        this.observerSlots = [Listener.sources.length - 1];
+      } else {
+        observers.push(Listener);
+        this.observerSlots.push(Listener.sources.length - 1);
+      }
     }
   }
   if (runningTransition && Transition.sources.has(this)) return this.tValue;
@@ -1052,7 +1055,11 @@ function resolveChildren(children) {
     const results = [];
     for (let i = 0; i < children.length; i++) {
       const result = resolveChildren(children[i]);
-      Array.isArray(result) ? results.push.apply(results, result) : results.push(result);
+      if (Array.isArray(result)) {
+        if (result.length < 32768) results.push.apply(results, result);else for (let j = 0; j < result.length; j++) results.push(result[j]);
+      } else {
+        results.push(result);
+      }
     }
     return results;
   }

package/dist/dev.js

@@ -664,20 +664,23 @@ function readSignal() {
     }
   }
   if (Listener) {
-    const sSlot = this.observers ? this.observers.length : 0;
-    if (!Listener.sources) {
-      Listener.sources = [this];
-      Listener.sourceSlots = [sSlot];
-    } else {
-      Listener.sources.push(this);
-      Listener.sourceSlots.push(sSlot);
-    }
-    if (!this.observers) {
-      this.observers = [Listener];
-      this.observerSlots = [Listener.sources.length - 1];
-    } else {
-      this.observers.push(Listener);
-      this.observerSlots.push(Listener.sources.length - 1);
+    const observers = this.observers;
+    if (!observers || observers[observers.length - 1] !== Listener) {
+      const sSlot = observers ? observers.length : 0;
+      if (!Listener.sources) {
+        Listener.sources = [this];
+        Listener.sourceSlots = [sSlot];
+      } else {
+        Listener.sources.push(this);
+        Listener.sourceSlots.push(sSlot);
+      }
+      if (!observers) {
+        this.observers = [Listener];
+        this.observerSlots = [Listener.sources.length - 1];
+      } else {
+        observers.push(Listener);
+        this.observerSlots.push(Listener.sources.length - 1);
+      }
     }
   }
   if (runningTransition && Transition.sources.has(this)) return this.tValue;
@@ -1050,7 +1053,11 @@ function resolveChildren(children) {
     const results = [];
     for (let i = 0; i < children.length; i++) {
       const result = resolveChildren(children[i]);
-      Array.isArray(result) ? results.push.apply(results, result) : results.push(result);
+      if (Array.isArray(result)) {
+        if (result.length < 32768) results.push.apply(results, result);else for (let j = 0; j < result.length; j++) results.push(result[j]);
+      } else {
+        results.push(result);
+      }
     }
     return results;
   }

package/dist/server.cjs

@@ -192,7 +192,11 @@ function resolveChildren(children) {
     const results = [];
     for (let i = 0; i < children.length; i++) {
       const result = resolveChildren(children[i]);
-      Array.isArray(result) ? results.push.apply(results, result) : results.push(result);
+      if (Array.isArray(result)) {
+        if (result.length < 32768) results.push.apply(results, result);else for (let j = 0; j < result.length; j++) results.push(result[j]);
+      } else {
+        results.push(result);
+      }
     }
     return results;
   }

package/dist/server.js

@@ -190,7 +190,11 @@ function resolveChildren(children) {
     const results = [];
     for (let i = 0; i < children.length; i++) {
       const result = resolveChildren(children[i]);
-      Array.isArray(result) ? results.push.apply(results, result) : results.push(result);
+      if (Array.isArray(result)) {
+        if (result.length < 32768) results.push.apply(results, result);else for (let j = 0; j < result.length; j++) results.push(result[j]);
+      } else {
+        results.push(result);
+      }
     }
     return results;
   }

package/dist/solid.cjs

@@ -623,20 +623,23 @@ function readSignal() {
     }
   }
   if (Listener) {
-    const sSlot = this.observers ? this.observers.length : 0;
-    if (!Listener.sources) {
-      Listener.sources = [this];
-      Listener.sourceSlots = [sSlot];
-    } else {
-      Listener.sources.push(this);
-      Listener.sourceSlots.push(sSlot);
-    }
-    if (!this.observers) {
-      this.observers = [Listener];
-      this.observerSlots = [Listener.sources.length - 1];
-    } else {
-      this.observers.push(Listener);
-      this.observerSlots.push(Listener.sources.length - 1);
+    const observers = this.observers;
+    if (!observers || observers[observers.length - 1] !== Listener) {
+      const sSlot = observers ? observers.length : 0;
+      if (!Listener.sources) {
+        Listener.sources = [this];
+        Listener.sourceSlots = [sSlot];
+      } else {
+        Listener.sources.push(this);
+        Listener.sourceSlots.push(sSlot);
+      }
+      if (!observers) {
+        this.observers = [Listener];
+        this.observerSlots = [Listener.sources.length - 1];
+      } else {
+        observers.push(Listener);
+        this.observerSlots.push(Listener.sources.length - 1);
+      }
     }
   }
   if (runningTransition && Transition.sources.has(this)) return this.tValue;
@@ -1006,7 +1009,11 @@ function resolveChildren(children) {
     const results = [];
     for (let i = 0; i < children.length; i++) {
       const result = resolveChildren(children[i]);
-      Array.isArray(result) ? results.push.apply(results, result) : results.push(result);
+      if (Array.isArray(result)) {
+        if (result.length < 32768) results.push.apply(results, result);else for (let j = 0; j < result.length; j++) results.push(result[j]);
+      } else {
+        results.push(result);
+      }
     }
     return results;
   }

package/dist/solid.js

@@ -621,20 +621,23 @@ function readSignal() {
     }
   }
   if (Listener) {
-    const sSlot = this.observers ? this.observers.length : 0;
-    if (!Listener.sources) {
-      Listener.sources = [this];
-      Listener.sourceSlots = [sSlot];
-    } else {
-      Listener.sources.push(this);
-      Listener.sourceSlots.push(sSlot);
-    }
-    if (!this.observers) {
-      this.observers = [Listener];
-      this.observerSlots = [Listener.sources.length - 1];
-    } else {
-      this.observers.push(Listener);
-      this.observerSlots.push(Listener.sources.length - 1);
+    const observers = this.observers;
+    if (!observers || observers[observers.length - 1] !== Listener) {
+      const sSlot = observers ? observers.length : 0;
+      if (!Listener.sources) {
+        Listener.sources = [this];
+        Listener.sourceSlots = [sSlot];
+      } else {
+        Listener.sources.push(this);
+        Listener.sourceSlots.push(sSlot);
+      }
+      if (!observers) {
+        this.observers = [Listener];
+        this.observerSlots = [Listener.sources.length - 1];
+      } else {
+        observers.push(Listener);
+        this.observerSlots.push(Listener.sources.length - 1);
+      }
     }
   }
   if (runningTransition && Transition.sources.has(this)) return this.tValue;
@@ -1004,7 +1007,11 @@ function resolveChildren(children) {
     const results = [];
     for (let i = 0; i < children.length; i++) {
       const result = resolveChildren(children[i]);
-      Array.isArray(result) ? results.push.apply(results, result) : results.push(result);
+      if (Array.isArray(result)) {
+        if (result.length < 32768) results.push.apply(results, result);else for (let j = 0; j < result.length; j++) results.push(result[j]);
+      } else {
+        results.push(result);
+      }
     }
     return results;
   }

package/h/jsx-runtime/types/jsx.d.ts

@@ -140,14 +140,13 @@ export namespace JSX {
   interface IntrinsicAttributes {
     ref?: unknown | ((e: unknown) => void) | undefined;
   }
+  export type ClassList = {
+    [k: string]: boolean | undefined;
+  };
   interface CustomAttributes<T> {
     ref?: T | ((el: T) => void) | undefined;
     children?: FunctionMaybe<Element | undefined>;
-    classList?:
-      | {
-          [k: string]: boolean | undefined;
-        }
-      | undefined;
+    classList?: ClassList | undefined;
     $ServerOnly?: boolean | undefined;
   }
   type Accessor<T> = () => T;

package/html/types/lit.d.ts

@@ -1,4 +1,7 @@
 type MountableElement = Element | Document | ShadowRoot | DocumentFragment | Node;
+export type ClassList = {
+    [k: string]: boolean | undefined;
+};
 interface Runtime {
     effect<T>(fn: (prev?: T) => T, init?: T): any;
     untrack<T>(fn: () => T): T;
@@ -7,13 +10,7 @@ interface Runtime {
     createComponent(Comp: (props: any) => any, props: any): any;
     addEventListener(node: Element, name: string, handler: EventListener | EventListenerObject | (EventListenerObject & AddEventListenerOptions), delegate: boolean): void;
     delegateEvents(eventNames: string[]): void;
-    classList(node: Element, value: {
-        [k: string]: boolean;
-    }, prev?: {
-        [k: string]: boolean;
-    }): {
-        [k: string]: boolean;
-    };
+    classList(node: Element, value: ClassList, prev?: ClassList): ClassList;
     style(node: Element, value: {
         [k: string]: string;
     }, prev?: {

package/package.json

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

package/store/dist/dev.cjs

@@ -17,11 +17,20 @@ function wrap$1(value) {
     });
     if (!Array.isArray(value)) {
       const keys = Object.keys(value),
-        desc = Object.getOwnPropertyDescriptors(value);
+        desc = Object.getOwnPropertyDescriptors(value),
+        proto = Object.getPrototypeOf(value);
+      const isClass = proto !== null && value !== null && typeof value === "object" && !Array.isArray(value) && proto !== Object.prototype;
+      if (isClass) {
+        const descriptors = Object.getOwnPropertyDescriptors(proto);
+        keys.push(...Object.keys(descriptors));
+        Object.assign(desc, descriptors);
+      }
       for (let i = 0, l = keys.length; i < l; i++) {
         const prop = keys[i];
+        if (isClass && prop === "constructor") continue;
         if (desc[prop].get) {
           Object.defineProperty(value, prop, {
+            configurable: true,
             enumerable: desc[prop].enumerable,
             get: desc[prop].get.bind(p)
           });
@@ -124,6 +133,10 @@ const proxyTraps$1 = {
   getOwnPropertyDescriptor: proxyDescriptor$1
 };
 function setProperty(state, property, value, deleting = false) {
+  if (property === "__proto__") {
+    console.warn(`Refusing to set "__proto__" on a store.`);
+    return;
+  }
   if (!deleting && state[property] === value) return;
   const prev = state[property],
     len = state.length;
@@ -148,9 +161,13 @@ function mergeStoreNode(state, value) {
   const keys = Object.keys(value);
   for (let i = 0; i < keys.length; i += 1) {
     const key = keys[i];
+    if (isUnsafeKey$1(key)) continue;
     setProperty(state, key, value[key]);
   }
 }
+function isUnsafeKey$1(property) {
+  return property === "__proto__" || property === "constructor" || property === "prototype";
+}
 function updateArray(current, next) {
   if (typeof next === "function") next = next(current);
   next = unwrap(next);
@@ -172,6 +189,10 @@ function updatePath(current, path, traversed = []) {
     part = path.shift();
     const partType = typeof part,
       isArray = Array.isArray(current);
+    if (partType === "string" && (part === "__proto__" || path.length > 1 && isUnsafeKey$1(part))) {
+      console.warn(`Refusing to traverse unsafe key "${part}" on a store.`);
+      return;
+    }
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
         updatePath(current, [part[i]].concat(path), traversed);
@@ -329,7 +350,11 @@ function modifyMutable(state, modifier) {
 }
 
 const $ROOT = Symbol("store-root");
+function isUnsafeKey(property) {
+  return property === "__proto__" || property === "constructor" || property === "prototype";
+}
 function applyState(target, parent, property, merge, key) {
+  if (isUnsafeKey(property)) return;
   const previous = parent[property];
   if (target === previous) return;
   const isArray = Array.isArray(target);
@@ -391,6 +416,7 @@ function applyState(target, parent, property, merge, key) {
   }
   const targetKeys = Object.keys(target);
   for (let i = 0, len = targetKeys.length; i < len; i++) {
+    if (isUnsafeKey(targetKeys[i])) continue;
     applyState(target[targetKeys[i]], previous, targetKeys[i], merge, key);
   }
   const previousKeys = Object.keys(previous);
@@ -417,6 +443,7 @@ const setterTraps = {
   get(target, property) {
     if (property === $RAW) return target;
     const value = target[property];
+    if (property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === $HAS || property === "__proto__") return value;
     let proxy;
     return isWrappable(value) ? producers.get(value) || (producers.set(value, proxy = new Proxy(value, setterTraps)), proxy) : value;
   },

package/store/dist/dev.js

@@ -15,11 +15,20 @@ function wrap$1(value) {
     });
     if (!Array.isArray(value)) {
       const keys = Object.keys(value),
-        desc = Object.getOwnPropertyDescriptors(value);
+        desc = Object.getOwnPropertyDescriptors(value),
+        proto = Object.getPrototypeOf(value);
+      const isClass = proto !== null && value !== null && typeof value === "object" && !Array.isArray(value) && proto !== Object.prototype;
+      if (isClass) {
+        const descriptors = Object.getOwnPropertyDescriptors(proto);
+        keys.push(...Object.keys(descriptors));
+        Object.assign(desc, descriptors);
+      }
       for (let i = 0, l = keys.length; i < l; i++) {
         const prop = keys[i];
+        if (isClass && prop === "constructor") continue;
         if (desc[prop].get) {
           Object.defineProperty(value, prop, {
+            configurable: true,
             enumerable: desc[prop].enumerable,
             get: desc[prop].get.bind(p)
           });
@@ -122,6 +131,10 @@ const proxyTraps$1 = {
   getOwnPropertyDescriptor: proxyDescriptor$1
 };
 function setProperty(state, property, value, deleting = false) {
+  if (property === "__proto__") {
+    console.warn(`Refusing to set "__proto__" on a store.`);
+    return;
+  }
   if (!deleting && state[property] === value) return;
   const prev = state[property],
     len = state.length;
@@ -146,9 +159,13 @@ function mergeStoreNode(state, value) {
   const keys = Object.keys(value);
   for (let i = 0; i < keys.length; i += 1) {
     const key = keys[i];
+    if (isUnsafeKey$1(key)) continue;
     setProperty(state, key, value[key]);
   }
 }
+function isUnsafeKey$1(property) {
+  return property === "__proto__" || property === "constructor" || property === "prototype";
+}
 function updateArray(current, next) {
   if (typeof next === "function") next = next(current);
   next = unwrap(next);
@@ -170,6 +187,10 @@ function updatePath(current, path, traversed = []) {
     part = path.shift();
     const partType = typeof part,
       isArray = Array.isArray(current);
+    if (partType === "string" && (part === "__proto__" || path.length > 1 && isUnsafeKey$1(part))) {
+      console.warn(`Refusing to traverse unsafe key "${part}" on a store.`);
+      return;
+    }
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
         updatePath(current, [part[i]].concat(path), traversed);
@@ -327,7 +348,11 @@ function modifyMutable(state, modifier) {
 }
 
 const $ROOT = Symbol("store-root");
+function isUnsafeKey(property) {
+  return property === "__proto__" || property === "constructor" || property === "prototype";
+}
 function applyState(target, parent, property, merge, key) {
+  if (isUnsafeKey(property)) return;
   const previous = parent[property];
   if (target === previous) return;
   const isArray = Array.isArray(target);
@@ -389,6 +414,7 @@ function applyState(target, parent, property, merge, key) {
   }
   const targetKeys = Object.keys(target);
   for (let i = 0, len = targetKeys.length; i < len; i++) {
+    if (isUnsafeKey(targetKeys[i])) continue;
     applyState(target[targetKeys[i]], previous, targetKeys[i], merge, key);
   }
   const previousKeys = Object.keys(previous);
@@ -415,6 +441,7 @@ const setterTraps = {
   get(target, property) {
     if (property === $RAW) return target;
     const value = target[property];
+    if (property === $PROXY || property === $TRACK || property === $NODE || property === $HAS || property === "__proto__") return value;
     let proxy;
     return isWrappable(value) ? producers.get(value) || (producers.set(value, proxy = new Proxy(value, setterTraps)), proxy) : value;
   },

package/store/dist/server.cjs

@@ -8,6 +8,7 @@ function unwrap(item) {
   return item;
 }
 function setProperty(state, property, value, force) {
+  if (property === "__proto__") return;
   if (!force && state[property] === value) return;
   if (value === undefined) {
     delete state[property];
@@ -17,9 +18,13 @@ function mergeStoreNode(state, value, force) {
   const keys = Object.keys(value);
   for (let i = 0; i < keys.length; i += 1) {
     const key = keys[i];
+    if (isUnsafeKey(key)) continue;
     setProperty(state, key, value[key], force);
   }
 }
+function isUnsafeKey(property) {
+  return property === "__proto__" || property === "constructor" || property === "prototype";
+}
 function updateArray(current, next) {
   if (typeof next === "function") next = next(current);
   if (Array.isArray(next)) {
@@ -40,6 +45,7 @@ function updatePath(current, path, traversed = []) {
     part = path.shift();
     const partType = typeof part,
       isArray = Array.isArray(current);
+    if (partType === "string" && (part === "__proto__" || path.length > 1 && isUnsafeKey(part))) return;
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
         updatePath(current, [part[i]].concat(path), traversed);
@@ -96,6 +102,7 @@ function reconcile(value, options = {}) {
     const targetKeys = Object.keys(value);
     for (let i = 0, len = targetKeys.length; i < len; i++) {
       const key = targetKeys[i];
+      if (isUnsafeKey(key)) continue;
       setProperty(state, key, value[key]);
     }
     const previousKeys = Object.keys(state);

package/store/dist/server.js

@@ -6,6 +6,7 @@ function unwrap(item) {
   return item;
 }
 function setProperty(state, property, value, force) {
+  if (property === "__proto__") return;
   if (!force && state[property] === value) return;
   if (value === undefined) {
     delete state[property];
@@ -15,9 +16,13 @@ function mergeStoreNode(state, value, force) {
   const keys = Object.keys(value);
   for (let i = 0; i < keys.length; i += 1) {
     const key = keys[i];
+    if (isUnsafeKey(key)) continue;
     setProperty(state, key, value[key], force);
   }
 }
+function isUnsafeKey(property) {
+  return property === "__proto__" || property === "constructor" || property === "prototype";
+}
 function updateArray(current, next) {
   if (typeof next === "function") next = next(current);
   if (Array.isArray(next)) {
@@ -38,6 +43,7 @@ function updatePath(current, path, traversed = []) {
     part = path.shift();
     const partType = typeof part,
       isArray = Array.isArray(current);
+    if (partType === "string" && (part === "__proto__" || path.length > 1 && isUnsafeKey(part))) return;
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
         updatePath(current, [part[i]].concat(path), traversed);
@@ -94,6 +100,7 @@ function reconcile(value, options = {}) {
     const targetKeys = Object.keys(value);
     for (let i = 0, len = targetKeys.length; i < len; i++) {
       const key = targetKeys[i];
+      if (isUnsafeKey(key)) continue;
       setProperty(state, key, value[key]);
     }
     const previousKeys = Object.keys(state);

package/store/dist/store.cjs

@@ -14,11 +14,20 @@ function wrap$1(value) {
     });
     if (!Array.isArray(value)) {
       const keys = Object.keys(value),
-        desc = Object.getOwnPropertyDescriptors(value);
+        desc = Object.getOwnPropertyDescriptors(value),
+        proto = Object.getPrototypeOf(value);
+      const isClass = proto !== null && value !== null && typeof value === "object" && !Array.isArray(value) && proto !== Object.prototype;
+      if (isClass) {
+        const descriptors = Object.getOwnPropertyDescriptors(proto);
+        keys.push(...Object.keys(descriptors));
+        Object.assign(desc, descriptors);
+      }
       for (let i = 0, l = keys.length; i < l; i++) {
         const prop = keys[i];
+        if (isClass && prop === "constructor") continue;
         if (desc[prop].get) {
           Object.defineProperty(value, prop, {
+            configurable: true,
             enumerable: desc[prop].enumerable,
             get: desc[prop].get.bind(p)
           });
@@ -119,6 +128,9 @@ const proxyTraps$1 = {
   getOwnPropertyDescriptor: proxyDescriptor$1
 };
 function setProperty(state, property, value, deleting = false) {
+  if (property === "__proto__") {
+    return;
+  }
   if (!deleting && state[property] === value) return;
   const prev = state[property],
     len = state.length;
@@ -142,9 +154,13 @@ function mergeStoreNode(state, value) {
   const keys = Object.keys(value);
   for (let i = 0; i < keys.length; i += 1) {
     const key = keys[i];
+    if (isUnsafeKey$1(key)) continue;
     setProperty(state, key, value[key]);
   }
 }
+function isUnsafeKey$1(property) {
+  return property === "__proto__" || property === "constructor" || property === "prototype";
+}
 function updateArray(current, next) {
   if (typeof next === "function") next = next(current);
   next = unwrap(next);
@@ -166,6 +182,9 @@ function updatePath(current, path, traversed = []) {
     part = path.shift();
     const partType = typeof part,
       isArray = Array.isArray(current);
+    if (partType === "string" && (part === "__proto__" || path.length > 1 && isUnsafeKey$1(part))) {
+      return;
+    }
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
         updatePath(current, [part[i]].concat(path), traversed);
@@ -313,7 +332,11 @@ function modifyMutable(state, modifier) {
 }
 
 const $ROOT = Symbol("store-root");
+function isUnsafeKey(property) {
+  return property === "__proto__" || property === "constructor" || property === "prototype";
+}
 function applyState(target, parent, property, merge, key) {
+  if (isUnsafeKey(property)) return;
   const previous = parent[property];
   if (target === previous) return;
   const isArray = Array.isArray(target);
@@ -375,6 +398,7 @@ function applyState(target, parent, property, merge, key) {
   }
   const targetKeys = Object.keys(target);
   for (let i = 0, len = targetKeys.length; i < len; i++) {
+    if (isUnsafeKey(targetKeys[i])) continue;
     applyState(target[targetKeys[i]], previous, targetKeys[i], merge, key);
   }
   const previousKeys = Object.keys(previous);
@@ -401,6 +425,7 @@ const setterTraps = {
   get(target, property) {
     if (property === $RAW) return target;
     const value = target[property];
+    if (property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === $HAS || property === "__proto__") return value;
     let proxy;
     return isWrappable(value) ? producers.get(value) || (producers.set(value, proxy = new Proxy(value, setterTraps)), proxy) : value;
   },

package/store/dist/store.js

@@ -12,11 +12,20 @@ function wrap$1(value) {
     });
     if (!Array.isArray(value)) {
       const keys = Object.keys(value),
-        desc = Object.getOwnPropertyDescriptors(value);
+        desc = Object.getOwnPropertyDescriptors(value),
+        proto = Object.getPrototypeOf(value);
+      const isClass = proto !== null && value !== null && typeof value === "object" && !Array.isArray(value) && proto !== Object.prototype;
+      if (isClass) {
+        const descriptors = Object.getOwnPropertyDescriptors(proto);
+        keys.push(...Object.keys(descriptors));
+        Object.assign(desc, descriptors);
+      }
       for (let i = 0, l = keys.length; i < l; i++) {
         const prop = keys[i];
+        if (isClass && prop === "constructor") continue;
         if (desc[prop].get) {
           Object.defineProperty(value, prop, {
+            configurable: true,
             enumerable: desc[prop].enumerable,
             get: desc[prop].get.bind(p)
           });
@@ -117,6 +126,9 @@ const proxyTraps$1 = {
   getOwnPropertyDescriptor: proxyDescriptor$1
 };
 function setProperty(state, property, value, deleting = false) {
+  if (property === "__proto__") {
+    return;
+  }
   if (!deleting && state[property] === value) return;
   const prev = state[property],
     len = state.length;
@@ -140,9 +152,13 @@ function mergeStoreNode(state, value) {
   const keys = Object.keys(value);
   for (let i = 0; i < keys.length; i += 1) {
     const key = keys[i];
+    if (isUnsafeKey$1(key)) continue;
     setProperty(state, key, value[key]);
   }
 }
+function isUnsafeKey$1(property) {
+  return property === "__proto__" || property === "constructor" || property === "prototype";
+}
 function updateArray(current, next) {
   if (typeof next === "function") next = next(current);
   next = unwrap(next);
@@ -164,6 +180,9 @@ function updatePath(current, path, traversed = []) {
     part = path.shift();
     const partType = typeof part,
       isArray = Array.isArray(current);
+    if (partType === "string" && (part === "__proto__" || path.length > 1 && isUnsafeKey$1(part))) {
+      return;
+    }
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
         updatePath(current, [part[i]].concat(path), traversed);
@@ -311,7 +330,11 @@ function modifyMutable(state, modifier) {
 }
 
 const $ROOT = Symbol("store-root");
+function isUnsafeKey(property) {
+  return property === "__proto__" || property === "constructor" || property === "prototype";
+}
 function applyState(target, parent, property, merge, key) {
+  if (isUnsafeKey(property)) return;
   const previous = parent[property];
   if (target === previous) return;
   const isArray = Array.isArray(target);
@@ -373,6 +396,7 @@ function applyState(target, parent, property, merge, key) {
   }
   const targetKeys = Object.keys(target);
   for (let i = 0, len = targetKeys.length; i < len; i++) {
+    if (isUnsafeKey(targetKeys[i])) continue;
     applyState(target[targetKeys[i]], previous, targetKeys[i], merge, key);
   }
   const previousKeys = Object.keys(previous);
@@ -399,6 +423,7 @@ const setterTraps = {
   get(target, property) {
     if (property === $RAW) return target;
     const value = target[property];
+    if (property === $PROXY || property === $TRACK || property === $NODE || property === $HAS || property === "__proto__") return value;
     let proxy;
     return isWrappable(value) ? producers.get(value) || (producers.set(value, proxy = new Proxy(value, setterTraps)), proxy) : value;
   },

package/store/types/index.d.ts

@@ -1,5 +1,5 @@
 export { $RAW, createStore, unwrap } from "./store.js";
-export type { ArrayFilterFn, DeepMutable, DeepReadonly, NotWrappable, Part, SetStoreFunction, SolidStore, Store, StoreNode, StorePathRange, StoreSetter } from "./store.js";
+export type { ArrayFilterFn, DeepMutable, DeepReadonly, NotWrappable, Part, SetStoreFunction, SolidStore, Store, StoreNode, StoreReturn, StorePathRange, StoreSetter } from "./store.js";
 export * from "./mutable.js";
 export * from "./modifiers.js";
 import { $NODE, isWrappable } from "./store.js";

package/store/types/server.d.ts

@@ -1,11 +1,11 @@
-import type { SetStoreFunction, Store } from "./store.js";
-export type { ArrayFilterFn, DeepMutable, DeepReadonly, NotWrappable, Part, SetStoreFunction, SolidStore, Store, StoreNode, StorePathRange, StoreSetter } from "./store.js";
+import type { Store, StoreReturn } from "./store.js";
+export type { ArrayFilterFn, DeepMutable, DeepReadonly, NotWrappable, Part, SetStoreFunction, SolidStore, Store, StoreNode, StoreReturn, StorePathRange, StoreSetter } from "./store.js";
 export declare const $RAW: unique symbol;
 export declare function isWrappable(obj: any): boolean;
 export declare function unwrap<T>(item: T): T;
 export declare function setProperty(state: any, property: PropertyKey, value: any, force?: boolean): void;
 export declare function updatePath(current: any, path: any[], traversed?: PropertyKey[]): void;
-export declare function createStore<T>(state: T | Store<T>): [Store<T>, SetStoreFunction<T>];
+export declare function createStore<T>(state: T | Store<T>): StoreReturn<T>;
 export declare function createMutable<T>(state: T | Store<T>): T;
 export declare function modifyMutable<T>(state: T, modifier: (state: T) => T): void;
 type ReconcileOptions = {

package/store/types/store.d.ts

@@ -94,6 +94,7 @@ export interface SetStoreFunction<T> {
     (setter: StoreSetter<T, []>): void;
     <K1 extends KeyOf<W<T>>, K2 extends KeyOf<W<W<T>[K1]>>, K3 extends KeyOf<W<W<W<T>[K1]>[K2]>>, K4 extends KeyOf<W<W<W<W<T>[K1]>[K2]>[K3]>>, K5 extends KeyOf<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>>, K6 extends KeyOf<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>>, K7 extends KeyOf<W<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, k3: Part<W<W<W<T>[K1]>[K2]>, K3>, k4: Part<W<W<W<W<T>[K1]>[K2]>[K3]>, K4>, k5: Part<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>, K5>, k6: Part<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>, K6>, k7: Part<W<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6]>, K7>, ...rest: Rest<W<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6]>[K7], [K7, K6, K5, K4, K3, K2, K1]>): void;
 }
+export type StoreReturn<T> = [get: Store<T>, set: SetStoreFunction<T>];
 /**
  * Creates a reactive store that can be read through a proxy object and written with a setter function
  *
@@ -103,5 +104,5 @@ export declare function createStore<T extends object = {}>(...[store, options]:
     name?: string;
 }] : [store: T | Store<T>, options?: {
     name?: string;
-}]): [get: Store<T>, set: SetStoreFunction<T>];
+}]): StoreReturn<T>;
 export {};

package/types/jsx.d.ts

@@ -137,14 +137,13 @@ export namespace JSX {
   interface IntrinsicAttributes {
     ref?: unknown | ((e: unknown) => void) | undefined;
   }
+  export type ClassList = {
+    [k: string]: boolean | undefined;
+  };
   interface CustomAttributes<T> {
     ref?: T | ((el: T) => void) | undefined;
     children?: Element | undefined;
-    classList?:
-      | {
-          [k: string]: boolean | undefined;
-        }
-      | undefined;
+    classList?: ClassList | undefined;
     $ServerOnly?: boolean | undefined;
   }
   type Accessor<T> = () => T;

package/types/reactive/signal.d.ts

@@ -328,9 +328,13 @@ export type InitializedResourceReturn<T, R = unknown> = [
  *
  * @description https://docs.solidjs.com/reference/basic-reactivity/create-resource
  */
-export declare function createResource<T, R = unknown>(fetcher: ResourceFetcher<true, T, R>, options: InitializedResourceOptions<NoInfer<T>, true>): InitializedResourceReturn<T, R>;
+export declare function createResource<T, R = unknown, I = T>(fetcher: (k: true, info: ResourceFetcherInfo<T | I, R>) => T | Promise<T>, options: ResourceOptions<T | I, true> & {
+    initialValue: I;
+}): InitializedResourceReturn<T | I, R>;
 export declare function createResource<T, R = unknown>(fetcher: ResourceFetcher<true, T, R>, options?: ResourceOptions<NoInfer<T>, true>): ResourceReturn<T, R>;
-export declare function createResource<T, S, R = unknown>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T, R>, options: InitializedResourceOptions<NoInfer<T>, S>): InitializedResourceReturn<T, R>;
+export declare function createResource<T, S, R = unknown, I = T>(source: ResourceSource<S>, fetcher: (k: S, info: ResourceFetcherInfo<T | I, R>) => T | Promise<T>, options: ResourceOptions<T | I, S> & {
+    initialValue: I;
+}): InitializedResourceReturn<T | I, R>;
 export declare function createResource<T, S, R = unknown>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T, R>, options?: ResourceOptions<NoInfer<T>, S>): ResourceReturn<T, R>;
 export interface DeferredOptions<T> {
     equals?: false | ((prev: T, next: T) => boolean);

package/web/dist/server.cjs

@@ -850,6 +850,7 @@ exports.addEventListener = notSup;
 exports.assign = notSup;
 exports.classList = notSup;
 exports.className = notSup;
+exports.clearDelegatedEvents = notSup;
 exports.createDynamic = createDynamic;
 exports.delegateEvents = notSup;
 exports.dynamicProperty = notSup;
@@ -877,7 +878,9 @@ exports.resolveSSRNode = resolveSSRNode;
 exports.runHydrationEvents = notSup;
 exports.setAttribute = notSup;
 exports.setAttributeNS = notSup;
+exports.setBoolAttribute = notSup;
 exports.setProperty = notSup;
+exports.setStyleProperty = notSup;
 exports.spread = notSup;
 exports.ssr = ssr;
 exports.ssrAttribute = ssrAttribute;
@@ -889,4 +892,5 @@ exports.ssrStyle = ssrStyle;
 exports.ssrStyleProperty = ssrStyleProperty;
 exports.style = notSup;
 exports.template = notSup;
+exports.use = notSup;
 exports.useAssets = useAssets;

package/web/dist/server.js

@@ -779,4 +779,4 @@ function Portal(props) {
   return "";
 }
 
-export { Aliases, Assets, ChildProperties, DOMElements, DelegatedEvents, Dynamic, Hydration, HydrationScript, NoHydration, Portal, Properties, RequestContext, SVGElements, SVGNamespace, notSup as addEventListener, notSup as assign, notSup as classList, notSup as className, createDynamic, notSup as delegateEvents, notSup as dynamicProperty, escape, generateHydrationScript, getAssets, getHydrationKey, notSup as getNextElement, notSup as getNextMarker, notSup as getNextMatch, getPropAlias, getRequestEvent, notSup as hydrate, notSup as insert, isDev, isServer, memo, pipeToNodeWritable, pipeToWritable, notSup as render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, notSup as runHydrationEvents, notSup as setAttribute, notSup as setAttributeNS, notSup as setProperty, notSup as spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrSpread, ssrStyle, ssrStyleProperty, notSup as style, notSup as template, useAssets };
+export { Aliases, Assets, ChildProperties, DOMElements, DelegatedEvents, Dynamic, Hydration, HydrationScript, NoHydration, Portal, Properties, RequestContext, SVGElements, SVGNamespace, notSup as addEventListener, notSup as assign, notSup as classList, notSup as className, notSup as clearDelegatedEvents, createDynamic, notSup as delegateEvents, notSup as dynamicProperty, escape, generateHydrationScript, getAssets, getHydrationKey, notSup as getNextElement, notSup as getNextMarker, notSup as getNextMatch, getPropAlias, getRequestEvent, notSup as hydrate, notSup as insert, isDev, isServer, memo, pipeToNodeWritable, pipeToWritable, notSup as render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, notSup as runHydrationEvents, notSup as setAttribute, notSup as setAttributeNS, notSup as setBoolAttribute, notSup as setProperty, notSup as setStyleProperty, notSup as spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrSpread, ssrStyle, ssrStyleProperty, notSup as style, notSup as template, notSup as use, useAssets };

package/web/types/client.d.ts

@@ -56,9 +56,9 @@ export function addEventListener(
 ): void;
 export function classList(
   node: Element,
-  value: { [k: string]: boolean },
-  prev?: { [k: string]: boolean }
-): { [k: string]: boolean };
+  value: JSX.ClassList,
+  prev?: JSX.ClassList
+): JSX.ClassList;
 export function style(
   node: Element,
   value: { [k: string]: string },

package/web/types/server.d.ts

@@ -50,7 +50,7 @@ export function ssrElement(
   children: any,
   needsId: boolean
 ): { t: string };
-export function ssrClassList(value: { [k: string]: boolean }): string;
+export function ssrClassList(value: JSX.ClassList): string;
 export function ssrStyle(value: { [k: string]: string }): string;
 export function ssrAttribute(key: string, value: any, isBoolean: boolean): string;
 export function ssrHydrationKey(): string;
@@ -107,9 +107,9 @@ export function untrack<T>(fn: () => T): T;
 /** @deprecated not supported on the server side */
 export function classList(
   node: Element,
-  value: { [k: string]: boolean },
-  prev?: { [k: string]: boolean }
-): { [k: string]: boolean };
+  value: JSX.ClassList,
+  prev?: JSX.ClassList
+): JSX.ClassList;
 
 /** @deprecated not supported on the server side */
 export function style(
@@ -175,3 +175,13 @@ export function getNextElement(template?: HTMLTemplateElement): Element;
 export function getNextMatch(start: Node, elementName: string): Element;
 /** @deprecated not supported on the server side */
 export function getNextMarker(start: Node): [Node, Array<Node>];
+/** @deprecated not supported on the server side */
+export function runHydrationEvents(): void;
+/** @deprecated not supported on the server side */
+export function use<Arg, Ret>(fn: (node: Element, arg: Arg) => Ret, node: Element, arg?: Arg): Ret;
+/** @deprecated not supported on the server side */
+export function setBoolAttribute(node: Element, name: string, value: any): void;
+/** @deprecated not supported on the server side */
+export function setStyleProperty(node: Element, name: string, value: any): void;
+/** @deprecated not supported on the server side */
+export function clearDelegatedEvents(d?: Document): void;