feat(ExtendedToken): support template files on Windows

bhsd-harry · Sep 16, 2024 · fa141ea · fa141ea
1 parent 61067bd
commit fa141ea
Show file tree

Hide file tree

Showing 66 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## v1.12.8
+
+*2024-09-16*
+
+**Fixed**
+
+- [`Token.prototype.expand`](https://github.com/bhsd-harry/wikiparser-node/wiki/Token#expand) now supports file names containing `꞉` as a substitute for `:` in a Windows file system
+
 ## v1.12.7
 
 *2024-08-24*

diff --git a/addon/token.ts b/addon/token.ts
@@ -251,7 +251,7 @@ const expand = (
 					} else if (!path.isAbsolute(Parser.templateDir)) {
 						Parser.templateDir = path.join(__dirname, '..', '..', Parser.templateDir);
 					}
-					const titles = [title, title.replaceAll('_', ' ')],
+					const titles = [title, title.replaceAll('_', ' ')].flatMap(tt => [tt, tt.replaceAll(':', '꞉')]),
 						file = ['.wiki', '.txt', '']
 							.flatMap(ext => titles.map(tt => path.join(Parser.templateDir!, tt + ext)))
 							.find(fs.existsSync);

diff --git a/package.json b/package.json
@@ -48,14 +48,14 @@
 		"chalk": "^4.1.2"
 	},
 	"devDependencies": {
-		"@bhsd/common": "^0.0.0",
+		"@bhsd/common": "^0.1.0",
 		"@codemirror/lint": "^6.8.0",
 		"@types/node": "^20.11.6",
 		"codejar-async": "^4.2.0",
 		"monaco-editor": "^0.51.0",
 		"v8r": "^3.0.0"
 	},
 	"engines": {
-		"node": "^20.9.0"
+		"node": ">=20.9.0"
 	}
 }
diff --git a/test/templates/MediaWiki:Fake.wiki → test/templates/MediaWiki꞉Fake.wiki b/test/templates/MediaWiki:Fake.wiki → test/templates/MediaWiki꞉Fake.wiki
diff --git a/test/templates/Template:''.wiki → test/templates/Template꞉''.wiki b/test/templates/Template:''.wiki → test/templates/Template꞉''.wiki
diff --git a/test/templates/Template:1x.wiki → test/templates/Template꞉1x.wiki b/test/templates/Template:1x.wiki → test/templates/Template꞉1x.wiki
diff --git a/test/templates/Template:1x_with_div.wiki → test/templates/Template꞉1x_with_div.wiki b/test/templates/Template:1x_with_div.wiki → test/templates/Template꞉1x_with_div.wiki
diff --git a/test/templates/Template:=.wiki → test/templates/Template꞉=.wiki b/test/templates/Template:=.wiki → test/templates/Template꞉=.wiki
diff --git a/test/templates/Template:Blank.wiki → test/templates/Template꞉Blank.wiki b/test/templates/Template:Blank.wiki → test/templates/Template꞉Blank.wiki
diff --git a/test/templates/Template:Blank_param.wiki → test/templates/Template꞉Blank_param.wiki b/test/templates/Template:Blank_param.wiki → test/templates/Template꞉Blank_param.wiki
diff --git a/test/templates/Template:Bullet.wiki → test/templates/Template꞉Bullet.wiki b/test/templates/Template:Bullet.wiki → test/templates/Template꞉Bullet.wiki
diff --git a/test/templates/Template:Complextemplate.wiki → test/templates/Template꞉Complextemplate.wiki b/test/templates/Template:Complextemplate.wiki → test/templates/Template꞉Complextemplate.wiki
diff --git a/test/templates/Template:Dangerous.wiki → test/templates/Template꞉Dangerous.wiki b/test/templates/Template:Dangerous.wiki → test/templates/Template꞉Dangerous.wiki
diff --git a/...mplates/Template:Dangerous_attribute.wiki → ...mplates/Template꞉Dangerous_attribute.wiki b/...mplates/Template:Dangerous_attribute.wiki → ...mplates/Template꞉Dangerous_attribute.wiki
diff --git a/...s/Template:Dangerous_style_attribute.wiki → ...s/Template꞉Dangerous_style_attribute.wiki b/...s/Template:Dangerous_style_attribute.wiki → ...s/Template꞉Dangerous_style_attribute.wiki
diff --git a/test/templates/Template:Div_style.wiki → test/templates/Template꞉Div_style.wiki b/test/templates/Template:Div_style.wiki → test/templates/Template꞉Div_style.wiki
diff --git a/test/templates/Template:Emptytemplate.wiki → test/templates/Template꞉Emptytemplate.wiki b/test/templates/Template:Emptytemplate.wiki → test/templates/Template꞉Emptytemplate.wiki
diff --git a/test/templates/Template:Foo.wiki → test/templates/Template꞉Foo.wiki b/test/templates/Template:Foo.wiki → test/templates/Template꞉Foo.wiki
diff --git a/test/templates/Template:Foo–bar.wiki → test/templates/Template꞉Foo–bar.wiki b/test/templates/Template:Foo–bar.wiki → test/templates/Template꞉Foo–bar.wiki
diff --git a/test/templates/Template:Identical.wiki → test/templates/Template꞉Identical.wiki b/test/templates/Template:Identical.wiki → test/templates/Template꞉Identical.wiki
diff --git a/test/templates/Template:Image_attribs.wiki → test/templates/Template꞉Image_attribs.wiki b/test/templates/Template:Image_attribs.wiki → test/templates/Template꞉Image_attribs.wiki
diff --git a/...mplates/Template:Includeonly_section.wiki → ...mplates/Template꞉Includeonly_section.wiki b/...mplates/Template:Includeonly_section.wiki → ...mplates/Template꞉Includeonly_section.wiki
diff --git a/test/templates/Template:Includes.wiki → test/templates/Template꞉Includes.wiki b/test/templates/Template:Includes.wiki → test/templates/Template꞉Includes.wiki
diff --git a/test/templates/Template:Includes2.wiki → test/templates/Template꞉Includes2.wiki b/test/templates/Template:Includes2.wiki → test/templates/Template꞉Includes2.wiki
diff --git a/test/templates/Template:Includes3.wiki → test/templates/Template꞉Includes3.wiki b/test/templates/Template:Includes3.wiki → test/templates/Template꞉Includes3.wiki
diff --git a/test/templates/Template:Inner_list.wiki → test/templates/Template꞉Inner_list.wiki b/test/templates/Template:Inner_list.wiki → test/templates/Template꞉Inner_list.wiki
diff --git a/test/templates/Template:Linktest.wiki → test/templates/Template꞉Linktest.wiki b/test/templates/Template:Linktest.wiki → test/templates/Template꞉Linktest.wiki
diff --git a/test/templates/Template:Linktest2.wiki → test/templates/Template꞉Linktest2.wiki b/test/templates/Template:Linktest2.wiki → test/templates/Template꞉Linktest2.wiki
diff --git a/test/templates/Template:Loop1.wiki → test/templates/Template꞉Loop1.wiki b/test/templates/Template:Loop1.wiki → test/templates/Template꞉Loop1.wiki
diff --git a/test/templates/Template:Loop2.wiki → test/templates/Template꞉Loop2.wiki b/test/templates/Template:Loop2.wiki → test/templates/Template꞉Loop2.wiki
diff --git a/...templates/Template:Map-one-parameter.wiki → ...templates/Template꞉Map-one-parameter.wiki b/...templates/Template:Map-one-parameter.wiki → ...templates/Template꞉Map-one-parameter.wiki
diff --git a/...Template:Mixed_attr_content_template.wiki → ...Template꞉Mixed_attr_content_template.wiki b/...Template:Mixed_attr_content_template.wiki → ...Template꞉Mixed_attr_content_template.wiki
diff --git a/...mplate:Mixed_attr_content_template_2.wiki → ...mplate꞉Mixed_attr_content_template_2.wiki b/...mplate:Mixed_attr_content_template_2.wiki → ...mplate꞉Mixed_attr_content_template_2.wiki
diff --git a/test/templates/Template:One-parameter.wiki → test/templates/Template꞉One-parameter.wiki b/test/templates/Template:One-parameter.wiki → test/templates/Template꞉One-parameter.wiki
diff --git a/test/templates/Template:Paramtest.wiki → test/templates/Template꞉Paramtest.wiki b/test/templates/Template:Paramtest.wiki → test/templates/Template꞉Paramtest.wiki
diff --git a/test/templates/Template:Paramtest2.wiki → test/templates/Template꞉Paramtest2.wiki b/test/templates/Template:Paramtest2.wiki → test/templates/Template꞉Paramtest2.wiki
diff --git a/test/templates/Template:Paramtestnum.wiki → test/templates/Template꞉Paramtestnum.wiki b/test/templates/Template:Paramtestnum.wiki → test/templates/Template꞉Paramtestnum.wiki
diff --git a/test/templates/Template:Pipe.wiki → test/templates/Template꞉Pipe.wiki b/test/templates/Template:Pipe.wiki → test/templates/Template꞉Pipe.wiki
diff --git a/test/templates/Template:Pipe_page.wiki → test/templates/Template꞉Pipe_page.wiki b/test/templates/Template:Pipe_page.wiki → test/templates/Template꞉Pipe_page.wiki
diff --git a/test/templates/Template:Precedence5.wiki → test/templates/Template꞉Precedence5.wiki b/test/templates/Template:Precedence5.wiki → test/templates/Template꞉Precedence5.wiki
diff --git a/...s/Template:Preprocessor_precedence_9.wiki → ...s/Template꞉Preprocessor_precedence_9.wiki b/...s/Template:Preprocessor_precedence_9.wiki → ...s/Template꞉Preprocessor_precedence_9.wiki
diff --git a/test/templates/Template:Quote.wiki → test/templates/Template꞉Quote.wiki b/test/templates/Template:Quote.wiki → test/templates/Template꞉Quote.wiki
diff --git a/test/templates/Template:SafeSubstTest.wiki → test/templates/Template꞉SafeSubstTest.wiki b/test/templates/Template:SafeSubstTest.wiki → test/templates/Template꞉SafeSubstTest.wiki
diff --git a/test/templates/Template:Safesubst.wiki → test/templates/Template꞉Safesubst.wiki b/test/templates/Template:Safesubst.wiki → test/templates/Template꞉Safesubst.wiki
diff --git a/test/templates/Template:T290526.wiki → test/templates/Template꞉T290526.wiki b/test/templates/Template:T290526.wiki → test/templates/Template꞉T290526.wiki
diff --git a/test/templates/Template:Table.wiki → test/templates/Template꞉Table.wiki b/test/templates/Template:Table.wiki → test/templates/Template꞉Table.wiki
diff --git a/test/templates/Template:Table_attribs.wiki → test/templates/Template꞉Table_attribs.wiki b/test/templates/Template:Table_attribs.wiki → test/templates/Template꞉Table_attribs.wiki
diff --git a/test/templates/Template:Table_attribs_2.wiki → test/templates/Template꞉Table_attribs_2.wiki b/test/templates/Template:Table_attribs_2.wiki → test/templates/Template꞉Table_attribs_2.wiki
diff --git a/test/templates/Template:Table_attribs_3.wiki → test/templates/Template꞉Table_attribs_3.wiki b/test/templates/Template:Table_attribs_3.wiki → test/templates/Template꞉Table_attribs_3.wiki
diff --git a/test/templates/Template:Table_attribs_4.wiki → test/templates/Template꞉Table_attribs_4.wiki b/test/templates/Template:Table_attribs_4.wiki → test/templates/Template꞉Table_attribs_4.wiki
diff --git a/test/templates/Template:Table_attribs_5.wiki → test/templates/Template꞉Table_attribs_5.wiki b/test/templates/Template:Table_attribs_5.wiki → test/templates/Template꞉Table_attribs_5.wiki
diff --git a/test/templates/Template:Table_attribs_6.wiki → test/templates/Template꞉Table_attribs_6.wiki b/test/templates/Template:Table_attribs_6.wiki → test/templates/Template꞉Table_attribs_6.wiki
diff --git a/...emplates/Template:Table_cell_content.wiki → ...emplates/Template꞉Table_cell_content.wiki b/...emplates/Template:Table_cell_content.wiki → ...emplates/Template꞉Table_cell_content.wiki
diff --git a/test/templates/Template:Table_cells.wiki → test/templates/Template꞉Table_cells.wiki b/test/templates/Template:Table_cells.wiki → test/templates/Template꞉Table_cells.wiki
diff --git a/...emplates/Template:Table_header_cells.wiki → ...emplates/Template꞉Table_header_cells.wiki b/...emplates/Template:Table_header_cells.wiki → ...emplates/Template꞉Table_header_cells.wiki
diff --git a/test/templates/Template:Tbl-end.wiki → test/templates/Template꞉Tbl-end.wiki b/test/templates/Template:Tbl-end.wiki → test/templates/Template꞉Tbl-end.wiki
diff --git a/test/templates/Template:Tbl-start.wiki → test/templates/Template꞉Tbl-start.wiki b/test/templates/Template:Tbl-start.wiki → test/templates/Template꞉Tbl-start.wiki
diff --git a/test/templates/Template:Templa.wiki → test/templates/Template꞉Templa.wiki b/test/templates/Template:Templa.wiki → test/templates/Template꞉Templa.wiki
diff --git a/...ates/Template:Template_with_pagename.wiki → ...ates/Template꞉Template_with_pagename.wiki b/...ates/Template:Template_with_pagename.wiki → ...ates/Template꞉Template_with_pagename.wiki
diff --git a/...templates/Template:Templateasargtest.wiki → ...templates/Template꞉Templateasargtest.wiki b/...templates/Template:Templateasargtest.wiki → ...templates/Template꞉Templateasargtest.wiki
diff --git a/...emplates/Template:Templateasargtest2.wiki → ...emplates/Template꞉Templateasargtest2.wiki b/...emplates/Template:Templateasargtest2.wiki → ...emplates/Template꞉Templateasargtest2.wiki
diff --git a/...es/Template:Templateasargtestdefault.wiki → ...es/Template꞉Templateasargtestdefault.wiki b/...es/Template:Templateasargtestdefault.wiki → ...es/Template꞉Templateasargtestdefault.wiki
diff --git a/...plates/Template:Templateasargtestnum.wiki → ...plates/Template꞉Templateasargtestnum.wiki b/...plates/Template:Templateasargtestnum.wiki → ...plates/Template꞉Templateasargtestnum.wiki
diff --git a/test/templates/Template:Templatesimple.wiki → test/templates/Template꞉Templatesimple.wiki b/test/templates/Template:Templatesimple.wiki → test/templates/Template꞉Templatesimple.wiki
diff --git a/test/templates/Template:Test.wiki → test/templates/Template꞉Test.wiki b/test/templates/Template:Test.wiki → test/templates/Template꞉Test.wiki
diff --git a/test/templates/Template:With:_Colon.wiki → test/templates/Template꞉With꞉_Colon.wiki b/test/templates/Template:With:_Colon.wiki → test/templates/Template꞉With꞉_Colon.wiki