solid-js 1.8.8 → 1.8.9

package/dist/solid.js

@@ -52,9 +52,11 @@ 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;
   }
@@ -160,12 +162,14 @@ function createRoot(fn, detachedOwner) {
     owner = Owner,
     unowned = fn.length === 0,
     current = detachedOwner === undefined ? owner : detachedOwner,
-    root = unowned ? UNOWNED : {
-      owned: null,
-      cleanups: null,
-      context: current ? current.context : null,
-      owner: current
-    },
+    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;
@@ -186,7 +190,8 @@ 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);
   };
@@ -194,11 +199,13 @@ 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;
@@ -210,10 +217,15 @@ function createEffect(fn, value, options) {
 }
 function createReaction(onInvalidate, options) {
   let fn;
-  const c = createComputation(() => {
-      fn ? fn() : untrack(onInvalidate);
-      fn = undefined;
-    }, undefined, false, 0),
+  const c = createComputation(
+      () => {
+        fn ? fn() : untrack(onInvalidate);
+        fn = undefined;
+      },
+      undefined,
+      false,
+      0
+    ),
     s = SuspenseContext && useContext(SuspenseContext);
   if (s) c.suspense = s;
   c.user = true;
@@ -241,7 +253,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 || {};
@@ -255,7 +267,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),
@@ -267,15 +279,19 @@ 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;
+    if (options.ssrLoadFrom === "initial") initP = options.initialValue;
+    else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v;
   }
   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);
@@ -306,7 +322,8 @@ 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);
           }
@@ -325,26 +342,35 @@ 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 (!isPromise(p)) {
       loadEnd(pr, p, undefined, lookup);
       return p;
     }
     pr = p;
     if ("value" in p) {
-      if (p.status === "success") loadEnd(pr, p.value, undefined, lookup);else loadEnd(pr, undefined, undefined, lookup);
+      if (p.status === "success") loadEnd(pr, p.value, undefined, lookup);
+      else loadEnd(pr, undefined, undefined, lookup);
       return 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: {
@@ -368,50 +394,80 @@ 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 [deferred, setDeferred] = createSignal(Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value, options);
+  const node = createComputation(
+    () => {
+      if (!t || !t.fn)
+        t = requestCallback(
+          () => setDeferred(() => node.value),
+          timeout !== undefined
+            ? {
+                timeout
+              }
+            : undefined
+        );
+      return source();
+    },
+    undefined,
+    true
+  );
+  const [deferred, setDeferred] = createSignal(
+    Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value,
+    options
+  );
   updateComputation(node);
-  setDeferred(() => Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
+  setDeferred(() =>
+    Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value
+  );
   return deferred;
 }
 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) {
@@ -451,7 +507,9 @@ 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) {
@@ -505,15 +563,17 @@ 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);
@@ -521,7 +581,7 @@ function startTransition(fn) {
     return t ? t.done : undefined;
   });
 }
-const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
+const [transPending, setTransPending] = /*@__PURE__*/ createSignal(false);
 function useTransition() {
   return [transPending, startTransition];
 }
@@ -538,7 +598,9 @@ function createContext(defaultValue, options) {
   };
 }
 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 children(fn) {
   const children = createMemo(fn);
@@ -555,10 +617,7 @@ function getSuspenseContext() {
 }
 function enableExternalSource(factory, untrack = fn => fn()) {
   if (ExternalSourceConfig) {
-    const {
-      factory: oldFactory,
-      untrack: oldUntrack
-    } = ExternalSourceConfig;
+    const { factory: oldFactory, untrack: oldUntrack } = ExternalSourceConfig;
     ExternalSourceConfig = {
       factory: (fn, trigger) => {
         const oldSource = oldFactory(fn, trigger);
@@ -583,7 +642,8 @@ function enableExternalSource(factory, untrack = fn => fn()) {
 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);
@@ -611,11 +671,12 @@ 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;
       }
@@ -628,14 +689,16 @@ 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);
@@ -647,7 +710,11 @@ function updateComputation(node) {
   if (!node.fn) return;
   cleanNode(node);
   const time = ExecCount;
-  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(() => {
@@ -712,11 +779,14 @@ function createComputation(fn, init, pure, state = STALE, options) {
     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 (ExternalSourceConfig && c.fn) {
@@ -767,7 +837,8 @@ 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();
@@ -781,7 +852,8 @@ 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;
@@ -849,7 +921,8 @@ 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) {
@@ -867,13 +940,15 @@ 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);
     }
   }
@@ -883,8 +958,10 @@ 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);
     }
   }
@@ -921,7 +998,8 @@ 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;
+  if (Transition && Transition.running) node.tState = 0;
+  else node.state = 0;
 }
 function reset(node, top) {
   if (!top) {
@@ -942,19 +1020,21 @@ 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 && 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);
+  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());
@@ -971,19 +1051,24 @@ function resolveChildren(children) {
 function createProvider(id, options) {
   return function provider(props) {
     let res;
-    createRenderEffect(() => res = untrack(() => {
-      Owner.context = {
-        ...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]) {
+  if (Owner === null);
+  else if (Owner.context === null || !Owner.context[ERROR]) {
     Owner.context = {
       ...Owner.context,
       [ERROR]: [fn]
@@ -1012,7 +1097,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() {}
@@ -1043,7 +1129,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);
@@ -1095,8 +1181,7 @@ 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];
@@ -1107,8 +1192,16 @@ 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]);
@@ -1142,7 +1235,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;
@@ -1208,7 +1301,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;
@@ -1277,112 +1370,131 @@ 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 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 false;
       },
-      keys() {
-        const keys = [];
-        for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(resolveSource(sources[i])));
-        return [...new Set(keys)];
-      }
-    }, propTraps);
+      propTraps
+    );
   }
-  const target = {};
   const sourcesMap = {};
-  const defined = new Set();
+  const defined = Object.create(null);
   for (let i = sources.length - 1; i >= 0; i--) {
     const source = sources[i];
     if (!source) continue;
     const sourceKeys = Object.getOwnPropertyNames(source);
-    for (let i = 0, length = sourceKeys.length; i < length; i++) {
+    for (let i = sourceKeys.length - 1; i >= 0; i--) {
       const key = sourceKeys[i];
       if (key === "__proto__" || key === "constructor") continue;
       const desc = Object.getOwnPropertyDescriptor(source, key);
-      if (!defined.has(key)) {
-        if (desc.get) {
-          defined.add(key);
-          Object.defineProperty(target, key, {
-            enumerable: true,
-            configurable: true,
-            get: resolveSources.bind(sourcesMap[key] = [desc.get.bind(source)])
-          });
-        } else {
-          if (desc.value !== undefined) defined.add(key);
-          target[key] = desc.value;
-        }
+      if (!defined[key]) {
+        defined[key] = desc.get
+          ? {
+              enumerable: true,
+              configurable: true,
+              get: resolveSources.bind((sourcesMap[key] = [desc.get.bind(source)]))
+            }
+          : desc.value !== undefined
+          ? desc
+          : undefined;
       } else {
         const sources = sourcesMap[key];
         if (sources) {
-          if (desc.get) {
-            sources.push(desc.get.bind(source));
-          } else if (desc.value !== undefined) {
-            sources.push(() => desc.value);
-          }
-        } else if (target[key] === undefined) target[key] = desc.value;
+          if (desc.get) sources.push(desc.get.bind(source));
+          else if (desc.value !== undefined) sources.push(() => desc.value);
+        }
       }
     }
   }
+  const target = {};
+  const definedKeys = Object.keys(defined);
+  for (let i = definedKeys.length - 1; i >= 0; i--) {
+    const key = definedKeys[i],
+      desc = defined[key];
+    if (desc && desc.get) Object.defineProperty(target, key, desc);
+    else target[key] = desc ? desc.value : undefined;
+  }
   return target;
 }
 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;
+      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);
+          }
         },
-        keys() {
-          return k.filter(property => property in props);
-        }
-      }, propTraps);
+        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));
+    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];
@@ -1408,17 +1520,21 @@ 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;
@@ -1443,49 +1559,77 @@ 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) => (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 [-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 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;
@@ -1496,22 +1640,28 @@ function resetErrorBoundaries() {
 }
 function ErrorBoundary(props) {
   let err;
-  if (sharedConfig.context && sharedConfig.load) err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
+  if (sharedConfig.context && sharedConfig.load)
+    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
   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(() => ({
@@ -1523,51 +1673,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,
-        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,
+  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
-        };
-      } else {
-        const next = !stop;
-        if (next) inFallback = true;
-        res[n] = {
-          showContent: next,
-          showFallback: !tail || next && tail === "collapsed" ? showFallback : false
-        };
-        stop = true;
+        }));
+        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;
+        }
+      }
+      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: {
@@ -1642,17 +1792,14 @@ 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;
@@ -1680,4 +1827,59 @@ 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
+};