format-specific mains for cycles

jspm · Nov 14, 2014 · 7a25d33 · 7a25d33
1 parent d12fbba
commit 7a25d33
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 6 deletions.
diff --git a/lib/common.js b/lib/common.js
@@ -67,4 +67,26 @@ exports.alphabetize = function(obj) {
     newObj[p] = obj[p];
   });
   return newObj;
-}
+}
+
+
+exports.getRedirectContents = function(format, main) {
+  if (format == 'es6')
+    return 'export * from "' + main + '";';
+
+  else if (format == 'cjs' || format == 'global')
+    return 'module.exports = require("' + main + '");';
+
+  else if (format == 'amd')
+    return 'define(["' + main + '"], function(main) {\n  return main;\n});';
+
+  else if (format == 'register')
+    return 'System.register(["' + main + '"], ' + 
+      'function($__export) {\n  return {\n    setters: [function(m) { for (var p in m) $__export(p, m[p]); }],\n    execute: function() {}\n  };\n});'
+
+  else
+    throw 'Unknown module format ' + format + '.';
+}
+
+
+
diff --git a/lib/package.js b/lib/package.js
@@ -28,6 +28,7 @@ var ep = require('./endpoint');
 var PackageName = require('./config/package-name');
 var globalConfig = require('./global-config');
 var readJSON = require('./common').readJSON;
+var getRedirectContents = require('./common').getRedirectContents;
 var ncp = require('ncp');
 var crypto = require('crypto');
 var fs = require('graceful-fs');
@@ -503,6 +504,7 @@ exports.processPackage = function(pkg, dir, pjson) {
 
 exports.createMain = function(pkg, pjson, downloadDir) {
   var lastNamePart, main;
+  var mainPath;
 
   return Promise.resolve()
 
@@ -522,7 +524,8 @@ exports.createMain = function(pkg, pjson, downloadDir) {
 
     // try the package.json main
     return new Promise(function(resolve, reject) {
-      fs.exists(path.resolve(downloadDir, main.substr(main.length - 3, 3) != '.js' ? main + '.js' : main), resolve);
+      mainPath = path.resolve(downloadDir, main.substr(main.length - 3, 3) != '.js' ? main + '.js' : main);
+      fs.exists(mainPath, resolve);
     });
   })
   .then(function(exists) {
@@ -531,13 +534,24 @@ exports.createMain = function(pkg, pjson, downloadDir) {
 
     main = lastNamePart;
     return new Promise(function(resolve, reject) {
-      fs.exists(path.resolve(downloadDir, main.substr(main.length - 3, 3) != '.js' ? main + '.js' : main), resolve);
+      mainPath = path.resolve(downloadDir, main.substr(main.length - 3, 3) != '.js' ? main + '.js' : main);
+      fs.exists(mainPath, resolve);
     });
   })
   .then(function(exists) {
-    // create the main pointer
-    var mainFile = path.resolve(downloadDir, '../' + lastNamePart + '@' + pkg.version + '.js');
-    return asp(fs.writeFile)(mainFile, 'export * from "' + pkg.exactName + '/' + main + '";');
+    // don't create a main if it doesn't exist
+    if (!exists)
+      return;
+
+    // detect the format of the main
+    return asp(fs.readFile)(mainPath)
+    .then(function(source) {
+      var detected = build.detectFormat(source.toString());
+
+      // create the main pointer
+      var mainFile = path.resolve(downloadDir, '../' + lastNamePart + '@' + pkg.version + '.js');
+      return asp(fs.writeFile)(mainFile, getRedirectContents(detected.format, pkg.exactName + '/' + main));
+    });
   });
 }