@anaemia/cli 0.3.2 → 0.3.4

package/dist/commands/create.js

@@ -1,12 +1,12 @@
 import logger from "../utils/logger.js";
-import path from "path";
-import fs from "fs";
+import path from "node:path";
+import fs from "node:fs";
 import pc from "picocolors";
 import { generateSharedComponent, scaffoldFeature, scaffoldHook, scaffoldPage } from "../scaffold.js";
 import prompts from "prompts";
-import { transform } from "sucrase";
 import { fileURLToPath } from "node:url";
 import { fetchTemplate } from "../utils/fetch-template.js";
+import { convertTypeScriptToJs } from "../utils/ts-to-js.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 export function register(cli) {
@@ -91,12 +91,9 @@ export function register(cli) {
         else {
             fs.mkdirSync(targetPath, { recursive: true });
         }
-        let templatePath = path.resolve(__dirname, "../templates/template-base");
-        if (!fs.existsSync(templatePath)) {
-            templatePath = path.resolve(__dirname, "../templates/base-app");
-        }
+        const templatePath = path.resolve(__dirname, "../templates/base-app");
         if (fs.existsSync(templatePath)) {
-            logger.info("unpacking localized scaffolding architecture layout structures...");
+            logger.info("unpacking local template...");
             fs.cpSync(templatePath, targetPath, {
                 recursive: true,
                 filter: (src) => !["node_modules", "dist", ".anaemia", ".rspack"].includes(path.basename(src)),
@@ -121,39 +118,7 @@ export function register(cli) {
         removeGitKeepFiles(targetPath);
         if (response.variant === "js") {
             logger.info("converting workspace assets to vanilla JavaScript...");
-            const convertTypeScriptToJs = (dir) => {
-                const files = fs.readdirSync(dir);
-                for (const file of files) {
-                    const fullPath = path.join(dir, file);
-                    const stat = fs.statSync(fullPath);
-                    if (stat.isDirectory()) {
-                        convertTypeScriptToJs(fullPath);
-                    }
-                    else if (file.endsWith(".ts") || file.endsWith(".tsx")) {
-                        const isTsx = file.endsWith(".tsx");
-                        const code = fs.readFileSync(fullPath, "utf8");
-                        try {
-                            const compiled = transform(code, {
-                                transforms: isTsx ? ["typescript", "jsx"] : ["typescript"],
-                                jsxRuntime: "preserve",
-                                production: true,
-                            });
-                            const newExt = isTsx ? ".jsx" : ".js";
-                            const newPath = fullPath.replace(/\.tsx?$/, newExt);
-                            fs.writeFileSync(newPath, compiled.code, "utf8");
-                            fs.unlinkSync(fullPath);
-                        }
-                        catch {
-                            logger.warn(`failed to strip types from ${file}, skipping...`);
-                        }
-                    }
-                }
-            };
             convertTypeScriptToJs(targetPath);
-            const tsconfigPath = path.join(targetPath, "tsconfig.json");
-            if (fs.existsSync(tsconfigPath)) {
-                fs.unlinkSync(tsconfigPath);
-            }
         }
         const pkgJsonPath = path.join(targetPath, "package.json");
         if (fs.existsSync(pkgJsonPath)) {

package/dist/commands/dev.js

@@ -8,6 +8,7 @@ import { WebSocketServer } from "ws";
 import { WebSocket as NodeWS } from "ws";
 import { loadUserConfig } from "../utils/config.js";
 import logger from "../utils/logger.js";
+import { flattenWsMessage } from "../utils/flatten-ws-message.js";
 export function register(cli) {
     cli.command("dev", "launch local development environment").action(async () => {
         process.env.NODE_ENV = "development";
@@ -22,11 +23,7 @@ export function register(cli) {
         wss.on("connection", (clientWs) => {
             const rspackSocket = new NodeWS(`ws://localhost:${targetPort + 1}/ws`);
             rspackSocket.on("message", (data) => {
-                const flattened = Array.isArray(data) ? Buffer.concat(data) : data;
-                if (Buffer.isBuffer(flattened))
-                    clientWs.send(flattened.toString("utf-8"));
-                else
-                    clientWs.send(String(flattened));
+                clientWs.send(flattenWsMessage(data));
             });
             rspackSocket.on("error", (err) => {
                 console.warn("[anaemia hmr] rspack socket error:", err.message);

package/dist/utils/fetch-template.js

@@ -9,7 +9,7 @@ export async function fetchTemplate(targetPath) {
     await new Promise((resolve, reject) => {
         const extract = tar.extract({
             cwd: targetPath,
-            strip: 2,
+            strip: 3,
             filter: (p) => p.startsWith("anaemia-main/templates/base-app"),
         });
         extract.on("finish", resolve);

package/dist/utils/flatten-ws-message.js

@@ -0,0 +1,9 @@
+export function flattenWsMessage(data) {
+    if (Array.isArray(data))
+        return Buffer.concat(data).toString("utf-8");
+    if (Buffer.isBuffer(data))
+        return data.toString("utf-8");
+    if (data instanceof ArrayBuffer)
+        return Buffer.from(data).toString("utf-8");
+    return String(data);
+}

package/dist/utils/ts-to-js.js

@@ -0,0 +1,39 @@
+import fs from "node:fs";
+import path from "node:path";
+import { transform } from "sucrase";
+import logger from "./logger.js";
+export function convertTypeScriptToJs(dir) {
+    const files = fs.readdirSync(dir);
+    for (const file of files) {
+        const fullPath = path.join(dir, file);
+        const stat = fs.statSync(fullPath);
+        if (stat.isDirectory()) {
+            convertTypeScriptToJs(fullPath);
+            continue;
+        }
+        if (!file.endsWith(".ts") && !file.endsWith(".tsx"))
+            continue;
+        const isTsx = file.endsWith(".tsx");
+        const code = fs.readFileSync(fullPath, "utf8");
+        try {
+            const compiled = transform(code, {
+                transforms: isTsx ? ["typescript", "jsx"] : ["typescript"],
+                jsxRuntime: "preserve",
+                production: true,
+            });
+            const cleaned = compiled.code
+                .replace(/\n{3,}/g, "\n\n")
+                .trimStart();
+            const newPath = fullPath.replace(/\.tsx?$/, isTsx ? ".jsx" : ".js");
+            fs.writeFileSync(newPath, cleaned, "utf8");
+            fs.unlinkSync(fullPath);
+        }
+        catch {
+            logger.warn(`failed to strip types from ${file}, skipping...`);
+        }
+    }
+    const tsconfigPath = path.join(dir, "tsconfig.json");
+    if (fs.existsSync(tsconfigPath)) {
+        fs.unlinkSync(tsconfigPath);
+    }
+}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@anaemia/cli",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "type": "module",
   "bin": {
     "anaemia": "./dist/index.js"
   },
   "dependencies": {
-    "@anaemia/bundler": "^0.3.2",
-    "@anaemia/core": "^0.3.2",
+    "@anaemia/bundler": "^0.3.4",
+    "@anaemia/core": "^0.3.4",
     "@rspack/core": "^2.0.5",
     "@rspack/dev-server": "2.0.1",
     "cac": "^7.0.0",
@@ -27,6 +27,7 @@
   },
   "scripts": {
     "build": "tsc",
-    "dev": "tsc --watch"
+    "dev": "tsc --watch",
+    "test": "pnpm run build && node --test test/*.test.mjs test/commands/*.test.mjs"
   }
 }

package/src/commands/create.ts

@@ -1,13 +1,13 @@
 import type { CAC } from "cac";
 import logger from "../utils/logger.js";
-import path from "path";
-import fs from "fs";
+import path from "node:path";
+import fs from "node:fs";
 import pc from "picocolors";
 import { generateSharedComponent, scaffoldFeature, scaffoldHook, scaffoldPage } from "../scaffold.js";
 import prompts from "prompts";
-import { transform } from "sucrase";
 import { fileURLToPath } from "node:url";
 import { fetchTemplate } from "../utils/fetch-template.js";
+import { convertTypeScriptToJs } from "../utils/ts-to-js.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -110,13 +110,10 @@ export function register(cli: CAC) {
         fs.mkdirSync(targetPath, { recursive: true });
       }
 
-      let templatePath = path.resolve(__dirname, "../templates/template-base");
-      if (!fs.existsSync(templatePath)) {
-        templatePath = path.resolve(__dirname, "../templates/base-app");
-      }
+      const templatePath = path.resolve(__dirname, "../templates/base-app");
 
       if (fs.existsSync(templatePath)) {
-        logger.info("unpacking localized scaffolding architecture layout structures...");
+        logger.info("unpacking local template...");
         fs.cpSync(templatePath, targetPath, {
           recursive: true,
           filter: (src) => !["node_modules", "dist", ".anaemia", ".rspack"].includes(path.basename(src)),
@@ -137,49 +134,12 @@ export function register(cli: CAC) {
           }
         }
       };
+
       removeGitKeepFiles(targetPath);
 
       if (response.variant === "js") {
         logger.info("converting workspace assets to vanilla JavaScript...");
-
-        const convertTypeScriptToJs = (dir: string) => {
-          const files = fs.readdirSync(dir);
-
-          for (const file of files) {
-            const fullPath = path.join(dir, file);
-            const stat = fs.statSync(fullPath);
-
-            if (stat.isDirectory()) {
-              convertTypeScriptToJs(fullPath);
-            } else if (file.endsWith(".ts") || file.endsWith(".tsx")) {
-              const isTsx = file.endsWith(".tsx");
-              const code = fs.readFileSync(fullPath, "utf8");
-
-              try {
-                const compiled = transform(code, {
-                  transforms: isTsx ? ["typescript", "jsx"] : ["typescript"],
-                  jsxRuntime: "preserve",
-                  production: true,
-                });
-
-                const newExt = isTsx ? ".jsx" : ".js";
-                const newPath = fullPath.replace(/\.tsx?$/, newExt);
-
-                fs.writeFileSync(newPath, compiled.code, "utf8");
-                fs.unlinkSync(fullPath);
-              } catch {
-                logger.warn(`failed to strip types from ${file}, skipping...`);
-              }
-            }
-          }
-        };
-
         convertTypeScriptToJs(targetPath);
-
-        const tsconfigPath = path.join(targetPath, "tsconfig.json");
-        if (fs.existsSync(tsconfigPath)) {
-          fs.unlinkSync(tsconfigPath);
-        }
       }
 
       const pkgJsonPath = path.join(targetPath, "package.json");

package/src/commands/dev.ts

@@ -10,6 +10,7 @@ import { WebSocket as NodeWS } from "ws";
 import { loadUserConfig } from "../utils/config.js";
 import logger from "../utils/logger.js";
 import { ChildProcess } from "node:child_process";
+import { flattenWsMessage } from "../utils/flatten-ws-message.js";
 
 export function register(cli: CAC) {
   cli.command("dev", "launch local development environment").action(async () => {
@@ -31,9 +32,7 @@ export function register(cli: CAC) {
       const rspackSocket = new NodeWS(`ws://localhost:${targetPort + 1}/ws`);
 
       rspackSocket.on("message", (data) => {
-        const flattened = Array.isArray(data) ? Buffer.concat(data) : data;
-        if (Buffer.isBuffer(flattened)) clientWs.send(flattened.toString("utf-8"));
-        else clientWs.send(String(flattened));
+        clientWs.send(flattenWsMessage(data));
       });
 
       rspackSocket.on("error", (err) => {

package/src/utils/fetch-template.ts

@@ -12,7 +12,7 @@ export async function fetchTemplate(targetPath: string): Promise<void> {
   await new Promise<void>((resolve, reject) => {
     const extract = tar.extract({
       cwd: targetPath,
-      strip: 2,
+      strip: 3,
       filter: (p: string) => p.startsWith("anaemia-main/templates/base-app"),
     });
 

package/src/utils/flatten-ws-message.ts

@@ -0,0 +1,6 @@
+export function flattenWsMessage(data: Buffer | Buffer[] | ArrayBuffer | string): string {
+  if (Array.isArray(data)) return Buffer.concat(data).toString("utf-8");
+  if (Buffer.isBuffer(data)) return data.toString("utf-8");
+  if (data instanceof ArrayBuffer) return Buffer.from(data).toString("utf-8");
+  return String(data);
+}

package/src/utils/ts-to-js.ts

@@ -0,0 +1,46 @@
+import fs from "node:fs";
+import path from "node:path";
+import { transform } from "sucrase";
+import logger from "./logger.js";
+
+export function convertTypeScriptToJs(dir: string): void {
+  const files = fs.readdirSync(dir);
+
+  for (const file of files) {
+    const fullPath = path.join(dir, file);
+    const stat = fs.statSync(fullPath);
+
+    if (stat.isDirectory()) {
+      convertTypeScriptToJs(fullPath);
+      continue;
+    }
+
+    if (!file.endsWith(".ts") && !file.endsWith(".tsx")) continue;
+
+    const isTsx = file.endsWith(".tsx");
+    const code = fs.readFileSync(fullPath, "utf8");
+
+    try {
+      const compiled = transform(code, {
+        transforms: isTsx ? ["typescript", "jsx"] : ["typescript"],
+        jsxRuntime: "preserve",
+        production: true,
+      });
+
+      const cleaned = compiled.code
+        .replace(/\n{3,}/g, "\n\n")
+        .trimStart();
+
+      const newPath = fullPath.replace(/\.tsx?$/, isTsx ? ".jsx" : ".js");
+      fs.writeFileSync(newPath, cleaned, "utf8");
+      fs.unlinkSync(fullPath);
+    } catch {
+      logger.warn(`failed to strip types from ${file}, skipping...`);
+    }
+  }
+
+  const tsconfigPath = path.join(dir, "tsconfig.json");
+  if (fs.existsSync(tsconfigPath)) {
+    fs.unlinkSync(tsconfigPath);
+  }
+}

package/test/commands/create.test.mjs

@@ -0,0 +1,73 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import fs from "node:fs";
+import path from "node:path";
+import os from "node:os";
+
+function createTmpDir() {
+  return fs.mkdtempSync(path.join(os.tmpdir(), "anaemia-create-test-"));
+}
+
+test("convertTypeScriptToJs strips types from .ts files", async () => {
+  const dir = createTmpDir();
+  try {
+    fs.writeFileSync(path.join(dir, "index.ts"), `const x: string = "hello";\nexport default x;\n`);
+
+    const { convertTypeScriptToJs } = await import("../../dist/utils/ts-to-js.js");
+    convertTypeScriptToJs(dir);
+
+    assert.ok(!fs.existsSync(path.join(dir, "index.ts")), "ts file should be removed");
+    assert.ok(fs.existsSync(path.join(dir, "index.js")), "js file should exist");
+    const content = fs.readFileSync(path.join(dir, "index.js"), "utf-8");
+    assert.ok(!content.includes(": string"), "type annotation should be stripped");
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("convertTypeScriptToJs strips types from .tsx files", async () => {
+  const dir = createTmpDir();
+  try {
+    fs.writeFileSync(path.join(dir, "Component.tsx"), `export default function Comp(props: { name: string }) {\n  return <div>{props.name}</div>;\n}\n`);
+
+    const { convertTypeScriptToJs } = await import("../../dist/utils/ts-to-js.js");
+    convertTypeScriptToJs(dir);
+
+    assert.ok(!fs.existsSync(path.join(dir, "Component.tsx")));
+    assert.ok(fs.existsSync(path.join(dir, "Component.jsx")));
+    const content = fs.readFileSync(path.join(dir, "Component.jsx"), "utf-8");
+    assert.ok(!content.includes(": string"));
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("convertTypeScriptToJs cleans up leading blank lines", async () => {
+  const dir = createTmpDir();
+  try {
+    fs.writeFileSync(path.join(dir, "root.tsx"), `import { JSX } from "solid-js";\n\nexport default function Root(props: { children: JSX.Element }) {\n  return <>{props.children}</>;\n}\n`);
+
+    const { convertTypeScriptToJs } = await import("../../dist/utils/ts-to-js.js");
+    convertTypeScriptToJs(dir);
+
+    const content = fs.readFileSync(path.join(dir, "root.jsx"), "utf-8");
+    assert.ok(!content.startsWith("\n"), "file should not start with blank lines");
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("convertTypeScriptToJs removes tsconfig.json", async () => {
+  const dir = createTmpDir();
+  try {
+    fs.writeFileSync(path.join(dir, "tsconfig.json"), JSON.stringify({ compilerOptions: {} }));
+    fs.writeFileSync(path.join(dir, "index.ts"), `export const x = 1;\n`);
+
+    const { convertTypeScriptToJs } = await import("../../dist/utils/ts-to-js.js");
+    convertTypeScriptToJs(dir);
+
+    assert.ok(!fs.existsSync(path.join(dir, "tsconfig.json")));
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});

package/test/commands/dev.test.mjs

@@ -0,0 +1,17 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import { flattenWsMessage } from "../../dist/utils/flatten-ws-message.js";
+
+test("flattenWsMessage handles a plain string", () => {
+  assert.equal(flattenWsMessage("hello"), "hello");
+});
+
+test("flattenWsMessage handles a single Buffer", () => {
+  const buf = Buffer.from("hello");
+  assert.equal(flattenWsMessage(buf), "hello");
+});
+
+test("flattenWsMessage concatenates a Buffer array", () => {
+  const bufs = [Buffer.from("hel"), Buffer.from("lo")];
+  assert.equal(flattenWsMessage(bufs), "hello");
+});

package/test/fetch-template.test.mjs

@@ -0,0 +1,23 @@
+import test from "node:test";
+import assert from "node:assert";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
+import { fetchTemplate } from "../dist/utils/fetch-template.js";
+
+test("fetchTemplate extracts template contents directly into target directory", async () => {
+  const targetDir = fs.mkdtempSync(path.join(os.tmpdir(), "anaemia-template-"));
+
+  try {
+    await fetchTemplate(targetDir);
+
+    const files = fs.readdirSync(targetDir);
+    assert.ok(files.includes("package.json"), "missing package.json");
+    assert.ok(files.includes("src"), "missing src directory");
+    assert.ok(files.includes("anaemia.config.ts"), "missing anaemia.config.ts");
+    assert.ok(!files.includes("base-app"), "base-app subdirectory should not exist");
+  } finally {
+    fs.rmSync(targetDir, { recursive: true, force: true });
+  }
+});

package/src/types/rspack-dev-server.d.ts

@@ -1,15 +0,0 @@
-// fuck you typescript
-
-declare module "@rspack/dev-server" {
-  import type { Compiler, MultiCompiler, DevServer } from "@rspack/core";
-
-  export type DevServerConfiguration = DevServer;
-
-  export class RspackDevServer {
-    constructor(config: DevServer, compiler: Compiler | MultiCompiler);
-    start(): Promise<void>;
-    stop(): Promise<void>;
-  }
-
-  export default RspackDevServer;
-}