solid-js 1.6.15 → 1.7.0-beta.1

package/html/dist/html.js

@@ -1,4 +1,4 @@
-import { effect, style, insert, untrack, spread, createComponent, delegateEvents, classList, mergeProps, dynamicProperty, setAttribute, setAttributeNS, addEventListener, Aliases, PropAliases, Properties, ChildProperties, DelegatedEvents, SVGElements, SVGNamespace } from 'solid-js/web';
+import { effect, style, insert, untrack, spread, createComponent, delegateEvents, classList, mergeProps, dynamicProperty, setAttribute, setAttributeNS, addEventListener, Aliases, getPropAlias, Properties, ChildProperties, DelegatedEvents, SVGElements, SVGNamespace } from 'solid-js/web';
 
 const tagRE = /(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g;
 const attrRE = /(?:\s(?<boolean>[^/\s><=]+?)(?=[\s/>]))|(?:(?<name>\S+?)(?:\s*=\s*(?:(['"])(?<quotedValue>[\s\S]*?)\3|(?<unquotedValue>[^\s>]+))))/g;
@@ -208,7 +208,7 @@ function createHTML(r, {
     cache.set(statics, templates);
     return templates;
   }
-  function parseKeyValue(tag, name, value, isSVG, isCE, options) {
+  function parseKeyValue(node, tag, name, value, isSVG, isCE, options) {
     let expr = value === "###" ? `!doNotWrap ? exprs[${options.counter}]() : exprs[${options.counter++}]` : value.split("###").map((v, i) => i ? ` + (typeof exprs[${options.counter}] === "function" ? exprs[${options.counter}]() : exprs[${options.counter++}]) + "${v}"` : `"${v}"`).join(""),
       parts,
       namespace;
@@ -226,15 +226,15 @@ function createHTML(r, {
       const prev = `_$v${uuid++}`;
       options.decl.push(`${prev}={}`);
       options.exprs.push(`r.classList(${tag},${expr},${prev})`);
-    } else if (namespace !== "attr" && (isChildProp || !isSVG && (r.PropAliases[name] || isProp) || isCE || namespace === "prop")) {
+    } else if (namespace !== "attr" && (isChildProp || !isSVG && (r.getPropAlias(name, node.name.toUpperCase()) || isProp) || isCE || namespace === "prop")) {
       if (isCE && !isChildProp && !isProp && namespace !== "prop") name = toPropertyName(name);
-      options.exprs.push(`${tag}.${r.PropAliases[name] || name} = ${expr}`);
+      options.exprs.push(`${tag}.${r.getPropAlias(name, node.name.toUpperCase()) || name} = ${expr}`);
     } else {
       const ns = isSVG && name.indexOf(":") > -1 && r.SVGNamespace[name.split(":")[0]];
       if (ns) options.exprs.push(`r.setAttributeNS(${tag},"${ns}","${name}",${expr})`);else options.exprs.push(`r.setAttribute(${tag},"${r.Aliases[name] || name}",${expr})`);
     }
   }
-  function parseAttribute(tag, name, value, isSVG, isCE, options) {
+  function parseAttribute(node, tag, name, value, isSVG, isCE, options) {
     if (name.slice(0, 2) === "on") {
       if (!name.includes(":")) {
         const lc = name.slice(2).toLowerCase();
@@ -252,7 +252,7 @@ function createHTML(r, {
           exprs: []
         }),
         count = options.counter;
-      parseKeyValue(tag, name, value, isSVG, isCE, childOptions);
+      parseKeyValue(node, tag, name, value, isSVG, isCE, childOptions);
       options.decl.push(`_fn${count} = (${value === "###" ? "doNotWrap" : ""}) => {\n${childOptions.exprs.join(";\n")};\n}`);
       if (value === "###") {
         options.exprs.push(`typeof exprs[${count}] === "function" ? r.effect(_fn${count}) : _fn${count}(true)`);
@@ -433,7 +433,7 @@ function createHTML(r, {
             value = node.attrs[name];
           if (value.includes("###")) {
             delete node.attrs[name];
-            parseAttribute(tag, name, value, isSVG, isCE, options);
+            parseAttribute(node, tag, name, value, isSVG, isCE, options);
           }
         }
       }
@@ -511,7 +511,7 @@ var index = createHTML({
   setAttributeNS,
   addEventListener,
   Aliases,
-  PropAliases,
+  getPropAlias,
   Properties,
   ChildProperties,
   DelegatedEvents,

package/html/types/lit.d.ts

@@ -22,7 +22,7 @@ interface Runtime {
     setAttribute(node: Element, name: string, value: any): void;
     setAttributeNS(node: Element, namespace: string, name: string, value: any): void;
     Aliases: Record<string, string>;
-    PropAliases: Record<string, string>;
+    getPropAlias(prop: string, tagName: string): string | undefined;
     Properties: Set<string>;
     ChildProperties: Set<string>;
     DelegatedEvents: Set<string>;

package/package.json

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

package/store/dist/dev.cjs

@@ -3,9 +3,11 @@
 var solidJs = require('solid-js');
 
 const $RAW = Symbol("store-raw"),
-  $NODE = Symbol("store-node"),
-  $NAME = Symbol("store-name");
-function wrap$1(value, name) {
+  $NODE = Symbol("store-node");
+const DevHooks = {
+  onStoreNodeUpdate: null
+};
+function wrap$1(value) {
   let p = value[solidJs.$PROXY];
   if (!p) {
     Object.defineProperty(value, solidJs.$PROXY, {
@@ -24,9 +26,6 @@ function wrap$1(value, name) {
         }
       }
     }
-    if (name) Object.defineProperty(value, $NAME, {
-      value: name
-    });
   }
   return p;
 }
@@ -69,7 +68,7 @@ function getDataNode(nodes, property, value) {
 }
 function proxyDescriptor$1(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || !desc.configurable || property === solidJs.$PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || !desc.configurable || property === solidJs.$PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[solidJs.$PROXY][property];
@@ -109,7 +108,7 @@ const proxyTraps$1 = {
       const desc = Object.getOwnPropertyDescriptor(target, property);
       if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();
     }
-    return isWrappable(value) ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
+    return isWrappable(value) ? wrap$1(value) : value;
   },
   has(target, property) {
     if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
@@ -131,7 +130,7 @@ function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
   const prev = state[property],
     len = state.length;
-  if (globalThis._$onStoreNodeUpdate) globalThis._$onStoreNodeUpdate(state, property, value, prev);
+  DevHooks.onStoreNodeUpdate && DevHooks.onStoreNodeUpdate(state, property, value, prev);
   if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
     node;
@@ -209,13 +208,11 @@ function createStore(...[store, options]) {
   const unwrappedStore = unwrap(store || {});
   const isArray = Array.isArray(unwrappedStore);
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createStore'. Expected an object.`);
-  const wrappedStore = wrap$1(unwrappedStore, (options && options.name || solidJs.DEV.hashValue(unwrappedStore)));
-  {
-    const name = options && options.name || solidJs.DEV.hashValue(unwrappedStore);
-    solidJs.DEV.registerGraph(name, {
-      value: unwrappedStore
-    });
-  }
+  const wrappedStore = wrap$1(unwrappedStore);
+  solidJs.DEV.registerGraph({
+    value: unwrappedStore,
+    name: options && options.name
+  });
   function setStore(...args) {
     solidJs.batch(() => {
       isArray && args.length === 1 ? updateArray(unwrappedStore, args[0]) : updatePath(unwrappedStore, args);
@@ -226,7 +223,7 @@ function createStore(...[store, options]) {
 
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || desc.set || !desc.configurable || property === solidJs.$PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || desc.set || !desc.configurable || property === solidJs.$PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[solidJs.$PROXY][property];
@@ -252,7 +249,7 @@ const proxyTraps = {
         return (...args) => solidJs.batch(() => Array.prototype[property].apply(receiver, args));
       }
     }
-    return isWrappable(value) ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
+    return isWrappable(value) ? wrap(value) : value;
   },
   has(target, property) {
     if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
@@ -270,7 +267,7 @@ const proxyTraps = {
   ownKeys: ownKeys,
   getOwnPropertyDescriptor: proxyDescriptor
 };
-function wrap(value, name) {
+function wrap(value) {
   let p = value[solidJs.$PROXY];
   if (!p) {
     Object.defineProperty(value, solidJs.$PROXY, {
@@ -294,22 +291,17 @@ function wrap(value, name) {
         });
       }
     }
-    if (name) Object.defineProperty(value, $NAME, {
-      value: name
-    });
   }
   return p;
 }
 function createMutable(state, options) {
   const unwrappedStore = unwrap(state || {});
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createMutable'. Expected an object.`);
-  const wrappedStore = wrap(unwrappedStore, (options && options.name || solidJs.DEV.hashValue(unwrappedStore)));
-  {
-    const name = options && options.name || solidJs.DEV.hashValue(unwrappedStore);
-    solidJs.DEV.registerGraph(name, {
-      value: unwrappedStore
-    });
-  }
+  const wrappedStore = wrap(unwrappedStore);
+  solidJs.DEV.registerGraph({
+    value: unwrappedStore,
+    name: options && options.name
+  });
   return wrappedStore;
 }
 function modifyMutable(state, modifier) {
@@ -429,14 +421,14 @@ function produce(fn) {
   };
 }
 
-const DEV = {
-  $NAME,
+exports.DEV = void 0;
+exports.DEV = {
   $NODE,
-  isWrappable
-} ;
+  isWrappable,
+  hooks: DevHooks
+};
 
 exports.$RAW = $RAW;
-exports.DEV = DEV;
 exports.createMutable = createMutable;
 exports.createStore = createStore;
 exports.modifyMutable = modifyMutable;

package/store/dist/dev.js

@@ -1,9 +1,11 @@
 import { $PROXY, DEV as DEV$1, $TRACK, getListener, batch, createSignal } from 'solid-js';
 
 const $RAW = Symbol("store-raw"),
-  $NODE = Symbol("store-node"),
-  $NAME = Symbol("store-name");
-function wrap$1(value, name) {
+  $NODE = Symbol("store-node");
+const DevHooks = {
+  onStoreNodeUpdate: null
+};
+function wrap$1(value) {
   let p = value[$PROXY];
   if (!p) {
     Object.defineProperty(value, $PROXY, {
@@ -22,9 +24,6 @@ function wrap$1(value, name) {
         }
       }
     }
-    if (name) Object.defineProperty(value, $NAME, {
-      value: name
-    });
   }
   return p;
 }
@@ -67,7 +66,7 @@ function getDataNode(nodes, property, value) {
 }
 function proxyDescriptor$1(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || !desc.configurable || property === $PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || !desc.configurable || property === $PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[$PROXY][property];
@@ -107,7 +106,7 @@ const proxyTraps$1 = {
       const desc = Object.getOwnPropertyDescriptor(target, property);
       if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();
     }
-    return isWrappable(value) ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
+    return isWrappable(value) ? wrap$1(value) : value;
   },
   has(target, property) {
     if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
@@ -129,7 +128,7 @@ function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
   const prev = state[property],
     len = state.length;
-  if (globalThis._$onStoreNodeUpdate) globalThis._$onStoreNodeUpdate(state, property, value, prev);
+  DevHooks.onStoreNodeUpdate && DevHooks.onStoreNodeUpdate(state, property, value, prev);
   if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
     node;
@@ -207,13 +206,11 @@ function createStore(...[store, options]) {
   const unwrappedStore = unwrap(store || {});
   const isArray = Array.isArray(unwrappedStore);
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createStore'. Expected an object.`);
-  const wrappedStore = wrap$1(unwrappedStore, (options && options.name || DEV$1.hashValue(unwrappedStore)));
-  {
-    const name = options && options.name || DEV$1.hashValue(unwrappedStore);
-    DEV$1.registerGraph(name, {
-      value: unwrappedStore
-    });
-  }
+  const wrappedStore = wrap$1(unwrappedStore);
+  DEV$1.registerGraph({
+    value: unwrappedStore,
+    name: options && options.name
+  });
   function setStore(...args) {
     batch(() => {
       isArray && args.length === 1 ? updateArray(unwrappedStore, args[0]) : updatePath(unwrappedStore, args);
@@ -224,7 +221,7 @@ function createStore(...[store, options]) {
 
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || desc.set || !desc.configurable || property === $PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || desc.set || !desc.configurable || property === $PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[$PROXY][property];
@@ -250,7 +247,7 @@ const proxyTraps = {
         return (...args) => batch(() => Array.prototype[property].apply(receiver, args));
       }
     }
-    return isWrappable(value) ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
+    return isWrappable(value) ? wrap(value) : value;
   },
   has(target, property) {
     if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
@@ -268,7 +265,7 @@ const proxyTraps = {
   ownKeys: ownKeys,
   getOwnPropertyDescriptor: proxyDescriptor
 };
-function wrap(value, name) {
+function wrap(value) {
   let p = value[$PROXY];
   if (!p) {
     Object.defineProperty(value, $PROXY, {
@@ -292,22 +289,17 @@ function wrap(value, name) {
         });
       }
     }
-    if (name) Object.defineProperty(value, $NAME, {
-      value: name
-    });
   }
   return p;
 }
 function createMutable(state, options) {
   const unwrappedStore = unwrap(state || {});
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createMutable'. Expected an object.`);
-  const wrappedStore = wrap(unwrappedStore, (options && options.name || DEV$1.hashValue(unwrappedStore)));
-  {
-    const name = options && options.name || DEV$1.hashValue(unwrappedStore);
-    DEV$1.registerGraph(name, {
-      value: unwrappedStore
-    });
-  }
+  const wrappedStore = wrap(unwrappedStore);
+  DEV$1.registerGraph({
+    value: unwrappedStore,
+    name: options && options.name
+  });
   return wrappedStore;
 }
 function modifyMutable(state, modifier) {
@@ -427,10 +419,11 @@ function produce(fn) {
   };
 }
 
-const DEV = {
-  $NAME,
+let DEV;
+DEV = {
   $NODE,
-  isWrappable
-} ;
+  isWrappable,
+  hooks: DevHooks
+};
 
 export { $RAW, DEV, createMutable, createStore, modifyMutable, produce, reconcile, unwrap };

package/store/dist/store.cjs

@@ -3,9 +3,8 @@
 var solidJs = require('solid-js');
 
 const $RAW = Symbol("store-raw"),
-  $NODE = Symbol("store-node"),
-  $NAME = Symbol("store-name");
-function wrap$1(value, name) {
+  $NODE = Symbol("store-node");
+function wrap$1(value) {
   let p = value[solidJs.$PROXY];
   if (!p) {
     Object.defineProperty(value, solidJs.$PROXY, {
@@ -66,7 +65,7 @@ function getDataNode(nodes, property, value) {
 }
 function proxyDescriptor$1(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || !desc.configurable || property === solidJs.$PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || !desc.configurable || property === solidJs.$PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[solidJs.$PROXY][property];
@@ -213,7 +212,7 @@ function createStore(...[store, options]) {
 
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || desc.set || !desc.configurable || property === solidJs.$PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || desc.set || !desc.configurable || property === solidJs.$PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[solidJs.$PROXY][property];
@@ -257,7 +256,7 @@ const proxyTraps = {
   ownKeys: ownKeys,
   getOwnPropertyDescriptor: proxyDescriptor
 };
-function wrap(value, name) {
+function wrap(value) {
   let p = value[solidJs.$PROXY];
   if (!p) {
     Object.defineProperty(value, solidJs.$PROXY, {
@@ -406,7 +405,7 @@ function produce(fn) {
   };
 }
 
-const DEV = undefined;
+let DEV;
 
 exports.$RAW = $RAW;
 exports.DEV = DEV;

package/store/dist/store.js

@@ -1,9 +1,8 @@
 import { $PROXY, $TRACK, getListener, batch, createSignal } from 'solid-js';
 
 const $RAW = Symbol("store-raw"),
-  $NODE = Symbol("store-node"),
-  $NAME = Symbol("store-name");
-function wrap$1(value, name) {
+  $NODE = Symbol("store-node");
+function wrap$1(value) {
   let p = value[$PROXY];
   if (!p) {
     Object.defineProperty(value, $PROXY, {
@@ -64,7 +63,7 @@ function getDataNode(nodes, property, value) {
 }
 function proxyDescriptor$1(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || !desc.configurable || property === $PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || !desc.configurable || property === $PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[$PROXY][property];
@@ -211,7 +210,7 @@ function createStore(...[store, options]) {
 
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
-  if (!desc || desc.get || desc.set || !desc.configurable || property === $PROXY || property === $NODE || property === $NAME) return desc;
+  if (!desc || desc.get || desc.set || !desc.configurable || property === $PROXY || property === $NODE) return desc;
   delete desc.value;
   delete desc.writable;
   desc.get = () => target[$PROXY][property];
@@ -255,7 +254,7 @@ const proxyTraps = {
   ownKeys: ownKeys,
   getOwnPropertyDescriptor: proxyDescriptor
 };
-function wrap(value, name) {
+function wrap(value) {
   let p = value[$PROXY];
   if (!p) {
     Object.defineProperty(value, $PROXY, {
@@ -404,6 +403,6 @@ function produce(fn) {
   };
 }
 
-const DEV = undefined;
+let DEV;
 
 export { $RAW, DEV, createMutable, createStore, modifyMutable, produce, reconcile, unwrap };

package/store/types/index.d.ts

@@ -1,10 +1,11 @@
-export { createStore, unwrap, $RAW } from "./store.js";
-export type { Store, SetStoreFunction, NotWrappable, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, Part, DeepReadonly, DeepMutable } from "./store.js";
+export { $RAW, createStore, unwrap } from "./store.js";
+export type { ArrayFilterFn, DeepMutable, DeepReadonly, NotWrappable, Part, SetStoreFunction, SolidStore, Store, StoreNode, StorePathRange, StoreSetter } from "./store.js";
 export * from "./mutable.js";
 export * from "./modifiers.js";
-import { $NAME, $NODE, isWrappable } from "./store.js";
-export declare const DEV: {
-    readonly $NAME: typeof $NAME;
-    readonly $NODE: typeof $NODE;
-    readonly isWrappable: typeof isWrappable;
+import { $NODE, isWrappable, DevHooks } from "./store.js";
+declare let DEV: {
+    $NODE: typeof $NODE;
+    isWrappable: typeof isWrappable;
+    hooks: typeof DevHooks;
 } | undefined;
+export { DEV };

package/store/types/store.d.ts

@@ -1,7 +1,7 @@
-export declare const $RAW: unique symbol, $NODE: unique symbol, $NAME: unique symbol;
-declare global {
-    var _$onStoreNodeUpdate: OnStoreNodeUpdate | undefined;
-}
+export declare const $RAW: unique symbol, $NODE: unique symbol;
+export declare const DevHooks: {
+    onStoreNodeUpdate: OnStoreNodeUpdate | null;
+};
 type DataNode = {
     (): any;
     $(value?: any): void;
@@ -9,7 +9,6 @@ type DataNode = {
 type DataNodes = Record<PropertyKey, DataNode>;
 export type OnStoreNodeUpdate = (state: StoreNode, property: PropertyKey, value: StoreNode | NotWrappable, prev: StoreNode | NotWrappable) => void;
 export interface StoreNode {
-    [$NAME]?: string;
     [$NODE]?: DataNodes;
     [key: PropertyKey]: any;
 }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-export { $DEVCOMP, $PROXY, $TRACK, batch, children, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, enableExternalSource, enableScheduling, equalFn, getListener, getOwner, on, onCleanup, onError, onMount, runWithOwner, startTransition, untrack, useContext, useTransition } from "./reactive/signal.js";
+export { $DEVCOMP, $PROXY, $TRACK, batch, children, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, enableExternalSource, enableScheduling, equalFn, getListener, getOwner, on, onCleanup, onError, catchError, onMount, runWithOwner, startTransition, untrack, useContext, useTransition } from "./reactive/signal.js";
 export type { Accessor, AccessorArray, ChildrenReturn, Context, EffectFunction, EffectOptions, InitializedResource, InitializedResourceOptions, InitializedResourceReturn, MemoOptions, NoInfer, OnEffectFunction, OnOptions, Owner, Resource, ResourceActions, ResourceFetcher, ResourceFetcherInfo, ResourceOptions, ResourceReturn, ResourceSource, ReturnTypes, Setter, Signal, SignalOptions } from "./reactive/signal.js";
 export * from "./reactive/observable.js";
 export * from "./reactive/scheduler.js";
@@ -7,13 +7,12 @@ export * from "./render/index.js";
 import type { JSX } from "./jsx.js";
 type JSXElement = JSX.Element;
 export type { JSXElement, JSX };
-import { hashValue, registerGraph, serializeGraph, writeSignal } from "./reactive/signal.js";
+import { registerGraph, writeSignal, DevHooks } from "./reactive/signal.js";
 declare let DEV: {
-    writeSignal: typeof writeSignal;
-    serializeGraph: typeof serializeGraph;
-    registerGraph: typeof registerGraph;
-    hashValue: typeof hashValue;
-};
+    readonly hooks: typeof DevHooks;
+    readonly writeSignal: typeof writeSignal;
+    readonly registerGraph: typeof registerGraph;
+} | undefined;
 export { DEV };
 declare global {
     var Solid$$: boolean;

package/types/jsx.d.ts

@@ -12,16 +12,12 @@ export namespace JSX {
   type Element =
     | Node
     | ArrayElement
-    | FunctionElement
     | (string & {})
     | number
     | boolean
     | null
     | undefined;
   interface ArrayElement extends Array<Element> {}
-  interface FunctionElement {
-    (): Element;
-  }
   interface ElementClass {
     // empty, libs can define requirements downstream
   }
@@ -803,6 +799,7 @@ export namespace JSX {
     checked?: boolean;
     crossorigin?: HTMLCrossorigin;
     disabled?: boolean;
+    enterkeyhint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';
     form?: string;
     formaction?: string;
     formenctype?: HTMLFormEncType;

package/types/reactive/signal.d.ts

@@ -31,13 +31,15 @@ export declare const $DEVCOMP: unique symbol;
 export declare var Owner: Owner | null;
 export declare let Transition: TransitionState | null;
 declare let ExternalSourceFactory: ExternalSourceFactory | null;
-declare global {
-    var _$afterUpdate: (() => void) | undefined;
-    var _$afterCreateRoot: ((root: Owner) => void) | undefined;
-}
+/** Object storing callbacks for debugging during development */
+export declare const DevHooks: {
+    afterUpdate: (() => void) | null;
+    afterCreateOwner: ((owner: Owner) => void) | null;
+};
 export type ComputationState = 0 | 1 | 2;
 export interface SourceMapValue {
     value: unknown;
+    name?: string;
     graph?: Owner;
 }
 export interface SignalState<T> extends SourceMapValue {
@@ -46,16 +48,14 @@ export interface SignalState<T> extends SourceMapValue {
     observerSlots: number[] | null;
     tValue?: T;
     comparator?: (prev: T, next: T) => boolean;
-    name?: string;
 }
 export interface Owner {
     owned: Computation<any>[] | null;
     cleanups: (() => void)[] | null;
     owner: Owner | null;
     context: any | null;
-    sourceMap?: Record<string, SourceMapValue>;
+    sourceMap?: SourceMapValue[];
     name?: string;
-    componentName?: string;
 }
 export interface Computation<Init, Next extends Init = Init> extends Owner {
     fn: EffectFunction<Init, Next>;
@@ -441,6 +441,17 @@ export declare function onMount(fn: () => void): void;
  */
 export declare function onCleanup<T extends () => any>(fn: T): T;
 /**
+ * catchError - run an effect whenever an error is thrown within the context of the child scopes
+ * @param fn boundary for the error
+ * @param handler an error handler that receives the error
+ *
+ * * If the error is thrown again inside the error handler, it will trigger the next available parent handler
+ *
+ * @description https://www.solidjs.com/docs/latest/api#catcherror
+ */
+export declare function catchError<T>(fn: () => T, handler: (err: Error) => void): T | undefined;
+/**
+ * @deprecated since version 1.7.0 and will be removed in next major - use catchError instead
  * onError - run an effect whenever an error is thrown within the context of the child scopes
  * @param fn an error handler that receives the error
  *
@@ -448,7 +459,7 @@ export declare function onCleanup<T extends () => any>(fn: T): T;
  *
  * @description https://www.solidjs.com/docs/latest/api#onerror
  */
-export declare function onError(fn: (err: any) => void): void;
+export declare function onError(fn: (err: Error) => void): void;
 export declare function getListener(): Computation<any, any> | null;
 export declare function getOwner(): Owner | null;
 export declare function runWithOwner<T>(o: typeof Owner, fn: () => T): T | undefined;
@@ -473,17 +484,13 @@ export type Transition = [Accessor<boolean>, (fn: () => void) => Promise<void>];
  */
 export declare function useTransition(): Transition;
 export declare function resumeEffects(e: Computation<any>[]): void;
-export interface DevComponent<T> extends Memo<JSX.Element> {
+export interface DevComponent<T> extends Memo<unknown> {
     props: T;
-    componentName: string;
-}
-export declare function devComponent<T>(Comp: (props: T) => JSX.Element, props: T): JSX.Element;
-export declare function hashValue(v: any): string;
-export declare function registerGraph(name: string, value: SourceMapValue): string;
-interface GraphRecord {
-    [k: string]: GraphRecord | unknown;
+    name: string;
+    component: (props: T) => unknown;
 }
-export declare function serializeGraph(owner?: Owner | null): GraphRecord;
+export declare function devComponent<P, V>(Comp: (props: P) => V, props: P): V;
+export declare function registerGraph(value: SourceMapValue): void;
 export type ContextProviderComponent<T> = FlowComponent<{
     value: T;
 }>;
@@ -522,7 +529,7 @@ export declare function createContext<T>(defaultValue: T, options?: EffectOption
  * @description https://www.solidjs.com/docs/latest/api#usecontext
  */
 export declare function useContext<T>(context: Context<T>): T;
-export type ResolvedJSXElement = Exclude<JSX.Element, JSX.ArrayElement | JSX.FunctionElement>;
+export type ResolvedJSXElement = Exclude<JSX.Element, JSX.ArrayElement>;
 export type ResolvedChildren = ResolvedJSXElement | ResolvedJSXElement[];
 export type ChildrenReturn = Accessor<ResolvedChildren> & {
     toArray: () => ResolvedJSXElement[];