@mauroandre/velojs 0.0.44 → 0.0.46

package/dist/cli.js

@@ -1,43 +1,43 @@
-import { spawnSync as c } from "node:child_process";
+import { spawnSync as a } from "node:child_process";
 import { join as n, resolve as u } from "node:path";
 import p from "node:fs";
-const o = process.argv.slice(2), a = o[0], v = (e, s = []) => {
-  const t = c(e, s, {
+const t = process.argv.slice(2), c = t[0], v = (s, e = []) => {
+  const o = a(s, e, {
     stdio: "inherit",
     cwd: process.cwd()
   });
-  process.exit(t.status ?? 0);
+  process.exit(o.status ?? 0);
 }, m = () => {
-  v("npx", ["vite", ...o.slice(1)]);
-}, j = (e) => {
-  const s = Date.now().toString(36), t = {
+  v("npx", ["vite", ...t.slice(1)]);
+}, f = (s) => {
+  const e = Date.now().toString(36), o = {
     ...process.env,
-    VELO_BUILD_HASH: s,
-    ...e ? { VELO_STATIC: "1" } : {}
+    VELO_BUILD_HASH: e,
+    ...s ? { VELO_STATIC: "1" } : {}
   };
   console.log("Building client...");
-  const r = c("npx", ["vite", "build"], {
+  const r = a("npx", ["vite", "build"], {
     stdio: "inherit",
     cwd: process.cwd(),
-    env: t
+    env: o
   });
   r.status !== 0 && (console.error("Client build failed. Aborting."), process.exit(r.status ?? 1)), console.log("Building server...");
-  const i = c("npx", ["vite", "build", "--mode", "server"], {
+  const i = a("npx", ["vite", "build", "--mode", "server"], {
     stdio: "inherit",
     cwd: process.cwd(),
-    env: t
+    env: o
   });
-  i.status !== 0 && (console.error("Server build failed. Aborting."), process.exit(i.status ?? 1)), console.log("Build complete!"), e && b();
-}, b = async () => {
+  i.status !== 0 && (console.error("Server build failed. Aborting."), process.exit(i.status ?? 1)), console.log("Build complete!"), s && j();
+}, j = async () => {
   process.env.NODE_ENV = "production", process.env.VELO_STATIC = "1";
-  const s = await import(u(process.cwd(), "dist/server.js")), t = s.default, r = s.routes;
-  (!t || !r) && (console.error("Failed to load app or routes from dist/server.js"), process.exit(1));
+  const e = await import(u(process.cwd(), "dist/server.js")), o = e.default, r = e.routes;
+  (!o || !r) && (console.error("Failed to load app or routes from dist/server.js"), process.exit(1));
   const { generateStatic: i } = await import("./static.js");
-  await i(t, r);
-}, f = () => {
+  await i(o, r);
+}, b = () => {
   process.env.NODE_ENV = "production";
-  const e = u(process.cwd(), "dist/server.js");
-  v("node", [e]);
+  const s = u(process.cwd(), "dist/server.js");
+  v("node", [s]);
 }, d = () => {
   console.log(`
 VeloJS CLI
@@ -46,7 +46,7 @@ Usage:
   velojs <command>
 
 Commands:
-  init             Create a new VeloJS project
+  init             Create a new VeloJS project (fails only on file conflicts; --force overwrites)
   dev              Start development server
   build            Build for production (client + server)
   build --static   Build as static site (HTML + JSON)
@@ -65,30 +65,35 @@ Examples:
   velojs graph --view
 `);
 };
-switch (a) {
+switch (c) {
   case "init": {
-    const { runInit: e } = await import("./init.js");
-    await e(o[1]);
+    const { runInit: s } = await import("./init.js");
+    try {
+      const e = t[1] && !t[1].startsWith("-") ? t[1] : void 0;
+      await s(e, { force: t.includes("--force") });
+    } catch (e) {
+      console.error(e.message), process.exit(1);
+    }
     break;
   }
   case "dev":
     m();
     break;
   case "build": {
-    const e = o.includes("--static");
-    j(e);
+    const s = t.includes("--static");
+    f(s);
     break;
   }
   case "start":
-    f();
+    b();
     break;
   case "graph": {
-    const { buildGraph: e } = await import("./graph.js"), s = process.cwd(), t = o[1] && !o[1].startsWith("-") ? o[1] : null, r = n(s, t ?? "app"), i = e(r), l = n(s, ".velojs");
+    const { buildGraph: s } = await import("./graph.js"), e = process.cwd(), o = t[1] && !t[1].startsWith("-") ? t[1] : null, r = n(e, o ?? "app"), i = s(r), l = n(e, ".velojs");
     p.mkdirSync(l, { recursive: !0 });
-    const w = n(l, "graph.json");
-    if (p.writeFileSync(w, JSON.stringify(i)), console.log("Graph written to .velojs/graph.json"), o.includes("--view")) {
-      const { serveGraphViewer: g } = await import("./graph-viewer.js"), h = await g(s);
-      console.log(`Graph viewer running at ${h} (Ctrl+C to stop)`);
+    const g = n(l, "graph.json");
+    if (p.writeFileSync(g, JSON.stringify(i)), console.log("Graph written to .velojs/graph.json"), t.includes("--view")) {
+      const { serveGraphViewer: h } = await import("./graph-viewer.js"), w = await h(e);
+      console.log(`Graph viewer running at ${w} (Ctrl+C to stop)`);
     }
     break;
   }
@@ -98,5 +103,5 @@ switch (a) {
     d();
     break;
   default:
-    a && console.error(`Unknown command: ${a}`), d(), process.exit(1);
+    c && console.error(`Unknown command: ${c}`), d(), process.exit(1);
 }

package/dist/hooks.js

@@ -1,39 +1,39 @@
-import { signal as w, useSignal as c } from "@preact/signals";
-import { useEffect as E, useRef as S } from "preact/hooks";
-import { useLocation as b, useParams as A } from "wouter-preact";
-import { refetchModule as m, loaderLoading as L, loaderEntry as N } from "./loader-store.js";
-import { __veloUpdatePending as Q } from "./loader-store.js";
-function R(e) {
+import { signal as S, useSignal as c } from "@preact/signals";
+import { useEffect as E, useRef as w } from "preact/hooks";
+import { useLocation as D, useParams as $, useSearch as C } from "wouter-preact";
+import { refetchModule as L, loaderLoading as m, loaderEntry as N } from "./loader-store.js";
+import { __veloUpdatePending as z } from "./loader-store.js";
+function U(e) {
   const n = e.value;
   n === null || typeof n != "object" || (e.value = Array.isArray(n) ? [...n] : { ...n });
 }
-function U(e) {
+function W(e) {
   return typeof window > "u" ? {
     data: {
       get value() {
         return e ? globalThis.__veloServerData?.getStore?.()?.[e] ?? null : null;
       }
     },
-    loading: w(!1),
+    loading: S(!1),
     refetch: () => {
     }
   } : e ? {
     data: N(e),
-    loading: L(e),
-    refetch: () => m(e)
-  } : { data: w(null), loading: w(!1), refetch: () => {
+    loading: m(e),
+    refetch: () => L(e)
+  } : { data: S(null), loading: S(!1), refetch: () => {
   } };
 }
-function W(e, n) {
+function j(e, n) {
   let t, r;
   if (Array.isArray(e) ? r = e : (t = e, r = n), typeof window > "u") {
-    let _ = null;
+    let g = null;
     if (t) {
       const h = globalThis.__veloServerData?.getStore?.();
-      h?.[t] && (_ = h[t]);
+      h?.[t] && (g = h[t]);
     }
     return {
-      data: c(_),
+      data: c(g),
       loading: c(!1),
       refetch: () => {
       }
@@ -42,108 +42,105 @@ function W(e, n) {
   if (!t)
     return { data: c(null), loading: c(!1), refetch: () => {
     } };
-  const a = N(t), o = L(t), u = () => m(t), d = S(!0);
+  const o = N(t), a = m(t), u = () => L(t), d = w(!0);
   return E(() => {
-    d.current && (d.current = !1, a.value !== null) || u();
-  }, r ?? []), { data: a, loading: o, refetch: u };
+    d.current && (d.current = !1, o.value !== null) || u();
+  }, r ?? []), { data: o, loading: a, refetch: u };
 }
-function q() {
-  const [, e] = b();
+function J() {
+  const [, e] = D();
   return e;
 }
-function j() {
-  return typeof window > "u" ? globalThis.__veloServerData?.getStore?.()?.__params ?? {} : A();
+function M() {
+  return typeof window > "u" ? globalThis.__veloServerData?.getStore?.()?.__params ?? {} : $();
 }
-function G() {
+function q() {
   if (typeof window > "u")
     return globalThis.__veloServerData?.getStore?.()?.__query ?? {};
-  const e = window.__PAGE_DATA__;
-  if (e?.__query)
-    return e.__query;
-  const n = new URLSearchParams(window.location.search), t = {};
-  return n.forEach((r, a) => {
-    t[a] = r;
-  }), t;
+  const e = C(), n = {};
+  return new URLSearchParams(e).forEach((t, r) => {
+    n[r] = t;
+  }), n;
 }
-function J() {
-  return typeof window > "u" ? globalThis.__veloServerData?.getStore?.()?.__pathname ?? "/" : (b(), window.location.pathname);
+function x() {
+  return typeof window > "u" ? globalThis.__veloServerData?.getStore?.()?.__pathname ?? "/" : (D(), window.location.pathname);
 }
-function M(e, n = {}) {
-  const t = c(null), r = c(null), a = c(!1), o = c(null), { channel: u, enabled: d = !0 } = n;
+function G(e, n = {}) {
+  const t = c(null), r = c(null), o = c(!1), a = c(null), { channel: u, enabled: d = !0 } = n;
   return E(() => {
     if (typeof window > "u" || !d) return;
     if (!e.__path) {
       console.warn("[velojs] useEventStream: stream has no __path");
       return;
     }
-    t.value = null, r.value = null, a.value = !1, o.value = null;
-    const _ = u ? `${e.__path}?channel=${encodeURIComponent(u)}` : e.__path, s = new EventSource(_);
+    t.value = null, r.value = null, o.value = !1, a.value = null;
+    const g = u ? `${e.__path}?channel=${encodeURIComponent(u)}` : e.__path, s = new EventSource(g);
     return s.addEventListener("snapshot", (h) => {
       try {
         r.value = JSON.parse(h.data);
-      } catch (y) {
-        o.value = y;
+      } catch (_) {
+        a.value = _;
       }
     }), s.addEventListener("message", (h) => {
       try {
         t.value = JSON.parse(h.data);
-      } catch (y) {
-        o.value = y;
+      } catch (_) {
+        a.value = _;
       }
     }), s.addEventListener("heartbeat", () => {
     }), s.addEventListener("close", () => {
-      a.value = !0, s.close();
+      o.value = !0, s.close();
     }), s.addEventListener("error", () => {
-      s.readyState === EventSource.CLOSED && (a.value = !0);
+      s.readyState === EventSource.CLOSED && (o.value = !0);
     }), () => {
       s.close();
     };
-  }, [e, u, d]), { data: t, snapshot: r, closed: a, error: o };
+  }, [e, u, d]), { data: t, snapshot: r, closed: o, error: a };
 }
-function x(e, n = {}) {
-  const t = c("connecting"), r = c(null), a = c(null), o = S(null), u = S([]), { channel: d, onMessage: _, onOpen: s, onClose: h, onError: y, enabled: D = !0 } = n;
+function B(e, n = {}) {
+  const t = c("connecting"), r = c(null), o = c(null), a = w(null), u = w([]), { channel: d, onMessage: g, onOpen: s, onClose: h, onError: _, enabled: b = !0 } = n;
   return E(() => {
-    if (typeof window > "u" || !D) return;
+    if (typeof window > "u" || !b) return;
     if (!e.__path) {
       console.warn("[velojs] useSocket: stub has no __path");
       return;
     }
-    t.value = "connecting", r.value = null, a.value = null;
+    t.value = "connecting", r.value = null, o.value = null;
     const v = `${window.location.protocol === "https:" ? "wss:" : "ws:"}//${window.location.host}`, i = d ? `${v}${e.__path}?channel=${encodeURIComponent(d)}` : `${v}${e.__path}`, f = new WebSocket(i);
-    return f.binaryType = "arraybuffer", o.current = f, f.addEventListener("open", () => {
+    return f.binaryType = "arraybuffer", a.current = f, f.addEventListener("open", () => {
       t.value = "open";
       const l = u.current;
       u.current = [];
-      for (const g of l)
+      for (const y of l)
         try {
-          f.send(g);
+          f.send(y);
         } catch {
         }
       s?.();
     }), f.addEventListener("message", (l) => {
-      let g;
+      let y;
       if (typeof l.data == "string")
-        g = l.data;
+        y = l.data;
       else if (l.data instanceof ArrayBuffer)
-        g = new Uint8Array(l.data);
+        y = new Uint8Array(l.data);
       else
         return;
-      r.value = g, _?.(g);
+      r.value = y, g?.(y);
     }), f.addEventListener("close", (l) => {
-      t.value = "closed", o.current = null, h?.(l);
+      t.value = "closed", a.current = null, h?.(l);
     }), f.addEventListener("error", (l) => {
-      a.value = l, y?.(l);
+      o.value = l, _?.(l);
     }), () => {
-      o.current = null;
+      a.current = null;
       try {
         (f.readyState === WebSocket.OPEN || f.readyState === WebSocket.CONNECTING) && f.close();
       } catch {
       }
     };
-  }, [e.__path, d, D]), { send: (p) => {
+  }, [e.__path, d, b]), { send: (p) => {
     let v;
     typeof p == "string" || p instanceof Uint8Array ? v = p : v = JSON.stringify(p);
-    const i = o.current;
+    const i = a.current;
     if (i && i.readyState === WebSocket.OPEN)
       try {
         i.send(v);
@@ -151,23 +148,23 @@ function x(e, n = {}) {
       }
     else i && i.readyState === WebSocket.CONNECTING && u.current.push(v);
   }, close: (p, v) => {
-    const i = o.current;
+    const i = a.current;
     if (i)
       try {
         i.close(p, v);
       } catch {
       }
-  }, status: t, lastMessage: r, error: a };
+  }, status: t, lastMessage: r, error: o };
 }
 export {
-  U as Loader,
-  Q as __veloUpdatePending,
-  R as touch,
-  M as useEventStream,
-  W as useLoader,
-  q as useNavigate,
-  j as useParams,
-  J as usePathname,
-  G as useQuery,
-  x as useSocket
+  W as Loader,
+  z as __veloUpdatePending,
+  U as touch,
+  G as useEventStream,
+  j as useLoader,
+  J as useNavigate,
+  M as useParams,
+  x as usePathname,
+  q as useQuery,
+  B as useSocket
 };

package/dist/init.d.ts

@@ -1 +1,3 @@
-export declare function runInit(dirName?: string): Promise<void>;
+export declare function runInit(dirName?: string, opts?: {
+    force?: boolean;
+}): Promise<void>;

package/dist/init.js

@@ -1,12 +1,12 @@
-import t from "node:fs";
-import s from "node:path";
-import { fileURLToPath as d } from "node:url";
-const i = "@mauroandre/velojs";
-function m() {
-  const o = s.dirname(d(import.meta.url)), e = s.resolve(o, "../package.json");
-  return JSON.parse(t.readFileSync(e, "utf-8")).version;
+import e from "node:fs";
+import o from "node:path";
+import { fileURLToPath as x } from "node:url";
+const r = "@mauroandre/velojs";
+function v() {
+  const n = o.dirname(x(import.meta.url)), p = o.resolve(n, "../package.json");
+  return JSON.parse(e.readFileSync(p, "utf-8")).version;
 }
-const u = {
+const g = {
   ".gitignore": `# Dependencies
 node_modules/
 
@@ -26,7 +26,7 @@ dist/
         "start": "velojs start"
     },
     "dependencies": {
-        "${i}": "^${m()}"
+        "${r}": "^${v()}"
     },
     "devDependencies": {
         "@types/node": "latest",
@@ -34,7 +34,7 @@ dist/
     }
 }
 `,
-  "vite.config.ts": `import { veloPlugin } from "${i}/vite";
+  "vite.config.ts": `import { veloPlugin } from "${r}/vite";
 
 export default { plugins: [veloPlugin()] };
 `,
@@ -59,7 +59,7 @@ export default { plugins: [veloPlugin()] };
     "exclude": ["node_modules", "dist"]
 }
 `,
-  "app/routes.tsx": `import type { AppRoutes } from "${i}";
+  "app/routes.tsx": `import type { AppRoutes } from "${r}";
 
 import * as Root from "./client-root.js";
 import * as Home from "./pages/Home.js";
@@ -79,11 +79,11 @@ export default [
 `,
   "app/server.tsx": `// Server initialization
 // Use this file to set up server-side logic:
-//   import { addRoutes, onServer } from "${i}/server";
+//   import { addRoutes, onServer } from "${r}/server";
 `,
   "app/client.tsx": `import "./styles/global.css";
 `,
-  "app/client-root.tsx": `import { Scripts } from "${i}";
+  "app/client-root.tsx": `import { Scripts } from "${r}";
 
 interface RootProps {
     children: preact.ComponentChildren;
@@ -147,25 +147,39 @@ a:hover {
 };
 `
 };
-async function x(o) {
-  const e = o ? s.resolve(process.cwd(), o) : process.cwd(), n = s.basename(e);
-  t.existsSync(e) ? t.readdirSync(e).filter(
-    (r) => !r.startsWith(".") && r !== "node_modules"
-  ).length > 0 && (console.error(
-    `Error: Directory "${n}" is not empty. Use an empty directory.`
-  ), process.exit(1)) : t.mkdirSync(e, { recursive: !0 });
-  for (const [a, r] of Object.entries(u)) {
-    const p = s.join(e, a), l = s.dirname(p);
-    t.existsSync(l) || t.mkdirSync(l, { recursive: !0 });
-    const c = a === "package.json" ? r.replace("my-velojs-app", n) : r;
-    t.writeFileSync(p, c);
+async function b(n, p) {
+  const s = n ? o.resolve(process.cwd(), n) : process.cwd(), a = o.basename(s);
+  e.existsSync(s) || e.mkdirSync(s, { recursive: !0 });
+  const d = Object.keys(g).filter(
+    (t) => t !== ".gitignore" && e.existsSync(o.join(s, t))
+  );
+  if (d.length > 0 && !p?.force)
+    throw new Error(
+      `Cannot init in "${a}": these files already exist and would be overwritten:
+` + d.map((t) => `  ${t}`).join(`
+`) + "\nMove them away, or run `velojs init --force` to overwrite."
+    );
+  for (const [t, l] of Object.entries(g)) {
+    const i = o.join(s, t), m = o.dirname(i);
+    if (e.existsSync(m) || e.mkdirSync(m, { recursive: !0 }), t === ".gitignore" && e.existsSync(i)) {
+      const h = e.readFileSync(i, "utf-8"), u = l.split(`
+`).filter((c) => c && !c.startsWith("#") && !h.includes(c));
+      u.length > 0 && e.appendFileSync(i, `
+# VeloJS
+${u.join(`
+`)}
+`);
+      continue;
+    }
+    const f = t === "package.json" ? l.replace("my-velojs-app", a) : l;
+    e.writeFileSync(i, f);
   }
   console.log(`
-Project created in ${o ? n : "current directory"}!
+Project created in ${n ? a : "current directory"}!
 `), console.log(`Next steps:
-`), o && console.log(`  cd ${n}`), console.log("  npm install"), console.log(`  npx velojs dev
+`), n && console.log(`  cd ${a}`), console.log("  npm install"), console.log(`  npx velojs dev
 `);
 }
 export {
-  x as runInit
+  b as runInit
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mauroandre/velojs",
-    "version": "0.0.44",
+    "version": "0.0.46",
     "type": "module",
     "description": "Fullstack web framework built on Hono + Preact with Vite-powered AST transforms",
     "keywords": [