solid-js 1.6.7 → 1.6.9

package/dist/dev.js

@@ -1,18 +1,18 @@
 let taskIdCounter = 1,
-    isCallbackScheduled = false,
-    isPerformingWork = false,
-    taskQueue = [],
-    currentTask = null,
-    shouldYieldToHost = null,
-    yieldInterval = 5,
-    deadline = 0,
-    maxYieldInterval = 300,
-    scheduleCallback = null,
-    scheduledCallback = null;
+  isCallbackScheduled = false,
+  isPerformingWork = false,
+  taskQueue = [],
+  currentTask = null,
+  shouldYieldToHost = null,
+  yieldInterval = 5,
+  deadline = 0,
+  maxYieldInterval = 300,
+  scheduleCallback = null,
+  scheduledCallback = null;
 const maxSigned31BitInt = 1073741823;
 function setupScheduler() {
   const channel = new MessageChannel(),
-        port = channel.port2;
+    port = channel.port2;
   scheduleCallback = () => port.postMessage(null);
   channel.port1.onmessage = () => {
     if (scheduledCallback !== null) {
@@ -63,7 +63,7 @@ function enqueue(taskQueue, task) {
 function requestCallback(fn, options) {
   if (!scheduleCallback) setupScheduler();
   let startTime = performance.now(),
-      timeout = maxSigned31BitInt;
+    timeout = maxSigned31BitInt;
   if (options && options.timeout) timeout = options.timeout;
   const newTask = {
     id: taskIdCounter++,
@@ -119,7 +119,8 @@ function setHydrateContext(context) {
   sharedConfig.context = context;
 }
 function nextHydrateContext() {
-  return { ...sharedConfig.context,
+  return {
+    ...sharedConfig.context,
     id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   };
@@ -155,22 +156,22 @@ let rootCount = 0;
 const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
-        owner = Owner,
-        unowned = fn.length === 0,
-        root = unowned ? {
-    owned: null,
-    cleanups: null,
-    context: null,
-    owner: null
-  }  : {
-    owned: null,
-    cleanups: null,
-    context: null,
-    owner: detachedOwner || owner
-  },
-        updateFn = unowned ? () => fn(() => {
-    throw new Error("Dispose method must be an explicit argument to createRoot function");
-  })  : () => fn(() => untrack(() => cleanNode(root)));
+    owner = Owner,
+    unowned = fn.length === 0,
+    root = unowned ? {
+      owned: null,
+      cleanups: null,
+      context: null,
+      owner: null
+    }  : {
+      owned: null,
+      cleanups: null,
+      context: null,
+      owner: detachedOwner || owner
+    },
+    updateFn = unowned ? () => fn(() => {
+      throw new Error("Dispose method must be an explicit argument to createRoot function");
+    })  : () => fn(() => untrack(() => cleanNode(root)));
   {
     if (owner) root.name = `${owner.name}-r${rootCount++}`;
     globalThis._$afterCreateRoot && globalThis._$afterCreateRoot(root);
@@ -212,7 +213,7 @@ function createRenderEffect(fn, value, options) {
 function createEffect(fn, value, options) {
   runEffects = runUserEffects;
   const c = createComputation(fn, value, false, STALE, options ),
-        s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+    s = SuspenseContext && lookup(Owner, SuspenseContext.id);
   if (s) c.suspense = s;
   c.user = true;
   Effects ? Effects.push(c) : updateComputation(c);
@@ -220,10 +221,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 ),
-        s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+      fn ? fn() : untrack(onInvalidate);
+      fn = undefined;
+    }, undefined, false, 0, options ),
+    s = SuspenseContext && lookup(Owner, SuspenseContext.id);
   if (s) c.suspense = s;
   c.user = true;
   return tracking => {
@@ -257,19 +258,19 @@ function createResource(pSource, pFetcher, pOptions) {
     options = pOptions || {};
   }
   let pr = null,
-      initP = NO_INIT,
-      id = null,
-      loadedUnderTransition = false,
-      scheduled = false,
-      resolved = ("initialValue" in options),
-      dynamic = typeof source === "function" && createMemo(source);
+    initP = NO_INIT,
+    id = null,
+    loadedUnderTransition = false,
+    scheduled = false,
+    resolved = ("initialValue" in options),
+    dynamic = typeof source === "function" && createMemo(source);
   const contexts = new Set(),
-        [value, setValue] = (options.storage || createSignal)(options.initialValue),
-        [error, setError] = createSignal(undefined),
-        [track, trigger] = createSignal(undefined, {
-    equals: false
-  }),
-        [state, setState] = createSignal(resolved ? "ready" : "unresolved");
+    [value, setValue] = (options.storage || createSignal)(options.initialValue),
+    [error, setError] = createSignal(undefined),
+    [track, trigger] = createSignal(undefined, {
+      equals: false
+    }),
+    [state, setState] = createSignal(resolved ? "ready" : "unresolved");
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
     let v;
@@ -305,8 +306,8 @@ function createResource(pSource, pFetcher, pOptions) {
   }
   function read() {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
-          v = value(),
-          err = error();
+      v = value(),
+      err = error();
     if (err && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
@@ -378,7 +379,7 @@ function createResource(pSource, pFetcher, pOptions) {
 }
 function createDeferred(source, options) {
   let t,
-      timeout = options ? options.timeoutMs : undefined;
+    timeout = options ? options.timeoutMs : undefined;
   const node = createComputation(() => {
     if (!t || !t.fn) t = requestCallback(() => setDeferred(() => node.value), timeout !== undefined ? {
       timeout
@@ -521,11 +522,10 @@ function devComponent(Comp, props) {
       [$DEVCOMP]: true
     });
     return Comp(props);
-  }), undefined, true);
+  }), undefined, true, 0);
   c.props = props;
   c.observers = null;
   c.observerSlots = null;
-  c.state = 0;
   c.componentName = Comp.name;
   updateComputation(c);
   return c.tValue !== undefined ? c.tValue : c.value;
@@ -558,13 +558,15 @@ function registerGraph(name, value) {
     Owner.sourceMap || (Owner.sourceMap = {});
     while (Owner.sourceMap[tryName]) tryName = `${name}-${++i}`;
     Owner.sourceMap[tryName] = value;
+    value.graph = Owner;
   }
   return tryName;
 }
 function serializeGraph(owner) {
   owner || (owner = Owner);
   if (!owner) return {};
-  return { ...serializeValues(owner.sourceMap),
+  return {
+    ...serializeValues(owner.sourceMap),
     ...(owner.owned ? serializeChildren(owner) : {})
   };
 }
@@ -680,8 +682,8 @@ function updateComputation(node) {
   if (!node.fn) return;
   cleanNode(node);
   const owner = Owner,
-        listener = Listener,
-        time = ExecCount;
+    listener = Listener,
+    time = ExecCount;
   Listener = Owner = node;
   runComputation(node, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value, time);
   if (Transition && !Transition.running && Transition.sources.has(node)) {
@@ -702,7 +704,17 @@ function runComputation(node, value, time) {
   try {
     nextValue = node.fn(value);
   } catch (err) {
-    if (node.pure) Transition && Transition.running ? node.tState = STALE : node.state = STALE;
+    if (node.pure) {
+      if (Transition && Transition.running) {
+        node.tState = STALE;
+        node.tOwned && node.tOwned.forEach(cleanNode);
+        node.tOwned = undefined;
+      } else {
+        node.state = STALE;
+        node.owned && node.owned.forEach(cleanNode);
+        node.owned = null;
+      }
+    }
     handleError(err);
   }
   if (!node.updatedAt || node.updatedAt <= time) {
@@ -770,7 +782,7 @@ function runTop(node) {
     node = ancestors[i];
     if (runningTransition) {
       let top = node,
-          prev = ancestors[i + 1];
+        prev = ancestors[i + 1];
       while ((top = top.owner) && top !== prev) {
         if (Transition.disposed.has(top)) return;
       }
@@ -867,7 +879,7 @@ function scheduleQueue(queue) {
 }
 function runUserEffects(queue) {
   let i,
-      userLength = 0;
+    userLength = 0;
   for (i = 0; i < queue.length; i++) {
     const e = queue[i];
     if (!e.user) runTop(e);else queue[userLength++] = e;
@@ -903,11 +915,11 @@ function cleanNode(node) {
   if (node.sources) {
     while (node.sources.length) {
       const source = node.sources.pop(),
-            index = node.sourceSlots.pop(),
-            obs = source.observers;
+        index = node.sourceSlots.pop(),
+        obs = source.observers;
       if (obs && obs.length) {
         const n = obs.pop(),
-              s = source.observerSlots.pop();
+          s = source.observerSlots.pop();
         if (index < obs.length) {
           n.sourceSlots[s] = index;
           obs[index] = n;
@@ -997,7 +1009,8 @@ function serializeChildren(root) {
   const result = {};
   for (let i = 0, len = root.owned.length; i < len; i++) {
     const node = root.owned[i];
-    result[node.componentName ? `${node.componentName}:${node.name}` : node.name] = { ...serializeValues(node.sourceMap),
+    result[node.componentName ? `${node.componentName}:${node.name}` : node.name] = {
+      ...serializeValues(node.sourceMap),
       ...(node.owned ? serializeChildren(node) : {})
     };
   }
@@ -1055,27 +1068,27 @@ function dispose(d) {
 }
 function mapArray(list, mapFn, options = {}) {
   let items = [],
-      mapped = [],
-      disposers = [],
-      len = 0,
-      indexes = mapFn.length > 1 ? [] : null;
+    mapped = [],
+    disposers = [],
+    len = 0,
+    indexes = mapFn.length > 1 ? [] : null;
   onCleanup(() => dispose(disposers));
   return () => {
     let newItems = list() || [],
-        i,
-        j;
+      i,
+      j;
     newItems[$TRACK];
     return untrack(() => {
       let newLen = newItems.length,
-          newIndices,
-          newIndicesNext,
-          temp,
-          tempdisposers,
-          tempIndexes,
-          start,
-          end,
-          newEnd,
-          item;
+        newIndices,
+        newIndicesNext,
+        temp,
+        tempdisposers,
+        tempIndexes,
+        start,
+        end,
+        newEnd,
+        item;
       if (newLen === 0) {
         if (len !== 0) {
           dispose(disposers);
@@ -1160,11 +1173,11 @@ function mapArray(list, mapFn, options = {}) {
 }
 function indexArray(list, mapFn, options = {}) {
   let items = [],
-      mapped = [],
-      disposers = [],
-      signals = [],
-      len = 0,
-      i;
+    mapped = [],
+    disposers = [],
+    signals = [],
+    len = 0,
+    i;
   onCleanup(() => dispose(disposers));
   return () => {
     const newItems = list() || [];
@@ -1446,21 +1459,21 @@ function Switch(props) {
   let keyed = false;
   const equals = (a, b) => a[0] === b[0] && (strictEqual ? 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,
-    name: "eval conditions"
-  } );
+      return [-1];
+    }, undefined, {
+      equals,
+      name: "eval conditions"
+    } );
   return createMemo(() => {
     const [index, when, cond] = evalConditions();
     if (index < 0) return props.fallback;
@@ -1509,9 +1522,9 @@ const suspenseListEquals = (a, b) => a.showContent === b.showContent && a.showFa
 const SuspenseListContext = createContext();
 function SuspenseList(props) {
   let [wrapper, setWrapper] = createSignal(() => ({
-    inFallback: false
-  })),
-      show;
+      inFallback: false
+    })),
+    show;
   const listContext = useContext(SuspenseListContext);
   const [registry, setRegistry] = createSignal([]);
   if (listContext) {
@@ -1519,13 +1532,13 @@ function SuspenseList(props) {
   }
   const resolved = createMemo(prev => {
     const reveal = props.revealOrder,
-          tail = props.tail,
-          {
-      showContent = true,
-      showFallback = true
-    } = show ? show() : {},
-          reg = registry(),
-          reverse = reveal === "backwards";
+      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(() => ({
@@ -1540,7 +1553,7 @@ function SuspenseList(props) {
     const res = [];
     for (let i = 0, len = reg.length; i < len; i++) {
       const n = reverse ? len - i - 1 : i,
-            s = reg[n]();
+        s = reg[n]();
       if (!stop && !s) {
         res[n] = {
           showContent,
@@ -1583,25 +1596,25 @@ function SuspenseList(props) {
 }
 function Suspense(props) {
   let counter = 0,
-      show,
-      ctx,
-      p,
-      flicker,
-      error;
+    show,
+    ctx,
+    p,
+    flicker,
+    error;
   const [inFallback, setFallback] = createSignal(false),
-        SuspenseContext = getSuspenseContext(),
-        store = {
-    increment: () => {
-      if (++counter === 1) setFallback(true);
-    },
-    decrement: () => {
-      if (--counter === 0) setFallback(false);
+    SuspenseContext = getSuspenseContext(),
+    store = {
+      increment: () => {
+        if (++counter === 1) setFallback(true);
+      },
+      decrement: () => {
+        if (--counter === 0) setFallback(false);
+      },
+      inFallback,
+      effects: [],
+      resolved: false
     },
-    inFallback,
-    effects: [],
-    resolved: false
-  },
-        owner = getOwner();
+    owner = getOwner();
   if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     let ref = sharedConfig.load(key);
@@ -1641,10 +1654,10 @@ function Suspense(props) {
         const rendered = createMemo(() => props.children);
         return createMemo(prev => {
           const inFallback = store.inFallback(),
-                {
-            showContent = true,
-            showFallback = true
-          } = show ? show() : {};
+            {
+              showContent = true,
+              showFallback = true
+            } = show ? show() : {};
           if ((!inFallback || p && p !== "$$f") && showContent) {
             store.resolved = true;
             dispose && dispose();

package/dist/server.cjs

@@ -25,10 +25,10 @@ let Owner = null;
 function createRoot(fn, detachedOwner) {
   detachedOwner && (Owner = detachedOwner);
   const owner = Owner,
-        root = fn.length === 0 ? UNOWNED : {
-    context: null,
-    owner
-  };
+    root = fn.length === 0 ? UNOWNED : {
+      context: null,
+      owner
+    };
   Owner = root;
   let result;
   try {
@@ -264,7 +264,8 @@ function setHydrateContext(context) {
   sharedConfig.context = context;
 }
 function nextHydrateContext() {
-  return sharedConfig.context ? { ...sharedConfig.context,
+  return sharedConfig.context ? {
+    ...sharedConfig.context,
     id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   } : undefined;
@@ -311,23 +312,23 @@ function mergeProps(...sources) {
 }
 function splitProps(props, ...keys) {
   const descriptors = Object.getOwnPropertyDescriptors(props),
-        split = k => {
-    const clone = {};
-    for (let i = 0; i < k.length; i++) {
-      const key = k[i];
-      if (descriptors[key]) {
-        Object.defineProperty(clone, key, descriptors[key]);
-        delete descriptors[key];
+    split = k => {
+      const clone = {};
+      for (let i = 0; i < k.length; i++) {
+        const key = k[i];
+        if (descriptors[key]) {
+          Object.defineProperty(clone, key, descriptors[key]);
+          delete descriptors[key];
+        }
       }
-    }
-    return clone;
-  };
+      return clone;
+    };
   return keys.map(split).concat(split(Object.keys(descriptors)));
 }
 function simpleMap(props, wrap) {
   const list = props.each || [],
-        len = list.length,
-        fn = props.children;
+    len = list.length,
+    fn = props.children;
   if (len) {
     let mapped = Array(len);
     for (let i = 0; i < len; i++) mapped[i] = wrap(fn, list[i], i);
@@ -363,15 +364,16 @@ function Match(props) {
 function resetErrorBoundaries() {}
 function ErrorBoundary(props) {
   let error,
-      res,
-      clean,
-      sync = true;
+    res,
+    clean,
+    sync = true;
   const ctx = sharedConfig.context;
   const id = ctx.id + ctx.count;
   function displayFallback() {
     cleanNode(clean);
     ctx.writeResource(id, error, true);
-    setHydrateContext({ ...ctx,
+    setHydrateContext({
+      ...ctx,
       count: 0
     });
     const f = props.fallback;
@@ -494,31 +496,21 @@ function createResource(source, fetcher, options = {}) {
   }];
 }
 function lazy(fn) {
-  let resolved;
   let p;
   let load = id => {
     if (!p) {
-      if (id) {
-        let ref = sharedConfig.context.resources[id] = {
-          ref: p = fn()
-        };
-        p.then(mod => ref.data = resolved = mod.default);
-        return p;
-      }
       p = fn();
-      p.then(mod => resolved = mod.default);
+      p.then(mod => p.resolved = mod.default);
+      if (id) sharedConfig.context.lazy[id] = p;
     }
     return p;
   };
   const contexts = new Set();
   const wrap = props => {
     const id = sharedConfig.context.id.slice(0, -1);
-    let ref = sharedConfig.context.resources[id];
-    if (ref) {
-      p = ref.ref;
-      resolved = ref.data;
-    } else load(id);
-    if (resolved) return resolved(props);
+    let ref = sharedConfig.context.lazy[id];
+    if (ref) p = ref;else load(id);
+    if (p.resolved) return p.resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {
       loading: true,
@@ -588,7 +580,8 @@ function Suspense(props) {
     }
   });
   function runSuspense() {
-    setHydrateContext({ ...ctx,
+    setHydrateContext({
+      ...ctx,
       count: 0
     });
     return runWithOwner(o, () => {
@@ -612,18 +605,20 @@ function Suspense(props) {
   });
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   if (ctx.async) {
-    setHydrateContext({ ...ctx,
+    setHydrateContext({
+      ...ctx,
       count: 0,
       id: ctx.id + "0.f",
       noHydrate: true
     });
     const res = {
-      t: `<span id="pl-${id}">${resolveSSRNode(props.fallback)}</span>`
+      t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!pl-${id}>`
     };
     setHydrateContext(ctx);
     return res;
   }
-  setHydrateContext({ ...ctx,
+  setHydrateContext({
+    ...ctx,
     count: 0,
     id: ctx.id + "0.f"
   });