solid-js 1.6.8 → 1.6.10

package/html/dist/html.js

@@ -20,8 +20,7 @@ const lookup = {
   track: true,
   wbr: true
 };
-function parseTag(
-tag) {
+function parseTag( tag) {
   const res = {
     type: 'tag',
     name: '',
@@ -181,14 +180,14 @@ function createHTML(r, {
   };
   function createTemplate(statics) {
     let i = 0,
-        markup = "";
+      markup = "";
     for (; i < statics.length - 1; i++) {
       markup = markup + statics[i] + "<!--#-->";
     }
     markup = markup + statics[i];
     markup = markup.replace(selfClosing, fullClosing).replace(/<(<!--#-->)/g, "<###").replace(/\.\.\.(<!--#-->)/g, "###").replace(attrSeeker, attrReplacer).replace(/>\n+\s*/g, ">").replace(/\n+\s*</g, "<").replace(/\s+</g, " <").replace(/>\s+/g, "> ");
     const [html, code] = parseTemplate(parse(markup)),
-          templates = [];
+      templates = [];
     for (let i = 0; i < html.length; i++) {
       templates.push(document.createElement("template"));
       templates[i].innerHTML = html[i];
@@ -211,8 +210,8 @@ function createHTML(r, {
   }
   function parseKeyValue(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;
+      parts,
+      namespace;
     if ((parts = name.split(":")) && parts[1] && reservedNameSpaces.has(parts[0])) {
       name = parts[1];
       namespace = parts[0];
@@ -250,9 +249,9 @@ function createHTML(r, {
       options.exprs.push(`exprs[${options.counter++}](${tag})`);
     } else {
       const childOptions = Object.assign({}, options, {
-        exprs: []
-      }),
-            count = options.counter;
+          exprs: []
+        }),
+        count = options.counter;
       parseKeyValue(tag, name, value, isSVG, isCE, childOptions);
       options.decl.push(`_fn${count} = (${value === "###" ? "doNotWrap" : ""}) => {\n${childOptions.exprs.join(";\n")};\n}`);
       if (value === "###") {
@@ -318,11 +317,11 @@ function createHTML(r, {
   function processComponent(node, options) {
     let props = [];
     const keys = Object.keys(node.attrs),
-          propGroups = [props],
-          componentIdentifier = options.counter++;
+      propGroups = [props],
+      componentIdentifier = options.counter++;
     for (let i = 0; i < keys.length; i++) {
       const name = keys[i],
-            value = node.attrs[name];
+        value = node.attrs[name];
       if (name === "###") {
         propGroups.push(`exprs[${options.counter++}]`);
         propGroups.push(props = []);
@@ -334,15 +333,15 @@ function createHTML(r, {
       props.push(`children: () => exprs[${options.counter++}]`);
     } else if (node.children.length) {
       const children = {
-        type: "fragment",
-        children: node.children
-      },
-            childOptions = Object.assign({}, options, {
-        first: true,
-        decl: [],
-        exprs: [],
-        parent: false
-      });
+          type: "fragment",
+          children: node.children
+        },
+        childOptions = Object.assign({}, options, {
+          first: true,
+          decl: [],
+          exprs: [],
+          parent: false
+        });
       parseNode(children, childOptions);
       props.push(`children: () => { ${childOptions.exprs.join(";\n")}}`);
       options.templateId = childOptions.templateId;
@@ -408,7 +407,7 @@ function createHTML(r, {
         let current = "";
         for (let i = 0; i < keys.length; i++) {
           const name = keys[i],
-                value = node.attrs[name];
+            value = node.attrs[name];
           if (value.includes("###")) {
             let count = options.counter++;
             current += `${name}: ${name !== "ref" ? `typeof exprs[${count}] === "function" ? exprs[${count}]() : ` : ""}exprs[${count}],`;
@@ -427,7 +426,7 @@ function createHTML(r, {
       } else {
         for (let i = 0; i < keys.length; i++) {
           const name = keys[i],
-                value = node.attrs[name];
+            value = node.attrs[name];
           if (value.includes("###")) {
             delete node.attrs[name];
             parseAttribute(tag, name, value, isSVG, isCE, options);
@@ -459,18 +458,18 @@ function createHTML(r, {
   }
   function parseTemplate(nodes) {
     const options = {
-      path: "",
-      decl: [],
-      exprs: [],
-      delegatedEvents: new Set(),
-      counter: 0,
-      first: true,
-      multi: false,
-      templateId: 0,
-      templateNodes: []
-    },
-          id = uuid,
-          origNodes = nodes;
+        path: "",
+        decl: [],
+        exprs: [],
+        delegatedEvents: new Set(),
+        counter: 0,
+        first: true,
+        multi: false,
+        templateId: 0,
+        templateNodes: []
+      },
+      id = uuid,
+      origNodes = nodes;
     let toplevel;
     if (nodes.length > 1) {
       nodes = [{

package/html/types/lit.d.ts

@@ -1,4 +1,4 @@
-declare type MountableElement = Element | Document | ShadowRoot | DocumentFragment | Node;
+type MountableElement = Element | Document | ShadowRoot | DocumentFragment | Node;
 interface Runtime {
     effect<T>(fn: (prev?: T) => T, init?: T): any;
     untrack<T>(fn: () => T): T;
@@ -29,7 +29,7 @@ interface Runtime {
     SVGElements: Set<string>;
     SVGNamespace: Record<string, string>;
 }
-export declare type HTMLTag = {
+export type HTMLTag = {
     (statics: TemplateStringsArray, ...args: unknown[]): Node | Node[];
 };
 export declare function createHTML(r: Runtime, { delegateEvents }?: {

package/package.json

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

package/store/dist/dev.cjs

@@ -3,8 +3,8 @@
 var solidJs = require('solid-js');
 
 const $RAW = Symbol("store-raw"),
-      $NODE = Symbol("store-node"),
-      $NAME = Symbol("store-name");
+  $NODE = Symbol("store-node"),
+  $NAME = Symbol("store-name");
 function wrap$1(value, name) {
   let p = value[solidJs.$PROXY];
   if (!p) {
@@ -13,7 +13,7 @@ function wrap$1(value, name) {
     });
     if (!Array.isArray(value)) {
       const keys = Object.keys(value),
-            desc = Object.getOwnPropertyDescriptors(value);
+        desc = Object.getOwnPropertyDescriptors(value);
       for (let i = 0, l = keys.length; i < l; i++) {
         const prop = keys[i];
         if (desc[prop].get) {
@@ -47,7 +47,7 @@ function unwrap(item, set = new Set()) {
   } else {
     if (Object.isFrozen(item)) item = Object.assign({}, item);else set.add(item);
     const keys = Object.keys(item),
-          desc = Object.getOwnPropertyDescriptors(item);
+      desc = Object.getOwnPropertyDescriptors(item);
     for (let i = 0, l = keys.length; i < l; i++) {
       prop = keys[i];
       if (desc[prop].get) continue;
@@ -130,11 +130,11 @@ const proxyTraps$1 = {
 function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
   const prev = state[property],
-        len = state.length;
+    len = state.length;
   if (globalThis._$onStoreNodeUpdate) globalThis._$onStoreNodeUpdate(state, property, value, prev);
   if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
-      node;
+    node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
   if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
   (node = nodes._) && node.$();
@@ -152,7 +152,7 @@ function updateArray(current, next) {
   if (Array.isArray(next)) {
     if (current === next) return;
     let i = 0,
-        len = next.length;
+      len = next.length;
     for (; i < len; i++) {
       const value = next[i];
       if (current[i] !== value) setProperty(current, i, value);
@@ -162,11 +162,11 @@ function updateArray(current, next) {
 }
 function updatePath(current, path, traversed = []) {
   let part,
-      prev = current;
+    prev = current;
   if (path.length > 1) {
     part = path.shift();
     const partType = typeof part,
-          isArray = Array.isArray(current);
+      isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
         updatePath(current, [part[i]].concat(path), traversed);
@@ -277,7 +277,7 @@ function wrap(value, name) {
       value: p = new Proxy(value, proxyTraps)
     });
     const keys = Object.keys(value),
-          desc = Object.getOwnPropertyDescriptors(value);
+      desc = Object.getOwnPropertyDescriptors(value);
     for (let i = 0, l = keys.length; i < l; i++) {
       const prop = keys[i];
       if (desc[prop].get) {
@@ -288,7 +288,7 @@ function wrap(value, name) {
       }
       if (desc[prop].set) {
         const og = desc[prop].set,
-              set = v => solidJs.batch(() => og.call(p, v));
+          set = v => solidJs.batch(() => og.call(p, v));
         Object.defineProperty(value, prop, {
           set
         });
@@ -334,7 +334,7 @@ function applyState(target, parent, property, merge, key) {
         applyState(target[start], previous, start, merge, key);
       }
       const temp = new Array(target.length),
-            newIndices = new Map();
+        newIndices = new Map();
       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];
       }
@@ -390,10 +390,10 @@ function applyState(target, parent, property, merge, key) {
 }
 function reconcile(value, options = {}) {
   const {
-    merge,
-    key = "id"
-  } = options,
-        v = unwrap(value);
+      merge,
+      key = "id"
+    } = options,
+    v = unwrap(value);
   return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
     const res = applyState(v, {

package/store/dist/dev.js

@@ -1,8 +1,8 @@
 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");
+  $NODE = Symbol("store-node"),
+  $NAME = Symbol("store-name");
 function wrap$1(value, name) {
   let p = value[$PROXY];
   if (!p) {
@@ -11,7 +11,7 @@ function wrap$1(value, name) {
     });
     if (!Array.isArray(value)) {
       const keys = Object.keys(value),
-            desc = Object.getOwnPropertyDescriptors(value);
+        desc = Object.getOwnPropertyDescriptors(value);
       for (let i = 0, l = keys.length; i < l; i++) {
         const prop = keys[i];
         if (desc[prop].get) {
@@ -45,7 +45,7 @@ function unwrap(item, set = new Set()) {
   } else {
     if (Object.isFrozen(item)) item = Object.assign({}, item);else set.add(item);
     const keys = Object.keys(item),
-          desc = Object.getOwnPropertyDescriptors(item);
+      desc = Object.getOwnPropertyDescriptors(item);
     for (let i = 0, l = keys.length; i < l; i++) {
       prop = keys[i];
       if (desc[prop].get) continue;
@@ -128,11 +128,11 @@ const proxyTraps$1 = {
 function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
   const prev = state[property],
-        len = state.length;
+    len = state.length;
   if (globalThis._$onStoreNodeUpdate) globalThis._$onStoreNodeUpdate(state, property, value, prev);
   if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
-      node;
+    node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
   if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
   (node = nodes._) && node.$();
@@ -150,7 +150,7 @@ function updateArray(current, next) {
   if (Array.isArray(next)) {
     if (current === next) return;
     let i = 0,
-        len = next.length;
+      len = next.length;
     for (; i < len; i++) {
       const value = next[i];
       if (current[i] !== value) setProperty(current, i, value);
@@ -160,11 +160,11 @@ function updateArray(current, next) {
 }
 function updatePath(current, path, traversed = []) {
   let part,
-      prev = current;
+    prev = current;
   if (path.length > 1) {
     part = path.shift();
     const partType = typeof part,
-          isArray = Array.isArray(current);
+      isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
         updatePath(current, [part[i]].concat(path), traversed);
@@ -275,7 +275,7 @@ function wrap(value, name) {
       value: p = new Proxy(value, proxyTraps)
     });
     const keys = Object.keys(value),
-          desc = Object.getOwnPropertyDescriptors(value);
+      desc = Object.getOwnPropertyDescriptors(value);
     for (let i = 0, l = keys.length; i < l; i++) {
       const prop = keys[i];
       if (desc[prop].get) {
@@ -286,7 +286,7 @@ function wrap(value, name) {
       }
       if (desc[prop].set) {
         const og = desc[prop].set,
-              set = v => batch(() => og.call(p, v));
+          set = v => batch(() => og.call(p, v));
         Object.defineProperty(value, prop, {
           set
         });
@@ -332,7 +332,7 @@ function applyState(target, parent, property, merge, key) {
         applyState(target[start], previous, start, merge, key);
       }
       const temp = new Array(target.length),
-            newIndices = new Map();
+        newIndices = new Map();
       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];
       }
@@ -388,10 +388,10 @@ function applyState(target, parent, property, merge, key) {
 }
 function reconcile(value, options = {}) {
   const {
-    merge,
-    key = "id"
-  } = options,
-        v = unwrap(value);
+      merge,
+      key = "id"
+    } = options,
+    v = unwrap(value);
   return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
     const res = applyState(v, {

package/store/dist/server.cjs

@@ -25,7 +25,7 @@ function updateArray(current, next) {
   if (Array.isArray(next)) {
     if (current === next) return;
     let i = 0,
-        len = next.length;
+      len = next.length;
     for (; i < len; i++) {
       const value = next[i];
       if (current[i] !== value) setProperty(current, i, value);
@@ -35,11 +35,11 @@ function updateArray(current, next) {
 }
 function updatePath(current, path, traversed = []) {
   let part,
-      next = current;
+    next = current;
   if (path.length > 1) {
     part = path.shift();
     const partType = typeof part,
-          isArray = Array.isArray(current);
+      isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
         updatePath(current, [part[i]].concat(path), traversed);

package/store/dist/server.js

@@ -23,7 +23,7 @@ function updateArray(current, next) {
   if (Array.isArray(next)) {
     if (current === next) return;
     let i = 0,
-        len = next.length;
+      len = next.length;
     for (; i < len; i++) {
       const value = next[i];
       if (current[i] !== value) setProperty(current, i, value);
@@ -33,11 +33,11 @@ function updateArray(current, next) {
 }
 function updatePath(current, path, traversed = []) {
   let part,
-      next = current;
+    next = current;
   if (path.length > 1) {
     part = path.shift();
     const partType = typeof part,
-          isArray = Array.isArray(current);
+      isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
         updatePath(current, [part[i]].concat(path), traversed);

package/store/dist/store.cjs

@@ -3,8 +3,8 @@
 var solidJs = require('solid-js');
 
 const $RAW = Symbol("store-raw"),
-      $NODE = Symbol("store-node"),
-      $NAME = Symbol("store-name");
+  $NODE = Symbol("store-node"),
+  $NAME = Symbol("store-name");
 function wrap$1(value, name) {
   let p = value[solidJs.$PROXY];
   if (!p) {
@@ -13,7 +13,7 @@ function wrap$1(value, name) {
     });
     if (!Array.isArray(value)) {
       const keys = Object.keys(value),
-            desc = Object.getOwnPropertyDescriptors(value);
+        desc = Object.getOwnPropertyDescriptors(value);
       for (let i = 0, l = keys.length; i < l; i++) {
         const prop = keys[i];
         if (desc[prop].get) {
@@ -44,7 +44,7 @@ function unwrap(item, set = new Set()) {
   } else {
     if (Object.isFrozen(item)) item = Object.assign({}, item);else set.add(item);
     const keys = Object.keys(item),
-          desc = Object.getOwnPropertyDescriptors(item);
+      desc = Object.getOwnPropertyDescriptors(item);
     for (let i = 0, l = keys.length; i < l; i++) {
       prop = keys[i];
       if (desc[prop].get) continue;
@@ -125,10 +125,10 @@ const proxyTraps$1 = {
 function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
   const prev = state[property],
-        len = state.length;
+    len = state.length;
   if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
-      node;
+    node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
   if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
   (node = nodes._) && node.$();
@@ -146,7 +146,7 @@ function updateArray(current, next) {
   if (Array.isArray(next)) {
     if (current === next) return;
     let i = 0,
-        len = next.length;
+      len = next.length;
     for (; i < len; i++) {
       const value = next[i];
       if (current[i] !== value) setProperty(current, i, value);
@@ -156,11 +156,11 @@ function updateArray(current, next) {
 }
 function updatePath(current, path, traversed = []) {
   let part,
-      prev = current;
+    prev = current;
   if (path.length > 1) {
     part = path.shift();
     const partType = typeof part,
-          isArray = Array.isArray(current);
+      isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
         updatePath(current, [part[i]].concat(path), traversed);
@@ -264,7 +264,7 @@ function wrap(value, name) {
       value: p = new Proxy(value, proxyTraps)
     });
     const keys = Object.keys(value),
-          desc = Object.getOwnPropertyDescriptors(value);
+      desc = Object.getOwnPropertyDescriptors(value);
     for (let i = 0, l = keys.length; i < l; i++) {
       const prop = keys[i];
       if (desc[prop].get) {
@@ -275,7 +275,7 @@ function wrap(value, name) {
       }
       if (desc[prop].set) {
         const og = desc[prop].set,
-              set = v => solidJs.batch(() => og.call(p, v));
+          set = v => solidJs.batch(() => og.call(p, v));
         Object.defineProperty(value, prop, {
           set
         });
@@ -311,7 +311,7 @@ function applyState(target, parent, property, merge, key) {
         applyState(target[start], previous, start, merge, key);
       }
       const temp = new Array(target.length),
-            newIndices = new Map();
+        newIndices = new Map();
       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];
       }
@@ -367,10 +367,10 @@ function applyState(target, parent, property, merge, key) {
 }
 function reconcile(value, options = {}) {
   const {
-    merge,
-    key = "id"
-  } = options,
-        v = unwrap(value);
+      merge,
+      key = "id"
+    } = options,
+    v = unwrap(value);
   return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
     const res = applyState(v, {

package/store/dist/store.js

@@ -1,8 +1,8 @@
 import { $PROXY, $TRACK, getListener, batch, createSignal } from 'solid-js';
 
 const $RAW = Symbol("store-raw"),
-      $NODE = Symbol("store-node"),
-      $NAME = Symbol("store-name");
+  $NODE = Symbol("store-node"),
+  $NAME = Symbol("store-name");
 function wrap$1(value, name) {
   let p = value[$PROXY];
   if (!p) {
@@ -11,7 +11,7 @@ function wrap$1(value, name) {
     });
     if (!Array.isArray(value)) {
       const keys = Object.keys(value),
-            desc = Object.getOwnPropertyDescriptors(value);
+        desc = Object.getOwnPropertyDescriptors(value);
       for (let i = 0, l = keys.length; i < l; i++) {
         const prop = keys[i];
         if (desc[prop].get) {
@@ -42,7 +42,7 @@ function unwrap(item, set = new Set()) {
   } else {
     if (Object.isFrozen(item)) item = Object.assign({}, item);else set.add(item);
     const keys = Object.keys(item),
-          desc = Object.getOwnPropertyDescriptors(item);
+      desc = Object.getOwnPropertyDescriptors(item);
     for (let i = 0, l = keys.length; i < l; i++) {
       prop = keys[i];
       if (desc[prop].get) continue;
@@ -123,10 +123,10 @@ const proxyTraps$1 = {
 function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
   const prev = state[property],
-        len = state.length;
+    len = state.length;
   if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
-      node;
+    node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
   if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
   (node = nodes._) && node.$();
@@ -144,7 +144,7 @@ function updateArray(current, next) {
   if (Array.isArray(next)) {
     if (current === next) return;
     let i = 0,
-        len = next.length;
+      len = next.length;
     for (; i < len; i++) {
       const value = next[i];
       if (current[i] !== value) setProperty(current, i, value);
@@ -154,11 +154,11 @@ function updateArray(current, next) {
 }
 function updatePath(current, path, traversed = []) {
   let part,
-      prev = current;
+    prev = current;
   if (path.length > 1) {
     part = path.shift();
     const partType = typeof part,
-          isArray = Array.isArray(current);
+      isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
         updatePath(current, [part[i]].concat(path), traversed);
@@ -262,7 +262,7 @@ function wrap(value, name) {
       value: p = new Proxy(value, proxyTraps)
     });
     const keys = Object.keys(value),
-          desc = Object.getOwnPropertyDescriptors(value);
+      desc = Object.getOwnPropertyDescriptors(value);
     for (let i = 0, l = keys.length; i < l; i++) {
       const prop = keys[i];
       if (desc[prop].get) {
@@ -273,7 +273,7 @@ function wrap(value, name) {
       }
       if (desc[prop].set) {
         const og = desc[prop].set,
-              set = v => batch(() => og.call(p, v));
+          set = v => batch(() => og.call(p, v));
         Object.defineProperty(value, prop, {
           set
         });
@@ -309,7 +309,7 @@ function applyState(target, parent, property, merge, key) {
         applyState(target[start], previous, start, merge, key);
       }
       const temp = new Array(target.length),
-            newIndices = new Map();
+        newIndices = new Map();
       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];
       }
@@ -365,10 +365,10 @@ function applyState(target, parent, property, merge, key) {
 }
 function reconcile(value, options = {}) {
   const {
-    merge,
-    key = "id"
-  } = options,
-        v = unwrap(value);
+      merge,
+      key = "id"
+    } = options,
+    v = unwrap(value);
   return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
     const res = applyState(v, {

package/types/index.d.ts

@@ -1,5 +1,5 @@
 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 type { Accessor, AccessorArray, ChildrenReturn, Context, EffectFunction, InitializedResource, InitializedResourceOptions, InitializedResourceReturn, MemoOptions, NoInfer, OnEffectFunction, Owner, Resource, ResourceActions, ResourceFetcher, ResourceFetcherInfo, ResourceOptions, ResourceReturn, ResourceSource, ReturnTypes, Setter, Signal, SignalOptions } 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";
 export * from "./reactive/array.js";

package/types/reactive/observable.d.ts

@@ -4,6 +4,12 @@ declare global {
         readonly observable: symbol;
     }
 }
+interface Observable<T> {
+    subscribe(observer: ObservableObserver<T>): {
+        unsubscribe(): void;
+    };
+    [Symbol.observable](): Observable<T>;
+}
 export declare type ObservableObserver<T> = ((v: T) => void) | {
     next?: (v: T) => void;
     error?: (v: any) => void;
@@ -19,14 +25,10 @@ export declare type ObservableObserver<T> = ((v: T) => void) | {
  * ```
  * description https://www.solidjs.com/docs/latest/api#observable
  */
-export declare function observable<T>(input: Accessor<T>): {
-    subscribe(observer: ObservableObserver<T>): {
-        unsubscribe(): void;
-    };
-    [Symbol.observable](): any;
-};
+export declare function observable<T>(input: Accessor<T>): Observable<T>;
 export declare function from<T>(producer: ((setter: Setter<T | undefined>) => () => void) | {
     subscribe: (fn: (v: T) => void) => (() => void) | {
         unsubscribe: () => void;
     };
 }): Accessor<T | undefined>;
+export {};