solid-js 2.0.0-experimental.13 → 2.0.0-experimental.14

package/dist/dev.cjs

@@ -50,27 +50,6 @@ 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));
-  }];
-}
-
 const sharedConfig = {
   hydrating: false,
   registry: undefined,
@@ -81,6 +60,77 @@ const sharedConfig = {
     return signals.getNextChildId(o);
   }
 };
+let _createMemo;
+let _createSignal;
+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 hydratedCreateMemo(compute, value, options) {
+  if (!sharedConfig.hydrating) return signals.createMemo(compute, value, options);
+  return signals.createMemo(prev => {
+    const o = signals.getOwner();
+    if (!sharedConfig.hydrating) return compute(prev);
+    let initP;
+    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+    const init = initP?.v ?? initP;
+    return init != null ? (subFetch(compute, prev), init) : compute(prev);
+  }, value, options);
+}
+function hydratedCreateSignal(fn, second, third) {
+  if (typeof fn !== "function" || !sharedConfig.hydrating) return signals.createSignal(fn, second, third);
+  return signals.createSignal(prev => {
+    if (!sharedConfig.hydrating) return fn(prev);
+    const o = signals.getOwner();
+    let initP;
+    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+    const init = initP?.v ?? initP;
+    return init != null ? (subFetch(fn, prev), init) : fn(prev);
+  }, second, third);
+}
+function enableHydration() {
+  _createMemo = hydratedCreateMemo;
+  _createSignal = hydratedCreateSignal;
+}
+const createMemo = (...args) => (_createMemo || signals.createMemo)(...args);
+const createSignal = (...args) => (_createSignal || signals.createSignal)(...args);
 function Loading(props) {
   if (!sharedConfig.hydrating) return signals.createLoadBoundary(() => props.children, () => props.fallback);
   return signals.createMemo(() => {
@@ -90,7 +140,7 @@ function Loading(props) {
       let ref = sharedConfig.load(id);
       let p;
       if (ref) {
-        if (typeof ref !== "object" || ref.s !== "success") p = ref;else sharedConfig.gather(id);
+        if (typeof ref !== "object" || ref.s !== 1) p = ref;else sharedConfig.gather(id);
       }
       if (p) {
         const [s, set] = signals.createSignal(undefined, {
@@ -115,8 +165,6 @@ function Loading(props) {
   });
 }
 
-function enableHydration() {
-}
 function createComponent(Comp, props) {
   return devComponent(Comp, props || {});
 }
@@ -226,9 +274,6 @@ function Errored(props) {
     return typeof f === "function" && f.length ? f(err, reset) : f;
   });
 }
-function Boundary(props) {
-  return signals.createBoundary(() => props.children, () => props.mode);
-}
 
 function ssrHandleError() {}
 function ssrRunInScope() {}
@@ -249,6 +294,10 @@ Object.defineProperty(exports, "$TRACK", {
   enumerable: true,
   get: function () { return signals.$TRACK; }
 });
+Object.defineProperty(exports, "NotReadyError", {
+  enumerable: true,
+  get: function () { return signals.NotReadyError; }
+});
 Object.defineProperty(exports, "action", {
   enumerable: true,
   get: function () { return signals.action; }
@@ -257,10 +306,6 @@ Object.defineProperty(exports, "createEffect", {
   enumerable: true,
   get: function () { return signals.createEffect; }
 });
-Object.defineProperty(exports, "createMemo", {
-  enumerable: true,
-  get: function () { return signals.createMemo; }
-});
 Object.defineProperty(exports, "createOptimistic", {
   enumerable: true,
   get: function () { return signals.createOptimistic; }
@@ -285,10 +330,6 @@ Object.defineProperty(exports, "createRoot", {
   enumerable: true,
   get: function () { return signals.createRoot; }
 });
-Object.defineProperty(exports, "createSignal", {
-  enumerable: true,
-  get: function () { return signals.createSignal; }
-});
 Object.defineProperty(exports, "createStore", {
   enumerable: true,
   get: function () { return signals.createStore; }
@@ -386,7 +427,6 @@ Object.defineProperty(exports, "untrack", {
   get: function () { return signals.untrack; }
 });
 exports.$DEVCOMP = $DEVCOMP;
-exports.Boundary = Boundary;
 exports.DEV = DEV;
 exports.Errored = Errored;
 exports.For = For;
@@ -398,12 +438,12 @@ exports.Switch = Switch;
 exports.children = children;
 exports.createComponent = createComponent;
 exports.createContext = createContext;
+exports.createMemo = createMemo;
+exports.createSignal = createSignal;
 exports.createUniqueId = createUniqueId;
 exports.enableHydration = enableHydration;
 exports.lazy = lazy;
-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 { getContext, createMemo, flatten, createRoot, setContext, getOwner, untrack, NotReadyError, getNextChildId, createLoadBoundary, createSignal, flush, runWithOwner, mapArray, repeat, createErrorBoundary, createBoundary } from '@solidjs/signals';
-export { $PROXY, $TRACK, action, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createRoot, createSignal, createStore, createTrackedEffect, deep, flatten, flush, getObserver, getOwner, isEqual, isPending, isRefreshing, isWrappable, mapArray, merge, omit, onCleanup, onSettled, pending, reconcile, refresh, repeat, resolve, runWithOwner, snapshot, untrack } from '@solidjs/signals';
+import { getContext, createMemo as createMemo$1, flatten, createRoot, setContext, getOwner, untrack, getNextChildId, createSignal as createSignal$1, createLoadBoundary, flush, runWithOwner, mapArray, repeat, createErrorBoundary } from '@solidjs/signals';
+export { $PROXY, $TRACK, NotReadyError, action, createEffect, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createRoot, createStore, createTrackedEffect, deep, flatten, flush, getObserver, getOwner, isEqual, isPending, isRefreshing, isWrappable, mapArray, merge, omit, onCleanup, onSettled, pending, reconcile, refresh, repeat, resolve, runWithOwner, snapshot, untrack } from '@solidjs/signals';
 
 const $DEVCOMP = Symbol("COMPONENT_DEV" );
 function createContext(defaultValue, options) {
@@ -18,8 +18,8 @@ function useContext(context) {
   return getContext(context);
 }
 function children(fn) {
-  const children = createMemo(fn);
-  const memo = createMemo(() => flatten(children()), undefined, {
+  const children = createMemo$1(fn);
+  const memo = createMemo$1(() => flatten(children()), undefined, {
     name: "children"
   }) ;
   memo.toArray = () => {
@@ -49,27 +49,6 @@ 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));
-  }];
-}
-
 const sharedConfig = {
   hydrating: false,
   registry: undefined,
@@ -80,19 +59,90 @@ const sharedConfig = {
     return getNextChildId(o);
   }
 };
+let _createMemo;
+let _createSignal;
+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 hydratedCreateMemo(compute, value, options) {
+  if (!sharedConfig.hydrating) return createMemo$1(compute, value, options);
+  return createMemo$1(prev => {
+    const o = getOwner();
+    if (!sharedConfig.hydrating) return compute(prev);
+    let initP;
+    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+    const init = initP?.v ?? initP;
+    return init != null ? (subFetch(compute, prev), init) : compute(prev);
+  }, value, options);
+}
+function hydratedCreateSignal(fn, second, third) {
+  if (typeof fn !== "function" || !sharedConfig.hydrating) return createSignal$1(fn, second, third);
+  return createSignal$1(prev => {
+    if (!sharedConfig.hydrating) return fn(prev);
+    const o = getOwner();
+    let initP;
+    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+    const init = initP?.v ?? initP;
+    return init != null ? (subFetch(fn, prev), init) : fn(prev);
+  }, second, third);
+}
+function enableHydration() {
+  _createMemo = hydratedCreateMemo;
+  _createSignal = hydratedCreateSignal;
+}
+const createMemo = (...args) => (_createMemo || createMemo$1)(...args);
+const createSignal = (...args) => (_createSignal || createSignal$1)(...args);
 function Loading(props) {
   if (!sharedConfig.hydrating) return createLoadBoundary(() => props.children, () => props.fallback);
-  return createMemo(() => {
+  return createMemo$1(() => {
     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 (typeof ref !== "object" || ref.s !== 1) p = ref;else sharedConfig.gather(id);
       }
       if (p) {
-        const [s, set] = createSignal(undefined, {
+        const [s, set] = createSignal$1(undefined, {
           equals: false
         });
         s();
@@ -114,8 +164,6 @@ function Loading(props) {
   });
 }
 
-function enableHydration() {
-}
 function createComponent(Comp, props) {
   return devComponent(Comp, props || {});
 }
@@ -123,9 +171,9 @@ function lazy(fn) {
   let comp;
   let p;
   const wrap = props => {
-    comp = createMemo(() => (p || (p = fn())).then(mod => mod.default));
+    comp = createMemo$1(() => (p || (p = fn())).then(mod => mod.default));
     let Comp;
-    return createMemo(() => (Comp = comp()) ? untrack(() => {
+    return createMemo$1(() => (Comp = comp()) ? untrack(() => {
       Object.assign(Comp, {
         [$DEVCOMP]: true
       });
@@ -159,14 +207,14 @@ function Repeat(props) {
 }
 function Show(props) {
   const keyed = props.keyed;
-  const conditionValue = createMemo(() => props.when, undefined, {
+  const conditionValue = createMemo$1(() => props.when, undefined, {
     name: "condition value"
   } );
-  const condition = keyed ? conditionValue : createMemo(conditionValue, undefined, {
+  const condition = keyed ? conditionValue : createMemo$1(conditionValue, undefined, {
     equals: (a, b) => !a === !b,
     name: "condition"
   } );
-  return createMemo(() => {
+  return createMemo$1(() => {
     const c = condition();
     if (c) {
       const child = props.children;
@@ -183,17 +231,17 @@ function Show(props) {
 }
 function Switch(props) {
   const chs = children(() => props.children);
-  const switchFunc = createMemo(() => {
+  const switchFunc = createMemo$1(() => {
     const mps = chs.toArray();
     let func = () => undefined;
     for (let i = 0; i < mps.length; i++) {
       const index = i;
       const mp = mps[i];
       const prevFunc = func;
-      const conditionValue = createMemo(() => prevFunc() ? undefined : mp.when, undefined, {
+      const conditionValue = createMemo$1(() => prevFunc() ? undefined : mp.when, undefined, {
         name: "condition value"
       } );
-      const condition = mp.keyed ? conditionValue : createMemo(conditionValue, undefined, {
+      const condition = mp.keyed ? conditionValue : createMemo$1(conditionValue, undefined, {
         equals: (a, b) => !a === !b,
         name: "condition"
       } );
@@ -201,7 +249,7 @@ function Switch(props) {
     }
     return func;
   });
-  return createMemo(() => {
+  return createMemo$1(() => {
     const sel = switchFunc()();
     if (!sel) return props.fallback;
     const [index, conditionValue, mp] = sel;
@@ -225,9 +273,6 @@ function Errored(props) {
     return typeof f === "function" && f.length ? f(err, reset) : f;
   });
 }
-function Boundary(props) {
-  return createBoundary(() => props.children, () => props.mode);
-}
 
 function ssrHandleError() {}
 function ssrRunInScope() {}
@@ -240,4 +285,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, Errored, For, Loading, Match, Repeat, Show, Switch, children, createComponent, createContext, createUniqueId, enableHydration, lazy, reducer, sharedConfig, ssrHandleError, ssrRunInScope, tryCatch, useContext };
+export { $DEVCOMP, DEV, Errored, For, Loading, Match, Repeat, Show, Switch, children, createComponent, createContext, createMemo, createSignal, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };