consistent staticBuild defaultExport option and detection

lib/builder.js

@@ -456,6 +456,7 @@ function processCompileOpts(options, defaults) {
     format: 'umd',
     globalDeps: {},
     globalName: null,
+    exportDefault: false,
     // conditionalResolutions: {}, 
     // can add a special object here that matches condition predicates to direct module names to use for sfx
 

lib/compile.js

@@ -63,6 +63,16 @@ function getEncoding(canonical, encodings) {
 
   return encodings[canonical] = highestEncoding.toString(16);
 }
+function getName(encoding, encodings) {
+  var match
+  Object.keys(encodings).some(function(e) {
+    if (encodings[e] == encoding) {
+      match = e;
+      return true;
+    }
+  });
+  return match;
+}
 
 // used to support leading #!/usr/bin/env in scripts as supported in Node
 var hashBangRegEx = /^\#\!.*/;
@@ -429,7 +439,14 @@ function wrapSFXOutputs(loader, tree, modules, outputs, entryPoints, compileOpts
     // for NodeJS execution to work correctly, we need to ensure the scoped module, exports and require variables are nulled out
     outputs.unshift("var require = this.require, exports = this.exports, module = this.module;");
 
-    outputs.unshift(sfxcore.toString(), "(" + JSON.stringify(entryPoints) + ", " + JSON.stringify(externalDepIds) + ", function(" + compileOpts.systemGlobal + ") {");
+    // if the first entry point is a dynamic module, then it is exportDefault always by default
+    var exportDefault = compileOpts.exportDefault;
+    var exportedLoad = tree[compileOpts.encodeNames && getName(entryPoints[0], cache.encodings) || entryPoints[0]];
+    if (exportedLoad.metadata.format != 'register' && exportedLoad.metadata.format != 'esm')
+      exportDefault = true;
+
+    outputs.unshift(sfxcore.toString(), "(" + JSON.stringify(entryPoints) + ", " + JSON.stringify(externalDepIds) + ", " + 
+        (exportDefault ? "true" : "false") + ", function(" + compileOpts.systemGlobal + ") {");
 
     outputs.push("})");
     return asp(fs.readFile)(path.resolve(__dirname, '../templates/sfx-' + compileOpts.format + '.js'))

lib/rollup.js

@@ -244,8 +244,13 @@ exports.rollupTree = function(loader, tree, entryPoints, traceOpts, compileOpts)
     .then(function(bundle) {
       var entryPointLoad = tree[entryPoint];
 
+      var defaultExport = compileOpts.defaultExport;
+      if (entryPointLoad.metadata.format != 'esm' && entryPointLoad.metadata.format != 'register')
+        defaultExport = true;
+
       var generateOptions = {
-        sourceMap: compileOpts.sourceMaps
+        sourceMap: compileOpts.sourceMaps,
+        exports: defaultExport ? 'default' : 'named'
       };
 
       // for a full tree rollup, we pass all the output options into rollup itself

templates/sfx-core-register.js

@@ -138,17 +138,18 @@
   function getESModule(exports) {
     var esModule = {};
     // don't trigger getters/setters in environments that support them
-    if (typeof exports == 'object' || typeof exports == 'function') {
-      var hasOwnProperty = exports && exports.hasOwnProperty;
+    if ((typeof exports == 'object' || typeof exports == 'function') && exports !== global) {
       if (getOwnPropertyDescriptor) {
-        for (var p in exports) {
-          if (!trySilentDefineProperty(esModule, exports, p))
-            setPropertyIfHasOwnProperty(esModule, exports, p, hasOwnProperty);
-        }
+        for (var p in exports)
+          defineOrCopyProperty(esModule, exports, p);
       }
       else {
-        for (var p in exports)
-          setPropertyIfHasOwnProperty(esModule, exports, p, hasOwnProperty);
+        var hasOwnProperty = exports && exports.hasOwnProperty;
+        for (var p in exports) {
+          if (hasOwnProperty && !exports.hasOwnProperty(p))
+            continue;
+          esModule[p] = exports[p];
+        }
       }
     }
     esModule['default'] = exports;
@@ -158,20 +159,16 @@
     return esModule;
   }
 
-  function setPropertyIfHasOwnProperty(targetObj, sourceObj, propName, hasOwnProperty) {
-    if (!hasOwnProperty || sourceObj.hasOwnProperty(propName))
-      targetObj[propName] = sourceObj[propName];
-  }
-
-  function trySilentDefineProperty(targetObj, sourceObj, propName) {
+  function defineOrCopyProperty(targetObj, sourceObj, propName) {
     try {
       var d;
       if (d = Object.getOwnPropertyDescriptor(sourceObj, propName))
         defineProperty(targetObj, propName, d);
-
-      return true;
-    } catch (ex) {
-      // Object.getOwnPropertyDescriptor threw an exception, fall back to normal set property.
+    }
+    catch (ex) {
+      // Object.getOwnPropertyDescriptor threw an exception, fall back to normal set property
+      // we dont need hasOwnProperty here because getOwnPropertyDescriptor would have returned undefined above
+      targetObj[propName] = sourceObj[propName];
       return false;
     }
   }
@@ -249,7 +246,7 @@
     return modules[name] = entry.declarative ? entry.module.exports : entry.esModule;
   };
 
-  return function(mains, depNames, declare) {
+  return function(mains, depNames, exportDefault, declare) {
     return function(formatDetect) {
       formatDetect(function(deps) {
         // register external dependencies
@@ -269,7 +266,7 @@
           for (var i = 1; i < mains.length; i++)
             load(mains[i]);
 
-        if (firstLoad.__useDefault)
+        if (exportDefault)
           return firstLoad['default'];
         else
           return firstLoad;

templates/sfx-core.js

@@ -398,7 +398,7 @@
     return modules[name] = entry.declarative ? entry.module.exports : entry.esModule;
   };
 
-  return function(mains, depNames, declare) {
+  return function(mains, depNames, exportDefault, declare) {
     return function(formatDetect) {
       formatDetect(function(deps) {
         var System = {
@@ -431,7 +431,7 @@
           for (var i = 1; i < mains.length; i++)
             load(mains[i]);
 
-        if (firstLoad.__useDefault)
+        if (exportDefault)
           return firstLoad['default'];
         else
           return firstLoad;
@@ -440,7 +440,7 @@
   };
 
 })(typeof self != 'undefined' ? self : global)
-/* (['mainModule'], ['external-dep'], function($__System) {
+/* (['mainModule'], ['external-dep'], false, function($__System) {
   System.register(...);
 })
 (function(factory) {

test/canonicals.js

@@ -39,6 +39,6 @@ suite('Canonical Names', function() {
     });
     assert.equal(builder.getCanonicalName(baseURL + 'src/asdf'), 'trailing/asdf');
     assert.equal(builder.getCanonicalName(baseURL + 'src/'), 'trailing/');
-    assert.equal(builder.getCanonicalName(baseURL + 'src'), 'trailing');
+    assert.equal(builder.getCanonicalName(baseURL + 'src'), 'trailing/');
   })
 });