More yeoman changes

connector.js

@@ -17,23 +17,25 @@ connector.saveToFile = function() {
 
 connector.loadFromFile = function() {
   var cb = arguments[arguments.length - 1];
-  var loader = connector.loader;
+  var recursiveCall = !!connector.loader;
 
-  if(loader) {
-    loader.once('complete', cb);
-    loader.once('error', cb);
-    return;
+  if (!recursiveCall) {
+    connector.loader = new EventEmitter();
+    connector.loader.setMaxListeners(100);
   }
 
-  loader = connector.loader = new EventEmitter();
+  var loader = connector.loader;
+  loader.once('complete', cb);
+  loader.once('error', cb);
+
+  if (recursiveCall) return;
+
   var done = function(err) {
     if (err)
       loader.emit('error', err);
     else
       loader.emit('complete');
-
     connector.loader = null;
-    cb(err);
   };
 
   // reset the cache

models.json

@@ -16,6 +16,7 @@
   },
   "PackageDefinition": {
     "properties": {
+      "componentName": {"type": "string", "required": true}
     },
     "public": false,
     "dataSource": "db",
@@ -94,7 +95,7 @@
       "scopes": "array",
       "public": "boolean",
       "indexes": "array",
-      "componentName": "string",
+      "componentName": {"type": "string", "required": true},
       "dataSource": "string"
     },
     "public": true,

models/component-definition.js

@@ -61,7 +61,15 @@ ComponentDefinition.loadIntoCache = function(cache, componentName, components, c
       cb();
     });
   } else {
-    debug('component configFile does not exist');
+    steps.push(function(cb) {
+      var componentData = {
+        name: componentName,
+        configFile: path.join(componentName, 'config.json')
+      };
+      debug('adding to cache component entry [%s]', componentData.configFile);
+      ComponentDefinition.addToCache(cache, componentName, componentData);
+      cb();
+    });
   }
 
   if(componentModels) {
@@ -147,12 +155,17 @@ ComponentDefinition.saveToFs = function(cache, componentDef, cb) {
 
   var debug = require('debug')('workspace:component:save:' + componentName);
 
-  var configFile = ComponentDefinition.getConfigFile(componentName, componentDef);
-  // remove extra data that shouldn't be persisted to the fs
-  delete componentDef.configFile;
-  configFile.data = componentDef;
+  var hasApp = ComponentDefinition.hasApp(componentDef);
+
+  if (hasApp) {
+    var configFile = ComponentDefinition.getConfigFile(componentName, componentDef);
+    // remove extra data that shouldn't be persisted to the fs
+    delete componentDef.configFile;
+    delete componentDef.name;
+    configFile.data = componentDef;
 
-  filesToSave.push(configFile);
+    filesToSave.push(configFile);
+  }
 
   PackageDefinition.allFromCache(cache).forEach(function(package) {
     if(package.componentName === componentName) {
@@ -165,34 +178,41 @@ ComponentDefinition.saveToFs = function(cache, componentDef, cb) {
     }
   });
 
-  var dataSoureConfig = {};
-  var dataSourcePath = path.join(componentName, 'datasources.json');
-  var cachedDataSources = DataSourceDefinition.allFromCache(cache);
-
-  cachedDataSources.forEach(function(dataSourceDef) {
-    if(dataSourceDef.componentName === componentName) {
-      dataSourcePath = DataSourceDefinition.getPath(componentName, dataSourceDef);
-      dataSoureConfig[dataSourceDef.name] = dataSourceDef;
-      delete dataSourceDef.name;
-    }
-  });
-
-  filesToSave.push(new ConfigFile({
-    path: dataSourcePath,
-    data: dataSoureConfig
-  }));
-
-  var cachedComponentModels = ComponentModel.allFromCache(cache);
-  var componentModelsPath = path.join(componentName, ComponentModel.settings.defaultConfigFile);
-  var componentModelFile = new ConfigFile({path: componentModelsPath}); // models.json
-  var componentModelsConfig = componentModelFile.data = {};
+  if (hasApp) {
+    var dataSoureConfig = {};
+    var dataSourcePath = path.join(componentName, 'datasources.json');
+    var cachedDataSources = DataSourceDefinition.allFromCache(cache);
+
+    cachedDataSources.forEach(function(dataSourceDef) {
+      if (dataSourceDef.componentName === componentName) {
+        dataSourcePath = DataSourceDefinition.getPath(componentName, dataSourceDef);
+        dataSoureConfig[dataSourceDef.name] = dataSourceDef;
+        // remove extra data that shouldn't be persisted to the fs
+        delete dataSourceDef.name;
+        delete dataSourceDef.componentName;
+      }
+    });
 
-  cachedComponentModels.forEach(function(componentModel) {
-    componentModelsConfig[componentModel.name] = componentModel;
-    delete componentModel.name;
-  });
+    filesToSave.push(new ConfigFile({
+      path: dataSourcePath,
+      data: dataSoureConfig
+    }));
+
+    var cachedComponentModels = ComponentModel.allFromCache(cache);
+    var componentModelsPath = path.join(componentName, ComponentModel.settings.defaultConfigFile);
+    var componentModelFile = new ConfigFile({path: componentModelsPath}); // models.json
+    var componentModelsConfig = componentModelFile.data = {};
+
+    cachedComponentModels.forEach(function(componentModel) {
+      if (componentModel.componentName !== componentName) return;
+      componentModelsConfig[componentModel.name] = componentModel;
+      // remove extra data that shouldn't be persisted to the fs
+      delete componentModel.name;
+      delete componentModel.componentName;
+    });
 
-  filesToSave.push(componentModelFile);
+    filesToSave.push(componentModelFile);
+  }
 
   var cachedModels = ModelDefinition.allFromCache(cache);
 
@@ -216,3 +236,11 @@ ComponentDefinition.saveToFs = function(cache, componentDef, cb) {
     cb();
   });
 }
+
+ComponentDefinition.hasApp = function(componentDef) {
+  // At the moment, the root component does not have `app.js`,
+  // all other components (rest, server) have their app.js
+  // In the future, we should read this from component,
+  // e.g. package.json > loopback-workspace > app: true|false
+  return componentDef.name !== '.';
+};

models/component-model.js

@@ -12,9 +12,11 @@ var ComponentModel = app.models.ComponentModel;
 
 /**
  * - `name` is required and must be unique per `ComponentDefinition`
+ * - `componentName` is required and must refer to an existing component
  * 
  * @header Property Validation
  */
 
 ComponentModel.validatesUniquenessOf('name', { scopedTo: ['component'] });
-ComponentModel.validatesPresenceOf('name');
+ComponentModel.validatesPresenceOf('name');
+ComponentModel.validatesPresenceOf('componentName');

models/config-file.js

@@ -70,6 +70,9 @@ ConfigFile.prototype.load = function(cb) {
   function load(exists, cb) {
     if(exists) {
       fs.readJson(absolutePath, function(err, data) {
+        if (err && err.name === 'SyntaxError') {
+          err.message = 'Cannot parse ' + configFile.path + ': ' + err.message;
+        }
         cb(err, err ? undefined : data);
       });
     } else {

models/data-source-definition.js

@@ -19,12 +19,14 @@ var DataSourceDefinition = app.models.DataSourceDefinition;
 /**
  * - `name` must be unique per `ComponentDefinition`
  * - `name` and `connector` are required
- * 
+ * - `componentName` is required and must refer to an existing component
+ *
  * @header Property Validation
  */
 
 DataSourceDefinition.validatesUniquenessOf('name', { scopedTo: ['componentName'] });
 DataSourceDefinition.validatesPresenceOf('name', 'connector');
+DataSourceDefinition.validatesPresenceOf('componentName');
 
 /**
  * Test the datasource definition connection.

models/workspace.js

@@ -39,6 +39,7 @@ Workspace.addComponent = function(options, cb) {
   var template;
   var templateName = options.template || DEFAULT_TEMPLATE;
   var name = options.name || templateName;
+  var packageName = options.packageName || name;
   if(options.root) name = '.';
   var fileTemplatesDir = path.join(TEMPLATE_DIR, templateName, 'template');
 
@@ -84,7 +85,7 @@ Workspace.addComponent = function(options, cb) {
   }
 
   if(template.package) {
-    template.package.name = name;
+    template.package.name = packageName;
     setComponentName(template.package);
     steps.push(function(cb) {
       PackageDefinition.create(template.package, cb);
@@ -179,3 +180,23 @@ var staticConnectorList = require('../available-connectors');
 Workspace.listAvailableConnectors = function(cb) {
   cb(null, staticConnectorList);
 };
+
+/**
+ * Check if the project is a valid directory.
+ * The callback is called with no arguments when the project is valid.
+ * @param {function(Error=)} cb
+ */
+Workspace.isValidDir = function(cb) {
+  // Every call of `Model.find()` triggers reload from the filesystem
+  // This allows us to catch basic errors in config files
+  ComponentDefinition.find(function(err, list) {
+    if (err) {
+      cb(err);
+    } else if (!list.length) {
+      cb(new Error('Invalid workspace: no components found.'));
+    } else {
+      // TODO(bajtos) Add more sophisticated validation based on component types
+      cb();
+    }
+  });
+};

templates/api-server/component.js

@@ -4,7 +4,6 @@
 
 var template = module.exports;
 var component = template.component = {
-  restApiRoot: '/api'
 };
 
 template.config = {
@@ -15,7 +14,10 @@ template.package = {
   "version": "0.0.0",
   "main": "server/server.js",
   "dependencies": {
+    "compression": "^1.0.3",
+    "errorhandler": "^1.1.1",
     "loopback": "~2.0.0-beta3",
+    "loopback-boot": "~2.0.0-beta1",
     "loopback-datasource-juggler": "~2.0.0-beta2"
   },
   "optionalDependencies": {

templates/rest/component.js

@@ -12,51 +12,37 @@ template.package = {
 
 template.componentModels = [
   {
-    name: 'user',
+    name: 'User',
     dataSource: 'db'
   },
   {
-    name: 'user',
-    dataSource: 'db'
+    name: 'AccessToken',
+    dataSource: 'db',
+    public: false
   },
   {
-    name: 'acl',
-    dataSource: 'db'
+    name: 'ACL',
+    dataSource: 'db',
+    public: false
   },
   {
-    name: 'roleMapping',
-    dataSource: 'db'
+    name: 'RoleMapping',
+    dataSource: 'db',
+    public: false
   },
   {
-    name: 'role',
-    dataSource: 'db'
+    name: 'Role',
+    dataSource: 'db',
+    public: false
   }
 ];
 
 template.relations = [
-  {
-    fromModel: 'user',
-    model: 'access-token',
-    type: 'hasMany',
-    foreignKey: 'userId'
-  },
-  {
-    fromModel: 'role',
-    type: 'hasMany',
-    model: 'roleMapping',
-    foreignKey: 'roleId'
-  }
 ];
 
 template.datasources = [
   {
     name: 'db',
-    defaultForType: 'db',
     connector: 'memory'
-  },
-  {
-    name: 'mail',
-    defaultForType: 'mail',
-    connector: 'mail'
   }
 ];

templates/rest/template/boot/authentication.js

@@ -1,4 +1,4 @@
-var rest = require('../rest');
-
-// enable authentication
-rest.enableAuth();
+module.exports = function enableAuthentication(rest) {
+  // enable authentication
+  rest.enableAuth();
+};

templates/server/component.js

@@ -4,6 +4,7 @@
 
 var template = module.exports;
 var component = template.component = {
+  restApiRoot: '/api',
   host: 'localhost'
 };
 

templates/server/template/boot/explorer.js

@@ -0,0 +1,23 @@
+module.exports = function mountLoopBackExplorer(server) {
+  var explorer;
+  try {
+    explorer = require('loopback-explorer');
+  } catch(err) {
+    console.log(
+      'Run `npm install loopback-explorer` to enable the LoopBack explorer'
+    );
+    return;
+  }
+
+  var restApp = require('../../rest');
+  var restApiRoot = server.get('restApiRoot');
+
+  var explorerApp = explorer(restApp, { basePath: restApiRoot });
+  server.use('/explorer', explorerApp);
+  server.once('started', function(baseUrl) {
+    // express 4.x (loopback 2.x) uses `mountpath`
+    // express 3.x (loopback 1.x) uses `route`
+    var explorerPath = explorerApp.mountpath || explorerApp.route;
+    console.log('Browse your REST API at %s%s', baseUrl, explorerPath);
+  });
+};

templates/server/template/boot/rest-api.js

@@ -0,0 +1,5 @@
+module.exports = function mountRestApi(server) {
+  var restApp = require('../../rest');
+  var restApiRoot = server.get('restApiRoot');
+  server.use(restApiRoot, restApp);
+};