@overlayed/cli 0.0.1 → 0.0.3

package/package.json

@@ -9,25 +9,29 @@
 	"keywords": [
 		"typescript"
 	],
-	"version": "0.0.1",
+	"version": "0.0.3",
 	"description": "Overlayed CLI",
 	"packageManager": "pnpm@10.6.3",
 	"type": "module",
 	"bin": {
 		"ogg": "./dist/cli.js"
 	},
+	"files": [
+		"dist/**/*"
+	],
 	"devDependencies": {
 		"@ark/attest": "^0.45.0",
+		"@overlayed/utils": "workspace:*",
+		"@overlayed/utils-node": "workspace:*",
 		"@types/fs-extra": "^11.0.4",
-		"clipanion": "4.0.0-rc.4",
 		"tsdown": "^0.12.9",
 		"typescript": "^5.8.2",
 		"vitest": "^3.0.9"
 	},
 	"dependencies": {
-		"@overlayed/utils": "workspace:*",
-		"@overlayed/utils-node": "workspace:*",
+		"arktype": "^2.1.20",
 		"chalk": "^5.4.1",
+		"clipanion": "4.0.0-rc.4",
 		"fs-extra": "^11.3.0",
 		"glob": "^11.0.3",
 		"jszip": "^3.10.1"

package/.attest/assertions/typescript.json

@@ -1 +0,0 @@
-{}

package/__mocks__/fs/promises.cjs

@@ -1,2 +0,0 @@
-const { fs } = require("memfs");
-module.exports = fs.promises;

package/__mocks__/fs.cjs

@@ -1,2 +0,0 @@
-const { fs } = require("memfs");
-module.exports = fs;

package/__tests__/bundler.test.ts

@@ -1,457 +0,0 @@
-import { describe, beforeEach, afterEach, it, expect, vi, type MockedFunction } from "vitest";
-import { vol } from "memfs";
-import { Bundler } from "../src/bundle/internal/bundler";
-import { AppBundler } from "../src/bundle/internal/appBundler";
-import { glob } from "glob";
-import path from "node:path";
-
-vi.mock("node:fs");
-vi.mock("glob");
-
-const mockGlob = glob as MockedFunction<typeof glob>;
-
-describe("Bundler", () => {
-	let bundler: Bundler;
-
-	beforeEach(() => {
-		vol.reset();
-		bundler = new Bundler();
-		vi.clearAllMocks();
-	});
-
-	afterEach(() => {
-		vi.clearAllMocks();
-	});
-
-	describe("addGlobPattern", () => {
-		it("should add a single string pattern", () => {
-			bundler.addGlobPattern("*.js");
-			// Test passes if no error is thrown
-			expect(bundler).toBeDefined();
-		});
-
-		it("should add an array of patterns", () => {
-			bundler.addGlobPattern(["*.js", "*.ts"]);
-			// Test passes if no error is thrown
-			expect(bundler).toBeDefined();
-		});
-
-		it("should add pattern with options", () => {
-			bundler.addGlobPattern("*.js", { ignore: ["node_modules/**"] });
-			// Test passes if no error is thrown
-			expect(bundler).toBeDefined();
-		});
-
-		it("should add multiple patterns", () => {
-			bundler.addGlobPattern("*.js");
-			bundler.addGlobPattern(["*.ts", "*.json"]);
-			bundler.addGlobPattern("*.md", { ignore: ["README.md"] });
-			// Test passes if no error is thrown
-			expect(bundler).toBeDefined();
-		});
-	});
-
-	describe("bundle", () => {
-		beforeEach(() => {
-			// Set up a mock file system with current working directory paths
-			const testCwd = process.cwd();
-			vol.fromJSON({
-				[path.join(testCwd, "file1.js")]: "console.log('file1');",
-				[path.join(testCwd, "file2.js")]: "console.log('file2');",
-				[path.join(testCwd, "src", "index.ts")]: "export const hello = 'world';",
-				[path.join(testCwd, "src", "utils.ts")]: "export const utils = true;",
-				[path.join(testCwd, "package.json")]: '{"name": "test-project"}',
-				[path.join(testCwd, "README.md")]: "# Test Project",
-				[path.join(testCwd, "node_modules", "dep", "index.js")]: "module.exports = {};",
-			});
-		});
-
-		it("should bundle files matching a single pattern", async () => {
-			const testCwd = process.cwd();
-			mockGlob.mockResolvedValueOnce([path.join(testCwd, "file1.js"), path.join(testCwd, "file2.js")]);
-
-			bundler.addGlobPattern("*.js");
-			const zip = await bundler.bundle();
-
-			expect(mockGlob).toHaveBeenCalledWith(
-				["*.js"],
-				expect.objectContaining({
-					absolute: true,
-					cwd: testCwd,
-				}),
-			);
-
-			const files = Object.keys(zip.files);
-			expect(files).toContain("file1.js");
-			expect(files).toContain("file2.js");
-		});
-
-		it("should bundle files matching multiple patterns", async () => {
-			const testCwd = process.cwd();
-			mockGlob
-				.mockResolvedValueOnce([path.join(testCwd, "file1.js"), path.join(testCwd, "file2.js")])
-				.mockResolvedValueOnce([path.join(testCwd, "src", "index.ts"), path.join(testCwd, "src", "utils.ts")]);
-
-			bundler.addGlobPattern("*.js");
-			bundler.addGlobPattern("src/*.ts");
-			const zip = await bundler.bundle();
-
-			expect(mockGlob).toHaveBeenCalledTimes(2);
-			expect(mockGlob).toHaveBeenNthCalledWith(1, ["*.js"], expect.any(Object));
-			expect(mockGlob).toHaveBeenNthCalledWith(2, ["src/*.ts"], expect.any(Object));
-
-			const files = Object.keys(zip.files);
-			expect(files).toContain("file1.js");
-			expect(files).toContain("file2.js");
-			expect(files).toContain(path.join("src", "index.ts"));
-			expect(files).toContain(path.join("src", "utils.ts"));
-		});
-
-		it("should handle array patterns", async () => {
-			const testCwd = process.cwd();
-			mockGlob.mockResolvedValueOnce([path.join(testCwd, "file1.js"), path.join(testCwd, "src", "index.ts")]);
-
-			bundler.addGlobPattern(["*.js", "src/*.ts"]);
-			const zip = await bundler.bundle();
-
-			expect(mockGlob).toHaveBeenCalledWith(["*.js", "src/*.ts"], expect.any(Object));
-
-			const files = Object.keys(zip.files);
-			expect(files).toContain("file1.js");
-			expect(files).toContain(path.join("src", "index.ts"));
-		});
-
-		it("should respect glob options", async () => {
-			const testCwd = process.cwd();
-			mockGlob.mockResolvedValueOnce([path.join(testCwd, "file1.js")]);
-
-			const options = { ignore: ["node_modules/**"] };
-			bundler.addGlobPattern("**/*.js", options);
-			await bundler.bundle();
-
-			expect(mockGlob).toHaveBeenCalledWith(
-				["**/*.js"],
-				expect.objectContaining({
-					ignore: ["node_modules/**"],
-					absolute: true,
-				}),
-			);
-		});
-
-		it("should use provided cwd option", async () => {
-			const customCwd = path.resolve("custom", "path");
-			mockGlob.mockResolvedValueOnce([path.join(customCwd, "file.js")]);
-
-			bundler.addGlobPattern("*.js", { cwd: customCwd });
-			await bundler.bundle();
-
-			expect(mockGlob).toHaveBeenCalledWith(
-				["*.js"],
-				expect.objectContaining({
-					cwd: customCwd,
-					absolute: true,
-				}),
-			);
-		});
-
-		it("should handle URL cwd option", async () => {
-			const testCwd = path.resolve("url", "path");
-			// Create the directory structure in the mock filesystem
-			vol.mkdirSync(testCwd, { recursive: true });
-			vol.writeFileSync(path.join(testCwd, "file.js"), "test");
-
-			mockGlob.mockResolvedValueOnce([path.join(testCwd, "file.js")]);
-
-			const urlCwd = new URL(`file:///${testCwd.replace(/\\/g, "/")}`);
-			bundler.addGlobPattern("*.js", { cwd: urlCwd });
-			await bundler.bundle();
-
-			expect(mockGlob).toHaveBeenCalledWith(
-				["*.js"],
-				expect.objectContaining({
-					cwd: testCwd,
-					absolute: true,
-				}),
-			);
-		});
-
-		it("should resolve relative cwd paths", async () => {
-			mockGlob.mockResolvedValueOnce([]);
-
-			bundler.addGlobPattern("*.js", { cwd: "./relative/path" });
-			await bundler.bundle();
-
-			expect(mockGlob).toHaveBeenCalledWith(
-				["*.js"],
-				expect.objectContaining({
-					cwd: path.resolve("./relative/path"),
-					absolute: true,
-				}),
-			);
-		});
-
-		it("should create zip with correct file paths relative to cwd", async () => {
-			const testCwd = path.resolve("project");
-			vol.mkdirSync(path.join(testCwd, "src"), { recursive: true });
-			vol.writeFileSync(path.join(testCwd, "src", "index.ts"), "test content");
-			vol.writeFileSync(path.join(testCwd, "package.json"), "{}");
-
-			mockGlob.mockResolvedValueOnce([path.join(testCwd, "src", "index.ts"), path.join(testCwd, "package.json")]);
-
-			bundler.addGlobPattern("**/*", { cwd: testCwd });
-			const zip = await bundler.bundle();
-
-			const files = Object.keys(zip.files);
-			expect(files).toContain(path.join("src", "index.ts"));
-			expect(files).toContain("package.json");
-			// Ensure absolute paths are not used
-			expect(files.every((f) => !path.isAbsolute(f))).toBe(true);
-		});
-
-		it("should handle empty glob results", async () => {
-			mockGlob.mockResolvedValueOnce([]);
-
-			bundler.addGlobPattern("*.nonexistent");
-			const zip = await bundler.bundle();
-
-			expect(Object.keys(zip.files)).toHaveLength(0);
-		});
-
-		it("should handle multiple patterns with some empty results", async () => {
-			const testCwd = process.cwd();
-			mockGlob.mockResolvedValueOnce([path.join(testCwd, "file1.js")]).mockResolvedValueOnce([]);
-
-			bundler.addGlobPattern("*.js");
-			bundler.addGlobPattern("*.nonexistent");
-			const zip = await bundler.bundle();
-
-			const files = Object.keys(zip.files);
-			expect(files).toContain("file1.js");
-			expect(files).toHaveLength(1);
-		});
-
-		it("should use DEFLATE compression", async () => {
-			const testCwd = process.cwd();
-			mockGlob.mockResolvedValueOnce([path.join(testCwd, "file1.js")]);
-
-			bundler.addGlobPattern("*.js");
-			const zip = await bundler.bundle();
-
-			const files = Object.keys(zip.files);
-			expect(files).toHaveLength(1);
-
-			const file = zip.files[files[0]];
-			expect(file).toBeDefined();
-			expect(file.options.compression).toBe("DEFLATE");
-		});
-
-		it("should handle glob errors gracefully", async () => {
-			const error = new Error("Glob failed");
-			mockGlob.mockRejectedValueOnce(error);
-
-			bundler.addGlobPattern("*.js");
-
-			await expect(bundler.bundle()).rejects.toThrow("Glob failed");
-		});
-	});
-
-	describe("AppBundler", () => {
-		let appBundler: AppBundler;
-
-		beforeEach(() => {
-			vol.reset();
-			appBundler = new AppBundler();
-			vi.clearAllMocks();
-		});
-
-		describe("constructor", () => {
-			it("should automatically include package.json pattern", () => {
-				// Test passes if no error is thrown during construction
-				// The package.json pattern is added in constructor
-				expect(appBundler).toBeDefined();
-			});
-		});
-
-		describe("installer folder exclusion", () => {
-			beforeEach(() => {
-				const testCwd = process.cwd();
-				vol.fromJSON({
-					[path.join(testCwd, "package.json")]: '{"name": "test-app"}',
-					[path.join(testCwd, "src", "index.js")]: "console.log('app');",
-					[path.join(testCwd, "installer", "setup.exe")]: "binary content",
-					[path.join(testCwd, "installer", "data", "config.json")]: '{"setup": true}',
-					[path.join(testCwd, "nested", "installer", "tool.exe")]: "tool content",
-					[path.join(testCwd, "dist", "app.js")]: "built app",
-				});
-			});
-
-			it("should exclude installer folder when no ignore options provided", async () => {
-				const testCwd = process.cwd();
-				// Mock package.json call (first call for auto-added pattern)
-				mockGlob.mockResolvedValueOnce([path.join(testCwd, "package.json")]);
-				// Mock user pattern call
-				mockGlob.mockResolvedValueOnce([
-					path.join(testCwd, "src", "index.js"),
-					path.join(testCwd, "dist", "app.js"),
-				]);
-
-				appBundler.addGlobPattern("**/*.js");
-				const zip = await appBundler.bundle();
-
-				expect(mockGlob).toHaveBeenNthCalledWith(
-					2,
-					["**/*.js"],
-					expect.objectContaining({
-						ignore: "**/installer/**",
-					}),
-				);
-
-				const files = Object.keys(zip.files);
-				expect(files).toContain("package.json");
-				expect(files).toContain(path.join("src", "index.js"));
-				expect(files).toContain(path.join("dist", "app.js"));
-			});
-
-			it("should merge installer exclusion with existing ignore patterns (string)", async () => {
-				const testCwd = process.cwd();
-				mockGlob.mockResolvedValueOnce([path.join(testCwd, "package.json")]);
-				mockGlob.mockResolvedValueOnce([path.join(testCwd, "src", "index.js")]);
-
-				appBundler.addGlobPattern("**/*.js", { ignore: "node_modules/**" });
-				await appBundler.bundle();
-
-				expect(mockGlob).toHaveBeenNthCalledWith(
-					2,
-					["**/*.js"],
-					expect.objectContaining({
-						ignore: ["node_modules/**", "**/installer/**"],
-					}),
-				);
-			});
-
-			it("should merge installer exclusion with existing ignore patterns (array)", async () => {
-				const testCwd = process.cwd();
-				mockGlob.mockResolvedValueOnce([path.join(testCwd, "package.json")]);
-				mockGlob.mockResolvedValueOnce([path.join(testCwd, "src", "index.js")]);
-
-				appBundler.addGlobPattern("**/*.js", {
-					ignore: ["node_modules/**", "*.test.js"],
-				});
-				await appBundler.bundle();
-
-				expect(mockGlob).toHaveBeenNthCalledWith(
-					2,
-					["**/*.js"],
-					expect.objectContaining({
-						ignore: ["node_modules/**", "*.test.js", "**/installer/**"],
-					}),
-				);
-			});
-
-			it("should not duplicate installer exclusion if already present", async () => {
-				const testCwd = process.cwd();
-				mockGlob.mockResolvedValueOnce([path.join(testCwd, "package.json")]);
-				mockGlob.mockResolvedValueOnce([path.join(testCwd, "src", "index.js")]);
-
-				appBundler.addGlobPattern("**/*.js", {
-					ignore: ["**/installer/**", "node_modules/**"],
-				});
-				await appBundler.bundle();
-
-				expect(mockGlob).toHaveBeenNthCalledWith(
-					2,
-					["**/*.js"],
-					expect.objectContaining({
-						ignore: ["**/installer/**", "node_modules/**", "**/installer/**"],
-					}),
-				);
-				// Note: The current implementation doesn't dedupe, which is acceptable
-			});
-		});
-
-		describe("package.json requirement", () => {
-			it("should include package.json by default", async () => {
-				const testCwd = process.cwd();
-				mockGlob.mockResolvedValueOnce([path.join(testCwd, "package.json")]);
-
-				const zip = await appBundler.bundle();
-
-				expect(mockGlob).toHaveBeenCalledWith(["package.json"], expect.any(Object));
-
-				const files = Object.keys(zip.files);
-				expect(files).toContain("package.json");
-			});
-
-			it("should not throw error when package.json is automatically included", async () => {
-				const testCwd = process.cwd();
-				// Set up files in mock filesystem first
-				vol.fromJSON({
-					[path.join(testCwd, "package.json")]: '{"name": "test"}',
-					[path.join(testCwd, "src", "index.js")]: "console.log('test');",
-				});
-
-				mockGlob.mockResolvedValueOnce([path.join(testCwd, "package.json")]);
-				mockGlob.mockResolvedValueOnce([path.join(testCwd, "src", "index.js")]);
-
-				appBundler.addGlobPattern("src/**/*.js");
-
-				await expect(appBundler.bundle()).resolves.toBeDefined();
-			});
-
-			it("should throw error if package.json is not found despite being added", async () => {
-				// Mock package.json pattern to return empty (simulating missing file)
-				mockGlob.mockResolvedValueOnce([]);
-				mockGlob.mockResolvedValueOnce([]);
-
-				appBundler.addGlobPattern("src/**/*.js");
-
-				await expect(appBundler.bundle()).rejects.toThrow("package.json not found");
-			});
-		});
-
-		describe("multiple patterns with installer exclusion", () => {
-			beforeEach(() => {
-				const testCwd = process.cwd();
-				vol.fromJSON({
-					[path.join(testCwd, "package.json")]: '{"name": "test-app"}',
-					[path.join(testCwd, "src", "index.js")]: "app code",
-					[path.join(testCwd, "assets", "logo.png")]: "image data",
-					[path.join(testCwd, "installer", "setup.exe")]: "installer",
-				});
-			});
-
-			it("should apply installer exclusion to all patterns", async () => {
-				const testCwd = process.cwd();
-				mockGlob.mockResolvedValueOnce([path.join(testCwd, "package.json")]);
-				mockGlob.mockResolvedValueOnce([path.join(testCwd, "src", "index.js")]);
-				mockGlob.mockResolvedValueOnce([path.join(testCwd, "assets", "logo.png")]);
-
-				appBundler.addGlobPattern("src/**/*.js", { ignore: "*.test.js" });
-				appBundler.addGlobPattern("assets/**/*");
-
-				const zip = await appBundler.bundle();
-
-				// Check that installer exclusion is applied to both patterns
-				expect(mockGlob).toHaveBeenNthCalledWith(
-					2,
-					["src/**/*.js"],
-					expect.objectContaining({
-						ignore: ["*.test.js", "**/installer/**"],
-					}),
-				);
-				expect(mockGlob).toHaveBeenNthCalledWith(
-					3,
-					["assets/**/*"],
-					expect.objectContaining({
-						ignore: "**/installer/**",
-					}),
-				);
-
-				const files = Object.keys(zip.files);
-				expect(files).toContain("package.json");
-				expect(files).toContain(path.join("src", "index.js"));
-				expect(files).toContain(path.join("assets", "logo.png"));
-			});
-		});
-	});
-});

package/__tests__/temp.test.ts

@@ -1,7 +0,0 @@
-import { describe, it, expect } from "vitest";
-
-describe("temp", () => {
-	it("should be true", () => {
-		expect(true).toBe(true);
-	});
-});

package/__tests__/utils.ts

@@ -1,2 +0,0 @@
-// eslint-disable no-export
-export const noop = () => {};

package/dist/chunk-RDQt0V5E.js

@@ -1,31 +0,0 @@
-import { createRequire } from "node:module";
-
-//#region rolldown:runtime
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function() {
-	return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-var __toDynamicImportESM = (isNodeMode) => (mod) => __toESM(mod.default, isNodeMode);
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
-
-//#endregion
-export { __commonJS, __require, __toDynamicImportESM };