solid-js 2.0.0-experimental.5 → 2.0.0-experimental.6

package/dist/solid.cjs

@@ -76,7 +76,7 @@ function from(producer, initialValue = undefined) {
 }
 
 const sharedConfig = {
-  context: undefined,
+  hydrating: false,
   registry: undefined,
   done: false,
   getNextContextId() {
@@ -85,8 +85,90 @@ const sharedConfig = {
     return o.getNextChildId();
   }
 };
-function setHydrateContext(context) {
-  sharedConfig.context = context;
+function Suspense(props) {
+  if (!sharedConfig.hydrating) return signals.createSuspense(() => props.children, () => props.fallback);
+  return signals.createMemo(() => {
+    const o = signals.getOwner();
+    const id = o.id;
+    if (sharedConfig.hydrating && sharedConfig.has(id)) {
+      let ref = sharedConfig.load(id);
+      let p;
+      if (ref) {
+        if (typeof ref !== "object" || ref.s !== "success") p = ref;else sharedConfig.gather(id);
+      }
+      if (p) {
+        const [s, set] = signals.createSignal(undefined, {
+          equals: false
+        });
+        s();
+        if (p !== "$$f") {
+          p.then(() => {
+            sharedConfig.gather(id);
+            sharedConfig.hydrating = true;
+            set();
+            signals.flush();
+            sharedConfig.hydrating = false;
+          }, err => signals.runWithObserver(o, () => {
+            throw err;
+          }));
+        } else queueMicrotask(set);
+        return props.fallback;
+      }
+    }
+    return signals.createSuspense(() => props.children, () => props.fallback);
+  });
+}
+function createAsync(compute, value, options) {
+  if (!sharedConfig.hydrating) return signals.createAsync(compute, value, options);
+  return signals.createAsync(prev => {
+    if (!sharedConfig.hydrating) return compute(prev);
+    const o = signals.getOwner();
+    let initP;
+    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+    const init = initP?.value || initP;
+    return init ? (subFetch(compute, prev), init) : compute(prev);
+  }, value, options);
+}
+class MockPromise {
+  static all() {
+    return new MockPromise();
+  }
+  static allSettled() {
+    return new MockPromise();
+  }
+  static any() {
+    return new MockPromise();
+  }
+  static race() {
+    return new MockPromise();
+  }
+  static reject() {
+    return new MockPromise();
+  }
+  static resolve() {
+    return new MockPromise();
+  }
+  catch() {
+    return new MockPromise();
+  }
+  then() {
+    return new MockPromise();
+  }
+  finally() {
+    return new MockPromise();
+  }
+}
+function subFetch(fn, prev) {
+  const ogFetch = fetch;
+  const ogPromise = Promise;
+  try {
+    window.fetch = () => new MockPromise();
+    Promise = MockPromise;
+    return fn(prev);
+  } finally {
+    window.fetch = ogFetch;
+    Promise = ogPromise;
+  }
 }
 
 function enableHydration() {
@@ -98,30 +180,13 @@ function lazy(fn) {
   let comp;
   let p;
   const wrap = props => {
-    const ctx = sharedConfig.context;
-    if (ctx) {
-      const [s, set] = signals.createSignal();
-      sharedConfig.count || (sharedConfig.count = 0);
-      sharedConfig.count++;
-      (p || (p = fn())).then(mod => {
-        !sharedConfig.done && setHydrateContext(ctx);
-        sharedConfig.count--;
-        set(() => mod.default);
-        setHydrateContext();
-      });
-      comp = s;
-    } else if (!comp) {
+    if (!comp) {
       const s = signals.createAsync(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
     }
     let Comp;
     return signals.createMemo(() => (Comp = comp()) ? signals.untrack(() => {
-      if (!ctx || sharedConfig.done) return Comp(props);
-      const c = sharedConfig.context;
-      setHydrateContext(ctx);
-      const r = Comp(props);
-      setHydrateContext(c);
-      return r;
+      return Comp(props);
     }) : "");
   };
   wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
@@ -129,8 +194,7 @@ function lazy(fn) {
 }
 let counter = 0;
 function createUniqueId() {
-  const ctx = sharedConfig.context;
-  return ctx ? sharedConfig.getNextContextId() : `cl-${counter++}`;
+  return sharedConfig.hydrating ? sharedConfig.getNextContextId() : `cl-${counter++}`;
 }
 
 const narrowedError = name => `Stale read from <${name}>.`;
@@ -208,9 +272,6 @@ function ErrorBoundary(props) {
     return typeof f === "function" && f.length ? f(err, reset) : f;
   });
 }
-function Suspense(props) {
-  return signals.createSuspense(() => props.children, () => props.fallback);
-}
 function Boundary(props) {
   return signals.createBoundary(() => props.children, () => props.mode);
 }
@@ -223,18 +284,10 @@ Object.defineProperty(exports, "$PROXY", {
   enumerable: true,
   get: function () { return signals.$PROXY; }
 });
-Object.defineProperty(exports, "$RAW", {
-  enumerable: true,
-  get: function () { return signals.$RAW; }
-});
 Object.defineProperty(exports, "$TRACK", {
   enumerable: true,
   get: function () { return signals.$TRACK; }
 });
-Object.defineProperty(exports, "createAsync", {
-  enumerable: true,
-  get: function () { return signals.createAsync; }
-});
 Object.defineProperty(exports, "createEffect", {
   enumerable: true,
   get: function () { return signals.createEffect; }
@@ -263,13 +316,17 @@ Object.defineProperty(exports, "createStore", {
   enumerable: true,
   get: function () { return signals.createStore; }
 });
+Object.defineProperty(exports, "deep", {
+  enumerable: true,
+  get: function () { return signals.deep; }
+});
 Object.defineProperty(exports, "flatten", {
   enumerable: true,
   get: function () { return signals.flatten; }
 });
-Object.defineProperty(exports, "flushSync", {
+Object.defineProperty(exports, "flush", {
   enumerable: true,
-  get: function () { return signals.flushSync; }
+  get: function () { return signals.flush; }
 });
 Object.defineProperty(exports, "getObserver", {
   enumerable: true,
@@ -331,6 +388,10 @@ Object.defineProperty(exports, "runWithOwner", {
   enumerable: true,
   get: function () { return signals.runWithOwner; }
 });
+Object.defineProperty(exports, "snapshot", {
+  enumerable: true,
+  get: function () { return signals.snapshot; }
+});
 Object.defineProperty(exports, "tryCatch", {
   enumerable: true,
   get: function () { return signals.tryCatch; }
@@ -339,10 +400,6 @@ Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return signals.untrack; }
 });
-Object.defineProperty(exports, "unwrap", {
-  enumerable: true,
-  get: function () { return signals.unwrap; }
-});
 exports.$DEVCOMP = $DEVCOMP;
 exports.Boundary = Boundary;
 exports.DEV = DEV;
@@ -354,6 +411,7 @@ exports.Show = Show;
 exports.Suspense = Suspense;
 exports.Switch = Switch;
 exports.children = children;
+exports.createAsync = createAsync;
 exports.createComponent = createComponent;
 exports.createContext = createContext;
 exports.createUniqueId = createUniqueId;

package/dist/solid.js

@@ -1,5 +1,5 @@
-import { createEffect, getContext, createMemo, flatten, createRoot, setContext, getOwner, onCleanup, createSignal, untrack, createAsync, mapArray, repeat, createErrorBoundary, createSuspense, createBoundary } from '@solidjs/signals';
-export { $PROXY, $RAW, $TRACK, createAsync, createEffect, createMemo, createProjection, createRenderEffect, createRoot, createSignal, createStore, flatten, flushSync, getObserver, getOwner, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, repeat, resolve, runWithObserver, runWithOwner, tryCatch, untrack, unwrap } from '@solidjs/signals';
+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, createProjection, createRenderEffect, createRoot, createSignal, createStore, deep, flatten, flush, getObserver, getOwner, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, repeat, resolve, runWithObserver, runWithOwner, snapshot, tryCatch, untrack } from '@solidjs/signals';
 
 const $DEVCOMP = Symbol(0);
 function onMount(fn) {
@@ -75,7 +75,7 @@ function from(producer, initialValue = undefined) {
 }
 
 const sharedConfig = {
-  context: undefined,
+  hydrating: false,
   registry: undefined,
   done: false,
   getNextContextId() {
@@ -84,8 +84,90 @@ const sharedConfig = {
     return o.getNextChildId();
   }
 };
-function setHydrateContext(context) {
-  sharedConfig.context = context;
+function Suspense(props) {
+  if (!sharedConfig.hydrating) return createSuspense(() => props.children, () => props.fallback);
+  return createMemo(() => {
+    const o = getOwner();
+    const id = o.id;
+    if (sharedConfig.hydrating && sharedConfig.has(id)) {
+      let ref = sharedConfig.load(id);
+      let p;
+      if (ref) {
+        if (typeof ref !== "object" || ref.s !== "success") p = ref;else sharedConfig.gather(id);
+      }
+      if (p) {
+        const [s, set] = createSignal(undefined, {
+          equals: false
+        });
+        s();
+        if (p !== "$$f") {
+          p.then(() => {
+            sharedConfig.gather(id);
+            sharedConfig.hydrating = true;
+            set();
+            flush();
+            sharedConfig.hydrating = false;
+          }, err => runWithObserver(o, () => {
+            throw err;
+          }));
+        } else queueMicrotask(set);
+        return props.fallback;
+      }
+    }
+    return createSuspense(() => props.children, () => props.fallback);
+  });
+}
+function createAsync(compute, value, options) {
+  if (!sharedConfig.hydrating) return createAsync$1(compute, value, options);
+  return createAsync$1(prev => {
+    if (!sharedConfig.hydrating) return compute(prev);
+    const o = getOwner();
+    let initP;
+    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+    const init = initP?.value || initP;
+    return init ? (subFetch(compute, prev), init) : compute(prev);
+  }, value, options);
+}
+class MockPromise {
+  static all() {
+    return new MockPromise();
+  }
+  static allSettled() {
+    return new MockPromise();
+  }
+  static any() {
+    return new MockPromise();
+  }
+  static race() {
+    return new MockPromise();
+  }
+  static reject() {
+    return new MockPromise();
+  }
+  static resolve() {
+    return new MockPromise();
+  }
+  catch() {
+    return new MockPromise();
+  }
+  then() {
+    return new MockPromise();
+  }
+  finally() {
+    return new MockPromise();
+  }
+}
+function subFetch(fn, prev) {
+  const ogFetch = fetch;
+  const ogPromise = Promise;
+  try {
+    window.fetch = () => new MockPromise();
+    Promise = MockPromise;
+    return fn(prev);
+  } finally {
+    window.fetch = ogFetch;
+    Promise = ogPromise;
+  }
 }
 
 function enableHydration() {
@@ -97,30 +179,13 @@ function lazy(fn) {
   let comp;
   let p;
   const wrap = props => {
-    const ctx = sharedConfig.context;
-    if (ctx) {
-      const [s, set] = createSignal();
-      sharedConfig.count || (sharedConfig.count = 0);
-      sharedConfig.count++;
-      (p || (p = fn())).then(mod => {
-        !sharedConfig.done && setHydrateContext(ctx);
-        sharedConfig.count--;
-        set(() => mod.default);
-        setHydrateContext();
-      });
-      comp = s;
-    } else if (!comp) {
-      const s = createAsync(() => (p || (p = fn())).then(mod => mod.default));
+    if (!comp) {
+      const s = createAsync$1(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
     }
     let Comp;
     return createMemo(() => (Comp = comp()) ? untrack(() => {
-      if (!ctx || sharedConfig.done) return Comp(props);
-      const c = sharedConfig.context;
-      setHydrateContext(ctx);
-      const r = Comp(props);
-      setHydrateContext(c);
-      return r;
+      return Comp(props);
     }) : "");
   };
   wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
@@ -128,8 +193,7 @@ function lazy(fn) {
 }
 let counter = 0;
 function createUniqueId() {
-  const ctx = sharedConfig.context;
-  return ctx ? sharedConfig.getNextContextId() : `cl-${counter++}`;
+  return sharedConfig.hydrating ? sharedConfig.getNextContextId() : `cl-${counter++}`;
 }
 
 const narrowedError = name => `Stale read from <${name}>.`;
@@ -207,9 +271,6 @@ function ErrorBoundary(props) {
     return typeof f === "function" && f.length ? f(err, reset) : f;
   });
 }
-function Suspense(props) {
-  return createSuspense(() => props.children, () => props.fallback);
-}
 function Boundary(props) {
   return createBoundary(() => props.children, () => props.mode);
 }
@@ -218,4 +279,4 @@ function ssrHandleError() {}
 function ssrRunInScope() {}
 const DEV = undefined;
 
-export { $DEVCOMP, Boundary, DEV, ErrorBoundary, For, Match, Repeat, Show, Suspense, Switch, children, 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, sharedConfig, ssrHandleError, ssrRunInScope, 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.5",
+  "version": "2.0.0-experimental.6",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -79,8 +79,10 @@
     "performance"
   ],
   "dependencies": {
-    "@solidjs/signals": "^0.3.1",
-    "csstype": "^3.1.0"
+    "@solidjs/signals": "^0.4.1",
+    "csstype": "^3.1.0",
+    "seroval": "~1.3.0",
+    "seroval-plugins": "~1.3.0"
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",

package/types/client/component.d.ts

@@ -21,7 +21,7 @@ export type VoidProps<P extends Record<string, any> = {}> = P & {
 export type VoidComponent<P extends Record<string, any> = {}> = Component<VoidProps<P>>;
 /**
  * Extend props to allow an optional `children` prop with the usual
- * type in JSX, `JSX.Element` (which allows elements, arrays, functions, etc.).
+ * type in JSX, `JSX.Element` (which allows elements, arrays, strings, etc.).
  * Use this for components that you want to accept children.
  */
 export type ParentProps<P extends Record<string, any> = {}> = P & {
@@ -29,7 +29,7 @@ export type ParentProps<P extends Record<string, any> = {}> = P & {
 };
 /**
  * `ParentComponent` allows an optional `children` prop with the usual
- * type in JSX, `JSX.Element` (which allows elements, arrays, functions, etc.).
+ * type in JSX, `JSX.Element` (which allows elements, arrays, strings, etc.).
  * Use this for components that you want to accept children.
  */
 export type ParentComponent<P extends Record<string, any> = {}> = Component<ParentProps<P>>;

package/types/client/flow.d.ts

@@ -15,7 +15,7 @@ import type { JSX } from "../jsx.js";
 export declare function For<T extends readonly any[], U extends JSX.Element>(props: {
     each: T | undefined | null | false;
     fallback?: JSX.Element;
-    keyed?: boolean | ((item: T) => any);
+    keyed?: boolean | ((item: T[number]) => any);
     children: (item: Accessor<T[number]>, index: Accessor<number>) => U;
 }): JSX.Element;
 /**
@@ -98,21 +98,6 @@ export declare function ErrorBoundary(props: {
     fallback: JSX.Element | ((err: any, reset: () => void) => JSX.Element);
     children: JSX.Element;
 }): JSX.Element;
-/**
- * Tracks all resources inside a component and renders a fallback until they are all resolved
- * ```typescript
- * const AsyncComponent = lazy(() => import('./component'));
- *
- * <Suspense fallback={<LoadingIndicator />}>
- *   <AsyncComponent />
- * </Suspense>
- * ```
- * @description https://docs.solidjs.com/reference/components/suspense
- */
-export declare function Suspense(props: {
-    fallback?: JSX.Element;
-    children: JSX.Element;
-}): JSX.Element;
 export declare function Boundary(props: {
     mode: BoundaryMode;
     children: JSX.Element;

package/types/client/hydration.d.ts

@@ -1,6 +1,8 @@
+import { MemoOptions, Accessor } from "@solidjs/signals";
+import { JSX } from "../jsx.js";
 export type HydrationContext = {};
 type SharedConfig = {
-    context?: HydrationContext;
+    hydrating: boolean;
     resources?: {
         [key: string]: any;
     };
@@ -8,11 +10,39 @@ type SharedConfig = {
     has?: (id: string) => boolean;
     gather?: (key: string) => void;
     registry?: Map<string, Element>;
-    done?: boolean;
-    count?: number;
+    done: boolean;
     getNextContextId(): string;
 };
 export declare const sharedConfig: SharedConfig;
-export declare function setHydrateContext(context?: HydrationContext): void;
-export declare function nextHydrateContext(): HydrationContext | undefined;
+/**
+ * Tracks all resources inside a component and renders a fallback until they are all resolved
+ * ```typescript
+ * const AsyncComponent = lazy(() => import('./component'));
+ *
+ * <Suspense fallback={<LoadingIndicator />}>
+ *   <AsyncComponent />
+ * </Suspense>
+ * ```
+ * @description https://docs.solidjs.com/reference/components/suspense
+ */
+export declare function Suspense(props: {
+    fallback?: JSX.Element;
+    children: JSX.Element;
+}): JSX.Element;
+/**
+ * Creates a readonly derived async reactive memoized signal
+ * ```typescript
+ * export function createAsync<T>(
+ *   compute: (v: T) => Promise<T> | T,
+ *   value?: T,
+ *   options?: { name?: string, equals?: false | ((prev: T, next: T) => boolean) }
+ * ): () => T;
+ * ```
+ * @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
+ * @param options allows to set a name in dev mode for debugging purposes and use a custom comparison function in equals
+ *
+ * @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 {};

package/types/index.d.ts

@@ -1,11 +1,11 @@
-export { $PROXY, $TRACK, $RAW, createAsync, createEffect, createMemo, createProjection, createRenderEffect, createRoot, createSignal, createStore, flatten, flushSync, getObserver, getOwner, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, repeat, resolve, runWithObserver, runWithOwner, tryCatch, untrack, unwrap } from "@solidjs/signals";
+export { $PROXY, $TRACK, createEffect, createMemo, 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 } 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 { $DEVCOMP, children, createContext, onMount, useContext } from "./client/core.js";
 export type { ChildrenReturn, Context, ContextProviderComponent, ResolvedChildren, ResolvedJSXElement } from "./client/core.js";
 export * from "./client/observable.js";
 export * from "./client/component.js";
 export * from "./client/flow.js";
-export { sharedConfig } from "./client/hydration.js";
+export { sharedConfig, createAsync, Suspense } from "./client/hydration.js";
 export declare function ssrHandleError(): void;
 export declare function ssrRunInScope(): void;
 import type { JSX } from "./jsx.js";