xote 6.1.2 → 6.2.0

package/src/SSR.res.mjs

@@ -1,72 +1,9 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Signal$Xote from "./Signal.res.mjs";
-
-function escape(str) {
-  return str.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;").replaceAll("'", "&#x27;");
-}
-
-let voidElements = [
-  "area",
-  "base",
-  "br",
-  "col",
-  "embed",
-  "hr",
-  "img",
-  "input",
-  "link",
-  "meta",
-  "param",
-  "source",
-  "track",
-  "wbr"
-];
-
-function isVoidElement(tag) {
-  return voidElements.includes(tag);
-}
-
-let Html = {
-  escape: escape,
-  voidElements: voidElements,
-  isVoidElement: isVoidElement
-};
-
-let signalTextStart = "<!--$-->";
-
-let signalTextEnd = "<!--/$-->";
-
-let signalFragmentStart = "<!--#-->";
-
-let signalFragmentEnd = "<!--/#-->";
-
-let keyedListStart = "<!--kl-->";
-
-let keyedListEnd = "<!--/kl-->";
-
-function keyedItemStart(key) {
-  return `<!--k:` + key + `-->`;
-}
-
-let keyedItemEnd = "<!--/k-->";
-
-let lazyComponentStart = "<!--lc-->";
-
-let lazyComponentEnd = "<!--/lc-->";
-
-let Markers = {
-  signalTextStart: signalTextStart,
-  signalTextEnd: signalTextEnd,
-  signalFragmentStart: signalFragmentStart,
-  signalFragmentEnd: signalFragmentEnd,
-  keyedListStart: keyedListStart,
-  keyedListEnd: keyedListEnd,
-  keyedItemStart: keyedItemStart,
-  keyedItemEnd: keyedItemEnd,
-  lazyComponentStart: lazyComponentStart,
-  lazyComponentEnd: lazyComponentEnd
-};
+import * as RuntimeAttr$Xote from "./RuntimeAttr.res.mjs";
+import * as RuntimeHtml$Xote from "./RuntimeHtml.res.mjs";
+import * as RuntimeHydrationMarkers$Xote from "./RuntimeHydrationMarkers.res.mjs";
 
 function renderAttr(param) {
   let value = param[1];
@@ -83,28 +20,14 @@ function renderAttr(param) {
       attrValue = value._0();
       break;
   }
-  switch (key) {
-    case "aria-expanded" :
-    case "aria-hidden" :
-    case "aria-selected" :
-    case "autofocus" :
-    case "checked" :
-    case "contenteditable" :
-    case "disabled" :
-    case "draggable" :
-    case "hidden" :
-    case "multiple" :
-    case "readonly" :
-    case "required" :
-    case "spellcheck" :
-      break;
-    default:
-      return key + `="` + escape(attrValue) + `"`;
-  }
-  if (attrValue === "true") {
-    return key;
+  if (RuntimeAttr$Xote.isBoolean(key)) {
+    if (RuntimeAttr$Xote.shouldRenderBoolean(attrValue)) {
+      return key;
+    } else {
+      return "";
+    }
   } else {
-    return "";
+    return key + `="` + RuntimeHtml$Xote.escape(attrValue) + `"`;
   }
 }
 
@@ -122,41 +45,47 @@ let Attributes = {
   renderAttrs: renderAttrs
 };
 
-function renderNodeToString(node) {
-  switch (node.TAG) {
-    case "Element" :
-      let tag = node.tag;
-      let attrsStr = renderAttrs(node.attrs);
-      if (voidElements.includes(tag)) {
-        return `<` + tag + attrsStr + ` />`;
-      }
-      let childrenStr = node.children.map(renderNodeToString).join("");
-      return `<` + tag + attrsStr + `>` + childrenStr + `</` + tag + `>`;
-    case "Text" :
-      return escape(node._0);
-    case "SignalText" :
-      let value = Signal$Xote.peek(node._0);
-      return signalTextStart + escape(value) + signalTextEnd;
-    case "Fragment" :
-      return node._0.map(renderNodeToString).join("");
-    case "SignalFragment" :
-      let children = Signal$Xote.peek(node._0);
-      let content = children.map(renderNodeToString).join("");
-      return signalFragmentStart + content + signalFragmentEnd;
-    case "LazyComponent" :
-      let childNode = node._0();
-      return lazyComponentStart + renderNodeToString(childNode) + lazyComponentEnd;
-    case "KeyedList" :
-      let renderItem = node.renderItem;
-      let keyFn = node.keyFn;
-      let items = Signal$Xote.peek(node.signal);
-      let content$1 = items.map(item => {
-        let key = keyFn(item);
-        let itemHtml = renderNodeToString(renderItem(item));
-        return keyedItemStart(key) + itemHtml + keyedItemEnd;
-      }).join("");
-      return keyedListStart + content$1 + keyedListEnd;
-  }
+function renderNodeToString(_node) {
+  while (true) {
+    let node = _node;
+    switch (node.TAG) {
+      case "Element" :
+        let tag = node.tag;
+        let attrsStr = renderAttrs(node.attrs);
+        if (RuntimeHtml$Xote.isVoidElement(tag)) {
+          return `<` + tag + attrsStr + ` />`;
+        }
+        let childrenStr = node.children.map(renderNodeToString).join("");
+        return `<` + tag + attrsStr + `>` + childrenStr + `</` + tag + `>`;
+      case "Text" :
+        return RuntimeHtml$Xote.escape(node._0);
+      case "SignalText" :
+        let value = Signal$Xote.peek(node._0);
+        return RuntimeHydrationMarkers$Xote.signalTextStart + RuntimeHtml$Xote.escape(value) + RuntimeHydrationMarkers$Xote.signalTextEnd;
+      case "Fragment" :
+        return node._0.map(renderNodeToString).join("");
+      case "SignalFragment" :
+        let children = Signal$Xote.peek(node._0);
+        let content = children.map(renderNodeToString).join("");
+        return RuntimeHydrationMarkers$Xote.signalFragmentStart + content + RuntimeHydrationMarkers$Xote.signalFragmentEnd;
+      case "Keyed" :
+        _node = node.child;
+        continue;
+      case "LazyComponent" :
+        let childNode = node._0();
+        return RuntimeHydrationMarkers$Xote.lazyComponentStart + renderNodeToString(childNode) + RuntimeHydrationMarkers$Xote.lazyComponentEnd;
+      case "KeyedList" :
+        let renderItem = node.renderItem;
+        let keyFn = node.keyFn;
+        let items = Signal$Xote.peek(node.signal);
+        let content$1 = items.map(item => {
+          let key = keyFn(item);
+          let itemHtml = renderNodeToString(renderItem(item));
+          return RuntimeHydrationMarkers$Xote.keyedItemStart(key) + itemHtml + RuntimeHydrationMarkers$Xote.keyedItemEnd;
+        }).join("");
+        return RuntimeHydrationMarkers$Xote.keyedListStart + content$1 + RuntimeHydrationMarkers$Xote.keyedListEnd;
+    }
+  };
 }
 
 function renderToString(component, optionsOpt) {
@@ -171,7 +100,7 @@ function renderToStringWithRoot(component, rootIdOpt, optionsOpt) {
 }
 
 function generateHydrationScript(nonce) {
-  let nonceAttr = nonce !== undefined ? ` nonce="` + escape(nonce) + `"` : "";
+  let nonceAttr = nonce !== undefined ? ` nonce="` + RuntimeHtml$Xote.escape(nonce) + `"` : "";
   return `<script` + nonceAttr + `>window.__XOTE_HYDRATED__=false;</script>`;
 }
 
@@ -183,10 +112,10 @@ function renderDocument(headOpt, bodyAttrsOpt, scriptsOpt, stylesOpt, stateScrip
   let stateScript = stateScriptOpt !== undefined ? stateScriptOpt : "";
   let content = renderToString(component, undefined);
   let hydrationScript = generateHydrationScript(nonce);
-  let styleLinks = styles.map(href => `<link rel="stylesheet" href="` + escape(href) + `" />`).join("\n    ");
+  let styleLinks = styles.map(href => `<link rel="stylesheet" href="` + RuntimeHtml$Xote.escape(href) + `" />`).join("\n    ");
   let scriptTags = scripts.map(src => {
-    let nonceAttr = nonce !== undefined ? ` nonce="` + escape(nonce) + `"` : "";
-    return `<script type="module" src="` + escape(src) + `"` + nonceAttr + `></script>`;
+    let nonceAttr = nonce !== undefined ? ` nonce="` + RuntimeHtml$Xote.escape(nonce) + `"` : "";
+    return `<script type="module" src="` + RuntimeHtml$Xote.escape(src) + `"` + nonceAttr + `></script>`;
   }).join("\n    ");
   return `<!DOCTYPE html>
 <html>
@@ -207,6 +136,10 @@ function renderDocument(headOpt, bodyAttrsOpt, scriptsOpt, stylesOpt, stateScrip
 </html>`;
 }
 
+let Html;
+
+let Markers;
+
 export {
   Html,
   Markers,

package/src/SSRState.res

@@ -244,3 +244,6 @@ let make = (id: string, initial: 'a, codec: Codec.t<'a>): Signal.t<'a> => {
   sync(id, signal, codec)
   signal
 }
+
+let signal = make
+let syncSignal = sync

package/src/SSRState.res.mjs

@@ -1,6 +1,5 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as SSR$Xote from "./SSR.res.mjs";
 import * as Signal$Xote from "./Signal.res.mjs";
 import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
@@ -8,6 +7,7 @@ import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as SSRContext$Xote from "./SSRContext.res.mjs";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
+import * as RuntimeHtml$Xote from "./RuntimeHtml.res.mjs";
 
 function int_encode(v) {
   return v;
@@ -234,7 +234,7 @@ function escapeForScript(str) {
 function generateScript(nonce) {
   let json = Stdlib_Option.getOr(JSON.stringify(registry), "{}");
   let escapedJson = escapeForScript(json);
-  let nonceAttr = nonce !== undefined ? ` nonce="` + SSR$Xote.Html.escape(nonce) + `"` : "";
+  let nonceAttr = nonce !== undefined ? ` nonce="` + RuntimeHtml$Xote.escape(nonce) + `"` : "";
   return `<script` + nonceAttr + `>window.__XOTE_STATE__=` + escapedJson + `;</script>`;
 }
 
@@ -271,6 +271,10 @@ function make$1(id, initial, codec) {
   return signal;
 }
 
+let signal = make$1;
+
+let syncSignal = sync;
+
 export {
   Codec,
   registry,
@@ -282,5 +286,7 @@ export {
   restore,
   sync,
   make$1 as make,
+  signal,
+  syncSignal,
 }
 /* SSRContext-Xote Not a pure module */