Simplified the JSON creation, added support for CWD

Author: Matt Karl

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "0.12"
 before_install:
   - npm install -g grunt-cli

README.md

@@ -30,19 +30,20 @@ grunt.loadNpmTasks('grunt-concat-json');
 
 Type: `String`|`Array`
 
-The path to the source JSON files or collection of individual files. For instance: `"src/**/*.json"`, which will include all JSON files in the `src` folder. 
+The path to the source JSON files or collection of individual files. For instance: `"src/**/*.json"`, which will concatenate all JSON files in the `src` folder.
 
 ### dest
 
 Type: `String`
 
-The output, concatenated JSON file. 
+The path to the output concatenated JSON file. 
 
 ### cwd
 
 Type: `String`
+Default: `null`
 
-The base folder to source files from. This will exclude this folder and it's parents from nested layer in the output JSON file. For instance if the `src` property is `"src/**/*.json"`, then `cwd` might be set to `src` to not include `src` as the name of the root property.
+The root folder to source files from. This will exclude this folder and it's parents from nested layer representation in the output JSON file. If `cwd` is set, then the root folder does not need to be specified as part of the `src`.
 
 ## Task Options
 

package.json

@@ -9,6 +9,11 @@
 		"email": "matteszklarz@cloudkid.com",
 		"url": "http://cloudkid.com"
 	},
+	"contributors": [{
+		"name": "Matt Karl",
+		"email": "matt@cloudkid.com",
+		"url": "http://cloudkid.com"
+	}],
 	"keywords": [
 		"gruntplugin",
 		"merge",
@@ -30,9 +35,9 @@
 		"grunt": "~0.4.5"
 	},
 	"dependencies": {
-		"chalk": "~1.1.0",
-		"strip-json-comments": "~1.0.2",
-		"jsonlint": "~1.6.2"
+		"colors": "^1.1.2",
+		"jsonlint": "~1.6.2",
+		"strip-json-comments": "~1.0.2"
 	},
 	"engines": {
 		"node": ">=0.10.0"

tasks/concat-json.js

@@ -1,11 +1,12 @@
 module.exports = function (grunt)
 {
-	var chalk = require("chalk");
-	var stripJsonComments = require("strip-json-comments");
-	var jsonlint = require("jsonlint");
-
 	grunt.registerMultiTask("concat-json", "Merge Multiple JSON Files", function ()
 	{
+		var path = require('path');
+		var colors = require("colors");
+		var jsonlint = require("jsonlint");
+		var stripJsonComments = require("strip-json-comments");
+
 		// prepare options
 		var options = this.options(
 		{
@@ -22,24 +23,27 @@ module.exports = function (grunt)
 			try
 			{
 				// Start with an empty object
-				var json = {};
+				var output = {};
 
 				// Save paths of unnamed arrays to prevent duplicates
 				var arrDict = {};
 
 				// Add fragments
-				f.src.forEach(function (src)
+				f.src.forEach(function(src)
 				{
+					// Source file using cwd
+					if (f.cwd)
+					{
+						src = path.join(f.cwd, src);
+					}
 
 					// Merge JSON file into object
 					if (!grunt.file.exists(src))
 					{
-						throw "JSON source file \"" + chalk.red(src) + "\" not found.";
+						throw "JSON source file \"" + src.red + "\" not found.";
 					}
 					else
 					{
-						var fragment;
-
 						try
 						{
 							// Read the raw file
@@ -50,54 +54,32 @@ module.exports = function (grunt)
 
 							// Lint the comment-free file.
 							// If linting errors, terminal will let you know!
-							var linted = jsonlint.parse(without);
-
-							fragment = {
-								dir: '',
-								// Attach comment-less JSON
-								json: linted
-							};
-
-							// Start a top level
-							var currentDir = json;
+							var json = jsonlint.parse(without);
 
 							// Remove the path to the contianer,
 							// and the .json extension
-							var path = src.replace(f.base + '/', '').replace('.json', '');
+							var cwd = f.base || f.cwd; // backward support
+							var target = src.replace(cwd + '/', '')
+								.replace('.json', '')
+								.split('/');
 
-							var test = true;
-							while (test)
+							var key, child = output;
+							while(target.length)
 							{
-								test = testDirectory(path, currentDir);
-							}
+								key = target.shift();
 
-							/**
-							 *
-							 *
-							 * @param {String}
-							 * @param {String}
-							 */
-							function testDirectory(_path, _currentDir)
-							{
-								var _currentDirIsArray = Array.isArray(_currentDir);
-
-								// If the is a slash, we have a parent folder
-								var firstSlash = _path.indexOf('/');
-								if (firstSlash > -1)
+								if (target.length > 0)
 								{
-									var dir = _path.slice(0, firstSlash);
-									if (grunt.util._.has(_currentDir, dir) === false)
+									if (!child[key])
 									{
-										_currentDir[dir] = {};
+										child[key] = {};
 									}
-
-									currentDir = _currentDir[dir];
-									path = _path.slice(firstSlash + 1);
-									return true;
+									child = child[key];
+								}
+								else
+								{
+									child[key] = json; // add linted JSON
 								}
-
-								_currentDir[path] = fragment.json;
-								return false;
 							}
 						}
 						catch (e)
@@ -118,66 +100,66 @@ module.exports = function (grunt)
 				 * Reminder, if an folder-array is nested in a folder-array, only
 				 * the top level folder-array will get a name change, as the children
 				 * arrays will become nameless array index items.
-				 *
-				 * @param {Object} _obj
+				 * 
+				 * @method  convertCollections
+				 * @param {Object} json
 				 */
-				var convertArrayMarkedFolders = function (_obj)
+				var convertCollections = function(json)
 				{
-					if (typeof _obj !== 'object')
+					if (typeof json !== 'object')
 					{
 						return false;
 					}
-
-					for (var key in _obj)
+					for (var key in json)
 					{
-						convertArrayMarkedFolders(_obj[key]);
+						var contents = json[key];
+
+						// Send contents through recursively before doing
+						// the contents copy.
+						// The process removes all but the top level key.
+						convertCollections(contents);
+
 						// Check all keys for the folderArrayMarker
 						var indexOfMarker = key.indexOf(options.folderArrayMarker);
-						var folderIsArray = indexOfMarker > -1;
-						if (folderIsArray)
+						if (indexOfMarker > -1)
 						{
-							/* Send contents through recursively before doing
-							 * the contents copy.
-							 * The process removes all but the top level key. */
-							convertArrayMarkedFolders(_obj[key]);
-
-							var contents = _obj[key];
-							/* Push the values one by one of the original key
-							 * into a new fresh array who's key has the
-							 * folderArrayMarker removed from it */
+							// Push the values one by one of the original key
+							// into a new fresh array who's key has the
+							// folderArrayMarker removed from it
 							var keyWithoutMarker = key.slice(0, indexOfMarker);
-							_obj[keyWithoutMarker] = [];
+							json[keyWithoutMarker] = [];
+
 							for (var k in contents)
 							{
-								_obj[keyWithoutMarker].push(contents[k]);
+								json[keyWithoutMarker].push(contents[k]);
 							}
-
 							// Delete the original marker key.
-							delete _obj[key];
+							delete json[key];
 						}
 					}
 				};
 
-				convertArrayMarkedFolders(json);
+				// Fixed folders marked as arrays
+				convertCollections(output);
 
 				// Write object as new JSON
-				grunt.log.debug(
-					"writing JSON destination file \"" +
-					chalk.green(f.dest) +
-					"\"");
+				grunt.log.debug("Writing JSON destination file \"" + f.dest.green + "\"");
 
 				grunt.file.write(
 					f.dest,
-					JSON.stringify(json, options.replacer, options.space));
-
-				grunt.log.writeln("File \"" +
-					chalk.green(f.dest) +
-					"\" created.");
+					JSON.stringify(
+						output,
+						options.replacer, 
+						options.space
+					)
+				);
+
+				grunt.log.writeln("File \"" + f.dest.green + "\" created.");
 			}
 			catch (e)
 			{
 				grunt.fail.warn(e);
 			}
 		});
 	});
-};
+};