From 3df1f9c9d0cc92b596262c0220ecf529c7fbb858 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Tue, 4 Feb 2020 13:57:24 +0000
Subject: [PATCH] Extend jsontiddlers macro to generate unformatted output

---
 core/modules/macros/jsontiddlers.js                    | 7 ++++---
 core/modules/wiki.js                                   | 5 +++--
 editions/tw5.com/tiddlers/macros/JsonTiddlersMacro.tid | 4 +++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/modules/macros/jsontiddlers.js b/core/modules/macros/jsontiddlers.js
index d26d6f61f..735f02693 100644
--- a/core/modules/macros/jsontiddlers.js
+++ b/core/modules/macros/jsontiddlers.js
@@ -19,14 +19,15 @@ Information about this macro
 exports.name = "jsontiddlers";
 
 exports.params = [
-	{name: "filter"}
+	{name: "filter"},
+	{name: "spaces"}
 ];
 
 /*
 Run the macro
 */
-exports.run = function(filter) {
-	return this.wiki.getTiddlersAsJson(filter);
+exports.run = function(filter,spaces) {
+	return this.wiki.getTiddlersAsJson(filter,spaces);
 };
 
 })();
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 76bb056b3..fc8b42eda 100755
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -660,8 +660,9 @@ exports.getTiddlerAsJson = function(title) {
 	}
 };
 
-exports.getTiddlersAsJson = function(filter) {
+exports.getTiddlersAsJson = function(filter,spaces) {
 	var tiddlers = this.filterTiddlers(filter),
+		spaces = (spaces === undefined) ? $tw.config.preferences.jsonSpaces : spaces,
 		data = [];
 	for(var t=0;t<tiddlers.length; t++) {
 		var tiddler = this.getTiddler(tiddlers[t]);
@@ -673,7 +674,7 @@ exports.getTiddlersAsJson = function(filter) {
 			data.push(fields);
 		}
 	}
-	return JSON.stringify(data,null,$tw.config.preferences.jsonSpaces);
+	return JSON.stringify(data,null,spaces);
 };
 
 /*
diff --git a/editions/tw5.com/tiddlers/macros/JsonTiddlersMacro.tid b/editions/tw5.com/tiddlers/macros/JsonTiddlersMacro.tid
index 627ccfbac..5005e9e9c 100644
--- a/editions/tw5.com/tiddlers/macros/JsonTiddlersMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/JsonTiddlersMacro.tid
@@ -1,5 +1,5 @@
 created: 20150221152226000
-modified: 20150221154213000
+modified: 20200204135513721
 tags: Macros [[Core Macros]]
 title: jsontiddlers Macro
 type: text/vnd.tiddlywiki
@@ -13,3 +13,5 @@ An example can be seen in the [[template tiddler for JSON exports|$:/core/templa
 
 ;filter
 : A [[filter|Filters]] selecting which tiddlers to include
+;spaces
+: An optional number of spaces to use for formatting the JSON. Defaults to 4, with blank or zero resulting in packed JSON with no formatting spaces