solid-js 1.7.9 → 1.7.11

package/dist/solid.js

@@ -52,11 +52,9 @@ function enqueue(taskQueue, task) {
     let m = 0;
     let n = taskQueue.length - 1;
     while (m <= n) {
-      const k = (n + m) >> 1;
+      const k = n + m >> 1;
       const cmp = task.expirationTime - taskQueue[k].expirationTime;
-      if (cmp > 0) m = k + 1;
-      else if (cmp < 0) n = k - 1;
-      else return k;
+      if (cmp > 0) m = k + 1;else if (cmp < 0) n = k - 1;else return k;
     }
     return m;
   }
@@ -157,19 +155,18 @@ let Listener = null;
 let Updates = null;
 let Effects = null;
 let ExecCount = 0;
-const [transPending, setTransPending] = /*@__PURE__*/ createSignal(false);
+const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
     owner = Owner,
     unowned = fn.length === 0,
-    root = unowned
-      ? UNOWNED
-      : {
-          owned: null,
-          cleanups: null,
-          context: null,
-          owner: detachedOwner === undefined ? owner : detachedOwner
-        },
+    current = detachedOwner === undefined ? owner : detachedOwner,
+    root = unowned ? UNOWNED : {
+      owned: null,
+      cleanups: null,
+      context: current ? current.context : null,
+      owner: current
+    },
     updateFn = unowned ? fn : () => fn(() => untrack(() => cleanNode(root)));
   Owner = root;
   Listener = null;
@@ -190,8 +187,7 @@ function createSignal(value, options) {
   };
   const setter = value => {
     if (typeof value === "function") {
-      if (Transition && Transition.running && Transition.sources.has(s)) value = value(s.tValue);
-      else value = value(s.value);
+      if (Transition && Transition.running && Transition.sources.has(s)) value = value(s.tValue);else value = value(s.value);
     }
     return writeSignal(s, value);
   };
@@ -199,34 +195,27 @@ function createSignal(value, options) {
 }
 function createComputed(fn, value, options) {
   const c = createComputation(fn, value, true, STALE);
-  if (Scheduler && Transition && Transition.running) Updates.push(c);
-  else updateComputation(c);
+  if (Scheduler && Transition && Transition.running) Updates.push(c);else updateComputation(c);
 }
 function createRenderEffect(fn, value, options) {
   const c = createComputation(fn, value, false, STALE);
-  if (Scheduler && Transition && Transition.running) Updates.push(c);
-  else updateComputation(c);
+  if (Scheduler && Transition && Transition.running) Updates.push(c);else updateComputation(c);
 }
 function createEffect(fn, value, options) {
   runEffects = runUserEffects;
   const c = createComputation(fn, value, false, STALE),
-    s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+    s = SuspenseContext && useContext(SuspenseContext);
   if (s) c.suspense = s;
   if (!options || !options.render) c.user = true;
   Effects ? Effects.push(c) : updateComputation(c);
 }
 function createReaction(onInvalidate, options) {
   let fn;
-  const c = createComputation(
-      () => {
-        fn ? fn() : untrack(onInvalidate);
-        fn = undefined;
-      },
-      undefined,
-      false,
-      0
-    ),
-    s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+  const c = createComputation(() => {
+      fn ? fn() : untrack(onInvalidate);
+      fn = undefined;
+    }, undefined, false, 0),
+    s = SuspenseContext && useContext(SuspenseContext);
   if (s) c.suspense = s;
   c.user = true;
   return tracking => {
@@ -250,7 +239,7 @@ function createResource(pSource, pFetcher, pOptions) {
   let source;
   let fetcher;
   let options;
-  if ((arguments.length === 2 && typeof pFetcher === "object") || arguments.length === 1) {
+  if (arguments.length === 2 && typeof pFetcher === "object" || arguments.length === 1) {
     source = true;
     fetcher = pSource;
     options = pFetcher || {};
@@ -264,7 +253,7 @@ function createResource(pSource, pFetcher, pOptions) {
     id = null,
     loadedUnderTransition = false,
     scheduled = false,
-    resolved = "initialValue" in options,
+    resolved = ("initialValue" in options),
     dynamic = typeof source === "function" && createMemo(source);
   const contexts = new Set(),
     [value, setValue] = (options.storage || createSignal)(options.initialValue),
@@ -276,19 +265,15 @@ function createResource(pSource, pFetcher, pOptions) {
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
     let v;
-    if (options.ssrLoadFrom === "initial") initP = options.initialValue;
-    else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
+    if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
   function loadEnd(p, v, error, key) {
     if (pr === p) {
       pr = null;
       key !== undefined && (resolved = true);
-      if ((p === initP || v === initP) && options.onHydrated)
-        queueMicrotask(() =>
-          options.onHydrated(key, {
-            value: v
-          })
-        );
+      if ((p === initP || v === initP) && options.onHydrated) queueMicrotask(() => options.onHydrated(key, {
+        value: v
+      }));
       initP = NO_INIT;
       if (Transition && p && loadedUnderTransition) {
         Transition.promises.delete(p);
@@ -311,7 +296,7 @@ function createResource(pSource, pFetcher, pOptions) {
     }, false);
   }
   function read() {
-    const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
+    const c = SuspenseContext && useContext(SuspenseContext),
       v = value(),
       err = error();
     if (err !== undefined && !pr) throw err;
@@ -319,8 +304,7 @@ function createResource(pSource, pFetcher, pOptions) {
       createComputed(() => {
         track();
         if (pr) {
-          if (c.resolved && Transition && loadedUnderTransition) Transition.promises.add(pr);
-          else if (!contexts.has(c)) {
+          if (c.resolved && Transition && loadedUnderTransition) Transition.promises.add(pr);else if (!contexts.has(c)) {
             c.increment();
             contexts.add(c);
           }
@@ -339,30 +323,22 @@ function createResource(pSource, pFetcher, pOptions) {
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
-    const p =
-      initP !== NO_INIT
-        ? initP
-        : untrack(() =>
-            fetcher(lookup, {
-              value: value(),
-              refetching
-            })
-          );
+    const p = initP !== NO_INIT ? initP : untrack(() => fetcher(lookup, {
+      value: value(),
+      refetching
+    }));
     if (typeof p !== "object" || !(p && "then" in p)) {
       loadEnd(pr, p, undefined, lookup);
       return p;
     }
     pr = p;
     scheduled = true;
-    queueMicrotask(() => (scheduled = false));
+    queueMicrotask(() => scheduled = false);
     runUpdates(() => {
       setState(resolved ? "refreshing" : "pending");
       trigger();
     }, false);
-    return p.then(
-      v => loadEnd(p, v, undefined, lookup),
-      e => loadEnd(p, undefined, castError(e), lookup)
-    );
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e), lookup));
   }
   Object.defineProperties(read, {
     state: {
@@ -386,35 +362,21 @@ function createResource(pSource, pFetcher, pOptions) {
       }
     }
   });
-  if (dynamic) createComputed(() => load(false));
-  else load(false);
-  return [
-    read,
-    {
-      refetch: load,
-      mutate: setValue
-    }
-  ];
+  if (dynamic) createComputed(() => load(false));else load(false);
+  return [read, {
+    refetch: load,
+    mutate: setValue
+  }];
 }
 function createDeferred(source, options) {
   let t,
     timeout = options ? options.timeoutMs : undefined;
-  const node = createComputation(
-    () => {
-      if (!t || !t.fn)
-        t = requestCallback(
-          () => setDeferred(() => node.value),
-          timeout !== undefined
-            ? {
-                timeout
-              }
-            : undefined
-        );
-      return source();
-    },
-    undefined,
-    true
-  );
+  const node = createComputation(() => {
+    if (!t || !t.fn) t = requestCallback(() => setDeferred(() => node.value), timeout !== undefined ? {
+      timeout
+    } : undefined);
+    return source();
+  }, undefined, true);
   const [deferred, setDeferred] = createSignal(node.value, options);
   updateComputation(node);
   setDeferred(() => node.value);
@@ -422,39 +384,28 @@ function createDeferred(source, options) {
 }
 function createSelector(source, fn = equalFn, options) {
   const subs = new Map();
-  const node = createComputation(
-    p => {
-      const v = source();
-      for (const [key, val] of subs.entries())
-        if (fn(key, v) !== fn(key, p)) {
-          for (const c of val.values()) {
-            c.state = STALE;
-            if (c.pure) Updates.push(c);
-            else Effects.push(c);
-          }
-        }
-      return v;
-    },
-    undefined,
-    true,
-    STALE
-  );
+  const node = createComputation(p => {
+    const v = source();
+    for (const [key, val] of subs.entries()) if (fn(key, v) !== fn(key, p)) {
+      for (const c of val.values()) {
+        c.state = STALE;
+        if (c.pure) Updates.push(c);else Effects.push(c);
+      }
+    }
+    return v;
+  }, undefined, true, STALE);
   updateComputation(node);
   return key => {
     const listener = Listener;
     if (listener) {
       let l;
-      if ((l = subs.get(key))) l.add(listener);
-      else subs.set(key, (l = new Set([listener])));
+      if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
         l.delete(listener);
         !l.size && subs.delete(key);
       });
     }
-    return fn(
-      key,
-      Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value
-    );
+    return fn(key, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
   };
 }
 function batch(fn) {
@@ -493,15 +444,14 @@ function onMount(fn) {
   createEffect(() => untrack(fn));
 }
 function onCleanup(fn) {
-  if (Owner === null);
-  else if (Owner.cleanups === null) Owner.cleanups = [fn];
-  else Owner.cleanups.push(fn);
+  if (Owner === null) ;else if (Owner.cleanups === null) Owner.cleanups = [fn];else Owner.cleanups.push(fn);
   return fn;
 }
 function catchError(fn, handler) {
   ERROR || (ERROR = Symbol("error"));
   Owner = createComputation(undefined, undefined, true);
   Owner.context = {
+    ...Owner.context,
     [ERROR]: [handler]
   };
   if (Transition && Transition.running) Transition.sources.add(Owner);
@@ -513,16 +463,6 @@ function catchError(fn, handler) {
     Owner = Owner.owner;
   }
 }
-function onError(fn) {
-  ERROR || (ERROR = Symbol("error"));
-  if (Owner === null);
-  else if (Owner.context === null)
-    Owner.context = {
-      [ERROR]: [fn]
-    };
-  else if (!Owner.context[ERROR]) Owner.context[ERROR] = [fn];
-  else Owner.context[ERROR].push(fn);
-}
 function getListener() {
   return Listener;
 }
@@ -558,17 +498,15 @@ function startTransition(fn) {
     Owner = o;
     let t;
     if (Scheduler || SuspenseContext) {
-      t =
-        Transition ||
-        (Transition = {
-          sources: new Set(),
-          effects: [],
-          promises: new Set(),
-          disposed: new Set(),
-          queue: new Set(),
-          running: true
-        });
-      t.done || (t.done = new Promise(res => (t.resolve = res)));
+      t = Transition || (Transition = {
+        sources: new Set(),
+        effects: [],
+        promises: new Set(),
+        disposed: new Set(),
+        queue: new Set(),
+        running: true
+      });
+      t.done || (t.done = new Promise(res => t.resolve = res));
       t.running = true;
     }
     runUpdates(fn, false);
@@ -592,8 +530,7 @@ function createContext(defaultValue, options) {
   };
 }
 function useContext(context) {
-  let ctx;
-  return (ctx = lookup(Owner, context.id)) !== undefined ? ctx : context.defaultValue;
+  return Owner && Owner.context && Owner.context[context.id] !== undefined ? Owner.context[context.id] : context.defaultValue;
 }
 function children(fn) {
   const children = createMemo(fn);
@@ -606,7 +543,7 @@ function children(fn) {
 }
 let SuspenseContext;
 function getSuspenseContext() {
-  return SuspenseContext || (SuspenseContext = createContext({}));
+  return SuspenseContext || (SuspenseContext = createContext());
 }
 function enableExternalSource(factory) {
   if (ExternalSourceFactory) {
@@ -629,8 +566,7 @@ function enableExternalSource(factory) {
 function readSignal() {
   const runningTransition = Transition && Transition.running;
   if (this.sources && (runningTransition ? this.tState : this.state)) {
-    if ((runningTransition ? this.tState : this.state) === STALE) updateComputation(this);
-    else {
+    if ((runningTransition ? this.tState : this.state) === STALE) updateComputation(this);else {
       const updates = Updates;
       Updates = null;
       runUpdates(() => lookUpstream(this), false);
@@ -658,12 +594,11 @@ function readSignal() {
   return this.value;
 }
 function writeSignal(node, value, isComp) {
-  let current =
-    Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value;
+  let current = Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value;
   if (!node.comparator || !node.comparator(current, value)) {
     if (Transition) {
       const TransitionRunning = Transition.running;
-      if (TransitionRunning || (!isComp && Transition.sources.has(node))) {
+      if (TransitionRunning || !isComp && Transition.sources.has(node)) {
         Transition.sources.add(node);
         node.tValue = value;
       }
@@ -676,16 +611,14 @@ function writeSignal(node, value, isComp) {
           const TransitionRunning = Transition && Transition.running;
           if (TransitionRunning && Transition.disposed.has(o)) continue;
           if (TransitionRunning ? !o.tState : !o.state) {
-            if (o.pure) Updates.push(o);
-            else Effects.push(o);
+            if (o.pure) Updates.push(o);else Effects.push(o);
             if (o.observers) markDownstream(o);
           }
-          if (!TransitionRunning) o.state = STALE;
-          else o.tState = STALE;
+          if (!TransitionRunning) o.state = STALE;else o.tState = STALE;
         }
         if (Updates.length > 10e5) {
           Updates = [];
-          if (false);
+          if (false) ;
           throw new Error();
         }
       }, false);
@@ -700,11 +633,7 @@ function updateComputation(node) {
     listener = Listener,
     time = ExecCount;
   Listener = Owner = node;
-  runComputation(
-    node,
-    Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value,
-    time
-  );
+  runComputation(node, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value, time);
   if (Transition && !Transition.running && Transition.sources.has(node)) {
     queueMicrotask(() => {
       runUpdates(() => {
@@ -758,21 +687,18 @@ function createComputation(fn, init, pure, state = STALE, options) {
     cleanups: null,
     value: init,
     owner: Owner,
-    context: null,
+    context: Owner ? Owner.context : null,
     pure
   };
   if (Transition && Transition.running) {
     c.state = 0;
     c.tState = state;
   }
-  if (Owner === null);
-  else if (Owner !== UNOWNED) {
+  if (Owner === null) ;else if (Owner !== UNOWNED) {
     if (Transition && Transition.running && Owner.pure) {
-      if (!Owner.tOwned) Owner.tOwned = [c];
-      else Owner.tOwned.push(c);
+      if (!Owner.tOwned) Owner.tOwned = [c];else Owner.tOwned.push(c);
     } else {
-      if (!Owner.owned) Owner.owned = [c];
-      else Owner.owned.push(c);
+      if (!Owner.owned) Owner.owned = [c];else Owner.owned.push(c);
     }
   }
   if (ExternalSourceFactory) {
@@ -823,8 +749,7 @@ function runUpdates(fn, init) {
   if (Updates) return fn();
   let wait = false;
   if (!init) Updates = [];
-  if (Effects) wait = true;
-  else Effects = [];
+  if (Effects) wait = true;else Effects = [];
   ExecCount++;
   try {
     const res = fn();
@@ -838,8 +763,7 @@ function runUpdates(fn, init) {
 }
 function completeUpdates(wait) {
   if (Updates) {
-    if (Scheduler && Transition && Transition.running) scheduleQueue(Updates);
-    else runQueue(Updates);
+    if (Scheduler && Transition && Transition.running) scheduleQueue(Updates);else runQueue(Updates);
     Updates = null;
   }
   if (wait) return;
@@ -907,8 +831,7 @@ function runUserEffects(queue) {
     userLength = 0;
   for (i = 0; i < queue.length; i++) {
     const e = queue[i];
-    if (!e.user) runTop(e);
-    else queue[userLength++] = e;
+    if (!e.user) runTop(e);else queue[userLength++] = e;
   }
   if (sharedConfig.context) {
     if (sharedConfig.count) {
@@ -926,15 +849,13 @@ function runUserEffects(queue) {
 }
 function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;
-  if (runningTransition) node.tState = 0;
-  else node.state = 0;
+  if (runningTransition) node.tState = 0;else node.state = 0;
   for (let i = 0; i < node.sources.length; i += 1) {
     const source = node.sources[i];
     if (source.sources) {
       const state = runningTransition ? source.tState : source.state;
       if (state === STALE) {
-        if (source !== ignore && (!source.updatedAt || source.updatedAt < ExecCount))
-          runTop(source);
+        if (source !== ignore && (!source.updatedAt || source.updatedAt < ExecCount)) runTop(source);
       } else if (state === PENDING) lookUpstream(source, ignore);
     }
   }
@@ -944,10 +865,8 @@ function markDownstream(node) {
   for (let i = 0; i < node.observers.length; i += 1) {
     const o = node.observers[i];
     if (runningTransition ? !o.tState : !o.state) {
-      if (runningTransition) o.tState = PENDING;
-      else o.state = PENDING;
-      if (o.pure) Updates.push(o);
-      else Effects.push(o);
+      if (runningTransition) o.tState = PENDING;else o.state = PENDING;
+      if (o.pure) Updates.push(o);else Effects.push(o);
       o.observers && markDownstream(o);
     }
   }
@@ -984,9 +903,7 @@ function cleanNode(node) {
     for (i = node.cleanups.length - 1; i >= 0; i--) node.cleanups[i]();
     node.cleanups = null;
   }
-  if (Transition && Transition.running) node.tState = 0;
-  else node.state = 0;
-  node.context = null;
+  if (Transition && Transition.running) node.tState = 0;else node.state = 0;
 }
 function reset(node, top) {
   if (!top) {
@@ -1007,28 +924,19 @@ function runErrors(err, fns, owner) {
   try {
     for (const f of fns) f(err);
   } catch (e) {
-    handleError(e, (owner && owner.owner) || null);
+    handleError(e, owner && owner.owner || null);
   }
 }
 function handleError(err, owner = Owner) {
-  const fns = ERROR && lookup(owner, ERROR);
+  const fns = ERROR && owner && owner.context && owner.context[ERROR];
   const error = castError(err);
   if (!fns) throw error;
-  if (Effects)
-    Effects.push({
-      fn() {
-        runErrors(error, fns, owner);
-      },
-      state: STALE
-    });
-  else runErrors(error, fns, owner);
-}
-function lookup(owner, key) {
-  return owner
-    ? owner.context && owner.context[key] !== undefined
-      ? owner.context[key]
-      : lookup(owner.owner, key)
-    : undefined;
+  if (Effects) Effects.push({
+    fn() {
+      runErrors(error, fns, owner);
+    },
+    state: STALE
+  });else runErrors(error, fns, owner);
 }
 function resolveChildren(children) {
   if (typeof children === "function" && !children.length) return resolveChildren(children());
@@ -1045,19 +953,40 @@ function resolveChildren(children) {
 function createProvider(id, options) {
   return function provider(props) {
     let res;
-    createRenderEffect(
-      () =>
-        (res = untrack(() => {
-          Owner.context = {
-            [id]: props.value
-          };
-          return children(() => props.children);
-        })),
-      undefined
-    );
+    createRenderEffect(() => res = untrack(() => {
+      Owner.context = {
+        ...Owner.context,
+        [id]: props.value
+      };
+      return children(() => props.children);
+    }), undefined);
     return res;
   };
 }
+function onError(fn) {
+  ERROR || (ERROR = Symbol("error"));
+  if (Owner === null) ;else if (Owner.context === null || !Owner.context[ERROR]) {
+    Owner.context = {
+      ...Owner.context,
+      [ERROR]: [fn]
+    };
+    mutateContext(Owner, ERROR, [fn]);
+  } else Owner.context[ERROR].push(fn);
+}
+function mutateContext(o, key, value) {
+  if (o.owned) {
+    for (let i = 0; i < o.owned.length; i++) {
+      if (o.owned[i].context === o.context) mutateContext(o.owned[i], key, value);
+      if (!o.owned[i].context) {
+        o.owned[i].context = o.context;
+        mutateContext(o.owned[i], key, value);
+      } else if (!o.owned[i].context[key]) {
+        o.owned[i].context[key] = value;
+        mutateContext(o.owned[i], key, value);
+      }
+    }
+  }
+}
 
 function observable(input) {
   return {
@@ -1065,8 +994,7 @@ 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() {}
@@ -1097,7 +1025,7 @@ function from(producer) {
   });
   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);
@@ -1149,7 +1077,8 @@ function mapArray(list, mapFn, options = {}) {
           });
           len = 1;
         }
-      } else if (len === 0) {
+      }
+      else if (len === 0) {
         mapped = new Array(newLen);
         for (j = 0; j < newLen; j++) {
           items[j] = newItems[j];
@@ -1160,16 +1089,8 @@ function mapArray(list, mapFn, options = {}) {
         temp = new Array(newLen);
         tempdisposers = new Array(newLen);
         indexes && (tempIndexes = new Array(newLen));
-        for (
-          start = 0, end = Math.min(len, newLen);
-          start < end && items[start] === newItems[start];
-          start++
-        );
-        for (
-          end = len - 1, newEnd = newLen - 1;
-          end >= start && newEnd >= start && items[end] === newItems[newEnd];
-          end--, newEnd--
-        ) {
+        for (start = 0, end = Math.min(len, newLen); start < end && items[start] === newItems[start]; start++);
+        for (end = len - 1, newEnd = newLen - 1; end >= start && newEnd >= start && items[end] === newItems[newEnd]; end--, newEnd--) {
           temp[newEnd] = mapped[end];
           tempdisposers[newEnd] = disposers[end];
           indexes && (tempIndexes[newEnd] = indexes[end]);
@@ -1203,7 +1124,7 @@ function mapArray(list, mapFn, options = {}) {
             }
           } else mapped[j] = createRoot(mapper);
         }
-        mapped = mapped.slice(0, (len = newLen));
+        mapped = mapped.slice(0, len = newLen);
         items = newItems.slice(0);
       }
       return mapped;
@@ -1269,7 +1190,7 @@ function indexArray(list, mapFn, options = {}) {
       }
       len = signals.length = disposers.length = newItems.length;
       items = newItems.slice(0);
-      return (mapped = mapped.slice(0, len));
+      return mapped = mapped.slice(0, len);
     });
     function mapper(disposer) {
       disposers[i] = disposer;
@@ -1338,33 +1259,29 @@ function mergeProps(...sources) {
   let proxy = false;
   for (let i = 0; i < sources.length; i++) {
     const s = sources[i];
-    proxy = proxy || (!!s && $PROXY in s);
-    sources[i] = typeof s === "function" ? ((proxy = true), createMemo(s)) : s;
+    proxy = proxy || !!s && $PROXY in s;
+    sources[i] = typeof s === "function" ? (proxy = true, createMemo(s)) : s;
   }
   if (proxy) {
-    return new Proxy(
-      {
-        get(property) {
-          for (let i = sources.length - 1; i >= 0; i--) {
-            const v = resolveSource(sources[i])[property];
-            if (v !== undefined) return v;
-          }
-        },
-        has(property) {
-          for (let i = sources.length - 1; i >= 0; i--) {
-            if (property in resolveSource(sources[i])) return true;
-          }
-          return false;
-        },
-        keys() {
-          const keys = [];
-          for (let i = 0; i < sources.length; i++)
-            keys.push(...Object.keys(resolveSource(sources[i])));
-          return [...new Set(keys)];
+    return new Proxy({
+      get(property) {
+        for (let i = sources.length - 1; i >= 0; i--) {
+          const v = resolveSource(sources[i])[property];
+          if (v !== undefined) return v;
+        }
+      },
+      has(property) {
+        for (let i = sources.length - 1; i >= 0; i--) {
+          if (property in resolveSource(sources[i])) return true;
         }
+        return false;
       },
-      propTraps
-    );
+      keys() {
+        const keys = [];
+        for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(resolveSource(sources[i])));
+        return [...new Set(keys)];
+      }
+    }, propTraps);
   }
   const target = {};
   const sourcesMap = {};
@@ -1383,7 +1300,7 @@ function mergeProps(...sources) {
           Object.defineProperty(target, key, {
             enumerable: true,
             configurable: true,
-            get: resolveSources.bind((sourcesMap[key] = [desc.get.bind(source)]))
+            get: resolveSources.bind(sourcesMap[key] = [desc.get.bind(source)])
           });
         } else {
           if (desc.value !== undefined) defined.add(key);
@@ -1407,60 +1324,47 @@ function splitProps(props, ...keys) {
   if ($PROXY in props) {
     const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
     const res = keys.map(k => {
-      return new Proxy(
-        {
-          get(property) {
-            return k.includes(property) ? props[property] : undefined;
-          },
-          has(property) {
-            return k.includes(property) && property in props;
-          },
-          keys() {
-            return k.filter(property => property in props);
-          }
+      return new Proxy({
+        get(property) {
+          return k.includes(property) ? props[property] : undefined;
         },
-        propTraps
-      );
-    });
-    res.push(
-      new Proxy(
-        {
-          get(property) {
-            return blocked.has(property) ? undefined : props[property];
-          },
-          has(property) {
-            return blocked.has(property) ? false : property in props;
-          },
-          keys() {
-            return Object.keys(props).filter(k => !blocked.has(k));
-          }
+        has(property) {
+          return k.includes(property) && property in props;
         },
-        propTraps
-      )
-    );
+        keys() {
+          return k.filter(property => property in props);
+        }
+      }, propTraps);
+    });
+    res.push(new Proxy({
+      get(property) {
+        return blocked.has(property) ? undefined : props[property];
+      },
+      has(property) {
+        return blocked.has(property) ? false : property in props;
+      },
+      keys() {
+        return Object.keys(props).filter(k => !blocked.has(k));
+      }
+    }, propTraps));
     return res;
   }
   const otherObject = {};
   const objects = keys.map(() => ({}));
   for (const propName of Object.getOwnPropertyNames(props)) {
     const desc = Object.getOwnPropertyDescriptor(props, propName);
-    const isDefaultDesc =
-      !desc.get && !desc.set && desc.enumerable && desc.writable && desc.configurable;
+    const isDefaultDesc = !desc.get && !desc.set && desc.enumerable && desc.writable && desc.configurable;
     let blocked = false;
     let objectIndex = 0;
     for (const k of keys) {
       if (k.includes(propName)) {
         blocked = true;
-        isDefaultDesc
-          ? (objects[objectIndex][propName] = desc.value)
-          : Object.defineProperty(objects[objectIndex], propName, desc);
+        isDefaultDesc ? objects[objectIndex][propName] = desc.value : Object.defineProperty(objects[objectIndex], propName, desc);
       }
       ++objectIndex;
     }
     if (!blocked) {
-      isDefaultDesc
-        ? (otherObject[propName] = desc.value)
-        : Object.defineProperty(otherObject, propName, desc);
+      isDefaultDesc ? otherObject[propName] = desc.value : Object.defineProperty(otherObject, propName, desc);
     }
   }
   return [...objects, otherObject];
@@ -1486,21 +1390,17 @@ function lazy(fn) {
       comp = s;
     }
     let Comp;
-    return createMemo(
-      () =>
-        (Comp = comp()) &&
-        untrack(() => {
-          if (false);
-          if (!ctx) return Comp(props);
-          const c = sharedConfig.context;
-          setHydrateContext(ctx);
-          const r = Comp(props);
-          setHydrateContext(c);
-          return r;
-        })
-    );
+    return createMemo(() => (Comp = comp()) && untrack(() => {
+      if (false) ;
+      if (!ctx) return Comp(props);
+      const c = sharedConfig.context;
+      setHydrateContext(ctx);
+      const r = Comp(props);
+      setHydrateContext(c);
+      return r;
+    }));
   };
-  wrap.preload = () => p || ((p = fn()).then(mod => (comp = () => mod.default)), p);
+  wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
   return wrap;
 }
 let counter = 0;
@@ -1525,78 +1425,49 @@ function Index(props) {
 function Show(props) {
   const keyed = props.keyed;
   const condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => (keyed ? a === b : !a === !b)
+    equals: (a, b) => keyed ? a === b : !a === !b
   });
-  return createMemo(
-    () => {
-      const c = condition();
-      if (c) {
-        const child = props.children;
-        const fn = typeof child === "function" && child.length > 0;
-        return fn
-          ? untrack(() =>
-              child(
-                keyed
-                  ? c
-                  : () => {
-                      if (!untrack(condition)) throw narrowedError("Show");
-                      return props.when;
-                    }
-              )
-            )
-          : child;
-      }
-      return props.fallback;
-    },
-    undefined,
-    undefined
-  );
+  return createMemo(() => {
+    const c = condition();
+    if (c) {
+      const child = props.children;
+      const fn = typeof child === "function" && child.length > 0;
+      return fn ? untrack(() => child(keyed ? c : () => {
+        if (!untrack(condition)) throw narrowedError("Show");
+        return props.when;
+      })) : child;
+    }
+    return props.fallback;
+  }, undefined, undefined);
 }
 function Switch(props) {
   let keyed = false;
-  const equals = (a, b) =>
-    a[0] === b[0] && (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
+  const equals = (a, b) => a[0] === b[0] && (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
-    evalConditions = 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]];
-          }
+    evalConditions = 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
       }
-    );
-  return 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
-        ? untrack(() =>
-            c(
-              keyed
-                ? when
-                : () => {
-                    if (untrack(evalConditions)[0] !== index) throw narrowedError("Match");
-                    return cond.when;
-                  }
-            )
-          )
-        : c;
-    },
-    undefined,
-    undefined
-  );
+      return [-1];
+    }, undefined, {
+      equals
+    });
+  return 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 ? untrack(() => c(keyed ? when : () => {
+      if (untrack(evalConditions)[0] !== index) throw narrowedError("Match");
+      return cond.when;
+    })) : c;
+  }, undefined, undefined);
 }
 function Match(props) {
   return props;
@@ -1608,32 +1479,22 @@ function resetErrorBoundaries() {
 function ErrorBoundary(props) {
   let err;
   let v;
-  if (
-    sharedConfig.context &&
-    sharedConfig.load &&
-    (v = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count))
-  )
-    err = v[0];
+  if (sharedConfig.context && sharedConfig.load && (v = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count))) err = v[0];
   const [errored, setErrored] = createSignal(err, undefined);
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
-  return createMemo(
-    () => {
-      let e;
-      if ((e = errored())) {
-        const f = props.fallback;
-        return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored())) : f;
-      }
-      return catchError(() => props.children, setErrored);
-    },
-    undefined,
-    undefined
-  );
+  return createMemo(() => {
+    let e;
+    if (e = errored()) {
+      const f = props.fallback;
+      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored())) : f;
+    }
+    return catchError(() => props.children, setErrored);
+  }, undefined, undefined);
 }
 
-const suspenseListEquals = (a, b) =>
-  a.showContent === b.showContent && a.showFallback === b.showFallback;
+const suspenseListEquals = (a, b) => a.showContent === b.showContent && a.showFallback === b.showFallback;
 const SuspenseListContext = createContext();
 function SuspenseList(props) {
   let [wrapper, setWrapper] = createSignal(() => ({
@@ -1645,51 +1506,51 @@ function SuspenseList(props) {
   if (listContext) {
     show = listContext.register(createMemo(() => wrapper()().inFallback));
   }
-  const resolved = createMemo(
-    prev => {
-      const reveal = props.revealOrder,
-        tail = props.tail,
-        { showContent = true, showFallback = true } = show ? show() : {},
-        reg = registry(),
-        reverse = reveal === "backwards";
-      if (reveal === "together") {
-        const all = reg.every(inFallback => !inFallback());
-        const res = reg.map(() => ({
-          showContent: all && showContent,
+  const resolved = createMemo(prev => {
+    const reveal = props.revealOrder,
+      tail = props.tail,
+      {
+        showContent = true,
+        showFallback = true
+      } = show ? show() : {},
+      reg = registry(),
+      reverse = reveal === "backwards";
+    if (reveal === "together") {
+      const all = reg.every(inFallback => !inFallback());
+      const res = reg.map(() => ({
+        showContent: all && showContent,
+        showFallback
+      }));
+      res.inFallback = !all;
+      return res;
+    }
+    let stop = false;
+    let inFallback = prev.inFallback;
+    const res = [];
+    for (let i = 0, len = reg.length; i < len; i++) {
+      const n = reverse ? len - i - 1 : i,
+        s = reg[n]();
+      if (!stop && !s) {
+        res[n] = {
+          showContent,
           showFallback
-        }));
-        res.inFallback = !all;
-        return res;
-      }
-      let stop = false;
-      let inFallback = prev.inFallback;
-      const res = [];
-      for (let i = 0, len = reg.length; i < len; i++) {
-        const n = reverse ? len - i - 1 : i,
-          s = reg[n]();
-        if (!stop && !s) {
-          res[n] = {
-            showContent,
-            showFallback
-          };
-        } else {
-          const next = !stop;
-          if (next) inFallback = true;
-          res[n] = {
-            showContent: next,
-            showFallback: !tail || (next && tail === "collapsed") ? showFallback : false
-          };
-          stop = true;
-        }
+        };
+      } else {
+        const next = !stop;
+        if (next) inFallback = true;
+        res[n] = {
+          showContent: next,
+          showFallback: !tail || next && tail === "collapsed" ? showFallback : false
+        };
+        stop = true;
       }
-      if (!stop) inFallback = false;
-      res.inFallback = inFallback;
-      return res;
-    },
-    {
-      inFallback: false
     }
-  );
+    if (!stop) inFallback = false;
+    res.inFallback = inFallback;
+    return res;
+  }, {
+    inFallback: false
+  });
   setWrapper(() => resolved);
   return createComponent(SuspenseListContext.Provider, {
     value: {
@@ -1763,14 +1624,17 @@ function Suspense(props) {
         ctx = sharedConfig.context;
         if (flicker) {
           flicker();
-          return (flicker = undefined);
+          return flicker = undefined;
         }
         if (ctx && p === "$$f") setHydrateContext();
         const rendered = createMemo(() => props.children);
         return createMemo(prev => {
           const inFallback = store.inFallback(),
-            { showContent = true, showFallback = true } = show ? show() : {};
-          if ((!inFallback || (p && p !== "$$f")) && showContent) {
+            {
+              showContent = true,
+              showFallback = true
+            } = show ? show() : {};
+          if ((!inFallback || p && p !== "$$f") && showContent) {
             store.resolved = true;
             dispose && dispose();
             dispose = ctx = p = undefined;
@@ -1798,59 +1662,4 @@ function Suspense(props) {
 
 const DEV = undefined;
 
-export {
-  $DEVCOMP,
-  $PROXY,
-  $TRACK,
-  DEV,
-  ErrorBoundary,
-  For,
-  Index,
-  Match,
-  Show,
-  Suspense,
-  SuspenseList,
-  Switch,
-  batch,
-  cancelCallback,
-  catchError,
-  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,
-  requestCallback,
-  resetErrorBoundaries,
-  runWithOwner,
-  sharedConfig,
-  splitProps,
-  startTransition,
-  untrack,
-  useContext,
-  useTransition
-};
+export { $DEVCOMP, $PROXY, $TRACK, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, catchError, 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, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };