dsh-tiddlywiki 0.1.1 → 0.2.0

package/lib/index.js

@@ -660,11 +660,11 @@ function timestampTitle(date = /* @__PURE__ */ new Date()) {
 * `isDraft && editTemplate`), and return the draft title so the client can
 * navigate the panel iframe to `#<draftTitle>`.
 */
-async function openInTwEditor(client, title, text, tag) {
+async function openInTwEditor(client, title, text, tags) {
 	if (text.trim().length > 0) await client.put({
 		title,
 		text,
-		tags: [tag]
+		tags
 	});
 	let draftText = text;
 	if (draftText.trim().length === 0) draftText = (await client.get(title))?.text ?? "";
@@ -689,6 +689,16 @@ async function openInTwEditor(client, title, text, tag) {
 		draftTitle
 	};
 }
+/** Resolve note tags from the request body: `tags` array wins, then the
+*  legacy single `tag` string, then the configured default tag. */
+function resolveTags(body, defaultTag) {
+	if (Array.isArray(body.tags)) {
+		const tags = body.tags.filter((t) => typeof t === "string" && t.trim().length > 0).map((t) => t.trim());
+		if (tags.length > 0) return tags;
+	}
+	if (typeof body.tag === "string" && body.tag.trim().length > 0) return body.tag.trim().split(/\s+/).filter(Boolean);
+	return [defaultTag];
+}
 function registerRoutes(ctx, deps) {
 	const handleStatus = async (_req, res) => {
 		const view = deps.server.status();
@@ -702,7 +712,8 @@ function registerRoutes(ctx, deps) {
 			ok: true,
 			...view,
 			git: gitSummary,
-			note: { tag: deps.noteDefaults().tag }
+			note: { tag: deps.noteDefaults().tag },
+			ui: deps.uiDefaults()
 		});
 	};
 	const handleNote = async (req, res) => {
@@ -725,17 +736,18 @@ function registerRoutes(ctx, deps) {
 				return;
 			}
 			const title = typeof body.title === "string" && body.title.trim().length > 0 ? body.title.trim() : timestampTitle();
-			const tag = typeof body.tag === "string" && body.tag.trim().length > 0 ? body.tag.trim() : deps.noteDefaults().tag;
+			const tags = resolveTags(body, deps.noteDefaults().tag);
 			await client.put({
 				title,
 				text,
-				tags: [tag]
+				tags
 			});
 			deps.autoCommit();
 			json$1(res, {
 				ok: true,
 				title,
-				tag,
+				tag: tags.join(" "),
+				tags,
 				text
 			});
 		} catch (err) {
@@ -757,8 +769,8 @@ function registerRoutes(ctx, deps) {
 				return;
 			}
 			const title = typeof body.title === "string" && body.title.trim().length > 0 ? body.title.trim() : timestampTitle();
-			const tag = typeof body.tag === "string" && body.tag.trim().length > 0 ? body.tag.trim() : deps.noteDefaults().tag;
-			const result = await openInTwEditor(client, title, typeof body.text === "string" ? body.text : "", tag);
+			const tags = resolveTags(body, deps.noteDefaults().tag);
+			const result = await openInTwEditor(client, title, typeof body.text === "string" ? body.text : "", tags);
 			deps.autoCommit();
 			json$1(res, {
 				ok: true,
@@ -772,6 +784,31 @@ function registerRoutes(ctx, deps) {
 			}, 500);
 		}
 	};
+	/** Distinct non-system tags for the quick-note tag autocomplete. */
+	const handleTags = async (_req, res) => {
+		const client = deps.getClient();
+		if (client === void 0) {
+			json$1(res, {
+				ok: false,
+				error: "wiki service is not running"
+			}, 503);
+			return;
+		}
+		try {
+			const items = await client.list(void 0, false);
+			const tags = /* @__PURE__ */ new Set();
+			for (const item of items) for (const tag of item.tags ?? []) if (tag.length > 0 && !tag.startsWith("$:/")) tags.add(tag);
+			json$1(res, {
+				ok: true,
+				tags: [...tags].sort((a, b) => a.localeCompare(b, "zh"))
+			});
+		} catch (err) {
+			json$1(res, {
+				ok: false,
+				error: err instanceof Error ? err.message : String(err)
+			}, 500);
+		}
+	};
 	const handleRestart = async (_req, res) => {
 		try {
 			await deps.server.restart();
@@ -845,6 +882,13 @@ function registerRoutes(ctx, deps) {
 				handleEdit(req, res);
 			}
 		}),
+		ctx.webServer.register({
+			kind: "exact",
+			path: `${ROUTE_PREFIX}/tags`,
+			handler: (req, res) => {
+				handleTags(req, res);
+			}
+		}),
 		ctx.webServer.register({
 			kind: "exact",
 			path: `${ROUTE_PREFIX}/restart`,
@@ -1303,6 +1347,8 @@ function registerAdminRoutes(ctx, deps) {
 const DOC_NOTE_TITLE = "dsh-tiddlywiki 插件说明";
 /** Tag that makes the note easy to find via `tiddlywiki_search tag=docs`. */
 const DOC_NOTE_TAG = "docs";
+/** One-time marker: its presence means "the note was offered once — hands off". */
+const SEED_MARKER_TITLE = "$:/plugins/dsh-tiddlywiki/seed-doc-note";
 /** The note body, TiddlyWiki wiki-text. */
 const DOC_NOTE_TEXT = `! dsh-tiddlywiki 插件说明
 
@@ -1312,9 +1358,9 @@ const DOC_NOTE_TEXT = `! dsh-tiddlywiki 插件说明
 
 * **5 个 agent 工具**：\`tiddlywiki_search\`（检索）/ \`tiddlywiki_get\`（读）/ \`tiddlywiki_put\`（写）/ \`tiddlywiki_delete\`（删）/ \`tiddlywiki_git_sync\`（git 同步）。
 * **TW 编辑器面板**：侧边栏「TiddlyWiki」按钮 → 在界面中央打开完整版 TW 编辑器。
-* **快速笔记**：右下角悬浮「📝 快速笔记」写随手记，\`Ctrl+Enter\` 保存；点「✏️ 在 TW 中编辑」会弹出独立小窗用 TW 原生编辑器编辑。
+* **快速笔记**：右下角悬浮「📝 快速笔记」写随手记（可多选/自动补全 tag），\`Ctrl+Enter\` 保存；点「✏️ 在 TW 中编辑」会弹出独立小窗用 TW 原生编辑器编辑。
 * **git 同步**：写入自动防抖 commit（默认 60 秒）；手动 \`tiddlywiki_git_sync action=sync\` 做 pull → commit → push。
-* **设置页**：DSH 设置 → 「TiddlyWiki 知识库」管理插件/主题/语言与运行配置。
+* **设置页**：DSH 设置 → 「TiddlyWiki 知识库」管理插件/主题/语言与运行配置（含「快速笔记」显示开关、侧边栏移左 CSS 补丁开关）。
 
 !! 知识库纪律（三条）
 
@@ -1329,19 +1375,67 @@ const DOC_NOTE_TEXT = `! dsh-tiddlywiki 插件说明
 
 !! 说明
 
-* 本笔记由插件在首次启动时自动写入 wiki（幂等：不存在才写）。删除后重启 dsh web 会重建；手动编辑过的内容不会被覆盖。
+* 本笔记由插件在**首次启动**时自动写入（一次性：只写一次）。删除后重启 dsh web **不会自动恢复**——它从此归你所有。
+* 「\`侧边移到左侧.css\`」是插件默认安装的界面补丁（把 TW 右侧栏移到左边）；可在设置页关闭「侧边栏移左 CSS」开关来停用补丁还原。
 * 更多细节见插件仓库 README。`;
 /**
-* Seed the doc note when it is absent. Returns whether a note was written.
-* Never throws (missing wiki or note already present → no-op / false).
+* Seed the doc note exactly once per wiki. A marker tiddler records that the
+* note has been offered; from then on the note is user-owned and is never
+* re-created (deleting it survives restarts). Returns whether a note was
+* written this call. Never throws.
 */
 async function seedDocNote(client) {
-	if (await client.get("dsh-tiddlywiki 插件说明").catch(() => void 0) !== void 0) return false;
+	if (await client.get("$:/plugins/dsh-tiddlywiki/seed-doc-note").catch(() => void 0) !== void 0) return false;
+	const existing = await client.get(DOC_NOTE_TITLE).catch(() => void 0);
+	let wrote = false;
+	if (existing === void 0) {
+		await client.put({
+			title: DOC_NOTE_TITLE,
+			text: DOC_NOTE_TEXT,
+			type: "text/vnd.tiddlywiki",
+			tags: [DOC_NOTE_TAG]
+		});
+		wrote = true;
+	}
 	await client.put({
-		title: DOC_NOTE_TITLE,
-		text: DOC_NOTE_TEXT,
-		type: "text/vnd.tiddlywiki",
-		tags: [DOC_NOTE_TAG]
+		title: SEED_MARKER_TITLE,
+		text: "seeded-once",
+		type: "text/plain",
+		tags: []
+	}).catch(() => void 0);
+	return wrote;
+}
+/** Sidebar-left CSS tiddler: moves TW's sidebar to the LEFT (mirror of the
+*  `centralised` default), so dsh-better-sidebar's top-right toggle cluster
+*  no longer sits over TW's own right sidebar. A normal tiddler (tag
+*  `$:/tags/Stylesheet`, type text/css) — same pattern as hand-made
+*  `编辑界面微调：小标题·大编辑器.css`, easy to find and delete. */
+const SIDEBAR_LEFT_CSS_TITLE = "侧边移到左侧.css";
+/** The stylesheet body. Hardcoded 960px breakpoint (vanilla default
+*  sidebarbreakpoint) — plain text/css tiddlers don't process `{{...}}`. */
+const SIDEBAR_LEFT_CSS = `/* 由 dsh-tiddlywiki 插件默认安装：把 TW 右侧栏镜像到左侧（与 centralised 主题默认对称）。
+   删除后，只要设置页「侧边栏移左 CSS」补丁开关开着，插件会在下次启动时重建本 tiddler。 */
+@media (min-width: 960px) {
+  html .tc-sidebar-scrollable {
+    left: 0 !important;
+    right: 50% !important;
+    margin-left: 0 !important;
+    margin-right: 343px !important;
+  }
+}`;
+/**
+* Patch-repair the sidebar-left CSS while the option is enabled: write it
+* whenever it is missing (fresh installs and deleted-by-user both re-seed).
+* Returns whether it was written. Never throws.
+*/
+async function seedSidebarLeftCss(client, enabled) {
+	if (!enabled) return false;
+	if (await client.get("侧边移到左侧.css").catch(() => void 0) !== void 0) return false;
+	await client.put({
+		title: SIDEBAR_LEFT_CSS_TITLE,
+		text: SIDEBAR_LEFT_CSS,
+		type: "text/css",
+		tags: ["$:/tags/Stylesheet"]
 	});
 	return true;
 }
@@ -1935,6 +2029,10 @@ const DEFAULTS = {
 		branch: "main"
 	},
 	note: { tag: "inbox" },
+	ui: {
+		showQuickNote: true,
+		sidebarLeftCss: true
+	},
 	auth: {
 		username: "",
 		password: ""
@@ -2007,6 +2105,10 @@ function apply(ctx, rawConfig = {}) {
 			...DEFAULTS.note,
 			...rawConfig.note ?? {}
 		},
+		ui: {
+			...DEFAULTS.ui,
+			...rawConfig.ui ?? {}
+		},
 		auth: {
 			...DEFAULTS.auth,
 			...rawConfig.auth ?? {}
@@ -2016,13 +2118,18 @@ function apply(ctx, rawConfig = {}) {
 	const git = new GitFace();
 	const configStore = new ConfigStore({
 		note: config.note,
-		git: config.git
+		git: config.git,
+		ui: config.ui
 	});
 	const eff = () => configStore.get();
 	const effectiveNoteTag = () => {
 		const tag = eff().note?.tag;
 		return typeof tag === "string" && tag.trim().length > 0 ? tag : config.note.tag;
 	};
+	const effectiveUi = () => ({
+		showQuickNote: eff().ui?.showQuickNote !== false,
+		sidebarLeftCss: eff().ui?.sidebarLeftCss !== false
+	});
 	const disposers = [];
 	const disposeAll = () => {
 		for (const dispose of disposers.splice(0)) dispose();
@@ -2096,9 +2203,12 @@ function apply(ctx, rawConfig = {}) {
 			await configStore.load(client());
 			try {
 				const seedClient = client();
-				if (seedClient !== void 0) await seedDocNote(seedClient);
+				if (seedClient !== void 0) {
+					await seedDocNote(seedClient);
+					await seedSidebarLeftCss(seedClient, effectiveUi().sidebarLeftCss);
+				}
 			} catch (err) {
-				console.warn("[dsh-tiddlywiki] seeding doc note:", err);
+				console.warn("[dsh-tiddlywiki] seeding doc note / css:", err);
 			}
 			const uiLang = eff().uiLanguage;
 			if (typeof uiLang === "string" && uiLang.trim().length > 0) try {
@@ -2128,6 +2238,7 @@ function apply(ctx, rawConfig = {}) {
 			git,
 			autoCommit: () => committer?.touch(),
 			noteDefaults: () => ({ tag: effectiveNoteTag() }),
+			uiDefaults: () => effectiveUi(),
 			getWikiPath: () => wikiPath
 		});
 		const disposeAdmin = registerAdminRoutes({ webServer: ws }, {
@@ -2148,6 +2259,6 @@ function apply(ctx, rawConfig = {}) {
 	}, "dsh-tiddlywiki: host teardown");
 }
 //#endregion
-export { AutoCommitter, ConfigStore, DOC_NOTE_TAG, DOC_NOTE_TEXT, DOC_NOTE_TITLE, GitFace, PATH_PREFIX, TiddlyWebClient, WikiServer, apply, bundledCatalog, deepMerge, defineTool, dshHomePath, ensureLanguage, inject, name, normalizeThemes, openInTwEditor, readWikiInfo, registerAdminRoutes, resolveTwRoot, seedDocNote, writeWikiInfo };
+export { AutoCommitter, ConfigStore, DOC_NOTE_TAG, DOC_NOTE_TEXT, DOC_NOTE_TITLE, GitFace, PATH_PREFIX, SIDEBAR_LEFT_CSS, SIDEBAR_LEFT_CSS_TITLE, TiddlyWebClient, WikiServer, apply, bundledCatalog, deepMerge, defineTool, dshHomePath, ensureLanguage, inject, name, normalizeThemes, openInTwEditor, readWikiInfo, registerAdminRoutes, resolveTwRoot, seedDocNote, seedSidebarLeftCss, writeWikiInfo };
 
 //# sourceMappingURL=index.js.map