codemerge-cli 1.1.9 → 1.2.0
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/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/core/codeMerger.d.ts +2 -0
- package/dist/core/codeMerger.d.ts.map +1 -1
- package/dist/core/codeMerger.js +76 -17
- 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 +48 -11
- 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/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 +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../lib/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,qBAAa,WAAW;IACf,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;YAIzB,OAAO;IA8BrB,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,gBAAgB;
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../lib/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,qBAAa,WAAW;IACf,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;YAIzB,OAAO;IA8BrB,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,gBAAgB;IA8CxB,OAAO,CAAC,eAAe;CAgBxB"}
|
package/dist/commands/init.js
CHANGED
|
@@ -53,19 +53,31 @@ export class InitCommand {
|
|
|
53
53
|
port: 9876,
|
|
54
54
|
useGitignore: true,
|
|
55
55
|
ignorePatterns: [
|
|
56
|
+
'node_modules',
|
|
56
57
|
'node_modules/**',
|
|
58
|
+
'.git',
|
|
57
59
|
'.git/**',
|
|
60
|
+
'dist',
|
|
58
61
|
'dist/**',
|
|
62
|
+
'build',
|
|
59
63
|
'build/**',
|
|
60
64
|
'**/*.log',
|
|
61
65
|
'package-lock.json',
|
|
66
|
+
'yarn.lock',
|
|
67
|
+
'pnpm-lock.yaml',
|
|
62
68
|
'codemerge.json',
|
|
63
69
|
'merged-output.txt',
|
|
64
|
-
'.env
|
|
70
|
+
'.env',
|
|
71
|
+
'.env.*',
|
|
65
72
|
'**/.DS_Store',
|
|
73
|
+
'coverage',
|
|
66
74
|
'coverage/**',
|
|
75
|
+
'.next',
|
|
67
76
|
'.next/**',
|
|
68
|
-
'.nuxt
|
|
77
|
+
'.nuxt',
|
|
78
|
+
'.nuxt/**',
|
|
79
|
+
'.vscode',
|
|
80
|
+
'.idea'
|
|
69
81
|
],
|
|
70
82
|
includePatterns: [
|
|
71
83
|
'**/*.ts',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../lib/commands/init.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../lib/commands/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,10 @@ export declare class CodeMerger {
|
|
|
4
4
|
constructor(options: MergeOptions);
|
|
5
5
|
execute(): Promise<MergeResult>;
|
|
6
6
|
private collectFiles;
|
|
7
|
+
private shouldProcessFile;
|
|
7
8
|
private getIgnorePatterns;
|
|
8
9
|
private parseGitignore;
|
|
10
|
+
private normalizePatterns;
|
|
9
11
|
private mergeFiles;
|
|
10
12
|
private generateHeader;
|
|
11
13
|
private generateBreakdown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeMerger.d.ts","sourceRoot":"","sources":["../../lib/core/codeMerger.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAY,MAAM,mBAAmB,CAAC;AAE7E,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAe;gBAElB,OAAO,EAAE,YAAY;IAIpB,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC;YAsB9B,YAAY;
|
|
1
|
+
{"version":3,"file":"codeMerger.d.ts","sourceRoot":"","sources":["../../lib/core/codeMerger.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAY,MAAM,mBAAmB,CAAC;AAE7E,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAe;gBAElB,OAAO,EAAE,YAAY;IAIpB,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC;YAsB9B,YAAY;IAgC1B,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,iBAAiB;IA8BzB,OAAO,CAAC,cAAc;IAgCtB,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,UAAU;IAuBlB,OAAO,CAAC,cAAc;IAgBtB,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,iBAAiB;IA+CzB,OAAO,CAAC,WAAW;CAGpB"}
|
package/dist/core/codeMerger.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { resolve, relative, join } from 'path';
|
|
1
|
+
import { resolve, relative, join, basename } from 'path';
|
|
2
2
|
import { glob } from 'glob';
|
|
3
3
|
import { FileUtils } from '../utils/fileUtils.js';
|
|
4
4
|
export class CodeMerger {
|
|
@@ -35,11 +35,12 @@ export class CodeMerger {
|
|
|
35
35
|
const matchedFiles = await glob(pattern, {
|
|
36
36
|
cwd: inputPath,
|
|
37
37
|
ignore: ignorePatterns,
|
|
38
|
-
nodir: true
|
|
38
|
+
nodir: true,
|
|
39
|
+
dot: false
|
|
39
40
|
});
|
|
40
41
|
for (const file of matchedFiles) {
|
|
41
42
|
const fullPath = resolve(inputPath, file);
|
|
42
|
-
if (
|
|
43
|
+
if (this.shouldProcessFile(fullPath, inputPath) && FileUtils.isTextFile(fullPath)) {
|
|
43
44
|
try {
|
|
44
45
|
files.push({
|
|
45
46
|
path: fullPath,
|
|
@@ -55,35 +56,93 @@ export class CodeMerger {
|
|
|
55
56
|
}
|
|
56
57
|
return files.sort((a, b) => a.relativePath.localeCompare(b.relativePath));
|
|
57
58
|
}
|
|
59
|
+
shouldProcessFile(fullPath, inputPath) {
|
|
60
|
+
if (!FileUtils.exists(fullPath))
|
|
61
|
+
return false;
|
|
62
|
+
const relativePath = relative(inputPath, fullPath);
|
|
63
|
+
const outputFileName = basename(this.options.outputPath);
|
|
64
|
+
const configFiles = ['codemerge.json', 'codemerge.config.json'];
|
|
65
|
+
if (relativePath === outputFileName || configFiles.includes(relativePath))
|
|
66
|
+
return false;
|
|
67
|
+
return true;
|
|
68
|
+
}
|
|
58
69
|
getIgnorePatterns(inputPath) {
|
|
59
70
|
const patterns = [...this.options.ignorePatterns];
|
|
71
|
+
const outputFileName = basename(this.options.outputPath);
|
|
72
|
+
if (!patterns.includes(outputFileName) && !patterns.includes(`**/${outputFileName}`)) {
|
|
73
|
+
patterns.push(outputFileName);
|
|
74
|
+
patterns.push(`**/${outputFileName}`);
|
|
75
|
+
}
|
|
76
|
+
patterns.push('codemerge.json');
|
|
77
|
+
patterns.push('codemerge.config.json');
|
|
78
|
+
patterns.push('**/.git/**');
|
|
79
|
+
patterns.push('**/node_modules/**');
|
|
60
80
|
if (!this.options.useGitignore)
|
|
61
|
-
return patterns;
|
|
81
|
+
return this.normalizePatterns(patterns);
|
|
62
82
|
const gitignorePath = join(inputPath, '.gitignore');
|
|
63
83
|
if (!FileUtils.exists(gitignorePath))
|
|
64
|
-
return patterns;
|
|
84
|
+
return this.normalizePatterns(patterns);
|
|
65
85
|
try {
|
|
66
86
|
const content = FileUtils.read(gitignorePath);
|
|
67
87
|
const gitignorePatterns = this.parseGitignore(content);
|
|
68
88
|
patterns.push(...gitignorePatterns);
|
|
69
89
|
}
|
|
70
90
|
catch (error) {
|
|
71
|
-
return patterns;
|
|
91
|
+
return this.normalizePatterns(patterns);
|
|
72
92
|
}
|
|
73
|
-
return patterns;
|
|
93
|
+
return this.normalizePatterns(patterns);
|
|
74
94
|
}
|
|
75
95
|
parseGitignore(content) {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
if (
|
|
82
|
-
return
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
96
|
+
const patterns = [];
|
|
97
|
+
content.split('\n').forEach(line => {
|
|
98
|
+
const trimmed = line.trim();
|
|
99
|
+
if (!trimmed || trimmed.startsWith('#'))
|
|
100
|
+
return;
|
|
101
|
+
if (trimmed.startsWith('!'))
|
|
102
|
+
return;
|
|
103
|
+
let pattern = trimmed;
|
|
104
|
+
if (pattern.startsWith('/')) {
|
|
105
|
+
pattern = pattern.slice(1);
|
|
106
|
+
}
|
|
107
|
+
if (pattern.endsWith('/')) {
|
|
108
|
+
patterns.push(`${pattern}**`);
|
|
109
|
+
patterns.push(`**/${pattern}**`);
|
|
110
|
+
}
|
|
111
|
+
else if (pattern.includes('/')) {
|
|
112
|
+
patterns.push(pattern);
|
|
113
|
+
if (!pattern.startsWith('**/'))
|
|
114
|
+
patterns.push(`**/${pattern}`);
|
|
115
|
+
}
|
|
116
|
+
else if (pattern.includes('*')) {
|
|
117
|
+
patterns.push(pattern);
|
|
118
|
+
patterns.push(`**/${pattern}`);
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
patterns.push(`**/${pattern}`);
|
|
122
|
+
patterns.push(`**/${pattern}/**`);
|
|
123
|
+
}
|
|
124
|
+
});
|
|
125
|
+
return patterns;
|
|
126
|
+
}
|
|
127
|
+
normalizePatterns(patterns) {
|
|
128
|
+
const normalized = new Set();
|
|
129
|
+
patterns.forEach(pattern => {
|
|
130
|
+
let p = pattern.trim();
|
|
131
|
+
if (!p)
|
|
132
|
+
return;
|
|
133
|
+
if (p.startsWith('./'))
|
|
134
|
+
p = p.slice(2);
|
|
135
|
+
if (p.startsWith('/'))
|
|
136
|
+
p = p.slice(1);
|
|
137
|
+
if (p.endsWith('/') && !p.endsWith('**/'))
|
|
138
|
+
p = `${p}**`;
|
|
139
|
+
normalized.add(p);
|
|
140
|
+
if (!p.includes('*') && !p.includes('/')) {
|
|
141
|
+
normalized.add(`**/${p}`);
|
|
142
|
+
normalized.add(`**/${p}/**`);
|
|
143
|
+
}
|
|
86
144
|
});
|
|
145
|
+
return Array.from(normalized);
|
|
87
146
|
}
|
|
88
147
|
mergeFiles(files) {
|
|
89
148
|
const totalLines = files.reduce((sum, file) => sum + file.content.split('\n').length, 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeMerger.js","sourceRoot":"","sources":["../../lib/core/codeMerger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"codeMerger.js","sourceRoot":"","sources":["../../lib/core/codeMerger.ts"],"names":[],"mappings":"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"}
|
package/dist/core/config.d.ts
CHANGED
|
@@ -9,5 +9,6 @@ export declare class Config {
|
|
|
9
9
|
private static parseConfigFile;
|
|
10
10
|
private static loadPackageJsonConfig;
|
|
11
11
|
static merge(config: ConfigFile, options: Partial<MergeOptions>): MergeOptions;
|
|
12
|
+
private static mergeIgnorePatterns;
|
|
12
13
|
}
|
|
13
14
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../lib/core/config.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAGtC;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../lib/core/config.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAGtC;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CA0C7C;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAO9C;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAQ;WAE9B,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU;IAahD,OAAO,CAAC,MAAM,CAAC,eAAe;IAQ9B,OAAO,CAAC,MAAM,CAAC,qBAAqB;WAYtB,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,YAAY;IAgBrF,OAAO,CAAC,MAAM,CAAC,mBAAmB;CAanC"}
|
package/dist/core/config.js
CHANGED
|
@@ -7,19 +7,47 @@ export class Config {
|
|
|
7
7
|
'codemerge.config.json'
|
|
8
8
|
];
|
|
9
9
|
static DEFAULT_IGNORE_PATTERNS = [
|
|
10
|
+
'node_modules',
|
|
10
11
|
'node_modules/**',
|
|
12
|
+
'**/node_modules',
|
|
13
|
+
'**/node_modules/**',
|
|
14
|
+
'.git',
|
|
11
15
|
'.git/**',
|
|
16
|
+
'**/.git',
|
|
17
|
+
'**/.git/**',
|
|
18
|
+
'dist',
|
|
12
19
|
'dist/**',
|
|
20
|
+
'**/dist',
|
|
21
|
+
'**/dist/**',
|
|
22
|
+
'build',
|
|
13
23
|
'build/**',
|
|
14
|
-
'
|
|
15
|
-
'
|
|
16
|
-
'
|
|
17
|
-
'merged-output.txt',
|
|
18
|
-
'.env*',
|
|
19
|
-
'**/.DS_Store',
|
|
24
|
+
'**/build',
|
|
25
|
+
'**/build/**',
|
|
26
|
+
'coverage',
|
|
20
27
|
'coverage/**',
|
|
28
|
+
'**/coverage',
|
|
29
|
+
'**/coverage/**',
|
|
30
|
+
'.next',
|
|
21
31
|
'.next/**',
|
|
22
|
-
'
|
|
32
|
+
'**/.next',
|
|
33
|
+
'**/.next/**',
|
|
34
|
+
'.nuxt',
|
|
35
|
+
'.nuxt/**',
|
|
36
|
+
'**/.nuxt',
|
|
37
|
+
'**/.nuxt/**',
|
|
38
|
+
'**/*.log',
|
|
39
|
+
'**/package-lock.json',
|
|
40
|
+
'**/yarn.lock',
|
|
41
|
+
'**/pnpm-lock.yaml',
|
|
42
|
+
'**/.env',
|
|
43
|
+
'**/.env.*',
|
|
44
|
+
'**/.DS_Store',
|
|
45
|
+
'**/Thumbs.db',
|
|
46
|
+
'**/.vscode',
|
|
47
|
+
'**/.idea',
|
|
48
|
+
'**/codemerge.json',
|
|
49
|
+
'**/codemerge.config.json',
|
|
50
|
+
'**/merged-output.txt'
|
|
23
51
|
];
|
|
24
52
|
static DEFAULT_INCLUDE_PATTERNS = [
|
|
25
53
|
'**/*.ts',
|
|
@@ -62,10 +90,7 @@ export class Config {
|
|
|
62
90
|
}
|
|
63
91
|
static merge(config, options) {
|
|
64
92
|
const outputPath = options.outputPath || config.outputPath || 'merged-output.txt';
|
|
65
|
-
const ignorePatterns =
|
|
66
|
-
if (!ignorePatterns.includes(outputPath)) {
|
|
67
|
-
ignorePatterns.push(outputPath);
|
|
68
|
-
}
|
|
93
|
+
const ignorePatterns = this.mergeIgnorePatterns(config.ignorePatterns, options.ignorePatterns, outputPath);
|
|
69
94
|
return {
|
|
70
95
|
inputPath: options.inputPath || process.cwd(),
|
|
71
96
|
outputPath,
|
|
@@ -77,5 +102,17 @@ export class Config {
|
|
|
77
102
|
port: options.port ?? config.port ?? this.DEFAULT_PORT
|
|
78
103
|
};
|
|
79
104
|
}
|
|
105
|
+
static mergeIgnorePatterns(configPatterns, optionPatterns, outputPath) {
|
|
106
|
+
const patterns = new Set([...this.DEFAULT_IGNORE_PATTERNS]);
|
|
107
|
+
if (configPatterns)
|
|
108
|
+
configPatterns.forEach(p => patterns.add(p));
|
|
109
|
+
if (optionPatterns)
|
|
110
|
+
optionPatterns.forEach(p => patterns.add(p));
|
|
111
|
+
if (outputPath) {
|
|
112
|
+
patterns.add(outputPath);
|
|
113
|
+
patterns.add(`**/${outputPath}`);
|
|
114
|
+
}
|
|
115
|
+
return Array.from(patterns);
|
|
116
|
+
}
|
|
80
117
|
}
|
|
81
118
|
//# sourceMappingURL=config.js.map
|
package/dist/core/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/core/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAKlD,MAAM,OAAO,MAAM;IACT,MAAM,CAAU,gBAAgB,GAAG;QACzC,gBAAgB;QAChB,uBAAuB;KACxB,CAAC;IAEM,MAAM,CAAU,uBAAuB,GAAG;QAChD,iBAAiB;QACjB,SAAS;QACT,SAAS;QACT,UAAU;QACV,UAAU;QACV,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/core/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileWatcher.d.ts","sourceRoot":"","sources":["../../lib/core/fileWatcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fileWatcher.d.ts","sourceRoot":"","sources":["../../lib/core/fileWatcher.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAmC;IAClD,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,aAAa,CAA+B;IACpD,OAAO,CAAC,YAAY,CAA0B;gBAElC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IAKzD,KAAK,IAAI,IAAI;IAwBb,IAAI,IAAI,IAAI;IAYnB,OAAO,CAAC,gBAAgB;CAwBzB"}
|
package/dist/core/fileWatcher.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { resolve } from 'path';
|
|
2
2
|
import chokidar from 'chokidar';
|
|
3
3
|
import { Logger } from '../utils/logger.js';
|
|
4
|
+
import { PatternUtils } from '../utils/patternUtils.js';
|
|
4
5
|
export class FileWatcher {
|
|
5
6
|
watcher = null;
|
|
6
7
|
options;
|
|
@@ -15,10 +16,13 @@ export class FileWatcher {
|
|
|
15
16
|
if (this.watcher)
|
|
16
17
|
this.stop();
|
|
17
18
|
const outputPath = resolve(this.options.outputPath);
|
|
19
|
+
const ignorePatterns = PatternUtils.addDefaultPatterns(this.options.ignorePatterns, this.options.outputPath);
|
|
18
20
|
this.watcher = chokidar.watch(this.options.inputPath, {
|
|
19
|
-
ignored:
|
|
21
|
+
ignored: ignorePatterns,
|
|
20
22
|
persistent: true,
|
|
21
|
-
ignoreInitial: true
|
|
23
|
+
ignoreInitial: true,
|
|
24
|
+
followSymlinks: false,
|
|
25
|
+
ignorePermissionErrors: true
|
|
22
26
|
});
|
|
23
27
|
this.watcher.on('change', this.handleFileChange.bind(this));
|
|
24
28
|
this.watcher.on('add', this.handleFileChange.bind(this));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileWatcher.js","sourceRoot":"","sources":["../../lib/core/fileWatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"fileWatcher.js","sourceRoot":"","sources":["../../lib/core/fileWatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"AAAA,MAAM,OAAO,YAAY;IAChB,MAAM,CAAC,sBAAsB,CAAC,OAAe;QAClD,MAAM,QAAQ,GAAa,EAAE,CAAC;QAE9B,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACjC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,OAAO;YAChD,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,OAAO;YAEpC,MAAM,SAAS,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;YACxD,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,MAAM,CAAC,uBAAuB,CAAC,OAAe;QACpD,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,IAAI,CAAC,GAAG,OAAO,CAAC;QAEhB,MAAM,cAAc,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,cAAc;YAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEnC,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,WAAW;YAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpC,IAAI,WAAW,EAAE,CAAC;YAChB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC5B,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3B,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,IAAI,CAAC,cAAc;gBAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAChD,CAAC;aAAM,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3B,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACzB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5B,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,QAAkB;QAChD,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QAErC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACzB,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC,CAAC;gBAAE,OAAO;YAEf,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;gBAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACvC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;gBAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAE7D,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,GAAG,aAAuC;QACpE,MAAM,WAAW,GAAa,EAAE,CAAC;QAEjC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC5B,IAAI,KAAK;gBAAE,WAAW,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,QAAkB,EAAE,UAAmB;QACtE,MAAM,QAAQ,GAAG;YACf,cAAc;YACd,iBAAiB;YACjB,iBAAiB;YACjB,oBAAoB;YACpB,MAAM;YACN,SAAS;YACT,SAAS;YACT,YAAY;YACZ,gBAAgB;YAChB,uBAAuB;SACxB,CAAC;QAEF,MAAM,QAAQ,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;QAE5C,IAAI,UAAU,EAAE,CAAC;YACf,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1B,QAAQ,CAAC,IAAI,CAAC,MAAM,UAAU,EAAE,CAAC,CAAC;QACpC,CAAC;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;CACF"}
|