resolve simplification

Author: guybedford

core/loader-polyfill.js

@@ -46,7 +46,7 @@ function Loader () {
 // 3.3.1
 Loader.prototype.constructor = Loader;
 // 3.3.2
-Loader.prototype.import = Loader.prototype.load = function (key, parent) {
+Loader.prototype.import = 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
@@ -74,26 +74,28 @@ var RESOLVE_INSTANTIATE = Loader.resolveInstantiate = createSymbol('resolveInsta
 // this provides compatibility for the resolveInstantiate optimization
 Loader.prototype[RESOLVE_INSTANTIATE] = function (key, parent) {
   var loader = this;
-  return this.resolve(key, parent)
+  return loader.resolve(key, parent)
   .then(function (resolved) {
     var module = loader.registry.get(resolved);
     if (!module)
-      throw new Error('Resolve did not define the "' + resolved + '" module into the registry.');
+      throw new Error('Module ' + resolved + ' did not instantiate.');
     return module;
   });
 };
 
+function ensureResolution (resolvedKey) {
+  if (resolvedKey === undefined)
+    throw new RangeError('No resolution found.');
+  return resolvedKey;
+}
+
 Loader.prototype.resolve = function (key, parent) {
   var loader = this;
   return Promise.resolve()
   .then(function() {
     return loader[RESOLVE](key, parent);
   })
-  .then(function (resolvedKey) {
-    if (resolvedKey === undefined)
-      throw new RangeError('No resolution found.');
-    return resolvedKey;
-  })
+  .then(ensureResolution)
   .catch(function (err) {
     throw addToError(err, 'Resolving ' + key + (parent ? ' to ' + parent : ''));
   });

core/register-loader.js

@@ -34,36 +34,15 @@ function RegisterLoader () {
 RegisterLoader.prototype = Object.create(Loader.prototype);
 RegisterLoader.prototype.constructor = RegisterLoader;
 
-var RESOLVE = RegisterLoader.resolve = createSymbol('normalize');
 var INSTANTIATE = RegisterLoader.instantiate = createSymbol('instantiate');
 
 // default normalize is the WhatWG style normalizer
-RegisterLoader.prototype[RESOLVE] = function (key, parentKey) {
+RegisterLoader.prototype[RegisterLoader.resolve = Loader.resolve] = function (key, parentKey) {
   return resolveIfNotPlain(key, parentKey || baseURI);
 };
 
 RegisterLoader.prototype[INSTANTIATE] = function (key, processAnonRegister) {};
 
-function ensureResolution (resolvedKey) {
-  if (resolvedKey === undefined)
-    throw new RangeError('No resolution found.');
-  return resolvedKey;
-}
-
-function resolve (key, parentKey) {
-  var loader = this;
-  return Promise.resolve()
-  .then(function () {
-    return loader[RESOLVE](key, parentKey);
-  })
-  .then(ensureResolution)
-  .catch(function (err) {
-    throw addToError(err, 'Resolving "' + key + '"' + (parentKey ? ' to ' + parentKey : ''));
-  });
-}
-
-RegisterLoader.prototype[Loader.resolve] = resolve;
-
 // once evaluated, the linkRecord is set to undefined leaving just the other load record properties
 // this allows tracking new binding listeners for es modules through importerSetters
 // for dynamic modules, the load record is removed entirely.
@@ -157,7 +136,7 @@ function resolveInstantiate (loader, key, parentKey, registry, state) {
   if (load && !load.module)
     return instantiate(loader, load, load.linkRecord, registry, state);
 
-  return resolve.call(loader, key, parentKey)
+  return loader.resolve(key, parentKey)
   .then(function (resolvedKey) {
     // main loader registry always takes preference
     module = registry[resolvedKey];
@@ -278,7 +257,7 @@ function resolveInstantiateDep (loader, key, parentKey, registry, state, traceDe
       traceDepMap[key] = key;
     return instantiate(loader, load, load.linkRecord, registry, state);
   } */
-  return resolve.call(loader, key, parentKey)
+  return loader.resolve(key, parentKey)
   .then(function (resolvedKey) {
     if (traceDepMap)
       traceDepMap[key] = key;

test/3-register-loader.js

@@ -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 "plain-name"\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 () {