@youcan/cli-kit 2.8.1 → 2.8.2

package/dist/services/cloudflared.test.js

@@ -1,114 +1,96 @@
-import { vi, describe, beforeEach, afterAll, it, expect } from 'vitest';
-import 'change-case';
-import '../node/cli.js';
-import 'conf';
-import 'env-paths';
-import { isExecutable } from '../node/filesystem.js';
-import 'formdata-node';
-import 'formdata-node/file-from-path';
-import 'simple-git';
-import { exec } from '../node/system.js';
-import 'node-fetch';
-import 'ramda';
-import 'kleur';
-import 'dayjs';
-import { Cloudflared } from './cloudflared.js';
-import '../ui/components/DevOutput.js';
-import 'react';
-import 'ink';
-
-vi.mock('..', () => ({
-    System: {
-        exec: vi.fn(),
-    },
-    Filesystem: {
-        isExecutable: vi.fn(),
-    },
-    Path: {
-        join: vi.fn().mockReturnValue('/mock/path/cloudflared'),
-    },
+import { isExecutable } from "../node/filesystem.js";
+import { exec } from "../node/system.js";
+import { Cloudflared } from "./cloudflared.js";
+import "../index.js";
+import { afterAll, beforeEach, describe, expect, it, vi } from "vitest";
+//#region lib/services/cloudflared.test.ts
+vi.mock("..", () => ({
+	System: { exec: vi.fn() },
+	Filesystem: { isExecutable: vi.fn() },
+	Path: { join: vi.fn().mockReturnValue("/mock/path/cloudflared") }
 }));
 const originalPlatform = process.platform;
 const originalArch = process.arch;
-describe('cloudflared', () => {
-    let cloudflared;
-    let mockAbortController;
-    beforeEach(() => {
-        vi.clearAllMocks();
-        Object.defineProperty(process, 'platform', {
-            value: 'darwin',
-            configurable: true,
-        });
-        Object.defineProperty(process, 'arch', {
-            value: 'arm64',
-            configurable: true,
-        });
-        vi.mocked(isExecutable).mockResolvedValue(true);
-        mockAbortController = new AbortController();
-        cloudflared = new Cloudflared();
-    });
-    afterAll(() => {
-        Object.defineProperty(process, 'platform', {
-            value: originalPlatform,
-            configurable: true,
-        });
-        Object.defineProperty(process, 'arch', {
-            value: originalArch,
-            configurable: true,
-        });
-    });
-    describe('tunnel', () => {
-        it('should pass abort signal to System.exec', async () => {
-            vi.mocked(exec).mockResolvedValue();
-            await cloudflared.tunnel(3000, 'localhost', mockAbortController.signal);
-            expect(exec).toHaveBeenCalledWith(expect.any(String), expect.any(Array), expect.objectContaining({
-                signal: mockAbortController.signal,
-            }));
-        });
-        it('should use correct cloudflared arguments', async () => {
-            vi.mocked(exec).mockResolvedValue();
-            await cloudflared.tunnel(3001, 'localhost', mockAbortController.signal);
-            expect(exec).toHaveBeenCalledWith(expect.any(String), ['tunnel', '--url=localhost:3001', '--no-autoupdate'], expect.any(Object));
-        });
-        it('should work without abort signal', async () => {
-            vi.mocked(exec).mockResolvedValue();
-            await expect(cloudflared.tunnel(3000)).resolves.toBeUndefined();
-            expect(exec).toHaveBeenCalledWith(expect.any(String), expect.any(Array), expect.objectContaining({
-                signal: undefined,
-            }));
-        });
-        it('should use default host when not provided', async () => {
-            vi.mocked(exec).mockResolvedValue();
-            await cloudflared.tunnel(3000, undefined, mockAbortController.signal);
-            expect(exec).toHaveBeenCalledWith(expect.any(String), ['tunnel', '--url=localhost:3000', '--no-autoupdate'], expect.any(Object));
-        });
-        it('should check if cloudflared is executable before running', async () => {
-            vi.mocked(exec).mockResolvedValue();
-            await cloudflared.tunnel(3000, 'localhost', mockAbortController.signal);
-            expect(isExecutable).toHaveBeenCalledWith('/mock/path/cloudflared');
-        });
-    });
-    describe('exec retry logic with signal', () => {
-        it('should retry with the same signal on failure', async () => {
-            let callCount = 0;
-            vi.mocked(exec).mockImplementation(async (bin, args, options) => {
-                callCount++;
-                if (callCount < 2) {
-                    if (options?.errorHandler) {
-                        await options.errorHandler(new Error('Connection failed'));
-                    }
-                }
-            });
-            await cloudflared.tunnel(3000, 'localhost', mockAbortController.signal);
-            expect(exec).toHaveBeenCalledTimes(2);
-            expect(exec).toHaveBeenNthCalledWith(1, expect.any(String), expect.any(Array), expect.objectContaining({ signal: mockAbortController.signal }));
-            expect(exec).toHaveBeenNthCalledWith(2, expect.any(String), expect.any(Array), expect.objectContaining({ signal: mockAbortController.signal }));
-        });
-        it('should handle errors without crashing', async () => {
-            vi.mocked(exec).mockResolvedValue();
-            await expect(cloudflared.tunnel(3000, 'localhost', mockAbortController.signal))
-                .resolves
-                .toBeUndefined();
-        });
-    });
+describe("cloudflared", () => {
+	let cloudflared;
+	let mockAbortController;
+	beforeEach(() => {
+		vi.clearAllMocks();
+		Object.defineProperty(process, "platform", {
+			value: "darwin",
+			configurable: true
+		});
+		Object.defineProperty(process, "arch", {
+			value: "arm64",
+			configurable: true
+		});
+		vi.mocked(isExecutable).mockResolvedValue(true);
+		mockAbortController = new AbortController();
+		cloudflared = new Cloudflared();
+	});
+	afterAll(() => {
+		Object.defineProperty(process, "platform", {
+			value: originalPlatform,
+			configurable: true
+		});
+		Object.defineProperty(process, "arch", {
+			value: originalArch,
+			configurable: true
+		});
+	});
+	describe("tunnel", () => {
+		it("should pass abort signal to System.exec", async () => {
+			vi.mocked(exec).mockResolvedValue();
+			await cloudflared.tunnel(3e3, "localhost", mockAbortController.signal);
+			expect(exec).toHaveBeenCalledWith(expect.any(String), expect.any(Array), expect.objectContaining({ signal: mockAbortController.signal }));
+		});
+		it("should use correct cloudflared arguments", async () => {
+			vi.mocked(exec).mockResolvedValue();
+			await cloudflared.tunnel(3001, "localhost", mockAbortController.signal);
+			expect(exec).toHaveBeenCalledWith(expect.any(String), [
+				"tunnel",
+				"--url=localhost:3001",
+				"--no-autoupdate"
+			], expect.any(Object));
+		});
+		it("should work without abort signal", async () => {
+			vi.mocked(exec).mockResolvedValue();
+			await expect(cloudflared.tunnel(3e3)).resolves.toBeUndefined();
+			expect(exec).toHaveBeenCalledWith(expect.any(String), expect.any(Array), expect.objectContaining({ signal: void 0 }));
+		});
+		it("should use default host when not provided", async () => {
+			vi.mocked(exec).mockResolvedValue();
+			await cloudflared.tunnel(3e3, void 0, mockAbortController.signal);
+			expect(exec).toHaveBeenCalledWith(expect.any(String), [
+				"tunnel",
+				"--url=localhost:3000",
+				"--no-autoupdate"
+			], expect.any(Object));
+		});
+		it("should check if cloudflared is executable before running", async () => {
+			vi.mocked(exec).mockResolvedValue();
+			await cloudflared.tunnel(3e3, "localhost", mockAbortController.signal);
+			expect(isExecutable).toHaveBeenCalledWith("/mock/path/cloudflared");
+		});
+	});
+	describe("exec retry logic with signal", () => {
+		it("should retry with the same signal on failure", async () => {
+			let callCount = 0;
+			vi.mocked(exec).mockImplementation(async (bin, args, options) => {
+				callCount++;
+				if (callCount < 2) {
+					if (options?.errorHandler) await options.errorHandler(/* @__PURE__ */ new Error("Connection failed"));
+				}
+			});
+			await cloudflared.tunnel(3e3, "localhost", mockAbortController.signal);
+			expect(exec).toHaveBeenCalledTimes(2);
+			expect(exec).toHaveBeenNthCalledWith(1, expect.any(String), expect.any(Array), expect.objectContaining({ signal: mockAbortController.signal }));
+			expect(exec).toHaveBeenNthCalledWith(2, expect.any(String), expect.any(Array), expect.objectContaining({ signal: mockAbortController.signal }));
+		});
+		it("should handle errors without crashing", async () => {
+			vi.mocked(exec).mockResolvedValue();
+			await expect(cloudflared.tunnel(3e3, "localhost", mockAbortController.signal)).resolves.toBeUndefined();
+		});
+	});
 });
+//#endregion

package/dist/services/index.js

@@ -1 +1,6 @@
-export { Cloudflared } from './cloudflared.js';
+import { __exportAll } from "../_virtual/_rolldown/runtime.js";
+import { Cloudflared } from "./cloudflared.js";
+//#region lib/services/index.ts
+var services_exports = /* @__PURE__ */ __exportAll({ Cloudflared: () => Cloudflared });
+//#endregion
+export { Cloudflared, services_exports };

package/dist/ui/components/DevOutput.js

@@ -1,60 +1,56 @@
-import React, { useState, useEffect } from 'react';
-import { render, useInput, Static, Box, Text } from 'ink';
-import { HotKeys } from './HotKeys.js';
-import { VerticalDivider } from './utils/symbols.js';
-import { map } from 'rxjs/operators';
-import { ReplaySubject } from 'rxjs';
-
-class OutputSubject {
-    subject = new ReplaySubject;
-    listen(handler) {
-        let lastLineKey = null;
-        this.subject.pipe(map(item => {
-            const currentLineKey = `${item.label}-${item.color}`;
-            if (currentLineKey !== lastLineKey) {
-                lastLineKey = currentLineKey;
-                return { ...item, label: this.pad(item.label, 10) };
-            }
-            return { ...item, label: this.pad('', 10) };
-        }))
-            .subscribe(handler);
-    }
-    emit(data) {
-        this.subject.next(data);
-    }
-    pad(subject, length, char = ' ') {
-        return subject.padEnd(length, char);
-    }
-}
-const outputSubject = new OutputSubject;
+import { VerticalDivider } from "./utils/symbols.js";
+import { HotKeys } from "./HotKeys.js";
+import React, { useEffect, useState } from "react";
+import { Box, Static, Text, render, useInput } from "ink";
+import { map } from "rxjs/operators";
+import { ReplaySubject } from "rxjs";
+//#region lib/ui/components/DevOutput.tsx
+var OutputSubject = class {
+	subject = new ReplaySubject();
+	listen(handler) {
+		let lastLineKey = null;
+		this.subject.pipe(map((item) => {
+			const currentLineKey = `${item.label}-${item.color}`;
+			if (currentLineKey !== lastLineKey) {
+				lastLineKey = currentLineKey;
+				return {
+					...item,
+					label: this.pad(item.label, 10)
+				};
+			}
+			return {
+				...item,
+				label: this.pad("", 10)
+			};
+		})).subscribe(handler);
+	}
+	emit(data) {
+		this.subject.next(data);
+	}
+	pad(subject, length, char = " ") {
+		return subject.padEnd(length, char);
+	}
+};
+const outputSubject = new OutputSubject();
 const DevOutput = ({ cmd, hotKeys = [] }) => {
-    const [linesBuffers, setLinesBuffers] = useState([]);
-    useInput((input, key) => {
-        if (input === 'c' && key.ctrl)
-            cmd.exit(130);
-    });
-    useEffect(() => {
-        outputSubject.listen((data) => {
-            setLinesBuffers((previousLines) => [...previousLines, data]);
-        });
-    }, []);
-    return (React.createElement(React.Fragment, null,
-        React.createElement(Static, { items: linesBuffers }, (line, i) => (React.createElement(Box, { flexDirection: 'column', key: i },
-            React.createElement(Text, null,
-                React.createElement(Text, { dimColor: true }, line.timestamp),
-                ' ',
-                React.createElement(VerticalDivider, null),
-                ' ',
-                React.createElement(Text, { color: line.color }, line.label),
-                React.createElement(Text, null,
-                    ' ',
-                    React.createElement(VerticalDivider, null),
-                    ' ',
-                    line.buffer))))),
-        React.createElement(Box, { flexDirection: 'column', paddingTop: 1 },
-            React.createElement(HotKeys, { hotKeys: hotKeys }))));
+	const [linesBuffers, setLinesBuffers] = useState([]);
+	useInput((input, key) => {
+		if (input === "c" && key.ctrl) cmd.exit(130);
+	});
+	useEffect(() => {
+		outputSubject.listen((data) => {
+			setLinesBuffers((previousLines) => [...previousLines, data]);
+		});
+	}, []);
+	return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Static, { items: linesBuffers }, (line, i) => /* @__PURE__ */ React.createElement(Box, {
+		flexDirection: "column",
+		key: i
+	}, /* @__PURE__ */ React.createElement(Text, null, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, line.timestamp), " ", /* @__PURE__ */ React.createElement(VerticalDivider, null), " ", /* @__PURE__ */ React.createElement(Text, { color: line.color }, line.label), /* @__PURE__ */ React.createElement(Text, null, " ", /* @__PURE__ */ React.createElement(VerticalDivider, null), " ", line.buffer)))), /* @__PURE__ */ React.createElement(Box, {
+		flexDirection: "column",
+		paddingTop: 1
+	}, /* @__PURE__ */ React.createElement(HotKeys, { hotKeys })));
 };
-const renderDevOutput = ((props) => render(React.createElement(DevOutput, { ...props }), { exitOnCtrlC: false }));
+const renderDevOutput = ((props) => render(/* @__PURE__ */ React.createElement(DevOutput, props), { exitOnCtrlC: false }));
 renderDevOutput.outputSubject = outputSubject;
-
+//#endregion
 export { DevOutput, renderDevOutput };

package/dist/ui/components/Error.js

@@ -1,18 +1,17 @@
-import React from 'react';
-import { render, Newline, Box, Text } from 'ink';
-
+import React from "react";
+import { Box, Newline, Text, render } from "ink";
+//#region lib/ui/components/Error.tsx
 const Error = ({ message, suggestions = [] }) => {
-    return (React.createElement(React.Fragment, null,
-        React.createElement(Newline, null),
-        React.createElement(Box, { flexDirection: 'column', borderStyle: 'round', borderColor: 'red', paddingLeft: 1 },
-            React.createElement(Text, { color: 'redBright' }, "Error"),
-            React.createElement(Text, { color: 'white' }, message),
-            suggestions.length > 0 && (React.createElement(Box, { marginTop: 1, flexDirection: 'column' },
-                React.createElement(Text, { color: 'yellow' }, "Suggestions:"),
-                suggestions.map((suggestion, index) => (React.createElement(Text, { key: index },
-                    " - ",
-                    suggestion))))))));
+	return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Newline, null), /* @__PURE__ */ React.createElement(Box, {
+		flexDirection: "column",
+		borderStyle: "round",
+		borderColor: "red",
+		paddingLeft: 1
+	}, /* @__PURE__ */ React.createElement(Text, { color: "redBright" }, "Error"), /* @__PURE__ */ React.createElement(Text, { color: "white" }, message), suggestions.length > 0 && /* @__PURE__ */ React.createElement(Box, {
+		marginTop: 1,
+		flexDirection: "column"
+	}, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "Suggestions:"), suggestions.map((suggestion, index) => /* @__PURE__ */ React.createElement(Text, { key: index }, " - ", suggestion)))));
 };
-const renderError = (props) => render(React.createElement(Error, { ...props }));
-
+const renderError = (props) => render(/* @__PURE__ */ React.createElement(Error, props));
+//#endregion
 export { renderError };

package/dist/ui/components/HotKeys.js

@@ -1,25 +1,19 @@
-import React from 'react';
-import { RightChevron, VerticalDivider } from './utils/symbols.js';
-import { render, Box, useInput, Text } from 'ink';
-
+import { RightChevron, VerticalDivider } from "./utils/symbols.js";
+import React from "react";
+import { Box, Text, render, useInput } from "ink";
+//#region lib/ui/components/HotKeys.tsx
 const HotKey = ({ keyboardKey, description, handler }) => {
-    useInput((input) => {
-        if (input === keyboardKey)
-            handler();
-    });
-    return (React.createElement(Box, { flexDirection: 'column' },
-        React.createElement(Text, null,
-            React.createElement(RightChevron, null),
-            " Press ",
-            React.createElement(Text, { dimColor: true }, keyboardKey),
-            " ",
-            React.createElement(VerticalDivider, null),
-            " ",
-            description)));
+	useInput((input) => {
+		if (input === keyboardKey) handler();
+	});
+	return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, null, /* @__PURE__ */ React.createElement(RightChevron, null), " Press ", /* @__PURE__ */ React.createElement(Text, { dimColor: true }, keyboardKey), " ", /* @__PURE__ */ React.createElement(VerticalDivider, null), " ", description));
 };
 const HotKeys = ({ hotKeys }) => {
-    return (React.createElement(Box, { flexDirection: 'column' }, hotKeys.map((hotKey) => React.createElement(HotKey, { key: hotKey.keyboardKey, ...hotKey }))));
+	return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, hotKeys.map((hotKey) => /* @__PURE__ */ React.createElement(HotKey, {
+		key: hotKey.keyboardKey,
+		...hotKey
+	})));
 };
-const renderHotKeys = (props) => render(React.createElement(HotKeys, { ...props }), { exitOnCtrlC: false });
-
+const renderHotKeys = (props) => render(/* @__PURE__ */ React.createElement(HotKeys, props), { exitOnCtrlC: false });
+//#endregion
 export { HotKeys, renderHotKeys };

package/dist/ui/components/utils/symbols.js

@@ -1,7 +1,7 @@
-import { Text } from 'ink';
-import React from 'react';
-
-const VerticalDivider = () => React.createElement(Text, null, "\u2502");
-const RightChevron = () => React.createElement(Text, null, "\u203A");
-
+import React from "react";
+import { Text } from "ink";
+//#region lib/ui/components/utils/symbols.tsx
+const VerticalDivider = () => /* @__PURE__ */ React.createElement(Text, null, "│");
+const RightChevron = () => /* @__PURE__ */ React.createElement(Text, null, "›");
+//#endregion
 export { RightChevron, VerticalDivider };

package/dist/ui/index.js

@@ -1,3 +1,12 @@
-export { renderDevOutput } from './components/DevOutput.js';
-export { renderError } from './components/Error.js';
-export { renderHotKeys } from './components/HotKeys.js';
+import { __exportAll } from "../_virtual/_rolldown/runtime.js";
+import { renderHotKeys } from "./components/HotKeys.js";
+import { renderDevOutput } from "./components/DevOutput.js";
+import { renderError } from "./components/Error.js";
+//#region lib/ui/index.ts
+var ui_exports = /* @__PURE__ */ __exportAll({
+	renderDevOutput: () => renderDevOutput,
+	renderError: () => renderError,
+	renderHotKeys: () => renderHotKeys
+});
+//#endregion
+export { renderDevOutput, renderError, renderHotKeys, ui_exports };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@youcan/cli-kit",
   "type": "module",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "description": "Utilities for the YouCan CLI",
   "author": "YouCan <contact@youcan.shop> (https://youcan.shop)",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "execa": "^6.1.0",
     "find-process": "^1.4.11",
     "formdata-node": "^6.0.3",
-    "fs-extra": "^11.3.4",
+    "fs-extra": "^11.3.5",
     "get-port": "^7.2.0",
     "glob": "^11.0.0",
     "ink": "^5.2.1",
@@ -50,7 +50,7 @@
     "react": "^18.3.1",
     "rxjs": "^7.8.2",
     "simple-git": "^3.36.0",
-    "tar": "^7.5.13",
+    "tar": "^7.5.15",
     "tcp-port-used": "^1.0.2",
     "tempy": "^3.2.0",
     "worker": "^0.4.0"
@@ -66,8 +66,8 @@
     "shx": "^0.3.4"
   },
   "scripts": {
-    "build": "shx rm -rf dist && tsc --noEmit && rollup --config rollup.config.js",
-    "dev": "shx rm -rf dist && rollup --config rollup.config.js --watch",
+    "build": "shx rm -rf dist && tsc --emitDeclarationOnly --outDir dist && rolldown --config rolldown.config.js",
+    "dev": "shx rm -rf dist && rolldown --config rolldown.config.js --watch",
     "test": "vitest run",
     "test:watch": "vitest",
     "release": "pnpm publish --access public",