Skip to content

Commit f4336bf

Browse files
committed
Code restructuring: eliminated the top-level lib/ directory
1 parent 4fbdb4c commit f4336bf

File tree

175 files changed

+355
-329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+355
-329
lines changed

bin/plug-compile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Command } from "@cliffy/command";
33

44
import { version } from "../version.ts";
55

6-
import { plugCompileCommand } from "../lib/plugos/plug_compile.ts";
6+
import { plugCompileCommand } from "../client/plugos/plug_compile.ts";
77

88
await new Command()
99
.name("plug-compile")

build_client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { fileURLToPath } from "node:url";
33

44
import sass from "denosass";
55

6-
import { patchDenoLibJS } from "./lib/plugos/plug_compile.ts";
6+
import { patchDenoLibJS } from "./client/plugos/plug_compile.ts";
77
import { denoPlugins } from "@luca/esbuild-deno-loader";
88
import * as esbuild from "esbuild";
99

build_plugs_libraries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as path from "@std/path";
22
import * as esbuild from "esbuild";
3-
import { compileManifests } from "./lib/plugos/plug_compile.ts";
3+
import { compileManifests } from "./client/plugos/plug_compile.ts";
44
import { builtinPlugNames } from "./plugs/builtin_plugs.ts";
55
import { parseArgs } from "@std/cli/parse-args";
66
import { fileURLToPath } from "node:url";
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { base64Decode, base64EncodedDataUrl } from "../crypto.ts";
1+
import {
2+
base64Decode,
3+
base64EncodedDataUrl,
4+
} from "../../plug-api/lib/crypto.ts";
25

36
type DataUrl = string;
47

client/boot.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
import { safeRun } from "../lib/async.ts";
2-
import { notAuthenticatedError, offlineError } from "../lib/constants.ts";
3-
import { initLogger } from "../lib/logger.ts";
1+
import { safeRun } from "@silverbulletmd/silverbullet/lib/async";
2+
import {
3+
notAuthenticatedError,
4+
offlineError,
5+
} from "@silverbulletmd/silverbullet/constants";
6+
import { initLogger } from "./logger.ts";
47
import { extractSpaceLuaFromPageText, loadConfig } from "./boot_config.ts";
58
import { Client } from "./client.ts";
69
import type { Config } from "./config.ts";
@@ -9,7 +12,7 @@ import {
912
} from "./service_worker/util.ts";
1013
import "./polyfills.ts";
1114
import type { BootConfig } from "./ui_types.ts";
12-
import { BoxProxy } from "../lib/box_proxy.ts";
15+
import { BoxProxy } from "./box_proxy.ts";
1316

1417
const logger = initLogger("[Client]");
1518

client/boot_config.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ import {
33
traverseTree,
44
} from "@silverbulletmd/silverbullet/lib/tree";
55
import { parseMarkdown } from "./markdown_parser/parser.ts";
6-
import { System } from "../lib/plugos/system.ts";
7-
import { configSyscalls } from "./syscalls/config.ts";
6+
import { System } from "./plugos/system.ts";
7+
import { configSyscalls } from "./plugos/syscalls/config.ts";
88
import { Config } from "./config.ts";
9-
import { luaBuildStandardEnv } from "../lib/space_lua/stdlib.ts";
9+
import { luaBuildStandardEnv } from "./space_lua/stdlib.ts";
1010
import { exposeSyscalls } from "./space_lua_api.ts";
11-
import { parse } from "../lib/space_lua/parse.ts";
12-
import { LuaEnv, LuaStackFrame } from "../lib/space_lua/runtime.ts";
13-
import { evalStatement } from "../lib/space_lua/eval.ts";
14-
import { editorSyscalls } from "./syscalls/editor.ts";
15-
import { markdownSyscalls } from "./syscalls/markdown.ts";
16-
import { yamlSyscalls } from "./syscalls/yaml.ts";
17-
import { languageSyscalls } from "./syscalls/language.ts";
18-
import { jsonschemaSyscalls } from "./syscalls/jsonschema.ts";
11+
import { parse } from "./space_lua/parse.ts";
12+
import { LuaEnv, LuaStackFrame } from "./space_lua/runtime.ts";
13+
import { evalStatement } from "./space_lua/eval.ts";
14+
import { editorSyscalls } from "./plugos/syscalls/editor.ts";
15+
import { markdownSyscalls } from "./plugos/syscalls/markdown.ts";
16+
import { yamlSyscalls } from "./plugos/syscalls/yaml.ts";
17+
import { languageSyscalls } from "./plugos/syscalls/language.ts";
18+
import { jsonschemaSyscalls } from "./plugos/syscalls/jsonschema.ts";
1919

2020
/**
2121
* Parses a page (CONFIG in practice) and extracts all space-lua code
File renamed without changes.

0 commit comments

Comments
 (0)