Improving data serialization and making it more diff friendly.

repository/TiddlyWiki/Tiddler.class.st

@@ -50,8 +50,13 @@ Tiddler >> asDictionary [
 ]
 
 { #category : 'converting' }
-Tiddler >> asJson [ 
-	^ STONJSON toStringPretty: self asDictionary 
+Tiddler >> asJson [
+	^ STON toStringPretty: { self asDictionary }
+]
+
+{ #category : 'converting' }
+Tiddler >> asJsonString [ 
+	^ STONJSON toStringPretty:  self asDictionary 
 ]
 
 { #category : 'accessing' }
@@ -60,6 +65,20 @@ Tiddler >> asJsonTempFile [
 		
 ]
 
+{ #category : 'accessing' }
+Tiddler >> asStonStringPretty [
+	| output temp |
+	temp := self.
+	temp wiki: nil.
+	output := '' writeStream.
+	(STON writer on: output)
+		newLine: String crlf;	
+    	prettyPrint: true;
+		keepNewLines: true;
+    	nextPut: temp.
+	^ output contents
+]
+
 { #category : 'accessing' }
 Tiddler >> bag [
 	^ bag

repository/TiddlyWiki/TiddlyWiki.class.st

@@ -16,9 +16,15 @@ Class {
 
 { #category : 'accessing' }
 TiddlyWiki >> exportSTONTiddlersFile [
-	| stonFile |
+	| stonFile output |
 	stonFile := self tiddlersJSONFile withoutExtension, 'ston'.
-	^ MarkupFile exportAsFileOn: stonFile containing:(STON toStringPretty: self) 
+	output := '' writeStream.
+	(STON writer on: output )
+		newLine: String lf;	
+    	prettyPrint: true;
+		keepNewLines: true;
+    	nextPut: self. 
+	^ MarkupFile exportAsFileOn: stonFile containing:self 
 ]
 
 { #category : 'accessing' }