@ryanatkn/gro 0.141.1 → 0.143.0

package/src/lib/sync.task.ts

@@ -14,26 +14,26 @@ export const Args = z
 		gen: z.boolean({description: 'dual of no-gen'}).default(true),
 		'no-gen': z.boolean({description: 'opt out of running gen'}).default(false),
 		install: z.boolean({description: 'dual of no-install'}).default(true),
-		'no-install': z.boolean({description: 'opt out of `npm install`'}).default(false),
+		'no-install': z.boolean({description: 'opt out of installing packages'}).default(false),
 	})
 	.strict();
 export type Args = z.infer<typeof Args>;
 
 export const task: Task<Args> = {
-	summary: 'run `gro gen`, update `package.json`, and optionally `npm i` to sync up',
+	summary: 'run `gro gen`, update `package.json`, and optionally install packages to sync up',
 	Args,
 	run: async ({args, invoke_task, config, log}): Promise<void> => {
 		const {sveltekit, package_json, gen, install} = args;
 
 		if (install) {
-			const result = await spawn('npm', ['i']);
+			const result = await spawn(config.pm_cli, ['install']);
 			if (!result.ok) {
-				throw new Task_Error('Failed npm install');
+				throw new Task_Error(`Failed \`${config.pm_cli} install\``);
 			}
 		}
 
 		if (sveltekit) {
-			await sveltekit_sync();
+			await sveltekit_sync(undefined, config.pm_cli);
 			log.info('synced SvelteKit');
 		}
 

package/src/lib/upgrade.task.ts

@@ -5,6 +5,7 @@ import {Task_Error, type Task} from './task.js';
 import {extract_deps, load_package_json, type Package_Json_Dep} from './package_json.js';
 import {Git_Origin, git_pull} from './git.js';
 import {spawn_cli} from './cli.js';
+import {serialize_args, to_forwarded_args} from './args.js';
 
 export const Args = z
 	.object({
@@ -27,7 +28,7 @@ export type Args = z.infer<typeof Args>;
 export const task: Task<Args> = {
 	summary: 'upgrade deps',
 	Args,
-	run: async ({args, log}): Promise<void> => {
+	run: async ({args, log, config}): Promise<void> => {
 		const {_, only, origin, force, pull, dry} = args;
 
 		if (_.length && only.length) {
@@ -65,7 +66,8 @@ export const task: Task<Args> = {
 		if (force) {
 			install_args.push('--force');
 		}
-		await spawn('npm', install_args);
+		install_args.push(...serialize_args(to_forwarded_args(config.pm_cli)));
+		await spawn(config.pm_cli, install_args);
 
 		// Sync in a new process to pick up any changes after installing, avoiding some errors.
 		await spawn_cli('gro', ['sync', '--no-install']); // don't install because we do above

package/src/lib/watch_dir.ts

@@ -1,6 +1,7 @@
 import {watch, type ChokidarOptions, type FSWatcher} from 'chokidar';
 import {relative} from 'node:path';
 import {statSync} from 'node:fs';
+import {create_deferred, type Deferred} from '@ryanatkn/belt/async.js';
 
 import type {Path_Filter} from './path.js';
 
@@ -42,13 +43,12 @@ export const watch_dir = ({
 	chokidar,
 }: Options): Watch_Node_Fs => {
 	let watcher: FSWatcher | undefined;
-	let initing: Promise<void> | undefined;
+	let initing: Deferred<void> | undefined;
 
 	return {
 		init: async () => {
-			if (initing) return initing;
-			let resolve: any;
-			initing = new Promise((r) => (resolve = r)); // TODO `create_deferred`?// cwd: chokidar?.cwd ?? process.cwd()
+			if (initing) return initing.promise;
+			initing = create_deferred();
 			watcher = watch(dir, {...chokidar});
 			watcher.on('add', (path) => {
 				const final_path = absolute ? path : relative(dir, path);
@@ -77,8 +77,8 @@ export const watch_dir = ({
 				on_change({type: 'delete', path: final_path, is_directory: true});
 			});
 			// wait until ready
-			watcher.once('ready', () => resolve());
-			await initing;
+			watcher.once('ready', () => initing?.resolve());
+			await initing.promise;
 		},
 		close: async () => {
 			initing = undefined;

package/dist/path_constants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"path_constants.d.ts","sourceRoot":"../src/lib/","sources":["path_constants.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,cAAc,QAAQ,CAAC;AACpC,eAAO,MAAM,WAAW,SAAS,CAAC;AAClC,eAAO,MAAM,eAAe,UAAU,CAAC;AACvC,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAC9C,eAAO,MAAM,eAAe,QAAuB,CAAC;AACpD,eAAO,MAAM,UAAU,QAAuB,CAAC;AAC/C,eAAO,MAAM,OAAO,QAAoB,CAAC;AACzC,eAAO,MAAM,WAAW,QAAwB,CAAC;AACjD,eAAO,MAAM,eAAe,kBAAkB,CAAC;AAC/C,eAAO,MAAM,eAAe,cAAc,CAAC;AAC3C,eAAO,MAAM,yBAAyB,qBAAqB,CAAC;AAC5D,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AACrD,eAAO,MAAM,oBAAoB,iBAAiB,CAAC;AACnD,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AACrD,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AACnD,eAAO,MAAM,uBAAuB,UAAU,CAAC;AAC/C,eAAO,MAAM,sBAAsB,SAAS,CAAC;AAC7C,eAAO,MAAM,yBAAyB,QAAkC,CAAC;AACzE,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,WAAW,SAAS,CAAC;AAClC,eAAO,MAAM,iBAAiB,kBAAkB,CAAC;AAEjD,eAAO,MAAM,UAAU,QAAwB,CAAC;AAChD,eAAO,MAAM,UAAU,QAAwB,CAAC;AAChD,eAAO,MAAM,YAAY,QAAY,CAAC;AACtC,eAAO,MAAM,kBAAkB,QAAO,CAAC"}