dsh-tiddlywiki 0.28.7 → 0.28.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-tiddlywiki",
   "description": "把 TiddlyWiki 5 变成你和 Agent 共用的本地文档中心（纯文本 + git）：你在 DSH 界面里阅读、写作、记日记，Agent 用 15 个 tiddlywiki_* 工具读写同一批笔记；每条笔记都是你能读、能改、能审计、能随时带走的文件——不是自动记忆插件，不做后台抓取。可选一键发布到微信公众号草稿箱。 Turn TiddlyWiki 5 into a document center you and your agent share, in plain text under git — a knowledge base you can read, edit, audit and take with you, not an auto-memory plugin. Mounts via the official dsh plugin system; no DSH source changes.",
-  "version": "0.28.7",
+  "version": "0.28.8",
   "type": "module",
   "keywords": [
     "dsh",
@@ -92,7 +92,7 @@
     "smoke:client": "node scripts/smoke-client.mjs",
     "selftest": "node scripts/selftest.mjs",
     "verify:static": "node scripts/verify-send-to-agent-bundle.mjs && node scripts/verify-render-bundle.mjs && node scripts/verify-wechat-publish-bundle.mjs && node scripts/verify-package-contents.mjs && node scripts/verify-version-consistency.mjs && node scripts/verify-constants.mjs && node scripts/verify-doc-links.mjs",
-    "verify:unit": "node scripts/verify-clip-bridge.mjs && node scripts/verify-seed-error-policy.mjs && node scripts/verify-render-sanitizer.mjs && node scripts/verify-secret-masking.mjs && node scripts/verify-write-policy.mjs && node scripts/verify-workspace.mjs && node scripts/verify-wiki-registry.mjs && node scripts/verify-wiki-farm.mjs && node scripts/verify-session-scope.mjs && node scripts/verify-skill-install.mjs && node scripts/verify-repo-keying.mjs && node scripts/verify-restart-drain.mjs && node scripts/verify-language-pin.mjs && node scripts/verify-prompt.mjs && node scripts/verify-conflict-config-guards.mjs && node scripts/verify-config-patch.mjs && node scripts/verify-tool-views.mjs && npx tsx scripts/verify-plugin-runtime.mjs && node scripts/verify-wechat-adapters.mjs && node scripts/verify-wechat-docs-seed.mjs && node scripts/verify-wechat-publish.mjs && npx tsx scripts/verify-tw-origin.mjs && node scripts/verify-frame-guards.mjs && npx tsx scripts/verify-ready-policy.mjs && npx tsx scripts/verify-frame-surface.mjs && npx tsx scripts/verify-editor-popup.mjs && npx tsx scripts/verify-status-cache.mjs && npx tsx scripts/verify-wiki-focus.mjs",
+    "verify:unit": "node scripts/verify-clip-bridge.mjs && node scripts/verify-seed-error-policy.mjs && node scripts/verify-render-sanitizer.mjs && node scripts/verify-secret-masking.mjs && node scripts/verify-write-policy.mjs && node scripts/verify-workspace.mjs && node scripts/verify-wiki-registry.mjs && node scripts/verify-wiki-farm.mjs && node scripts/verify-session-scope.mjs && node scripts/verify-skill-install.mjs && node scripts/verify-repo-keying.mjs && node scripts/verify-restart-drain.mjs && node scripts/verify-desktop-node.mjs && node scripts/verify-language-pin.mjs && node scripts/verify-prompt.mjs && node scripts/verify-conflict-config-guards.mjs && node scripts/verify-config-patch.mjs && node scripts/verify-tool-views.mjs && npx tsx scripts/verify-plugin-runtime.mjs && node scripts/verify-wechat-adapters.mjs && node scripts/verify-wechat-docs-seed.mjs && node scripts/verify-wechat-publish.mjs && npx tsx scripts/verify-tw-origin.mjs && node scripts/verify-frame-guards.mjs && npx tsx scripts/verify-ready-policy.mjs && npx tsx scripts/verify-frame-surface.mjs && npx tsx scripts/verify-editor-popup.mjs && npx tsx scripts/verify-status-cache.mjs && npx tsx scripts/verify-wiki-focus.mjs",
     "verify:e2e": "node scripts/verify-auth.mjs && node scripts/verify-anon-username.mjs && node scripts/verify-tools.mjs && node scripts/verify-audit-fixes.mjs && node scripts/verify-git-resolve.mjs && node scripts/verify-resilience.mjs && node scripts/verify-seed-send-to-agent.mjs && node scripts/verify-seeds-admin.mjs && node scripts/verify-wiki-switch.mjs && node scripts/verify-wiki-farm-boot.mjs",
     "verify:large": "node scripts/verify-large-wiki.mjs",
     "verify": "npm run verify:static && npm run verify:unit && npm run verify:e2e && npm run verify:large",

package/src/client/dom.ts

@@ -0,0 +1,26 @@
+/**
+ * The one DOM element helper shared by the client widgets (v0.28.8).
+ *
+ * WHY A MODULE FOR ONE FUNCTION: `make()` existed as a private copy inside
+ * `settings-page.ts` — fine while the settings page was one file, but extracting
+ * the icon picker (and any future widget) needs the same three lines, and a
+ * second private copy is exactly the kind of drift this repo has paid for before
+ * (see the endpoints.ts note about eight re-declared routes). One definition,
+ * imported where needed.
+ *
+ * @module dsh-tiddlywiki/client/dom
+ */
+
+/**
+ * Create an element with an optional class and text.
+ *
+ * `text` goes through `textContent` — deliberately, not `innerHTML`: callers
+ * pass values that can originate in user-editable files (a wiki's label or icon),
+ * and this helper must never be a markup injection point.
+ */
+export function make<K extends keyof HTMLElementTagNameMap>(tag: K, className?: string, text?: string): HTMLElementTagNameMap[K] {
+  const node = document.createElement(tag)
+  if (className !== undefined) node.className = className
+  if (text !== undefined) node.textContent = text
+  return node
+}

package/src/client/index.ts

@@ -20,6 +20,7 @@ import { createSyncController } from './sync-button.ts'
 import { mountKnowledgeFab } from './knowledge-fab.ts'
 import { createQuickNoteDock } from './quick-note-dock.ts'
 import { createWikiScopeDock } from './wiki-scope-dock.ts'
+import { mountScopeSeat, type ScopeSeatSlots } from './scope-seat.ts'
 import { fetchUiConfig } from './ui-config.ts'
 import { mountSessionSummaryView } from './session-summary.ts'
 import { disposeEditorPopup } from './editor-popup.ts'
@@ -127,6 +128,19 @@ export function apply(ctx: ClientContextFace): void {
             if (removeDock !== undefined) disposers.push(removeDock)
           })
         }
+        // 空白会话（新建）里的知识库选择器（v0.28.8，需求 9）：挂到
+        // `conversation.input.selector.context` —— 模式/预设选择器旁边那一格，
+        // 正是作者要的位置（参考 dsh-client-ui-git-graph 的做法）。
+        //
+        // 与会话内那个选择器的分工（**两者不会同时出现**）：
+        //   · selector.context 是 session-maybe + 只在**空白会话**渲染 →
+        //     新建会话时出现在模式选择器旁；
+        //   · 会话内那个在 quick-note 行里（v0.28.7），只在**已有消息**的会话出现。
+        // 组件自身在两种情况下都会因为拿不到可用数据而不渲染，但这层「哪个座位」
+        // 的选择由 scope-seat.ts 负责；本机 shell 未声明 selector.context 时它会
+        // 回落到 dock（dock 里已经有 quick-note 行的选择器，所以回落态下这一条
+        // 用 blank-only 组件，避免同一选择器在 dock 里出现两次）。
+        safeMount('wiki scope seat', () => disposers.push(mountScopeSeat(ctx.slots as ScopeSeatSlots, createWikiScopeDock({ blankOnly: true }))))
         // 会话顶部「知识库」Tab（conversation.view 槽位）：显示本会话产生/读取/
         // 检索过的 wiki 笔记汇总（TW 原生渲染）。由 ui.showSessionTab 控制（默认
         // 开），tab 名跟随 ui.tabLabel（默认「知识库」）。

package/src/client/note-widget-draft.ts

@@ -0,0 +1,154 @@
+/**
+ * Draft persistence + small pure helpers of the quick-note card (v0.28.8 split).
+ *
+ * WHY IT IS ITS OWN MODULE: the card's draft layer is a self-contained concern —
+ * one window-scoped localStorage namespace, one JSON shape, one signature rule —
+ * and it is the part with the most accumulated history (per-window keys, the
+ * one-time legacy migration, the "already persisted" signature). Keeping it in
+ * `note-widget.ts` buried it under the DOM building; it now reads on its own.
+ *
+ * Nothing here touches the DOM or the card's state machine: the widget owns the
+ * debounce timer and the "is this content already in the wiki" decision, this
+ * module owns only how a draft is stored, read, migrated and compared.
+ *
+ * @module dsh-tiddlywiki/client/note-widget-draft
+ */
+import { fetchStatus } from './status-cache.ts'
+
+/**
+ * 旧版全局草稿 key（v0.18.0 及以前）。多标签页会互相覆盖，现在只作为一次性
+ * 迁移来源读取：读到且本窗口还没有草稿 → 迁移到本窗口的 key 并删除它。
+ */
+const LEGACY_DRAFT_KEY = 'dsh-tw-note-draft-v1'
+/** 本窗口草稿 key 前缀（`<前缀><窗口 id>`），窗口之间互不覆盖。 */
+const DRAFT_KEY_PREFIX = 'dsh-tw-note-draft-v1:'
+/** sessionStorage 里保存本标签页窗口 id 的 key（刷新后仍是同一个窗口）。 */
+const DRAFT_WINDOW_ID_KEY = 'dsh-tw-note-window-id'
+/** Draft auto-save debounce. */
+export const DRAFT_DEBOUNCE_MS = 500
+
+/**
+ * 本窗口的草稿命名空间 id：优先取 sessionStorage 里的随机 id（同一标签页刷新后
+ * 仍是同一个窗口 → 自己的草稿静默恢复）；sessionStorage 不可用时退化为「本次
+ * 加载一个随机 id」（刷新后会被当成「其它窗口的草稿」，恢复时给出提示而不是
+ * 静默覆盖）。
+ */
+const DRAFT_WINDOW_ID: string = (() => {
+  try {
+    const existing = sessionStorage.getItem(DRAFT_WINDOW_ID_KEY)
+    if (existing !== null && existing.length > 0) return existing
+    const created = Math.random().toString(36).slice(2, 10)
+    sessionStorage.setItem(DRAFT_WINDOW_ID_KEY, created)
+    return created
+  } catch {
+    return Math.random().toString(36).slice(2, 10)
+  }
+})()
+
+export interface Draft { text: string; title: string; tags: string[]; savedAt: number; windowId?: string }
+
+/** 读取结果：draft = 草稿本体；foreign = 不是本窗口写的（迁移/跨窗口）。 */
+export interface DraftHit { draft: Draft; foreign: boolean }
+
+function draftKey(): string {
+  return `${DRAFT_KEY_PREFIX}${DRAFT_WINDOW_ID}`
+}
+
+function parseDraft(raw: string | null): Draft | null {
+  if (raw === null) return null
+  try {
+    const parsed = JSON.parse(raw) as Partial<Draft>
+    if (typeof parsed.text !== 'string' || typeof parsed.title !== 'string') return null
+    return {
+      text: parsed.text,
+      title: parsed.title,
+      tags: Array.isArray(parsed.tags) ? parsed.tags.filter((t): t is string => typeof t === 'string') : [],
+      savedAt: typeof parsed.savedAt === 'number' ? parsed.savedAt : 0,
+      windowId: typeof parsed.windowId === 'string' ? parsed.windowId : undefined,
+    }
+  } catch {
+    return null
+  }
+}
+
+function readDraftFrom(key: string): Draft | null {
+  try {
+    return parseDraft(localStorage.getItem(key))
+  } catch {
+    return null
+  }
+}
+
+/**
+ * 读取本窗口草稿。本窗口 key 为空时尝试迁移旧全局 key（一次性：迁移后删除旧
+ * key）。返回 null = 没有任何草稿；foreign=true = 草稿来源不是本窗口（旧 key
+ * 迁移过来，或 sessionStorage 不可用时窗口 id 变了），调用方需要给出可见提示。
+ */
+export function loadDraft(): DraftHit | null {
+  const own = readDraftFrom(draftKey())
+  if (own !== null) {
+    return { draft: own, foreign: own.windowId !== undefined && own.windowId !== DRAFT_WINDOW_ID }
+  }
+  const legacy = readDraftFrom(LEGACY_DRAFT_KEY)
+  if (legacy === null) return null
+  // 旧 key 一次性迁移：补上本窗口标记写进本窗口 key，然后删除旧 key。
+  const migrated: Draft = { ...legacy, windowId: DRAFT_WINDOW_ID }
+  persistDraft(migrated)
+  try { localStorage.removeItem(LEGACY_DRAFT_KEY) } catch { /* ignore */ }
+  return { draft: migrated, foreign: true }
+}
+
+/** 采纳草稿（标记为本窗口所有），避免每次打开都重复提示「来自其它窗口」。 */
+export function adoptDraft(draft: Draft): void {
+  persistDraft({ ...draft, windowId: DRAFT_WINDOW_ID })
+}
+
+export function persistDraft(draft: Draft): void {
+  try { localStorage.setItem(draftKey(), JSON.stringify({ ...draft, windowId: DRAFT_WINDOW_ID })) } catch { /* storage unavailable */ }
+}
+
+export function clearDraft(): void {
+  try { localStorage.removeItem(draftKey()) } catch { /* ignore */ }
+}
+
+/**
+ * 内容签名（标题 + 正文 + 标签）：用来判断「这份内容是不是已经写进 wiki 了」。
+ * 只做相等比较，不是哈希——不做安全用途（v0.19.1）。
+ */
+export function draftSignature(title: string, text: string, tags: string[]): string {
+  return `${title}\u0000${text}\u0000${tags.join('\u0001')}`
+}
+
+function pad(n: number): string {
+  return n < 10 ? `0${n}` : String(n)
+}
+
+/** Default note title: `YYYY-MM-DD HH:mm`. */
+export function timestampTitle(date = new Date()): string {
+  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`
+}
+
+/** Compact Chinese relative time for the recent picker (e.g. "3小时前"). */
+export function relativeTime(iso: string | null): string {
+  if (iso === null) return ''
+  const ms = new Date(iso).getTime()
+  if (Number.isNaN(ms)) return ''
+  const diff = Date.now() - ms
+  const min = Math.floor(diff / 60_000)
+  if (min < 1) return '刚刚'
+  if (min < 60) return `${min}分钟前`
+  const hr = Math.floor(min / 60)
+  if (hr < 24) return `${hr}小时前`
+  const day = Math.floor(hr / 24)
+  if (day < 30) return `${day}天前`
+  return new Date(ms).toLocaleDateString('zh-CN')
+}
+
+/** The default tag for a new note (settings `note.tag`).
+ *
+ *  Reads the shared, TTL-cached `/status` projection rather than a private copy
+ *  of the `ui.*` shape (v0.22.8 — this was one of three duplicates). */
+export async function fetchDefaultTag(): Promise<string> {
+  const status = await fetchStatus()
+  return typeof status?.note?.tag === 'string' && status.note.tag.length > 0 ? status.note.tag : 'inbox'
+}

package/src/client/note-widget-tags.ts

@@ -0,0 +1,184 @@
+/**
+ * Multi-tag chip editor for the quick-note card (v0.28.8 split).
+ *
+ * WHY IT IS ITS OWN MODULE: a self-contained widget with its own DOM, its own
+ * tag-suggestion cache and its own document-level listener — the card only
+ * mounts it. It also carries a rule worth reading on its own: tag suggestions
+ * are fetched PER TARGET WIKI (v0.28.0), because a note written to wiki B must
+ * not offer wiki A's tags.
+ *
+ * @module dsh-tiddlywiki/client/note-widget-tags
+ */
+import { TAGS_ENDPOINT } from './endpoints.ts'
+
+/** Multi-tag chip editor with autocomplete from the wiki's existing tags. */
+export function buildTagEditor(opts: { onChange?: () => void; wikiQuery?: (url: string) => string } = {}): {
+  el: HTMLDivElement
+  /** Commits any pending input first, then returns the chips (user actions). */
+  getTags: () => string[]
+  /** Pure read of the committed chips — never commits pending input. */
+  peekTags: () => string[]
+  setDefault: (tag: string) => void
+  setTags: (tags: string[]) => void
+  /** Remove the document-level outside-click listener (unmount must not leak). */
+  dispose: () => void
+} {
+  const wrap = document.createElement('div')
+  wrap.className = 'dsh-tw-note-tags'
+
+  const chipWrap = document.createElement('div')
+  chipWrap.className = 'dsh-tw-note-chips'
+  const input = document.createElement('input')
+  input.className = 'dsh-tw-note-taginput'
+  input.placeholder = 'tag（可多选，自动补全）'
+  const suggest = document.createElement('div')
+  suggest.className = 'dsh-tw-note-tagsuggest'
+  suggest.hidden = true
+  wrap.append(chipWrap, input, suggest)
+
+  const chips: string[] = []
+  const hideSuggest = (): void => { suggest.hidden = true }
+
+  const emit = (): void => { opts.onChange?.() }
+
+  const renderChips = (): void => {
+    chipWrap.replaceChildren()
+    for (const tag of chips) {
+      const chip = document.createElement('span')
+      chip.className = 'dsh-tw-note-tagchip'
+      chip.textContent = tag
+      const x = document.createElement('span')
+      x.className = 'dsh-tw-note-tagchip-x'
+      x.textContent = '×'
+      x.title = `移除 tag「${tag}」`
+      x.addEventListener('click', (event) => {
+        event.stopPropagation()
+        const i = chips.indexOf(tag)
+        if (i >= 0) {
+          chips.splice(i, 1)
+          renderChips()
+          emit()
+        }
+      })
+      chip.append(x)
+      chipWrap.append(chip)
+    }
+  }
+
+  const addTag = (tag: string): void => {
+    const t = tag.trim()
+    if (t.length === 0 || chips.includes(t)) return
+    chips.push(t)
+    input.value = ''
+    renderChips()
+    hideSuggest()
+    input.focus()
+    emit()
+  }
+
+  const commitInput = (): void => {
+    for (const raw of input.value.split(/\s+/)) addTag(raw)
+  }
+
+  // Existing tags, fetched lazily once per widget lifetime — PER TARGET WIKI
+  // (v0.28.0): the card can be pointed at another knowledge base, and its tag
+  // suggestions must come from the same one the note is written to. The memo is
+  // keyed by the resolved URL, so switching the target re-reads automatically
+  // (no reset call, nothing to forget).
+  let knownTags: string[] = []
+  let tagsPromise: Promise<string[]> | undefined
+  let tagsPromiseKey: string | undefined
+  const ensureTags = (): Promise<string[]> => {
+    const url = opts.wikiQuery?.(TAGS_ENDPOINT) ?? TAGS_ENDPOINT
+    if (tagsPromise === undefined || tagsPromiseKey !== url) {
+      tagsPromiseKey = url
+      tagsPromise = fetch(url, { signal: AbortSignal.timeout(5_000) })
+        .then((r) => (r.ok ? (r.json() as Promise<{ tags?: string[] }>) : Promise.resolve<{ tags?: string[] }>({})))
+        .then((p) => [...(p.tags ?? [])].sort((a, b) => a.localeCompare(b, 'zh')))
+        .catch(() => [])
+      void tagsPromise.then((list) => { knownTags = list })
+    }
+    return tagsPromise
+  }
+
+  const showSuggest = (): void => {
+    const q = input.value.trim().toLowerCase()
+    const matches = knownTags
+      .filter((t) => !chips.includes(t) && (q.length === 0 || t.toLowerCase().includes(q)))
+      .slice(0, 8)
+    suggest.replaceChildren()
+    for (const tag of matches) {
+      const item = document.createElement('div')
+      item.className = 'dsh-tw-note-tagsuggest-item'
+      item.textContent = tag
+      // 键盘可达：div + mousedown 对键盘用户不可用，补 role/tabIndex/Enter·Space。
+      item.setAttribute('role', 'button')
+      item.tabIndex = 0
+      item.setAttribute('aria-label', `添加标签「${tag}」`)
+      item.addEventListener('mousedown', (event) => {
+        event.preventDefault()
+        addTag(tag)
+      })
+      item.addEventListener('keydown', (event) => {
+        if (event.key === 'Enter' || event.key === ' ') {
+          event.preventDefault()
+          addTag(tag)
+        }
+      })
+      suggest.append(item)
+    }
+    suggest.hidden = matches.length === 0
+  }
+
+  input.addEventListener('focus', () => { void ensureTags().then(showSuggest) })
+  input.addEventListener('input', () => {
+    if (knownTags.length === 0) void ensureTags().then(showSuggest)
+    else showSuggest()
+  })
+  input.addEventListener('keydown', (event) => {
+    if (event.key === 'Enter' || event.key === ',') {
+      event.preventDefault()
+      commitInput()
+    } else if (event.key === 'Backspace' && input.value.length === 0 && chips.length > 0) {
+      chips.pop()
+      renderChips()
+      emit()
+    } else if (event.key === 'Escape') {
+      hideSuggest()
+    }
+  })
+  const onDocClick = (event: Event): void => {
+    if (!wrap.contains(event.target as Node)) hideSuggest()
+  }
+  document.addEventListener('click', onDocClick, true)
+
+  return {
+    el: wrap,
+    getTags: () => {
+      commitInput()
+      return [...chips]
+    },
+    peekTags: () => [...chips],
+    setDefault: (tag: string) => {
+      // Only pre-fill when nothing is chosen yet; never steal focus.
+      if (chips.length === 0) {
+        const t = tag.trim()
+        if (t.length > 0) {
+          chips.push(t)
+          renderChips()
+        }
+      }
+    },
+    setTags: (tags: string[]) => {
+      chips.length = 0
+      for (const tag of Array.isArray(tags) ? tags : []) {
+        const t = typeof tag === 'string' ? tag.trim() : ''
+        if (t.length > 0 && !chips.includes(t)) chips.push(t)
+      }
+      input.value = ''
+      renderChips()
+      hideSuggest()
+    },
+    dispose: () => document.removeEventListener('click', onDocClick, true),
+  }
+}

package/src/client/note-widget-upload.ts

@@ -0,0 +1,50 @@
+/**
+ * Attachment upload for the quick-note card (v0.28.8 split).
+ *
+ * One function, one concern: take a `File` the user dropped / picked, POST it to
+ * the upload route, and insert the resulting Markdown image/link line at the
+ * caret. Kept out of `note-widget.ts` so the widget file stays about the card's
+ * state machine and DOM.
+ *
+ * @module dsh-tiddlywiki/client/note-widget-upload
+ */
+import { toast } from './toast.ts'
+import { type MarkdownEditor } from './markdown-editor.ts'
+import { UPLOAD_ENDPOINT } from './endpoints.ts'
+
+export const MAX_UPLOAD_BYTES = 64 * 1024 * 1024
+
+/**
+ * Upload one file to the wiki (raw body, name in ?name=), then insert a
+ * Markdown image/link line at the caret of the given editor.
+ *
+ * `wikiQuery` scopes the upload to the CARD's target knowledge base (v0.28.0):
+ * an attachment must land in the same wiki as the note that references it.
+ */
+export async function uploadInto(file: File, editor: MarkdownEditor, wikiQuery: (url: string) => string = (url) => url): Promise<void> {
+  if (file.size > MAX_UPLOAD_BYTES) {
+    toast(`文件过大（≤ ${Math.round(MAX_UPLOAD_BYTES / 1024 / 1024)}MB）`)
+    return
+  }
+  try {
+    const res = await fetch(wikiQuery(`${UPLOAD_ENDPOINT}?name=${encodeURIComponent(file.name)}`), {
+      method: 'POST',
+      headers: { 'content-type': file.type || 'application/octet-stream' },
+      body: file,
+      signal: AbortSignal.timeout(120_000),
+    })
+    const payload = (await res.json().catch(() => null)) as { ok?: boolean; name?: string; url?: string; error?: string } | null
+    if (!res.ok || payload?.ok !== true) {
+      toast(`上传失败：${payload?.error ?? `HTTP ${res.status}`}`)
+      return
+    }
+    const name = payload.name ?? file.name
+    const markdown = file.type.startsWith('image/')
+      ? `![${name}](${payload.url})`
+      : `[${name}](${payload.url})`
+    editor.insertAtCaret(markdown)
+    toast(`已上传「${name}」并插入链接`)
+  } catch (err) {
+    toast(`上传失败：${err instanceof Error ? err.message : String(err)}`)
+  }
+}