@opentui/core 0.1.17 → 0.1.19-snapshot4-010c3be8

package/3d.js

@@ -5,7 +5,7 @@ import {
   __export,
   __require,
   __toESM
-} from "./index-vg0fxf54.js";
+} from "./index-grak7z0n.js";
 
 // ../../node_modules/omggif/omggif.js
 var require_omggif = __commonJS((exports) => {

package/README.md

@@ -37,7 +37,7 @@ import { createCliRenderer, TextRenderable } from "@opentui/core"
 
 const renderer = await createCliRenderer()
 
-const obj = new TextRenderable("my-obj", { content: "Hello, world!" })
+const obj = new TextRenderable(renderer, { id: "my-obj", content: "Hello, world!" })
 
 renderer.root.add(obj)
 ```

package/Renderable.d.ts

@@ -95,6 +95,7 @@ export declare abstract class Renderable extends EventEmitter {
     static renderablesByNumber: Map<number, Renderable>;
     readonly id: string;
     readonly num: number;
+    private _isDestroyed;
     protected _ctx: RenderContext;
     protected _translateX: number;
     protected _translateY: number;
@@ -231,6 +232,7 @@ export declare abstract class Renderable extends EventEmitter {
         height: number;
     };
     protected renderSelf(buffer: OptimizedBuffer, deltaTime: number): void;
+    get isDestroyed(): boolean;
     destroy(): void;
     destroyRecursively(): void;
     protected destroySelf(): void;

package/{index-vg0fxf54.js → index-grak7z0n.js}

@@ -5823,6 +5823,7 @@ class Renderable extends EventEmitter3 {
   static renderablesByNumber = new Map;
   id;
   num;
+  _isDestroyed = false;
   _ctx;
   _translateX = 0;
   _translateY = 0;
@@ -6552,26 +6553,35 @@ class Renderable extends EventEmitter3 {
     if (!obj) {
       return -1;
     }
-    obj = ensureRenderable(this._ctx, obj);
-    if (this.renderableMap.has(obj.id)) {
-      console.warn(`A renderable with id ${obj.id} already exists in ${this.id}, removing it`);
-      this.remove(obj.id);
+    const renderable = maybeMakeRenderable(this._ctx, obj);
+    if (!renderable) {
+      return -1;
+    }
+    if (renderable.isDestroyed) {
+      if (true) {
+        console.warn(`Renderable with id ${renderable.id} was already destroyed, skipping add`);
+      }
+      return -1;
     }
-    this.replaceParent(obj);
-    const childLayoutNode = obj.getLayoutNode();
+    if (this.renderableMap.has(renderable.id)) {
+      console.warn(`A renderable with id ${renderable.id} already exists in ${this.id}, removing it`);
+      this.remove(renderable.id);
+    }
+    this.replaceParent(renderable);
+    const childLayoutNode = renderable.getLayoutNode();
     let insertedIndex;
     if (index !== undefined) {
-      this.renderableArray.splice(index, 0, obj);
+      this.renderableArray.splice(index, 0, renderable);
       insertedIndex = this.layoutNode.insertChild(childLayoutNode, index);
     } else {
-      this.renderableArray.push(obj);
+      this.renderableArray.push(renderable);
       insertedIndex = this.layoutNode.addChild(childLayoutNode);
     }
     this.needsZIndexSort = true;
     this.childrenPrimarySortDirty = true;
-    this.renderableMap.set(obj.id, obj);
-    if (obj._liveCount > 0) {
-      this.propagateLiveCount(obj._liveCount);
+    this.renderableMap.set(renderable.id, renderable);
+    if (renderable._liveCount > 0) {
+      this.propagateLiveCount(renderable._liveCount);
     }
     this.requestRender();
     return insertedIndex;
@@ -6580,9 +6590,12 @@ class Renderable extends EventEmitter3 {
     if (!obj) {
       return -1;
     }
-    obj = ensureRenderable(this._ctx, obj);
+    const renderable = maybeMakeRenderable(this._ctx, obj);
+    if (!renderable) {
+      return -1;
+    }
     if (!anchor) {
-      return this.add(obj);
+      return this.add(renderable);
     }
     if (!this.renderableMap.has(anchor.id)) {
       throw new Error("Anchor does not exist");
@@ -6591,7 +6604,7 @@ class Renderable extends EventEmitter3 {
     if (anchorIndex === -1) {
       throw new Error("Anchor does not exist");
     }
-    return this.add(obj, anchorIndex);
+    return this.add(renderable, anchorIndex);
   }
   getRenderable(id) {
     return this.renderableMap.get(id);
@@ -6674,7 +6687,14 @@ class Renderable extends EventEmitter3 {
     };
   }
   renderSelf(buffer, deltaTime) {}
+  get isDestroyed() {
+    return this._isDestroyed;
+  }
   destroy() {
+    if (this._isDestroyed) {
+      return;
+    }
+    this._isDestroyed = true;
     if (this.parent) {
       this.parent.remove(this.id);
     }
@@ -6683,16 +6703,15 @@ class Renderable extends EventEmitter3 {
       this.frameBuffer = null;
     }
     for (const child of this.renderableArray) {
-      child.parent = null;
-      child.destroy();
+      this.remove(child.id);
     }
     this.renderableArray = [];
     this.renderableMap.clear();
     Renderable.renderablesByNumber.delete(this.num);
-    this.layoutNode.destroy();
     this.blur();
     this.removeAllListeners();
     this.destroySelf();
+    this.layoutNode.destroy();
   }
   destroyRecursively() {
     this.destroy();
@@ -6847,11 +6866,12 @@ class RootRenderable extends Renderable {
     try {
       this.yogaConfig.free();
     } catch (error) {}
-    super.destroySelf();
   }
 }
 
 // src/renderables/composition/vnode.ts
+import util from "util";
+var BrandedVNode = Symbol.for("@opentui/core/VNode");
 function isRenderableConstructor(value) {
   return typeof value === "function" && value.prototype && Renderable.prototype.isPrototypeOf(value.prototype);
 }
@@ -6871,7 +6891,7 @@ function h(type, props, ...children) {
     throw new TypeError("h() received an invalid vnode type");
   }
   const vnode = {
-    __isVNode: true,
+    [BrandedVNode]: true,
     type,
     props,
     children: flattenChildren(children),
@@ -6913,12 +6933,17 @@ function h(type, props, ...children) {
   return vnode;
 }
 function isVNode(node) {
-  return node && node.__isVNode;
+  return node && node[BrandedVNode];
 }
-function ensureRenderable(ctx, node) {
+function maybeMakeRenderable(ctx, node) {
   if (isRenderable(node))
     return node;
-  return instantiate(ctx, node);
+  if (isVNode(node))
+    return instantiate(ctx, node);
+  if (true) {
+    console.warn("maybeMakeRenderable received an invalid node", util.inspect(node, { depth: 2 }));
+  }
+  return null;
 }
 function wrapWithDelegates(instance, delegateMap) {
   if (!delegateMap || Object.keys(delegateMap).length === 0)
@@ -7015,7 +7040,7 @@ import { EventEmitter as EventEmitter5 } from "events";
 import { Console } from "console";
 import fs from "fs";
 import path from "path";
-import util from "util";
+import util2 from "util";
 
 // src/lib/output.capture.ts
 import { Writable } from "stream";
@@ -7431,13 +7456,13 @@ class TerminalConsole extends EventEmitter5 {
       }
       if (typeof arg === "object" && arg !== null) {
         try {
-          return util.inspect(arg, { depth: 2 });
+          return util2.inspect(arg, { depth: 2 });
         } catch (e) {
           return String(arg);
         }
       }
       try {
-        return util.inspect(arg, { depth: 2 });
+        return util2.inspect(arg, { depth: 2 });
       } catch (e) {
         return String(arg);
       }
@@ -7911,6 +7936,8 @@ class CliRenderer extends EventEmitter6 {
         }, 100);
       }).then(() => {
         this.realStdoutWrite.call(this.stdout, `
+`.repeat(this._terminalHeight));
+        this.realStdoutWrite.call(this.stdout, `
 === FATAL ERROR OCCURRED ===
 `);
         this.realStdoutWrite.call(this.stdout, `Console cache:
@@ -8744,7 +8771,7 @@ Error details:
   }
 }
 
-export { __toESM, __commonJS, __export, __require, Edge, Gutter, MeasureMode, BorderChars, getBorderFromSides, getBorderSides, borderCharsToArray, BorderCharArrays, TrackedNode, createTrackedNode, nonAlphanumericKeys, parseKeypress, KeyHandler, getKeyHandler, RGBA, hexToRgb, rgbToHex, hsvToRgb, parseColor, fonts, measureText, getCharacterPositions, coordinateToCharacterIndex, renderFontToFrameBuffer, TextAttributes, DebugOverlayCorner, createTextAttributes, StyledText, stringToStyledText, black, red, green, yellow, blue, magenta, cyan, white, brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite, bgBlack, bgRed, bgGreen, bgYellow, bgBlue, bgMagenta, bgCyan, bgWhite, bold, italic, underline, strikethrough, dim, reverse, blink, fg, bg, tn, t, SyntaxStyle, hastToStyledText, parseAlign, parseBoxSizing, parseDimension, parseDirection, parseDisplay, parseEdge, parseFlexDirection, parseGutter, parseJustify, parseLogLevel, parseMeasureMode, parseOverflow, parsePositionType, parseUnit, parseWrap, MouseParser, Selection, convertGlobalToLocalSelection, ASCIIFontSelectionHelper, TextBuffer, LogLevel2 as LogLevel, setRenderLibPath, resolveRenderLib, OptimizedBuffer, h, isVNode, ensureRenderable, wrapWithDelegates, instantiate, delegate, LayoutEvents, RenderableEvents, isValidPercentage, isMarginType, isPaddingType, isPositionType, isPositionTypeType, isOverflowType, isDimensionType, isFlexBasisType, isSizeType, isRenderable, Renderable, RootRenderable, capture, ConsolePosition, TerminalConsole, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, CliRenderer };
+export { __toESM, __commonJS, __export, __require, Edge, Gutter, MeasureMode, BorderChars, getBorderFromSides, getBorderSides, borderCharsToArray, BorderCharArrays, TrackedNode, createTrackedNode, nonAlphanumericKeys, parseKeypress, KeyHandler, getKeyHandler, RGBA, hexToRgb, rgbToHex, hsvToRgb, parseColor, fonts, measureText, getCharacterPositions, coordinateToCharacterIndex, renderFontToFrameBuffer, TextAttributes, DebugOverlayCorner, createTextAttributes, StyledText, stringToStyledText, black, red, green, yellow, blue, magenta, cyan, white, brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite, bgBlack, bgRed, bgGreen, bgYellow, bgBlue, bgMagenta, bgCyan, bgWhite, bold, italic, underline, strikethrough, dim, reverse, blink, fg, bg, tn, t, SyntaxStyle, hastToStyledText, parseAlign, parseBoxSizing, parseDimension, parseDirection, parseDisplay, parseEdge, parseFlexDirection, parseGutter, parseJustify, parseLogLevel, parseMeasureMode, parseOverflow, parsePositionType, parseUnit, parseWrap, MouseParser, Selection, convertGlobalToLocalSelection, ASCIIFontSelectionHelper, TextBuffer, LogLevel2 as LogLevel, setRenderLibPath, resolveRenderLib, OptimizedBuffer, h, isVNode, maybeMakeRenderable, wrapWithDelegates, instantiate, delegate, LayoutEvents, RenderableEvents, isValidPercentage, isMarginType, isPaddingType, isPositionType, isPositionTypeType, isOverflowType, isDimensionType, isFlexBasisType, isSizeType, isRenderable, Renderable, RootRenderable, capture, ConsolePosition, TerminalConsole, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, CliRenderer };
 
-//# debugId=7F86A4475F17242C64756E2164756E21
-//# sourceMappingURL=index-vg0fxf54.js.map
+//# debugId=5CD4CD088CC2988464756E2164756E21
+//# sourceMappingURL=index-grak7z0n.js.map