mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-17 07:14:50 +00:00
Code Issues Releases Wiki Activity
574b90cf7a
TiddlyWiki5/editions/test/tiddlers/tests/test-wikitext-parser.js

267 lines
22 KiB
JavaScript
Raw Normal View History

Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
/*\
title: test-wikitext-parser.js
type: application/javascript
tags: [[$:/tags/test-spec]]
Tests for wikitext parser
\*/
(function(){
/*jslint node: true, browser: true */
/*global $tw: false */
"use strict";
describe("WikiText parser tests", function() {
// Create a wiki
var wiki = new $tw.Wiki();
// Define a parsing shortcut
var parse = function(text) {
Get rid of the "new_" prefix we had on some methods There's still the "old_" prefix to get rid of too.
2013-11-08 08:51:14 +00:00
return wiki.parseText("text/vnd.tiddlywiki",text).tree;
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
};
it("should parse tags", function() {
expect(parse("<br>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start : 0, end : 4, children : [ { type : 'element', tag : 'br', start : 0, end : 4, isBlock : false, attributes : { }, orderedAttributes: [ ] } ] } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
expect(parse("</br>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start : 0, end : 5, children : [ { type : 'text', text : '</br>', start : 0, end : 5 } ] } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
expect(parse("<div>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start : 0, end : 5, children : [ { type : 'element', tag : 'div', start : 0, end : 5, isBlock : false, attributes : { }, orderedAttributes: [ ], children : [ ] } ] } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
expect(parse("<div/>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start : 0, end : 6, children : [ { type : 'element', tag : 'div', isSelfClosing : true, isBlock : false, attributes : { }, orderedAttributes: [ ], start : 0, end : 6 } ] } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
expect(parse("<div></div>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start : 0, end : 11, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { }, orderedAttributes: [ ], children : [ ], start : 0, end : 5 } ] } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
expect(parse("<div>some text</div>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start : 0, end : 20, children : [ { type : 'element', tag : 'div', start : 0, end : 20, isBlock : false, attributes : { }, orderedAttributes: [ ], children : [ { type : 'text', text : 'some text', start : 5, end : 14 } ], start : 0, end : 5 } ] } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
expect(parse("<div attribute>some text</div>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start : 0, end : 30, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'string', value : 'true', start : 4, end : 14, name: 'attribute' } }, orderedAttributes: [ { type : 'string', value : 'true', start : 4, end : 14, name: 'attribute' } ], children : [ { type : 'text', text : 'some text', start : 15, end : 24 } ], start : 0, end : 15 } ] } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
expect(parse("<div attribute='value'>some text</div>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start : 0, end : 38, children : [ { type : 'element', tag : 'div', start: 0, end: 38, isBlock : false, attributes : { attribute : { type : 'string', name: 'attribute', value : 'value', start: 4, end: 22 } }, orderedAttributes: [ { type: 'string', name: 'attribute', value : 'value', start: 4, end: 22 } ], children : [ { type : 'text', text : 'some text', start : 23, end : 32 } ], start : 0, end : 23 } ] } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
expect(parse("<div attribute={{TiddlerTitle}}>some text</div>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start: 0, end: 47, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'indirect', name: 'attribute', textReference : 'TiddlerTitle', start : 4, end : 31 } }, orderedAttributes: [ { type : 'indirect', name: 'attribute', textReference : 'TiddlerTitle', start : 4, end : 31 } ], children : [ { type : 'text', text : 'some text', start : 32, end : 41 } ], start : 0, end : 32 } ] } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
expect(parse("<$reveal state='$:/temp/search' type='nomatch' text=''>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start: 0, end: 55, children : [ { type : 'reveal', tag: '$reveal', start : 0, attributes : { state : { start : 8, name : 'state', type : 'string', value : '$:/temp/search', end : 31 }, type : { start : 31, name : 'type', type : 'string', value : 'nomatch', end : 46 }, text : { start : 46, name : 'text', type : 'string', value : '', end : 54 } }, orderedAttributes: [ { start : 8, name : 'state', type : 'string', value : '$:/temp/search', end : 31 }, { start : 31, name : 'type', type : 'string', value : 'nomatch', end : 46 }, { start : 46, name : 'text', type : 'string', value : '', end : 54 } ], end : 55, isBlock : false, children : [ ] } ] } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
expect(parse("<div attribute={{TiddlerTitle!!field}}>some text</div>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start: 0, end: 54, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'indirect', name : 'attribute', textReference : 'TiddlerTitle!!field', start : 4, end : 38 } }, orderedAttributes: [ { type : 'indirect', name : 'attribute', textReference : 'TiddlerTitle!!field', start : 4, end : 38 } ], children : [ { type : 'text', text : 'some text', start : 39, end : 48 } ], start : 0, end : 39 } ] } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
Test for transcluding tiddler title containing spaces
2013-10-31 12:37:47 +00:00
);
expect(parse("<div attribute={{Tiddler Title!!field}}>some text</div>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start: 0, end: 55, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'indirect', name : 'attribute', textReference : 'Tiddler Title!!field', start : 4, end : 39 } }, orderedAttributes: [ { type : 'indirect', name : 'attribute', textReference : 'Tiddler Title!!field', start : 4, end : 39 } ], children : [ { type : 'text', text : 'some text', start : 40, end : 49 } ], start : 0, end : 40 } ] } ] } ]
Test for transcluding tiddler title containing spaces
2013-10-31 12:37:47 +00:00
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
Use double linebreaks to indicate content of a widget or html element should be parsed in block mode Fixes #82. The old behaviour was to parse the content of a widget or html element in block mode if the opening tag was followed by a line break. The new behaviour requires two line breaks. This makes it possible to include linebreaks more liberally within wikitext, although care must still be taken to only use double line breaks when the block mode behaviour is desired. The code change here is very simple, just a single line change in html.js. Most of the other changes are to convert various single line breaks into double line breaks.
2014-02-20 21:42:31 +00:00
expect(parse("<div attribute={{TiddlerTitle!!field}}>\n\nsome text</div>")).toEqual(
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', start : 0, attributes : { attribute : { start : 4, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 38 } }, orderedAttributes: [ { start : 4, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 38 } ], tag : 'div', end : 39, isBlock : true, children : [ { type : 'element', tag : 'p', start : 41, end : 50, children : [ { type : 'text', text : 'some text', start : 41, end : 50 } ] } ] } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
Use double linebreaks to indicate content of a widget or html element should be parsed in block mode Fixes #82. The old behaviour was to parse the content of a widget or html element in block mode if the opening tag was followed by a line break. The new behaviour requires two line breaks. This makes it possible to include linebreaks more liberally within wikitext, although care must still be taken to only use double line breaks when the block mode behaviour is desired. The code change here is very simple, just a single line change in html.js. Most of the other changes are to convert various single line breaks into double line breaks.
2014-02-20 21:42:31 +00:00
expect(parse("<div><div attribute={{TiddlerTitle!!field}}>\n\nsome text</div></div>")).toEqual(
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start: 0, end: 67, children : [ { type : 'element', start : 0, attributes : { }, orderedAttributes: [ ], tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 44, isBlock : true, children : [ { type : 'element', tag : 'p', start : 46, end : 55, children : [ { type : 'text', text : 'some text', start : 46, end : 55 } ] } ] } ] } ] } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
Use double linebreaks to indicate content of a widget or html element should be parsed in block mode Fixes #82. The old behaviour was to parse the content of a widget or html element in block mode if the opening tag was followed by a line break. The new behaviour requires two line breaks. This makes it possible to include linebreaks more liberally within wikitext, although care must still be taken to only use double line breaks when the block mode behaviour is desired. The code change here is very simple, just a single line change in html.js. Most of the other changes are to convert various single line breaks into double line breaks.
2014-02-20 21:42:31 +00:00
expect(parse("<div><div attribute={{TiddlerTitle!!field}}>\n\n!some heading</div></div>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start: 0, end: 71, children : [ { type : 'element', start : 0, attributes : { }, orderedAttributes: [ ], tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 44, isBlock : true, children : [ { type : 'element', tag : 'h1', attributes : { class : { type : 'string', value : '' } }, children : [ { type : 'text', text : 'some heading</div></div>', start : 47, end : 71 } ] } ] } ] } ] } ] } ]
Use double linebreaks to indicate content of a widget or html element should be parsed in block mode Fixes #82. The old behaviour was to parse the content of a widget or html element in block mode if the opening tag was followed by a line break. The new behaviour requires two line breaks. This makes it possible to include linebreaks more liberally within wikitext, although care must still be taken to only use double line breaks when the block mode behaviour is desired. The code change here is very simple, just a single line change in html.js. Most of the other changes are to convert various single line breaks into double line breaks.
2014-02-20 21:42:31 +00:00
);
expect(parse("<div><div attribute={{TiddlerTitle!!field}}>\n!some heading</div></div>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start: 0, end: 70, children : [ { type : 'element', start : 0, attributes : { }, orderedAttributes: [ ], tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 44, isBlock : false, children : [ { type : 'text', text : '\n!some heading', start : 44, end : 58 } ] } ] } ] } ] } ]
Use double linebreaks to indicate content of a widget or html element should be parsed in block mode Fixes #82. The old behaviour was to parse the content of a widget or html element in block mode if the opening tag was followed by a line break. The new behaviour requires two line breaks. This makes it possible to include linebreaks more liberally within wikitext, although care must still be taken to only use double line breaks when the block mode behaviour is desired. The code change here is very simple, just a single line change in html.js. Most of the other changes are to convert various single line breaks into double line breaks.
2014-02-20 21:42:31 +00:00
);
Fix for #3306, inline/block widget glitch (#5452) * Fix for #3306, inline/block widget glitch * Just realized we don't need to set lastIndex anymore * Forgot that parseBlocks doesn't use options
2021-01-29 14:57:30 +00:00
// Regression test for issue (#3306)
expect(parse("<div><span><span>\n\nSome text</span></span></div>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start: 0, end: 48, children : [ { type : 'element', start : 0, attributes : { }, orderedAttributes: [ ], tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : { }, orderedAttributes: [ ], tag : 'span', end : 11, isBlock : false, children : [ { type : 'element', start : 11, attributes : { }, orderedAttributes: [ ], tag : 'span', end : 17, isBlock : true, children : [ { type : 'element', tag : 'p', start : 19, end : 28, children : [ { type : 'text', text : 'Some text', start : 19, end : 28 } ] } ] } ] } ] } ] } ] } ]
Fix for #3306, inline/block widget glitch (#5452) * Fix for #3306, inline/block widget glitch * Just realized we don't need to set lastIndex anymore * Forgot that parseBlocks doesn't use options
2021-01-29 14:57:30 +00:00
);
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
});
it("should parse macro definitions", function() {
expect(parse("\\define myMacro()\nnothing\n\\end\n")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'set', attributes : { name : { type : 'string', value : 'myMacro' }, value : { type : 'string', value : 'nothing' } }, children : [ ], params : [ ], isMacroDefinition : true } ] } ]
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
);
Add "commentpragma" html style rule (#5726) * html-comment, that can be used in the pragma area * add commentpragma test * fix typo * fix typo and change comments ab bit * combine html-comment and pragma-comment and add some docs, how to use it * Make docs simpler by removing caching info * change h2 wording
2021-06-14 16:39:56 +00:00
});
Allow newlines within filtered transclusions (#6421) * Allow newlines within filtered transclusions * Docs
2022-02-21 15:28:21 +00:00
it("should parse comment in pragma area. Comment will be invisible", function() {
Add "commentpragma" html style rule (#5726) * html-comment, that can be used in the pragma area * add commentpragma test * fix typo * fix typo and change comments ab bit * combine html-comment and pragma-comment and add some docs, how to use it * Make docs simpler by removing caching info * change h2 wording
2021-06-14 16:39:56 +00:00
expect(parse("<!-- comment in pragma area -->\n\\define aMacro()\nnothing\n\\end\n")).toEqual(
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'set', attributes : { name : { type : 'string', value : 'aMacro' }, value : { type : 'string', value : 'nothing' } }, children : [ ], params : [ ], isMacroDefinition : true } ] } ]
Add "commentpragma" html style rule (#5726) * html-comment, that can be used in the pragma area * add commentpragma test * fix typo * fix typo and change comments ab bit * combine html-comment and pragma-comment and add some docs, how to use it * Make docs simpler by removing caching info * change h2 wording
2021-06-14 16:39:56 +00:00
);
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
});
Allow newlines within filtered transclusions (#6421) * Allow newlines within filtered transclusions * Docs
2022-02-21 15:28:21 +00:00
it("should block mode filtered transclusions", function() {
expect(parse("{{{ filter }}}")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'list', attributes: { filter: { type: 'string', value: ' filter ' } }, isBlock: true } ] } ]
Allow newlines within filtered transclusions (#6421) * Allow newlines within filtered transclusions * Docs
2022-02-21 15:28:21 +00:00
);
expect(parse("{{{ fil\nter }}}")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'list', attributes: { filter: { type: 'string', value: ' fil\nter ' } }, isBlock: true } ] } ]
Allow newlines within filtered transclusions (#6421) * Allow newlines within filtered transclusions * Docs
2022-02-21 15:28:21 +00:00
);
});
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
it("should parse inline macro calls", function() {
Fixed problem with greedy regexp for macrocalls It was preventing this from working: ``` <<macro>><<bacrp>><<sdf>><<qweqwe>> ```
2013-11-17 21:53:12 +00:00
expect(parse("<<john>><<paul>><<george>><<ringo>>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'element', tag: 'p', start: 0, end: 35, children: [ { type: 'macrocall', start: 0, params: [ ], name: 'john', end: 8 }, { type: 'macrocall', start: 8, params: [ ], name: 'paul', end: 16 }, { type: 'macrocall', start: 16, params: [ ], name: 'george', end: 26 }, { type: 'macrocall', start: 26, params: [ ], name: 'ringo', end: 35 } ] } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
expect(parse("text <<john one:val1 two: 'val \"2\"' three: \"val '3'\" four: \"\"\"val 4\"5'\"\"\" five: [[val 5]] >>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[{ type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'element', tag: 'p', start: 0, end: 92, children: [ { type: 'text', text: 'text ', start: 0, end: 5 }, { type: 'macrocall', name: 'john', start: 5, params: [ { type: 'macro-parameter', start: 11, value: 'val1', name: 'one', end: 20 }, { type: 'macro-parameter', start: 20, value: 'val "2"', name: 'two', end: 35 }, { type: 'macro-parameter', start: 35, value: 'val \'3\'', name: 'three', end: 52 }, { type: 'macro-parameter', start: 52, value: 'val 4"5\'', name: 'four', end: 73 }, { type: 'macro-parameter', start: 73, value: 'val 5', name: 'five', end: 89 } ], end: 92 } ] } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
expect(parse("ignored << carrots <<john>>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'element', tag: 'p', start: 0, end: 27, children: [ { type: 'text', text: 'ignored << carrots ', start: 0, end: 19 }, { type: 'macrocall', name: 'john', start: 19, params: [ ], end: 27 } ] } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
expect(parse("text <<<john>>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'element', tag: 'p', start: 0, end: 14, children: [ { type: 'text', text: 'text ', start: 0, end: 5 }, { type: 'macrocall', name: '<john', start: 5, params: [ ], end: 14 } ] } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
expect(parse("before\n<<john>>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'element', tag: 'p', start: 0, end: 15, children: [ { type: 'text', text: 'before\n', start: 0, end: 7 }, { type: 'macrocall', start: 7, params: [ ], name: 'john', end: 15 } ] } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
// A single space will cause it to be inline
expect(parse("<<john>> ")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'element', tag: 'p', start: 0, end: 9, children: [ { type: 'macrocall', start: 0, params: [ ], name: 'john', end: 8 }, { type: 'text', text: ' ', start: 8, end: 9 } ] } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
expect(parse("text <<outie one:'my <<innie>>' >>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'element', tag: 'p', start: 0, end: 34, children: [ { type: 'text', text: 'text ', start: 0, end: 5 }, { type: 'macrocall', start: 5, params: [ { type: 'macro-parameter', start: 12, value: 'my <<innie>>', name: 'one', end: 31 } ], name: 'outie', end: 34 } ] } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
});
it("should parse block macro calls", function() {
expect(parse("<<john>>\n<<paul>>\r\n<<george>>\n<<ringo>>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'macrocall', start: 0, name: 'john', params: [ ], end: 8, isBlock: true }, { type: 'macrocall', start: 9, name: 'paul', params: [ ], end: 17, isBlock: true }, { type: 'macrocall', start: 19, name: 'george', params: [ ], end: 29, isBlock: true }, { type: 'macrocall', start: 30, name: 'ringo', params: [ ], end: 39, isBlock: true } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
expect(parse("<<john one:val1 two: 'val \"2\"' three: \"val '3'\" four: \"\"\"val 4\"5'\"\"\" five: [[val 5]] >>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'macrocall', start: 0, name: 'john', params: [ { type: 'macro-parameter', start: 6, value: 'val1', name: 'one', end: 15 }, { type: 'macro-parameter', start: 15, value: 'val "2"', name: 'two', end: 30 }, { type: 'macro-parameter', start: 30, value: 'val \'3\'', name: 'three', end: 47 }, { type: 'macro-parameter', start: 47, value: 'val 4"5\'', name: 'four', end: 68 }, { type: 'macro-parameter', start: 68, value: 'val 5', name: 'five', end: 84 }], end: 87, isBlock: true } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
expect(parse("<< carrots\n\n<<john>>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'element', tag: 'p', start : 0, end : 10, children: [ { type: 'text', text: '<< carrots', start : 0, end : 10 } ] }, { type: 'macrocall', start: 12, params: [ ], name: 'john', end: 20, isBlock: true } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
expect(parse("before\n\n<<john>>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'element', tag: 'p', start : 0, end : 6, children: [ { type: 'text', text: 'before', start : 0, end : 6 } ] }, { type: 'macrocall', start: 8, name: 'john', params: [ ], end: 16, isBlock: true } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
expect(parse("<<john>>\nafter")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'macrocall', start: 0, name: 'john', params: [ ], end: 8, isBlock: true }, { type: 'element', tag: 'p', start: 9, end: 14, children: [ { type: 'text', text: 'after', start: 9, end: 14 } ] } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
expect(parse("<<multiline arg:\"\"\"\n\nwikitext\n\"\"\" >>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'macrocall', start: 0, params: [ { type: 'macro-parameter', start: 11, value: '\n\nwikitext\n', name: 'arg', end: 33 } ], name: 'multiline', end: 36, isBlock: true } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
expect(parse("<<outie one:'my <<innie>>' >>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'macrocall', start: 0, params: [ { type: 'macro-parameter', start: 7, value: 'my <<innie>>', name: 'one', end: 26 } ], name: 'outie', end: 29, isBlock: true } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
});
it("should parse tricky macrocall parameters", function() {
expect(parse("<<john pa>am>>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'macrocall', start: 0, params: [ { type: 'macro-parameter', start: 6, value: 'pa>am', end: 12 } ], name: 'john', end: 14, isBlock: true } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
expect(parse("<<john param> >>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'macrocall', start: 0, params: [ { type: 'macro-parameter', start: 6, value: 'param>', end: 13 } ], name: 'john', end: 16, isBlock: true } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
expect(parse("<<john param>>>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'element', tag: 'p', start: 0, end: 15, children: [ { type: 'macrocall', start: 0, params: [ { type: 'macro-parameter', start: 6, value: 'param', end: 12 } ], name: 'john', end: 14 }, { type: 'text', text: '>', start: 14, end: 15 } ] } ] } ]
Wikirules now use better macrocall parser (#5451) * wikirules now use better macrocall parser Before, wikirules would use a deficient macrocall parser which couldn't handle certain types of arguments. Now it uses the same one that the widget parser uses. Less code! * style changes and removing weird switch statement That switch statement made more sense in an earlier iteration. * comment improvements * oops, wikirule macrocalls could do ONE thing better * '=' wasn't allowed for widget macros, but why? Now they're allowed for both widget macros and macrocall macros.
2021-01-29 13:26:31 +00:00
);
// equals signs should be allowed
expect(parse("<<john var>=4 >>")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type: 'macrocall', start: 0, params: [ { type: 'macro-parameter', start: 6, value: 'var>=4', end: 13 } ], name: 'john', end: 16, isBlock: true } ] } ]
Fixed problem with greedy regexp for macrocalls It was preventing this from working: ``` <<macro>><<bacrp>><<sdf>><<qweqwe>> ```
2013-11-17 21:53:12 +00:00
);
});
Add a failing test for @Skeeve's upcoming #307
2013-12-30 11:45:18 +00:00
it("should parse horizontal rules", function() {
expect(parse("---Not a rule\n\n----\n\nBetween\n\n---")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', start : 0, end : 13, children : [ { type : 'entity', entity : '&mdash;' }, { type : 'text', text : 'Not a rule', start : 3, end : 13 } ] }, { type : 'element', tag : 'hr' }, { type : 'element', tag : 'p', start : 21, end : 28, children : [ { type : 'text', text : 'Between', start : 21, end : 28 } ] }, { type : 'element', tag : 'hr' } ] } ]
Add a failing test for @Skeeve's upcoming #307
2013-12-30 11:45:18 +00:00
);
});
Add parser rule for hard linebreaks
2013-12-14 17:05:57 +00:00
it("should parse hard linebreak areas", function() {
expect(parse("\"\"\"Something\nin the\nway she moves\n\"\"\"\n\n")).toEqual(
Initial Commit
2023-01-05 10:55:35 +00:00
[ { type : 'set', attributes : { name : { type : 'string', value : 'thisTiddler' }, value : { type : 'string', value : '' } }, children : [ { type : 'element', tag : 'p', children : [ { type : 'text', text : 'Something', start : 3, end : 12 }, { type : 'element', tag : 'br' }, { type : 'text', text : 'in the', start : 13, end : 19 }, { type : 'element', tag : 'br' }, { type : 'text', text : 'way she moves', start : 20, end : 33 }, { type : 'element', tag : 'br' } ], start : 0, end : 37 } ] } ]
Add parser rule for hard linebreaks
2013-12-14 17:05:57 +00:00
);
});
Separate the wikitext parser tests into their own file
2013-07-03 15:01:01 +00:00
});
})();
Reference in New Issue Copy Permalink