@jsenv/core 24.4.3 → 24.4.8

package/src/internal/runtime/s.js

@@ -599,15 +599,18 @@
   var autoImportCandidates = {};
   var systemRegister = systemJSPrototype.register;
   var inlineScriptCount = 0;
-  systemJSPrototype.register = function (deps, declare) {
+  systemJSPrototype.register = function (deps, declare, autoUrl) {
     if (hasDocument && document.readyState === 'loading' && typeof deps !== 'string') {
       var scripts = document.querySelectorAll('script[src]');
       var lastScript = scripts[scripts.length - 1];
       var lastAutoImportUrl
       lastAutoImportDeps = deps;
-      if (lastScript) {
+      if (lastScript && lastScript.src) {
         lastAutoImportUrl = lastScript.src;
       }
+      else if (autoUrl) {
+        lastAutoImportUrl = autoUrl
+      }
       else {
         inlineScriptCount++
         lastAutoImportUrl = document.location.href + "__inline_script__" + inlineScriptCount;
@@ -727,84 +730,39 @@
 
 }());
 
-(function(){/*
- * SystemJS named register extension
- * Supports System.register('name', [..deps..], function (_export, _context) { ... })
- *
- * Names are written to the registry as-is
- * System.register('x', ...) can be imported as System.import('x')
- */
-(function (global) {
-  var System = global.System;
-  setRegisterRegistry(System);
-  var systemJSPrototype = System.constructor.prototype;
-  var constructor = System.constructor;
-  var SystemJS = function () {
-    constructor.call(this);
-    setRegisterRegistry(this);
-  };
-  SystemJS.prototype = systemJSPrototype;
-  System.constructor = SystemJS;
-
-  var firstNamedDefine, firstName;
-
-  function setRegisterRegistry(systemInstance) {
-    systemInstance.registerRegistry = Object.create(null);
-    systemInstance.namedRegisterAliases = Object.create(null);
-  }
+(function(){
+  var envGlobal = typeof self !== 'undefined' ? self : global;
+  var System = envGlobal.System;
+  var register = System.register;
+  var registerRegistry = Object.create(null)
 
-  var register = systemJSPrototype.register;
-  systemJSPrototype.register = function (name, deps, declare) {
-    if (typeof name !== 'string')
-      return register.apply(this, arguments);
+  System.register = function (name, deps, declare) {
+    if (typeof name !== 'string') return register.apply(this, arguments);
     var define = [deps, declare];
-    this.registerRegistry[name] = define;
-    if (!firstNamedDefine) {
-      firstNamedDefine = define;
-      firstName = name;
-    }
-    Promise.resolve().then(function () {
-      firstNamedDefine = null;
-      firstName = null;
-    });
-    return register.apply(this, [deps, declare]);
+    return System.prepareImport().then(function () {
+      var url = System.resolve(`./${name}`);
+      registerRegistry[url] = define;
+      return register.call(System, deps, declare, url);
+    })
   };
 
-  var resolve = systemJSPrototype.resolve;
-  systemJSPrototype.resolve = function (id, parentURL) {
-    try {
-      // Prefer import map (or other existing) resolution over the registerRegistry
-      return resolve.call(this, id, parentURL);
-    } catch (err) {
-      if (id in this.registerRegistry) {
-        return this.namedRegisterAliases[id] || id;
-      }
-      throw err;
-    }
-  };
+  var instantiate = System.instantiate;
+  System.instantiate = function (url, firstParentUrl) {
+    var result = registerRegistry[url];
 
-  var instantiate = systemJSPrototype.instantiate;
-  systemJSPrototype.instantiate = function (url, firstParentUrl) {
-    var result = this.registerRegistry[url];
     if (result) {
-      this.registerRegistry[url] = null;
+      registerRegistry[url] = null;
       return result;
     } else {
       return instantiate.call(this, url, firstParentUrl);
     }
   };
 
-  var getRegister = systemJSPrototype.getRegister;
-  systemJSPrototype.getRegister = function (url) {
+  var getRegister = System.getRegister;
+  System.getRegister = function (url) {
     // Calling getRegister() because other extras need to know it was called so they can perform side effects
     var register = getRegister.call(this, url);
-
-    if (firstName && url) {
-      this.namedRegisterAliases[firstName] = url;
-    }
-    var result = firstNamedDefine || register;
-    firstNamedDefine = null;
-    firstName = null;
+    var result = registerRegistry[url] || register;
     return result;
   };
-})(typeof self !== 'undefined' ? self : global);}());
+}());