jsrepo 1.7.0 → 1.8.0

package/dist/index.js

@@ -6,7 +6,7 @@ import path12 from "pathe";
 
 // src/commands/add.ts
 import fs6 from "node:fs";
-import { cancel, confirm, isCancel, multiselect, outro, spinner as spinner2 } from "@clack/prompts";
+import { cancel, confirm, isCancel, multiselect, outro, spinner as spinner2, text } from "@clack/prompts";
 import color7 from "chalk";
 import { Command, program as program2 } from "commander";
 import { resolveCommand as resolveCommand2 } from "package-manager-detector/commands";
@@ -1415,14 +1415,32 @@ var _add = async (blockNames, options) => {
   };
   verbose(`Attempting to add ${JSON.stringify(blockNames)}`);
   const loading = spinner2();
-  const config = getConfig(options.cwd).match(
-    (val) => val,
-    (err) => program2.error(color7.red(err))
-  );
+  const configResult = getConfig(options.cwd);
+  const noConfig = configResult.isErr();
+  let config;
+  if (configResult.isErr()) {
+    const response = await confirm({
+      message: `You don't have ${JSREPO} initialized in your project. Do you want to continue?`,
+      initialValue: false
+    });
+    if (isCancel(response) || !response) {
+      cancel("Canceled!");
+      process.exit(0);
+    }
+    config = {
+      $schema: "",
+      includeTests: false,
+      watermark: true,
+      path: "./src/blocks",
+      repos: []
+    };
+  } else {
+    config = configResult.unwrap();
+  }
   let repoPaths = config.repos;
   if (options.repo) repoPaths = [options.repo];
   for (const blockSpecifier of blockNames) {
-    if (!blockSpecifier.startsWith("github")) continue;
+    if (!blockSpecifier.startsWith("github/")) continue;
     const [providerName, owner, repoName, ...rest] = blockSpecifier.split("/");
     let repo;
     if (rest.length > 2) {
@@ -1433,7 +1451,7 @@ var _add = async (blockNames, options) => {
     if (!repoPaths.find((repoPath) => repoPath === repo)) {
       if (!options.allow) {
         const result = await confirm({
-          message: `Allow ${color7.cyan("jsrepo")} to download and run code from ${color7.cyan(repo)}?`,
+          message: `Allow ${JSREPO} to download and run code from ${color7.cyan(repo)}?`,
           initialValue: true
         });
         if (isCancel(result) || !result) {
@@ -1446,7 +1464,7 @@ var _add = async (blockNames, options) => {
   }
   if (!options.allow && options.repo) {
     const result = await confirm({
-      message: `Allow ${color7.cyan("jsrepo")} to download and run code from ${color7.cyan(options.repo)}?`,
+      message: `Allow ${JSREPO} to download and run code from ${color7.cyan(options.repo)}?`,
       initialValue: true
     });
     if (isCancel(result) || !result) {
@@ -1455,6 +1473,13 @@ var _add = async (blockNames, options) => {
     }
   }
   if (repoPaths.length === 0) {
+    if (noConfig) {
+      program2.error(
+        color7.red(
+          `Fully quality blocks ex: (github/ieedan/std/utils/math) or provide the \`${color7.bold("--repo")}\` flag to specify a registry.`
+        )
+      );
+    }
     program2.error(
       color7.red(
         `There were no repos present in your config and you didn't provide the \`${color7.bold("--repo")}\` flag with a repo.`
@@ -1509,7 +1534,7 @@ var _add = async (blockNames, options) => {
   if (options.verbose) console.log("Blocks map: ", blocksMap);
   const installingBlocks = (await resolveTree(installingBlockNames, blocksMap, repoPaths)).match(
     (val) => val,
-    program2.error
+    (err) => program2.error(err)
   );
   const pm = (await detect({ cwd: options.cwd }))?.agent ?? "npm";
   const tasks = [];
@@ -1520,6 +1545,43 @@ var _add = async (blockNames, options) => {
     const watermark = getWatermark(context.package.version, block.sourceRepo.url);
     const providerInfo = block.sourceRepo;
     verbose(`Setting up ${fullSpecifier}`);
+    if (noConfig) {
+      const partialSpecifier = `${color7.cyan(`${block.category}/${block.name}`)}`;
+      const blocksPath = await text({
+        message: `Where would you like to add ${partialSpecifier}?`,
+        initialValue: config.path,
+        defaultValue: config.path,
+        placeholder: config.path,
+        validate(value) {
+          if (value.trim() === "") return "Please provide a value";
+        }
+      });
+      if (isCancel(blocksPath)) {
+        cancel("Canceled!");
+        process.exit(0);
+      }
+      config.path = blocksPath;
+      if (!options.yes) {
+        const includeTests = await confirm({
+          message: `Include tests for ${partialSpecifier}?`,
+          initialValue: config.includeTests
+        });
+        if (isCancel(includeTests)) {
+          cancel("Canceled!");
+          process.exit(0);
+        }
+        config.includeTests = includeTests;
+        const addWatermark = await confirm({
+          message: `Add watermark to ${partialSpecifier}?`,
+          initialValue: config.watermark
+        });
+        if (isCancel(addWatermark)) {
+          cancel("Canceled!");
+          process.exit(0);
+        }
+        config.watermark = addWatermark;
+      }
+    }
     const directory = path6.join(options.cwd, config.path, block.category);
     const blockExists = !block.subdirectory && fs6.existsSync(path6.join(directory, block.files[0])) || block.subdirectory && fs6.existsSync(path6.join(directory, block.name));
     if (blockExists && !options.yes) {
@@ -1700,6 +1762,18 @@ var _auth = async (options) => {
   const storage = get();
   if (options.logout) {
     for (const provider of providers) {
+      const tokenKey = `${provider.name()}-token`;
+      if (storage.get(tokenKey) === void 0) {
+        process.stdout.write(`${VERTICAL_LINE}
+`);
+        process.stdout.write(
+          color8.gray(
+            `${VERTICAL_LINE}  Already logged out of ${provider.name()}.
+`
+          )
+        );
+        continue;
+      }
       const response = await confirm2({
         message: `Remove ${provider.name()} token?`,
         initialValue: true
@@ -1709,7 +1783,7 @@ var _auth = async (options) => {
         process.exit(0);
       }
       if (!response) continue;
-      storage.delete(`${provider.name()}-token`);
+      storage.delete(tokenKey);
     }
     return;
   }
@@ -2193,7 +2267,7 @@ ${prefix?.() ?? ""}
 
 // src/commands/init.ts
 import fs9 from "node:fs";
-import { cancel as cancel4, confirm as confirm4, isCancel as isCancel4, outro as outro5, password as password2, select as select2, spinner as spinner5, text } from "@clack/prompts";
+import { cancel as cancel4, confirm as confirm4, isCancel as isCancel4, outro as outro5, password as password2, select as select2, spinner as spinner5, text as text2 } from "@clack/prompts";
 import color12 from "chalk";
 import { Command as Command5, program as program5 } from "commander";
 import { detect as detect2, resolveCommand as resolveCommand3 } from "package-manager-detector";
@@ -2250,7 +2324,7 @@ var _initProject = async (options) => {
   const initialConfig = getConfig(options.cwd);
   const loading = spinner5();
   if (!options.path) {
-    const result = await text({
+    const result = await text2({
       message: "Where should we add the blocks?",
       validate(value) {
         if (value.trim() === "") return "Please provide a value";
@@ -2276,7 +2350,7 @@ var _initProject = async (options) => {
         process.exit(0);
       }
       if (!confirmResult) break;
-      const result = await text({
+      const result = await text2({
         message: "Where should we download the blocks from?",
         placeholder: "github/ieedan/std",
         validate: (val) => {
@@ -2340,8 +2414,12 @@ var _initProject = async (options) => {
 };
 var _initRegistry = async (options) => {
   const loading = spinner5();
+  const packagePath = path9.join(options.cwd, "package.json");
+  if (!fs9.existsSync(packagePath)) {
+    program5.error(color12.red(`Couldn't find your ${color12.bold("package.json")}!`));
+  }
   if (!options.path) {
-    const response = await text({
+    const response = await text2({
       message: "Where are your blocks located?",
       defaultValue: "./blocks",
       initialValue: "./blocks",
@@ -2353,10 +2431,6 @@ var _initRegistry = async (options) => {
     }
     options.path = response;
   }
-  const packagePath = path9.join(options.cwd, "package.json");
-  if (!fs9.existsSync(packagePath)) {
-    program5.error(color12.red(`Couldn't find your ${color12.bold("package.json")}!`));
-  }
   const pkg = JSON.parse(fs9.readFileSync(packagePath).toString());
   const scriptAlreadyExists = pkg.scripts !== void 0 && pkg.scripts[options.script] !== void 0;
   if (!options.yes && scriptAlreadyExists) {
@@ -2369,7 +2443,7 @@ var _initRegistry = async (options) => {
       process.exit(0);
     }
     if (!response) {
-      const response2 = await text({
+      const response2 = await text2({
         message: "What would you like to call the script?",
         defaultValue: "build:registry",
         placeholder: "build:registry",

package/package.json

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

package/src/commands/add.ts

@@ -1,5 +1,5 @@
 import fs from 'node:fs';
-import { cancel, confirm, isCancel, multiselect, outro, spinner } from '@clack/prompts';
+import { cancel, confirm, isCancel, multiselect, outro, spinner, text } from '@clack/prompts';
 import color from 'chalk';
 import { Command, program } from 'commander';
 import { resolveCommand } from 'package-manager-detector/commands';
@@ -10,7 +10,7 @@ import { context } from '..';
 import * as ascii from '../utils/ascii';
 import { getInstalled, resolveTree } from '../utils/blocks';
 import { type Block, isTestFile } from '../utils/build';
-import { getConfig } from '../utils/config';
+import { type Config, getConfig } from '../utils/config';
 import { installDependencies } from '../utils/dependencies';
 import { getWatermark } from '../utils/get-watermark';
 import * as gitProviders from '../utils/git-providers';
@@ -60,10 +60,35 @@ const _add = async (blockNames: string[], options: Options) => {
 
 	const loading = spinner();
 
-	const config = getConfig(options.cwd).match(
-		(val) => val,
-		(err) => program.error(color.red(err))
-	);
+	const configResult = getConfig(options.cwd);
+
+	/** The user has opted for no config */
+	const noConfig = configResult.isErr();
+
+	let config: Config;
+
+	if (configResult.isErr()) {
+		const response = await confirm({
+			message: `You don't have ${ascii.JSREPO} initialized in your project. Do you want to continue?`,
+			initialValue: false,
+		});
+
+		if (isCancel(response) || !response) {
+			cancel('Canceled!');
+			process.exit(0);
+		}
+
+		// add default config used for default values in prompts
+		config = {
+			$schema: '',
+			includeTests: false,
+			watermark: true,
+			path: './src/blocks',
+			repos: [],
+		};
+	} else {
+		config = configResult.unwrap();
+	}
 
 	let repoPaths = config.repos;
 
@@ -73,7 +98,7 @@ const _add = async (blockNames: string[], options: Options) => {
 	// resolve repos for blocks
 	for (const blockSpecifier of blockNames) {
 		// we are only getting repos for blocks that specified repos
-		if (!blockSpecifier.startsWith('github')) continue;
+		if (!blockSpecifier.startsWith('github/')) continue;
 
 		const [providerName, owner, repoName, ...rest] = blockSpecifier.split('/');
 
@@ -88,7 +113,7 @@ const _add = async (blockNames: string[], options: Options) => {
 		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)}?`,
+					message: `Allow ${ascii.JSREPO} to download and run code from ${color.cyan(repo)}?`,
 					initialValue: true,
 				});
 
@@ -104,7 +129,7 @@ const _add = async (blockNames: string[], options: Options) => {
 
 	if (!options.allow && options.repo) {
 		const result = await confirm({
-			message: `Allow ${color.cyan('jsrepo')} to download and run code from ${color.cyan(options.repo)}?`,
+			message: `Allow ${ascii.JSREPO} to download and run code from ${color.cyan(options.repo)}?`,
 			initialValue: true,
 		});
 
@@ -115,6 +140,14 @@ const _add = async (blockNames: string[], options: Options) => {
 	}
 
 	if (repoPaths.length === 0) {
+		if (noConfig) {
+			program.error(
+				color.red(
+					`Fully quality blocks ex: (github/ieedan/std/utils/math) or provide the \`${color.bold('--repo')}\` flag to specify a registry.`
+				)
+			);
+		}
+
 		program.error(
 			color.red(
 				`There were no repos present in your config and you didn't provide the \`${color.bold('--repo')}\` flag with a repo.`
@@ -191,7 +224,7 @@ const _add = async (blockNames: string[], options: Options) => {
 
 	const installingBlocks = (await resolveTree(installingBlockNames, blocksMap, repoPaths)).match(
 		(val) => val,
-		program.error
+		(err) => program.error(err)
 	);
 
 	const pm = (await detect({ cwd: options.cwd }))?.agent ?? 'npm';
@@ -209,6 +242,53 @@ const _add = async (blockNames: string[], options: Options) => {
 
 		verbose(`Setting up ${fullSpecifier}`);
 
+		if (noConfig) {
+			const partialSpecifier = `${color.cyan(`${block.category}/${block.name}`)}`;
+
+			const blocksPath = await text({
+				message: `Where would you like to add ${partialSpecifier}?`,
+				initialValue: config.path,
+				defaultValue: config.path,
+				placeholder: config.path,
+				validate(value) {
+					if (value.trim() === '') return 'Please provide a value';
+				},
+			});
+
+			if (isCancel(blocksPath)) {
+				cancel('Canceled!');
+				process.exit(0);
+			}
+
+			config.path = blocksPath;
+
+			if (!options.yes) {
+				const includeTests = await confirm({
+					message: `Include tests for ${partialSpecifier}?`,
+					initialValue: config.includeTests,
+				});
+
+				if (isCancel(includeTests)) {
+					cancel('Canceled!');
+					process.exit(0);
+				}
+
+				config.includeTests = includeTests;
+
+				const addWatermark = await confirm({
+					message: `Add watermark to ${partialSpecifier}?`,
+					initialValue: config.watermark,
+				});
+
+				if (isCancel(addWatermark)) {
+					cancel('Canceled!');
+					process.exit(0);
+				}
+
+				config.watermark = addWatermark;
+			}
+		}
+
 		const directory = path.join(options.cwd, config.path, block.category);
 
 		const blockExists =

package/src/commands/auth.ts

@@ -3,6 +3,7 @@ import color from 'chalk';
 import { Command, Option } from 'commander';
 import * as v from 'valibot';
 import { context } from '..';
+import * as ascii from '../utils/ascii';
 import { providers } from '../utils/git-providers';
 import * as persisted from '../utils/persisted';
 import { intro } from '../utils/prompts';
@@ -41,6 +42,18 @@ const _auth = async (options: Options) => {
 
 	if (options.logout) {
 		for (const provider of providers) {
+			const tokenKey = `${provider.name()}-token`;
+
+			if (storage.get(tokenKey) === undefined) {
+				process.stdout.write(`${ascii.VERTICAL_LINE}\n`);
+				process.stdout.write(
+					color.gray(
+						`${ascii.VERTICAL_LINE}  Already logged out of ${provider.name()}.\n`
+					)
+				);
+				continue;
+			}
+
 			const response = await confirm({
 				message: `Remove ${provider.name()} token?`,
 				initialValue: true,
@@ -53,7 +66,7 @@ const _auth = async (options: Options) => {
 
 			if (!response) continue;
 
-			storage.delete(`${provider.name()}-token`);
+			storage.delete(tokenKey);
 		}
 		return;
 	}

package/src/commands/init.ts

@@ -206,6 +206,12 @@ const _initProject = async (options: Options) => {
 const _initRegistry = async (options: Options) => {
 	const loading = spinner();
 
+	const packagePath = path.join(options.cwd, 'package.json');
+
+	if (!fs.existsSync(packagePath)) {
+		program.error(color.red(`Couldn't find your ${color.bold('package.json')}!`));
+	}
+
 	if (!options.path) {
 		const response = await text({
 			message: 'Where are your blocks located?',
@@ -222,12 +228,6 @@ const _initRegistry = async (options: Options) => {
 		options.path = response;
 	}
 
-	const packagePath = path.join(options.cwd, 'package.json');
-
-	if (!fs.existsSync(packagePath)) {
-		program.error(color.red(`Couldn't find your ${color.bold('package.json')}!`));
-	}
-
 	const pkg = JSON.parse(fs.readFileSync(packagePath).toString());
 
 	const scriptAlreadyExists =