solid-js 2.0.0-experimental.7 → 2.0.0-experimental.9

package/dist/dev.cjs

@@ -53,6 +53,27 @@ function registerGraph(value) {
   value.graph = owner;
 }
 
+function tryCatch(fn) {
+  try {
+    const v = fn();
+    if (v instanceof Promise) {
+      return v.then(v => [undefined, v], e => {
+        if (e instanceof signals.NotReadyError) throw e;
+        return [e];
+      });
+    }
+    return [undefined, v];
+  } catch (e) {
+    if (e instanceof signals.NotReadyError) throw e;
+    return [e];
+  }
+}
+function reducer(source, reducerFn) {
+  return [source[0], action => {
+    source[1](s => reducerFn(s, action));
+  }];
+}
+
 function observable(input) {
   return {
     subscribe(observer) {
@@ -447,14 +468,14 @@ Object.defineProperty(exports, "transition", {
   enumerable: true,
   get: function () { return signals.transition; }
 });
-Object.defineProperty(exports, "tryCatch", {
-  enumerable: true,
-  get: function () { return signals.tryCatch; }
-});
 Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return signals.untrack; }
 });
+Object.defineProperty(exports, "useTransition", {
+  enumerable: true,
+  get: function () { return signals.useTransition; }
+});
 exports.$DEVCOMP = $DEVCOMP;
 exports.Boundary = Boundary;
 exports.DEV = DEV;
@@ -475,7 +496,9 @@ exports.from = from;
 exports.lazy = lazy;
 exports.observable = observable;
 exports.onMount = onMount;
+exports.reducer = reducer;
 exports.sharedConfig = sharedConfig;
 exports.ssrHandleError = ssrHandleError;
 exports.ssrRunInScope = ssrRunInScope;
+exports.tryCatch = tryCatch;
 exports.useContext = useContext;

package/dist/dev.js

@@ -1,5 +1,5 @@
-import { createEffect, getContext, createMemo, flatten, createRoot, setContext, getOwner, untrack, onCleanup, createSignal, createSuspense, flush, runWithObserver, createAsync as createAsync$1, mapArray, repeat, createErrorBoundary, createBoundary } from '@solidjs/signals';
-export { $PROXY, $TRACK, createEffect, createMemo, createOptimistic, createProjection, createRenderEffect, createRoot, createSignal, createStore, deep, flatten, flush, getObserver, getOwner, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, repeat, resolve, runWithObserver, runWithOwner, snapshot, transition, tryCatch, untrack } from '@solidjs/signals';
+import { createEffect, getContext, createMemo, flatten, createRoot, setContext, getOwner, untrack, NotReadyError, onCleanup, createSignal, createSuspense, flush, runWithObserver, createAsync as createAsync$1, mapArray, repeat, createErrorBoundary, createBoundary } from '@solidjs/signals';
+export { $PROXY, $TRACK, createEffect, createMemo, createOptimistic, createProjection, createRenderEffect, createRoot, createSignal, createStore, deep, flatten, flush, getObserver, getOwner, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, repeat, resolve, runWithObserver, runWithOwner, snapshot, transition, untrack, useTransition } from '@solidjs/signals';
 
 const $DEVCOMP = Symbol("COMPONENT_DEV" );
 function onMount(fn) {
@@ -52,6 +52,27 @@ function registerGraph(value) {
   value.graph = owner;
 }
 
+function tryCatch(fn) {
+  try {
+    const v = fn();
+    if (v instanceof Promise) {
+      return v.then(v => [undefined, v], e => {
+        if (e instanceof NotReadyError) throw e;
+        return [e];
+      });
+    }
+    return [undefined, v];
+  } catch (e) {
+    if (e instanceof NotReadyError) throw e;
+    return [e];
+  }
+}
+function reducer(source, reducerFn) {
+  return [source[0], action => {
+    source[1](s => reducerFn(s, action));
+  }];
+}
+
 function observable(input) {
   return {
     subscribe(observer) {
@@ -326,4 +347,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, Boundary, DEV, ErrorBoundary, For, Match, Repeat, Show, Suspense, Switch, children, createAsync, createComponent, createContext, createUniqueId, enableHydration, from, lazy, observable, onMount, sharedConfig, ssrHandleError, ssrRunInScope, useContext };
+export { $DEVCOMP, Boundary, DEV, ErrorBoundary, For, Match, Repeat, Show, Suspense, Switch, children, createAsync, createComponent, createContext, createUniqueId, enableHydration, from, lazy, observable, onMount, reducer, sharedConfig, ssrHandleError, ssrRunInScope, tryCatch, useContext };

package/dist/server.cjs

@@ -385,6 +385,11 @@ function repeat(count, mapFn, options = {}) {
   } else if (options.fallback) s = [options.fallback()];
   return () => s;
 }
+function transition(fn) {
+}
+function useTransition() {
+  return [() => false, () => {}];
+}
 
 function isWrappable(obj) {
   return obj != null && typeof obj === "object" && !Object.isFrozen(obj);
@@ -409,6 +414,7 @@ function createProjection(fn, initialValue = {}) {
   fn(state);
   return state;
 }
+const createOptimistic = createStore;
 function reconcile(value) {
   return state => {
     if (!isWrappable(state) || !isWrappable(value)) return value;
@@ -463,6 +469,30 @@ function omit(props, ...keys) {
   }
   return clone;
 }
+function deep(store) {
+  return store;
+}
+
+function tryCatch(fn) {
+  try {
+    const v = fn();
+    if (v instanceof Promise) {
+      return v.then(v => [undefined, v], e => {
+        if (e instanceof signals.NotReadyError) throw e;
+        return [e];
+      });
+    }
+    return [undefined, v];
+  } catch (e) {
+    if (e instanceof signals.NotReadyError) throw e;
+    return [e];
+  }
+}
+function reducer(source, reducerFn) {
+  return [source[0], action => {
+    source[1](s => reducerFn(s, action));
+  }];
+}
 
 const $DEVCOMP = Symbol("solid-dev-component");
 const DEV = undefined;
@@ -503,10 +533,6 @@ Object.defineProperty(exports, "runWithOwner", {
   enumerable: true,
   get: function () { return signals.runWithOwner; }
 });
-Object.defineProperty(exports, "tryCatch", {
-  enumerable: true,
-  get: function () { return signals.tryCatch; }
-});
 exports.$DEVCOMP = $DEVCOMP;
 exports.DEV = DEV;
 exports.ErrorBoundary = ErrorBoundary;
@@ -522,11 +548,13 @@ exports.createComponent = createComponent;
 exports.createContext = createContext;
 exports.createEffect = createEffect;
 exports.createMemo = createMemo;
+exports.createOptimistic = createOptimistic;
 exports.createProjection = createProjection;
 exports.createRenderEffect = createRenderEffect;
 exports.createSignal = createSignal;
 exports.createStore = createStore;
 exports.createUniqueId = createUniqueId;
+exports.deep = deep;
 exports.enableHydration = enableHydration;
 exports.flush = flush;
 exports.from = from;
@@ -540,12 +568,16 @@ exports.observable = observable;
 exports.omit = omit;
 exports.onMount = onMount;
 exports.reconcile = reconcile;
+exports.reducer = reducer;
 exports.repeat = repeat;
 exports.resolve = resolve;
 exports.runWithObserver = runWithObserver;
 exports.sharedConfig = sharedConfig;
 exports.ssrHandleError = ssrHandleError;
 exports.ssrRunInScope = ssrRunInScope;
+exports.transition = transition;
+exports.tryCatch = tryCatch;
 exports.untrack = untrack;
 exports.unwrap = unwrap;
 exports.useContext = useContext;
+exports.useTransition = useTransition;

package/dist/server.js

@@ -1,5 +1,5 @@
 import { getContext, onCleanup, Owner, runWithOwner, createRoot, setContext, flatten, NotReadyError, getOwner } from '@solidjs/signals';
-export { $PROXY, $TRACK, createRoot, flatten, getOwner, isEqual, isWrappable, onCleanup, runWithOwner, tryCatch } from '@solidjs/signals';
+export { $PROXY, $TRACK, createRoot, flatten, getOwner, isEqual, isWrappable, onCleanup, runWithOwner } from '@solidjs/signals';
 
 function onMount(fn) {
   createEffect();
@@ -384,6 +384,11 @@ function repeat(count, mapFn, options = {}) {
   } else if (options.fallback) s = [options.fallback()];
   return () => s;
 }
+function transition(fn) {
+}
+function useTransition() {
+  return [() => false, () => {}];
+}
 
 function isWrappable(obj) {
   return obj != null && typeof obj === "object" && !Object.isFrozen(obj);
@@ -408,6 +413,7 @@ function createProjection(fn, initialValue = {}) {
   fn(state);
   return state;
 }
+const createOptimistic = createStore;
 function reconcile(value) {
   return state => {
     if (!isWrappable(state) || !isWrappable(value)) return value;
@@ -462,8 +468,32 @@ function omit(props, ...keys) {
   }
   return clone;
 }
+function deep(store) {
+  return store;
+}
+
+function tryCatch(fn) {
+  try {
+    const v = fn();
+    if (v instanceof Promise) {
+      return v.then(v => [undefined, v], e => {
+        if (e instanceof NotReadyError) throw e;
+        return [e];
+      });
+    }
+    return [undefined, v];
+  } catch (e) {
+    if (e instanceof NotReadyError) throw e;
+    return [e];
+  }
+}
+function reducer(source, reducerFn) {
+  return [source[0], action => {
+    source[1](s => reducerFn(s, action));
+  }];
+}
 
 const $DEVCOMP = Symbol("solid-dev-component");
 const DEV = undefined;
 
-export { $DEVCOMP, DEV, ErrorBoundary, For, Match, Repeat, Show, Suspense, Switch, children, createAsync, createComponent, createContext, createEffect, createMemo, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, flush, from, getObserver, isPending, latest, lazy, mapArray, merge, observable, omit, onMount, reconcile, repeat, resolve, runWithObserver, sharedConfig, ssrHandleError, ssrRunInScope, untrack, unwrap, useContext };
+export { $DEVCOMP, DEV, ErrorBoundary, For, Match, Repeat, Show, Suspense, Switch, children, createAsync, createComponent, createContext, createEffect, createMemo, createOptimistic, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, deep, enableHydration, flush, from, getObserver, isPending, latest, lazy, mapArray, merge, observable, omit, onMount, reconcile, reducer, repeat, resolve, runWithObserver, sharedConfig, ssrHandleError, ssrRunInScope, transition, tryCatch, untrack, unwrap, useContext, useTransition };

package/dist/solid.cjs

@@ -31,6 +31,27 @@ function children(fn) {
   return memo;
 }
 
+function tryCatch(fn) {
+  try {
+    const v = fn();
+    if (v instanceof Promise) {
+      return v.then(v => [undefined, v], e => {
+        if (e instanceof signals.NotReadyError) throw e;
+        return [e];
+      });
+    }
+    return [undefined, v];
+  } catch (e) {
+    if (e instanceof signals.NotReadyError) throw e;
+    return [e];
+  }
+}
+function reducer(source, reducerFn) {
+  return [source[0], action => {
+    source[1](s => reducerFn(s, action));
+  }];
+}
+
 function observable(input) {
   return {
     subscribe(observer) {
@@ -400,14 +421,14 @@ Object.defineProperty(exports, "transition", {
   enumerable: true,
   get: function () { return signals.transition; }
 });
-Object.defineProperty(exports, "tryCatch", {
-  enumerable: true,
-  get: function () { return signals.tryCatch; }
-});
 Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return signals.untrack; }
 });
+Object.defineProperty(exports, "useTransition", {
+  enumerable: true,
+  get: function () { return signals.useTransition; }
+});
 exports.$DEVCOMP = $DEVCOMP;
 exports.Boundary = Boundary;
 exports.DEV = DEV;
@@ -428,7 +449,9 @@ exports.from = from;
 exports.lazy = lazy;
 exports.observable = observable;
 exports.onMount = onMount;
+exports.reducer = reducer;
 exports.sharedConfig = sharedConfig;
 exports.ssrHandleError = ssrHandleError;
 exports.ssrRunInScope = ssrRunInScope;
+exports.tryCatch = tryCatch;
 exports.useContext = useContext;

package/dist/solid.js

@@ -1,5 +1,5 @@
-import { createEffect, getContext, createMemo, flatten, createRoot, setContext, getOwner, onCleanup, createSignal, createSuspense, flush, runWithObserver, createAsync as createAsync$1, untrack, mapArray, repeat, createErrorBoundary, createBoundary } from '@solidjs/signals';
-export { $PROXY, $TRACK, createEffect, createMemo, createOptimistic, createProjection, createRenderEffect, createRoot, createSignal, createStore, deep, flatten, flush, getObserver, getOwner, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, repeat, resolve, runWithObserver, runWithOwner, snapshot, transition, tryCatch, untrack } from '@solidjs/signals';
+import { createEffect, getContext, createMemo, flatten, createRoot, setContext, NotReadyError, getOwner, onCleanup, createSignal, createSuspense, flush, runWithObserver, createAsync as createAsync$1, untrack, mapArray, repeat, createErrorBoundary, createBoundary } from '@solidjs/signals';
+export { $PROXY, $TRACK, createEffect, createMemo, createOptimistic, createProjection, createRenderEffect, createRoot, createSignal, createStore, deep, flatten, flush, getObserver, getOwner, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, repeat, resolve, runWithObserver, runWithOwner, snapshot, transition, untrack, useTransition } from '@solidjs/signals';
 
 const $DEVCOMP = Symbol(0);
 function onMount(fn) {
@@ -30,6 +30,27 @@ function children(fn) {
   return memo;
 }
 
+function tryCatch(fn) {
+  try {
+    const v = fn();
+    if (v instanceof Promise) {
+      return v.then(v => [undefined, v], e => {
+        if (e instanceof NotReadyError) throw e;
+        return [e];
+      });
+    }
+    return [undefined, v];
+  } catch (e) {
+    if (e instanceof NotReadyError) throw e;
+    return [e];
+  }
+}
+function reducer(source, reducerFn) {
+  return [source[0], action => {
+    source[1](s => reducerFn(s, action));
+  }];
+}
+
 function observable(input) {
   return {
     subscribe(observer) {
@@ -279,4 +300,4 @@ function ssrHandleError() {}
 function ssrRunInScope() {}
 const DEV = undefined;
 
-export { $DEVCOMP, Boundary, DEV, ErrorBoundary, For, Match, Repeat, Show, Suspense, Switch, children, createAsync, createComponent, createContext, createUniqueId, enableHydration, from, lazy, observable, onMount, sharedConfig, ssrHandleError, ssrRunInScope, useContext };
+export { $DEVCOMP, Boundary, DEV, ErrorBoundary, For, Match, Repeat, Show, Suspense, Switch, children, createAsync, createComponent, createContext, createUniqueId, enableHydration, from, lazy, observable, onMount, reducer, sharedConfig, ssrHandleError, ssrRunInScope, tryCatch, useContext };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "2.0.0-experimental.7",
+  "version": "2.0.0-experimental.9",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -79,7 +79,7 @@
     "performance"
   ],
   "dependencies": {
-    "@solidjs/signals": "^0.4.1",
+    "@solidjs/signals": "^0.6.0",
     "csstype": "^3.1.0",
     "seroval": "~1.3.0",
     "seroval-plugins": "~1.3.0"

package/types/client/hydration.d.ts

@@ -36,7 +36,7 @@ export declare function Suspense(props: {
  *   compute: (v: T) => Promise<T> | T,
  *   value?: T,
  *   options?: { name?: string, equals?: false | ((prev: T, next: T) => boolean) }
- * ): () => T;
+ * ): () => T & { refresh: () => void };
  * ```
  * @param compute a function that receives its previous or the initial value, if set, and returns a new value used to react on a computation
  * @param value an optional initial value for the computation; if set, fn will never receive undefined as first argument
@@ -44,5 +44,7 @@ export declare function Suspense(props: {
  *
  * @description https://docs.solidjs.com/reference/basic-reactivity/create-async
  */
-export declare function createAsync<T>(compute: (prev?: T) => Promise<T> | AsyncIterable<T> | T, value?: T, options?: MemoOptions<T>): Accessor<T>;
+export declare function createAsync<T>(compute: (prev?: T) => Promise<T> | AsyncIterable<T> | T, value?: T, options?: MemoOptions<T>): Accessor<T> & {
+    refresh: () => void;
+};
 export {};

package/types/index.d.ts

@@ -1,7 +1,8 @@
-export { $PROXY, $TRACK, createEffect, createMemo, createOptimistic, createProjection, createRenderEffect, createRoot, createSignal, createStore, flatten, flush, getObserver, getOwner, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, repeat, resolve, runWithObserver, runWithOwner, snapshot, tryCatch, untrack, deep, transition } from "@solidjs/signals";
-export type { Accessor, BoundaryMode, ComputeFunction, EffectFunction, EffectOptions, Merge, NoInfer, NotWrappable, Omit, Owner, Signal, SignalOptions, Setter, Store, SolidStore, StoreNode, StoreSetter, TryCatchResult } from "@solidjs/signals";
+export { $PROXY, $TRACK, createEffect, createMemo, createOptimistic, createProjection, createRenderEffect, createRoot, createSignal, createStore, flatten, flush, getObserver, getOwner, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, repeat, resolve, runWithObserver, runWithOwner, snapshot, untrack, deep, transition, useTransition } from "@solidjs/signals";
+export type { Accessor, BoundaryMode, ComputeFunction, EffectFunction, EffectOptions, Merge, NoInfer, NotWrappable, Omit, Owner, Signal, SignalOptions, Setter, Store, SolidStore, StoreNode, StoreSetter } from "@solidjs/signals";
 export { $DEVCOMP, children, createContext, onMount, useContext } from "./client/core.js";
 export type { ChildrenReturn, Context, ContextProviderComponent, ResolvedChildren, ResolvedJSXElement } from "./client/core.js";
+export * from "./utilities.js";
 export * from "./client/observable.js";
 export * from "./client/component.js";
 export * from "./client/flow.js";

package/types/server/index.d.ts

@@ -1,8 +1,9 @@
-export { $PROXY, $TRACK, tryCatch, flatten, isEqual, isWrappable } from "@solidjs/signals";
-export { createAsync, createEffect, createMemo, createRenderEffect, createRoot, createSignal, flush, getObserver, getOwner, isPending, latest, mapArray, onCleanup, repeat, resolve, runWithObserver, runWithOwner, untrack } from "./signals.js";
+export { $PROXY, $TRACK, flatten, isEqual, isWrappable } from "@solidjs/signals";
+export { createAsync, createEffect, createMemo, createRenderEffect, createRoot, createSignal, flush, getObserver, getOwner, isPending, latest, mapArray, onCleanup, repeat, resolve, runWithObserver, runWithOwner, untrack, transition, useTransition } from "./signals.js";
 export { observable, from, children, createContext, onMount, useContext, ssrRunInScope } from "./reactive.js";
-export { createProjection, createStore, unwrap, reconcile, merge, omit } from "./store.js";
+export { createProjection, createStore, createOptimistic, unwrap, reconcile, merge, omit, deep } from "./store.js";
 export { createComponent, For, Repeat, Show, Switch, Match, ErrorBoundary, Suspense, enableHydration, createUniqueId, lazy, sharedConfig, ssrHandleError } from "./rendering.js";
+export * from "../utilities.js";
 export declare const $DEVCOMP: unique symbol;
 export declare const DEV: undefined;
 export type { Component } from "../index.js";

package/types/server/signals.d.ts

@@ -35,3 +35,5 @@ export declare function repeat<T>(count: Accessor<number>, mapFn: (i: number) =>
     fallback?: Accessor<any>;
     from?: Accessor<number | undefined>;
 }): () => T[];
+export declare function transition<T>(fn: () => T): void;
+export declare function useTransition(): [() => boolean, (fn: () => void) => void];

package/types/server/store.d.ts

@@ -4,6 +4,8 @@ export declare function isWrappable(obj: any): boolean;
 export declare function unwrap<T>(item: T): T;
 export declare function createStore<T>(state: T | Store<T>): [get: Store<T>, set: StoreSetter<T>];
 export declare function createProjection<T extends Object>(fn: (draft: T) => void, initialValue?: T): Store<T>;
+export declare const createOptimistic: typeof createStore;
 export declare function reconcile<T extends U, U extends object>(value: T): (state: U) => T;
 export declare function merge<T extends unknown[]>(...sources: T): Merge<T>;
 export declare function omit<T extends Record<any, any>, K extends readonly (keyof T)[]>(props: T, ...keys: K): Omit<T, K>;
+export declare function deep<T extends object>(store: Store<T>): Store<T>;

package/types/utilities.d.ts

@@ -0,0 +1,36 @@
+import { Accessor, Signal, Store, StoreSetter } from "@solidjs/signals";
+/**
+ * Runs the given function and returns a tuple with the result or an error.
+ * If the function throws an error, it will be caught and returned as the first element of the tuple.
+ * If the function returns a promise, it will resolve to a tuple with the result or an error.
+ *
+ * @param fn The function to run.
+ * @returns A tuple with either [undefined, result] or [error].
+ *
+ * @description https://docs.solidjs.com/reference/reactive-utilities/try-catch
+ */
+export type TryCatchResult<T, E> = [undefined, T] | [E];
+export declare function tryCatch<T, E = Error>(fn: () => Promise<T>): Promise<TryCatchResult<T, E>>;
+export declare function tryCatch<T, E = Error>(fn: () => T): TryCatchResult<T, E>;
+/**
+ * Simple reducer utility for Signals and Stores
+ * ```typescript
+ * const [state, dispatch] = reducer(createSignal({ count: 0 }), (state, action) => {
+ *   switch (action.type) {
+ *     case "increment":
+ *       return { count: state.count + 1 };
+ *     case "decrement":
+ *       return { count: state.count - 1 };
+ *     default:
+ *       return state;
+ *   }
+ * });
+ * ```
+ * @param source Signal or Store tuple
+ * @param reducerFn reducer function that receives the current value and an action, and returns the new value for signals or void for stores
+ * @returns a tuple with the current value accessor and a dispatch function to send actions to the reducer
+ *
+ * @description https://docs.solidjs.com/reference/reactive-utilities/reducer
+ */
+export declare function reducer<T, A>(source: Signal<T>, reducerFn: (value: T, action: A) => T): [Accessor<T>, (action: A) => void];
+export declare function reducer<T, A>(source: [Store<T>, StoreSetter<T>], reducerFn: (value: T, action: A) => T | void): [Store<T>, (action: A) => void];