Adding UMD support to help allow Typescript

.eslintignore

@@ -1,2 +1,4 @@
 coverage/
 test/sandbox/
+test/fixtures/simple-app/boot/umd.js
+test/fixtures/umd-app/models/customer.js

lib/executor.js

@@ -248,6 +248,12 @@ function defineModels(app, instructions) {
         if (typeof code === 'function') {
           debug('Customizing model %s', name);
           code(model);
+        // If code is a default UMD module use it
+        } else if (code.__esModule && code.hasOwnProperty('default')) {
+          if (typeof code.default === 'function') {
+            debug('Customizing model %s', name);
+            code.default(model);
+          }
         } else {
           debug('Skipping model file %s - `module.exports` is not a function',
             data.sourceFile);
@@ -295,6 +301,15 @@ function runScripts(app, list, callback) {
           path: filepath,
           func: exports,
         });
+      // If the file contains a default UMD module, load it
+      } else if (exports.__esModule && exports.hasOwnProperty('default')) {
+        if (typeof exports.default === 'function') {
+          debug('Exported function detected %s', filepath);
+          functions.push({
+            path: filepath,
+            func: exports.default,
+          });
+        }
       }
     } catch (err) {
       g.error('Failed loading boot script: %s\n%s', filepath, err.stack);

test/browser.test.js

@@ -66,6 +66,22 @@ describe('browser support', function() {
     });
   });
 
+  it('can load UMD model code', function(done) {
+    var appDir = path.resolve(__dirname, './fixtures/umd-app');
+
+    browserifyTestApp(appDir, function(err, bundlePath) {
+      if (err) return done(err);
+
+      var app = executeBundledApp(bundlePath);
+
+      expect(Object.keys(app.models)).to.include('Customer');
+      expect(app.models.Customer.settings)
+        .to.have.property('_customized', 'Customer');
+
+      done();
+    });
+  });
+
   it('loads mixins', function(done) {
     var appDir = path.resolve(__dirname, './fixtures/browser-app');
     var options = {

test/executor.test.js

@@ -278,6 +278,7 @@ describe('executor', function() {
           'barStarted',
           'barFinished',
           'barSyncExecuted',
+          'umdLoaded',
         ]);
         done();
       }, 10);
@@ -294,6 +295,7 @@ describe('executor', function() {
           'barStarted',
           'barFinished',
           'barSyncExecuted',
+          'umdLoaded',
         ]);
         done();
       });

test/fixtures/simple-app/boot/umd.js

@@ -0,0 +1,21 @@
+// Copyright IBM Corp. 2014. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+// GENERATED CODE
+(function (factory) {
+    if (typeof module === 'object' && typeof module.exports === 'object') {
+        var v = factory(require, exports); if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === 'function' && define.amd) {
+        define(["require", "exports"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    function default_1(app) {
+        console.log('UMD Module loaded');
+        process.bootFlags.push('umdLoaded');
+    }
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.default = default_1;
+});

test/fixtures/umd-app/app.js

@@ -0,0 +1,11 @@
+// Copyright IBM Corp. 2015,2016. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+var loopback = require('loopback');
+var boot = require('../../../');
+
+var app = module.exports = loopback();
+
+boot(app);

test/fixtures/umd-app/datasources.json

@@ -0,0 +1,5 @@
+{
+  "db": {
+    "connector": "remote"
+  }
+}

test/fixtures/umd-app/model-config.json

@@ -0,0 +1,5 @@
+{
+  "Customer": {
+    "dataSource": "db"
+  }
+}

test/fixtures/umd-app/models/customer.js

@@ -0,0 +1,16 @@
+(function (factory) {
+    if (typeof module === 'object' && typeof module.exports === 'object') {
+        var v = factory(require, exports); if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === 'function' && define.amd) {
+        define(["require", "exports"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    function default_1(Customer) {
+      Customer.settings._customized = 'Customer'
+      Customer.base.settings._customized = 'Base'
+    }
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.default = default_1;
+});

test/fixtures/umd-app/models/customer.json

@@ -0,0 +1,4 @@
+{
+  "name": "Customer",
+  "base": "User"
+}