Skip to content

Commit 0e91a76

Browse files
RandomByteRandomByte
committed
[ui5-builder][INTERNAL] ESLint: prefer-const
ESLint rule update will follow with eslint-config-google dependency bump. See google/eslint-config-google#52
1 parent 4ecd3be commit 0e91a76

29 files changed

+206
-207
lines changed

‎packages/builder/lib/builder/builder.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function build({tree, destPath, buildDependencies = false, dev = false, selfCont
6565
" including dependencies..." + (dev ? " [dev mode]" : ""));
6666
log.verbose(`Building to ${destPath}...`);
6767

68-
let selectedTasks = composeTaskList({dev, selfContained, includedTasks, excludedTasks});
68+
const selectedTasks = composeTaskList({dev, selfContained, includedTasks, excludedTasks});
6969

7070
const fsTarget = resourceFactory.createAdapter({
7171
fsBasePath: destPath,
@@ -201,7 +201,7 @@ function composeTaskList({dev, selfContained, includedTasks, excludedTasks}) {
201201

202202
// Exclude tasks
203203
for (let i = 0; i < excludedTasks.length; i++) {
204-
let taskName = excludedTasks[i];
204+
const taskName = excludedTasks[i];
205205
if (taskName === "*") {
206206
Object.keys(selectedTasks).forEach((sKey) => {
207207
selectedTasks[sKey] = false;
@@ -215,7 +215,7 @@ function composeTaskList({dev, selfContained, includedTasks, excludedTasks}) {
215215

216216
// Include tasks
217217
for (let i = 0; i < includedTasks.length; i++) {
218-
let taskName = includedTasks[i];
218+
const taskName = includedTasks[i];
219219
if (taskName === "*") {
220220
Object.keys(selectedTasks).forEach((sKey) => {
221221
selectedTasks[sKey] = true;

‎packages/builder/lib/lbt/analyzer/ComponentAnalyzer.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ class ComponentAnalyzer {
5656
return info;
5757
}
5858

59-
let manifestName = resource.name.replace(/Component\.js$/, "manifest.json");
59+
const manifestName = resource.name.replace(/Component\.js$/, "manifest.json");
6060
try {
61-
let manifestResource = await this._pool.findResource(manifestName).catch(() => null);
61+
const manifestResource = await this._pool.findResource(manifestName).catch(() => null);
6262
if ( manifestResource ) {
63-
let fileContent = await manifestResource.buffer();
63+
const fileContent = await manifestResource.buffer();
6464
this._analyzeManifest( JSON.parse(fileContent.toString()), info );
6565
} else {
6666
log.verbose("No manifest found for '%s', skipping analysis", resource.name);
@@ -82,7 +82,7 @@ class ComponentAnalyzer {
8282
* @private
8383
*/
8484
_analyzeManifest( manifest, info ) {
85-
let ui5 = (manifest && manifest["sap.ui5"]) || {};
85+
const ui5 = (manifest && manifest["sap.ui5"]) || {};
8686

8787
if ( ui5.resources && ui5.resources.css ) {
8888
// TODO how to handle CSS dependencies?
@@ -93,21 +93,21 @@ class ComponentAnalyzer {
9393
}
9494

9595
if ( ui5.rootView ) {
96-
let module = ModuleName.fromUI5LegacyName(
96+
const module = ModuleName.fromUI5LegacyName(
9797
ui5.rootView.viewName,
9898
".view." + ui5.rootView.type.toLowerCase() );
9999
log.verbose("adding root view dependency ", module);
100100
info.addDependency( module );
101101
}
102102

103103
each( ui5.dependencies && ui5.dependencies.libs, (options, lib) => {
104-
let module = ModuleName.fromUI5LegacyName(lib, "/library.js");
104+
const module = ModuleName.fromUI5LegacyName(lib, "/library.js");
105105
log.verbose("adding library dependency ", module, options.lazy || false);
106106
info.addDependency( module, options.lazy ); // lazy -> conditional dependency
107107
});
108108

109109
each( ui5.dependencies && ui5.dependencies.components, (options, component) => {
110-
let module = ModuleName.fromUI5LegacyName(component, "/Component.js");
110+
const module = ModuleName.fromUI5LegacyName(component, "/Component.js");
111111
log.verbose("adding component dependency ", module, options.lazy || false);
112112
info.addDependency( module, options.lazy ); // lazy -> conditional dependency
113113
});
@@ -116,18 +116,18 @@ class ComponentAnalyzer {
116116

117117
each( ui5.models, (options, model) => {
118118
if ( options.type ) {
119-
let module = ModuleName.fromUI5LegacyName( options.type );
119+
const module = ModuleName.fromUI5LegacyName( options.type );
120120
log.verbose("derived model implementation dependency ", module);
121121
info.addDependency(module);
122122
}
123123
});
124124

125-
let routing = ui5.routing;
125+
const routing = ui5.routing;
126126
if ( routing ) {
127127
if (Array.isArray(routing.routes)) {
128128
routing.routes.forEach((route) => this._visitRoute(route, routing, info));
129129
} else {
130-
for (let key in routing.routes) {
130+
for (const key in routing.routes) {
131131
if (!routing.routes.hasOwnProperty(key)) {
132132
continue;
133133
}

‎packages/builder/lib/lbt/analyzer/FioriElementsAnalyzer.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ class FioriElementsAnalyzer {
9393
return info;
9494
}
9595

96-
let manifestName = resource.name.replace(/Component\.js$/, "manifest.json");
96+
const manifestName = resource.name.replace(/Component\.js$/, "manifest.json");
9797
try {
98-
let manifestResource = await this._pool.findResource(manifestName).catch(() => null);
98+
const manifestResource = await this._pool.findResource(manifestName).catch(() => null);
9999
if ( manifestResource ) {
100-
let fileContent = await manifestResource.buffer();
100+
const fileContent = await manifestResource.buffer();
101101
await this._analyzeManifest( JSON.parse(fileContent.toString()), info );
102102
} else {
103103
log.verbose("No manifest found for '%s', skipping analysis", resource.name);
@@ -119,8 +119,8 @@ class FioriElementsAnalyzer {
119119
* @private
120120
*/
121121
async _analyzeManifest( manifest, info ) {
122-
let promises = [];
123-
let st = (manifest && manifest["sap.fe"]) || {};
122+
const promises = [];
123+
const st = (manifest && manifest["sap.fe"]) || {};
124124

125125
each(st.entitySets, (entitySetCfg) => {
126126
each(entitySetCfg, (activityCfg, activity) => {
@@ -144,14 +144,14 @@ class FioriElementsAnalyzer {
144144

145145
async _analyzeTemplateComponent(moduleName, pageConfig, appInfo) {
146146
// console.log("analyzing template component %s", moduleName);
147-
let resource = await this._pool.findResource(moduleName);
148-
let code = await resource.buffer();
149-
let ast = esprima.parse(code);
150-
let defaultTemplateName = this._analyzeAST(moduleName, ast);
151-
let templateName = (pageConfig.component && pageConfig.component.settings &&
147+
const resource = await this._pool.findResource(moduleName);
148+
const code = await resource.buffer();
149+
const ast = esprima.parse(code);
150+
const defaultTemplateName = this._analyzeAST(moduleName, ast);
151+
const templateName = (pageConfig.component && pageConfig.component.settings &&
152152
pageConfig.component.settings.templateName) || defaultTemplateName;
153153
if ( templateName ) {
154-
let templateModuleName = ModuleName.fromUI5LegacyName( templateName, ".view.xml" );
154+
const templateModuleName = ModuleName.fromUI5LegacyName( templateName, ".view.xml" );
155155
log.verbose("template app: add dependency to template view %s", templateModuleName);
156156
appInfo.addDependency(templateModuleName);
157157
}
@@ -161,8 +161,8 @@ class FioriElementsAnalyzer {
161161
let templateName = "";
162162
if ( ast.body.length > 0 && (isMethodCall(ast.body[0].expression, CALL_SAP_UI_DEFINE) ||
163163
isMethodCall(ast.body[0].expression, CALL_DEFINE)) ) {
164-
let defineCall = new SapUiDefine(ast.body[0].expression, moduleName);
165-
let TA = defineCall.findImportName("sap/fe/core/TemplateAssembler.js");
164+
const defineCall = new SapUiDefine(ast.body[0].expression, moduleName);
165+
const TA = defineCall.findImportName("sap/fe/core/TemplateAssembler.js");
166166
// console.log("local name for TemplateAssembler: %s", TA);
167167
if ( TA && defineCall.factory ) {
168168
defineCall.factory.body.body.forEach( (stmt) => {
@@ -179,7 +179,7 @@ class FioriElementsAnalyzer {
179179
}
180180

181181
_analyzeTemplateClassDefinition(clazz) {
182-
let defaultValue = getValue(clazz, ["metadata", "properties", "templateName", "defaultValue"]);
182+
const defaultValue = getValue(clazz, ["metadata", "properties", "templateName", "defaultValue"]);
183183
if ( isString(defaultValue) ) {
184184
return defaultValue.value;
185185
}

‎packages/builder/lib/lbt/analyzer/JSModuleAnalyzer.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -164,16 +164,16 @@ const EnrichedVisitorKeys = (function() {
164164
};
165165

166166
// check for unknown keys in our configuration
167-
for ( let type in TempKeys ) {
167+
for ( const type in TempKeys ) {
168168
if ( VisitorKeys[type] === undefined ) {
169169
throw new Error("configuration contains unknown node type '" + type + "'");
170170
}
171171
}
172172

173173
// merge with 'official' visitor keys
174174
Object.keys(VisitorKeys).forEach( (type) => {
175-
let visitorKeys = VisitorKeys[type];
176-
let condKeys = TempKeys[type];
175+
const visitorKeys = VisitorKeys[type];
176+
const condKeys = TempKeys[type];
177177
if ( condKeys === undefined ) {
178178
// configuration missing in ConditionalKeys, maybe a new syntax ?
179179
throw new Error(`unknown estree node type '${type}', new syntax?`);
@@ -269,7 +269,7 @@ class JSModuleAnalyzer {
269269
return;
270270
}
271271

272-
let condKeys = EnrichedVisitorKeys[node.type];
272+
const condKeys = EnrichedVisitorKeys[node.type];
273273
switch (node.type) {
274274
case Syntax.CallExpression:
275275
if ( !conditional && isMethodCall(node, CALL_JQUERY_SAP_DECLARE) ) {
@@ -336,7 +336,7 @@ class JSModuleAnalyzer {
336336
|| isMethodCall(node, CALL_REQUIRE_PRELOAD)
337337
|| isMethodCall(node, CALL_SAP_UI_REQUIRE_PRELOAD) ) {
338338
// recognizes a call to jQuery.sap.registerPreloadedModules
339-
let legacyCall = isMethodCall(node, CALL_JQUERY_SAP_REGISTER_PRELOADED_MODULES);
339+
const legacyCall = isMethodCall(node, CALL_JQUERY_SAP_REGISTER_PRELOADED_MODULES);
340340
info.setFormat( legacyCall ? ModuleFormat.UI5_LEGACY : ModuleFormat.UI5_DEFINE);
341341
onRegisterPreloadedModules(node, legacyCall);
342342
} else if ( isCallableExpression(node.callee) ) {
@@ -346,7 +346,7 @@ class JSModuleAnalyzer {
346346
visit(node.callee.body, conditional);
347347
} else {
348348
// default visit
349-
for ( let key of condKeys ) {
349+
for ( const key of condKeys ) {
350350
visit(node[key.key], key.conditional || conditional);
351351
}
352352
}
@@ -366,7 +366,7 @@ class JSModuleAnalyzer {
366366
visit(node.alternate, true);
367367
} else {
368368
// default visit
369-
for ( let key of condKeys ) {
369+
for ( const key of condKeys ) {
370370
visit(node[key.key], key.conditional || conditional);
371371
}
372372
}
@@ -378,7 +378,7 @@ class JSModuleAnalyzer {
378378
throw new Error(`Unhandled AST node type ${node.type}`);
379379
}
380380
// default visit
381-
for ( let key of condKeys ) {
381+
for ( const key of condKeys ) {
382382
visit(node[key.key], key.conditional || conditional);
383383
}
384384
break;
@@ -454,7 +454,7 @@ class JSModuleAnalyzer {
454454
} else {
455455
// UI5 signature with one or many required modules
456456
for (let i = 0; i < nArgs; i++) {
457-
let arg = args[i];
457+
const arg = args[i];
458458
if ( isString(arg) ) {
459459
const requiredModuleName = ModuleName.fromUI5LegacyName( arg.value );
460460
info.addDependency(requiredModuleName, conditional);
@@ -475,7 +475,7 @@ class JSModuleAnalyzer {
475475
function onSapUiRequireSync(node, conditional) {
476476
const args = node.arguments;
477477
const nArgs = args.length;
478-
let i = 0;
478+
const i = 0;
479479

480480
if ( i < nArgs && isString(args[i]) ) {
481481
const moduleName = ModuleName.fromRequireJSName( args[i].value );
@@ -509,7 +509,7 @@ class JSModuleAnalyzer {
509509
if ( legacyCall ) {
510510
const obj = args[0];
511511
isNewSyntax = false;
512-
let version = findOwnProperty(obj, "version");
512+
const version = findOwnProperty(obj, "version");
513513
if ( version && isString(version) && parseFloat(version.value) >= 2.0 ) {
514514
isNewSyntax = true;
515515
}

‎packages/builder/lib/lbt/analyzer/SmartTemplateAnalyzer.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ class TemplateComponentAnalyzer {
5252
return info;
5353
}
5454

55-
let manifestName = resource.name.replace(/Component\.js$/, "manifest.json");
55+
const manifestName = resource.name.replace(/Component\.js$/, "manifest.json");
5656
try {
57-
let manifestResource = await this._pool.findResource(manifestName).catch(() => null);
57+
const manifestResource = await this._pool.findResource(manifestName).catch(() => null);
5858
if ( manifestResource ) {
59-
let fileContent = await manifestResource.buffer();
59+
const fileContent = await manifestResource.buffer();
6060
await this._analyzeManifest( JSON.parse(fileContent.toString()), info );
6161
} else {
6262
log.verbose("No manifest found for '%s', skipping analysis", resource.name);
@@ -78,14 +78,14 @@ class TemplateComponentAnalyzer {
7878
* @private
7979
*/
8080
async _analyzeManifest( manifest, info ) {
81-
let promises = [];
82-
let that = this;
83-
let st = (manifest && manifest["sap.ui.generic.app"]) || {};
81+
const promises = [];
82+
const that = this;
83+
const st = (manifest && manifest["sap.ui.generic.app"]) || {};
8484
function recurse(ctx) {
8585
if ( ctx.pages ) {
8686
ctx.pages.forEach((page) => {
8787
if ( page.component && page.component.name ) {
88-
let module = ModuleName.fromUI5LegacyName( page.component.name + ".Component" );
88+
const module = ModuleName.fromUI5LegacyName( page.component.name + ".Component" );
8989
log.verbose("template app: add dependency to template component %s", module);
9090
info.addDependency(module);
9191
promises.push( that._analyzeTemplateComponent(module, page, info) );
@@ -101,8 +101,8 @@ class TemplateComponentAnalyzer {
101101

102102
async _analyzeTemplateComponent(moduleName, pageConfig, appInfo) {
103103
// console.log("analyzing template component %s", moduleName);
104-
let resource = await this._pool.findResource(moduleName);
105-
let code = await resource.buffer();
104+
const resource = await this._pool.findResource(moduleName);
105+
const code = await resource.buffer();
106106
const ast = esprima.parse(code);
107107
const defaultTemplateName = this._analyzeAST(moduleName, ast);
108108
const templateName = (pageConfig.component && pageConfig.component.settings &&
@@ -118,8 +118,8 @@ class TemplateComponentAnalyzer {
118118
let templateName = "";
119119
if ( ast.body.length > 0 && (isMethodCall(ast.body[0].expression, CALL_SAP_UI_DEFINE) ||
120120
isMethodCall(ast.body[0].expression, CALL_DEFINE)) ) {
121-
let defineCall = new SapUiDefine(ast.body[0].expression, moduleName);
122-
let TA = defineCall.findImportName("sap/suite/ui/generic/template/lib/TemplateAssembler.js");
121+
const defineCall = new SapUiDefine(ast.body[0].expression, moduleName);
122+
const TA = defineCall.findImportName("sap/suite/ui/generic/template/lib/TemplateAssembler.js");
123123
// console.log("local name for TemplateAssembler: %s", TA);
124124
if ( TA && defineCall.factory ) {
125125
defineCall.factory.body.body.forEach( (stmt) => {

‎packages/builder/lib/lbt/analyzer/XMLCompositeAnalyzer.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class XMLCompositeAnalyzer {
1616
if ( ast.body.length > 0 && ast.body[0].type === Syntax.ExpressionStatement &&
1717
(isMethodCall(ast.body[0].expression, CALL_SAP_UI_DEFINE) ||
1818
isMethodCall(ast.body[0].expression, CALL_DEFINE)) ) {
19-
let defineCall = new SapUiDefine(ast.body[0].expression, moduleName);
20-
let XMLC = defineCall.findImportName("sap/ui/core/XMLComposite.js");
19+
const defineCall = new SapUiDefine(ast.body[0].expression, moduleName);
20+
const XMLC = defineCall.findImportName("sap/ui/core/XMLComposite.js");
2121
// console.log("local name for XMLComposite: %s", XMLC);
2222
if ( XMLC && defineCall.factory ) {
2323
defineCall.factory.body.body.forEach( (stmt) => {
@@ -31,7 +31,7 @@ class XMLCompositeAnalyzer {
3131
}
3232
});
3333
if ( fragmentName ) {
34-
let fragmentModule = ModuleName.fromUI5LegacyName( fragmentName, ".control.xml" );
34+
const fragmentModule = ModuleName.fromUI5LegacyName( fragmentName, ".control.xml" );
3535
log.verbose("fragment control: add dependency to template fragment %s", fragmentModule);
3636
info.addDependency(fragmentModule);
3737
}
@@ -55,7 +55,7 @@ class XMLCompositeAnalyzer {
5555

5656
_analyzeXMLCClassDefinition(clazz) {
5757
// log.verbose(clazz);
58-
let fragmentName = getValue(clazz, ["fragment"]);
58+
const fragmentName = getValue(clazz, ["fragment"]);
5959
if ( isString(fragmentName) ) {
6060
return fragmentName.value;
6161
}

‎packages/builder/lib/lbt/analyzer/analyzeLibraryJS.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const CALL__SAP_UI_GETCORE = ["sap", "ui", "getCore"];
1111
* call in a library.js module.
1212
*/
1313
async function analyze(resource) {
14-
let libInfo = {
14+
const libInfo = {
1515
noLibraryCSS: false,
1616
types: [],
1717
controls: [],
@@ -27,8 +27,8 @@ async function analyze(resource) {
2727
&& node.arguments.length === 1
2828
&& node.arguments[0].type === Syntax.ObjectExpression ) {
2929
node.arguments[0].properties.forEach( (prop) => {
30-
let key = getPropertyKey(prop);
31-
let value = prop.value;
30+
const key = getPropertyKey(prop);
31+
const value = prop.value;
3232
if ( key === "noLibraryCSS"
3333
&& (value.type === Syntax.Literal && typeof value.value === "boolean") ) {
3434
libInfo.noLibraryCSS = value.value;
@@ -46,8 +46,8 @@ async function analyze(resource) {
4646
return true; // abort, we're done
4747
}
4848

49-
for ( let key of VisitorKeys[node.type] ) {
50-
let child = node[key];
49+
for ( const key of VisitorKeys[node.type] ) {
50+
const child = node[key];
5151
if ( Array.isArray(child) ) {
5252
if ( child.some(visit) ) {
5353
return true;
@@ -62,7 +62,7 @@ async function analyze(resource) {
6262
return false;
6363
}
6464

65-
let code = await resource.getBuffer();
65+
const code = await resource.getBuffer();
6666
visit( esprima.parse(code) );
6767

6868
return libInfo;

0 commit comments

Comments
 (0)