@solidrt/cli 0.0.1-exp.9 → 0.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidrt/cli",
-  "version": "0.0.1-exp.9",
+  "version": "0.0.2",
   "license": "MIT",
   "author": "Antoine van Wel",
   "type": "module",
@@ -19,12 +19,12 @@
     "qrcode-generator": "^2.0.4"
   },
   "optionalDependencies": {
-    "@solidrt/darwin-arm64": "0.0.1-exp.9",
-    "@solidrt/linux-x64-gnu": "0.0.1-exp.9",
-    "@solidrt/win32-x64-msvc": "0.0.1-exp.9"
+    "@solidrt/darwin-arm64": "0.0.2",
+    "@solidrt/linux-x64-gnu": "0.0.2",
+    "@solidrt/win32-x64-msvc": "0.0.2"
   },
   "peerDependencies": {
-    "@solidrt/core": "0.0.1-exp.9",
+    "@solidrt/core": "0.0.2",
     "typescript": "^5"
   },
   "devDependencies": {

package/src/build.ts

@@ -48,7 +48,7 @@ export async function bundleTo(outfile: string) {
 }
 
 async function compileJs(jsCode: string, outfile: string) {
-  let compiler = requireBinary("flux")
+  let compiler = requireBinary("fluxc")
   let proc = Bun.spawn([compiler], {
     stdin: new Blob([jsCode]),
     stdout: "pipe",

package/src/bun-plugin-solid.ts

@@ -2,11 +2,8 @@ import { transformAsync } from "@babel/core"
 import ts from "@babel/preset-typescript"
 import solid from "babel-preset-solid"
 import { type BunPlugin } from "bun"
-import { resolve } from "path"
 
-// let ioDevPath = resolve(import.meta.dir, "io-dev.ts")
-
-export function solidPlugin(opts: { devBase?: string } = {}): BunPlugin {
+export function solidPlugin(): BunPlugin {
   return {
     name: "bun-plugin-solid",
     setup: (build) => {
@@ -19,20 +16,6 @@ export function solidPlugin(opts: { devBase?: string } = {}): BunPlugin {
         })
         return { contents: transforms?.code ?? "", loader: "js" }
       })
-
-      // // -- dev-mode qjs:io rewrite ----------------------------------
-      // // In dev, user code's `import * as io from "qjs:io"` is redirected
-      // // to a wrapper that proxies non-http targets through the dev
-      // // server. The wrapper itself imports `qjs:io` -- that one import
-      // // is short-circuited to `external` to break the cycle.
-      // if (opts.devBase) {
-      //   build.onResolve({ filter: /^qjs:io$/ }, (args) => {
-      //     if (args.importer === ioDevPath) {
-      //       return { path: "qjs:io", external: true }
-      //     }
-      //     return { path: ioDevPath }
-      //   })
-      // }
     },
   }
-}
+}

package/src/repl.ts

@@ -3,10 +3,13 @@ import { resolve, dirname } from "path"
 import { readdirSync } from "node:fs"
 import { state, print, printErr, broadcastStop, shutdown } from "./util"
 import { bundle } from "./build"
-import { startWatcher } from "./watcher"
+import { startWatcher, stopWatcher } from "./watcher"
 
 function cmdStop(args: string) {
   if (!args) {
+    stopWatcher()
+    state.currentCode = null
+    state.source = undefined
     broadcastStop()
     print("[cli] Sent stop to all clients")
     return

package/src/server.ts

@@ -44,10 +44,10 @@ export function startServer() {
           }),
         )
         entries.sort((a, b) => a.name.localeCompare(b.name))
-        return Response.json(entries)
+        return Response.json(entries, { headers: { "X-SRT-Type": "directory" } })
       }
 
-      return new Response(Bun.file(filePath))
+      return new Response(Bun.file(filePath), { headers: { "X-SRT-Type": "file" } })
     },
     websocket: {
       open(ws) {

package/src/util.ts

@@ -11,7 +11,7 @@ export let state = {
   source: undefined as string | undefined,
   sourceDir: process.cwd(),
   child: null as ReturnType<typeof Bun.spawn> | null,
-  server: null as BunServer<unknown> | null,
+  server: null as BunServer<undefined> | null,
   serverUrl: null as string | null,
   rl: null as ReadlineInterface | null,
 }

package/src/watcher.ts

@@ -5,6 +5,13 @@ import { bundle } from "./build"
 
 let currentWatcher: ReturnType<typeof watch> | null = null
 
+export function stopWatcher() {
+  if (currentWatcher) {
+    currentWatcher.close()
+    currentWatcher = null
+  }
+}
+
 export function startWatcher() {
   if (!state.source) return
   let watchDir = dirname(resolve(state.source))