replaced Class with constructor

sokra · sokra · commit 5acfacfdd667 · 2015-10-18T10:53:38.000+02:00
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -175,9 +175,9 @@ Compilation.prototype.addModuleDependencies = function(module, dependencies, bai
 
 	var factories = [];
 	for(var i = 0; i < dependencies.length; i++) {
-		var factory = this.dependencyFactories.get(dependencies[i][0].Class);
+		var factory = this.dependencyFactories.get(dependencies[i][0].constructor);
 		if(!factory) {
-			return callback(new Error("No module factory available for dependency type: " + dependencies[i][0].Class.name));
+			return callback(new Error("No module factory available for dependency type: " + dependencies[i][0].constructor.name));
 		}
 		factories[i] = [factory, dependencies[i]];
 	}
@@ -343,13 +343,13 @@ Compilation.prototype._addModuleChain = function process(context, dependency, on
 		callback();
 	}.bind(this);
 
-	if(typeof dependency !== "object" || dependency === null || !dependency.Class) {
+	if(typeof dependency !== "object" || dependency === null || !dependency.constructor) {
 		throw new Error("Parameter 'dependency' must be a Dependency");
 	}
 
-	var moduleFactory = this.dependencyFactories.get(dependency.Class);
+	var moduleFactory = this.dependencyFactories.get(dependency.constructor);
 	if(!moduleFactory) {
-		throw new Error("No dependency factory available for this dependency type: " + dependency.Class.name);
+		throw new Error("No dependency factory available for this dependency type: " + dependency.constructor.name);
 	}
 
 	moduleFactory.create(context, dependency, function(err, module) {
diff --git a/lib/DependenciesBlockVariable.js b/lib/DependenciesBlockVariable.js
@@ -23,8 +23,8 @@ DependenciesBlockVariable.prototype.updateHash = function(hash) {
 DependenciesBlockVariable.prototype.expressionSource = function(dependencyTemplates, outputOptions, requestShortener) {
 	var source = new ReplaceSource(new RawSource(this.expression));
 	this.dependencies.forEach(function(dep) {
-		var template = dependencyTemplates.get(dep.Class);
-		if(!template) throw new Error("No template for dependency: " + dep.Class.name);
+		var template = dependencyTemplates.get(dep.constructor);
+		if(!template) throw new Error("No template for dependency: " + dep.constructor.name);
 		template.apply(dep, source, outputOptions, requestShortener, dependencyTemplates);
 	});
 	return source;
diff --git a/lib/Dependency.js b/lib/Dependency.js
@@ -4,7 +4,6 @@
 */
 function Dependency() {
 	this.module = null;
-	this.Class = Dependency;
 }
 module.exports = Dependency;
 
diff --git a/lib/NormalModule.js b/lib/NormalModule.js
@@ -133,8 +133,8 @@ NormalModule.prototype.source = function(dependencyTemplates, outputOptions, req
 	var topLevelBlock = this;
 
 	function doDep(dep) {
-		var template = dependencyTemplates.get(dep.Class);
-		if(!template) throw new Error("No template for dependency: " + dep.Class.name);
+		var template = dependencyTemplates.get(dep.constructor);
+		if(!template) throw new Error("No template for dependency: " + dep.constructor.name);
 		template.apply(dep, source, outputOptions, requestShortener, dependencyTemplates);
 	}
 
diff --git a/lib/dependencies/AMDDefineDependency.js b/lib/dependencies/AMDDefineDependency.js
@@ -6,7 +6,6 @@ var NullDependency = require("./NullDependency");
 
 function AMDDefineDependency(range, arrayRange, functionRange, objectRange) {
 	NullDependency.call(this);
-	this.Class = AMDDefineDependency;
 	this.range = range;
 	this.arrayRange = arrayRange;
 	this.functionRange = functionRange;
diff --git a/lib/dependencies/AMDRequireArrayDependency.js b/lib/dependencies/AMDRequireArrayDependency.js
@@ -6,7 +6,6 @@ var Dependency = require("../Dependency");
 
 function AMDRequireArrayDependency(depsArray, range) {
 	Dependency.call(this);
-	this.Class = AMDRequireArrayDependency;
 	this.depsArray = depsArray;
 	this.range = range;
 }
diff --git a/lib/dependencies/AMDRequireContextDependency.js b/lib/dependencies/AMDRequireContextDependency.js
@@ -8,7 +8,6 @@ function AMDRequireContextDependency(request, recursive, regExp, range, valueRan
 	ContextDependency.call(this, request, recursive, regExp);
 	this.range = range;
 	this.valueRange = valueRange;
-	this.Class = AMDRequireContextDependency;
 }
 module.exports = AMDRequireContextDependency;
 
diff --git a/lib/dependencies/AMDRequireDependency.js b/lib/dependencies/AMDRequireDependency.js
@@ -7,7 +7,6 @@ var DepBlockHelpers = require("./DepBlockHelpers");
 
 function AMDRequireDependency(block) {
 	NullDependency.call(this);
-	this.Class = AMDRequireDependency;
 	this.block = block;
 }
 module.exports = AMDRequireDependency;
diff --git a/lib/dependencies/AMDRequireItemDependency.js b/lib/dependencies/AMDRequireItemDependency.js
@@ -6,7 +6,6 @@ var ModuleDependency = require("./ModuleDependency");
 
 function AMDRequireItemDependency(request, range) {
 	ModuleDependency.call(this, request);
-	this.Class = AMDRequireItemDependency;
 	this.range = range;
 }
 module.exports = AMDRequireItemDependency;
diff --git a/lib/dependencies/CommonJsRequireContextDependency.js b/lib/dependencies/CommonJsRequireContextDependency.js
@@ -8,7 +8,6 @@ function CommonJsRequireContextDependency(request, recursive, regExp, range, val
 	ContextDependency.call(this, request, recursive, regExp);
 	this.range = range;
 	this.valueRange = valueRange;
-	this.Class = CommonJsRequireContextDependency;
 }
 module.exports = CommonJsRequireContextDependency;
 
diff --git a/lib/dependencies/CommonJsRequireDependency.js b/lib/dependencies/CommonJsRequireDependency.js
@@ -6,7 +6,6 @@ var ModuleDependency = require("./ModuleDependency");
 
 function CommonJsRequireDependency(request, range) {
 	ModuleDependency.call(this, request);
-	this.Class = CommonJsRequireDependency;
 	this.range = range;
 }
 module.exports = CommonJsRequireDependency;
diff --git a/lib/dependencies/ConstDependency.js b/lib/dependencies/ConstDependency.js
@@ -6,7 +6,6 @@ var NullDependency = require("./NullDependency");
 
 function ConstDependency(expression, range) {
 	NullDependency.call(this);
-	this.Class = ConstDependency;
 	this.expression = expression;
 	this.range = range;
 }
diff --git a/lib/dependencies/ContextDependency.js b/lib/dependencies/ContextDependency.js
@@ -10,7 +10,6 @@ function ContextDependency(request, recursive, regExp) {
 	this.userRequest = request;
 	this.recursive = recursive;
 	this.regExp = regExp;
-	this.Class = ContextDependency;
 }
 module.exports = ContextDependency;
 
diff --git a/lib/dependencies/ContextElementDependency.js b/lib/dependencies/ContextElementDependency.js
@@ -6,7 +6,6 @@ var ModuleDependency = require("./ModuleDependency");
 
 function ContextElementDependency(request) {
 	ModuleDependency.call(this, request);
-	this.Class = ContextElementDependency;
 }
 module.exports = ContextElementDependency;
 
diff --git a/lib/dependencies/DelegatedSourceDependency.js b/lib/dependencies/DelegatedSourceDependency.js
@@ -6,7 +6,6 @@ var ModuleDependency = require("./ModuleDependency");
 
 function DelegatedSourceDependency(request) {
 	ModuleDependency.call(this, request);
-	this.Class = DelegatedSourceDependency;
 }
 module.exports = DelegatedSourceDependency;
 
diff --git a/lib/dependencies/DllEntryDependency.js b/lib/dependencies/DllEntryDependency.js
@@ -6,7 +6,6 @@ var Dependency = require("../Dependency");
 
 function DllEntryDependency(dependencies, name, type) {
 	Dependency.call(this);
-	this.Class = DllEntryDependency;
 	this.dependencies = dependencies;
 	this.name = name;
 	this.type = type;
diff --git a/lib/dependencies/LabeledExportsDependency.js b/lib/dependencies/LabeledExportsDependency.js
@@ -6,7 +6,6 @@ var NullDependency = require("./NullDependency");
 
 function LabeledExportsDependency(name, pos) {
 	NullDependency.call(this);
-	this.Class = LabeledExportsDependency;
 	this.name = name;
 	this.pos = pos;
 }
diff --git a/lib/dependencies/LabeledModuleDependency.js b/lib/dependencies/LabeledModuleDependency.js
@@ -7,7 +7,6 @@ var Template = require("../Template");
 
 function LabeledModuleDependency(request, range) {
 	ModuleDependency.call(this, request);
-	this.Class = LabeledModuleDependency;
 	this.range = range;
 }
 module.exports = LabeledModuleDependency;
diff --git a/lib/dependencies/LoaderDependency.js b/lib/dependencies/LoaderDependency.js
@@ -6,7 +6,6 @@ var ModuleDependency = require("./ModuleDependency");
 
 function LoaderDependency(request) {
 	ModuleDependency.call(this, request);
-	this.Class = LoaderDependency;
 }
 module.exports = LoaderDependency;
 
diff --git a/lib/dependencies/LocalModuleDependency.js b/lib/dependencies/LocalModuleDependency.js
@@ -6,7 +6,6 @@ var NullDependency = require("./NullDependency");
 
 function LocalModuleDependency(localModule, range) {
 	NullDependency.call(this);
-	this.Class = LocalModuleDependency;
 	localModule.flagUsed();
 	this.localModule = localModule;
 	this.range = range;
diff --git a/lib/dependencies/ModuleDependency.js b/lib/dependencies/ModuleDependency.js
@@ -8,7 +8,6 @@ function ModuleDependency(request) {
 	Dependency.call(this);
 	this.request = request;
 	this.userRequest = request;
-	this.Class = ModuleDependency;
 }
 module.exports = ModuleDependency;
 
diff --git a/lib/dependencies/ModuleHotAcceptDependency.js b/lib/dependencies/ModuleHotAcceptDependency.js
@@ -6,7 +6,6 @@ var ModuleDependency = require("./ModuleDependency");
 
 function ModuleHotAcceptDependency(request, range) {
 	ModuleDependency.call(this, request);
-	this.Class = ModuleHotAcceptDependency;
 	this.range = range;
 	this.weak = true;
 }
diff --git a/lib/dependencies/ModuleHotDeclineDependency.js b/lib/dependencies/ModuleHotDeclineDependency.js
@@ -6,7 +6,6 @@ var ModuleDependency = require("./ModuleDependency");
 
 function ModuleHotDeclineDependency(request, range) {
 	ModuleDependency.call(this, request);
-	this.Class = ModuleHotDeclineDependency;
 	this.range = range;
 	this.weak = true;
 }
diff --git a/lib/dependencies/MultiEntryDependency.js b/lib/dependencies/MultiEntryDependency.js
@@ -6,7 +6,6 @@ var Dependency = require("../Dependency");
 
 function MultiEntryDependency(dependencies, name) {
 	Dependency.call(this);
-	this.Class = MultiEntryDependency;
 	this.dependencies = dependencies;
 	this.name = name;
 }
diff --git a/lib/dependencies/NullDependency.js b/lib/dependencies/NullDependency.js
@@ -6,7 +6,6 @@ var Dependency = require("../Dependency");
 
 function NullDependency() {
 	Dependency.call(this);
-	this.Class = NullDependency;
 }
 module.exports = NullDependency;
 
diff --git a/lib/dependencies/PrefetchDependency.js b/lib/dependencies/PrefetchDependency.js
@@ -6,7 +6,6 @@ var ModuleDependency = require("./ModuleDependency");
 
 function PrefetchDependency(request) {
 	ModuleDependency.call(this, request);
-	this.Class = PrefetchDependency;
 }
 module.exports = PrefetchDependency;
 
diff --git a/lib/dependencies/RequireContextDependency.js b/lib/dependencies/RequireContextDependency.js
@@ -7,7 +7,6 @@ var ContextDependency = require("./ContextDependency");
 function RequireContextDependency(request, recursive, regExp, range) {
 	ContextDependency.call(this, request, recursive, regExp);
 	this.range = range;
-	this.Class = RequireContextDependency;
 }
 module.exports = RequireContextDependency;
 
diff --git a/lib/dependencies/RequireEnsureDependency.js b/lib/dependencies/RequireEnsureDependency.js
@@ -7,7 +7,6 @@ var DepBlockHelpers = require("./DepBlockHelpers");
 
 function RequireEnsureDependency(block) {
 	NullDependency.call(this);
-	this.Class = RequireEnsureDependency;
 	this.block = block;
 }
 module.exports = RequireEnsureDependency;
diff --git a/lib/dependencies/RequireEnsureItemDependency.js b/lib/dependencies/RequireEnsureItemDependency.js
@@ -6,7 +6,6 @@ var ModuleDependency = require("./ModuleDependency");
 
 function RequireEnsureItemDependency(request) {
 	ModuleDependency.call(this, request);
-	this.Class = RequireEnsureItemDependency;
 }
 module.exports = RequireEnsureItemDependency;
 
diff --git a/lib/dependencies/RequireHeaderDependency.js b/lib/dependencies/RequireHeaderDependency.js
@@ -7,7 +7,6 @@ var NullDependency = require("./NullDependency");
 function RequireHeaderDependency(range) {
 	if(!Array.isArray(range)) throw new Error("range must be valid");
 	NullDependency.call(this);
-	this.Class = RequireHeaderDependency;
 	this.range = range;
 }
 module.exports = RequireHeaderDependency;
diff --git a/lib/dependencies/RequireIncludeDependency.js b/lib/dependencies/RequireIncludeDependency.js
@@ -6,7 +6,6 @@ var ModuleDependency = require("./ModuleDependency");
 
 function RequireIncludeDependency(request, range) {
 	ModuleDependency.call(this, request);
-	this.Class = RequireIncludeDependency;
 	this.range = range;
 }
 module.exports = RequireIncludeDependency;
diff --git a/lib/dependencies/RequireResolveContextDependency.js b/lib/dependencies/RequireResolveContextDependency.js
@@ -8,7 +8,6 @@ function RequireResolveContextDependency(request, recursive, regExp, range, valu
 	ContextDependency.call(this, request, recursive, regExp);
 	this.range = range;
 	this.valueRange = valueRange;
-	this.Class = RequireResolveContextDependency;
 }
 module.exports = RequireResolveContextDependency;
 
diff --git a/lib/dependencies/RequireResolveDependency.js b/lib/dependencies/RequireResolveDependency.js
@@ -6,7 +6,6 @@ var ModuleDependency = require("./ModuleDependency");
 
 function RequireResolveDependency(request, range) {
 	ModuleDependency.call(this, request);
-	this.Class = RequireResolveDependency;
 	this.range = range;
 }
 module.exports = RequireResolveDependency;
diff --git a/lib/dependencies/RequireResolveHeaderDependency.js b/lib/dependencies/RequireResolveHeaderDependency.js
@@ -7,7 +7,6 @@ var NullDependency = require("./NullDependency");
 function RequireResolveHeaderDependency(range) {
 	if(!Array.isArray(range)) throw new Error("range must be valid");
 	NullDependency.call(this);
-	this.Class = RequireResolveHeaderDependency;
 	this.range = range;
 }
 module.exports = RequireResolveHeaderDependency;
diff --git a/lib/dependencies/SingleEntryDependency.js b/lib/dependencies/SingleEntryDependency.js
@@ -6,7 +6,6 @@ var ModuleDependency = require("./ModuleDependency");
 
 function SingleEntryDependency(request) {
 	ModuleDependency.call(this, request);
-	this.Class = SingleEntryDependency;
 }
 module.exports = SingleEntryDependency;
 
diff --git a/lib/dependencies/TemplateArgumentDependency.js b/lib/dependencies/TemplateArgumentDependency.js
@@ -4,7 +4,6 @@
 */
 function TemplateArgumentDependency(name, dep) {
 	this.name = name;
-	this.Class = TemplateArgumentDependency;
 	this.dep = dep;
 }
 module.exports = TemplateArgumentDependency;
@@ -20,8 +19,8 @@ TemplateArgumentDependency.Template = function TemplateArgumentDependencyTemplat
 
 TemplateArgumentDependency.Template.prototype.apply = function(dep, source, outputOptions, requestShortener, dependencyTemplates) {
 	var d = dep.dep;
-	var template = dependencyTemplates.get(d.Class);
-	if(!template) throw new Error("No template for dependency: " + d.Class.name);
-	if(!template.applyAsTemplateArgument) throw new Error("Template cannot be applied as TemplateArgument: " + d.Class.name);
+	var template = dependencyTemplates.get(d.constructor);
+	if(!template) throw new Error("No template for dependency: " + d.constructor.name);
+	if(!template.applyAsTemplateArgument) throw new Error("Template cannot be applied as TemplateArgument: " + d.constructor.name);
 	return template.applyAsTemplateArgument(dep.name, d, source, outputOptions, requestShortener, dependencyTemplates);
 };

Original file line number	Diff line number	Diff line change
`@@ -175,9 +175,9 @@ Compilation.prototype.addModuleDependencies = function(module, dependencies, bai`
`175`	`175`
`176`	`176`	`var factories = [];`
`177`	`177`	`for(var i = 0; i < dependencies.length; i++) {`
`178`		`- var factory = this.dependencyFactories.get(dependencies[i][0].Class);`
	`178`	`+ var factory = this.dependencyFactories.get(dependencies[i][0].constructor);`
`179`	`179`	`if(!factory) {`
`180`		`- return callback(new Error("No module factory available for dependency type: " + dependencies[i][0].Class.name));`
	`180`	`+ return callback(new Error("No module factory available for dependency type: " + dependencies[i][0].constructor.name));`
`181`	`181`	`}`
`182`	`182`	`factories[i] = [factory, dependencies[i]];`
`183`	`183`	`}`
`@@ -343,13 +343,13 @@ Compilation.prototype._addModuleChain = function process(context, dependency, on`
`343`	`343`	`callback();`
`344`	`344`	`}.bind(this);`
`345`	`345`
`346`		`- if(typeof dependency !== "object" \|\| dependency === null \|\| !dependency.Class) {`
	`346`	`+ if(typeof dependency !== "object" \|\| dependency === null \|\| !dependency.constructor) {`
`347`	`347`	`throw new Error("Parameter 'dependency' must be a Dependency");`
`348`	`348`	`}`
`349`	`349`
`350`		`- var moduleFactory = this.dependencyFactories.get(dependency.Class);`
	`350`	`+ var moduleFactory = this.dependencyFactories.get(dependency.constructor);`
`351`	`351`	`if(!moduleFactory) {`
`352`		`- throw new Error("No dependency factory available for this dependency type: " + dependency.Class.name);`
	`352`	`+ throw new Error("No dependency factory available for this dependency type: " + dependency.constructor.name);`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`moduleFactory.create(context, dependency, function(err, module) {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`*/`
`5`	`5`	`function Dependency() {`
`6`	`6`	`this.module = null;`
`7`		`- this.Class = Dependency;`
`8`	`7`	`}`
`9`	`8`	`module.exports = Dependency;`
`10`	`9`
Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,8 @@ NormalModule.prototype.source = function(dependencyTemplates, outputOptions, req`
`133`	`133`	`var topLevelBlock = this;`
`134`	`134`
`135`	`135`	`function doDep(dep) {`
`136`		`- var template = dependencyTemplates.get(dep.Class);`
`137`		`- if(!template) throw new Error("No template for dependency: " + dep.Class.name);`
	`136`	`+ var template = dependencyTemplates.get(dep.constructor);`
	`137`	`+ if(!template) throw new Error("No template for dependency: " + dep.constructor.name);`
`138`	`138`	`template.apply(dep, source, outputOptions, requestShortener, dependencyTemplates);`
`139`	`139`	`}`
`140`	`140`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ var Dependency = require("../Dependency");`
`6`	`6`
`7`	`7`	`function AMDRequireArrayDependency(depsArray, range) {`
`8`	`8`	`Dependency.call(this);`
`9`		`- this.Class = AMDRequireArrayDependency;`
`10`	`9`	`this.depsArray = depsArray;`
`11`	`10`	`this.range = range;`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ function AMDRequireContextDependency(request, recursive, regExp, range, valueRan`
`8`	`8`	`ContextDependency.call(this, request, recursive, regExp);`
`9`	`9`	`this.range = range;`
`10`	`10`	`this.valueRange = valueRange;`
`11`		`- this.Class = AMDRequireContextDependency;`
`12`	`11`	`}`
`13`	`12`	`module.exports = AMDRequireContextDependency;`
`14`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ var DepBlockHelpers = require("./DepBlockHelpers");`
`7`	`7`
`8`	`8`	`function AMDRequireDependency(block) {`
`9`	`9`	`NullDependency.call(this);`
`10`		`- this.Class = AMDRequireDependency;`
`11`	`10`	`this.block = block;`
`12`	`11`	`}`
`13`	`12`	`module.exports = AMDRequireDependency;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ var ModuleDependency = require("./ModuleDependency");`
`6`	`6`
`7`	`7`	`function AMDRequireItemDependency(request, range) {`
`8`	`8`	`ModuleDependency.call(this, request);`
`9`		`- this.Class = AMDRequireItemDependency;`
`10`	`9`	`this.range = range;`
`11`	`10`	`}`
`12`	`11`	`module.exports = AMDRequireItemDependency;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ function CommonJsRequireContextDependency(request, recursive, regExp, range, val`
`8`	`8`	`ContextDependency.call(this, request, recursive, regExp);`
`9`	`9`	`this.range = range;`
`10`	`10`	`this.valueRange = valueRange;`
`11`		`- this.Class = CommonJsRequireContextDependency;`
`12`	`11`	`}`
`13`	`12`	`module.exports = CommonJsRequireContextDependency;`
`14`	`13`