6.8.3

CHANGELOG.md

@@ -1,3 +1,6 @@
+SystemJS 6.8.3
+* Allow deletion of uninstantiated modules whose top level parent import finished. (https://github.com/systemjs/systemjs/pull/2291)
+
 SystemJS 6.8.2
 * Fix deleting modules after link failure. (https://github.com/systemjs/systemjs/pull/2288)
 * Ensure onload hooks retain catches (https://github.com/systemjs/systemjs/pull/2289)

dist/s.js

@@ -1,5 +1,5 @@
 /*
-* SJS 6.8.2
+* SJS 6.8.3
 * Minimal SystemJS Build
 */
 (function () {
@@ -373,8 +373,6 @@
       // dependency load records
       d: undefined,
       // execution function
-      // set to NULL immediately after execution (or on any failure) to indicate execution has happened
-      // in such a case, C should be used, and E, I, L will be emptied
       e: undefined,
 
       // On execution we have populated:
@@ -386,18 +384,23 @@
       // On execution, L, I, E cleared
 
       // Promise for top-level completion
-      C: undefined
+      C: undefined,
+
+      // parent instantiator / executor
+      p: undefined
     };
   }
 
-  function instantiateAll (loader, load, loaded) {
+  function instantiateAll (loader, load, parent, loaded) {
     if (!loaded[load.id]) {
       loaded[load.id] = true;
       // load.L may be undefined for already-instantiated
       return Promise.resolve(load.L)
       .then(function () {
+        if (!load.p || load.p.e === null)
+          load.p = parent;
         return Promise.all(load.d.map(function (dep) {
-          return instantiateAll(loader, dep, loaded);
+          return instantiateAll(loader, dep, parent, loaded);
         }));
       })
       .catch(function (err) {
@@ -410,7 +413,7 @@
   }
 
   function topLevelLoad (loader, load) {
-    return load.C = instantiateAll(loader, load, {})
+    return load.C = instantiateAll(loader, load, load, {})
     .then(function () {
       return postOrderExec(loader, load, {});
     })

dist/system-node.cjs

@@ -2825,8 +2825,6 @@ function getOrCreateLoad (loader, id, firstParentUrl) {
     // dependency load records
     d: undefined,
     // execution function
-    // set to NULL immediately after execution (or on any failure) to indicate execution has happened
-    // in such a case, C should be used, and E, I, L will be emptied
     e: undefined,
 
     // On execution we have populated:
@@ -2838,18 +2836,23 @@ function getOrCreateLoad (loader, id, firstParentUrl) {
     // On execution, L, I, E cleared
 
     // Promise for top-level completion
-    C: undefined
+    C: undefined,
+
+    // parent instantiator / executor
+    p: undefined
   };
 }
 
-function instantiateAll (loader, load, loaded) {
+function instantiateAll (loader, load, parent, loaded) {
   if (!loaded[load.id]) {
     loaded[load.id] = true;
     // load.L may be undefined for already-instantiated
     return Promise.resolve(load.L)
     .then(function () {
+      if (!load.p || load.p.e === null)
+        load.p = parent;
       return Promise.all(load.d.map(function (dep) {
-        return instantiateAll(loader, dep, loaded);
+        return instantiateAll(loader, dep, parent, loaded);
       }));
     })
     .catch(function (err) {
@@ -2863,7 +2866,7 @@ function instantiateAll (loader, load, loaded) {
 }
 
 function topLevelLoad (loader, load) {
-  return load.C = instantiateAll(loader, load, {})
+  return load.C = instantiateAll(loader, load, load, {})
   .then(function () {
     return postOrderExec(loader, load, {});
   })
@@ -3105,7 +3108,7 @@ systemJSPrototype.delete = function (id) {
   var load = registry[id];
   // in future we can support load.E case by failing load first
   // but that will require TLA callbacks to be implemented
-  if (!load || load.e !== null || load.E)
+  if (!load || (load.p && load.p.e !== null) || load.E)
     return false;
 
   var importerSetters = load.i;