feat: serialize AST node back to wikitext string#8258
Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
|
First line is wrapped by a p element, but I haven't find the rule that produce the p element. And there was no p html in the source, so I may need to add some attribute to ast to show this p element is "fake". Anyway, this is just a demo for API, do you like the API name and their usage? The further task is just adding |
IMO the current parser has a "systemic" problem with redundant P-tags, that we probably may need to solve first. Working around this problem with "fake" elements will just increase your code complexity, instead of solving the underlaying problem. It will also create an other dependency, that will make solving the problem, in the core, in backwards compatible way even harder as it is now. |
Can't remove then, many of my plugin style sheet is already depending on this structure. And Another option is handle it like text node, regard it as a special case. |
That's true, but we do have a lot of |
|
Handle the block rule by adding a I've added some test for it. |
📊 Build Size Comparison:
|
| Branch | Size |
|---|---|
| Base (master) | 2423.3 KB |
| PR | 2426.2 KB |
Diff: ⬆️ Increase: +2.9 KB
Jermolene
left a comment
There was a problem hiding this comment.
Thank you @linonetwo for your dedicated work on this PR for so long. These are very useful changes, and the implementation is exemplary. I appreciate that you addressed my feedback several months ago, and it is unfortunate that there has been such long wait before we could commit changes for v5.4.0.
There’s a minor point below, and then once the feedback of @saqimtiaz has been addressed I’ll be able to merge this PR.
Co-authored-by: Jeremy Ruston <jeremy@jermolene.com>
📊 Build Size Comparison:
|
| Branch | Size |
|---|---|
| Base (master) | 2423.3 KB |
| PR | 2426.2 KB |
Diff: ⬆️ Increase: +2.9 KB
📊 Build Size Comparison:
|
| Branch | Size |
|---|---|
| Base (master) | 2423.3 KB |
| PR | 2426.2 KB |
Diff: ⬆️ Increase: +2.9 KB
There was a problem hiding this comment.
@linonetwo this looks good, thank you for all of your work on this and for your patience.
@Jermolene this looks good from my perspective.
|
Great stuff, thank you @linonetwo. |
|
Cool, thanks for review, being careful is right. |
* refactor: extract a new $tw.wiki.getParser * feat: allow $tw.utils.getParseTreeText to render other rules' text * feat: two example getText handler * Revert "feat: allow $tw.utils.getParseTreeText to render other rules' text" This reverts commit 8a12498. * refactor: keep original getParseTreeText not touched * refactor: use serialize in rules * refactor: $tw.utils.extend({},options) -> options || {} * Update codeinline.js * Create test-wikitext-serialize.js * DEBUG: only run my tests for development, remove before PR merge * lint: if * feat: add rule: 'parseBlock' metadata * feat: handle tailing \n that may be missing * feat: allow recursive * feat: generate more rule and tests * feat: generate more rule and tests * fix: remove pragma:true, otherwise following text will become children of it * fix: condition manually Deekseek is silly * fix: some test * fix: some test * feat: $tw.utils.serializeAttribute * fix: use "" for string param * feat: list * refactor: ' -> " * fix: parsemode don't have node * fix: render invisible comment and parsemode as data element * feat: add void: true, in ast node to prevent render * feat: use void widget, so methods always return a widget * feat: ast to use new widget type void * test: add rule: 'parseBlock' and isRuleEnd: true * lint: quote * Update widget.js * fix: void node need to handle its children * Update test-wikitext-parser.js * lint: quote * Update void.js * Update test-wikitext-parser.js * fix: macrodef with comment (void node) not working * lint: ' -> " * feat: add to styleblock * feat: styleblock * feat: styleinline * Update table.js * lint: useless comments * feat: transcludeblock * refactor: reuse block on inline when possible * feat: use void node to carry important info for typedblock * feat: run all tests * lint: useless ai generated comments * Update conditional.js to not include space * Update test-wikitext-serialize.js * Update conditional.js * refactor: move tiddlers to /data * refactor: no need for new $tw.Wiki() * lint: double quote * refactor: lowercase the parseblock rule name * fix: Wiki parser initialize blockRuleClasses only when first new an instance * feat: restore inline macro def * fix: macro in widget param * fix: positional attribute in macro call * fix: table space and horizrule block new line * feat: make sure block rule all have \n\n for visiblity * lint: function param * fix: empty list item * feat: add \n\n based on isBlock, if could also be inline * fix: conditional without elseif * refactor: use isBlock in macrodef to know inline or block * fix: link may not have attribute and children * DEBUG: render result and diff below body only on browser DEBUG: render result below body only on browser DEBUG: render result below body DEBUG: fix build DEBUG: show render result as ViewTemplate * fix: remove pad space in /> * test: remove pad space in /> * Revert DEBUG: render result and diff below body only on browser * refactor: fold commentText variable * refactor: fold long comment * fix: double quotes for parameter values * Update void.js * refactor: move all exports.serialize = function(tree,serialize) { to plugin * fix: expost listTypes from core, and require it in plugin * refactor: move serializeWikitextParseTree to plugin and init it * refactor: move serializeAttribute util also to the plugin * fix: Delete unused file * Update macrodef.js * Update test-wikitext-parser.js * lint: fix * Update plugins/tiddlywiki/wikitext-serialize/rules/filteredtranscludeblock.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update core/modules/widgets/void.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update plugins/tiddlywiki/wikitext-serialize/rules/list.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update plugins/tiddlywiki/wikitext-serialize/rules/list.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update plugins/tiddlywiki/wikitext-serialize/rules/styleblock.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Remove unused methods from VoidNodeWidget Deleted render, execute, and refresh methods from VoidNodeWidget as they are no longer needed. The widget now only inherits from the base Widget class and exports the constructor. * docs: about regex in styleinline.js * Update parsetree.js * Update core/modules/widgets/void.js Co-authored-by: Jeremy Ruston <jeremy@jermolene.com> * feat: Ensure at least one space after the style/class --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Jeremy Ruston <jeremy@jermolene.com>
|
Should this be merged into core? Separated as it is, it won't stay synchronized. It's already appears to be out of date, since it doesn't have a mvvdisplayinline rule. If the serialize rules are right there inside the wikirule modules, then this won't be a problem going forward. Also, plugins like Relink can't take advantage of this unless end-users include this plugin too. Edit: Actually, nvm. This won't work for Relink anyway, so I've no need for it to be in core. |
|
I think, this PR started before MVVs have been a thing. There are even more elements where they have not been fully implemented. From my point of view MVV development is not finished yet. There has been an experimental PR that was rejected. It contained more MVV related changes. The process is not finished yet. |
|
Anyone could just at me when you have trouble implementing the serialization rule. Me and my AI slaves are always willing to help, as long as I'm still using TiddyWiki. I understand you may forget or don't want to do this unnecessary extra step. |

closes #8255
Currently just a demo, I will gradually move code from https://github.com/tiddly-gittly/wikiast/tree/master/packages/wikiast-util-to-wikitext to here.
Try it with tiddler (Well, if official website have share plugin installed, I can put a link here):
and run this in console: