solid-js 1.3.0-rc.3 → 1.3.0-rc.4

package/dist/dev.cjs

@@ -170,14 +170,12 @@ function createRoot(fn, detachedOwner) {
   if (owner) root.name = `${owner.name}-r${rootCount++}`;
   Owner = root;
   Listener = null;
-  let result;
   try {
-    runUpdates(() => result = fn(() => cleanNode(root)), true);
+    return runUpdates(() => fn(() => cleanNode(root)), true);
   } finally {
     Listener = listener;
     Owner = owner;
   }
-  return result;
 }
 function createSignal(value, options) {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
@@ -211,7 +209,21 @@ function createEffect(fn, value, options) {
         s = SuspenseContext && lookup(Owner, SuspenseContext.id);
   if (s) c.suspense = s;
   c.user = true;
-  Effects && Effects.push(c);
+  Effects ? Effects.push(c) : queueMicrotask(() => updateComputation(c));
+}
+function createReaction(onInvalidate, options) {
+  let fn;
+  const c = createComputation(() => {
+    fn ? fn() : untrack(onInvalidate);
+    fn = undefined;
+  }, undefined, false, 0, options ),
+        s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+  if (s) c.suspense = s;
+  c.user = true;
+  return tracking => {
+    fn = tracking;
+    updateComputation(c);
+  };
 }
 function createMemo(fn, value, options) {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
@@ -241,7 +253,7 @@ function createResource(source, fetcher, options) {
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
-    onCleanup(() => Resources.delete(load));
+    Owner && onCleanup(() => Resources.delete(load));
   }
   const contexts = new Set(),
         [s, set] = createSignal(options.initialValue),
@@ -352,7 +364,7 @@ function createResource(source, fetcher, options) {
 }
 let Resources;
 function refetchResources(info) {
-  Resources && Resources.forEach(fn => fn(info));
+  return Resources && Promise.all([...Resources].map(fn => fn(info)));
 }
 function createDeferred(source, options) {
   let t,
@@ -777,7 +789,7 @@ function runUpdates(fn, init) {
   if (Effects) wait = true;else Effects = [];
   ExecCount++;
   try {
-    fn();
+    return fn();
   } catch (err) {
     handleError(err);
   } finally {
@@ -1588,6 +1600,7 @@ exports.createContext = createContext;
 exports.createDeferred = createDeferred;
 exports.createEffect = createEffect;
 exports.createMemo = createMemo;
+exports.createReaction = createReaction;
 exports.createRenderEffect = createRenderEffect;
 exports.createResource = createResource;
 exports.createRoot = createRoot;

package/dist/dev.js

@@ -166,14 +166,12 @@ function createRoot(fn, detachedOwner) {
   if (owner) root.name = `${owner.name}-r${rootCount++}`;
   Owner = root;
   Listener = null;
-  let result;
   try {
-    runUpdates(() => result = fn(() => cleanNode(root)), true);
+    return runUpdates(() => fn(() => cleanNode(root)), true);
   } finally {
     Listener = listener;
     Owner = owner;
   }
-  return result;
 }
 function createSignal(value, options) {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
@@ -207,7 +205,21 @@ function createEffect(fn, value, options) {
         s = SuspenseContext && lookup(Owner, SuspenseContext.id);
   if (s) c.suspense = s;
   c.user = true;
-  Effects && Effects.push(c);
+  Effects ? Effects.push(c) : queueMicrotask(() => updateComputation(c));
+}
+function createReaction(onInvalidate, options) {
+  let fn;
+  const c = createComputation(() => {
+    fn ? fn() : untrack(onInvalidate);
+    fn = undefined;
+  }, undefined, false, 0, options ),
+        s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+  if (s) c.suspense = s;
+  c.user = true;
+  return tracking => {
+    fn = tracking;
+    updateComputation(c);
+  };
 }
 function createMemo(fn, value, options) {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
@@ -237,7 +249,7 @@ function createResource(source, fetcher, options) {
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
-    onCleanup(() => Resources.delete(load));
+    Owner && onCleanup(() => Resources.delete(load));
   }
   const contexts = new Set(),
         [s, set] = createSignal(options.initialValue),
@@ -348,7 +360,7 @@ function createResource(source, fetcher, options) {
 }
 let Resources;
 function refetchResources(info) {
-  Resources && Resources.forEach(fn => fn(info));
+  return Resources && Promise.all([...Resources].map(fn => fn(info)));
 }
 function createDeferred(source, options) {
   let t,
@@ -773,7 +785,7 @@ function runUpdates(fn, init) {
   if (Effects) wait = true;else Effects = [];
   ExecCount++;
   try {
-    fn();
+    return fn();
   } catch (err) {
     handleError(err);
   } finally {
@@ -1565,4 +1577,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, 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, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/server.cjs

@@ -54,6 +54,11 @@ function createComputed(fn, value) {
 }
 const createRenderEffect = createComputed;
 function createEffect(fn, value) {}
+function createReaction(fn) {
+  return fn => {
+    fn();
+  };
+}
 function createMemo(fn, value) {
   Owner = {
     owner: Owner,
@@ -529,6 +534,7 @@ exports.createContext = createContext;
 exports.createDeferred = createDeferred;
 exports.createEffect = createEffect;
 exports.createMemo = createMemo;
+exports.createReaction = createReaction;
 exports.createRenderEffect = createRenderEffect;
 exports.createResource = createResource;
 exports.createRoot = createRoot;

package/dist/server.js

@@ -50,6 +50,11 @@ function createComputed(fn, value) {
 }
 const createRenderEffect = createComputed;
 function createEffect(fn, value) {}
+function createReaction(fn) {
+  return fn => {
+    fn();
+  };
+}
 function createMemo(fn, value) {
   Owner = {
     owner: Owner,
@@ -506,4 +511,4 @@ function Suspense(props) {
   return props.fallback;
 }
 
-export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/solid.cjs

@@ -168,14 +168,12 @@ function createRoot(fn, detachedOwner) {
   };
   Owner = root;
   Listener = null;
-  let result;
   try {
-    runUpdates(() => result = fn(() => cleanNode(root)), true);
+    return runUpdates(() => fn(() => cleanNode(root)), true);
   } finally {
     Listener = listener;
     Owner = owner;
   }
-  return result;
 }
 function createSignal(value, options) {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
@@ -208,7 +206,21 @@ function createEffect(fn, value, options) {
         s = SuspenseContext && lookup(Owner, SuspenseContext.id);
   if (s) c.suspense = s;
   c.user = true;
-  Effects && Effects.push(c);
+  Effects ? Effects.push(c) : queueMicrotask(() => updateComputation(c));
+}
+function createReaction(onInvalidate, options) {
+  let fn;
+  const c = createComputation(() => {
+    fn ? fn() : untrack(onInvalidate);
+    fn = undefined;
+  }, undefined, false, 0),
+        s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+  if (s) c.suspense = s;
+  c.user = true;
+  return tracking => {
+    fn = tracking;
+    updateComputation(c);
+  };
 }
 function createMemo(fn, value, options) {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
@@ -238,7 +250,7 @@ function createResource(source, fetcher, options) {
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
-    onCleanup(() => Resources.delete(load));
+    Owner && onCleanup(() => Resources.delete(load));
   }
   const contexts = new Set(),
         [s, set] = createSignal(options.initialValue),
@@ -349,7 +361,7 @@ function createResource(source, fetcher, options) {
 }
 let Resources;
 function refetchResources(info) {
-  Resources && Resources.forEach(fn => fn(info));
+  return Resources && Promise.all([...Resources].map(fn => fn(info)));
 }
 function createDeferred(source, options) {
   let t,
@@ -720,7 +732,7 @@ function runUpdates(fn, init) {
   if (Effects) wait = true;else Effects = [];
   ExecCount++;
   try {
-    fn();
+    return fn();
   } catch (err) {
     handleError(err);
   } finally {
@@ -1497,6 +1509,7 @@ exports.createContext = createContext;
 exports.createDeferred = createDeferred;
 exports.createEffect = createEffect;
 exports.createMemo = createMemo;
+exports.createReaction = createReaction;
 exports.createRenderEffect = createRenderEffect;
 exports.createResource = createResource;
 exports.createRoot = createRoot;

package/dist/solid.js

@@ -164,14 +164,12 @@ function createRoot(fn, detachedOwner) {
   };
   Owner = root;
   Listener = null;
-  let result;
   try {
-    runUpdates(() => result = fn(() => cleanNode(root)), true);
+    return runUpdates(() => fn(() => cleanNode(root)), true);
   } finally {
     Listener = listener;
     Owner = owner;
   }
-  return result;
 }
 function createSignal(value, options) {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
@@ -204,7 +202,21 @@ function createEffect(fn, value, options) {
         s = SuspenseContext && lookup(Owner, SuspenseContext.id);
   if (s) c.suspense = s;
   c.user = true;
-  Effects && Effects.push(c);
+  Effects ? Effects.push(c) : queueMicrotask(() => updateComputation(c));
+}
+function createReaction(onInvalidate, options) {
+  let fn;
+  const c = createComputation(() => {
+    fn ? fn() : untrack(onInvalidate);
+    fn = undefined;
+  }, undefined, false, 0),
+        s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+  if (s) c.suspense = s;
+  c.user = true;
+  return tracking => {
+    fn = tracking;
+    updateComputation(c);
+  };
 }
 function createMemo(fn, value, options) {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
@@ -234,7 +246,7 @@ function createResource(source, fetcher, options) {
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
-    onCleanup(() => Resources.delete(load));
+    Owner && onCleanup(() => Resources.delete(load));
   }
   const contexts = new Set(),
         [s, set] = createSignal(options.initialValue),
@@ -345,7 +357,7 @@ function createResource(source, fetcher, options) {
 }
 let Resources;
 function refetchResources(info) {
-  Resources && Resources.forEach(fn => fn(info));
+  return Resources && Promise.all([...Resources].map(fn => fn(info)));
 }
 function createDeferred(source, options) {
   let t,
@@ -716,7 +728,7 @@ function runUpdates(fn, init) {
   if (Effects) wait = true;else Effects = [];
   ExecCount++;
   try {
-    fn();
+    return fn();
   } catch (err) {
     handleError(err);
   } finally {
@@ -1473,4 +1485,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, 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, 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-rc.3",
+  "version": "1.3.0-rc.4",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "24a44a798dc517a578ac4881af594990a1faadc8"
+  "gitHead": "25d84f333fb0b2fd6f9e055148e66665c1a7d813"
 }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-export { createRoot, createSignal, createEffect, createRenderEffect, createComputed, createDeferred, createSelector, createMemo, createResource, onMount, onCleanup, onError, untrack, batch, on, enableScheduling, enableExternalSource, startTransition, useTransition, refetchResources, createContext, useContext, children, getListener, getOwner, runWithOwner, equalFn, $DEVCOMP, $PROXY } from "./reactive/signal";
+export { createRoot, createSignal, createEffect, createRenderEffect, createComputed, createReaction, createDeferred, createSelector, createMemo, createResource, onMount, onCleanup, onError, untrack, batch, on, enableScheduling, enableExternalSource, startTransition, useTransition, refetchResources, createContext, useContext, children, getListener, getOwner, runWithOwner, equalFn, $DEVCOMP, $PROXY } from "./reactive/signal";
 export type { Accessor, Setter, Resource, ResourceReturn, ResourceFetcher, ResourceFetcherInfo, Context, ReturnTypes } from "./reactive/signal";
 export * from "./reactive/observable";
 export * from "./reactive/scheduler";

package/types/reactive/signal.d.ts

@@ -158,6 +158,20 @@ export declare function createRenderEffect<Next, Init = undefined>(..._: undefin
  */
 export declare function createEffect<Next, Init = Next>(fn: EffectFunction<Init | Next, Next>, value: Init, options?: EffectOptions): void;
 export declare function createEffect<Next, Init = undefined>(..._: undefined extends Init ? [fn: EffectFunction<Init | Next, Next>, value?: Init, options?: EffectOptions] : [fn: EffectFunction<Init | Next, Next>, value: Init, options?: EffectOptions]): void;
+/**
+ * Creates a reactive computation that runs after the render phase with flexible tracking
+ * ```typescript
+ * export function createReaction(
+ *   onInvalidate: () => void,
+ *   options?: { name?: string }
+ * ): (fn: () => void) => void;
+ * ```
+ * @param invalidated a function that is called when tracked function is invalidated.
+ * @param options allows to set a name in dev mode for debugging purposes
+ *
+ * @description https://www.solidjs.com/docs/latest/api#createreaction
+ */
+export declare function createReaction(onInvalidate: () => void, options?: EffectOptions): (tracking: () => void) => void;
 interface Memo<Prev, Next = Prev> extends SignalState<Next>, Computation<Next> {
     tOwned?: Computation<Prev | Next, Next>[];
 }
@@ -171,7 +185,7 @@ export interface MemoOptions<T> extends EffectOptions {
  *   fn: (v: T) => T,
  *   value?: T,
  *   options?: { name?: string, equals?: false | ((prev: T, next: T) => boolean) }
- * ): T;
+ * ): () => T;
  * ```
  * @param fn 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
@@ -236,7 +250,7 @@ export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S,
 export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T>;
 export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): ResourceReturn<T | undefined>;
 export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T>;
-export declare function refetchResources(info?: unknown): void;
+export declare function refetchResources(info?: unknown): Promise<any[]>;
 export interface DeferredOptions<T> {
     equals?: false | ((prev: T, next: T) => boolean);
     name?: string;
@@ -357,7 +371,7 @@ export declare function onCleanup(fn: () => void): () => void;
 export declare function onError(fn: (err: any) => void): void;
 export declare function getListener(): Computation<any, any> | null;
 export declare function getOwner(): Owner | null;
-export declare function runWithOwner(o: Owner, fn: () => any): void;
+export declare function runWithOwner<T>(o: Owner, fn: () => T): T;
 export declare function enableScheduling(scheduler?: typeof requestCallback): void;
 /**
  * ```typescript

package/types/server/index.d.ts

@@ -1,3 +1,3 @@
-export { createRoot, createSignal, createComputed, createRenderEffect, createEffect, createDeferred, createSelector, createMemo, getListener, onMount, onCleanup, onError, untrack, batch, on, children, createContext, useContext, getOwner, runWithOwner, equalFn, requestCallback, mapArray, observable, from, $PROXY, $DEVCOMP, DEV, enableExternalSource } from "./reactive";
+export { createRoot, createSignal, createComputed, createRenderEffect, createEffect, createReaction, createDeferred, createSelector, createMemo, getListener, onMount, onCleanup, onError, untrack, batch, on, children, createContext, useContext, getOwner, runWithOwner, equalFn, requestCallback, mapArray, observable, from, $PROXY, $DEVCOMP, DEV, enableExternalSource } from "./reactive";
 export { mergeProps, splitProps, createComponent, For, Index, Show, Switch, Match, ErrorBoundary, Suspense, SuspenseList, createResource, enableScheduling, enableHydration, startTransition, useTransition, createUniqueId, lazy, sharedConfig } from "./rendering";
 export type { Component, Resource } from "./rendering";

package/types/server/reactive.d.ts

@@ -16,6 +16,7 @@ export declare function createSignal<T>(value: T, options?: {
 export declare function createComputed<T>(fn: (v?: T) => T, value?: T): void;
 export declare const createRenderEffect: typeof createComputed;
 export declare function createEffect<T>(fn: (v?: T) => T, value?: T): void;
+export declare function createReaction(fn: () => void): (fn: () => void) => void;
 export declare function createMemo<T>(fn: (v?: T) => T, value?: T): () => T;
 export declare function createDeferred<T>(source: () => T): () => T;
 export declare function createSelector<T>(source: () => T, fn: (k: T, value: T) => boolean): (k: T) => boolean;