shipthis 0.1.31 → 0.1.33

package/dist/{AppleBundleIdDetails-eoK5F8Qn.js → AppleBundleIdDetails-BhHPCvRm.js}

@@ -1,37 +1,37 @@
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { Box, Text } from 'ink';
 import Spinner from 'ink-spinner';
-import './index-w3lHxk5O.js';
-import 'axios';
-import '@tanstack/react-query';
-import 'crypto';
-import 'fs';
-import 'readline-sync';
-import 'node:readline';
+import '@inkjs/ui';
+import 'node:crypto';
+import 'node:fs';
 import 'node:path';
+import 'node:readline';
 import 'node:url';
+import 'readline-sync';
 import 'luxon';
+import 'axios';
 import 'isomorphic-git';
+import './index-pj8JVg5X.js';
 import '@oclif/core';
+import '@tanstack/react-query';
 import 'react';
 import 'crypto-js';
 import 'uuid';
-import 'socket.io-client';
-import { u as useAppleApp } from './useAppleApp-h1Ogi_qc.js';
+import { u as useAppleApp } from './useAppleApp-Dr6URQvC.js';
 import 'fast-glob';
 import 'yazl';
-import '@inkjs/ui';
-import './index-CyvGh-kt.js';
-import 'open';
-import { T as Table } from './Table-CvM6pccN.js';
+import 'socket.io-client';
+import 'fullscreen-ink';
+import { T as Table } from './Table-FaNgpyeq.js';
 import { T as Title } from './Title-BCQtayg6.js';
 import 'string-length';
 import 'strip-ansi';
+import 'open';
+import './index-DfUg5j06.js';
 import 'marked';
 import 'marked-terminal';
-import 'path';
 import 'qrcode';
-import { u as useAppleBundleId } from './useAppleBundleId-B3TTNap0.js';
+import { u as useAppleBundleId } from './useAppleBundleId-DELAwSQp.js';
 
 const AppleAppDetails = (props) => {
   const { data, isLoading } = useAppleApp(props);
@@ -44,7 +44,7 @@ const AppleAppDetails = (props) => {
 
 const AppleBundleIdDetails = (props) => {
   const { data, isLoading } = useAppleBundleId(props);
-  const { bundleIdSummary, capabilitiesTable, shouldSyncCapabilities, capabilities } = data || {};
+  const { bundleIdSummary, capabilities, capabilitiesTable, shouldSyncCapabilities } = data || {};
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
       /* @__PURE__ */ jsx(Title, { children: "BundleId Details (in the Apple Developer Portal)" }),
@@ -56,9 +56,7 @@ const AppleBundleIdDetails = (props) => {
       /* @__PURE__ */ jsx(
         Table,
         {
-          data: capabilities.map((c) => {
-            return { capability: `${c}` };
-          })
+          data: capabilities.map((c) => ({ capability: `${c}` }))
         }
       )
     ] }),

package/dist/Command-BDIkuv2g.js

@@ -0,0 +1,29 @@
+import { jsx } from 'react/jsx-runtime';
+import { QueryClientProvider } from '@tanstack/react-query';
+import { useScreenSize } from 'fullscreen-ink';
+import { Box } from 'ink';
+import { K as queryClient } from './index-pj8JVg5X.js';
+import 'axios';
+import 'node:fs';
+import 'crypto-js';
+import 'uuid';
+import 'luxon';
+import 'node:crypto';
+import 'node:path';
+import 'node:readline';
+import 'node:url';
+import 'readline-sync';
+import 'isomorphic-git';
+import '@oclif/core';
+import 'react';
+import 'socket.io-client';
+import 'fast-glob';
+import 'yazl';
+import { b as CommandProvider } from './index-DfUg5j06.js';
+
+const Command = ({ children, command }) => {
+  const { width } = useScreenSize();
+  return /* @__PURE__ */ jsx(QueryClientProvider, { client: queryClient, children: /* @__PURE__ */ jsx(CommandProvider, { command, children: /* @__PURE__ */ jsx(Box, { flexDirection: "column", width, children }) }) });
+};
+
+export { Command as C };

package/dist/CommandGame-CvBIjPZp.js

@@ -0,0 +1,7 @@
+import { jsx } from 'react/jsx-runtime';
+import { c as GameProvider } from './index-DfUg5j06.js';
+import { C as Command } from './Command-BDIkuv2g.js';
+
+const CommandGame = ({ children, command }) => /* @__PURE__ */ jsx(Command, { command, children: /* @__PURE__ */ jsx(GameProvider, { children }) });
+
+export { CommandGame as C };

package/dist/{Create-ISdroJ3G.js → Create-Lpe0B8nT.js}

@@ -1,34 +1,34 @@
 import { jsx } from 'react/jsx-runtime';
-import { Box } from 'ink';
+import { useQueryClient } from '@tanstack/react-query';
 import axios from 'axios';
+import { Box } from 'ink';
 import { useContext } from 'react';
-import { useQueryClient } from '@tanstack/react-query';
-import { p as getAuthedHeaders, q as API_URL } from './index-w3lHxk5O.js';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-Dy3Ag7_r.js';
-import { b as GameContext } from './index-CyvGh-kt.js';
+import { p as getAuthedHeaders, o as API_URL } from './index-pj8JVg5X.js';
 import 'ink-spinner';
-import '@inkjs/ui';
-import 'fs';
-import 'uuid';
-import 'yazl';
-import 'crypto';
-import 'readline-sync';
-import 'node:readline';
+import 'node:crypto';
+import 'node:fs';
 import 'node:path';
+import 'node:readline';
 import 'node:url';
+import 'readline-sync';
 import 'luxon';
 import 'isomorphic-git';
 import '@oclif/core';
+import { c as cacheKeys } from './useAndroidServiceAccountTestResult-D4e5AKAZ.js';
 import 'fast-glob';
+import 'uuid';
+import 'yazl';
 import 'socket.io-client';
+import 'fullscreen-ink';
+import 'string-length';
+import 'strip-ansi';
 import 'open';
+import '@inkjs/ui';
 import 'marked';
 import 'marked-terminal';
-import 'path';
 import 'qrcode';
-import { R as RunWithSpinner } from './RunWithSpinner-BVXNWGD3.js';
-import 'string-length';
-import 'strip-ansi';
+import { R as RunWithSpinner } from './RunWithSpinner-gMVA07bZ.js';
+import { G as GameContext } from './index-DfUg5j06.js';
 
 const CreateKeystore = ({ onComplete, onError, ...boxProps }) => {
   const { gameId } = useContext(GameContext);
@@ -40,17 +40,17 @@ const CreateKeystore = ({ onComplete, onError, ...boxProps }) => {
       await axios.post(`${API_URL}/projects/${gameId}/credentials/android/certificate`, null, {
         headers
       });
-      queryClient.invalidateQueries({ queryKey: cacheKeys.projectCredentials({ projectId: gameId, pageNumber: 0 }) });
-    } catch (err) {
-      onError(err);
+      queryClient.invalidateQueries({ queryKey: cacheKeys.projectCredentials({ pageNumber: 0, projectId: gameId }) });
+    } catch (error) {
+      onError(error);
     }
   };
   return /* @__PURE__ */ jsx(Box, { flexDirection: "column", gap: 1, ...boxProps, children: gameId && /* @__PURE__ */ jsx(
     RunWithSpinner,
     {
       executeMethod: handleCreate,
-      msgInProgress: "Creating Keystore...",
       msgComplete: "Keystore created",
+      msgInProgress: "Creating Keystore...",
       onComplete
     }
   ) });

package/dist/GameStatus-5XpufIY_.js

@@ -0,0 +1,137 @@
+import { jsx, jsxs } from 'react/jsx-runtime';
+import { Text, Box } from 'ink';
+import { useState, useEffect, useContext } from 'react';
+import { b as getShortDate, P as Platform, E as getProject, F as getProjectPlatformProgress } from './index-pj8JVg5X.js';
+import 'ink-spinner';
+import { g as getShortUUID, m as makeHumanReadable } from './index-B27WJDxn.js';
+import '@tanstack/react-query';
+import 'axios';
+import 'luxon';
+import 'node:fs';
+import 'fast-glob';
+import 'uuid';
+import 'yazl';
+import 'socket.io-client';
+import 'fullscreen-ink';
+import 'string-length';
+import 'strip-ansi';
+import { S as StatusTable } from './StatusTable-DzRWcMr4.js';
+import 'open';
+import '@inkjs/ui';
+import 'node:path';
+import 'marked';
+import 'marked-terminal';
+import { N as NextSteps } from './NextSteps-DbJHmscQ.js';
+import 'qrcode';
+import { G as GameContext, C as CommandContext } from './index-DfUg5j06.js';
+
+function isPlatformConfigured(platform, progress) {
+  if (!progress) return false;
+  return progress.platform === platform && progress.hasBundleSet && progress.hasCredentialsForPlatform && progress.hasApiKeyForPlatform;
+}
+function getSteps(platform, progress) {
+  if (!progress) return ["shipthis game wizard " + platform.toLowerCase()];
+  switch (platform) {
+    case Platform.ANDROID: {
+      return [
+        !progress.hasCredentialsForPlatform && "shipthis game android keyStore create",
+        !progress.hasApiKeyForPlatform && "shipthis game android apiKey create",
+        isPlatformConfigured(platform, progress) && "shipthis game ship"
+      ].filter(Boolean);
+    }
+    case Platform.IOS: {
+      return [
+        !progress.hasApiKeyForPlatform && "shipthis apple apiKey create",
+        !progress.hasCredentialsForPlatform && "shipthis game ios profile create",
+        isPlatformConfigured(platform, progress) && "shipthis game ship"
+      ].filter(Boolean);
+    }
+    default: {
+      throw new Error("Invalid platform");
+    }
+  }
+}
+async function fetchGameStatus(gameId, platforms) {
+  const game = await getProject(gameId);
+  const isEnabled = {};
+  const statuses = {};
+  for (const platform of platforms) {
+    isEnabled[platform] = platform === Platform.IOS ? Boolean(game.details?.iosBundleId) : Boolean(game.details?.androidPackageName);
+    if (isEnabled[platform]) {
+      statuses[platform] = await getProjectPlatformProgress(game.id, platform);
+    }
+  }
+  let steps = [];
+  for (const platform of platforms) {
+    steps = steps.concat(getSteps(platform, statuses[platform]));
+  }
+  let exitCode = 0;
+  for (const platform of platforms) {
+    const platformStatus = statuses[platform];
+    if (!platformStatus) continue;
+    const hasConfigError = isEnabled[platform] && !isPlatformConfigured(platform, platformStatus);
+    if (hasConfigError) exitCode = exitCode || 1;
+  }
+  if (platforms.length === 1 && !isEnabled[platforms[0]]) {
+    exitCode = exitCode || 1;
+  } else if (platforms.length > 1 && !isEnabled[Platform.IOS] && !isEnabled[Platform.ANDROID]) {
+    exitCode = exitCode || 1;
+  }
+  return {
+    exitCode,
+    game,
+    isEnabled,
+    statuses,
+    steps
+  };
+}
+const GameStatusDetails = ({ children, gameId, onComplete, onError, platforms }) => {
+  const [state, setState] = useState(null);
+  useEffect(() => {
+    fetchGameStatus(gameId, platforms).then((res) => {
+      setState(res);
+      setTimeout(() => onComplete?.(res.exitCode), 0);
+    }).catch((error) => onError?.(error));
+  }, []);
+  if (!state) return /* @__PURE__ */ jsx(Text, {});
+  const { game, statuses, steps } = state;
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx(
+      StatusTable,
+      {
+        statuses: {
+          "Build Number": `${game.details?.buildNumber || 1}`,
+          "Created At": getShortDate(game.createdAt),
+          "Game Engine": `${game.details?.gameEngine || "godot"} ${game.details?.gameEngineVersion || "4.3"}`,
+          "Game ID": getShortUUID(game.id),
+          Name: game.name,
+          Version: game.details?.semanticVersion || "0.0.1"
+        },
+        title: "Game Details"
+      }
+    ),
+    platforms.map((platform) => {
+      const status = statuses[platform];
+      const label = platform === Platform.IOS ? "iOS" : "Android";
+      const color = platforms.length === 1 ? "red" : "yellow";
+      const { platform: _, ...statusValues } = status || {};
+      return /* @__PURE__ */ jsx(Box, { marginTop: 1, children: status ? /* @__PURE__ */ jsx(StatusTable, { statuses: makeHumanReadable(statusValues), title: `${label} Status` }) : /* @__PURE__ */ jsxs(Text, { color, children: [
+        "The ",
+        label,
+        " platform is not enabled for this game."
+      ] }) }, platform);
+    }),
+    children,
+    /* @__PURE__ */ jsx(NextSteps, { steps })
+  ] });
+};
+const GameStatus$1 = ({ children, onComplete }) => {
+  const { gameId } = useContext(GameContext);
+  const { command } = useContext(CommandContext);
+  const flags = command && command.getFlags() || {};
+  const platforms = flags.platform ? [flags.platform.toUpperCase()] : [Platform.IOS, Platform.ANDROID];
+  if (!gameId) return null;
+  return /* @__PURE__ */ jsx(GameStatusDetails, { gameId, onComplete, platforms, children });
+};
+
+export { GameStatusDetails as G, GameStatus$1 as a };

package/dist/{Import-CfThJF6k.js → Import-DFzrAG04.js}

@@ -1,35 +1,35 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { useContext, useState, useEffect } from 'react';
 import { Box, Text } from 'ink';
 import Spinner from 'ink-spinner';
-import { b as GameContext } from './index-CyvGh-kt.js';
-import { _ as queryClient, P as Platform, C as CredentialsType } from './index-w3lHxk5O.js';
-import 'axios';
-import 'crypto-js';
-import { v4 } from 'uuid';
-import fs__default from 'fs';
-import 'luxon';
-import '@inkjs/ui';
-import { useMutation } from '@tanstack/react-query';
-import yazl from 'yazl';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-Dy3Ag7_r.js';
-import { i as importCredential } from './import-8pL1AF47.js';
-import 'crypto';
-import 'readline-sync';
-import 'node:readline';
+import { useContext, useState, useEffect } from 'react';
+import 'node:crypto';
+import fs__default from 'node:fs';
 import 'node:path';
+import 'node:readline';
 import 'node:url';
+import 'readline-sync';
+import 'luxon';
+import 'axios';
 import 'isomorphic-git';
+import { K as queryClient, P as Platform, C as CredentialsType } from './index-pj8JVg5X.js';
 import '@oclif/core';
+import { useMutation } from '@tanstack/react-query';
+import 'crypto-js';
+import { v4 } from 'uuid';
 import 'fast-glob';
+import { ZipFile } from 'yazl';
 import 'socket.io-client';
+import 'fullscreen-ink';
+import 'string-length';
+import 'strip-ansi';
 import 'open';
+import '@inkjs/ui';
 import 'marked';
 import 'marked-terminal';
-import 'path';
 import 'qrcode';
-import 'string-length';
-import 'strip-ansi';
+import { G as GameContext } from './index-DfUg5j06.js';
+import { c as cacheKeys } from './useAndroidServiceAccountTestResult-D4e5AKAZ.js';
+import { i as importCredential } from './import-BoY5e0uJ.js';
 
 async function importKeystore({ log = () => {
 }, ...opt }) {
@@ -50,7 +50,7 @@ async function importKeystore({ log = () => {
       zip.outputStream.pipe(outputStream).on("close", () => resolve());
       zip.end();
     });
-    const zipFile = new yazl.ZipFile();
+    const zipFile = new ZipFile();
     log("Adding keyStore.jks to zip file...");
     zipFile.addFile(opt.jksFilePath, "keyStore.jks");
     log("Adding password.txt and keyPassword.txt to zip file...");
@@ -64,31 +64,29 @@ async function importKeystore({ log = () => {
   }
   log("Uploading and importing zip file...");
   const keyStore = await importCredential({
+    platform: Platform.ANDROID,
     projectId: opt.gameId,
-    zipPath: `${opt.zipFilePath}`,
     type: CredentialsType.CERTIFICATE,
-    platform: Platform.ANDROID
+    zipPath: `${opt.zipFilePath}`
   });
   log("Imported successfully");
-  toDelete.forEach((file) => {
+  for (const file of toDelete) {
     log(`Deleting temporary file: ${file}`);
     fs__default.unlinkSync(file);
-  });
+  }
   return keyStore;
 }
-const useImportKeystore = () => {
-  return useMutation({
-    mutationFn: importKeystore,
-    onSuccess: async (data) => {
-      const projectId = data.projectId;
-      queryClient.invalidateQueries({
-        queryKey: cacheKeys.projectCredentials({ projectId, pageNumber: 0 })
-      });
-    }
-  });
-};
+const useImportKeystore = () => useMutation({
+  mutationFn: importKeystore,
+  async onSuccess(data) {
+    const { projectId } = data;
+    queryClient.invalidateQueries({
+      queryKey: cacheKeys.projectCredentials({ pageNumber: 0, projectId })
+    });
+  }
+});
 
-const ImportKeystore = ({ onComplete, onError, importKeystoreProps }) => {
+const ImportKeystore = ({ importKeystoreProps, onComplete, onError }) => {
   const { gameId } = useContext(GameContext);
   const importMutation = useImportKeystore();
   const [log, setLog] = useState(null);

package/dist/{JobLogTail-BWzbQBZz.js → JobLogTail-BYcJgPcL.js}

@@ -1,28 +1,29 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { measureElement, Box, Text } from 'ink';
 import Spinner from 'ink-spinner';
-import { d as getStageColor, j as getMessageColor } from './index-DJ078v-U.js';
-import { useState, useRef, useEffect } from 'react';
-import axios from 'axios';
 import { useInfiniteQuery } from '@tanstack/react-query';
-import { p as getAuthedHeaders, q as API_URL, I as castArrayObjectDates, J as JobStatus, a3 as castJobDates, a1 as castObjectDates, a4 as getShortTime } from './index-w3lHxk5O.js';
+import axios from 'axios';
+import { useState, useRef, useEffect } from 'react';
+import 'node:fs';
 import 'crypto-js';
 import 'uuid';
-import 'fs';
+import { p as getAuthedHeaders, o as API_URL, I as castArrayObjectDates, J as JobStatus, a4 as castJobDates, a1 as castObjectDates, a5 as getShortTime } from './index-pj8JVg5X.js';
+import { d as getStageColor, j as getMessageColor } from './index-B27WJDxn.js';
 import 'luxon';
 import 'fast-glob';
 import 'yazl';
 import 'socket.io-client';
-import 'crypto';
-import 'readline-sync';
-import 'node:readline';
+import { c as cacheKeys } from './useAndroidServiceAccountTestResult-D4e5AKAZ.js';
+import 'node:crypto';
 import 'node:path';
+import 'node:readline';
 import 'node:url';
+import 'readline-sync';
 import 'isomorphic-git';
 import '@oclif/core';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-Dy3Ag7_r.js';
-import { e as useJob } from './index-CyvGh-kt.js';
-import { u as useWebSocket } from './useWebSocket-gyuCsore.js';
+import 'fullscreen-ink';
+import { f as useJob } from './index-DfUg5j06.js';
+import { u as useWebSocket } from './useWebSocket-CRV7V69Q.js';
 import { T as Title } from './Title-BCQtayg6.js';
 import stringLength from 'string-length';
 import stripAnsi from 'strip-ansi';
@@ -38,10 +39,10 @@ function dictionaryToArray(dictionary) {
 }
 
 async function queryJobLogs({
-  projectId,
-  jobId,
   cursor,
-  pageSize = 10
+  jobId,
+  pageSize = 10,
+  projectId
 }) {
   try {
     const headers = getAuthedHeaders();
@@ -59,35 +60,35 @@ async function queryJobLogs({
 }
 const useJobLogs = (props) => {
   const queryResult = useInfiniteQuery({
-    queryKey: cacheKeys.jobLogs(props),
-    queryFn: async ({ pageParam }) => {
+    getNextPageParam: (lastPage) => lastPage.nextCursor,
+    initialPageParam: props.cursor,
+    async queryFn({ pageParam }) {
       return queryJobLogs({
         ...props,
         cursor: pageParam
       });
     },
-    getNextPageParam: (lastPage) => lastPage.nextCursor,
-    initialPageParam: props.cursor
+    queryKey: cacheKeys.jobLogs(props)
   });
   return queryResult;
 };
 
 function useJobWatching({
-  projectId,
-  jobId,
   isWatching,
-  onJobUpdate,
-  onFailure,
+  jobId,
   onComplete,
-  onNewLogEntry
+  onFailure,
+  onJobUpdate,
+  onNewLogEntry,
+  projectId
 }) {
   const [websocketJob, setWebsocketJob] = useState(null);
   const [mostRecentLog, setMostRecentLog] = useState(null);
   const prevJobStatus = useRef(JobStatus.PENDING);
   const handleJobUpdate = (job2) => {
-    const completed = [JobStatus.COMPLETED, JobStatus.FAILED];
-    const wasRunning = !completed.includes(prevJobStatus.current);
-    if (completed.includes(job2.status) && wasRunning) {
+    const completed = /* @__PURE__ */ new Set([JobStatus.COMPLETED, JobStatus.FAILED]);
+    const wasRunning = !completed.has(prevJobStatus.current);
+    if (completed.has(job2.status) && wasRunning) {
       if (job2.status === JobStatus.FAILED) {
         onFailure && onFailure(job2);
       } else {
@@ -97,27 +98,27 @@ function useJobWatching({
     prevJobStatus.current = job2.status;
   };
   const jobStatusListener = {
-    getPattern: () => [`project.${projectId}:job:created`, `project.${projectId}:job:updated`],
-    eventHandler: async (pattern, rawJob) => {
+    async eventHandler(pattern, rawJob) {
       if (rawJob.id !== jobId) return;
       const job2 = castJobDates(rawJob);
       setWebsocketJob(job2);
       handleJobUpdate(job2);
       if (onJobUpdate) onJobUpdate(job2);
-    }
+    },
+    getPattern: () => [`project.${projectId}:job:created`, `project.${projectId}:job:updated`]
   };
   const jobProgressListener = {
-    getPattern: () => `project.${projectId}:job.${jobId}:log`,
-    eventHandler: async (pattern, rawLogEntry) => {
+    async eventHandler(pattern, rawLogEntry) {
       const logEntry = castObjectDates(rawLogEntry, ["sentAt", "createdAt"]);
       if (onNewLogEntry) onNewLogEntry(logEntry);
       setMostRecentLog(logEntry);
-    }
+    },
+    getPattern: () => `project.${projectId}:job.${jobId}:log`
   };
   useWebSocket(isWatching ? [jobStatusListener, jobProgressListener] : []);
-  const { isLoading, data: job } = useJob({
-    projectId,
-    jobId
+  const { data: job, isLoading } = useJob({
+    jobId,
+    projectId
   });
   useEffect(() => {
     setWebsocketJob(null);
@@ -127,8 +128,8 @@ function useJobWatching({
   const progress = mostRecentLog?.progress || null;
   const stage = mostRecentLog?.stage || null;
   return {
-    isLoading,
     data,
+    isLoading,
     progress,
     stage
   };
@@ -137,20 +138,20 @@ function useJobWatching({
 function getSortedJobLogs(logs) {
   return logs.sort((a, b) => a.sentAt.toMillis() - b.sentAt.toMillis());
 }
-function useJobLogTail({ projectId, jobId, isWatching, length }) {
+function useJobLogTail({ isWatching, jobId, length, projectId }) {
   const [websocketLogs, setWebsocketLogs] = useState([]);
   useJobWatching({
-    projectId,
-    jobId,
     isWatching,
-    onNewLogEntry: (logEntry) => {
+    jobId,
+    onNewLogEntry(logEntry) {
       setWebsocketLogs((prevLogs) => [...prevLogs, logEntry]);
-    }
+    },
+    projectId
   });
-  const { isLoading, data: fetchedJobLogs } = useJobLogs({
-    projectId,
+  const { data: fetchedJobLogs, isLoading } = useJobLogs({
     jobId,
-    pageSize: length
+    pageSize: length,
+    projectId
   });
   useEffect(() => {
     setWebsocketLogs([]);
@@ -161,8 +162,8 @@ function useJobLogTail({ projectId, jobId, isWatching, length }) {
   const uniqueLogs = dictionaryToArray(allLogsById);
   const data = getSortedJobLogs(uniqueLogs).slice(-length);
   return {
-    isLoading,
-    data
+    data,
+    isLoading
   };
 }
 
@@ -175,27 +176,27 @@ const TruncatedText = ({ children, wrap, ...textPropsWithoutWrap }) => {
     setWidth(measuredWidth);
   }, []);
   const getTruncated = (input) => {
-    const withoutCrlf = input.replaceAll(/[\r\n]/g, "");
+    const withoutCrlf = input.replaceAll(/[\n\r]/g, "");
     if (width === null) return withoutCrlf;
     const withoutAnsi = stripAnsi(withoutCrlf);
     const textLength = stringLength(withoutAnsi);
-    return textLength > width ? withoutCrlf.substring(0, width) : withoutCrlf;
+    return textLength > width ? withoutCrlf.slice(0, Math.max(0, width)) : withoutCrlf;
   };
   return /* @__PURE__ */ jsx(Box, { ref, children: /* @__PURE__ */ jsx(Text, { ...textPropsWithoutWrap, children: getTruncated(children) + "\x1B[0m" }) });
 };
 
 const JobLogTail = (props) => {
-  const { isLoading, data } = useJobLogTail(props);
+  const { data, isLoading } = useJobLogTail(props);
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx(Title, { children: "Job Logs" }),
     isLoading && /* @__PURE__ */ jsx(Spinner, { type: "dots" }),
     /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: data.map((log) => {
       const stageColor = getStageColor(log.stage);
       const messageColor = getMessageColor(log.level);
-      return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", overflow: "hidden", height: 1, children: [
+      return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", height: 1, overflow: "hidden", children: [
         /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Text, { children: getShortTime(log.sentAt) }) }),
-        /* @__PURE__ */ jsx(Box, { marginLeft: 1, width: 9, justifyContent: "flex-start", children: /* @__PURE__ */ jsx(Text, { color: stageColor, children: log.stage }) }),
-        /* @__PURE__ */ jsx(Box, { marginLeft: 1, overflow: "hidden", height: 1, marginRight: 2, children: /* @__PURE__ */ jsx(TruncatedText, { color: messageColor, children: log.message }) })
+        /* @__PURE__ */ jsx(Box, { justifyContent: "flex-start", marginLeft: 1, width: 9, children: /* @__PURE__ */ jsx(Text, { color: stageColor, children: log.stage }) }),
+        /* @__PURE__ */ jsx(Box, { height: 1, marginLeft: 1, marginRight: 2, overflow: "hidden", children: /* @__PURE__ */ jsx(TruncatedText, { color: messageColor, children: log.message }) })
       ] }, log.id);
     }) })
   ] });