Merge branch 'dev' of gs.github.com:greatsquare0/thy-weaver

Author: greatsquare0

packages/core/package.json

@@ -21,6 +21,11 @@
     },
     "./types": {
       "types": "./types/index.d.ts"
+    },
+    "./plugin_helpers": {
+      "import": "./dist/plugin_helpers.js",
+      "require": "./dist/plugin_helpers.js",
+      "types": "./dist/plugin_helpers.d.ts"
     }
   },
   "files": [

packages/core/pnpm-lock.yaml

@@ -8,6 +8,9 @@ import { runDev } from "./run_dev.ts";
 import { rm } from "fs/promises";
 import { resolveToProjectRoot } from "./utils.ts";
 import { handleTweegoSetup } from "./build_commands.ts";
+import { loadConfig } from "./config/config_handler.ts";
+
+const config = await loadConfig();
 
 program
   .name("weaver")
@@ -74,4 +77,12 @@ program
     console.log("WIP");
   });
 
+if (config.plugins) {
+  config.plugins.forEach((plugin) => {
+    if (plugin.command !== undefined) {
+      program.addCommand(plugin.command);
+    }
+  });
+}
+
 program.parse();

packages/core/src/cli.ts

@@ -3,7 +3,7 @@ import swc from "@swc/core";
 import { defaultConfig } from "./defaults.ts";
 import { randomUUID } from "node:crypto";
 import { writeFile, mkdir, rm } from "node:fs/promises";
-import { tempFolderPath } from "../utils.ts";
+import { isTS, resolveToProjectRoot, tempFolderPath } from "../utils.ts";
 import { resolve } from "node:path";
 import { existsSync } from "node:fs";
 import { pathToFileURL } from "node:url";
@@ -61,15 +61,18 @@ const loadTsConfig = async (_filepath: string, content: string) => {
 };
 
 const options: Partial<Options> = {
-  searchPlaces: ["thyweaver.config.ts", "thyweaver.config.js"],
   loaders: {
     ...defaultLoaders,
     ".ts": loadTsConfig,
   },
 };
 
 export const loadConfig = async () => {
-  const result = await lilconfig("weaver", options).search();
+  const result = await lilconfig("weaver", options).load(
+    isTS
+      ? resolveToProjectRoot("thyweaver.config.ts")
+      : resolveToProjectRoot("thyweaver.config.js"),
+  );
   return result!.config as ThyWevearOptions;
 };
 

packages/core/src/config/config_handler.ts

@@ -1,4 +1,5 @@
 import type { Config as SWCOptions } from "@swc/core";
+import type { Command } from "commander";
 
 export interface AdditionalAsset {
   /**
@@ -52,7 +53,13 @@ export interface DevServerOptions {
   twineDebug: boolean;
 }
 
+export interface Plugin {
+  name: string;
+  command?: Command;
+}
+
 export interface ThyWevearOptions {
+  plugins?: Plugin[];
   devServer?: DevServerOptions;
   bundler: BundlerOptions;
 }

packages/core/src/config/config_types.ts

@@ -3,6 +3,7 @@ import swc from "./swc_defaults.ts";
 import postcss from "./postcss_defaults.ts";
 import { resolve } from "node:path";
 import { tempFolderPath } from "../utils.ts";
+import { isTS } from "../utils.ts";
 
 export const defaultConfig: ThyWevearOptions = {
   devServer: {
@@ -18,7 +19,9 @@ export const defaultConfig: ThyWevearOptions = {
     filesystem: {
       dist: "dist/",
       projectFiles: {
-        entryPoint: "src/assets/app/index.ts",
+        entryPoint: isTS
+          ? "src/assets/app/index.ts"
+          : "src/assets/app/index.js",
         fontsDir: "src/assets/fonts/",
         mediaDir: "src/assets/media/",
         vendorFilesDir: "src/assets/vendor/",

packages/core/src/config/defaults.ts

@@ -1,9 +1,9 @@
-import { H3, serve, serveStatic } from "h3";
+import { createEventStream, H3, serve, serveStatic } from "h3";
 import { loadConfig } from "../config/config_handler.ts";
 import { readFile, stat } from "node:fs/promises";
 import { join } from "node:path";
 import { devState, resolveToProjectRoot } from "../utils.ts";
-
+import { addStream, broadcast, removeStream } from "./streams.ts";
 const config = await loadConfig();
 
 const app = new H3();
@@ -56,7 +56,9 @@ app.use("/media/**", (event) => {
         .join("/");
 
       const path = join(
-        resolveToProjectRoot(config.bundler.filesystem!.projectFiles.mediaDir),
+        resolveToProjectRoot(
+          config.bundler.filesystem!.projectFiles!.mediaDir!,
+        ),
         parsedId,
       );
 
@@ -71,7 +73,9 @@ app.use("/media/**", (event) => {
         .join("/");
 
       const path = join(
-        resolveToProjectRoot(config.bundler.filesystem!.projectFiles.mediaDir),
+        resolveToProjectRoot(
+          config.bundler.filesystem!.projectFiles!.mediaDir!,
+        ),
         parsedId,
       );
 
@@ -85,6 +89,20 @@ app.use("/media/**", (event) => {
     },
   });
 });
+
+app.get("/events/", async (event) => {
+  const eventStream = createEventStream(event);
+  addStream(eventStream);
+
+  await broadcast("Test message");
+
+  eventStream.onClosed(() => {
+    removeStream(eventStream);
+  });
+
+  return eventStream.send();
+});
+
 const startServer = () => {
   return serve(app, {
     port: config.devServer!.port,