blockend-cli 1.4.4 → 1.4.6

package/dist/index.js

@@ -14,6 +14,15 @@ var REPO_NAME = "blockend";
 var BRANCH = "master";
 var RAW_CDN_BASE = `https://raw.githubusercontent.com/${REPO_OWNER}/${REPO_NAME}/${BRANCH}`;
 var MANIFEST_URL = `${RAW_CDN_BASE}/registry/index.json`;
+function blockSupportsEnv(block, envKey) {
+  if (block.frameworks && block.frameworks.length > 0) {
+    return block.frameworks.includes("*") || block.frameworks.includes(envKey);
+  }
+  return block.adapters?.[envKey] !== void 0 || block.environments?.[envKey] !== void 0;
+}
+function resolveAdapterContext(block, envKey) {
+  return block.adapters?.[envKey] ?? block.adapters?.["*"] ?? block.environments?.[envKey] ?? block.environments?.["*"] ?? null;
+}
 function rewriteFileImports(fileContent, writtenFilePath, blocksRoot, aliasBase) {
   if (!aliasBase || aliasBase.startsWith(".")) {
     return fileContent;
@@ -23,9 +32,7 @@ function rewriteFileImports(fileContent, writtenFilePath, blocksRoot, aliasBase)
   return fileContent.replace(importRegex, (match, keyword, openQuote, relativePath, closeQuote) => {
     const absoluteTarget = path.resolve(fileDir, relativePath);
     const fromBlocksRoot = path.relative(blocksRoot, absoluteTarget).replace(/\\/g, "/");
-    if (fromBlocksRoot.startsWith("..")) {
-      return match;
-    }
+    if (fromBlocksRoot.startsWith("..")) return match;
     const aliased = `${aliasBase}/${fromBlocksRoot}`.replace(/\/+/g, "/");
     return `${keyword}${openQuote}${aliased}${closeQuote}`;
   });
@@ -41,11 +48,7 @@ function outputResult(json, result) {
   if (json) {
     process.stdout.write(JSON.stringify(result) + "\n");
   } else {
-    if (result.success) {
-      outro(pc.green(`\u2728 ${result.message}`));
-    } else {
-      outro(pc.yellow(`\u2139 ${result.message}`));
-    }
+    outro(result.success ? pc.green(`\u2728 ${result.message}`) : pc.yellow(`\u2139 ${result.message}`));
   }
 }
 function handleCancel(value) {
@@ -92,7 +95,6 @@ async function addCommand(blockName, options = {}) {
   }
   if (config.language !== "typescript") {
     outputError(json, "Blockend currently only supports TypeScript projects.");
-    if (!json) outro(pc.dim("Exiting."));
     return;
   }
   const physicalBlocksPath = config.paths.blocks;
@@ -111,9 +113,7 @@ async function addCommand(blockName, options = {}) {
     if (!json) {
       s.stop("Failed to fetch registry.");
       log.error(pc.dim(String(err)));
-    } else {
-      outputError(json, "Failed to fetch the component registry from GitHub.");
-    }
+    } else outputError(json, "Failed to fetch registry from GitHub.");
     return;
   }
   const blockMap = registry.blocks && typeof registry.blocks === "object" && !Array.isArray(registry.blocks) ? registry.blocks : registry;
@@ -123,13 +123,11 @@ async function addCommand(blockName, options = {}) {
   }
   let targetBlock = blockName;
   if (!targetBlock) {
-    const available = Object.entries(blockMap).filter(([, block]) => {
-      if (!block) return false;
-      return block.adapters?.[envKey] !== void 0 || block.environments?.[envKey] !== void 0;
-    });
+    const available = Object.entries(blockMap).filter(
+      ([, block]) => block != null && blockSupportsEnv(block, envKey)
+    );
     if (available.length === 0) {
-      const msg = `No blocks available for environment: ${envKey}`;
-      outputError(json, msg);
+      outputError(json, `No blocks available for environment: ${envKey}`);
       if (!json) outro(pc.dim("Exiting."));
       return;
     }
@@ -148,17 +146,24 @@ async function addCommand(blockName, options = {}) {
   }
   const blockMeta = blockMap[targetBlock];
   if (!blockMeta) {
-    outputError(json, `Block "${targetBlock}" does not exist in the registry.`);
+    outputError(json, `Block "${targetBlock}" not found in the registry.`);
     return;
   }
-  const adapterContext = blockMeta.adapters?.[envKey] ?? blockMeta.environments?.[envKey];
-  if (!adapterContext) {
+  if (!blockSupportsEnv(blockMeta, envKey)) {
     outputError(json, `Block "${targetBlock}" does not support environment: ${envKey}`);
     return;
   }
+  const adapterContext = resolveAdapterContext(blockMeta, envKey);
+  if (!adapterContext) {
+    outputError(
+      json,
+      `Block "${targetBlock}" has no adapter or environment entry for: ${envKey}. This is a registry configuration issue \u2014 please open an issue.`
+    );
+    return;
+  }
   const variantKeys = Object.keys(adapterContext.variants ?? {});
   if (variantKeys.length === 0) {
-    outputError(json, `No variants found for block "${targetBlock}" in environment "${envKey}"`);
+    outputError(json, `No variants found for "${targetBlock}" / "${envKey}".`);
     return;
   }
   let selectedVariant;
@@ -197,17 +202,17 @@ async function addCommand(blockName, options = {}) {
     ...packageJson.devDependencies ?? {}
   };
   const missingProd = [
+    ...blockMeta.dependencies ?? [],
     ...adapterContext.dependencies ?? [],
     ...variantMeta?.dependencies ?? []
   ].filter((d) => !(d in installedDeps));
   const missingDev = [
+    ...blockMeta.dependencies ?? [],
     ...adapterContext.devDependencies ?? [],
     ...variantMeta?.devDependencies ?? []
   ].filter((d) => !(d in installedDeps));
   if (missingProd.length > 0 || missingDev.length > 0) {
-    if (!json) {
-      log.warn(`Missing dependencies: ${pc.cyan([...missingProd, ...missingDev].join(", "))}`);
-    }
+    if (!json) log.warn(`Missing: ${pc.cyan([...missingProd, ...missingDev].join(", "))}`);
     const shouldInstall = yes ? true : await confirm({ message: "Install missing dependencies?", initialValue: true });
     if (!yes) handleCancel(shouldInstall);
     if (shouldInstall) {
@@ -246,15 +251,13 @@ async function addCommand(blockName, options = {}) {
         if (!json) {
           s.stop("Installation failed.");
           log.error(pc.dim(String(err)));
-        } else {
-          outputError(json, "Dependency installation failed.");
-        }
+        } else outputError(json, "Dependency installation failed.");
         return;
       }
     }
   }
   const filesToDownload = [];
-  if (blockMeta.baseFiles && Array.isArray(blockMeta.baseFiles)) {
+  if (blockMeta.baseFiles?.length) {
     filesToDownload.push(...blockMeta.baseFiles);
   }
   if (adapterContext.core) {
@@ -265,11 +268,9 @@ async function addCommand(blockName, options = {}) {
   }
   if (variantMeta && Array.isArray(variantMeta.files)) {
     for (const entry of variantMeta.files) {
-      if (typeof entry === "string") {
-        filesToDownload.push({ source: entry, target: path.basename(entry) });
-      } else {
-        filesToDownload.push(entry);
-      }
+      filesToDownload.push(
+        typeof entry === "string" ? { source: entry, target: path.basename(entry) } : entry
+      );
     }
   }
   let hasConflict = false;
@@ -296,9 +297,8 @@ async function addCommand(blockName, options = {}) {
   const filesWritten = [];
   try {
     for (const fm of filesToDownload) {
-      const fileUrl = `${RAW_CDN_BASE}/${fm.source}`;
-      const res = await fetch(fileUrl);
-      if (!res.ok) throw new Error(`Failed to download: ${fm.source} (HTTP ${res.status})`);
+      const res = await fetch(`${RAW_CDN_BASE}/${fm.source}`);
+      if (!res.ok) throw new Error(`Download failed: ${fm.source} (HTTP ${res.status})`);
       let content = await res.text();
       const writtenFilePath = path.join(targetFolder, fm.target);
       content = rewriteFileImports(content, writtenFilePath, blocksRootAbsolute, aliasBase);
@@ -318,9 +318,7 @@ async function addCommand(blockName, options = {}) {
     if (!json) {
       s.stop("Failed.");
       log.error(pc.dim(String(err)));
-    } else {
-      outputError(json, "Fatal error while writing block files.");
-    }
+    } else outputError(json, "Fatal error while writing block files.");
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockend-cli",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "CLI for installing production-ready backend blocks into Next.js, Express, Hono, NestJS, and other Node.js applications.",
   "type": "module",
   "main": "./dist/index.js",