JavaScriptIOT
diff --git a/‎builders.js‎
Lines changed: 30 additions & 6 deletions b/‎builders.js‎
Lines changed: 30 additions & 6 deletions
diff --git a/‎minify/merged/total.js‎
Lines changed: 9 additions & 9 deletions b/‎minify/merged/total.js‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎minify/total.js/builders.js‎
Lines changed: 1 addition & 1 deletion b/‎minify/total.js/builders.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/test-builders.js‎
Lines changed: 2 additions & 2 deletions b/‎test/test-builders.js‎
Lines changed: 2 additions & 2 deletions
@@ -552,9 +552,12 @@ SchemaBuilderEntity.prototype.$make = function(obj) {
         if (callback === undefined)
             callback = NOOP;
         obj.$$async = [];
+        obj.$$result = [];
         obj.$callback = callback;
         setImmediate(function() {
-            obj.$$async.async(callback);
+            obj.$$async.async(function() {
+                callback(null, obj.$$result);
+            });
         });
         return obj;
     };
@@ -568,11 +571,15 @@ SchemaBuilderEntity.prototype.$make = function(obj) {
 
         obj.$$async.push(function(next) {
             self.save(obj, helper, function(err, result) {
+
+                if (obj.$$result)
+                    obj.$$result.push(err ? null : result);
+
                 if (!err)
                     return next();
                 obj.$$async = null;
                 next = null;
-                obj.$callback(err);
+                obj.$callback(err, obj.$$result);
             });
         });
 
@@ -588,11 +595,15 @@ SchemaBuilderEntity.prototype.$make = function(obj) {
 
         obj.$$async.push(function(next) {
             self.remove(obj, helper, function(err, result) {
+
+                if (obj.$$result)
+                    obj.$$result.push(err ? null : result);
+
                 if (!err)
                     return next();
                 obj.$$async = null;
                 next = null;
-                obj.$callback(err);
+                obj.$callback(err, obj.$$result);
             });
         });
 
@@ -616,11 +627,15 @@ SchemaBuilderEntity.prototype.$make = function(obj) {
 
         obj.$$async.push(function(next) {
             self.transform(name, obj, helper, function(err, result) {
+
+                if (obj.$$result)
+                    obj.$$result.push(err ? null : result);
+
                 if (!err)
                     return next();
                 obj.$$async = null;
                 next = null;
-                obj.$callback(err);
+                obj.$callback(err, obj.$$result);
             });
         });
 
@@ -636,11 +651,15 @@ SchemaBuilderEntity.prototype.$make = function(obj) {
 
         obj.$$async.push(function(next) {
             self.compose(name, obj, helper, function(err, result) {
+
+                if (obj.$$result)
+                    obj.$$result.push(err ? null : result);
+
                 if (!err)
                     return next();
                 obj.$$async = null;
                 next = null;
-                obj.$callback(err);
+                obj.$callback(err, obj.$$result);
             });
         });
 
@@ -656,11 +675,15 @@ SchemaBuilderEntity.prototype.$make = function(obj) {
 
         obj.$$async.push(function(next) {
             self.workflow(name, obj, helper, function(err, result) {
+
+                if (obj.$$result)
+                    obj.$$result.push(err ? null : result);
+
                 if (!err)
                     return next();
                 obj.$$async = null;
                 next = null;
-                obj.$callback(err);
+                obj.$callback(err, obj.$$result);
             });
         });
 
@@ -1321,6 +1344,7 @@ SchemaBuilderEntity.prototype.clean = function(m, isCopied) {
 
     var self = this;
 
+    delete model['$$result'];
     delete model['$$async'];
     delete model['$async'];
     delete model['$callback'];
 
@@ -238,8 +238,8 @@ function test_Schema() {
 
     var obj = SCHEMA('default', '2').create();
 
-    obj.$async(function(err) {
-        assert.ok(countW === 2 && countS === 2, 'schema $async');
+    obj.$async(function(err, result) {
+        assert.ok(err === null && countW === 2 && countS === 2 && result.length === 2, 'schema $async');
     }).$save().$workflow('send');
 };