Module -> ModuleNamespace

Author: guybedford

core/loader-polyfill.js

@@ -1,6 +1,6 @@
 import { addToError, createSymbol } from './common.js';
 
-export { Loader, Module, Module as ModuleNamespace }
+export { Loader, ModuleNamespace }
 
 /*
  * Simple Array values shim
@@ -158,7 +158,7 @@ Registry.prototype.get = function (key) {
 };
 // 4.4.7
 Registry.prototype.set = function (key, namespace) {
-  if (!(namespace instanceof Module))
+  if (!(namespace instanceof ModuleNamespace))
     throw new Error('Registry must be set with an instance of Module Namespace');
   this[REGISTRY][key] = namespace;
   return this;
@@ -195,7 +195,7 @@ var BASE_OBJECT = createSymbol('baseObject');
  * Optional evaluation function provides experimental Module.evaluate
  * support for non-executed modules in registry.
  */
-function Module (baseObject/*, evaluate*/) {
+function ModuleNamespace (baseObject/*, evaluate*/) {
   Object.defineProperty(this, BASE_OBJECT, {
     value: baseObject
   });
@@ -213,10 +213,10 @@ function Module (baseObject/*, evaluate*/) {
   //}
 };
 // 8.4.2
-Module.prototype = Object.create(null);
+ModuleNamespace.prototype = Object.create(null);
 
 if (typeof Symbol !== 'undefined' && Symbol.toStringTag)
-  Object.defineProperty(Module.prototype, Symbol.toStringTag, {
+  Object.defineProperty(ModuleNamespace.prototype, Symbol.toStringTag, {
     value: 'Module'
   });
 

core/register-loader.js

@@ -1,4 +1,4 @@
-import { Loader, Module, } from './loader-polyfill.js';
+import { Loader, ModuleNamespace } from './loader-polyfill.js';
 import { resolveIfNotPlain } from './resolve.js';
 import { addToError, global, createSymbol, baseURI } from './common.js';
 
@@ -122,7 +122,7 @@ RegisterLoader.prototype[Loader.resolveInstantiate] = function (key, parentKey)
 
   return resolveInstantiate(loader, key, parentKey, registry, registerRegistry)
   .then(function (instantiated) {
-    if (instantiated instanceof Module)
+    if (instantiated instanceof ModuleNamespace)
       return instantiated;
 
     // if already beaten to linked, return
@@ -205,7 +205,7 @@ function instantiate (loader, load, link, registry, registerRegistry) {
   .then(function (instantiation) {
     // direct module return from instantiate -> we're done
     if (instantiation !== undefined) {
-      if (!(instantiation instanceof Module))
+      if (!(instantiation instanceof ModuleNamespace))
         throw new TypeError('Instantiate did not return a valid Module object.');
 
       delete registerRegistry[load.key];
@@ -407,7 +407,7 @@ function instantiateDeps (loader, load, link, registry, registerRegistry, seen)
         if (setter) {
           var instantiation = dependencyInstantiations[i];
 
-          if (instantiation instanceof Module) {
+          if (instantiation instanceof ModuleNamespace) {
             setter(instantiation);
           }
           else {
@@ -474,7 +474,7 @@ function clearLoadErrors (loader, load) {
 
   if (link.dependencyInstantiations)
     link.dependencyInstantiations.forEach(function (depLoad, index) {
-      if (!depLoad || depLoad instanceof Module)
+      if (!depLoad || depLoad instanceof ModuleNamespace)
         return;
 
       if (depLoad.linkRecord) {
@@ -588,7 +588,7 @@ function makeDynamicRequire (loader, key, dependencies, dependencyInstantiations
         var depLoad = dependencyInstantiations[i];
         var module;
 
-        if (depLoad instanceof Module)
+        if (depLoad instanceof ModuleNamespace)
           module = depLoad;
         else
           module = ensureEvaluate(loader, depLoad, depLoad.linkRecord, registry, registerRegistry, seen);
@@ -614,7 +614,7 @@ function doEvaluate (loader, load, link, registry, registerRegistry, seen) {
     for (var i = 0; i < link.dependencies.length; i++) {
       depLoad = link.dependencyInstantiations[i];
 
-      if (depLoad instanceof Module)
+      if (depLoad instanceof ModuleNamespace)
         continue;
 
       // custom Module returned from instantiate
@@ -669,7 +669,7 @@ function doEvaluate (loader, load, link, registry, registerRegistry, seen) {
   if (err)
     return link.error = addToError(err, 'Evaluating ' + load.key);
 
-  registry[load.key] = load.module = new Module(link.moduleObj);
+  registry[load.key] = load.module = new ModuleNamespace(link.moduleObj);
 
   // if not an esm module, run importer setters and clear them
   // this allows dynamic modules to update themselves into es modules

core/resolve.js

@@ -4,7 +4,7 @@ import { isNode } from './common.js';
  * Optimized URL normalization assuming a syntax-valid URL parent
  */
 function throwResolveError () {
- throw new RangeError('Unable to resolve "' + relUrl + '" to ' + parentUrl);
+  throw new RangeError('Unable to resolve "' + relUrl + '" to ' + parentUrl);
 }
 export function resolveIfNotPlain (relUrl, parentUrl) {
   var parentProtocol = parentUrl && parentUrl.substr(0, parentUrl.indexOf(':') + 1);

test/2-loader-api.js

@@ -1,5 +1,5 @@
 import assert from 'assert';
-import { Loader, Module, ModuleNamespace } from '../core/loader-polyfill.js';
+import { Loader, ModuleNamespace } from '../core/loader-polyfill.js';
 import { pathToFileUrl } from '../core/common.js';
 
 describe('Loader Polyfill API', function() {
@@ -42,7 +42,7 @@ describe('Loader Polyfill API', function() {
   it('Should support Module construction, evaluation and mutation', function() {
     //var evaluated = false;
     var mutator = { a: 'asdf' };
-    var module = new Module(mutator);/*, function() {
+    var module = new ModuleNamespace(mutator);/*, function() {
       evaluated = true;
       mutator.a = 'b';
     });*/