jsrepo 1.0.2 → 1.1.0

package/dist/index.js

@@ -1183,6 +1183,29 @@ var _add = async (blockNames, options) => {
   const blocksMap = /* @__PURE__ */ new Map();
   let repoPaths = config.repos;
   if (options.repo) repoPaths = [options.repo];
+  for (const blockSpecifier of blockNames) {
+    if (!blockSpecifier.startsWith("github")) continue;
+    const [providerName, owner, repoName, ...rest] = blockSpecifier.split("/");
+    let repo;
+    if (rest.length > 2) {
+      repo = `${providerName}/${owner}/${repoName}/${rest.join("/")}`;
+    } else {
+      repo = `${providerName}/${owner}/${repoName}`;
+    }
+    if (!repoPaths.find((repoPath) => repoPath === repo)) {
+      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);
+        }
+      }
+      repoPaths.push(repo);
+    }
+  }
   if (!options.allow && options.repo) {
     const result = await confirm({
       message: `Allow ${color5.cyan("jsrepo")} to download and run code from ${color5.cyan(options.repo)}?`,
@@ -1259,15 +1282,16 @@ var _add = async (blockNames, options) => {
   }
   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();
   const deps = /* @__PURE__ */ new Set();
-  for (const { name: specifier, block } of installingBlocks) {
+  for (const { block } of installingBlocks) {
+    const fullSpecifier = `${block.sourceRepo.url}/${block.category}/${block.name}`;
     const watermark = getWatermark(context.package.version, block.sourceRepo.url);
     const providerInfo = block.sourceRepo;
-    verbose(`Attempting to add ${specifier}`);
+    verbose(`Attempting to add ${fullSpecifier}`);
     const directory = path5.join(config.path, block.category);
     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));
@@ -1282,8 +1306,8 @@ var _add = async (blockNames, options) => {
       }
     }
     tasks.push({
-      loadingMessage: `Adding ${specifier}`,
-      completedMessage: `Added ${specifier}`,
+      loadingMessage: `Adding ${fullSpecifier}`,
+      completedMessage: `Added ${fullSpecifier}`,
       run: async () => {
         fs6.mkdirSync(directory, { recursive: true });
         const files = [];
@@ -1292,7 +1316,9 @@ var _add = async (blockNames, options) => {
           const response = await fetch(rawUrl);
           if (!response.ok) {
             loading.stop(color5.red(`Error fetching ${color5.bold(rawUrl.href)}`));
-            program2.error(color5.red(`There was an error trying to get ${specifier}`));
+            program2.error(
+              color5.red(`There was an error trying to get ${fullSpecifier}`)
+            );
           }
           return await response.text();
         };
@@ -1414,7 +1440,7 @@ ${content}`;
   }
   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;
@@ -1438,38 +1464,6 @@ 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 providerInfo = (await getProviderInfo(repo)).match(
-          (val) => val,
-          (err) => program2.error(color5.red(err))
-        );
-        const manifestUrl = await providerInfo.provider.resolveRaw(
-          providerInfo,
-          OUTPUT_FILE
-        );
-        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) {
@@ -1480,9 +1474,10 @@ var getBlocks = async (blockSpecifiers, blocksMap, repoPaths) => {
     blocks.set(blockSpecifier, { name: blockSpecifier, subDependency: false, block });
     if (block.localDependencies && block.localDependencies.length > 0) {
       const subDeps = await getBlocks(
-        block.localDependencies.filter((dep) => blocks.has(dep)),
+        block.localDependencies.filter((dep) => !blocks.has(dep)),
         blocksMap,
-        repoPaths
+        repoPaths,
+        options
       );
       for (const dep of subDeps) {
         blocks.set(dep.name, dep);

package/package.json

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

package/src/blocks/utilities/pad.ts

@@ -1,7 +1,7 @@
 /*
-	jsrepo 1.0.0-next.18
+	jsrepo 1.0.3
 	Installed from github/ieedan/std
-	11-18-2024
+	11-19-2024
 */
 
 import { stripAsni } from './strip-ansi';

package/src/blocks/utilities/strip-ansi.ts

@@ -1,7 +1,7 @@
 /*
-	jsrepo 1.0.0-next.18
+	jsrepo 1.0.3
 	Installed from github/ieedan/std
-	11-18-2024
+	11-19-2024
 */
 
 import ansiRegex from 'ansi-regex';

package/src/commands/add.ts

@@ -68,6 +68,38 @@ const _add = async (blockNames: string[], options: Options) => {
 	// we just want to override all others if supplied via the CLI
 	if (options.repo) repoPaths = [options.repo];
 
+	// resolve repos for blocks
+	for (const blockSpecifier of blockNames) {
+		// we are only getting repos for blocks that specified repos
+		if (!blockSpecifier.startsWith('github')) continue;
+
+		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}`;
+		}
+
+		if (!repoPaths.find((repoPath) => repoPath === repo)) {
+			if (!options.allow) {
+				const result = await confirm({
+					message: `Allow ${color.cyan('jsrepo')} to download and run code from ${color.cyan(repo)}?`,
+					initialValue: true,
+				});
+
+				if (isCancel(result) || !result) {
+					cancel('Canceled!');
+					process.exit(0);
+				}
+			}
+
+			repoPaths.push(repo);
+		}
+	}
+
 	if (!options.allow && options.repo) {
 		const result = await confirm({
 			message: `Allow ${color.cyan('jsrepo')} to download and run code from ${color.cyan(options.repo)}?`,
@@ -84,6 +116,7 @@ const _add = async (blockNames: string[], options: Options) => {
 
 	if (!options.verbose) loading.start(`Fetching blocks from ${color.cyan(repoPaths.join(', '))}`);
 
+	// get blocks from each repo
 	for (const repo of repoPaths) {
 		const providerInfo: gitProviders.Info = (await gitProviders.getProviderInfo(repo)).match(
 			(info) => info,
@@ -126,6 +159,7 @@ const _add = async (blockNames: string[], options: Options) => {
 
 	let installingBlockNames = blockNames;
 
+	// if no blocks are provided prompt the user for what blocks they want
 	if (installingBlockNames.length === 0) {
 		const promptResult = await multiselect({
 			message: 'Select which blocks to add.',
@@ -168,7 +202,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';
 
@@ -177,12 +211,13 @@ const _add = async (blockNames: string[], options: Options) => {
 	const devDeps: Set<string> = new Set<string>();
 	const deps: Set<string> = new Set<string>();
 
-	for (const { name: specifier, block } of installingBlocks) {
+	for (const { block } of installingBlocks) {
+		const fullSpecifier = `${block.sourceRepo.url}/${block.category}/${block.name}`;
 		const watermark = getWatermark(context.package.version, block.sourceRepo.url);
 
 		const providerInfo = block.sourceRepo;
 
-		verbose(`Attempting to add ${specifier}`);
+		verbose(`Attempting to add ${fullSpecifier}`);
 
 		const directory = path.join(config.path, block.category);
 
@@ -205,8 +240,8 @@ const _add = async (blockNames: string[], options: Options) => {
 		}
 
 		tasks.push({
-			loadingMessage: `Adding ${specifier}`,
-			completedMessage: `Added ${specifier}`,
+			loadingMessage: `Adding ${fullSpecifier}`,
+			completedMessage: `Added ${fullSpecifier}`,
 			run: async () => {
 				// in case the directory didn't already exist
 				fs.mkdirSync(directory, { recursive: true });
@@ -220,7 +255,9 @@ const _add = async (blockNames: string[], options: Options) => {
 
 					if (!response.ok) {
 						loading.stop(color.red(`Error fetching ${color.bold(rawUrl.href)}`));
-						program.error(color.red(`There was an error trying to get ${specifier}`));
+						program.error(
+							color.red(`There was an error trying to get ${fullSpecifier}`)
+						);
 					}
 
 					return await response.text();
@@ -392,7 +429,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>();
 
@@ -411,6 +449,7 @@ const getBlocks = async (
 				);
 			}
 
+			// check every repo for the block and return the first block found
 			for (const repo of repoPaths) {
 				// we unwrap because we already checked this
 				const providerInfo = (await gitProviders.getProviderInfo(repo)).unwrap();
@@ -426,45 +465,6 @@ const getBlocks = async (
 				break;
 			}
 		} else {
-			if (repoPaths.length === 0) {
-				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}`;
-				}
-
-				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 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,
-							}
-						);
-					}
-				}
-			}
-
 			block = blocksMap.get(blockSpecifier);
 		}
 
@@ -478,9 +478,10 @@ const getBlocks = async (
 
 		if (block.localDependencies && block.localDependencies.length > 0) {
 			const subDeps = await getBlocks(
-				block.localDependencies.filter((dep) => blocks.has(dep)),
+				block.localDependencies.filter((dep) => !blocks.has(dep)),
 				blocksMap,
-				repoPaths
+				repoPaths,
+				options
 			);
 
 			for (const dep of subDeps) {