solid-js 1.9.6 → 1.9.8

package/dist/dev.js

@@ -7,6 +7,7 @@ let taskIdCounter = 1,
   yieldInterval = 5,
   deadline = 0,
   maxYieldInterval = 300,
+  maxDeadline = 0,
   scheduleCallback = null,
   scheduledCallback = null;
 const maxSigned31BitInt = 1073741823;
@@ -18,9 +19,9 @@ function setupScheduler() {
     if (scheduledCallback !== null) {
       const currentTime = performance.now();
       deadline = currentTime + yieldInterval;
-      const hasTimeRemaining = true;
+      maxDeadline = currentTime + maxYieldInterval;
       try {
-        const hasMoreWork = scheduledCallback(hasTimeRemaining, currentTime);
+        const hasMoreWork = scheduledCallback(currentTime);
         if (!hasMoreWork) {
           scheduledCallback = null;
         } else port.postMessage(null);
@@ -38,7 +39,7 @@ function setupScheduler() {
         if (scheduling.isInputPending()) {
           return true;
         }
-        return currentTime >= maxYieldInterval;
+        return currentTime >= maxDeadline;
       } else {
         return false;
       }
@@ -52,11 +53,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;
   }
@@ -84,21 +83,21 @@ function requestCallback(fn, options) {
 function cancelCallback(task) {
   task.fn = null;
 }
-function flushWork(hasTimeRemaining, initialTime) {
+function flushWork(initialTime) {
   isCallbackScheduled = false;
   isPerformingWork = true;
   try {
-    return workLoop(hasTimeRemaining, initialTime);
+    return workLoop(initialTime);
   } finally {
     currentTask = null;
     isPerformingWork = false;
   }
 }
-function workLoop(hasTimeRemaining, initialTime) {
+function workLoop(initialTime) {
   let currentTime = initialTime;
   currentTask = taskQueue[0] || null;
   while (currentTask !== null) {
-    if (currentTask.expirationTime > currentTime && (!hasTimeRemaining || shouldYieldToHost())) {
+    if (currentTask.expirationTime > currentTime && shouldYieldToHost()) {
       break;
     }
     const callback = currentTask.fn;
@@ -183,25 +182,20 @@ function createRoot(fn, detachedOwner) {
     owner = Owner,
     unowned = fn.length === 0,
     current = detachedOwner === undefined ? owner : detachedOwner,
-    root = unowned
-      ? {
-          owned: null,
-          cleanups: null,
-          context: null,
-          owner: null
-        }
-      : {
-          owned: null,
-          cleanups: null,
-          context: current ? current.context : null,
-          owner: current
-        },
-    updateFn = unowned
-      ? () =>
-          fn(() => {
-            throw new Error("Dispose method must be an explicit argument to createRoot function");
-          })
-      : () => fn(() => untrack(() => cleanNode(root)));
+    root = unowned ? {
+      owned: null,
+      cleanups: null,
+      context: null,
+      owner: null
+    }  : {
+      owned: null,
+      cleanups: null,
+      context: current ? current.context : null,
+      owner: current
+    },
+    updateFn = unowned ? () => fn(() => {
+      throw new Error("Dispose method must be an explicit argument to createRoot function");
+    })  : () => fn(() => untrack(() => cleanNode(root)));
   DevHooks.afterCreateOwner && DevHooks.afterCreateOwner(root);
   Owner = root;
   Listener = null;
@@ -231,26 +225,23 @@ 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);
   };
   return [readSignal.bind(s), setter];
 }
 function createComputed(fn, value, options) {
-  const c = createComputation(fn, value, true, STALE, options);
-  if (Scheduler && Transition && Transition.running) Updates.push(c);
-  else updateComputation(c);
+  const c = createComputation(fn, value, true, STALE, options );
+  if (Scheduler && Transition && Transition.running) Updates.push(c);else updateComputation(c);
 }
 function createRenderEffect(fn, value, options) {
-  const c = createComputation(fn, value, false, STALE, options);
-  if (Scheduler && Transition && Transition.running) Updates.push(c);
-  else updateComputation(c);
+  const c = createComputation(fn, value, false, STALE, options );
+  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, options),
+  const c = createComputation(fn, value, false, STALE, options ),
     s = SuspenseContext && useContext(SuspenseContext);
   if (s) c.suspense = s;
   if (!options || !options.render) c.user = true;
@@ -258,16 +249,10 @@ function createEffect(fn, value, options) {
 }
 function createReaction(onInvalidate, options) {
   let fn;
-  const c = createComputation(
-      () => {
-        fn ? fn() : untrack(onInvalidate);
-        fn = undefined;
-      },
-      undefined,
-      false,
-      0,
-      options
-    ),
+  const c = createComputation(() => {
+      fn ? fn() : untrack(onInvalidate);
+      fn = undefined;
+    }, undefined, false, 0, options ),
     s = SuspenseContext && useContext(SuspenseContext);
   if (s) c.suspense = s;
   c.user = true;
@@ -278,7 +263,7 @@ function createReaction(onInvalidate, options) {
 }
 function createMemo(fn, value, options) {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
-  const c = createComputation(fn, value, true, 0, options);
+  const c = createComputation(fn, value, true, 0, options );
   c.observers = null;
   c.observerSlots = null;
   c.comparator = options.equals || undefined;
@@ -320,19 +305,15 @@ function createResource(pSource, pFetcher, pOptions) {
     [state, setState] = createSignal(resolved ? "ready" : "unresolved");
   if (sharedConfig.context) {
     id = sharedConfig.getNextContextId();
-    if (options.ssrLoadFrom === "initial") initP = options.initialValue;
-    else if (sharedConfig.load && sharedConfig.has(id)) initP = sharedConfig.load(id);
+    if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && sharedConfig.has(id)) initP = sharedConfig.load(id);
   }
   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);
@@ -363,8 +344,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);
           }
@@ -383,35 +363,36 @@ 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
-            })
-          );
-    if (!isPromise(p)) {
+    let error;
+    const p = initP !== NO_INIT ? initP : untrack(() => {
+      try {
+        return fetcher(lookup, {
+          value: value(),
+          refetching
+        });
+      } catch (fetcherError) {
+        error = fetcherError;
+      }
+    });
+    if (error !== undefined) {
+      loadEnd(pr, undefined, castError(error), lookup);
+      return;
+    } else 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, castError(p.value), lookup);
+    if ("v" in p) {
+      if (p.s === 1) loadEnd(pr, p.v, undefined, lookup);else loadEnd(pr, undefined, castError(p.v), 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: {
@@ -436,81 +417,50 @@ function createResource(pSource, pFetcher, pOptions) {
     }
   });
   let owner = Owner;
-  if (dynamic) createComputed(() => ((owner = Owner), load(false)));
-  else load(false);
-  return [
-    read,
-    {
-      refetch: info => runWithOwner(owner, () => load(info)),
-      mutate: setValue
-    }
-  ];
+  if (dynamic) createComputed(() => (owner = Owner, load(false)));else load(false);
+  return [read, {
+    refetch: info => runWithOwner(owner, () => load(info)),
+    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,
-    options
-  );
+  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, options );
   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) {
@@ -550,10 +500,7 @@ function onMount(fn) {
   createEffect(() => untrack(fn));
 }
 function onCleanup(fn) {
-  if (Owner === null)
-    console.warn("cleanups created outside a `createRoot` or `render` will never be run");
-  else if (Owner.cleanups === null) Owner.cleanups = [fn];
-  else Owner.cleanups.push(fn);
+  if (Owner === null) console.warn("cleanups created outside a `createRoot` or `render` will never be run");else if (Owner.cleanups === null) Owner.cleanups = [fn];else Owner.cleanups.push(fn);
   return fn;
 }
 function catchError(fn, handler) {
@@ -607,17 +554,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);
@@ -625,7 +570,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];
 }
@@ -634,18 +579,12 @@ function resumeEffects(e) {
   e.length = 0;
 }
 function devComponent(Comp, props) {
-  const c = createComputation(
-    () =>
-      untrack(() => {
-        Object.assign(Comp, {
-          [$DEVCOMP]: true
-        });
-        return Comp(props);
-      }),
-    undefined,
-    true,
-    0
-  );
+  const c = createComputation(() => untrack(() => {
+    Object.assign(Comp, {
+      [$DEVCOMP]: true
+    });
+    return Comp(props);
+  }), undefined, true, 0);
   c.props = props;
   c.observers = null;
   c.observerSlots = null;
@@ -656,8 +595,7 @@ function devComponent(Comp, props) {
 }
 function registerGraph(value) {
   if (Owner) {
-    if (Owner.sourceMap) Owner.sourceMap.push(value);
-    else Owner.sourceMap = [value];
+    if (Owner.sourceMap) Owner.sourceMap.push(value);else Owner.sourceMap = [value];
     value.graph = Owner;
   }
   if (DevHooks.afterRegisterGraph) DevHooks.afterRegisterGraph(value);
@@ -672,15 +610,13 @@ function createContext(defaultValue, options) {
 }
 function useContext(context) {
   let value;
-  return Owner && Owner.context && (value = Owner.context[context.id]) !== undefined
-    ? value
-    : context.defaultValue;
+  return Owner && Owner.context && (value = Owner.context[context.id]) !== undefined ? value : context.defaultValue;
 }
 function children(fn) {
   const children = createMemo(fn);
   const memo = createMemo(() => resolveChildren(children()), undefined, {
     name: "children"
-  });
+  }) ;
   memo.toArray = () => {
     const c = memo();
     return Array.isArray(c) ? c : c != null ? [c] : [];
@@ -693,7 +629,10 @@ 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);
@@ -718,8 +657,7 @@ 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);
@@ -747,12 +685,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;
       }
@@ -765,12 +702,10 @@ 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 = [];
@@ -786,11 +721,7 @@ 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(() => {
@@ -855,15 +786,11 @@ function createComputation(fn, init, pure, state = STALE, options) {
     c.state = 0;
     c.tState = state;
   }
-  if (Owner === null)
-    console.warn("computations created outside a `createRoot` or `render` will never be disposed");
-  else if (Owner !== UNOWNED) {
+  if (Owner === null) console.warn("computations created outside a `createRoot` or `render` will never be disposed");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 (options && options.name) c.name = options.name;
@@ -916,8 +843,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();
@@ -931,8 +857,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;
@@ -972,8 +897,7 @@ function completeUpdates(wait) {
   }
   const e = Effects;
   Effects = null;
-  if (e.length) runUpdates(() => runEffects(e), false);
-  else DevHooks.afterUpdate && DevHooks.afterUpdate();
+  if (e.length) runUpdates(() => runEffects(e), false);else DevHooks.afterUpdate && DevHooks.afterUpdate();
   if (res) res();
 }
 function runQueue(queue) {
@@ -1001,8 +925,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) {
@@ -1021,15 +944,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);
     }
   }
@@ -1039,10 +960,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);
     }
   }
@@ -1079,8 +998,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;
+  if (Transition && Transition.running) node.tState = 0;else node.state = 0;
   delete node.sourceMap;
 }
 function reset(node, top) {
@@ -1102,21 +1020,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 && 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());
@@ -1133,26 +1049,19 @@ 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,
-      options
-    );
+    createRenderEffect(() => res = untrack(() => {
+      Owner.context = {
+        ...Owner.context,
+        [id]: props.value
+      };
+      return children(() => props.children);
+    }), undefined, options);
     return res;
   };
 }
 function onError(fn) {
   ERROR || (ERROR = Symbol("error"));
-  if (Owner === null)
-    console.warn("error handlers created outside a `createRoot` or `render` will never be run");
-  else if (Owner.context === null || !Owner.context[ERROR]) {
+  if (Owner === null) console.warn("error handlers created outside a `createRoot` or `render` will never be run");else if (Owner.context === null || !Owner.context[ERROR]) {
     Owner.context = {
       ...Owner.context,
       [ERROR]: [fn]
@@ -1181,8 +1090,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() {}
@@ -1213,7 +1121,7 @@ function from(producer, initalValue = 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);
@@ -1257,7 +1165,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];
@@ -1268,16 +1177,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]);
@@ -1311,7 +1212,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;
@@ -1321,7 +1222,7 @@ function mapArray(list, mapFn, options = {}) {
       if (indexes) {
         const [s, set] = createSignal(j, {
           name: "index"
-        });
+        }) ;
         indexes[j] = set;
         return mapFn(newItems[j], s);
       }
@@ -1380,13 +1281,13 @@ function indexArray(list, mapFn, options = {}) {
       }
       len = signals.length = disposers.length = newLen;
       items = newItems.slice(0);
-      return (mapped = mapped.slice(0, len));
+      return mapped = mapped.slice(0, len);
     });
     function mapper(disposer) {
       disposers[i] = disposer;
       const [s, set] = createSignal(newItems[i], {
         name: "value"
-      });
+      }) ;
       signals[i] = set;
       return mapFn(s, i);
     }
@@ -1402,7 +1303,7 @@ function createComponent(Comp, props) {
     if (sharedConfig.context) {
       const c = sharedConfig.context;
       setHydrateContext(nextHydrateContext());
-      const r = devComponent(Comp, props || {});
+      const r = devComponent(Comp, props || {}) ;
       setHydrateContext(c);
       return r;
     }
@@ -1451,33 +1352,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 (SUPPORTS_PROXY && 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 sourcesMap = {};
   const defined = Object.create(null);
@@ -1490,20 +1387,15 @@ function mergeProps(...sources) {
       if (key === "__proto__" || key === "constructor") continue;
       const desc = Object.getOwnPropertyDescriptor(source, key);
       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;
+        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);
+          if (desc.get) sources.push(desc.get.bind(source));else if (desc.value !== undefined) sources.push(() => desc.value);
         }
       }
     }
@@ -1513,8 +1405,7 @@ function mergeProps(...sources) {
   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;
+    if (desc && desc.get) Object.defineProperty(target, key, desc);else target[key] = desc ? desc.value : undefined;
   }
   return target;
 }
@@ -1522,60 +1413,47 @@ function splitProps(props, ...keys) {
   if (SUPPORTS_PROXY && $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];
@@ -1601,24 +1479,19 @@ function lazy(fn) {
       comp = s;
     }
     let Comp;
-    return createMemo(() =>
-      (Comp = comp())
-        ? untrack(() => {
-            if (IS_DEV)
-              Object.assign(Comp, {
-                [$DEVCOMP]: true
-              });
-            if (!ctx || sharedConfig.done) return Comp(props);
-            const c = sharedConfig.context;
-            setHydrateContext(ctx);
-            const r = Comp(props);
-            setHydrateContext(c);
-            return r;
-          })
-        : ""
-    );
+    return createMemo(() => (Comp = comp()) ? untrack(() => {
+      if (IS_DEV) Object.assign(Comp, {
+        [$DEVCOMP]: true
+      });
+      if (!ctx || sharedConfig.done) return Comp(props);
+      const c = sharedConfig.context;
+      setHydrateContext(ctx);
+      const r = Comp(props);
+      setHydrateContext(c);
+      return r;
+    }) : "");
   };
-  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;
@@ -1627,69 +1500,46 @@ function createUniqueId() {
   return ctx ? sharedConfig.getNextContextId() : `cl-${counter++}`;
 }
 
-const narrowedError = name =>
-  `Attempting to access a stale value from <${name}> that could possibly be undefined. This may occur because you are reading the accessor returned from the component at a time where it has already been unmounted. We recommend cleaning up any stale timers or async, or reading from the initial condition.`;
+const narrowedError = name => `Attempting to access a stale value from <${name}> that could possibly be undefined. This may occur because you are reading the accessor returned from the component at a time where it has already been unmounted. We recommend cleaning up any stale timers or async, or reading from the initial condition.` ;
 function For(props) {
   const fallback = "fallback" in props && {
     fallback: () => props.fallback
   };
-  return createMemo(
-    mapArray(() => props.each, props.children, fallback || undefined),
-    undefined,
-    {
-      name: "value"
-    }
-  );
+  return createMemo(mapArray(() => props.each, props.children, fallback || undefined), undefined, {
+    name: "value"
+  }) ;
 }
 function Index(props) {
   const fallback = "fallback" in props && {
     fallback: () => props.fallback
   };
-  return createMemo(
-    indexArray(() => props.each, props.children, fallback || undefined),
-    undefined,
-    {
-      name: "value"
-    }
-  );
+  return createMemo(indexArray(() => props.each, props.children, fallback || undefined), undefined, {
+    name: "value"
+  }) ;
 }
 function Show(props) {
   const keyed = props.keyed;
   const conditionValue = createMemo(() => props.when, undefined, {
     name: "condition value"
-  });
-  const condition = keyed
-    ? conditionValue
-    : createMemo(conditionValue, undefined, {
-        equals: (a, b) => !a === !b,
-        name: "condition"
-      });
-  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 conditionValue();
-                    }
-              )
-            )
-          : child;
-      }
-      return props.fallback;
-    },
-    undefined,
-    {
-      name: "value"
+  } );
+  const condition = keyed ? conditionValue : createMemo(conditionValue, undefined, {
+    equals: (a, b) => !a === !b,
+    name: "condition"
+  } );
+  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 conditionValue();
+      })) : child;
     }
-  );
+    return props.fallback;
+  }, undefined, {
+    name: "value"
+  } );
 }
 function Switch(props) {
   const chs = children(() => props.children);
@@ -1701,44 +1551,30 @@ function Switch(props) {
       const index = i;
       const mp = mps[i];
       const prevFunc = func;
-      const conditionValue = createMemo(() => (prevFunc() ? undefined : mp.when), undefined, {
+      const conditionValue = createMemo(() => prevFunc() ? undefined : mp.when, undefined, {
         name: "condition value"
-      });
-      const condition = mp.keyed
-        ? conditionValue
-        : createMemo(conditionValue, undefined, {
-            equals: (a, b) => !a === !b,
-            name: "condition"
-          });
+      } );
+      const condition = mp.keyed ? conditionValue : createMemo(conditionValue, undefined, {
+        equals: (a, b) => !a === !b,
+        name: "condition"
+      } );
       func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
     }
     return func;
   });
-  return createMemo(
-    () => {
-      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
-        ? untrack(() =>
-            child(
-              mp.keyed
-                ? conditionValue()
-                : () => {
-                    if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
-                    return conditionValue();
-                  }
-            )
-          )
-        : child;
-    },
-    undefined,
-    {
-      name: "eval conditions"
-    }
-  );
+  return createMemo(() => {
+    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 ? untrack(() => child(mp.keyed ? conditionValue() : () => {
+      if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+      return conditionValue();
+    })) : child;
+  }, undefined, {
+    name: "eval conditions"
+  } );
 }
 function Match(props) {
   return props;
@@ -1749,34 +1585,28 @@ function resetErrorBoundaries() {
 }
 function ErrorBoundary(props) {
   let err;
-  if (sharedConfig.context && sharedConfig.load)
-    err = sharedConfig.load(sharedConfig.getContextId());
+  if (sharedConfig.context && sharedConfig.load) err = sharedConfig.load(sharedConfig.getContextId());
   const [errored, setErrored] = createSignal(err, {
     name: "errored"
-  });
+  } );
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
-  return createMemo(
-    () => {
-      let e;
-      if ((e = errored())) {
-        const f = props.fallback;
-        if (typeof f !== "function" || f.length == 0) console.error(e);
-        return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored())) : f;
-      }
-      return catchError(() => props.children, setErrored);
-    },
-    undefined,
-    {
-      name: "value"
+  return createMemo(() => {
+    let e;
+    if (e = errored()) {
+      const f = props.fallback;
+      if ((typeof f !== "function" || f.length == 0)) console.error(e);
+      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored())) : f;
     }
-  );
+    return catchError(() => props.children, setErrored);
+  }, undefined, {
+    name: "value"
+  } );
 }
 
-const suspenseListEquals = (a, b) =>
-  a.showContent === b.showContent && a.showFallback === b.showFallback;
-const SuspenseListContext = /* #__PURE__ */ createContext();
+const suspenseListEquals = (a, b) => a.showContent === b.showContent && a.showFallback === b.showFallback;
+const SuspenseListContext = /* #__PURE__ */createContext();
 function SuspenseList(props) {
   let [wrapper, setWrapper] = createSignal(() => ({
       inFallback: false
@@ -1787,51 +1617,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: {
@@ -1876,27 +1706,23 @@ function Suspense(props) {
     const key = sharedConfig.getContextId();
     let ref = sharedConfig.load(key);
     if (ref) {
-      if (typeof ref !== "object" || ref.status !== "success") p = ref;
-      else sharedConfig.gather(key);
+      if (typeof ref !== "object" || ref.s !== 1) p = ref;else sharedConfig.gather(key);
     }
     if (p && p !== "$$f") {
       const [s, set] = createSignal(undefined, {
         equals: false
       });
       flicker = s;
-      p.then(
-        () => {
-          if (sharedConfig.done) return set();
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-        },
-        err => {
-          error = err;
-          set();
-        }
-      );
+      p.then(() => {
+        if (sharedConfig.done) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+      }, err => {
+        error = err;
+        set();
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);
@@ -1911,14 +1737,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;
@@ -1948,68 +1777,9 @@ const DEV = {
   hooks: DevHooks,
   writeSignal,
   registerGraph
-};
+} ;
 if (globalThis) {
-  if (!globalThis.Solid$$) globalThis.Solid$$ = true;
-  else
-    console.warn(
-      "You appear to have multiple instances of Solid. This can lead to unexpected behavior."
-    );
+  if (!globalThis.Solid$$) globalThis.Solid$$ = true;else console.warn("You appear to have multiple instances of Solid. This can lead to unexpected behavior.");
 }
 
-export {
-  $DEVCOMP,
-  $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 };