codemerge-cli 1.1.9 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +893 -72
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +14 -2
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/watch.d.ts +0 -1
- package/dist/commands/watch.d.ts.map +1 -1
- package/dist/commands/watch.js +11 -11
- package/dist/commands/watch.js.map +1 -1
- package/dist/core/codeMerger.d.ts +6 -1
- package/dist/core/codeMerger.d.ts.map +1 -1
- package/dist/core/codeMerger.js +176 -19
- package/dist/core/codeMerger.js.map +1 -1
- package/dist/core/config.d.ts +1 -0
- package/dist/core/config.d.ts.map +1 -1
- package/dist/core/config.js +50 -12
- package/dist/core/config.js.map +1 -1
- package/dist/core/fileWatcher.d.ts.map +1 -1
- package/dist/core/fileWatcher.js +6 -2
- package/dist/core/fileWatcher.js.map +1 -1
- package/dist/core/httpServer.d.ts +7 -0
- package/dist/core/httpServer.d.ts.map +1 -1
- package/dist/core/httpServer.js +78 -3
- package/dist/core/httpServer.js.map +1 -1
- package/dist/types/merge.d.ts +18 -0
- package/dist/types/merge.d.ts.map +1 -1
- package/dist/utils/patternUtils.d.ts +8 -0
- package/dist/utils/patternUtils.d.ts.map +1 -0
- package/dist/utils/patternUtils.js +90 -0
- package/dist/utils/patternUtils.js.map +1 -0
- package/package.json +2 -2
|
@@ -1,14 +1,21 @@
|
|
|
1
1
|
import { MergeCache } from './mergeCache.js';
|
|
2
|
+
import { CodeMerger } from './codeMerger.js';
|
|
3
|
+
import type { MergeOptions } from '../types/merge.js';
|
|
2
4
|
export declare class HttpServer {
|
|
3
5
|
private server;
|
|
4
6
|
private port;
|
|
5
7
|
private projectName;
|
|
6
8
|
private cache;
|
|
7
9
|
private basePath;
|
|
10
|
+
private merger;
|
|
11
|
+
private mergeOptions;
|
|
8
12
|
constructor(port: number, projectName: string, cache: MergeCache, basePath?: string);
|
|
13
|
+
setMerger(merger: CodeMerger, options: MergeOptions): void;
|
|
9
14
|
start(): Promise<void>;
|
|
10
15
|
stop(): void;
|
|
11
16
|
private handleRequest;
|
|
17
|
+
private handleStructureEndpoint;
|
|
18
|
+
private handleSelectiveContentEndpoint;
|
|
12
19
|
private handleUpsertEndpoint;
|
|
13
20
|
private processUpsert;
|
|
14
21
|
private handleMergeEndpoint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpServer.d.ts","sourceRoot":"","sources":["../../lib/core/httpServer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"httpServer.d.ts","sourceRoot":"","sources":["../../lib/core/httpServer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,OAAO,KAAK,EAAwD,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE5G,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,KAAK,CAAa;IAC1B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,YAAY,CAA6B;gBAErC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,GAAE,MAAsB;IAO3F,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAKpD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB5B,IAAI,IAAI,IAAI;IAOnB,OAAO,CAAC,aAAa;YAgCP,uBAAuB;IAmBrC,OAAO,CAAC,8BAA8B;IAkDtC,OAAO,CAAC,oBAAoB;IAmC5B,OAAO,CAAC,aAAa;IAoErB,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,oBAAoB;IAgB5B,OAAO,CAAC,cAAc;CAOvB"}
|
package/dist/core/httpServer.js
CHANGED
|
@@ -8,12 +8,18 @@ export class HttpServer {
|
|
|
8
8
|
projectName;
|
|
9
9
|
cache;
|
|
10
10
|
basePath;
|
|
11
|
+
merger = null;
|
|
12
|
+
mergeOptions = null;
|
|
11
13
|
constructor(port, projectName, cache, basePath = process.cwd()) {
|
|
12
14
|
this.port = port;
|
|
13
15
|
this.projectName = projectName;
|
|
14
16
|
this.cache = cache;
|
|
15
17
|
this.basePath = basePath;
|
|
16
18
|
}
|
|
19
|
+
setMerger(merger, options) {
|
|
20
|
+
this.merger = merger;
|
|
21
|
+
this.mergeOptions = options;
|
|
22
|
+
}
|
|
17
23
|
async start() {
|
|
18
24
|
return new Promise((resolve, reject) => {
|
|
19
25
|
this.server = createServer(this.handleRequest.bind(this));
|
|
@@ -43,16 +49,83 @@ export class HttpServer {
|
|
|
43
49
|
this.handleUpsertEndpoint(req, res);
|
|
44
50
|
return;
|
|
45
51
|
}
|
|
46
|
-
if (url ===
|
|
52
|
+
if (url === '/content' || url === '/content/') {
|
|
47
53
|
this.handleMergeEndpoint(res);
|
|
48
54
|
return;
|
|
49
55
|
}
|
|
56
|
+
if (url === '/structure' || url === '/structure/') {
|
|
57
|
+
this.handleStructureEndpoint(res);
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
if (url === '/selective-content' && method === 'POST') {
|
|
61
|
+
this.handleSelectiveContentEndpoint(req, res);
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
50
64
|
if (url === '/health' || url === '/') {
|
|
51
65
|
this.handleHealthEndpoint(res);
|
|
52
66
|
return;
|
|
53
67
|
}
|
|
54
68
|
this.handleNotFound(res);
|
|
55
69
|
}
|
|
70
|
+
async handleStructureEndpoint(res) {
|
|
71
|
+
if (!this.merger) {
|
|
72
|
+
res.writeHead(503, { 'Content-Type': 'application/json' });
|
|
73
|
+
res.end(JSON.stringify({ error: 'Merger not initialized' }));
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
try {
|
|
77
|
+
const structure = await this.merger.getProjectStructure();
|
|
78
|
+
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
79
|
+
res.end(JSON.stringify(structure));
|
|
80
|
+
}
|
|
81
|
+
catch (error) {
|
|
82
|
+
res.writeHead(500, { 'Content-Type': 'application/json' });
|
|
83
|
+
res.end(JSON.stringify({
|
|
84
|
+
error: error instanceof Error ? error.message : 'Failed to generate structure'
|
|
85
|
+
}));
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
handleSelectiveContentEndpoint(req, res) {
|
|
89
|
+
let body = '';
|
|
90
|
+
req.on('data', chunk => body += chunk.toString());
|
|
91
|
+
req.on('end', async () => {
|
|
92
|
+
try {
|
|
93
|
+
if (!this.merger) {
|
|
94
|
+
res.writeHead(503, { 'Content-Type': 'application/json' });
|
|
95
|
+
res.end(JSON.stringify({ error: 'Merger not initialized' }));
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
const data = JSON.parse(body);
|
|
99
|
+
if (!data.selectedPaths || !Array.isArray(data.selectedPaths)) {
|
|
100
|
+
res.writeHead(400, { 'Content-Type': 'application/json' });
|
|
101
|
+
res.end(JSON.stringify({ error: 'selectedPaths array is required' }));
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
const result = await this.merger.getSelectiveContent(data.selectedPaths);
|
|
105
|
+
if (!result.success) {
|
|
106
|
+
res.writeHead(500, { 'Content-Type': 'application/json' });
|
|
107
|
+
res.end(JSON.stringify({
|
|
108
|
+
error: 'Failed to generate content',
|
|
109
|
+
details: result.errors
|
|
110
|
+
}));
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
|
|
114
|
+
res.end(result.content);
|
|
115
|
+
Logger.success(`Generated selective content with ${result.filesProcessed} files`);
|
|
116
|
+
}
|
|
117
|
+
catch (error) {
|
|
118
|
+
res.writeHead(400, { 'Content-Type': 'application/json' });
|
|
119
|
+
res.end(JSON.stringify({
|
|
120
|
+
error: error instanceof Error ? error.message : 'Invalid request'
|
|
121
|
+
}));
|
|
122
|
+
}
|
|
123
|
+
});
|
|
124
|
+
req.on('error', error => {
|
|
125
|
+
res.writeHead(500, { 'Content-Type': 'application/json' });
|
|
126
|
+
res.end(JSON.stringify({ error: error.message }));
|
|
127
|
+
});
|
|
128
|
+
}
|
|
56
129
|
handleUpsertEndpoint(req, res) {
|
|
57
130
|
let body = '';
|
|
58
131
|
req.on('data', chunk => body += chunk.toString());
|
|
@@ -162,7 +235,9 @@ export class HttpServer {
|
|
|
162
235
|
status: 'ok',
|
|
163
236
|
project: this.projectName,
|
|
164
237
|
endpoints: {
|
|
165
|
-
merge:
|
|
238
|
+
merge: '/content',
|
|
239
|
+
structure: '/structure',
|
|
240
|
+
selectiveContent: '/selective-content',
|
|
166
241
|
upsert: '/upsert',
|
|
167
242
|
health: '/health'
|
|
168
243
|
},
|
|
@@ -173,7 +248,7 @@ export class HttpServer {
|
|
|
173
248
|
res.writeHead(404, { 'Content-Type': 'application/json' });
|
|
174
249
|
res.end(JSON.stringify({
|
|
175
250
|
error: 'Not found',
|
|
176
|
-
availableEndpoints: ['/', '/health',
|
|
251
|
+
availableEndpoints: ['/', '/health', '/content', '/structure', '/selective-content', '/upsert']
|
|
177
252
|
}));
|
|
178
253
|
}
|
|
179
254
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpServer.js","sourceRoot":"","sources":["../../lib/core/httpServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA2C,MAAM,MAAM,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAQ,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"httpServer.js","sourceRoot":"","sources":["../../lib/core/httpServer.ts"],"names":[],"mappings":"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"}
|
package/dist/types/merge.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export interface MergeOptions {
|
|
|
7
7
|
includePatterns: string[];
|
|
8
8
|
useGitignore: boolean;
|
|
9
9
|
port: number;
|
|
10
|
+
writeOutput: boolean;
|
|
10
11
|
}
|
|
11
12
|
export interface FileData {
|
|
12
13
|
path: string;
|
|
@@ -18,6 +19,7 @@ export interface MergeResult {
|
|
|
18
19
|
outputPath: string;
|
|
19
20
|
filesProcessed: number;
|
|
20
21
|
errors: string[];
|
|
22
|
+
content?: string;
|
|
21
23
|
}
|
|
22
24
|
export interface UpsertFile {
|
|
23
25
|
path: string;
|
|
@@ -38,4 +40,20 @@ export interface UpsertResult {
|
|
|
38
40
|
error?: string;
|
|
39
41
|
}>;
|
|
40
42
|
}
|
|
43
|
+
export interface ProjectNode {
|
|
44
|
+
name: string;
|
|
45
|
+
type: 'file' | 'directory';
|
|
46
|
+
path: string;
|
|
47
|
+
lines?: number;
|
|
48
|
+
children?: ProjectNode[];
|
|
49
|
+
}
|
|
50
|
+
export interface ProjectStructure {
|
|
51
|
+
root: ProjectNode;
|
|
52
|
+
totalFiles: number;
|
|
53
|
+
totalDirectories: number;
|
|
54
|
+
fileTypes: Record<string, number>;
|
|
55
|
+
}
|
|
56
|
+
export interface SelectiveContentRequest {
|
|
57
|
+
selectedPaths: string[];
|
|
58
|
+
}
|
|
41
59
|
//# sourceMappingURL=merge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../lib/types/merge.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../lib/types/merge.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,SAAS,GAAG,SAAS,CAAC;QAC9B,OAAO,EAAE,OAAO,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,uBAAuB;IACtC,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export declare class PatternUtils {
|
|
2
|
+
static parseGitignorePatterns(content: string): string[];
|
|
3
|
+
private static convertGitignorePattern;
|
|
4
|
+
static normalizePatterns(patterns: string[]): string[];
|
|
5
|
+
static mergePatterns(...patternGroups: (string[] | undefined)[]): string[];
|
|
6
|
+
static addDefaultPatterns(patterns: string[], outputPath?: string): string[];
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=patternUtils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"patternUtils.d.ts","sourceRoot":"","sources":["../../lib/utils/patternUtils.ts"],"names":[],"mappings":"AAAA,qBAAa,YAAY;WACT,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE;IAe/D,OAAO,CAAC,MAAM,CAAC,uBAAuB;WA+BxB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;WAgB/C,aAAa,CAAC,GAAG,aAAa,EAAE,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE;WAUnE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;CAuBpF"}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
export class PatternUtils {
|
|
2
|
+
static parseGitignorePatterns(content) {
|
|
3
|
+
const patterns = [];
|
|
4
|
+
content.split('\n').forEach(line => {
|
|
5
|
+
const trimmed = line.trim();
|
|
6
|
+
if (!trimmed || trimmed.startsWith('#'))
|
|
7
|
+
return;
|
|
8
|
+
if (trimmed.startsWith('!'))
|
|
9
|
+
return;
|
|
10
|
+
const converted = this.convertGitignorePattern(trimmed);
|
|
11
|
+
patterns.push(...converted);
|
|
12
|
+
});
|
|
13
|
+
return patterns;
|
|
14
|
+
}
|
|
15
|
+
static convertGitignorePattern(pattern) {
|
|
16
|
+
const patterns = [];
|
|
17
|
+
let p = pattern;
|
|
18
|
+
const isRootRelative = p.startsWith('/');
|
|
19
|
+
if (isRootRelative)
|
|
20
|
+
p = p.slice(1);
|
|
21
|
+
const isDirectory = p.endsWith('/');
|
|
22
|
+
if (isDirectory)
|
|
23
|
+
p = p.slice(0, -1);
|
|
24
|
+
if (isDirectory) {
|
|
25
|
+
patterns.push(`${p}/**`);
|
|
26
|
+
if (!isRootRelative) {
|
|
27
|
+
patterns.push(`**/${p}/**`);
|
|
28
|
+
patterns.push(`**/${p}`);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
else if (p.includes('/')) {
|
|
32
|
+
patterns.push(p);
|
|
33
|
+
if (!isRootRelative)
|
|
34
|
+
patterns.push(`**/${p}`);
|
|
35
|
+
}
|
|
36
|
+
else if (p.includes('*')) {
|
|
37
|
+
patterns.push(p);
|
|
38
|
+
patterns.push(`**/${p}`);
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
patterns.push(`**/${p}`);
|
|
42
|
+
patterns.push(`**/${p}/**`);
|
|
43
|
+
patterns.push(p);
|
|
44
|
+
}
|
|
45
|
+
return patterns;
|
|
46
|
+
}
|
|
47
|
+
static normalizePatterns(patterns) {
|
|
48
|
+
const normalized = new Set();
|
|
49
|
+
patterns.forEach(pattern => {
|
|
50
|
+
let p = pattern.trim();
|
|
51
|
+
if (!p)
|
|
52
|
+
return;
|
|
53
|
+
if (p.startsWith('./'))
|
|
54
|
+
p = p.slice(2);
|
|
55
|
+
if (p.startsWith('/') && !p.startsWith('**'))
|
|
56
|
+
p = p.slice(1);
|
|
57
|
+
normalized.add(p);
|
|
58
|
+
});
|
|
59
|
+
return Array.from(normalized);
|
|
60
|
+
}
|
|
61
|
+
static mergePatterns(...patternGroups) {
|
|
62
|
+
const allPatterns = [];
|
|
63
|
+
patternGroups.forEach(group => {
|
|
64
|
+
if (group)
|
|
65
|
+
allPatterns.push(...group);
|
|
66
|
+
});
|
|
67
|
+
return this.normalizePatterns(allPatterns);
|
|
68
|
+
}
|
|
69
|
+
static addDefaultPatterns(patterns, outputPath) {
|
|
70
|
+
const defaults = [
|
|
71
|
+
'node_modules',
|
|
72
|
+
'node_modules/**',
|
|
73
|
+
'**/node_modules',
|
|
74
|
+
'**/node_modules/**',
|
|
75
|
+
'.git',
|
|
76
|
+
'.git/**',
|
|
77
|
+
'**/.git',
|
|
78
|
+
'**/.git/**',
|
|
79
|
+
'codemerge.json',
|
|
80
|
+
'codemerge.config.json'
|
|
81
|
+
];
|
|
82
|
+
const combined = [...defaults, ...patterns];
|
|
83
|
+
if (outputPath) {
|
|
84
|
+
combined.push(outputPath);
|
|
85
|
+
combined.push(`**/${outputPath}`);
|
|
86
|
+
}
|
|
87
|
+
return this.normalizePatterns(combined);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
//# sourceMappingURL=patternUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"patternUtils.js","sourceRoot":"","sources":["../../lib/utils/patternUtils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "codemerge-cli",
|
|
3
|
-
"version": "1.1
|
|
3
|
+
"version": "1.2.1",
|
|
4
4
|
"description": "AI-focused code and data preparation utility",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "CodeMerge Team",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"build": "tsc && tsc-alias",
|
|
26
26
|
"dev": "tsx watch lib/cli.ts",
|
|
27
27
|
"codemerge": "node dist/cli.js",
|
|
28
|
-
"
|
|
28
|
+
"publisher": "npx project-publisher --bump-package --build --npm-publish --push",
|
|
29
29
|
"prepublishOnly": "npm run build"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|