codemerge-cli 1.3.6 → 1.3.7

package/dist/commands/use.js

@@ -1,13 +1,21 @@
-import { ProcessUtils } from '../utils/processUtils.js';
-import { CodeMerger } from '../core/codeMerger.js';
-import { Config } from '../core/config.js';
 import { FileWatcher } from '../core/fileWatcher.js';
+import { CodeMerger } from '../core/codeMerger.js';
+import { Process } from '../utils/process.js';
 import { Logger } from '../utils/logger.js';
+import { Config } from '../core/config.js';
 export class UseCommand {
-    register(program) {
-        program.command('use').description('Merge code files into a single output file').argument('[path]', 'Input path to scan', '.').option('-o, --output <path>', 'Output file path').option('-w, --watch', 'Watch for file changes').option('--ignore <patterns>', 'Additional ignore patterns (comma-separated)').option('--include <patterns>', 'Include patterns (comma-separated)').action(this.execute.bind(this));
-    }
-    async execute(inputPath, options) {
+    register = (program) => {
+        program
+            .command('use')
+            .description('Merge code files into a single output file')
+            .argument('[path]', 'Input path to scan', '.')
+            .option('-o, --output <path>', 'Output file path')
+            .option('-w, --watch', 'Watch for file changes')
+            .option('--ignore <patterns>', 'Additional ignore patterns (comma-separated)')
+            .option('--include <patterns>', 'Include patterns (comma-separated)')
+            .action(this.execute);
+    };
+    execute = async (inputPath, options) => {
         try {
             Logger.info('Starting code merge...');
             const config = Config.load(inputPath);
@@ -18,23 +26,21 @@ export class UseCommand {
                 ignorePatterns: options.ignore ? options.ignore.split(',') : undefined,
                 includePatterns: options.include ? options.include.split(',') : undefined
             });
-            if (mergeOptions.onStartCommand) {
-                ProcessUtils.runCommand(mergeOptions.onStartCommand, mergeOptions.onStartCommandLogs);
-            }
+            if (mergeOptions.onStartCommand)
+                Process.runCommand(mergeOptions.onStartCommand, mergeOptions.onStartCommandLogs);
             const merger = new CodeMerger(mergeOptions);
             const result = await merger.execute();
             if (!result.success) {
                 Logger.error('Merge failed:');
-                result.errors.forEach(error => Logger.error('  ' + error));
+                result.errors.forEach(error => Logger.error(`  ${error}`));
                 process.exit(1);
             }
-            Logger.success('Merged ' + result.filesProcessed + ' files into ' + result.outputPath);
+            Logger.success(`Merged ${result.filesProcessed} files into ${result.outputPath}`);
             if (mergeOptions.watch) {
                 const watcher = new FileWatcher(mergeOptions, async () => {
-                    const result = await merger.execute();
-                    if (result.success) {
-                        Logger.success('Merged ' + result.filesProcessed + ' files into ' + result.outputPath);
-                    }
+                    const res = await merger.execute();
+                    if (res.success)
+                        Logger.success(`Merged ${res.filesProcessed} files into ${res.outputPath}`);
                 });
                 watcher.start();
                 process.on('SIGINT', () => {
@@ -49,6 +55,6 @@ export class UseCommand {
             Logger.error(error instanceof Error ? error.message : 'Unexpected error occurred');
             process.exit(1);
         }
-    }
+    };
 }
 //# sourceMappingURL=use.js.map

package/dist/commands/use.js.map

@@ -1 +1 @@
-{"version":3,"file":"use.js","sourceRoot":"","sources":["../../lib/commands/use.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use.js","sourceRoot":"","sources":["../../lib/commands/use.ts"],"names":[],"mappings":"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"}

package/dist/commands/version/index.d.ts

@@ -0,0 +1,9 @@
+import { Command } from 'commander';
+export default class VersionCommand {
+    register: (program: Command) => void;
+    private execute;
+    private displayBanner;
+    private displayVersion;
+    private getPackageJson;
+}
+//# sourceMappingURL=index.d.ts.map

package/dist/commands/version/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/commands/version/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC,MAAM,CAAC,OAAO,OAAO,cAAc;IAC1B,QAAQ,GAAI,SAAS,OAAO,KAAG,IAAI,CAEzC;IAED,OAAO,CAAC,OAAO,CAQd;IAED,OAAO,CAAC,aAAa,CAIpB;IAED,OAAO,CAAC,cAAc,CAAuE;IAE7F,OAAO,CAAC,cAAc,CAAsG;CAC7H"}

package/dist/commands/version/index.js

@@ -0,0 +1,26 @@
+import Logger from '../../utils/logger.js';
+import File from '../../utils/file.js';
+import Path from '../../utils/path.js';
+export default class VersionCommand {
+    register = (program) => {
+        program.command('version').description('Display version information').action(this.execute);
+    };
+    execute = async () => {
+        try {
+            this.displayBanner();
+            this.displayVersion();
+        }
+        catch (error) {
+            Logger.error(error instanceof Error ? error.message : 'Unexpected error occurred');
+            process.exit(1);
+        }
+    };
+    displayBanner = () => {
+        const packageJson = this.getPackageJson();
+        const name = packageJson.name.replace('-', ' ').toUpperCase();
+        Logger.banner(name);
+    };
+    displayVersion = () => Logger.info(`Version: ${this.getPackageJson().version}`);
+    getPackageJson = () => File.readJson(Path.getPackagePath(import.meta.url, 'package.json'));
+}
+//# sourceMappingURL=index.js.map

package/dist/commands/version/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/commands/version/index.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,kBAAkB,CAAA;AACrC,OAAO,IAAI,MAAM,gBAAgB,CAAA;AACjC,OAAO,IAAI,MAAM,gBAAgB,CAAA;AAIjC,MAAM,CAAC,OAAO,OAAO,cAAc;IAC1B,QAAQ,GAAG,CAAC,OAAgB,EAAQ,EAAE;QAC3C,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,6BAA6B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC5F,CAAC,CAAA;IAEO,OAAO,GAAG,KAAK,IAAmB,EAAE;QAC1C,IAAI,CAAC;YACH,IAAI,CAAC,aAAa,EAAE,CAAA;YACpB,IAAI,CAAC,cAAc,EAAE,CAAA;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAA;YAClF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;IACH,CAAC,CAAA;IAEO,aAAa,GAAG,GAAS,EAAE;QACjC,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QACzC,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA;QAC7D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC,CAAA;IAEO,cAAc,GAAG,GAAS,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;IAErF,cAAc,GAAG,GAAgB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAc,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAA;CAC7H"}

package/dist/commands/version/types.d.ts

@@ -0,0 +1,5 @@
+export interface PackageInfo {
+    version: string;
+    name: string;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/commands/version/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../lib/commands/version/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACb"}

package/dist/commands/version/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/commands/version/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../lib/commands/version/types.ts"],"names":[],"mappings":""}

package/dist/commands/version.d.ts

@@ -1,6 +1,6 @@
 import { Command } from 'commander';
 export declare class VersionCommand {
-    register(program: Command): void;
+    register: (program: Command) => void;
     private execute;
     private displayBanner;
     private displayVersion;

package/dist/commands/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../lib/commands/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,qBAAa,cAAc;IAClB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;YAIzB,OAAO;IAUrB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,cAAc;CAIvB"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../lib/commands/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC,qBAAa,cAAc;IAClB,QAAQ,GAAI,SAAS,OAAO,KAAG,IAAI,CAEzC;IAED,OAAO,CAAC,OAAO,CAQd;IAED,OAAO,CAAC,aAAa,CAIpB;IAED,OAAO,CAAC,cAAc,CAAuE;IAE7F,OAAO,CAAC,cAAc,CAAsG;CAC7H"}

package/dist/commands/version.js

@@ -1,11 +1,11 @@
-import { PathUtils } from '../utils/pathUtils.js';
-import { FileUtils } from '../utils/fileUtils.js';
 import { Logger } from '../utils/logger.js';
+import { Path } from '../utils/path.js';
+import { File } from '../utils/file.js';
 export class VersionCommand {
-    register(program) {
-        program.command('version').description('Display version information').action(() => this.execute());
-    }
-    async execute() {
+    register = (program) => {
+        program.command('version').description('Display version information').action(this.execute);
+    };
+    execute = async () => {
         try {
             this.displayBanner();
             this.displayVersion();
@@ -14,19 +14,13 @@ export class VersionCommand {
             Logger.error(error instanceof Error ? error.message : 'Unexpected error occurred');
             process.exit(1);
         }
-    }
-    displayBanner() {
+    };
+    displayBanner = () => {
         const packageJson = this.getPackageJson();
         const name = packageJson.name.replace('-', ' ').toUpperCase();
         Logger.banner(name);
-    }
-    displayVersion() {
-        const packageJson = this.getPackageJson();
-        Logger.info(`Version: ${packageJson.version}`);
-    }
-    getPackageJson() {
-        const packagePath = PathUtils.getPackagePath(import.meta.url, 'package.json');
-        return FileUtils.readJson(packagePath);
-    }
+    };
+    displayVersion = () => Logger.info(`Version: ${this.getPackageJson().version}`);
+    getPackageJson = () => File.readJson(Path.getPackagePath(import.meta.url, 'package.json'));
 }
 //# sourceMappingURL=version.js.map

package/dist/commands/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../lib/commands/version.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAI5C,MAAM,OAAO,cAAc;IAClB,QAAQ,CAAC,OAAgB;QAC9B,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,6BAA6B,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACrG,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,IAAI,CAAC;YACH,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,IAAI,CAAC,cAAc,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC;YACnF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAEO,aAAa;QACnB,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1C,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC9D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEO,cAAc;QACpB,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,YAAY,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;IACjD,CAAC;IAEO,cAAc;QACpB,MAAM,WAAW,GAAG,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QAC9E,OAAO,SAAS,CAAC,QAAQ,CAAc,WAAW,CAAC,CAAC;IACtD,CAAC;CACF"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../lib/commands/version.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AAIvC,MAAM,OAAO,cAAc;IAClB,QAAQ,GAAG,CAAC,OAAgB,EAAQ,EAAE;QAC3C,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,6BAA6B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC5F,CAAC,CAAA;IAEO,OAAO,GAAG,KAAK,IAAmB,EAAE;QAC1C,IAAI,CAAC;YACH,IAAI,CAAC,aAAa,EAAE,CAAA;YACpB,IAAI,CAAC,cAAc,EAAE,CAAA;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAA;YAClF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;IACH,CAAC,CAAA;IAEO,aAAa,GAAG,GAAS,EAAE;QACjC,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QACzC,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA;QAC7D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC,CAAA;IAEO,cAAc,GAAG,GAAS,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;IAErF,cAAc,GAAG,GAAgB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAc,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAA;CAC7H"}

package/dist/commands/watch/index.d.ts

@@ -0,0 +1,9 @@
+import { Command } from 'commander';
+export default class WatchCommand {
+    register: (program: Command) => void;
+    private execute;
+    private performInitialMerge;
+    private getProjectName;
+    private setupGracefulShutdown;
+}
+//# sourceMappingURL=index.d.ts.map

package/dist/commands/watch/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/commands/watch/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAYnC,MAAM,CAAC,OAAO,OAAO,YAAY;IACxB,QAAQ,GAAI,SAAS,OAAO,KAAG,IAAI,CAUzC;IAED,OAAO,CAAC,OAAO,CAiDd;IAED,OAAO,CAAC,mBAAmB,CAW1B;IAED,OAAO,CAAC,cAAc,CAA8H;IAEpJ,OAAO,CAAC,qBAAqB,CAU5B;CACF"}

package/dist/commands/watch/index.js

@@ -0,0 +1,86 @@
+import { basename, resolve } from 'path';
+import HttpServer from '../../core/httpServer/index.js';
+import FileWatcher from '../../core/fileWatcher.js';
+import CodeMerger from '../../core/codeMerger.js';
+import MergeCache from '../../core/mergeCache.js';
+import Process from '../../utils/process.js';
+import Config from '../../core/config.js';
+import Logger from '../../utils/logger.js';
+export default class WatchCommand {
+    register = (program) => {
+        program
+            .command('watch')
+            .description('Start HTTP server and watch for file changes')
+            .argument('[path]', 'Input path to scan', '.')
+            .option('-o, --output <path>', 'Output file path')
+            .option('-p, --port <number>', 'Server port', '9876')
+            .option('--ignore <patterns>', 'Additional ignore patterns (comma-separated)')
+            .option('--include <patterns>', 'Include patterns (comma-separated)')
+            .action(this.execute);
+    };
+    execute = async (inputPath, options) => {
+        try {
+            Logger.info('Starting watch mode...');
+            const config = Config.load(inputPath);
+            const mergeOptions = Config.merge(config, {
+                inputPath,
+                outputPath: options.output,
+                watch: true,
+                writeOutput: false,
+                ignorePatterns: options.ignore ? options.ignore.split(',') : undefined,
+                includePatterns: options.include ? options.include.split(',') : undefined
+            });
+            if (mergeOptions.onStartCommand)
+                Process.runCommand(mergeOptions.onStartCommand, mergeOptions.onStartCommandLogs);
+            const projectName = this.getProjectName(mergeOptions.outputPath);
+            const port = parseInt(options.port || '9876', 10);
+            const cache = new MergeCache();
+            const basePath = resolve(mergeOptions.inputPath);
+            const merger = new CodeMerger(mergeOptions);
+            await this.performInitialMerge(merger, cache);
+            const server = new HttpServer(port, projectName, cache, basePath);
+            server.setMerger(merger, mergeOptions);
+            await server.start();
+            const watcher = new FileWatcher(mergeOptions, async () => await this.performInitialMerge(merger, cache));
+            watcher.start();
+            this.setupGracefulShutdown(server, watcher);
+            Logger.success(`Server running at http://localhost:${port}`);
+            Logger.plain(`  Merge endpoint: http://localhost:${port}/content`);
+            Logger.plain(`  Structure endpoint: http://localhost:${port}/structure`);
+            Logger.plain(`  Selective content: http://localhost:${port}/selective-content`);
+            Logger.plain(`  Upsert endpoint: http://localhost:${port}/upsert`);
+            Logger.plain(`  Delete files endpoint: http://localhost:${port}/delete-files`);
+            Logger.plain(`  Commit endpoint: http://localhost:${port}/commit`);
+            Logger.plain(`  Execute commands endpoint: http://localhost:${port}/execute-commands`);
+            Logger.plain(`  Command output endpoint: http://localhost:${port}/command-output`);
+            Logger.plain('Press Ctrl+C to stop');
+        }
+        catch (error) {
+            Logger.error(error instanceof Error ? error.message : 'Unexpected error occurred');
+            process.exit(1);
+        }
+    };
+    performInitialMerge = async (merger, cache) => {
+        const result = await merger.execute();
+        if (!result.success) {
+            Logger.error('Initial merge failed');
+            result.errors.forEach(error => Logger.error(`  ${error}`));
+            return;
+        }
+        if (result.content)
+            cache.set(result.content);
+        Logger.success(`Merged ${result.filesProcessed} files`);
+    };
+    getProjectName = (outputPath) => basename(outputPath).replace(/\.[^/.]+$/, '').replace(/[^a-zA-Z0-9-_]/g, '-').toLowerCase();
+    setupGracefulShutdown = (server, watcher) => {
+        const shutdown = () => {
+            Logger.plain('\nStopping server and watcher...');
+            server.stop();
+            watcher.stop();
+            process.exit(0);
+        };
+        process.on('SIGINT', shutdown);
+        process.on('SIGTERM', shutdown);
+    };
+}
+//# sourceMappingURL=index.js.map

package/dist/commands/watch/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/commands/watch/index.ts"],"names":[],"mappings":"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"}

package/dist/commands/watch/types.d.ts

@@ -0,0 +1,5 @@
+import type { CommandOptions } from '../../types/config.js';
+export interface WatchOptions extends CommandOptions {
+    port?: string;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/commands/watch/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../lib/commands/watch/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAErD,MAAM,WAAW,YAAa,SAAQ,cAAc;IAClD,IAAI,CAAC,EAAE,MAAM,CAAA;CACd"}

package/dist/commands/watch/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/commands/watch/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../lib/commands/watch/types.ts"],"names":[],"mappings":""}

package/dist/commands/watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../lib/commands/watch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,qBAAa,YAAY;IAChB,QAAQ,GAAI,SAAS,OAAO,KAAG,IAAI,CAExC;IAEF,OAAO,CAAC,OAAO,CA0Cb;IAEF,OAAO,CAAC,mBAAmB,CASzB;IAEF,OAAO,CAAC,cAAc,CAGpB;IAEF,OAAO,CAAC,qBAAqB,CAS3B;CACH"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../lib/commands/watch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAYnC,qBAAa,YAAY;IAChB,QAAQ,GAAI,SAAS,OAAO,KAAG,IAAI,CAUzC;IAED,OAAO,CAAC,OAAO,CA+Cd;IAED,OAAO,CAAC,mBAAmB,CAS1B;IAED,OAAO,CAAC,cAAc,CAA8H;IAEpJ,OAAO,CAAC,qBAAqB,CAS5B;CACF"}

package/dist/commands/watch.js

@@ -1,14 +1,22 @@
 import { basename, resolve } from 'path';
-import { ProcessUtils } from '../utils/processUtils.js';
-import { FileWatcher } from '../core/fileWatcher.js';
 import { HttpServer } from '../core/httpServer.js';
+import { FileWatcher } from '../core/fileWatcher.js';
 import { CodeMerger } from '../core/codeMerger.js';
 import { MergeCache } from '../core/mergeCache.js';
+import { Process } from '../utils/process.js';
 import { Logger } from '../utils/logger.js';
 import { Config } from '../core/config.js';
 export class WatchCommand {
     register = (program) => {
-        program.command('watch').description('Start HTTP server and watch for file changes').argument('[path]', 'Input path to scan', '.').option('-o, --output <path>', 'Output file path').option('-p, --port <number>', 'Server port', '9876').option('--ignore <patterns>', 'Additional ignore patterns (comma-separated)').option('--include <patterns>', 'Include patterns (comma-separated)').action(this.execute);
+        program
+            .command('watch')
+            .description('Start HTTP server and watch for file changes')
+            .argument('[path]', 'Input path to scan', '.')
+            .option('-o, --output <path>', 'Output file path')
+            .option('-p, --port <number>', 'Server port', '9876')
+            .option('--ignore <patterns>', 'Additional ignore patterns (comma-separated)')
+            .option('--include <patterns>', 'Include patterns (comma-separated)')
+            .action(this.execute);
     };
     execute = async (inputPath, options) => {
         try {
@@ -23,7 +31,7 @@ export class WatchCommand {
                 includePatterns: options.include ? options.include.split(',') : undefined
             });
             if (mergeOptions.onStartCommand)
-                ProcessUtils.runCommand(mergeOptions.onStartCommand, mergeOptions.onStartCommandLogs);
+                Process.runCommand(mergeOptions.onStartCommand, mergeOptions.onStartCommandLogs);
             const projectName = this.getProjectName(mergeOptions.outputPath);
             const port = parseInt(options.port || '9876', 10);
             const cache = new MergeCache();
@@ -33,9 +41,7 @@ export class WatchCommand {
             const server = new HttpServer(port, projectName, cache, basePath);
             server.setMerger(merger, mergeOptions);
             await server.start();
-            const watcher = new FileWatcher(mergeOptions, async () => {
-                await this.performInitialMerge(merger, cache);
-            });
+            const watcher = new FileWatcher(mergeOptions, async () => await this.performInitialMerge(merger, cache));
             watcher.start();
             this.setupGracefulShutdown(server, watcher);
             Logger.success(`Server running at http://localhost:${port}`);
@@ -47,7 +53,6 @@ export class WatchCommand {
             Logger.plain(`  Commit endpoint: http://localhost:${port}/commit`);
             Logger.plain(`  Execute commands endpoint: http://localhost:${port}/execute-commands`);
             Logger.plain(`  Command output endpoint: http://localhost:${port}/command-output`);
-            Logger.plain(`  Health endpoint: http://localhost:${port}/health`);
             Logger.plain('Press Ctrl+C to stop');
         }
         catch (error) {
@@ -59,17 +64,14 @@ export class WatchCommand {
         const result = await merger.execute();
         if (!result.success) {
             Logger.error('Initial merge failed');
-            result.errors.forEach(error => Logger.error('  ' + error));
+            result.errors.forEach(error => Logger.error(`  ${error}`));
             return;
         }
         if (result.content)
             cache.set(result.content);
         Logger.success(`Merged ${result.filesProcessed} files`);
     };
-    getProjectName = (outputPath) => {
-        const fileName = basename(outputPath);
-        return fileName.replace(/\.[^/.]+$/, '').replace(/[^a-zA-Z0-9-_]/g, '-').toLowerCase();
-    };
+    getProjectName = (outputPath) => basename(outputPath).replace(/\.[^/.]+$/, '').replace(/[^a-zA-Z0-9-_]/g, '-').toLowerCase();
     setupGracefulShutdown = (server, watcher) => {
         const shutdown = () => {
             Logger.plain('\nStopping server and watcher...');

package/dist/commands/watch.js.map

@@ -1 +1 @@
-{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../lib/commands/watch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../lib/commands/watch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAGxC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAI1C,MAAM,OAAO,YAAY;IAChB,QAAQ,GAAG,CAAC,OAAgB,EAAQ,EAAE;QAC3C,OAAO;aACJ,OAAO,CAAC,OAAO,CAAC;aAChB,WAAW,CAAC,8CAA8C,CAAC;aAC3D,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,EAAE,GAAG,CAAC;aAC7C,MAAM,CAAC,qBAAqB,EAAE,kBAAkB,CAAC;aACjD,MAAM,CAAC,qBAAqB,EAAE,aAAa,EAAE,MAAM,CAAC;aACpD,MAAM,CAAC,qBAAqB,EAAE,8CAA8C,CAAC;aAC7E,MAAM,CAAC,sBAAsB,EAAE,oCAAoC,CAAC;aACpE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACzB,CAAC,CAAA;IAEO,OAAO,GAAG,KAAK,EAAE,SAAiB,EAAE,OAA2C,EAAiB,EAAE;QACxG,IAAI,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;YAErC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACrC,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE;gBACxC,SAAS;gBACT,UAAU,EAAE,OAAO,CAAC,MAAM;gBAC1B,KAAK,EAAE,IAAI;gBACX,WAAW,EAAE,KAAK;gBAClB,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;gBACtE,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;aAC1E,CAAC,CAAA;YAEF,IAAI,YAAY,CAAC,cAAc;gBAAE,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,cAAc,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAA;YAEjH,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAA;YAChE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,MAAM,EAAE,EAAE,CAAC,CAAA;YACjD,MAAM,KAAK,GAAG,IAAI,UAAU,EAAE,CAAA;YAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;YAChD,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,YAAY,CAAC,CAAA;YAE3C,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;YAE7C,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;YACjE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;YACtC,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;YAEpB,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAA;YACxG,OAAO,CAAC,KAAK,EAAE,CAAA;YAEf,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;YAE3C,MAAM,CAAC,OAAO,CAAC,sCAAsC,IAAI,EAAE,CAAC,CAAA;YAC5D,MAAM,CAAC,KAAK,CAAC,sCAAsC,IAAI,UAAU,CAAC,CAAA;YAClE,MAAM,CAAC,KAAK,CAAC,0CAA0C,IAAI,YAAY,CAAC,CAAA;YACxE,MAAM,CAAC,KAAK,CAAC,yCAAyC,IAAI,oBAAoB,CAAC,CAAA;YAC/E,MAAM,CAAC,KAAK,CAAC,uCAAuC,IAAI,SAAS,CAAC,CAAA;YAClE,MAAM,CAAC,KAAK,CAAC,6CAA6C,IAAI,eAAe,CAAC,CAAA;YAC9E,MAAM,CAAC,KAAK,CAAC,uCAAuC,IAAI,SAAS,CAAC,CAAA;YAClE,MAAM,CAAC,KAAK,CAAC,iDAAiD,IAAI,mBAAmB,CAAC,CAAA;YACtF,MAAM,CAAC,KAAK,CAAC,+CAA+C,IAAI,iBAAiB,CAAC,CAAA;YAClF,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAA;YAClF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;IACH,CAAC,CAAA;IAEO,mBAAmB,GAAG,KAAK,EAAE,MAAkB,EAAE,KAAiB,EAAiB,EAAE;QAC3F,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;QACrC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;YACpC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAA;YAC1D,OAAM;QACR,CAAC;QACD,IAAI,MAAM,CAAC,OAAO;YAAE,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAC7C,MAAM,CAAC,OAAO,CAAC,UAAU,MAAM,CAAC,cAAc,QAAQ,CAAC,CAAA;IACzD,CAAC,CAAA;IAEO,cAAc,GAAG,CAAC,UAAkB,EAAU,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA;IAE5I,qBAAqB,GAAG,CAAC,MAAkB,EAAE,OAAoB,EAAQ,EAAE;QACjF,MAAM,QAAQ,GAAG,GAAG,EAAE;YACpB,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;YAChD,MAAM,CAAC,IAAI,EAAE,CAAA;YACb,OAAO,CAAC,IAAI,EAAE,CAAA;YACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC,CAAA;QACD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC9B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IACjC,CAAC,CAAA;CACF"}

package/dist/core/codeMerger.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectStructure, MergeOptions, MergeResult } from '../types/merge.js';
-export declare class CodeMerger {
+export default class CodeMerger {
     private options;
     constructor(options: MergeOptions);
     execute: () => Promise<MergeResult>;

package/dist/core/codeMerger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codeMerger.d.ts","sourceRoot":"","sources":["../../lib/core/codeMerger.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAe,YAAY,EAAE,WAAW,EAAY,MAAM,mBAAmB,CAAA;AAE3G,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAc;gBAEjB,OAAO,EAAE,YAAY;IAI1B,OAAO,QAAa,OAAO,CAAC,WAAW,CAAC,CAsB9C;IAEM,mBAAmB,QAAa,OAAO,CAAC,gBAAgB,CAAC,CAyB/D;IAEM,mBAAmB,GAAU,eAAe,MAAM,EAAE,KAAG,OAAO,CAAC,WAAW,CAAC,CA4BjF;IAED,OAAO,CAAC,kBAAkB,CAsDzB;IAED,OAAO,CAAC,YAAY,CAwCnB;IAED,OAAO,CAAC,iBAAiB,CASxB;IAED,OAAO,CAAC,iBAAiB,CAwBxB;IAED,OAAO,CAAC,UAAU,CAqBjB;IAED,OAAO,CAAC,cAAc,CAcrB;IAED,OAAO,CAAC,iBAAiB,CAcxB;IAED,OAAO,CAAC,iBAAiB,CA6CxB;IAED,OAAO,CAAC,WAAW,CAElB;CACF"}
+{"version":3,"file":"codeMerger.d.ts","sourceRoot":"","sources":["../../lib/core/codeMerger.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAe,YAAY,EAAE,WAAW,EAAY,MAAM,gBAAgB,CAAA;AAExG,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,OAAO,CAAC,OAAO,CAAc;gBAEjB,OAAO,EAAE,YAAY;IAI1B,OAAO,QAAa,OAAO,CAAC,WAAW,CAAC,CAsB9C;IAEM,mBAAmB,QAAa,OAAO,CAAC,gBAAgB,CAAC,CAyB/D;IAEM,mBAAmB,GAAU,eAAe,MAAM,EAAE,KAAG,OAAO,CAAC,WAAW,CAAC,CA4BjF;IAED,OAAO,CAAC,kBAAkB,CAsDzB;IAED,OAAO,CAAC,YAAY,CAwCnB;IAED,OAAO,CAAC,iBAAiB,CASxB;IAED,OAAO,CAAC,iBAAiB,CAwBxB;IAED,OAAO,CAAC,UAAU,CAqBjB;IAED,OAAO,CAAC,cAAc,CAcrB;IAED,OAAO,CAAC,iBAAiB,CAcxB;IAED,OAAO,CAAC,iBAAiB,CA6CxB;IAED,OAAO,CAAC,WAAW,CAA0E;CAC9F"}

package/dist/core/codeMerger.js

@@ -1,8 +1,8 @@
 import { resolve, relative, basename, join } from 'path';
 import { promises } from 'fs';
-import { PatternUtils } from '../utils/pattern.js';
-import { FileUtils } from '../utils/fileUtils.js';
-export class CodeMerger {
+import Pattern from '../utils/pattern.js';
+import File from '../utils/file.js';
+export default class CodeMerger {
     options;
     constructor(options) {
         this.options = options;
@@ -59,7 +59,7 @@ export class CodeMerger {
             const selectedFiles = allFiles.filter(file => selectedPaths.some(selected => {
                 const normalizedSelected = selected.replace(/\\/g, '/');
                 const normalizedFile = file.relativePath.replace(/\\/g, '/');
-                return normalizedFile === normalizedSelected || normalizedFile.startsWith(normalizedSelected + '/');
+                return normalizedFile === normalizedSelected || normalizedFile.startsWith(`${normalizedSelected}/`);
             }));
             const content = this.mergeFiles(selectedFiles);
             return {
@@ -131,8 +131,8 @@ export class CodeMerger {
         const inputPath = resolve(this.options.inputPath);
         const ignorePatterns = this.getIgnorePatterns(inputPath);
         const includePatterns = this.options.includePatterns;
-        const ignoreRegexes = ignorePatterns.map(p => PatternUtils.globToRegex(p));
-        const includeRegexes = includePatterns.map(p => PatternUtils.globToRegex(p));
+        const ignoreRegexes = ignorePatterns.map(p => Pattern.globToRegex(p));
+        const includeRegexes = includePatterns.map(p => Pattern.globToRegex(p));
         const walk = async (currentPath, relativeDir) => {
             try {
                 const entries = await promises.readdir(currentPath, { withFileTypes: true });
@@ -147,10 +147,10 @@ export class CodeMerger {
                     else if (entry.isFile()) {
                         if (!includeRegexes.some(r => r.test(relPath)))
                             continue;
-                        if (this.shouldProcessFile(fullPath, inputPath) && FileUtils.isTextFile(fullPath)) {
+                        if (this.shouldProcessFile(fullPath, inputPath) && File.isTextFile(fullPath)) {
                             files.push({
                                 path: fullPath,
-                                content: FileUtils.read(fullPath),
+                                content: File.read(fullPath),
                                 relativePath: relPath
                             });
                         }
@@ -165,7 +165,7 @@ export class CodeMerger {
         return files.sort((a, b) => a.relativePath.localeCompare(b.relativePath));
     };
     shouldProcessFile = (fullPath, inputPath) => {
-        if (!FileUtils.exists(fullPath))
+        if (!File.exists(fullPath))
             return false;
         const relativePath = relative(inputPath, fullPath);
         const outputFileName = basename(this.options.outputPath);
@@ -206,11 +206,11 @@ export class CodeMerger {
         const mergedContent = files.map(file => {
             const fileSeparator = '-'.repeat(40);
             return [
-                'STARTOFFILE: ' + file.relativePath,
+                `STARTOFFILE: ${file.relativePath}`,
                 fileSeparator,
                 file.content,
                 fileSeparator,
-                'ENDOFFILE: ' + file.relativePath,
+                `ENDOFFILE: ${file.relativePath}`,
                 ''
             ].join('\n');
         }).join('\n');
@@ -220,11 +220,11 @@ export class CodeMerger {
         const timestamp = new Date().toISOString();
         return [
             '# Code Merge Output',
-            'Generated at: ' + timestamp,
-            'Source path: ' + this.options.inputPath,
-            'Files processed: ' + fileCount,
-            'Total lines: ' + totalLines,
-            'Total characters: ' + totalChars,
+            `Generated at: ${timestamp}`,
+            `Source path: ${this.options.inputPath}`,
+            `Files processed: ${fileCount}`,
+            `Total lines: ${totalLines}`,
+            `Total characters: ${totalChars}`,
             '',
             breakdown,
             '',
@@ -284,8 +284,6 @@ export class CodeMerger {
         });
         return lines.join('\n');
     };
-    writeOutput = (content) => {
-        FileUtils.write(this.options.outputPath, content);
-    };
+    writeOutput = (content) => File.write(this.options.outputPath, content);
 }
 //# sourceMappingURL=codeMerger.js.map