Skip to content

Commit 2fcc7b1

Browse files
yurikuznyurikuzn
committed
ref
1 parent 7f4723b commit 2fcc7b1

File tree

4 files changed

+78
-76
lines changed

4 files changed

+78
-76
lines changed

‎bundler/bundler-general.js‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,24 @@ class BundlerGeneral {
7272
}
7373
}
7474

75+
// noinspection JSUnusedGlobalSymbols
7576
/**
7677
* @return {Object.<string, string>}
7778
*/
7879
bundle() {
79-
let result = {};
80-
let mapping = {};
80+
const result = {};
81+
const mapping = {};
8182
let files = [];
8283
let modules = [];
8384
let templateFiles = [];
84-
let mainName = this.config.order[0];
85+
const mainName = this.config.order[0];
8586

8687
/** @var {Object.<string, string[]>} */
8788
const notBundledMap = {};
88-
/** @var {Object.<string, string> */
89+
/** @var {Object.<string, string>} */
8990
const moduleChunkMap = {};
9091
/** @var {Object.<string, string[]>} */
91-
const chunkDirectDependenctModulesMap = {};
92+
const chunkDirectDependentModulesMap = {};
9293

9394
this.config.order.forEach((name, i) => {
9495
const data = this.#bundleChunk(name, i === 0, {
@@ -104,7 +105,7 @@ class BundlerGeneral {
104105

105106
console.log(` Chunk '${name}' done, ${data.files.length} files.`)
106107

107-
chunkDirectDependenctModulesMap[name] = data.directDependencyModules;
108+
chunkDirectDependentModulesMap[name] = data.directDependencyModules;
108109

109110
if (i > 0) {
110111
for (const m of data.modules) {
@@ -139,7 +140,7 @@ class BundlerGeneral {
139140
const dependsOnChunks = [];
140141
const deps = [];
141142

142-
for (const m of chunkDirectDependenctModulesMap[name]) {
143+
for (const m of chunkDirectDependentModulesMap[name]) {
143144
const dependeeChunk = moduleChunkMap[m];
144145

145146
if (!dependeeChunk) {

‎bundler/bundler.js‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -80,24 +80,24 @@ class Bundler {
8080
* }}
8181
*/
8282
bundle(params) {
83-
let ignoreFullPathFiles = params.ignoreFullPathFiles ?? [];
84-
let files = params.files ?? [];
85-
let ignoreFiles = params.ignoreFiles ?? [];
83+
const ignoreFullPathFiles = params.ignoreFullPathFiles ?? [];
84+
const files = params.files ?? [];
85+
const ignoreFiles = params.ignoreFiles ?? [];
8686

87-
let fullPathFiles = []
87+
const fullPathFiles = []
8888
.concat(this.#normalizePaths(params.files || []))
8989
.concat(this.#obtainFiles(params.patterns, [...files, ...ignoreFiles], params.ignorePatterns))
9090
// @todo Check if working.
9191
.filter(file => !ignoreFullPathFiles.includes(file));
9292

93-
let allFiles = this.#obtainFiles(params.lookupPatterns || params.patterns);
93+
const allFiles = this.#obtainFiles(params.lookupPatterns || params.patterns);
9494

95-
let ignoreLibs = params.libs
95+
const ignoreLibs = params.libs
9696
.filter(item => item.amdId && !item.bundle)
9797
.map(item => item.amdId)
9898
.filter(item => !(params.dependentOn || []).includes(item));
9999

100-
let notBundledModules = [];
100+
const notBundledModules = [];
101101

102102
const {files: sortedFiles, depModules, directDepModules} = this.#sortFiles(
103103
params.name,
@@ -152,7 +152,7 @@ class Bundler {
152152
ignorePatterns = this.#normalizePaths(ignorePatterns || []);
153153

154154
this.#normalizePaths(patterns).forEach(pattern => {
155-
let itemFiles = globSync(pattern, {ignore: ignorePatterns})
155+
const itemFiles = globSync(pattern, {ignore: ignorePatterns})
156156
.map(file => file.replaceAll('\\', '/'))
157157
.filter(file => !ignoreFiles.includes(file));
158158

@@ -198,21 +198,21 @@ class Bundler {
198198
libs
199199
) {
200200
/** @var {Object.<string, string[]>} */
201-
let moduleDepsMap = {};
202-
let standalonePathList = [];
201+
const moduleDepsMap = {};
202+
const standalonePathList = [];
203203
let modules = [];
204-
let moduleFileMap = {};
204+
const moduleFileMap = {};
205205

206206
// All direct dependency modules, including dependency to this chunk.
207207
// To be filtered in the upper method call.
208208
const directDepModules = [];
209209

210-
let ignoreModules = ignoreFiles.map(file => this.#obtainModuleName(file));
210+
const ignoreModules = ignoreFiles.map(file => this.#obtainModuleName(file));
211211

212212
allFiles.forEach(file => {
213-
let data = this.#obtainModuleData(file);
213+
const data = this.#obtainModuleData(file);
214214

215-
let isTarget = files.includes(file);
215+
const isTarget = files.includes(file);
216216

217217
if (!data) {
218218
if (isTarget) {
@@ -230,8 +230,8 @@ class Bundler {
230230
}
231231
});
232232

233-
let depModules = [];
234-
let allDepModules = [];
233+
const depModules = [];
234+
const allDepModules = [];
235235

236236
modules
237237
.forEach(name => {
@@ -254,11 +254,11 @@ class Bundler {
254254
.filter(module => !ignoreModules.includes(module));
255255

256256
/** @var {string[]} */
257-
let discardedModules = [];
257+
const discardedModules = [];
258258
/** @var {Object.<string, number>} */
259-
let depthMap = {};
259+
const depthMap = {};
260260
/** @var {string[]} */
261-
let pickedModules = [];
261+
const pickedModules = [];
262262

263263
for (const module of modules) {
264264
this.#buildTreeItem(
@@ -330,7 +330,7 @@ class Bundler {
330330
list = [];
331331
}
332332

333-
let deps = map[name] || [];
333+
const deps = map[name] || [];
334334

335335
deps.forEach(depName => {
336336
if (!list.includes(depName)) {
@@ -370,7 +370,7 @@ class Bundler {
370370
path
371371
) {
372372
/** @var {string[]} */
373-
let deps = map[module] || [];
373+
const deps = map[module] || [];
374374
depth = depth || 0;
375375
path = [].concat(path || []);
376376

@@ -415,7 +415,7 @@ class Bundler {
415415
return dependentOn.includes(depName);
416416
}
417417

418-
for (let depName of deps) {
418+
for (const depName of deps) {
419419
if (isLib(depName)) {
420420
path
421421
.filter(item => !discardedModules.includes(item))
@@ -455,8 +455,8 @@ class Bundler {
455455
* @return string
456456
*/
457457
#obtainModuleName(file) {
458-
for (let mod in this.modPaths) {
459-
let part = this.basePath + '/' + this.modPaths[mod] + '/src/';
458+
for (const mod in this.modPaths) {
459+
const part = this.basePath + '/' + this.modPaths[mod] + '/src/';
460460

461461
if (file.indexOf(part) === 0) {
462462
return `modules/${mod}/` + file.substring(part.length, file.length - 3);
@@ -475,17 +475,17 @@ class Bundler {
475475
return null;
476476
}
477477

478-
let moduleName = this.#obtainModuleName(path);
478+
const moduleName = this.#obtainModuleName(path);
479479

480480
const sourceCode = fs.readFileSync(path, 'utf-8');
481481

482-
let tsSourceFile = typescript.createSourceFile(
482+
const tsSourceFile = typescript.createSourceFile(
483483
path,
484484
sourceCode,
485485
typescript.ScriptTarget.Latest
486486
);
487487

488-
let rootStatement = tsSourceFile.statements[0];
488+
const rootStatement = tsSourceFile.statements[0];
489489

490490
if (
491491
!rootStatement.expression ||
@@ -509,18 +509,18 @@ class Bundler {
509509
};
510510
}
511511

512-
let deps = [];
512+
const deps = [];
513513

514-
let argumentList = rootStatement.expression.arguments;
514+
const argumentList = rootStatement.expression.arguments;
515515

516-
for (let argument of argumentList.slice(0, 2)) {
516+
for (const argument of argumentList.slice(0, 2)) {
517517
if (argument.elements) {
518518
argument.elements.forEach(node => {
519519
if (!node.text) {
520520
return;
521521
}
522522

523-
let dep = this.#normalizeModModuleId(node.text);
523+
const dep = this.#normalizeModModuleId(node.text);
524524

525525
deps.push(dep);
526526
});
@@ -565,17 +565,17 @@ class Bundler {
565565

566566
let outputPath = id;
567567

568-
let dirParts = subjectId.split('/').slice(0, -1);
568+
const dirParts = subjectId.split('/').slice(0, -1);
569569

570570
if (id.slice(0, 2) === './') {
571571
outputPath = dirParts.join('/') + '/' + id.slice(2);
572572
}
573573

574-
let parts = outputPath.split('/');
574+
const parts = outputPath.split('/');
575575

576576
let up = 0;
577577

578-
for (let part of parts) {
578+
for (const part of parts) {
579579
if (part === '..') {
580580
up++;
581581

@@ -605,7 +605,7 @@ class Bundler {
605605
return id;
606606
}
607607

608-
let [mod, part] = id.split(':');
608+
const [mod, part] = id.split(':');
609609

610610
return `modules/${mod}/` + part;
611611
}
@@ -619,15 +619,15 @@ class Bundler {
619619
return false;
620620
}
621621

622-
let startParts = [this.#getSrcPath()];
622+
const startParts = [this.#getSrcPath()];
623623

624-
for (let mod in this.modPaths) {
625-
let modPath = this.basePath + '/' + this.modPaths[mod] + '/src/';
624+
for (const mod in this.modPaths) {
625+
const modPath = this.basePath + '/' + this.modPaths[mod] + '/src/';
626626

627627
startParts.push(modPath);
628628
}
629629

630-
for (let starPart of startParts) {
630+
for (const starPart of startParts) {
631631
if (path.indexOf(starPart) === 0) {
632632
return true;
633633
}
@@ -643,7 +643,7 @@ class Bundler {
643643
*/
644644
#normalizeSourceFile(path) {
645645
let sourceCode = fs.readFileSync(path, 'utf-8');
646-
let srcPath = this.#getSrcPath();
646+
const srcPath = this.#getSrcPath();
647647

648648
sourceCode = this.#stripSourceMappingUrl(sourceCode);
649649

@@ -655,15 +655,15 @@ class Bundler {
655655
return sourceCode;
656656
}
657657

658-
let moduleName = path.slice(srcPath.length, -3);
658+
const moduleName = path.slice(srcPath.length, -3);
659659

660-
let tsSourceFile = typescript.createSourceFile(
660+
const tsSourceFile = typescript.createSourceFile(
661661
path,
662662
sourceCode,
663663
typescript.ScriptTarget.Latest
664664
);
665665

666-
let rootStatement = tsSourceFile.statements[0];
666+
const rootStatement = tsSourceFile.statements[0];
667667

668668
if (
669669
!rootStatement.expression ||
@@ -673,13 +673,13 @@ class Bundler {
673673
return sourceCode;
674674
}
675675

676-
let argumentList = rootStatement.expression.arguments;
676+
const argumentList = rootStatement.expression.arguments;
677677

678678
if (argumentList.length >= 3 || argumentList.length === 0) {
679679
return sourceCode;
680680
}
681681

682-
let moduleNameNode = typescript.createStringLiteral(moduleName);
682+
const moduleNameNode = typescript.createStringLiteral(moduleName);
683683

684684
if (argumentList.length === 1) {
685685
argumentList.unshift(
@@ -697,7 +697,7 @@ class Bundler {
697697
* @return {string}
698698
*/
699699
#stripSourceMappingUrl(contents) {
700-
let re = /^\/\/# sourceMappingURL.*/gm;
700+
const re = /^\/\/# sourceMappingURL.*/gm;
701701

702702
if (!contents.match(re)) {
703703
return contents;

‎bundler/template-precompiler.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ class TemplatePrecompiler {
4848
let files = [];
4949

5050
this.#normalizePaths(params.patterns).forEach(pattern => {
51-
let itemFiles = globSync(pattern)
51+
const itemFiles = globSync(pattern)
5252
.map(file => file.replaceAll('\\', '/'));
5353

5454
files = files.concat(itemFiles);
5555
});
5656

57-
let nameMap = {};
58-
let compiledFiles = [];
57+
const nameMap = {};
58+
const compiledFiles = [];
5959

6060
files.forEach(file => {
6161
let module = null;
@@ -64,8 +64,8 @@ class TemplatePrecompiler {
6464
return;
6565
}
6666

67-
for (let itemModule in params.modulePaths) {
68-
let path = baseBase + '/' + params.modulePaths[itemModule];
67+
for (const itemModule in params.modulePaths) {
68+
const path = baseBase + '/' + params.modulePaths[itemModule];
6969

7070
if (file.indexOf(path) === 0) {
7171
module = itemModule;
@@ -94,11 +94,11 @@ class TemplatePrecompiler {
9494
'Espo.preCompiledTemplates = Espo.preCompiledTemplates || {};\n' +
9595
'Object.assign(Espo.preCompiledTemplates, {\n';
9696

97-
for (let file in nameMap) {
98-
let name = nameMap[file];
97+
for (const file in nameMap) {
98+
const name = nameMap[file];
9999

100-
let templateContent = fs.readFileSync(file, 'utf8');
101-
let compiled = Handlebars.precompile(templateContent);
100+
const templateContent = fs.readFileSync(file, 'utf8');
101+
const compiled = Handlebars.precompile(templateContent);
102102

103103
contents += `'${name}': Handlebars.template(\n${compiled}\n),\n`;
104104
}

0 commit comments

Comments
 (0)