Merge pull request #20 from clarkbw/babel-plugins

Merging babel plugin updates

es6/index.js

@@ -4,3 +4,5 @@ import timestamp from './time-stamp';
 export default deprecate((app) => {
   app.loopback.modelBuilder.mixins.define('TimeStamp', timestamp);
 }, 'DEPRECATED: Use mixinSources, see https://github.com/clarkbw/loopback-ds-timestamp-mixin#mixinsources');
+
+module.exports = exports.default;

es6/time-stamp.js

@@ -32,3 +32,5 @@ export default (Model, options = {}) => {
   });
 
 };
+
+module.exports = exports.default;

package.json

@@ -23,6 +23,15 @@
     "type": "git",
     "url": "https://github.com/clarkbw/loopback-ds-timestamp-mixin.git"
   },
+  "babel": {
+    "presets": [
+      "es2015"
+    ],
+    "plugins": [
+      "transform-object-assign",
+      "transform-es2015-modules-commonjs"
+    ]
+  },
   "dependencies": {
     "debug": "2.x"
   },
@@ -31,7 +40,9 @@
   },
   "devDependencies": {
     "babel-core": "latest",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.3.16",
     "babel-plugin-transform-object-assign": "latest",
+    "babel-preset-es2015": "latest",
     "coveralls": "latest",
     "gulp": "latest",
     "gulp-babel": "latest",

test/test.js

@@ -15,7 +15,6 @@ test('loopback datasource timestamps', function(tap) {
       Widget.destroyAll(function() {
         Widget.create({name: 'book 1', type: 'fiction'}, function(err, book) {
           tt.error(err);
-          tt.ok(book.createdAt);
           tt.type(book.createdAt, Date);
           tt.end();
         });
@@ -26,7 +25,7 @@ test('loopback datasource timestamps', function(tap) {
       Widget.destroyAll(function() {
         Widget.create({name:'book 1', type:'fiction'}, function(err, book) {
           tt.error(err);
-          tt.ok(book.createdAt);
+          tt.type(book.createdAt, Date);
           book.name = 'book inf';
           book.save(function(err, b) {
             tt.equal(book.createdAt, b.createdAt);
@@ -40,7 +39,7 @@ test('loopback datasource timestamps', function(tap) {
       Widget.destroyAll(function() {
         Widget.create({name:'book 1', type:'fiction'}, function(err, book) {
           tt.error(err);
-          tt.ok(book.createdAt);
+          tt.type(book.createdAt, Date);
           book.updateAttributes({ name:'book inf' }, function(err, b) {
             tt.error(err);
             tt.equal(book.createdAt, b.createdAt);
@@ -54,7 +53,7 @@ test('loopback datasource timestamps', function(tap) {
       Widget.destroyAll(function() {
         Widget.create({name:'book 1', type:'fiction'}, function(err, book) {
           tt.error(err);
-          tt.ok(book.createdAt);
+          tt.type(book.createdAt, Date);
           Widget.upsert({id: book.id, name:'book inf'}, function(err, b) {
             tt.error(err);
             tt.equal(book.createdAt.getTime(), b.createdAt.getTime());
@@ -69,7 +68,7 @@ test('loopback datasource timestamps', function(tap) {
       Widget.destroyAll(function() {
         Widget.create({name:'book 1', type:'fiction'}, function(err, book) {
           tt.error(err);
-          tt.ok(book.createdAt);
+          tt.type(book.createdAt, Date);
           Widget.updateAll({ type:'fiction' }, { type:'non-fiction' }, function(err) {
             tt.error(err);
             Widget.findById(book.id, function(err, b) {
@@ -92,7 +91,6 @@ test('loopback datasource timestamps', function(tap) {
       Widget.destroyAll(function() {
         Widget.create({name:'book 1', type:'fiction'}, function(err, book) {
           tt.error(err);
-          tt.ok(book.updatedAt);
           tt.type(book.updatedAt, Date);
           tt.end();
         });
@@ -104,14 +102,14 @@ test('loopback datasource timestamps', function(tap) {
       Widget.destroyAll(function() {
         Widget.create({name:'book 1', type:'fiction'}, function(err, book) {
           tt.error(err);
-          tt.ok(book.updatedAt);
+          tt.type(book.createdAt, Date);
           updatedAt = book.updatedAt;
 
           // ensure we give enough time for the updatedAt value to be different
           setTimeout(function pause() {
             book.updateAttributes({ type:'historical-fiction' }, function(err, b) {
               tt.error(err);
-              tt.ok(b.updatedAt);
+              tt.type(b.createdAt, Date);
               tt.ok(b.updatedAt.getTime() > updatedAt.getTime());
               tt.end();
             });
@@ -178,10 +176,7 @@ test('loopback datasource timestamps', function(tap) {
           tt.type(book.createdAt, 'undefined');
           tt.type(book.updatedAt, 'undefined');
 
-          tt.ok(book.createdOn);
           tt.type(book.createdOn, Date);
-
-          tt.ok(book.updatedOn);
           tt.type(book.updatedOn, Date);
 
           tt.end();
@@ -220,14 +215,14 @@ test('loopback datasource timestamps', function(tap) {
         Widget.create({name:'book 1', type:'fiction'}, function(err, book1) {
           tt.error(err);
 
-          tt.ok(book1.updatedAt);
+          tt.type(book1.updatedAt, Date);
 
           var book = {id: book1.id, name:'book 2'};
 
           Widget.updateOrCreate(book, {skipUpdatedAt: true}, function(err, book2) {
             tt.error(err);
 
-            tt.ok(book2.updatedAt);
+            tt.type(book2.updatedAt, Date);
             tt.equal(book1.updatedAt.getTime(), book2.updatedAt.getTime());
             tt.end();
           });