Skip to content

Commit

Permalink
[INTERNAL] ESLint: Activate no-var rule
Browse files Browse the repository at this point in the history
Already active through eslint-config-google
  • Loading branch information
RandomByte committed May 17, 2018
1 parent ce91dd1 commit 88c7950
Show file tree
Hide file tree
Showing 15 changed files with 76 additions and 77 deletions.
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ module.exports = {
{ "allow": ["!!"] }
],
"comma-dangle": "off",
"no-var": "off",
"no-tabs": "off",
"no-console": "off", // until we have better logging
'valid-jsdoc': [
Expand Down
2 changes: 1 addition & 1 deletion lib/lbt/analyzer/FioriElementsAnalyzer.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class FioriElementsAnalyzer {
}
each(activityCfg, (actionCfg) => {
if ( actionCfg.template ) {
var module = ModuleName.fromUI5LegacyName( "sap.fe.templates." +
const module = ModuleName.fromUI5LegacyName( "sap.fe.templates." +
actionCfg.template + ".Component" );
log.verbose("template app: add dependency to template component %s", module);
info.addDependency(module);
Expand Down
10 changes: 5 additions & 5 deletions lib/lbt/analyzer/SmartTemplateAnalyzer.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ class TemplateComponentAnalyzer {
// console.log("analyzing template component %s", moduleName);
let resource = await this._pool.findResource(moduleName);
let code = await resource.buffer();
var ast = esprima.parse(code);
var defaultTemplateName = this._analyzeAST(moduleName, ast);
var templateName = (pageConfig.component && pageConfig.component.settings &&
const ast = esprima.parse(code);
const defaultTemplateName = this._analyzeAST(moduleName, ast);
const templateName = (pageConfig.component && pageConfig.component.settings &&
pageConfig.component.settings.templateName) || defaultTemplateName;
if ( templateName ) {
var templateModuleName = ModuleName.fromUI5LegacyName( templateName, ".view.xml" );
const templateModuleName = ModuleName.fromUI5LegacyName( templateName, ".view.xml" );
log.verbose("template app: add dependency to template view %s", templateModuleName);
appInfo.addDependency(templateModuleName);
}
Expand Down Expand Up @@ -132,7 +132,7 @@ class TemplateComponentAnalyzer {
}

_analyzeTemplateClassDefinition(clazz) {
var defaultValue = getValue(clazz, ["metadata", "properties", "templateName", "defaultValue"]);
const defaultValue = getValue(clazz, ["metadata", "properties", "templateName", "defaultValue"]);
if ( isString(defaultValue) ) {
return defaultValue.value;
}
Expand Down
40 changes: 20 additions & 20 deletions lib/lbt/analyzer/XMLTemplateAnalyzer.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,14 @@ class XMLTemplateAnalyzer {
_analyzeViewRootNode(node) {
this.info.addImplicitDependency(XMLVIEW_MODULE);

var controllerName = getAttribute(node, XMLVIEW_CONTROLLERNAME_ATTRIBUTE);
const controllerName = getAttribute(node, XMLVIEW_CONTROLLERNAME_ATTRIBUTE);
if ( controllerName ) {
this._addDependency( ModuleName.fromUI5LegacyName(controllerName, ".controller.js") );
}

var resourceBundleName = getAttribute(node, XMLVIEW_RESBUNDLENAME_ATTRIBUTE);
const resourceBundleName = getAttribute(node, XMLVIEW_RESBUNDLENAME_ATTRIBUTE);
if ( resourceBundleName ) {
var resourceBundleModuleName = ModuleName.fromUI5LegacyName(resourceBundleName, ".properties");
const resourceBundleModuleName = ModuleName.fromUI5LegacyName(resourceBundleName, ".properties");
log.verbose("found dependency to resource bundle %s", resourceBundleModuleName);
// TODO locale dependent dependencies: this._addDependency(resourceBundleModuleName);
this._addDependency( resourceBundleModuleName );
Expand All @@ -186,10 +186,10 @@ class XMLTemplateAnalyzer {
}

_analyzeNode(node) {
var namespace = node.$ns.uri || "";
var localName = node.$ns.local;
const namespace = node.$ns.uri || "";
const localName = node.$ns.local;

var oldConditional = this.conditional;
const oldConditional = this.conditional;

if ( namespace === TEMPLATING_NAMESPACE ) {
if ( TEMPLATING_CONDITONAL_TAGS.test(localName) ) {
Expand All @@ -201,7 +201,7 @@ class XMLTemplateAnalyzer {

} else if ( PATTERN_LIBRARY_NAMESPACES.test(namespace) ) {
// looks like a UI5 library or package name
var moduleName = ModuleName.fromUI5LegacyName( (namespace ? namespace + "." : "") + localName );
const moduleName = ModuleName.fromUI5LegacyName( (namespace ? namespace + "." : "") + localName );

// ignore FragmentDefinition (also skipped by runtime XMLTemplateProcessor)
if ( FRAGMENTDEFINITION_MODULE !== moduleName ) {
Expand All @@ -216,47 +216,47 @@ class XMLTemplateAnalyzer {
// - Fragment references a fragment by 'fragmentName' . 'type'

if ( moduleName === COMPONENTCONTAINER_MODULE ) {
var componentName = getAttribute(node, COMPONENTCONTAINER_COMPONENTNAME_ATTRIBUTE);
const componentName = getAttribute(node, COMPONENTCONTAINER_COMPONENTNAME_ATTRIBUTE);
if ( componentName ) {
var componentModuleName =
const componentModuleName =
ModuleName.fromUI5LegacyName( componentName, "/Component.js" );
this._addDependency(componentModuleName);
}
// TODO what about component.json? handle it transitively via Component.js?
} else if ( moduleName === FRAGMENT_MODULE ) {
var fragmentName = getAttribute(node, FRAGMENT_FRAGMENTNAME_ATTRIBUTE);
var type = getAttribute(node, FRAGMENT_TYPE_ATTRIBUTE);
const fragmentName = getAttribute(node, FRAGMENT_FRAGMENTNAME_ATTRIBUTE);
const type = getAttribute(node, FRAGMENT_TYPE_ATTRIBUTE);
if ( fragmentName && type ) {
var fragmentModuleName =
const fragmentModuleName =
ModuleName.fromUI5LegacyName( fragmentName, this._getFragmentExtension(type) );
// console.log("child fragment detected %s", fragmentModuleName);
this._addDependency(fragmentModuleName);
}
} else if ( moduleName === HTMLVIEW_MODULE ) {
let viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
const viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
if ( viewName ) {
let childViewModuleName = ModuleName.fromUI5LegacyName( viewName, ".view.html" );
const childViewModuleName = ModuleName.fromUI5LegacyName( viewName, ".view.html" );
// console.log("child view detected %s", childViewModuleName);
this._addDependency(childViewModuleName);
}
} else if ( moduleName === JSVIEW_MODULE ) {
let viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
const viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
if ( viewName ) {
let childViewModuleName = ModuleName.fromUI5LegacyName( viewName, ".view.js" );
const childViewModuleName = ModuleName.fromUI5LegacyName( viewName, ".view.js" );
// console.log("child view detected %s", childViewModuleName);
this._addDependency(childViewModuleName);
}
} else if ( moduleName === JSONVIEW_MODULE ) {
let viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
const viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
if ( viewName ) {
let childViewModuleName = ModuleName.fromUI5LegacyName( viewName, ".view.json" );
const childViewModuleName = ModuleName.fromUI5LegacyName( viewName, ".view.json" );
// console.log("child view detected %s", childViewModuleName);
this._addDependency(childViewModuleName);
}
} else if ( moduleName === XMLVIEW_MODULE ) {
let viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
const viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
if ( viewName ) {
let childViewModuleName = ModuleName.fromUI5LegacyName( viewName, ".view.xml" );
const childViewModuleName = ModuleName.fromUI5LegacyName( viewName, ".view.xml" );
// console.log("child view detected %s", childViewModuleName);
this._addDependency(childViewModuleName);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/lbt/bundle/AutoSplitter.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class AutoSplitter {
totalSize += 1024; // just a rough estimate
}

var promises = [];
const promises = [];

resolvedModule.sections.forEach( (section) => {
switch ( section.mode ) {
Expand Down
26 changes: 13 additions & 13 deletions lib/lbt/bundle/Builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ class BundleBuilder {
if ( !config ) {
return;
}
var outW = this.outW;
const outW = this.outW;
outW.ensureNewLine(); // for clarity and to avoid issues with single line comments
outW.writeln(`(function(window){`);
outW.writeln(`\tvar cfg=window['sap-ui-config']=window['sap-ui-config']||{},`);
Expand All @@ -253,7 +253,7 @@ class BundleBuilder {
if ( resource != null ) {
this.outW.startSegment(module);
await this.writeRawModule(module, resource);
var compressedSize = this.outW.endSegment();
const compressedSize = this.outW.endSegment();
log.verbose(" %s (%d,%d)", module, resource.info != null ? resource.info.size : -1, compressedSize);
if ( section.declareRawModules ) {
this.missingRawDeclarations.push(module);
Expand All @@ -277,19 +277,19 @@ class BundleBuilder {
}

async writePreloadFunction(section) {
var outW = this.outW;
var avoidLazyParsing = section.sectionDefinition.avoidLazyParsing;
const outW = this.outW;
const avoidLazyParsing = section.sectionDefinition.avoidLazyParsing;

outW.ensureNewLine();

var sequence = section.modules.slice();
const sequence = section.modules.slice();

this.beforeWriteFunctionPreloadSection(sequence);

await this.rewriteAMDModules(sequence, avoidLazyParsing);
if ( sequence.length > 0 ) {
this.targetBundleFormat.beforePreloads(outW, section);
var i = 0;
let i = 0;
for ( let module of sequence ) {
let resource = await this.pool.findResourceWithInfo(module);
if ( resource != null ) {
Expand All @@ -300,7 +300,7 @@ class BundleBuilder {
outW.write(`\t"${module.toString()}":`);
outW.startSegment(module);
await this.writePreloadModule(module, resource.info, resource, avoidLazyParsing);
var compressedSize = outW.endSegment();
const compressedSize = outW.endSegment();
log.verbose(" %s (%d,%d)", module,
resource.info != null ? resource.info.size : -1, compressedSize);
i++;
Expand Down Expand Up @@ -335,7 +335,7 @@ class BundleBuilder {
throw result.error;
}
// console.log(result.map);
// var map = new MOZ_SourceMap.SourceMapConsumer(result.map);
// const map = new MOZ_SourceMap.SourceMapConsumer(result.map);
// map.eachMapping(function (m) { console.log(m); }); // console.log(map);
fileContent = result.code;
// throw new Error();
Expand All @@ -355,7 +355,7 @@ class BundleBuilder {
throw result.error;
}
// console.log(result.map);
// var map = new MOZ_SourceMap.SourceMapConsumer(result.map);
// const map = new MOZ_SourceMap.SourceMapConsumer(result.map);
// map.eachMapping(function (m) { console.log(m); }); // console.log(map);
fileContent = result.code;
// throw new Error();
Expand Down Expand Up @@ -384,14 +384,14 @@ class BundleBuilder {
// console.log("trying to read " + module);
let resource = await this.pool.findResourceWithInfo(module);
let code = await resource.buffer();
var ast = rewriteDefine(this.targetBundleFormat, code, module, avoidLazyParsing);
const ast = rewriteDefine(this.targetBundleFormat, code, module, avoidLazyParsing);
if ( ast ) {
outW.startSegment(module);
outW.ensureNewLine();
var fileContent = this.compressJS( ast, resource );
const fileContent = this.compressJS( ast, resource );
outW.write( fileContent );
outW.ensureNewLine();
var compressedSize = outW.endSegment();
const compressedSize = outW.endSegment();
log.verbose(" %s (%d,%d)", module,
resource.info != null ? resource.info.size : -1, compressedSize);
} else {
Expand All @@ -415,7 +415,7 @@ class BundleBuilder {
}

async writePreloadModule(module, info, resource, avoidLazyParsing) {
var outW = this.outW;
const outW = this.outW;

if ( /\.js$/.test(module) && (info == null || !info.requiresTopLevelScope) ) {
let compressedContent = await this.compressJSAsync( resource );
Expand Down
2 changes: 1 addition & 1 deletion lib/lbt/bundle/Resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const {SectionType} = require("./BundleDefinition");
const ResolvedBundleDefinition = require("./ResolvedBundleDefinition");
const log = require("@ui5/logger").getLogger("Resolver");

var dependencyTracker;
let dependencyTracker;

/**
* Resolve a bundle definition.
Expand Down
8 changes: 4 additions & 4 deletions lib/lbt/calls/SapUiDefine.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"use strict";

var {Syntax} = require("esprima");
var ModuleName = require("../utils/ModuleName");
var {isString} = require("../utils/ASTUtils");
const {Syntax} = require("esprima");
const ModuleName = require("../utils/ModuleName");
const {isString} = require("../utils/ASTUtils");

class SapUiDefineCall {
constructor(node, moduleName) {
Expand Down Expand Up @@ -55,7 +55,7 @@ class SapUiDefineCall {
// console.error("no dependency error");
// return;
}
var i = this.dependencyInsertionIdx++;
let i = this.dependencyInsertionIdx++;
this.dependencyArray.elements.splice(i, 0, b.literal(module));
this.dependencies.splice(i, 0, module);
// console.log(this.factory.params);
Expand Down
24 changes: 12 additions & 12 deletions lib/lbt/graph/topologicalSort.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,23 @@ class GraphNode {
* @private
*/
function createDependencyGraph(pool, moduleNames, indegreeOnly) {
var graph = Object.create(null);
const graph = Object.create(null);

var promises = moduleNames.map( (moduleName) => {
const promises = moduleNames.map( (moduleName) => {
return pool.getModuleInfo(moduleName).
then( (module) => {
var node = graph[moduleName];
let node = graph[moduleName];
if ( node == null ) {
node = new GraphNode(moduleName, indegreeOnly);
graph[moduleName] = node;
}
var p = module.dependencies.map( function(dep) {
const p = module.dependencies.map( function(dep) {
if ( module.isConditionalDependency(dep) ) {
return;
}
return pool.getModuleInfo(dep).then( (depModule) => {
if ( moduleNames.indexOf(dep) >= 0 ) {
var depNode = graph[dep];
let depNode = graph[dep];
if ( depNode == null ) {
depNode = new GraphNode(dep, indegreeOnly);
graph[dep] = depNode;
Expand Down Expand Up @@ -89,19 +89,19 @@ function topologicalSort(pool, moduleNames) {
return createDependencyGraph(pool, moduleNames, false).
then(function(graph) {
// now do a topological sort.
var sequence = [];
var i;
var j;
var l = moduleNames.length;
const sequence = [];
let i;
let j;
let l = moduleNames.length;
moduleNames = moduleNames.slice(); // clone

do {
// invariant: the first 'l' items in moduleNames are still to be processed

// first loop over all remaining modules and emit those that don't have any more dependencies
for (i = 0, j = 0; i < l; i++ ) {
var moduleName = moduleNames[i];
var node = graph[moduleName];
const moduleName = moduleNames[i];
const node = graph[moduleName];

// modules that don't have any unsatisfied dependencies can be emitted
if ( node == null || node.outgoing.length === 0 ) {
Expand All @@ -113,7 +113,7 @@ function topologicalSort(pool, moduleNames) {
// remove outgoing dependency to current module from all modules that depend on it
if ( node != null ) {
node.incoming.forEach( function(dependent) {
var index = dependent.outgoing.indexOf(node);
const index = dependent.outgoing.indexOf(node);
if ( index >= 0 ) {
dependent.outgoing.splice(index, 1);
// console.log("removing outgoing %s in %s", node.name, dependent.name);
Expand Down
2 changes: 1 addition & 1 deletion lib/lbt/resources/ResourceFilterList.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class ResourceFilterList {
addFilters(filters) {
if ( Array.isArray(filters) ) {
filters.forEach( (filter) => {
var matcher = makeMatcher(filter);
const matcher = makeMatcher(filter);
this.matchers.push( matcher );
this.matchByDefault = this.matchByDefault && !matcher.include;
});
Expand Down
4 changes: 2 additions & 2 deletions lib/lbt/resources/ResourcePool.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const ResourceFilterList = require("./ResourceFilterList");
const Resource = require("./Resource");
const log = require("@ui5/logger").getLogger("ResourcePool");

var jsAnalyzer = new JSModuleAnalyzer();
const jsAnalyzer = new JSModuleAnalyzer();

function scanFileOrDir(fileOrDir, name, pool) {
// console.log("visiting " + fileOrDir + " (" + name + ")");
Expand All @@ -41,7 +41,7 @@ function scanFileOrDir(fileOrDir, name, pool) {
});
} else if ( /\.(?:js|json|xml|html|properties|library)$/.test(name) ) {
// TODO think about right place for configuration of such a global filtering
var resource = new Resource(pool, name, fileOrDir, stat);
const resource = new Resource(pool, name, fileOrDir, stat);
resolve( pool.addResource( resource ) );
} else {
/* else: ignore other resource types */
Expand Down
6 changes: 3 additions & 3 deletions lib/lbt/utils/ASTUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function isIdentifier(node, name) {
if ( typeof name == "string" ) {
return name === node.name;
}
for (var i = 0; i < name.length; i++) {
for (let i = 0; i < name.length; i++) {
if ( name[i] === node.name || name[i] === "*" ) {
return true;
}
Expand All @@ -64,12 +64,12 @@ function getPropertyKey(property) {
}

function findOwnProperty(obj, name) {
var property = obj && obj.properties.find((property) => getPropertyKey(property) === name);
const property = obj && obj.properties.find((property) => getPropertyKey(property) === name);
return property && property.value;
}

function getValue(obj, names) {
var i = 0;
let i = 0;
while ( i < names.length ) {
if ( obj == null || obj.type !== Syntax.ObjectExpression ) {
return null;
Expand Down
Loading

0 comments on commit 88c7950

Please sign in to comment.