jsrepo 1.0.1 → 1.0.3

package/dist/index.js

@@ -8,7 +8,7 @@ import { program as program5 } from "commander";
 import fs6 from "node:fs";
 import path5 from "node:path";
 import { cancel, confirm, isCancel, multiselect, outro, spinner as spinner2 } from "@clack/prompts";
-import color4 from "chalk";
+import color5 from "chalk";
 import { Command, program as program2 } from "commander";
 import { execa } from "execa";
 import { resolveCommand } from "package-manager-detector/commands";
@@ -689,7 +689,7 @@ var getConfig = () => {
 // src/utils/build.ts
 import fs4 from "node:fs";
 import path3 from "node:path";
-import color2 from "chalk";
+import color3 from "chalk";
 import { program } from "commander";
 import * as v2 from "valibot";
 
@@ -703,6 +703,7 @@ var INFO = color.bgBlueBright.white("INFO");
 import fs3 from "node:fs";
 import { builtinModules } from "node:module";
 import path2 from "node:path";
+import color2 from "chalk";
 import { walk } from "estree-walker";
 import * as sv from "svelte/compiler";
 import { Project } from "ts-morph";
@@ -719,6 +720,19 @@ var findNearestPackageJson = (startDir, until) => {
   return findNearestPackageJson(segments.slice(0, segments.length - 1).join("/"), until);
 };
 
+// src/utils/parse-package-name.ts
+var RE_SCOPED = /^(@[^\/]+\/[^@\/]+)(?:@([^\/]+))?(\/.*)?$/;
+var RE_NON_SCOPED = /^([^@\/]+)(?:@([^\/]+))?(\/.*)?$/;
+var parsePackageName = (input) => {
+  const m = RE_SCOPED.exec(input) || RE_NON_SCOPED.exec(input);
+  if (!m) return Err(`invalid package name: ${input}`);
+  return Ok({
+    name: m[1] || "",
+    version: m[2] || "latest",
+    path: m[3] || ""
+  });
+};
+
 // src/utils/language-support.ts
 var typescript = {
   matches: (fileName) => fileName.endsWith(".ts") || fileName.endsWith(".js") || fileName.endsWith(".tsx") || fileName.endsWith(".jsx"),
@@ -798,7 +812,7 @@ var resolveLocalImport = (mod, category, isSubDir) => {
 };
 var resolveRemoteDeps = (deps, filePath) => {
   const filteredDeps = deps.filter(
-    (dep) => !builtinModules.includes(dep) && !dep.startsWith("node:") && validatePackageName(dep).validForNewPackages
+    (dep) => !builtinModules.includes(dep) && !dep.startsWith("node:")
   );
   const pkgPath = findNearestPackageJson(path2.dirname(filePath), "");
   const dependencies = /* @__PURE__ */ new Set();
@@ -806,22 +820,36 @@ var resolveRemoteDeps = (deps, filePath) => {
   if (pkgPath) {
     const { devDependencies: packageDevDependencies, dependencies: packageDependencies } = JSON.parse(fs3.readFileSync(pkgPath, "utf-8"));
     for (const dep of filteredDeps) {
+      const parsed = parsePackageName(dep);
+      if (parsed.isErr()) {
+        console.warn(
+          `${WARN} Skipped adding import \`${color2.cyan(dep)}\`. Reason: Couldn't parse package name`
+        );
+        continue;
+      }
+      const depInfo = parsed.unwrap();
+      if (!validatePackageName(depInfo.name).validForNewPackages) {
+        console.warn(
+          `${WARN} Skipped adding import \`${color2.cyan(dep)}\`. Reason: Not a valid package name`
+        );
+        continue;
+      }
       let version2 = void 0;
       if (packageDependencies !== void 0) {
-        version2 = packageDependencies[dep];
+        version2 = packageDependencies[depInfo.name];
       }
       if (version2 !== void 0) {
-        dependencies.add(`${dep}@${version2}`);
+        dependencies.add(`${depInfo.name}@${version2}`);
         continue;
       }
       if (packageDevDependencies !== void 0) {
-        version2 = packageDevDependencies[dep];
+        version2 = packageDevDependencies[depInfo.name];
       }
       if (version2 !== void 0) {
-        devDependencies.add(`${dep}@${version2}`);
+        devDependencies.add(`${depInfo.name}@${version2}`);
         continue;
       }
-      dependencies.add(dep);
+      dependencies.add(depInfo.name);
     }
   }
   return {
@@ -855,7 +883,7 @@ var buildBlocksDirectory = (blocksPath, cwd) => {
   try {
     paths = fs4.readdirSync(blocksPath);
   } catch {
-    program.error(color2.red(`Couldn't read the ${color2.bold(blocksPath)} directory.`));
+    program.error(color3.red(`Couldn't read the ${color3.bold(blocksPath)} directory.`));
   }
   const categories = [];
   for (const categoryPath of paths) {
@@ -874,7 +902,7 @@ var buildBlocksDirectory = (blocksPath, cwd) => {
         const lang = languages.find((resolver) => resolver.matches(file));
         if (!lang) {
           console.warn(
-            `${WARN} Skipped \`${color2.bold(blockDir)}\` \`${color2.bold(
+            `${WARN} Skipped \`${color3.bold(blockDir)}\` \`${color3.bold(
               path3.parse(file).ext
             )}\` files are not currently supported!`
           );
@@ -887,7 +915,7 @@ var buildBlocksDirectory = (blocksPath, cwd) => {
         const { dependencies, devDependencies, local } = lang.resolveDependencies(blockDir, categoryName, false).match(
           (val) => val,
           (err) => {
-            program.error(color2.red(err));
+            program.error(color3.red(err));
           }
         );
         const block = {
@@ -917,7 +945,7 @@ var buildBlocksDirectory = (blocksPath, cwd) => {
           const lang = languages.find((resolver) => resolver.matches(f));
           if (!lang) {
             console.warn(
-              `${WARN} Skipped \`${color2.bold(path3.join(blockDir, f))}\` \`${color2.bold(
+              `${WARN} Skipped \`${color3.bold(path3.join(blockDir, f))}\` \`${color3.bold(
                 path3.parse(file).ext
               )}\` files are not currently supported!`
             );
@@ -926,7 +954,7 @@ var buildBlocksDirectory = (blocksPath, cwd) => {
           const { local, dependencies, devDependencies } = lang.resolveDependencies(path3.join(blockDir, f), categoryName, true).match(
             (val) => val,
             (err) => {
-              program.error(color2.red(err));
+              program.error(color3.red(err));
             }
           );
           for (const dep of local) {
@@ -1062,7 +1090,7 @@ var getManifest = async (url) => {
 
 // src/utils/prompts.ts
 import { intro, spinner } from "@clack/prompts";
-import color3 from "chalk";
+import color4 from "chalk";
 
 // src/blocks/utilities/strip-ansi.ts
 import ansiRegex from "ansi-regex";
@@ -1084,11 +1112,11 @@ var rightPadMin = (str, length, padWith = " ") => {
 };
 
 // src/utils/prompts.ts
-var VERTICAL_BORDER = color3.gray("\u2502");
-var HORIZONTAL_BORDER = color3.gray("\u2500");
-var TOP_RIGHT_CORNER = color3.gray("\u2510");
-var BOTTOM_RIGHT_CORNER = color3.gray("\u2518");
-var JUNCTION_RIGHT = color3.gray("\u251C");
+var VERTICAL_BORDER = color4.gray("\u2502");
+var HORIZONTAL_BORDER = color4.gray("\u2500");
+var TOP_RIGHT_CORNER = color4.gray("\u2510");
+var BOTTOM_RIGHT_CORNER = color4.gray("\u2518");
+var JUNCTION_RIGHT = color4.gray("\u251C");
 var runTasks = async (tasks, { verbose = false }) => {
   const loading = spinner();
   for (const task of tasks) {
@@ -1126,7 +1154,7 @@ var nextSteps = (steps) => {
 `;
   return result;
 };
-var _intro = (version2) => intro(`${color3.bgHex("#f7df1e").black(" jsrepo ")}${color3.gray(` v${version2} `)}`);
+var _intro = (version2) => intro(`${color4.bgHex("#f7df1e").black(" jsrepo ")}${color4.gray(` v${version2} `)}`);
 
 // src/commands/add.ts
 var schema2 = v4.object({
@@ -1150,14 +1178,14 @@ var _add = async (blockNames, options) => {
   const loading = spinner2();
   const config = getConfig().match(
     (val) => val,
-    (err) => program2.error(color4.red(err))
+    (err) => program2.error(color5.red(err))
   );
   const blocksMap = /* @__PURE__ */ new Map();
   let repoPaths = config.repos;
   if (options.repo) repoPaths = [options.repo];
   if (!options.allow && options.repo) {
     const result = await confirm({
-      message: `Allow ${color4.cyan("jsrepo")} to download and run code from ${color4.cyan(options.repo)}?`,
+      message: `Allow ${color5.cyan("jsrepo")} to download and run code from ${color5.cyan(options.repo)}?`,
       initialValue: true
     });
     if (isCancel(result) || !result) {
@@ -1165,23 +1193,23 @@ var _add = async (blockNames, options) => {
       process.exit(0);
     }
   }
-  verbose(`Fetching blocks from ${color4.cyan(repoPaths.join(", "))}`);
-  if (!options.verbose) loading.start(`Fetching blocks from ${color4.cyan(repoPaths.join(", "))}`);
+  verbose(`Fetching blocks from ${color5.cyan(repoPaths.join(", "))}`);
+  if (!options.verbose) loading.start(`Fetching blocks from ${color5.cyan(repoPaths.join(", "))}`);
   for (const repo of repoPaths) {
     const providerInfo = (await getProviderInfo(repo)).match(
       (info) => info,
       (err) => {
-        loading.stop(`Failed fetching blocks from ${color4.cyan(repo)}`);
-        program2.error(color4.red(err));
+        loading.stop(`Failed fetching blocks from ${color5.cyan(repo)}`);
+        program2.error(color5.red(err));
       }
     );
     const manifestUrl = await providerInfo.provider.resolveRaw(providerInfo, OUTPUT_FILE);
-    verbose(`Got info for provider ${color4.cyan(providerInfo.name)}`);
+    verbose(`Got info for provider ${color5.cyan(providerInfo.name)}`);
     const categories = (await getManifest(manifestUrl)).match(
       (val) => val,
       (err) => {
-        loading.stop(`Failed fetching blocks from ${color4.cyan(repo)}`);
-        program2.error(color4.red(err));
+        loading.stop(`Failed fetching blocks from ${color5.cyan(repo)}`);
+        program2.error(color5.red(err));
       }
     );
     for (const category of categories) {
@@ -1196,8 +1224,8 @@ var _add = async (blockNames, options) => {
       }
     }
   }
-  verbose(`Retrieved blocks from ${color4.cyan(repoPaths.join(", "))}`);
-  if (!options.verbose) loading.stop(`Retrieved blocks from ${color4.cyan(repoPaths.join(", "))}`);
+  verbose(`Retrieved blocks from ${color5.cyan(repoPaths.join(", "))}`);
+  if (!options.verbose) loading.stop(`Retrieved blocks from ${color5.cyan(repoPaths.join(", "))}`);
   const installedBlocks = getInstalledBlocks(blocksMap, config).map((val) => val.specifier);
   let installingBlockNames = blockNames;
   if (installingBlockNames.length === 0) {
@@ -1208,14 +1236,14 @@ var _add = async (blockNames, options) => {
         const blockExists = installedBlocks.findIndex((block) => block === shortName) !== -1;
         let label;
         if (repoPaths.length > 1) {
-          label = `${color4.cyan(
+          label = `${color5.cyan(
             `${value.sourceRepo.name}/${value.sourceRepo.owner}/${value.sourceRepo.repoName}/${value.category}`
           )}/${value.name}`;
         } else {
-          label = `${color4.cyan(value.category)}/${value.name}`;
+          label = `${color5.cyan(value.category)}/${value.name}`;
         }
         return {
-          label: blockExists ? color4.gray(label) : label,
+          label: blockExists ? color5.gray(label) : label,
           value: key,
           // show hint for `Installed` if block is already installed
           hint: blockExists ? "Installed" : void 0
@@ -1229,9 +1257,9 @@ var _add = async (blockNames, options) => {
     }
     installingBlockNames = promptResult;
   }
-  verbose(`Installing blocks ${color4.cyan(installingBlockNames.join(", "))}`);
+  verbose(`Installing blocks ${color5.cyan(installingBlockNames.join(", "))}`);
   if (options.verbose) console.log("Blocks map: ", blocksMap);
-  const installingBlocks = await getBlocks(installingBlockNames, blocksMap, repoPaths);
+  const installingBlocks = await getBlocks(installingBlockNames, blocksMap, repoPaths, options);
   const pm = (await detect({ cwd: process.cwd() }))?.agent ?? "npm";
   const tasks = [];
   const devDeps = /* @__PURE__ */ new Set();
@@ -1241,11 +1269,11 @@ var _add = async (blockNames, options) => {
     const providerInfo = block.sourceRepo;
     verbose(`Attempting to add ${specifier}`);
     const directory = path5.join(config.path, block.category);
-    verbose(`Creating directory ${color4.bold(directory)}`);
+    verbose(`Creating directory ${color5.bold(directory)}`);
     const blockExists = !block.subdirectory && fs6.existsSync(path5.join(directory, block.files[0])) || block.subdirectory && fs6.existsSync(path5.join(directory, block.name));
     if (blockExists && !options.yes) {
       const result = await confirm({
-        message: `${color4.bold(block.name)} already exists in your project would you like to overwrite it?`,
+        message: `${color5.bold(block.name)} already exists in your project would you like to overwrite it?`,
         initialValue: false
       });
       if (isCancel(result) || !result) {
@@ -1263,8 +1291,8 @@ var _add = async (blockNames, options) => {
           const rawUrl = await providerInfo.provider.resolveRaw(providerInfo, filePath);
           const response = await fetch(rawUrl);
           if (!response.ok) {
-            loading.stop(color4.red(`Error fetching ${color4.bold(rawUrl.href)}`));
-            program2.error(color4.red(`There was an error trying to get ${specifier}`));
+            loading.stop(color5.red(`Error fetching ${color5.bold(rawUrl.href)}`));
+            program2.error(color5.red(`There was an error trying to get ${specifier}`));
           }
           return await response.text();
         };
@@ -1316,7 +1344,7 @@ ${content}`;
   }
   await runTasks(tasks, { verbose: options.verbose });
   const installDependencies = async (deps2, dev) => {
-    if (!options.verbose) loading.start(`Installing dependencies with ${color4.cyan(pm)}`);
+    if (!options.verbose) loading.start(`Installing dependencies with ${color5.cyan(pm)}`);
     let add2;
     if (dev) {
       add2 = resolveCommand(pm, "install", [...deps2, "-D"]);
@@ -1324,20 +1352,20 @@ ${content}`;
       add2 = resolveCommand(pm, "install", [...deps2]);
     }
     if (add2 == null) {
-      program2.error(color4.red(`Could not resolve add command for '${pm}'.`));
+      program2.error(color5.red(`Could not resolve add command for '${pm}'.`));
     }
     try {
       await execa(add2.command, [...add2.args], { cwd: process.cwd() });
     } catch {
       program2.error(
-        color4.red(
-          `Failed to install ${color4.bold("vitest")}! Failed while running '${color4.bold(
+        color5.red(
+          `Failed to install ${color5.bold("vitest")}! Failed while running '${color5.bold(
             `${add2.command} ${add2.args.join(" ")}`
           )}'`
         )
       );
     }
-    if (!options.verbose) loading.stop(`Installed ${color4.cyan(deps2.join(", "))}`);
+    if (!options.verbose) loading.stop(`Installed ${color5.cyan(deps2.join(", "))}`);
   };
   const hasDependencies = deps.size > 0 || devDeps.size > 0;
   if (hasDependencies) {
@@ -1366,13 +1394,13 @@ ${content}`;
       if (deps.size > 0) {
         const cmd = resolveCommand(pm, "install", [...deps]);
         steps.push(
-          `Install dependencies \`${color4.cyan(`${cmd?.command} ${cmd?.args.join(" ")}`)}\``
+          `Install dependencies \`${color5.cyan(`${cmd?.command} ${cmd?.args.join(" ")}`)}\``
         );
       }
       if (devDeps.size > 0) {
         const cmd = resolveCommand(pm, "install", [...devDeps, "-D"]);
         steps.push(
-          `Install dev dependencies \`${color4.cyan(`${cmd?.command} ${cmd?.args.join(" ")}`)}\``
+          `Install dev dependencies \`${color5.cyan(`${cmd?.command} ${cmd?.args.join(" ")}`)}\``
         );
       }
     }
@@ -1380,21 +1408,21 @@ ${content}`;
     if (!install) {
       steps.push("");
     }
-    steps.push(`Import the blocks from \`${color4.cyan(config.path)}\``);
+    steps.push(`Import the blocks from \`${color5.cyan(config.path)}\``);
     const next = nextSteps(steps);
     process.stdout.write(next);
   }
-  outro(color4.green("All done!"));
+  outro(color5.green("All done!"));
 };
-var getBlocks = async (blockSpecifiers, blocksMap, repoPaths) => {
+var getBlocks = async (blockSpecifiers, blocksMap, repoPaths, options) => {
   const blocks = /* @__PURE__ */ new Map();
   for (const blockSpecifier of blockSpecifiers) {
     let block = void 0;
     if (!blockSpecifier.startsWith("github")) {
       if (repoPaths.length === 0) {
         program2.error(
-          color4.red(
-            `If your config doesn't repos then you must provide the repo in the block specifier ex: \`${color4.bold(
+          color5.red(
+            `If your config doesn't repos then you must provide the repo in the block specifier ex: \`${color5.bold(
               `github/<owner>/<name>/${blockSpecifier}`
             )}\`!`
           )
@@ -1410,43 +1438,48 @@ var getBlocks = async (blockSpecifiers, blocksMap, repoPaths) => {
         break;
       }
     } else {
-      if (repoPaths.length === 0) {
-        const [providerName, owner, repoName, ...rest] = blockSpecifier.split("/");
-        let repo;
-        if (rest.length > 2) {
-          repo = `${providerName}/${owner}/${repoName}/${rest.join("/")}`;
-        } else {
-          repo = `${providerName}/${owner}/${repoName}`;
+      const [providerName, owner, repoName, ...rest] = blockSpecifier.split("/");
+      let repo;
+      if (rest.length > 2) {
+        repo = `${providerName}/${owner}/${repoName}/${rest.join("/")}`;
+      } else {
+        repo = `${providerName}/${owner}/${repoName}`;
+      }
+      const providerInfo = (await getProviderInfo(repo)).match(
+        (val) => val,
+        (err) => program2.error(color5.red(err))
+      );
+      const manifestUrl = await providerInfo.provider.resolveRaw(providerInfo, OUTPUT_FILE);
+      if (!options.allow) {
+        const result = await confirm({
+          message: `Allow ${color5.cyan("jsrepo")} to download and run code from ${color5.cyan(repo)}?`,
+          initialValue: true
+        });
+        if (isCancel(result) || !result) {
+          cancel("Canceled!");
+          process.exit(0);
         }
-        const providerInfo = (await getProviderInfo(repo)).match(
-          (val) => val,
-          (err) => program2.error(color4.red(err))
-        );
-        const manifestUrl = await providerInfo.provider.resolveRaw(
-          providerInfo,
-          OUTPUT_FILE
-        );
-        const categories = (await getManifest(manifestUrl)).match(
-          (val) => val,
-          (err) => program2.error(color4.red(err))
-        );
-        for (const category of categories) {
-          for (const block2 of category.blocks) {
-            blocksMap.set(
-              `${providerInfo.name}/${providerInfo.owner}/${providerInfo.repoName}/${category.name}/${block2.name}`,
-              {
-                ...block2,
-                sourceRepo: providerInfo
-              }
-            );
-          }
+      }
+      const categories = (await getManifest(manifestUrl)).match(
+        (val) => val,
+        (err) => program2.error(color5.red(err))
+      );
+      for (const category of categories) {
+        for (const block2 of category.blocks) {
+          blocksMap.set(
+            `${providerInfo.name}/${providerInfo.owner}/${providerInfo.repoName}/${category.name}/${block2.name}`,
+            {
+              ...block2,
+              sourceRepo: providerInfo
+            }
+          );
         }
       }
       block = blocksMap.get(blockSpecifier);
     }
     if (!block) {
       program2.error(
-        color4.red(`Invalid block! ${color4.bold(blockSpecifier)} does not exist!`)
+        color5.red(`Invalid block! ${color5.bold(blockSpecifier)} does not exist!`)
       );
     }
     blocks.set(blockSpecifier, { name: blockSpecifier, subDependency: false, block });
@@ -1454,7 +1487,8 @@ var getBlocks = async (blockSpecifiers, blocksMap, repoPaths) => {
       const subDeps = await getBlocks(
         block.localDependencies.filter((dep) => blocks.has(dep)),
         blocksMap,
-        repoPaths
+        repoPaths,
+        options
       );
       for (const dep of subDeps) {
         blocks.set(dep.name, dep);
@@ -1468,7 +1502,7 @@ var getBlocks = async (blockSpecifiers, blocksMap, repoPaths) => {
 import fs7 from "node:fs";
 import path6 from "node:path";
 import { outro as outro2, spinner as spinner3 } from "@clack/prompts";
-import color5 from "chalk";
+import color6 from "chalk";
 import { Command as Command2 } from "commander";
 import * as v5 from "valibot";
 var schema3 = v5.object({
@@ -1488,10 +1522,10 @@ var _build = async (options) => {
   const outFile = path6.join(options.cwd, OUTPUT_FILE);
   for (const dir of options.dirs) {
     const dirPath = path6.join(options.cwd, dir);
-    loading.start(`Building ${color5.cyan(dirPath)}`);
+    loading.start(`Building ${color6.cyan(dirPath)}`);
     if (options.output && fs7.existsSync(outFile)) fs7.rmSync(outFile);
     categories.push(...buildBlocksDirectory(dirPath, options.cwd));
-    loading.stop(`Built ${color5.cyan(dirPath)}`);
+    loading.stop(`Built ${color6.cyan(dirPath)}`);
   }
   const categoriesMap = /* @__PURE__ */ new Map();
   for (const category of categories) {
@@ -1508,20 +1542,20 @@ var _build = async (options) => {
   } else {
     loading.stop("Built successfully!");
   }
-  outro2(color5.green("All done!"));
+  outro2(color6.green("All done!"));
 };
 
 // src/commands/diff.ts
 import fs8 from "node:fs";
 import path7 from "node:path";
 import { cancel as cancel2, confirm as confirm2, isCancel as isCancel2, outro as outro3, spinner as spinner4 } from "@clack/prompts";
-import color7 from "chalk";
+import color8 from "chalk";
 import { Command as Command3, program as program3 } from "commander";
 import { diffLines } from "diff";
 import * as v6 from "valibot";
 
 // src/utils/diff.ts
-import color6 from "chalk";
+import color7 from "chalk";
 import { diffChars } from "diff";
 
 // src/blocks/utilities/array-sum.ts
@@ -1556,8 +1590,8 @@ var formatDiff = ({
   changes,
   expand = false,
   maxUnchanged = 5,
-  colorRemoved = color6.red,
-  colorAdded = color6.green,
+  colorRemoved = color7.red,
+  colorAdded = color7.green,
   prefix,
   onUnchanged,
   intro: intro2
@@ -1591,7 +1625,7 @@ var formatDiff = ({
     onUnchanged,
     intro: intro2
   });
-  const linePrefix = (line) => color6.gray(`${prefix?.() ?? ""}${leftPadMin(`${line + 1 + lineOffset} `, length)} `);
+  const linePrefix = (line) => color7.gray(`${prefix?.() ?? ""}${leftPadMin(`${line + 1 + lineOffset} `, length)} `);
   for (let i = 0; i < changes.length; i++) {
     const change = changes[i];
     const hasPreviousChange = changes[i - 1]?.added || changes[i - 1]?.removed;
@@ -1621,8 +1655,8 @@ var formatDiff = ({
           const count = ls.length - shownLines;
           result += `${join(
             get(
-              color6.gray(
-                `+ ${count} more unchanged (${color6.italic("-E to expand")})`
+              color7.gray(
+                `+ ${count} more unchanged (${color7.italic("-E to expand")})`
               )
             ),
             {
@@ -1677,7 +1711,7 @@ var formatDiff = ({
 };
 
 // src/commands/diff.ts
-var L = color7.gray("\u2502");
+var L = color8.gray("\u2502");
 var schema4 = v6.object({
   allow: v6.boolean(),
   expand: v6.boolean(),
@@ -1699,14 +1733,14 @@ var _diff = async (options) => {
   const loading = spinner4();
   const config = getConfig().match(
     (val) => val,
-    (err) => program3.error(color7.red(err))
+    (err) => program3.error(color8.red(err))
   );
   const blocksMap = /* @__PURE__ */ new Map();
   let repoPaths = config.repos;
   if (options.repo) repoPaths = [options.repo];
   if (!options.allow && options.repo) {
     const result = await confirm2({
-      message: `Allow ${color7.cyan("jsrepo")} to download and run code from ${color7.cyan(options.repo)}?`,
+      message: `Allow ${color8.cyan("jsrepo")} to download and run code from ${color8.cyan(options.repo)}?`,
       initialValue: true
     });
     if (isCancel2(result) || !result) {
@@ -1714,16 +1748,16 @@ var _diff = async (options) => {
       process.exit(0);
     }
   }
-  loading.start(`Fetching blocks from ${color7.cyan(repoPaths.join(", "))}`);
+  loading.start(`Fetching blocks from ${color8.cyan(repoPaths.join(", "))}`);
   for (const repo of repoPaths) {
     const providerInfo = (await getProviderInfo(repo)).match(
       (info) => info,
-      (err) => program3.error(color7.red(err))
+      (err) => program3.error(color8.red(err))
     );
     const manifestUrl = await providerInfo.provider.resolveRaw(providerInfo, OUTPUT_FILE);
     const categories = (await getManifest(manifestUrl)).match(
       (val) => val,
-      (err) => program3.error(color7.red(err))
+      (err) => program3.error(color8.red(err))
     );
     for (const category of categories) {
       for (const block of category.blocks) {
@@ -1737,7 +1771,7 @@ var _diff = async (options) => {
       }
     }
   }
-  loading.stop(`Retrieved blocks from ${color7.cyan(repoPaths.join(", "))}`);
+  loading.stop(`Retrieved blocks from ${color8.cyan(repoPaths.join(", "))}`);
   const installedBlocks = getInstalledBlocks(blocksMap, config);
   for (const blockSpecifier of installedBlocks) {
     let found = false;
@@ -1760,7 +1794,7 @@ var _diff = async (options) => {
         const rawUrl = await providerInfo.provider.resolveRaw(providerInfo, sourcePath);
         const response = await fetch(rawUrl);
         if (!response.ok) {
-          program3.error(color7.red(`There was an error trying to get ${fullSpecifier}`));
+          program3.error(color8.red(`There was an error trying to get ${fullSpecifier}`));
         }
         let remoteContent = await response.text();
         let localPath = path7.join(config.path, block.category, file);
@@ -1793,14 +1827,14 @@ ${remoteContent}`;
           changes,
           expand: options.expand,
           maxUnchanged: options.maxUnchanged,
-          colorAdded: color7.greenBright,
-          colorRemoved: color7.redBright,
+          colorAdded: color8.greenBright,
+          colorRemoved: color8.redBright,
           prefix: () => `${L}  `,
-          onUnchanged: ({ from: from2, to: to2, prefix }) => `${prefix?.() ?? ""}${color7.cyan(from2)} \u2192 ${color7.gray(to2)} ${color7.gray("(unchanged)")}
+          onUnchanged: ({ from: from2, to: to2, prefix }) => `${prefix?.() ?? ""}${color8.cyan(from2)} \u2192 ${color8.gray(to2)} ${color8.gray("(unchanged)")}
 `,
           intro: ({ from: from2, to: to2, changes: changes2, prefix }) => {
             const totalChanges = changes2.filter((a) => a.added).length;
-            return `${prefix?.() ?? ""}${color7.cyan(from2)} \u2192 ${color7.gray(to2)} (${totalChanges} change${totalChanges === 1 ? "" : "s"})
+            return `${prefix?.() ?? ""}${color8.cyan(from2)} \u2192 ${color8.gray(to2)} (${totalChanges} change${totalChanges === 1 ? "" : "s"})
 ${prefix?.() ?? ""}
 `;
           }
@@ -1811,17 +1845,17 @@ ${prefix?.() ?? ""}
     }
     if (!found) {
       program3.error(
-        color7.red(`Invalid block! ${color7.bold(blockSpecifier)} does not exist!`)
+        color8.red(`Invalid block! ${color8.bold(blockSpecifier)} does not exist!`)
       );
     }
   }
-  outro3(color7.green("All done!"));
+  outro3(color8.green("All done!"));
 };
 
 // src/commands/init.ts
 import fs9 from "node:fs";
 import { cancel as cancel3, confirm as confirm3, isCancel as isCancel3, outro as outro4, spinner as spinner5, text } from "@clack/prompts";
-import color8 from "chalk";
+import color9 from "chalk";
 import { Command as Command4 } from "commander";
 import * as v7 from "valibot";
 var schema5 = v7.object({
@@ -1874,7 +1908,7 @@ var _init = async (options) => {
         placeholder: "github/ieedan/std",
         validate: (val) => {
           if (!val.startsWith("https://github.com") && !val.startsWith("github/")) {
-            return `Must be a ${color8.bold("GitHub")} repository!`;
+            return `Must be a ${color9.bold("GitHub")} repository!`;
           }
         }
       });
@@ -1897,14 +1931,14 @@ var _init = async (options) => {
 `);
   fs9.mkdirSync(config.path, { recursive: true });
   loading.stop(`Wrote config to \`${CONFIG_NAME}\`.`);
-  outro4(color8.green("All done!"));
+  outro4(color9.green("All done!"));
 };
 
 // src/commands/test.ts
 import fs10 from "node:fs";
 import path8 from "node:path";
 import { cancel as cancel4, confirm as confirm4, isCancel as isCancel4, outro as outro5, spinner as spinner6 } from "@clack/prompts";
-import color9 from "chalk";
+import color10 from "chalk";
 import { Argument, Command as Command5, program as program4 } from "commander";
 import { execa as execa2 } from "execa";
 import { resolveCommand as resolveCommand2 } from "package-manager-detector/commands";
@@ -1931,7 +1965,7 @@ var _test = async (blockNames, options) => {
   verbose(`Attempting to test ${JSON.stringify(blockNames)}`);
   const config = getConfig().match(
     (val) => val,
-    (err) => program4.error(color9.red(err))
+    (err) => program4.error(color10.red(err))
   );
   const loading = spinner6();
   const blocksMap = /* @__PURE__ */ new Map();
@@ -1939,7 +1973,7 @@ var _test = async (blockNames, options) => {
   if (options.repo) repoPaths = [options.repo];
   if (!options.allow && options.repo) {
     const result = await confirm4({
-      message: `Allow ${color9.cyan("jsrepo")} to download and run code from ${color9.cyan(options.repo)}?`,
+      message: `Allow ${color10.cyan("jsrepo")} to download and run code from ${color10.cyan(options.repo)}?`,
       initialValue: true
     });
     if (isCancel4(result) || !result) {
@@ -1947,21 +1981,21 @@ var _test = async (blockNames, options) => {
       process.exit(0);
     }
   }
-  verbose(`Fetching blocks from ${color9.cyan(repoPaths.join(", "))}`);
-  if (!options.verbose) loading.start(`Fetching blocks from ${color9.cyan(repoPaths.join(", "))}`);
+  verbose(`Fetching blocks from ${color10.cyan(repoPaths.join(", "))}`);
+  if (!options.verbose) loading.start(`Fetching blocks from ${color10.cyan(repoPaths.join(", "))}`);
   for (const repo of repoPaths) {
     const providerInfo = (await getProviderInfo(repo)).match(
       (info) => info,
-      (err) => program4.error(color9.red(err))
+      (err) => program4.error(color10.red(err))
     );
     const manifestUrl = await providerInfo.provider.resolveRaw(providerInfo, OUTPUT_FILE);
-    verbose(`Got info for provider ${color9.cyan(providerInfo.name)}`);
+    verbose(`Got info for provider ${color10.cyan(providerInfo.name)}`);
     const response = await fetch(manifestUrl);
     if (!response.ok) {
-      if (!options.verbose) loading.stop(`Error fetching ${color9.cyan(manifestUrl.href)}`);
+      if (!options.verbose) loading.stop(`Error fetching ${color10.cyan(manifestUrl.href)}`);
       program4.error(
-        color9.red(
-          `There was an error fetching the \`${OUTPUT_FILE}\` from the repository ${color9.cyan(
+        color10.red(
+          `There was an error fetching the \`${OUTPUT_FILE}\` from the repository ${color10.cyan(
             repo
           )} make sure the target repository has a \`${OUTPUT_FILE}\` in its root?`
         )
@@ -1980,10 +2014,10 @@ var _test = async (blockNames, options) => {
       }
     }
   }
-  verbose(`Retrieved blocks from ${color9.cyan(repoPaths.join(", "))}`);
-  if (!options.verbose) loading.stop(`Retrieved blocks from ${color9.cyan(repoPaths.join(", "))}`);
+  verbose(`Retrieved blocks from ${color10.cyan(repoPaths.join(", "))}`);
+  if (!options.verbose) loading.stop(`Retrieved blocks from ${color10.cyan(repoPaths.join(", "))}`);
   const tempTestDirectory = `blocks-tests-temp-${Date.now()}`;
-  verbose(`Trying to create the temp directory ${color9.bold(tempTestDirectory)}.`);
+  verbose(`Trying to create the temp directory ${color10.bold(tempTestDirectory)}.`);
   fs10.mkdirSync(tempTestDirectory, { recursive: true });
   const cleanUp = () => {
     fs10.rmSync(tempTestDirectory, { recursive: true, force: true });
@@ -1995,7 +2029,7 @@ var _test = async (blockNames, options) => {
   }
   if (testingBlocks.length === 0) {
     cleanUp();
-    program4.error(color9.red("There were no blocks found in your project!"));
+    program4.error(color10.red("There were no blocks found in your project!"));
   }
   const testingBlocksMapped = [];
   for (const blockSpecifier of testingBlocks) {
@@ -2021,7 +2055,7 @@ var _test = async (blockNames, options) => {
         }
         const providerInfo = (await getProviderInfo(repo)).match(
           (val) => val,
-          (err) => program4.error(color9.red(err))
+          (err) => program4.error(color10.red(err))
         );
         const manifestUrl = await providerInfo.provider.resolveRaw(
           providerInfo,
@@ -2029,7 +2063,7 @@ var _test = async (blockNames, options) => {
         );
         const categories = (await getManifest(manifestUrl)).match(
           (val) => val,
-          (err) => program4.error(color9.red(err))
+          (err) => program4.error(color10.red(err))
         );
         for (const category of categories) {
           for (const block2 of category.blocks) {
@@ -2047,7 +2081,7 @@ var _test = async (blockNames, options) => {
     }
     if (!block) {
       program4.error(
-        color9.red(`Invalid block! ${color9.bold(blockSpecifier)} does not exist!`)
+        color10.red(`Invalid block! ${color10.bold(blockSpecifier)} does not exist!`)
       );
     }
     testingBlocksMapped.push({ name: blockSpecifier, block });
@@ -2055,18 +2089,18 @@ var _test = async (blockNames, options) => {
   for (const { name: specifier, block } of testingBlocksMapped) {
     const providerInfo = block.sourceRepo;
     if (!options.verbose) {
-      loading.start(`Setting up test file for ${color9.cyan(specifier)}`);
+      loading.start(`Setting up test file for ${color10.cyan(specifier)}`);
     }
     if (!block.tests) {
-      loading.stop(`No tests found for ${color9.cyan(specifier)}`);
+      loading.stop(`No tests found for ${color10.cyan(specifier)}`);
       continue;
     }
     const getSourceFile = async (filePath) => {
       const rawUrl = await providerInfo.provider.resolveRaw(providerInfo, filePath);
       const response = await fetch(rawUrl);
       if (!response.ok) {
-        loading.stop(color9.red(`Error fetching ${color9.bold(rawUrl.href)}`));
-        program4.error(color9.red(`There was an error trying to get ${specifier}`));
+        loading.stop(color10.red(`Error fetching ${color10.bold(rawUrl.href)}`));
+        program4.error(color10.red(`There was an error trying to get ${specifier}`));
       }
       return await response.text();
     };
@@ -2081,7 +2115,7 @@ var _test = async (blockNames, options) => {
     const directory = path8.join(config.path, block.category);
     let blockFilePath = path8.join(directory, `${block.name}`);
     blockFilePath = blockFilePath.replaceAll("\\", "/");
-    verbose(`${color9.bold(specifier)} file path is ${color9.bold(blockFilePath)}`);
+    verbose(`${color10.bold(specifier)} file path is ${color10.bold(blockFilePath)}`);
     const project = new Project2();
     for (const file of testFiles) {
       verbose(`Opening test file ${file}`);
@@ -2113,19 +2147,19 @@ var _test = async (blockNames, options) => {
       }
     }
     project.saveSync();
-    verbose(`Completed ${color9.cyan.bold(specifier)} test file`);
+    verbose(`Completed ${color10.cyan.bold(specifier)} test file`);
     if (!options.verbose) {
-      loading.stop(`Completed setup for ${color9.bold(specifier)}`);
+      loading.stop(`Completed setup for ${color10.bold(specifier)}`);
     }
   }
   verbose("Beginning testing");
   const pm = await detect2({ cwd: process.cwd() });
   if (pm == null) {
-    program4.error(color9.red("Could not detect package manager"));
+    program4.error(color10.red("Could not detect package manager"));
   }
   const resolved = resolveCommand2(pm.agent, "execute", ["vitest", "run", tempTestDirectory]);
   if (resolved == null) {
-    program4.error(color9.red(`Could not resolve add command for '${pm.agent}'.`));
+    program4.error(color10.red(`Could not resolve add command for '${pm.agent}'.`));
   }
   const { command, args } = resolved;
   const testCommand = `${command} ${args.join(" ")}`;
@@ -2139,11 +2173,11 @@ var _test = async (blockNames, options) => {
   try {
     await testingProcess;
     cleanUp();
-    outro5(color9.green("All done!"));
+    outro5(color10.green("All done!"));
   } catch (err) {
     if (options.debug) {
       console.info(
-        `${color9.bold("--debug")} flag provided. Skipping cleanup. Run '${color9.bold(
+        `${color10.bold("--debug")} flag provided. Skipping cleanup. Run '${color10.bold(
           testCommand
         )}' to retry tests.
 `
@@ -2151,7 +2185,7 @@ var _test = async (blockNames, options) => {
     } else {
       cleanUp();
     }
-    program4.error(color9.red(`Tests failed! Error ${err}`));
+    program4.error(color10.red(`Tests failed! Error ${err}`));
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jsrepo",
   "description": "A CLI to add shared code from remote repositories.",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ieedan/jsrepo"

package/src/commands/add.ts

@@ -168,7 +168,7 @@ const _add = async (blockNames: string[], options: Options) => {
 
 	if (options.verbose) console.log('Blocks map: ', blocksMap);
 
-	const installingBlocks = await getBlocks(installingBlockNames, blocksMap, repoPaths);
+	const installingBlocks = await getBlocks(installingBlockNames, blocksMap, repoPaths, options);
 
 	const pm = (await detect({ cwd: process.cwd() }))?.agent ?? 'npm';
 
@@ -392,7 +392,8 @@ type InstallingBlock = {
 const getBlocks = async (
 	blockSpecifiers: string[],
 	blocksMap: Map<string, RemoteBlock>,
-	repoPaths: string[]
+	repoPaths: string[],
+	options: Options
 ): Promise<InstallingBlock[]> => {
 	const blocks = new Map<string, InstallingBlock>();
 
@@ -426,42 +427,49 @@ const getBlocks = async (
 				break;
 			}
 		} else {
-			if (repoPaths.length === 0) {
-				const [providerName, owner, repoName, ...rest] = blockSpecifier.split('/');
+			const [providerName, owner, repoName, ...rest] = blockSpecifier.split('/');
+
+			let repo: string;
+			// if rest is greater than 2 it isn't the block specifier so it is part of the path
+			if (rest.length > 2) {
+				repo = `${providerName}/${owner}/${repoName}/${rest.join('/')}`;
+			} else {
+				repo = `${providerName}/${owner}/${repoName}`;
+			}
 
-				let repo: string;
-				// if rest is greater than 2 it isn't the block specifier so it is part of the path
-				if (rest.length > 2) {
-					repo = `${providerName}/${owner}/${repoName}/${rest.join('/')}`;
-				} else {
-					repo = `${providerName}/${owner}/${repoName}`;
-				}
+			const providerInfo = (await gitProviders.getProviderInfo(repo)).match(
+				(val) => val,
+				(err) => program.error(color.red(err))
+			);
 
-				const providerInfo = (await gitProviders.getProviderInfo(repo)).match(
-					(val) => val,
-					(err) => program.error(color.red(err))
-				);
+			const manifestUrl = await providerInfo.provider.resolveRaw(providerInfo, OUTPUT_FILE);
 
-				const manifestUrl = await providerInfo.provider.resolveRaw(
-					providerInfo,
-					OUTPUT_FILE
-				);
+			if (!options.allow) {
+				const result = await confirm({
+					message: `Allow ${color.cyan('jsrepo')} to download and run code from ${color.cyan(repo)}?`,
+					initialValue: true,
+				});
 
-				const categories = (await gitProviders.getManifest(manifestUrl)).match(
-					(val) => val,
-					(err) => program.error(color.red(err))
-				);
+				if (isCancel(result) || !result) {
+					cancel('Canceled!');
+					process.exit(0);
+				}
+			}
 
-				for (const category of categories) {
-					for (const block of category.blocks) {
-						blocksMap.set(
-							`${providerInfo.name}/${providerInfo.owner}/${providerInfo.repoName}/${category.name}/${block.name}`,
-							{
-								...block,
-								sourceRepo: providerInfo,
-							}
-						);
-					}
+			const categories = (await gitProviders.getManifest(manifestUrl)).match(
+				(val) => val,
+				(err) => program.error(color.red(err))
+			);
+
+			for (const category of categories) {
+				for (const block of category.blocks) {
+					blocksMap.set(
+						`${providerInfo.name}/${providerInfo.owner}/${providerInfo.repoName}/${category.name}/${block.name}`,
+						{
+							...block,
+							sourceRepo: providerInfo,
+						}
+					);
 				}
 			}
 
@@ -480,7 +488,8 @@ const getBlocks = async (
 			const subDeps = await getBlocks(
 				block.localDependencies.filter((dep) => blocks.has(dep)),
 				blocksMap,
-				repoPaths
+				repoPaths,
+				options
 			);
 
 			for (const dep of subDeps) {

package/src/utils/language-support.ts

@@ -1,12 +1,15 @@
 import fs from 'node:fs';
 import { builtinModules } from 'node:module';
 import path from 'node:path';
+import color from 'chalk';
 import { walk } from 'estree-walker';
 import * as sv from 'svelte/compiler';
 import { Project } from 'ts-morph';
 import validatePackageName from 'validate-npm-package-name';
-import { Err, Ok, type Result } from '../blocks/types/result';
+import { WARN } from '.';
+import { Ok, type Result } from '../blocks/types/result';
 import { findNearestPackageJson } from './package';
+import { parsePackageName } from './parse-package-name';
 
 export type ResolvedDependencies = {
 	local: string[];
@@ -147,10 +150,7 @@ const resolveLocalImport = (
  */
 const resolveRemoteDeps = (deps: string[], filePath: string) => {
 	const filteredDeps = deps.filter(
-		(dep) =>
-			!builtinModules.includes(dep) &&
-			!dep.startsWith('node:') &&
-			validatePackageName(dep).validForNewPackages
+		(dep) => !builtinModules.includes(dep) && !dep.startsWith('node:')
 	);
 
 	const pkgPath = findNearestPackageJson(path.dirname(filePath), '');
@@ -163,27 +163,45 @@ const resolveRemoteDeps = (deps: string[], filePath: string) => {
 			JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
 
 		for (const dep of filteredDeps) {
+			const parsed = parsePackageName(dep);
+
+			if (parsed.isErr()) {
+				console.warn(
+					`${WARN} Skipped adding import \`${color.cyan(dep)}\`. Reason: Couldn't parse package name`
+				);
+				continue;
+			}
+
+			const depInfo = parsed.unwrap();
+
+			if (!validatePackageName(depInfo.name).validForNewPackages) {
+				console.warn(
+					`${WARN} Skipped adding import \`${color.cyan(dep)}\`. Reason: Not a valid package name`
+				);
+				continue;
+			}
+
 			let version: string | undefined = undefined;
 			if (packageDependencies !== undefined) {
-				version = packageDependencies[dep];
+				version = packageDependencies[depInfo.name];
 			}
 
 			if (version !== undefined) {
-				dependencies.add(`${dep}@${version}`);
+				dependencies.add(`${depInfo.name}@${version}`);
 				continue;
 			}
 
 			if (packageDevDependencies !== undefined) {
-				version = packageDevDependencies[dep];
+				version = packageDevDependencies[depInfo.name];
 			}
 
 			if (version !== undefined) {
-				devDependencies.add(`${dep}@${version}`);
+				devDependencies.add(`${depInfo.name}@${version}`);
 				continue;
 			}
 
 			// if no version found just add it without a version
-			dependencies.add(dep);
+			dependencies.add(depInfo.name);
 		}
 	}
 

package/src/utils/parse-package-name.ts

@@ -0,0 +1,25 @@
+/**
+ * Adapted from https://github.com/egoist/parse-package-name/blob/main/src/index.ts
+ * @module
+ */
+
+import { Err, Ok } from '../blocks/types/result';
+
+// Parsed a scoped package name into name, version, and path.
+const RE_SCOPED = /^(@[^\/]+\/[^@\/]+)(?:@([^\/]+))?(\/.*)?$/;
+// Parsed a non-scoped package name into name, version, path
+const RE_NON_SCOPED = /^([^@\/]+)(?:@([^\/]+))?(\/.*)?$/;
+
+const parsePackageName = (input: string) => {
+	const m = RE_SCOPED.exec(input) || RE_NON_SCOPED.exec(input);
+
+	if (!m) return Err(`invalid package name: ${input}`);
+
+	return Ok({
+		name: m[1] || '',
+		version: m[2] || 'latest',
+		path: m[3] || '',
+	});
+};
+
+export { parsePackageName };