From d6190b7c055fbb6ca1c1af839d0ce324d006b73a Mon Sep 17 00:00:00 2001 From: Zef Hemel Date: Mon, 29 Sep 2025 11:17:55 +0200 Subject: [PATCH] Moving more files around --- build_client.ts | 4 +-- client/boot.ts | 2 +- client/client.ts | 6 ++-- client/client_system.ts | 2 +- .../{cm_plugins => codemirror}/admonition.ts | 0 client/{cm_plugins => codemirror}/block.ts | 0 .../{cm_plugins => codemirror}/block_quote.ts | 0 .../{cm_plugins => codemirror}/change.test.ts | 0 client/{cm_plugins => codemirror}/change.ts | 0 client/{cm_plugins => codemirror}/clean.ts | 0 client/{ => codemirror}/cm_util.ts | 0 .../{cm_plugins => codemirror}/code_copy.ts | 0 .../{cm_plugins => codemirror}/code_widget.ts | 0 .../editor_paste.ts | 0 client/{ => codemirror}/editor_state.ts | 31 +++++++++---------- client/{cm_plugins => codemirror}/escapes.ts | 0 .../{cm_plugins => codemirror}/fenced_code.ts | 0 .../{cm_plugins => codemirror}/frontmatter.ts | 0 client/{cm_plugins => codemirror}/hashtag.ts | 0 .../{cm_plugins => codemirror}/hide_mark.ts | 0 .../iframe_widget.ts | 0 .../inline_content.ts | 0 .../line_wrapper.ts | 0 client/{cm_plugins => codemirror}/link.ts | 0 client/{cm_plugins => codemirror}/lint.ts | 0 client/{cm_plugins => codemirror}/list.ts | 0 .../lua_directive.ts | 0 .../{cm_plugins => codemirror}/lua_widget.ts | 0 .../smart_quotes.ts | 0 .../spell_checking.ts | 0 client/{cm_plugins => codemirror}/table.ts | 0 client/{cm_plugins => codemirror}/task.ts | 0 .../top_bottom_panels.ts | 0 client/{cm_plugins => codemirror}/util.ts | 0 .../{cm_plugins => codemirror}/widget_util.ts | 0 .../{cm_plugins => codemirror}/wiki_link.ts | 0 .../wiki_link_processor.ts | 0 client/components/mini_editor.tsx | 2 +- client/components/panel.tsx | 2 +- client/config.ts | 3 ++ client/editor_ui.tsx | 2 +- client/{ => html}/auth.html | 0 client/{ => html}/index.html | 0 client/plugos/syscalls/client_code_widget.ts | 2 +- client/reducer.ts | 3 +- client/service_worker.ts | 2 +- client/{ui_types.ts => types/ui.ts} | 4 +-- 47 files changed, 32 insertions(+), 33 deletions(-) rename client/{cm_plugins => codemirror}/admonition.ts (100%) rename client/{cm_plugins => codemirror}/block.ts (100%) rename client/{cm_plugins => codemirror}/block_quote.ts (100%) rename client/{cm_plugins => codemirror}/change.test.ts (100%) rename client/{cm_plugins => codemirror}/change.ts (100%) rename client/{cm_plugins => codemirror}/clean.ts (100%) rename client/{ => codemirror}/cm_util.ts (100%) rename client/{cm_plugins => codemirror}/code_copy.ts (100%) rename client/{cm_plugins => codemirror}/code_widget.ts (100%) rename client/{cm_plugins => codemirror}/editor_paste.ts (100%) rename client/{ => codemirror}/editor_state.ts (93%) rename client/{cm_plugins => codemirror}/escapes.ts (100%) rename client/{cm_plugins => codemirror}/fenced_code.ts (100%) rename client/{cm_plugins => codemirror}/frontmatter.ts (100%) rename client/{cm_plugins => codemirror}/hashtag.ts (100%) rename client/{cm_plugins => codemirror}/hide_mark.ts (100%) rename client/{cm_plugins => codemirror}/iframe_widget.ts (100%) rename client/{cm_plugins => codemirror}/inline_content.ts (100%) rename client/{cm_plugins => codemirror}/line_wrapper.ts (100%) rename client/{cm_plugins => codemirror}/link.ts (100%) rename client/{cm_plugins => codemirror}/lint.ts (100%) rename client/{cm_plugins => codemirror}/list.ts (100%) rename client/{cm_plugins => codemirror}/lua_directive.ts (100%) rename client/{cm_plugins => codemirror}/lua_widget.ts (100%) rename client/{cm_plugins => codemirror}/smart_quotes.ts (100%) rename client/{cm_plugins => codemirror}/spell_checking.ts (100%) rename client/{cm_plugins => codemirror}/table.ts (100%) rename client/{cm_plugins => codemirror}/task.ts (100%) rename client/{cm_plugins => codemirror}/top_bottom_panels.ts (100%) rename client/{cm_plugins => codemirror}/util.ts (100%) rename client/{cm_plugins => codemirror}/widget_util.ts (100%) rename client/{cm_plugins => codemirror}/wiki_link.ts (100%) rename client/{cm_plugins => codemirror}/wiki_link_processor.ts (100%) rename client/{ => html}/auth.html (100%) rename client/{ => html}/index.html (100%) rename client/{ui_types.ts => types/ui.ts} (98%) diff --git a/build_client.ts b/build_client.ts index d5657637..b96bae61 100644 --- a/build_client.ts +++ b/build_client.ts @@ -16,10 +16,10 @@ export async function bundleAll(): Promise { export async function copyAssets(dist: string) { await Deno.mkdir(dist, { recursive: true }); await copy("client/fonts", `${dist}`, { overwrite: true }); - await copy("client/index.html", `${dist}/index.html`, { + await copy("client/html/index.html", `${dist}/index.html`, { overwrite: true, }); - await copy("client/auth.html", `${dist}/auth.html`, { + await copy("client/html/auth.html", `${dist}/auth.html`, { overwrite: true, }); await copy("client/images/favicon.png", `${dist}/favicon.png`, { diff --git a/client/boot.ts b/client/boot.ts index e00f37fa..cf89751b 100644 --- a/client/boot.ts +++ b/client/boot.ts @@ -11,7 +11,7 @@ import { flushCachesAndUnregisterServiceWorker, } from "./service_worker/util.ts"; import "./lib/polyfills.ts"; -import type { BootConfig } from "./ui_types.ts"; +import type { BootConfig } from "./types/ui.ts"; import { BoxProxy } from "./lib/box_proxy.ts"; const logger = initLogger("[Client]"); diff --git a/client/client.ts b/client/client.ts index 23d53926..d79e8a10 100644 --- a/client/client.ts +++ b/client/client.ts @@ -29,7 +29,7 @@ import type { BootConfig, ServiceWorkerSourceMessage, ServiceWorkerTargetMessage, -} from "./ui_types.ts"; +} from "./types/ui.ts"; import type { PageCreatingContent, @@ -53,7 +53,7 @@ import { type Ref, } from "@silverbulletmd/silverbullet/lib/ref"; import { ClientSystem } from "./client_system.ts"; -import { createEditorState, isValidEditor } from "./editor_state.ts"; +import { createEditorState, isValidEditor } from "./codemirror/editor_state.ts"; import { MainUI } from "./editor_ui.tsx"; import type { SpacePrimitives } from "./spaces/space_primitives.ts"; import { DataStore } from "./data/datastore.ts"; @@ -63,7 +63,7 @@ import { DataStoreMQ } from "./data/mq.datastore.ts"; import { ReadOnlySpacePrimitives } from "./spaces/ro_space_primitives.ts"; import { LimitedMap } from "@silverbulletmd/silverbullet/lib/limited_map"; import { fsEndpoint, plugPrefix } from "./spaces/constants.ts"; -import { diffAndPrepareChanges } from "./cm_util.ts"; +import { diffAndPrepareChanges } from "./codemirror/cm_util.ts"; import { DocumentEditor } from "./document_editor.ts"; import { parseExpressionString } from "./space_lua/parse.ts"; import type { Config } from "./config.ts"; diff --git a/client/client_system.ts b/client/client_system.ts index 7cc6bcf6..f4cba888 100644 --- a/client/client_system.ts +++ b/client/client_system.ts @@ -34,7 +34,7 @@ import { languageSyscalls } from "./plugos/syscalls/language.ts"; import { codeWidgetSyscalls } from "./plugos/syscalls/code_widget.ts"; import { clientCodeWidgetSyscalls } from "./plugos/syscalls/client_code_widget.ts"; import { KVPrimitivesManifestCache } from "./plugos/manifest_cache.ts"; -import { createKeyBindings } from "./editor_state.ts"; +import { createKeyBindings } from "./codemirror/editor_state.ts"; import type { DataStoreMQ } from "./data/mq.datastore.ts"; import { jsonschemaSyscalls } from "./plugos/syscalls/jsonschema.ts"; import { luaSyscalls } from "./plugos/syscalls/lua.ts"; diff --git a/client/cm_plugins/admonition.ts b/client/codemirror/admonition.ts similarity index 100% rename from client/cm_plugins/admonition.ts rename to client/codemirror/admonition.ts diff --git a/client/cm_plugins/block.ts b/client/codemirror/block.ts similarity index 100% rename from client/cm_plugins/block.ts rename to client/codemirror/block.ts diff --git a/client/cm_plugins/block_quote.ts b/client/codemirror/block_quote.ts similarity index 100% rename from client/cm_plugins/block_quote.ts rename to client/codemirror/block_quote.ts diff --git a/client/cm_plugins/change.test.ts b/client/codemirror/change.test.ts similarity index 100% rename from client/cm_plugins/change.test.ts rename to client/codemirror/change.test.ts diff --git a/client/cm_plugins/change.ts b/client/codemirror/change.ts similarity index 100% rename from client/cm_plugins/change.ts rename to client/codemirror/change.ts diff --git a/client/cm_plugins/clean.ts b/client/codemirror/clean.ts similarity index 100% rename from client/cm_plugins/clean.ts rename to client/codemirror/clean.ts diff --git a/client/cm_util.ts b/client/codemirror/cm_util.ts similarity index 100% rename from client/cm_util.ts rename to client/codemirror/cm_util.ts diff --git a/client/cm_plugins/code_copy.ts b/client/codemirror/code_copy.ts similarity index 100% rename from client/cm_plugins/code_copy.ts rename to client/codemirror/code_copy.ts diff --git a/client/cm_plugins/code_widget.ts b/client/codemirror/code_widget.ts similarity index 100% rename from client/cm_plugins/code_widget.ts rename to client/codemirror/code_widget.ts diff --git a/client/cm_plugins/editor_paste.ts b/client/codemirror/editor_paste.ts similarity index 100% rename from client/cm_plugins/editor_paste.ts rename to client/codemirror/editor_paste.ts diff --git a/client/editor_state.ts b/client/codemirror/editor_state.ts similarity index 93% rename from client/editor_state.ts rename to client/codemirror/editor_state.ts index 37b08870..fe22e476 100644 --- a/client/editor_state.ts +++ b/client/codemirror/editor_state.ts @@ -1,4 +1,4 @@ -import customMarkdownStyle from "./style.ts"; +import customMarkdownStyle from "../style.ts"; import { history, indentWithTab, @@ -34,23 +34,20 @@ import { } from "@codemirror/view"; import { vim } from "@replit/codemirror-vim"; import { markdown } from "@codemirror/lang-markdown"; -import type { Client } from "./client.ts"; -import { inlineContentPlugin } from "./cm_plugins/inline_content.ts"; -import { cleanModePlugins } from "./cm_plugins/clean.ts"; -import { lineWrapper } from "./cm_plugins/line_wrapper.ts"; -import { createSmartQuoteKeyBindings } from "./cm_plugins/smart_quotes.ts"; -import { - documentExtension, - pasteLinkExtension, -} from "./cm_plugins/editor_paste.ts"; -import type { TextChange } from "./cm_plugins/change.ts"; -import { postScriptPrefacePlugin } from "./cm_plugins/top_bottom_panels.ts"; -import { languageFor } from "./languages.ts"; -import { plugLinter } from "./cm_plugins/lint.ts"; -import { extendedMarkdownLanguage } from "./markdown_parser/parser.ts"; +import type { Client } from "../client.ts"; +import { inlineContentPlugin } from "./inline_content.ts"; +import { cleanModePlugins } from "./clean.ts"; +import { lineWrapper } from "./line_wrapper.ts"; +import { createSmartQuoteKeyBindings } from "./smart_quotes.ts"; +import { documentExtension, pasteLinkExtension } from "./editor_paste.ts"; +import type { TextChange } from "./change.ts"; +import { postScriptPrefacePlugin } from "./top_bottom_panels.ts"; +import { languageFor } from "../languages.ts"; +import { plugLinter } from "./lint.ts"; +import { extendedMarkdownLanguage } from "../markdown_parser/parser.ts"; import { safeRun } from "@silverbulletmd/silverbullet/lib/async"; -import { codeCopyPlugin } from "./cm_plugins/code_copy.ts"; -import { disableSpellcheck } from "./cm_plugins/spell_checking.ts"; +import { codeCopyPlugin } from "../codemirror/code_copy.ts"; +import { disableSpellcheck } from "../codemirror/spell_checking.ts"; import type { ClickEvent } from "@silverbulletmd/silverbullet/type/client"; export function createEditorState( diff --git a/client/cm_plugins/escapes.ts b/client/codemirror/escapes.ts similarity index 100% rename from client/cm_plugins/escapes.ts rename to client/codemirror/escapes.ts diff --git a/client/cm_plugins/fenced_code.ts b/client/codemirror/fenced_code.ts similarity index 100% rename from client/cm_plugins/fenced_code.ts rename to client/codemirror/fenced_code.ts diff --git a/client/cm_plugins/frontmatter.ts b/client/codemirror/frontmatter.ts similarity index 100% rename from client/cm_plugins/frontmatter.ts rename to client/codemirror/frontmatter.ts diff --git a/client/cm_plugins/hashtag.ts b/client/codemirror/hashtag.ts similarity index 100% rename from client/cm_plugins/hashtag.ts rename to client/codemirror/hashtag.ts diff --git a/client/cm_plugins/hide_mark.ts b/client/codemirror/hide_mark.ts similarity index 100% rename from client/cm_plugins/hide_mark.ts rename to client/codemirror/hide_mark.ts diff --git a/client/cm_plugins/iframe_widget.ts b/client/codemirror/iframe_widget.ts similarity index 100% rename from client/cm_plugins/iframe_widget.ts rename to client/codemirror/iframe_widget.ts diff --git a/client/cm_plugins/inline_content.ts b/client/codemirror/inline_content.ts similarity index 100% rename from client/cm_plugins/inline_content.ts rename to client/codemirror/inline_content.ts diff --git a/client/cm_plugins/line_wrapper.ts b/client/codemirror/line_wrapper.ts similarity index 100% rename from client/cm_plugins/line_wrapper.ts rename to client/codemirror/line_wrapper.ts diff --git a/client/cm_plugins/link.ts b/client/codemirror/link.ts similarity index 100% rename from client/cm_plugins/link.ts rename to client/codemirror/link.ts diff --git a/client/cm_plugins/lint.ts b/client/codemirror/lint.ts similarity index 100% rename from client/cm_plugins/lint.ts rename to client/codemirror/lint.ts diff --git a/client/cm_plugins/list.ts b/client/codemirror/list.ts similarity index 100% rename from client/cm_plugins/list.ts rename to client/codemirror/list.ts diff --git a/client/cm_plugins/lua_directive.ts b/client/codemirror/lua_directive.ts similarity index 100% rename from client/cm_plugins/lua_directive.ts rename to client/codemirror/lua_directive.ts diff --git a/client/cm_plugins/lua_widget.ts b/client/codemirror/lua_widget.ts similarity index 100% rename from client/cm_plugins/lua_widget.ts rename to client/codemirror/lua_widget.ts diff --git a/client/cm_plugins/smart_quotes.ts b/client/codemirror/smart_quotes.ts similarity index 100% rename from client/cm_plugins/smart_quotes.ts rename to client/codemirror/smart_quotes.ts diff --git a/client/cm_plugins/spell_checking.ts b/client/codemirror/spell_checking.ts similarity index 100% rename from client/cm_plugins/spell_checking.ts rename to client/codemirror/spell_checking.ts diff --git a/client/cm_plugins/table.ts b/client/codemirror/table.ts similarity index 100% rename from client/cm_plugins/table.ts rename to client/codemirror/table.ts diff --git a/client/cm_plugins/task.ts b/client/codemirror/task.ts similarity index 100% rename from client/cm_plugins/task.ts rename to client/codemirror/task.ts diff --git a/client/cm_plugins/top_bottom_panels.ts b/client/codemirror/top_bottom_panels.ts similarity index 100% rename from client/cm_plugins/top_bottom_panels.ts rename to client/codemirror/top_bottom_panels.ts diff --git a/client/cm_plugins/util.ts b/client/codemirror/util.ts similarity index 100% rename from client/cm_plugins/util.ts rename to client/codemirror/util.ts diff --git a/client/cm_plugins/widget_util.ts b/client/codemirror/widget_util.ts similarity index 100% rename from client/cm_plugins/widget_util.ts rename to client/codemirror/widget_util.ts diff --git a/client/cm_plugins/wiki_link.ts b/client/codemirror/wiki_link.ts similarity index 100% rename from client/cm_plugins/wiki_link.ts rename to client/codemirror/wiki_link.ts diff --git a/client/cm_plugins/wiki_link_processor.ts b/client/codemirror/wiki_link_processor.ts similarity index 100% rename from client/cm_plugins/wiki_link_processor.ts rename to client/codemirror/wiki_link_processor.ts diff --git a/client/components/mini_editor.tsx b/client/components/mini_editor.tsx index 92bbea1e..4291df76 100644 --- a/client/components/mini_editor.tsx +++ b/client/components/mini_editor.tsx @@ -17,7 +17,7 @@ import { type ViewUpdate, } from "@codemirror/view"; import { getCM as vimGetCm, Vim, vim } from "@replit/codemirror-vim"; -import { createCommandKeyBindings } from "../editor_state.ts"; +import { createCommandKeyBindings } from "../codemirror/editor_state.ts"; type MiniEditorEvents = { onEnter: (newText: string, shiftDown?: boolean) => void; diff --git a/client/components/panel.tsx b/client/components/panel.tsx index f9af050f..2e006f6e 100644 --- a/client/components/panel.tsx +++ b/client/components/panel.tsx @@ -1,6 +1,6 @@ import { useEffect, useRef } from "preact/hooks"; import type { Client } from "../client.ts"; -import type { PanelConfig } from "../ui_types.ts"; +import type { PanelConfig } from "../types/ui.ts"; import { panelHtml } from "./panel_html.ts"; export function Panel({ diff --git a/client/config.ts b/client/config.ts index 94e209fb..8c17fbca 100644 --- a/client/config.ts +++ b/client/config.ts @@ -1,5 +1,8 @@ import { Ajv } from "ajv"; +/** + * Configuration management (config.* APIs) for the client + */ export class Config { public schemas: Record = { type: "object", diff --git a/client/editor_ui.tsx b/client/editor_ui.tsx index e2212fc0..ab2ef41c 100644 --- a/client/editor_ui.tsx +++ b/client/editor_ui.tsx @@ -8,7 +8,7 @@ import { type Action, type AppViewState, initialViewState, -} from "./ui_types.ts"; +} from "./types/ui.ts"; import * as featherIcons from "preact-feather"; import * as mdi from "./filtered_material_icons.ts"; import { h, render as preactRender } from "preact"; diff --git a/client/auth.html b/client/html/auth.html similarity index 100% rename from client/auth.html rename to client/html/auth.html diff --git a/client/index.html b/client/html/index.html similarity index 100% rename from client/index.html rename to client/html/index.html diff --git a/client/plugos/syscalls/client_code_widget.ts b/client/plugos/syscalls/client_code_widget.ts index eba58916..f03c3544 100644 --- a/client/plugos/syscalls/client_code_widget.ts +++ b/client/plugos/syscalls/client_code_widget.ts @@ -1,5 +1,5 @@ import type { SysCallMapping } from "../../plugos/system.ts"; -import { reloadAllWidgets } from "../../cm_plugins/code_widget.ts"; +import { reloadAllWidgets } from "../../codemirror/code_widget.ts"; import { broadcastReload } from "../../components/widget_sandbox_iframe.ts"; export function clientCodeWidgetSyscalls(): SysCallMapping { diff --git a/client/reducer.ts b/client/reducer.ts index dc08e766..3cd89bda 100644 --- a/client/reducer.ts +++ b/client/reducer.ts @@ -1,4 +1,4 @@ -import type { Action, AppViewState } from "./ui_types.ts"; +import type { Action, AppViewState } from "./types/ui.ts"; import type { PageMeta } from "../plug-api/types/index.ts"; import { isMarkdownPath, @@ -9,7 +9,6 @@ export default function reducer( state: AppViewState, action: Action, ): AppViewState { - // console.log("Got action", action); switch (action.type) { case "document-editor-loaded": return { diff --git a/client/service_worker.ts b/client/service_worker.ts index d9326228..f067f5b4 100644 --- a/client/service_worker.ts +++ b/client/service_worker.ts @@ -5,7 +5,7 @@ import { SyncEngine } from "./service_worker/sync_engine.ts"; import type { ServiceWorkerSourceMessage, ServiceWorkerTargetMessage, -} from "./ui_types.ts"; +} from "./types/ui.ts"; import { simpleHash } from "@silverbulletmd/silverbullet/lib/crypto"; import { IndexedDBKvPrimitives } from "./data/indexeddb_kv_primitives.ts"; import { fsEndpoint } from "./spaces/constants.ts"; diff --git a/client/ui_types.ts b/client/types/ui.ts similarity index 98% rename from client/ui_types.ts rename to client/types/ui.ts index 6283adc2..6dcff09d 100644 --- a/client/ui_types.ts +++ b/client/types/ui.ts @@ -1,4 +1,4 @@ -import type { Command } from "./types/command.ts"; +import type { Command } from "./command.ts"; import type { FilterOption, Notification, @@ -10,7 +10,7 @@ import type { PageMeta, } from "@silverbulletmd/silverbullet/type/index"; import type { Path } from "@silverbulletmd/silverbullet/lib/ref"; -import type { SyncStatus } from "./spaces/sync.ts"; +import type { SyncStatus } from "../spaces/sync.ts"; export type PanelConfig = { mode?: PanelMode;