From ff741b8075ee848d6a96dde931f322ccdd8cb359 Mon Sep 17 00:00:00 2001 From: Zef Hemel Date: Mon, 9 Jun 2025 17:57:20 +0200 Subject: [PATCH] Refactor: Moved spaces/ to lib/ --- .github/workflows/release.yml | 1 - cmd/sync.ts | 2 +- .../spaces/asset_bundle_space_primitives.ts | 0 {web => lib}/spaces/constants.ts | 0 .../spaces/datastore_space_primitives.test.ts | 0 .../spaces/datastore_space_primitives.ts | 0 {web => lib}/spaces/disk_space_primitives.ts | 0 .../spaces/evented_space_primitives.ts | 0 .../spaces/fallback_space_primitives.ts | 0 .../spaces/filtered_space_primitives.ts | 0 {web => lib}/spaces/http_space_primitives.ts | 4 ++-- .../spaces/kv_meta_space_primitives.ts | 0 {web => lib}/spaces/plug_space_primitives.ts | 0 {web => lib}/spaces/ro_space_primitives.ts | 0 {web => lib}/spaces/space_primitives.test.ts | 0 {web => lib}/spaces/space_primitives.ts | 0 {web => lib}/spaces/sync.test.ts | 0 {web => lib}/spaces/sync.ts | 0 server/shell.test.ts | 2 +- server/space_server.ts | 8 ++++---- server/storage_backend.ts | 6 +++--- web/client.ts | 18 +++++++++--------- web/client_system.ts | 2 +- web/service_worker.ts | 2 +- web/space.ts | 4 ++-- web/sync_service.ts | 6 +++--- 26 files changed, 27 insertions(+), 28 deletions(-) rename {web => lib}/spaces/asset_bundle_space_primitives.ts (100%) rename {web => lib}/spaces/constants.ts (100%) rename {web => lib}/spaces/datastore_space_primitives.test.ts (100%) rename {web => lib}/spaces/datastore_space_primitives.ts (100%) rename {web => lib}/spaces/disk_space_primitives.ts (100%) rename {web => lib}/spaces/evented_space_primitives.ts (100%) rename {web => lib}/spaces/fallback_space_primitives.ts (100%) rename {web => lib}/spaces/filtered_space_primitives.ts (100%) rename {web => lib}/spaces/http_space_primitives.ts (99%) rename {web => lib}/spaces/kv_meta_space_primitives.ts (100%) rename {web => lib}/spaces/plug_space_primitives.ts (100%) rename {web => lib}/spaces/ro_space_primitives.ts (100%) rename {web => lib}/spaces/space_primitives.test.ts (100%) rename {web => lib}/spaces/space_primitives.ts (100%) rename {web => lib}/spaces/sync.test.ts (100%) rename {web => lib}/spaces/sync.ts (100%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c4590bc9..ca71929e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,4 +34,3 @@ jobs: draft: false files: | website/CHANGELOG.md - dist/silverbullet.js diff --git a/cmd/sync.ts b/cmd/sync.ts index 9d7c87c9..206bcf96 100644 --- a/cmd/sync.ts +++ b/cmd/sync.ts @@ -1,4 +1,4 @@ -import { SpaceSync, type SyncStatusItem } from "../web/spaces/sync.ts"; +import { SpaceSync, type SyncStatusItem } from "../lib/spaces/sync.ts"; import { determineStorageBackend } from "../server/storage_backend.ts"; export async function syncCommand( diff --git a/web/spaces/asset_bundle_space_primitives.ts b/lib/spaces/asset_bundle_space_primitives.ts similarity index 100% rename from web/spaces/asset_bundle_space_primitives.ts rename to lib/spaces/asset_bundle_space_primitives.ts diff --git a/web/spaces/constants.ts b/lib/spaces/constants.ts similarity index 100% rename from web/spaces/constants.ts rename to lib/spaces/constants.ts diff --git a/web/spaces/datastore_space_primitives.test.ts b/lib/spaces/datastore_space_primitives.test.ts similarity index 100% rename from web/spaces/datastore_space_primitives.test.ts rename to lib/spaces/datastore_space_primitives.test.ts diff --git a/web/spaces/datastore_space_primitives.ts b/lib/spaces/datastore_space_primitives.ts similarity index 100% rename from web/spaces/datastore_space_primitives.ts rename to lib/spaces/datastore_space_primitives.ts diff --git a/web/spaces/disk_space_primitives.ts b/lib/spaces/disk_space_primitives.ts similarity index 100% rename from web/spaces/disk_space_primitives.ts rename to lib/spaces/disk_space_primitives.ts diff --git a/web/spaces/evented_space_primitives.ts b/lib/spaces/evented_space_primitives.ts similarity index 100% rename from web/spaces/evented_space_primitives.ts rename to lib/spaces/evented_space_primitives.ts diff --git a/web/spaces/fallback_space_primitives.ts b/lib/spaces/fallback_space_primitives.ts similarity index 100% rename from web/spaces/fallback_space_primitives.ts rename to lib/spaces/fallback_space_primitives.ts diff --git a/web/spaces/filtered_space_primitives.ts b/lib/spaces/filtered_space_primitives.ts similarity index 100% rename from web/spaces/filtered_space_primitives.ts rename to lib/spaces/filtered_space_primitives.ts diff --git a/web/spaces/http_space_primitives.ts b/lib/spaces/http_space_primitives.ts similarity index 99% rename from web/spaces/http_space_primitives.ts rename to lib/spaces/http_space_primitives.ts index 151e945c..233542a3 100644 --- a/web/spaces/http_space_primitives.ts +++ b/lib/spaces/http_space_primitives.ts @@ -1,10 +1,10 @@ import type { SpacePrimitives } from "./space_primitives.ts"; import type { FileMeta } from "../../plug-api/types.ts"; +import { encodePageURI } from "@silverbulletmd/silverbullet/lib/page_ref"; import { flushCachesAndUnregisterServiceWorker, unregisterServiceWorkers, -} from "../sw_util.ts"; -import { encodePageURI } from "@silverbulletmd/silverbullet/lib/page_ref"; +} from "../../web/sw_util.ts"; const defaultFetchTimeout = 30000; // 30 seconds diff --git a/web/spaces/kv_meta_space_primitives.ts b/lib/spaces/kv_meta_space_primitives.ts similarity index 100% rename from web/spaces/kv_meta_space_primitives.ts rename to lib/spaces/kv_meta_space_primitives.ts diff --git a/web/spaces/plug_space_primitives.ts b/lib/spaces/plug_space_primitives.ts similarity index 100% rename from web/spaces/plug_space_primitives.ts rename to lib/spaces/plug_space_primitives.ts diff --git a/web/spaces/ro_space_primitives.ts b/lib/spaces/ro_space_primitives.ts similarity index 100% rename from web/spaces/ro_space_primitives.ts rename to lib/spaces/ro_space_primitives.ts diff --git a/web/spaces/space_primitives.test.ts b/lib/spaces/space_primitives.test.ts similarity index 100% rename from web/spaces/space_primitives.test.ts rename to lib/spaces/space_primitives.test.ts diff --git a/web/spaces/space_primitives.ts b/lib/spaces/space_primitives.ts similarity index 100% rename from web/spaces/space_primitives.ts rename to lib/spaces/space_primitives.ts diff --git a/web/spaces/sync.test.ts b/lib/spaces/sync.test.ts similarity index 100% rename from web/spaces/sync.test.ts rename to lib/spaces/sync.test.ts diff --git a/web/spaces/sync.ts b/lib/spaces/sync.ts similarity index 100% rename from web/spaces/sync.ts rename to lib/spaces/sync.ts diff --git a/server/shell.test.ts b/server/shell.test.ts index 7bd93e8d..2202ffff 100644 --- a/server/shell.test.ts +++ b/server/shell.test.ts @@ -7,7 +7,7 @@ import { ShellStreamClient, type ShellStreamEvent, } from "../web/shell_stream_client.ts"; -import { HttpSpacePrimitives } from "../web/spaces/http_space_primitives.ts"; +import { HttpSpacePrimitives } from "$lib/spaces/http_space_primitives.ts"; // Create a test script async function createTestScript(dir: string): Promise { diff --git a/server/space_server.ts b/server/space_server.ts index bc83db86..8bc879c3 100644 --- a/server/space_server.ts +++ b/server/space_server.ts @@ -1,7 +1,7 @@ -import { AssetBundlePlugSpacePrimitives } from "../web/spaces/asset_bundle_space_primitives.ts"; -import { FilteredSpacePrimitives } from "../web/spaces/filtered_space_primitives.ts"; -import { ReadOnlySpacePrimitives } from "../web/spaces/ro_space_primitives.ts"; -import type { SpacePrimitives } from "../web/spaces/space_primitives.ts"; +import { AssetBundlePlugSpacePrimitives } from "../lib/spaces/asset_bundle_space_primitives.ts"; +import { FilteredSpacePrimitives } from "../lib/spaces/filtered_space_primitives.ts"; +import { ReadOnlySpacePrimitives } from "../lib/spaces/ro_space_primitives.ts"; +import type { SpacePrimitives } from "../lib/spaces/space_primitives.ts"; import type { AssetBundle } from "../lib/asset_bundle/bundle.ts"; import type { KvPrimitives } from "$lib/data/kv_primitives.ts"; import { JWTIssuer } from "./crypto.ts"; diff --git a/server/storage_backend.ts b/server/storage_backend.ts index 941dee69..f5f5f7e2 100644 --- a/server/storage_backend.ts +++ b/server/storage_backend.ts @@ -1,7 +1,7 @@ -import { DiskSpacePrimitives } from "../web/spaces/disk_space_primitives.ts"; -import type { SpacePrimitives } from "../web/spaces/space_primitives.ts"; +import { DiskSpacePrimitives } from "../lib/spaces/disk_space_primitives.ts"; +import type { SpacePrimitives } from "../lib/spaces/space_primitives.ts"; import { resolve } from "@std/path"; -import { HttpSpacePrimitives } from "../web/spaces/http_space_primitives.ts"; +import { HttpSpacePrimitives } from "../lib/spaces/http_space_primitives.ts"; export function determineStorageBackend( folder: string, diff --git a/web/client.ts b/web/client.ts index d2f48484..c8d79644 100644 --- a/web/client.ts +++ b/web/client.ts @@ -31,13 +31,13 @@ import type { } from "../plug-api/types.ts"; import type { StyleObject } from "../plugs/index/style.ts"; import { throttle } from "$lib/async.ts"; -import { PlugSpacePrimitives } from "./spaces/plug_space_primitives.ts"; -import { EventedSpacePrimitives } from "./spaces/evented_space_primitives.ts"; +import { PlugSpacePrimitives } from "../lib/spaces/plug_space_primitives.ts"; +import { EventedSpacePrimitives } from "../lib/spaces/evented_space_primitives.ts"; import { pageSyncInterval, SyncService } from "./sync_service.ts"; import { simpleHash } from "$lib/crypto.ts"; -import type { SyncStatus } from "./spaces/sync.ts"; -import { HttpSpacePrimitives } from "./spaces/http_space_primitives.ts"; -import { FallbackSpacePrimitives } from "./spaces/fallback_space_primitives.ts"; +import type { SyncStatus } from "../lib/spaces/sync.ts"; +import { HttpSpacePrimitives } from "../lib/spaces/http_space_primitives.ts"; +import { FallbackSpacePrimitives } from "../lib/spaces/fallback_space_primitives.ts"; import { encodePageURI, encodeRef, @@ -49,7 +49,7 @@ import { ClientSystem } from "./client_system.ts"; import { createEditorState } from "./editor_state.ts"; import { MainUI } from "./editor_ui.tsx"; import { cleanPageRef } from "@silverbulletmd/silverbullet/lib/resolve"; -import type { SpacePrimitives } from "./spaces/space_primitives.ts"; +import type { SpacePrimitives } from "../lib/spaces/space_primitives.ts"; import type { CodeWidgetButton, FileMeta, @@ -58,11 +58,11 @@ import type { import { DataStore } from "$lib/data/datastore.ts"; import { IndexedDBKvPrimitives } from "$lib/data/indexeddb_kv_primitives.ts"; import { DataStoreMQ } from "$lib/data/mq.datastore.ts"; -import { DataStoreSpacePrimitives } from "./spaces/datastore_space_primitives.ts"; +import { DataStoreSpacePrimitives } from "../lib/spaces/datastore_space_primitives.ts"; -import { ReadOnlySpacePrimitives } from "./spaces/ro_space_primitives.ts"; +import { ReadOnlySpacePrimitives } from "../lib/spaces/ro_space_primitives.ts"; import { LimitedMap } from "$lib/limited_map.ts"; -import { plugPrefix } from "./spaces/constants.ts"; +import { plugPrefix } from "../lib/spaces/constants.ts"; import { diffAndPrepareChanges } from "./cm_util.ts"; import { DocumentEditor } from "./document_editor.ts"; import { parseExpressionString } from "./space_lua/parse.ts"; diff --git a/web/client_system.ts b/web/client_system.ts index 28c4c76e..ba4afd20 100644 --- a/web/client_system.ts +++ b/web/client_system.ts @@ -34,7 +34,7 @@ import { clientCodeWidgetSyscalls } from "./syscalls/client_code_widget.ts"; import { KVPrimitivesManifestCache } from "$lib/plugos/manifest_cache.ts"; import { createKeyBindings } from "./editor_state.ts"; import type { DataStoreMQ } from "$lib/data/mq.datastore.ts"; -import { plugPrefix } from "./spaces/constants.ts"; +import { plugPrefix } from "../lib/spaces/constants.ts"; import { jsonschemaSyscalls } from "./syscalls/jsonschema.ts"; import { luaSyscalls } from "./syscalls/lua.ts"; import { indexSyscalls } from "./syscalls/index.ts"; diff --git a/web/service_worker.ts b/web/service_worker.ts index 7272a4d8..2c2dfb52 100644 --- a/web/service_worker.ts +++ b/web/service_worker.ts @@ -1,4 +1,4 @@ -import type { FileContent } from "./spaces/datastore_space_primitives.ts"; +import type { FileContent } from "$lib/spaces/datastore_space_primitives.ts"; import { simpleHash } from "$lib/crypto.ts"; import { DataStore } from "$lib/data/datastore.ts"; import { IndexedDBKvPrimitives } from "$lib/data/indexeddb_kv_primitives.ts"; diff --git a/web/space.ts b/web/space.ts index 615e4e83..adc07076 100644 --- a/web/space.ts +++ b/web/space.ts @@ -1,10 +1,10 @@ -import { plugPrefix } from "./spaces/constants.ts"; +import { plugPrefix } from "../lib/spaces/constants.ts"; import type { DocumentMeta, FileMeta, PageMeta } from "../plug-api/types.ts"; import type { EventHook } from "../web/hooks/event.ts"; import { safeRun } from "../lib/async.ts"; import { localDateString } from "$lib/dates.ts"; -import type { EventedSpacePrimitives } from "./spaces/evented_space_primitives.ts"; +import type { EventedSpacePrimitives } from "../lib/spaces/evented_space_primitives.ts"; const pageWatchInterval = 5000; diff --git a/web/sync_service.ts b/web/sync_service.ts index 16330d35..33dc9a6e 100644 --- a/web/sync_service.ts +++ b/web/sync_service.ts @@ -1,10 +1,10 @@ -import { plugPrefix, stdLibPrefix } from "./spaces/constants.ts"; -import type { SpacePrimitives } from "./spaces/space_primitives.ts"; +import { plugPrefix, stdLibPrefix } from "../lib/spaces/constants.ts"; +import type { SpacePrimitives } from "../lib/spaces/space_primitives.ts"; import { SpaceSync, type SyncStatus, type SyncStatusItem, -} from "./spaces/sync.ts"; +} from "../lib/spaces/sync.ts"; import { sleep } from "$lib/async.ts"; import type { EventHook } from "./hooks/event.ts"; import type { DataStore } from "$lib/data/datastore.ts";