project helpers

app/nose/bin/cat.ts

@@ -4,20 +4,13 @@ import { join, extname } from "path"
 
 import type { CommandOutput } from "app/src/shared/types"
 import { NOSE_WWW } from "app/src/config"
-import { getState } from "@/session"
-import { appDir } from "app/src/webapp"
 import { isBinaryFile } from "app/src/utils"
 import { highlight } from "../lib/highlight"
+import { projectName, projectDir } from "@/project"
 
 export default async function (path: string) {
-    const state = getState()
+    const project = projectName()
-    if (!state) return { error: "no state" }
+    const root = projectDir()
-
-    const project = state.project
-    if (!project) return { error: "no project loaded" }
-
-    const root = appDir(project)
-    if (!root) return { error: "error loading project" }
 
     let files: string[] = []
 

app/nose/bin/edit.tsx

@@ -1,23 +1,15 @@
-import { escapeHTML } from "bun"
 import { readdirSync } from "fs"
 import { join, extname } from "path"
 
 import type { CommandOutput } from "app/src/shared/types"
 import { NOSE_WWW } from "app/src/config"
-import { getState } from "@/session"
-import { appDir } from "app/src/webapp"
 import { isBinaryFile } from "app/src/utils"
 import { countChar } from "app/src/shared/utils"
+import { projectName, projectDir } from "@/project"
 
 export default async function (path: string) {
-  const state = getState()
+  const project = projectName()
-  if (!state) return { error: "no state" }
+  const root = projectDir()
-
-  const project = state.project
-  if (!project) return { error: "no project loaded" }
-
-  const root = appDir(project)
-  if (!root) return { error: "error loading project" }
 
   let files: string[] = []
 

app/nose/bin/ls.ts

@@ -1,22 +1,15 @@
 import { readdirSync } from "fs"
 import { NOSE_WWW } from "app/src/config"
-import { getState } from "@/session"
+import { projectName, projectDir } from "@/project"
-import { appDir } from "app/src/webapp"
 
 export default function () {
-    const state = getState()
+    const project = projectName()
-    if (!state) return { error: "no state" }
+    const root = projectDir()
-
-    const project = state.project
-    if (!project) return { error: "no project loaded" }
-
-    const root = appDir(project)
-    if (!root) return { error: "error loading project" }
 
     let files: string[] = []
 
     for (const file of readdirSync(root, { withFileTypes: true })) {
-        files.push(file.name)
+        files.push(file.isDirectory() ? `${file.name}/` : file.name)
     }
 
     if (root === NOSE_WWW) {

app/src/project.ts

@@ -0,0 +1,22 @@
+//// 
+// Helpers for working with projects in the CLI.
+
+import { getState } from "./session"
+import { appDir } from "./webapp"
+
+export function projectName(): string {
+  const state = getState()
+  if (!state) throw "no state"
+
+  const project = state.project
+  if (!project) throw "no project loaded"
+
+  return project
+}
+
+export function projectDir(): string {
+  const root = appDir(projectName())
+  if (!root) throw "error loading project"
+
+  return root
+}