[cli] add pinned deps support to mops update and mops outdated

Author: ZenVoich

cli/commands/add.ts

@@ -83,7 +83,7 @@ export async function add(name : string, {verbose = false, dev = false, lock} :
 		}
 
 		pkgDetails = {
-			name: name,
+			name: asName || name,
 			repo: '',
 			version: ver,
 		};

cli/commands/available-updates.ts

@@ -2,7 +2,8 @@ import process from 'node:process';
 import chalk from 'chalk';
 import {mainActor} from '../api/actors.js';
 import {Config} from '../types.js';
-import {getDepName} from '../helpers/get-dep-name.js';
+import {getDepName, getDepPinnedVersion} from '../helpers/get-dep-name.js';
+import {SemverPart} from '../declarations/main/main.did.js';
 
 // [pkg, oldVersion, newVersion]
 export async function getAvailableUpdates(config : Config, pkg ?: string) : Promise<Array<[string, string, string]>> {
@@ -11,25 +12,37 @@ export async function getAvailableUpdates(config : Config, pkg ?: string) : Prom
 	let allDeps = [...deps, ...devDeps].filter((dep) => dep.version);
 	let depsToUpdate = pkg ? allDeps.filter((dep) => dep.name === pkg) : allDeps;
 
-	// skip pinned dependencies
-	depsToUpdate = depsToUpdate.filter((dep) => getDepName(dep.name) === dep.name);
+	// skip hard pinned dependencies (e.g. "base@X.Y.Z")
+	depsToUpdate = depsToUpdate.filter((dep) => getDepName(dep.name) === dep.name || getDepPinnedVersion(dep.name).split('.').length !== 3);
 
-	let getCurrentVersion = (pkg : string) => {
+	let getCurrentVersion = (pkg : string, updateVersion : string) => {
 		for (let dep of allDeps) {
-			if (dep.name === pkg && dep.version) {
+			if (getDepName(dep.name) === pkg && dep.version) {
+				let pinnedVersion = getDepPinnedVersion(dep.name);
+				if (pinnedVersion && !updateVersion.startsWith(pinnedVersion)) {
+					continue;
+				}
 				return dep.version;
 			}
 		}
 		return '';
 	};
 
 	let actor = await mainActor();
-	let res = await actor.getHighestSemverBatch(depsToUpdate.map((dep) => [dep.name, dep.version || '', {major: null}]));
+	let res = await actor.getHighestSemverBatch(depsToUpdate.map((dep) => {
+		let semverPart : SemverPart = {major: null};
+		let name = getDepName(dep.name);
+		let pinnedVersion = getDepPinnedVersion(dep.name);
+		if (pinnedVersion) {
+			semverPart = pinnedVersion.split('.').length === 1 ? {minor: null} : {patch: null};
+		}
+		return [name, dep.version || '', semverPart];
+	}));
 
 	if ('err' in res) {
 		console.log(chalk.red('Error:'), res.err);
 		process.exit(1);
 	}
 
-	return res.ok.filter((dep) => dep[1] !== getCurrentVersion(dep[0])).map((dep) => [dep[0], getCurrentVersion(dep[0]), dep[1]]);
+	return res.ok.filter((dep) => dep[1] !== getCurrentVersion(dep[0], dep[1])).map((dep) => [dep[0], getCurrentVersion(dep[0], dep[1]), dep[1]]);
 }

cli/commands/outdated.ts

@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 import {checkConfigFile, readConfig} from '../mops.js';
 import {getAvailableUpdates} from './available-updates.js';
+import {getDepName, getDepPinnedVersion} from '../helpers/get-dep-name.js';
 
 export async function outdated() {
 	if (!checkConfigFile()) {
@@ -15,8 +16,14 @@ export async function outdated() {
 	}
 	else {
 		console.log('Available updates:');
+		let allDeps = [...Object.keys(config.dependencies || {}), ...Object.keys(config['dev-dependencies'] || {})];
 		for (let dep of available) {
-			console.log(`${dep[0]} ${chalk.yellow(dep[1])} -> ${chalk.green(dep[2])}`);
+			let name = allDeps.find((d) => {
+				let pinnedVersion = getDepPinnedVersion(d);
+				return getDepName(d) === dep[0] && (!pinnedVersion || dep[1].startsWith(pinnedVersion));
+			}) || dep[0];
+
+			console.log(`${name} ${chalk.yellow(dep[1])} -> ${chalk.green(dep[2])}`);
 		}
 	}
 }

cli/commands/update.ts

@@ -3,6 +3,7 @@ import {checkConfigFile, getGithubCommit, parseGithubURL, readConfig} from '../m
 import {add} from './add.js';
 import {getAvailableUpdates} from './available-updates.js';
 import {checkIntegrity} from '../integrity.js';
+import {getDepName, getDepPinnedVersion} from '../helpers/get-dep-name.js';
 
 type UpdateOptions = {
 	verbose ?: boolean;
@@ -51,8 +52,24 @@ export async function update(pkg ?: string, {lock} : UpdateOptions = {}) {
 	}
 	else {
 		for (let dep of available) {
-			let dev = !!config['dev-dependencies']?.[dep[0]];
-			await add(`${dep[0]}@${dep[2]}`, {dev});
+			let devDeps = Object.keys(config['dev-dependencies'] || {});
+			let allDeps = [...Object.keys(config.dependencies || {}), ...devDeps];
+
+			let dev = false;
+			for (let d of devDeps) {
+				let pinnedVersion = getDepPinnedVersion(d);
+				if (getDepName(d) === dep[0] && (!pinnedVersion || dep[1].startsWith(pinnedVersion))) {
+					dev = true;
+					break;
+				}
+			}
+
+			let asName = allDeps.find((d) => {
+				let pinnedVersion = getDepPinnedVersion(d);
+				return getDepName(d) === dep[0] && (!pinnedVersion || dep[1].startsWith(pinnedVersion));
+			}) || dep[0];
+
+			await add(`${dep[0]}@${dep[2]}`, {dev}, asName);
 		}
 	}
 

cli/helpers/get-dep-name.ts

@@ -1,3 +1,7 @@
 export function getDepName(name : string) : string {
 	return name.split('@')[0] || '';
+}
+
+export function getDepPinnedVersion(name : string) : string {
+	return name.split('@')[1] || '';
 }