solid-js 2.0.0-experimental.1 → 2.0.0-experimental.11

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2023 Ryan Carniato
+Copyright (c) 2016-2025 Ryan Carniato
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/dev.cjs

@@ -9,8 +9,8 @@ function onMount(fn) {
 function createContext(defaultValue, options) {
   const id = Symbol(options && options.name || "");
   function provider(props) {
-    return signals.createMemo(() => {
-      signals.setContext(provider, signals.untrack(() => props.value));
+    return signals.createRoot(() => {
+      signals.setContext(provider, props.value);
       return children(() => props.children);
     });
   }
@@ -53,6 +53,27 @@ 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));
+  }];
+}
+
 function observable(input) {
   return {
     subscribe(observer) {
@@ -83,8 +104,8 @@ function observable(input) {
     }
   };
 }
-function from(producer) {
-  const [s, set] = signals.createSignal(undefined, {
+function from(producer, initialValue = undefined) {
+  const [s, set] = signals.createSignal(() => initialValue, initialValue, {
     equals: false
   });
   if ("subscribe" in producer) {
@@ -98,65 +119,111 @@ function from(producer) {
 }
 
 const sharedConfig = {
-  context: undefined,
+  hydrating: false,
   registry: undefined,
   done: false,
-  getContextId() {
-    return getContextId(this.context.count);
-  },
   getNextContextId() {
-    return getContextId(this.context.count++);
+    const o = signals.getOwner();
+    if (!o) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    return signals.getNextChildId(o);
   }
 };
-function getContextId(count) {
-  const num = String(count),
-    len = num.length - 1;
-  return sharedConfig.context.id + (len ? String.fromCharCode(96 + len) : "") + num;
+function Loading(props) {
+  if (!sharedConfig.hydrating) return signals.createLoadBoundary(() => 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.runWithOwner(o, () => {
+            throw err;
+          }));
+        } else queueMicrotask(set);
+        return props.fallback;
+      }
+    }
+    return signals.createLoadBoundary(() => props.children, () => props.fallback);
+  });
 }
-function setHydrateContext(context) {
-  sharedConfig.context = context;
+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);
 }
-function nextHydrateContext() {
-  return {
-    ...sharedConfig.context,
-    id: sharedConfig.getNextContextId(),
-    count: 0
-  };
+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;
+  }
 }
 
-let hydrationEnabled = false;
 function enableHydration() {
-  hydrationEnabled = true;
 }
 function createComponent(Comp, props) {
-  if (hydrationEnabled) {
-    if (sharedConfig.context) {
-      const c = sharedConfig.context;
-      setHydrateContext(nextHydrateContext());
-      const r = devComponent(Comp, props || {}) ;
-      setHydrateContext(c);
-      return r;
-    }
-  }
   return devComponent(Comp, props || {});
 }
 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;
     }
@@ -165,12 +232,7 @@ function lazy(fn) {
       Object.assign(Comp, {
         [$DEVCOMP]: true
       });
-      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);
@@ -178,8 +240,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 => `Attempting to access a stale value from <${name}> that could possibly be undefined. This may occur because you are reading the accessor returned from the component at a time where it has already been unmounted. We recommend cleaning up any stale timers or async, or reading from the initial condition.` ;
@@ -190,22 +251,22 @@ function For(props) {
   } : {
     keyed: props.keyed
   };
-  return signals.createMemo(signals.mapArray(() => props.each, props.children, options), undefined, {
-    name: "value"
-  }) ;
+  return signals.mapArray(() => props.each, props.children, options);
 }
 function Repeat(props) {
   const options = "fallback" in props ? {
     fallback: () => props.fallback
   } : {};
-  return signals.createMemo(signals.repeat(() => props.count, index => typeof props.children === "function" ? props.children(index) : props.children, options), undefined, {
-    name: "value"
-  }) ;
+  options.from = () => props.from;
+  return signals.repeat(() => props.count, index => typeof props.children === "function" ? props.children(index) : props.children, options);
 }
 function Show(props) {
   const keyed = props.keyed;
-  const condition = signals.createMemo(() => props.when, undefined, {
-    equals: (a, b) => keyed ? a === b : !a === !b,
+  const conditionValue = signals.createMemo(() => props.when, undefined, {
+    name: "condition value"
+  } );
+  const condition = keyed ? conditionValue : signals.createMemo(conditionValue, undefined, {
+    equals: (a, b) => !a === !b,
     name: "condition"
   } );
   return signals.createMemo(() => {
@@ -215,7 +276,7 @@ function Show(props) {
       const fn = typeof child === "function" && child.length > 0;
       return fn ? signals.untrack(() => child(() => {
         if (!signals.untrack(condition)) throw narrowedError("Show");
-        return props.when;
+        return conditionValue();
       })) : child;
     }
     return props.fallback;
@@ -224,51 +285,55 @@ function Show(props) {
   } );
 }
 function Switch(props) {
-  let keyed = false;
-  const equals = (a, b) => (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
-  const conditions = children(() => props.children),
-    evalConditions = signals.createMemo(() => {
-      let conds = conditions();
-      if (!Array.isArray(conds)) conds = [conds];
-      for (let i = 0; i < conds.length; i++) {
-        const c = conds[i].when;
-        if (c) {
-          keyed = !!conds[i].keyed;
-          return [i, c, conds[i]];
-        }
-      }
-      return [-1];
-    }, undefined, {
-      equals,
-      name: "eval conditions"
-    } );
+  const chs = children(() => props.children);
+  const switchFunc = signals.createMemo(() => {
+    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 = signals.createMemo(() => prevFunc() ? undefined : mp.when, undefined, {
+        name: "condition value"
+      } );
+      const condition = mp.keyed ? conditionValue : signals.createMemo(conditionValue, undefined, {
+        equals: (a, b) => !a === !b,
+        name: "condition"
+      } );
+      func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
+    }
+    return func;
+  });
   return signals.createMemo(() => {
-    const [index, when, cond] = evalConditions();
-    if (index < 0) return props.fallback;
-    const c = cond.children;
-    const fn = typeof c === "function" && c.length > 0;
-    return fn ? signals.untrack(() => c(() => {
-      if (signals.untrack(evalConditions)[0] !== index) throw narrowedError("Match");
-      return cond.when;
-    })) : c;
+    const sel = switchFunc()();
+    if (!sel) return props.fallback;
+    const [index, conditionValue, mp] = sel;
+    const child = mp.children;
+    const fn = typeof child === "function" && child.length > 0;
+    return fn ? signals.untrack(() => child(() => {
+      if (signals.untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+      return conditionValue();
+    })) : child;
   }, undefined, {
-    name: "value"
+    name: "eval conditions"
   } );
 }
 function Match(props) {
   return props;
 }
-function ErrorBoundary(props) {
+function Errored(props) {
   return signals.createErrorBoundary(() => props.children, (err, reset) => {
     const f = props.fallback;
     if ((typeof f !== "function" || f.length == 0)) console.error(err);
     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);
 }
 
+function ssrHandleError() {}
+function ssrRunInScope() {}
 const DevHooks = {};
 const DEV = {
   hooks: DevHooks,
@@ -282,22 +347,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, "catchError", {
-  enumerable: true,
-  get: function () { return signals.catchError; }
-});
-Object.defineProperty(exports, "createAsync", {
-  enumerable: true,
-  get: function () { return signals.createAsync; }
-});
 Object.defineProperty(exports, "createEffect", {
   enumerable: true,
   get: function () { return signals.createEffect; }
@@ -306,6 +359,14 @@ Object.defineProperty(exports, "createMemo", {
   enumerable: true,
   get: function () { return signals.createMemo; }
 });
+Object.defineProperty(exports, "createOptimistic", {
+  enumerable: true,
+  get: function () { return signals.createOptimistic; }
+});
+Object.defineProperty(exports, "createOptimisticStore", {
+  enumerable: true,
+  get: function () { return signals.createOptimisticStore; }
+});
 Object.defineProperty(exports, "createProjection", {
   enumerable: true,
   get: function () { return signals.createProjection; }
@@ -330,13 +391,21 @@ Object.defineProperty(exports, "createStore", {
   enumerable: true,
   get: function () { return signals.createStore; }
 });
+Object.defineProperty(exports, "createTrackedEffect", {
+  enumerable: true,
+  get: function () { return signals.createTrackedEffect; }
+});
+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,
@@ -350,18 +419,14 @@ Object.defineProperty(exports, "isEqual", {
   enumerable: true,
   get: function () { return signals.isEqual; }
 });
-Object.defineProperty(exports, "isStale", {
+Object.defineProperty(exports, "isPending", {
   enumerable: true,
-  get: function () { return signals.isStale; }
+  get: function () { return signals.isPending; }
 });
 Object.defineProperty(exports, "isWrappable", {
   enumerable: true,
   get: function () { return signals.isWrappable; }
 });
-Object.defineProperty(exports, "latest", {
-  enumerable: true,
-  get: function () { return signals.latest; }
-});
 Object.defineProperty(exports, "mapArray", {
   enumerable: true,
   get: function () { return signals.mapArray; }
@@ -378,6 +443,14 @@ Object.defineProperty(exports, "onCleanup", {
   enumerable: true,
   get: function () { return signals.onCleanup; }
 });
+Object.defineProperty(exports, "onSettled", {
+  enumerable: true,
+  get: function () { return signals.onSettled; }
+});
+Object.defineProperty(exports, "pending", {
+  enumerable: true,
+  get: function () { return signals.pending; }
+});
 Object.defineProperty(exports, "reconcile", {
   enumerable: true,
   get: function () { return signals.reconcile; }
@@ -394,24 +467,26 @@ Object.defineProperty(exports, "runWithOwner", {
   enumerable: true,
   get: function () { return signals.runWithOwner; }
 });
-Object.defineProperty(exports, "untrack", {
+Object.defineProperty(exports, "snapshot", {
   enumerable: true,
-  get: function () { return signals.untrack; }
+  get: function () { return signals.snapshot; }
 });
-Object.defineProperty(exports, "unwrap", {
+Object.defineProperty(exports, "untrack", {
   enumerable: true,
-  get: function () { return signals.unwrap; }
+  get: function () { return signals.untrack; }
 });
 exports.$DEVCOMP = $DEVCOMP;
+exports.Boundary = Boundary;
 exports.DEV = DEV;
-exports.ErrorBoundary = ErrorBoundary;
+exports.Errored = Errored;
 exports.For = For;
+exports.Loading = Loading;
 exports.Match = Match;
 exports.Repeat = Repeat;
 exports.Show = Show;
-exports.Suspense = Suspense;
 exports.Switch = Switch;
 exports.children = children;
+exports.createAsync = createAsync;
 exports.createComponent = createComponent;
 exports.createContext = createContext;
 exports.createUniqueId = createUniqueId;
@@ -420,5 +495,9 @@ exports.from = from;
 exports.lazy = lazy;
 exports.observable = observable;
 exports.onMount = onMount;
+exports.reducer = reducer;
 exports.sharedConfig = sharedConfig;
+exports.ssrHandleError = ssrHandleError;
+exports.ssrRunInScope = ssrRunInScope;
+exports.tryCatch = tryCatch;
 exports.useContext = useContext;