mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-07-05 11:32:50 +00:00
Code Issues Releases Wiki Activity

feat: transcludeblock

Browse Source
This commit is contained in:
lin onetwo 2024-08-10 01:31:43 +08:00
parent 3cf93d08e5
commit 589241a406
2 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
core/modules/parsers/wikiparser/rules/transcludeblock.js
View File

@ -87,37 +87,53 @@ exports.parse = function() {
}; };
exports.serialize = function(tree, serialize) { exports.serialize = function(tree, serialize) {
var serialized = "{{"; var result = "{{";
// Check for tiddler attribute function handleTransclude(transcludeNode) {
if(tree.attributes.$tiddler) { // Handle field
serialized += tree.attributes.$tiddler.value; if(transcludeNode.attributes.$field) {
// Check for field attribute result += "!!" + transcludeNode.attributes.$field.value;
if(tree.attributes.$field) {
serialized += "##" + tree.attributes.$field.value;
} }
// Check for index attribute // Check for index attribute
if(tree.attributes.$index) { if(transcludeNode.attributes.$index) {
serialized += "!!" + tree.attributes.$index.value; result += "##" + transcludeNode.attributes.$index.value;
} }
} // Handle template
// Check for template attribute var tiddlerTitle = tree.attributes.tiddler ? tree.attributes.tiddler.value : undefined;
if(tree.attributes.$template) { if(transcludeNode.attributes.$tiddler && transcludeNode.attributes.$tiddler.value !== tiddlerTitle) {
serialized += "||" + tree.attributes.$template.value; result += "||" + transcludeNode.attributes.$tiddler.value;
} }
// Check for parameters // Check for parameters
var params = []; var params = [];
for(var key in tree.attributes) { var excludedAttributes = ["tiddler", "$tiddler", "$field", "$index", "$template"];
if(key !== "$tiddler" && key !== "$field" && key !== "$index" && key !== "$template") { for(var key in transcludeNode.attributes) {
params.push(tree.attributes[key].value); if(excludedAttributes.indexOf(key) === -1) {
params.push(transcludeNode.attributes[key].value);
} }
} }
if(params.length > 0) { if(params.length > 0) {
serialized += "|" + params.join("|"); result += "|" + params.join("|");
} }
// Close the serialized string }
serialized += "}}"; function handleTiddler(tiddlerNode) {
// Return the complete serialized string // Check for tiddler attribute
return serialized; if(tree.attributes.tiddler.value) {
result += tree.attributes.tiddler.value;
}
$tw.utils.each(tree.children, function(child) {
if(child.type === "transclude") {
handleTransclude(child);
}
});
}
if(tree.type === "tiddler") {
handleTiddler(tree);
} else if(tree.type === "transclude") {
handleTransclude(tree);
}
// Close the result string
result += "}}\n\n";
// Return the complete result string
return result;
}; };
})(); })();

6
editions/test/tiddlers/tests/test-wikitext-serialize.js
View File

@ -354,11 +354,10 @@ describe("WikiAST serialization unit tests", function () {
var serialized = $tw.utils.serializeParseTree(wiki.parseTiddler("TableTest").tree).trimEnd(); var serialized = $tw.utils.serializeParseTree(wiki.parseTiddler("TableTest").tree).trimEnd();
expect(serialized).toBe(wiki.getTiddlerText("TableTest").trimEnd()); expect(serialized).toBe(wiki.getTiddlerText("TableTest").trimEnd());
}); });
return;
wiki.addTiddler({ wiki.addTiddler({
title: "TranscludeBlockTest", title: "TranscludeBlockTest",
text: "{{MyTiddler}}\n{{MyTiddler||TemplateTitle}}", text: "{{MyTiddler}}\n\n{{MyTiddler||TemplateTitle}}\n\n{{||TemplateTitle}}\n\n{{MyTiddler|Parameter}}\n\n{{MyTiddler||TemplateTitle|Parameter|SecondParameter}}\n\n{{MyTiddler!!field}}\n\n{{!!field}}\n\n{{MyTiddler##index}}\n\n{{##index}}",
}); });
it("should serialize block-level transclusions correctly", function () { it("should serialize block-level transclusions correctly", function () {
var serialized = $tw.utils.serializeParseTree(wiki.parseTiddler("TranscludeBlockTest").tree).trimEnd(); var serialized = $tw.utils.serializeParseTree(wiki.parseTiddler("TranscludeBlockTest").tree).trimEnd();
@ -367,12 +366,13 @@ describe("WikiAST serialization unit tests", function () {
wiki.addTiddler({ wiki.addTiddler({
title: "TranscludeInlineTest", title: "TranscludeInlineTest",
text: "{{MyTiddler}}\n{{MyTiddler||TemplateTitle}}", text: "{{MyTiddler}} {{MyTiddler||TemplateTitle}}",
}); });
it("should serialize inline-level transclusions correctly", function () { it("should serialize inline-level transclusions correctly", function () {
var serialized = $tw.utils.serializeParseTree(wiki.parseTiddler("TranscludeInlineTest").tree).trimEnd(); var serialized = $tw.utils.serializeParseTree(wiki.parseTiddler("TranscludeInlineTest").tree).trimEnd();
expect(serialized).toBe(wiki.getTiddlerText("TranscludeInlineTest").trimEnd()); expect(serialized).toBe(wiki.getTiddlerText("TranscludeInlineTest").trimEnd());
}); });
return;
wiki.addTiddler({ wiki.addTiddler({
title: "TypedBlockTest", title: "TypedBlockTest",