git-stack-cli 2.9.7 → 2.9.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "2.9.7",
+  "version": "2.9.8",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/DebugOutput.tsx

@@ -3,6 +3,8 @@ import * as React from "react";
 import * as Ink from "ink-cjs";
 import { DateTime } from "luxon";
 
+import { render_node } from "~/core/render_node";
+
 type Props = {
   node: React.ReactNode;
 };
@@ -14,17 +16,7 @@ export function DebugOutput(props: Props) {
   const timestamp = DateTime.now().toFormat("yyyy-MM-dd HH:mm:ss.SSS");
   const content_width = available_width - timestamp.length - 2;
 
-  const content = (function () {
-    switch (typeof props.node) {
-      case "boolean":
-      case "number":
-      case "string": {
-        return <Ink.Text dimColor>{String(props.node)}</Ink.Text>;
-      }
-      default:
-        return props.node;
-    }
-  })();
+  const content = render_node(props.node);
 
   return (
     <Ink.Box flexDirection="column">

package/src/app/Output.tsx

@@ -4,6 +4,7 @@ import * as Ink from "ink-cjs";
 
 import { DebugOutput } from "~/app/DebugOutput";
 import { Store } from "~/app/Store";
+import { render_node } from "~/core/render_node";
 
 export function Output() {
   const output = Store.useState((state) => state.output);
@@ -14,7 +15,7 @@ export function Output() {
       <Ink.Static items={output}>
         {(entry) => {
           const [id, node] = entry;
-          return <Ink.Box key={id}>{node}</Ink.Box>;
+          return <Ink.Box key={id}>{render_node(node)}</Ink.Box>;
         }}
       </Ink.Static>
 

package/src/core/render_node.tsx

@@ -0,0 +1,37 @@
+import * as React from "react";
+
+import * as Ink from "ink-cjs";
+
+import { Store } from "~/app/Store";
+
+export function render_node(node: React.ReactNode) {
+  const actions = Store.getState().actions;
+
+  if (node == null) {
+    return null;
+  }
+
+  if (React.isValidElement(node)) {
+    return node;
+  }
+
+  if (Array.isArray(node)) {
+    return (
+      <React.Fragment>
+        {node.map((entry, index) => (
+          <React.Fragment key={index}>{render_node(entry)}</React.Fragment>
+        ))}
+      </React.Fragment>
+    );
+  }
+
+  switch (typeof node) {
+    case "string":
+    case "number":
+    case "boolean":
+      return <Ink.Text>{String(node)}</Ink.Text>;
+    default:
+      actions.debug(`unhandled node ${typeof node}`);
+      return null;
+  }
+}