Skip to content

Commit 0a02526

Browse files
erik168erik168
committed
rename module -> mod, resource -> res, since variable named module is hard to watch value when debug
1 parent 9ef5359 commit 0a02526

File tree

1 file changed

+58
-58
lines changed

1 file changed

+58
-58
lines changed

‎src/esl.js

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ var esl;
177177
}
178178
}
179179

180-
var module = modModules[id];
181-
if (!module) {
180+
var mod = modModules[id];
181+
if (!mod) {
182182
if (!missModulesMap[id]) {
183183
missModulesMap[id] = 1;
184184
missModules.push(id);
@@ -191,7 +191,7 @@ var esl;
191191
}
192192

193193
each(
194-
module.depMs,
194+
mod.depMs,
195195
function (dep) {
196196
checkError(dep.absId, dep.hard);
197197
}
@@ -366,14 +366,14 @@ var esl;
366366
* @param {string} id 模块id
367367
*/
368368
function modAnalyse(id) {
369-
var module = modModules[id];
370-
if (!module || modIs(id, MODULE_ANALYZED)) {
369+
var mod = modModules[id];
370+
if (!mod || modIs(id, MODULE_ANALYZED)) {
371371
return;
372372
}
373373

374-
var deps = module.deps;
374+
var deps = mod.deps;
375+
var factory = mod.factory;
375376
var hardDependsCount = 0;
376-
var factory = module.factory;
377377

378378
// 分析function body中的require
379379
// 如果包含显式依赖声明，根据AMD规定和性能考虑，可以不分析factoryBody
@@ -382,7 +382,7 @@ var esl;
382382

383383
// If the dependencies argument is present, the module loader
384384
// SHOULD NOT scan for dependencies within the factory function.
385-
!module.depsDec && factory.toString()
385+
!mod.depsDec && factory.toString()
386386
.replace(/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, '')
387387
.replace(/require\(\s*(['"'])([^'"]+)\1\s*\)/g,
388388
function ($0, $1, depId) {
@@ -394,7 +394,7 @@ var esl;
394394
var requireModules = [];
395395
each(deps, function (depId, index) {
396396
var idInfo = parseId(depId);
397-
var absId = normalize(idInfo.module, id);
397+
var absId = normalize(idInfo.mod, id);
398398
var moduleInfo;
399399
var resInfo;
400400

@@ -411,27 +411,27 @@ var esl;
411411
// - ../../js!../name.js
412412
//
413413
// 所以加载资源的module ready时，需要遍历module.depRs进行处理
414-
if (idInfo.resource) {
414+
if (idInfo.res) {
415415
resInfo = {
416-
id : depId,
417-
module : absId,
418-
resource : idInfo.resource
416+
id: depId,
417+
mod: absId,
418+
res: idInfo.res
419419
};
420420
autoDefineModules[absId] = 1;
421-
module.depPMs.push(absId);
422-
module.depRs.push(resInfo);
421+
mod.depPMs.push(absId);
422+
mod.depRs.push(resInfo);
423423
}
424424

425425
// 对依赖模块的id normalize能保证正确性，在此处进行去重
426-
moduleInfo = module.depMkv[absId];
426+
moduleInfo = mod.depMkv[absId];
427427
if (!moduleInfo) {
428428
moduleInfo = {
429-
id : idInfo.module,
429+
id : idInfo.mod,
430430
absId : absId,
431431
hard : index < hardDependsCount
432432
};
433-
module.depMs.push(moduleInfo);
434-
module.depMkv[absId] = moduleInfo;
433+
mod.depMs.push(moduleInfo);
434+
mod.depMkv[absId] = moduleInfo;
435435
requireModules.push(absId);
436436
}
437437
}
@@ -443,11 +443,11 @@ var esl;
443443
// 则记录到module.factoryDeps中
444444
// 在factory invoke前将用于生成invoke arguments
445445
if (index < hardDependsCount) {
446-
module.factoryDeps.push(resInfo || moduleInfo);
446+
mod.factoryDeps.push(resInfo || moduleInfo);
447447
}
448448
});
449449

450-
module.state = MODULE_ANALYZED;
450+
mod.state = MODULE_ANALYZED;
451451
modInitFactoryInvoker(id);
452452
nativeRequire(requireModules);
453453
}
@@ -483,11 +483,11 @@ var esl;
483483
}
484484

485485
visited[id] = 1;
486-
var module = modModules[id];
486+
var mod = modModules[id];
487487
var prepared = true;
488488

489489
each(
490-
module.depMs,
490+
mod.depMs,
491491
function (dep) {
492492
return (prepared = update(dep.absId));
493493
}
@@ -496,7 +496,7 @@ var esl;
496496
// 判断resource是否加载完成。如果resource未加载完成，则认为未准备好
497497
/* jshint ignore:start */
498498
prepared && each(
499-
module.depRs,
499+
mod.depRs,
500500
function (dep) {
501501
prepared = !!(dep.absId && modIs(dep.absId, MODULE_DEFINED));
502502
return prepared;
@@ -505,7 +505,7 @@ var esl;
505505
/* jshint ignore:end */
506506

507507
if (prepared) {
508-
module.state = MODULE_PREPARED;
508+
mod.state = MODULE_PREPARED;
509509
}
510510

511511
return prepared;
@@ -519,19 +519,19 @@ var esl;
519519
* @param {string} id 模块id
520520
*/
521521
function modInitFactoryInvoker(id) {
522-
var module = modModules[id];
522+
var mod = modModules[id];
523523
var invoking;
524524

525-
module.invokeFactory = invokeFactory;
525+
mod.invokeFactory = invokeFactory;
526526
each(
527-
module.depPMs,
527+
mod.depPMs,
528528
function (pluginModuleId) {
529529

530530
modAddDefinedListener(
531531
pluginModuleId,
532532
function () {
533-
each(module.depRs, function (res) {
534-
if (!res.absId && res.module === pluginModuleId) {
533+
each(mod.depRs, function (res) {
534+
if (!res.absId && res.mod === pluginModuleId) {
535535
res.absId = normalize(res.id, id);
536536
nativeRequire([res.absId], modAutoInvoke);
537537
}
@@ -548,7 +548,7 @@ var esl;
548548
* @inner
549549
*/
550550
function invokeFactory() {
551-
if (invoking || module.state !== MODULE_PREPARED) {
551+
if (invoking || mod.state !== MODULE_PREPARED) {
552552
return;
553553
}
554554

@@ -558,7 +558,7 @@ var esl;
558558
var factoryReady = 1;
559559
var factoryDeps = [];
560560
each(
561-
module.factoryDeps,
561+
mod.factoryDeps,
562562
function (dep) {
563563
var depId = dep.absId;
564564

@@ -579,31 +579,31 @@ var esl;
579579
var args = modGetModulesExports(
580580
factoryDeps,
581581
{
582-
require : module.require,
583-
exports : module.exports,
584-
module : module
582+
require : mod.require,
583+
exports : mod.exports,
584+
module : mod
585585
}
586586
);
587587

588588
// 调用factory函数初始化module
589-
var factory = module.factory;
589+
var factory = mod.factory;
590590
var exports = typeof factory === 'function'
591591
? factory.apply(global, args)
592592
: factory;
593593

594594
if (exports != null) {
595-
module.exports = exports;
595+
mod.exports = exports;
596596
}
597597

598-
module.invokeFactory = null;
598+
mod.invokeFactory = null;
599599
delete autoDefineModules[id];
600600
}
601601
catch (ex) {
602602
invoking = 0;
603603
if (/^\[MODULE_MISS\]"([^"]+)/.test(ex.message)) {
604604
// 出错，则说明在factory的运行中，该require的模块是需要的
605605
// 所以把它加入强依赖中
606-
var hardCirclurDep = module.depMkv[RegExp.$1];
606+
var hardCirclurDep = mod.depMkv[RegExp.$1];
607607
hardCirclurDep && (hardCirclurDep.hard = 1);
608608
return;
609609
}
@@ -637,10 +637,10 @@ var esl;
637637
* @param {string} id 模块id
638638
*/
639639
function modTryInvokeFactory(id) {
640-
var module = modModules[id];
640+
var mod = modModules[id];
641641

642-
if (module && module.invokeFactory) {
643-
module.invokeFactory();
642+
if (mod && mod.invokeFactory) {
643+
mod.invokeFactory();
644644
}
645645
}
646646

@@ -704,8 +704,8 @@ var esl;
704704
*/
705705
function modDefined(id) {
706706
var listeners = modDefinedListeners[id] || [];
707-
var module = modModules[id];
708-
module.state = MODULE_DEFINED;
707+
var mod = modModules[id];
708+
mod.state = MODULE_DEFINED;
709709

710710
var len = listeners.length;
711711
while (len--) {
@@ -763,11 +763,11 @@ var esl;
763763
function completePreDefine(currentId) {
764764
// HACK: 这里在IE下有个性能陷阱，不能使用任何变量。
765765
// 否则貌似会形成变量引用和修改的读写锁，导致wait4PreDefine释放困难
766-
each(wait4PreDefine, function (module) {
766+
each(wait4PreDefine, function (mod) {
767767
modPreDefine(
768768
currentId,
769-
module.deps,
770-
module.factory
769+
mod.deps,
770+
mod.factory
771771
);
772772
});
773773

@@ -965,14 +965,14 @@ var esl;
965965
: actualGlobalRequire;
966966

967967
plugin.load(
968-
idInfo.resource,
968+
idInfo.res,
969969
pluginRequire,
970970
pluginOnload,
971971
moduleConfigGetter.call({id: pluginAndResource})
972972
);
973973
}
974974

975-
load(modGetModuleExports(idInfo.module));
975+
load(modGetModuleExports(idInfo.mod));
976976
}
977977

978978
/**
@@ -1286,11 +1286,11 @@ var esl;
12861286
requireId,
12871287
function (id, i) {
12881288
var idInfo = parseId(id);
1289-
var absId = normalize(idInfo.module, baseId);
1289+
var absId = normalize(idInfo.mod, baseId);
12901290
pureModules.push(absId);
12911291
autoDefineModules[absId] = 1;
12921292

1293-
if (idInfo.resource) {
1293+
if (idInfo.res) {
12941294
pluginModules.push(absId);
12951295
normalizedIds[i] = null;
12961296
}
@@ -1382,8 +1382,8 @@ var esl;
13821382
return id;
13831383
}
13841384

1385-
var resourceId = idInfo.resource;
1386-
var moduleId = relative2absolute(idInfo.module, baseId);
1385+
var resourceId = idInfo.res;
1386+
var moduleId = relative2absolute(idInfo.mod, baseId);
13871387

13881388
each(
13891389
packagesIndex,
@@ -1414,9 +1414,9 @@ var esl;
14141414
);
14151415

14161416
if (resourceId) {
1417-
var module = modGetModuleExports(moduleId);
1418-
resourceId = module.normalize
1419-
? module.normalize(
1417+
var mod = modGetModuleExports(moduleId);
1418+
resourceId = mod.normalize
1419+
? mod.normalize(
14201420
resourceId,
14211421
function (resId) {
14221422
return normalize(resId, baseId);
@@ -1488,8 +1488,8 @@ var esl;
14881488

14891489
if (segs[0]) {
14901490
return {
1491-
module : segs[0],
1492-
resource : segs[1]
1491+
mod: segs[0],
1492+
res: segs[1]
14931493
};
14941494
}
14951495

0 commit comments

Comments
 (0)