Merge pull request #61 from fastcodejava/master

Template default for array
amida-tech · Apr 18, 2017 · cd7535e · cd7535e
2 parents fbc214c + b20e325
commit cd7535e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/lib/jsonapter.js b/lib/jsonapter.js
@@ -282,8 +282,8 @@ var prototype = {
                 input = input[0];
             } else {
                 var resultForArray = this.runForArray(template, input, parent, params);
-                if (resultForArray === null && (template.default !== null && template.default !== undefined)) {
-                    resultForArray = template.default;
+                if (resultForArray === null && !util.isNullOrUndefined(template.default)) {
+                    resultForArray = _.isFunction(template.default) ? template.default(input, parent, params) : template.default;
                 }
                 return resultForArray;
             }
@@ -300,12 +300,13 @@ var prototype = {
             }
         }
 
-        if (result === null && (template.default !== null && template.default !== undefined)) {
+        if (result === null && !util.isNullOrUndefined(template.default)) {
             result = _.isFunction(template.default) ? template.default(input, parent, params) : template.default;
         }
         if ((result !== null) && template.multiple) {
             result = [result];
         }
+
         return result;
     },
     actionKeys: ['content', 'value', 'template', 'arrayIndex', 'assign', 'firstOf', 'constant', 'arrayContent'],

diff --git a/lib/util.js b/lib/util.js
@@ -3,6 +3,10 @@
  */
 var _ = require('lodash');
 
+function isNullOrUndefined(input) {
+    return input === null || input === undefined;
+}
+
 function getSize(input) {
     if (_.isArray(input) || _.isString(input)) {
         return input.length;
@@ -11,4 +15,7 @@ function getSize(input) {
     }
 }
 
-module.exports.getSize = getSize;
+module.exports = {
+        getSize: getSize,
+        isNullOrUndefined: isNullOrUndefined
+};
diff --git a/test/test-boolean-default.js b/test/test-boolean-default.js
@@ -23,7 +23,7 @@ describe('templates with boolean, 0, or "" default values', function () {
         };
 
         var r = j2j.run(template, {
-            id: 'test',
+            id: 'test'
         });
 
         expect(r).to.deep.equal({
@@ -47,7 +47,7 @@ describe('templates with boolean, 0, or "" default values', function () {
         };
 
         var r = j2j.run(template, {
-            id: 'test',
+            id: 'test'
         });
 
         expect(r).to.deep.equal({
@@ -71,7 +71,7 @@ describe('templates with boolean, 0, or "" default values', function () {
         };
 
         var r = j2j.run(template, {
-            id: 'test',
+            id: 'test'
         });
 
         expect(r).to.deep.equal({
@@ -95,7 +95,7 @@ describe('templates with boolean, 0, or "" default values', function () {
         };
 
         var r = j2j.run(template, {
-            id: 'test',
+            id: 'test'
         });
 
         expect(r).to.deep.equal({

diff --git a/test/test-content.js b/test/test-content.js
@@ -22,6 +22,15 @@ describe('content', function () {
         }
     });
 
+    it('case-content-0: basic default for array with function', function () {
+        var template = case_0.template;
+        template.default = function () {
+            return [];
+        };
+        var actual = engine.run(template, []);
+        expect(actual).to.deep.equal([]);
+    });
+
     it('case-content-1: array', function () {
         var template = case_1.template;
         var n = case_1.inputs.length;