remove base key as standard constructor

Author: guybedford

core/loader-polyfill.js

@@ -1,4 +1,4 @@
-import { baseURI, addToError, createSymbol } from './common.js';
+import { addToError, createSymbol } from './common.js';
 
 export { Loader, Module, Module as ModuleNamespace }
 
@@ -40,8 +40,7 @@ function arrayValues (arr) {
  * We skip the entire native internal pipeline, just providing the bare API
  */
 // 3.1.1
-function Loader (baseKey) {
-  this.key = baseKey || baseURI;
+function Loader () {
   this.registry = new Registry();
 }
 // 3.3.1
@@ -51,7 +50,7 @@ Loader.prototype.import = Loader.prototype.load = function (key, parent) {
   if (typeof key !== 'string')
     throw new TypeError('Loader import method must be passed a module key string');
   // custom resolveInstantiate combined hook for better perf
-  return Promise.resolve(this[RESOLVE_INSTANTIATE](key, parent || this.key))
+  return Promise.resolve(this[RESOLVE_INSTANTIATE](key, parent))
   //.then(Module.evaluate)
   .catch(function (err) {
     throw addToError(err, 'Loading ' + key + (parent ? ' from ' + parent : ''));

core/register-loader.js

@@ -1,6 +1,6 @@
 import { Loader, Module, } from './loader-polyfill.js';
 import { resolveIfNotPlain } from './resolve.js';
-import { addToError, global, createSymbol } from './common.js';
+import { addToError, global, createSymbol, baseURI } from './common.js';
 
 export default RegisterLoader;
 
@@ -18,8 +18,8 @@ export default RegisterLoader;
 var REGISTER_REGISTRY = createSymbol('registerRegistry');
 var REGISTERED_LAST_ANON = createSymbol('registeredLastAnon');
 
-function RegisterLoader (baseKey) {
-  Loader.apply(this, arguments);
+function RegisterLoader () {
+  Loader.call(this);
 
   // last anonymous System.register call
   this[REGISTERED_LAST_ANON] = undefined;
@@ -44,7 +44,7 @@ RegisterLoader.prototype[RESOLVE] = function (key, parentKey) {
   // normalization shortpath for already in registry
   if (this[REGISTER_REGISTRY][key] || this.registry._registry[key])
     return key;
-  return resolveIfNotPlain(key, parentKey);
+  return resolveIfNotPlain(key, parentKey || baseURI);
 };
 
 RegisterLoader.prototype[INSTANTIATE] = function (key, processAnonRegister) {};
@@ -63,7 +63,7 @@ function resolve (key, parentKey) {
   })
   .then(ensureResolution)
   .catch(function (err) {
-    throw addToError(err, 'Resolving dependency "' + key + '" to ' + parentKey);
+    throw addToError(err, 'Resolving "' + key + '"' + (parentKey ? ' to ' + parentKey : ''));
   });
 }
 

test/2-loader-api.js

@@ -1,5 +1,5 @@
 import assert from 'assert';
-import { Loader, Module, InternalModuleNamespace } from '../core/loader-polyfill.js';
+import { Loader, Module, ModuleNamespace } from '../core/loader-polyfill.js';
 import { pathToFileUrl } from '../core/common.js';
 
 describe('Loader Polyfill API', function() {
@@ -12,11 +12,11 @@ describe('Loader Polyfill API', function() {
   it('Should support the full registry API', function() {
     assert(loader.registry);
 
-    loader.registry.set('asdf', new InternalModuleNamespace({ asdf: 'asdf' }));
+    loader.registry.set('asdf', new ModuleNamespace({ asdf: 'asdf' }));
     assert(loader.registry.has('asdf'));
     var m = loader.registry.get('asdf');
     assert(m);
-    assert(m instanceof InternalModuleNamespace);
+    assert(m instanceof ModuleNamespace);
     assert.equal(m.asdf, 'asdf');
 
     for (var k of loader.registry.keys())

test/3-register-loader.js

@@ -184,7 +184,7 @@ describe('System Register Loader', function() {
 
   describe('Errors', function () {
 
-    var testPath = fileUrlToPath(loader.key) + 'register-modules/';
+    var testPath = fileUrlToPath(loader.baseKey) + 'register-modules/';
 
     async function getImportError(module) {
       try {
@@ -198,7 +198,7 @@ describe('System Register Loader', function() {
 
     it('should give a plain name error', async function () {
       var err = await getImportError('plain-name');
-      assert.equal(err, 'Error: No resolution found.\n  Resolving dependency "plain-name" to ' + fileUrlToPath(loader.key) + '\n  Loading plain-name');
+      assert.equal(err, 'Error: No resolution found.\n  Resolving "plain-name"\n  Loading plain-name');
     });
 
     it('should throw if on syntax error', async function () {
@@ -231,7 +231,7 @@ describe('System Register Loader', function() {
     });
 
     it('should load mixed bundles of register and registerDynamic', async function () {
-      new Module().require(path.resolve(fileUrlToPath(loader.key), 'dynamic-modules/mixed-bundle.js'));
+      new Module().require(path.resolve(fileUrlToPath(loader.baseKey), 'dynamic-modules/mixed-bundle.js'));
       var m = await loader.import('tree/first');
       assert.equal(m.p, 5);
       assert.equal(m.q, 4);

test/fixtures/system-register-loader.js

@@ -10,8 +10,8 @@ import { resolveIfNotPlain } from '../../core/resolve.js';
  * If the module does not call System.register, an error will be thrown
  */
 function SystemRegisterLoader (baseKey) {
-  baseKey = resolveIfNotPlain(baseKey || (isNode ? process.cwd() : '.'), baseURI) || baseKey;
-  RegisterLoader.call(this, baseKey);
+  this.baseKey = resolveIfNotPlain(baseKey || (isNode ? process.cwd() : '.'), baseURI) || baseKey;
+  RegisterLoader.call(this);
 
   var loader = this;
 
@@ -37,7 +37,7 @@ SystemRegisterLoader.prototype = Object.create(RegisterLoader.prototype);
 // normalize is never given a relative name like "./x", that part is already handled
 // so we just need to do plain name detect to throw as in the WhatWG spec
 SystemRegisterLoader.prototype[RegisterLoader.resolve] = function (key, parent) {
-  return RegisterLoader.prototype[RegisterLoader.resolve].call(this, key, parent);
+  return RegisterLoader.prototype[RegisterLoader.resolve].call(this, key, parent || this.baseKey);
 };
 
 var fs;