tiddlywiki 5.2.3 → 5.2.4

package/languages/zh-Hans/Misc.multids

@@ -1,15 +1,16 @@
 title: $:/language/
 
-AboveStory/ClassicPlugin/Warning: 您貌似要加载为 ~TiddlyWiki 经典版设计的插件。请注意，[[这些插件无法运行于 TiddlyWiki 5.x.x 版|https://tiddlywiki.com/#TiddlyWikiClassic]]。检测到 ~TiddlyWiki 经典版插件：
+AboveStory/ClassicPlugin/Warning: 您似乎要加载为 ~TiddlyWiki 经典版设计的插件。请注意，[[这些插件无法运行于 TiddlyWiki 5.x.x 版|https://tiddlywiki.com/#TiddlyWikiClassic]]。检测到 ~TiddlyWiki 经典版插件：
 BinaryWarning/Prompt: 此条目包含二进制数据
 ClassicWarning/Hint: 此条目以经典版 TiddlyWiki 标记格式撰写，不完全兼容新版 TiddlyWiki 的格式，详细信息请参阅：https://tiddlywiki.com/static/Upgrading。
 ClassicWarning/Upgrade/Caption: 升级
 CloseAll/Button: 全部关闭
 ColourPicker/Recent: 最近︰
-ConfirmCancelTiddler: 您确定要放弃对条目 "<$text text=<<title>>/>" 的更改？
+ConfirmCancelTiddler: 您确定要取消对条目 "<$text text=<<title>>/>" 的更改？
 ConfirmDeleteTiddler: 您确定要删除条目 "<$text text=<<title>>/>"？
-ConfirmOverwriteTiddler: 您确定要复写条目 "<$text text=<<title>>/>"？
-ConfirmEditShadowTiddler: 您即将要编辑默认条目，任何更改将会复盖默认的系统，使未来的升级不寻常。您确定要编辑 "<$text text=<<title>>/>"?
+ConfirmDeleteTiddlers: 您确定要删除 <<resultCount>> 个条目？
+ConfirmOverwriteTiddler: 您确定要覆盖条目 "<$text text=<<title>>/>"？
+ConfirmEditShadowTiddler: 您即将要编辑默认条目，任何更改将会覆盖默认的系统，使未来的升级不寻常。您确定要编辑 "<$text text=<<title>>/>"?
 ConfirmAction: 是否要继续？
 Count: 计数
 DefaultNewTiddlerTitle: 新条目
@@ -34,8 +35,8 @@ Error/NetworkErrorAlert: `<h2>''网络错误''</h2>与服务器的连缐似乎
 Error/PutEditConflict: 服务器上的文件已更改
 Error/PutForbidden: 没有权限
 Error/PutUnauthorized: 需要身分验证
-Error/RecursiveTransclusion: 于 transclude 小部件中的递回嵌入错误
-Error/RetrievingSkinny: 简要条目清单撷取错误
+Error/RecursiveTransclusion: 于 transclude 小部件中的递归嵌入错误
+Error/RetrievingSkinny: 简要条目清单提取错误
 Error/SavingToTWEdit: 保存到 TWEdit 时，发生错误
 Error/WhileSaving: 保存时，发生错误
 Error/XMLHttpRequest: XMLHttpRequest 错误代码
@@ -45,10 +46,10 @@ LayoutSwitcher/Description: 打开布局切换器
 LazyLoadingWarning: <p>正在从 ''<$text text={{!!_canonical_uri}}/>'' 加载外部内容 ...</p><p>如果此信息未消失，可能是条目内容类型与外部内容的类型不匹配，或是您可能正在使用的浏览器，不支援单文件式维基的外部内容。请参阅 https://tiddlywiki.com/#ExternalText</p>
 LoginToTiddlySpace: 登录 TiddlySpace
 Manager/Controls/FilterByTag/None: (无)
-Manager/Controls/FilterByTag/Prompt: 依标签筛选︰
+Manager/Controls/FilterByTag/Prompt: 按标签筛选︰
 Manager/Controls/Order/Prompt: 反向顺序
-Manager/Controls/Search/Placeholder: 搜寻
-Manager/Controls/Search/Prompt: 搜寻︰
+Manager/Controls/Search/Placeholder: 搜索
+Manager/Controls/Search/Prompt: 搜索︰
 Manager/Controls/Show/Option/Tags: 标签
 Manager/Controls/Show/Option/Tiddlers: 条目
 Manager/Controls/Show/Prompt: 显示︰
@@ -71,14 +72,14 @@ PluginReloadWarning: 请保存 {{$:/core/ui/Buttons/save-wiki}} 并刷新页面
 RecentChanges/DateFormat: YYYY年0MM月0DD日
 Shortcuts/Input/Accept/Hint: 接受选取的项目
 Shortcuts/Input/AcceptVariant/Hint: 接受选取项目 (变种)
-Shortcuts/Input/AdvancedSearch/Hint: 从侧边栏搜寻字段内打开[[进阶搜寻|$:/AdvancedSearch]]面板
+Shortcuts/Input/AdvancedSearch/Hint: 从侧边栏搜索字段内打开[[进阶搜索|$:/AdvancedSearch]]面板
 Shortcuts/Input/Cancel/Hint: 清除输入字段
 Shortcuts/Input/Down/Hint: 选择下一个项目
 Shortcuts/Input/Tab-Left/Hint: 选择上一个页签
 Shortcuts/Input/Tab-Right/Hint: 选择下一个页签
 Shortcuts/Input/Up/Hint: 选择前一个项目
 Shortcuts/SidebarLayout/Hint: 更改侧边栏布局
-Switcher/Subtitle/theme: 切换布景主题
+Switcher/Subtitle/theme: 切换布局主题
 Switcher/Subtitle/layout: 切换布局
 Switcher/Subtitle/language: 切换语言
 Switcher/Subtitle/palette: 切换调色板

package/languages/zh-Hans/Search.multids

@@ -2,19 +2,19 @@ title: $:/language/Search/
 
 DefaultResults/Caption: 列表
 Filter/Caption: 筛选
-Filter/Hint: 以[[筛选表达式|https://tiddlywiki.com/static/Filters.html]]查找
+Filter/Hint: 以[[筛选表达式|https://tiddlywiki.com/static/Filters.html]]搜索
 Filter/Matches: //<small><<resultCount>> 个条目符合条件</small>//
 Matches: //<small><<resultCount>> 个条目符合条件</small>//
 Matches/All: 所有匹配：
 Matches/Title: 条目名称匹配：
-Search: 查找
-Search/TooShort: 查找文本太短
+Search: 搜索
+Search/TooShort: 搜索文本太短
 Shadows/Caption: 默认
-Shadows/Hint: 查找默认条目
+Shadows/Hint: 搜索默认条目
 Shadows/Matches: //<small><<resultCount>> 个条目符合条件</small>//
 Standard/Caption: 标准
-Standard/Hint: 查找一般条目
+Standard/Hint: 搜索一般条目
 Standard/Matches: //<small><<resultCount>> 个条目符合条件</small>//
 System/Caption: 系统
-System/Hint: 查找系统条目
+System/Hint: 搜索系统条目
 System/Matches: //<small><<resultCount>> 个条目符合条件</small>//

package/languages/zh-Hans/SiteSubtitle.tid

@@ -1,3 +1,3 @@
 title: $:/SiteSubtitle
 
-一个非线性的网页式笔记
+卡片式个人网页笔记

package/languages/zh-Hans/Snippets/ListByTag.tid

@@ -1,5 +1,5 @@
 title: $:/language/Snippets/ListByTag
 tags: $:/tags/TextEditor/Snippet
-caption: 依标签筛选的条目列表
+caption: 按标签筛选的条目列表
 
 <<list-links "[tag[task]sort[title]]">>

package/languages/zh-Hans/ThemeTweaks.multids

@@ -1,21 +1,21 @@
 title: $:/language/ThemeTweaks/
 
 ThemeTweaks: 主题调整
-ThemeTweaks/Hint: 您可以调整 ''Vanilla'' 布景主题的某些样貌。
+ThemeTweaks/Hint: 您可以调整 ''Vanilla'' 布局主题的某些样貌。
 Options: 选项
 Options/SidebarLayout: 侧边栏布局
 Options/SidebarLayout/Fixed-Fluid: 固定故事，浮动侧边栏
 Options/SidebarLayout/Fluid-Fixed: 浮动故事，固定侧边栏
 Options/StickyTitles: 置顶标题
-Options/StickyTitles/Hint: 使条目名称"黏着"于浏览器窗口的顶端
-Options/CodeWrapping: 在代码区块中折行
+Options/StickyTitles/Hint: 使条目名称吸顶
+Options/CodeWrapping: 在代码区块中换行
 Settings: 设置
 Settings/FontFamily: 字型
 Settings/CodeFontFamily: 代码字型
 Settings/EditorFontFamily: 编辑器字型
 Settings/BackgroundImage: 页面背景图像
 Settings/BackgroundImageAttachment: 页面背景图像附属
-Settings/BackgroundImageAttachment/Scroll: 随条目卷动
+Settings/BackgroundImageAttachment/Scroll: 随条目滚动
 Settings/BackgroundImageAttachment/Fixed: 固定于窗口
 Settings/BackgroundImageSize: 页面背景图像大小
 Settings/BackgroundImageSize/Auto: 自动
@@ -28,8 +28,8 @@ Metrics/BodyFontSize: 条目本文的字体大小
 Metrics/BodyLineHeight: 条目本文的行高
 Metrics/StoryLeft: 故事左侧位置
 Metrics/StoryLeft/Hint: 故事河（条目区）的左边缘与页面左端的间距
-Metrics/StoryTop: 故事顶端位置
-Metrics/StoryTop/Hint: 故事河（条目区）的上边缘与页面顶端的间距
+Metrics/StoryTop: 故事顶部位置
+Metrics/StoryTop/Hint: 故事河（条目区）的上边缘与页面顶部的间距
 Metrics/StoryRight: 故事右侧位置
 Metrics/StoryRight/Hint: 侧边栏的左边缘与页面左端的间距
 Metrics/StoryWidth: 故事的宽度
@@ -39,4 +39,4 @@ Metrics/TiddlerWidth/Hint: 在故事河内
 Metrics/SidebarBreakpoint: 侧边栏中断点
 Metrics/SidebarBreakpoint/Hint: 故事河和侧边栏会并排显示的最小页面宽度
 Metrics/SidebarWidth: 侧边栏宽度
-Metrics/SidebarWidth/Hint: 在浮动-固定布局中，侧边栏的宽度
+Metrics/SidebarWidth/Hint: 在 浮动故事，固定侧边栏 布局中，侧边栏的宽度

package/languages/zh-Hans/TiddlerInfo.multids

@@ -8,8 +8,8 @@ Advanced/ShadowInfo/Heading: 默认条目状态
 Advanced/ShadowInfo/NotShadow/Hint: <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> 不是一个默认条目
 Advanced/ShadowInfo/Shadow/Hint: <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> 是一个默认条目
 Advanced/ShadowInfo/Shadow/Source: 此条目定义于插件 <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link>
-Advanced/ShadowInfo/OverriddenShadow/Hint: 已被一般条目覆写
-Fields/Caption: 栏位
+Advanced/ShadowInfo/OverriddenShadow/Hint: 已被一般条目覆盖
+Fields/Caption: 字段
 List/Caption: 列表
 List/Empty: 此条目无指定列表
 Listed/Caption: 被列于

package/languages/zh-Hant/Buttons.multids

@@ -18,6 +18,8 @@ CopyToClipboard/Caption: 複製到剪貼簿
 CopyToClipboard/Hint: 將此文字複製到剪貼簿
 Delete/Caption: 刪除
 Delete/Hint: 刪除此條目
+DeleteTiddlers/Caption: 刪除條目
+DeleteTiddlers/Hint: 刪除條目
 Edit/Caption: 編輯
 Edit/Hint: 編輯此條目
 Encryption/Caption: 加密
@@ -57,6 +59,8 @@ Info/Caption: 資訊
 Info/Hint: 顯示此條目的資訊
 Language/Caption: 語言
 Language/Hint: 選擇使用者介面語言
+LayoutSwitcher/Hint: 開啟版面切換器
+LayoutSwitcher/Caption: 版面
 Manager/Caption: 條目管理器
 Manager/Hint: 開啟條目管理器
 More/Caption: 更多

package/languages/zh-Hant/ControlPanel.multids

@@ -7,7 +7,7 @@ Appearance/Hint: 自訂您的 TiddlyWiki 外觀。
 Basics/AnimDuration/Prompt: 動畫持續時間
 Basics/AutoFocus/Prompt: 編輯條目時的預設自動停留欄位
 Basics/Caption: 基本
-Basics/DefaultTiddlers/BottomHint: 標題含空白時請使用 &#91;&#91;雙中括弧&#93;&#93;，或者您可用 <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">保留開啟中的條目順序</$button>
+Basics/DefaultTiddlers/BottomHint: 標題含空白時請使用 &#91;&#91;雙中括弧&#93;&#93;，或者您可用 {{保留開啟中的條目順序||$:/snippets/retain-story-ordering-button}}
 Basics/DefaultTiddlers/Prompt: 首頁
 Basics/DefaultTiddlers/TopHint: 預設開啟的條目
 Basics/Language/Prompt: 您好！當前的語言：
@@ -24,7 +24,7 @@ Basics/Subtitle/Prompt: 副標題
 Basics/SystemTiddlers/Prompt: 系統條目數量
 Basics/Tags/Prompt: 標籤數量
 Basics/Tiddlers/Prompt: 一般條目數量
-Basics/Title/Prompt: 標題
+Basics/Title/Prompt: 此 ~TiddlyWiki 的標題
 Basics/Username/Prompt: 編輯者署名
 Basics/Version/Prompt: ~TiddlyWiki 版本
 Cascades/Caption: 級聯

package/languages/zh-Hant/Fields.multids

@@ -13,7 +13,7 @@ dependents: 插件的相依插件列表
 description: 插件的說明、描述
 draft.of: 草稿條目，包含條目的標題、標籤、欄位 ...
 draft.title: 草稿條目的標題
-footer: wizard 的註腳
+footer: 互動視窗的註腳
 hide-body: 若設定為 ''yes''，檢視範本將隱藏條目的主體
 icon: 條目的標題含有與條目關聯的圖示
 library: 若設定為 ''yes''，表示條目應該被儲存為一個 JavaScript 程式庫
@@ -28,7 +28,7 @@ plugin-type: 套件條目的類型
 released: TiddlyWiki 的釋出日期
 revision: 條目存放於伺服器中的修訂版本
 source: 條目的網址
-subtitle: 一個 wizard 的副標題
+subtitle: 互動視窗的副標題
 tags: 條目的標籤清單
 text: 條目的內文
 throttle.refresh: 如果存在，則限制此條目的刷新

package/languages/zh-Hant/GettingStarted.tid

@@ -9,9 +9,10 @@ title: GettingStarted
 
 <div class="tc-control-panel">
 
-|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
-|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|tc-table-no-border tc-first-col-min-width tc-first-link-nowrap|k
+| <$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link>|<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+| <$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link>|<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|^ <$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link><br><<lingo DefaultTiddlers/TopHint>>|<$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 </div>
 
 請參閱[[控制台|$:/ControlPanel]]查看更多選項。

package/languages/zh-Hant/Help/commands.tid

@@ -0,0 +1,18 @@
+title: $:/language/Help/commands
+description: 執行從篩選器傳回的命令
+
+按順序執行從篩選器傳回的命令符記
+
+```
+--commands <filter>
+```
+
+範例
+
+```
+--commands "[enlist{$:/build-commands-as-text}]"
+```
+
+```
+--commands "[{$:/build-commands-as-json}jsonindexes[]] :map[{$:/build-commands-as-json}jsonget<currentTiddler>]"
+```

package/languages/zh-Hant/Misc.multids

@@ -8,6 +8,7 @@ CloseAll/Button: 全部關閉
 ColourPicker/Recent: 最近︰
 ConfirmCancelTiddler: 您確定要放棄對條目 "<$text text=<<title>>/>" 的更改？
 ConfirmDeleteTiddler: 您確定要刪除條目 "<$text text=<<title>>/>"？
+ConfirmDeleteTiddlers: 您確定要刪除 <<resultCount>> 個條目？
 ConfirmOverwriteTiddler: 您確定要覆寫條目 "<$text text=<<title>>/>"？
 ConfirmEditShadowTiddler: 您即將要編輯預設條目，任何更改將會覆蓋預設的系統，使未來的升級不尋常。您確定要編輯 "<$text text=<<title>>/>"?
 ConfirmAction: 是否要繼續？

package/licenses/cla-individual.md

@@ -497,3 +497,7 @@ Nolan Darilek, @NDarilek,  2022/06/21
 Keiichi Shiga (🎈 BALLOON | FU-SEN), @fu-sen. 2022/07/07
 
 Nathaniel Knight, @nathanielknight, 2022/07/26
+
+HuanCheng Bai, @bestony, 2022/09/17
+
+Carlo Colombo, @carlo-colombo, 2022/11/30

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tiddlywiki",
   "preferGlobal": "true",
-  "version": "5.2.3",
+  "version": "5.2.4",
   "author": "Jeremy Ruston <jeremy@jermolene.com>",
   "description": "a non-linear personal web notebook",
   "contributors": [

package/plugins/tiddlywiki/codemirror/engine.js

@@ -186,6 +186,10 @@ function CodeMirrorEngine(options) {
 		return false;
 	});
 	this.cm.on("keydown",function(cm,event) {
+		if ($tw.keyboardManager.handleKeydownEvent(event, {onlyPriority: true})) {
+			return true;
+		}
+	
 		return self.widget.handleKeydownEvent.call(self.widget,event);
 	});
 	this.cm.on("focus",function(cm,event) {

package/plugins/tiddlywiki/dynannotate/docs/readme.tid

@@ -108,11 +108,11 @@ The selection tracker triggers an action string whenever the browser text select
 
 The selection tracker works within DOM subtrees that have the following structure:
 
-* The outer wrapper element has the attribute `data-selection-action-title` containing the title of the tiddler containing the action string to be invoked when the selection changes
+* The outer wrapper element has the attribute `data-selection-actions-title` containing the title of the tiddler containing the action string to be invoked when the selection changes
 * Each child element of the outer element must have a unique `id` attribute to identify it
 
 ```
-<div data-selection-action-title="{tiddler title}">
+<div data-selection-actions-title="{tiddler title}">
 	<div id="{title}">
 		Content text
 	</div>

package/plugins/tiddlywiki/dynannotate/modules/dynannotate.js

@@ -16,6 +16,8 @@ var TextMap = require("$:/plugins/tiddlywiki/dynannotate/textmap.js").TextMap;
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
+var Popup = require("$:/core/modules/utils/dom/popup.js");
+
 var DynannotateWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);
 };
@@ -191,7 +193,7 @@ DynannotateWidget.prototype.applyAnnotations = function() {
 				"tv-selection-posy": (bounds.top).toString(),
 				"tv-selection-width": (bounds.width).toString(),
 				"tv-selection-height": (bounds.height).toString(),
-				"tv-selection-coords": "(" + bounds.left + "," + bounds.top + "," + bounds.width + "," + bounds.height + ")"
+				"tv-selection-coords": Popup.buildCoordinates(Popup.coordinatePrefix.csOffsetParent,bounds)
 			});
 			if(self.hasAttribute("popup")) {
 				$tw.popup.triggerPopup({
@@ -330,7 +332,7 @@ DynannotateWidget.prototype.applySnippets = function() {
 			// Output the match
 			container.appendChild($tw.utils.domMaker("span",{
 				text: textMap.string.slice(match.startPos,match.endPos),
-				"class": "tc-dynannotate-snippet-highlight " + self.getAttribute("searchClass")
+				"class": "tc-dynannotate-snippet-highlight " + self.getAttribute("searchClass","")
 			}));
 			// Does the context of this match merge into the next?
 			merged = index < matches.length - 1 && matches[index + 1].startPos - match.endPos <= 2 * contextLength;

package/plugins/tiddlywiki/help/tabs/Support.tid

@@ -4,9 +4,13 @@ caption: Support
 
 ~TiddlyWiki is an open source project with a vibrant community of users and developers. We're always happy to help new users get the most from ~TiddlyWiki.
 
-Join the ~TiddlyWiki mailing list:
+Join the ~TiddlyWiki forum:
 
-http://groups.google.com/group/TiddlyWiki
+https://talk.tiddlywiki.org/
+
+For the convenience of existing users, we also continue to operate the original TiddlyWiki group (hosted on Google Groups since 2005):
+
+https://groups.google.com/group/TiddlyWiki
 
 Post bug reports to the ~TiddlyWiki ~GitHub repository:
 

package/plugins/tiddlywiki/jasmine/command.js

@@ -0,0 +1,33 @@
+/*\
+title: $:/plugins/tiddlywiki/jasmine/command.js
+type: application/javascript
+module-type: command
+
+The command which executes jasmine on the command line for TiddlyWiki5
+
+\*/
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var jasmine = require("./jasmine-plugin.js");
+
+exports.info = {
+	name: "test",
+	synchronous: false,
+	namedParameterMode: true
+};
+
+var Command = function(params,commander,callback) {
+	this.params = params;
+	this.commander = commander;
+	this.callback = callback;
+};
+
+Command.prototype.execute = function() {
+	var specFilter = this.params.spec;
+	jasmine.runTests(this.callback,specFilter);
+};
+
+exports.Command = Command;

package/plugins/tiddlywiki/jasmine/help.tid

@@ -0,0 +1,24 @@
+title: $:/language/Help/test
+description: Run the jasmine test suite
+
+This runs all of the tests in tiddlers tagged with `$:/tags/test-spec`.
+
+```
+--test [spec=<regExp>]
+```
+
+''spec'' - optional regular expression to run only specific suites or tests. It will be matched against the full name of every test to see whether to run it. The full name of a test is its assigned name prepended with the names of all containing suites. For instance, to run only the following test:
+
+```
+describe("Framework") { it("handles edgecases") { ... } }
+```
+
+You might use a specFilter like `"^Framework handles edgecases$"` to match the full name exactly, or more simply `"edgecases"`, though this might run other tests with "edgecases" in their name. You could also run all tests in that suite with `"^Framework"`.
+
+If any tests fail or are skipped, all following commands are ignored. If you have any commands which must be executed regardless of test results, execute them first.
+
+A common usage is to run the tests on the console after creating a Tiddlywiki file which will run the tests on the browser.
+
+```
+tiddlywiki --rendertiddler $:/core/save/all test.html text/plain --test
+```

package/plugins/tiddlywiki/jasmine/jasmine-plugin.js

@@ -1,7 +1,7 @@
 /*\
 title: $:/plugins/tiddlywiki/jasmine/jasmine-plugin.js
 type: application/javascript
-module-type: startup
+module-type: library
 
 The main module of the Jasmine test plugin for TiddlyWiki5
 
@@ -12,20 +12,15 @@ The main module of the Jasmine test plugin for TiddlyWiki5
 /*global $tw: true */
 "use strict";
 
-var TEST_TIDDLER_FILTER = "[type[application/javascript]tag[$:/tags/test-spec]]";
+var TEST_TIDDLER_FILTER = "[all[tiddlers+shadows]type[application/javascript]tag[$:/tags/test-spec]]";
+var TESTS_DONE = false;
 
-exports.name = "jasmine";
-// Ensure this startup module is executed in the right order.
-// In Node.js, Jasmine calls `process.exit()` with a non-zero exit code if there's
-// any failed tests. Because of that, we want to make sure all critical
-// startup modules are run before this one.
-// * The "commands" module handles the --rendertiddler command-line flag,
-//   which is typically given in order to export an HTML file that can be opened with
-//   a browser to run tests.
-exports.after = $tw.node ? ["commands"] : [];
+exports.testsWereRun = function() {
+	return TESTS_DONE;
+};
 
 /*
-Startup function for running tests
+function for running tests
 
 Below, paths like jasmine-core/jasmine.js refer to files in the 'jasmine-core' npm
 package, whose repository is https://github.com/jasmine/jasmine.
@@ -34,7 +29,8 @@ repository is https://github.com/jasmine/jasmine-npm.
 
 They're all locally checked into the `./files` directory.
 */
-exports.startup = function() {
+
+exports.runTests = function(callback,specFilter) {
 	// Set up a shared context object.
 	var context = {
 		console: console,
@@ -63,6 +59,10 @@ exports.startup = function() {
 	//    is executed, so we use the `context` object instead.
 	context.global = $tw.browser ? window : context;
 
+	// We set this early rather than at the end for simplicity. The browser
+	// and node.js environments don't end the same way.
+	TESTS_DONE = true;
+
 	function evalInContext(title) {
 		var code = $tw.wiki.getTiddlerText(title,"");
 		var _exports = {};
@@ -123,7 +123,15 @@ exports.startup = function() {
 			path: "$:/plugins/tiddlywiki/jasmine/jasmine-core/jasmine-core"
 		};
 		// 'jasmine/jasmine.js' references `process.exit`, among other properties
-		context.process = process;
+		// It will call 'exit' after it's done, which gives us an
+		// opportunity to resynchronize and finish any following commands.
+		context.process = Object.create(process);
+		context.process.exit = function(code) {
+			// If jasmine's exit code is non-zero, tests failed. Abort any
+			// further commands. If they're important, they could have come
+			// before the testing suite.
+			callback(code ? "Tests failed with code " + code : undefined);
+		};
 
 		var NodeJasmine = evalInContext("$:/plugins/tiddlywiki/jasmine/jasmine/jasmine.js");
 		nodeJasmineWrapper = new NodeJasmine({jasmineCore: jasmineCore});
@@ -135,13 +143,11 @@ exports.startup = function() {
 	context = $tw.utils.extend({},jasmineInterface,context);
 	// Iterate through all the test modules
 	var tests = $tw.wiki.filterTiddlers(TEST_TIDDLER_FILTER);
-	$tw.utils.each(tests,function(title) {
-		evalInContext(title);
-	});
+	$tw.utils.each(tests,evalInContext);
 	// In a browser environment, jasmine-core/boot.js calls `execute()` for us.
 	// In Node.js, we call it manually.
 	if(!$tw.browser) {
-		nodeJasmineWrapper.execute();
+		nodeJasmineWrapper.execute(null,specFilter);
 	}
 };
 

package/plugins/tiddlywiki/jasmine/readme.tid

@@ -1,5 +1,35 @@
 title: $:/plugins/tiddlywiki/jasmine/readme
 
-This plugin provides a framework for running tests in the browser and under Node.js. It is based on [[Jasmine|https://jasmine.github.io/]] test framework.
+This plugin provides a framework for running tests in the browser and under Node.js. It is based on [[Jasmine|https://jasmine.github.io/]] test framework. On Tiddlywiki, it runs tests in all javascript tiddlers tagged with <<tag $:/tags/test-spec>>.
 
 [[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/jasmine]]
+
+!! Usage on Node.js
+
+On the command line, type `tiddlywiki --test`.
+
+Alternatively, you can set up a build task for jasmine by including the following in your tiddlywiki.info file:
+
+```
+{
+	...
+	"build": {
+		...
+		"test": ["--test"]
+	}
+}
+```
+
+You could then run tests by typing `tiddlywiki --build test` or just `tiddlywiki --build`. The advantage to this is it allows you to include other commands to run as well. See `tiddlywiki --help test` for more information.
+
+This will run the tests and produce a test file in your output directory.
+
+```
+		"test": [
+			"--test",
+			"--rendertiddler","$:/core/save/all","test.html","text/plain"]
+```
+
+!! Usage on a browser
+
+Once you've constructed a Tiddlywiki file using a command like the one above, you can run the tests simply by opening it. Tests run automatically, and the results will be at the bottom of the window.

package/plugins/tiddlywiki/jasmine/run-wiki-based-tests.js

@@ -0,0 +1,93 @@
+/*\
+title: $:/plugins/tiddlywiki/jasmine/run-wiki-based-tests.js
+type: application/javascript
+tags: [[$:/tags/test-spec]]
+
+Tests the wiki based tests
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var TEST_WIKI_TIDDLER_FILTER = "[type[text/vnd.tiddlywiki-multiple]tag[$:/tags/wiki-test-spec]]";
+
+var widget = require("$:/core/modules/widgets/widget.js");
+
+describe("Wiki-based tests", function() {
+
+	// Step through the test tiddlers
+	var tests = $tw.wiki.filterTiddlers(TEST_WIKI_TIDDLER_FILTER);
+	$tw.utils.each(tests,function(title) {
+		var tiddler = $tw.wiki.getTiddler(title);
+		it(tiddler.fields.title + ": " + tiddler.fields.description, function() {
+			// Add our tiddlers
+			var wiki = new $tw.Wiki();
+			wiki.addTiddlers(readMultipleTiddlersTiddler(title));
+			// Complain if we don't have the ouput and expected results
+			if(!wiki.tiddlerExists("Output")) {
+				throw "Missing 'Output' tiddler";
+			}
+			if(!wiki.tiddlerExists("ExpectedResult")) {
+				throw "Missing 'ExpectedResult' tiddler";
+			}
+			// Construct the widget node
+			var text = "{{Output}}\n\n";
+			var widgetNode = createWidgetNode(parseText(text,wiki),wiki);
+			// Render the widget node to the DOM
+			var wrapper = renderWidgetNode(widgetNode);
+			// Clear changes queue
+			wiki.clearTiddlerEventQueue();
+			// Run the actions if provided
+			if(wiki.tiddlerExists("Actions")) {
+				widgetNode.invokeActionString(wiki.getTiddlerText("Actions"));
+				refreshWidgetNode(widgetNode,wrapper);
+			}
+			// Test the rendering
+			expect(wrapper.innerHTML).toBe(wiki.getTiddlerText("ExpectedResult"));
+		});
+	});
+
+	function readMultipleTiddlersTiddler(title) {
+		var rawTiddlers = $tw.wiki.getTiddlerText(title).split("\n+\n");
+		var tiddlers = [];
+		$tw.utils.each(rawTiddlers,function(rawTiddler) {
+			var fields = Object.create(null),
+				split = rawTiddler.split(/\r?\n\r?\n/mg);
+			if(split.length >= 1) {
+				fields = $tw.utils.parseFields(split[0],fields);
+			}
+			if(split.length >= 2) {
+				fields.text = split.slice(1).join("\n\n");
+			}
+			tiddlers.push(fields);
+		});
+		return tiddlers;
+	}
+
+	function createWidgetNode(parser,wiki) {
+		return wiki.makeWidget(parser);
+	}
+
+	function parseText(text,wiki,options) {
+		return wiki.parseText("text/vnd.tiddlywiki",text,options);
+	}
+
+	function renderWidgetNode(widgetNode) {
+		$tw.fakeDocument.setSequenceNumber(0);
+		var wrapper = $tw.fakeDocument.createElement("div");
+		widgetNode.render(wrapper,null);
+// console.log(require("util").inspect(wrapper,{depth: 8}));
+		return wrapper;
+	}
+
+	function refreshWidgetNode(widgetNode,wrapper) {
+		widgetNode.refresh(widgetNode.wiki.changedTiddlers,wrapper);
+// console.log(require("util").inspect(wrapper,{depth: 8}));
+	}
+
+});
+
+})();