various polishing

lib/bundle.js

@@ -27,14 +27,10 @@ var toFileURL = require('./common').toFileURL;
 // just allows cfg object
 function Builder(_config) {
   config.loadSync();
-  SystemJSBuilder.call(this, toFileURL(config.pjson.baseURL));
 
-  var cfg = config.loader.getConfig();
-
-  if (_config)
-    extend(cfg, _config);
-
-  SystemJSBuilder.call(this, toFileURL(config.pjson.baseURL), cfg);
+  // NB do really need a proper config merging function here to handle edge cases properly
+  SystemJSBuilder.call(this, config.getLoaderConfig());
+  this.config(_config);
 }
 Builder.prototype = Object.create(SystemJSBuilder.prototype);
 exports.Builder = Builder;
@@ -103,9 +99,7 @@ exports.bundle = function(moduleExpression, fileName, opts) {
       // Add the bundle to config if the inject flag was given.
       var bundleName = systemBuilder.getCanonicalName(toFileURL(path.resolve(fileName)));
 
-      if (!config.loader.bundles)
-        config.loader.bundles = {};
-      config.loader.bundles[bundleName] = output.entryPoints;
+      config.loaderBrowser.file.setValue(['bundles', bundleName], output.modules);
 
       ui.log('ok', '`' + bundleName + '` added to config bundles.');
     }
@@ -123,8 +117,8 @@ exports.bundle = function(moduleExpression, fileName, opts) {
 exports.unbundle = function() {
   return config.load()
   .then(function() {
-    config.loader.bundles = {};
-    config.loader.depCache = {};
+    config.loaderBrowser.file.remove(['bundles']);
+    config.loaderBrowser.file.remove(['depCache']);
     return config.save();
   })
   .then(function() {

lib/config/config-file.js

@@ -112,10 +112,12 @@ function setProperty(properties, key, value, ordering) {
     properties.forEach(function(prop, index) {
       // get the ordering index of the current property
       var propOrderIndex = orderingIndex(ordering, prop.key);
-      if (propOrderIndex < orderIndex && index + 1 > minOrderIndex && index < maxOrderIndex)
-        minOrderIndex = index + 1;
-      if (propOrderIndex > orderIndex && index < maxOrderIndex && index >= minOrderIndex)
-        maxOrderIndex = index;
+      if (propOrderIndex != -1) {
+        if (propOrderIndex < orderIndex && index + 1 > minOrderIndex && index < maxOrderIndex)
+          minOrderIndex = index + 1;
+        if (propOrderIndex > orderIndex && index < maxOrderIndex && index >= minOrderIndex)
+          maxOrderIndex = index;
+      }
     });
 
   // within the ordering range, use alphabetical ordering
@@ -338,12 +340,21 @@ ConfigFile.prototype.setValue = function(memberArray, value) {
 // default behaviour is to not write empty objects, but to also not clear objects made empty
 // also avoids unnecessary changes
 ConfigFile.prototype.setProperties = function(memberArray, properties, clearIfEmpty, keepOrder) {
-  if (!properties.length && clearIfEmpty) {
-    this.remove(memberArray);
+  var targetProperties;
+
+  if (!properties.length) {
+    targetProperties = this.getProperties(memberArray);
+    if (targetProperties && targetProperties.length) {
+      if (clearIfEmpty)
+        this.remove(memberArray);
+      else
+        targetProperties.splice(0, targetProperties.length);
+      this.changed = true;
+    }
     return;
   }
 
-  var targetProperties = this.getProperties(memberArray, true);
+  targetProperties = this.getProperties(memberArray, true);
 
   var ordering;
   if (!keepOrder)
@@ -372,6 +383,9 @@ ConfigFile.prototype.setProperties = function(memberArray, properties, clearIfEm
 ConfigFile.prototype.orderFirst = function(memberArray) {
   var properties = this.getProperties(memberArray.slice(0, memberArray.length - 1));
 
+  if (!properties)
+    return;
+
   var propIndex = getProperty(properties, memberArray[memberArray.length - 1]).index;
 
   if (propIndex != -1)
@@ -384,7 +398,7 @@ ConfigFile.prototype.orderFirst = function(memberArray) {
 // instead of applying the ordering algorithm
 ConfigFile.prototype.setObject = function(memberArray, obj, clearIfEmpty, keepOrder) {
   // convert object into a properties array
-  this.setProperties(memberArray, objectToProperties(obj), clearIfEmpty, keepOrder);
+  return this.setProperties(memberArray, objectToProperties(obj), clearIfEmpty, keepOrder);
 };
 
 // default serialization is as a JSON file, but these can be overridden
@@ -395,6 +409,7 @@ ConfigFile.prototype.serialize = function(obj) {
     jsonString += this.style.newline;
 
   return jsonString
+      .replace(/([^\\])""/g, '$1' + this.style.quote + this.style.quote) // empty strings
       .replace(/([^\\])"/g, '$1' + this.style.quote)
       .replace(/\n/g, this.style.newline);
 };

lib/config/index.js

@@ -26,6 +26,7 @@ var PackageName = require('../package-name');
 var stringify = require('../common').stringify;
 var absURLRegEx = require('../common').absURLRegEx;
 var inDir = require('../common').inDir;
+var toFileURL = require('../common').toFileURL;
 
 var config = module.exports;
 
@@ -35,6 +36,23 @@ exports.version = require('../../package.json').version;
 exports.pjson = null;
 exports.loader = null;
 
+exports.getLoaderConfig = function() {
+  var cfg = config.loader.getConfig();
+
+  cfg.paths = cfg.paths || {};
+  (cfg.packageConfigPaths || []).forEach(function(pkgConfigPath) {
+    var registryName = pkgConfigPath.substr(0, pkgConfigPath.indexOf(':'));
+    if (registryName && !cfg.paths[registryName + ':*'])
+      cfg.paths[registryName + ':*'] = toFileURL(config.pjson.packages) + '/' + registryName + '/*';
+  });
+
+  // no depCache or bundles
+  delete cfg.depCache;
+  delete cfg.bundles;
+
+  return cfg;
+};
+
 var loadPromise;
 exports.loaded = false;
 exports.load = function(prompts) {

lib/config/loader.js

@@ -39,7 +39,7 @@ function JspmSystemConfig(fileName) {
 
   // the base install map is the global map config
   this.baseMap = {};
-  var map = this.file.getObject(['map']);
+  var map = this.file.getObject(['map']) || {};
   Object.keys(map).forEach(function(key) {
     self.baseMap[key] = new PackageName(map[key]);
   });
@@ -82,7 +82,7 @@ function JspmSystemConfig(fileName) {
 JspmSystemConfig.prototype = Object.create(SystemConfig.prototype);
 JspmSystemConfig.prototype.ensureRegistry = function(registryName) {
   // ensure packageNameFormats are present as packageConfigPaths in the right order
-  var packageConfigPaths = this.file.getValue(['packageConfigPaths'], 'array');
+  var packageConfigPaths = this.file.getValue(['packageConfigPaths'], 'array') || [];
 
   var lastIndex;
   (registry.load(registryName).constructor.packageNameFormats || ['*'])
@@ -129,7 +129,8 @@ JspmSystemConfig.prototype.syncFile = function() {
 
   if (this.packageName != config.pjson.name)
     this.file.remove(['packages', this.packageName = config.pjson.name]);
-  this.file.setObject(['packages', this.packageName], this.package);
+
+  this.file.setObject(['packages', this.packageName], this.package, true);
   // ensure the local package is the first in the package list
   this.file.orderFirst(['packages', this.packageName]);
 };

lib/config/package.js

@@ -83,7 +83,7 @@ function PackageConfig(fileName) {
 
   this.dir = path.dirname(path.resolve(fileName));
 
-  this.name = prefixedGetValue.call(this, ['name'], 'string') || '';
+  this.name = prefixedGetValue.call(this, ['name'], 'string') || 'app';
 
   this.jspmPrefix = this.file.has(['jspm']);
   this.jspmAware = this.jspmPrefix || this.file.has(['registry']);
@@ -187,10 +187,9 @@ PackageConfig.prototype.write = function() {
 
   prefixedSetValue.call(this, ['name'], this.name, '');
 
-  if (hasProperties(this.dependencies))
-    this.file.setObject(depsBase.concat('dependencies'), writeDependencies(this.dependencies));
-  this.file.setObject(depsBase.concat('peerDependencies'), writeDependencies(this.peerDependencies), true);
-  this.file.setObject(depsBase.concat('devDependencies'), writeDependencies(this.devDependencies), true);
+  this.file.setObject(depsBase.concat('dependencies'), writeDependencies(this.dependencies));
+  this.file.setObject(depsBase.concat('peerDependencies'), writeDependencies(this.peerDependencies));
+  this.file.setObject(depsBase.concat('devDependencies'), writeDependencies(this.devDependencies));
 
   prefixedSetObject.call(this, ['overrides'], this.overrides, true);
 

lib/core.js

@@ -29,21 +29,20 @@ var asp = require('rsvp').denodeify;
 var System = require('systemjs');
 var toFileURL = require('./common').toFileURL;
 var HOME = require('./common').HOME;
+var dextend = require('./common').dextend;
 
 
 var core = module.exports;
 
 // we always download the latest semver compatible version
 var systemVersion = require('../package.json').dependencies.systemjs;
 
-exports.run = function(moduleName) {
+exports.run = function(moduleName, _config) {
   return config.load()
   .then(function() {
-    var cfg = config.loader.getConfig();
-    delete cfg.bundles;
-    cfg.baseURL = toFileURL(config.pjson.baseURL);
-    System.config(cfg);
-
+    System.config(config.getLoaderConfig());
+    if (_config)
+      System.config(_config);
     return System.import(moduleName);
   })
   .catch(function(e) {

lib/install.js

@@ -448,11 +448,11 @@ function install(name, target, options, seen) {
         primaryRanges[name] = target.copy();
 
       // store in package.json
-      // if a peer or dev dep, but primary install exists, we save as a primary install
-      if (config.pjson.dependencies[name])
-        options.dev = options.peer = false;
-      if (config.pjson.peerDependencies[name])
-        options.dev = false;
+      // if a peer, but primary install exists, we save as a primary install
+      if (options.parent && options.peer && config.pjson.dependencies[name])
+        options.peer = false;
+      if (!options.parent && !options.peer && !options.dev && config.pjson.peerDependencies[name])
+        options.peer = true;
 
       if (options.dev)
         config.pjson.devDependencies[name] = primaryRanges[name];

lib/package.js

@@ -262,8 +262,8 @@ function getOverride(pkg, manualOverride) {
       });
     });
 
-    if (alreadyInstalled || config.pjson.overrides[pkg.exactName]) {
-      var override = extend(config.pjson.overrides[pkg.exactName] || {}, manualOverride);
+    if ((alreadyInstalled || config.pjson.overrides[pkg.exactName]) && !manualOverride) {
+      var override = config.pjson.overrides[pkg.exactName] || {};
       // persist the manual override
       if (hasProperties(override))
         config.pjson.overrides[pkg.exactName] = override;
@@ -276,10 +276,16 @@ function getOverride(pkg, manualOverride) {
     var endpoint = registry.load(globalConfig.config.defaultRegistry);
     return endpoint.getOverride(pkg.registry, pkg.package, pkg.version, manualOverride)
     .then(function(override) {
+      for (var p in override)
+        if (override[p] === undefined)
+          delete override[p];
+
       override = override || {};
       // persist the override for reproducibility
       if (hasProperties(override))
         config.pjson.overrides[pkg.exactName] = override;
+      else
+        delete config.pjson.overrides[pkg.exactName];
       return override;
     });
   })

lib/ui.js

@@ -155,9 +155,10 @@ function wordWrap(text, leftIndent, rightIndent) {
     }
     if (text[i] == ' ')
       lastSpace = i;
-    if ((i  - skipLength) != lastBreak && (i - lastBreak - skipLength) % columns == 0 && text[i + 1] != '\n') {
-      if (lastSpace <= lastBreak)
-        lastSpace = lastBreak + columns + skipLength;
+    if ((i  - skipLength) != lastBreak && (i - lastBreak - skipLength) % columns == 0 && text[i] != '\n') {
+      // wrap spaceless lines
+      //if (lastSpace <= lastBreak)
+      //  lastSpace = lastBreak + columns + skipLength - 1;
       var line = text.substring(lastBreak, lastSpace + 1);
       lines.push(line);
       lastBreak = lastSpace + 1;