dom-expressions 0.35.21 → 0.35.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dom-expressions",
   "description": "A Fine-Grained Runtime for Performant DOM Rendering",
-  "version": "0.35.21",
+  "version": "0.35.23",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -23,8 +23,8 @@
     "csstype": "^3.0"
   },
   "devDependencies": {
-    "babel-plugin-jsx-dom-expressions": "^0.35.19",
+    "babel-plugin-jsx-dom-expressions": "^0.35.23",
     "csstype": "^3.1"
   },
-  "gitHead": "c110a1d909116fb418691a5145281164330051cf"
+  "gitHead": "3f44ae32aeacdae833f18882b79e34cc1960c1a9"
 }

package/src/client.js

@@ -368,7 +368,16 @@ function eventHandler(e) {
 }
 
 function insertExpression(parent, value, current, marker, unwrapArray) {
-  if (sharedConfig.context && !current) current = [...parent.childNodes];
+  if (sharedConfig.context) {
+    !current && (current = [...parent.childNodes]);
+    let cleaned = [];
+    for (let i = 0; i < current.length; i++) {
+      const node = current[i];
+      if (node.nodeType === 8 && node.data === "!") node.remove();
+      else cleaned.push(node);
+    }
+    current = cleaned;
+  }
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -467,9 +476,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
     } else {
       // NOTE: is String better than `item + ''`, ``${item}``, `item.toString()` and `item.valueOf()`?
       const value = String(item);
-      if (value === "<!>") {
-        if (prev && prev.nodeType === 8) normalized.push(prev);
-      } else if (prev && prev.nodeType === 3) {
+      if (prev && prev.nodeType === 3) {
         prev.data = value;
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));

package/src/jsx.d.ts

@@ -798,11 +798,13 @@ export namespace JSX {
     accept?: string;
     alt?: string;
     autocomplete?: string;
+    autocorrect?: "on" | "off";
     autofocus?: boolean;
     capture?: boolean | string;
     checked?: boolean;
     crossorigin?: HTMLCrossorigin;
     disabled?: boolean;
+    enterkeyhint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';
     form?: string;
     formaction?: string;
     formenctype?: HTMLFormEncType;
@@ -810,6 +812,7 @@ export namespace JSX {
     formnovalidate?: boolean;
     formtarget?: string;
     height?: number | string;
+    incremental?: boolean;
     list?: string;
     max?: number | string;
     maxlength?: number | string;
@@ -820,6 +823,7 @@ export namespace JSX {
     pattern?: string;
     placeholder?: string;
     readonly?: boolean;
+    results?: number;
     required?: boolean;
     size?: number | string;
     src?: string;

package/src/server.js

@@ -25,9 +25,8 @@ export function renderToString(code, options = {}) {
     }
   };
   let html = root(d => {
-    const r = resolveSSRNode(escape(code()));
-    d();
-    return r;
+    setTimeout(d);
+    return resolveSSRNode(escape(code()));
   });
   sharedConfig.context.noHydrate = true;
   html = injectAssets(sharedConfig.context.assets, html);
@@ -64,7 +63,7 @@ export function renderToStream(code, options = {}) {
         });
       writable && writable.end();
       completed = true;
-      dispose();
+      setTimeout(dispose);
     }
   };
   const pushTask = task => {
@@ -349,11 +348,10 @@ export function ssrHydrationKey() {
 export function escape(s, attr) {
   const t = typeof s;
   if (t !== "string") {
-    if (!attr && t === "function") return escape(s(), attr);
+    if (!attr && t === "function") return escape(s());
     if (!attr && Array.isArray(s)) {
-      let r = "";
-      for (let i = 0; i < s.length; i++) r += resolveSSRNode(escape(s[i], attr));
-      return { t: r };
+      for (let i = 0; i < s.length; i++) s[i] = escape(s[i]);
+      return s;
     }
     if (attr && t === "boolean") return String(s);
     return s;
@@ -405,8 +403,12 @@ export function resolveSSRNode(node) {
   if (t === "string") return node;
   if (node == null || t === "boolean") return "";
   if (Array.isArray(node)) {
+    let prev = {};
     let mapped = "";
-    for (let i = 0, len = node.length; i < len; i++) mapped += resolveSSRNode(node[i]);
+    for (let i = 0, len = node.length; i < len; i++) {
+      if (typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!-->`;
+      mapped += resolveSSRNode(prev = node[i]);
+    }
     return mapped;
   }
   if (t === "object") return node.t;

package/src/universal.d.ts

@@ -23,6 +23,7 @@ export interface Renderer<NodeType> {
   spread<T>(node: any, accessor: (() => T) | T, skipChildren?: Boolean): void;
   setProp<T>(node: NodeType, name: string, value: T, prev?: T): T;
   mergeProps(...sources: unknown[]): unknown;
+  use<A, T>(fn: (element: NodeType, arg: A) => T, element: NodeType, arg: A): T;
 }
 
 export function createRenderer<NodeType>(options: RendererOptions<NodeType>): Renderer<NodeType>;