solid-js 1.6.12 → 1.6.14

package/dist/server.cjs

@@ -6,7 +6,6 @@ const $TRACK = Symbol("solid-track");
 const $DEVCOMP = Symbol("solid-dev-component");
 const DEV = {};
 const ERROR = Symbol("error");
-const BRANCH = Symbol("branch");
 function castError(err) {
   if (err instanceof Error || typeof err === "string") return err;
   return new Error("Unknown error");
@@ -19,19 +18,35 @@ function handleError(err) {
 }
 const UNOWNED = {
   context: null,
-  owner: null
+  owner: null,
+  owned: null,
+  cleanups: null
 };
 let Owner = null;
+function createOwner() {
+  const o = {
+    owner: Owner,
+    context: null,
+    owned: null,
+    cleanups: null
+  };
+  if (Owner) {
+    if (!Owner.owned) Owner.owned = [o];else Owner.owned.push(o);
+  }
+  return o;
+}
 function createRoot(fn, detachedOwner) {
   const owner = Owner,
     root = fn.length === 0 ? UNOWNED : {
       context: null,
-      owner: detachedOwner === undefined ? owner : detachedOwner
+      owner: detachedOwner === undefined ? owner : detachedOwner,
+      owned: null,
+      cleanups: null
     };
   Owner = root;
   let result;
   try {
-    result = fn(() => {});
+    result = fn(fn.length === 0 ? () => {} : () => cleanNode(root));
   } catch (err) {
     handleError(err);
   } finally {
@@ -45,10 +60,7 @@ function createSignal(value, options) {
   }];
 }
 function createComputed(fn, value) {
-  Owner = {
-    owner: Owner,
-    context: null
-  };
+  Owner = createOwner();
   try {
     fn(value);
   } catch (err) {
@@ -65,10 +77,7 @@ function createReaction(fn) {
   };
 }
 function createMemo(fn, value) {
-  Owner = {
-    owner: Owner,
-    context: null
-  };
+  Owner = createOwner();
   let v;
   try {
     v = fn(value);
@@ -104,16 +113,19 @@ function on(deps, fn, options = {}) {
 }
 function onMount(fn) {}
 function onCleanup(fn) {
-  let node;
-  if (Owner && (node = lookup(Owner, BRANCH))) {
-    if (!node.cleanups) node.cleanups = [fn];else node.cleanups.push(fn);
+  if (Owner) {
+    if (!Owner.cleanups) Owner.cleanups = [fn];else Owner.cleanups.push(fn);
   }
   return fn;
 }
 function cleanNode(node) {
+  if (node.owned) {
+    for (let i = 0; i < node.owned.length; i++) cleanNode(node.owned[i]);
+    node.owned = null;
+  }
   if (node.cleanups) {
     for (let i = 0; i < node.cleanups.length; i++) node.cleanups[i]();
-    node.cleanups = undefined;
+    node.cleanups = null;
   }
 }
 function onError(fn) {
@@ -383,11 +395,8 @@ function ErrorBoundary(props) {
     !sync && ctx.replace("e" + id, displayFallback);
     sync = true;
   });
-  onCleanup(() => cleanNode(clean));
   createMemo(() => {
-    Owner.context = {
-      [BRANCH]: clean = {}
-    };
+    clean = Owner;
     return res = props.children;
   });
   if (error) return displayFallback();
@@ -437,7 +446,7 @@ function createResource(source, fetcher, options = {}) {
   };
   read.loading = false;
   read.error = undefined;
-  read.state = "initialValue" in options ? "resolved" : "unresolved";
+  read.state = "initialValue" in options ? "ready" : "unresolved";
   Object.defineProperty(read, "latest", {
     get() {
       return read();
@@ -470,7 +479,7 @@ function createResource(source, fetcher, options = {}) {
       if (ctx.writeResource) ctx.writeResource(id, p, undefined, options.deferStream);
       return p.then(res => {
         read.loading = false;
-        read.state = "resolved";
+        read.state = "ready";
         ctx.resources[id].data = res;
         p = null;
         notifySuspense(contexts);
@@ -560,15 +569,9 @@ function SuspenseList(props) {
 }
 function Suspense(props) {
   let done;
-  let clean;
   const ctx = sharedConfig.context;
   const id = ctx.id + ctx.count;
-  const o = Owner;
-  if (o) {
-    if (o.context) o.context[BRANCH] = clean = {};else o.context = {
-      [BRANCH]: clean = {}
-    };
-  }
+  const o = createOwner();
   const value = ctx.suspense[id] || (ctx.suspense[id] = {
     resources: new Map(),
     completed: () => {
@@ -583,11 +586,11 @@ function Suspense(props) {
       ...ctx,
       count: 0
     });
+    o && cleanNode(o);
     return runWithOwner(o, () => {
       return createComponent(SuspenseContext.Provider, {
         value,
         get children() {
-          clean && cleanNode(clean);
           return props.children;
         }
       });

package/dist/server.js

@@ -4,7 +4,6 @@ const $TRACK = Symbol("solid-track");
 const $DEVCOMP = Symbol("solid-dev-component");
 const DEV = {};
 const ERROR = Symbol("error");
-const BRANCH = Symbol("branch");
 function castError(err) {
   if (err instanceof Error || typeof err === "string") return err;
   return new Error("Unknown error");
@@ -17,19 +16,35 @@ function handleError(err) {
 }
 const UNOWNED = {
   context: null,
-  owner: null
+  owner: null,
+  owned: null,
+  cleanups: null
 };
 let Owner = null;
+function createOwner() {
+  const o = {
+    owner: Owner,
+    context: null,
+    owned: null,
+    cleanups: null
+  };
+  if (Owner) {
+    if (!Owner.owned) Owner.owned = [o];else Owner.owned.push(o);
+  }
+  return o;
+}
 function createRoot(fn, detachedOwner) {
   const owner = Owner,
     root = fn.length === 0 ? UNOWNED : {
       context: null,
-      owner: detachedOwner === undefined ? owner : detachedOwner
+      owner: detachedOwner === undefined ? owner : detachedOwner,
+      owned: null,
+      cleanups: null
     };
   Owner = root;
   let result;
   try {
-    result = fn(() => {});
+    result = fn(fn.length === 0 ? () => {} : () => cleanNode(root));
   } catch (err) {
     handleError(err);
   } finally {
@@ -43,10 +58,7 @@ function createSignal(value, options) {
   }];
 }
 function createComputed(fn, value) {
-  Owner = {
-    owner: Owner,
-    context: null
-  };
+  Owner = createOwner();
   try {
     fn(value);
   } catch (err) {
@@ -63,10 +75,7 @@ function createReaction(fn) {
   };
 }
 function createMemo(fn, value) {
-  Owner = {
-    owner: Owner,
-    context: null
-  };
+  Owner = createOwner();
   let v;
   try {
     v = fn(value);
@@ -102,16 +111,19 @@ function on(deps, fn, options = {}) {
 }
 function onMount(fn) {}
 function onCleanup(fn) {
-  let node;
-  if (Owner && (node = lookup(Owner, BRANCH))) {
-    if (!node.cleanups) node.cleanups = [fn];else node.cleanups.push(fn);
+  if (Owner) {
+    if (!Owner.cleanups) Owner.cleanups = [fn];else Owner.cleanups.push(fn);
   }
   return fn;
 }
 function cleanNode(node) {
+  if (node.owned) {
+    for (let i = 0; i < node.owned.length; i++) cleanNode(node.owned[i]);
+    node.owned = null;
+  }
   if (node.cleanups) {
     for (let i = 0; i < node.cleanups.length; i++) node.cleanups[i]();
-    node.cleanups = undefined;
+    node.cleanups = null;
   }
 }
 function onError(fn) {
@@ -381,11 +393,8 @@ function ErrorBoundary(props) {
     !sync && ctx.replace("e" + id, displayFallback);
     sync = true;
   });
-  onCleanup(() => cleanNode(clean));
   createMemo(() => {
-    Owner.context = {
-      [BRANCH]: clean = {}
-    };
+    clean = Owner;
     return res = props.children;
   });
   if (error) return displayFallback();
@@ -435,7 +444,7 @@ function createResource(source, fetcher, options = {}) {
   };
   read.loading = false;
   read.error = undefined;
-  read.state = "initialValue" in options ? "resolved" : "unresolved";
+  read.state = "initialValue" in options ? "ready" : "unresolved";
   Object.defineProperty(read, "latest", {
     get() {
       return read();
@@ -468,7 +477,7 @@ function createResource(source, fetcher, options = {}) {
       if (ctx.writeResource) ctx.writeResource(id, p, undefined, options.deferStream);
       return p.then(res => {
         read.loading = false;
-        read.state = "resolved";
+        read.state = "ready";
         ctx.resources[id].data = res;
         p = null;
         notifySuspense(contexts);
@@ -558,15 +567,9 @@ function SuspenseList(props) {
 }
 function Suspense(props) {
   let done;
-  let clean;
   const ctx = sharedConfig.context;
   const id = ctx.id + ctx.count;
-  const o = Owner;
-  if (o) {
-    if (o.context) o.context[BRANCH] = clean = {};else o.context = {
-      [BRANCH]: clean = {}
-    };
-  }
+  const o = createOwner();
   const value = ctx.suspense[id] || (ctx.suspense[id] = {
     resources: new Map(),
     completed: () => {
@@ -581,11 +584,11 @@ function Suspense(props) {
       ...ctx,
       count: 0
     });
+    o && cleanNode(o);
     return runWithOwner(o, () => {
       return createComponent(SuspenseContext.Provider, {
         value,
         get children() {
-          clean && cleanNode(clean);
           return props.children;
         }
       });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.6.12",
+  "version": "1.6.14",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",

package/types/server/reactive.d.ts

@@ -6,13 +6,15 @@ export declare const DEV: {};
 export type Accessor<T> = () => T;
 export type Setter<T> = undefined extends T ? <U extends T>(value?: (U extends Function ? never : U) | ((prev?: T) => U)) => U : <U extends T>(value: (U extends Function ? never : U) | ((prev: T) => U)) => U;
 export type Signal<T> = [get: Accessor<T>, set: Setter<T>];
-export declare const BRANCH: unique symbol;
 export declare function castError(err: any): string | Error;
 export declare let Owner: Owner | null;
 interface Owner {
     owner: Owner | null;
     context: any | null;
+    owned: Owner[] | null;
+    cleanups: (() => void)[] | null;
 }
+export declare function createOwner(): Owner;
 export declare function createRoot<T>(fn: (dispose: () => void) => T, detachedOwner?: typeof Owner): T;
 export declare function createSignal<T>(value: T, options?: {
     equals?: false | ((prev: T, next: T) => boolean);
@@ -32,9 +34,7 @@ export declare function on<T, U>(deps: Array<() => T> | (() => T), fn: (value: A
 }): (prev?: U) => U | undefined;
 export declare function onMount(fn: () => void): void;
 export declare function onCleanup(fn: () => void): () => void;
-export declare function cleanNode(node: {
-    cleanups?: Function[] | null;
-}): void;
+export declare function cleanNode(node: Owner): void;
 export declare function onError(fn: (err: any) => void): void;
 export declare function getListener(): null;
 export interface Context<T> {

package/web/dist/dev.cjs

@@ -460,7 +460,10 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
       }
     } else {
       const value = String(item);
-      if (prev && prev.nodeType === 3 && prev.data === value) {
+      if (value === "<!>") {
+        if (prev && prev.nodeType === 8) normalized.push(prev);
+      } else if (prev && prev.nodeType === 3) {
+        prev.data = value;
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));
     }

package/web/dist/dev.js

@@ -459,7 +459,10 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
       }
     } else {
       const value = String(item);
-      if (prev && prev.nodeType === 3 && prev.data === value) {
+      if (value === "<!>") {
+        if (prev && prev.nodeType === 8) normalized.push(prev);
+      } else if (prev && prev.nodeType === 3) {
+        prev.data = value;
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));
     }

package/web/dist/server.cjs

@@ -278,7 +278,11 @@ function renderToString(code, options = {}) {
       scripts += `_$HY.set("${id}", ${stringify(p)});`;
     }
   };
-  let html = resolveSSRNode(escape(code()));
+  let html = solidJs.createRoot(d => {
+    const r = resolveSSRNode(escape(code()));
+    d();
+    return r;
+  });
   solidJs.sharedConfig.context.noHydrate = true;
   html = injectAssets(solidJs.sharedConfig.context.assets, html);
   if (scripts.length) html = injectScripts(html, scripts, options.nonce);
@@ -304,6 +308,7 @@ function renderToStream(code, options = {}) {
     onCompleteAll,
     renderId
   } = options;
+  let dispose;
   const blockingResources = [];
   const registry = new Map();
   const dedupe = new WeakMap();
@@ -317,6 +322,7 @@ function renderToStream(code, options = {}) {
       });
       writable && writable.end();
       completed = true;
+      dispose();
     }
   };
   const pushTask = task => {
@@ -404,7 +410,10 @@ function renderToStream(code, options = {}) {
       };
     }
   };
-  let html = resolveSSRNode(escape(code()));
+  let html = solidJs.createRoot(d => {
+    dispose = d;
+    return resolveSSRNode(escape(code()));
+  });
   function doShell() {
     solidJs.sharedConfig.context = context;
     context.noHydrate = true;

package/web/dist/server.js

@@ -1,4 +1,4 @@
-import { sharedConfig, splitProps } from 'solid-js';
+import { sharedConfig, createRoot, splitProps } from 'solid-js';
 export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, mergeProps } from 'solid-js';
 
 const booleans = ["allowfullscreen", "async", "autofocus", "autoplay", "checked", "controls", "default", "disabled", "formnovalidate", "hidden", "indeterminate", "ismap", "loop", "multiple", "muted", "nomodule", "novalidate", "open", "playsinline", "readonly", "required", "reversed", "seamless", "selected"];
@@ -277,7 +277,11 @@ function renderToString(code, options = {}) {
       scripts += `_$HY.set("${id}", ${stringify(p)});`;
     }
   };
-  let html = resolveSSRNode(escape(code()));
+  let html = createRoot(d => {
+    const r = resolveSSRNode(escape(code()));
+    d();
+    return r;
+  });
   sharedConfig.context.noHydrate = true;
   html = injectAssets(sharedConfig.context.assets, html);
   if (scripts.length) html = injectScripts(html, scripts, options.nonce);
@@ -303,6 +307,7 @@ function renderToStream(code, options = {}) {
     onCompleteAll,
     renderId
   } = options;
+  let dispose;
   const blockingResources = [];
   const registry = new Map();
   const dedupe = new WeakMap();
@@ -316,6 +321,7 @@ function renderToStream(code, options = {}) {
       });
       writable && writable.end();
       completed = true;
+      dispose();
     }
   };
   const pushTask = task => {
@@ -403,7 +409,10 @@ function renderToStream(code, options = {}) {
       };
     }
   };
-  let html = resolveSSRNode(escape(code()));
+  let html = createRoot(d => {
+    dispose = d;
+    return resolveSSRNode(escape(code()));
+  });
   function doShell() {
     sharedConfig.context = context;
     context.noHydrate = true;

package/web/dist/web.cjs

@@ -460,7 +460,10 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
       }
     } else {
       const value = String(item);
-      if (prev && prev.nodeType === 3 && prev.data === value) {
+      if (value === "<!>") {
+        if (prev && prev.nodeType === 8) normalized.push(prev);
+      } else if (prev && prev.nodeType === 3) {
+        prev.data = value;
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));
     }

package/web/dist/web.js

@@ -459,7 +459,10 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
       }
     } else {
       const value = String(item);
-      if (prev && prev.nodeType === 3 && prev.data === value) {
+      if (value === "<!>") {
+        if (prev && prev.nodeType === 8) normalized.push(prev);
+      } else if (prev && prev.nodeType === 3) {
+        prev.data = value;
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));
     }