@opentui/solid 0.1.85 → 0.1.87

package/dist/index.d.ts

@@ -83,6 +83,7 @@ export function _render(code: any, element: any): undefined;
 export class UnderlineSpanRenderable extends TextModifierRenderable {
     constructor(options: any);
 }
+export function TimeToFirstDraw(props: any): any;
 export class TextSlotRenderable extends TextNodeRenderable3 {
     constructor(id: any, parent: any);
     slotParent: any;

package/index.d.ts

@@ -13,5 +13,6 @@ export declare const testRender: (node: () => JSX.Element, renderConfig?: TestRe
 }>;
 export * from "./src/reconciler";
 export * from "./src/elements";
+export * from "./src/time-to-first-draw";
 export * from "./src/types/elements";
 export { type JSX };

package/index.js

@@ -124,6 +124,7 @@ import {
   TextNodeRenderable,
   TextRenderable
 } from "@opentui/core";
+import { decodeHTML } from "entities";
 import { useContext as useContext2 } from "solid-js";
 
 // src/renderer/universal.js
@@ -482,7 +483,7 @@ function _createTextNode(value) {
   if (typeof value === "number") {
     value = value.toString();
   }
-  return TextNode.fromString(value, { id });
+  return TextNode.fromString(decodeHTML(value), { id });
 }
 function createSlotNode() {
   const id = getNextId("slot-node");
@@ -536,7 +537,7 @@ var {
     log("Replacing text:", value, "in node:", logId(textNode));
     if (!(textNode instanceof TextNode))
       return;
-    textNode.replace(value, 0);
+    textNode.replace(decodeHTML(value), 0);
   },
   setProperty(node, name, value, prev) {
     if (name.startsWith("on:")) {
@@ -642,9 +643,11 @@ var {
         }
         break;
       case "text":
-      case "content":
-        node[name] = typeof value === "string" ? value : Array.isArray(value) ? value.join("") : `${value}`;
+      case "content": {
+        const textValue = typeof value === "string" ? value : Array.isArray(value) ? value.join("") : `${value}`;
+        node[name] = decodeHTML(textValue);
         break;
+      }
       default:
         node[name] = value;
     }
@@ -930,60 +933,85 @@ function extend(objects) {
 function getComponentCatalogue() {
   return componentCatalogue;
 }
+// src/time-to-first-draw.tsx
+import { TimeToFirstDrawRenderable } from "@opentui/core";
+extend({
+  time_to_first_draw: TimeToFirstDrawRenderable
+});
+var TimeToFirstDraw = (props) => {
+  return (() => {
+    var _el$ = createElement("time_to_first_draw");
+    spread(_el$, props, false);
+    return _el$;
+  })();
+};
 
 // index.ts
-var render = async (node, rendererOrConfig = {}) => {
-  let isDisposed = false;
+var mountSolidRoot = (renderer, node) => {
   let dispose;
+  let disposeRequested = false;
+  let disposed = false;
+  let mounting = true;
+  let destroyRequested = false;
+  const originalDestroy = renderer.destroy.bind(renderer);
+  const runDispose = () => {
+    if (disposed) {
+      return;
+    }
+    if (!dispose) {
+      disposeRequested = true;
+      return;
+    }
+    disposed = true;
+    dispose();
+  };
+  renderer.once("destroy", runDispose);
+  renderer.destroy = () => {
+    if (mounting) {
+      destroyRequested = true;
+      return;
+    }
+    originalDestroy();
+  };
+  try {
+    dispose = _render(() => createComponent2(RendererContext.Provider, {
+      get value() {
+        return renderer;
+      },
+      get children() {
+        return createComponent2(node, {});
+      }
+    }), renderer.root);
+  } finally {
+    mounting = false;
+    renderer.destroy = originalDestroy;
+  }
+  if (disposeRequested) {
+    runDispose();
+  }
+  if (destroyRequested) {
+    originalDestroy();
+  }
+};
+var render = async (node, rendererOrConfig = {}) => {
   const renderer = rendererOrConfig instanceof CliRenderer ? rendererOrConfig : await createCliRenderer({
     ...rendererOrConfig,
     onDestroy: () => {
-      if (!isDisposed) {
-        isDisposed = true;
-        dispose();
-      }
       rendererOrConfig.onDestroy?.();
     }
   });
-  if (rendererOrConfig instanceof CliRenderer) {
-    renderer.on("destroy", () => {
-      if (!isDisposed) {
-        isDisposed = true;
-        dispose();
-      }
-    });
-  }
   engine2.attach(renderer);
-  dispose = _render(() => createComponent2(RendererContext.Provider, {
-    get value() {
-      return renderer;
-    },
-    get children() {
-      return createComponent2(node, {});
-    }
-  }), renderer.root);
+  mountSolidRoot(renderer, node);
 };
 var testRender = async (node, renderConfig = {}) => {
-  let isDisposed = false;
   const testSetup = await createTestRenderer({
     ...renderConfig,
     onDestroy: () => {
-      if (!isDisposed) {
-        isDisposed = true;
-        dispose();
-      }
       renderConfig.onDestroy?.();
     }
   });
   engine2.attach(testSetup.renderer);
-  const dispose = _render(() => createComponent2(RendererContext.Provider, {
-    get value() {
-      return testSetup.renderer;
-    },
-    get children() {
-      return createComponent2(node, {});
-    }
-  }), testSetup.renderer.root);
+  mountSolidRoot(testSetup.renderer, node);
   return testSetup;
 };
 export {
@@ -1017,6 +1045,7 @@ export {
   baseComponents,
   _render,
   UnderlineSpanRenderable,
+  TimeToFirstDraw,
   TextSlotRenderable,
   SlotRenderable,
   RendererContext,

package/package.json

@@ -4,7 +4,7 @@
   "main": "index.js",
   "types": "index.d.ts",
   "type": "module",
-  "version": "0.1.85",
+  "version": "0.1.87",
   "description": "SolidJS renderer for OpenTUI",
   "license": "MIT",
   "repository": {
@@ -31,9 +31,10 @@
   "dependencies": {
     "@babel/core": "7.28.0",
     "@babel/preset-typescript": "7.27.1",
-    "@opentui/core": "0.1.85",
+    "@opentui/core": "0.1.87",
     "babel-plugin-module-resolver": "5.0.2",
     "babel-preset-solid": "1.9.9",
+    "entities": "7.0.1",
     "s-js": "^0.4.9"
   },
   "devDependencies": {

package/scripts/solid-plugin.ts

@@ -1,4 +1,5 @@
 import { transformAsync } from "@babel/core"
+import { readFile } from "node:fs/promises"
 // @ts-expect-error - Types not important.
 import ts from "@babel/preset-typescript"
 // @ts-expect-error - Types not important.
@@ -10,19 +11,16 @@ const solidTransformPlugin: BunPlugin = {
   setup: (build) => {
     build.onLoad({ filter: /\/node_modules\/solid-js\/dist\/server\.js$/ }, async (args) => {
       const path = args.path.replace("server.js", "solid.js")
-      const file = Bun.file(path)
-      const code = await file.text()
+      const code = await readFile(path, "utf8")
       return { contents: code, loader: "js" }
     })
     build.onLoad({ filter: /\/node_modules\/solid-js\/store\/dist\/server\.js$/ }, async (args) => {
       const path = args.path.replace("server.js", "store.js")
-      const file = Bun.file(path)
-      const code = await file.text()
+      const code = await readFile(path, "utf8")
       return { contents: code, loader: "js" }
     })
     build.onLoad({ filter: /\.(js|ts)x$/ }, async (args) => {
-      const file = Bun.file(args.path)
-      const code = await file.text()
+      const code = await readFile(args.path, "utf8")
       const transforms = await transformAsync(code, {
         filename: args.path,
         // env: {

package/src/time-to-first-draw.d.ts

@@ -0,0 +1,9 @@
+import { TimeToFirstDrawRenderable } from "@opentui/core";
+import type { ExtendedComponentProps } from "./types/elements";
+declare module "@opentui/solid" {
+    interface OpenTUIComponents {
+        time_to_first_draw: typeof TimeToFirstDrawRenderable;
+    }
+}
+export type TimeToFirstDrawProps = ExtendedComponentProps<typeof TimeToFirstDrawRenderable>;
+export declare const TimeToFirstDraw: (props: TimeToFirstDrawProps) => any;