feat: list

core/modules/parsers/wikiparser/rules/import.js

@@ -51,11 +51,11 @@ exports.parse = function() {
 	}];
 };
 
-exports.serialize = function(tree) {
+exports.serialize = function(tree,serialize) {
 	// Filter attribute
 	var filter = tree.attributes.filter.value;
-	// Construct the serialized string
-	return "\\import " + filter;
+	// Construct the serialized string with children that is actually the sibling below the pragma.
+	return "\\import " + filter + "\n" + serialize(tree.children);
 };
 
 })();

core/modules/parsers/wikiparser/rules/list.js

@@ -153,28 +153,54 @@ exports.parse = function() {
 	return [listStack[0]];
 };
 
-exports.serialize = function(tree, serialize) {
-	// Serialize the list recursively
-	return serializeList(tree, serialize, 0);
+exports.serialize = function (tree, serialize) {
+	// Helper function to find the marker for a given list container tag and item tag
+	function findMarker(listTag, itemTag) {
+		for(var key in listTypes) {
+			if(listTypes[key].listTag === listTag && listTypes[key].itemTag === itemTag) {
+				return key; // Return the marker associated with the list tag and item tag
+			}
+		}
+		return ''; // Return empty string if no matching marker is found
+	}
+
+	// Recursive function to serialize list nodes, handling nested lists and formatting output
+	function serializeList(node, markerPrefix) {
+		var result = [];
+		if(node.type === 'element' && ['ul', 'ol', 'dl', 'blockquote'].includes(node.tag)) {
+			node.children.forEach(function (child) {
+				if(['li', 'dt', 'dd', 'div'].includes(child.tag)) {
+					var currentMarker = findMarker(node.tag, child.tag);
+					// Handle class attributes
+					var classAttr = child.attributes && child.attributes.class ? '.' + child.attributes.class.value : '';
+					// same level text nodes may be split into multiple children, and separated by deeper list sub-tree. We collect same level text nodes into this list, and concat then submit them before enter deeper list.
+					var content = [];
+					$tw.utils.each(child.children,function (subNode) {
+						// Check if the child is a nested list or a simple line of list item
+						if(['ul', 'ol', 'dl', 'blockquote'].includes(subNode.tag)) {
+							// Recursive call for nested lists
+							if(content.length > 0) {
+								result.push(markerPrefix + currentMarker + classAttr + ' ' + content.join('').trim());
+								content = []
+							}
+							result.push(serializeList(subNode, markerPrefix + currentMarker).trim())
+						} else {
+							content.push(serialize(subNode)) ;
+						}
+						return ''; // Default return for unhandled node types
+					});
+					if(content.length > 0) {
+						result.push(markerPrefix + currentMarker + classAttr + ' ' + content.join('').trim());
+						content = []
+					}
+				}
+			});
+		}
+		return result.join('\n');
+	}
+
+	// Begin serialization from the root node, with an empty string as the initial marker prefix
+	return serializeList(tree, '') + '\n\n';
 };
 
-// utility to handle recursion of list
-function serializeList(node, serialize, depth) {
-	// List tag
-	var listTag = node.tag;
-	// List item tag
-	var itemTag = listTypes[listTag[0]].itemTag;
-	// Serialized list items
-	var items = node.children.map(function(child) {
-			// Classes
-			var classes = child.attributes && child.attributes.class ? child.attributes.class.value.split(" ").join(".") : "";
-			// Serialized children
-			var children = serialize(child.children);
-			// Construct the serialized list item
-			return Array(depth + 1).join(listTag[0]) + (classes ? "." + classes : "") + " " + children;
-	}).join("\n");
-	// Return the serialized list
-	return items;
-}
-
 })();

editions/test/tiddlers/tests/test-wikitext-serialize.js

@@ -213,11 +213,10 @@ describe('WikiAST serialization unit tests', function () {
     var serialized = $tw.utils.serializeParseTree(wiki.parseTiddler('ImageTest').tree).trimEnd();
     expect(serialized).toBe(wiki.getTiddlerText('ImageTest').trimEnd());
   });
-  return;
 
   wiki.addTiddler({
     title: 'ImportTest',
-    text: '\\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]',
+    text: '\\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]\n\\import [[$:/core/ui/PageMacros]]',
   });
   it('should serialize import pragma correctly', function () {
     var serialized = $tw.utils.serializeParseTree(wiki.parseTiddler('ImportTest').tree).trimEnd();
@@ -232,6 +231,7 @@ describe('WikiAST serialization unit tests', function () {
     var serialized = $tw.utils.serializeParseTree(wiki.parseTiddler('ListTest').tree).trimEnd();
     expect(serialized).toBe(wiki.getTiddlerText('ListTest').trimEnd());
   });
+  return;
 
   wiki.addTiddler({
     title: 'MacroCallBlockTest',