dom-expressions 0.37.13 → 0.37.14

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dom-expressions",
   "description": "A Fine-Grained Runtime for Performant DOM Rendering",
-  "version": "0.37.13",
+  "version": "0.37.14",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -29,5 +29,5 @@
     "seroval": "^1.0.2",
     "seroval-plugins": "^1.0.2"
   },
-  "gitHead": "ae2bc5ecd4f8dd61df0b2eb5c4ed0ae7589b6a6b"
+  "gitHead": "e4ec396f109c89a1b86d82b53bbfbf2cc66764b1"
 }

package/src/client.js

@@ -308,7 +308,7 @@ function assignProp(node, prop, value, prev, isSVG, skipRef) {
   let isCE, isProp, isChildProp, propAlias, forceProp;
   if (prop === "style") return style(node, value, prev);
   if (prop === "classList") return classList(node, value, prev);
-  if (value === prev && (prop !== "value" || prop !== "checked")) return prev;
+  if (value === prev && prop !== "value" && prop !== "checked") return prev;
   if (prop === "ref") {
     if (!skipRef) value(node);
   } else if (prop.slice(0, 3) === "on:") {

package/src/server.js

@@ -65,7 +65,6 @@ export function renderToStream(code, options = {}) {
   const blockingPromises = [];
   const pushTask = task => {
     if (noScripts) return;
-    // TODO is the correct place to put this
     if (!tasks && !firstFlushed) {
       tasks = getLocalHeaderScript(renderId);
     }
@@ -74,24 +73,23 @@ export function renderToStream(code, options = {}) {
       timer = setTimeout(writeTasks);
     }
   };
-  const checkEnd = () => {
-    if (!registry.size && !completed) {
-      writeTasks();
-      onCompleteAll &&
-        onCompleteAll({
-          write(v) {
-            !completed && buffer.write(v);
-          }
-        });
-      writable && writable.end();
-      completed = true;
-      setTimeout(dispose);
-    }
+  const onDone = () => {
+    writeTasks();
+    doShell();
+    onCompleteAll &&
+      onCompleteAll({
+        write(v) {
+          !completed && buffer.write(v);
+        }
+      });
+    writable && writable.end();
+    completed = true;
+    if (firstFlushed) dispose();
   };
   const serializer = createSerializer({
     scopeId: options.renderId,
     onData: pushTask,
-    onDone: checkEnd,
+    onDone,
     onError: options.onError
   });
   const flushEnd = () => {
@@ -118,6 +116,7 @@ export function renderToStream(code, options = {}) {
   let tasks = "";
   let firstFlushed = false;
   let completed = false;
+  let shellCompleted = false;
   let scriptFlushed = false;
   let timer = null;
   let buffer = {
@@ -208,6 +207,7 @@ export function renderToStream(code, options = {}) {
     return resolveSSRNode(escape(code()));
   });
   function doShell() {
+    if (shellCompleted) return;
     sharedConfig.context = context;
     context.noHydrate = true;
     html = injectAssets(context.assets, html);
@@ -220,12 +220,12 @@ export function renderToStream(code, options = {}) {
           !completed && buffer.write(v);
         }
       });
+    shellCompleted = true;
   }
-
   return {
     then(fn) {
       function complete() {
-        doShell();
+        dispose();
         fn(tmp);
       }
       if (onCompleteAll) {
@@ -235,7 +235,7 @@ export function renderToStream(code, options = {}) {
           complete();
         };
       } else onCompleteAll = complete;
-      if (!registry.size) queue(flushEnd);
+      queue(flushEnd);
     },
     pipe(w) {
       allSettled(blockingPromises).then(() => {
@@ -244,8 +244,10 @@ export function renderToStream(code, options = {}) {
           buffer = writable = w;
           buffer.write(tmp);
           firstFlushed = true;
-          if (completed) writable.end();
-          else queue(flushEnd);
+          if (completed) {
+            dispose();
+            writable.end();
+          } else flushEnd();
         });
       });
     },
@@ -271,8 +273,10 @@ export function renderToStream(code, options = {}) {
           };
           buffer.write(tmp);
           firstFlushed = true;
-          if (completed) writable.end();
-          else queue(flushEnd);
+          if (completed) {
+            dispose();
+            writable.end();
+          } else flushEnd();
         });
         return p;
       });