blockend-cli 1.3.0 → 1.3.1

package/dist/index.js

@@ -4,103 +4,11 @@
 import { Command } from "commander";
 
 // src/commands/init.ts
-import path, { join as join6 } from "path";
+import path, { join } from "path";
 import fs from "fs/promises";
-import { existsSync as existsSync4 } from "fs";
-import { intro, outro, select, text, confirm, spinner, isCancel } from "@clack/prompts";
-
-// ../detector/dist/index.js
-import { join as join5 } from "path";
-import { readFile } from "fs/promises";
-import { join } from "path";
-import { readFile as readFile2 } from "fs/promises";
 import { existsSync } from "fs";
-import { join as join2 } from "path";
-import { existsSync as existsSync2 } from "fs";
-import { join as join3 } from "path";
-import { existsSync as existsSync3 } from "fs";
-import { join as join4 } from "path";
-async function readPackageJson(cwd) {
-  const pkgPath = join(cwd, "package.json");
-  try {
-    const content = await readFile(pkgPath, "utf-8");
-    return JSON.parse(content);
-  } catch {
-    throw new Error(`No package.json found at ${pkgPath}. Run blockend from your project root.`);
-  }
-}
-async function readTsConfig(cwd) {
-  const tsconfigPath = join2(cwd, "tsconfig.json");
-  if (!existsSync(tsconfigPath)) return null;
-  try {
-    const content = await readFile2(tsconfigPath, "utf-8");
-    const cleanLines = content.split(/\r?\n/).filter((line) => {
-      const trimmed = line.trim();
-      return !trimmed.startsWith("//") && !trimmed.startsWith("/*");
-    }).join("\n").replace(/,(\s*[}\]])/g, "$1");
-    return JSON.parse(cleanLines);
-  } catch {
-    return null;
-  }
-}
-async function inferSrcDir(cwd) {
-  const candidates = ["src", "app", "lib"];
-  for (const dir of candidates) {
-    if (existsSync2(join3(cwd, dir))) {
-      return join3(cwd, dir);
-    }
-  }
-  return cwd;
-}
-function detectFramework(deps) {
-  if ("fastify" in deps) return "fastify";
-  if ("hono" in deps) return "hono";
-  if ("express" in deps) return "express";
-  if ("next" in deps) return "next";
-  return "none";
-}
-function detectRuntime(deps) {
-  if ("@types/bun" in deps || "bun-types" in deps) return "bun";
-  return "node";
-}
-function detectPackageManager(cwd) {
-  if (existsSync3(join4(cwd, "pnpm-lock.yaml"))) return "pnpm";
-  if (existsSync3(join4(cwd, "bun.lockb"))) return "bun";
-  if (existsSync3(join4(cwd, "yarn.lock"))) return "yarn";
-  return "npm";
-}
-async function detectProject(cwd) {
-  const [pkg, tsConfig] = await Promise.all([readPackageJson(cwd), readTsConfig(cwd)]);
-  const allDeps = {
-    ...pkg.dependencies,
-    ...pkg.devDependencies,
-    ...pkg.peerDependencies
-  };
-  const srcDir = await inferSrcDir(cwd);
-  return {
-    root: cwd,
-    language: tsConfig !== null ? "typescript" : "javascript",
-    runtime: detectRuntime(allDeps),
-    framework: detectFramework(allDeps),
-    packageManager: detectPackageManager(cwd),
-    hasRedis: "ioredis" in allDeps || "redis" in allDeps,
-    hasPrisma: "@prisma/client" in allDeps,
-    hasDrizzle: "drizzle-orm" in allDeps,
-    aliasMap: tsConfig?.compilerOptions?.paths ? flattenTsPaths(tsConfig.compilerOptions.paths) : {},
-    srcDir,
-    // Default blocks directory: srcDir/lib/blocks
-    blocksDir: join5(srcDir, "lib", "blocks")
-  };
-}
-function flattenTsPaths(paths) {
-  const result = {};
-  for (const [alias, targets] of Object.entries(paths)) {
-    if (targets[0]) {
-      result[alias.replace("/*", "/")] = targets[0].replace("/*", "/");
-    }
-  }
-  return result;
-}
+import { intro, outro, select, text, confirm, spinner, isCancel } from "@clack/prompts";
+import { detectProject } from "@blockend/detector";
 
 // src/ui/theme.ts
 import pc from "picocolors";
@@ -140,7 +48,7 @@ var format = {
 // src/commands/init.ts
 async function initCommand() {
   const cwd = process.cwd();
-  const configPath = join6(cwd, "blockend.json");
+  const configPath = join(cwd, "blockend.json");
   console.log(`
 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557       \u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557  \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2557   \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557
 \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551      \u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2551 \u2588\u2588\u2554\u255D\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557
@@ -150,7 +58,7 @@ async function initCommand() {
 \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D  \u255A\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u2550\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u255D
 `);
   intro(format.title("Blockend \xB7 Intelligent Backend Blocks Setup"));
-  if (existsSync4(configPath)) {
+  if (existsSync(configPath)) {
     const action = await select({
       message: "blockend.json already exists. What do you want to do?",
       options: [
@@ -212,7 +120,7 @@ async function initCommand() {
   const aliasPrefix = availableAliases.find((a) => blockAlias.startsWith(a)) || "";
   const physicalPrefix = aliasPrefix ? context.aliasMap[aliasPrefix] : "./";
   const resolvedSubDir = blockAlias.replace(aliasPrefix, "");
-  const assumedPhysicalDir = join6(physicalPrefix, resolvedSubDir);
+  const assumedPhysicalDir = join(physicalPrefix, resolvedSubDir);
   const relativeBlocksPath = path.relative(cwd, path.resolve(cwd, assumedPhysicalDir));
   const normalizedPath = relativeBlocksPath.replace(/\\/g, "/");
   const finalPath = normalizedPath.startsWith(".") ? normalizedPath : `./${normalizedPath}`;
@@ -250,7 +158,7 @@ async function initCommand() {
 }
 
 // src/commands/add.ts
-import path2, { join as join7, dirname } from "path";
+import path2, { join as join2, dirname } from "path";
 import fs2 from "fs/promises";
 import { exec } from "child_process";
 import { intro as intro2, outro as outro2, select as select2, spinner as spinner2, confirm as confirm2, isCancel as isCancel2 } from "@clack/prompts";
@@ -269,7 +177,7 @@ function handleCancel(value) {
 async function findUp(filename, startDir) {
   let dir = startDir;
   while (true) {
-    const checkPath = join7(dir, filename);
+    const checkPath = join2(dir, filename);
     try {
       await fs2.access(checkPath);
       return checkPath;
@@ -404,7 +312,7 @@ async function addCommand(blockName) {
     });
     handleCancel(shouldInstallPrompt);
     if (shouldInstallPrompt) {
-      const packageManager = await fs2.access(join7(packageJsonDir, "pnpm-lock.yaml")).then(() => "pnpm").catch(() => "npm");
+      const packageManager = await fs2.access(join2(packageJsonDir, "pnpm-lock.yaml")).then(() => "pnpm").catch(() => "npm");
       s.start(`Preparing native workspace via ${packageManager}...`);
       try {
         const installCmd = packageManager === "pnpm" ? `pnpm add ${missingDeps.join(" ")}` : `npm install ${missingDeps.join(" ")}`;
@@ -433,29 +341,36 @@ async function addCommand(blockName) {
   }
   s.start(`Downloading clean production template block [${targetBlock}]...`);
   try {
-    const BASE_URL = RAW_CDN_BASE;
-    const coreFileUrl = `${BASE_URL}/${envConfig.core}`;
-    const coreFetchResponse = await fetch(coreFileUrl);
-    if (!coreFetchResponse.ok) {
-      throw new Error(`Failed downloading core component file: ${coreFetchResponse.statusText}`);
+    const remoteFilesToDownload = [];
+    if (envConfig.core) {
+      remoteFilesToDownload.push(envConfig.core);
+    }
+    if (variantMeta && Array.isArray(variantMeta.files)) {
+      remoteFilesToDownload.push(...variantMeta.files);
     }
-    const coreCodeTemplate = await coreFetchResponse.text();
     let physicalPath = config.paths.blocks;
     if (physicalPath.startsWith("@")) {
       physicalPath = "./src/blocks";
     }
     let targetFolder = path2.resolve(rootDir, physicalPath);
     if (variantMeta && selectedVariant) {
-      targetFolder = join7(targetFolder, targetBlock);
+      targetFolder = join2(targetFolder, targetBlock);
     }
-    await fs2.mkdir(targetFolder, { recursive: true });
-    const coreOutputFilename = `${targetBlock}.ts`;
-    const coreTargetFileLocation = join7(targetFolder, coreOutputFilename);
-    try {
-      await fs2.access(coreTargetFileLocation);
+    let fileExistsConflict = false;
+    for (const remoteFile of remoteFilesToDownload) {
+      const parsedFilename = path2.basename(remoteFile, ".txt");
+      const checkFileLocation = join2(targetFolder, parsedFilename);
+      try {
+        await fs2.access(checkFileLocation);
+        fileExistsConflict = true;
+        break;
+      } catch {
+      }
+    }
+    if (fileExistsConflict) {
       s.stop();
       const overwritePrompt = await confirm2({
-        message: `\u26A0 Block component file [${coreOutputFilename}] already exists. Overwrite custom code revisions?`,
+        message: `\u26A0 Components in [${targetBlock}] already exist. Overwrite custom revisions?`,
         initialValue: false
       });
       handleCancel(overwritePrompt);
@@ -463,21 +378,19 @@ async function addCommand(blockName) {
         outro2(pc2.yellow("\u2139 Operation aborted safely. Local code modifications preserved."));
         return;
       }
-      s.start(`Re-downloading template block [${targetBlock}]...`);
-    } catch {
+      s.start(`Re-downloading template block files [${targetBlock}]...`);
     }
-    await fs2.writeFile(coreTargetFileLocation, coreCodeTemplate, "utf-8");
-    if (variantMeta && selectedVariant) {
-      const variantFileUrl = `${BASE_URL}/${variantMeta.path}`;
-      const variantFetchResponse = await fetch(variantFileUrl);
-      if (!variantFetchResponse.ok) {
-        throw new Error(
-          `Failed downloading storage variant file: ${variantFetchResponse.statusText}`
-        );
+    await fs2.mkdir(targetFolder, { recursive: true });
+    for (const remoteFilePath of remoteFilesToDownload) {
+      const fileUrl = `${RAW_CDN_BASE}/${remoteFilePath}`;
+      const response = await fetch(fileUrl);
+      if (!response.ok) {
+        throw new Error(`Failed downloading file: ${remoteFilePath} (${response.statusText})`);
       }
-      const variantCodeTemplate = await variantFetchResponse.text();
-      const variantOutputFilename = `store-${selectedVariant}.ts`;
-      await fs2.writeFile(join7(targetFolder, variantOutputFilename), variantCodeTemplate, "utf-8");
+      const rawCodeTemplate = await response.text();
+      const targetFilename = path2.basename(remoteFilePath, ".txt");
+      const localWriteLocation = join2(targetFolder, targetFilename);
+      await fs2.writeFile(localWriteLocation, rawCodeTemplate, "utf-8");
     }
     const cleanDisplayPath = variantMeta && selectedVariant ? `${physicalPath.replace(/\\/g, "/")}/${targetBlock}` : physicalPath.replace(/\\/g, "/");
     s.stop(pc2.green("\u2714 Component isolation structures written smoothly."));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockend-cli",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Intelligent, modular backend blocks right inside your terminal",
   "main": "./dist/index.js",
   "type": "module",
@@ -26,11 +26,13 @@
   "license": "ISC",
   "packageManager": "pnpm@10.33.2",
   "dependencies": {
+    "@blockend/detector": "workspace:*",
     "@clack/prompts": "^1.5.1",
     "commander": "^15.0.0",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {
-    "@types/node": "^25.9.3"
+    "@types/node": "^25.9.3",
+    "tsup": "^8.5.1"
   }
 }