ieedan · ieedan · Feb 10, 2025 · Feb 10, 2025 · Feb 10, 2025 · Feb 10, 2025
diff --git a/.changeset/eight-moons-drop.md b/.changeset/eight-moons-drop.md
@@ -0,0 +1,5 @@
+---
+"jsrepo": minor
+---
+
+perf: Cache git provider state to improve time it takes to fetch the manifest. (This behavior can be disabled with the `--no-cache` flag)
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -69,11 +69,11 @@
 		"package-manager-detector": "^0.2.9",
 		"parse5": "^7.2.1",
 		"pathe": "^2.0.2",
-		"prettier": "^3.4.2",
+		"prettier": "^3.5.0",
 		"semver": "^7.7.1",
 		"svelte": "^5.19.9",
 		"ts-morph": "^25.0.1",
-		"valibot": "1.0.0-beta.15",
+		"valibot": "1.0.0-rc.0",
 		"validate-npm-package-name": "^6.0.0",
 		"vue": "^3.5.13"
 	}

diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts
@@ -1,41 +1,11 @@
-import fs from 'node:fs';
-import { fileURLToPath } from 'node:url';
 import { program } from 'commander';
-import path from 'pathe';
+import pkg from '../package.json';
 import * as commands from './commands';
-import type { CLIContext } from './utils/context';
-import { getLatestVersion } from './utils/get-latest-version';
-
-const resolveRelativeToRoot = (p: string): string => {
-	const dirname = fileURLToPath(import.meta.url);
-	return path.join(dirname, '../..', p);
-};
-
-// get version from package.json
-const { version, name, description, repository } = JSON.parse(
-	fs.readFileSync(resolveRelativeToRoot('package.json'), 'utf-8')
-);
-
-const latestVersion = (await getLatestVersion()).match(
-	(val) => val,
-	() => undefined
-);
-
-const context: CLIContext = {
-	package: {
-		name,
-		description,
-		version,
-		repository,
-		latestVersion,
-	},
-	resolveRelativeToRoot,
-};
 
 const cli = program
-	.name(name)
-	.description(description)
-	.version(version)
+	.name(pkg.name)
+	.description(pkg.description)
+	.version(pkg.version)
 	.addCommand(commands.add)
 	.addCommand(commands.auth)
 	.addCommand(commands.build)
@@ -44,4 +14,4 @@ const cli = program
 	.addCommand(commands.test)
 	.addCommand(commands.update);
 
-export { cli, context };
+export { cli };
diff --git a/packages/cli/src/commands/add.ts b/packages/cli/src/commands/add.ts
@@ -16,7 +16,6 @@ import { resolveCommand } from 'package-manager-detector/commands';
 import { detect } from 'package-manager-detector/detect';
 import path from 'pathe';
 import * as v from 'valibot';
-import { context } from '../cli';
 import * as ascii from '../utils/ascii';
 import { getInstalled, resolveTree } from '../utils/blocks';
 import * as url from '../utils/blocks/ts/url';
@@ -48,6 +47,7 @@ const schema = v.object({
 	repo: v.optional(v.string()),
 	allow: v.boolean(),
 	yes: v.boolean(),
+	cache: v.boolean(),
 	verbose: v.boolean(),
 	cwd: v.string(),
 });
@@ -63,12 +63,13 @@ const add = new Command('add')
 	.option('--repo <repo>', 'Repository to download the blocks from.')
 	.option('-A, --allow', 'Allow jsrepo to download code from the provided repo.', false)
 	.option('-y, --yes', 'Skip confirmation prompt.', false)
+	.option('--no-cache', 'Disable caching of resolved git urls.')
 	.option('--verbose', 'Include debug logs.', false)
 	.option('--cwd <path>', 'The current working directory.', process.cwd())
 	.action(async (blockNames, opts) => {
 		const options = v.parse(schema, opts);
 
-		intro(context);
+		await intro();
 
 		await _add(blockNames, options);
 
@@ -216,7 +217,7 @@ const _add = async (blockNames: string[], options: Options) => {
 	if (!options.verbose) loading.start(`Fetching blocks from ${color.cyan(repoPaths.join(', '))}`);
 
 	const resolvedRepos: registry.RegistryProviderState[] = (
-		await registry.forEachPathGetProviderState(...repoPaths)
+		await registry.forEachPathGetProviderState(repoPaths, { noCache: !options.cache })
 	).match(
 		(val) => val,
 		({ repo, message }) => {
@@ -417,7 +418,7 @@ const _add = async (blockNames: string[], options: Options) => {
 	for (const { block } of installingBlocks) {
 		const fullSpecifier = url.join(block.sourceRepo.url, block.category, block.name);
 		const shortSpecifier = `${block.category}/${block.name}`;
-		const watermark = getWatermark(context.package.version, block.sourceRepo.url);
+		const watermark = getWatermark(block.sourceRepo.url);
 
 		const providerInfo = block.sourceRepo;
 

diff --git a/packages/cli/src/commands/auth.ts b/packages/cli/src/commands/auth.ts
@@ -2,7 +2,6 @@ import { cancel, confirm, isCancel, outro, password, select } from '@clack/promp
 import color from 'chalk';
 import { Command, Option } from 'commander';
 import * as v from 'valibot';
-import { context } from '../cli';
 import * as ascii from '../utils/ascii';
 import * as persisted from '../utils/persisted';
 import { intro } from '../utils/prompts';
@@ -30,7 +29,7 @@ const auth = new Command('auth')
 	.action(async (opts) => {
 		const options = v.parse(schema, opts);
 
-		intro(context);
+		await intro();
 
 		await _auth(options);
 

diff --git a/packages/cli/src/commands/build.ts b/packages/cli/src/commands/build.ts
@@ -5,7 +5,6 @@ import { Command, program } from 'commander';
 import ignore from 'ignore';
 import path from 'pathe';
 import * as v from 'valibot';
-import { context } from '../cli';
 import { MANIFEST_FILE } from '../constants';
 import type { Category, Manifest } from '../types';
 import * as ascii from '../utils/ascii';
@@ -72,7 +71,7 @@ const build = new Command('build')
 	.action(async (opts) => {
 		const options = v.parse(schema, opts);
 
-		intro(context);
+		await intro();
 
 		await _build(options);
 

diff --git a/packages/cli/src/commands/exec.ts b/packages/cli/src/commands/exec.ts
@@ -7,7 +7,6 @@ import { resolveCommand } from 'package-manager-detector/commands';
 import { detect } from 'package-manager-detector/detect';
 import path from 'pathe';
 import * as v from 'valibot';
-import { context } from '../cli';
 import * as ascii from '../utils/ascii';
 import { resolveTree } from '../utils/blocks';
 import * as url from '../utils/blocks/ts/url';
@@ -21,6 +20,7 @@ const schema = v.objectWithRest(
 	{
 		repo: v.optional(v.string()),
 		allow: v.boolean(),
+		cache: v.boolean(),
 		cwd: v.string(),
 	},
 	v.unknown()
@@ -39,13 +39,14 @@ const exec = new Command('exec')
 	)
 	.option('--repo <repo>', 'Repository to download and run the script from.')
 	.option('-A, --allow', 'Allow jsrepo to download code from the provided repo.', false)
+	.option('--no-cache', 'Disable caching of resolved git urls.')
 	.option('--cwd <path>', 'The current working directory.', process.cwd())
 	.allowExcessArguments()
 	.allowUnknownOption()
 	.action(async (script, opts, command) => {
 		const options = v.parse(schema, opts);
 
-		intro(context);
+		await intro();
 
 		await _exec(script, options, command);
 	});
@@ -141,7 +142,7 @@ const _exec = async (s: string | undefined, options: Options, command: any) => {
 	loading.start(`Fetching scripts from ${color.cyan(repoPaths.join(', '))}`);
 
 	const resolvedRepos: registry.RegistryProviderState[] = (
-		await registry.forEachPathGetProviderState(...repoPaths)
+		await registry.forEachPathGetProviderState(repoPaths, { noCache: !options.cache })
 	).match(
 		(val) => val,
 		({ repo, message }) => {

diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts
@@ -18,7 +18,6 @@ import { createPathsMatcher } from 'get-tsconfig';
 import { detect, resolveCommand } from 'package-manager-detector';
 import path from 'pathe';
 import * as v from 'valibot';
-import { context } from '../cli';
 import { type ModelName, models } from '../utils/ai';
 import * as ascii from '../utils/ascii';
 import {
@@ -31,6 +30,7 @@ import {
 	getProjectConfig,
 	getRegistryConfig,
 } from '../utils/config';
+import { packageJson } from '../utils/context';
 import { installDependencies } from '../utils/dependencies';
 import { formatDiff } from '../utils/diff';
 import { formatFile, matchJSDescendant, tryGetTsconfig } from '../utils/files';
@@ -52,6 +52,7 @@ const schema = v.object({
 	expand: v.boolean(),
 	maxUnchanged: v.number(),
 	yes: v.boolean(),
+	cache: v.boolean(),
 	cwd: v.string(),
 });
 
@@ -87,11 +88,12 @@ const init = new Command('init')
 		3
 	)
 	.option('-y, --yes', 'Skip confirmation prompt.', false)
+	.option('--no-cache', 'Disable caching of resolved git urls.')
 	.option('--cwd <path>', 'The current working directory.', process.cwd())
 	.action(async (registries, opts) => {
 		const options = v.parse(schema, opts);
 
-		intro(context);
+		await intro();
 
 		if (options.registry !== undefined && options.project !== undefined) {
 			program.error(
@@ -315,7 +317,7 @@ const _initProject = async (registries: string[], options: Options) => {
 	}
 
 	const config: ProjectConfig = {
-		$schema: `https://unpkg.com/jsrepo@${context.package.version}/schemas/project-config.json`,
+		$schema: `https://unpkg.com/jsrepo@${packageJson.version}/schemas/project-config.json`,
 		repos,
 		includeTests:
 			initialConfig.isOk() && options.tests === undefined
@@ -527,7 +529,7 @@ const promptForProviderConfig = async ({
 
 	loading.start(`Fetching manifest from ${color.cyan(repo)}`);
 
-	const providerState = await registry.getProviderState(repo);
+	const providerState = await registry.getProviderState(repo, { noCache: !options.cache });
 
 	if (providerState.isErr()) {
 		program.error(color.red(providerState.unwrapErr()));
@@ -874,7 +876,7 @@ const _initRegistry = async (options: Options) => {
 		};
 	}
 
-	config.$schema = `https://unpkg.com/jsrepo@${context.package.version}/schemas/registry-config.json`;
+	config.$schema = `https://unpkg.com/jsrepo@${packageJson.version}/schemas/registry-config.json`;
 
 	while (true) {
 		if (config.dirs.length > 0) {

diff --git a/packages/cli/src/commands/test.ts b/packages/cli/src/commands/test.ts
@@ -8,7 +8,6 @@ import { detect } from 'package-manager-detector/detect';
 import path from 'pathe';
 import { Project } from 'ts-morph';
 import * as v from 'valibot';
-import { context } from '../cli';
 import * as ascii from '../utils/ascii';
 import { getInstalled } from '../utils/blocks';
 import * as url from '../utils/blocks/ts/url';
@@ -21,6 +20,7 @@ const schema = v.object({
 	repo: v.optional(v.string()),
 	allow: v.boolean(),
 	debug: v.boolean(),
+	cache: v.boolean(),
 	verbose: v.boolean(),
 	cwd: v.string(),
 });
@@ -33,12 +33,13 @@ const test = new Command('test')
 	.option('--repo <repo>', 'Repository to download the blocks from.')
 	.option('-A, --allow', 'Allow jsrepo to download code from the provided repo.', false)
 	.option('--debug', 'Leaves the temp test file around for debugging upon failure.', false)
+	.option('--no-cache', 'Disable caching of resolved git urls.')
 	.option('--verbose', 'Include debug logs.', false)
 	.option('--cwd <path>', 'The current working directory.', process.cwd())
 	.action(async (blockNames, opts) => {
 		const options = v.parse(schema, opts);
 
-		intro(context);
+		await intro();
 
 		await _test(blockNames, options);
 
@@ -81,7 +82,7 @@ const _test = async (blockNames: string[], options: Options) => {
 	if (!options.verbose) loading.start(`Fetching blocks from ${color.cyan(repoPaths.join(', '))}`);
 
 	const resolvedRepos: registry.RegistryProviderState[] = (
-		await registry.forEachPathGetProviderState(...repoPaths)
+		await registry.forEachPathGetProviderState(repoPaths, { noCache: !options.cache })
 	).match(
 		(val) => val,
 		({ repo, message }) => {

diff --git a/packages/cli/src/commands/update.ts b/packages/cli/src/commands/update.ts
@@ -16,7 +16,6 @@ import { resolveCommand } from 'package-manager-detector/commands';
 import { detect } from 'package-manager-detector/detect';
 import path from 'pathe';
 import * as v from 'valibot';
-import { context } from '../cli';
 import { type ModelName, models } from '../utils/ai';
 import * as ascii from '../utils/ascii';
 import { getInstalled, resolveTree } from '../utils/blocks';
@@ -40,6 +39,7 @@ const schema = v.object({
 	repo: v.optional(v.string()),
 	allow: v.boolean(),
 	yes: v.boolean(),
+	cache: v.boolean(),
 	verbose: v.boolean(),
 	cwd: v.string(),
 });
@@ -61,12 +61,13 @@ const update = new Command('update')
 	.option('--repo <repo>', 'Repository to download the blocks from.')
 	.option('-A, --allow', 'Allow jsrepo to download code from the provided repo.', false)
 	.option('-y, --yes', 'Skip confirmation prompt.', false)
+	.option('--no-cache', 'Disable caching of resolved git urls.')
 	.option('--verbose', 'Include debug logs.', false)
 	.option('--cwd <path>', 'The current working directory.', process.cwd())
 	.action(async (blockNames, opts) => {
 		const options = v.parse(schema, opts);
 
-		intro(context);
+		await intro();
 
 		await _update(blockNames, options);
 
@@ -122,7 +123,7 @@ const _update = async (blockNames: string[], options: Options) => {
 	if (!options.verbose) loading.start(`Fetching blocks from ${color.cyan(repoPaths.join(', '))}`);
 
 	const resolvedRepos: registry.RegistryProviderState[] = (
-		await registry.forEachPathGetProviderState(...repoPaths)
+		await registry.forEachPathGetProviderState(repoPaths, { noCache: !options.cache })
 	).match(
 		(val) => val,
 		({ repo, message }) => {
@@ -220,7 +221,7 @@ const _update = async (blockNames: string[], options: Options) => {
 	for (const { block } of updatingBlocks) {
 		const fullSpecifier = url.join(block.sourceRepo.url, block.category, block.name);
 
-		const watermark = getWatermark(context.package.version, block.sourceRepo.url);
+		const watermark = getWatermark(block.sourceRepo.url);
 
 		const providerState = block.sourceRepo;
 

diff --git a/packages/cli/src/utils/context.ts b/packages/cli/src/utils/context.ts
@@ -1,18 +1,4 @@
-export interface CLIContext {
-	/** The package.json of the CLI */
-	package: {
-		name: string;
-		version: string;
-		description: string;
-		repository: {
-			url: string;
-		};
-		latestVersion?: string;
-	};
-	/** Resolves the path relative to the root of the application
-	 *
-	 * @param path
-	 * @returns
-	 */
-	resolveRelativeToRoot: (path: string) => string;
-}
+import pkg from '../../package.json';
+import type { PackageJson } from './package';
+
+export const packageJson = pkg as PackageJson;