solid-js 1.3.3 → 1.3.4

package/dist/dev.cjs

@@ -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);
@@ -1402,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) {
@@ -1627,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

@@ -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);
@@ -1398,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) {
@@ -1579,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

@@ -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) {
@@ -1533,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

@@ -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) {
@@ -1484,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.3",
+  "version": "1.3.4",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "58f98c55a3573b23f683978c8828bbda563ae666"
+  "gitHead": "4c08b520a8cb3ed03886fba160154a679dfab8a6"
 }

package/types/index.d.ts

@@ -1,5 +1,5 @@
 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 type { Accessor, Setter, Signal, Resource, ResourceReturn, ResourceFetcher, ResourceFetcherInfo, Context, ReturnTypes } from "./reactive/signal";
 export * from "./reactive/observable";
 export * from "./reactive/scheduler";
 export * from "./reactive/array";

package/types/reactive/signal.d.ts

@@ -204,13 +204,13 @@ export declare type ResourceActions<T> = {
     refetch: (info?: unknown) => void;
 };
 export declare type ResourceReturn<T> = [Resource<T>, ResourceActions<T>];
-export declare type ResourceSource<S> = S | false | null | (() => S | false | null);
+export declare type ResourceSource<S> = S | false | null | undefined | (() => S | false | null | undefined);
 export declare type ResourceFetcher<S, T> = (k: S, info: ResourceFetcherInfo<T>) => T | Promise<T>;
 export declare type ResourceFetcherInfo<T> = {
     value: T | undefined;
     refetching?: unknown;
 };
-export declare type ResourceOptions<T> = T extends undefined ? {
+export declare type ResourceOptions<T> = undefined extends T ? {
     initialValue?: T;
     name?: string;
     globalRefetch?: boolean;

package/types/render/component.d.ts

@@ -13,8 +13,9 @@ export declare type Component<P = {}> = (props: PropsWithChildren<P>) => JSX.Ele
  */
 export declare type ComponentProps<T extends keyof JSX.IntrinsicElements | Component<any>> = T extends Component<infer P> ? P : T extends keyof JSX.IntrinsicElements ? JSX.IntrinsicElements[T] : {};
 export declare function createComponent<T>(Comp: (props: T) => JSX.Element, props: T): JSX.Element;
+declare type UnboxLazy<T> = T extends () => infer U ? U : T;
 declare type BoxedTupleTypes<T extends any[]> = {
-    [P in keyof T]: [T[P]];
+    [P in keyof T]: [UnboxLazy<T[P]>];
 }[Exclude<keyof T, keyof any[]>];
 declare type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 declare type UnboxIntersection<T> = T extends {

package/types/render/flow.d.ts

@@ -77,6 +77,7 @@ export declare type MatchProps<T> = {
  * @description https://www.solidjs.com/docs/latest/api#%3Cswitch%3E%2F%3Cmatch%3E
  */
 export declare function Match<T>(props: MatchProps<T>): JSX.Element;
+export declare function resetErrorBoundaries(): void;
 /**
  * catches uncaught errors inside components and renders a fallback content
  *

package/types/server/rendering.d.ts

@@ -55,6 +55,7 @@ declare type MatchProps<T> = {
     children: string | ((item: T) => string);
 };
 export declare function Match<T>(props: MatchProps<T>): MatchProps<T>;
+export declare function resetErrorBoundaries(): void;
 export declare function ErrorBoundary(props: {
     fallback: string | ((err: any, reset: () => void) => string);
     children: string;
@@ -62,10 +63,12 @@ export declare function ErrorBoundary(props: {
 export interface Resource<T> {
     (): T | undefined;
     loading: boolean;
+    error: any;
 }
 declare type SuspenseContextType = {
     resources: Map<string, {
         loading: boolean;
+        error: any;
     }>;
     completed: () => void;
 };

package/web/dist/server.cjs

@@ -322,12 +322,13 @@ function renderToStream(code, options = {}) {
   const dedupe = new WeakMap();
   const checkEnd = () => {
     if (!registry.size && !completed) {
+      writeTasks();
       onCompleteAll && onCompleteAll(result);
       writable && writable.end();
       completed = true;
     }
   };
-  const writeInitialScript = () => {
+  const writeTasks = () => {
     if (tasks.length && !completed) {
       buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${tasks.join(";")}</script>`);
       tasks.length = 0;
@@ -354,7 +355,7 @@ function renderToStream(code, options = {}) {
     nonce,
     writeResource(id, p, error) {
       if (!scheduled) {
-        Promise.resolve().then(writeInitialScript);
+        Promise.resolve().then(writeTasks);
         scheduled = true;
       }
       if (error) return tasks.push(`_$HY.set("${id}", ${serializeError(p)})`);
@@ -369,7 +370,7 @@ function renderToStream(code, options = {}) {
     registerFragment(key) {
       registry.set(key, []);
       if (!scheduled) {
-        Promise.resolve().then(writeInitialScript);
+        Promise.resolve().then(writeTasks);
         scheduled = true;
       }
       tasks.push(`_$HY.init("${key}")`);

package/web/dist/server.js

@@ -319,12 +319,13 @@ function renderToStream(code, options = {}) {
   const dedupe = new WeakMap();
   const checkEnd = () => {
     if (!registry.size && !completed) {
+      writeTasks();
       onCompleteAll && onCompleteAll(result);
       writable && writable.end();
       completed = true;
     }
   };
-  const writeInitialScript = () => {
+  const writeTasks = () => {
     if (tasks.length && !completed) {
       buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${tasks.join(";")}</script>`);
       tasks.length = 0;
@@ -351,7 +352,7 @@ function renderToStream(code, options = {}) {
     nonce,
     writeResource(id, p, error) {
       if (!scheduled) {
-        Promise.resolve().then(writeInitialScript);
+        Promise.resolve().then(writeTasks);
         scheduled = true;
       }
       if (error) return tasks.push(`_$HY.set("${id}", ${serializeError(p)})`);
@@ -366,7 +367,7 @@ function renderToStream(code, options = {}) {
     registerFragment(key) {
       registry.set(key, []);
       if (!scheduled) {
-        Promise.resolve().then(writeInitialScript);
+        Promise.resolve().then(writeTasks);
         scheduled = true;
       }
       tasks.push(`_$HY.init("${key}")`);