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

package/dist/server.js

@@ -17,7 +17,7 @@ function handleError(err, owner = Owner) {
   try {
     for (const f of fns) f(error);
   } catch (e) {
-    handleError(e, owner && owner.owner || null);
+    handleError(e, (owner && owner.owner) || null);
   }
 }
 const UNOWNED = {
@@ -35,19 +35,23 @@ function createOwner() {
     cleanups: null
   };
   if (Owner) {
-    if (!Owner.owned) Owner.owned = [o];else Owner.owned.push(o);
+    if (!Owner.owned) Owner.owned = [o];
+    else Owner.owned.push(o);
   }
   return o;
 }
 function createRoot(fn, detachedOwner) {
   const owner = Owner,
     current = detachedOwner === undefined ? owner : detachedOwner,
-    root = fn.length === 0 ? UNOWNED : {
-      context: current ? current.context : null,
-      owner: current,
-      owned: null,
-      cleanups: null
-    };
+    root =
+      fn.length === 0
+        ? UNOWNED
+        : {
+            context: current ? current.context : null,
+            owner: current,
+            owned: null,
+            cleanups: null
+          };
   Owner = root;
   let result;
   try {
@@ -60,9 +64,12 @@ function createRoot(fn, detachedOwner) {
   return result;
 }
 function createSignal(value, options) {
-  return [() => value, v => {
-    return value = typeof v === "function" ? v(value) : v;
-  }];
+  return [
+    () => value,
+    v => {
+      return (value = typeof v === "function" ? v(value) : v);
+    }
+  ];
 }
 function createComputed(fn, value) {
   Owner = createOwner();
@@ -119,7 +126,8 @@ function on(deps, fn, options = {}) {
 function onMount(fn) {}
 function onCleanup(fn) {
   if (Owner) {
-    if (!Owner.cleanups) Owner.cleanups = [fn];else Owner.cleanups.push(fn);
+    if (!Owner.cleanups) Owner.cleanups = [fn];
+    else Owner.cleanups.push(fn);
   }
   return fn;
 }
@@ -160,7 +168,9 @@ function createContext(defaultValue) {
   };
 }
 function useContext(context) {
-  return Owner && Owner.context && Owner.context[context.id] !== undefined ? Owner.context[context.id] : context.defaultValue;
+  return Owner && Owner.context && Owner.context[context.id] !== undefined
+    ? Owner.context[context.id]
+    : context.defaultValue;
 }
 function getOwner() {
   return Owner;
@@ -237,7 +247,8 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = typeof observer === "function" ? observer : observer.next && observer.next.bind(observer);
+      const handler =
+        typeof observer === "function" ? observer : observer.next && observer.next.bind(observer);
       if (!handler) {
         return {
           unsubscribe() {}
@@ -266,7 +277,7 @@ function from(producer) {
   const [s, set] = createSignal(undefined);
   if ("subscribe" in producer) {
     const unsub = producer.subscribe(v => set(() => v));
-    onCleanup(() => "unsubscribe" in unsub ? unsub.unsubscribe() : unsub());
+    onCleanup(() => ("unsubscribe" in unsub ? unsub.unsubscribe() : unsub()));
   } else {
     const clean = producer(set);
     onCleanup(clean);
@@ -337,12 +348,13 @@ function escape(s, attr) {
       left = iDelim + 1;
       iDelim = s.indexOf(delim, left);
     } while (iDelim >= 0);
-  } else while (iAmp >= 0) {
-    if (left < iAmp) out += s.substring(left, iAmp);
-    out += "&amp;";
-    left = iAmp + 1;
-    iAmp = s.indexOf("&", left);
-  }
+  } else
+    while (iAmp >= 0) {
+      if (left < iAmp) out += s.substring(left, iAmp);
+      out += "&amp;";
+      left = iAmp + 1;
+      iAmp = s.indexOf("&", left);
+    }
   return left < s.length ? out + s.substring(left) : out;
 }
 function resolveSSRNode(node) {
@@ -354,7 +366,7 @@ function resolveSSRNode(node) {
     let mapped = "";
     for (let i = 0, len = node.length; i < len; i++) {
       if (typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!$-->`;
-      mapped += resolveSSRNode(prev = node[i]);
+      mapped += resolveSSRNode((prev = node[i]));
     }
     return mapped;
   }
@@ -369,7 +381,8 @@ const sharedConfig = {
     return getContextId(this.context.count);
   },
   getNextContextId() {
-    if (!this.context) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    if (!this.context)
+      throw new Error(`getNextContextId cannot be used under non-hydrating context`);
     return getContextId(this.context.count++);
   }
 };
@@ -382,11 +395,13 @@ function setHydrateContext(context) {
   sharedConfig.context = context;
 }
 function nextHydrateContext() {
-  return sharedConfig.context ? {
-    ...sharedConfig.context,
-    id: sharedConfig.getNextContextId(),
-    count: 0
-  } : undefined;
+  return sharedConfig.context
+    ? {
+        ...sharedConfig.context,
+        id: sharedConfig.getNextContextId(),
+        count: 0
+      }
+    : undefined;
 }
 function createUniqueId() {
   return sharedConfig.getNextContextId();
@@ -461,7 +476,11 @@ function Index(props) {
 }
 function Show(props) {
   let c;
-  return props.when ? typeof (c = props.children) === "function" ? c(props.keyed ? props.when : () => props.when) : c : props.fallback || "";
+  return props.when
+    ? typeof (c = props.children) === "function"
+      ? c(props.keyed ? props.when : () => props.when)
+      : c
+    : props.fallback || "";
 }
 function Switch(props) {
   let conditions = props.children;
@@ -498,11 +517,14 @@ function ErrorBoundary(props) {
   }
   createMemo(() => {
     clean = Owner;
-    return catchError(() => res = props.children, err => {
-      error = err;
-      !sync && ctx.replace("e" + id, displayFallback);
-      sync = true;
-    });
+    return catchError(
+      () => (res = props.children),
+      err => {
+        error = err;
+        !sync && ctx.replace("e" + id, displayFallback);
+        sync = true;
+      }
+    );
   });
   if (error) return displayFallback();
   sync = false;
@@ -527,13 +549,17 @@ function createResource(source, fetcher, options = {}) {
   if (sharedConfig.context.async && options.ssrLoadFrom !== "initial") {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
-      if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error) resource.ref[1].refetch();
+      if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error)
+        resource.ref[1].refetch();
       return resource.ref;
     }
   }
   const read = () => {
     if (error) throw error;
-    const resolved = options.ssrLoadFrom !== "initial" && sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
+    const resolved =
+      options.ssrLoadFrom !== "initial" &&
+      sharedConfig.context.async &&
+      "data" in sharedConfig.context.resources[id];
     if (!resolved && resourceContext) resourceContext.push(id);
     if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
@@ -554,7 +580,7 @@ function createResource(source, fetcher, options = {}) {
   });
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = !!(typeof source === "function" ? source() : source);
+    if (!ctx.async) return (read.loading = !!(typeof source === "function" ? source() : source));
     if (ctx.resources && id in ctx.resources && "data" in ctx.resources[id]) {
       value = ctx.resources[id].data;
       return;
@@ -576,21 +602,23 @@ function createResource(source, fetcher, options = {}) {
     if (p != undefined && typeof p === "object" && "then" in p) {
       read.loading = true;
       read.state = "pending";
-      p = p.then(res => {
-        read.loading = false;
-        read.state = "ready";
-        ctx.resources[id].data = res;
-        p = null;
-        notifySuspense(contexts);
-        return res;
-      }).catch(err => {
-        read.loading = false;
-        read.state = "errored";
-        read.error = error = castError(err);
-        p = null;
-        notifySuspense(contexts);
-        throw error;
-      });
+      p = p
+        .then(res => {
+          read.loading = false;
+          read.state = "ready";
+          ctx.resources[id].data = res;
+          p = null;
+          notifySuspense(contexts);
+          return res;
+        })
+        .catch(err => {
+          read.loading = false;
+          read.state = "errored";
+          read.error = error = castError(err);
+          p = null;
+          notifySuspense(contexts);
+          throw error;
+        });
       if (ctx.serialize) ctx.serialize(id, p, options.deferStream);
       return p;
     }
@@ -600,17 +628,20 @@ function createResource(source, fetcher, options = {}) {
     return ctx.resources[id].data;
   }
   if (options.ssrLoadFrom !== "initial") load();
-  return resource.ref = [read, {
-    refetch: load,
-    mutate: v => value = v
-  }];
+  return (resource.ref = [
+    read,
+    {
+      refetch: load,
+      mutate: v => (value = v)
+    }
+  ]);
 }
 function lazy(fn) {
   let p;
   let load = id => {
     if (!p) {
       p = fn();
-      p.then(mod => p.resolved = mod.default);
+      p.then(mod => (p.resolved = mod.default));
       if (id) sharedConfig.context.lazy[id] = p;
     }
     return p;
@@ -619,7 +650,8 @@ function lazy(fn) {
   const wrap = props => {
     const id = sharedConfig.context.id;
     let ref = sharedConfig.context.lazy[id];
-    if (ref) p = ref;else load(id);
+    if (ref) p = ref;
+    else load(id);
     if (p.resolved) return p.resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {
@@ -631,10 +663,12 @@ function lazy(fn) {
       contexts.add(ctx);
     }
     if (sharedConfig.context.async) {
-      sharedConfig.context.block(p.then(() => {
-        track.loading = false;
-        notifySuspense(contexts);
-      }));
+      sharedConfig.context.block(
+        p.then(() => {
+          track.loading = false;
+          notifySuspense(contexts);
+        })
+      );
     }
     return "";
   };
@@ -662,9 +696,12 @@ function startTransition(fn) {
   fn();
 }
 function useTransition() {
-  return [() => false, fn => {
-    fn();
-  }];
+  return [
+    () => false,
+    fn => {
+      fn();
+    }
+  ];
 }
 function SuspenseList(props) {
   return props.children;
@@ -674,15 +711,17 @@ function Suspense(props) {
   const ctx = sharedConfig.context;
   const id = sharedConfig.getContextId();
   const o = createOwner();
-  const value = ctx.suspense[id] || (ctx.suspense[id] = {
-    resources: new Map(),
-    completed: () => {
-      const res = runSuspense();
-      if (suspenseComplete(value)) {
-        done(resolveSSRNode(escape(res)));
+  const value =
+    ctx.suspense[id] ||
+    (ctx.suspense[id] = {
+      resources: new Map(),
+      completed: () => {
+        const res = runSuspense();
+        if (suspenseComplete(value)) {
+          done(resolveSSRNode(escape(res)));
+        }
       }
-    }
-  });
+    });
   function suspenseError(err) {
     if (!done || !done(undefined, err)) {
       runWithOwner(o.owner, () => {
@@ -696,12 +735,14 @@ function Suspense(props) {
       count: 0
     });
     cleanNode(o);
-    return runWithOwner(o, () => createComponent(SuspenseContext.Provider, {
-      value,
-      get children() {
-        return catchError(() => props.children, suspenseError);
-      }
-    }));
+    return runWithOwner(o, () =>
+      createComponent(SuspenseContext.Provider, {
+        value,
+        get children() {
+          return catchError(() => props.children, suspenseError);
+        }
+      })
+    );
   }
   const res = runSuspense();
   if (suspenseComplete(value)) {
@@ -718,7 +759,9 @@ function Suspense(props) {
         noHydrate: true
       });
       const res = {
-        t: `<template id="pl-${id}"></template>${resolveSSRNode(escape(props.fallback))}<!--pl-${id}-->`
+        t: `<template id="pl-${id}"></template>${resolveSSRNode(
+          escape(props.fallback)
+        )}<!--pl-${id}-->`
       };
       setHydrateContext(ctx);
       return res;
@@ -767,4 +810,61 @@ function reconcile(value) {
   };
 }
 
-export { $DEVCOMP, $PROXY, $TRACK, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, catchError, children, createComponent, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createStore, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, isWrappable, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, reconcile, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, unwrap, useContext, useTransition };
+export {
+  $DEVCOMP,
+  $PROXY,
+  $TRACK,
+  DEV,
+  ErrorBoundary,
+  For,
+  Index,
+  Match,
+  Show,
+  Suspense,
+  SuspenseList,
+  Switch,
+  batch,
+  catchError,
+  children,
+  createComponent,
+  createContext,
+  createDeferred,
+  createEffect,
+  createMemo,
+  createReaction,
+  createRenderEffect,
+  createResource,
+  createRoot,
+  createSelector,
+  createSignal,
+  createStore,
+  createUniqueId,
+  enableExternalSource,
+  enableHydration,
+  enableScheduling,
+  equalFn,
+  from,
+  getListener,
+  getOwner,
+  indexArray,
+  isWrappable,
+  lazy,
+  mapArray,
+  mergeProps,
+  observable,
+  on,
+  onCleanup,
+  onError,
+  onMount,
+  reconcile,
+  requestCallback,
+  resetErrorBoundaries,
+  runWithOwner,
+  sharedConfig,
+  splitProps,
+  startTransition,
+  untrack,
+  unwrap,
+  useContext,
+  useTransition
+};

package/dist/solid.cjs

@@ -61,8 +61,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) {
@@ -175,8 +175,9 @@ function Repeat(props) {
 }
 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, undefined);
+  const condition = keyed ? conditionValue : signals.createMemo(conditionValue, undefined, {
+    equals: (a, b) => !a === !b
   });
   return signals.createMemo(() => {
     const c = condition();
@@ -185,39 +186,40 @@ 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;
   }, undefined, undefined);
 }
 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
-    });
+  const chs = children(() => props.children);
+  const switchFunc = signals.createMemo(() => {
+    const ch = chs();
+    const mps = Array.isArray(ch) ? ch : [ch];
+    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, undefined);
+      const condition = mp.keyed ? conditionValue : signals.createMemo(conditionValue, undefined, {
+        equals: (a, b) => !a === !b
+      });
+      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, undefined);
 }
 function Match(props) {
@@ -267,10 +269,6 @@ Object.defineProperty(exports, "createProjection", {
   enumerable: true,
   get: function () { return signals.createProjection; }
 });
-Object.defineProperty(exports, "createReaction", {
-  enumerable: true,
-  get: function () { return signals.createReaction; }
-});
 Object.defineProperty(exports, "createRenderEffect", {
   enumerable: true,
   get: function () { return signals.createRenderEffect; }
@@ -307,9 +305,9 @@ 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,
@@ -347,6 +345,10 @@ Object.defineProperty(exports, "resolve", {
   enumerable: true,
   get: function () { return signals.resolve; }
 });
+Object.defineProperty(exports, "runWithObserver", {
+  enumerable: true,
+  get: function () { return signals.runWithObserver; }
+});
 Object.defineProperty(exports, "runWithOwner", {
   enumerable: true,
   get: function () { return signals.runWithOwner; }