solid-js 1.3.15 → 1.4.0-beta.0

package/dist/dev.cjs

@@ -131,6 +131,7 @@ function nextHydrateContext() {
 
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $TRACK = Symbol("solid-track");
 const $DEVCOMP = Symbol("solid-dev-component");
 const signalOptions = {
   equals: equalFn
@@ -208,7 +209,7 @@ function createEffect(fn, value, options) {
         s = SuspenseContext && lookup(Owner, SuspenseContext.id);
   if (s) c.suspense = s;
   c.user = true;
-  Effects ? Effects.push(c) : queueMicrotask(() => updateComputation(c));
+  Effects ? Effects.push(c) : updateComputation(c);
 }
 function createReaction(onInvalidate, options) {
   let fn;
@@ -249,13 +250,8 @@ function createResource(source, fetcher, options) {
     source = true;
   }
   options || (options = {});
-  if (options.globalRefetch !== false) {
-    Resources || (Resources = new Set());
-    Resources.add(load);
-    Owner && onCleanup(() => Resources.delete(load));
-  }
   const contexts = new Set(),
-        [s, set] = createSignal(options.initialValue),
+        [value, setValue] = createSignal(options.initialValue),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -267,7 +263,7 @@ function createResource(source, fetcher, options) {
       id = null,
       loadedUnderTransition = false,
       scheduled = false,
-      dynamic = typeof source === "function";
+      dynamic = typeof source === "function" && createMemo(source);
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
     if (sharedConfig.load) initP = sharedConfig.load(id);
@@ -297,7 +293,7 @@ function createResource(source, fetcher, options) {
   }
   function completeLoad(v) {
     batch(() => {
-      set(() => v);
+      setValue(() => v);
       setLoading(false);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -305,7 +301,7 @@ function createResource(source, fetcher, options) {
   }
   function read() {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
-          v = s();
+          v = value();
     if (err) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
@@ -324,15 +320,15 @@ function createResource(source, fetcher, options) {
     if (refetching && scheduled) return;
     scheduled = false;
     setError(err = undefined);
-    const lookup = dynamic ? source() : source;
+    const lookup = dynamic ? dynamic() : source;
     loadedUnderTransition = Transition && Transition.running;
     if (lookup == null || lookup === false) {
-      loadEnd(pr, untrack(s));
+      loadEnd(pr, untrack(value));
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
     const p = initP || untrack(() => fetcher(lookup, {
-      value: s(),
+      value: value(),
       refetching
     }));
     if (typeof p !== "object" || !("then" in p)) {
@@ -358,18 +354,20 @@ function createResource(source, fetcher, options) {
       get() {
         return error();
       }
+    },
+    latest: {
+      get() {
+        if (err) throw err;
+        return value();
+      }
     }
   });
   if (dynamic) createComputed(() => load(false));else load(false);
   return [read, {
     refetch: load,
-    mutate: set
+    mutate: setValue
   }];
 }
-let Resources;
-function refetchResources(info) {
-  return Resources && Promise.all([...Resources].map(fn => fn(info)));
-}
 function createDeferred(source, options) {
   let t,
       timeout = options ? options.timeoutMs : undefined;
@@ -388,7 +386,7 @@ function createSelector(source, fn = equalFn, options) {
   const subs = new Map();
   const node = createComputation(p => {
     const v = source();
-    for (const key of subs.keys()) if (fn(key, v) !== (p !== undefined && fn(key, p))) {
+    for (const key of subs.keys()) if (fn(key, v) !== fn(key, p)) {
       const l = subs.get(key);
       for (const c of l.values()) {
         c.state = STALE;
@@ -797,11 +795,14 @@ function runUpdates(fn, init) {
   if (Effects) wait = true;else Effects = [];
   ExecCount++;
   try {
-    return fn();
+    const res = fn();
+    completeUpdates(wait);
+    return res;
   } catch (err) {
     handleError(err);
   } finally {
-    completeUpdates(wait);
+    Updates = null;
+    if (!wait) Effects = null;
   }
 }
 function completeUpdates(wait) {
@@ -1066,6 +1067,7 @@ function mapArray(list, mapFn, options = {}) {
     let newItems = list() || [],
         i,
         j;
+    newItems[$TRACK];
     return untrack(() => {
       let newLen = newItems.length,
           newIndices,
@@ -1167,6 +1169,7 @@ function indexArray(list, mapFn, options = {}) {
   onCleanup(() => dispose(disposers));
   return () => {
     const newItems = list() || [];
+    newItems[$TRACK];
     return untrack(() => {
       if (newItems.length === 0) {
         if (len !== 0) {
@@ -1330,9 +1333,7 @@ function lazy(fn) {
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default), {
-        globalRefetch: false
-      });
+      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
     } else {
       const c = comp();
@@ -1601,6 +1602,7 @@ if (globalThis) {
 
 exports.$DEVCOMP = $DEVCOMP;
 exports.$PROXY = $PROXY;
+exports.$TRACK = $TRACK;
 exports.ErrorBoundary = ErrorBoundary;
 exports.For = For;
 exports.Index = Index;
@@ -1641,7 +1643,6 @@ exports.on = on;
 exports.onCleanup = onCleanup;
 exports.onError = onError;
 exports.onMount = onMount;
-exports.refetchResources = refetchResources;
 exports.requestCallback = requestCallback;
 exports.resetErrorBoundaries = resetErrorBoundaries;
 exports.runWithOwner = runWithOwner;

package/dist/dev.js

@@ -127,6 +127,7 @@ function nextHydrateContext() {
 
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $TRACK = Symbol("solid-track");
 const $DEVCOMP = Symbol("solid-dev-component");
 const signalOptions = {
   equals: equalFn
@@ -204,7 +205,7 @@ function createEffect(fn, value, options) {
         s = SuspenseContext && lookup(Owner, SuspenseContext.id);
   if (s) c.suspense = s;
   c.user = true;
-  Effects ? Effects.push(c) : queueMicrotask(() => updateComputation(c));
+  Effects ? Effects.push(c) : updateComputation(c);
 }
 function createReaction(onInvalidate, options) {
   let fn;
@@ -245,13 +246,8 @@ function createResource(source, fetcher, options) {
     source = true;
   }
   options || (options = {});
-  if (options.globalRefetch !== false) {
-    Resources || (Resources = new Set());
-    Resources.add(load);
-    Owner && onCleanup(() => Resources.delete(load));
-  }
   const contexts = new Set(),
-        [s, set] = createSignal(options.initialValue),
+        [value, setValue] = createSignal(options.initialValue),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -263,7 +259,7 @@ function createResource(source, fetcher, options) {
       id = null,
       loadedUnderTransition = false,
       scheduled = false,
-      dynamic = typeof source === "function";
+      dynamic = typeof source === "function" && createMemo(source);
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
     if (sharedConfig.load) initP = sharedConfig.load(id);
@@ -293,7 +289,7 @@ function createResource(source, fetcher, options) {
   }
   function completeLoad(v) {
     batch(() => {
-      set(() => v);
+      setValue(() => v);
       setLoading(false);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -301,7 +297,7 @@ function createResource(source, fetcher, options) {
   }
   function read() {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
-          v = s();
+          v = value();
     if (err) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
@@ -320,15 +316,15 @@ function createResource(source, fetcher, options) {
     if (refetching && scheduled) return;
     scheduled = false;
     setError(err = undefined);
-    const lookup = dynamic ? source() : source;
+    const lookup = dynamic ? dynamic() : source;
     loadedUnderTransition = Transition && Transition.running;
     if (lookup == null || lookup === false) {
-      loadEnd(pr, untrack(s));
+      loadEnd(pr, untrack(value));
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
     const p = initP || untrack(() => fetcher(lookup, {
-      value: s(),
+      value: value(),
       refetching
     }));
     if (typeof p !== "object" || !("then" in p)) {
@@ -354,18 +350,20 @@ function createResource(source, fetcher, options) {
       get() {
         return error();
       }
+    },
+    latest: {
+      get() {
+        if (err) throw err;
+        return value();
+      }
     }
   });
   if (dynamic) createComputed(() => load(false));else load(false);
   return [read, {
     refetch: load,
-    mutate: set
+    mutate: setValue
   }];
 }
-let Resources;
-function refetchResources(info) {
-  return Resources && Promise.all([...Resources].map(fn => fn(info)));
-}
 function createDeferred(source, options) {
   let t,
       timeout = options ? options.timeoutMs : undefined;
@@ -384,7 +382,7 @@ function createSelector(source, fn = equalFn, options) {
   const subs = new Map();
   const node = createComputation(p => {
     const v = source();
-    for (const key of subs.keys()) if (fn(key, v) !== (p !== undefined && fn(key, p))) {
+    for (const key of subs.keys()) if (fn(key, v) !== fn(key, p)) {
       const l = subs.get(key);
       for (const c of l.values()) {
         c.state = STALE;
@@ -793,11 +791,14 @@ function runUpdates(fn, init) {
   if (Effects) wait = true;else Effects = [];
   ExecCount++;
   try {
-    return fn();
+    const res = fn();
+    completeUpdates(wait);
+    return res;
   } catch (err) {
     handleError(err);
   } finally {
-    completeUpdates(wait);
+    Updates = null;
+    if (!wait) Effects = null;
   }
 }
 function completeUpdates(wait) {
@@ -1062,6 +1063,7 @@ function mapArray(list, mapFn, options = {}) {
     let newItems = list() || [],
         i,
         j;
+    newItems[$TRACK];
     return untrack(() => {
       let newLen = newItems.length,
           newIndices,
@@ -1163,6 +1165,7 @@ function indexArray(list, mapFn, options = {}) {
   onCleanup(() => dispose(disposers));
   return () => {
     const newItems = list() || [];
+    newItems[$TRACK];
     return untrack(() => {
       if (newItems.length === 0) {
         if (len !== 0) {
@@ -1326,9 +1329,7 @@ function lazy(fn) {
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default), {
-        globalRefetch: false
-      });
+      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
     } else {
       const c = comp();
@@ -1595,4 +1596,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, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $DEVCOMP, $PROXY, $TRACK, 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, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/server.cjs

@@ -221,7 +221,11 @@ function resolveSSRNode(node) {
   const t = typeof node;
   if (t === "string") return node;
   if (node == null || t === "boolean") return "";
-  if (Array.isArray(node)) return node.map(resolveSSRNode).join("");
+  if (Array.isArray(node)) {
+    let mapped = "";
+    for (let i = 0, len = node.length; i < len; i++) mapped += resolveSSRNode(node[i]);
+    return mapped;
+  }
   if (t === "object") return resolveSSRNode(node.t);
   if (t === "function") return resolveSSRNode(node());
   return String(node);
@@ -279,13 +283,11 @@ function simpleMap(props, wrap) {
         len = list.length,
         fn = props.children;
   if (len) {
-    let mapped = "";
-    for (let i = 0; i < len; i++) mapped += resolveSSRNode(wrap(fn, list[i], i));
-    return {
-      t: mapped
-    };
+    let mapped = Array(len);
+    for (let i = 0; i < len; i++) mapped[i] = wrap(fn, list[i], i);
+    return mapped;
   }
-  return props.fallback || "";
+  return props.fallback;
 }
 function For(props) {
   return simpleMap(props, (fn, item, i) => fn(item, () => i));
@@ -417,7 +419,6 @@ function createResource(source, fetcher, options = {}) {
     mutate: v => value = v
   }];
 }
-function refetchResources(info) {}
 function lazy(fn) {
   let resolved;
   const p = fn();
@@ -565,7 +566,6 @@ exports.on = on;
 exports.onCleanup = onCleanup;
 exports.onError = onError;
 exports.onMount = onMount;
-exports.refetchResources = refetchResources;
 exports.requestCallback = requestCallback;
 exports.resetErrorBoundaries = resetErrorBoundaries;
 exports.runWithOwner = runWithOwner;

package/dist/server.js

@@ -217,7 +217,11 @@ function resolveSSRNode(node) {
   const t = typeof node;
   if (t === "string") return node;
   if (node == null || t === "boolean") return "";
-  if (Array.isArray(node)) return node.map(resolveSSRNode).join("");
+  if (Array.isArray(node)) {
+    let mapped = "";
+    for (let i = 0, len = node.length; i < len; i++) mapped += resolveSSRNode(node[i]);
+    return mapped;
+  }
   if (t === "object") return resolveSSRNode(node.t);
   if (t === "function") return resolveSSRNode(node());
   return String(node);
@@ -275,13 +279,11 @@ function simpleMap(props, wrap) {
         len = list.length,
         fn = props.children;
   if (len) {
-    let mapped = "";
-    for (let i = 0; i < len; i++) mapped += resolveSSRNode(wrap(fn, list[i], i));
-    return {
-      t: mapped
-    };
+    let mapped = Array(len);
+    for (let i = 0; i < len; i++) mapped[i] = wrap(fn, list[i], i);
+    return mapped;
   }
-  return props.fallback || "";
+  return props.fallback;
 }
 function For(props) {
   return simpleMap(props, (fn, item, i) => fn(item, () => i));
@@ -413,7 +415,6 @@ function createResource(source, fetcher, options = {}) {
     mutate: v => value = v
   }];
 }
-function refetchResources(info) {}
 function lazy(fn) {
   let resolved;
   const p = fn();
@@ -520,4 +521,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, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, resetErrorBoundaries, 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, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/solid.cjs

@@ -131,6 +131,7 @@ function nextHydrateContext() {
 
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $TRACK = Symbol("solid-track");
 const $DEVCOMP = Symbol("solid-dev-component");
 const signalOptions = {
   equals: equalFn
@@ -205,7 +206,7 @@ function createEffect(fn, value, options) {
         s = SuspenseContext && lookup(Owner, SuspenseContext.id);
   if (s) c.suspense = s;
   c.user = true;
-  Effects ? Effects.push(c) : queueMicrotask(() => updateComputation(c));
+  Effects ? Effects.push(c) : updateComputation(c);
 }
 function createReaction(onInvalidate, options) {
   let fn;
@@ -246,13 +247,8 @@ function createResource(source, fetcher, options) {
     source = true;
   }
   options || (options = {});
-  if (options.globalRefetch !== false) {
-    Resources || (Resources = new Set());
-    Resources.add(load);
-    Owner && onCleanup(() => Resources.delete(load));
-  }
   const contexts = new Set(),
-        [s, set] = createSignal(options.initialValue),
+        [value, setValue] = createSignal(options.initialValue),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -264,7 +260,7 @@ function createResource(source, fetcher, options) {
       id = null,
       loadedUnderTransition = false,
       scheduled = false,
-      dynamic = typeof source === "function";
+      dynamic = typeof source === "function" && createMemo(source);
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
     if (sharedConfig.load) initP = sharedConfig.load(id);
@@ -294,7 +290,7 @@ function createResource(source, fetcher, options) {
   }
   function completeLoad(v) {
     batch(() => {
-      set(() => v);
+      setValue(() => v);
       setLoading(false);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -302,7 +298,7 @@ function createResource(source, fetcher, options) {
   }
   function read() {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
-          v = s();
+          v = value();
     if (err) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
@@ -321,15 +317,15 @@ function createResource(source, fetcher, options) {
     if (refetching && scheduled) return;
     scheduled = false;
     setError(err = undefined);
-    const lookup = dynamic ? source() : source;
+    const lookup = dynamic ? dynamic() : source;
     loadedUnderTransition = Transition && Transition.running;
     if (lookup == null || lookup === false) {
-      loadEnd(pr, untrack(s));
+      loadEnd(pr, untrack(value));
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
     const p = initP || untrack(() => fetcher(lookup, {
-      value: s(),
+      value: value(),
       refetching
     }));
     if (typeof p !== "object" || !("then" in p)) {
@@ -355,18 +351,20 @@ function createResource(source, fetcher, options) {
       get() {
         return error();
       }
+    },
+    latest: {
+      get() {
+        if (err) throw err;
+        return value();
+      }
     }
   });
   if (dynamic) createComputed(() => load(false));else load(false);
   return [read, {
     refetch: load,
-    mutate: set
+    mutate: setValue
   }];
 }
-let Resources;
-function refetchResources(info) {
-  return Resources && Promise.all([...Resources].map(fn => fn(info)));
-}
 function createDeferred(source, options) {
   let t,
       timeout = options ? options.timeoutMs : undefined;
@@ -385,7 +383,7 @@ function createSelector(source, fn = equalFn, options) {
   const subs = new Map();
   const node = createComputation(p => {
     const v = source();
-    for (const key of subs.keys()) if (fn(key, v) !== (p !== undefined && fn(key, p))) {
+    for (const key of subs.keys()) if (fn(key, v) !== fn(key, p)) {
       const l = subs.get(key);
       for (const c of l.values()) {
         c.state = STALE;
@@ -740,11 +738,14 @@ function runUpdates(fn, init) {
   if (Effects) wait = true;else Effects = [];
   ExecCount++;
   try {
-    return fn();
+    const res = fn();
+    completeUpdates(wait);
+    return res;
   } catch (err) {
     handleError(err);
   } finally {
-    completeUpdates(wait);
+    Updates = null;
+    if (!wait) Effects = null;
   }
 }
 function completeUpdates(wait) {
@@ -985,6 +986,7 @@ function mapArray(list, mapFn, options = {}) {
     let newItems = list() || [],
         i,
         j;
+    newItems[$TRACK];
     return untrack(() => {
       let newLen = newItems.length,
           newIndices,
@@ -1086,6 +1088,7 @@ function indexArray(list, mapFn, options = {}) {
   onCleanup(() => dispose(disposers));
   return () => {
     const newItems = list() || [];
+    newItems[$TRACK];
     return untrack(() => {
       if (newItems.length === 0) {
         if (len !== 0) {
@@ -1249,9 +1252,7 @@ function lazy(fn) {
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default), {
-        globalRefetch: false
-      });
+      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
     } else {
       const c = comp();
@@ -1505,6 +1506,7 @@ let DEV;
 
 exports.$DEVCOMP = $DEVCOMP;
 exports.$PROXY = $PROXY;
+exports.$TRACK = $TRACK;
 exports.DEV = DEV;
 exports.ErrorBoundary = ErrorBoundary;
 exports.For = For;
@@ -1546,7 +1548,6 @@ exports.on = on;
 exports.onCleanup = onCleanup;
 exports.onError = onError;
 exports.onMount = onMount;
-exports.refetchResources = refetchResources;
 exports.requestCallback = requestCallback;
 exports.resetErrorBoundaries = resetErrorBoundaries;
 exports.runWithOwner = runWithOwner;