solid-js 1.3.0 → 1.3.4

package/dist/dev.cjs

@@ -249,7 +249,7 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  options ||= {};
+  options || (options = {});
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
@@ -506,7 +506,7 @@ function startTransition(fn) {
         queue: new Set(),
         running: true
       });
-      t.done ||= new Promise(res => t.resolve = res);
+      t.done || (t.done = new Promise(res => t.resolve = res));
       t.running = true;
     }
     batch(fn);
@@ -1313,7 +1313,6 @@ function lazy(fn) {
   const wrap = props => {
     const ctx = sharedConfig.context;
     if (ctx) {
-      ctx.count++;
       const [s, set] = createSignal();
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
@@ -1332,6 +1331,9 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
+      Object.assign(Comp, {
+        [$DEVCOMP]: true
+      });
       if (!ctx) return Comp(props);
       const c = sharedConfig.context;
       setHydrateContext(ctx);
@@ -1399,12 +1401,19 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+let Errors;
+function resetErrorBoundaries() {
+  Errors && [...Errors].forEach(fn => fn());
+}
 function ErrorBoundary(props) {
   let err = undefined;
   if (sharedConfig.context && sharedConfig.load) {
     err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
   }
   const [errored, setErrored] = createSignal(err);
+  Errors || (Errors = new Set());
+  Errors.add(setErrored);
+  onCleanup(() => Errors.delete(setErrored));
   let e;
   return createMemo(() => {
     if ((e = errored()) != null) {
@@ -1508,20 +1517,18 @@ function Suspense(props) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
-      if (typeof p !== "object" || !("then" in p)) error = p;else {
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (error = err) return set();
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-          p = undefined;
-        });
-      }
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);
@@ -1547,6 +1554,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }
@@ -1625,6 +1633,7 @@ exports.onError = onError;
 exports.onMount = onMount;
 exports.refetchResources = refetchResources;
 exports.requestCallback = requestCallback;
+exports.resetErrorBoundaries = resetErrorBoundaries;
 exports.runWithOwner = runWithOwner;
 exports.sharedConfig = sharedConfig;
 exports.splitProps = splitProps;

package/dist/dev.js

@@ -245,7 +245,7 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  options ||= {};
+  options || (options = {});
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
@@ -502,7 +502,7 @@ function startTransition(fn) {
         queue: new Set(),
         running: true
       });
-      t.done ||= new Promise(res => t.resolve = res);
+      t.done || (t.done = new Promise(res => t.resolve = res));
       t.running = true;
     }
     batch(fn);
@@ -1309,7 +1309,6 @@ function lazy(fn) {
   const wrap = props => {
     const ctx = sharedConfig.context;
     if (ctx) {
-      ctx.count++;
       const [s, set] = createSignal();
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
@@ -1328,6 +1327,9 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
+      Object.assign(Comp, {
+        [$DEVCOMP]: true
+      });
       if (!ctx) return Comp(props);
       const c = sharedConfig.context;
       setHydrateContext(ctx);
@@ -1395,12 +1397,19 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+let Errors;
+function resetErrorBoundaries() {
+  Errors && [...Errors].forEach(fn => fn());
+}
 function ErrorBoundary(props) {
   let err = undefined;
   if (sharedConfig.context && sharedConfig.load) {
     err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
   }
   const [errored, setErrored] = createSignal(err);
+  Errors || (Errors = new Set());
+  Errors.add(setErrored);
+  onCleanup(() => Errors.delete(setErrored));
   let e;
   return createMemo(() => {
     if ((e = errored()) != null) {
@@ -1504,20 +1513,18 @@ function Suspense(props) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
-      if (typeof p !== "object" || !("then" in p)) error = p;else {
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (error = err) return set();
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-          p = undefined;
-        });
-      }
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);
@@ -1543,6 +1550,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }
@@ -1577,4 +1585,4 @@ if (globalThis) {
   if (!globalThis.Solid$$) globalThis.Solid$$ = true;else console.warn("You appear to have multiple instances of Solid. This can lead to unexpected behavior.");
 }
 
-export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/server.cjs

@@ -349,7 +349,7 @@ function createResource(fn, fetcher, options = {}) {
   if (sharedConfig.context.async) {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
-      if (!resource.data && !resource.ref[0].loading) resource.ref[1].refetch();
+      if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error) resource.ref[1].refetch();
       return resource.ref;
     }
   }
@@ -367,6 +367,7 @@ function createResource(fn, fetcher, options = {}) {
     return resolved ? sharedConfig.context.resources[id].data : value;
   };
   read.loading = false;
+  read.error = undefined;
   function load() {
     const ctx = sharedConfig.context;
     if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
@@ -395,7 +396,7 @@ function createResource(fn, fetcher, options = {}) {
         return res;
       }).catch(err => {
         read.loading = false;
-        error = err;
+        read.error = error = err;
         p = null;
         notifySuspense(contexts);
       });
@@ -416,11 +417,12 @@ function lazy(fn) {
   const contexts = new Set();
   p.then(mod => resolved = mod.default);
   const wrap = props => {
-    const id = sharedConfig.context.id + sharedConfig.context.count++;
+    const id = sharedConfig.context.id.slice(0, -1);
     if (resolved) return resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {
-      loading: true
+      loading: true,
+      error: undefined
     };
     if (ctx) {
       ctx.resources.set(id, track);

package/dist/server.js

@@ -345,7 +345,7 @@ function createResource(fn, fetcher, options = {}) {
   if (sharedConfig.context.async) {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
-      if (!resource.data && !resource.ref[0].loading) resource.ref[1].refetch();
+      if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error) resource.ref[1].refetch();
       return resource.ref;
     }
   }
@@ -363,6 +363,7 @@ function createResource(fn, fetcher, options = {}) {
     return resolved ? sharedConfig.context.resources[id].data : value;
   };
   read.loading = false;
+  read.error = undefined;
   function load() {
     const ctx = sharedConfig.context;
     if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
@@ -391,7 +392,7 @@ function createResource(fn, fetcher, options = {}) {
         return res;
       }).catch(err => {
         read.loading = false;
-        error = err;
+        read.error = error = err;
         p = null;
         notifySuspense(contexts);
       });
@@ -412,11 +413,12 @@ function lazy(fn) {
   const contexts = new Set();
   p.then(mod => resolved = mod.default);
   const wrap = props => {
-    const id = sharedConfig.context.id + sharedConfig.context.count++;
+    const id = sharedConfig.context.id.slice(0, -1);
     if (resolved) return resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {
-      loading: true
+      loading: true,
+      error: undefined
     };
     if (ctx) {
       ctx.resources.set(id, track);

package/dist/solid.cjs

@@ -246,7 +246,7 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  options ||= {};
+  options || (options = {});
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
@@ -503,7 +503,7 @@ function startTransition(fn) {
         queue: new Set(),
         running: true
       });
-      t.done ||= new Promise(res => t.resolve = res);
+      t.done || (t.done = new Promise(res => t.resolve = res));
       t.running = true;
     }
     batch(fn);
@@ -1232,7 +1232,6 @@ function lazy(fn) {
   const wrap = props => {
     const ctx = sharedConfig.context;
     if (ctx) {
-      ctx.count++;
       const [s, set] = createSignal();
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
@@ -1318,12 +1317,19 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+let Errors;
+function resetErrorBoundaries() {
+  Errors && [...Errors].forEach(fn => fn());
+}
 function ErrorBoundary(props) {
   let err = undefined;
   if (sharedConfig.context && sharedConfig.load) {
     err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
   }
   const [errored, setErrored] = createSignal(err);
+  Errors || (Errors = new Set());
+  Errors.add(setErrored);
+  onCleanup(() => Errors.delete(setErrored));
   let e;
   return createMemo(() => {
     if ((e = errored()) != null) {
@@ -1427,20 +1433,18 @@ function Suspense(props) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
-      if (typeof p !== "object" || !("then" in p)) error = p;else {
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (error = err) return set();
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-          p = undefined;
-        });
-      }
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);
@@ -1466,6 +1470,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }
@@ -1534,6 +1539,7 @@ exports.onError = onError;
 exports.onMount = onMount;
 exports.refetchResources = refetchResources;
 exports.requestCallback = requestCallback;
+exports.resetErrorBoundaries = resetErrorBoundaries;
 exports.runWithOwner = runWithOwner;
 exports.sharedConfig = sharedConfig;
 exports.splitProps = splitProps;

package/dist/solid.js

@@ -242,7 +242,7 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  options ||= {};
+  options || (options = {});
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
@@ -499,7 +499,7 @@ function startTransition(fn) {
         queue: new Set(),
         running: true
       });
-      t.done ||= new Promise(res => t.resolve = res);
+      t.done || (t.done = new Promise(res => t.resolve = res));
       t.running = true;
     }
     batch(fn);
@@ -1228,7 +1228,6 @@ function lazy(fn) {
   const wrap = props => {
     const ctx = sharedConfig.context;
     if (ctx) {
-      ctx.count++;
       const [s, set] = createSignal();
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
@@ -1314,12 +1313,19 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+let Errors;
+function resetErrorBoundaries() {
+  Errors && [...Errors].forEach(fn => fn());
+}
 function ErrorBoundary(props) {
   let err = undefined;
   if (sharedConfig.context && sharedConfig.load) {
     err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
   }
   const [errored, setErrored] = createSignal(err);
+  Errors || (Errors = new Set());
+  Errors.add(setErrored);
+  onCleanup(() => Errors.delete(setErrored));
   let e;
   return createMemo(() => {
     if ((e = errored()) != null) {
@@ -1423,20 +1429,18 @@ function Suspense(props) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
-      if (typeof p !== "object" || !("then" in p)) error = p;else {
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (error = err) return set();
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-          p = undefined;
-        });
-      }
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);
@@ -1462,6 +1466,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }
@@ -1485,4 +1490,4 @@ function Suspense(props) {
 
 let DEV;
 
-export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.0",
+  "version": "1.3.4",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -124,9 +124,9 @@
     "build": "npm-run-all -cnl build:*",
     "build:link": "symlink-dir . node_modules/solid-js",
     "build:js": "ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./src/jsx.d.ts && rollup -c",
-    "build:types": "tsc",
-    "build:types-store": "tsc --project ./store/tsconfig.json && tsconfig-replace-paths --project ./store/tsconfig.types.json",
-    "build:types-web": "tsc --project ./web/tsconfig.json && tsconfig-replace-paths --project ./web/tsconfig.types.json",
+    "build:types": "tsc --project ./tsconfig.build.json",
+    "build:types-store": "tsc --project ./store/tsconfig.build.json && tsconfig-replace-paths --project ./store/tsconfig.types.json",
+    "build:types-web": "tsc --project ./web/tsconfig.build.json && tsconfig-replace-paths --project ./web/tsconfig.types.json",
     "build:types-html": "tsc --project ./html/tsconfig.json",
     "build:types-h": "tsc --project ./h/tsconfig.json",
     "build:types-universal": "tsc --project ./universal/tsconfig.json",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "9525e859cc86e444e2c8f043af218043e719b964"
+  "gitHead": "4c08b520a8cb3ed03886fba160154a679dfab8a6"
 }

package/store/dist/dev.cjs

@@ -103,7 +103,7 @@ const proxyTraps$1 = {
       node = nodes[property] || (nodes[property] = createDataNode());
       node();
     }
-    return wrappable ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property}`) : value;
+    return wrappable ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
   set() {
     console.warn("Cannot mutate a Store directly");
@@ -344,8 +344,7 @@ function reconcile(value, options = {}) {
     key = "id"
   } = options,
         v = unwrap(value);
-  return s => {
-    const state = s;
+  return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
     applyState(v, {
       state
@@ -369,8 +368,7 @@ const setterTraps = {
   }
 };
 function produce(fn) {
-  return s => {
-    const state = s;
+  return state => {
     if (isWrappable(state)) fn(new Proxy(state, setterTraps));
     return state;
   };

package/store/dist/dev.js

@@ -99,7 +99,7 @@ const proxyTraps$1 = {
       node = nodes[property] || (nodes[property] = createDataNode());
       node();
     }
-    return wrappable ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property}`) : value;
+    return wrappable ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
   set() {
     console.warn("Cannot mutate a Store directly");
@@ -340,8 +340,7 @@ function reconcile(value, options = {}) {
     key = "id"
   } = options,
         v = unwrap(value);
-  return s => {
-    const state = s;
+  return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
     applyState(v, {
       state
@@ -365,8 +364,7 @@ const setterTraps = {
   }
 };
 function produce(fn) {
-  return s => {
-    const state = s;
+  return state => {
     if (isWrappable(state)) fn(new Proxy(state, setterTraps));
     return state;
   };

package/store/dist/store.cjs

@@ -324,8 +324,7 @@ function reconcile(value, options = {}) {
     key = "id"
   } = options,
         v = unwrap(value);
-  return s => {
-    const state = s;
+  return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
     applyState(v, {
       state
@@ -349,8 +348,7 @@ const setterTraps = {
   }
 };
 function produce(fn) {
-  return s => {
-    const state = s;
+  return state => {
     if (isWrappable(state)) fn(new Proxy(state, setterTraps));
     return state;
   };

package/store/dist/store.js

@@ -320,8 +320,7 @@ function reconcile(value, options = {}) {
     key = "id"
   } = options,
         v = unwrap(value);
-  return s => {
-    const state = s;
+  return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
     applyState(v, {
       state
@@ -345,8 +344,7 @@ const setterTraps = {
   }
 };
 function produce(fn) {
-  return s => {
-    const state = s;
+  return state => {
     if (isWrappable(state)) fn(new Proxy(state, setterTraps));
     return state;
   };

package/store/package.json

@@ -9,5 +9,27 @@
   "unpkg": "./dist/store.cjs",
   "types": "./types/index.d.ts",
   "type": "module",
-  "sideEffects": false
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "browser": {
+        "development": {
+          "import": "./dist/dev.js",
+          "require": "./dist/dev.cjs"
+        },
+        "import": "./dist/store.js",
+        "require": "./dist/store.cjs"
+      },
+      "node": {
+        "import": "./dist/server.js",
+        "require": "./dist/server.cjs"
+      },
+      "development": {
+        "import": "./dist/dev.js",
+        "require": "./dist/dev.cjs"
+      },
+      "import": "./dist/store.js",
+      "require": "./dist/store.cjs"
+    }
+  }
 }

package/store/types/index.d.ts

@@ -1,4 +1,4 @@
 export { createStore, unwrap, $RAW } from "./store";
-export type { Store, SetStoreFunction, NotWrappable, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, Part, Next, Readonly, DeepReadonly } from "./store";
+export type { Store, SetStoreFunction, NotWrappable, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, Part, Next, WrappableNext, DeepReadonly } from "./store";
 export * from "./mutable";
 export * from "./modifiers";

package/store/types/modifiers.d.ts

@@ -1,7 +1,7 @@
-import { Store, NotWrappable, DeepReadonly } from "./store";
+import { Store } from "./store";
 export declare type ReconcileOptions = {
     key?: string | null;
     merge?: boolean;
 };
-export declare function reconcile<T>(value: T | Store<T>, options?: ReconcileOptions): (state: T extends NotWrappable ? T : Store<DeepReadonly<T>>) => T extends NotWrappable ? T : Store<T>;
-export declare function produce<T>(fn: (state: T) => void): (state: T extends NotWrappable ? T : Store<DeepReadonly<T>>) => T extends NotWrappable ? T : Store<T>;
+export declare function reconcile<T>(value: T, options?: ReconcileOptions): (state: unknown) => Store<T>;
+export declare function produce<T>(fn: (state: T) => void): (state: Store<T>) => Store<T>;

package/store/types/mutable.d.ts

@@ -1,4 +1,4 @@
-import { StoreNode, Store } from "./store";
-export declare function createMutable<T extends StoreNode>(state: T | Store<T>, options?: {
+import { StoreNode } from "./store";
+export declare function createMutable<T extends StoreNode>(state: T, options?: {
     name?: string;
-}): Store<T>;
+}): T;