@overlayed/cli 0.0.2 → 0.0.4

package/dist/cli.js

@@ -1,7 +1,8 @@
-import{Command as e,UsageError as t,runExit as n}from"clipanion";import r from"chalk";import i,{createReadStream as a}from"node:fs";import"arktype";import{createWriteStream as o,existsSync as s,mkdirSync as c,readdirSync as l,unlinkSync as u,writeFileSync as d}from"fs";import{join as f}from"path";import p from"node:path";import{glob as m}from"glob";import h,{fileURLToPath as g}from"node:url";import _ from"jszip";const v={deployment:`deployment`};function y(e){return{all:e=e||new Map,on:function(t,n){var r=e.get(t);r?r.push(n):e.set(t,[n])},off:function(t,n){var r=e.get(t);r&&(n?r.splice(r.indexOf(n)>>>0,1):e.set(t,[]))},emit:function(t,n){var r=e.get(t);r&&r.slice().map(function(e){e(n)}),(r=e.get(`*`))&&r.slice().map(function(e){e(t,n)})}}}function b(e){return Object.prototype.toString.call(e)===`[object Object]`}function x(e){return e?Array.isArray(e)?e:[e]:[]}var S=class{data=[];constructor(){}get size(){return this.data.length}add(e){this.data.push(e)}next(){return this.data.shift()}clear(){this.data.length=0}*flush(){for(;this.size>0;){let e=this.next();e&&(yield e)}}},C=class{emitter;constructor(){this.emitter=y()}on(e,t){this.emitter.on(e,t)}off(e,t){this.emitter.off(e,t)}emit(e,t){this.emitter.emit(e,t)}removeAllListeners(){this.emitter.all.clear()}};function w(e,...t){let n=class extends e{static _instance;static getInstance(){return this._instance||(this._instance=new e(...t)),this._instance}static clearInstance(){this._instance=void 0}};return n}var T=class extends C{destroy(){this.removeAllListeners()}fatal(e,t,n){this.emit(`fatal`,{code:t,message:e,data:n,timestamp:Date.now()})}error(e,t,n){this.emit(`error`,{code:t,message:e,data:n,timestamp:Date.now()})}warn(e,t,n){this.emit(`warning`,{code:t,message:e,data:n,timestamp:Date.now()})}};w(T);var E=class e extends C{stream;logPath;baseFileName;currentDate;rotationCheckInterval;isRotating=!1;constructor(e,t){super(),this.logPath=e,this.baseFileName=t.replace(`.log`,``),this.currentDate=this.getDateString(new Date),this.ensureLogDirectory(),this.ensureLogFile(),this.stream=this.createStream(),this.rotationCheckInterval=this.startRotationCheck(),this.cleanupOldLogs()}static scope(t,n){return new e(t,n)}log(...e){this.write(`log`,...e)}error(...e){this.write(`error`,...e)}warn(...e){this.write(`warn`,...e)}info(...e){this.write(`info`,...e)}debug(...e){this.write(`debug`,...e)}async close(){clearInterval(this.rotationCheckInterval),await new Promise(e=>{this.stream.end(()=>e())})}getCurrentFileName(){return this.getFileName(this.currentDate)}getFileName(e){return`${this.baseFileName}-${e}.log`}ensureLogDirectory(){try{c(this.logPath,{recursive:!0})}catch(e){throw console.error(`Failed to create log directory ${this.logPath}:`,e),e}}ensureLogFile(){let e=f(this.logPath,this.getFileName(this.currentDate));if(!s(e))try{d(e,``,`utf8`)}catch(t){throw console.error(`Failed to create log file ${e}:`,t),t}}getDateString(e){return e.toISOString().split(`T`)[0]}createStream(){let e=f(this.logPath,this.getFileName(this.currentDate));return o(e,{flags:`a`,encoding:`utf8`})}async rotateLogs(){if(this.isRotating)return;this.isRotating=!0;let e=this.getDateString(new Date);e!==this.currentDate&&await new Promise(t=>{this.stream.end(()=>{this.currentDate=e,this.stream=this.createStream(),this.cleanupOldLogs(),t()})}),this.isRotating=!1}startRotationCheck(){return setInterval(()=>this.rotateLogs(),6e4)}cleanupOldLogs(){let e=l(this.logPath),t=new Date;t.setDate(t.getDate()-3),e.filter(e=>e.startsWith(this.baseFileName)&&e.endsWith(`.log`)).filter(e=>{let n=e.replace(`${this.baseFileName}-`,``).replace(`.log`,``),r=new Date(n);return r<t}).forEach(e=>{try{u(f(this.logPath,e))}catch(t){console.error(`Failed to delete old log file ${e}:`,t)}})}write(e,...t){let n=new Date,r=n.toISOString().replace(`T`,` `).replace(/\.\d+Z$/,``)+`.${n.getMilliseconds().toString().padStart(3,`0`)}`,i=t.map(e=>typeof e==`object`?JSON.stringify(e,void 0,2):String(e)).join(` `),a=`[${r}] [${e}] ${i}\n`;this.stream.write(a,e=>{e?this.emit(`error`,e):this.emit(`write`,a)})}};const D=()=>p.join(process.env.APPDATA??``,`overlayed`),O=e=>p.join(D(),`apps`,e),k=e=>p.join(O(e),`logs`);var A=class{fileLogger;path;appId;messageQueue=new S;fileName;constructor(e){this.fileName=e}init(e){this.appId=e,this.path=k(e),this.fileLogger=new E(this.path,this.fileName),this.messageQueue.flush().forEach(e=>{this.fileLogger?.[e.type](...e.args)})}scope(e){if(!this.appId||!this.path)throw Error(`Logger not initialized`);let t=`[${e}]`;return{scope:e=>this.scope(e),error:(...e)=>this.error(t,...e),warn:(...e)=>this.warn(t,...e),info:(...e)=>this.info(t,...e),log:(...e)=>this.log(t,...e)}}error(...e){this.handle(`error`,...e)}warn(...e){this.handle(`warn`,...e)}info(...e){this.handle(`log`,...e)}debug(...e){this.handle(`debug`,...e)}log(...e){this.handle(`log`,...e)}handle(e,...t){console[e](...t),this.fileLogger?this.fileLogger[e](...t):this.messageQueue.add({type:e,args:t})}};w(A,`main.log`);const j=`**/overlayed.config.{js,ts,mts}`;async function M(){let e=P(),t=await Promise.all(e.map(async e=>{let t=await import(h.pathToFileURL(e).toString());return t.default}));return t.filter(N)}function N(e){return b(e)&&`app`in e}function P(){let e=m.globSync(j,{absolute:!0,cwd:process.cwd()});return e}var F=class{pattern;options;constructor(e,t){this.pattern=e,this.options=t}},I=class{patterns=[];addGlobPattern(e,t){let n=this.resolveOptions(t),r=x(e);this.patterns.push(new F(r,n))}async bundle(){let e=new _;for(let t of this.patterns){let n=t.options??{},r;r=n.cwd?typeof n.cwd==`string`?n.cwd:g(n.cwd):process.cwd(),p.isAbsolute(r)||(r=p.resolve(r)),n.absolute=!0,n.cwd=r;let i=await m(t.pattern,n);await Promise.all(i.map(async t=>{let n=p.relative(r,t),i=a(t,`binary`);e.file(n,i,{compression:`DEFLATE`})}))}return e}resolveOptions(e){return e}},L=class extends I{installerFolderGlob=`**/installer/**`;constructor(){super(),this.addGlobPattern(`package.json`)}async bundle(){let e=await super.bundle(),t=e.file(`package.json`);if(!t)throw Error(`package.json not found`);return e}resolveOptions(e){if(!e)return{ignore:this.installerFolderGlob};let t=typeof e.ignore==`string`?[e.ignore]:e.ignore??[];return t.push(this.installerFolderGlob),e.ignore=t,e}},R=class extends e{overlayedConfigGlob=`**/overlayed.config.{js,ts,mts}`;static paths=[[`bundle`]];static usage=e.Usage({category:v.deployment,description:`Bundle the app and site for deployment.`,details:`
+#!/usr/bin/env node
+import{Builtins as e,Cli as t,Command as n,UsageError as r}from"clipanion";import i from"chalk";import a,{createReadStream as o}from"node:fs";import"arktype";import{createWriteStream as s,existsSync as c,mkdirSync as l,readdirSync as u,unlinkSync as d,writeFileSync as f}from"fs";import{join as p}from"path";import m from"node:path";import{glob as h}from"glob";import g,{fileURLToPath as _}from"node:url";import v from"jszip";const y={deployment:`deployment`};function b(e){return{all:e=e||new Map,on:function(t,n){var r=e.get(t);r?r.push(n):e.set(t,[n])},off:function(t,n){var r=e.get(t);r&&(n?r.splice(r.indexOf(n)>>>0,1):e.set(t,[]))},emit:function(t,n){var r=e.get(t);r&&r.slice().map(function(e){e(n)}),(r=e.get(`*`))&&r.slice().map(function(e){e(t,n)})}}}function x(e){return Object.prototype.toString.call(e)===`[object Object]`}function S(e){return e?Array.isArray(e)?e:[e]:[]}var C=class{data=[];constructor(){}get size(){return this.data.length}add(e){this.data.push(e)}next(){return this.data.shift()}clear(){this.data.length=0}*flush(){for(;this.size>0;){let e=this.next();e&&(yield e)}}},w=class{emitter;constructor(){this.emitter=b()}on(e,t){this.emitter.on(e,t)}off(e,t){this.emitter.off(e,t)}emit(e,t){this.emitter.emit(e,t)}removeAllListeners(){this.emitter.all.clear()}};function T(e,...t){let n=class extends e{static _instance;static getInstance(){return this._instance||(this._instance=new e(...t)),this._instance}static clearInstance(){this._instance=void 0}};return n}var E=class extends w{destroy(){this.removeAllListeners()}fatal(e,t,n){this.emit(`fatal`,{code:t,message:e,data:n,timestamp:Date.now()})}error(e,t,n){this.emit(`error`,{code:t,message:e,data:n,timestamp:Date.now()})}warn(e,t,n){this.emit(`warning`,{code:t,message:e,data:n,timestamp:Date.now()})}};T(E);var D=class e extends w{stream;logPath;baseFileName;currentDate;rotationCheckInterval;isRotating=!1;constructor(e,t){super(),this.logPath=e,this.baseFileName=t.replace(`.log`,``),this.currentDate=this.getDateString(new Date),this.ensureLogDirectory(),this.ensureLogFile(),this.stream=this.createStream(),this.rotationCheckInterval=this.startRotationCheck(),this.cleanupOldLogs()}static scope(t,n){return new e(t,n)}log(...e){this.write(`log`,...e)}error(...e){this.write(`error`,...e)}warn(...e){this.write(`warn`,...e)}info(...e){this.write(`info`,...e)}debug(...e){this.write(`debug`,...e)}async close(){clearInterval(this.rotationCheckInterval),await new Promise(e=>{this.stream.end(()=>e())})}getCurrentFileName(){return this.getFileName(this.currentDate)}getFileName(e){return`${this.baseFileName}-${e}.log`}ensureLogDirectory(){try{l(this.logPath,{recursive:!0})}catch(e){throw console.error(`Failed to create log directory ${this.logPath}:`,e),e}}ensureLogFile(){let e=p(this.logPath,this.getFileName(this.currentDate));if(!c(e))try{f(e,``,`utf8`)}catch(t){throw console.error(`Failed to create log file ${e}:`,t),t}}getDateString(e){return e.toISOString().split(`T`)[0]}createStream(){let e=p(this.logPath,this.getFileName(this.currentDate));return s(e,{flags:`a`,encoding:`utf8`})}async rotateLogs(){if(this.isRotating)return;this.isRotating=!0;let e=this.getDateString(new Date);e!==this.currentDate&&await new Promise(t=>{this.stream.end(()=>{this.currentDate=e,this.stream=this.createStream(),this.cleanupOldLogs(),t()})}),this.isRotating=!1}startRotationCheck(){return setInterval(()=>this.rotateLogs(),6e4)}cleanupOldLogs(){let e=u(this.logPath),t=new Date;t.setDate(t.getDate()-3),e.filter(e=>e.startsWith(this.baseFileName)&&e.endsWith(`.log`)).filter(e=>{let n=e.replace(`${this.baseFileName}-`,``).replace(`.log`,``),r=new Date(n);return r<t}).forEach(e=>{try{d(p(this.logPath,e))}catch(t){console.error(`Failed to delete old log file ${e}:`,t)}})}write(e,...t){let n=new Date,r=n.toISOString().replace(`T`,` `).replace(/\.\d+Z$/,``)+`.${n.getMilliseconds().toString().padStart(3,`0`)}`,i=t.map(e=>typeof e==`object`?JSON.stringify(e,void 0,2):String(e)).join(` `),a=`[${r}] [${e}] ${i}\n`;this.stream.write(a,e=>{e?this.emit(`error`,e):this.emit(`write`,a)})}};const O=()=>m.join(process.env.APPDATA??``,`overlayed`),k=e=>m.join(O(),`apps`,e),A=e=>m.join(k(e),`logs`);var j=class{fileLogger;path;appId;messageQueue=new C;fileName;constructor(e){this.fileName=e}init(e){this.appId=e,this.path=A(e),this.fileLogger=new D(this.path,this.fileName),this.messageQueue.flush().forEach(e=>{this.fileLogger?.[e.type](...e.args)})}scope(e){if(!this.appId||!this.path)throw Error(`Logger not initialized`);let t=`[${e}]`;return{scope:e=>this.scope(e),error:(...e)=>this.error(t,...e),warn:(...e)=>this.warn(t,...e),info:(...e)=>this.info(t,...e),log:(...e)=>this.log(t,...e)}}error(...e){this.handle(`error`,...e)}warn(...e){this.handle(`warn`,...e)}info(...e){this.handle(`log`,...e)}debug(...e){this.handle(`debug`,...e)}log(...e){this.handle(`log`,...e)}handle(e,...t){console[e](...t),this.fileLogger?this.fileLogger[e](...t):this.messageQueue.add({type:e,args:t})}};T(j,`main.log`);const M=`**/overlayed.config.{js,ts,mts}`;async function N(){let e=F(),t=await Promise.all(e.map(async e=>{let t=await import(g.pathToFileURL(e).toString());return t.default}));return t.filter(P)}function P(e){return x(e)&&`app`in e}function F(){let e=h.globSync(M,{absolute:!0,cwd:process.cwd()});return e}var I=class{pattern;options;constructor(e,t){this.pattern=e,this.options=t}},L=class{patterns=[];addGlobPattern(e,t){let n=this.resolveOptions(t),r=S(e);this.patterns.push(new I(r,n))}async bundle(){let e=new v;for(let t of this.patterns){let n=t.options??{},r;r=n.cwd?typeof n.cwd==`string`?n.cwd:_(n.cwd):process.cwd(),m.isAbsolute(r)||(r=m.resolve(r)),n.absolute=!0,n.cwd=r;let i=await h(t.pattern,n);await Promise.all(i.map(async t=>{let n=m.relative(r,t),i=o(t,`binary`);e.file(n,i,{compression:`DEFLATE`})}))}return e}resolveOptions(e){return e}},R=class extends L{installerFolderGlob=`**/installer/**`;constructor(){super(),this.addGlobPattern(`package.json`)}async bundle(){let e=await super.bundle(),t=e.file(`package.json`);if(!t)throw Error(`package.json not found`);return e}resolveOptions(e){if(!e)return{ignore:this.installerFolderGlob};let t=typeof e.ignore==`string`?[e.ignore]:e.ignore??[];return t.push(this.installerFolderGlob),e.ignore=t,e}},z=class extends n{overlayedConfigGlob=`**/overlayed.config.{js,ts,mts}`;static paths=[[`bundle`]];static usage=n.Usage({category:y.deployment,description:`Bundle the app and site for deployment.`,details:`
 			Bundle the app and site for deployment.
 
 			[Docs](http://docs.overlayed.gg/cli/bundle)
-		`,examples:[[`Basic usage`,`$0 bundle`]]});async execute(){let e=await this.resolveConfig(),t=i.createWriteStream(process.cwd()+`/app.zip`),n=await e.app.bundle();if(t.write(await n.generateAsync({type:`nodebuffer`})),e.site){let t=i.createWriteStream(process.cwd()+`/site.zip`),n=await e.site?.bundle();t.write(await n?.generateAsync({type:`nodebuffer`}))}this.context.stdout.write(r.green(`Bundle created successfully.`))}async resolveConfig(){let e=await M();if(e.length===0)throw new t(`No config file found matching `+this.overlayedConfigGlob);e.length>1&&this.context.stdout.write(r.yellow(`
-Multiple config files found matching ${j}, using the first one.
-				`));let n=e.at(0);return{app:this.getAppBundler(n.app),site:n.site?this.getSiteBundler(n.site):void 0}}getAppBundler(e){let t=new L;return t.addGlobPattern(e.include,{ignore:e.exclude}),t}getSiteBundler(e){let t=new I;return t.addGlobPattern(e.include,{ignore:e.exclude}),t}};n([R]);
+		`,examples:[[`Basic usage`,`$0 bundle`]]});async execute(){let e=await this.resolveConfig(),t=a.createWriteStream(process.cwd()+`/app.zip`),n=await e.app.bundle();if(t.write(await n.generateAsync({type:`nodebuffer`})),e.site){let t=a.createWriteStream(process.cwd()+`/site.zip`),n=await e.site?.bundle();t.write(await n?.generateAsync({type:`nodebuffer`}))}this.context.stdout.write(i.green(`Bundle created successfully.`))}async resolveConfig(){let e=await N();if(e.length===0)throw new r(`No config file found matching `+this.overlayedConfigGlob);e.length>1&&this.context.stdout.write(i.yellow(`
+Multiple config files found matching ${M}, using the first one.
+				`));let t=e.at(0);return{app:this.getAppBundler(t.app),site:t.site?this.getSiteBundler(t.site):void 0}}getAppBundler(e){let t=new R;return t.addGlobPattern(e.include,{ignore:e.exclude}),t}getSiteBundler(e){let t=new L;return t.addGlobPattern(e.include,{ignore:e.exclude}),t}};const B=process.argv.slice(2),V=new t({binaryName:`ogg`,binaryLabel:`Overlayed`});[z,e.HelpCommand].forEach(e=>{V.register(e)}),V.runExit(B);

package/package.json

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

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/moon.yml

@@ -1,18 +0,0 @@
-id: "cli"
-language: "typescript"
-type: "library"
-
-tasks:
-    build:
-        command: "tsdown"
-        outputs:
-            - "dist"
-
-    test:
-        command: "vitest run"
-
-    test-watch:
-        command: "vitest"
-        local: true
-        env:
-            ATTEST_skipTypes: "1"

package/setupVitest.ts

@@ -1,5 +0,0 @@
-// eslint-disable no-export
-import { setup } from "@ark/attest";
-
-// config options can be passed here
-export default () => setup({});

package/src/bundle/command.ts

@@ -1,87 +0,0 @@
-import { Command, UsageError } from "clipanion";
-import chalk from "chalk";
-import fs from "node:fs";
-import { COMMAND_CATEGORIES } from "../consts";
-import {
-	type BundleAppConfig,
-	type BundleSiteConfig,
-	OVERLAYED_CONFIG_GLOB,
-	getOverlayedConfigs,
-} from "@overlayed/utils-node";
-import { AppBundler } from "./internal/appBundler";
-import { Bundler } from "./internal/bundler";
-
-export class BundleCommand extends Command {
-	private readonly overlayedConfigGlob = "**/overlayed.config.{js,ts,mts}";
-
-	public static override paths = [["bundle"]];
-
-	public static override usage = Command.Usage({
-		category: COMMAND_CATEGORIES.deployment,
-		description: "Bundle the app and site for deployment.",
-		details: `
-			Bundle the app and site for deployment.
-
-			[Docs](http://docs.overlayed.gg/cli/bundle)
-		`,
-		examples: [["Basic usage", "$0 bundle"]],
-	});
-
-	public async execute(): Promise<void> {
-		const config = await this.resolveConfig();
-
-		// TODO remove this and send via API instead
-		const appWriteStream = fs.createWriteStream(process.cwd() + "/app.zip");
-		const appZip = await config.app.bundle();
-		appWriteStream.write(await appZip.generateAsync({ type: "nodebuffer" }));
-
-		if (config.site) {
-			const siteWriteStream = fs.createWriteStream(process.cwd() + "/site.zip");
-			const siteZip = await config.site?.bundle();
-
-			siteWriteStream.write(await siteZip?.generateAsync({ type: "nodebuffer" }));
-		}
-
-		this.context.stdout.write(chalk.green("Bundle created successfully."));
-	}
-
-	private async resolveConfig() {
-		const configs = await getOverlayedConfigs();
-
-		if (configs.length === 0) {
-			throw new UsageError("No config file found matching " + this.overlayedConfigGlob);
-		}
-
-		if (configs.length > 1) {
-			this.context.stdout.write(
-				chalk.yellow(`
-Multiple config files found matching ${OVERLAYED_CONFIG_GLOB}, using the first one.
-				`),
-			);
-		}
-
-		const config = configs.at(0)!;
-		return {
-			app: this.getAppBundler(config.app),
-			site: config.site ? this.getSiteBundler(config.site) : undefined,
-		};
-	}
-
-	private getAppBundler(config: BundleAppConfig) {
-		const bundler = new AppBundler();
-		bundler.addGlobPattern(config.include, {
-			ignore: config.exclude,
-		});
-
-		return bundler;
-	}
-
-	private getSiteBundler(config: BundleSiteConfig) {
-		const bundler = new Bundler();
-		bundler.addGlobPattern(config.include, {
-			ignore: config.exclude,
-		});
-
-		return bundler;
-	}
-}

package/src/bundle/internal/appBundler.ts

@@ -1,35 +0,0 @@
-import { Bundler, type BundlerPatternOptions } from "./bundler";
-import type Zip from "jszip";
-
-export class AppBundler extends Bundler {
-	private readonly installerFolderGlob = "**/installer/**";
-
-	public constructor() {
-		super();
-		this.addGlobPattern("package.json");
-	}
-
-	public override async bundle(): Promise<Zip> {
-		const zip = await super.bundle();
-
-		const packageJson = zip.file("package.json");
-		if (!packageJson) {
-			throw new Error("package.json not found");
-		}
-
-		return zip;
-	}
-
-	protected override resolveOptions(options: BundlerPatternOptions | undefined): BundlerPatternOptions | undefined {
-		if (!options) {
-			return {
-				ignore: this.installerFolderGlob,
-			};
-		}
-
-		const ignore = typeof options.ignore === "string" ? [options.ignore] : (options.ignore ?? []);
-		ignore.push(this.installerFolderGlob);
-		options.ignore = ignore;
-		return options;
-	}
-}

package/src/bundle/internal/bundler.ts

@@ -1,77 +0,0 @@
-import { glob, type GlobOptionsWithFileTypesFalse } from "glob";
-import { createReadStream } from "node:fs";
-import { fileURLToPath } from "node:url";
-import path from "node:path";
-import Zip from "jszip";
-import { asArray } from "@overlayed/utils";
-
-class PatternSet {
-	public readonly pattern: string[];
-	public readonly options?: GlobOptionsWithFileTypesFalse;
-
-	constructor(pattern: string[], options?: BundlerPatternOptions) {
-		this.pattern = pattern;
-		this.options = options;
-	}
-}
-
-export interface BundlerPatternOptions extends GlobOptionsWithFileTypesFalse {
-	ignore?: string | string[];
-}
-
-/**
- * Bundles files into a zip file based on a set of glob patterns.
- *
- * Always includes package.json in the bundle.
- * Excludes installer folder.
- */
-export class Bundler {
-	private patterns: PatternSet[] = [];
-
-	public addGlobPattern(pattern: string | string[], options?: BundlerPatternOptions): void {
-		const resolvedOptions = this.resolveOptions(options);
-		const patternArray = asArray(pattern);
-		this.patterns.push(new PatternSet(patternArray, resolvedOptions));
-	}
-
-	public async bundle(): Promise<Zip> {
-		const zip = new Zip();
-
-		for (const pattern of this.patterns) {
-			const options = pattern.options ?? {};
-
-			let cwd: string;
-
-			if (!options.cwd) {
-				cwd = process.cwd();
-			} else if (typeof options.cwd === "string") {
-				cwd = options.cwd;
-			} else {
-				cwd = fileURLToPath(options.cwd);
-			}
-
-			if (!path.isAbsolute(cwd)) {
-				cwd = path.resolve(cwd);
-			}
-
-			options.absolute = true;
-			options.cwd = cwd;
-
-			const files = await glob(pattern.pattern, options);
-			await Promise.all(
-				files.map(async (file) => {
-					const zipPath = path.relative(cwd, file);
-					const stream = createReadStream(file, "binary");
-
-					zip.file(zipPath, stream, { compression: "DEFLATE" });
-				}),
-			);
-		}
-
-		return zip;
-	}
-
-	protected resolveOptions(options: BundlerPatternOptions | undefined): BundlerPatternOptions | undefined {
-		return options;
-	}
-}

package/src/bundle/internal/isBundleConfig.ts

@@ -1,6 +0,0 @@
-import { isObject } from "@overlayed/utils";
-import type { defineConfig } from "../config";
-
-export function isBundleConfig(config: unknown): config is ReturnType<typeof defineConfig> {
-	return isObject(config) && "app" in config;
-}

package/src/cli.ts

@@ -1,4 +0,0 @@
-import { runExit } from "clipanion";
-import { BundleCommand } from "./bundle/command";
-
-runExit([BundleCommand]);

package/src/consts.ts

@@ -1,3 +0,0 @@
-export const COMMAND_CATEGORIES = {
-	deployment: "deployment",
-} as const;

package/temp/overlayed.config.ts

@@ -1,8 +0,0 @@
-import { defineConfig } from "../src/bundle/config";
-
-// TODO think about allowing just an object
-export default defineConfig({
-	app: {
-		include: ["**/*.ts"],
-	},
-});

package/tsconfig.build.json

@@ -1,8 +0,0 @@
-{
-	"extends": "../../tsconfig.options.json",
-	"compilerOptions": {
-		"outDir": "dist",
-		"rootDir": "src"
-	},
-	"include": ["src/**/*"]
-}

package/tsconfig.json

@@ -1,38 +0,0 @@
-{
-	"extends": "../../tsconfig.options.json",
-	"compilerOptions": {
-		"emitDeclarationOnly": true,
-		"outDir": "./dist",
-		"paths": {
-			"@overlayed/utils": [
-				"../utils/src/index.ts"
-			],
-			"@overlayed/utils/*": [
-				"../utils/src/*"
-			],
-			"@overlayed/utils-node": [
-				"../utils-node/src/index.ts"
-			],
-			"@overlayed/utils-node/*": [
-				"../utils-node/src/*"
-			]
-		}
-	},
-	"include": [
-		"*.js",
-		"*.ts",
-		"__tests__/**/*",
-		"src/**/*"
-	],
-	"references": [
-		{
-			"path": "./tsconfig.build.json"
-		},
-		{
-			"path": "../utils"
-		},
-		{
-			"path": "../utils-node"
-		}
-	]
-}

package/tsdown.config.ts

@@ -1,18 +0,0 @@
-import { defineConfig } from "tsdown";
-
-export default defineConfig({
-	tsconfig: "tsconfig.build.json",
-	platform: "node",
-	entry: {
-		cli: "src/cli.ts",
-	},
-	dts: {
-		sourcemap: false,
-		resolve: true,
-	},
-	minify: true,
-	sourcemap: false,
-	// TODO: investigate why treeshaking is not working, maybe a bug with tsdown since its still a newer package
-	// for now we can at least remove arktype since its huge
-	external: [/arktype/, /@ark\/util/],
-});

package/vitest.config.ts

@@ -1,17 +0,0 @@
-import { defineConfig } from "vitest/config";
-import tsconfigPaths from "vite-tsconfig-paths";
-export default defineConfig({
-	plugins: [tsconfigPaths({
-			skip(dir) {
-				return !dir.includes("templates");
-			},
-		}),],
-	test: {
-		globalSetup: "./setupVitest.ts",
-		typecheck: {
-			enabled: true,
-			ignoreSourceErrors: true,
-			tsconfig: "./tsconfig.build.json",
-		}
-	},
-});