Compare commits

...
75 Commits
Author SHA1 Message Date
amitwh f63a678c88 fix(security): strengthen ReDoS denylist in search-in-files
Follow-up to the push-sweep review: the previous UNSAFE_REGEX used
JS bitwise OR (|) between regex literals, accidentally OR-ing the
RegExp objects instead of combining alternatives into one pattern.

Replace with a single RegExp that catches:
- nested quantifiers (a+)+, [a-z]*+
- class + quantifier
- dot-quantifier followed by dot-quantifier
- lookahead / lookbehind (?=, ?!)
- backrefs \1..\9
- alternation + quantifier

Also add MAX_REGEX_LENGTH=200 hard cap. The denylist is still
defense-in-depth — the length, files-traversed, and per-file-byte caps
are the primary defense.
2026-07-23 09:39:08 +05:30
amitwh 5e76d77ece fix(security): harden search-in-files against DoS + path traversal
Address findings from automated security review:

1. Validate rootPath via validatePath/isPathAccessible before recursing,
   matching the pattern used by read-file/write-file.
2. Cap query length at 1024 chars to bound regex compilation cost.
3. Reject regexes matching classic ReDoS shapes (nested quantifiers
   and similar) before invoking RegExp.
4. Use realpathSync to resolve symlinks and verify containment under
   rootPath; drop symlinks that point outside the search root.
5. Cap total files traversed at 10000, in addition to existing
   1000-result and 2MB-per-file caps.

Add regression tests for each guard.
2026-07-23 09:34:57 +05:30
amitwh f43e34ca2b fix(ipc): re-type wrapper signatures to match handler return shapes
Many IPC handlers were returning useful data but the wrappers typed
'void', silently dropping the response. Re-type all affected wrappers:

- file.write: returns { path } (resolved after security validation)
- file.delete/ensureDir/exists/isDirectory/copy/move: full wrappers
  (previously only on window.electronAPI.file.*)
- crash.read: typed as Array<{...}> so callers can trust the shape
- crash.delete: returns boolean
- gitStage: returns { files, error? } so callers can detect failure
- gitCommit: returns { summary } | { error }
- updater.check/getState: returns { state }
2026-07-23 09:34:57 +05:30
amitwh 6da2ba7cc7 fix(ipc): crash modal reads wrapper, search wired to real handler
CrashReportModal crashed on dumps.map because ipc.crash.read returns
{ ok, data } and the consumer was assigning the wrapper to state. Now
unwraps .data and falls back to [] on error.

ipc.file.search was miswired to ipc.file.pickFile — clicking 'Search'
popped a file picker instead of searching. Add real 'search-in-files'
handler in src/main/files/search-in-files.js with regex support,
case-sensitivity toggle, .git/node_modules/dist skip, 2MB file cap, and
1000-result limit. Wire preload bridge + TS declaration + allowlist.

Also:
- Drop dead ipc.file.open wrapper that was miswired to pickFile
- Rename FileEntry field 'modified' to 'modifiedAt' (number) so the
  IPC payload matches the declared type
- Update CrashReportModal tests to use the safeCall envelope shape
2026-07-23 09:34:57 +05:30
amitwh f1f8a16a79 fix: list-directory returns flat array, drop defensive fallback
The list-directory handler returned { path, entries } while the
renderer typed result.data as FileEntry[]; the file-store had to fall
back to raw.entries via Array.isArray. Extract the entries builder into
src/main/files/list-directory.js so it can be unit-tested, return a
plain array, and skip entries that can't be stat'd (broken symlinks,
permission errors) instead of throwing.

Also tighten jest config so dist/*.snap electron-builder artifacts are
not matched as test suites.
2026-07-23 09:34:57 +05:30
amitwh 772a791d9a fix(git): git-status IPC returns a flat array, not wrapped object
GitOperations.getStatus returns { files: [...] } but the renderer's
ipc.file.gitStatus type declares Array<...> and calls result.data.map().
The mismatch made GitStatusPanel.tsx throw 'n.map is not a function'
on mount, which blanked the entire React tree.

Unwrap result.files in the IPC handler so it returns the array the
renderer expects. Add tests covering the success, empty, and non-git
branches so this regression cannot recur.

Refs: blank-screen-on-md-open
2026-07-23 09:34:57 +05:30
amitwh ec3d53ea7e chore: lint cleanup + 5.1.0 changelog entry
- Drop unused imports/vars (withEpubEmbedFontArgs, monoPdfHeaderDir, _e)
- Append CHANGELOG entry summarising the parity work and the
  Markdown Converter React rename
2026-07-23 09:34:57 +05:30
amitwh 50c6369348 test(e2e): verify monospace font embeds into PDF/DOCX/EPUB/HTML 2026-07-23 09:34:57 +05:30
amitwh 81d38160d8 build(identity): rename to Markdown Converter React + defaults
- package.json: name -> markdown-converter-react; productName -> Markdown
  Converter React; appId -> com.concreteinfo.markdownconverter.react;
  linux.executableName -> markdown-converter-react
- Window title: 'Markdown Converter — React Dev' in dev mode
- Migration defaults: monospaceFont, monospaceLigatures, appVariant
- Bumped fields in v5OnlyFields so v4->v5 detection covers new keys
2026-07-23 09:34:57 +05:30
amitwh 28ef350f39 feat(ipc): expose monospace settings through preload bridge
- Add 'get-monospace-settings' + 'set-monospace-settings' to allowlist
- Expose electronAPI.monospace.{getSettings,saveSettings}
- Extend ElectronAPI TypeScript interface with the monospace namespace
2026-07-23 09:34:57 +05:30
amitwh d29f19b1f5 feat(renderer): body-class monospace toggle + CSS tokens
- useMonospaceClasses hook calls electronAPI.monospace.getSettings()
  and toggles body.mono-{jetbrains-mono,fira-code} and
  body.mono-ligatures-{on,off} classes
- Add --font-mono-active and --font-mono-feature tokens in globals.css
- Apply to code/pre/kbd/samp so all code rendering picks up the active
  monospace font + ligature settings
2026-07-23 09:34:57 +05:30
amitwh b2ad8b8326 fix(security): address supply-chain + resource-leak findings
- PdfFontHeader: use mkdtempSync for exclusive temp dir; caller unlinks
  after pandoc consumes (cleanup wired into exportWithPandoc callback)
- download-tools: pin FiraCode to immutable release v6.2 with SHA-256
  digests verified before atomic rename; refuse download on mismatch
- Vendor missing FiraCode-Bold.ttf + JetBrainsMono-Regular.ttf
2026-07-23 09:34:57 +05:30
amitwh d2f3118bfe feat(main): wire monospace embedders into PDF/DOCX/EPUB/HTML exports
- Add getActiveMonospaceContext() helper that reads settings + resolves TTF
- PDF: build fontspec header and pass --include-in-header to xelatex
- DOCX: post-process zip to embed TTF and add fontTable.xml + rels
- EPUB: prepend --epub-embed-font + patch manifest
- HTML: embed woff2 base64 into built-in marked exporter CSS
- Register get-monospace-settings / set-monospace-settings IPC at startup
2026-07-23 09:34:57 +05:30
amitwh 4cb38cd861 build(monospace): bundle JetBrains Mono + Fira Code TTFs, asarUnpack
- Copy TTFs and LICENSE files from master v4.5.0
- Add assets/fonts/** to electron-builder files + asarUnpack
- Extend download-tools.js with downloadFiraCode() parallel to downloadPandoc()
2026-07-23 09:34:57 +05:30
amitwh 65dfdfb307 feat(monospace): add get/set IPC handlers with safe validation 2026-07-23 09:34:57 +05:30
amitwh f1c3aaa0ef feat(monospace): build CSS with embedded woff2 base64 2026-07-23 09:34:57 +05:30
amitwh 0c37a8ca2d feat(monospace): EPUB embed-font helper + manifest patcher 2026-07-23 09:34:57 +05:30
amitwh 992c6b72d6 feat(monospace): embed TTF into pandoc-generated DOCX 2026-07-23 09:34:57 +05:30
amitwh 001c9463e3 feat(monospace): add xelatex fontspec header builder 2026-07-23 09:34:57 +05:30
amitwh 3602bc35a7 feat(monospace): add path resolver for bundled TTF assets 2026-07-23 09:34:57 +05:30
amitwh 14b5a38a5a feat(monospace): add settings schema with safe defaults 2026-07-23 09:34:57 +05:30
amitwh 33a61e65ef docs(plan): monospace font embedding + naming implementation plan 2026-07-23 09:34:57 +05:30
amitwh 857fd8a75a docs(spec): monospace font embedding + naming differentiation design
Port master's v4.5.0 monospace font embedding feature (JetBrains Mono +
Fira Code TTF assets, embedded into PDF/DOCX/EPUB/HTML exports) and
rename branch identity to Markdown Converter React so dev build coexists
with the installed markdown-converter deb without appId/productName
collisions.

Amit Haridas
2026-07-23 09:34:57 +05:30
amitwh b8d26c8d78 chore(repo-map): add auto-generated structural map
Generated with ~/.claude-shared/scripts/repo-map.sh (universal-ctags).
Signatures-only map of classes/functions/methods/interfaces/enums.

Amit Haridas
2026-07-18 07:23:30 +05:30
amitwh bb4e874809 docs(claude-md): add tailored CLAUDE.md for react-electron branch
Documents the React 19 + TypeScript + Tailwind/shadcn rewrite: dual
Vite+Electron dev workflow, modular main process, Zustand stores,
typed IPC via preload whitelist, two-stage build pipeline, and
dual test runners (Jest main, Vitest renderer).

Amit Haridas
2026-06-19 23:18:22 +05:30
amitwh 36422a9ab3 feat: complete master feature parity with interactive PDF editing, Reveal.js export dialog, Large File Mode, and scoped CSS 2026-06-15 01:22:17 +05:30
amitwh 7eb90d467a feat: wire batch media converter and document compare, remove coming-soon stubs
- batch.showConverter: open BatchMediaConverterDialog for image/audio/video
  types (uses existing universal-convert-batch handler with ImageMagick/FFmpeg)
- tools.documentCompare: line-by-line diff of two open tabs with confirmation
  dialog, shows diff count in toast and full diff in console
- No more 'coming soon' toasts for any menu item
2026-06-14 01:51:43 +05:30
amitwh 809c266e54 fix: serialize git status/stage/commit/log results for IPC transfer
simple-git returns objects with Map/Set fields that cannot be cloned
over Electron IPC. Flatten all git operation results into plain
JSON-serializable objects to fix 'An object could not be cloned' error.
2026-06-14 01:43:29 +05:30
amitwh 2e3f4dda0f fix: add missing rendererReady call and fix temporal dead zone crash
- App.tsx: call electronAPI.file.rendererReady() on mount so main process
  opens pendingFile (files passed via CLI or file associations)
- FindReplaceBar: move updateMatchCount declaration before executeCommand
  to fix 'Cannot access d before initialization' crash in minified build
  (executeCommand referenced updateMatchCount via closure before its
  const declaration in the same scope)
2026-06-14 01:25:05 +05:30
amitwh 21a00a53a4 fix: resolve 12 critical runtime failures, security issue, and dead code
CRITICAL fixes:
- GitStatusPanel: use ipc.file.gitStage/gitCommit instead of non-existent top-level methods
- HeaderFooterDialog: use send/on channels instead of non-existent headerFooter namespace
- CodeMirrorEditor: use invoke('save-pasted-image') instead of non-existent savePastedImage
- ipc.ts: map to correct preload namespaces (git.status, git.stage, git.commit)
- Add pick-folder/pick-file to ALLOWED_SEND_CHANNELS whitelist
- Add git convenience namespace to preload (git.status/stage/commit/log/diff)

HIGH fixes:
- FindReplaceBar: replace broken match count stub with regex-based counter
- PDF export window: disable nodeIntegration, enable contextIsolation + sandbox
- Git handler: accept rootPath argument from renderer
- Add git-diff IPC handler + GitOperations.diff()

MEDIUM fixes:
- Remove 4 dead functions: checkPandocAvailable, safeExecFile, runPandoc, openPDFFile, exportWithPandocPDF
- Remove stale ODT header/footer console.log stub
- Rewrite electron.d.ts to match actual preload API shape
2026-06-13 19:52:51 +05:30
amitwh f2398e6e1a feat: enhance WelcomeDialog, export dialogs, GitStatusPanel, add CommandPalette, FindReplaceBar, and new converter dialogs
- WelcomeDialog: add quick start, feature showcase, keyboard shortcuts, recent files, version display
- ExportDocxDialog/ExportHtmlDialog/ExportPdfDialog: add header/footer, paper size, margin controls
- GitStatusPanel: full staging/unstaging, discard, commit workflow
- CommandPalette: fuzzy command search with keyboard navigation
- FindReplaceBar: find/replace with regex, case, whole-word options
- New dialogs: BatchMediaConverterDialog, HeaderFooterDialog, PdfEditorDialog, UniversalConverterDialog
- Tests: comprehensive coverage for all new/updated components
2026-06-13 19:34:42 +05:30
amitwh 6b564a4569 style: run prettier formatter over src and tests 2026-06-11 20:46:00 +05:30
amitwh 2389d4f297 feat: add writing analytics dashboard and daily word goal tracking 2026-06-11 20:44:16 +05:30
amitwh 50f4f62575 fix: handle list-directory return shape {entries} in openFolder/loadChildren
The main process list-directory handler returns {path, entries} but
the file store was calling .map() directly on result.data. Since
arrays have a .entries iterator method, the nullish coalescing
fallback didn't work. Now properly extracts the entries array with
Array.isArray check.
2026-06-11 07:49:42 +05:30
amitwh 9ef5317d71 fix: add show-document-compare to preload receive channel whitelist
The IPC channel was missing from ALLOWED_RECEIVE_CHANNELS in preload.js,
causing the useBridgeNativeMenu listener to be silently blocked.
2026-06-11 07:37:48 +05:30
amitwh cf6b6817b9 fix: wire orphaned IPC channels, fix data-loss bug, print preview events, sidebar navigation
- Fix file.clearRecent sending IPC to main process instead of clearing openTabs
- Wire show-batch-converter, show-document-compare, open-header-footer-dialog IPC channels
- Add print preview event listeners (mc:print-preview, mc:print-preview-styled) in App.tsx
- Fix sidebar hidden bridge buttons toggling sidebar closed after scroll
- Update sidebar menu labels to match actual sections (Files, Outline, Git)
- Fix ipc.print to be an object with show/doPrint methods (was bare function)
- Update callers: ExportPdfDialog, pdf-export, PrintPreview
- Add 7 regression tests for all fixes
- Clean 2 obsolete snapshots
- Build Linux packages (deb, AppImage, snap) — 549 tests passing
2026-06-11 07:15:33 +05:30
amitwh e25a5e1d75 fix(migration): normalize legacy theme values under v5 marker
Two related bugs surfaced during end-to-end verification:

1. The 'isAlreadyV5' short-circuit in both the main-side and renderer-side
   v4-to-v5 transforms returned the persisted object as-is when a
   migration.version=5 marker was present. A previously-shipped v4 build
   had written theme: 'ayu-light' (and similar) under the v5 marker;
   the transform trusted the marker and passed the invalid theme through,
   which then failed the renderer's zod schema on every launch and
   reset user settings to defaults.

   Fix: in both transforms, when isAlreadyV5 matches, normalize theme
   against the v5 enum (light/dark/system) and validate the full result
   with the v5 schema before returning. Out-of-range values are replaced
   with the v5 default ('system').

2. The renderer's settings-store onRehydrateStorage callback called
   useSettingsStore.setState() to reset the store on validation failure.
   At that moment the store is still being constructed, and setState
   could hit a TDZ ReferenceError (the one we already wrapped in a
   try/catch in v5.0.0, which only hid the symptom).

   Fix: return the normalized state object from onRehydrateStorage
   instead. Zustand's persist middleware applies the returned value
   *after* construction completes, so there is no TDZ.

Tests: 334 vitest + 208 jest = 542 passing.
E2E: 12/12 verify-features.mjs steps green; no console errors.

Amit Haridas
2026-06-08 07:45:06 +05:30
amitwh c5d4b113bd fix(polish): address 3 review blockers + 1 security issue
1. ThemeSettings: change 'auto' radio value to 'system' to match
   the v5 settingsSchema enum. Storing 'auto' silently wipes all
   settings on next launch.
2. UpdateBanner: render an 'available' branch so users see a CTA
   when a new version is detected (the store already had this state,
   but the banner was silent). Added a test.
3. feed-config: remove the unused resolveFeedUrl / FEEDS exports.
   feedConfigFor is the actual implementation used by the IPC
   handler. Updated tests to match.
4. main/index.js: tighten app:open-external regex to https:// only.
2026-06-08 07:35:54 +05:30
Amit Haridas 1715e26e5f chore: E2E additions to verify-features.mjs (note: .claude/ is gitignored, see script content in working tree) 2026-06-08 07:23:11 +05:30
Amit Haridas 81484a8d33 test(e2e): verify first-run wizard and update banner in live app
- verify-features.mjs: dismiss FirstRunWizard if visible before clicking
  toolbar (wizard overlay blocked previous toolbar clicks); write a
  firstRun=true settings.json to test wizard visibility; emit
  'updater:status' from main via Playwright IPC.
- package.json: dev:electron now passes --no-sandbox to match the
  .claude/skills/run-desktop driver scripts.
2026-06-08 07:23:01 +05:30
amitwh 6df1389cc8 fix(updater): dispatch setFeedURL by provider instead of raw url 2026-06-08 07:11:28 +05:30
amitwh aeadde5f40 fix(migration): handle already-v5 settings and ensure 'failed' branch writes v5 marker 2026-06-08 07:02:45 +05:30
amitwh 74dde8d6d1 docs: v5.1.0 changelog + Distribution & Updates section 2026-06-08 06:49:12 +05:30
amitwh cd57f34c36 ci(release): publish latest.yml on all platforms, mirror to ConcreteInfo 2026-06-08 06:48:00 +05:30
amitwh 4da701deb5 ci: run on react-electron branch and ensure both jest and vitest run 2026-06-08 06:46:11 +05:30
amitwh 41c68fcf82 feat(renderer): auto-check for updates 5s after launch when enabled 2026-06-08 06:45:16 +05:30
amitwh 9b899b5205 feat(renderer): mount UpdateBanner, FirstRunWizard, and CrashReportModal 2026-06-08 06:43:40 +05:30
amitwh 691b00a2b8 feat(settings): add Updates section with channel radio and Check now 2026-06-08 06:40:51 +05:30
amitwh ade6c115b8 feat(renderer): add CrashReportModal listing local dumps 2026-06-08 06:38:08 +05:30
amitwh cc33e6c7a8 feat(renderer): add FirstRunWizard with theme/channel/template steps 2026-06-08 06:34:40 +05:30
amitwh 59fd9b8646 feat(renderer): add UpdateBanner for non-blocking update notifications 2026-06-08 06:31:07 +05:30
amitwh d87f175212 feat(renderer): add updater store mirroring main process state 2026-06-08 06:27:13 +05:30
amitwh ef88b6343b feat(settings): add updateChannel, autoCheckUpdates, firstRun fields 2026-06-08 06:25:58 +05:30
amitwh e8c9f95d25 feat(main): initialize updater, crash writer, and migration on app start 2026-06-08 06:24:34 +05:30
amitwh f85c1a8107 feat(preload): allowlist updater:* and crash:* channels, expose API 2026-06-08 06:20:59 +05:30
amitwh b1b9aa3727 feat(ipc): add updater and crash IPC handlers 2026-06-08 06:19:15 +05:30
amitwh 77ad2fdb9d test(settings): update default theme expectation from 'auto' to 'system' 2026-06-08 06:18:11 +05:30
amitwh c62070304f feat(migration): add v4-to-v5 settings migration runner with backup 2026-06-08 06:16:17 +05:30
amitwh 9f4bfbdfee feat(crash): add CrashWriter for local crash dumps (cap 20, prune oldest) 2026-06-08 06:14:02 +05:30
amitwh 2e41b59da5 feat(updater): add UpdaterService wrapping electron-updater lifecycle 2026-06-08 06:12:04 +05:30
amitwh 57c8f92f42 feat(updater): add feed-config to map channel setting to feed URL 2026-06-08 06:10:06 +05:30
amitwh 9da4b96f76 chore(deps): add electron-updater for auto-update flow 2026-06-08 06:08:35 +05:30
Amit Haridas 5b81988f30 docs(plan): production polish implementation plan
21 tasks, 90 actionable steps. TDD throughout. Each step shows the
exact code and the exact command with expected output.

Tasks:
1. Install electron-updater
2-5. Updater service, crash writer, migration runner, feed config (TDD)
6-7. IPC handlers + preload allowlist
8. Wire services in main entry
9-10. Settings + updater store
11-13. UpdateBanner, FirstRunWizard, CrashReportModal
14-16. Settings sheet updates + App.tsx mounts
17-18. CI + release workflows (publish latest.yml, mirror to CI)
19. Docs
20-21. E2E verification + tag v5.1.0

After this plan executes, the remaining v5+ sub-projects are:
- Cloud/licensing (next spec)
- Plugin system
- Performance + accessibility
2026-06-07 23:47:15 +05:30
Amit Haridas a5da5d19bc docs(spec): production polish design for v5 shippable build
Brainstormed with the user (ULTRATHINK context). Sub-project 1 of 4 in the
v5+ roadmap (production polish → cloud/licensing → plugins → perf+a11y).

Spec covers:
- Two-channel distribution: GitHub Releases (default) + ConcreteInfo self-hosted
- Light, skippable first-run wizard (theme + update channel + starter template)
- Auto-migrate v4.4.1 settings with v4 backup and toast on success/failure
- Local crash dump capture (no third-party) with a CrashReportModal
- Non-blocking update banner with user-confirmed restart-to-install
- IPC allowlist additions for updater:* and crash:*
- GitHub Actions CI extension (latest.yml generation, PR test suite)

Defers to v5.1: code signing, Sentry, delta updates, beta tracks.

After user review and approval, write the implementation plan via the
writing-plans skill.
2026-06-07 23:42:03 +05:30
amitwh 74ff6afb19 feat(renderer): wire remaining stubbed commands and rebuild
The v5.0.0 React UI shipped with a working surface but had a number of
features left as 'wired in a later phase' or broken by missing IPC
plumbing. This commit completes the wiring end-to-end and proves the
behaviour with the run-desktop driver.

Toolbar format buttons (Toolbar.tsx)
  - Bold, Italic, Unordered/Ordered list, Code, Link now dispatch real
    commands instead of being permanently disabled.

New module: src/renderer/lib/editor-commands.ts
  - Module-level singleton holding the active CodeMirror EditorView.
  - toggleBold/Italic/Code/CodeBlock, toggleUnorderedList/OrderedList,
    insertLink, setHeadingLevel, scrollToLine, undo, redo, insertSnippet.
  - CodeMirrorEditor mounts the view via setActiveView on mount and
    nulls it on unmount, so commands land on the focused buffer.

register-menu-commands.ts
  - file.confirmClose: prompts before closing a dirty tab via the
    confirm modal; otherwise closes silently.
  - app.quit: prompts before quitting if any buffer is dirty; uses
    the new ipc.app.quit channel.
  - short-cuts.show: shows the keyboard shortcut list in a confirm dialog.
  - editor.bold/italic/code/list.*/link/undo/redo/heading.*: drive the
    active editor.
  - find.toggle: dispatches mc:find-toggle for any listening component.
  - view.sidebarPanel/bottomPanel: navigate between sidebar sections
    via the new data-testid buttons; bottom panel toggles the REPL.
  - font.size: increase/decrease/reset on editorFontSize (10..28).
  - theme.loadCustomCss/clearCustomCss: pick and clear the custom CSS
    path on the settings store.
  - template.load: inserts a bundled markdown skeleton at the cursor.
  - print.preview/previewStyled: emit mc:print and mc:print-preview.
  - file.clearRecent: clears open tabs.
  - file.new: creates an untitled buffer and tab.
  - editor.gotoHeading: scrolls to a given line (used by Outline and
    Breadcrumb).
  - view.toggleSidebar: already wired.
  - file.opened: already wired (prior fix).

Sidebar Outline + Breadcrumb
  - Both now click through to 'editor.gotoHeading' with the line
    number extracted from the active buffer.
  - Sidebar exposes data-testid for the 'view.sidebarPanel' menu action.

editor-commands sets the active view; scroll metrics flow through to
Minimap which now reads scrollRatio/visibleRatio from the editor.

Export dialogs (PDF/DOCX/HTML)
  - Replaced the broken ipc.export.{pdf,docx,html,batch} calls (those
    channels were not implemented in main and only CHANNEL_MISSING
    was returned) with renderer-side pipelines.
  - PDF: generateHtml() with @page CSS for size + margins, then
    ipc.print to the main process for native print-to-PDF.
  - DOCX: generateDocx() from the existing lib, then ipc.file.writeBuffer.
  - HTML: generateHtml() then ipc.file.writeBuffer.
  - All three dialogs use ipc.app.showSaveDialog for output path
    (new IPC handler) and ipc.file.writeBuffer for the binary write
    (new preload channel).
  - PrintPreview now uses MarkdownRenderer instead of a raw <pre>.

New settings fields
  - editorFontSize: 10..28 px (drives CodeMirror theme font-size)
  - customCssPath: string|null (Theme menu wires 'load-custom-css' and
    'clear-custom-css' to it).

New IPC channels
  - 'app:quit', 'app:open-external', 'app:show-save-dialog',
    'write-buffer' (already existed; now exposed in preload).

Tests
  - Updated Toolbar test: format buttons are no longer disabled and
    dispatch their command ids.
  - Updated Export*D*Dialog tests to mock the new ipc surface
    (ipc.print, ipc.app.showSaveDialog, ipc.file.writeBuffer) and
    assert the new flow.
  - Updated PrintPreview test to use ipc.print.doPrint.
  - Updated phase8-toasts integration: PDF flow now goes through
    ipc.print and asserts 'Sent <title> to printer'.
  - register-menu-commands test: re-register 'template.load' AFTER
    Harness renders so the captured-args handler is the live one.

Verification
  - npm run build:renderer: success (1.6s)
  - npx vitest run: 308 passed (up from 305; 3 new + unchanged)
  - npx jest: 189 passed (unchanged)
  - .claude/skills/run-desktop/verify-features.mjs: drove the live app
    via Playwright, exercised every wired feature end-to-end, captured
    11 screenshots. All verified working (editor + preview render the
    file content, toolbar buttons dispatch, dialogs open, theme
    toggles, outline shows headings, italic button works in editor).
2026-06-07 23:13:47 +05:30
amitwh 5ef1610873 fix(ipc): wire preload bridge so menu Open file actually loads in editor + preview
Two related defects were breaking the 'open file' flow:

1. The BrowserWindow webPreferences had no preload path AND
   contextIsolation: false, so contextBridge.exposeInMainWorld
   threw on load and window.electronAPI was never set. Result:
   every renderer-side ipc.* call returned CHANNEL_MISSING and
   silently no-op'd. Toolbar Open/Save, the file menu, every
   dialog — all broken.

2. The 'file.opened' IPC bridge in register-menu-commands.ts
   dispatched to a 'file.opened' command that was never registered
   as a handler. Even if the preload had worked, the main menu's
   File -> Open would have been a no-op once it reached the
   command store.

Fixes:
- window/index.js: add preload path; set contextIsolation: true
  (required for contextBridge) and nodeIntegration: false
  (renderer no longer needs direct Node access; everything goes
  through the whitelisted preload bridge).
- file-store.ts: add openFileFromMain(path, content) that opens
  a tab + editor buffer from content the main process already read
  (skips the renderer's ipc.file.read since main has the bytes).
  Preserves existing buffer content if the file is already open.
- register-menu-commands.ts: register 'file.opened' to call
  openFileFromMain. Drop the dead 'command.palette' bridge
  (no consumer, no UI, no handler).
- tests: two new cases for openFileFromMain — verifies it does
  not call ipc.file.read and does not clobber user edits on
  re-open.

Verified end-to-end via the run-desktop driver: triggering
file-opened from the main process with a test .md now shows the
content in BOTH the CodeMirror editor and the rendered preview
pane (plus the Outline panel picks up the H1). 497 tests pass.
2026-06-07 22:35:30 +05:30
amitwh 69afd5fc54 chore(release): bump version to 5.0.1 2026-06-06 23:08:20 +05:30
amitwh 9e315af1b9 fix(release): walk-and-find pandoc binary in extracted archive
Pandoc 3.9 macOS zip uses an arch-suffixed inner directory
(pandoc-3.9.0.2-x86_64/) where Linux/Windows use the bare
pandoc-3.9.0.2/ dir. Hard-coding the intermediate path broke
the macOS build in v5.0.1-rc1.

Replace the hard-coded path.join(tmpDir, PANDOC_VERSION, ...)
with a recursive walk that locates the binary by name. This
is robust to future pandoc layout shifts (e.g., universal
binaries renaming the inner dir).

Verified:
  - Linux: download + extract produces a working pandoc 3.9.0.2
  - macOS: walker finds pandoc in pandoc-3.9.0.2-x86_64/bin/
  - Windows: walker finds pandoc.exe in pandoc-3.9.0.2/
  - 306/306 tests pass
2026-06-06 23:07:30 +05:30
amitwh 78914a4d65 chore(renderer): default to light theme
User prefers light mode. next-themes previously defaulted to dark
which made first-load users (no localStorage) see a dark UI. With
'enableSystem' on, 'system' is still available as a choice — only
the initial value changed.

Existing users with 'dark' in localStorage keep dark until they toggle.
New users get light.
2026-06-06 22:43:16 +05:30
amitwh 3c4cc985fb feat(packaging): add macOS icon.icns + build:icon-icns script
electron-builder's mac block declared 'icon: assets/icon.icns' but the
file was never generated, so macOS builds shipped with the default
Electron icon. The build would succeed but the .app looked generic.

Add scripts/build-icon-icns.js — a 50-line node script that packs the
existing PNGs from assets/icons/ (16/32/64/128/256/512/1024 + 48 small
+ 16/32/128/256 @2x retina) into a valid ICNS file. No native deps;
works on Linux, mac, and Windows runners alike (avoids the mac-only
'sips' that png2icns requires).

Wired into npm via 'npm run build:icon-icns'. Local build:linux now
parses the ICNS correctly and produces AppImage/deb/snap.
2026-06-06 22:43:06 +05:30
amitwh 09d9f6bdd1 fix(window): renderer path off-by-one; use 'close' for state save
Two related bugs in src/main/window/index.js:

1. Renderer path was ../../dist/renderer/index.html which resolves to
   src/dist/renderer/index.html (one level too deep). Production builds
   load from <project>/dist/renderer/index.html. Fix: ../../..

   This was never caught because dev mode uses VITE_DEV_SERVER_URL and
   never touches the file path; only 'electron .' (no Vite) hits it.

2. win.on('closed', state.save) calls win.getBounds() on a destroyed
   BrowserWindow. The 'closed' event fires AFTER destruction, so
   getBounds() throws 'Object has been destroyed'. Use 'close' (fires
   before destruction) and guard with isDestroyed() as a belt-and-suspenders.

Both bugs surfaced when the user clicked File → Open. The renderer
loaded a missing HTML (blank body); the openFile handler then triggered
the closed-event state save which threw.
2026-06-06 22:42:54 +05:30
amitwh f36d918871 fix(menu): require('../main') → require('../index') after main.js→index.js rename
The menu items file was using require('../main') which resolved to a
non-existent src/main/main.js. After the 054ce23 refactor that renamed
main.js → index.js, every menu click tried to require a missing module.

All 65 occurrences fixed; fileItems() now loads cleanly at app startup
and the menu doesn't throw on construction.

Caught by user clicking File → Open: showOpenDialogSync emitted through
to the lazy require at items.js:52, which failed with module-not-found
before main process handlers ran.
2026-06-06 22:42:42 +05:30
amitwh ab16998922 feat(packaging): all-platform builds with GitHub Releases
Closes the gap from the previous handoff: `npm run dist:all` now
produces Linux .deb/AppImage/snap, Windows NSIS/portable/zip, and
macOS dmg/zip artifacts. `.github/workflows/release.yml` builds all
three on tag push (v*) and attaches the union to a GitHub Release.

Bug fix in the same commit (would have broken any packaged build):

* `build.files` was `["src/**/*", ...]` — shipped `src/renderer/`
  .tsx dev source into the asar. Replaced with a whitelist
  (`src/main/**/*`, `src/preload.js`, `src/plugins/**/*`,
  `package.json`) and moved the built renderer to
  `build.extraResources` (`dist/renderer` -> `renderer/`).

* `src/main/window/index.js` now uses `process.resourcesPath` when
  `app.isPackaged` is true, plus a friendly error if the renderer is
  missing. Verified by extracting the .AppImage and launching the
  binary — main process logs
  `Production mode — loading .../resources/renderer/index.html`.

New in `package.json` build config:

* `mac.target`: dmg + zip for x64 and arm64; `darkModeSupport: true`,
  `hardenedRuntime: false`, `gatekeeperAssess: false`,
  `entitlements: null`. `mac.identity: null` retained (unsigned).
* `publish`: GitHub Releases provider. CI overrides with
  `--publish=never`.

Known limitations (intentional follow-ups, not blockers):

* No `assets/icon.icns` — macOS app uses the default Electron icon.
  This box lacks `iconutil`/`png2icns`; generating a proper .icns is
  a one-line follow-up.
* No code signing — Windows SmartScreen will warn, macOS Gatekeeper
  will quarantine. `CSC_LINK_BASE64`/`CSC_KEY_PASSWORD` secrets are
  already wired in the Windows job for when the cert is added.
* No auto-update — user decision. The `publish` block writes the
  metadata that a future `electron-updater` integration will consume.

Verified on this Linux box:

* `npm run build:renderer` then `npm run build:linux` — produced
  AppImage (291M), deb (220M), snap (245M).
* `resources/app.asar` has 0 `src/renderer/*` entries (was the
  pre-fix bug). 44 .tsx files remain in asar — all from
  `node_modules/@hookform/resolvers` and `node_modules/immer` test
  fixtures, not our code.
* Extracted `squashfs-root/resources/renderer/index.html` exists and
  is what `window/index.js` loads.
* Binary runs for >12s without crashing — `loadFile` resolves
  `process.resourcesPath/renderer/index.html` correctly.

Tests: 306/306 pass. No regressions.

Plan doc: docs/plans/2026-06-06-packaging-all-platforms.md (the
task-by-task execution guide I followed; included for traceability).
2026-06-06 21:06:20 +05:30
amitwh 58ca3014d8 fix(modals): drop shadcn-style aria-describedby to silence Radix warning
Every DialogContent had aria-describedby="X-desc" and every
DialogDescription had a matching id="X-desc". That pattern is the
default shadcn/ui recipe, but it breaks Radix 1.1.x.

Root cause: Radix auto-generates a descriptionId via useId() (e.g. :r0:)
and stores it in the Dialog context. The DescriptionWarning effect does
`document.getElementById(descriptionId)` and warns if the element is
missing. When the description element's id is overridden to
"welcome-desc", the DOM has id="welcome-desc" but the context still has
:r0:, so the lookup misses and the warning fires on every dialog open.

Fix: drop both overrides. Let Radix manage the id and aria-describedby
itself. Screen-reader semantics are unchanged (Radix still wires
Content -> Description via the auto-generated id).

Touched: 12 modal files (11 DialogContent/DialogDescription pairs +
SettingsSheet which uses Sheet). +1 regression test in
WelcomeDialog.test.tsx that spies on console.warn and asserts the
"Missing Description" message is never emitted.

Tests: 306/306 pass (was 305).

Long-term memory: radix-aria-describedby-anti-pattern.md captures the
do-not-reintroduce rule for future agents.
2026-06-06 20:45:13 +05:30
amitwh 7c1a79c724 fix(app): add Vite dev workflow, fix onLayout prop, fix icon path, allow Google Fonts CSP
The v5.0.0 React UI redesign shipped without a working dev workflow —
`npm start` only ran `electron .` which loaded the source index.html
that references raw .tsx files. The browser couldn't execute them, so
the app rendered an empty #root and the user saw 'lot of errors'.

This commit restores a real dev workflow:

1. **Vite dev server wired into npm scripts** — added `concurrently`
   + `wait-on` as devDeps. `npm run dev` now runs Vite (port 5173)
   and Electron together with `wait-on tcp:5173` so Electron only
   starts after the dev server is ready.

2. **Main process loads Vite URL in dev, dist/ in prod** — window
   module now checks `process.env.VITE_DEV_SERVER_URL` and
   `app.isPackaged` to decide what to load. Production still
   loads the built `dist/renderer/index.html`.

3. **Fixed ReferenceError: app is not defined** — window module
   referenced `app.isPackaged` but only imported `BrowserWindow`.
   Added `app` to the destructured import.

4. **Fixed wrong icon path** — window creation used
   `../../assets/icon.png` from src/main/window/ which resolved
   to `src/assets/icon.png` (doesn't exist). Icon lives at
   project root, so path is now `../../../assets/icon.png`.

5. **Allowed Google Fonts in CSP** — the strict CSP
   (`font-src 'self' data:`, `connect-src 'self'`) blocked
   the preconnect/css link to fonts.googleapis.com / .gstatic.com.
   Added both domains so Plus Jakarta Sans loads.

6. **Renamed onLayout → onLayoutChange** in AppShell — react-resizable-panels
   v4 renamed the prop. The v1 name was being spread to a DOM
   div and React logged 'Unknown event handler property' warnings.
   Test mock updated for parity.

7. **show: false → show: true** — ready-to-show was hanging on
   this Wayland/container combo. Now the window is shown
   immediately on create.

Verified end-to-end:
- 305/305 vitest tests pass
- Vite dev server starts on :5173
- Electron loads localhost:5173 and React mounts
- Header 'MarkdownConverter' + sidebar with 'No files open' visible
- No onLayout warnings after HMR
- All blocked errors resolved
2026-06-06 16:17:16 +05:30
299 changed files with 24912 additions and 4608 deletions
+5 -2
View File
@@ -2,9 +2,9 @@ name: CI
on: on:
push: push:
branches: [master] branches: [master, react-electron]
pull_request: pull_request:
branches: [master] branches: [master, react-electron]
jobs: jobs:
test: test:
@@ -24,5 +24,8 @@ jobs:
- name: Run tests - name: Run tests
run: npm test run: npm test
- name: Run renderer tests
run: npm run test:renderer
- name: Run linter - name: Run linter
run: npm run lint run: npm run lint
+58 -4
View File
@@ -29,7 +29,7 @@ jobs:
run: npm test run: npm test
- name: Build Linux packages - name: Build Linux packages
run: npm run build:linux-ci -- --publish=never run: npm run build:linux-ci -- --publish=always
- name: Upload Linux artifacts - name: Upload Linux artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@@ -77,13 +77,13 @@ jobs:
env: env:
CSC_LINK: code-signing-cert.pfx CSC_LINK: code-signing-cert.pfx
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
run: npm run build:win-signed -- --publish=never run: npm run build:win-signed -- --publish=always
- name: Build Windows packages (unsigned) - name: Build Windows packages (unsigned)
if: ${{ env.CERT_AVAILABLE != 'true' }} if: ${{ env.CERT_AVAILABLE != 'true' }}
env: env:
CSC_IDENTITY_AUTO_DISCOVERY: 'false' CSC_IDENTITY_AUTO_DISCOVERY: 'false'
run: npm run build:win-unsigned -- --publish=never run: npm run build:win-unsigned -- --publish=always
- name: Upload Windows artifacts - name: Upload Windows artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@@ -94,8 +94,42 @@ jobs:
dist/*.zip dist/*.zip
retention-days: 5 retention-days: 5
build-macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
cache: npm
- name: Install dependencies
run: npm ci
- name: Download external tools (pandoc)
run: node scripts/download-tools.js
- name: Run tests
run: npm test
- name: Build macOS packages (unsigned)
env:
CSC_IDENTITY_AUTO_DISCOVERY: 'false'
run: npm run build:mac -- --publish=always
- name: Upload macOS artifacts
uses: actions/upload-artifact@v4
with:
name: macos-artifacts
path: |
dist/*.dmg
dist/*.zip
retention-days: 5
release: release:
needs: [build-linux, build-windows] needs: [build-linux, build-windows, build-macos]
if: always() if: always()
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@@ -115,8 +149,28 @@ jobs:
name: windows-artifacts name: windows-artifacts
path: dist path: dist
- name: Download macOS artifacts
uses: actions/download-artifact@v4
continue-on-error: true
with:
name: macos-artifacts
path: dist
- name: Create GitHub Release - name: Create GitHub Release
uses: softprops/action-gh-release@v2 uses: softprops/action-gh-release@v2
with: with:
generate_release_notes: true generate_release_notes: true
files: dist/* files: dist/*
- name: Mirror artifacts to ConcreteInfo update feed
if: env.CONCRETEINFO_DEPLOY_HOOK != ''
env:
CONCRETEINFO_DEPLOY_HOOK: ${{ secrets.CONCRETEINFO_DEPLOY_HOOK }}
run: |
curl -fsSL -X POST \
-H "Authorization: Bearer ${{ secrets.CONCRETEINFO_DEPLOY_HOOK }}" \
-F "version=${GITHUB_REF_NAME#v}" \
-F "artifacts=@dist/latest-mac.yml" \
-F "artifacts=@dist/latest-linux.yml" \
-F "artifacts=@dist/latest-windows.yml" \
https://updates.concreteinfo.co.in/api/v1/ingest
+24
View File
@@ -5,6 +5,15 @@ All notable changes to markdown-converter will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [5.1.0] - 2026-06-08
### Added
- Auto-update via electron-updater against GitHub Releases (default) or ConcreteInfo self-hosted feed.
- Light, skippable first-run wizard: theme, update channel, starter template.
- One-shot v4.4.1 → v5 settings migration with backup at `settings.v4.bak.json`.
- Local crash dump capture (cap 20, auto-prune) and a CrashReportModal.
- "Updates" section in Settings: channel picker, Check now, auto-check toggle.
## [5.0.0] - 2026-06-06 ## [5.0.0] - 2026-06-06
### Added ### Added
@@ -41,3 +50,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- 9 dead IPC channels from `src/preload.js`: `toggle-command-palette`, `print-preview`, `print-preview-styled`, `open-ascii-generator`, `open-table-generator`, `show-ascii-generator`, `show-ascii-generator-window`, `show-table-generator`, `show-table-generator-window` - 9 dead IPC channels from `src/preload.js`: `toggle-command-palette`, `print-preview`, `print-preview-styled`, `open-ascii-generator`, `open-table-generator`, `show-ascii-generator`, `show-ascii-generator-window`, `show-table-generator`, `show-table-generator-window`
[5.0.0]: https://github.com/amitwh/markdown-converter/releases/tag/v5.0.0 [5.0.0]: https://github.com/amitwh/markdown-converter/releases/tag/v5.0.0
## [5.1.0] - 2026-07-23 - react-electron parity
### Added
- **Monospace font embedding** — bundles JetBrains Mono + Fira Code TTFs and embeds the active font into PDF (xelatex fontspec), DOCX (post-pandoc zip patch with `fontTable.xml`), EPUB (`--epub-embed-font` + manifest), and HTML (woff2 base64 in CSS) exports. ASCII art and code blocks now render with the exact same font across machines.
- **Monospace settings** — `get-monospace-settings` / `set-monospace-settings` IPC, with `monospaceFont` (`jetbrains-mono` / `fira-code`) and `monospaceLigatures` (boolean).
- **Renderer body-class toggle** — `useMonospaceClasses` hook toggles `mono-jetbrains-mono` / `mono-fira-code` and `mono-ligatures-on` / `mono-ligatures-off` on `document.body`, driving `--font-mono-active` and `--font-mono-feature` CSS tokens.
### Changed
- **App renamed to Markdown Converter React** (`com.concreteinfo.markdownconverter.react`, npm name `markdown-converter-react`, deb `markdown-converter-react_*_amd64.deb`) so the dev build coexists with the installed `markdown-converter` deb without single-instance lock conflicts.
- Window title shows `Markdown Converter — React Dev` in dev mode.
- `download-tools.js` pins Fira Code to release `6.2` with SHA-256 digests verified before atomic rename; downloads refuse to start on digest mismatch.
### Security
- `PdfFontHeader` uses `fs.mkdtempSync` for an exclusive temp directory; the caller unlinks it after pandoc consumes the header (no racy `Date.now()+pid` filenames).
+145
View File
@@ -0,0 +1,145 @@
# CLAUDE.md — MarkdownConverter (react-electron)
> General code-quality, TypeScript, git, security, and testing standards are in the **global CLAUDE.md**. This file holds project- and branch-specific notes.
## Project Overview
Electron desktop app for Markdown editing and universal file conversion powered by Pandoc. Cross-platform (Win/macOS/Linux). Features: multi-tab editor with live preview, 25+ themes, PDF viewer/editor (merge/split/compress/rotate/watermark/password), export to 20+ formats (PDF/DOCX/ODT/EPUB/HTML/LaTeX/RTF/PPTX), batch conversion, syntax highlighting, diagram support (Mermaid), Git integration, plugin system, and auto-updater.
- **Version:** 5.0.1
- **License:** MIT
- **App ID:** `com.concreteinfo.markdownconverter`
## Branch Specifics
This is the **React rewrite branch** — the renderer has been rebuilt with React 19 + TypeScript + Tailwind CSS + shadcn/ui, replacing the vanilla JS renderer from master. The main process remains vanilla CommonJS JavaScript. A dual dev workflow runs Vite (renderer) and Electron (main) concurrently.
Key differences from master:
- Renderer: React 19 + TypeScript (TSX) instead of vanilla JS DOM manipulation
- Bundler: Vite for the renderer (`vite.renderer.config.ts`)
- UI: shadcn/ui (Radix primitives + Tailwind) instead of hand-rolled CSS
- State: Zustand 5 stores instead of global mutable state
- Security: `contextIsolation: true` + `nodeIntegration: false` (preload with channel whitelisting) instead of master's open renderer
- Build: two-stage (Vite build renderer, then electron-builder packages) instead of single electron-builder pass
- Testing: dual test runners — Vitest (renderer/React/TS) + Jest (main process/JS)
- Main process is now in `src/main/` (modular) instead of flat `src/main.js`
- Adds auto-updater via `electron-updater` with GitHub Releases + self-hosted feed support
- Adds React Hook Form + Zod for form validation, Lucide React icons, Motion for animations
- Legacy sidebar modules (`src/sidebar/*.js`) still exist alongside new React sidebar (`src/renderer/components/sidebar/`)
## Architecture
### Main Process (`src/main/`)
Modular structure (improvement over master's monolith):
- `src/main/index.js` — IPC handlers, Pandoc invocation, export logic (~3,500 lines)
- `src/main/PDFOperations.js` — PDF manipulation via `pdf-lib`
- `src/main/GitOperations.js` — Git operations via `simple-git`
- `src/main/store.js` — Custom JSON settings store (NOT electron-store)
- `src/main/window/index.js` — BrowserWindow creation with three-mode loading (dev/prod/packaged)
- `src/main/menu/` — Application menu definitions
- `src/main/ipc/` — Crash handlers, updater handlers
- `src/main/updater/` — Auto-update service, feed config, migration runner
- `src/main/files/` — File operation modules
- `src/main/word-template/` — Word template export
### Preload (`src/preload.js`)
Properly isolated. Uses `contextBridge` with **channel whitelisting** (`ALLOWED_SEND_CHANNELS`, `ALLOWED_RECEIVE_CHANNELS` arrays). The renderer has no direct Node access.
### Renderer (`src/renderer/`)
React 19 + TypeScript application bundled by Vite:
- `src/renderer/App.tsx` — Root component: assembles AppShell, modals, command palette, toaster
- `src/renderer/components/layout/AppShell.tsx` — Three-panel resizable layout (sidebar | editor | preview)
- `src/renderer/stores/` — Zustand stores: `app-store`, `editor-store`, `file-store`, `preview-store`, `settings-store`, `command-store`
- `src/renderer/hooks/` — Custom hooks: `use-shortcut`, `use-file-shortcuts`, `use-menu-action`, `use-scroll-sync`, `use-zen-mode`, `use-export-source`
- `src/renderer/components/modals/` — 30+ modal dialogs as React components
- `src/renderer/components/editor/` — CodeMirror 6 editor React wrapper
- `src/renderer/components/preview/` — Markdown renderer with Mermaid lazy loading
- `src/renderer/components/sidebar/` — React sidebar panels (FileTree, GitStatus, Outline, Snippets, Templates)
- `src/renderer/components/ui/` — shadcn/ui primitives (button, dialog, sheet, select, tabs, etc.)
- `src/renderer/lib/` — Utilities: typed IPC wrapper (`ipc.ts`), export modules, validators
- `src/renderer/types/` — TypeScript declarations: `electron.d.ts` (window.electronAPI), `ipc.ts` (IPC types)
### Security Model
- **`contextIsolation: true` + `nodeIntegration: false`** (properly secured, unlike master)
- Preload with explicit channel whitelisting
- TypeScript declarations ensure type-safe IPC
- Pandoc invoked via `execFile` (not `exec`)
- Permission handler: only `clipboard-read`/`clipboard-write` allowed
- ESLint enforces `no-eval`, `no-implied-eval`, `no-new-func`
- CSP in `index.html` restricts script/style/img/font/connect sources
### Plugin System (`src/plugins/`)
Unchanged from master. Manifest-based discovery, built-in `writing-studio` plugin.
## System Dependencies
| Dependency | Required | Notes |
|---|---|---|
| **Node.js** | >= 20 | Electron 41 bundles Node 20.x; Vite 8 requires Node 18+ |
| **Pandoc** | Yes (for exports) | Downloaded to `bin/<platform>/pandoc` via `scripts/download-tools.js` (v3.9.0.2). Falls back to system PATH. |
| **FFmpeg** | Bundled | `ffmpeg-static` npm package; `asarUnpacked` |
| **MiKTeX / TeX Live** | Optional | LaTeX PDF export; MiKTeX PATH injected on Windows |
| **ImageMagick** | Optional | Linux image conversion; deb dependency |
| **LibreOffice** | Optional | Enhanced document conversion; deb dependency |
## Development Commands
```bash
npm run dev # Start dev mode: Vite dev server (port 5173) + Electron (concurrently)
npm run dev:renderer # Vite dev server only (port 5173)
npm run dev:electron # Electron only (waits for Vite on tcp:5173)
npm start # Launch Electron app (prod mode, requires built renderer)
npm run preview # Build renderer then launch Electron
npm test # Jest — main process tests (vanilla JS)
npm run test:renderer # Vitest — renderer tests (React/TS)
npm run lint # ESLint check
npm run lint:fix # ESLint auto-fix
npm run format # Prettier write
npm run format:check # Prettier check
npm run download-tools # Download Pandoc binaries
npm run generate-icons # Generate app icons
```
**Dev workflow:** `npm run dev` starts Vite (renderer HMR on `:5173`) and Electron concurrently. The main process loads from `http://localhost:5173` in dev mode.
## Build & Package
**Two-stage build process:**
1. `npm run build:renderer` — Vite builds renderer to `dist/renderer/`
2. `npm run build` — electron-builder packages main process + preload + built renderer
**Tool:** `electron-builder` (v26.0.12), config inline in `package.json`.
| Target | Platforms |
|---|---|
| `npm run build:win` | Windows: NSIS + portable + zip (x64) |
| `npm run build:mac` | macOS: dmg + zip (x64 + arm64) |
| `npm run build:linux` | Linux: deb + AppImage + snap |
**Packaged files:** `src/main/**`, `src/preload.js`, `src/plugins/**`, `package.json`. Renderer built output copied to resources as `renderer/`.
**Bundled with builds:** Pandoc binary per platform, FFmpeg (asarUnpacked).
**Output:** `dist/` directory.
**Auto-updater:** `electron-updater` with GitHub Releases (default) and optional ConcreteInfo self-hosted feed.
**CI:** GitHub Actions workflows in `.github/workflows/` (ci.yml, release.yml).
## Project Conventions / Gotchas
- **Dual-process architecture.** Main process is vanilla CommonJS JavaScript (`src/main/`). Renderer is React 19 + TypeScript + Tailwind (`src/renderer/`). They are separate build targets.
- **Vite for renderer only.** Main process is NOT bundled — Electron loads `src/main/index.js` directly. Do not add TypeScript to main process files.
- **Tailwind + shadcn/ui.** Use shadcn/ui components (`src/renderer/components/ui/`) for all UI primitives. Custom theme in `tailwind.config.js`. Path alias `@` maps to `src/renderer/`. Brand color: `#e5461f`.
- **Zustand for state.** All renderer state lives in `src/renderer/stores/`. Each store is a separate file. Use immer for immutable updates.
- **Typed IPC.** `src/renderer/types/electron.d.ts` declares `window.electronAPI`. `src/renderer/lib/ipc.ts` provides type-safe wrappers. When adding new IPC channels, update both the preload whitelist AND the TypeScript declarations.
- **Legacy + new sidebar.** `src/sidebar/*.js` (vanilla JS) and `src/renderer/components/sidebar/` (React TSX) both exist. New sidebar features go in the React version.
- **Pandoc is external.** Must be present for non-HTML/PDF exports. Download via `npm run download-tools` or install system-wide.
- **PDF export fallback chain:** xelatex -> pdflatex -> lualatex -> Electron built-in `printToPDF()`.
- **PDF rendering:** `pdfjs-dist` (viewer). **PDF manipulation:** `pdf-lib` in main process.
- **Editor:** CodeMirror 6, configured in `src/editor/codemirror-setup.js`, wrapped as React component in `src/renderer/components/editor/CodeMirrorEditor.tsx`.
- **Tests:** Jest (main process, `tests/**/*.test.js`, 15% threshold) + Vitest (renderer, `tests/**/*.{test,spec}.{ts,tsx}`, v8 coverage on `src/renderer/`).
- **ESLint flat config** with ECMAScript 2022. Prettier: 2-space, single quotes, semicolons, 100-char width.
- **No tsconfig.json at root** — TypeScript is renderer-only, handled by Vite. Do not add `tsconfig.json` for the main process.
- **File associations:** `.md`, `.markdown`, `.pdf` registered at install.
- **Single instance lock** via `app.requestSingleInstanceLock()`.
+15
View File
@@ -140,6 +140,21 @@ Open PDF files directly in MarkdownConverter:
- Rotate pages left or right - Rotate pages left or right
- Close PDF to return to editor - Close PDF to return to editor
## Distribution & Updates
v5.x uses `electron-updater` against two feeds:
- **GitHub Releases** (default, public): the public release at `https://github.com/amitwh/markdown-converter/releases`. The CI workflow publishes `latest-{mac,linux,windows}.yml` on every tag.
- **ConcreteInfo self-hosted** (opt-in for enterprise deployments): `https://updates.concreteinfo.co.in/v5/`. CI mirrors artifacts on every release when `CONCRETEINFO_DEPLOY_HOOK` is set as a repository secret.
Users switch the feed in **Settings → Updates → Update channel**. Auto-check is enabled by default; disable it in the same panel.
### Manual mirror
```bash
CONCRETEINFO_DEPLOY_HOOK=... npm run publish:concreteinfo -- 5.1.0
```
## Open Source ## Open Source
MarkdownConverter is 100% open-source. All dependencies are permissively licensed: MarkdownConverter is 100% open-source. All dependencies are permissively licensed:
File diff suppressed because one or more lines are too long
+93
View File
@@ -0,0 +1,93 @@
Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode)
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
File diff suppressed because one or more lines are too long
Binary file not shown.
+93
View File
@@ -0,0 +1,93 @@
Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono)
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
https://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
Binary file not shown.
BIN
View File
Binary file not shown.
@@ -0,0 +1,270 @@
# Packaging — All-Platform Build + GitHub Releases
**Goal:** Make `npm run dist:all` produce Linux + Windows + macOS artifacts, and have the existing `.github/workflows/release.yml` create a GitHub Release on tag push with those artifacts. No code signing in this iteration.
**Scope (user decisions 2026-06-06):**
- Target platforms: **all three** (Linux .deb/AppImage/snap, Windows NSIS/portable/zip, macOS dmg/zip)
- Distribution: **GitHub Releases** (no auto-update; static artifacts only)
- Code signing: **skip for now** (unsigned binaries; Windows SmartScreen will warn, macOS Gatekeeper will quarantine)
**Architecture:** This is mostly about completing the existing scaffold. `electron-builder` 26.0.12, `scripts/download-tools.js`, `scripts/generate-icons.js`, the `package.json` scripts, and `release.yml` are all already in place. We need to (1) close a real bug in the `files` config, (2) add the macOS job to the workflow, and (3) declare macOS targets in the package config.
**Tech stack:** electron-builder 26.0.12, GitHub Actions `ubuntu-latest`/`windows-latest`/`macos-latest` runners, softprops/action-gh-release@v2 for the release creation.
---
## Task 1 — Fix the `files` config in `package.json`
The current `files: ["src/**/*", ...]` matches `src/renderer/**/*.tsx` and ships dev source into the asar. The shipped renderer should be the built `dist/renderer/**/*` output, not TS source. asarUnpack for ffmpeg-static is correct and stays.
**Files:** `package.json` (build.files, build.extraResources)
### Step 1.1 — Replace `files` block
```json
"files": [
"src/main/**/*",
"src/preload.js",
"src/plugins/**/*",
"package.json"
],
"extraResources": [
{
"from": "dist/renderer",
"to": "renderer"
}
]
```
- `src/main/**/*` — main process source (entry point + all main-process modules)
- `src/preload.js` — single preload file at the root of `src/`
- `src/plugins/**/*` — built-in plugins (referenced from main process; the `extraFiles: []` line in the current config is empty, so this is the right pattern)
- `package.json` — required for the asar `app.asar/package.json` lookup electron does at runtime
- `dist/renderer` moves to `extraResources` because it should live alongside the asar (not inside it) — the asar is sealed and we want the renderer to be a separately-updatable resource path. Production main loads it via `loadFile(path.join(__dirname, '../../dist/renderer/index.html'))` which, in the packaged app, resolves to `process.resourcesPath/renderer/index.html`. **This requires changing the loadFile path in `src/main/window/index.js` too** — see Task 4.
### Step 1.2 — Verify
- `npm run build:linux` should produce a working .AppImage
- Inside the .AppImage (extract with `--appimage-extract`), check `resources/` has `app.asar` and a `renderer/` directory containing `index.html` and `assets/`
- Inside `app.asar`, check `src/main/index.js` is present and `src/renderer/` is absent
---
## Task 2 — Add macOS targets + icon to `package.json` build config
**Files:** `package.json`
### Step 2.1 — Replace the existing `mac` block
```json
"mac": {
"category": "public.app-category.productivity",
"identity": null,
"target": [
{ "target": "dmg", "arch": ["x64", "arm64"] },
{ "target": "zip", "arch": ["x64", "arm64"] }
],
"icon": "assets/icon.icns",
"darkModeSupport": true,
"hardenedRuntime": false,
"gatekeeperAssess": false,
"entitlements": null
}
```
- `identity: null` is intentional for unsigned builds
- `darkModeSupport: true` — the app already supports dark mode; this is just metadata
- `hardenedRuntime: false` and `gatekeeperAssess: false` — without signing, these are the only way the build succeeds
- `entitlements: null` — no entitlements file; some features (jit) won't work but Electron's main process doesn't need them in this app
- **`.icns` is missing.** For this iteration we'll use the default Electron icon and add a follow-up to generate one. The build will succeed without it but the produced .app will have the default icon.
### Step 2.2 — Generate a placeholder `.icns` (optional, can be deferred)
If we want a proper icon, the path is:
1. `npm run generate-icons` to produce `assets/icons/*.png` (already done)
2. Use `png2icns` (Linux) or `iconutil` (mac) to bundle them into `assets/icon.icns`
3. We don't have either on this Linux container; defer to a follow-up plan
For this iteration: ship without `.icns` and accept the default icon.
### Step 2.3 — Add `publish` config
```json
"publish": {
"provider": "github",
"owner": "amitwh",
"repo": "markdown-converter",
"releaseType": "release"
}
```
Even without auto-update, this tells `electron-builder` to write `latest-mac.yml` / `latest-linux.yml` next to the artifacts. Useful for future auto-update wiring. CI passes `--publish=never` to override.
---
## Task 3 — Add macOS job to `.github/workflows/release.yml`
**Files:** `.github/workflows/release.yml`
### Step 3.1 — Add a third job between `build-windows` and `release`
Insert after the `build-windows` job (around line 96):
```yaml
build-macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
cache: npm
- name: Install dependencies
run: npm ci
- name: Download external tools (pandoc)
run: node scripts/download-tools.js
- name: Run tests
run: npm test
- name: Build macOS packages (unsigned)
env:
CSC_IDENTITY_AUTO_DISCOVERY: 'false'
run: npm run build:mac -- --publish=never
- name: Upload macOS artifacts
uses: actions/upload-artifact@v4
with:
name: macos-artifacts
path: |
dist/*.dmg
dist/*.zip
retention-days: 5
```
### Step 3.2 — Wire macOS into the `release` job's `needs` and downloads
Change the `release` job:
```yaml
release:
needs: [build-linux, build-windows, build-macos]
...
```
And add a third download step (after the Windows download):
```yaml
- name: Download macOS artifacts
uses: actions/download-artifact@v4
continue-on-error: true
with:
name: macos-artifacts
path: dist
```
`continue-on-error: true` is intentional — a failed macOS build shouldn't block a release of working Linux+Windows artifacts.
---
## Task 4 — Update `src/main/window/index.js` for the resource path
**Files:** `src/main/window/index.js`
### Step 4.1 — Update the loadFile path
The current code (line 35):
```js
const prodPath = path.join(__dirname, '../../dist/renderer/index.html');
```
Inside the packaged app, `__dirname` points into the asar. `process.resourcesPath` points to the directory holding `app.asar` + the `renderer/` extraResources dir. Change to:
```js
const rendererIndex = app.isPackaged
? path.join(process.resourcesPath, 'renderer', 'index.html')
: path.join(__dirname, '../../dist/renderer/index.html');
win.loadFile(rendererIndex);
```
This needs to happen after the dev/prod branch is decided. The existing `if (!app.isPackaged && devServerUrl)` block already handles dev mode; the else branch needs this update.
### Step 4.2 — Add a guard for missing renderer in prod
```js
if (app.isPackaged) {
try {
fs.accessSync(path.join(process.resourcesPath, 'renderer', 'index.html'));
} catch {
console.error('[WINDOW] Renderer not found at', process.resourcesPath, '— did you run `npm run build:renderer` before packaging?');
}
}
```
Failure mode: someone runs `npm run build` without first building the renderer. Without this guard, the window opens blank and the user has no idea why.
---
## Task 5 — Test on this Linux box
### Step 5.1 — Local verification
```bash
npm ci
npm run download-tools # idempotent; bin/linux/pandoc already exists
npm run build:renderer
npm run build:linux # produces .deb, .AppImage in dist/
```
Inspect the .AppImage:
```bash
chmod +x dist/*.AppImage
./dist/MarkdownConverter-*.AppImage --appimage-extract
ls squashfs-root/resources/
# Expect: app.asar renderer/
ls squashfs-root/resources/renderer/
# Expect: index.html assets/
```
### Step 5.2 — Run the produced app
```bash
./dist/MarkdownConverter-*.AppImage
```
The app should:
- Launch with the AppShell, header, sidebar
- Allow opening a folder / file
- Export to PDF/DOCX/HTML work (pandoc bundled)
### Step 5.3 — Tag + push to test the release workflow (optional)
Only do this if the user wants to verify the full pipeline. A dry-run on the CI side via `act` would be cleaner but `act` doesn't run macos-latest jobs locally. If the user wants to verify the workflow, push a `v5.0.1-rc1` tag and watch the Actions tab.
---
## Success criteria
1. `npm run dist:all` produces all three platform families on this Linux box (or at least Linux + mac, since Windows is built on Windows)
2. The .AppImage launches and the app works end-to-end
3. `release.yml` runs all three jobs on a tag push and creates a GitHub release with the union of artifacts
4. No regressions: 306/306 tests still pass, dev workflow still works
5. The `files` bug is fixed: no `.tsx` in the packaged asar
## Known limitations (intentional, can be follow-ups)
- **No `.icns`** — the macOS app will have the default Electron icon. Generating a proper `.icns` requires `iconutil` (mac) or `png2icns` (cross-platform); neither is on this Linux box.
- **No code signing** — Windows SmartScreen will warn; macOS Gatekeeper will quarantine unsigned `.dmg`. Setting up signing later is a config-only change (no structural rework): add `CSC_LINK`/`CSC_KEY_PASSWORD` for Windows, `CSC_LINK` (Apple Developer ID) for mac.
- **No auto-update** — user decisions for this iteration. Wiring `electron-updater` is a follow-up; the `publish` config from Task 2 puts metadata in the right place.
- **Cross-build quirks** — building macOS from Linux produces a `.dmg` that is generally usable but may show a "this app is from an unidentified developer" prompt the first time. Right-click → Open to bypass once. Documented in the release notes.
## Out of scope
- CHANGELOG.md updates (not part of packaging)
- electron-updater wiring
- Code signing cert procurement
- Snap store / Microsoft Store / Mac App Store submission
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,295 @@
# Production polish — v5 shippable build
**Date:** 2026-06-07
**Branch:** `react-electron`
**Status:** Draft, pending implementation plan
**Author:** Claude (brainstormed with Amit Haridas)
## 1. Goals & non-goals
### Goals
v5 is reliably shippable to two distribution channels:
- **GitHub Releases** (public, free, existing workflow).
- **ConcreteInfo update server** at `https://updates.concreteinfo.co.in/v5/` (self-hosted, for ConcreteInfo's own users).
Concretely:
- A non-blocking update banner surfaces "v5.0.2 is available" with a user-confirmed restart-to-install flow. No silent background installs.
- A light first-run wizard (theme + update channel + starter template), all skippable.
- One-shot auto-migration from v4.4.1 settings, with a v4 backup file and a toast on success/failure.
- Local crash dump capture (no third-party). CrashReportModal lets the user open the dump folder and copy/delete dumps.
- GitHub Actions CI that builds + uploads artifacts on tag and runs the test suite on every PR.
### Non-goals (deferred to v5.1+)
- **Code signing.** macOS Gatekeeper and Windows SmartScreen will warn. Re-evaluated for v5.1.
- **Sentry or any third-party crash reporting.** Local dumps only.
- **Auto-install on quit.** Always user-confirmed.
- **Delta updates** (full downloads only in v5).
- **Plugin system, cloud/licensing, perf/a11y** — each is its own subsequent spec.
## 2. Architecture
```
GitHub Releases (public) ConcreteInfo (CI feed)
└── *.zip, *.dmg, *.exe, └── *.zip, *.dmg, *.exe,
*.deb, *.rpm, *.deb, *.rpm,
latest.yml, latest- latest.yml, latest-
mac.yml, latest- mac.yml, latest-
linux.yml, latest- linux.yml, latest-
windows.yml windows.yml
▲ ▲
│ │
└──────┬───────────────────────┘
│ electron-updater reads
│ the channel chosen in
│ Settings (default: GitHub)
┌─────────────────────────────────────────────────────┐
│ Main process (src/main/updater/) │
│ - Updater service: wraps electron-updater │
│ - Channel resolver: returns feed URL from setting │
│ - State machine: idle → checking → available → │
│ downloading → ready → installing │
│ - Crash writer: catches process.on('uncaught…) │
│ - Migration runner: idempotent, runs on app start│
└─────────────────────────────────────────────────────┘
▲ ▲
│ IPC (renderer→main, │ IPC (renderer→main,
│ allowlisted SEND) │ allowlisted SEND)
│ updater:check, │ crash:read,
│ updater:install, │ crash:open-dir,
│ updater:get-state │ crash:delete
│ │
│ IPC (main→renderer, │
│ allowlisted RECEIVE) │
│ updater:status │
▼ ▼
┌─────────────────────────────────────────────────────┐
│ Renderer (preload bridge + React) │
│ - Update banner: "v5.0.2 available" │
│ - Settings: Update channel radio │
│ - First-run wizard: skip-links, all optional │
│ - Crash dialog: open dump dir, copy file │
│ - Migration: first-launch indicator in settings │
└─────────────────────────────────────────────────────┘
```
### Key boundaries
- **`src/main/updater/`** is a single new directory. `updater-service.js` owns the `electron-updater` lifecycle, never the renderer.
- **Renderer talks to updater over IPC only.** No direct `autoUpdater` import in preload. Channels must be in `ALLOWED_SEND_CHANNELS` / `ALLOWED_RECEIVE_CHANNELS`.
- **Channel switching is a settings change.** No restart required; the next `checkForUpdates()` reads the new feed URL.
- **Migration is idempotent.** Stores a `migration.version` key; skips if already at v5.
- **Crash writer never blocks startup.** Initialized in main entry, but a write failure is non-fatal.
## 3. Component breakdown
| Unit | What it does | How it's used | Depends on |
|---|---|---|---|
| `main/updater/updater-service.js` | Owns `electron-updater`; exposes check/download/install; emits status events | Main process singleton; started after `app.whenReady()` | `electron-updater`, `electron` |
| `main/updater/feed-config.js` | Maps channel setting → feed URL; reads from `app.getPath('userData')/settings.json` | Called by updater-service on each check | settings store |
| `main/updater/crash-writer.js` | Hooks `process.on('uncaughtException', …)`; writes minidump + stack to `app.getPath('userData')/crashDumps/{timestamp}.json` | Initialized in main entry, before anything else | `electron`, `app.getPath` |
| `main/updater/migration-runner.js` | Reads v4 settings; transforms to v5 schema; writes backup; updates `migration.version` | Run from main entry on `app.whenReady()` | `fs`, settings store |
| `main/ipc/updater-handlers.js` | IPC handlers: `updater:check`, `updater:install`, `updater:get-state` | Registered in main entry | updater-service |
| `main/ipc/crash-handlers.js` | IPC handlers: `crash:read`, `crash:open-dir` | Registered in main entry | crash-writer |
| `preload.js` (extension) | Add `updater.check()`, `updater.install()`, `crash.read()`, `crash.openDir()` to `electronAPI`; add channels to allowlist | Preload runs at boot | existing preload |
| `renderer/lib/updater-store.ts` | Zustand store mirroring updater state; subscribes to `updater:status` events | Renderer; consumed by banner, settings, modals | `zustand`, IPC bridge |
| `renderer/components/UpdateBanner.tsx` | Non-blocking banner shown when `updater-store.status` is `available | downloading | ready` | Mounted in `App.tsx` next to header | updater-store, sonner |
| `renderer/components/FirstRunWizard.tsx` | 3-step modal with skip links; opens on first launch when `app-store.firstRun === true` | Mounted in `App.tsx` | app-store, settings-store, command-store |
| `renderer/components/modals/SettingsModal.tsx` (extend) | Add "Updates" section: channel radio, "Check now" button, auto-check toggle | Mounted via `useAppStore.modal` | updater-store, settings-store |
| `renderer/components/modals/CrashReportModal.tsx` | List local crash dumps; "Open dump folder", "Copy to clipboard", "Delete" actions | Mounted via `useAppStore.modal` | crash ipc, sonner |
| `renderer/lib/migrations/v4-to-v5.ts` | Pure function: `(v4Settings) => v5Settings` | Called from `migration-runner` | zod schemas |
### Data flow — "user clicks Check for updates"
1. Settings panel: `useSettingsStore.getState().setSetting('updateChannel', 'github' | 'concreteinfo')`.
2. `SettingsModal` calls `await ipc.updater.check()`.
3. Preload `safeCall``window.electronAPI.updater.check()``ipcRenderer.invoke('updater:check')`.
4. Main handler asks `updater-service` to `autoUpdater.checkForUpdates()` with the channel's feed URL.
5. `updater-service` emits `'updater:status', { state: 'available', version: '5.0.2' }`.
6. Preload forwards to `updater-store` via `window.electronAPI.on('updater:status', cb)`.
7. `updater-store` state flips to `available`; `UpdateBanner` renders.
8. User clicks "View release notes" → opens `https://github.com/.../releases/tag/v5.0.2` via `ipc.app.openExternal`.
9. User clicks "Restart to update" → calls `ipc.updater.install()`. `updater-service` calls `autoUpdater.quitAndInstall()`. App quits, relaunches into v5.0.2.
## 4. Error handling
### Updater
- **No network:** `autoUpdater.checkForUpdates()` rejects with `ENOTFOUND` / `ETIMEDOUT`. We catch, log to main log, emit `updater:status { state: 'error', code: 'NETWORK' }`. Banner shows "Couldn't check for updates. Try again." Toast fires inline at the wire point in `UpdateBanner` / `SettingsModal` on retry, matching the existing pattern (`toasts-inline-at-wire-points`).
- **Feed 404 / signature missing (N/A in v5 since unsigned):** Treat as configuration error. Log to main log with full URL. Banner shows "Update feed is misconfigured. Report this on GitHub." Crash-log-style entry is written.
- **Update available but download fails:** Banner flips to "Download failed. Try again." Clicking "Try again" re-invokes `autoUpdater.downloadUpdate()`. Three consecutive failures show a "Report issue" link in the banner.
- **Update installs but launch fails:** Worst case. We catch the post-`quitAndInstall` crash via `crash-writer` and write a marker file `app.getPath('userData')/update-failed.json` with the previous version. On next boot, the user is offered to revert manually by re-downloading from the GitHub release page (a "rolled back" banner instead of the wizard).
- **Concurrent checks:** Debounce 60s. A second `checkForUpdates()` within 60s is a no-op; returns the current state. The Check-Now button is disabled during a check.
### Migration
- **v4 settings file missing/corrupt:** Treat as "nothing to migrate." App starts with v5 defaults. Toast: "Welcome to v5 — using default settings."
- **Migration throws mid-transform:** Original v4 file is preserved as `settings.v4.bak.json` (already on disk). App starts with v5 defaults. Toast: "Couldn't migrate v4 settings — your old settings are preserved at {path}."
- **`migration.version === 5`:** Skip entirely. No-op.
### Crash writer
- **Dump write fails (disk full, permissions):** Print to stderr; do not crash the app. Recovery is "user's problem" — we never block app startup on the crash writer.
- **No dumps in dir:** CrashReportModal shows empty state: "No crashes recorded — nice work!"
### First-run wizard
- **Skip clicked at any step:** Sets `app-store.firstRun = false` and proceeds. All defaults already match the unselected choice, so this is non-destructive.
- **Wizard cannot reach settings (corrupt store):** Falls back to defaults silently. Wizard still closes.
## 5. Testing
### Unit (Vitest, renderer-side)
- `useUpdaterStore`: state transitions on each `updater:status` event; debounce on `check()`; reject on missing channel.
- `FirstRunWizard`: each step's CTA writes the right slice; "Skip" leaves defaults; "Skip at step 1" still closes the wizard and sets `firstRun = false`.
- `migrations/v4-to-v5`: golden-file tests — every v4 shape we ship transforms to expected v5 output. Idempotency: running twice yields identical v5 settings.
- `feed-config`: each channel setting resolves to the right feed URL; missing/unknown channel falls back to GitHub.
### Component (Vitest + RTL)
- `UpdateBanner`: hidden when state is `idle` or `error-network`; visible with the right copy in `available`/`downloading`/`ready`; Restart button calls `ipc.updater.install()`; "View release notes" opens the right URL via `ipc.app.openExternal`.
- `FirstRunWizard`: skip links work; theme picker updates the store; channel picker persists; template picker inserts into the new buffer.
- `CrashReportModal`: lists dumps from the IPC response; "Open folder" invokes `crash.openDir`; delete removes the file.
- `SettingsModal > Updates`: channel radio flips `settings-store.updateChannel`; "Check now" fires `ipc.updater.check`; auto-check toggle persists.
### Integration (Vitest, full app)
- **Migration end-to-end:** pre-seed a v4 settings file in `app.getPath('userData')/settings.json`, launch the app, verify v5 file is written, v4 backup exists, `migration.version === 5`, and the wizard opens on first run.
- **Update flow mock:** stub `electron-updater` to emit `available``downloading``ready`; verify the banner appears, Restart click triggers `quitAndInstall`, and the IPC sequence matches the allowlist.
### E2E (Playwright + Electron, runs the live app)
- Open the app, verify the FirstRun wizard renders. Skip. Verify the editor is visible.
- Open Settings, switch update channel from GitHub to ConcreteInfo, click Check now. Stub the feed response. Verify the banner appears with the right version.
- Click Restart. Verify the app calls `quitAndInstall` (assert on a mocked `autoUpdater.quitAndInstall`).
- Trigger an unhandled rejection in the renderer. Verify a dump is written to `crashDumps/`. Open the CrashReportModal, verify it appears in the list.
### Coverage targets
- Updater service: ≥ 90% (small surface, hot path).
- Migration runner: 100% of branches (idempotency, corrupt file, missing file, transform failure).
- FirstRunWizard: ≥ 80%.
- Component tests above any preset.
## 6. Distribution feed contracts
### GitHub Releases (default)
Feed URL pattern:
```
https://github.com/{owner}/{repo}/releases/download/v{version}/
```
For v5.0.2:
```
https://github.com/{owner}/{repo}/releases/download/v5.0.2/latest-mac.yml
https://github.com/{owner}/{repo}/releases/download/v5.0.2/latest-linux.yml
https://github.com/{owner}/{repo}/releases/download/v5.0.2/latest-windows.yml
```
`electron-updater` reads these automatically given the GitHub owner/repo config. The release workflow already exists at `.github/workflows/release.yml` and builds `.dmg`, `.zip`, `.exe`, `.deb`, `.rpm`. We add `latest.yml` generation via `electron-builder --publish always` in the CI.
### ConcreteInfo feed
Feed URL:
```
https://updates.concreteinfo.co.in/v5/latest.yml
https://updates.concreteinfo.co.in/v5/latest-mac.yml
https://updates.concreteinfo.co.in/v5/latest-linux.yml
https://updates.concreteinfo.co.in/v5/latest-windows.yml
```
CI mirrors the GitHub Release artifacts to this path on every release. ConcreteInfo infra is documented in `~/.claude-mmax/CLAUDE.md`; the coolify server is `localhost:8000`. The mirror is a static-file route — no auth, just version-prefixed.
## 7. First-run wizard contract
Three steps. Each step has "Skip" and "Back" links. Final step is "Done."
1. **Theme:** Light / Dark / System. Default: System. Persists to `settings-store.theme`.
2. **Update channel:** GitHub Releases / ConcreteInfo. Default: GitHub Releases. Persists to `settings-store.updateChannel`.
3. **Starter template:** Blank / README / Meeting notes / Blog post. Default: Blank. On "Done," creates an untitled buffer with the chosen template content.
`firstRun` lives in `app-store` (not persisted across app data resets) and is checked on every launch. Setting it to `false` either explicitly (skip/done) or implicitly (v4 migration succeeded) prevents re-showing.
## 8. Settings migration contract (v4.4.1 → v5.0.0)
`migration-runner` runs once on first v5 launch. It:
1. Reads `app.getPath('userData')/settings.json` if it exists.
2. Validates the v4 shape with a zod schema (`v4SettingsSchema`).
3. If valid: transforms via `migrations/v4-to-v5.ts` and writes the v5 settings to `settings.json`. Backs up v4 to `settings.v4.bak.json`. Sets `migration.version = 5` in the v5 file.
4. If missing or invalid: writes a fresh v5 settings file with defaults. `migration.version = 5`.
5. If transform throws: leaves v4 file in place as the "backup." App starts with defaults. Toast warns the user.
The transform handles:
- v4 `theme` ('light' | 'dark' | 'auto') → v5 `theme` ('light' | 'dark' | 'system').
- v4 `customCss` string → v5 `customCssPath` file path or `null`.
- v4 `recentFiles: string[]` → v5 `recentFiles` (unchanged shape).
- v4 `editorFontSize: number` → v5 `editorFontSize` (unchanged shape).
- v4 `keyBindings: object` → v5 `userBindings` (keymap).
- v4 `snippets: array` → v5 `snippets` (unchanged shape).
- v4 `pdfExportOptions` etc. → v5 schema for the new export pipeline.
Anything not in the v4 schema is dropped. Defaults are taken from the v5 zod schema.
## 9. IPC allowlist additions
`src/preload.js` adds these to `ALLOWED_SEND_CHANNELS`:
```js
'updater:check',
'updater:install',
'updater:get-state',
'crash:read',
'crash:open-dir',
'crash:delete',
```
`ALLOWED_RECEIVE_CHANNELS`:
```js
'updater:status',
```
The `electronAPI` object gets:
```js
updater: {
check: () => ipcRenderer.invoke('updater:check'),
install: () => ipcRenderer.invoke('updater:install'),
getState: () => ipcRenderer.invoke('updater:get-state'),
onStatus: (cb) => ipcRenderer.on('updater:status', (_, payload) => cb(payload)),
},
crash: {
read: () => ipcRenderer.invoke('crash:read'),
openDir: () => ipcRenderer.send('crash:open-dir'),
delete: (filename) => ipcRenderer.invoke('crash:delete', filename),
},
```
## 10. Risks & mitigations
| Risk | Mitigation |
|---|---|
| First-run wizard is annoying to long-time users | Skippable; only shows on first launch. `firstRun = false` is set permanently on first skip/done. |
| Auto-migration corrupts settings | Original v4 file is preserved as `settings.v4.bak.json`. Transform errors fall back to defaults and toast the user. |
| Crash writer fills disk | Cap at 20 dumps; oldest auto-pruned. |
| Update feed mirror drift between GitHub and CI | Mirror runs in CI on every release; manual `npm run publish:concreteinfo` available as fallback. |
| `electron-updater` is unsigned, so anyone can publish a "v5.0.2" to a mirror | We do not enable auto-install in v5 — every install is user-confirmed via the release-notes page. v5.1 adds signing. |
| First-run wizard blocks app start on a slow renderer | Wizard is non-blocking. App shell mounts and is interactive behind the modal. |
| Debounced `checkForUpdates()` may mask real errors | "Check now" button bypasses the debounce; debounce only applies to automatic checks. |
| CI release workflow is on a tag — broken tags must be re-tagged manually | Documented in CONTRIBUTING.md; pre-release tag re-runs the workflow. |
## 11. Out of scope (deferred)
- Code signing.
- Delta updates.
- Per-channel pre-release / beta tracks (only stable feeds in v5).
- Crash analytics / Sentry.
- Squirrel.Windows-specific quirks (we publish NSIS only).
@@ -0,0 +1,258 @@
# Monospace Font Embedding + Naming Differentiation
**Date:** 2026-07-22
**Branch:** react-electron
**Goal:** Bring `react-electron` to feature parity with `master` by porting the v4.5.0 "embedded monospace font" feature, and differentiate the dev build identity from the installed `markdown-converter` deb so the two can coexist on the same machine.
---
## Context
The `react-electron` branch is the active development branch — a major rewrite of the renderer in React 19 + TypeScript + Tailwind/shadcn while keeping the main process in CommonJS. As of commit `bb4e874` it is **ahead** of `master` in nearly every dimension (auto-updater, crash writer, migration runner, command palette, first-run wizard, updates settings, crash report modal, 30+ React modals, large-file mode, scoped CSS).
A repo-wide diff (`git diff --stat master..react-electron`) shows 301 files changed, +38,293/-26,786 lines. Master is **behind** react-electron.
The **only** feature present in `master` and absent in `react-electron` is the monospace-font-embedding feature added in master v4.5.0 (commits `3f8679c` through `b218c76`, 19 commits). It bundles JetBrains Mono + Fira Code TTFs and embeds them into PDF/DOCX/EPUB/HTML exports so ASCII art and code blocks render with the exact font the user sees in the preview.
A second concern: the user has `markdown-converter` installed as a `.deb`. Running `npm run dev` from this repo currently uses the same `appId` (`com.concreteinfo.markdownconverter`) and `productName` (`MarkdownConverter`), which triggers Electron's single-instance lock and confuses file-association routing. We rename this branch's identity to `Markdown Converter React` / `markdown-converter-react` to coexist.
---
## Scope
### In scope
1. Port the monospace font embedding feature from `master` v4.5.0 into the react-electron branch:
- All five `src/main/*.js` modules (`MonospaceFontConfig`, `PdfFontHeader`, `DocxFontEmbedder`, `EpubFontEmbedder`, `ExportCss`)
- Settings schema module (`src/main/settings/monospaceSettings.js`)
- Two new IPC handlers (`get-monospace-settings`, `set-monospace-settings`) plus preload allowlist and TypeScript declaration
- Renderer body-class toggle and CSS tokens (`--font-mono-active`, `--font-mono-feature`)
- Bundled font assets: `JetBrainsMono-{Regular,Bold}.ttf`, `FiraCode-{Regular,Bold}.ttf` plus LICENSE files
- `asarUnpack` directive for `assets/fonts/**`
- `download-tools.js` extension to fetch Fira Code
- Wire `buildMonospaceExportCss`, `buildPdfFontHeader`, `DocxFontEmbedder.embed`, `EpubFontEmbedder.embed` into `src/main/index.js` export pipelines (PDF, DOCX, EPUB, HTML paths)
- Print-preview font integration (`src/renderer/components/preview/PrintPreviewFrame.tsx` or equivalent)
- Tests: one test file per new module mirroring master's coverage plus an E2E smoke test
2. Rename branch identity:
- `package.json` `name``markdown-converter-react`
- `package.json` `build.productName``Markdown Converter React`
- `package.json` `build.appId``com.concreteinfo.markdownconverter.react`
- `package.json` `build.linux.executableName``markdown-converter-react`
- Window title prefix → `Markdown Converter — React Dev` in dev mode (use `process.env.VITE_DEV_SERVER_URL` as the gate)
- Settings file path remains `userData/settings.json` (no migration needed) — but add a new key `appVariant: "react"` so the renderer can show the correct title
### Out of scope
- React renderer rewrites (already ahead of master)
- Auto-updater, crash, migration (already ahead of master)
- Tauri / Web migration
- Pandoc version bump
- Documentation beyond this spec, the implementation plan, and the changelog entry
- Changes to v4-to-v5 settings migration (we leave the existing runner alone)
---
## Design
### Module layout (new files)
```
src/main/
MonospaceFontConfig.js # path resolver — finds bundled TTF
PdfFontHeader.js # builds .tex fontspec header for xelatex/lualatex
DocxFontEmbedder.js # injects TTF into pandoc DOCX output (post-process)
EpubFontEmbedder.js # EPUB --epub-embed-font + manifest patch
ExportCss.js # builds CSS string with woff2 embedded as base64
settings/
monospaceSettings.js # schema, defaults, family map
ipc/
monospace-handlers.js # IPC handler registration
utils/
(existing) # no change
src/renderer/
hooks/
use-monospace-classes.ts # toggles body.mono-{jetbrains,fira}{,-ligatures} classes
components/preview/
PrintPreviewFrame.tsx # wire print preview to monospace settings via IPC
styles/globals.css # add --font-mono-active/--font-mono-feature declarations
types/electron.d.ts # extend ElectronAPI with monospace.{getSettings,saveSettings}
src/preload.js # add monospace channels to ALLOWED_SEND_CHANNELS + expose on window.electronAPI.monospace
assets/fonts/
JetBrainsMono-Regular.ttf # bundled, ~270 KB
JetBrainsMono-Bold.ttf # bundled, ~278 KB
JetBrainsMono-LICENSE.txt
FiraCode-Regular.ttf # bundled, ~300 KB
FiraCode-Bold.ttf # bundled, ~300 KB
FiraCode-LICENSE.txt
scripts/download-tools.js # extend to fetch Fira Code
tests/
unit/main/monospace/
MonospaceFontConfig.test.js
monospaceSettings.test.js
PdfFontHeader.test.js
DocxFontEmbedder.test.js
EpubFontEmbedder.test.js
ExportCss.test.js
monospace-handlers.test.js
smoke-e2e-monospace.js # e2e: convert ASCII-art Markdown → PDF/DOCX/EPUB/HTML, assert TTF references appear in output
```
### Key interfaces (TypeScript-style for clarity)
```ts
// src/main/settings/monospaceSettings.js
type MonoFont = 'jetbrains-mono' | 'fira-code';
const FAMILY_BY_KEY: Record<MonoFont, string> = {
'jetbrains-mono': 'JetBrains Mono',
'fira-code': 'Fira Code',
};
function getActiveMonoFont(settings): string;
function isLigaturesEnabled(settings): boolean;
function safeMonospaceSettings(input): { monospaceFont: MonoFont; monospaceLigatures: boolean };
// src/main/MonospaceFontConfig.js
function getMonoFontTtfPath(familyKey, weight = 400): string | null; // null if asset missing
function ligaturesEnabled(settings): boolean;
function getActiveFamily(settings): string;
// src/main/PdfFontHeader.js
function buildPdfFontHeader(settings, ttfPath, fontFamily): { headerPath: string; familyName: string };
// src/main/DocxFontEmbedder.js
async function embedDocxFont(inputDocxPath, outputDocxPath, ttfPath, fontFamily): Promise<void>;
async function buildDocxWithEmbeddedFont(pandocArgs, settings): Promise<{args, postProcess}>;
// src/main/EpubFontEmbedder.js
async function embedEpubFont(epubPath, ttfPath, fontFamily): Promise<void>;
function withEpubEmbedFontArgs(pandocArgs, ttfPath, fontFamily): string[];
// src/main/ExportCss.js
function buildExportCss(settings, { woff2Base64, family, ligatures }): string;
function buildFontFaceBlock(familyKey, woff2Base64): string;
// src/main/ipc/monospace-handlers.js
function register({ getMainWindow }): void;
// ipcMain.handle('get-monospace-settings', () => ({ monospaceFont, monospaceLigatures }))
// ipcMain.handle('set-monospace-settings', (_e, partial) => safeMonospaceSettings(partial) → persist + broadcast)
```
### Renderer integration
- `use-monospace-classes.ts` hook runs once on mount, calls `electronAPI.monospace.getSettings()`, applies `document.body.classList` of:
- `mono-jetbrains-mono` | `mono-fira-code`
- `mono-ligatures-on` | `mono-ligatures-off`
- CSS in `globals.css`:
```css
:root {
--font-mono-active: 'JetBrains Mono', 'SF Mono', Monaco, 'Courier New', monospace;
--font-mono-feature: 'liga' 0, 'calt' 0;
}
body.mono-fira-code { --font-mono-active: 'Fira Code', 'JetBrains Mono', 'SF Mono', monospace; }
body.mono-ligatures-on { --font-mono-feature: 'liga' 1, 'calt' 1; }
```
- All existing `font-family: monospace` and `font-family: var(--font-mono)` usages continue to work; the new tokens sit above them.
### Wiring into export pipelines
In `src/main/index.js` `exportWithPandoc` (PDF branch):
- Read `monospaceFont` + `monospaceLigatures` from settings
- Resolve TTF path via `MonospaceFontConfig.getMonoFontTtfPath`
- If path exists: build font header via `PdfFontHeader.buildPdfFontHeader`, pass `--include-in-header=…`
- If path missing: log warning, fall back to existing `-V monofont=Consolas` behavior
In DOCX branch: invoke `DocxFontEmbedder.embedDocxFont` post-pandoc.
In EPUB branch: prepend `--epub-embed-font=…` to pandoc args; call `EpubFontEmbedder.embedEpubFont` to patch manifest.
In HTML branch: write CSS via `ExportCss.buildExportCss` (embed woff2 as base64) and reference in `<style>`.
### Naming differentiation
`package.json` changes:
```diff
- "name": "markdown-converter"
+ "name": "markdown-converter-react"
- "productName": "MarkdownConverter"
+ "productName": "Markdown Converter React"
- "appId": "com.concreteinfo.markdownconverter"
+ "appId": "com.concreteinfo.markdownconverter.react"
+ "linux": {
+ "executableName": "markdown-converter-react",
+ "synopsis": "Markdown editor (React build)",
+ "description": "Markdown editor and universal file converter — React build"
+ }
```
`src/main/window/index.js`:
```js
const isDev = !!process.env.VITE_DEV_SERVER_URL;
const titleSuffix = isDev ? ' — React Dev' : '';
mainWindow = new BrowserWindow({
title: `Markdown Converter${titleSuffix}`,
...
});
```
### Settings impact
Add two keys to `migration-transform.js` v5 schema with safe defaults:
- `monospaceFont: z.enum(['jetbrains-mono', 'fira-code']).default('jetbrains-mono')`
- `monospaceLigatures: z.boolean().default(false)`
- `appVariant: z.enum(['classic', 'react']).default('react')`
Existing user settings remain valid; the migration just fills in the new defaults.
---
## Testing strategy (TDD)
For each new module: red-green-refactor.
1. `MonospaceFontConfig.test.js` — uses tmpdir + mocked `process.resourcesPath` to assert resolution from `assets/fonts/JetBrainsMono-Regular.ttf`. Covers missing-file fallback.
2. `monospaceSettings.test.js` — schema validation: rejects unknown fonts, coerces ligatures boolean, fills defaults.
3. `PdfFontHeader.test.js` — writes a temp `.tex` file, asserts `\setmonofont{JetBrainsMono-Regular.ttf}[...]` lines match.
4. `DocxFontEmbedder.test.js` — given a minimal DOCX zip, asserts `word/fonts/` contains the TTF and `word/_rels/fontTable.xml.rels` references it.
5. `EpubFontEmbedder.test.js` — asserts `META-INF/container.xml` and `content.opf` updated after `--epub-embed-font`.
6. `ExportCss.test.js` — base64 round-trip: `atob(css.match(/base64,([A-Za-z0-9+/=]+)/)[1])` returns the original woff2 bytes.
7. `monospace-handlers.test.js` — invokes the registered handlers against `ipcMain` mock; asserts settings persistence + broadcast.
8. `smoke-e2e-monospace.js` — runs `pandoc` end-to-end against a fixture markdown with ASCII art; greps output for font references.
Coverage threshold maintained: jest at 15%, vitest at v8 + renderer lines.
---
## Risks
- **TTF download license** — Fira Code is OFL-1.1; JetBrains Mono is OFL-1.1. Both allow redistribution; LICENSE files ship alongside TTFs. No risk.
- **Pandoc version sensitivity** — `--epub-embed-font` requires pandoc ≥ 2.19. The download-tools script pins to 3.9.0.2; check `pandocVersion` and gracefully fall back if older.
- **asarUnpack size** — adding ~1.2 MB of TTFs to packaged builds. Acceptable; matches master.
- **Dev/prod appId split** — if a user installs both `markdown-converter` and `markdown-converter-react` debs, their settings files are separate (`userData/com.concreteinfo.markdownconverter.react/settings.json`). Documented in README.
- **Test environment** — the e2e smoke test requires pandoc available locally. We'll `test.skip` if `which pandoc` fails.
---
## Definition of done
- [ ] All planned steps implemented, not just the first/easiest ones
- [ ] No forbidden markers (`TODO`, `FIXME`, `XXX`, `HACK`, `not implemented`, `placeholder`, `stub`, `coming soon`) in changed source
- [ ] New test suites pass; existing 638 tests still pass
- [ ] `npm run build:linux` produces a `.deb` artifact named `markdown-converter-react_*_amd64.deb`
- [ ] App launches in dev mode with title `Markdown Converter — React Dev`
- [ ] E2E smoke test confirms TTF references in PDF/DOCX/EPUB/HTML output
- [ ] CHANGELOG.md updated with a "5.1.0 — react-electron parity" entry
- [ ] No unrelated refactors; every changed line traces to the request
---
## Learning collaboration
Per the project's learning-mode preference, the user will be asked to contribute two 5-10 line decisions during implementation:
1. **Default monospace family** in `monospaceSettings.js` (`jetbrains-mono` vs `fira-code` vs `system-fallback`).
2. **Body-class gating strategy** in `use-monospace-classes.ts` (apply on every settings change vs debounce vs once-on-mount).
These choices shape the feature's behavior in ways that benefit from the user's domain knowledge.
+1 -1
View File
@@ -85,7 +85,7 @@ module.exports = [
}, },
rules: { rules: {
// Error prevention // Error prevention
'no-unused-vars': ['warn', { argsIgnorePattern: '^_' }], 'no-unused-vars': ['warn', { argsIgnorePattern: '^_', varsIgnorePattern: '^_', caughtErrorsIgnorePattern: '^_' }],
'no-undef': 'error', 'no-undef': 'error',
'no-console': 'off', // Allow console for Electron apps 'no-console': 'off', // Allow console for Electron apps
+16 -3
View File
@@ -10,10 +10,23 @@ module.exports = {
// Root directory // Root directory
rootDir: '.', rootDir: '.',
// Test file patterns // Test file patterns — scoped to ./tests/ only so dist/ artifacts like
// .snap packages don't get matched as test suites.
testMatch: [ testMatch: [
'**/tests/**/*.test.js', '<rootDir>/tests/**/*.test.js',
'**/tests/**/*.spec.js' '<rootDir>/tests/**/*.spec.js'
],
// Ignore build outputs so .snap packages and bundled .asar contents
// never enter jest's file discovery.
testPathIgnorePatterns: [
'/node_modules/',
'/dist/',
'/\\.git/'
],
modulePathIgnorePatterns: [
'/node_modules/',
'/dist/'
], ],
// Coverage configuration // Coverage configuration
+490 -7
View File
@@ -1,12 +1,12 @@
{ {
"name": "markdown-converter", "name": "markdown-converter",
"version": "4.4.2", "version": "5.0.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "markdown-converter", "name": "markdown-converter",
"version": "4.4.2", "version": "5.0.1",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@codemirror/autocomplete": "^6.20.1", "@codemirror/autocomplete": "^6.20.1",
@@ -46,6 +46,7 @@
"docx4js": "^2.0.1", "docx4js": "^2.0.1",
"dompurify": "^3.3.1", "dompurify": "^3.3.1",
"electron-store": "^10.1.0", "electron-store": "^10.1.0",
"electron-updater": "^6.8.9",
"ffmpeg-static": "^5.3.0", "ffmpeg-static": "^5.3.0",
"figlet": "^1.11.0", "figlet": "^1.11.0",
"highlight.js": "^11.11.1", "highlight.js": "^11.11.1",
@@ -86,6 +87,7 @@
"autoprefixer": "^10.5.0", "autoprefixer": "^10.5.0",
"class-variance-authority": "^0.7.1", "class-variance-authority": "^0.7.1",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"concurrently": "^10.0.3",
"cross-env": "^10.0.0", "cross-env": "^10.0.0",
"electron": "^41.1.1", "electron": "^41.1.1",
"electron-builder": "^26.0.12", "electron-builder": "^26.0.12",
@@ -104,7 +106,8 @@
"tailwindcss-animate": "^1.0.7", "tailwindcss-animate": "^1.0.7",
"typescript": "^6.0.3", "typescript": "^6.0.3",
"vite": "^8.0.16", "vite": "^8.0.16",
"vitest": "^4.1.8" "vitest": "^4.1.8",
"wait-on": "^9.0.10"
} }
}, },
"node_modules/@adobe/css-tools": { "node_modules/@adobe/css-tools": {
@@ -1902,6 +1905,60 @@
"integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==", "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/@hapi/address": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/@hapi/address/-/address-5.1.1.tgz",
"integrity": "sha512-A+po2d/dVoY7cYajycYI43ZbYMXukuopIsqCjh5QzsBCipDtdofHntljDlpccMjIfTy6UOkg+5KPriwYch2bXA==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
"@hapi/hoek": "^11.0.2"
},
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/@hapi/formula": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/@hapi/formula/-/formula-3.0.2.tgz",
"integrity": "sha512-hY5YPNXzw1He7s0iqkRQi+uMGh383CGdyyIGYtB+W5N3KHPXoqychklvHhKCC9M3Xtv0OCs/IHw+r4dcHtBYWw==",
"dev": true,
"license": "BSD-3-Clause"
},
"node_modules/@hapi/hoek": {
"version": "11.0.7",
"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-11.0.7.tgz",
"integrity": "sha512-HV5undWkKzcB4RZUusqOpcgxOaq6VOAH7zhhIr2g3G8NF/MlFO75SjOr2NfuSx0Mh40+1FqCkagKLJRykUWoFQ==",
"dev": true,
"license": "BSD-3-Clause"
},
"node_modules/@hapi/pinpoint": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-2.0.1.tgz",
"integrity": "sha512-EKQmr16tM8s16vTT3cA5L0kZZcTMU5DUOZTuvpnY738m+jyP3JIUj+Mm1xc1rsLkGBQ/gVnfKYPwOmPg1tUR4Q==",
"dev": true,
"license": "BSD-3-Clause"
},
"node_modules/@hapi/tlds": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/@hapi/tlds/-/tlds-1.1.6.tgz",
"integrity": "sha512-xdi7A/4NZokvV0ewovme3aUO5kQhW9pQ2YD1hRqZGhhSi5rBv4usHYidVocXSi9eihYsznZxLtAiEYYUL6VBGw==",
"dev": true,
"license": "BSD-3-Clause",
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/@hapi/topo": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-6.0.2.tgz",
"integrity": "sha512-KR3rD5inZbGMrHmgPxsJ9dbi6zEK+C3ZwUwTa+eMwWLz7oijWUTWD2pMSNNYJAU6Qq+65NkxXjqHr/7LM2Xkqg==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
"@hapi/hoek": "^11.0.2"
}
},
"node_modules/@hookform/resolvers": { "node_modules/@hookform/resolvers": {
"version": "5.4.0", "version": "5.4.0",
"resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-5.4.0.tgz", "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-5.4.0.tgz",
@@ -6844,7 +6901,6 @@
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
"dev": true,
"license": "Python-2.0" "license": "Python-2.0"
}, },
"node_modules/aria-hidden": { "node_modules/aria-hidden": {
@@ -6982,6 +7038,46 @@
"postcss": "^8.1.0" "postcss": "^8.1.0"
} }
}, },
"node_modules/axios": {
"version": "1.17.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.17.0.tgz",
"integrity": "sha512-J8SwNxprqqpbfenehxWYXE7CW+wM1BB4w3+N+g+/Wx40xM4rsLrfPmHHxSWIxJLYDgSY/HqlFPIYb2/S3rxafw==",
"dev": true,
"license": "MIT",
"dependencies": {
"follow-redirects": "^1.16.0",
"form-data": "^4.0.5",
"https-proxy-agent": "^5.0.1",
"proxy-from-env": "^2.1.0"
}
},
"node_modules/axios/node_modules/agent-base": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"debug": "4"
},
"engines": {
"node": ">= 6.0.0"
}
},
"node_modules/axios/node_modules/https-proxy-agent": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
"integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
"dev": true,
"license": "MIT",
"dependencies": {
"agent-base": "6",
"debug": "4"
},
"engines": {
"node": ">= 6"
}
},
"node_modules/babel-jest": { "node_modules/babel-jest": {
"version": "30.3.0", "version": "30.3.0",
"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.3.0.tgz", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.3.0.tgz",
@@ -7889,6 +7985,185 @@
"typedarray": "^0.0.6" "typedarray": "^0.0.6"
} }
}, },
"node_modules/concurrently": {
"version": "10.0.3",
"resolved": "https://registry.npmjs.org/concurrently/-/concurrently-10.0.3.tgz",
"integrity": "sha512-hc3LH4UaKWd/bbyDK/IGVa4RB6PtQ3CUYwtrkzqHn+wIG3Hr5fhpRlk0L/gCa8ZE1L/Ufj50Zho69cI5w8SQBA==",
"dev": true,
"license": "MIT",
"dependencies": {
"chalk": "5.6.2",
"rxjs": "7.8.2",
"shell-quote": "1.8.4",
"supports-color": "10.2.2",
"tree-kill": "1.2.2",
"yargs": "18.0.0"
},
"bin": {
"conc": "dist/bin/index.js",
"concurrently": "dist/bin/index.js"
},
"engines": {
"node": ">=22"
},
"funding": {
"url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
}
},
"node_modules/concurrently/node_modules/ansi-regex": {
"version": "6.2.2",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
"integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://github.com/chalk/ansi-regex?sponsor=1"
}
},
"node_modules/concurrently/node_modules/ansi-styles": {
"version": "6.2.3",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
"integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
"node_modules/concurrently/node_modules/chalk": {
"version": "5.6.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
"integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
"dev": true,
"license": "MIT",
"engines": {
"node": "^12.17.0 || ^14.13 || >=16.0.0"
},
"funding": {
"url": "https://github.com/chalk/chalk?sponsor=1"
}
},
"node_modules/concurrently/node_modules/cliui": {
"version": "9.0.1",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz",
"integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==",
"dev": true,
"license": "ISC",
"dependencies": {
"string-width": "^7.2.0",
"strip-ansi": "^7.1.0",
"wrap-ansi": "^9.0.0"
},
"engines": {
"node": ">=20"
}
},
"node_modules/concurrently/node_modules/emoji-regex": {
"version": "10.6.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
"integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
"dev": true,
"license": "MIT"
},
"node_modules/concurrently/node_modules/string-width": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
"integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"emoji-regex": "^10.3.0",
"get-east-asian-width": "^1.0.0",
"strip-ansi": "^7.1.0"
},
"engines": {
"node": ">=18"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/concurrently/node_modules/strip-ansi": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
"integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
"dev": true,
"license": "MIT",
"dependencies": {
"ansi-regex": "^6.2.2"
},
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://github.com/chalk/strip-ansi?sponsor=1"
}
},
"node_modules/concurrently/node_modules/supports-color": {
"version": "10.2.2",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-10.2.2.tgz",
"integrity": "sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=18"
},
"funding": {
"url": "https://github.com/chalk/supports-color?sponsor=1"
}
},
"node_modules/concurrently/node_modules/wrap-ansi": {
"version": "9.0.2",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
"integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
"dev": true,
"license": "MIT",
"dependencies": {
"ansi-styles": "^6.2.1",
"string-width": "^7.0.0",
"strip-ansi": "^7.1.0"
},
"engines": {
"node": ">=18"
},
"funding": {
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
}
},
"node_modules/concurrently/node_modules/yargs": {
"version": "18.0.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz",
"integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==",
"dev": true,
"license": "MIT",
"dependencies": {
"cliui": "^9.0.1",
"escalade": "^3.1.1",
"get-caller-file": "^2.0.5",
"string-width": "^7.2.0",
"y18n": "^5.0.5",
"yargs-parser": "^22.0.0"
},
"engines": {
"node": "^20.19.0 || ^22.12.0 || >=23"
}
},
"node_modules/concurrently/node_modules/yargs-parser": {
"version": "22.0.0",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz",
"integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==",
"dev": true,
"license": "ISC",
"engines": {
"node": "^20.19.0 || ^22.12.0 || >=23"
}
},
"node_modules/conf": { "node_modules/conf": {
"version": "14.0.0", "version": "14.0.0",
"resolved": "https://registry.npmjs.org/conf/-/conf-14.0.0.tgz", "resolved": "https://registry.npmjs.org/conf/-/conf-14.0.0.tgz",
@@ -9469,6 +9744,82 @@
"dev": true, "dev": true,
"license": "ISC" "license": "ISC"
}, },
"node_modules/electron-updater": {
"version": "6.8.9",
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.8.9.tgz",
"integrity": "sha512-ZhVxM9iGONUpZGI1FxdMRgJjUFXi7AYGVa5PwKlO1tV1/4zDxQmfKpXOHVztKrd6L9rLcFjERvi1Mf2vxyTkig==",
"license": "MIT",
"dependencies": {
"builder-util-runtime": "9.7.0",
"fs-extra": "^10.1.0",
"js-yaml": "^4.1.0",
"lazy-val": "^1.0.5",
"lodash.escaperegexp": "^4.1.2",
"lodash.isequal": "^4.5.0",
"semver": "~7.7.3",
"tiny-typed-emitter": "^2.1.0"
}
},
"node_modules/electron-updater/node_modules/builder-util-runtime": {
"version": "9.7.0",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.7.0.tgz",
"integrity": "sha512-g/kR520giAFYkSXTzcmF3kqQq7wi8F6N6SzeDgZrqTBN+VHdmgWOyTdD1yD7AATDId/yXLvuP34CxW46/BwCdw==",
"license": "MIT",
"dependencies": {
"debug": "^4.3.4",
"sax": "^1.2.4"
},
"engines": {
"node": ">=12.0.0"
}
},
"node_modules/electron-updater/node_modules/fs-extra": {
"version": "10.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
"integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
"license": "MIT",
"dependencies": {
"graceful-fs": "^4.2.0",
"jsonfile": "^6.0.1",
"universalify": "^2.0.0"
},
"engines": {
"node": ">=12"
}
},
"node_modules/electron-updater/node_modules/jsonfile": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
"integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
"license": "MIT",
"dependencies": {
"universalify": "^2.0.0"
},
"optionalDependencies": {
"graceful-fs": "^4.1.6"
}
},
"node_modules/electron-updater/node_modules/semver": {
"version": "7.7.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
"integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
"license": "ISC",
"bin": {
"semver": "bin/semver.js"
},
"engines": {
"node": ">=10"
}
},
"node_modules/electron-updater/node_modules/universalify": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
"license": "MIT",
"engines": {
"node": ">= 10.0.0"
}
},
"node_modules/electron-winstaller": { "node_modules/electron-winstaller": {
"version": "5.4.0", "version": "5.4.0",
"resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-5.4.0.tgz", "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-5.4.0.tgz",
@@ -10378,6 +10729,27 @@
"dev": true, "dev": true,
"license": "ISC" "license": "ISC"
}, },
"node_modules/follow-redirects": {
"version": "1.16.0",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
"integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
"dev": true,
"funding": [
{
"type": "individual",
"url": "https://github.com/sponsors/RubenVerborgh"
}
],
"license": "MIT",
"engines": {
"node": ">=4.0"
},
"peerDependenciesMeta": {
"debug": {
"optional": true
}
}
},
"node_modules/fontkit": { "node_modules/fontkit": {
"version": "2.0.4", "version": "2.0.4",
"resolved": "https://registry.npmjs.org/fontkit/-/fontkit-2.0.4.tgz", "resolved": "https://registry.npmjs.org/fontkit/-/fontkit-2.0.4.tgz",
@@ -10563,6 +10935,19 @@
"node": "6.* || 8.* || >= 10.*" "node": "6.* || 8.* || >= 10.*"
} }
}, },
"node_modules/get-east-asian-width": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz",
"integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=18"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/get-intrinsic": { "node_modules/get-intrinsic": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
@@ -10810,7 +11195,6 @@
"version": "4.2.11", "version": "4.2.11",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
"dev": true,
"license": "ISC" "license": "ISC"
}, },
"node_modules/hachure-fill": { "node_modules/hachure-fill": {
@@ -12696,6 +13080,25 @@
"jiti": "lib/jiti-cli.mjs" "jiti": "lib/jiti-cli.mjs"
} }
}, },
"node_modules/joi": {
"version": "18.2.1",
"resolved": "https://registry.npmjs.org/joi/-/joi-18.2.1.tgz",
"integrity": "sha512-2/OKlogiESf2Nh3TFCrRjrr9z1DRHeW0I+KReF67+4J0Ns+8hBtHRmoWAZ2OFU6I5+TWLEe6sVlSdXPjHm5UbQ==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
"@hapi/address": "^5.1.1",
"@hapi/formula": "^3.0.2",
"@hapi/hoek": "^11.0.7",
"@hapi/pinpoint": "^2.0.1",
"@hapi/tlds": "^1.1.1",
"@hapi/topo": "^6.0.2",
"@standard-schema/spec": "^1.1.0"
},
"engines": {
"node": ">= 20"
}
},
"node_modules/jpeg-exif": { "node_modules/jpeg-exif": {
"version": "1.1.4", "version": "1.1.4",
"resolved": "https://registry.npmjs.org/jpeg-exif/-/jpeg-exif-1.1.4.tgz", "resolved": "https://registry.npmjs.org/jpeg-exif/-/jpeg-exif-1.1.4.tgz",
@@ -12714,7 +13117,6 @@
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
"integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"argparse": "^2.0.1" "argparse": "^2.0.1"
@@ -12980,7 +13382,6 @@
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz", "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz",
"integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==", "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==",
"dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/leven": { "node_modules/leven": {
@@ -13357,6 +13758,19 @@
"integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==", "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/lodash.escaperegexp": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
"integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==",
"license": "MIT"
},
"node_modules/lodash.isequal": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
"integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
"deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.",
"license": "MIT"
},
"node_modules/lodash.merge": { "node_modules/lodash.merge": {
"version": "4.6.2", "version": "4.6.2",
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -15183,6 +15597,16 @@
"signal-exit": "^3.0.2" "signal-exit": "^3.0.2"
} }
}, },
"node_modules/proxy-from-env": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
"integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=10"
}
},
"node_modules/pump": { "node_modules/pump": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz",
@@ -15758,6 +16182,16 @@
"integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==", "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
"license": "BSD-3-Clause" "license": "BSD-3-Clause"
}, },
"node_modules/rxjs": {
"version": "7.8.2",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
"integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
"tslib": "^2.1.0"
}
},
"node_modules/safe-buffer": { "node_modules/safe-buffer": {
"version": "5.2.1", "version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -15958,6 +16392,19 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/shell-quote": {
"version": "1.8.4",
"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.4.tgz",
"integrity": "sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/siginfo": { "node_modules/siginfo": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
@@ -16739,6 +17186,12 @@
"integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==", "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/tiny-typed-emitter": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz",
"integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==",
"license": "MIT"
},
"node_modules/tinybench": { "node_modules/tinybench": {
"version": "2.9.0", "version": "2.9.0",
"resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
@@ -16878,6 +17331,16 @@
"node": ">=20" "node": ">=20"
} }
}, },
"node_modules/tree-kill": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
"dev": true,
"license": "MIT",
"bin": {
"tree-kill": "cli.js"
}
},
"node_modules/truncate-utf8-bytes": { "node_modules/truncate-utf8-bytes": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
@@ -17441,6 +17904,26 @@
"node": ">=18" "node": ">=18"
} }
}, },
"node_modules/wait-on": {
"version": "9.0.10",
"resolved": "https://registry.npmjs.org/wait-on/-/wait-on-9.0.10.tgz",
"integrity": "sha512-rCoJEhvMr0X6alHmwc9abbrA5ZrLZFKpFQVKPNFwl2h7DapXOGdmimIHDtLOWhT4PjhZhxFEtZoQgEXbkDWdZw==",
"dev": true,
"license": "MIT",
"dependencies": {
"axios": "^1.16.0",
"joi": "^18.2.1",
"lodash": "^4.18.1",
"minimist": "^1.2.8",
"rxjs": "^7.8.2"
},
"bin": {
"wait-on": "bin/wait-on"
},
"engines": {
"node": ">=20.0.0"
}
},
"node_modules/walker": { "node_modules/walker": {
"version": "1.0.8", "version": "1.0.8",
"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+59 -13
View File
@@ -1,10 +1,15 @@
{ {
"name": "markdown-converter", "name": "markdown-converter-react",
"version": "5.0.0", "version": "5.0.1",
"description": "Professional Markdown editor and universal file converter with PDF editing, batch processing, and syntax highlighting", "description": "Professional Markdown editor and universal file converter with PDF editing, batch processing, and syntax highlighting (React build)",
"main": "src/main/index.js", "main": "src/main/index.js",
"scripts": { "scripts": {
"start": "electron .", "start": "electron .",
"dev:renderer": "vite --config vite.renderer.config.ts",
"dev:electron": "wait-on tcp:5173 && cross-env VITE_DEV_SERVER_URL=http://localhost:5173 ELECTRON_DISABLE_SANDBOX=1 electron . -- --no-sandbox --disable-gpu --disable-software-rasterizer --disable-dev-shm-usage",
"dev": "concurrently -k -n vite,electron -c blue,green \"npm:dev:renderer\" \"npm:dev:electron\"",
"build:renderer": "vite build --config vite.renderer.config.ts",
"preview": "npm run build:renderer && electron .",
"test": "jest", "test": "jest",
"test:watch": "jest --watch", "test:watch": "jest --watch",
"test:coverage": "jest --coverage", "test:coverage": "jest --coverage",
@@ -27,7 +32,9 @@
"dist": "electron-builder --publish=never", "dist": "electron-builder --publish=never",
"dist:all": "electron-builder -mwl", "dist:all": "electron-builder -mwl",
"download-tools": "node scripts/download-tools.js", "download-tools": "node scripts/download-tools.js",
"generate-icons": "node scripts/generate-icons.js" "generate-icons": "node scripts/generate-icons.js",
"build:icon-icns": "node scripts/build-icon-icns.js",
"publish:concreteinfo": "node scripts/publish-concreteinfo.js"
}, },
"keywords": [ "keywords": [
"markdown", "markdown",
@@ -60,6 +67,7 @@
"autoprefixer": "^10.5.0", "autoprefixer": "^10.5.0",
"class-variance-authority": "^0.7.1", "class-variance-authority": "^0.7.1",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"concurrently": "^10.0.3",
"cross-env": "^10.0.0", "cross-env": "^10.0.0",
"electron": "^41.1.1", "electron": "^41.1.1",
"electron-builder": "^26.0.12", "electron-builder": "^26.0.12",
@@ -78,7 +86,8 @@
"tailwindcss-animate": "^1.0.7", "tailwindcss-animate": "^1.0.7",
"typescript": "^6.0.3", "typescript": "^6.0.3",
"vite": "^8.0.16", "vite": "^8.0.16",
"vitest": "^4.1.8" "vitest": "^4.1.8",
"wait-on": "^9.0.10"
}, },
"dependencies": { "dependencies": {
"@codemirror/autocomplete": "^6.20.1", "@codemirror/autocomplete": "^6.20.1",
@@ -118,6 +127,7 @@
"docx4js": "^2.0.1", "docx4js": "^2.0.1",
"dompurify": "^3.3.1", "dompurify": "^3.3.1",
"electron-store": "^10.1.0", "electron-store": "^10.1.0",
"electron-updater": "^6.8.9",
"ffmpeg-static": "^5.3.0", "ffmpeg-static": "^5.3.0",
"figlet": "^1.11.0", "figlet": "^1.11.0",
"highlight.js": "^11.11.1", "highlight.js": "^11.11.1",
@@ -151,22 +161,29 @@
"lodash": "^4.17.21" "lodash": "^4.17.21"
}, },
"build": { "build": {
"appId": "com.concreteinfo.markdownconverter", "appId": "com.concreteinfo.markdownconverter.react",
"productName": "MarkdownConverter", "productName": "Markdown Converter React",
"copyright": "Copyright (C) 2024-2025 ConcreteInfo", "copyright": "Copyright (C) 2024-2025 ConcreteInfo",
"directories": { "directories": {
"output": "dist" "output": "dist"
}, },
"icon": "assets/icon", "icon": "assets/icon",
"files": [ "files": [
"src/**/*", "src/main/**/*",
"assets/**/*", "src/preload.js",
"scripts/**/*", "src/plugins/**/*",
"node_modules/**/*", "assets/fonts/**",
"package.json" "package.json"
], ],
"asarUnpack": [ "asarUnpack": [
"node_modules/ffmpeg-static/**" "node_modules/ffmpeg-static/**",
"assets/fonts/**"
],
"extraResources": [
{
"from": "dist/renderer",
"to": "renderer"
}
], ],
"extraFiles": [], "extraFiles": [],
"fileAssociations": [ "fileAssociations": [
@@ -194,7 +211,28 @@
], ],
"mac": { "mac": {
"category": "public.app-category.productivity", "category": "public.app-category.productivity",
"identity": null "identity": null,
"target": [
{
"target": "dmg",
"arch": [
"x64",
"arm64"
]
},
{
"target": "zip",
"arch": [
"x64",
"arm64"
]
}
],
"icon": "assets/icon.icns",
"darkModeSupport": true,
"hardenedRuntime": false,
"gatekeeperAssess": false,
"entitlements": null
}, },
"win": { "win": {
"target": [ "target": [
@@ -253,6 +291,8 @@
], ],
"category": "Utility", "category": "Utility",
"maintainer": "ConcreteInfo <amit.wh@gmail.com>", "maintainer": "ConcreteInfo <amit.wh@gmail.com>",
"executableName": "markdown-converter-react",
"synopsis": "Markdown editor and converter (React build)",
"extraFiles": [ "extraFiles": [
{ {
"from": "bin/linux/pandoc", "from": "bin/linux/pandoc",
@@ -267,6 +307,12 @@
], ],
"description": "Professional Markdown editor and universal file converter", "description": "Professional Markdown editor and universal file converter",
"maintainer": "ConcreteInfo <amit.wh@gmail.com>" "maintainer": "ConcreteInfo <amit.wh@gmail.com>"
},
"publish": {
"provider": "github",
"owner": "amitwh",
"repo": "markdown-converter",
"releaseType": "release"
} }
} }
} }
+718
View File
@@ -0,0 +1,718 @@
# Repository Structure Map
Auto-generated by `~/.claude-shared/scripts/repo-map.sh` (universal-ctags).
Signatures only — classes, functions, methods, interfaces, enums, types, namespaces, traits.
Regenerate after structural changes. Languages: `JavaScript,Sh,TypeScript`.
```
scripts/download-tools.js:
L28 function findFile
L46 method extract (PANDOC_CONFIG.linux)
L61 method extract (PANDOC_CONFIG.win32)
L77 method extract (PANDOC_CONFIG.darwin)
L90 function download
L97 function get (download)
L136 function downloadPandoc
scripts/generate-icons.js:
L17 function generateIcons
scripts/verify-open-export.mjs:
L60 function showSaveDialogSync (dialog)
src/adapters/electron/fs.js:
L20 method readFile (electronFsAdapter)
L30 method writeFile (electronFsAdapter)
L39 method deleteFile (electronFsAdapter)
L48 method ensureDir (electronFsAdapter)
L57 method listDirectory (electronFsAdapter)
L77 method exists (electronFsAdapter)
L86 method isDirectory (electronFsAdapter)
L96 method copy (electronFsAdapter)
L106 method move (electronFsAdapter)
src/analytics/analytics-panel.js:
L7 function showAnalyticsModal
L105 function escHandler (showAnalyticsModal)
L116 function escapeHtml
src/analytics/writing-analytics.js:
L77 function countSyllables
L83 function extractWords
L87 function getReadabilityLabel
L95 function analyze
src/editor/codemirror-setup.js:
L46 function createEditor
L61 function onChange (createEditor)
L118 function getLanguageExtension
L120 method javascript (getLanguageExtension.loaders)
L124 method html (getLanguageExtension.loaders)
L128 method css (getLanguageExtension.loaders)
L132 method json (getLanguageExtension.loaders)
L136 method python (getLanguageExtension.loaders)
src/main/GitOperations.js:
L3 function getGitInstance
L7 function getStatus
L31 function stage
L56 function commit
L66 function log
L84 function diff
src/main/PDFOperations.js:
L5 function parsePageRanges
L28 function hexToRgb
L39 function pdfMerge
L59 function pdfSplit
L126 function pdfCompress
L152 function pdfRotate
L182 function pdfDeletePages
L208 function pdfReorder
L233 function pdfWatermark
L319 function pdfEncrypt
L353 function pdfDecrypt
L370 function pdfSetPermissions
L404 function executeOperation
L431 function getPageCount
src/main/files/binary.js:
L6 function register
src/main/files/git.js:
L6 function register
src/main/files/index.js:
L9 function register
src/main/index.js:
L28 function getPandocPath
L46 function getFFmpegPath
L65 function sanitizeErrorMessage
L74 function createRateLimiter
L76 function canProceed (createRateLimiter)
L86 function convertDataToMarkdown
L108 function runPandocCmd
L124 function parseCommand
L319 function checkPandocAvailability
L334 function showAboutDialog
L437 function showDependenciesDialog
L550 function openFile
L580 function openPdfFile
L599 function saveAsFile
L614 function exportFile
L624 function showExportOptionsDialog
L628 function showBatchConversionDialog
L633 function selectWordTemplate
L654 function showTemplateSettings
L847 function processDynamicFields
L868 function setDocxPageSize
L927 function addHeaderFooterToDocx
L1060 function exportWordWithTemplate
L1100 function exportPDFViaWordTemplate
L1180 function showUniversalConverterDialog
L1185 function showPDFEditorDialog
L1195 function checkConverterAvailable
L1336 function collectFiles
L1431 function convertWithLibreOffice
L1466 function convertWithImageMagick
L1475 function convertWithFFmpeg
L1483 function convertWithPandoc
L1490 function performExportWithOptions
L1741 function tryPdfFallback
L1818 function showExportSuccess
L1828 function exportWithPandoc
L1907 function exportToHTML
L2026 function exportToPDFElectron
L2174 function exportSpreadsheet
L2184 function importDocument
L2280 function setTheme
L2488 function extractTablesFromMarkdown
L2530 function performBatchConversion
L2552 function findMarkdownFiles (performBatchConversion)
L2579 function processNextFile (performBatchConversion)
L2855 function handleCLIConversion
L2883 function showConversionDialog
L2932 function performCLIConversion
L2974 function buildPandocCommand
L3152 method transform (anonymousObject0b93a19c6805)
L3273 function openFileFromPath
L3468 function loadSnippets
L3479 function saveSnippetsFile
src/main/ipc/crash-handlers.js:
L3 function register
src/main/ipc/updater-handlers.js:
L4 function register
src/main/menu/index.js:
L16 function buildMenu
L30 function register
src/main/menu/items.js:
L9 function buildRecentFilesMenu
L18 method click (buildRecentFilesMenu.anonymousObject59dd54ea0305)
L27 method click (anonymousObject59dd54ea0505)
L40 function fileItems
L143 method click (fileItems.anonymousObject59dd54ea1005)
L150 method click (fileItems.anonymousObject59dd54ea1105)
L157 method click (fileItems.anonymousObject59dd54ea1205)
L165 method click (fileItems.anonymousObject59dd54ea1305)
L172 method click (fileItems.anonymousObject59dd54ea1405)
L180 method click (fileItems.anonymousObject59dd54ea1505)
L187 method click (fileItems.anonymousObject59dd54ea1605)
L194 method click (fileItems.anonymousObject59dd54ea1705)
L201 method click (fileItems.anonymousObject59dd54ea1805)
L209 method click (fileItems.anonymousObject59dd54ea1a05)
L216 method click (fileItems.anonymousObject59dd54ea1b05)
L224 method click (fileItems.anonymousObject59dd54ea1d05)
L232 method click (fileItems.anonymousObject59dd54ea1f05)
L239 method click (fileItems.anonymousObject59dd54ea2005)
L246 method click (fileItems.anonymousObject59dd54ea2105)
L254 method click (fileItems.anonymousObject59dd54ea2305)
L261 method click (fileItems.anonymousObject59dd54ea2405)
L300 function editItems
L326 function viewItems
L372 method click (viewItems.anonymousObject59dd54ea2a05)
L379 method click (viewItems.anonymousObject59dd54ea2b05)
L386 method click (viewItems.anonymousObject59dd54ea2c05)
L393 method click (viewItems.anonymousObject59dd54ea2d05)
L400 method click (viewItems.anonymousObject59dd54ea2e05)
L407 method click (viewItems.anonymousObject59dd54ea2f05)
L414 method click (viewItems.anonymousObject59dd54ea3005)
L421 method click (viewItems.anonymousObject59dd54ea3105)
L428 method click (viewItems.anonymousObject59dd54ea3205)
L435 method click (viewItems.anonymousObject59dd54ea3305)
L443 method click (viewItems.anonymousObject59dd54ea3505)
L450 method click (viewItems.anonymousObject59dd54ea3605)
L457 method click (viewItems.anonymousObject59dd54ea3705)
L464 method click (viewItems.anonymousObject59dd54ea3805)
L471 method click (viewItems.anonymousObject59dd54ea3905)
L478 method click (viewItems.anonymousObject59dd54ea3a05)
L485 method click (viewItems.anonymousObject59dd54ea3b05)
L492 method click (viewItems.anonymousObject59dd54ea3c05)
L499 method click (viewItems.anonymousObject59dd54ea3d05)
L506 method click (viewItems.anonymousObject59dd54ea3e05)
L513 method click (viewItems.anonymousObject59dd54ea3f05)
L520 method click (viewItems.anonymousObject59dd54ea4005)
L527 method click (viewItems.anonymousObject59dd54ea4105)
L534 method click (viewItems.anonymousObject59dd54ea4205)
L541 method click (viewItems.anonymousObject59dd54ea4305)
L602 function batchItems
L631 function convertItems
L644 function pdfEditorItems
L712 method click (pdfEditorItems.anonymousObject59dd54ea4905)
L719 method click (pdfEditorItems.anonymousObject59dd54ea4a05)
L726 method click (pdfEditorItems.anonymousObject59dd54ea4b05)
L744 function toolsItems
L757 function helpItems
src/main/store.js:
L11 method get (store)
L20 method set (store)
src/main/updater/crash-writer.js:
L5 class CrashWriter
L6 method constructor (CrashWriter)
L12 method handleUncaught (CrashWriter)
L28 method _prune (CrashWriter)
L40 method list (CrashWriter)
L54 method delete (CrashWriter)
L59 method path (CrashWriter)
src/main/updater/feed-config.js:
L1 function feedConfigFor
src/main/updater/migration-runner.js:
L4 class MigrationRunner
L5 method constructor (MigrationRunner)
L12 method run (MigrationRunner)
L36 method _writeDefaults (MigrationRunner)
src/main/updater/migration-transform.js:
L49 function isAlreadyV5
L56 function normalizeAlreadyV5
L95 function migrateV4ToV5
src/main/updater/updater-service.js:
L4 class UpdaterService
L5 method constructor (UpdaterService)
L13 method _wire (UpdaterService)
L27 method _emit (UpdaterService)
L32 method check (UpdaterService)
L38 method install (UpdaterService)
src/main/utils/paths.js:
L7 function getAllowedDirectories
L23 function validatePath
L58 function resolveWritablePath
L88 function isPathAccessible
src/main/window/index.js:
L10 function createMainWindow
src/main/window/state.js:
L10 function load
L18 function save
src/main/word-template/index.js:
L11 class WordTemplateExporter
L12 method constructor (WordTemplateExporter)
L21 method convert (WordTemplateExporter)
L58 method setPageSize (WordTemplateExporter)
L111 method insertContentAfterPage (WordTemplateExporter)
L140 method markdownToWordXml (WordTemplateExporter)
L251 method createHeadingXml (WordTemplateExporter)
L266 method createParagraphXml (WordTemplateExporter)
L280 method createQuoteXml (WordTemplateExporter)
L294 method createListItemXml (WordTemplateExporter)
L315 method createCodeBlockXml (WordTemplateExporter)
L352 method createHorizontalRuleXml (WordTemplateExporter)
L366 method createTableXml (WordTemplateExporter)
L502 method isAsciiArt (WordTemplateExporter)
L606 method createAsciiArtXml (WordTemplateExporter)
L715 method parseInlineFormatting (WordTemplateExporter)
L776 method createRunXml (WordTemplateExporter)
L797 method escapeXml (WordTemplateExporter)
src/plugins/built-in/_sample/index.js:
L3 class SamplePlugin
L4 method init (SamplePlugin)
src/plugins/built-in/writing-studio/goal-tracker.js:
L3 class GoalTracker
L7 method constructor (GoalTracker)
L11 method _getHistory (GoalTracker)
L16 method _setHistory (GoalTracker)
L20 method _setHistoryDay (GoalTracker)
L26 method addWords (GoalTracker)
L37 method getDailyProgress (GoalTracker)
L44 method getStreak (GoalTracker)
L61 method getLast30Days (GoalTracker)
L74 method getWeeklyTotal (GoalTracker)
src/plugins/built-in/writing-studio/index.js:
L7 class WritingStudioPlugin
L8 method init (WritingStudioPlugin)
L34 method _registerCommands (WritingStudioPlugin)
L112 method _registerStatusBar (WritingStudioPlugin)
L123 method deactivate (WritingStudioPlugin)
L127 method getEngines (WritingStudioPlugin)
src/plugins/built-in/writing-studio/panels/goals-panel.js:
L1 function renderGoalsPanel
src/plugins/built-in/writing-studio/panels/manuscript-panel.js:
L1 function renderManuscriptPanel
src/plugins/built-in/writing-studio/panels/proofread-panel.js:
L1 function renderProofreadPanel
L41 method callback (anonymousObjectd036aefd0105)
L50 function renderIssues
src/plugins/built-in/writing-studio/panels/snapshots-panel.js:
L1 function renderSnapshotsPanel
src/plugins/built-in/writing-studio/project-manager.js:
L1 class ProjectManager
L5 method constructor (ProjectManager)
L9 method createProject (ProjectManager)
L21 method loadProject (ProjectManager)
L27 method _saveProject (ProjectManager)
L31 method addChapter (ProjectManager)
L38 method updateChapter (ProjectManager)
L45 method compileManuscript (ProjectManager)
L56 method getStats (ProjectManager)
src/plugins/built-in/writing-studio/snapshot-manager.js:
L1 class SnapshotManager
L6 method constructor (SnapshotManager)
L11 method _getAll (SnapshotManager)
L16 method _saveAll (SnapshotManager)
L20 method create (SnapshotManager)
L34 method list (SnapshotManager)
L38 method getById (SnapshotManager)
L42 method restore (SnapshotManager)
L48 method delete (SnapshotManager)
L53 method diff (SnapshotManager)
L71 method prune (SnapshotManager)
src/plugins/built-in/writing-studio/sprint-engine.js:
L1 class SprintEngine
L6 method constructor (SprintEngine)
L14 method start (SprintEngine)
L22 method stop (SprintEngine)
L33 method tick (SprintEngine)
L43 method isActive (SprintEngine)
L47 method getRemaining (SprintEngine)
src/plugins/event-bus.js:
L1 class EventBus
L2 method constructor (EventBus)
L6 method on (EventBus)
L13 method off (EventBus)
L25 method emit (EventBus)
L37 method hasHandler (EventBus)
src/plugins/plugin-api.js:
L1 class PluginAPI
L7 method init (PluginAPI)
L12 method activate (PluginAPI)
L15 method deactivate (PluginAPI)
L18 method getManifest (PluginAPI)
src/plugins/plugin-context.js:
L1 class PluginContext
L14 method constructor (PluginContext)
L23 method register (PluginContext.constructor.commands)
L24 function safeHandler (PluginContext.constructor.commands.register)
L65 method registerPreHook (PluginContext.constructor.exports)
L68 method registerPostHook (PluginContext.constructor.exports)
src/plugins/plugin-loader.js:
L4 class PluginLoader
L8 method constructor (PluginLoader)
L17 method discoverPlugins (PluginLoader)
L66 method validateManifest (PluginLoader)
src/plugins/plugin-registry.js:
L4 class PluginRegistry
L5 method constructor (PluginRegistry)
L15 method register (PluginRegistry)
L49 method getPlugin (PluginRegistry)
L53 method getAll (PluginRegistry)
L57 method activate (PluginRegistry)
L68 method deactivate (PluginRegistry)
src/plugins/settings-store.js:
L1 class SettingsStore
L5 method constructor (SettingsStore)
L9 method get (SettingsStore)
L13 method set (SettingsStore)
L17 method onChanged (SettingsStore)
src/preload.js:
L275 method send (anonymousObject04f5e4370105)
L289 method invoke (anonymousObject04f5e4370105)
L308 method on (anonymousObject04f5e4370105)
L310 function subscription (anonymousObject04f5e4370105.on)
L328 method once (anonymousObject04f5e4370105)
L340 method removeAllListeners (anonymousObject04f5e4370105)
L488 function subscription
src/renderer/hooks/use-export-source.ts:
L4 interface ExportSource
L14 function useExportSource
src/renderer/hooks/use-file-shortcuts.ts:
L15 function useFileShortcuts
src/renderer/hooks/use-menu-action.ts:
L6 alias Transform
L17 function useMenuAction
src/renderer/hooks/use-restore-last-folder.ts:
L9 function useRestoreLastFolder
src/renderer/hooks/use-scroll-sync.ts:
L3 interface Options
L8 function useScrollSync
src/renderer/hooks/use-shortcut.ts:
L20 function useShortcut
L44 interface ComboSpec
L53 function parseCombo
L71 function matchCombo
src/renderer/hooks/use-welcome-trigger.ts:
L9 function useWelcomeTrigger
src/renderer/hooks/use-zen-mode.ts:
L8 function useZenMode
src/renderer/hooks/useAutoUpdateCheck.ts:
L5 function useAutoUpdateCheck
src/renderer/lib/ascii-table.ts:
L5 function toAsciiTable
L36 function applyAsciiTransform
src/renderer/lib/commands/register-menu-commands.ts:
L24 alias HeadingItem
L26 alias OpenModal
L28 function confirmCloseFlow
L45 function registerMenuCommands
L411 function useRegisterMenuCommands
L421 function useBridgeNativeMenu
src/renderer/lib/docx-export.ts:
L4 interface DocxOptions
L10 function generateDocx
src/renderer/lib/editor-commands.ts:
L18 function setActiveView
L22 function getActiveView
L27 function wrap
L57 function setLineHeading
L76 function toggleLinePrefix
L103 function toggleBold
L107 function toggleItalic
L111 function toggleCode
L115 function toggleCodeBlock
L143 function toggleUnorderedList
L147 function toggleOrderedList
L151 function insertLink
L167 function setHeadingLevel
L171 function scrollToLine
L185 function undo
L192 function redo
L199 function selectCurrentLine
L210 function insertSnippet
src/renderer/lib/figlet.ts:
L13 alias FigletFont
L15 function figletText
src/renderer/lib/headings.ts:
L1 interface HeadingItem
L13 function extractHeadings
src/renderer/lib/html-export.ts:
L11 interface HtmlExportOptions
L101 function generateHtml
L125 function escapeHtml
src/renderer/lib/ipc.ts:
L14 alias ChannelMissing
L16 function wrap
src/renderer/lib/markdown.ts:
L11 function renderMarkdown
src/renderer/lib/migrations/v4-to-v5.ts:
L16 function isAlreadyV5
L22 function normalizeAlreadyV5
L37 function migrateV4ToV5
src/renderer/lib/pdf-export.ts:
L13 interface PdfExportOptions
L28 function generatePdf
src/renderer/lib/updater-store.ts:
L4 alias State
L6 interface UpdaterState
src/renderer/lib/utils.ts:
L1 alias ClassValue
L4 function cn
src/renderer/lib/validators.ts:
L30 alias Settings
L38 alias ExportPdfOptions
L44 alias ExportDocxOptions
L51 alias ExportHtmlOptions
L58 alias ExportBatchOptions
src/renderer/lib/writing-analytics.ts:
L115 function countSyllables
L122 function extractWords
L126 function getReadabilityLabel
L134 interface WritingMetrics
L151 function analyzeText
src/renderer/stores/app-store.ts:
L4 interface PaneSizes
L10 interface ConfirmProps
L20 alias ModalState
L42 alias ModalKind
L44 interface AppState
L57 method openModal (AppState)
src/renderer/stores/command-store.ts:
L4 alias CommandId
L6 alias CommandHandler
L13 alias UserBindings
L15 interface CommandState
src/renderer/stores/editor-store.ts:
L7 interface Buffer
L15 interface EditorState
src/renderer/stores/file-store.ts:
L12 interface FileNode
L21 interface OpenTab
L28 interface FileState
L50 function entryToNode
L60 function updateNode
src/renderer/stores/preview-store.ts:
L3 interface PreviewState
src/renderer/stores/settings-store.ts:
L3 alias Settings
L5 alias Omit
L5 alias SettingsLeaf
L7 interface SettingsState
L8 method setSetting (SettingsState)
src/renderer/test/setup.ts:
L7 interface Window
L119 class ResizeObserver
L120 method observe (ResizeObserver)
L121 method unobserve (ResizeObserver)
L122 method disconnect (ResizeObserver)
L141 class DOMMatrix
src/renderer/types/electron.d.ts:
L1 interface ElectronAPI
L134 interface Window
src/renderer/types/ipc.ts:
L1 alias IpcResult
L5 interface FileEntry
L13 interface FileResult
L18 interface PdfOptions
L27 interface DocxOptions
L34 interface HtmlOptions
L41 interface ExportResult
L47 interface BatchItem
L52 interface BatchOptions
L57 interface BatchResult
src/repl/repl-panel.js:
L1 class ReplPanel
L2 method constructor (ReplPanel)
L8 method setupEventListeners (ReplPanel)
L13 method toggle (ReplPanel)
L19 method show (ReplPanel)
L25 method clear (ReplPanel)
L29 method appendOutput (ReplPanel)
L42 method escapeHtml (ReplPanel)
src/sidebar/explorer-panel.js:
L1 function renderExplorerPanel
L40 function renderTree
L79 function getFileIcon
src/sidebar/git-panel.js:
L1 function renderGitPanel
L24 function loadGitStatus (renderGitPanel)
src/sidebar/outline-panel.js:
L6 function renderOutlinePanel
L18 function parseHeadings (renderOutlinePanel)
L36 function findActiveHeading (renderOutlinePanel)
L48 function renderHeadings (renderOutlinePanel)
L89 function escapeHtml (renderOutlinePanel)
L95 function refresh (renderOutlinePanel)
L100 function setActiveHeading (renderOutlinePanel)
src/sidebar/sidebar-manager.js:
L1 class SidebarManager
L2 method constructor (SidebarManager)
L11 method setupEventListeners (SidebarManager)
L20 method registerPanel (SidebarManager)
L24 method togglePanel (SidebarManager)
L32 method expand (SidebarManager)
L45 method collapse (SidebarManager)
src/sidebar/snippets-panel.js:
L1 function renderSnippetsPanel
L14 function loadSnippets (renderSnippetsPanel)
L19 function renderList (renderSnippetsPanel)
src/sidebar/templates-panel.js:
L18 function renderTemplatesPanel
src/utils/ModalManager.js:
L5 class ModalManager
L16 method constructor (ModalManager)
L31 method init (ModalManager)
L47 method setupCloseTriggers (ModalManager)
L51 function handler (ModalManager.setupCloseTriggers)
L65 function handler
L74 method getFocusableElements (ModalManager)
L89 method trapFocus (ModalManager)
L111 method handleKeydown (ModalManager)
L119 method open (ModalManager)
L141 function keydownHandler (ModalManager.open)
L164 method close (ModalManager)
L182 function addHidden (ModalManager.close)
L188 function onTransitionEnd (ModalManager.close)
L223 method isOpen (ModalManager)
L227 method destroy (ModalManager)
tests/git-operations.test.js:
L26 function asyncFn
L35 function asyncFnWithError
tests/main-utils.test.js:
L7 function sanitizeErrorMessage
L49 function createRateLimiter
L51 function canProceed (createRateLimiter)
tests/markdown-extensions.test.js:
L83 method start (extension)
L86 method tokenizer (extension)
L102 method renderer (extension)
L151 function plantumlEncode
L176 function slugify
L203 function scopeCSS
tests/modal-manager.test.js:
L11 function createModalElement
tests/plugin-api.test.js:
L18 class MyPlugin
L19 method init (MyPlugin)
tests/plugin-context.test.js:
L39 function badHandler
tests/plugin-loader.test.js:
L17 function writeManifest
tests/plugin-registry.test.js:
L5 class TestPlugin
L6 method init (TestPlugin)
L10 method activate (TestPlugin)
L13 method deactivate (TestPlugin)
L69 class BadPlugin
L70 method init (BadPlugin)
tests/setup.js:
L96 function error (console)
tests/sidebar.test.js:
L41 method render (anonymousObject7c2818c30105)
L52 method render (anonymousObject7c2818c30205)
L62 method render (anonymousObject7c2818c30305)
L68 method render (anonymousObject7c2818c30405)
L80 method render (anonymousObject7c2818c30505)
L88 method render (anonymousObject7c2818c30605)
L96 method render (anonymousObject7c2818c30705)
L120 method render (anonymousObject7c2818c30905)
L130 method render (anonymousObject7c2818c30a05)
tests/unit/hooks/use-menu-action.test.ts:
L6 alias Cleanup
L27 function fireMenu
tests/unit/main/updater/crash-writer.test.js:
L6 function tmpDir
tests/unit/main/updater/migration-runner.test.js:
L6 function tmpDir
L47 method transform (anonymousObject196c14410c05)
L63 method transform (anonymousObject196c14410d05)
tests/unit/stores/file-store.test.ts:
L26 function fakeFileEntry
tests/utils.test.js:
L9 function parseCommand
L78 function hexToRgb
L121 function getExtension
L133 function replaceExtension
```
+75
View File
@@ -0,0 +1,75 @@
/**
* Build assets/icon.icns from the PNGs in assets/icons/.
*
* ICNS file format (Apple Icon Image):
* Header: 'icns' (4 bytes) + total file length (uint32 BE, includes header)
* For each size:
* Type tag (4 bytes) + length (uint32 BE, includes the 8-byte entry header) + PNG data
*
* Standard PNG type tags we'll include:
* icp4 = 16x16, icp5 = 32x32, icp6 = 64x64
* ic07 = 128x128, ic08 = 256x256, ic09 = 512x512, ic10 = 1024x1024
* icsb = 48x48 (small)
* ic11 = 16x16@2x (32x32 retina), ic12 = 32x32@2x (64x64 retina)
* ic13 = 128x128@2x (256x256 retina), ic14 = 256x256@2x (512x512 retina)
*/
const fs = require('fs');
const path = require('path');
const iconsDir = path.join(__dirname, '..', 'assets', 'icons');
const outFile = path.join(__dirname, '..', 'assets', 'icon.icns');
// (size-in-pixels, icns type tag) — we skip sizes we don't have on disk
const sizes = [
{ size: 16, type: 'icp4' },
{ size: 32, type: 'icp5' },
{ size: 64, type: 'icp6' },
{ size: 128, type: 'ic07' },
{ size: 256, type: 'ic08' },
{ size: 512, type: 'ic09' },
{ size: 1024, type: 'ic10' },
{ size: 48, type: 'icsb' },
{ size: 32, type: 'ic11' }, // 16@2x
{ size: 64, type: 'ic12' }, // 32@2x
{ size: 256, type: 'ic13' }, // 128@2x
{ size: 512, type: 'ic14' }, // 256@2x
];
const entries = [];
for (const { size, type } of sizes) {
const pngPath = path.join(iconsDir, `${size}x${size}.png`);
if (!fs.existsSync(pngPath)) continue;
const png = fs.readFileSync(pngPath);
// ICNS requires 8-byte alignment per entry. paddedLen is the TOTAL entry size
// (8-byte type+length header + PNG + padding), rounded up to a multiple of 8.
const paddedLen = 8 + Math.ceil(png.length / 8) * 8;
entries.push({ type, png, paddedLen });
console.log(` ${type} (${size}x${size}) — ${png.length} bytes`);
}
if (entries.length === 0) {
console.error('No source PNGs found in', iconsDir);
process.exit(1);
}
const totalLen = 8 + entries.reduce((s, e) => s + e.paddedLen, 0);
const buf = Buffer.alloc(totalLen);
let off = 0;
// Header
buf.write('icns', off, 4, 'ascii'); off += 4;
buf.writeUInt32BE(totalLen, off); off += 4;
// Entries
for (const { type, png, paddedLen } of entries) {
buf.write(type, off, 4, 'ascii'); off += 4;
buf.writeUInt32BE(paddedLen, off); off += 4;
png.copy(buf, off);
off += png.length;
// Pad to 8-byte boundary within the entry. paddedLen already includes the 8-byte header.
const pad = paddedLen - 8 - png.length;
if (pad > 0) off += pad;
}
fs.writeFileSync(outFile, buf);
console.log(`\nWrote ${outFile} (${buf.length} bytes, ${entries.length} sizes)`);
+72 -5
View File
@@ -14,6 +14,30 @@ const { execSync } = require('child_process');
const PANDOC_VERSION = '3.9.0.2'; const PANDOC_VERSION = '3.9.0.2';
/**
* Pandoc's archive inner layout has shifted across releases and platforms:
* linux tarball: pandoc-3.9.0.2/bin/pandoc
* win32 zip: pandoc-3.9.0.2/pandoc.exe
* darwin zip: pandoc-3.9.0.2-x86_64/bin/pandoc (arch-suffixed inner dir)
* pandoc-3.9.0.2-arm64/bin/pandoc (on Apple Silicon builds)
* Rather than hard-coding the intermediate path — which has already broken
* once when pandoc 3.9 added the arch suffix to the macOS archive — we walk
* the extracted tree and find the binary by name. This is robust to future
* layout shifts (e.g., universal binaries renaming the inner dir).
*/
function findFile(rootDir, targetName) {
const entries = fs.readdirSync(rootDir, { withFileTypes: true });
for (const entry of entries) {
const full = path.join(rootDir, entry.name);
if (entry.isFile() && entry.name === targetName) return full;
if (entry.isDirectory()) {
const found = findFile(full, targetName);
if (found) return found;
}
}
return null;
}
const PANDOC_CONFIG = { const PANDOC_CONFIG = {
linux: { linux: {
url: `https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/pandoc-${PANDOC_VERSION}-linux-amd64.tar.gz`, url: `https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/pandoc-${PANDOC_VERSION}-linux-amd64.tar.gz`,
@@ -22,8 +46,9 @@ const PANDOC_CONFIG = {
extract(archivePath, destDir) { extract(archivePath, destDir) {
const tmpDir = path.join(os.tmpdir(), `pandoc-${Date.now()}`); const tmpDir = path.join(os.tmpdir(), `pandoc-${Date.now()}`);
fs.mkdirSync(tmpDir, { recursive: true }); fs.mkdirSync(tmpDir, { recursive: true });
execSync(`tar -xzf "${archivePath}" -C "${tmpDir}" pandoc-${PANDOC_VERSION}/bin/pandoc`); execSync(`tar -xzf "${archivePath}" -C "${tmpDir}"`);
const src = path.join(tmpDir, `pandoc-${PANDOC_VERSION}`, 'bin', 'pandoc'); const src = findFile(tmpDir, 'pandoc');
if (!src) throw new Error(`pandoc binary not found under ${tmpDir}`);
fs.copyFileSync(src, path.join(destDir, 'pandoc')); fs.copyFileSync(src, path.join(destDir, 'pandoc'));
fs.chmodSync(path.join(destDir, 'pandoc'), 0o755); fs.chmodSync(path.join(destDir, 'pandoc'), 0o755);
fs.rmSync(tmpDir, { recursive: true, force: true }); fs.rmSync(tmpDir, { recursive: true, force: true });
@@ -39,7 +64,8 @@ const PANDOC_CONFIG = {
execSync( execSync(
`powershell -Command "Expand-Archive -Force '${archivePath}' '${tmpDir}'"`, `powershell -Command "Expand-Archive -Force '${archivePath}' '${tmpDir}'"`,
); );
const src = path.join(tmpDir, `pandoc-${PANDOC_VERSION}`, 'pandoc.exe'); const src = findFile(tmpDir, 'pandoc.exe');
if (!src) throw new Error(`pandoc.exe not found under ${tmpDir}`);
fs.copyFileSync(src, path.join(destDir, 'pandoc.exe')); fs.copyFileSync(src, path.join(destDir, 'pandoc.exe'));
fs.rmSync(tmpDir, { recursive: true, force: true }); fs.rmSync(tmpDir, { recursive: true, force: true });
}, },
@@ -52,7 +78,8 @@ const PANDOC_CONFIG = {
const tmpDir = path.join(os.tmpdir(), `pandoc-${Date.now()}`); const tmpDir = path.join(os.tmpdir(), `pandoc-${Date.now()}`);
fs.mkdirSync(tmpDir, { recursive: true }); fs.mkdirSync(tmpDir, { recursive: true });
execSync(`unzip -o "${archivePath}" -d "${tmpDir}"`); execSync(`unzip -o "${archivePath}" -d "${tmpDir}"`);
const src = path.join(tmpDir, `pandoc-${PANDOC_VERSION}`, 'bin', 'pandoc'); const src = findFile(tmpDir, 'pandoc');
if (!src) throw new Error(`pandoc binary not found under ${tmpDir}`);
fs.copyFileSync(src, path.join(destDir, 'pandoc')); fs.copyFileSync(src, path.join(destDir, 'pandoc'));
fs.chmodSync(path.join(destDir, 'pandoc'), 0o755); fs.chmodSync(path.join(destDir, 'pandoc'), 0o755);
fs.rmSync(tmpDir, { recursive: true, force: true }); fs.rmSync(tmpDir, { recursive: true, force: true });
@@ -142,7 +169,47 @@ async function downloadPandoc() {
console.log(`[download-tools] pandoc ready: ${destFile}`); console.log(`[download-tools] pandoc ready: ${destFile}`);
} }
downloadPandoc().catch((err) => { async function downloadFiraCode() {
const targetDir = path.resolve(__dirname, '..', 'assets', 'fonts');
fs.mkdirSync(targetDir, { recursive: true });
// Pinned to an immutable release tag with explicit SHA-256 digests so the
// build fails loudly on any upstream tampering or accidental change.
// Update the version + digests together when bumping Fira Code.
const FIRA_CODE_VERSION = '6.2';
const baseUrl = `https://github.com/tonsky/FiraCode/releases/download/${FIRA_CODE_VERSION}`;
const files = [
{ url: `${baseUrl}/FiraCode-Regular.ttf`, out: 'FiraCode-Regular.ttf', sha256: '3c79d234a9161c790410ebb2a80de7efb7c15f581062c130e0fa78503ccdd0da' },
{ url: `${baseUrl}/FiraCode-Bold.ttf`, out: 'FiraCode-Bold.ttf', sha256: '975f26779fac1029c2cbdac1e9fac7e9ddeec05e064675e4aac63bffa121742f' },
{ url: `${baseUrl}/FiraCode-LICENSE.txt`, out: 'FiraCode-LICENSE.txt', sha256: null },
];
for (const f of files) {
const dest = path.join(targetDir, f.out);
if (fs.existsSync(dest)) {
console.log(`[download-tools] Fira Code asset already present at ${dest} — skipping.`);
continue;
}
if (!f.sha256 || !/^[a-f0-9]{64}$/i.test(f.sha256)) {
throw new Error(
`[download-tools] Refusing to download ${f.url}: SHA-256 digest not pinned. ` +
'Update scripts/download-tools.js with the digest from the official Fira Code release before building.'
);
}
const tmp = `${dest}.tmp`;
console.log(`[download-tools] Downloading ${f.url}...`);
await download(f.url, tmp);
const actual = require('crypto').createHash('sha256').update(fs.readFileSync(tmp)).digest('hex');
if (actual !== f.sha256) {
fs.unlinkSync(tmp);
throw new Error(
`[download-tools] SHA-256 mismatch for ${f.url}: expected ${f.sha256}, got ${actual}`
);
}
fs.renameSync(tmp, dest);
}
console.log('[download-tools] Fira Code ready');
}
Promise.all([downloadPandoc(), downloadFiraCode()]).catch((err) => {
console.error('[download-tools] FAILED:', err.message); console.error('[download-tools] FAILED:', err.message);
process.exit(1); process.exit(1);
}); });
+49
View File
@@ -0,0 +1,49 @@
#!/usr/bin/env node
const fs = require('fs');
const path = require('path');
const version = process.argv[2] || require('../package.json').version;
const hook = process.env.CONCRETEINFO_DEPLOY_HOOK;
if (!hook) {
console.error('CONCRETEINFO_DEPLOY_HOOK not set');
process.exit(1);
}
const candidates = [
'latest-mac.yml',
'latest-linux.yml',
'latest-windows.yml',
`MarkdownConverter-${version}.dmg`,
`markdown-converter_${version}_amd64.deb`,
`MarkdownConverter-Setup-${version}.exe`,
];
const dist = path.resolve(__dirname, '..', 'dist');
for (const f of candidates) {
if (!fs.existsSync(path.join(dist, f))) {
console.error(`missing ${f} — run electron-builder first`);
process.exit(1);
}
}
const form = new FormData();
form.append('version', version);
for (const f of candidates) {
if (fs.existsSync(path.join(dist, f))) {
form.append('artifacts', fs.createReadStream(path.join(dist, f)), f);
}
}
fetch('https://updates.concreteinfo.co.in/api/v1/ingest', {
method: 'POST',
headers: { Authorization: `Bearer ${hook}` },
body: form,
})
.then((r) => {
console.log('ingest status', r.status);
process.exit(r.ok ? 0 : 1);
})
.catch((e) => {
console.error('ingest failed:', e);
process.exit(1);
});
+148
View File
@@ -0,0 +1,148 @@
import { _electron as electron } from 'playwright-core';
import * as fs from 'node:fs';
import * as path from 'node:path';
const APP_DIR = '/home/amith/apps/markdown-converter';
const electronBin = path.join(APP_DIR, 'node_modules/electron/dist/electron');
const testMd = '/tmp/verify-test.md';
const outputDocx = '/tmp/verify-output.docx';
const outputHtml = '/tmp/verify-output.html';
// Cleanup previous outputs
if (fs.existsSync(testMd)) fs.unlinkSync(testMd);
if (fs.existsSync(outputDocx)) fs.unlinkSync(outputDocx);
if (fs.existsSync(outputHtml)) fs.unlinkSync(outputHtml);
// Write test Markdown file
fs.writeFileSync(
testMd,
'# Test Document\n\nThis is a verification test for opening and exporting.\n\n- Point A\n- Point B\n'
);
console.log('Launching Electron...');
const app = await electron.launch({
executablePath: electronBin,
args: [
'--no-sandbox',
'--disable-gpu',
'--disable-software-rasterizer',
'--disable-dev-shm-usage',
'.',
],
env: {
...process.env,
DISPLAY: ':0',
ELECTRON_DISABLE_SANDBOX: '1',
VITE_DEV_SERVER_URL: 'http://localhost:5173',
},
cwd: APP_DIR,
});
app.process().stdout.on('data', (data) => console.log('[MAIN-OUT]', data.toString().trim()));
app.process().stderr.on('data', (data) => console.log('[MAIN-ERR]', data.toString().trim()));
const win = await app.firstWindow();
await win.waitForLoadState('domcontentloaded');
await win.waitForSelector('.cm-editor, [role="toolbar"]', { timeout: 10000 });
console.log('App loaded.');
// Dismiss welcome wizard if present
const wizardCount = await win.locator('[data-testid="first-run-wizard"]').count();
if (wizardCount > 0) {
console.log('Dismissing first run wizard...');
await win.click('[data-testid="first-run-wizard"] >> text=Skip');
await new Promise((r) => setTimeout(r, 300));
}
// Stub dialog.showSaveDialogSync in main process to automatically return output paths
await app.evaluate(({ dialog }, { outputDocx, outputHtml }) => {
dialog.showSaveDialogSync = (window, options) => {
const filters = options?.filters || [];
if (filters.some(f => f.extensions.includes('docx'))) {
return outputDocx;
}
return outputHtml;
};
}, { outputDocx, outputHtml });
// Simulate opening the test Md file by sending IPC from main
console.log('Opening test markdown file...');
const fileContent = fs.readFileSync(testMd, 'utf-8');
await app.evaluate(({ BrowserWindow }, { filePath, content }) => {
const wins = BrowserWindow.getAllWindows();
const main = wins.find((w) => !w.isDestroyed());
if (!main) throw new Error('No main window');
main.webContents.send('file-opened', { path: filePath, content });
}, { filePath: testMd, content: fileContent });
// Wait for editor to display the content
await win.waitForFunction(
(content) => {
const editor = document.querySelector('.cm-content');
return editor && editor.textContent.includes('Test Document');
},
fileContent,
{ timeout: 5000 }
);
console.log('File successfully opened in editor.');
// Let's wait a moment for currentFile synchronization to trigger in the main process
await new Promise((r) => setTimeout(r, 500));
// Trigger DOCX Export (calls performExportWithOptions under the hood)
console.log('Exporting to DOCX...');
await win.evaluate(() => {
window.electronAPI.export.withOptions('docx', {});
});
// Wait for file to be written to disk
let docxExported = false;
for (let i = 0; i < 20; i++) {
if (fs.existsSync(outputDocx) && fs.statSync(outputDocx).size > 0) {
docxExported = true;
break;
}
await new Promise((r) => setTimeout(r, 250));
}
if (docxExported) {
console.log('✅ DOCX exported successfully.');
} else {
console.error('❌ DOCX export failed (file not created or empty).');
}
// Wait 2.5 seconds to bypass the conversion rate limiter (2000ms debounce)
console.log('Waiting for rate limiter...');
await new Promise((r) => setTimeout(r, 2500));
// Trigger HTML Export
console.log('Exporting to HTML...');
await win.evaluate(() => {
window.electronAPI.export.withOptions('html', {});
});
let htmlExported = false;
for (let i = 0; i < 20; i++) {
if (fs.existsSync(outputHtml) && fs.statSync(outputHtml).size > 0) {
htmlExported = true;
break;
}
await new Promise((r) => setTimeout(r, 250));
}
if (htmlExported) {
console.log('✅ HTML exported successfully.');
} else {
console.error('❌ HTML export failed (file not created or empty).');
}
await app.close();
console.log('Verification completed.');
if (docxExported && htmlExported) {
process.exit(0);
} else {
process.exit(1);
}
+2 -2
View File
@@ -65,7 +65,7 @@ const electronFsAdapter = {
isDir: entry.isDirectory, isDir: entry.isDirectory,
size: entry.size ?? 0, size: entry.size ?? 0,
modified: entry.modified ?? 0, modified: entry.modified ?? 0,
path: entry.path path: entry.path,
})); }));
}, },
@@ -105,7 +105,7 @@ const electronFsAdapter = {
*/ */
async move(source, dest) { async move(source, dest) {
return await window.electronAPI.file.move(source, dest); return await window.electronAPI.file.move(source, dest);
} },
}; };
module.exports = { electronFsAdapter }; module.exports = { electronFsAdapter };
+16 -6
View File
@@ -61,11 +61,15 @@ function showAnalyticsModal(tabManager) {
<span class="analytics-label">Avg Sentence</span> <span class="analytics-label">Avg Sentence</span>
<span class="analytics-value">${metrics.avgSentenceLength} words</span> <span class="analytics-value">${metrics.avgSentenceLength} words</span>
</div> </div>
${metrics.longestSentenceLength > 0 ? ` ${
metrics.longestSentenceLength > 0
? `
<div class="analytics-row analytics-longest"> <div class="analytics-row analytics-longest">
<span class="analytics-label">Longest (${metrics.longestSentenceLength} words)</span> <span class="analytics-label">Longest (${metrics.longestSentenceLength} words)</span>
<span class="analytics-value analytics-sentence-preview">${escapeHtml(metrics.longestSentence)}</span> <span class="analytics-value analytics-sentence-preview">${escapeHtml(metrics.longestSentence)}</span>
</div>` : ''} </div>`
: ''
}
</div> </div>
<div class="analytics-section"> <div class="analytics-section">
@@ -74,13 +78,19 @@ function showAnalyticsModal(tabManager) {
<span class="analytics-label">Unique</span> <span class="analytics-label">Unique</span>
<span class="analytics-value">${metrics.uniqueWordCount} / ${metrics.wordCount}<small>${metrics.lexicalDiversity}%</small></span> <span class="analytics-value">${metrics.uniqueWordCount} / ${metrics.wordCount}<small>${metrics.lexicalDiversity}%</small></span>
</div> </div>
${metrics.topWords.length > 0 ? ` ${
metrics.topWords.length > 0
? `
<div class="word-cloud"> <div class="word-cloud">
${metrics.topWords.map(w => { ${metrics.topWords
.map((w) => {
const scale = 13 + Math.round((w.count / maxCount) * 3); const scale = 13 + Math.round((w.count / maxCount) * 3);
return `<span class="word-tag" style="font-size:${scale}px">${escapeHtml(w.word)}<small>${w.count}</small></span>`; return `<span class="word-tag" style="font-size:${scale}px">${escapeHtml(w.word)}<small>${w.count}</small></span>`;
}).join('')} })
</div>` : ''} .join('')}
</div>`
: ''
}
</div> </div>
</div> </div>
</div> </div>
+89 -16
View File
@@ -4,14 +4,74 @@
*/ */
const STOP_WORDS = new Set([ const STOP_WORDS = new Set([
'the', 'a', 'an', 'is', 'are', 'was', 'were', 'be', 'been', 'the',
'have', 'has', 'had', 'do', 'does', 'did', 'will', 'would', 'a',
'could', 'should', 'to', 'of', 'in', 'for', 'on', 'with', 'an',
'at', 'by', 'from', 'as', 'and', 'or', 'but', 'if', 'it', 'is',
'its', 'this', 'that', 'these', 'those', 'i', 'me', 'my', 'are',
'we', 'our', 'you', 'your', 'he', 'him', 'his', 'she', 'her', 'was',
'they', 'them', 'their', 'not', 'no', 'so', 'than', 'too', 'were',
'very', 'also', 'just', 'about', 'up', 'out', 'what', 'which', 'who' 'be',
'been',
'have',
'has',
'had',
'do',
'does',
'did',
'will',
'would',
'could',
'should',
'to',
'of',
'in',
'for',
'on',
'with',
'at',
'by',
'from',
'as',
'and',
'or',
'but',
'if',
'it',
'its',
'this',
'that',
'these',
'those',
'i',
'me',
'my',
'we',
'our',
'you',
'your',
'he',
'him',
'his',
'she',
'her',
'they',
'them',
'their',
'not',
'no',
'so',
'than',
'too',
'very',
'also',
'just',
'about',
'up',
'out',
'what',
'which',
'who',
]); ]);
function countSyllables(word) { function countSyllables(word) {
@@ -48,17 +108,23 @@ function analyze(text) {
avgSentenceLength: 0, avgSentenceLength: 0,
longestSentence: '', longestSentence: '',
longestSentenceLength: 0, longestSentenceLength: 0,
topWords: [] topWords: [],
}; };
} }
const words = extractWords(text); const words = extractWords(text);
const wordCount = words.length; const wordCount = words.length;
const sentences = text.split(/[.!?]+/).map(s => s.trim()).filter(Boolean); const sentences = text
.split(/[.!?]+/)
.map((s) => s.trim())
.filter(Boolean);
const sentenceCount = Math.max(sentences.length, 1); const sentenceCount = Math.max(sentences.length, 1);
const paragraphs = text.split(/\n\s*\n/).map(p => p.trim()).filter(Boolean); const paragraphs = text
.split(/\n\s*\n/)
.map((p) => p.trim())
.filter(Boolean);
const paragraphCount = Math.max(paragraphs.length, 1); const paragraphCount = Math.max(paragraphs.length, 1);
let totalSyllables = 0; let totalSyllables = 0;
@@ -66,16 +132,23 @@ function analyze(text) {
totalSyllables += countSyllables(w); totalSyllables += countSyllables(w);
} }
const fleschEase = Math.round((206.835 - 1.015 * (wordCount / sentenceCount) - 84.6 * (totalSyllables / wordCount)) * 10) / 10; const fleschEase =
const fleschGrade = Math.round((0.39 * (wordCount / sentenceCount) + 11.8 * (totalSyllables / wordCount) - 15.59) * 10) / 10; Math.round(
(206.835 - 1.015 * (wordCount / sentenceCount) - 84.6 * (totalSyllables / wordCount)) * 10
) / 10;
const fleschGrade =
Math.round(
(0.39 * (wordCount / sentenceCount) + 11.8 * (totalSyllables / wordCount) - 15.59) * 10
) / 10;
const readabilityLabel = getReadabilityLabel(fleschEase); const readabilityLabel = getReadabilityLabel(fleschEase);
const readingTime = Math.ceil(wordCount / 200); const readingTime = Math.ceil(wordCount / 200);
const speakingTime = Math.ceil(wordCount / 130); const speakingTime = Math.ceil(wordCount / 130);
const uniqueWords = new Set(words.map(w => w.toLowerCase())); const uniqueWords = new Set(words.map((w) => w.toLowerCase()));
const uniqueWordCount = uniqueWords.size; const uniqueWordCount = uniqueWords.size;
const lexicalDiversity = wordCount > 0 ? Math.round((uniqueWordCount / wordCount) * 1000) / 10 : 0; const lexicalDiversity =
wordCount > 0 ? Math.round((uniqueWordCount / wordCount) * 1000) / 10 : 0;
const avgSentenceLength = Math.round((wordCount / sentenceCount) * 10) / 10; const avgSentenceLength = Math.round((wordCount / sentenceCount) * 10) / 10;
@@ -120,7 +193,7 @@ function analyze(text) {
avgSentenceLength, avgSentenceLength,
longestSentence, longestSentence,
longestSentenceLength, longestSentenceLength,
topWords topWords,
}; };
} }
+36 -29
View File
@@ -12,38 +12,23 @@ const { EditorState } = require('@codemirror/state');
const { markdown, markdownLanguage } = require('@codemirror/lang-markdown'); const { markdown, markdownLanguage } = require('@codemirror/lang-markdown');
// Language extensions loaded lazily on first use // Language extensions loaded lazily on first use
let _javascript, _html, _css, _json, _python; let _javascript, _html, _css, _json, _python;
const { const { defaultKeymap, history, historyKeymap, indentWithTab } = require('@codemirror/commands');
defaultKeymap, const { searchKeymap, highlightSelectionMatches } = require('@codemirror/search');
history, const { autocompletion, completionKeymap } = require('@codemirror/autocomplete');
historyKeymap, const { bracketMatching, foldGutter, indentOnInput } = require('@codemirror/language');
indentWithTab,
} = require('@codemirror/commands');
const {
searchKeymap,
highlightSelectionMatches,
} = require('@codemirror/search');
const {
autocompletion,
completionKeymap,
} = require('@codemirror/autocomplete');
const {
bracketMatching,
foldGutter,
indentOnInput,
} = require('@codemirror/language');
const { oneDark } = require('@codemirror/theme-one-dark'); const { oneDark } = require('@codemirror/theme-one-dark');
// Custom theme for JetBrains Mono font // Custom theme for JetBrains Mono font
const jetBrainsMonoTheme = EditorView.theme({ const jetBrainsMonoTheme = EditorView.theme({
'&': { '&': {
fontFamily: "'JetBrains Mono', 'Fira Code', 'SF Mono', Monaco, 'Courier New', monospace" fontFamily: "'JetBrains Mono', 'Fira Code', 'SF Mono', Monaco, 'Courier New', monospace",
}, },
'.cm-content': { '.cm-content': {
fontFamily: 'inherit' fontFamily: 'inherit',
}, },
'.cm-scroller': { '.cm-scroller': {
fontFamily: 'inherit' fontFamily: 'inherit',
} },
}); });
/** /**
@@ -59,7 +44,14 @@ const jetBrainsMonoTheme = EditorView.theme({
* @returns {EditorView} the created editor view * @returns {EditorView} the created editor view
*/ */
function createEditor(parentElement, options = {}) { function createEditor(parentElement, options = {}) {
console.log('[createEditor] Called with parentElement:', parentElement?.id, 'dimensions:', parentElement?.clientWidth, 'x', parentElement?.clientHeight); console.log(
'[createEditor] Called with parentElement:',
parentElement?.id,
'dimensions:',
parentElement?.clientWidth,
'x',
parentElement?.clientHeight
);
if (!parentElement) { if (!parentElement) {
console.error('[createEditor] ERROR: parentElement is null or undefined!'); console.error('[createEditor] ERROR: parentElement is null or undefined!');
return null; return null;
@@ -125,11 +117,26 @@ function createEditor(parentElement, options = {}) {
*/ */
function getLanguageExtension(lang) { function getLanguageExtension(lang) {
const loaders = { const loaders = {
javascript: () => { if (!_javascript) _javascript = require('@codemirror/lang-javascript').javascript; return _javascript(); }, javascript: () => {
html: () => { if (!_html) _html = require('@codemirror/lang-html').html; return _html(); }, if (!_javascript) _javascript = require('@codemirror/lang-javascript').javascript;
css: () => { if (!_css) _css = require('@codemirror/lang-css').css; return _css(); }, return _javascript();
json: () => { if (!_json) _json = require('@codemirror/lang-json').json; return _json(); }, },
python: () => { if (!_python) _python = require('@codemirror/lang-python').python; return _python(); }, html: () => {
if (!_html) _html = require('@codemirror/lang-html').html;
return _html();
},
css: () => {
if (!_css) _css = require('@codemirror/lang-css').css;
return _css();
},
json: () => {
if (!_json) _json = require('@codemirror/lang-json').json;
return _json();
},
python: () => {
if (!_python) _python = require('@codemirror/lang-python').python;
return _python();
},
markdown: () => markdown({ base: markdownLanguage }), markdown: () => markdown({ base: markdownLanguage }),
}; };
loaders.js = loaders.javascript; loaders.js = loaders.javascript;
+45
View File
@@ -0,0 +1,45 @@
'use strict';
const fs = require('fs');
const JSZip = require('jszip');
const FONT_TABLE_PATH = 'word/fontTable.xml';
const FONT_TABLE_RELS_PATH = 'word/_rels/fontTable.xml.rels';
function fontTableXml(family) {
return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<w:fonts xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
<w:font w:name="${family}">
<w:panose1 w:val="020F0502020204030204"/>
<w:charset w:val="00"/>
<w:family w:val="modern"/>
<w:pitch w:val="fixed"/>
<w:embedRegular r:id="rId1"/>
</w:font>
</w:fonts>`;
}
function fontTableRels(fontFilename) {
return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/font" Target="${fontFilename}"/>
</Relationships>`;
}
async function embedDocxFont(inputDocxPath, outputDocxPath, ttfPath, fontFamily) {
if (!ttfPath || !fs.existsSync(ttfPath)) {
throw new Error(`DocxFontEmbedder: TTF not found at ${ttfPath}`);
}
const inputBytes = fs.readFileSync(inputDocxPath);
const zip = await JSZip.loadAsync(inputBytes);
const safeFamily = String(fontFamily).replace(/[^A-Za-z0-9]/g, '');
const fontFilename = `${safeFamily}.ttf`;
const fontBytes = fs.readFileSync(ttfPath);
zip.file(`word/fonts/${fontFilename}`, fontBytes);
zip.file(FONT_TABLE_PATH, fontTableXml(safeFamily));
zip.file(FONT_TABLE_RELS_PATH, fontTableRels(fontFilename));
const out = await zip.generateAsync({ type: 'nodebuffer' });
fs.writeFileSync(outputDocxPath, out);
}
module.exports = { embedDocxFont };
+37
View File
@@ -0,0 +1,37 @@
'use strict';
const fs = require('fs');
const path = require('path');
const JSZip = require('jszip');
function withEpubEmbedFontArgs(pandocArgs, ttfPath, _fontFamily) {
return [`--epub-embed-font=${ttfPath}`, ...pandocArgs];
}
async function embedEpubFont(epubPath, ttfPath, _fontFamily) {
if (!ttfPath || !fs.existsSync(ttfPath)) {
throw new Error(`EpubFontEmbedder: TTF not found at ${ttfPath}`);
}
const bytes = fs.readFileSync(epubPath);
const zip = await JSZip.loadAsync(bytes);
const ttfBytes = fs.readFileSync(ttfPath);
const fontName = path.basename(ttfPath);
zip.file(`OEBPS/${fontName}`, ttfBytes);
const opfPath = 'OEBPS/content.opf';
const opfFile = zip.file(opfPath);
if (!opfFile) {
fs.writeFileSync(epubPath, await zip.generateAsync({ type: 'nodebuffer' }));
return;
}
let opf = await opfFile.async('string');
const manifestEntry = `<item id="font-${path.basename(fontName, '.ttf')}" href="${fontName}" media-type="application/x-font-ttf"/>`;
if (!opf.includes('manifest')) {
opf = opf.replace('</package>', `<manifest>${manifestEntry}</manifest></package>`);
} else if (!opf.includes(fontName)) {
opf = opf.replace('</manifest>', `${manifestEntry}</manifest>`);
}
zip.file(opfPath, opf);
fs.writeFileSync(epubPath, await zip.generateAsync({ type: 'nodebuffer' }));
}
module.exports = { withEpubEmbedFontArgs, embedEpubFont };
+25
View File
@@ -0,0 +1,25 @@
'use strict';
const { FAMILY_BY_KEY } = require('./settings/monospaceSettings');
function buildFontFaceBlock(family, woff2Bytes) {
const safeFamily = family.replace(/'/g, "\\'");
const b64 = Buffer.from(woff2Bytes).toString('base64');
return `@font-face {
font-family: '${safeFamily}';
src: url(data:font/woff2;base64,${b64}) format('woff2');
font-weight: 100 900;
font-style: normal;
font-display: swap;
}`;
}
function buildExportCss(settings, { woff2 } = {}) {
const family = (settings && FAMILY_BY_KEY[settings.monospaceFont]) || 'JetBrains Mono';
const ligatures = !!(settings && settings.monospaceLigatures === true);
const face = buildFontFaceBlock(family, woff2 || Buffer.alloc(0));
const feature = ligatures ? `code, pre, kbd, samp { font-feature-settings: 'liga' 1, 'calt' 1; }` : '';
return [face, feature].filter(Boolean).join('\n\n');
}
module.exports = { buildExportCss, buildFontFaceBlock };
+58 -8
View File
@@ -7,9 +7,24 @@ function getGitInstance(dir) {
async function getStatus(dir) { async function getStatus(dir) {
try { try {
const git = getGitInstance(dir); const git = getGitInstance(dir);
return await git.status(); const result = await git.status();
} catch (err) { const files = [];
return { error: 'Not a git repository' }; for (const [filePath, status] of Object.entries(result.files || {})) {
files.push({
filePath,
status:
status.working_dir === 'M'
? 'modified'
: status.working_dir === 'A' || status.index === 'A'
? 'added'
: status.working_dir === 'D' || status.index === 'D'
? 'deleted'
: 'untracked',
});
}
return { files };
} catch (_err) {
return { files: [], error: 'Not a git repository' };
} }
} }
@@ -17,16 +32,32 @@ async function stage(dir, files) {
try { try {
const git = getGitInstance(dir); const git = getGitInstance(dir);
await git.add(files); await git.add(files);
return await git.status(); const result = await git.status();
const staged = [];
for (const [filePath, status] of Object.entries(result.files || {})) {
staged.push({
filePath,
status:
status.index === 'A'
? 'added'
: status.index === 'M'
? 'modified'
: status.index === 'D'
? 'deleted'
: 'untracked',
});
}
return { files: staged };
} catch (err) { } catch (err) {
return { error: err.message }; return { files: [], error: err.message };
} }
} }
async function commit(dir, message) { async function commit(dir, message) {
try { try {
const git = getGitInstance(dir); const git = getGitInstance(dir);
return await git.commit(message); const result = await git.commit(message);
return { summary: result?.summary || 'Committed' };
} catch (err) { } catch (err) {
return { error: err.message }; return { error: err.message };
} }
@@ -35,10 +66,29 @@ async function commit(dir, message) {
async function log(dir, maxCount = 20) { async function log(dir, maxCount = 20) {
try { try {
const git = getGitInstance(dir); const git = getGitInstance(dir);
return await git.log({ maxCount }); const result = await git.log({ maxCount });
return {
latest: result?.latest || null,
all: (result?.all || []).map((entry) => ({
hash: entry.hash,
message: entry.message,
author: entry.author_name,
date: entry.date,
})),
};
} catch (err) {
return { all: [], error: err.message };
}
}
async function diff(dir, filePath) {
try {
const git = getGitInstance(dir);
const args = filePath ? ['--', filePath] : [];
return await git.diff(args);
} catch (err) { } catch (err) {
return { error: err.message }; return { error: err.message };
} }
} }
module.exports = { getStatus, stage, commit, log }; module.exports = { getStatus, stage, commit, log, diff };
+55
View File
@@ -0,0 +1,55 @@
'use strict';
const fs = require('fs');
const path = require('path');
const {
getActiveMonoFont,
isLigaturesEnabled,
FAMILY_BY_KEY,
} = require('./settings/monospaceSettings');
const WEIGHT_BY_KEY = { 300: 'Light', 400: 'Regular', 500: 'Medium', 600: 'SemiBold', 700: 'Bold' };
function getAppRoot() {
if (
process.resourcesPath &&
fs.existsSync(path.join(process.resourcesPath, 'app.asar.unpacked'))
) {
return process.resourcesPath;
}
return path.resolve(__dirname, '..', '..');
}
function getCandidatePaths(family, weight) {
const familyDir = family === 'Fira Code' ? 'FiraCode' : 'JetBrainsMono';
const weightName = WEIGHT_BY_KEY[weight] || 'Regular';
const filename = `${familyDir}-${weightName}.ttf`;
const candidates = [];
candidates.push(path.resolve(getAppRoot(), 'assets', 'fonts', filename));
const packagedRoot = process.resourcesPath || getAppRoot();
candidates.push(path.join(packagedRoot, 'app.asar.unpacked', 'assets', 'fonts', filename));
return candidates;
}
function getMonoFontTtfPath(familyKey, weight = 400) {
const family = FAMILY_BY_KEY[familyKey] || 'JetBrains Mono';
const candidates = getCandidatePaths(family, weight);
for (const p of candidates) {
if (fs.existsSync(p)) return p;
}
const filename = path.basename(candidates[candidates.length - 1]);
console.warn(
`[MonospaceFontConfig] bundled font missing: ${filename}; falling back to system monospace`
);
return null;
}
function ligaturesEnabled(settings) {
return isLigaturesEnabled(settings);
}
function getActiveFamily(settings) {
return getActiveMonoFont(settings);
}
module.exports = { getMonoFontTtfPath, ligaturesEnabled, getActiveFamily };
+58 -39
View File
@@ -4,11 +4,11 @@ const { PDFDocument, rgb, degrees, StandardFonts } = require('pdf-lib');
function parsePageRanges(rangeString, totalPages) { function parsePageRanges(rangeString, totalPages) {
const pages = []; const pages = [];
const ranges = rangeString.split(',').map(r => r.trim()); const ranges = rangeString.split(',').map((r) => r.trim());
for (const range of ranges) { for (const range of ranges) {
if (range.includes('-')) { if (range.includes('-')) {
const [start, end] = range.split('-').map(n => parseInt(n.trim())); const [start, end] = range.split('-').map((n) => parseInt(n.trim()));
for (let i = start; i <= end && i <= totalPages; i++) { for (let i = start; i <= end && i <= totalPages; i++) {
if (i > 0 && !pages.includes(i - 1)) { if (i > 0 && !pages.includes(i - 1)) {
pages.push(i - 1); pages.push(i - 1);
@@ -27,11 +27,13 @@ function parsePageRanges(rangeString, totalPages) {
function hexToRgb(hex) { function hexToRgb(hex) {
const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex); const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
return result ? { return result
? {
r: parseInt(result[1], 16) / 255, r: parseInt(result[1], 16) / 255,
g: parseInt(result[2], 16) / 255, g: parseInt(result[2], 16) / 255,
b: parseInt(result[3], 16) / 255 b: parseInt(result[3], 16) / 255,
} : { r: 0, g: 0, b: 0 }; }
: { r: 0, g: 0, b: 0 };
} }
async function pdfMerge(data) { async function pdfMerge(data) {
@@ -42,7 +44,7 @@ async function pdfMerge(data) {
const pdfBytes = fs.readFileSync(filePath); const pdfBytes = fs.readFileSync(filePath);
const pdf = await PDFDocument.load(pdfBytes); const pdf = await PDFDocument.load(pdfBytes);
const copiedPages = await mergedPdf.copyPages(pdf, pdf.getPageIndices()); const copiedPages = await mergedPdf.copyPages(pdf, pdf.getPageIndices());
copiedPages.forEach(page => mergedPdf.addPage(page)); copiedPages.forEach((page) => mergedPdf.addPage(page));
} }
const pdfBytes = await mergedPdf.save(); const pdfBytes = await mergedPdf.save();
@@ -63,13 +65,13 @@ async function pdfSplit(data) {
const splits = []; const splits = [];
if (data.splitMode === 'pages') { if (data.splitMode === 'pages') {
const ranges = data.pageRanges.split(',').map(r => r.trim()); const ranges = data.pageRanges.split(',').map((r) => r.trim());
for (let i = 0; i < ranges.length; i++) { for (let i = 0; i < ranges.length; i++) {
const range = ranges[i]; const range = ranges[i];
const pages = []; const pages = [];
if (range.includes('-')) { if (range.includes('-')) {
const [start, end] = range.split('-').map(n => parseInt(n.trim())); const [start, end] = range.split('-').map((n) => parseInt(n.trim()));
for (let p = start; p <= end && p <= totalPages; p++) { for (let p = start; p <= end && p <= totalPages; p++) {
pages.push(p - 1); pages.push(p - 1);
} }
@@ -108,7 +110,7 @@ async function pdfSplit(data) {
for (const split of splits) { for (const split of splits) {
const newPdf = await PDFDocument.create(); const newPdf = await PDFDocument.create();
const copiedPages = await newPdf.copyPages(pdf, split.pages); const copiedPages = await newPdf.copyPages(pdf, split.pages);
copiedPages.forEach(page => newPdf.addPage(page)); copiedPages.forEach((page) => newPdf.addPage(page));
const outputPath = path.join(data.outputFolder, `${baseName}_${split.name}.pdf`); const outputPath = path.join(data.outputFolder, `${baseName}_${split.name}.pdf`);
const newPdfBytes = await newPdf.save(); const newPdfBytes = await newPdf.save();
@@ -129,18 +131,18 @@ async function pdfCompress(data) {
const compressedPdfBytes = await pdf.save({ const compressedPdfBytes = await pdf.save({
useObjectStreams: true, useObjectStreams: true,
addDefaultPage: false, addDefaultPage: false,
objectsPerTick: 50 objectsPerTick: 50,
}); });
fs.writeFileSync(data.outputPath, compressedPdfBytes); fs.writeFileSync(data.outputPath, compressedPdfBytes);
const originalSize = fs.statSync(data.inputPath).size; const originalSize = fs.statSync(data.inputPath).size;
const compressedSize = fs.statSync(data.outputPath).size; const compressedSize = fs.statSync(data.outputPath).size;
const savings = ((originalSize - compressedSize) / originalSize * 100).toFixed(1); const savings = (((originalSize - compressedSize) / originalSize) * 100).toFixed(1);
return { return {
success: true, success: true,
message: `PDF compressed. Size reduced by ${savings}% (${(originalSize / 1024).toFixed(1)}KB → ${(compressedSize / 1024).toFixed(1)}KB)` message: `PDF compressed. Size reduced by ${savings}% (${(originalSize / 1024).toFixed(1)}KB → ${(compressedSize / 1024).toFixed(1)}KB)`,
}; };
} catch (error) { } catch (error) {
return { success: false, error: error.message }; return { success: false, error: error.message };
@@ -160,7 +162,7 @@ async function pdfRotate(data) {
pagesToRotate = Array.from({ length: totalPages }, (_, i) => i); pagesToRotate = Array.from({ length: totalPages }, (_, i) => i);
} }
pagesToRotate.forEach(pageIndex => { pagesToRotate.forEach((pageIndex) => {
const page = pdf.getPage(pageIndex); const page = pdf.getPage(pageIndex);
page.setRotation(degrees(data.angle)); page.setRotation(degrees(data.angle));
}); });
@@ -170,7 +172,7 @@ async function pdfRotate(data) {
return { return {
success: true, success: true,
message: `Successfully rotated ${pagesToRotate.length} page(s) by ${data.angle}\u00B0` message: `Successfully rotated ${pagesToRotate.length} page(s) by ${data.angle}\u00B0`,
}; };
} catch (error) { } catch (error) {
return { success: false, error: error.message }; return { success: false, error: error.message };
@@ -185,7 +187,9 @@ async function pdfDeletePages(data) {
const pagesToDelete = parsePageRanges(data.pages, totalPages); const pagesToDelete = parsePageRanges(data.pages, totalPages);
pagesToDelete.sort((a, b) => b - a).forEach(pageIndex => { pagesToDelete
.sort((a, b) => b - a)
.forEach((pageIndex) => {
pdf.removePage(pageIndex); pdf.removePage(pageIndex);
}); });
@@ -194,7 +198,7 @@ async function pdfDeletePages(data) {
return { return {
success: true, success: true,
message: `Successfully deleted ${pagesToDelete.length} page(s). New PDF has ${totalPages - pagesToDelete.length} pages` message: `Successfully deleted ${pagesToDelete.length} page(s). New PDF has ${totalPages - pagesToDelete.length} pages`,
}; };
} catch (error) { } catch (error) {
return { success: false, error: error.message }; return { success: false, error: error.message };
@@ -207,7 +211,7 @@ async function pdfReorder(data) {
const pdf = await PDFDocument.load(pdfBytes); const pdf = await PDFDocument.load(pdfBytes);
const totalPages = pdf.getPageCount(); const totalPages = pdf.getPageCount();
const newOrder = data.newOrder.split(',').map(n => parseInt(n.trim()) - 1); const newOrder = data.newOrder.split(',').map((n) => parseInt(n.trim()) - 1);
if (newOrder.length !== totalPages) { if (newOrder.length !== totalPages) {
return { success: false, error: `New order must include all ${totalPages} pages` }; return { success: false, error: `New order must include all ${totalPages} pages` };
@@ -215,7 +219,7 @@ async function pdfReorder(data) {
const newPdf = await PDFDocument.create(); const newPdf = await PDFDocument.create();
const copiedPages = await newPdf.copyPages(pdf, newOrder); const copiedPages = await newPdf.copyPages(pdf, newOrder);
copiedPages.forEach(page => newPdf.addPage(page)); copiedPages.forEach((page) => newPdf.addPage(page));
const reorderedPdfBytes = await newPdf.save(); const reorderedPdfBytes = await newPdf.save();
fs.writeFileSync(data.outputPath, reorderedPdfBytes); fs.writeFileSync(data.outputPath, reorderedPdfBytes);
@@ -246,7 +250,9 @@ async function pdfWatermark(data) {
const page = pdf.getPage(pageIndex); const page = pdf.getPage(pageIndex);
const { width, height } = page.getSize(); const { width, height } = page.getSize();
let x, y, rotation = 0; let x,
y,
rotation = 0;
switch (data.position) { switch (data.position) {
case 'center': case 'center':
@@ -294,7 +300,7 @@ async function pdfWatermark(data) {
font, font,
color: rgb(color.r, color.g, color.b), color: rgb(color.r, color.g, color.b),
opacity: data.opacity, opacity: data.opacity,
rotate: degrees(rotation) rotate: degrees(rotation),
}); });
} }
@@ -303,7 +309,7 @@ async function pdfWatermark(data) {
return { return {
success: true, success: true,
message: `Successfully added watermark to ${pagesToWatermark.length} page(s)` message: `Successfully added watermark to ${pagesToWatermark.length} page(s)`,
}; };
} catch (error) { } catch (error) {
return { success: false, error: error.message }; return { success: false, error: error.message };
@@ -325,8 +331,8 @@ async function pdfEncrypt(data) {
annotating: data.permissions.annotating, annotating: data.permissions.annotating,
fillingForms: data.permissions.fillingForms, fillingForms: data.permissions.fillingForms,
contentAccessibility: data.permissions.contentAccessibility, contentAccessibility: data.permissions.contentAccessibility,
documentAssembly: data.permissions.documentAssembly documentAssembly: data.permissions.documentAssembly,
} },
}); });
fs.writeFileSync(data.outputPath, encryptedPdfBytes); fs.writeFileSync(data.outputPath, encryptedPdfBytes);
@@ -336,7 +342,8 @@ async function pdfEncrypt(data) {
if (error.message.includes('encrypt') || error.message.includes('password')) { if (error.message.includes('encrypt') || error.message.includes('password')) {
return { return {
success: false, success: false,
error: 'PDF encryption requires pdf-lib with encryption support. This feature may not be available in the current version.' error:
'PDF encryption requires pdf-lib with encryption support. This feature may not be available in the current version.',
}; };
} }
return { success: false, error: error.message }; return { success: false, error: error.message };
@@ -375,8 +382,8 @@ async function pdfSetPermissions(data) {
annotating: data.permissions.annotating, annotating: data.permissions.annotating,
fillingForms: data.permissions.fillingForms, fillingForms: data.permissions.fillingForms,
contentAccessibility: data.permissions.contentAccessibility, contentAccessibility: data.permissions.contentAccessibility,
documentAssembly: data.permissions.documentAssembly documentAssembly: data.permissions.documentAssembly,
} },
}); });
fs.writeFileSync(data.outputPath, newPdfBytes); fs.writeFileSync(data.outputPath, newPdfBytes);
@@ -386,7 +393,8 @@ async function pdfSetPermissions(data) {
if (error.message.includes('encrypt') || error.message.includes('permission')) { if (error.message.includes('encrypt') || error.message.includes('permission')) {
return { return {
success: false, success: false,
error: 'PDF permissions require pdf-lib with encryption support. This feature may not be available in the current version.' error:
'PDF permissions require pdf-lib with encryption support. This feature may not be available in the current version.',
}; };
} }
return { success: false, error: error.message }; return { success: false, error: error.message };
@@ -395,17 +403,28 @@ async function pdfSetPermissions(data) {
function executeOperation(operation, data) { function executeOperation(operation, data) {
switch (operation) { switch (operation) {
case 'merge': return pdfMerge(data); case 'merge':
case 'split': return pdfSplit(data); return pdfMerge(data);
case 'compress': return pdfCompress(data); case 'split':
case 'rotate': return pdfRotate(data); return pdfSplit(data);
case 'delete': return pdfDeletePages(data); case 'compress':
case 'reorder': return pdfReorder(data); return pdfCompress(data);
case 'watermark': return pdfWatermark(data); case 'rotate':
case 'encrypt': return pdfEncrypt(data); return pdfRotate(data);
case 'decrypt': return pdfDecrypt(data); case 'delete':
case 'permissions': return pdfSetPermissions(data); return pdfDeletePages(data);
default: return Promise.resolve({ success: false, error: `Unknown operation: ${operation}` }); case 'reorder':
return pdfReorder(data);
case 'watermark':
return pdfWatermark(data);
case 'encrypt':
return pdfEncrypt(data);
case 'decrypt':
return pdfDecrypt(data);
case 'permissions':
return pdfSetPermissions(data);
default:
return Promise.resolve({ success: false, error: `Unknown operation: ${operation}` });
} }
} }
@@ -429,5 +448,5 @@ module.exports = {
pdfDecrypt, pdfDecrypt,
pdfSetPermissions, pdfSetPermissions,
executeOperation, executeOperation,
getPageCount getPageCount,
}; };
+38
View File
@@ -0,0 +1,38 @@
'use strict';
const fs = require('fs');
const os = require('os');
const path = require('path');
/**
* Build a xelatex/lualatex fontspec header referencing the bundled TTF.
*
* Uses an exclusive temp directory (mkdtempSync) to avoid the racy
* Date.now()+pid filename pattern. Returns the directory along with the
* header path; callers MUST `unlinkSync(headerPath)` and `rmdirSync(dir)`
* after pandoc consumes the file.
*/
function buildPdfFontHeader(settings, ttfPath, fontFamily) {
if (!ttfPath || !fs.existsSync(ttfPath)) {
throw new Error(`PdfFontHeader: TTF not found at ${ttfPath}`);
}
const ligatures = !!(settings && settings.monospaceLigatures === true);
const fontDir = path.dirname(ttfPath);
const basename = path.basename(ttfPath);
const boldName = basename.replace('Regular', 'Bold').replace('Medium', 'Bold');
const lines = [
`\\setmonofont[Path = ${fontDir}/,`,
` Extension = .ttf,`,
` UprightFont = ${basename},`,
` BoldFont = ${boldName},`,
ligatures ? ' Ligatures=TeX,' : '',
` Scale = 0.9]`,
`{${fontFamily}}`,
].filter(Boolean);
const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'mono-pdf-'));
const headerPath = path.join(dir, 'monospace.tex');
fs.writeFileSync(headerPath, lines.join('\n'), 'utf-8');
return { headerPath, dir, familyName: fontFamily };
}
module.exports = { buildPdfFontHeader };
+5
View File
@@ -8,6 +8,11 @@ function register() {
await fs.writeFile(filePath, Buffer.from(buffer)); await fs.writeFile(filePath, Buffer.from(buffer));
return { ok: true }; return { ok: true };
}); });
ipcMain.handle('read-buffer', async (_event, { path: filePath }) => {
const data = await fs.readFile(filePath);
return { ok: true, data };
});
} }
module.exports = { register }; module.exports = { register };
+27 -9
View File
@@ -4,25 +4,43 @@ const { ipcMain } = require('electron');
const GitOperations = require('../GitOperations'); const GitOperations = require('../GitOperations');
function register(currentFileRef) { function register(currentFileRef) {
ipcMain.handle('git-status', async () => { ipcMain.handle('git-status', async (_event, rootPath) => {
const dir = currentFileRef.current ? require('path').dirname(currentFileRef.current) : process.cwd(); const dir =
return GitOperations.getStatus(dir); rootPath ||
(currentFileRef.current ? require('path').dirname(currentFileRef.current) : process.cwd());
const result = GitOperations.getStatus(dir);
return Array.isArray(result?.files) ? result.files : [];
}); });
ipcMain.handle('git-stage', async (_event, { files }) => { ipcMain.handle('git-stage', async (_event, { rootPath, files }) => {
const dir = currentFileRef.current ? require('path').dirname(currentFileRef.current) : process.cwd(); const dir =
rootPath ||
(currentFileRef.current ? require('path').dirname(currentFileRef.current) : process.cwd());
return GitOperations.stage(dir, files); return GitOperations.stage(dir, files);
}); });
ipcMain.handle('git-commit', async (_event, { message }) => { ipcMain.handle('git-commit', async (_event, { rootPath, message }) => {
const dir = currentFileRef.current ? require('path').dirname(currentFileRef.current) : process.cwd(); const dir =
rootPath ||
(currentFileRef.current ? require('path').dirname(currentFileRef.current) : process.cwd());
return GitOperations.commit(dir, message); return GitOperations.commit(dir, message);
}); });
ipcMain.handle('git-log', async () => { ipcMain.handle('git-log', async (_event, rootPath) => {
const dir = currentFileRef.current ? require('path').dirname(currentFileRef.current) : process.cwd(); const dir =
rootPath ||
(currentFileRef.current ? require('path').dirname(currentFileRef.current) : process.cwd());
return GitOperations.log(dir); return GitOperations.log(dir);
}); });
ipcMain.handle('git-diff', async (_event, filePath) => {
const dir = filePath
? require('path').dirname(filePath)
: currentFileRef.current
? require('path').dirname(currentFileRef.current)
: process.cwd();
return GitOperations.diff(dir, filePath);
});
} }
module.exports = { register }; module.exports = { register };
+19 -2
View File
@@ -1,12 +1,19 @@
// src/main/files/index.js // src/main/files/index.js
// File ops facade — registers all file-related IPC handlers // File ops facade — registers all file-related IPC handlers
const { ipcMain, dialog, shell } = require('electron'); const { ipcMain, dialog } = require('electron');
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const { register: registerGit } = require('./git'); const { register: registerGit } = require('./git');
const { register: registerBinary } = require('./binary'); const { register: registerBinary } = require('./binary');
const { searchInFiles } = require('./search-in-files');
function register({ validatePath, resolveWritablePath, isPathAccessible, currentFileRef, mainWindow }) { function register({
validatePath,
resolveWritablePath,
isPathAccessible,
currentFileRef,
mainWindow,
}) {
// pick-folder // pick-folder
ipcMain.handle('pick-folder', async () => { ipcMain.handle('pick-folder', async () => {
const result = await dialog.showOpenDialog(mainWindow, { const result = await dialog.showOpenDialog(mainWindow, {
@@ -125,6 +132,16 @@ function register({ validatePath, resolveWritablePath, isPathAccessible, current
return { source: sourceValidation.resolved, destination: destinationValidation.resolved }; return { source: sourceValidation.resolved, destination: destinationValidation.resolved };
}); });
// search-in-files
ipcMain.handle('search-in-files', async (_event, payload) => {
const validation = validatePath(payload?.rootPath);
if (!validation.valid || !isPathAccessible(validation.resolved)) {
console.error('[SECURITY] Invalid search rootPath:', validation.error);
return [];
}
return searchInFiles({ ...(payload || {}), rootPath: validation.resolved });
});
// open-file-path // open-file-path
ipcMain.on('open-file-path', (event, filePath) => { ipcMain.on('open-file-path', (event, filePath) => {
try { try {
+45
View File
@@ -0,0 +1,45 @@
'use strict';
const fs = require('fs');
const path = require('path');
/**
* List a directory's entries (excluding dotfiles), sorted directories-first
* then alphabetically. Returns a flat array of FileEntry-shaped objects,
* matching the renderer type declaration in `src/renderer/lib/ipc.ts`.
*
* Skips entries that cannot be stat'd (permission errors, broken symlinks)
* instead of throwing — keeps the UI responsive on partially-readable dirs.
*/
function listDirectoryEntries(dirPath) {
const dirents = fs.readdirSync(dirPath, { withFileTypes: true });
const entries = [];
for (const d of dirents) {
if (d.name.startsWith('.')) continue;
const full = path.join(dirPath, d.name);
let size = 0;
let modified = 0;
try {
const s = fs.statSync(full);
size = d.isDirectory() ? 0 : s.size;
modified = s.mtimeMs;
} catch (_err) {
continue;
}
entries.push({
name: d.name,
isDirectory: d.isDirectory(),
size,
modifiedAt: modified,
path: full,
});
}
entries.sort((a, b) => {
if (a.isDirectory && !b.isDirectory) return -1;
if (!a.isDirectory && b.isDirectory) return 1;
return a.name.localeCompare(b.name);
});
return entries;
}
module.exports = { listDirectoryEntries };
+150
View File
@@ -0,0 +1,150 @@
'use strict';
const fs = require('fs');
const path = require('path');
const MAX_RESULTS = 1000;
const MAX_FILE_BYTES = 2 * 1024 * 1024;
const MAX_FILES = 10000;
const MAX_QUERY_LENGTH = 1024;
const MAX_REGEX_LENGTH = 200;
const SKIP_DIRS = new Set(['node_modules', '.git', 'dist', '.next', '.cache']);
// Reject regexes with classic ReDoS shapes. This is a defense-in-depth
// denylist, not a proof of safety — the hard caps on length, files, and
// results are the primary defense.
const UNSAFE_REGEX = new RegExp(
// nested quantifiers: (a+)+, [a-z]*+
'\\([^)]*[+*][^)]*\\)[+*?]' +
'|' +
// class with quantifier: [a-z]+
'\\[[^\\]]*\\][+*]' +
'|' +
// dot-quantifier followed by dot-quantifier
'\\.[+*]\\s*\\.[+*]' +
'|' +
// lookahead / lookbehind
'\\(\\?[=!]' +
'|' +
// backrefs
'\\\\[1-9]' +
'|' +
// alternation with quantifier
'\\([^)]*\\|[^)]*\\)[+*]'
);
function listFiles(rootPath) {
const out = [];
const stack = [rootPath];
const visited = new Set();
while (stack.length && out.length < MAX_FILES) {
const dir = stack.pop();
// Resolve symlinks and verify we haven't escaped the root.
let real;
try {
real = fs.realpathSync(dir);
} catch (_) {
continue;
}
if (visited.has(real)) continue;
visited.add(real);
const rootReal = fs.realpathSync(rootPath);
if (!real.startsWith(rootReal + path.sep) && real !== rootReal) continue;
let entries;
try {
entries = fs.readdirSync(real, { withFileTypes: true });
} catch (_) {
continue;
}
for (const e of entries) {
if (e.name.startsWith('.')) continue;
const full = path.join(real, e.name);
// Follow symlinks but verify containment again.
try {
const s = fs.lstatSync(full);
if (s.isSymbolicLink()) {
const linkTarget = fs.realpathSync(full);
if (!linkTarget.startsWith(rootReal + path.sep) && linkTarget !== rootReal) continue;
}
} catch (_) {
continue;
}
try {
const s = fs.statSync(full);
if (s.isDirectory()) {
if (SKIP_DIRS.has(e.name)) continue;
stack.push(full);
} else if (s.isFile()) {
out.push(full);
if (out.length >= MAX_FILES) break;
}
} catch (_) {
continue;
}
}
}
return out;
}
function makeMatcher(query, isRegex, caseSensitive) {
if (isRegex) {
if (query.length > MAX_REGEX_LENGTH) return null;
if (UNSAFE_REGEX.test(query)) return null;
try {
const re = new RegExp(query, caseSensitive ? '' : 'i');
return (line) => re.test(line);
} catch (_err) {
return null;
}
}
const needle = caseSensitive ? query : query.toLowerCase();
return (line) => (caseSensitive ? line : line.toLowerCase()).includes(needle);
}
/**
* Recursively search `rootPath` for files containing `query`.
* Returns up to MAX_RESULTS matches of the form
* { filePath, line, content }.
*
* Hardened against:
* - Path traversal via symlinks (verified after realpathSync)
* - ReDoS via nested-quantifier regex (rejected at match time)
* - Resource exhaustion via MAX_FILES + MAX_FILE_BYTES + MAX_RESULTS
* - Empty / oversized queries via MAX_QUERY_LENGTH
*/
function searchInFiles({ rootPath, query, isRegex = false, caseSensitive = false }) {
if (!rootPath || !query) return [];
if (typeof query !== 'string' || query.length > MAX_QUERY_LENGTH) return [];
const matcher = makeMatcher(query, isRegex, caseSensitive);
if (!matcher) return [];
const results = [];
for (const filePath of listFiles(rootPath)) {
if (results.length >= MAX_RESULTS) break;
let stat;
try {
stat = fs.statSync(filePath);
} catch (_) {
continue;
}
if (!stat.isFile() || stat.size > MAX_FILE_BYTES) continue;
let content;
try {
content = fs.readFileSync(filePath, 'utf-8');
} catch (_) {
continue;
}
const lines = content.split(/\r?\n/);
for (let i = 0; i < lines.length; i++) {
if (matcher(lines[i])) {
results.push({ filePath, line: i + 1, content: lines[i] });
if (results.length >= MAX_RESULTS) break;
}
}
}
return results;
}
module.exports = { searchInFiles };
+559 -324
View File
File diff suppressed because it is too large Load Diff
+24
View File
@@ -0,0 +1,24 @@
const { ipcMain, shell } = require('electron');
function register({ crash, getMainWindow: _getMainWindow }) {
ipcMain.handle('crash:read', () => {
return crash.list();
});
ipcMain.on('crash:open-dir', () => {
shell.openPath(crash.path());
});
ipcMain.handle('crash:delete', (_event, filename) => {
if (
typeof filename === 'string' &&
/^\d+(-\d+)?-(uncaughtException|unhandledRejection)\.json$/.test(filename)
) {
crash.delete(filename);
return true;
}
return false;
});
}
module.exports = { register };
+29
View File
@@ -0,0 +1,29 @@
'use strict';
const { ipcMain } = require('electron');
const store = require('../store');
const { safeMonospaceSettings, DEFAULT_SETTINGS } = require('../settings/monospaceSettings');
function readCurrent() {
return {
monospaceFont: store.get('monospaceFont', DEFAULT_SETTINGS.monospaceFont),
monospaceLigatures: store.get('monospaceLigatures', DEFAULT_SETTINGS.monospaceLigatures),
};
}
function register() {
ipcMain.handle('get-monospace-settings', () => readCurrent());
ipcMain.handle('set-monospace-settings', (_event, partial) => {
const safe = safeMonospaceSettings(partial || {});
if (Object.prototype.hasOwnProperty.call(partial || {}, 'monospaceFont')) {
store.set('monospaceFont', safe.monospaceFont);
}
if (Object.prototype.hasOwnProperty.call(partial || {}, 'monospaceLigatures')) {
store.set('monospaceLigatures', safe.monospaceLigatures);
}
return readCurrent();
});
}
module.exports = { register, readCurrent };
+29
View File
@@ -0,0 +1,29 @@
const { ipcMain } = require('electron');
const { feedConfigFor } = require('../updater/feed-config');
function register({ updater, getMainWindow, getChannel }) {
ipcMain.handle('updater:check', async () => {
const channel = getChannel();
updater.autoUpdater.setFeedURL(feedConfigFor(channel));
await updater.check();
return { state: updater.state };
});
ipcMain.handle('updater:install', () => {
updater.install();
});
ipcMain.handle('updater:get-state', () => {
return { state: updater.state };
});
// Forward status events to renderer
updater.on('status', (payload) => {
const win = getMainWindow();
if (win && !win.isDestroyed()) {
win.webContents.send('updater:status', payload);
}
});
}
module.exports = { register };
+2 -2
View File
@@ -10,7 +10,7 @@ const {
convertItems, convertItems,
pdfEditorItems, pdfEditorItems,
toolsItems, toolsItems,
helpItems helpItems,
} = require('./items'); } = require('./items');
function buildMenu(mainWindow) { function buildMenu(mainWindow) {
@@ -22,7 +22,7 @@ function buildMenu(mainWindow) {
{ label: '&Convert', submenu: convertItems(mainWindow) }, { label: '&Convert', submenu: convertItems(mainWindow) },
{ label: 'PDF Editor', submenu: pdfEditorItems(mainWindow) }, { label: 'PDF Editor', submenu: pdfEditorItems(mainWindow) },
{ label: '&Tools', submenu: toolsItems(mainWindow) }, { label: '&Tools', submenu: toolsItems(mainWindow) },
{ label: '&Help', submenu: helpItems(mainWindow) } { label: '&Help', submenu: helpItems(mainWindow) },
]; ];
return Menu.buildFromTemplate(template); return Menu.buildFromTemplate(template);
} }
+439 -162
View File
@@ -1,7 +1,7 @@
// src/main/menu/items.js // src/main/menu/items.js
// Individual menu items — pure functions that take (mainWindow) and return menu item arrays // Individual menu items — pure functions that take (mainWindow) and return menu item arrays
const { app, dialog, shell } = require('electron'); const { app, shell } = require('electron');
const path = require('path'); const path = require('path');
const fs = require('fs'); const fs = require('fs');
@@ -11,14 +11,14 @@ function buildRecentFilesMenu(mainWindow) {
const recentFilesPath = path.join(app.getPath('userData'), 'recent-files.json'); const recentFilesPath = path.join(app.getPath('userData'), 'recent-files.json');
if (!fs.existsSync(recentFilesPath)) return [{ label: 'No Recent Files', enabled: false }]; if (!fs.existsSync(recentFilesPath)) return [{ label: 'No Recent Files', enabled: false }];
const recentFiles = JSON.parse(fs.readFileSync(recentFilesPath, 'utf-8')); const recentFiles = JSON.parse(fs.readFileSync(recentFilesPath, 'utf-8'));
const existing = recentFiles.filter(file => fs.existsSync(file)); const existing = recentFiles.filter((file) => fs.existsSync(file));
if (existing.length === 0) return [{ label: 'No Recent Files', enabled: false }]; if (existing.length === 0) return [{ label: 'No Recent Files', enabled: false }];
const items = existing.map(file => ({ const items = existing.map((file) => ({
label: path.basename(file), label: path.basename(file),
click: () => { click: () => {
const { openFileFromPath } = require('../main'); const { openFileFromPath } = require('../index');
openFileFromPath(file); openFileFromPath(file);
} },
})); }));
items.push( items.push(
{ type: 'separator' }, { type: 'separator' },
@@ -28,11 +28,11 @@ function buildRecentFilesMenu(mainWindow) {
if (mainWindow) { if (mainWindow) {
mainWindow.webContents.send('clear-recent-files'); mainWindow.webContents.send('clear-recent-files');
} }
} },
} }
); );
return items; return items;
} catch (e) { } catch (_e) {
return [{ label: 'No Recent Files', enabled: false }]; return [{ label: 'No Recent Files', enabled: false }];
} }
} }
@@ -42,134 +42,243 @@ function fileItems(mainWindow) {
{ {
label: 'New', label: 'New',
accelerator: 'CmdOrCtrl+N', accelerator: 'CmdOrCtrl+N',
click: () => mainWindow.webContents.send('file-new') click: () => mainWindow.webContents.send('file-new'),
}, },
{ {
label: 'Open', label: 'Open',
accelerator: 'CmdOrCtrl+O', accelerator: 'CmdOrCtrl+O',
click: () => { click: () => {
const { openFile } = require('../main'); const { openFile } = require('../index');
openFile(); openFile();
} },
}, },
{ {
label: 'Open PDF', label: 'Open PDF',
accelerator: 'CmdOrCtrl+Shift+O', accelerator: 'CmdOrCtrl+Shift+O',
click: () => { click: () => {
const { openPdfFile } = require('../main'); const { openPdfFile } = require('../index');
openPdfFile(); openPdfFile();
} },
}, },
{ {
label: 'Save', label: 'Save',
accelerator: 'CmdOrCtrl+S', accelerator: 'CmdOrCtrl+S',
click: () => mainWindow.webContents.send('file-save') click: () => mainWindow.webContents.send('file-save'),
}, },
{ {
label: 'Save As', label: 'Save As',
accelerator: 'CmdOrCtrl+Shift+S', accelerator: 'CmdOrCtrl+Shift+S',
click: () => { click: () => {
const { saveAsFile } = require('../main'); const { saveAsFile } = require('../index');
saveAsFile(); saveAsFile();
} },
}, },
{ type: 'separator' }, { type: 'separator' },
// NOTE: Print Preview submenu removed — handled by React <PrintPreview> overlay // NOTE: Print Preview submenu removed — handled by React <PrintPreview> overlay
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'Recent Files', label: 'Recent Files',
submenu: buildRecentFilesMenu(mainWindow) submenu: buildRecentFilesMenu(mainWindow),
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'New from Template', label: 'New from Template',
submenu: [ submenu: [
{ label: 'Blog Post', click: () => mainWindow.webContents.send('load-template-menu', 'blog-post.md') }, {
{ label: 'Meeting Notes', click: () => mainWindow.webContents.send('load-template-menu', 'meeting-notes.md') }, label: 'Blog Post',
{ label: 'Technical Spec', click: () => mainWindow.webContents.send('load-template-menu', 'technical-spec.md') }, click: () => mainWindow.webContents.send('load-template-menu', 'blog-post.md'),
{ label: 'Changelog', click: () => mainWindow.webContents.send('load-template-menu', 'changelog.md') }, },
{ label: 'README', click: () => mainWindow.webContents.send('load-template-menu', 'readme.md') }, {
{ label: 'Project Plan', click: () => mainWindow.webContents.send('load-template-menu', 'project-plan.md') }, label: 'Meeting Notes',
{ label: 'API Documentation', click: () => mainWindow.webContents.send('load-template-menu', 'api-docs.md') }, click: () => mainWindow.webContents.send('load-template-menu', 'meeting-notes.md'),
{ label: 'Tutorial', click: () => mainWindow.webContents.send('load-template-menu', 'tutorial.md') }, },
{ label: 'Release Notes', click: () => mainWindow.webContents.send('load-template-menu', 'release-notes.md') }, {
{ label: 'Comparison', click: () => mainWindow.webContents.send('load-template-menu', 'comparison.md') } label: 'Technical Spec',
] click: () => mainWindow.webContents.send('load-template-menu', 'technical-spec.md'),
},
{
label: 'Changelog',
click: () => mainWindow.webContents.send('load-template-menu', 'changelog.md'),
},
{
label: 'README',
click: () => mainWindow.webContents.send('load-template-menu', 'readme.md'),
},
{
label: 'Project Plan',
click: () => mainWindow.webContents.send('load-template-menu', 'project-plan.md'),
},
{
label: 'API Documentation',
click: () => mainWindow.webContents.send('load-template-menu', 'api-docs.md'),
},
{
label: 'Tutorial',
click: () => mainWindow.webContents.send('load-template-menu', 'tutorial.md'),
},
{
label: 'Release Notes',
click: () => mainWindow.webContents.send('load-template-menu', 'release-notes.md'),
},
{
label: 'Comparison',
click: () => mainWindow.webContents.send('load-template-menu', 'comparison.md'),
},
],
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'Import Document...', label: 'Import Document...',
accelerator: 'CmdOrCtrl+I', accelerator: 'CmdOrCtrl+I',
click: () => { click: () => {
const { importDocument } = require('../main'); const { importDocument } = require('../index');
importDocument(); importDocument();
} },
}, },
{ {
label: 'Export', label: 'Export',
submenu: [ submenu: [
{ {
label: 'HTML', click: () => { label: 'HTML',
const { exportFile } = require('../main'); click: () => {
const { exportFile } = require('../index');
exportFile('html'); exportFile('html');
} },
}, },
{ {
label: 'PDF', click: () => { label: 'PDF',
const { exportFile } = require('../main'); click: () => {
const { exportFile } = require('../index');
exportFile('pdf'); exportFile('pdf');
} },
}, },
{ {
label: 'PDF (Enhanced)', click: () => { label: 'PDF (Enhanced)',
const { exportPDFViaWordTemplate } = require('../main'); click: () => {
const { exportPDFViaWordTemplate } = require('../index');
exportPDFViaWordTemplate(); exportPDFViaWordTemplate();
}, accelerator: 'Ctrl+Shift+P' },
accelerator: 'Ctrl+Shift+P',
}, },
{ {
label: 'DOCX', click: () => { label: 'DOCX',
const { exportFile } = require('../main'); click: () => {
const { exportFile } = require('../index');
exportFile('docx'); exportFile('docx');
} },
}, },
{ {
label: 'DOCX (Enhanced)', click: () => { label: 'DOCX (Enhanced)',
const { exportWordWithTemplate } = require('../main'); click: () => {
const { exportWordWithTemplate } = require('../index');
exportWordWithTemplate(); exportWordWithTemplate();
}, accelerator: 'Ctrl+Shift+W'
}, },
{ label: 'LaTeX', click: () => { const { exportFile } = require('../main'); exportFile('latex'); } }, accelerator: 'Ctrl+Shift+W',
{ label: 'RTF', click: () => { const { exportFile } = require('../main'); exportFile('rtf'); } }, },
{ label: 'ODT', click: () => { const { exportFile } = require('../main'); exportFile('odt'); } }, {
{ label: 'EPUB', click: () => { const { exportFile } = require('../main'); exportFile('epub'); } }, label: 'LaTeX',
click: () => {
const { exportFile } = require('../index');
exportFile('latex');
},
},
{
label: 'RTF',
click: () => {
const { exportFile } = require('../index');
exportFile('rtf');
},
},
{
label: 'ODT',
click: () => {
const { exportFile } = require('../index');
exportFile('odt');
},
},
{
label: 'EPUB',
click: () => {
const { exportFile } = require('../index');
exportFile('epub');
},
},
{ type: 'separator' }, { type: 'separator' },
{ label: 'PowerPoint (PPTX)', click: () => { const { exportFile } = require('../main'); exportFile('pptx'); } }, {
{ label: 'OpenDocument Presentation (ODP)', click: () => { const { exportFile } = require('../main'); exportFile('odp'); } }, label: 'PowerPoint (PPTX)',
click: () => {
const { exportFile } = require('../index');
exportFile('pptx');
},
},
{
label: 'OpenDocument Presentation (ODP)',
click: () => {
const { exportFile } = require('../index');
exportFile('odp');
},
},
{ type: 'separator' }, { type: 'separator' },
{ label: 'CSV (Tables)', click: () => { const { exportSpreadsheet } = require('../main'); exportSpreadsheet('csv'); } }, {
label: 'CSV (Tables)',
click: () => {
const { exportSpreadsheet } = require('../index');
exportSpreadsheet('csv');
},
},
{ type: 'separator' }, { type: 'separator' },
{ label: 'JSON (.json)', click: () => { const { exportFile } = require('../main'); exportFile('json'); } }, {
{ label: 'YAML (.yaml)', click: () => { const { exportFile } = require('../main'); exportFile('yaml'); } }, label: 'JSON (.json)',
{ label: 'XML (.xml)', click: () => { const { exportFile } = require('../main'); exportFile('xml'); } }, click: () => {
const { exportFile } = require('../index');
exportFile('json');
},
},
{
label: 'YAML (.yaml)',
click: () => {
const { exportFile } = require('../index');
exportFile('yaml');
},
},
{
label: 'XML (.xml)',
click: () => {
const { exportFile } = require('../index');
exportFile('xml');
},
},
{ type: 'separator' }, { type: 'separator' },
{ label: 'Confluence Wiki (.txt)', click: () => { const { exportFile } = require('../main'); exportFile('confluence'); } }, {
{ label: 'MOBI E-book (.mobi)', click: () => { const { exportFile } = require('../main'); exportFile('mobi'); } } label: 'Confluence Wiki (.txt)',
] click: () => {
const { exportFile } = require('../index');
exportFile('confluence');
},
},
{
label: 'MOBI E-book (.mobi)',
click: () => {
const { exportFile } = require('../index');
exportFile('mobi');
},
},
],
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'Select Word Template...', label: 'Select Word Template...',
click: () => { click: () => {
const { selectWordTemplate } = require('../main'); const { selectWordTemplate } = require('../index');
selectWordTemplate(); selectWordTemplate();
} },
}, },
{ {
label: 'Template Settings...', label: 'Template Settings...',
click: () => { click: () => {
const { showTemplateSettings } = require('../main'); const { showTemplateSettings } = require('../index');
showTemplateSettings(); showTemplateSettings();
} },
}, },
{ {
label: 'Header & Footer Settings...', label: 'Header & Footer Settings...',
@@ -177,14 +286,14 @@ function fileItems(mainWindow) {
if (mainWindow) { if (mainWindow) {
mainWindow.webContents.send('open-header-footer-dialog'); mainWindow.webContents.send('open-header-footer-dialog');
} }
} },
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'Quit', label: 'Quit',
accelerator: process.platform === 'darwin' ? 'Cmd+Q' : 'Ctrl+Q', accelerator: process.platform === 'darwin' ? 'Cmd+Q' : 'Ctrl+Q',
click: () => app.quit() click: () => app.quit(),
} },
]; ];
} }
@@ -193,12 +302,12 @@ function editItems(mainWindow) {
{ {
label: 'Undo', label: 'Undo',
accelerator: 'CmdOrCtrl+Z', accelerator: 'CmdOrCtrl+Z',
click: () => mainWindow.webContents.send('undo') click: () => mainWindow.webContents.send('undo'),
}, },
{ {
label: 'Redo', label: 'Redo',
accelerator: 'CmdOrCtrl+Shift+Z', accelerator: 'CmdOrCtrl+Shift+Z',
click: () => mainWindow.webContents.send('redo') click: () => mainWindow.webContents.send('redo'),
}, },
{ type: 'separator' }, { type: 'separator' },
{ label: 'Cut', accelerator: 'CmdOrCtrl+X', role: 'cut' }, { label: 'Cut', accelerator: 'CmdOrCtrl+X', role: 'cut' },
@@ -209,8 +318,8 @@ function editItems(mainWindow) {
{ {
label: 'Find & Replace', label: 'Find & Replace',
accelerator: 'CmdOrCtrl+F', accelerator: 'CmdOrCtrl+F',
click: () => mainWindow.webContents.send('toggle-find') click: () => mainWindow.webContents.send('toggle-find'),
} },
]; ];
} }
@@ -219,54 +328,222 @@ function viewItems(mainWindow) {
{ {
label: 'Toggle Preview', label: 'Toggle Preview',
accelerator: 'CmdOrCtrl+Shift+V', accelerator: 'CmdOrCtrl+Shift+V',
click: () => mainWindow.webContents.send('toggle-preview') click: () => mainWindow.webContents.send('toggle-preview'),
},
{
label: 'Writing Analytics',
accelerator: 'CmdOrCtrl+Shift+A',
click: () => mainWindow.webContents.send('show-analytics-dialog'),
}, },
// NOTE: Command Palette removed — handled by useCommandStore // NOTE: Command Palette removed — handled by useCommandStore
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'Sidebar', label: 'Sidebar',
submenu: [ submenu: [
{ label: 'File Explorer', click: () => mainWindow.webContents.send('toggle-sidebar-panel', 'explorer') }, {
label: 'Files',
click: () => mainWindow.webContents.send('toggle-sidebar-panel', 'explorer'),
},
{
label: 'Outline',
click: () => mainWindow.webContents.send('toggle-sidebar-panel', 'outline'),
},
{
label: 'Snippets',
click: () => mainWindow.webContents.send('toggle-sidebar-panel', 'snippets'),
},
{
label: 'Templates',
click: () => mainWindow.webContents.send('toggle-sidebar-panel', 'templates'),
},
{ label: 'Git', click: () => mainWindow.webContents.send('toggle-sidebar-panel', 'git') }, { label: 'Git', click: () => mainWindow.webContents.send('toggle-sidebar-panel', 'git') },
{ label: 'Snippets', click: () => mainWindow.webContents.send('toggle-sidebar-panel', 'snippets') }, ],
{ label: 'Templates', click: () => mainWindow.webContents.send('toggle-sidebar-panel', 'templates') }
]
}, },
{ {
label: 'Bottom Panel (REPL)', label: 'Bottom Panel (REPL)',
click: () => mainWindow.webContents.send('toggle-bottom-panel') click: () => mainWindow.webContents.send('toggle-bottom-panel'),
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'Theme', label: 'Theme',
submenu: [ submenu: [
{ label: 'Atom One Light (Default)', click: () => { const { setTheme } = require('../main'); setTheme('atomonelight'); } }, {
{ label: 'GitHub Light', click: () => { const { setTheme } = require('../main'); setTheme('github'); } }, label: 'Atom One Light (Default)',
{ label: 'Light', click: () => { const { setTheme } = require('../main'); setTheme('light'); } }, click: () => {
{ label: 'Solarized Light', click: () => { const { setTheme } = require('../main'); setTheme('solarized'); } }, const { setTheme } = require('../index');
{ label: 'Gruvbox Light', click: () => { const { setTheme } = require('../main'); setTheme('gruvbox-light'); } }, setTheme('atomonelight');
{ label: 'Ayu Light', click: () => { const { setTheme } = require('../main'); setTheme('ayu-light'); } }, },
{ label: 'Sepia', click: () => { const { setTheme } = require('../main'); setTheme('sepia'); } }, },
{ label: 'Paper', click: () => { const { setTheme } = require('../main'); setTheme('paper'); } }, {
{ label: 'Rose Pine Dawn', click: () => { const { setTheme } = require('../main'); setTheme('rosepine-dawn'); } }, label: 'GitHub Light',
{ label: 'Concrete Light', click: () => { const { setTheme } = require('../main'); setTheme('concrete-light'); } }, click: () => {
const { setTheme } = require('../index');
setTheme('github');
},
},
{
label: 'Light',
click: () => {
const { setTheme } = require('../index');
setTheme('light');
},
},
{
label: 'Solarized Light',
click: () => {
const { setTheme } = require('../index');
setTheme('solarized');
},
},
{
label: 'Gruvbox Light',
click: () => {
const { setTheme } = require('../index');
setTheme('gruvbox-light');
},
},
{
label: 'Ayu Light',
click: () => {
const { setTheme } = require('../index');
setTheme('ayu-light');
},
},
{
label: 'Sepia',
click: () => {
const { setTheme } = require('../index');
setTheme('sepia');
},
},
{
label: 'Paper',
click: () => {
const { setTheme } = require('../index');
setTheme('paper');
},
},
{
label: 'Rose Pine Dawn',
click: () => {
const { setTheme } = require('../index');
setTheme('rosepine-dawn');
},
},
{
label: 'Concrete Light',
click: () => {
const { setTheme } = require('../index');
setTheme('concrete-light');
},
},
{ type: 'separator' }, { type: 'separator' },
{ label: 'Dark', click: () => { const { setTheme } = require('../main'); setTheme('dark'); } }, {
{ label: 'One Dark', click: () => { const { setTheme } = require('../main'); setTheme('onedark'); } }, label: 'Dark',
{ label: 'Dracula', click: () => { const { setTheme } = require('../main'); setTheme('dracula'); } }, click: () => {
{ label: 'Nord', click: () => { const { setTheme } = require('../main'); setTheme('nord'); } }, const { setTheme } = require('../index');
{ label: 'Monokai', click: () => { const { setTheme } = require('../main'); setTheme('monokai'); } }, setTheme('dark');
{ label: 'Material', click: () => { const { setTheme } = require('../main'); setTheme('material'); } }, },
{ label: 'Gruvbox Dark', click: () => { const { setTheme } = require('../main'); setTheme('gruvbox-dark'); } }, },
{ label: 'Tokyo Night', click: () => { const { setTheme } = require('../main'); setTheme('tokyonight'); } }, {
{ label: 'Palenight', click: () => { const { setTheme } = require('../main'); setTheme('palenight'); } }, label: 'One Dark',
{ label: 'Ayu Dark', click: () => { const { setTheme } = require('../main'); setTheme('ayu-dark'); } }, click: () => {
{ label: 'Ayu Mirage', click: () => { const { setTheme } = require('../main'); setTheme('ayu-mirage'); } }, const { setTheme } = require('../index');
{ label: 'Oceanic Next', click: () => { const { setTheme } = require('../main'); setTheme('oceanic-next'); } }, setTheme('onedark');
{ label: 'Cobalt2', click: () => { const { setTheme } = require('../main'); setTheme('cobalt2'); } }, },
{ label: 'Concrete Dark', click: () => { const { setTheme } = require('../main'); setTheme('concrete-dark'); } }, },
{ label: 'Concrete Warm', click: () => { const { setTheme } = require('../main'); setTheme('concrete-warm'); } } {
] label: 'Dracula',
click: () => {
const { setTheme } = require('../index');
setTheme('dracula');
},
},
{
label: 'Nord',
click: () => {
const { setTheme } = require('../index');
setTheme('nord');
},
},
{
label: 'Monokai',
click: () => {
const { setTheme } = require('../index');
setTheme('monokai');
},
},
{
label: 'Material',
click: () => {
const { setTheme } = require('../index');
setTheme('material');
},
},
{
label: 'Gruvbox Dark',
click: () => {
const { setTheme } = require('../index');
setTheme('gruvbox-dark');
},
},
{
label: 'Tokyo Night',
click: () => {
const { setTheme } = require('../index');
setTheme('tokyonight');
},
},
{
label: 'Palenight',
click: () => {
const { setTheme } = require('../index');
setTheme('palenight');
},
},
{
label: 'Ayu Dark',
click: () => {
const { setTheme } = require('../index');
setTheme('ayu-dark');
},
},
{
label: 'Ayu Mirage',
click: () => {
const { setTheme } = require('../index');
setTheme('ayu-mirage');
},
},
{
label: 'Oceanic Next',
click: () => {
const { setTheme } = require('../index');
setTheme('oceanic-next');
},
},
{
label: 'Cobalt2',
click: () => {
const { setTheme } = require('../index');
setTheme('cobalt2');
},
},
{
label: 'Concrete Dark',
click: () => {
const { setTheme } = require('../index');
setTheme('concrete-dark');
},
},
{
label: 'Concrete Warm',
click: () => {
const { setTheme } = require('../index');
setTheme('concrete-warm');
},
},
],
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
@@ -275,19 +552,19 @@ function viewItems(mainWindow) {
{ {
label: 'Increase Font Size', label: 'Increase Font Size',
accelerator: 'CmdOrCtrl+Shift+Plus', accelerator: 'CmdOrCtrl+Shift+Plus',
click: () => mainWindow.webContents.send('adjust-font-size', 'increase') click: () => mainWindow.webContents.send('adjust-font-size', 'increase'),
}, },
{ {
label: 'Decrease Font Size', label: 'Decrease Font Size',
accelerator: 'CmdOrCtrl+Shift+-', accelerator: 'CmdOrCtrl+Shift+-',
click: () => mainWindow.webContents.send('adjust-font-size', 'decrease') click: () => mainWindow.webContents.send('adjust-font-size', 'decrease'),
}, },
{ {
label: 'Reset Font Size', label: 'Reset Font Size',
accelerator: 'CmdOrCtrl+Shift+0', accelerator: 'CmdOrCtrl+Shift+0',
click: () => mainWindow.webContents.send('adjust-font-size', 'reset') click: () => mainWindow.webContents.send('adjust-font-size', 'reset'),
} },
] ],
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
@@ -296,7 +573,7 @@ function viewItems(mainWindow) {
checked: true, checked: true,
click: (menuItem) => { click: (menuItem) => {
mainWindow.webContents.session.setSpellCheckerEnabled(menuItem.checked); mainWindow.webContents.session.setSpellCheckerEnabled(menuItem.checked);
} },
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
@@ -304,13 +581,13 @@ function viewItems(mainWindow) {
submenu: [ submenu: [
{ {
label: 'Load Custom Preview CSS...', label: 'Load Custom Preview CSS...',
click: () => mainWindow.webContents.send('load-custom-css') click: () => mainWindow.webContents.send('load-custom-css'),
}, },
{ {
label: 'Clear Custom Preview CSS', label: 'Clear Custom Preview CSS',
click: () => mainWindow.webContents.send('clear-custom-css') click: () => mainWindow.webContents.send('clear-custom-css'),
} },
] ],
}, },
{ type: 'separator' }, { type: 'separator' },
{ label: 'Reload', accelerator: 'CmdOrCtrl+R', role: 'reload' }, { label: 'Reload', accelerator: 'CmdOrCtrl+R', role: 'reload' },
@@ -318,7 +595,7 @@ function viewItems(mainWindow) {
{ type: 'separator' }, { type: 'separator' },
{ label: 'Zoom In', accelerator: 'CmdOrCtrl+Plus', role: 'zoomIn' }, { label: 'Zoom In', accelerator: 'CmdOrCtrl+Plus', role: 'zoomIn' },
{ label: 'Zoom Out', accelerator: 'CmdOrCtrl+-', role: 'zoomOut' }, { label: 'Zoom Out', accelerator: 'CmdOrCtrl+-', role: 'zoomOut' },
{ label: 'Reset Zoom', accelerator: 'CmdOrCtrl+0', role: 'resetZoom' } { label: 'Reset Zoom', accelerator: 'CmdOrCtrl+0', role: 'resetZoom' },
]; ];
} }
@@ -327,104 +604,104 @@ function batchItems(mainWindow) {
{ {
label: 'Convert Markdown Folder...', label: 'Convert Markdown Folder...',
click: () => { click: () => {
const { showBatchConversionDialog } = require('../main'); const { showBatchConversionDialog } = require('../index');
showBatchConversionDialog(); showBatchConversionDialog();
} },
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'Batch Image Conversion...', label: 'Batch Image Conversion...',
click: () => mainWindow.webContents.send('show-batch-converter', 'image') click: () => mainWindow.webContents.send('show-batch-converter', 'image'),
}, },
{ {
label: 'Batch Audio Conversion...', label: 'Batch Audio Conversion...',
click: () => mainWindow.webContents.send('show-batch-converter', 'audio') click: () => mainWindow.webContents.send('show-batch-converter', 'audio'),
}, },
{ {
label: 'Batch Video Conversion...', label: 'Batch Video Conversion...',
click: () => mainWindow.webContents.send('show-batch-converter', 'video') click: () => mainWindow.webContents.send('show-batch-converter', 'video'),
}, },
{ {
label: 'Batch PDF Conversion...', label: 'Batch PDF Conversion...',
click: () => mainWindow.webContents.send('show-batch-converter', 'pdf') click: () => mainWindow.webContents.send('show-batch-converter', 'pdf'),
} },
]; ];
} }
function convertItems(mainWindow) { function convertItems(_mainWindow) {
return [ return [
{ {
label: 'Universal File Converter...', label: 'Universal File Converter...',
accelerator: 'CmdOrCtrl+Shift+C', accelerator: 'CmdOrCtrl+Shift+C',
click: () => { click: () => {
const { showUniversalConverterDialog } = require('../main'); const { showUniversalConverterDialog } = require('../index');
showUniversalConverterDialog(); showUniversalConverterDialog();
} },
} },
]; ];
} }
function pdfEditorItems(mainWindow) { function pdfEditorItems(_mainWindow) {
return [ return [
{ {
label: 'Open PDF File...', label: 'Open PDF File...',
accelerator: 'CmdOrCtrl+Shift+O', accelerator: 'CmdOrCtrl+Shift+O',
click: () => { click: () => {
const { openPdfFile } = require('../main'); const { openPdfFile } = require('../index');
openPdfFile(); openPdfFile();
} },
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'Merge PDFs...', label: 'Merge PDFs...',
click: () => { click: () => {
const { showPDFEditorDialog } = require('../main'); const { showPDFEditorDialog } = require('../index');
showPDFEditorDialog('merge'); showPDFEditorDialog('merge');
} },
}, },
{ {
label: 'Split PDF...', label: 'Split PDF...',
click: () => { click: () => {
const { showPDFEditorDialog } = require('../main'); const { showPDFEditorDialog } = require('../index');
showPDFEditorDialog('split'); showPDFEditorDialog('split');
} },
}, },
{ {
label: 'Compress PDF...', label: 'Compress PDF...',
click: () => { click: () => {
const { showPDFEditorDialog } = require('../main'); const { showPDFEditorDialog } = require('../index');
showPDFEditorDialog('compress'); showPDFEditorDialog('compress');
} },
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'Rotate Pages...', label: 'Rotate Pages...',
click: () => { click: () => {
const { showPDFEditorDialog } = require('../main'); const { showPDFEditorDialog } = require('../index');
showPDFEditorDialog('rotate'); showPDFEditorDialog('rotate');
} },
}, },
{ {
label: 'Delete Pages...', label: 'Delete Pages...',
click: () => { click: () => {
const { showPDFEditorDialog } = require('../main'); const { showPDFEditorDialog } = require('../index');
showPDFEditorDialog('delete'); showPDFEditorDialog('delete');
} },
}, },
{ {
label: 'Reorder Pages...', label: 'Reorder Pages...',
click: () => { click: () => {
const { showPDFEditorDialog } = require('../main'); const { showPDFEditorDialog } = require('../index');
showPDFEditorDialog('reorder'); showPDFEditorDialog('reorder');
} },
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'Add Watermark...', label: 'Add Watermark...',
click: () => { click: () => {
const { showPDFEditorDialog } = require('../main'); const { showPDFEditorDialog } = require('../index');
showPDFEditorDialog('watermark'); showPDFEditorDialog('watermark');
} },
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
@@ -433,34 +710,34 @@ function pdfEditorItems(mainWindow) {
{ {
label: 'Add Password Protection...', label: 'Add Password Protection...',
click: () => { click: () => {
const { showPDFEditorDialog } = require('../main'); const { showPDFEditorDialog } = require('../index');
showPDFEditorDialog('encrypt'); showPDFEditorDialog('encrypt');
} },
}, },
{ {
label: 'Remove Password...', label: 'Remove Password...',
click: () => { click: () => {
const { showPDFEditorDialog } = require('../main'); const { showPDFEditorDialog } = require('../index');
showPDFEditorDialog('decrypt'); showPDFEditorDialog('decrypt');
} },
}, },
{ {
label: 'Set Permissions...', label: 'Set Permissions...',
click: () => { click: () => {
const { showPDFEditorDialog } = require('../main'); const { showPDFEditorDialog } = require('../index');
showPDFEditorDialog('permissions'); showPDFEditorDialog('permissions');
} },
} },
] ],
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'About PDF Editor', label: 'About PDF Editor',
click: () => { click: () => {
const { showAboutDialog } = require('../main'); const { showAboutDialog } = require('../index');
showAboutDialog(); showAboutDialog();
} },
} },
]; ];
} }
@@ -472,41 +749,41 @@ function toolsItems(mainWindow) {
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'Document Compare', label: 'Document Compare',
click: () => mainWindow.webContents.send('show-document-compare') click: () => mainWindow.webContents.send('show-document-compare'),
} },
]; ];
} }
function helpItems(mainWindow) { function helpItems(_mainWindow) {
return [ return [
{ {
label: 'About MarkdownConverter', label: 'About MarkdownConverter',
click: () => { click: () => {
const { showAboutDialog } = require('../main'); const { showAboutDialog } = require('../index');
showAboutDialog(); showAboutDialog();
} },
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'Dependencies & Requirements', label: 'Dependencies & Requirements',
click: () => { click: () => {
const { showDependenciesDialog } = require('../main'); const { showDependenciesDialog } = require('../index');
showDependenciesDialog(); showDependenciesDialog();
} },
}, },
{ type: 'separator' }, { type: 'separator' },
{ {
label: 'Documentation', label: 'Documentation',
click: () => shell.openExternal('https://github.com/amitwh/markdown-converter') click: () => shell.openExternal('https://github.com/amitwh/markdown-converter'),
}, },
{ {
label: 'Report Issue', label: 'Report Issue',
click: () => shell.openExternal('https://github.com/amitwh/markdown-converter/issues') click: () => shell.openExternal('https://github.com/amitwh/markdown-converter/issues'),
}, },
{ {
label: 'Check for Updates', label: 'Check for Updates',
click: () => shell.openExternal('https://github.com/amitwh/markdown-converter/releases') click: () => shell.openExternal('https://github.com/amitwh/markdown-converter/releases'),
} },
]; ];
} }
@@ -518,5 +795,5 @@ module.exports = {
convertItems, convertItems,
pdfEditorItems, pdfEditorItems,
toolsItems, toolsItems,
helpItems helpItems,
}; };
+49
View File
@@ -0,0 +1,49 @@
'use strict';
const FAMILY_BY_KEY = {
'jetbrains-mono': 'JetBrains Mono',
'fira-code': 'Fira Code',
};
const ALLOWED_FONTS = Object.keys(FAMILY_BY_KEY);
const DEFAULT_SETTINGS = Object.freeze({
monospaceFont: 'jetbrains-mono',
monospaceLigatures: false,
});
function getActiveMonoFont(settings) {
const key = settings && settings.monospaceFont;
if (typeof key === 'string' && Object.prototype.hasOwnProperty.call(FAMILY_BY_KEY, key)) {
return FAMILY_BY_KEY[key];
}
return FAMILY_BY_KEY[DEFAULT_SETTINGS.monospaceFont];
}
function isLigaturesEnabled(settings) {
return !!(settings && settings.monospaceLigatures === true);
}
function safeMonospaceSettings(input) {
const safe = { ...DEFAULT_SETTINGS };
if (input && typeof input === 'object') {
if (ALLOWED_FONTS.includes(input.monospaceFont)) {
safe.monospaceFont = input.monospaceFont;
}
if (typeof input.monospaceLigatures === 'boolean') {
safe.monospaceLigatures = input.monospaceLigatures;
} else if (input.monospaceLigatures === 1 || input.monospaceLigatures === 'true') {
safe.monospaceLigatures = true;
}
}
return safe;
}
module.exports = {
FAMILY_BY_KEY,
ALLOWED_FONTS,
DEFAULT_SETTINGS,
getActiveMonoFont,
isLigaturesEnabled,
safeMonospaceSettings,
};
+1 -1
View File
@@ -25,7 +25,7 @@ const store = {
} catch {} } catch {}
settings[key] = value; settings[key] = value;
fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2)); fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
} },
}; };
module.exports = store; module.exports = store;
+64
View File
@@ -0,0 +1,64 @@
const fs = require('fs');
const path = require('path');
const MAX_DUMPS = 20;
class CrashWriter {
constructor(dir) {
this.dir = dir;
this._counter = 0;
fs.mkdirSync(dir, { recursive: true });
}
handleUncaught(err, kind) {
try {
const filename = `${Date.now()}-${++this._counter}-${kind}.json`;
const payload = {
kind,
message: err && err.message,
stack: err && err.stack,
timestamp: new Date().toISOString(),
};
fs.writeFileSync(path.join(this.dir, filename), JSON.stringify(payload, null, 2));
this._prune();
} catch (writeErr) {
console.error('[crash-writer] dump write failed:', writeErr.message);
}
}
_prune() {
const files = fs.readdirSync(this.dir).sort();
while (files.length > MAX_DUMPS) {
const oldest = files.shift();
try {
fs.unlinkSync(path.join(this.dir, oldest));
} catch (_unlinkErr) {
/* ignore */
}
}
}
list() {
if (!fs.existsSync(this.dir)) return [];
return fs
.readdirSync(this.dir)
.filter((f) => f.endsWith('.json'))
.sort()
.reverse()
.map((filename) => {
const full = path.join(this.dir, filename);
const data = JSON.parse(fs.readFileSync(full, 'utf-8'));
return { filename, ...data };
});
}
delete(filename) {
const full = path.join(this.dir, filename);
if (fs.existsSync(full)) fs.unlinkSync(full);
}
path() {
return this.dir;
}
}
module.exports = { CrashWriter };
+8
View File
@@ -0,0 +1,8 @@
function feedConfigFor(channel) {
if (channel === 'github') {
return { provider: 'github', owner: 'amitwh', repo: 'markdown-converter' };
}
return { provider: 'generic', url: 'https://updates.concreteinfo.co.in/v5' };
}
module.exports = { feedConfigFor };
+42
View File
@@ -0,0 +1,42 @@
const fs = require('fs');
const path = require('path');
class MigrationRunner {
constructor({ dir, transform }) {
this.dir = dir;
this.transform = transform;
this.file = path.join(dir, 'settings.json');
this.backup = path.join(dir, 'settings.v4.bak.json');
}
run() {
if (!fs.existsSync(this.file)) {
this._writeDefaults();
return 'fresh';
}
const raw = JSON.parse(fs.readFileSync(this.file, 'utf-8'));
if (raw && raw['migration.version'] === 5) {
return 'skipped';
}
try {
const v5 = this.transform(raw);
fs.copyFileSync(this.file, this.backup);
fs.writeFileSync(this.file, JSON.stringify({ ...v5, 'migration.version': 5 }, null, 2));
return 'migrated';
} catch (err) {
console.error('[migration-runner] transform failed:', err.message);
// Back up the original and write v5 marker so future launches skip migration.
// Without this, every launch would fail again and the user stays on defaults.
fs.copyFileSync(this.file, this.backup);
fs.writeFileSync(this.file, JSON.stringify({ ...raw, 'migration.version': 5 }, null, 2));
return 'failed';
}
}
_writeDefaults() {
const v5 = this.transform({});
fs.writeFileSync(this.file, JSON.stringify({ ...v5, 'migration.version': 5 }, null, 2));
}
}
module.exports = { MigrationRunner };
+120
View File
@@ -0,0 +1,120 @@
// Mirror of src/renderer/lib/migrations/v4-to-v5.ts, plain JS, for main-process use.
// Kept in sync manually; if the renderer transform changes, update this too.
const { z } = require('zod');
const v4SettingsSchema = z
.object({
theme: z.enum(['light', 'dark', 'auto']).default('auto'),
customCss: z.string().optional().nullable(),
recentFiles: z.array(z.string()).default([]),
editorFontSize: z.number().min(10).max(28).default(14),
keyBindings: z.record(z.string(), z.string()).optional(),
snippets: z.array(z.unknown()).default([]),
})
.passthrough();
const v5SettingsSchema = z
.object({
fontSize: z.number().default(14),
tabSize: z.number().default(4),
lineNumbers: z.boolean().default(true),
wordWrap: z.boolean().default(true),
minimap: z.boolean().default(true),
theme: z.enum(['light', 'dark', 'system']).default('system'),
accentColor: z.string().default('brand'),
fontFamily: z.string().default('system'),
pdfFormat: z.string().default('a4'),
pdfMargins: z.string().default('normal'),
pdfEmbedFonts: z.boolean().default(true),
docxTemplate: z.string().default('standard'),
docxCustomTemplatePath: z.string().nullable().default(null),
replOpen: z.boolean().default(false),
breadcrumbSymbols: z.boolean().default(true),
htmlHighlightStyle: z.string().default('github'),
renderTablesAsAscii: z.boolean().default(false),
welcomeDismissed: z.boolean().default(false),
editorFontSize: z.number().default(14),
customCssPath: z.string().nullable().default(null),
userBindings: z.record(z.string(), z.string()).default({}),
updateChannel: z.enum(['github', 'concreteinfo']).default('github'),
autoCheckUpdates: z.boolean().default(true),
firstRun: z.boolean().default(true),
monospaceFont: z.enum(['jetbrains-mono', 'fira-code']).default('jetbrains-mono'),
monospaceLigatures: z.boolean().default(false),
appVariant: z.enum(['classic', 'react']).default('react'),
'migration.version': z.literal(5).optional(),
})
.passthrough();
const v5OnlyFields = ['updateChannel', 'autoCheckUpdates', 'firstRun'];
const v5ThemeValues = ['light', 'dark', 'system'];
function isAlreadyV5(data) {
if (!data || typeof data !== 'object') return false;
if (data['migration.version'] === 5) return true;
// Check for v5-only fields — a v4 file would never have these
return v5OnlyFields.some((f) => f in data);
}
function normalizeAlreadyV5(data) {
// Some earlier v5 builds wrote a legacy theme value (e.g. "ayu-light")
// under the v5 marker. Trusting the marker blindly broke the renderer's
// zod schema on every launch. Always normalize theme against the v5 enum
// before returning, so persisted files are always valid v5.
const out = { ...data };
if (typeof out.theme !== 'string' || !v5ThemeValues.includes(out.theme)) {
out.theme = 'system';
}
return out;
}
const v5SettingsShape = {
fontSize: 14,
tabSize: 4,
lineNumbers: true,
wordWrap: true,
minimap: true,
theme: 'system',
accentColor: 'brand',
fontFamily: 'system',
pdfFormat: 'a4',
pdfMargins: 'normal',
pdfEmbedFonts: true,
docxTemplate: 'standard',
docxCustomTemplatePath: null,
replOpen: false,
breadcrumbSymbols: true,
htmlHighlightStyle: 'github',
renderTablesAsAscii: false,
welcomeDismissed: false,
editorFontSize: 14,
customCssPath: null,
userBindings: {},
updateChannel: 'github',
autoCheckUpdates: true,
firstRun: true,
};
function migrateV4ToV5(v4) {
// If data already looks like v5 (has migration.version=5 or v5-only fields),
// normalize and validate against the v5 schema. This handles the case where
// a buggy v5 run wrote v5 fields without the marker, AND the case where a
// v5 file has a legacy theme value (e.g. "ayu-light") that would otherwise
// be rejected by the renderer.
if (isAlreadyV5(v4)) {
return v5SettingsSchema.parse(normalizeAlreadyV5(v4));
}
const parsed = v4SettingsSchema.parse(v4 || {});
return {
...v5SettingsShape,
...parsed,
theme: parsed.theme === 'auto' ? 'system' : parsed.theme,
customCssPath: parsed.customCss ?? null,
recentFiles: parsed.recentFiles,
editorFontSize: parsed.editorFontSize,
userBindings: parsed.keyBindings ?? v5SettingsShape.userBindings,
snippets: parsed.snippets,
};
}
module.exports = { migrateV4ToV5, v5SettingsShape };
+43
View File
@@ -0,0 +1,43 @@
const { EventEmitter } = require('events');
const DEBOUNCE_MS = 60_000;
class UpdaterService extends EventEmitter {
constructor(autoUpdater) {
super();
this.autoUpdater = autoUpdater;
this.state = 'idle';
this.lastCheckAt = 0;
this._wire();
}
_wire() {
const au = this.autoUpdater;
au.on('checking-for-update', () => this._emit({ state: 'checking' }));
au.on('update-available', (info) => this._emit({ state: 'available', version: info.version }));
au.on('download-progress', (p) => this._emit({ state: 'downloading', percent: p.percent }));
au.on('update-downloaded', (info) => this._emit({ state: 'ready', version: info.version }));
au.on('update-not-available', () => this._emit({ state: 'idle' }));
au.on('error', (err) => {
const code =
err && /ENOTFOUND|ETIMEDOUT|ECONNREFUSED/.test(err.message) ? 'NETWORK' : 'UNKNOWN';
this._emit({ state: 'error', code });
});
}
_emit(payload) {
this.state = payload.state;
this.emit('status', payload);
}
async check() {
if (Date.now() - this.lastCheckAt < DEBOUNCE_MS) return;
this.lastCheckAt = Date.now();
await this.autoUpdater.checkForUpdates();
}
install() {
this.autoUpdater.quitAndInstall();
}
}
module.exports = { UpdaterService };
+10 -6
View File
@@ -10,7 +10,7 @@ function getAllowedDirectories() {
app.getPath('desktop'), app.getPath('desktop'),
app.getPath('downloads'), app.getPath('downloads'),
app.getPath('home'), app.getPath('home'),
process.cwd() // Current working directory process.cwd(), // Current working directory
].filter(Boolean); // Remove any undefined paths ].filter(Boolean); // Remove any undefined paths
return dirs; return dirs;
} }
@@ -29,7 +29,7 @@ function validatePath(filePath) {
let resolved; let resolved;
try { try {
resolved = path.resolve(filePath); resolved = path.resolve(filePath);
} catch (err) { } catch (_err) {
return { valid: false, resolved: '', error: 'Invalid path format' }; return { valid: false, resolved: '', error: 'Invalid path format' };
} }
@@ -63,7 +63,7 @@ function resolveWritablePath(filePath) {
let resolved; let resolved;
try { try {
resolved = path.normalize(path.resolve(filePath)); resolved = path.normalize(path.resolve(filePath));
} catch (err) { } catch (_err2) {
return { valid: false, resolved: '', error: 'Invalid path format' }; return { valid: false, resolved: '', error: 'Invalid path format' };
} }
@@ -88,9 +88,13 @@ function resolveWritablePath(filePath) {
function isPathAccessible(resolvedPath) { function isPathAccessible(resolvedPath) {
// Block access to sensitive system directories // Block access to sensitive system directories
const blockedPaths = [ const blockedPaths = [
'/etc/passwd', '/etc/shadow', '/root', '/etc/passwd',
'C:\\Windows\\System32', 'C:\\Windows\\System', '/etc/shadow',
'/System', '/private/etc' '/root',
'C:\\Windows\\System32',
'C:\\Windows\\System',
'/System',
'/private/etc',
]; ];
const normalizedPath = resolvedPath.toLowerCase(); const normalizedPath = resolvedPath.toLowerCase();
+63 -15
View File
@@ -1,28 +1,69 @@
// src/main/window/index.js // src/main/window/index.js
// Main window creation // Main window creation
const { BrowserWindow } = require('electron'); const { app, BrowserWindow } = require('electron');
const path = require('path'); const path = require('path');
const fs = require('fs');
const state = require('./state'); const state = require('./state');
const menu = require('../menu'); const menu = require('../menu');
function createMainWindow() { function createMainWindow() {
const bounds = state.load(); const bounds = state.load();
const isDev = !!process.env.VITE_DEV_SERVER_URL;
const win = new BrowserWindow({ const win = new BrowserWindow({
width: bounds.width, width: bounds.width,
height: bounds.height, height: bounds.height,
x: bounds.x, x: bounds.x,
y: bounds.y, y: bounds.y,
show: false, show: true,
title: `Markdown Converter${isDev ? ' — React Dev' : ''}`,
webPreferences: { webPreferences: {
nodeIntegration: true, // The preload script exposes `window.electronAPI` — the only IPC
contextIsolation: false, // bridge the renderer uses. Without this, every renderer call returns
spellcheck: true // CHANNEL_MISSING and file/folder/save all silently no-op.
preload: path.join(__dirname, '../../preload.js'),
// contextIsolation MUST be true for the preload's contextBridge
// exposeInMainWorld call to succeed. Without it, the preload throws
// on load and the renderer never gets the IPC bridge.
contextIsolation: true,
nodeIntegration: false,
spellcheck: true,
}, },
icon: path.join(__dirname, '../../assets/icon.png') icon: path.join(__dirname, '../../../assets/icon.png'),
}); });
win.loadFile(path.join(__dirname, '../../renderer/index.html')); // Dev (Vite): load the running dev server so .tsx is transformed on the fly.
// Production (running from dist/ directly): load the built renderer at the
// relative path from this file.
// Production (packaged installer build): the renderer ships under
// process.resourcesPath/renderer (configured via build.extraResources in
// package.json) — not inside the asar.
// VITE_DEV_SERVER_URL is set by `npm run dev` via cross-env.
// app.isPackaged is set by electron-builder for installer builds.
const devServerUrl = process.env.VITE_DEV_SERVER_URL;
if (!app.isPackaged && devServerUrl) {
console.log('[WINDOW] Dev mode — loading', devServerUrl);
win.loadURL(devServerUrl);
} else {
const rendererIndex = app.isPackaged
? path.join(process.resourcesPath, 'renderer', 'index.html')
: path.join(__dirname, '../../../dist/renderer/index.html');
if (app.isPackaged) {
try {
fs.accessSync(rendererIndex);
} catch {
console.error(
'[WINDOW] Renderer not found at',
rendererIndex,
'— did you run `npm run build:renderer` before packaging?'
);
}
}
console.log('[WINDOW] Production mode — loading', rendererIndex);
win.loadFile(rendererIndex);
}
// Show window only after content is ready — avoids blank flash // Show window only after content is ready — avoids blank flash
win.once('ready-to-show', () => { win.once('ready-to-show', () => {
@@ -31,8 +72,10 @@ function createMainWindow() {
menu.register(win); menu.register(win);
win.on('closed', () => { // Use 'close' (fires before destruction) — 'closed' fires after the
state.save(win); // BrowserWindow object is destroyed, so getBounds() would throw.
win.on('close', () => {
if (!win.isDestroyed()) state.save(win);
}); });
// Spell check context menu // Spell check context menu
@@ -43,18 +86,23 @@ function createMainWindow() {
// Add spell check suggestions // Add spell check suggestions
if (params.misspelledWord) { if (params.misspelledWord) {
for (const suggestion of params.dictionarySuggestions) { for (const suggestion of params.dictionarySuggestions) {
ctxMenu.append(new MenuItem({ ctxMenu.append(
new MenuItem({
label: suggestion, label: suggestion,
click: () => win.webContents.replaceMisspelling(suggestion) click: () => win.webContents.replaceMisspelling(suggestion),
})); })
);
} }
if (params.dictionarySuggestions.length > 0) { if (params.dictionarySuggestions.length > 0) {
ctxMenu.append(new MenuItem({ type: 'separator' })); ctxMenu.append(new MenuItem({ type: 'separator' }));
} }
ctxMenu.append(new MenuItem({ ctxMenu.append(
new MenuItem({
label: 'Add to Dictionary', label: 'Add to Dictionary',
click: () => win.webContents.session.addWordToSpellCheckerDictionary(params.misspelledWord) click: () =>
})); win.webContents.session.addWordToSpellCheckerDictionary(params.misspelledWord),
})
);
ctxMenu.append(new MenuItem({ type: 'separator' })); ctxMenu.append(new MenuItem({ type: 'separator' }));
} }
+85 -21
View File
@@ -7,7 +7,6 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const PizZip = require('pizzip'); const PizZip = require('pizzip');
const Docx = require('docx4js').default;
class WordTemplateExporter { class WordTemplateExporter {
constructor(templatePath, startPage = 3, pageSettings = null) { constructor(templatePath, startPage = 3, pageSettings = null) {
@@ -66,7 +65,7 @@ class WordTemplateExporter {
b5: { width: 9979, height: 14170 }, b5: { width: 9979, height: 14170 },
letter: { width: 12240, height: 15840 }, letter: { width: 12240, height: 15840 },
legal: { width: 12240, height: 20160 }, legal: { width: 12240, height: 20160 },
tabloid: { width: 15840, height: 24480 } tabloid: { width: 15840, height: 24480 },
}; };
let width, height; let width, height;
@@ -373,7 +372,10 @@ class WordTemplateExporter {
continue; continue;
} }
// Split by | and trim // Split by | and trim
const cells = line.split('|').filter(cell => cell.trim()).map(cell => cell.trim()); const cells = line
.split('|')
.filter((cell) => cell.trim())
.map((cell) => cell.trim());
if (cells.length > 0) { if (cells.length > 0) {
rows.push(cells); rows.push(cells);
} }
@@ -382,7 +384,7 @@ class WordTemplateExporter {
if (rows.length === 0) return ''; if (rows.length === 0) return '';
// Calculate number of columns // Calculate number of columns
const numCols = Math.max(...rows.map(row => row.length)); const numCols = Math.max(...rows.map((row) => row.length));
// Calculate column width in twips (1440 twips = 1 inch) // Calculate column width in twips (1440 twips = 1 inch)
// Assume standard page width of 9360 twips (6.5 inches usable) // Assume standard page width of 9360 twips (6.5 inches usable)
@@ -429,7 +431,7 @@ class WordTemplateExporter {
rowCells.push(''); rowCells.push('');
} }
rowCells.forEach((cellText, colIndex) => { rowCells.forEach((cellText, _colIndex) => {
tableXml += '<w:tc>'; tableXml += '<w:tc>';
tableXml += '<w:tcPr>'; tableXml += '<w:tcPr>';
@@ -444,7 +446,8 @@ class WordTemplateExporter {
} }
// Cell borders // Cell borders
tableXml += '<w:tcBorders>' + tableXml +=
'<w:tcBorders>' +
'<w:top w:val="single" w:sz="8" w:space="0" w:color="F58220"/>' + '<w:top w:val="single" w:sz="8" w:space="0" w:color="F58220"/>' +
'<w:left w:val="single" w:sz="8" w:space="0" w:color="F58220"/>' + '<w:left w:val="single" w:sz="8" w:space="0" w:color="F58220"/>' +
'<w:bottom w:val="single" w:sz="8" w:space="0" w:color="F58220"/>' + '<w:bottom w:val="single" w:sz="8" w:space="0" w:color="F58220"/>' +
@@ -452,7 +455,8 @@ class WordTemplateExporter {
'</w:tcBorders>'; '</w:tcBorders>';
// Cell margins for proper padding // Cell margins for proper padding
tableXml += '<w:tcMar>' + tableXml +=
'<w:tcMar>' +
'<w:top w:w="80" w:type="dxa"/>' + '<w:top w:w="80" w:type="dxa"/>' +
'<w:left w:w="120" w:type="dxa"/>' + '<w:left w:w="120" w:type="dxa"/>' +
'<w:bottom w:w="80" w:type="dxa"/>' + '<w:bottom w:w="80" w:type="dxa"/>' +
@@ -499,7 +503,7 @@ class WordTemplateExporter {
// Don't treat markdown tables as ASCII art // Don't treat markdown tables as ASCII art
if (line.trim().startsWith('|') && line.trim().endsWith('|')) { if (line.trim().startsWith('|') && line.trim().endsWith('|')) {
// Check if it's a proper markdown table (has multiple cells) // Check if it's a proper markdown table (has multiple cells)
const cells = line.split('|').filter(c => c.trim()); const cells = line.split('|').filter((c) => c.trim());
if (cells.length >= 2) { if (cells.length >= 2) {
return false; return false;
} }
@@ -507,17 +511,72 @@ class WordTemplateExporter {
// Common ASCII art characters (Unicode box drawing and symbols) // Common ASCII art characters (Unicode box drawing and symbols)
const asciiArtChars = [ const asciiArtChars = [
'─', '│', '┌', '┐', '└', '┘', '├', '┤', '┬', '┴', '┼', // Box drawing '─',
'═', '║', '╔', '╗', '╚', '╝', '╠', '╣', '╦', '╩', '╬', // Double box '│',
'╭', '╮', '╯', '╰', // Rounded corners '┌',
'▲', '▼', '◄', '►', '♦', '●', '○', '■', '□', '◆', '◇', // Shapes '┐',
'↓', '→', '←', '↑', '↔', '↕', '⇒', '⇐', '⇓', '⇑', // Arrows '└',
'┃', '━', '┏', '┓', '┗', '┛', '┣', '┫', '┳', '┻', '╋', // Heavy box '┘',
'░', '▒', '▓', '█', // Shading '├',
'┤',
'┬',
'┴',
'┼', // Box drawing
'═',
'║',
'╔',
'╗',
'╚',
'╝',
'╠',
'╣',
'╦',
'╩',
'╬', // Double box
'╭',
'╮',
'╯',
'╰', // Rounded corners
'▲',
'▼',
'◄',
'►',
'♦',
'●',
'○',
'■',
'□',
'◆',
'◇', // Shapes
'↓',
'→',
'←',
'↑',
'↔',
'↕',
'⇒',
'⇐',
'⇓',
'⇑', // Arrows
'┃',
'━',
'┏',
'┓',
'┗',
'┛',
'┣',
'┫',
'┳',
'┻',
'╋', // Heavy box
'░',
'▒',
'▓',
'█', // Shading
]; ];
// Check for box drawing characters // Check for box drawing characters
if (asciiArtChars.some(char => line.includes(char))) { if (asciiArtChars.some((char) => line.includes(char))) {
return true; return true;
} }
@@ -537,7 +596,7 @@ class WordTemplateExporter {
/^\s*\*[-=\*]+\*/, // *----* /^\s*\*[-=\*]+\*/, // *----*
]; ];
return asciiPatterns.some(pattern => pattern.test(line)); return asciiPatterns.some((pattern) => pattern.test(line));
} }
/** /**
@@ -564,7 +623,7 @@ class WordTemplateExporter {
// Check if line contains arrow characters and color them red // Check if line contains arrow characters and color them red
const arrowChars = ['↓', '→', '←', '↑', '▼', '►', '◄', '▲']; const arrowChars = ['↓', '→', '←', '↑', '▼', '►', '◄', '▲'];
const hasArrow = arrowChars.some(arrow => line.includes(arrow)); const hasArrow = arrowChars.some((arrow) => line.includes(arrow));
if (hasArrow) { if (hasArrow) {
// Split line into parts and color arrows red // Split line into parts and color arrows red
@@ -655,14 +714,14 @@ class WordTemplateExporter {
*/ */
parseInlineFormatting(text) { parseInlineFormatting(text) {
let xml = ''; let xml = '';
const pos = 0; const _pos = 0;
// Patterns for inline formatting // Patterns for inline formatting
const patterns = [ const patterns = [
{ regex: /\*\*\*(.+?)\*\*\*/g, bold: true, italic: true }, { regex: /\*\*\*(.+?)\*\*\*/g, bold: true, italic: true },
{ regex: /\*\*(.+?)\*\*/g, bold: true }, { regex: /\*\*(.+?)\*\*/g, bold: true },
{ regex: /\*(.+?)\*/g, italic: true }, { regex: /\*(.+?)\*/g, italic: true },
{ regex: /`(.+?)`/g, code: true } { regex: /`(.+?)`/g, code: true },
]; ];
// Simple approach: process text sequentially // Simple approach: process text sequentially
@@ -693,7 +752,12 @@ class WordTemplateExporter {
} }
// Add formatted text // Add formatted text
xml += this.createRunXml(match[1], matchedPattern.bold, matchedPattern.italic, matchedPattern.code); xml += this.createRunXml(
match[1],
matchedPattern.bold,
matchedPattern.italic,
matchedPattern.code
);
remaining = remaining.substring(earliestPos + match[0].length); remaining = remaining.substring(earliestPos + match[0].length);
} else { } else {
+1 -3
View File
@@ -5,9 +5,7 @@
"description": "Demonstrates the plugin system. Safe to delete.", "description": "Demonstrates the plugin system. Safe to delete.",
"icon": "puzzle", "icon": "puzzle",
"extensionPoints": { "extensionPoints": {
"commands": [ "commands": [{ "id": "hello", "label": "Sample: Hello World", "shortcut": "" }]
{ "id": "hello", "label": "Sample: Hello World", "shortcut": "" }
]
}, },
"settings": [] "settings": []
} }
+47 -17
View File
@@ -9,7 +9,7 @@ class WritingStudioPlugin extends PluginAPI {
this.context = context; this.context = context;
this.sprintEngine = new SprintEngine({ this.sprintEngine = new SprintEngine({
onEvent: (name, data) => context.events.emit(name, data) onEvent: (name, data) => context.events.emit(name, data),
}); });
this.goalTracker = new GoalTracker(context.settings); this.goalTracker = new GoalTracker(context.settings);
this.snapshotManager = new SnapshotManager(context.settings); this.snapshotManager = new SnapshotManager(context.settings);
@@ -17,14 +17,14 @@ class WritingStudioPlugin extends PluginAPI {
readFile: (p) => context.ipc.invoke('read-file', p), readFile: (p) => context.ipc.invoke('read-file', p),
writeFile: (p, c) => context.ipc.invoke('write-file', p, c), writeFile: (p, c) => context.ipc.invoke('write-file', p, c),
fileExists: (p) => context.ipc.invoke('path-exists', p), fileExists: (p) => context.ipc.invoke('path-exists', p),
listDir: (p) => context.ipc.invoke('list-directory', p) listDir: (p) => context.ipc.invoke('list-directory', p),
}); });
this._engines = { this._engines = {
sprint: this.sprintEngine, sprint: this.sprintEngine,
goals: this.goalTracker, goals: this.goalTracker,
snapshots: this.snapshotManager, snapshots: this.snapshotManager,
projects: this.projectManager projects: this.projectManager,
}; };
this._registerCommands(context); this._registerCommands(context);
@@ -34,59 +34,89 @@ class WritingStudioPlugin extends PluginAPI {
_registerCommands(context) { _registerCommands(context) {
const { sprintEngine, snapshotManager, goalTracker } = this; const { sprintEngine, snapshotManager, goalTracker } = this;
context.commands.register('start-sprint', 'Studio: Start Sprint', () => { context.commands.register(
'start-sprint',
'Studio: Start Sprint',
() => {
const duration = context.settings.get('sprintDuration') || 25; const duration = context.settings.get('sprintDuration') || 25;
const content = context.editor.getContent() || ''; const content = context.editor.getContent() || '';
const words = content.split(/\s+/).filter(Boolean).length; const words = content.split(/\s+/).filter(Boolean).length;
sprintEngine.start(duration, words); sprintEngine.start(duration, words);
}, 'Ctrl+Alt+S'); },
'Ctrl+Alt+S'
);
context.commands.register('stop-sprint', 'Studio: Stop Sprint', () => { context.commands.register(
'stop-sprint',
'Studio: Stop Sprint',
() => {
if (!sprintEngine.isActive()) return; if (!sprintEngine.isActive()) return;
const content = context.editor.getContent() || ''; const content = context.editor.getContent() || '';
const words = content.split(/\s+/).filter(Boolean).length; const words = content.split(/\s+/).filter(Boolean).length;
const result = sprintEngine.stop(words); const result = sprintEngine.stop(words);
goalTracker.addWords(result.wordDelta); goalTracker.addWords(result.wordDelta);
context.events.emit('sprint:stopped', result); context.events.emit('sprint:stopped', result);
}, 'Ctrl+Alt+Shift+S'); },
'Ctrl+Alt+Shift+S'
);
context.commands.register('take-snapshot', 'Studio: Take Snapshot', () => { context.commands.register(
'take-snapshot',
'Studio: Take Snapshot',
() => {
const content = context.editor.getContent() || ''; const content = context.editor.getContent() || '';
snapshotManager.create(content, 'manual'); snapshotManager.create(content, 'manual');
context.events.emit('snapshot:created', {}); context.events.emit('snapshot:created', {});
}, 'Ctrl+Alt+N'); },
'Ctrl+Alt+N'
);
context.commands.register('restore-last-snapshot', 'Studio: Restore Last Snapshot', () => { context.commands.register(
'restore-last-snapshot',
'Studio: Restore Last Snapshot',
() => {
const snaps = snapshotManager.list(); const snaps = snapshotManager.list();
if (snaps.length === 0) return; if (snaps.length === 0) return;
const content = snapshotManager.restore(snaps[0].id); const content = snapshotManager.restore(snaps[0].id);
context.editor.insertAtCursor(content); context.editor.insertAtCursor(content);
}, 'Ctrl+Alt+Z'); },
'Ctrl+Alt+Z'
);
context.commands.register('new-project', 'Studio: New Project', () => { context.commands.register('new-project', 'Studio: New Project', () => {
context.events.emit('studio:new-project', {}); context.events.emit('studio:new-project', {});
}); });
context.commands.register('compile-manuscript', 'Studio: Compile Manuscript', () => { context.commands.register(
'compile-manuscript',
'Studio: Compile Manuscript',
() => {
context.events.emit('studio:compile', {}); context.events.emit('studio:compile', {});
}, 'Ctrl+Alt+E'); },
'Ctrl+Alt+E'
);
context.commands.register('proofread-document', 'Studio: Proofread Document', () => { context.commands.register(
'proofread-document',
'Studio: Proofread Document',
() => {
if (context.events.hasHandler('ai:analyze')) { if (context.events.hasHandler('ai:analyze')) {
const content = context.editor.getContent() || ''; const content = context.editor.getContent() || '';
context.events.emit('ai:analyze', { text: content, type: 'grammar' }); context.events.emit('ai:analyze', { text: content, type: 'grammar' });
} }
}, 'Ctrl+Alt+G'); },
'Ctrl+Alt+G'
);
} }
_registerStatusBar(context) { _registerStatusBar(context) {
context.statusBar.registerIndicator('word-goal', { context.statusBar.registerIndicator('word-goal', {
text: '0/1000', text: '0/1000',
tooltip: 'Daily word goal progress' tooltip: 'Daily word goal progress',
}); });
context.statusBar.registerIndicator('sprint-timer', { context.statusBar.registerIndicator('sprint-timer', {
text: '', text: '',
tooltip: 'Writing sprint timer' tooltip: 'Writing sprint timer',
}); });
} }
@@ -15,17 +15,34 @@
{ "id": "start-sprint", "label": "Studio: Start Sprint", "shortcut": "Ctrl+Alt+S" }, { "id": "start-sprint", "label": "Studio: Start Sprint", "shortcut": "Ctrl+Alt+S" },
{ "id": "stop-sprint", "label": "Studio: Stop Sprint", "shortcut": "Ctrl+Alt+Shift+S" }, { "id": "stop-sprint", "label": "Studio: Stop Sprint", "shortcut": "Ctrl+Alt+Shift+S" },
{ "id": "take-snapshot", "label": "Studio: Take Snapshot", "shortcut": "Ctrl+Alt+N" }, { "id": "take-snapshot", "label": "Studio: Take Snapshot", "shortcut": "Ctrl+Alt+N" },
{ "id": "restore-last-snapshot", "label": "Studio: Restore Last Snapshot", "shortcut": "Ctrl+Alt+Z" }, {
"id": "restore-last-snapshot",
"label": "Studio: Restore Last Snapshot",
"shortcut": "Ctrl+Alt+Z"
},
{ "id": "new-project", "label": "Studio: New Project", "shortcut": "" }, { "id": "new-project", "label": "Studio: New Project", "shortcut": "" },
{ "id": "compile-manuscript", "label": "Studio: Compile Manuscript", "shortcut": "Ctrl+Alt+E" }, {
{ "id": "proofread-document", "label": "Studio: Proofread Document", "shortcut": "Ctrl+Alt+G" } "id": "compile-manuscript",
"label": "Studio: Compile Manuscript",
"shortcut": "Ctrl+Alt+E"
},
{
"id": "proofread-document",
"label": "Studio: Proofread Document",
"shortcut": "Ctrl+Alt+G"
}
], ],
"statusBar": { "indicators": ["sprint-timer", "word-goal"] } "statusBar": { "indicators": ["sprint-timer", "word-goal"] }
}, },
"settings": [ "settings": [
{ "key": "dailyGoal", "type": "number", "default": 1000, "label": "Daily word goal" }, { "key": "dailyGoal", "type": "number", "default": 1000, "label": "Daily word goal" },
{ "key": "sprintDuration", "type": "number", "default": 25, "label": "Sprint duration (min)" }, { "key": "sprintDuration", "type": "number", "default": 25, "label": "Sprint duration (min)" },
{ "key": "autoSnapshotInterval", "type": "number", "default": 0, "label": "Auto-snapshot interval (min, 0=off)" }, {
"key": "autoSnapshotInterval",
"type": "number",
"default": 0,
"label": "Auto-snapshot interval (min, 0=off)"
},
{ "key": "maxSnapshots", "type": "number", "default": 50, "label": "Max snapshots to keep" } { "key": "maxSnapshots", "type": "number", "default": 50, "label": "Max snapshots to keep" }
] ]
} }
@@ -29,7 +29,8 @@ function renderGoalsPanel(container, { engines, settings }) {
const row = document.createElement('div'); const row = document.createElement('div');
row.className = 'ws-stat-row'; row.className = 'ws-stat-row';
const label = document.createElement('span'); const label = document.createElement('span');
label.textContent = progress.written.toLocaleString() + ' / ' + dailyGoal.toLocaleString() + ' words'; label.textContent =
progress.written.toLocaleString() + ' / ' + dailyGoal.toLocaleString() + ' words';
const pct = document.createElement('span'); const pct = document.createElement('span');
pct.className = 'ws-pct'; pct.className = 'ws-pct';
pct.textContent = progress.pct + '%'; pct.textContent = progress.pct + '%';
@@ -81,7 +82,7 @@ function renderGoalsPanel(container, { engines, settings }) {
const chart = document.createElement('div'); const chart = document.createElement('div');
chart.className = 'ws-chart'; chart.className = 'ws-chart';
const maxWords = Math.max(...last30.map(d => d.words), 1); const maxWords = Math.max(...last30.map((d) => d.words), 1);
for (const day of last30) { for (const day of last30) {
const barEl = document.createElement('div'); const barEl = document.createElement('div');
const height = Math.max(2, (day.words / maxWords) * 60); const height = Math.max(2, (day.words / maxWords) * 60);
@@ -69,7 +69,8 @@ function renderManuscriptPanel(container, { engines, editor, settings }) {
const row = document.createElement('div'); const row = document.createElement('div');
row.className = 'ws-stat-row'; row.className = 'ws-stat-row';
const label = document.createElement('span'); const label = document.createElement('span');
label.textContent = stats.totalWords.toLocaleString() + ' / ' + stats.targetWords.toLocaleString() + ' words'; label.textContent =
stats.totalWords.toLocaleString() + ' / ' + stats.targetWords.toLocaleString() + ' words';
const pct = document.createElement('span'); const pct = document.createElement('span');
pct.className = 'ws-pct'; pct.className = 'ws-pct';
pct.textContent = stats.pctComplete + '%'; pct.textContent = stats.pctComplete + '%';
@@ -42,7 +42,7 @@ function renderProofreadPanel(container, { events, editor }) {
if (result && result.issues) { if (result && result.issues) {
renderIssues(issuesList, result.issues); renderIssues(issuesList, result.issues);
} }
} },
}); });
}); });
} }
@@ -80,7 +80,10 @@ function renderIssues(container, issues) {
const actions = document.createElement('div'); const actions = document.createElement('div');
actions.className = 'ws-issue-actions'; actions.className = 'ws-issue-actions';
for (const [action, label] of [['accept', 'Accept'], ['dismiss', 'Dismiss']]) { for (const [_action, label] of [
['accept', 'Accept'],
['dismiss', 'Dismiss'],
]) {
const actionBtn = document.createElement('button'); const actionBtn = document.createElement('button');
actionBtn.className = 'ws-btn ws-btn-sm'; actionBtn.className = 'ws-btn ws-btn-sm';
actionBtn.textContent = label; actionBtn.textContent = label;
@@ -45,7 +45,11 @@ function renderSnapshotsPanel(container, { engines, editor }) {
const actions = document.createElement('div'); const actions = document.createElement('div');
actions.className = 'ws-snapshot-actions'; actions.className = 'ws-snapshot-actions';
for (const [action, text, cls] of [['restore', 'Restore', ''], ['diff', 'Diff', ''], ['delete', 'Delete', 'ws-btn-danger']]) { for (const [action, text, cls] of [
['restore', 'Restore', ''],
['diff', 'Diff', ''],
['delete', 'Delete', 'ws-btn-danger'],
]) {
const actionBtn = document.createElement('button'); const actionBtn = document.createElement('button');
actionBtn.className = 'ws-btn ws-btn-sm' + (cls ? ' ' + cls : ''); actionBtn.className = 'ws-btn ws-btn-sm' + (cls ? ' ' + cls : '');
actionBtn.textContent = text; actionBtn.textContent = text;
@@ -12,7 +12,7 @@ class ProjectManager {
type: opts.type || 'manuscript', type: opts.type || 'manuscript',
target: { words: opts.targetWords || 0, deadline: opts.deadline || null }, target: { words: opts.targetWords || 0, deadline: opts.deadline || null },
chapters: [], chapters: [],
metadata: opts.metadata || {} metadata: opts.metadata || {},
}; };
this.fs.writeFile(dir + '/.project.json', JSON.stringify(project, null, 2)); this.fs.writeFile(dir + '/.project.json', JSON.stringify(project, null, 2));
return project; return project;
@@ -66,7 +66,7 @@ class ProjectManager {
totalWords, totalWords,
chapterCount: project.chapters.length, chapterCount: project.chapters.length,
targetWords: target, targetWords: target,
pctComplete: target > 0 ? Math.min(100, Math.round((totalWords / target) * 100)) : 0 pctComplete: target > 0 ? Math.min(100, Math.round((totalWords / target) * 100)) : 0,
}; };
} }
} }
@@ -24,7 +24,7 @@ class SnapshotManager {
timestamp: new Date().toISOString(), timestamp: new Date().toISOString(),
content, content,
wordCount: content.split(/\s+/).filter(Boolean).length, wordCount: content.split(/\s+/).filter(Boolean).length,
label label,
}; };
snaps.unshift(snap); snaps.unshift(snap);
this._saveAll(snaps); this._saveAll(snaps);
@@ -36,7 +36,7 @@ class SnapshotManager {
} }
getById(id) { getById(id) {
return this._getAll().find(s => s.id === id) || null; return this._getAll().find((s) => s.id === id) || null;
} }
restore(id) { restore(id) {
@@ -46,7 +46,7 @@ class SnapshotManager {
} }
delete(id) { delete(id) {
const snaps = this._getAll().filter(s => s.id !== id); const snaps = this._getAll().filter((s) => s.id !== id);
this._saveAll(snaps); this._saveAll(snaps);
} }
@@ -59,8 +59,12 @@ class SnapshotManager {
const newSet = new Set(newLines); const newSet = new Set(newLines);
let added = 0; let added = 0;
let removed = 0; let removed = 0;
for (const line of newLines) { if (!oldSet.has(line)) added++; } for (const line of newLines) {
for (const line of oldLines) { if (!newSet.has(line)) removed++; } if (!oldSet.has(line)) added++;
}
for (const line of oldLines) {
if (!newSet.has(line)) removed++;
}
return { added, removed }; return { added, removed };
} }
@@ -40,7 +40,9 @@ class SprintEngine {
} }
} }
isActive() { return this._active; } isActive() {
return this._active;
}
getRemaining() { getRemaining() {
if (!this._active) return 0; if (!this._active) return 0;
+15 -10
View File
@@ -12,10 +12,11 @@ class PluginContext {
* @param {object} deps.exportHooks - { preHooks: [], postHooks: [] } * @param {object} deps.exportHooks - { preHooks: [], postHooks: [] }
*/ */
constructor(deps) { constructor(deps) {
const { pluginId, sidebar, commands, statusBar, eventBus, settings, editor, ipc, exportHooks } = deps; const { pluginId, sidebar, commands, statusBar, eventBus, settings, editor, ipc, exportHooks } =
deps;
this.sidebar = { this.sidebar = {
registerPanel: (id, opts) => sidebar.registerPanel(`${pluginId}:${id}`, opts) registerPanel: (id, opts) => sidebar.registerPanel(`${pluginId}:${id}`, opts),
}; };
this.commands = { this.commands = {
@@ -28,41 +29,45 @@ class PluginContext {
} }
}; };
commands.register(`${pluginId}:${id}`, label, safeHandler, shortcut); commands.register(`${pluginId}:${id}`, label, safeHandler, shortcut);
} },
}; };
this.statusBar = { this.statusBar = {
registerIndicator: (id, opts) => statusBar.registerIndicator(`${pluginId}:${id}`, opts) registerIndicator: (id, opts) => statusBar.registerIndicator(`${pluginId}:${id}`, opts),
}; };
this.settings = { this.settings = {
get: (key) => settings.get(`plugins.${pluginId}.${key}`), get: (key) => settings.get(`plugins.${pluginId}.${key}`),
set: (key, value) => settings.set(`plugins.${pluginId}.${key}`, value), set: (key, value) => settings.set(`plugins.${pluginId}.${key}`, value),
onChanged: (key, cb) => settings.onChanged(`plugins.${pluginId}.${key}`, cb) onChanged: (key, cb) => settings.onChanged(`plugins.${pluginId}.${key}`, cb),
}; };
this.editor = { this.editor = {
getContent: () => editor.getContent(), getContent: () => editor.getContent(),
getSelection: () => editor.getSelection(), getSelection: () => editor.getSelection(),
insertAtCursor: (text) => editor.insertAtCursor(text), insertAtCursor: (text) => editor.insertAtCursor(text),
onContentChanged: (cb) => editor.onContentChanged(cb) onContentChanged: (cb) => editor.onContentChanged(cb),
}; };
this.events = { this.events = {
on: (event, handler) => eventBus.on(event, handler), on: (event, handler) => eventBus.on(event, handler),
off: (event, handler) => eventBus.off(event, handler), off: (event, handler) => eventBus.off(event, handler),
emit: (event, payload) => eventBus.emit(event, payload), emit: (event, payload) => eventBus.emit(event, payload),
hasHandler: (event) => eventBus.hasHandler(event) hasHandler: (event) => eventBus.hasHandler(event),
}; };
this.ipc = { this.ipc = {
invoke: (channel, ...args) => ipc.invoke(channel, ...args), invoke: (channel, ...args) => ipc.invoke(channel, ...args),
on: (channel, handler) => ipc.on(channel, handler) on: (channel, handler) => ipc.on(channel, handler),
}; };
this.exports = { this.exports = {
registerPreHook: (handler) => { if (exportHooks) exportHooks.preHooks.push(handler); }, registerPreHook: (handler) => {
registerPostHook: (handler) => { if (exportHooks) exportHooks.postHooks.push(handler); } if (exportHooks) exportHooks.preHooks.push(handler);
},
registerPostHook: (handler) => {
if (exportHooks) exportHooks.postHooks.push(handler);
},
}; };
} }
} }
+5 -2
View File
@@ -35,7 +35,10 @@ class PluginLoader {
const loaded = require(indexPath); const loaded = require(indexPath);
PluginClass = loaded.Plugin || loaded.default || null; PluginClass = loaded.Plugin || loaded.default || null;
} catch (err) { } catch (err) {
console.error(`[PluginLoader] Failed to load index.js for "${manifest.id}":`, err.message); console.error(
`[PluginLoader] Failed to load index.js for "${manifest.id}":`,
err.message
);
continue; continue;
} }
} }
@@ -46,7 +49,7 @@ class PluginLoader {
description: manifest.description, description: manifest.description,
manifest, manifest,
PluginClass, PluginClass,
dir: pluginDir dir: pluginDir,
}); });
this.loadedIds.add(manifest.id); this.loadedIds.add(manifest.id);
} catch (err) { } catch (err) {
+1 -1
View File
@@ -32,7 +32,7 @@ class PluginRegistry {
settings: this.deps.settings, settings: this.deps.settings,
editor: this.deps.editor, editor: this.deps.editor,
ipc: this.deps.ipc, ipc: this.deps.ipc,
exportHooks: this.exportHooks exportHooks: this.exportHooks,
}); });
try { try {
+1 -1
View File
@@ -14,7 +14,7 @@ class SettingsStore {
this.backend.set(key, value); this.backend.set(key, value);
} }
onChanged(key, callback) { onChanged(_key, _callback) {
// Deferred: plugins read settings on init/activate for MVP. // Deferred: plugins read settings on init/activate for MVP.
// Full change notification requires IPC watcher in main process. // Full change notification requires IPC watcher in main process.
} }
+100 -17
View File
@@ -98,12 +98,17 @@ const ALLOWED_SEND_CHANNELS = [
'list-directory', 'list-directory',
'read-file', 'read-file',
'write-file', 'write-file',
'write-buffer',
'read-buffer',
'delete-file', 'delete-file',
'ensure-directory', 'ensure-directory',
'path-exists', 'path-exists',
'is-directory', 'is-directory',
'copy-path', 'copy-path',
'move-path', 'move-path',
'pick-folder',
'pick-file',
'search-in-files',
// Git // Git
'git-status', 'git-status',
@@ -129,12 +134,32 @@ const ALLOWED_SEND_CHANNELS = [
'menu-open', 'menu-open',
'export', 'export',
// App lifecycle
'app:quit',
'app:open-external',
'app:show-save-dialog',
'get-app-version',
// Updater
'updater:check',
'updater:install',
'updater:get-state',
// Crash reporter
'crash:read',
'crash:open-dir',
'crash:delete',
// Monospace font settings
'get-monospace-settings',
'set-monospace-settings',
// Git diff // Git diff
'git-diff', 'git-diff',
// Plugin settings // Plugin settings
'plugin-settings:get', 'plugin-settings:get',
'plugin-settings:set' 'plugin-settings:set',
]; ];
const ALLOWED_RECEIVE_CHANNELS = [ const ALLOWED_RECEIVE_CHANNELS = [
@@ -217,15 +242,25 @@ const ALLOWED_RECEIVE_CHANNELS = [
// Batch converter // Batch converter
'show-batch-converter', 'show-batch-converter',
// Document compare
'show-document-compare',
// v4 menu-triggered events // v4 menu-triggered events
'load-template-menu', 'load-template-menu',
'toggle-sidebar-panel', 'toggle-sidebar-panel',
'toggle-bottom-panel', 'toggle-bottom-panel',
'print-preview',
'print-preview-styled',
'clear-recent-files',
// Updater
'updater:status',
'show-analytics-dialog',
// File dialog / directory listing // File dialog / directory listing
'list-directory', 'list-directory',
'pick-folder', 'pick-folder',
'pick-file' 'pick-file',
]; ];
/** /**
@@ -327,6 +362,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
rendererReady: () => ipcRenderer.send('renderer-ready'), rendererReady: () => ipcRenderer.send('renderer-ready'),
read: (filePath) => ipcRenderer.invoke('read-file', filePath), read: (filePath) => ipcRenderer.invoke('read-file', filePath),
write: (filePath, content) => ipcRenderer.invoke('write-file', { path: filePath, content }), write: (filePath, content) => ipcRenderer.invoke('write-file', { path: filePath, content }),
readBuffer: (filePath) => ipcRenderer.invoke('read-buffer', { path: filePath }),
writeBuffer: (filePath, buffer) => ipcRenderer.invoke('write-buffer', { path: filePath, buffer }),
delete: (filePath) => ipcRenderer.invoke('delete-file', filePath), delete: (filePath) => ipcRenderer.invoke('delete-file', filePath),
ensureDir: (dirPath) => ipcRenderer.invoke('ensure-directory', dirPath), ensureDir: (dirPath) => ipcRenderer.invoke('ensure-directory', dirPath),
exists: (filePath) => ipcRenderer.invoke('path-exists', filePath), exists: (filePath) => ipcRenderer.invoke('path-exists', filePath),
@@ -335,23 +372,25 @@ contextBridge.exposeInMainWorld('electronAPI', {
move: (source, destination) => ipcRenderer.invoke('move-path', { source, destination }), move: (source, destination) => ipcRenderer.invoke('move-path', { source, destination }),
list: (dirPath) => ipcRenderer.invoke('list-directory', dirPath), list: (dirPath) => ipcRenderer.invoke('list-directory', dirPath),
pickFolder: () => ipcRenderer.invoke('pick-folder'), pickFolder: () => ipcRenderer.invoke('pick-folder'),
pickFile: () => ipcRenderer.invoke('pick-file') pickFile: () => ipcRenderer.invoke('pick-file'),
search: (args) => ipcRenderer.invoke('search-in-files', args),
}, },
// Theme Operations // Theme Operations
theme: { theme: {
get: () => ipcRenderer.send('get-theme') get: () => ipcRenderer.send('get-theme'),
}, },
// Print Operations // Print Operations
print: { print: {
doPrint: (options) => ipcRenderer.send('do-print', options) doPrint: (options) => ipcRenderer.send('do-print', options),
show: (payload) => ipcRenderer.send('do-print', payload),
}, },
// Export Operations // Export Operations
export: { export: {
withOptions: (format, options) => ipcRenderer.send('export-with-options', { format, options }), withOptions: (format, options) => ipcRenderer.send('export-with-options', { format, options }),
spreadsheet: (content, format) => ipcRenderer.send('export-spreadsheet', { content, format }) spreadsheet: (content, format) => ipcRenderer.send('export-spreadsheet', { content, format }),
}, },
// Batch Conversion // Batch Conversion
@@ -359,7 +398,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
convert: (inputFolder, outputFolder, format, options) => { convert: (inputFolder, outputFolder, format, options) => {
ipcRenderer.send('batch-convert', { inputFolder, outputFolder, format, options }); ipcRenderer.send('batch-convert', { inputFolder, outputFolder, format, options });
}, },
selectFolder: (type) => ipcRenderer.send('select-folder', type) selectFolder: (type) => ipcRenderer.send('select-folder', type),
}, },
// Universal Converter // Universal Converter
@@ -368,8 +407,14 @@ contextBridge.exposeInMainWorld('electronAPI', {
ipcRenderer.send('universal-convert', { tool, fromFormat, toFormat, filePath }); ipcRenderer.send('universal-convert', { tool, fromFormat, toFormat, filePath });
}, },
convertBatch: (tool, fromFormat, toFormat, inputFolder, outputFolder) => { convertBatch: (tool, fromFormat, toFormat, inputFolder, outputFolder) => {
ipcRenderer.send('universal-convert-batch', { tool, fromFormat, toFormat, inputFolder, outputFolder }); ipcRenderer.send('universal-convert-batch', {
} tool,
fromFormat,
toFormat,
inputFolder,
outputFolder,
});
},
}, },
// Header/Footer Operations // Header/Footer Operations
@@ -377,22 +422,23 @@ contextBridge.exposeInMainWorld('electronAPI', {
getSettings: () => ipcRenderer.send('get-header-footer-settings'), getSettings: () => ipcRenderer.send('get-header-footer-settings'),
saveSettings: (settings) => ipcRenderer.send('save-header-footer-settings', settings), saveSettings: (settings) => ipcRenderer.send('save-header-footer-settings', settings),
browseLogo: (position) => ipcRenderer.send('browse-header-footer-logo', position), browseLogo: (position) => ipcRenderer.send('browse-header-footer-logo', position),
saveLogo: (position, filePath) => ipcRenderer.send('save-header-footer-logo', { position, filePath }), saveLogo: (position, filePath) =>
clearLogo: (position) => ipcRenderer.send('clear-header-footer-logo', position) ipcRenderer.send('save-header-footer-logo', { position, filePath }),
clearLogo: (position) => ipcRenderer.send('clear-header-footer-logo', position),
}, },
// Page Settings // Page Settings
page: { page: {
getSettings: () => ipcRenderer.send('get-page-settings'), getSettings: () => ipcRenderer.send('get-page-settings'),
updateSettings: (settings) => ipcRenderer.send('update-page-settings', settings), updateSettings: (settings) => ipcRenderer.send('update-page-settings', settings),
setCustomStartPage: (pageNumber) => ipcRenderer.send('set-custom-start-page', pageNumber) setCustomStartPage: (pageNumber) => ipcRenderer.send('set-custom-start-page', pageNumber),
}, },
// PDF Operations // PDF Operations
pdf: { pdf: {
processOperation: (data) => ipcRenderer.send('process-pdf-operation', data), processOperation: (data) => ipcRenderer.send('process-pdf-operation', data),
getPageCount: (filePath) => ipcRenderer.send('get-pdf-page-count', filePath), getPageCount: (filePath) => ipcRenderer.send('get-pdf-page-count', filePath),
selectFolder: (inputId) => ipcRenderer.send('select-pdf-folder', inputId) selectFolder: (inputId) => ipcRenderer.send('select-pdf-folder', inputId),
}, },
// Image Converter Operations // Image Converter Operations
@@ -401,7 +447,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
batchConvert: (data) => ipcRenderer.send('image-batch-convert', data), batchConvert: (data) => ipcRenderer.send('image-batch-convert', data),
resize: (data) => ipcRenderer.send('image-resize', data), resize: (data) => ipcRenderer.send('image-resize', data),
compress: (data) => ipcRenderer.send('image-compress', data), compress: (data) => ipcRenderer.send('image-compress', data),
rotate: (data) => ipcRenderer.send('image-rotate', data) rotate: (data) => ipcRenderer.send('image-rotate', data),
}, },
// Audio Converter Operations // Audio Converter Operations
@@ -410,7 +456,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
batchConvert: (data) => ipcRenderer.send('audio-batch-convert', data), batchConvert: (data) => ipcRenderer.send('audio-batch-convert', data),
extract: (data) => ipcRenderer.send('audio-extract', data), extract: (data) => ipcRenderer.send('audio-extract', data),
trim: (data) => ipcRenderer.send('audio-trim', data), trim: (data) => ipcRenderer.send('audio-trim', data),
merge: (data) => ipcRenderer.send('audio-merge', data) merge: (data) => ipcRenderer.send('audio-merge', data),
}, },
// Video Converter Operations // Video Converter Operations
@@ -420,10 +466,47 @@ contextBridge.exposeInMainWorld('electronAPI', {
compress: (data) => ipcRenderer.send('video-compress', data), compress: (data) => ipcRenderer.send('video-compress', data),
trim: (data) => ipcRenderer.send('video-trim', data), trim: (data) => ipcRenderer.send('video-trim', data),
extractFrames: (data) => ipcRenderer.send('video-frames', data), extractFrames: (data) => ipcRenderer.send('video-frames', data),
toGif: (data) => ipcRenderer.send('video-gif', data) toGif: (data) => ipcRenderer.send('video-gif', data),
}, },
getAppVersion: () => ipcRenderer.invoke('get-app-version') getAppVersion: () => ipcRenderer.invoke('get-app-version'),
// Git Operations
git: {
status: (rootPath) => ipcRenderer.invoke('git-status', rootPath),
stage: (args) => ipcRenderer.invoke('git-stage', args),
commit: (args) => ipcRenderer.invoke('git-commit', args),
log: (rootPath) => ipcRenderer.invoke('git-log', rootPath),
diff: (filePath) => ipcRenderer.invoke('git-diff', filePath),
},
app: {
quit: () => ipcRenderer.send('app:quit'),
openExternal: (url) => ipcRenderer.send('app:open-external', url),
showSaveDialog: (args) => ipcRenderer.invoke('app:show-save-dialog', args),
},
updater: {
check: () => ipcRenderer.invoke('updater:check'),
install: () => ipcRenderer.invoke('updater:install'),
getState: () => ipcRenderer.invoke('updater:get-state'),
onStatus: (cb) => {
const subscription = (_event, payload) => cb(payload);
ipcRenderer.on('updater:status', subscription);
return () => ipcRenderer.removeListener('updater:status', subscription);
},
},
crash: {
read: () => ipcRenderer.invoke('crash:read'),
openDir: () => ipcRenderer.send('crash:open-dir'),
delete: (filename) => ipcRenderer.invoke('crash:delete', filename),
},
monospace: {
getSettings: () => ipcRenderer.invoke('get-monospace-settings'),
saveSettings: (partial) => ipcRenderer.invoke('set-monospace-settings', partial),
},
}); });
// Log successful preload initialization // Log successful preload initialization
+76 -1
View File
@@ -1,26 +1,101 @@
import { useState, useEffect } from 'react'; import { useState, useEffect } from 'react';
import { AppShell } from './components/layout/AppShell'; import { AppShell } from './components/layout/AppShell';
import { ModalLayer } from './components/modals/ModalLayer'; import { ModalLayer } from './components/modals/ModalLayer';
import { CommandPalette } from './components/modals/CommandPalette';
import { Toaster } from './components/ui/sonner'; import { Toaster } from './components/ui/sonner';
import { ReplPanel } from './components/tools/ReplPanel'; import { ReplPanel } from './components/tools/ReplPanel';
import { PrintPreview } from './components/tools/PrintPreview'; import { PrintPreview } from './components/tools/PrintPreview';
import { UpdateBanner } from './components/UpdateBanner';
import { FirstRunWizard } from './components/FirstRunWizard';
import { useWelcomeTrigger } from './hooks/use-welcome-trigger'; import { useWelcomeTrigger } from './hooks/use-welcome-trigger';
import { useAutoUpdateCheck } from './hooks/useAutoUpdateCheck';
import { useMonospaceClasses } from './hooks/use-monospace-classes';
import { useSettingsStore } from './stores/settings-store';
import { ipc } from './lib/ipc';
import { toast } from './lib/toast';
function scopeCSS(cssText: string, scopeSelector: string) {
if (!cssText) return '';
return cssText.replace(/([^\r\n,{}]+)(,(?=[^}]*{)|(?=[^{]*{))/g, (match, selector, separator) => {
const trimmed = selector.trim();
if (
!trimmed ||
trimmed.startsWith('@') ||
trimmed.startsWith(':root') ||
trimmed.startsWith('from') ||
trimmed.startsWith('to') ||
/^\d+%$/.test(trimmed)
) {
return match;
}
return scopeSelector + ' ' + trimmed + (separator || '');
});
}
function App() { function App() {
useWelcomeTrigger(); useWelcomeTrigger();
useAutoUpdateCheck();
useMonospaceClasses();
const [printOpen, setPrintOpen] = useState(false); const [printOpen, setPrintOpen] = useState(false);
const customCssPath = useSettingsStore((s) => s.customCssPath);
useEffect(() => {
let active = true;
const styleId = 'custom-preview-style';
async function applyCSS() {
if (!customCssPath) {
const styleTag = document.getElementById(styleId);
if (styleTag) styleTag.remove();
return;
}
const r = await ipc.file.read(customCssPath);
if (!active) return;
if (r.ok && r.data) {
let styleTag = document.getElementById(styleId);
if (!styleTag) {
styleTag = document.createElement('style');
styleTag.id = styleId;
document.head.appendChild(styleTag);
}
styleTag.textContent = scopeCSS(r.data, '.preview-content');
} else {
toast.error('Failed to load custom CSS file');
}
}
void applyCSS();
return () => {
active = false;
};
}, [customCssPath]);
useEffect(() => {
window.electronAPI?.file?.rendererReady?.();
}, []);
useEffect(() => { useEffect(() => {
const handler = () => setPrintOpen(true); const handler = () => setPrintOpen(true);
window.addEventListener('mc:print', handler); window.addEventListener('mc:print', handler);
return () => window.removeEventListener('mc:print', handler); window.addEventListener('mc:print-preview', handler);
window.addEventListener('mc:print-preview-styled', handler);
return () => {
window.removeEventListener('mc:print', handler);
window.removeEventListener('mc:print-preview', handler);
window.removeEventListener('mc:print-preview-styled', handler);
};
}, []); }, []);
return ( return (
<> <>
<AppShell /> <AppShell />
<ModalLayer /> <ModalLayer />
<CommandPalette />
<Toaster /> <Toaster />
<UpdateBanner />
<FirstRunWizard />
<ReplPanel /> <ReplPanel />
{printOpen && <PrintPreview onClose={() => setPrintOpen(false)} />} {printOpen && <PrintPreview onClose={() => setPrintOpen(false)} />}
</> </>
+121
View File
@@ -0,0 +1,121 @@
import { useState } from 'react';
import { useAppStore } from '@/stores/app-store';
import { useSettingsStore } from '@/stores/settings-store';
const TEMPLATES = {
blank: '',
readme: '# Project\n\nDescription.\n\n## Usage\n\n```\nnpm install\n```\n',
meeting:
'# Meeting Notes — YYYY-MM-DD\n\n## Attendees\n\n- \n## Agenda\n\n1. \n\n## Action items\n\n- [ ] \n',
blog: '# Title\n\n*Subtitle*\n\nLorem ipsum.\n\n---\n\n## Section 1\n',
};
export function FirstRunWizard() {
const firstRun = useAppStore((s) => s.firstRun);
const setFirstRun = useAppStore((s) => s.setFirstRun);
const theme = useSettingsStore((s) => s.theme);
const setSetting = useSettingsStore((s) => s.setSetting);
const updateChannel = useSettingsStore((s) => s.updateChannel);
const [step, setStep] = useState(0);
const [template, setTemplate] = useState<keyof typeof TEMPLATES>('blank');
if (!firstRun) return null;
const close = () => setFirstRun(false);
return (
<div
data-testid="first-run-wizard"
role="dialog"
aria-modal="true"
className="fixed inset-0 z-50 bg-black/40 flex items-center justify-center"
>
<div className="bg-white dark:bg-neutral-900 rounded-lg p-6 w-[28rem] shadow-xl">
{step === 0 && (
<div>
<h2 className="text-lg font-semibold mb-2">Pick a theme</h2>
<div className="flex gap-2 mb-4">
{(['light', 'dark', 'system'] as const).map((t) => (
<label key={t} className="flex items-center gap-1">
<input
type="radio"
name="theme"
checked={theme === t}
onChange={() => setSetting('theme', t)}
/>
{t}
</label>
))}
</div>
</div>
)}
{step === 1 && (
<div>
<h2 className="text-lg font-semibold mb-2">Update channel</h2>
<div className="flex flex-col gap-2 mb-4">
<label className="flex items-center gap-2">
<input
type="radio"
name="channel"
checked={updateChannel === 'github'}
onChange={() => setSetting('updateChannel', 'github')}
/>
GitHub Releases (public)
</label>
<label className="flex items-center gap-2">
<input
type="radio"
name="channel"
checked={updateChannel === 'concreteinfo'}
onChange={() => setSetting('updateChannel', 'concreteinfo')}
/>
ConcreteInfo self-hosted
</label>
</div>
</div>
)}
{step === 2 && (
<div>
<h2 className="text-lg font-semibold mb-2">Starter template</h2>
<select
value={template}
onChange={(e) => setTemplate(e.target.value as any)}
className="border rounded px-2 py-1 w-full mb-4"
>
<option value="blank">Blank</option>
<option value="readme">README</option>
<option value="meeting">Meeting notes</option>
<option value="blog">Blog post</option>
</select>
</div>
)}
<div className="flex justify-between items-center mt-4">
<button onClick={close} className="text-sm text-neutral-500">
Skip
</button>
<div className="flex gap-2">
{step > 0 && <button onClick={() => setStep(step - 1)}>Back</button>}
{step < 2 ? (
<button
onClick={() => setStep(step + 1)}
className="px-3 py-1 rounded bg-brand text-white"
>
Next
</button>
) : (
<button
onClick={() => {
useAppStore.getState().newBuffer(TEMPLATES[template]);
close();
}}
className="px-3 py-1 rounded bg-brand text-white"
>
Done
</button>
)}
</div>
</div>
</div>
</div>
);
}
+84
View File
@@ -0,0 +1,84 @@
import { useUpdaterStore } from '@/lib/updater-store';
import { ipc } from '@/lib/ipc';
import { toast } from 'sonner';
export function UpdateBanner() {
const { state, version, percent, install, check } = useUpdaterStore();
if (state === 'idle' || state === 'checking') return null;
if (state === 'error') {
return (
<div
data-testid="update-banner"
role="status"
className="bg-amber-50 border-b border-amber-200 px-4 py-2 text-sm"
>
Couldn't check for updates.{' '}
<button
onClick={async () => {
try {
await check();
} catch (e: any) {
toast.error(e.message);
}
}}
className="underline"
>
Try again
</button>
</div>
);
}
if (state === 'available') {
return (
<div
data-testid="update-banner"
className="bg-blue-50 border-b border-blue-200 px-4 py-2 text-sm"
>
A new version (v{version}) is available.{' '}
<button onClick={() => useUpdaterStore.getState().check()} className="underline">
Download now
</button>
</div>
);
}
if (state === 'downloading') {
return (
<div
data-testid="update-banner"
className="bg-blue-50 border-b border-blue-200 px-4 py-2 text-sm"
>
Downloading update… {Math.round(percent)}%
</div>
);
}
if (state === 'ready') {
return (
<div
data-testid="update-banner"
className="bg-green-50 border-b border-green-200 px-4 py-2 text-sm flex items-center gap-3"
>
<span>v{version} is ready.</span>
<button
onClick={() =>
ipc.app.openExternal(
`https://github.com/amitwh/markdown-converter/releases/tag/v${version}`
)
}
className="underline"
>
View release notes
</button>
<button onClick={install} className="px-3 py-1 rounded bg-brand text-white">
Restart to update
</button>
</div>
);
}
return null;
}
@@ -1,6 +1,12 @@
import { useEffect, useRef } from 'react'; import { useEffect, useRef, useState, useCallback } from 'react';
import { EditorState, Compartment } from '@codemirror/state'; import { EditorState, Compartment } from '@codemirror/state';
import { EditorView, keymap, lineNumbers, highlightActiveLine, drawSelection } from '@codemirror/view'; import {
EditorView,
keymap,
lineNumbers,
highlightActiveLine,
drawSelection,
} from '@codemirror/view';
import { defaultKeymap, history, historyKeymap, indentWithTab } from '@codemirror/commands'; import { defaultKeymap, history, historyKeymap, indentWithTab } from '@codemirror/commands';
import { markdown, markdownLanguage } from '@codemirror/lang-markdown'; import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
import { searchKeymap, highlightSelectionMatches } from '@codemirror/search'; import { searchKeymap, highlightSelectionMatches } from '@codemirror/search';
@@ -10,7 +16,10 @@ import { useTheme } from 'next-themes';
import { lightTheme, lightHighlight } from './themes/light'; import { lightTheme, lightHighlight } from './themes/light';
import { useEditorStore } from '@/stores/editor-store'; import { useEditorStore } from '@/stores/editor-store';
import { useSettingsStore } from '@/stores/settings-store'; import { useSettingsStore } from '@/stores/settings-store';
import { setActiveView, insertSnippet } from '@/lib/editor-commands';
import { Minimap } from './Minimap'; import { Minimap } from './Minimap';
import { toast } from '@/lib/toast';
import { cn } from '@/lib/utils';
interface Props { interface Props {
bufferId: string; bufferId: string;
@@ -19,6 +28,63 @@ interface Props {
onCursorChange?: (line: number, column: number) => void; onCursorChange?: (line: number, column: number) => void;
} }
const IMAGE_TYPES = new Set([
'image/png',
'image/jpeg',
'image/gif',
'image/webp',
'image/svg+xml',
'image/bmp',
'image/avif',
]);
function guessExt(mimeType: string): string {
const map: Record<string, string> = {
'image/png': 'png',
'image/jpeg': 'jpg',
'image/gif': 'gif',
'image/webp': 'webp',
'image/svg+xml': 'svg',
'image/bmp': 'bmp',
'image/avif': 'avif',
};
return map[mimeType] ?? 'png';
}
async function handleImageFile(file: File): Promise<void> {
const reader = new FileReader();
reader.onload = async () => {
const base64 = (reader.result as string).split(',')[1];
if (!base64) return;
const ext = guessExt(file.type);
const result = await window.electronAPI.invoke('save-pasted-image', { base64, ext });
if (result) {
insertSnippet(`![${file.name}](${result.relativePath})`);
toast.success('Image pasted');
}
};
reader.readAsDataURL(file);
}
function createPasteHandler() {
return EditorView.domEventHandlers({
paste(event: ClipboardEvent, _view: EditorView) {
const items = event.clipboardData?.items;
if (!items) return false;
for (let i = 0; i < items.length; i++) {
const item = items[i];
if (IMAGE_TYPES.has(item.type)) {
event.preventDefault();
const file = item.getAsFile();
if (file) handleImageFile(file);
return true;
}
}
return false;
},
});
}
export function CodeMirrorEditor({ bufferId, initialContent, onChange, onCursorChange }: Props) { export function CodeMirrorEditor({ bufferId, initialContent, onChange, onCursorChange }: Props) {
const ref = useRef<HTMLDivElement>(null); const ref = useRef<HTMLDivElement>(null);
const viewRef = useRef<EditorView | null>(null); const viewRef = useRef<EditorView | null>(null);
@@ -27,6 +93,12 @@ export function CodeMirrorEditor({ bufferId, initialContent, onChange, onCursorC
const updateContent = useEditorStore((s) => s.updateContent); const updateContent = useEditorStore((s) => s.updateContent);
const setCursor = useEditorStore((s) => s.setCursor); const setCursor = useEditorStore((s) => s.setCursor);
const minimap = useSettingsStore((s) => s.minimap); const minimap = useSettingsStore((s) => s.minimap);
const editorFontSize = useSettingsStore((s) => s.editorFontSize);
const buffer = useEditorStore((s) => s.buffers.get(bufferId));
const content = buffer?.content ?? initialContent;
const [scrollRatio, setScrollRatio] = useState(0);
const [visibleRatio, setVisibleRatio] = useState(1);
const [isDragOver, setIsDragOver] = useState(false);
useEffect(() => { useEffect(() => {
if (!ref.current) return; if (!ref.current) return;
@@ -40,8 +112,16 @@ export function CodeMirrorEditor({ bufferId, initialContent, onChange, onCursorC
drawSelection(), drawSelection(),
markdown({ base: markdownLanguage, codeLanguages: [] }), markdown({ base: markdownLanguage, codeLanguages: [] }),
autocompletion(), autocompletion(),
keymap.of([...defaultKeymap, ...historyKeymap, ...searchKeymap, ...completionKeymap, indentWithTab]), keymap.of([
themeCompartment.current.of(resolvedTheme === 'dark' ? [oneDark] : [lightTheme, lightHighlight]), ...defaultKeymap,
...historyKeymap,
...searchKeymap,
...completionKeymap,
indentWithTab,
]),
themeCompartment.current.of(
resolvedTheme === 'dark' ? [oneDark] : [lightTheme, lightHighlight]
),
EditorView.lineWrapping, EditorView.lineWrapping,
EditorView.updateListener.of((v) => { EditorView.updateListener.of((v) => {
if (v.docChanged) { if (v.docChanged) {
@@ -58,11 +138,28 @@ export function CodeMirrorEditor({ bufferId, initialContent, onChange, onCursorC
onCursorChange?.(lineNo, col); onCursorChange?.(lineNo, col);
} }
}), }),
EditorView.theme({
'&': { fontSize: `${editorFontSize}px` },
}),
EditorView.domEventHandlers({
scroll(_event, view) {
const el = view.scrollDOM;
const denom = el.scrollHeight - el.clientHeight;
setScrollRatio(denom > 0 ? el.scrollTop / denom : 0);
setVisibleRatio(
el.clientHeight > 0 ? Math.min(1, el.clientHeight / el.scrollHeight) : 1
);
return false;
},
}),
createPasteHandler(),
], ],
}); });
const view = new EditorView({ state, parent: ref.current }); const view = new EditorView({ state, parent: ref.current });
viewRef.current = view; viewRef.current = view;
setActiveView(view);
return () => { return () => {
setActiveView(null);
view.destroy(); view.destroy();
viewRef.current = null; viewRef.current = null;
}; };
@@ -79,10 +176,43 @@ export function CodeMirrorEditor({ bufferId, initialContent, onChange, onCursorC
}); });
}, [resolvedTheme]); }, [resolvedTheme]);
const handleDragOver = useCallback((e: React.DragEvent) => {
if (e.dataTransfer.types.includes('Files')) {
e.preventDefault();
setIsDragOver(true);
}
}, []);
const handleDragLeave = useCallback((e: React.DragEvent) => {
e.preventDefault();
setIsDragOver(false);
}, []);
const handleDrop = useCallback(async (e: React.DragEvent) => {
e.preventDefault();
setIsDragOver(false);
const files = Array.from(e.dataTransfer.files);
const imageFiles = files.filter((f) => IMAGE_TYPES.has(f.type));
for (const file of imageFiles) {
await handleImageFile(file);
}
}, []);
return ( return (
<div className="relative h-full overflow-hidden"> <div className="relative h-full overflow-hidden">
<div ref={ref} className="h-full overflow-hidden" /> <div
{minimap && <Minimap content={initialContent} />} ref={ref}
className={cn(
'h-full overflow-hidden transition-colors duration-150',
isDragOver && 'ring-2 ring-primary bg-primary/5'
)}
onDragOver={handleDragOver}
onDragLeave={handleDragLeave}
onDrop={handleDrop}
/>
{minimap && (
<Minimap content={content} scrollRatio={scrollRatio} visibleRatio={visibleRatio} />
)}
</div> </div>
); );
} }
+35 -8
View File
@@ -1,15 +1,43 @@
import { useEffect } from 'react'; import { useEffect, useRef } from 'react';
import { CodeMirrorEditor } from './CodeMirrorEditor'; import { CodeMirrorEditor } from './CodeMirrorEditor';
import { FindReplaceBar } from './FindReplaceBar';
import { useEditorStore } from '@/stores/editor-store'; import { useEditorStore } from '@/stores/editor-store';
import { usePreviewStore } from '@/stores/preview-store'; import { usePreviewStore } from '@/stores/preview-store';
import { useAppStore } from '@/stores/app-store';
import { toast } from '@/lib/toast';
export function EditorPane() { export function EditorPane() {
const { buffers, activeId } = useEditorStore(); const { buffers, activeId } = useEditorStore();
const buf = activeId ? buffers.get(activeId) : null; const buf = activeId ? buffers.get(activeId) : null;
const setPreviewSource = usePreviewStore((s) => s.setSource); const setPreviewSource = usePreviewStore((s) => s.setSource);
const lastActiveId = useRef<string | null>(null);
useEffect(() => { useEffect(() => {
if (buf) setPreviewSource(buf.content); if (!buf) return;
const isNewFile = lastActiveId.current !== buf.id;
lastActiveId.current = buf.id;
const isLarge = buf.content.length > 1024 * 1024;
if (isLarge) {
if (!usePreviewStore.getState().largeFileMode) {
usePreviewStore.setState({ largeFileMode: true });
useAppStore.setState({ previewVisible: false });
toast.warning(
'Large content detected (>1MB). Large File Mode enabled to maintain peak responsiveness. Live preview auto-render is disabled.'
);
}
// Only render on initial load / tab switch, not on edits
if (isNewFile) {
usePreviewStore.getState().forceRender(buf.content);
}
} else {
if (usePreviewStore.getState().largeFileMode) {
usePreviewStore.setState({ largeFileMode: false });
}
setPreviewSource(buf.content);
}
}, [buf?.id, buf?.content, buf, setPreviewSource]); }, [buf?.id, buf?.content, buf, setPreviewSource]);
if (!buf) { if (!buf) {
@@ -21,12 +49,11 @@ export function EditorPane() {
} }
return ( return (
<div className="h-full"> <div className="flex h-full flex-col">
<CodeMirrorEditor <FindReplaceBar />
key={buf.id} <div className="flex-1 overflow-hidden">
bufferId={buf.id} <CodeMirrorEditor key={buf.id} bufferId={buf.id} initialContent={buf.content} />
initialContent={buf.content} </div>
/>
</div> </div>
); );
} }
@@ -0,0 +1,268 @@
import { useEffect, useRef, useCallback, useState } from 'react';
import {
findNext,
findPrevious,
replaceNext,
replaceAll,
closeSearchPanel,
getSearchQuery,
setSearchQuery,
} from '@codemirror/search';
import type { EditorView } from '@codemirror/view';
import { getActiveView } from '@/lib/editor-commands';
import { useAppStore } from '@/stores/app-store';
import { Input } from '@/components/ui/input';
import { Button } from '@/components/ui/button';
import { cn } from '@/lib/utils';
import { X, ChevronDown, ChevronUp, Replace, ReplaceAll, CaseSensitive, Regex } from 'lucide-react';
export function FindReplaceBar() {
const findBarOpen = useAppStore((s) => s.findBarOpen);
const toggleFindBar = useAppStore((s) => s.toggleFindBar);
const searchRef = useRef<HTMLInputElement>(null);
const replaceRef = useRef<HTMLInputElement>(null);
const [caseSensitive, setCaseSensitive] = useState(false);
const [useRegex, setUseRegex] = useState(false);
const [matchInfo, setMatchInfo] = useState<{ current: number; total: number } | null>(null);
const updateMatchCount = useCallback(() => {
const view = getActiveView();
if (!view) {
setMatchInfo(null);
return;
}
const query = getSearchQuery(view.state);
if (!query || !query.search) {
setMatchInfo(null);
return;
}
try {
const docText = view.state.doc.toString();
const searchStr = query.regexp
? query.search
: query.search.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
const flags = `g${query.caseSensitive ? '' : 'i'}`;
const regex = new RegExp(searchStr, flags);
const matches = docText.match(regex);
if (!matches) {
setMatchInfo({ current: 0, total: 0 });
return;
}
const selectionHead = view.state.selection.main.head;
let currentMatch = 0;
const matchPositions: number[] = [];
let match;
while ((match = regex.exec(docText)) !== null) {
matchPositions.push(match.index);
if (match.index <= selectionHead && selectionHead <= match.index + match[0].length) {
currentMatch = matchPositions.length;
}
if (matchPositions.length > 10000) break;
}
setMatchInfo({ current: currentMatch || 1, total: matchPositions.length });
} catch {
setMatchInfo(null);
}
}, []);
const executeCommand = useCallback(
(fn: (view: EditorView) => boolean | void) => {
const view = getActiveView();
if (!view) return false;
const result = fn(view);
updateMatchCount();
view.focus();
return result;
},
[updateMatchCount]
);
const handleFindNext = useCallback(() => {
executeCommand(findNext);
}, [executeCommand]);
const handleFindPrev = useCallback(() => {
executeCommand(findPrevious);
}, [executeCommand]);
const handleReplace = useCallback(() => {
executeCommand(replaceNext);
}, [executeCommand]);
const handleReplaceAll = useCallback(() => {
executeCommand(replaceAll);
}, [executeCommand]);
const handleClose = useCallback(() => {
const view = getActiveView();
if (view) closeSearchPanel(view);
toggleFindBar();
view?.focus();
}, [toggleFindBar]);
const handleSearchChange = useCallback(
(e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value;
const view = getActiveView();
if (!view) return;
setSearchQuery(view, {
search: value,
caseSensitive,
regexp: useRegex,
});
},
[caseSensitive, useRegex]
);
const handleReplaceChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
const view = getActiveView();
if (!view) return;
const query = getSearchQuery(view.state);
if (query) {
setSearchQuery(view, {
search: query.search,
caseSensitive: query.caseSensitive ?? false,
regexp: query.regexp ?? false,
replace: e.target.value,
});
}
}, []);
useEffect(() => {
if (findBarOpen) {
setTimeout(() => searchRef.current?.focus(), 50);
}
}, [findBarOpen]);
useEffect(() => {
const handler = () => {
if (!useAppStore.getState().findBarOpen) {
useAppStore.getState().toggleFindBar();
}
};
window.addEventListener('mc:find-toggle', handler);
return () => window.removeEventListener('mc:find-toggle', handler);
}, []);
if (!findBarOpen) return null;
return (
<div className="flex items-center gap-1.5 border-b border-border bg-background px-2 py-1">
<Input
ref={searchRef}
placeholder="Find..."
className="h-7 w-48 text-xs"
onChange={handleSearchChange}
onKeyDown={(e) => {
if (e.key === 'Enter') {
e.shiftKey ? handleFindPrev() : handleFindNext();
}
if (e.key === 'Escape') handleClose();
if (e.key === 'Tab' && !e.shiftKey) {
e.preventDefault();
replaceRef.current?.focus();
}
}}
data-testid="find-input"
/>
<button
type="button"
className={cn(
'rounded p-0.5 hover:bg-accent',
caseSensitive && 'bg-accent text-accent-foreground'
)}
onClick={() => {
setCaseSensitive((v) => {
const next = !v;
const view = getActiveView();
if (view) {
const query = getSearchQuery(view.state);
if (query) {
setSearchQuery(view, {
search: query.search,
caseSensitive: next,
regexp: useRegex,
replace: query.replace,
});
}
}
return next;
});
}}
aria-label="Case sensitive"
data-testid="find-case-sensitive"
>
<CaseSensitive className="h-3.5 w-3.5" />
</button>
<button
type="button"
className={cn(
'rounded p-0.5 hover:bg-accent',
useRegex && 'bg-accent text-accent-foreground'
)}
onClick={() => {
setUseRegex((v) => {
const next = !v;
const view = getActiveView();
if (view) {
const query = getSearchQuery(view.state);
if (query) {
setSearchQuery(view, {
search: query.search,
caseSensitive,
regexp: next,
replace: query.replace,
});
}
}
return next;
});
}}
aria-label="Use regex"
data-testid="find-regex"
>
<Regex className="h-3.5 w-3.5" />
</button>
{matchInfo && matchInfo.total > 0 && (
<span className="min-w-[4rem] text-center text-[10px] text-muted-foreground">
{matchInfo.current}/{matchInfo.total}
</span>
)}
<Input
ref={replaceRef}
placeholder="Replace..."
className="h-7 w-48 text-xs"
onChange={handleReplaceChange}
onKeyDown={(e) => {
if (e.key === 'Enter') handleReplace();
if (e.key === 'Escape') handleClose();
if (e.key === 'Tab' && e.shiftKey) {
e.preventDefault();
searchRef.current?.focus();
}
}}
data-testid="replace-input"
/>
<Button size="sm" variant="ghost" onClick={handleFindPrev} aria-label="Find previous">
<ChevronUp className="h-3.5 w-3.5" />
</Button>
<Button size="sm" variant="ghost" onClick={handleFindNext} aria-label="Find next">
<ChevronDown className="h-3.5 w-3.5" />
</Button>
<Button size="sm" variant="ghost" onClick={handleReplace} aria-label="Replace">
<Replace className="h-3.5 w-3.5" />
</Button>
<Button size="sm" variant="ghost" onClick={handleReplaceAll} aria-label="Replace all">
<ReplaceAll className="h-3.5 w-3.5" />
</Button>
<Button size="sm" variant="ghost" onClick={handleClose} aria-label="Close">
<X className="h-3.5 w-3.5" />
</Button>
</div>
);
}
+10 -3
View File
@@ -10,7 +10,10 @@ import { useAppStore } from '@/stores/app-store';
import { ResizablePanelGroup, ResizablePanel, ResizableHandle } from '@/components/ui/resizable'; import { ResizablePanelGroup, ResizablePanel, ResizableHandle } from '@/components/ui/resizable';
import { useFileShortcuts } from '@/hooks/use-file-shortcuts'; import { useFileShortcuts } from '@/hooks/use-file-shortcuts';
import { useRestoreLastFolder } from '@/hooks/use-restore-last-folder'; import { useRestoreLastFolder } from '@/hooks/use-restore-last-folder';
import { useRegisterMenuCommands, useBridgeNativeMenu } from '@/lib/commands/register-menu-commands'; import {
useRegisterMenuCommands,
useBridgeNativeMenu,
} from '@/lib/commands/register-menu-commands';
import { useZenMode } from '@/hooks/use-zen-mode'; import { useZenMode } from '@/hooks/use-zen-mode';
export function AppShell() { export function AppShell() {
@@ -27,7 +30,9 @@ export function AppShell() {
<main className="h-screen w-screen overflow-hidden bg-background"> <main className="h-screen w-screen overflow-hidden bg-background">
<ResizablePanelGroup <ResizablePanelGroup
direction="horizontal" direction="horizontal"
onLayout={(sizes) => setPaneSizes({ sidebar: 0, editor: sizes[0], preview: sizes[1] })} onLayoutChange={(sizes) =>
setPaneSizes({ sidebar: 0, editor: sizes[0], preview: sizes[1] })
}
> >
<ResizablePanel defaultSize={previewVisible ? 50 : 100} minSize={20}> <ResizablePanel defaultSize={previewVisible ? 50 : 100} minSize={20}>
<section className="h-full bg-background"> <section className="h-full bg-background">
@@ -58,7 +63,9 @@ export function AppShell() {
<main className="flex-1 overflow-hidden"> <main className="flex-1 overflow-hidden">
<ResizablePanelGroup <ResizablePanelGroup
direction="horizontal" direction="horizontal"
onLayout={(sizes) => setPaneSizes({ sidebar: sizes[0], editor: sizes[1], preview: sizes[2] })} onLayoutChange={(sizes) =>
setPaneSizes({ sidebar: sizes[0], editor: sizes[1], preview: sizes[2] })
}
> >
{sidebarVisible && ( {sidebarVisible && (
<> <>
+12 -13
View File
@@ -1,22 +1,15 @@
import { useFileStore } from '@/stores/file-store'; import { useFileStore } from '@/stores/file-store';
import { useEditorStore } from '@/stores/editor-store'; import { useEditorStore } from '@/stores/editor-store';
import { useSettingsStore } from '@/stores/settings-store'; import { useSettingsStore } from '@/stores/settings-store';
import { useCommandStore } from '@/stores/command-store';
function extractHeadings(content: string): { level: number; text: string }[] { import { extractHeadings } from '@/lib/headings';
const lines = content.split('\n');
const headings: { level: number; text: string }[] = [];
for (const line of lines) {
const m = line.match(/^(#{1,6})\s+(.+)$/);
if (m) headings.push({ level: m[1].length, text: m[2].trim() });
}
return headings;
}
export function Breadcrumb() { export function Breadcrumb() {
const activeTabId = useFileStore((s) => s.activeTabId); const activeTabId = useFileStore((s) => s.activeTabId);
const openTabs = useFileStore((s) => s.openTabs); const openTabs = useFileStore((s) => s.openTabs);
const buffer = useEditorStore((s) => (activeTabId ? s.buffers.get(activeTabId) : undefined)); const buffer = useEditorStore((s) => (activeTabId ? s.buffers.get(activeTabId) : undefined));
const showSymbols = useSettingsStore((s) => s.breadcrumbSymbols); const showSymbols = useSettingsStore((s) => s.breadcrumbSymbols);
const dispatch = useCommandStore((s) => s.dispatch);
const tab = activeTabId ? openTabs.find((t) => t.id === activeTabId) : null; const tab = activeTabId ? openTabs.find((t) => t.id === activeTabId) : null;
const headings = showSymbols && buffer ? extractHeadings(buffer.content).slice(0, 3) : []; const headings = showSymbols && buffer ? extractHeadings(buffer.content).slice(0, 3) : [];
@@ -26,12 +19,18 @@ export function Breadcrumb() {
aria-label="File path" aria-label="File path"
className="flex h-7 items-center gap-1 border-b border-border bg-card/10 px-3 text-xs text-muted-foreground" className="flex h-7 items-center gap-1 border-b border-border bg-card/10 px-3 text-xs text-muted-foreground"
> >
<span>{tab ? tab.title : 'No file selected'}</span> <span className="truncate">{tab ? tab.title : 'No file selected'}</span>
{headings.map((h, i) => ( {headings.map((h, i) => (
<span key={i} className="flex items-center gap-1"> <button
key={i}
onClick={() => dispatch('editor.gotoHeading', h.line)}
className="flex items-center gap-1 hover:text-foreground"
>
<span aria-hidden="true"></span> <span aria-hidden="true"></span>
<span className="truncate">{'#'.repeat(h.level)} {h.text}</span> <span className="truncate">
{'#'.repeat(h.level)} {h.text}
</span> </span>
</button>
))} ))}
</nav> </nav>
); );
+3 -1
View File
@@ -17,7 +17,9 @@ export function StatusBar() {
<span>UTF-8</span> <span>UTF-8</span>
</div> </div>
<div className="flex items-center gap-4"> <div className="flex items-center gap-4">
<span>Ln {cursor.line}, Col {cursor.column}</span> <span>
Ln {cursor.line}, Col {cursor.column}
</span>
<span>Markdown</span> <span>Markdown</span>
</div> </div>
</footer> </footer>
+1 -5
View File
@@ -7,11 +7,7 @@ import {
closestCenter, closestCenter,
type DragEndEvent, type DragEndEvent,
} from '@dnd-kit/core'; } from '@dnd-kit/core';
import { import { SortableContext, horizontalListSortingStrategy, useSortable } from '@dnd-kit/sortable';
SortableContext,
horizontalListSortingStrategy,
useSortable,
} from '@dnd-kit/sortable';
import { CSS } from '@dnd-kit/utilities'; import { CSS } from '@dnd-kit/utilities';
import { useFileStore, type OpenTab } from '@/stores/file-store'; import { useFileStore, type OpenTab } from '@/stores/file-store';
import { cn } from '@/lib/utils'; import { cn } from '@/lib/utils';
+67 -7
View File
@@ -1,4 +1,16 @@
import { Bold, Italic, List, ListOrdered, Code, Link as LinkIcon, PanelLeft, PanelRight, Save, FolderOpen, FileText } from 'lucide-react'; import {
Bold,
Italic,
List,
ListOrdered,
Code,
Link as LinkIcon,
PanelLeft,
PanelRight,
Save,
FolderOpen,
FileText,
} from 'lucide-react';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { useCommandStore } from '@/stores/command-store'; import { useCommandStore } from '@/stores/command-store';
import { useAppStore } from '@/stores/app-store'; import { useAppStore } from '@/stores/app-store';
@@ -66,12 +78,60 @@ export function Toolbar() {
<div className="mx-1 h-5 w-px bg-border" aria-hidden="true" /> <div className="mx-1 h-5 w-px bg-border" aria-hidden="true" />
<Button variant="ghost" size="icon" aria-label="Bold" disabled><Bold className="h-4 w-4" /></Button> <Button
<Button variant="ghost" size="icon" aria-label="Italic" disabled><Italic className="h-4 w-4" /></Button> variant="ghost"
<Button variant="ghost" size="icon" aria-label="Unordered list" disabled><List className="h-4 w-4" /></Button> size="icon"
<Button variant="ghost" size="icon" aria-label="Ordered list" disabled><ListOrdered className="h-4 w-4" /></Button> aria-label="Bold"
<Button variant="ghost" size="icon" aria-label="Code" disabled><Code className="h-4 w-4" /></Button> data-testid="toolbar-bold"
<Button variant="ghost" size="icon" aria-label="Link" disabled><LinkIcon className="h-4 w-4" /></Button> onClick={() => dispatch('editor.bold')}
>
<Bold className="h-4 w-4" />
</Button>
<Button
variant="ghost"
size="icon"
aria-label="Italic"
data-testid="toolbar-italic"
onClick={() => dispatch('editor.italic')}
>
<Italic className="h-4 w-4" />
</Button>
<Button
variant="ghost"
size="icon"
aria-label="Unordered list"
data-testid="toolbar-list-unordered"
onClick={() => dispatch('editor.list.unordered')}
>
<List className="h-4 w-4" />
</Button>
<Button
variant="ghost"
size="icon"
aria-label="Ordered list"
data-testid="toolbar-list-ordered"
onClick={() => dispatch('editor.list.ordered')}
>
<ListOrdered className="h-4 w-4" />
</Button>
<Button
variant="ghost"
size="icon"
aria-label="Inline code"
data-testid="toolbar-code"
onClick={() => dispatch('editor.code')}
>
<Code className="h-4 w-4" />
</Button>
<Button
variant="ghost"
size="icon"
aria-label="Insert link"
data-testid="toolbar-link"
onClick={() => dispatch('editor.link')}
>
<LinkIcon className="h-4 w-4" />
</Button>
</div> </div>
); );
} }
+10 -3
View File
@@ -1,5 +1,12 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'; import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { ipc } from '@/lib/ipc'; import { ipc } from '@/lib/ipc';
import { useAppStore } from '@/stores/app-store'; import { useAppStore } from '@/stores/app-store';
@@ -17,10 +24,10 @@ export function AboutDialog() {
return ( return (
<Dialog open={isOpen} onOpenChange={(o) => !o && closeModal()}> <Dialog open={isOpen} onOpenChange={(o) => !o && closeModal()}>
<DialogContent aria-describedby="about-desc"> <DialogContent>
<DialogHeader> <DialogHeader>
<DialogTitle>About MarkdownConverter</DialogTitle> <DialogTitle>About MarkdownConverter</DialogTitle>
<DialogDescription id="about-desc"> <DialogDescription>
Professional Markdown editor and universal file converter. Professional Markdown editor and universal file converter.
</DialogDescription> </DialogDescription>
</DialogHeader> </DialogHeader>
@@ -18,7 +18,10 @@ export function AboutSettings() {
<a <a
href="https://github.com/amitwh/markdown-converter" href="https://github.com/amitwh/markdown-converter"
className="text-brand hover:underline" className="text-brand hover:underline"
onClick={(e) => { e.preventDefault(); ipc.app.openExternal('https://github.com/amitwh/markdown-converter'); }} onClick={(e) => {
e.preventDefault();
ipc.app.openExternal('https://github.com/amitwh/markdown-converter');
}}
> >
GitHub repository GitHub repository
</a> </a>
@@ -27,7 +30,10 @@ export function AboutSettings() {
<a <a
href="https://concreteinfo.co.in" href="https://concreteinfo.co.in"
className="text-brand hover:underline" className="text-brand hover:underline"
onClick={(e) => { e.preventDefault(); ipc.app.openExternal('https://concreteinfo.co.in'); }} onClick={(e) => {
e.preventDefault();
ipc.app.openExternal('https://concreteinfo.co.in');
}}
> >
ConcreteInfo ConcreteInfo
</a> </a>
@@ -1,8 +1,21 @@
import { useState, useEffect } from 'react'; import { useState, useEffect } from 'react';
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'; import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { Label } from '@/components/ui/label'; import { Label } from '@/components/ui/label';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { Textarea } from '@/components/ui/textarea'; import { Textarea } from '@/components/ui/textarea';
import { useAppStore } from '@/stores/app-store'; import { useAppStore } from '@/stores/app-store';
import { toast } from '@/lib/toast'; import { toast } from '@/lib/toast';
@@ -17,9 +30,15 @@ export function AsciiGeneratorDialog() {
useEffect(() => { useEffect(() => {
let cancelled = false; let cancelled = false;
figletText(text || ' ', font) figletText(text || ' ', font)
.then((result) => { if (!cancelled) setOutput(result); }) .then((result) => {
.catch(() => { if (!cancelled) setOutput('(render error)'); }); if (!cancelled) setOutput(result);
return () => { cancelled = true; }; })
.catch(() => {
if (!cancelled) setOutput('(render error)');
});
return () => {
cancelled = true;
};
}, [text, font]); }, [text, font]);
const handleCopy = async () => { const handleCopy = async () => {
@@ -33,10 +52,10 @@ export function AsciiGeneratorDialog() {
return ( return (
<Dialog open onOpenChange={(o) => !o && closeModal()}> <Dialog open onOpenChange={(o) => !o && closeModal()}>
<DialogContent aria-describedby="ascii-desc" className="max-w-2xl"> <DialogContent className="max-w-2xl">
<DialogHeader> <DialogHeader>
<DialogTitle>ASCII generator</DialogTitle> <DialogTitle>ASCII generator</DialogTitle>
<DialogDescription id="ascii-desc">Type text, pick a font, see ASCII art</DialogDescription> <DialogDescription>Type text, pick a font, see ASCII art</DialogDescription>
</DialogHeader> </DialogHeader>
<div className="space-y-3"> <div className="space-y-3">
<div> <div>
@@ -52,23 +71,32 @@ export function AsciiGeneratorDialog() {
<div> <div>
<Label htmlFor="ascii-font">Font</Label> <Label htmlFor="ascii-font">Font</Label>
<Select value={font} onValueChange={(v) => setFont(v as FigletFont)}> <Select value={font} onValueChange={(v) => setFont(v as FigletFont)}>
<SelectTrigger id="ascii-font" aria-label="Font"><SelectValue /></SelectTrigger> <SelectTrigger id="ascii-font" aria-label="Font">
<SelectValue />
</SelectTrigger>
<SelectContent> <SelectContent>
{FIGLET_FONTS.map((f) => ( {FIGLET_FONTS.map((f) => (
<SelectItem key={f} value={f}>{f}</SelectItem> <SelectItem key={f} value={f}>
{f}
</SelectItem>
))} ))}
</SelectContent> </SelectContent>
</Select> </Select>
</div> </div>
<div> <div>
<Label>Output</Label> <Label>Output</Label>
<pre className="overflow-auto rounded border border-border bg-card/30 p-3 text-xs" data-testid="ascii-output"> <pre
className="overflow-auto rounded border border-border bg-card/30 p-3 text-xs"
data-testid="ascii-output"
>
{output} {output}
</pre> </pre>
</div> </div>
</div> </div>
<DialogFooter> <DialogFooter>
<Button variant="ghost" onClick={closeModal}>Close</Button> <Button variant="ghost" onClick={closeModal}>
Close
</Button>
<Button onClick={handleCopy}>Copy</Button> <Button onClick={handleCopy}>Copy</Button>
</DialogFooter> </DialogFooter>
</DialogContent> </DialogContent>
@@ -0,0 +1,294 @@
import { useState, useEffect, useCallback } from 'react';
import {
Dialog,
DialogContent,
DialogDescription,
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { Input } from '@/components/ui/input';
import { Button } from '@/components/ui/button';
import { Switch } from '@/components/ui/switch';
import { Label } from '@/components/ui/label';
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
import { useAppStore } from '@/stores/app-store';
import { ExportDialogFooter } from './ExportDialogFooter';
import { toast } from '@/lib/toast';
type ToolKey = 'imagemagick' | 'ffmpeg';
interface FormatOption {
value: string;
label: string;
}
const converterFormats: Record<ToolKey, { input: FormatOption[]; output: FormatOption[] }> = {
imagemagick: {
input: [
{ value: 'png', label: 'PNG' },
{ value: 'jpg', label: 'JPEG' },
{ value: 'webp', label: 'WebP' },
{ value: 'gif', label: 'GIF' },
{ value: 'bmp', label: 'BMP' },
{ value: 'tiff', label: 'TIFF' },
{ value: 'svg', label: 'SVG' },
{ value: 'ico', label: 'ICO' },
],
output: [
{ value: 'png', label: 'PNG' },
{ value: 'jpg', label: 'JPEG' },
{ value: 'webp', label: 'WebP' },
{ value: 'gif', label: 'GIF' },
{ value: 'pdf', label: 'PDF' },
{ value: 'bmp', label: 'BMP' },
{ value: 'ico', label: 'ICO' },
],
},
ffmpeg: {
input: [
{ value: 'mp4', label: 'MP4' },
{ value: 'mp3', label: 'MP3' },
{ value: 'wav', label: 'WAV' },
{ value: 'avi', label: 'AVI' },
{ value: 'mkv', label: 'MKV' },
{ value: 'flac', label: 'FLAC' },
{ value: 'ogg', label: 'OGG' },
{ value: 'mov', label: 'MOV' },
],
output: [
{ value: 'mp4', label: 'MP4' },
{ value: 'mp3', label: 'MP3' },
{ value: 'wav', label: 'WAV' },
{ value: 'avi', label: 'AVI' },
{ value: 'mkv', label: 'MKV' },
{ value: 'flac', label: 'FLAC' },
{ value: 'ogg', label: 'OGG' },
{ value: 'gif', label: 'GIF' },
{ value: 'webm', label: 'WebM' },
],
},
};
const toolLabels: Record<ToolKey, string> = {
imagemagick: 'ImageMagick',
ffmpeg: 'FFmpeg',
};
export function BatchMediaConverterDialog() {
const closeModal = useAppStore((s) => s.closeModal);
const [tool, setTool] = useState<ToolKey>('imagemagick');
const [fromFormat, setFromFormat] = useState('');
const [toFormat, setToFormat] = useState('');
const [inputFolder, setInputFolder] = useState('');
const [outputFolder, setOutputFolder] = useState('');
const [includeSubfolders, setIncludeSubfolders] = useState(false);
const [converting, setConverting] = useState(false);
const [progress, setProgress] = useState(0);
const [error, setError] = useState<string | null>(null);
const inputFormats = converterFormats[tool].input;
const outputFormats = converterFormats[tool].output;
useEffect(() => {
setFromFormat('');
setToFormat('');
}, [tool]);
const handleBrowseInputFolder = useCallback(async () => {
const result = await window.electronAPI?.file?.pickFolder?.();
if (typeof result === 'string') {
setInputFolder(result);
}
}, []);
const handleBrowseOutputFolder = useCallback(async () => {
const result = await window.electronAPI?.file?.pickFolder?.();
if (typeof result === 'string') {
setOutputFolder(result);
}
}, []);
useEffect(() => {
if (typeof window === 'undefined') return;
const handlers: Array<() => void> = [];
const batchProgressHandler = (_event: unknown, data: { current?: number; total?: number }) => {
if (typeof data?.current === 'number' && typeof data?.total === 'number') {
setProgress(Math.round((data.current / data.total) * 100));
}
};
const completeHandler = (_event: unknown, data: { outputPath?: string; error?: string }) => {
setConverting(false);
setProgress(100);
if (data?.error) {
setError(data.error);
toast.error(`Batch conversion failed: ${data.error}`);
} else {
toast.success('Batch conversion complete');
closeModal();
}
};
const unsubBatch =
window.electronAPI?.on?.('batch-progress', batchProgressHandler) ?? (() => {});
const unsubComplete =
window.electronAPI?.on?.('conversion-complete', completeHandler) ?? (() => {});
handlers.push(unsubBatch, unsubComplete);
return () => handlers.forEach((h) => h());
}, [closeModal]);
const handleConvert = async () => {
if (!fromFormat || !toFormat) {
setError('Select both source and target formats');
return;
}
if (!inputFolder || !outputFolder) {
setError('Select both input and output folders');
return;
}
setConverting(true);
setProgress(0);
setError(null);
try {
await window.electronAPI?.converter?.convertBatch?.({
tool,
fromFormat,
toFormat,
inputFolder,
outputFolder,
includeSubfolders,
});
} catch (err) {
const msg = err instanceof Error ? err.message : String(err);
setError(msg);
toast.error(`Batch conversion failed: ${msg}`);
setConverting(false);
}
};
return (
<Dialog open onOpenChange={(o) => !o && closeModal()}>
<DialogContent className="max-w-lg">
<DialogHeader>
<DialogTitle>Batch Media Converter</DialogTitle>
<DialogDescription>
Convert multiple media files between formats using ImageMagick or FFmpeg
</DialogDescription>
</DialogHeader>
<div className="space-y-3 text-sm">
<Tabs value={tool} onValueChange={(v) => setTool(v as ToolKey)}>
<TabsList>
<TabsTrigger value="imagemagick">ImageMagick</TabsTrigger>
<TabsTrigger value="ffmpeg">FFmpeg</TabsTrigger>
</TabsList>
<TabsContent value={tool} className="mt-3 space-y-3">
<div className="grid grid-cols-2 gap-3">
<div>
<Label htmlFor="batch-from">From</Label>
<Select value={fromFormat} onValueChange={setFromFormat}>
<SelectTrigger id="batch-from" aria-label="Source format">
<SelectValue placeholder="Source format" />
</SelectTrigger>
<SelectContent>
{inputFormats.map((f) => (
<SelectItem key={f.value} value={f.value}>
{f.label}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
<div>
<Label htmlFor="batch-to">To</Label>
<Select value={toFormat} onValueChange={setToFormat}>
<SelectTrigger id="batch-to" aria-label="Target format">
<SelectValue placeholder="Target format" />
</SelectTrigger>
<SelectContent>
{outputFormats.map((f) => (
<SelectItem key={f.value} value={f.value}>
{f.label}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
</div>
<div className="flex items-center gap-2">
<Input
value={inputFolder}
onChange={(e) => setInputFolder(e.target.value)}
placeholder="Input folder"
className="flex-1"
aria-label="Input folder"
/>
<Button variant="outline" onClick={handleBrowseInputFolder}>
Browse
</Button>
</div>
<div className="flex items-center gap-2">
<Input
value={outputFolder}
onChange={(e) => setOutputFolder(e.target.value)}
placeholder="Output folder"
className="flex-1"
aria-label="Output folder"
/>
<Button variant="outline" onClick={handleBrowseOutputFolder}>
Browse
</Button>
</div>
<div className="flex items-center gap-3">
<Switch
checked={includeSubfolders}
onCheckedChange={setIncludeSubfolders}
id="batch-subfolders"
/>
<Label htmlFor="batch-subfolders">Include subdirectories</Label>
</div>
</TabsContent>
</Tabs>
{converting && (
<div className="space-y-1">
<div className="h-2 w-full overflow-hidden rounded-full bg-secondary">
<div
className="h-full rounded-full bg-primary transition-all duration-300"
style={{ width: `${Math.max(2, progress)}%` }}
/>
</div>
<p className="text-xs text-muted-foreground text-right">{progress}%</p>
</div>
)}
{error && (
<div
role="alert"
className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive"
>
{error}
</div>
)}
</div>
<ExportDialogFooter
onCancel={closeModal}
onSubmit={handleConvert}
submitting={converting}
submitLabel="Convert"
/>
</DialogContent>
</Dialog>
);
}
@@ -0,0 +1,157 @@
import { useState, useEffect, useRef, useMemo, useCallback } from 'react';
import { useCommandStore } from '@/stores/command-store';
import { cn } from '@/lib/utils';
interface CommandItem {
id: string;
label: string;
shortcut: string | null;
}
const MAX_RESULTS = 8;
export function CommandPalette() {
const [open, setOpen] = useState(false);
const [query, setQuery] = useState('');
const [selectedIndex, setSelectedIndex] = useState(0);
const inputRef = useRef<HTMLInputElement>(null);
const listRef = useRef<HTMLDivElement>(null);
const commands = useMemo<CommandItem[]>(() => {
const handlers = useCommandStore.getState().handlers;
return Object.keys(handlers).map((id) => ({
id,
label: id
.split('.')
.map((part) => part.charAt(0).toUpperCase() + part.slice(1))
.join(' → '),
shortcut: null,
}));
}, []);
const filtered = useMemo(() => {
if (!query.trim()) return commands.slice(0, MAX_RESULTS);
const lower = query.toLowerCase();
const scored = commands
.map((cmd) => {
const labelLower = cmd.label.toLowerCase();
const idLower = cmd.id.toLowerCase();
const labelIdx = labelLower.indexOf(lower);
const idIdx = idLower.indexOf(lower);
let score = 100;
if (labelIdx === 0) score = 10;
else if (labelIdx >= 0) score = 20;
else if (idIdx === 0) score = 15;
else if (idIdx >= 0) score = 25;
else score = 100;
return { cmd, score };
})
.filter((item) => item.score < 100)
.sort((a, b) => a.score - b.score)
.map((item) => item.cmd);
return scored.slice(0, MAX_RESULTS);
}, [commands, query]);
useEffect(() => {
if (open) {
setSelectedIndex(0);
setQuery('');
requestAnimationFrame(() => inputRef.current?.focus());
}
}, [open]);
const execute = useCallback((id: string) => {
useCommandStore.getState().dispatch(id);
setOpen(false);
}, []);
const handleKeyDown = useCallback(
(e: React.KeyboardEvent) => {
if (e.key === 'ArrowDown') {
e.preventDefault();
setSelectedIndex((i) => Math.min(i + 1, filtered.length - 1));
} else if (e.key === 'ArrowUp') {
e.preventDefault();
setSelectedIndex((i) => Math.max(i - 1, 0));
} else if (e.key === 'Enter') {
e.preventDefault();
const cmd = filtered[selectedIndex];
if (cmd) execute(cmd.id);
} else if (e.key === 'Escape') {
e.preventDefault();
setOpen(false);
}
},
[filtered, selectedIndex, execute]
);
useEffect(() => {
const handle = (e: KeyboardEvent) => {
if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.key.toLowerCase() === 'p') {
e.preventDefault();
setOpen((o) => !o);
}
};
window.addEventListener('keydown', handle);
return () => window.removeEventListener('keydown', handle);
}, []);
useEffect(() => {
const el = listRef.current?.children[selectedIndex] as HTMLElement | undefined;
el?.scrollIntoView({ block: 'nearest' });
}, [selectedIndex]);
if (!open) return null;
return (
<div className="fixed inset-0 z-[100] flex items-start justify-center pt-[15vh]">
<div className="fixed inset-0 bg-black/50 backdrop-blur-sm" onClick={() => setOpen(false)} />
<div className="relative z-10 w-full max-w-lg rounded-lg border bg-background shadow-2xl">
<div className="border-b px-3">
<input
ref={inputRef}
value={query}
onChange={(e) => setQuery(e.target.value)}
onKeyDown={handleKeyDown}
placeholder="Type a command..."
className="h-12 w-full bg-transparent text-sm outline-none placeholder:text-muted-foreground"
aria-label="Search commands"
role="combobox"
aria-expanded="true"
aria-activedescendant={
filtered[selectedIndex] ? `cmd-${filtered[selectedIndex].id}` : undefined
}
/>
</div>
<div ref={listRef} className="max-h-64 overflow-y-auto p-1" role="listbox">
{filtered.length === 0 && (
<div className="px-3 py-6 text-center text-sm text-muted-foreground">
No matching commands
</div>
)}
{filtered.map((cmd, idx) => (
<button
key={cmd.id}
id={`cmd-${cmd.id}`}
role="option"
aria-selected={idx === selectedIndex}
className={cn(
'flex w-full items-center justify-between rounded-md px-3 py-2 text-sm',
idx === selectedIndex ? 'bg-accent text-accent-foreground' : 'hover:bg-accent/50'
)}
onClick={() => execute(cmd.id)}
onMouseEnter={() => setSelectedIndex(idx)}
>
<span>{cmd.label}</span>
{cmd.shortcut && (
<kbd className="ml-4 rounded bg-muted px-1.5 py-0.5 text-[10px] font-mono text-muted-foreground">
{cmd.shortcut}
</kbd>
)}
</button>
))}
</div>
</div>
</div>
);
}
@@ -1,10 +1,25 @@
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'; import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { useAppStore, type ConfirmProps } from '@/stores/app-store'; import { useAppStore, type ConfirmProps } from '@/stores/app-store';
export function ConfirmDialog(props: ConfirmProps) { export function ConfirmDialog(props: ConfirmProps) {
const closeModal = useAppStore((s) => s.closeModal); const closeModal = useAppStore((s) => s.closeModal);
const { title, body, confirmLabel = 'Confirm', cancelLabel = 'Cancel', destructive, onConfirm, onCancel } = props; const {
title,
body,
confirmLabel = 'Confirm',
cancelLabel = 'Cancel',
destructive,
onConfirm,
onCancel,
} = props;
const handleConfirm = async () => { const handleConfirm = async () => {
await onConfirm(); await onConfirm();
@@ -17,10 +32,10 @@ export function ConfirmDialog(props: ConfirmProps) {
return ( return (
<Dialog open onOpenChange={(o) => !o && handleCancel()}> <Dialog open onOpenChange={(o) => !o && handleCancel()}>
<DialogContent aria-describedby="confirm-body"> <DialogContent>
<DialogHeader> <DialogHeader>
<DialogTitle>{title}</DialogTitle> <DialogTitle>{title}</DialogTitle>
<DialogDescription id="confirm-body">{body}</DialogDescription> <DialogDescription>{body}</DialogDescription>
</DialogHeader> </DialogHeader>
<DialogFooter> <DialogFooter>
<Button variant="ghost" onClick={handleCancel}> <Button variant="ghost" onClick={handleCancel}>
@@ -0,0 +1,77 @@
import { useEffect, useState } from 'react';
import { ipc } from '@/lib/ipc';
interface Dump {
filename: string;
kind: string;
message?: string;
timestamp: string;
}
export function CrashReportModal({ onClose }: { onClose: () => void }) {
const [dumps, setDumps] = useState<Dump[]>([]);
const refresh = async () => {
const result = await ipc.crash.read();
if (!result.ok) {
setDumps([]);
return;
}
setDumps(Array.isArray(result.data) ? (result.data as Dump[]) : []);
};
useEffect(() => {
refresh();
}, []);
return (
<div
role="dialog"
aria-modal="true"
data-testid="crash-report-modal"
className="fixed inset-0 z-50 bg-black/40 flex items-center justify-center"
>
<div className="bg-white dark:bg-neutral-900 rounded-lg p-6 w-[36rem] max-h-[80vh] overflow-y-auto shadow-xl">
<header className="flex items-center justify-between mb-4">
<h2 className="text-lg font-semibold">Crash reports</h2>
<button onClick={onClose} aria-label="Close">
×
</button>
</header>
<button
onClick={() => ipc.crash.openDir()}
className="mb-4 px-3 py-1 text-sm border rounded"
>
Open dump folder
</button>
{dumps.length === 0 ? (
<p data-testid="empty-state" className="text-neutral-500">
No crashes recorded nice work!
</p>
) : (
<ul className="space-y-2">
{dumps.map((d) => (
<li
key={d.filename}
className="border rounded p-2 text-sm flex justify-between items-start gap-2"
>
<div>
<div className="font-mono text-xs text-neutral-500">{d.timestamp}</div>
<div>{d.message ?? '(no message)'}</div>
</div>
<button
onClick={async () => {
await ipc.crash.delete(d.filename);
refresh();
}}
className="text-red-600 text-xs"
>
Delete
</button>
</li>
))}
</ul>
)}
</div>
</div>
);
}
@@ -1,7 +1,13 @@
import { useSettingsStore } from '@/stores/settings-store'; import { useSettingsStore } from '@/stores/settings-store';
import { Label } from '@/components/ui/label'; import { Label } from '@/components/ui/label';
import { Slider } from '@/components/ui/slider'; import { Slider } from '@/components/ui/slider';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { Switch } from '@/components/ui/switch'; import { Switch } from '@/components/ui/switch';
export function EditorSettings() { export function EditorSettings() {
@@ -11,12 +17,24 @@ export function EditorSettings() {
<div className="space-y-5 text-sm"> <div className="space-y-5 text-sm">
<div> <div>
<Label htmlFor="editor-font-size">Font size: {fontSize}px</Label> <Label htmlFor="editor-font-size">Font size: {fontSize}px</Label>
<Slider id="editor-font-size" min={10} max={24} step={1} value={[fontSize]} onValueChange={([v]) => setSetting('fontSize', v)} /> <Slider
id="editor-font-size"
min={10}
max={24}
step={1}
value={[fontSize]}
onValueChange={([v]) => setSetting('fontSize', v)}
/>
</div> </div>
<div> <div>
<Label htmlFor="editor-tab-size">Tab size</Label> <Label htmlFor="editor-tab-size">Tab size</Label>
<Select value={String(tabSize)} onValueChange={(v) => setSetting('tabSize', Number(v) as 2 | 4 | 8)}> <Select
<SelectTrigger id="editor-tab-size" aria-label="Tab size"><SelectValue /></SelectTrigger> value={String(tabSize)}
onValueChange={(v) => setSetting('tabSize', Number(v) as 2 | 4 | 8)}
>
<SelectTrigger id="editor-tab-size" aria-label="Tab size">
<SelectValue />
</SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="2">2 spaces</SelectItem> <SelectItem value="2">2 spaces</SelectItem>
<SelectItem value="4">4 spaces</SelectItem> <SelectItem value="4">4 spaces</SelectItem>
@@ -26,15 +44,27 @@ export function EditorSettings() {
</div> </div>
<label className="flex items-center justify-between"> <label className="flex items-center justify-between">
<span>Line numbers</span> <span>Line numbers</span>
<Switch checked={lineNumbers} onCheckedChange={(c) => setSetting('lineNumbers', c)} aria-label="Line numbers" /> <Switch
checked={lineNumbers}
onCheckedChange={(c) => setSetting('lineNumbers', c)}
aria-label="Line numbers"
/>
</label> </label>
<label className="flex items-center justify-between"> <label className="flex items-center justify-between">
<span>Word wrap</span> <span>Word wrap</span>
<Switch checked={wordWrap} onCheckedChange={(c) => setSetting('wordWrap', c)} aria-label="Word wrap" /> <Switch
checked={wordWrap}
onCheckedChange={(c) => setSetting('wordWrap', c)}
aria-label="Word wrap"
/>
</label> </label>
<label className="flex items-center justify-between"> <label className="flex items-center justify-between">
<span>Minimap</span> <span>Minimap</span>
<Switch checked={minimap} onCheckedChange={(c) => setSetting('minimap', c)} aria-label="Minimap" /> <Switch
checked={minimap}
onCheckedChange={(c) => setSetting('minimap', c)}
aria-label="Minimap"
/>
</label> </label>
</div> </div>
); );
@@ -1,7 +1,19 @@
import { useState } from 'react'; import { useState } from 'react';
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog'; import {
Dialog,
DialogContent,
DialogDescription,
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import { Label } from '@/components/ui/label'; import { Label } from '@/components/ui/label';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { useAppStore } from '@/stores/app-store'; import { useAppStore } from '@/stores/app-store';
import { ipc } from '@/lib/ipc'; import { ipc } from '@/lib/ipc';
import { toast } from '@/lib/toast'; import { toast } from '@/lib/toast';
@@ -37,16 +49,18 @@ export function ExportBatchDialog({ sourcePaths }: { sourcePaths: string[] }) {
return ( return (
<Dialog open onOpenChange={(o) => !o && closeModal()}> <Dialog open onOpenChange={(o) => !o && closeModal()}>
<DialogContent aria-describedby="batch-desc"> <DialogContent>
<DialogHeader> <DialogHeader>
<DialogTitle>Batch export</DialogTitle> <DialogTitle>Batch export</DialogTitle>
<DialogDescription id="batch-desc">{sourcePaths.length} files</DialogDescription> <DialogDescription>{sourcePaths.length} files</DialogDescription>
</DialogHeader> </DialogHeader>
<div className="space-y-3 text-sm"> <div className="space-y-3 text-sm">
<div> <div>
<Label htmlFor="batch-format">Format</Label> <Label htmlFor="batch-format">Format</Label>
<Select value={format} onValueChange={(v) => setFormat(v as any)}> <Select value={format} onValueChange={(v) => setFormat(v as any)}>
<SelectTrigger id="batch-format" aria-label="Format"><SelectValue /></SelectTrigger> <SelectTrigger id="batch-format" aria-label="Format">
<SelectValue />
</SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="pdf">PDF</SelectItem> <SelectItem value="pdf">PDF</SelectItem>
<SelectItem value="docx">DOCX</SelectItem> <SelectItem value="docx">DOCX</SelectItem>
@@ -58,24 +72,40 @@ export function ExportBatchDialog({ sourcePaths }: { sourcePaths: string[] }) {
<div> <div>
<Label htmlFor="batch-concurrency">Concurrency</Label> <Label htmlFor="batch-concurrency">Concurrency</Label>
<Select value={String(concurrency)} onValueChange={(v) => setConcurrency(Number(v))}> <Select value={String(concurrency)} onValueChange={(v) => setConcurrency(Number(v))}>
<SelectTrigger id="batch-concurrency" aria-label="Concurrency"><SelectValue /></SelectTrigger> <SelectTrigger id="batch-concurrency" aria-label="Concurrency">
<SelectValue />
</SelectTrigger>
<SelectContent> <SelectContent>
{[1, 2, 4, 8, 16].map((n) => ( {[1, 2, 4, 8, 16].map((n) => (
<SelectItem key={n} value={String(n)}>{n}</SelectItem> <SelectItem key={n} value={String(n)}>
{n}
</SelectItem>
))} ))}
</SelectContent> </SelectContent>
</Select> </Select>
</div> </div>
<div className="max-h-40 overflow-auto rounded border border-border bg-card/20 p-2 text-xs"> <div className="max-h-40 overflow-auto rounded border border-border bg-card/20 p-2 text-xs">
{sourcePaths.map((p) => <div key={p} className="truncate">{p}</div>)} {sourcePaths.map((p) => (
<div key={p} className="truncate">
{p}
</div>
))}
</div> </div>
{error && ( {error && (
<div role="alert" className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive"> <div
role="alert"
className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive"
>
{error} {error}
</div> </div>
)} )}
</div> </div>
<ExportDialogFooter onCancel={closeModal} onSubmit={handleSubmit} submitting={submitting} submitLabel="Export" /> <ExportDialogFooter
onCancel={closeModal}
onSubmit={handleSubmit}
submitting={submitting}
submitLabel="Export"
/>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
); );
@@ -9,7 +9,13 @@ interface Props {
submitDisabled?: boolean; submitDisabled?: boolean;
} }
export function ExportDialogFooter({ onCancel, onSubmit, submitting, submitLabel, submitDisabled }: Props) { export function ExportDialogFooter({
onCancel,
onSubmit,
submitting,
submitLabel,
submitDisabled,
}: Props) {
return ( return (
<DialogFooter> <DialogFooter>
<Button variant="ghost" onClick={onCancel} disabled={submitting}> <Button variant="ghost" onClick={onCancel} disabled={submitting}>
@@ -1,11 +1,26 @@
import { useState } from 'react'; import { useState } from 'react';
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog'; import {
Dialog,
DialogContent,
DialogDescription,
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import { Checkbox } from '@/components/ui/checkbox'; import { Checkbox } from '@/components/ui/checkbox';
import { Label } from '@/components/ui/label'; import { Label } from '@/components/ui/label';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { Input } from '@/components/ui/input';
import { Switch } from '@/components/ui/switch';
import { useAppStore } from '@/stores/app-store'; import { useAppStore } from '@/stores/app-store';
import { useSettingsStore } from '@/stores/settings-store'; import { useSettingsStore } from '@/stores/settings-store';
import { useExportSource } from '@/hooks/use-export-source'; import { useExportSource } from '@/hooks/use-export-source';
import { generateDocx } from '@/lib/docx-export';
import { ipc } from '@/lib/ipc'; import { ipc } from '@/lib/ipc';
import { toast } from '@/lib/toast'; import { toast } from '@/lib/toast';
import { ExportDialogFooter } from './ExportDialogFooter'; import { ExportDialogFooter } from './ExportDialogFooter';
@@ -16,41 +31,73 @@ export function ExportDocxDialog({ sourcePath }: { sourcePath: string }) {
const source = useExportSource(); const source = useExportSource();
const [template, setTemplate] = useState<'standard' | 'minimal' | 'modern'>(docxTemplate); const [template, setTemplate] = useState<'standard' | 'minimal' | 'modern'>(docxTemplate);
const [ascii, setAscii] = useState(renderTablesAsAscii); const [ascii, setAscii] = useState(renderTablesAsAscii);
const [referenceDoc, setReferenceDoc] = useState('');
const [toc, setToc] = useState(false);
const [tocDepth, setTocDepth] = useState(3);
const [numberSections, setNumberSections] = useState(false);
const [bibliography, setBibliography] = useState('');
const [submitting, setSubmitting] = useState(false); const [submitting, setSubmitting] = useState(false);
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
const handleSubmit = async () => { const handleSubmit = async () => {
if (!source) { setError('No file open.'); return; } if (!source) {
setError('No file open.');
return;
}
setSubmitting(true); setSubmitting(true);
setError(null); setError(null);
const result = await ipc.export.docx({ try {
inputPath: source.path, const blob = await generateDocx({ source: source.source, title: source.title });
outputPath: source.path.replace(/\.md$/, '.docx'), const saveResult = await ipc.app.showSaveDialog?.({
template, title: 'Save as Word document',
renderTablesAsAscii: ascii, defaultPath: source.path.replace(/\.md$/, '.docx'),
} as any); });
if (!result.ok) { if (!saveResult?.ok || !saveResult.data) {
toast.error(`Export failed: ${result.error.message}`);
setError(result.error.message);
setSubmitting(false); setSubmitting(false);
} else { return;
toast.success(`Exported ${source.title} to ${result.data?.outputPath ?? 'file'}`); }
const options = {
referenceDoc: referenceDoc || undefined,
toc,
tocDepth,
numberSections,
bibliography: bibliography || undefined,
};
await window.electronAPI?.export?.withOptions?.('docx', options);
const buffer = new Uint8Array(await blob.arrayBuffer());
const writeResult = await ipc.file.writeBuffer({ path: saveResult.data, buffer });
if (!writeResult.ok) {
setError(writeResult.error.message);
setSubmitting(false);
return;
}
toast.success(`Exported ${source.title} to ${saveResult.data}`);
closeModal(); closeModal();
} catch (err) {
const msg = err instanceof Error ? err.message : String(err);
toast.error(`Export failed: ${msg}`);
setError(msg);
setSubmitting(false);
} }
}; };
return ( return (
<Dialog open onOpenChange={(o) => !o && closeModal()}> <Dialog open onOpenChange={(o) => !o && closeModal()}>
<DialogContent aria-describedby="docx-desc"> <DialogContent className="max-h-[85vh] overflow-y-auto">
<DialogHeader> <DialogHeader>
<DialogTitle>Export to DOCX</DialogTitle> <DialogTitle>Export to DOCX</DialogTitle>
<DialogDescription id="docx-desc">{sourcePath}</DialogDescription> <DialogDescription>{sourcePath}</DialogDescription>
</DialogHeader> </DialogHeader>
<div className="space-y-3 text-sm"> <div className="space-y-3 text-sm">
<div> <div>
<Label htmlFor="docx-template">Template</Label> <Label htmlFor="docx-template">Template</Label>
<Select value={template} onValueChange={(v) => setTemplate(v as any)}> <Select value={template} onValueChange={(v) => setTemplate(v as any)}>
<SelectTrigger id="docx-template" aria-label="Template"><SelectValue /></SelectTrigger> <SelectTrigger id="docx-template" aria-label="Template">
<SelectValue />
</SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="standard">Standard</SelectItem> <SelectItem value="standard">Standard</SelectItem>
<SelectItem value="minimal">Minimal</SelectItem> <SelectItem value="minimal">Minimal</SelectItem>
@@ -58,20 +105,80 @@ export function ExportDocxDialog({ sourcePath }: { sourcePath: string }) {
</SelectContent> </SelectContent>
</Select> </Select>
<p className="mt-1 text-xs text-muted-foreground"> <p className="mt-1 text-xs text-muted-foreground">
Bundled with the app. Standard is the default; Modern adds a colored cover page. The renderer-side export produces the same document for all three template choices;
the option is preserved for future stylesheets.
</p> </p>
</div> </div>
<label className="flex items-center gap-2"> <label className="flex items-center gap-2">
<Checkbox checked={ascii} onCheckedChange={(c) => setAscii(!!c)} aria-label="ASCII tables" /> <Checkbox
checked={ascii}
onCheckedChange={(c) => setAscii(!!c)}
aria-label="ASCII tables"
/>
Render tables as ASCII Render tables as ASCII
</label> </label>
<div>
<Label htmlFor="docx-reference">Reference doc / template</Label>
<Input
id="docx-reference"
value={referenceDoc}
onChange={(e) => setReferenceDoc(e.target.value)}
placeholder="/path/to/reference.docx"
aria-label="Reference document path"
/>
</div>
<div className="flex items-center gap-3">
<Switch checked={toc} onCheckedChange={setToc} id="docx-toc" />
<Label htmlFor="docx-toc">Table of Contents</Label>
</div>
{toc && (
<div className="pl-9">
<Label htmlFor="docx-toc-depth">TOC Depth</Label>
<Input
id="docx-toc-depth"
type="number"
min={1}
max={6}
value={tocDepth}
onChange={(e) => setTocDepth(Math.min(6, Math.max(1, Number(e.target.value))))}
className="w-20"
aria-label="TOC depth"
/>
</div>
)}
<div className="flex items-center gap-3">
<Switch
checked={numberSections}
onCheckedChange={setNumberSections}
id="docx-number-sections"
/>
<Label htmlFor="docx-number-sections">Number sections</Label>
</div>
<div>
<Label htmlFor="docx-bibliography">Bibliography file</Label>
<Input
id="docx-bibliography"
value={bibliography}
onChange={(e) => setBibliography(e.target.value)}
placeholder="/path/to/references.bib"
aria-label="Bibliography file path"
/>
</div>
{error && ( {error && (
<div role="alert" className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive"> <div
role="alert"
className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive"
>
{error} {error}
</div> </div>
)} )}
</div> </div>
<ExportDialogFooter onCancel={closeModal} onSubmit={handleSubmit} submitting={submitting} submitLabel="Export" /> <ExportDialogFooter
onCancel={closeModal}
onSubmit={handleSubmit}
submitting={submitting}
submitLabel="Export"
/>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
); );
@@ -1,11 +1,26 @@
import { useState } from 'react'; import { useState } from 'react';
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog'; import {
Dialog,
DialogContent,
DialogDescription,
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import { Checkbox } from '@/components/ui/checkbox'; import { Checkbox } from '@/components/ui/checkbox';
import { Label } from '@/components/ui/label'; import { Label } from '@/components/ui/label';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { Input } from '@/components/ui/input';
import { Switch } from '@/components/ui/switch';
import { useAppStore } from '@/stores/app-store'; import { useAppStore } from '@/stores/app-store';
import { useSettingsStore } from '@/stores/settings-store'; import { useSettingsStore } from '@/stores/settings-store';
import { useExportSource } from '@/hooks/use-export-source'; import { useExportSource } from '@/hooks/use-export-source';
import { generateHtml } from '@/lib/html-export';
import { ipc } from '@/lib/ipc'; import { ipc } from '@/lib/ipc';
import { toast } from '@/lib/toast'; import { toast } from '@/lib/toast';
import { ExportDialogFooter } from './ExportDialogFooter'; import { ExportDialogFooter } from './ExportDialogFooter';
@@ -17,46 +32,89 @@ export function ExportHtmlDialog({ sourcePath }: { sourcePath: string }) {
const [standalone, setStandalone] = useState(true); const [standalone, setStandalone] = useState(true);
const [highlight, setHighlight] = useState(htmlHighlightStyle); const [highlight, setHighlight] = useState(htmlHighlightStyle);
const [ascii, setAscii] = useState(renderTablesAsAscii); const [ascii, setAscii] = useState(renderTablesAsAscii);
const [selfContained, setSelfContained] = useState(false);
const [toc, setToc] = useState(false);
const [tocDepth, setTocDepth] = useState(3);
const [numberSections, setNumberSections] = useState(false);
const [cssPath, setCssPath] = useState('');
const [submitting, setSubmitting] = useState(false); const [submitting, setSubmitting] = useState(false);
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
const handleSubmit = async () => { const handleSubmit = async () => {
if (!source) { setError('No file open.'); return; } if (!source) {
setError('No file open.');
return;
}
setSubmitting(true); setSubmitting(true);
setError(null); setError(null);
const result = await ipc.export.html({ try {
inputPath: source.path, const html = generateHtml({
outputPath: source.path.replace(/\.md$/, '.html'), source: source.source,
title: source.title,
standalone, standalone,
highlightStyle: highlight, highlightStyle: highlight,
renderTablesAsAscii: ascii, renderTablesAsAscii: ascii,
} as any); });
if (!result.ok) {
toast.error(`Export failed: ${result.error.message}`); const options = {
setError(result.error.message); standalone,
highlightStyle: highlight,
selfContained,
toc,
tocDepth,
numberSections,
css: cssPath || undefined,
};
await window.electronAPI?.export?.withOptions?.('html', options);
const saveResult = await ipc.app.showSaveDialog?.({
title: 'Save as HTML',
defaultPath: source.path.replace(/\.md$/, '.html'),
});
if (!saveResult?.ok || !saveResult.data) {
setSubmitting(false); setSubmitting(false);
} else { return;
toast.success(`Exported ${source.title} to ${result.data?.outputPath ?? 'file'}`); }
const buffer = new TextEncoder().encode(html);
const writeResult = await ipc.file.writeBuffer({ path: saveResult.data, buffer });
if (!writeResult.ok) {
setError(writeResult.error.message);
setSubmitting(false);
return;
}
toast.success(`Exported ${source.title} to ${saveResult.data}`);
closeModal(); closeModal();
} catch (err) {
const msg = err instanceof Error ? err.message : String(err);
toast.error(`Export failed: ${msg}`);
setError(msg);
setSubmitting(false);
} }
}; };
return ( return (
<Dialog open onOpenChange={(o) => !o && closeModal()}> <Dialog open onOpenChange={(o) => !o && closeModal()}>
<DialogContent aria-describedby="html-desc"> <DialogContent className="max-h-[85vh] overflow-y-auto">
<DialogHeader> <DialogHeader>
<DialogTitle>Export to HTML</DialogTitle> <DialogTitle>Export to HTML</DialogTitle>
<DialogDescription id="html-desc">{sourcePath}</DialogDescription> <DialogDescription>{sourcePath}</DialogDescription>
</DialogHeader> </DialogHeader>
<div className="space-y-3 text-sm"> <div className="space-y-3 text-sm">
<label className="flex items-center gap-2"> <label className="flex items-center gap-2">
<Checkbox checked={standalone} onCheckedChange={(c) => setStandalone(!!c)} aria-label="Standalone" /> <Checkbox
checked={standalone}
onCheckedChange={(c) => setStandalone(!!c)}
aria-label="Standalone"
/>
Standalone document (with inline CSS) Standalone document (with inline CSS)
</label> </label>
<div> <div>
<Label htmlFor="html-highlight">Syntax highlight style</Label> <Label htmlFor="html-highlight">Syntax highlight style</Label>
<Select value={highlight} onValueChange={(v) => setHighlight(v as any)}> <Select value={highlight} onValueChange={(v) => setHighlight(v as any)}>
<SelectTrigger id="html-highlight" aria-label="Highlight style"><SelectValue /></SelectTrigger> <SelectTrigger id="html-highlight" aria-label="Highlight style">
<SelectValue />
</SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="github">GitHub</SelectItem> <SelectItem value="github">GitHub</SelectItem>
<SelectItem value="monokai">Monokai</SelectItem> <SelectItem value="monokai">Monokai</SelectItem>
@@ -65,17 +123,74 @@ export function ExportHtmlDialog({ sourcePath }: { sourcePath: string }) {
</SelectContent> </SelectContent>
</Select> </Select>
</div> </div>
<div className="flex items-center gap-3">
<Switch
checked={selfContained}
onCheckedChange={setSelfContained}
id="html-self-contained"
/>
<Label htmlFor="html-self-contained">Self-contained (embed all CSS inline)</Label>
</div>
<label className="flex items-center gap-2"> <label className="flex items-center gap-2">
<Checkbox checked={ascii} onCheckedChange={(c) => setAscii(!!c)} aria-label="ASCII tables" /> <Checkbox
checked={ascii}
onCheckedChange={(c) => setAscii(!!c)}
aria-label="ASCII tables"
/>
Render tables as ASCII Render tables as ASCII
</label> </label>
<div className="flex items-center gap-3">
<Switch checked={toc} onCheckedChange={setToc} id="html-toc" />
<Label htmlFor="html-toc">Table of Contents</Label>
</div>
{toc && (
<div className="pl-9">
<Label htmlFor="html-toc-depth">TOC Depth</Label>
<Input
id="html-toc-depth"
type="number"
min={1}
max={6}
value={tocDepth}
onChange={(e) => setTocDepth(Math.min(6, Math.max(1, Number(e.target.value))))}
className="w-20"
aria-label="TOC depth"
/>
</div>
)}
<div className="flex items-center gap-3">
<Switch
checked={numberSections}
onCheckedChange={setNumberSections}
id="html-number-sections"
/>
<Label htmlFor="html-number-sections">Number sections</Label>
</div>
<div>
<Label htmlFor="html-css">Custom CSS file</Label>
<Input
id="html-css"
value={cssPath}
onChange={(e) => setCssPath(e.target.value)}
placeholder="/path/to/custom.css"
aria-label="Custom CSS file path"
/>
</div>
{error && ( {error && (
<div role="alert" className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive"> <div
role="alert"
className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive"
>
{error} {error}
</div> </div>
)} )}
</div> </div>
<ExportDialogFooter onCancel={closeModal} onSubmit={handleSubmit} submitting={submitting} submitLabel="Export" /> <ExportDialogFooter
onCancel={closeModal}
onSubmit={handleSubmit}
submitting={submitting}
submitLabel="Export"
/>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
); );
@@ -1,14 +1,29 @@
import { useState } from 'react'; import { useState } from 'react';
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog'; import {
Dialog,
DialogContent,
DialogDescription,
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import { Checkbox } from '@/components/ui/checkbox'; import { Checkbox } from '@/components/ui/checkbox';
import { Label } from '@/components/ui/label'; import { Label } from '@/components/ui/label';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { Input } from '@/components/ui/input';
import { Switch } from '@/components/ui/switch';
import { useAppStore } from '@/stores/app-store'; import { useAppStore } from '@/stores/app-store';
import { useSettingsStore } from '@/stores/settings-store'; import { useSettingsStore } from '@/stores/settings-store';
import { useExportSource } from '@/hooks/use-export-source'; import { useExportSource } from '@/hooks/use-export-source';
import { ipc } from '@/lib/ipc';
import { toast } from '@/lib/toast'; import { toast } from '@/lib/toast';
import { ExportDialogFooter } from './ExportDialogFooter'; import { ExportDialogFooter } from './ExportDialogFooter';
import { ipc } from '@/lib/ipc';
import { generateHtml } from '@/lib/html-export';
const MARGIN_MAP = { const MARGIN_MAP = {
normal: { top: 25, right: 25, bottom: 25, left: 25 }, normal: { top: 25, right: 25, bottom: 25, left: 25 },
@@ -18,14 +33,23 @@ const MARGIN_MAP = {
export function ExportPdfDialog({ sourcePath }: { sourcePath: string }) { export function ExportPdfDialog({ sourcePath }: { sourcePath: string }) {
const closeModal = useAppStore((s) => s.closeModal); const closeModal = useAppStore((s) => s.closeModal);
const { fontSize, pdfFormat, pdfMargins, pdfEmbedFonts, renderTablesAsAscii } = useSettingsStore(); const { fontSize, pdfFormat, pdfMargins, pdfEmbedFonts, renderTablesAsAscii } =
useSettingsStore();
const [format, setFormat] = useState<'letter' | 'a4' | 'legal'>(pdfFormat); const [format, setFormat] = useState<'letter' | 'a4' | 'legal'>(pdfFormat);
const [margins, setMargins] = useState<'normal' | 'narrow' | 'wide'>(pdfMargins); const [margins, setMargins] = useState<'normal' | 'narrow' | 'wide'>(pdfMargins);
const [embed, setEmbed] = useState(pdfEmbedFonts); const [embed, setEmbed] = useState(pdfEmbedFonts);
const [ascii, setAscii] = useState(renderTablesAsAscii); const [ascii, setAscii] = useState(renderTablesAsAscii);
const [engine, setEngine] = useState<'pdflatex' | 'xelatex' | 'lualatex'>('pdflatex');
const [toc, setToc] = useState(false);
const [tocDepth, setTocDepth] = useState(3);
const [numberSections, setNumberSections] = useState(false);
const [pageGeometry, setPageGeometry] = useState<'margin' | 'crop' | 'bleed'>('margin');
const [bibliography, setBibliography] = useState('');
const [mainFont, setMainFont] = useState('');
const [cjkFont, setCjkFont] = useState('');
const [highlightStyle, setHighlightStyle] = useState('tango');
const [submitting, setSubmitting] = useState(false); const [submitting, setSubmitting] = useState(false);
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
const source = useExportSource(); const source = useExportSource();
const handleSubmit = async () => { const handleSubmit = async () => {
@@ -35,37 +59,72 @@ export function ExportPdfDialog({ sourcePath }: { sourcePath: string }) {
} }
setSubmitting(true); setSubmitting(true);
setError(null); setError(null);
const result = await ipc.export.pdf({ try {
inputPath: source.path, const html = generateHtml({
outputPath: source.path.replace(/\.md$/, '.pdf'), source: source.source,
format, title: source.title,
margins: MARGIN_MAP[margins], standalone: true,
embedFonts: embed, highlightStyle: 'github',
renderTablesAsAscii: ascii, renderTablesAsAscii: ascii,
fontSize, });
} as any); const fmt =
format === 'a4'
? { width: '210mm', height: '297mm' }
: format === 'legal'
? { width: '8.5in', height: '14in' }
: { width: '8.5in', height: '11in' };
const m = MARGIN_MAP[margins];
const pageCss = `@page { size: ${fmt.width} ${fmt.height}; margin: ${m.top}mm ${m.right}mm ${m.bottom}mm ${m.left}mm; }`;
const finalHtml = html.replace('</style>', `${pageCss}</style>`);
const options = {
html: finalHtml,
withStyles: embed,
engine,
toc,
tocDepth,
numberSections,
pageGeometry,
bibliography: bibliography || undefined,
mainFont: mainFont || undefined,
cjkFont: cjkFont || undefined,
highlightStyle,
};
const result = await (window.electronAPI?.export?.withOptions?.('pdf', options) ??
ipc.print.show({ html: finalHtml, withStyles: embed }));
if (!result.ok) { if (!result.ok) {
toast.error(`Export failed: ${result.error?.message ?? 'Export failed'}`); const msg = result.error?.message ?? 'PDF export failed';
setError(result.error?.message ?? 'Export failed'); toast.error(`Export failed: ${msg}`);
setError(msg);
setSubmitting(false); setSubmitting(false);
} else { return;
toast.success(`Exported ${source.title} to ${result.data?.outputPath ?? 'file'}`); }
toast.success(`Sent ${source.title} to printer`);
closeModal(); closeModal();
} catch (err) {
const msg = err instanceof Error ? err.message : String(err);
toast.error(`Export failed: ${msg}`);
setError(msg);
setSubmitting(false);
} }
}; };
return ( return (
<Dialog open onOpenChange={(o) => !o && closeModal()}> <Dialog open onOpenChange={(o) => !o && closeModal()}>
<DialogContent aria-describedby="pdf-desc"> <DialogContent className="max-w-lg max-h-[85vh] overflow-y-auto">
<DialogHeader> <DialogHeader>
<DialogTitle>Export to PDF</DialogTitle> <DialogTitle>Export to PDF</DialogTitle>
<DialogDescription id="pdf-desc">{sourcePath}</DialogDescription> <DialogDescription>{sourcePath}</DialogDescription>
</DialogHeader> </DialogHeader>
<div className="space-y-3 text-sm"> <div className="space-y-3 text-sm">
<div> <div>
<Label htmlFor="pdf-format">Format</Label> <Label htmlFor="pdf-format">Format</Label>
<Select value={format} onValueChange={(v) => setFormat(v as typeof format)}> <Select value={format} onValueChange={(v) => setFormat(v as typeof format)}>
<SelectTrigger id="pdf-format" aria-label="Format"><SelectValue /></SelectTrigger> <SelectTrigger id="pdf-format" aria-label="Format">
<SelectValue />
</SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="letter">Letter</SelectItem> <SelectItem value="letter">Letter</SelectItem>
<SelectItem value="a4">A4</SelectItem> <SelectItem value="a4">A4</SelectItem>
@@ -76,7 +135,9 @@ export function ExportPdfDialog({ sourcePath }: { sourcePath: string }) {
<div> <div>
<Label htmlFor="pdf-margins">Margins</Label> <Label htmlFor="pdf-margins">Margins</Label>
<Select value={margins} onValueChange={(v) => setMargins(v as typeof margins)}> <Select value={margins} onValueChange={(v) => setMargins(v as typeof margins)}>
<SelectTrigger id="pdf-margins" aria-label="Margins"><SelectValue /></SelectTrigger> <SelectTrigger id="pdf-margins" aria-label="Margins">
<SelectValue />
</SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="narrow">Narrow</SelectItem> <SelectItem value="narrow">Narrow</SelectItem>
<SelectItem value="normal">Normal</SelectItem> <SelectItem value="normal">Normal</SelectItem>
@@ -85,20 +146,136 @@ export function ExportPdfDialog({ sourcePath }: { sourcePath: string }) {
</Select> </Select>
</div> </div>
<label className="flex items-center gap-2"> <label className="flex items-center gap-2">
<Checkbox checked={embed} onCheckedChange={(c) => setEmbed(!!c)} aria-label="Embed fonts" /> <Checkbox
checked={embed}
onCheckedChange={(c) => setEmbed(!!c)}
aria-label="Embed fonts"
/>
Embed fonts Embed fonts
</label> </label>
<label className="flex items-center gap-2"> <label className="flex items-center gap-2">
<Checkbox checked={ascii} onCheckedChange={(c) => setAscii(!!c)} aria-label="ASCII tables" /> <Checkbox
checked={ascii}
onCheckedChange={(c) => setAscii(!!c)}
aria-label="ASCII tables"
/>
Render tables as ASCII Render tables as ASCII
</label> </label>
<div>
<Label htmlFor="pdf-engine">PDF Engine</Label>
<Select value={engine} onValueChange={(v) => setEngine(v as typeof engine)}>
<SelectTrigger id="pdf-engine" aria-label="PDF Engine">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="pdflatex">pdflatex</SelectItem>
<SelectItem value="xelatex">xelatex</SelectItem>
<SelectItem value="lualatex">lualatex</SelectItem>
</SelectContent>
</Select>
</div>
<div className="flex items-center gap-3">
<Switch checked={toc} onCheckedChange={setToc} id="pdf-toc" />
<Label htmlFor="pdf-toc">Table of Contents</Label>
</div>
{toc && (
<div className="pl-9">
<Label htmlFor="pdf-toc-depth">TOC Depth</Label>
<Input
id="pdf-toc-depth"
type="number"
min={1}
max={6}
value={tocDepth}
onChange={(e) => setTocDepth(Math.min(6, Math.max(1, Number(e.target.value))))}
className="w-20"
aria-label="TOC depth"
/>
</div>
)}
<div className="flex items-center gap-3">
<Switch
checked={numberSections}
onCheckedChange={setNumberSections}
id="pdf-number-sections"
/>
<Label htmlFor="pdf-number-sections">Number sections</Label>
</div>
<div>
<Label htmlFor="pdf-page-geometry">Page Geometry</Label>
<Select
value={pageGeometry}
onValueChange={(v) => setPageGeometry(v as typeof pageGeometry)}
>
<SelectTrigger id="pdf-page-geometry" aria-label="Page geometry">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="margin">Margin</SelectItem>
<SelectItem value="crop">Crop</SelectItem>
<SelectItem value="bleed">Bleed</SelectItem>
</SelectContent>
</Select>
</div>
<div>
<Label htmlFor="pdf-bibliography">Bibliography file</Label>
<Input
id="pdf-bibliography"
value={bibliography}
onChange={(e) => setBibliography(e.target.value)}
placeholder="/path/to/references.bib"
aria-label="Bibliography file path"
/>
</div>
<div>
<Label htmlFor="pdf-main-font">Main font</Label>
<Input
id="pdf-main-font"
value={mainFont}
onChange={(e) => setMainFont(e.target.value)}
placeholder="e.g. Latin Modern"
aria-label="Main font"
/>
</div>
<div>
<Label htmlFor="pdf-cjk-font">CJK font</Label>
<Input
id="pdf-cjk-font"
value={cjkFont}
onChange={(e) => setCjkFont(e.target.value)}
placeholder="e.g. Noto Sans CJK SC"
aria-label="CJK font"
/>
</div>
<div>
<Label htmlFor="pdf-highlight">Highlight style</Label>
<Select value={highlightStyle} onValueChange={setHighlightStyle}>
<SelectTrigger id="pdf-highlight" aria-label="Highlight style">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="tango">Tango</SelectItem>
<SelectItem value="pygments">Pygments</SelectItem>
<SelectItem value="kateks">Kate (Kateks)</SelectItem>
<SelectItem value="monochrome">Monochrome</SelectItem>
</SelectContent>
</Select>
</div>
{error && ( {error && (
<div role="alert" className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive"> <div
role="alert"
className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive"
>
{error} {error}
</div> </div>
)} )}
</div> </div>
<ExportDialogFooter onCancel={closeModal} onSubmit={handleSubmit} submitting={submitting} submitLabel="Export" /> <ExportDialogFooter
onCancel={closeModal}
onSubmit={handleSubmit}
submitting={submitting}
submitLabel="Export"
/>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
); );
@@ -0,0 +1,275 @@
import { useState } from 'react';
import {
Dialog,
DialogContent,
DialogDescription,
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import { Checkbox } from '@/components/ui/checkbox';
import { Label } from '@/components/ui/label';
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { Input } from '@/components/ui/input';
import { Switch } from '@/components/ui/switch';
import { useAppStore } from '@/stores/app-store';
import { useExportSource } from '@/hooks/use-export-source';
import { ipc } from '@/lib/ipc';
import { toast } from '@/lib/toast';
import { ExportDialogFooter } from './ExportDialogFooter';
export function ExportRevealjsDialog({ sourcePath }: { sourcePath: string }) {
const closeModal = useAppStore((s) => s.closeModal);
const source = useExportSource();
const [revealTheme, setRevealTheme] = useState('black');
const [revealTransition, setRevealTransition] = useState('slide');
const [revealTransitionSpeed, setRevealTransitionSpeed] = useState('default');
const [revealSlideNumber, setRevealSlideNumber] = useState(false);
const [revealControls, setRevealControls] = useState(true);
const [revealProgress, setRevealProgress] = useState(true);
const [revealHistory, setRevealHistory] = useState(true);
const [revealCenter, setRevealCenter] = useState(true);
const [template, setTemplate] = useState('default');
const [title, setTitle] = useState(source?.title || '');
const [author, setAuthor] = useState('');
const [date, setDate] = useState('');
const [bibliography, setBibliography] = useState('');
const [csl, setCsl] = useState('');
const [submitting, setSubmitting] = useState(false);
const [error, setError] = useState<string | null>(null);
const handleBrowseFile = async (setter: (v: string) => void) => {
const result = await ipc.file.pickFile();
if (result.ok && result.data) {
setter(result.data);
}
};
const handleSubmit = async () => {
if (!source) {
setError('No file open.');
return;
}
setSubmitting(true);
setError(null);
try {
const options = {
revealTheme,
revealTransition,
revealTransitionSpeed,
revealSlideNumber,
revealControls,
revealProgress,
revealHistory,
revealCenter,
template: template || undefined,
metadata: {
title: title || undefined,
author: author || undefined,
date: date || undefined,
},
bibliography: bibliography || undefined,
csl: csl || undefined,
};
await window.electronAPI?.export?.withOptions?.('revealjs', options);
toast.success('Slide export process completed');
closeModal();
} catch (err) {
const msg = err instanceof Error ? err.message : String(err);
toast.error(`Export failed: ${msg}`);
setError(msg);
setSubmitting(false);
}
};
return (
<Dialog open onOpenChange={(o) => !o && closeModal()}>
<DialogContent className="max-h-[85vh] max-w-lg overflow-y-auto">
<DialogHeader>
<DialogTitle>Export Reveal.js Slides</DialogTitle>
<DialogDescription>{sourcePath}</DialogDescription>
</DialogHeader>
<div className="space-y-4 text-sm">
{/* Theme & Transitions */}
<div className="grid grid-cols-2 gap-3">
<div>
<Label htmlFor="reveal-theme">Theme</Label>
<Select value={revealTheme} onValueChange={setRevealTheme}>
<SelectTrigger id="reveal-theme">
<SelectValue />
</SelectTrigger>
<SelectContent>
{['black', 'white', 'league', 'beige', 'sky', 'night', 'serif', 'simple', 'solarized', 'blood', 'moon'].map((t) => (
<SelectItem key={t} value={t}>
{t.charAt(0).toUpperCase() + t.slice(1)}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
<div>
<Label htmlFor="reveal-transition">Transition</Label>
<Select value={revealTransition} onValueChange={setRevealTransition}>
<SelectTrigger id="reveal-transition">
<SelectValue />
</SelectTrigger>
<SelectContent>
{['slide', 'none', 'fade', 'convex', 'concave', 'zoom'].map((t) => (
<SelectItem key={t} value={t}>
{t.charAt(0).toUpperCase() + t.slice(1)}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
</div>
<div>
<Label htmlFor="reveal-speed">Transition Speed</Label>
<Select value={revealTransitionSpeed} onValueChange={setRevealTransitionSpeed}>
<SelectTrigger id="reveal-speed">
<SelectValue />
</SelectTrigger>
<SelectContent>
{['default', 'fast', 'slow'].map((s) => (
<SelectItem key={s} value={s}>
{s.charAt(0).toUpperCase() + s.slice(1)}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
{/* Toggle Switches */}
<div className="grid grid-cols-2 gap-x-4 gap-y-2 py-2">
<div className="flex items-center gap-2">
<Switch checked={revealSlideNumber} onCheckedChange={setRevealSlideNumber} id="reveal-slide-number" />
<Label htmlFor="reveal-slide-number">Slide Numbers</Label>
</div>
<div className="flex items-center gap-2">
<Switch checked={revealControls} onCheckedChange={setRevealControls} id="reveal-controls" />
<Label htmlFor="reveal-controls">Controls</Label>
</div>
<div className="flex items-center gap-2">
<Switch checked={revealProgress} onCheckedChange={setRevealProgress} id="reveal-progress" />
<Label htmlFor="reveal-progress">Progress Bar</Label>
</div>
<div className="flex items-center gap-2">
<Switch checked={revealHistory} onCheckedChange={setRevealHistory} id="reveal-history" />
<Label htmlFor="reveal-history">Slide History</Label>
</div>
<div className="flex items-center gap-2 col-span-2">
<Switch checked={revealCenter} onCheckedChange={setRevealCenter} id="reveal-center" />
<Label htmlFor="reveal-center">Center Content Vertically</Label>
</div>
</div>
{/* Template & Metadata */}
<div className="border-t pt-3 space-y-3">
<Label className="font-semibold text-xs text-muted-foreground uppercase tracking-wider block">Metadata & Template</Label>
<div>
<Label htmlFor="reveal-template">Template File</Label>
<div className="flex gap-2">
<Input
id="reveal-template"
value={template}
onChange={(e) => setTemplate(e.target.value)}
placeholder="default"
className="flex-1"
/>
<Button variant="outline" size="sm" onClick={() => handleBrowseFile(setTemplate)}>
Browse
</Button>
</div>
</div>
<div className="grid grid-cols-3 gap-2">
<div>
<Label htmlFor="reveal-title">Title</Label>
<Input id="reveal-title" value={title} onChange={(e) => setTitle(e.target.value)} />
</div>
<div>
<Label htmlFor="reveal-author">Author</Label>
<Input id="reveal-author" value={author} onChange={(e) => setAuthor(e.target.value)} />
</div>
<div>
<Label htmlFor="reveal-date">Date</Label>
<Input id="reveal-date" value={date} onChange={(e) => setDate(e.target.value)} />
</div>
</div>
</div>
{/* Bibliography & CSL */}
<div className="border-t pt-3 space-y-3">
<Label className="font-semibold text-xs text-muted-foreground uppercase tracking-wider block">Bibliography (Pandoc)</Label>
<div>
<Label htmlFor="reveal-bibliography">Bibliography (.bib, .json)</Label>
<div className="flex gap-2">
<Input
id="reveal-bibliography"
value={bibliography}
onChange={(e) => setBibliography(e.target.value)}
placeholder="/path/to/citations.bib"
className="flex-1"
/>
<Button variant="outline" size="sm" onClick={() => handleBrowseFile(setBibliography)}>
Browse
</Button>
</div>
</div>
<div>
<Label htmlFor="reveal-csl">CSL Style</Label>
<div className="flex gap-2">
<Input
id="reveal-csl"
value={csl}
onChange={(e) => setCsl(e.target.value)}
placeholder="/path/to/style.csl"
className="flex-1"
/>
<Button variant="outline" size="sm" onClick={() => handleBrowseFile(setCsl)}>
Browse
</Button>
</div>
</div>
</div>
{error && (
<div
role="alert"
className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive"
>
{error}
</div>
)}
</div>
<ExportDialogFooter
onCancel={closeModal}
onSubmit={handleSubmit}
submitting={submitting}
submitLabel="Export"
/>
</DialogContent>
</Dialog>
);
}
@@ -1,17 +1,33 @@
import { useSettingsStore } from '@/stores/settings-store'; import { useSettingsStore } from '@/stores/settings-store';
import { Label } from '@/components/ui/label'; import { Label } from '@/components/ui/label';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { Switch } from '@/components/ui/switch'; import { Switch } from '@/components/ui/switch';
export function ExportSettings() { export function ExportSettings() {
const { pdfFormat, pdfMargins, pdfEmbedFonts, docxTemplate, htmlHighlightStyle, renderTablesAsAscii, setSetting } = useSettingsStore(); const {
pdfFormat,
pdfMargins,
pdfEmbedFonts,
docxTemplate,
htmlHighlightStyle,
renderTablesAsAscii,
setSetting,
} = useSettingsStore();
return ( return (
<div className="space-y-5 text-sm"> <div className="space-y-5 text-sm">
<div> <div>
<Label htmlFor="export-pdf-format">Default PDF format</Label> <Label htmlFor="export-pdf-format">Default PDF format</Label>
<Select value={pdfFormat} onValueChange={(v) => setSetting('pdfFormat', v as any)}> <Select value={pdfFormat} onValueChange={(v) => setSetting('pdfFormat', v as any)}>
<SelectTrigger id="export-pdf-format" aria-label="Default PDF format"><SelectValue /></SelectTrigger> <SelectTrigger id="export-pdf-format" aria-label="Default PDF format">
<SelectValue />
</SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="letter">Letter</SelectItem> <SelectItem value="letter">Letter</SelectItem>
<SelectItem value="a4">A4</SelectItem> <SelectItem value="a4">A4</SelectItem>
@@ -22,7 +38,9 @@ export function ExportSettings() {
<div> <div>
<Label htmlFor="export-pdf-margins">Default PDF margins</Label> <Label htmlFor="export-pdf-margins">Default PDF margins</Label>
<Select value={pdfMargins} onValueChange={(v) => setSetting('pdfMargins', v as any)}> <Select value={pdfMargins} onValueChange={(v) => setSetting('pdfMargins', v as any)}>
<SelectTrigger id="export-pdf-margins" aria-label="Default PDF margins"><SelectValue /></SelectTrigger> <SelectTrigger id="export-pdf-margins" aria-label="Default PDF margins">
<SelectValue />
</SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="narrow">Narrow</SelectItem> <SelectItem value="narrow">Narrow</SelectItem>
<SelectItem value="normal">Normal</SelectItem> <SelectItem value="normal">Normal</SelectItem>
@@ -32,12 +50,18 @@ export function ExportSettings() {
</div> </div>
<label className="flex items-center justify-between"> <label className="flex items-center justify-between">
<span>Embed fonts in PDFs</span> <span>Embed fonts in PDFs</span>
<Switch checked={pdfEmbedFonts} onCheckedChange={(c) => setSetting('pdfEmbedFonts', c)} aria-label="Embed fonts" /> <Switch
checked={pdfEmbedFonts}
onCheckedChange={(c) => setSetting('pdfEmbedFonts', c)}
aria-label="Embed fonts"
/>
</label> </label>
<div> <div>
<Label htmlFor="export-docx-template">Default DOCX template</Label> <Label htmlFor="export-docx-template">Default DOCX template</Label>
<Select value={docxTemplate} onValueChange={(v) => setSetting('docxTemplate', v as any)}> <Select value={docxTemplate} onValueChange={(v) => setSetting('docxTemplate', v as any)}>
<SelectTrigger id="export-docx-template" aria-label="Default DOCX template"><SelectValue /></SelectTrigger> <SelectTrigger id="export-docx-template" aria-label="Default DOCX template">
<SelectValue />
</SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="standard">Standard</SelectItem> <SelectItem value="standard">Standard</SelectItem>
<SelectItem value="minimal">Minimal</SelectItem> <SelectItem value="minimal">Minimal</SelectItem>
@@ -47,8 +71,13 @@ export function ExportSettings() {
</div> </div>
<div> <div>
<Label htmlFor="export-html-highlight">Default HTML highlight</Label> <Label htmlFor="export-html-highlight">Default HTML highlight</Label>
<Select value={htmlHighlightStyle} onValueChange={(v) => setSetting('htmlHighlightStyle', v as any)}> <Select
<SelectTrigger id="export-html-highlight" aria-label="Default HTML highlight"><SelectValue /></SelectTrigger> value={htmlHighlightStyle}
onValueChange={(v) => setSetting('htmlHighlightStyle', v as any)}
>
<SelectTrigger id="export-html-highlight" aria-label="Default HTML highlight">
<SelectValue />
</SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="github">GitHub</SelectItem> <SelectItem value="github">GitHub</SelectItem>
<SelectItem value="monokai">Monokai</SelectItem> <SelectItem value="monokai">Monokai</SelectItem>
@@ -59,7 +88,11 @@ export function ExportSettings() {
</div> </div>
<label className="flex items-center justify-between"> <label className="flex items-center justify-between">
<span>Render tables as ASCII by default</span> <span>Render tables as ASCII by default</span>
<Switch checked={renderTablesAsAscii} onCheckedChange={(c) => setSetting('renderTablesAsAscii', c)} aria-label="ASCII tables by default" /> <Switch
checked={renderTablesAsAscii}
onCheckedChange={(c) => setSetting('renderTablesAsAscii', c)}
aria-label="ASCII tables by default"
/>
</label> </label>
</div> </div>
); );
@@ -1,5 +1,12 @@
import { useState } from 'react'; import { useState } from 'react';
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'; import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { Checkbox } from '@/components/ui/checkbox'; import { Checkbox } from '@/components/ui/checkbox';
import { Input } from '@/components/ui/input'; import { Input } from '@/components/ui/input';
@@ -47,10 +54,10 @@ export function FindInFilesDialog() {
return ( return (
<Dialog open onOpenChange={(o) => !o && closeModal()}> <Dialog open onOpenChange={(o) => !o && closeModal()}>
<DialogContent aria-describedby="find-desc" className="max-w-2xl"> <DialogContent className="max-w-2xl">
<DialogHeader> <DialogHeader>
<DialogTitle>Find in files</DialogTitle> <DialogTitle>Find in files</DialogTitle>
<DialogDescription id="find-desc"> <DialogDescription>
{rootPath ? `Search in ${rootPath}` : 'No folder open'} {rootPath ? `Search in ${rootPath}` : 'No folder open'}
</DialogDescription> </DialogDescription>
</DialogHeader> </DialogHeader>
@@ -67,22 +74,35 @@ export function FindInFilesDialog() {
</div> </div>
<div className="flex gap-4"> <div className="flex gap-4">
<label className="flex items-center gap-2"> <label className="flex items-center gap-2">
<Checkbox checked={isRegex} onCheckedChange={(c) => setIsRegex(!!c)} aria-label="Regex" /> <Checkbox
checked={isRegex}
onCheckedChange={(c) => setIsRegex(!!c)}
aria-label="Regex"
/>
Regex Regex
</label> </label>
<label className="flex items-center gap-2"> <label className="flex items-center gap-2">
<Checkbox checked={caseSensitive} onCheckedChange={(c) => setCaseSensitive(!!c)} aria-label="Case sensitive" /> <Checkbox
checked={caseSensitive}
onCheckedChange={(c) => setCaseSensitive(!!c)}
aria-label="Case sensitive"
/>
Case sensitive Case sensitive
</label> </label>
</div> </div>
{error && ( {error && (
<div role="alert" className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive"> <div
role="alert"
className="rounded border border-destructive/40 bg-destructive/5 p-2 text-xs text-destructive"
>
{error} {error}
</div> </div>
)} )}
{results.length > 0 && ( {results.length > 0 && (
<div> <div>
<Label>{results.length} result{results.length === 1 ? '' : 's'}</Label> <Label>
{results.length} result{results.length === 1 ? '' : 's'}
</Label>
<div className="max-h-64 overflow-auto rounded border border-border bg-card/20 text-xs"> <div className="max-h-64 overflow-auto rounded border border-border bg-card/20 text-xs">
{results.map((r, i) => ( {results.map((r, i) => (
<button <button
@@ -91,7 +111,9 @@ export function FindInFilesDialog() {
className="block w-full truncate border-b border-border/30 px-2 py-1 text-left hover:bg-card/50" className="block w-full truncate border-b border-border/30 px-2 py-1 text-left hover:bg-card/50"
data-testid="find-result" data-testid="find-result"
> >
<span className="font-mono text-muted-foreground">{r.filePath}:{r.line}</span> <span className="font-mono text-muted-foreground">
{r.filePath}:{r.line}
</span>
<span className="ml-2">{r.content}</span> <span className="ml-2">{r.content}</span>
</button> </button>
))} ))}
@@ -100,7 +122,9 @@ export function FindInFilesDialog() {
)} )}
</div> </div>
<DialogFooter> <DialogFooter>
<Button variant="ghost" onClick={closeModal} disabled={submitting}>Close</Button> <Button variant="ghost" onClick={closeModal} disabled={submitting}>
Close
</Button>
<Button onClick={handleSearch} disabled={submitting || !query}> <Button onClick={handleSearch} disabled={submitting || !query}>
{submitting ? 'Searching…' : 'Search'} {submitting ? 'Searching…' : 'Search'}
</Button> </Button>

Some files were not shown because too many files have changed in this diff Show More