Implements #1556

Massive code restructure

Author: zefhemel

.air.toml

@@ -6,7 +6,7 @@ tmp_dir = "tmp"
   bin = "silverbullet"
   cmd = "deno task build && go build"
   # delay = 10000
-  exclude_dir = ["node_modules", "website", "scripts", "dist_client_bundle", "dist_plug_bundle", "dist"]
+  exclude_dir = ["node_modules", "website", "scripts", "dist_client_bundle", "dist_base_fs_bundle", "dist"]
   exclude_file = ["public_version.ts"]
   exclude_regex = ["_test.go", ".test.ts"]
   exclude_unchanged = false

.gitignore

@@ -1,7 +1,7 @@
 .env
 .DS_Store
 dist_client_bundle
-dist_plug_bundle
+dist_base_fs_bundle
 dist
 *.js.map
 website_build

Makefile

@@ -1,9 +1,15 @@
 build:
 	# Build frontend
 	deno task build
+	# Build plug-compile
+	deno task build-plug-compile
 	# Build backend
 	go build
 
+clean:
+	deno task clean
+	rm -f silverbullet
+
 check:
 	# Frontend type check
 	deno task check
@@ -23,3 +29,7 @@ test:
 	deno task test
 	# Run backend tests
 	go test ./pkg/...
+
+generate:
+	# Regenerate the Lua parser from the the grammar
+	deno run -A npm:@lezer/generator@1.5.1 lib/space_lua/lua.grammar -o lib/space_lua/parse-lua.js

plug-compile.ts bin/plug-compile.tsplug-compile.ts renamed to bin/plug-compile.ts

@@ -1,9 +1,9 @@
 import.meta.main = false;
 import { Command } from "@cliffy/command";
 
-import { version } from "./version.ts";
+import { version } from "../version.ts";
 
-import { plugCompileCommand } from "./cmd/plug_compile.ts";
+import { plugCompileCommand } from "../lib/plugos/plug_compile.ts";
 
 await new Command()
   .name("plug-compile")

build_web.ts build_client.tsbuild_web.ts renamed to build_client.ts

@@ -3,68 +3,41 @@ import { fileURLToPath } from "node:url";
 
 import sass from "denosass";
 
-import { parseArgs } from "@std/cli/parse-args";
-import { patchDenoLibJS } from "./cmd/compile.ts";
+import { patchDenoLibJS } from "./lib/plugos/plug_compile.ts";
 import { denoPlugins } from "@luca/esbuild-deno-loader";
 import * as esbuild from "esbuild";
-import { updateVersionFile } from "./cmd/update_version.ts";
 
-export async function bundleAll(
-  watch: boolean,
-): Promise<void> {
-  let building = false;
+// This builds the client and puts it into dist_client_bundle/
+
+export async function bundleAll(): Promise<void> {
   await buildCopyBundleAssets();
-  let timer;
-  if (watch) {
-    const watcher = Deno.watchFs([
-      "web",
-      "dist_plug_bundle/_plug",
-      "lib",
-      "Library",
-    ]);
-    for await (const _event of watcher) {
-      if (timer) {
-        clearTimeout(timer);
-      }
-      timer = setTimeout(() => {
-        console.log("Change detected, rebuilding...");
-        if (building) {
-          return;
-        }
-        building = true;
-        buildCopyBundleAssets().finally(() => {
-          building = false;
-        });
-      }, 1000);
-    }
-  }
 }
 
 export async function copyAssets(dist: string) {
   await Deno.mkdir(dist, { recursive: true });
-  await copy("web/fonts", `${dist}`, { overwrite: true });
-  await copy("web/index.html", `${dist}/index.html`, {
+  await copy("client/fonts", `${dist}`, { overwrite: true });
+  await copy("client/index.html", `${dist}/index.html`, {
     overwrite: true,
   });
-  await copy("web/auth.html", `${dist}/auth.html`, {
+  await copy("client/auth.html", `${dist}/auth.html`, {
     overwrite: true,
   });
-  await copy("web/images/favicon.png", `${dist}/favicon.png`, {
+  await copy("client/images/favicon.png", `${dist}/favicon.png`, {
     overwrite: true,
   });
-  await copy("web/images/logo.png", `${dist}/logo.png`, {
+  await copy("client/images/logo.png", `${dist}/logo.png`, {
     overwrite: true,
   });
-  await copy("web/images/logo-dock.png", `${dist}/logo-dock.png`, {
+  await copy("client/images/logo-dock.png", `${dist}/logo-dock.png`, {
     overwrite: true,
   });
-  await copy("web/manifest.json", `${dist}/manifest.json`, {
+  await copy("client/manifest.json", `${dist}/manifest.json`, {
     overwrite: true,
   });
   const compiler = sass(
-    Deno.readTextFileSync("web/styles/main.scss"),
+    Deno.readTextFileSync("client/styles/main.scss"),
     {
-      load_paths: ["web/styles"],
+      load_paths: ["client/styles"],
     },
   );
   await Deno.writeTextFile(
@@ -80,23 +53,18 @@ export async function copyAssets(dist: string) {
 
 async function buildCopyBundleAssets() {
   await Deno.mkdir("dist_client_bundle", { recursive: true });
-  await Deno.mkdir("dist_plug_bundle", { recursive: true });
-
-  // Copy Library files
-  await copy("Library", "dist_plug_bundle/Library", {
-    overwrite: true,
-  });
+  await Deno.mkdir("dist_base_fs_bundle", { recursive: true });
 
   console.log("Now ESBuilding the client and service workers...");
 
   const result = await esbuild.build({
     entryPoints: [
       {
-        in: "web/boot.ts",
+        in: "client/boot.ts",
         out: ".client/client",
       },
       {
-        in: "web/service_worker.ts",
+        in: "client/service_worker.ts",
         out: "service_worker",
       },
     ],
@@ -133,16 +101,6 @@ async function buildCopyBundleAssets() {
 }
 
 if (import.meta.main) {
-  const args = parseArgs(Deno.args, {
-    boolean: ["watch"],
-    alias: { w: "watch" },
-    default: {
-      watch: false,
-    },
-  });
-  await updateVersionFile();
-  await bundleAll(args.watch);
-  if (!args.watch) {
-    esbuild.stop();
-  }
+  await bundleAll();
+  esbuild.stop();
 }

build_plug_compile.ts

@@ -4,7 +4,7 @@ import * as esbuild from "esbuild";
 await Deno.mkdir("dist", { recursive: true });
 const result = await esbuild.build({
   entryPoints: {
-    "plug-compile": "plug-compile.ts",
+    "plug-compile": "./bin/plug-compile.ts",
   },
   outdir: "dist",
   format: "esm",

build_plugs.ts

@@ -0,0 +1,68 @@
+import * as path from "@std/path";
+import * as esbuild from "esbuild";
+import { compileManifests } from "./lib/plugos/plug_compile.ts";
+import { builtinPlugNames } from "./plugs/builtin_plugs.ts";
+import { parseArgs } from "@std/cli/parse-args";
+import { fileURLToPath } from "node:url";
+import { copy } from "@std/fs";
+import { version } from "./version.ts";
+
+// This builds all built-in plugs and libraries and puts them into dist_base_fs_bundle/
+
+if (import.meta.main) {
+  await updateVersionFile();
+  const args = parseArgs(Deno.args, {
+    boolean: ["debug", "reload", "info"],
+    alias: { w: "watch" },
+  });
+
+  const manifests = builtinPlugNames.map((name) =>
+    `./plugs/${name}/${name}.plug.yaml`
+  );
+
+  const plugBundlePath = "dist_base_fs_bundle";
+  const targetDir = path.join(plugBundlePath, "_plug");
+  Deno.mkdirSync(targetDir, { recursive: true });
+  Deno.mkdirSync("dist", { recursive: true });
+
+  // Copy Library files
+  await copy("libraries/Library", "dist_base_fs_bundle/Library", {
+    overwrite: true,
+  });
+
+  // Build the plugs
+  await compileManifests(
+    manifests,
+    targetDir,
+    {
+      debug: args.debug,
+      info: args.info,
+      configPath: fileURLToPath(new URL("deno.json", import.meta.url)),
+    },
+  );
+  esbuild.stop();
+}
+
+export async function updateVersionFile() {
+  const command = new Deno.Command("git", {
+    args: ["describe", "--tags", "--long"],
+    stdout: "piped",
+    stderr: "piped",
+  });
+
+  const { stdout } = await command.output();
+  let commitVersion = new TextDecoder().decode(stdout).trim();
+
+  if (!commitVersion) {
+    // Probably no valid .git repo, fallback to GITHUB_SHA env var (used in CI)
+    commitVersion = `${version}-${Deno.env.get("GITHUB_SHA") || "unknown"}`;
+  }
+
+  const versionFilePath = "./public_version.ts";
+  const versionContent = `export const publicVersion = "${commitVersion}";`;
+
+  await Deno.writeTextFile(versionFilePath, versionContent);
+  console.log(
+    `Updated public_version.ts with version information: ${commitVersion}`,
+  );
+}