add packageManager property

Author: equiman

CHANGELOG.md

@@ -9,6 +9,12 @@ Fixed       for any bug fixes.
 Security    to invite users to upgrade in case of vulnerabilities.
 -->
 
+## [0.2.0] - 2022/05/18
+
+### Added
+
+- add `packageManager` property to `getCurrentPackageManager` method
+
 ## [0.1.2] - 2022/05/18
 
 ### Changed

README.md

@@ -161,7 +161,7 @@ This command installs a package and any packages that it depends on. If the pack
 
 ### Add
 
-This command, no arguments, will add a package to local `package.json` file. 
+This command, no arguments, will add a package to local `package.json` file.
 
 ```bash
 swpm add <package> [--save-dev --global]
@@ -184,14 +184,15 @@ swpm add <package> [--save-dev --global]
 
 `swpm` use two stages to infer what is the current Package Manager, following this order.
 
-1. Search the `swpm` property on the `package.json` file
-1. Search for `lock`'s files.
+1. Search the `swpm` property on `package.json` file
+1. Search the `packageManager` property on `package.json` file
+1. Search for `lock`'s files
 
-| Lock File           | Package Manager |
-| ------------------- | --------------- |
-| `package-lock.json` | `npm`           |
-| `yarn.lock`         | `yarn`          |
-| `pnpm-lock.yaml`    | `pnpm`          |
+  | Lock File           | Package Manager |
+  | ------------------- | --------------- |
+  | `package-lock.json` | `npm`           |
+  | `yarn.lock`         | `yarn`          |
+  | `pnpm-lock.yaml`    | `pnpm`          |
 
 ⇧ [Back to menu](#menu)
 

options/get.js

@@ -1,22 +1,24 @@
+import { stripIndents } from 'common-tags'
 import chalk from 'chalk'
 import { getPackageJson, lockFileExists } from '../helpers/files.js'
 import packagesList, { packageExists } from '../packages/list.js'
 
 const packageName = 'package.json'
 
-const searchOnPackageJson = async () => {
-  const packageJson = await getPackageJson()
-  if (!packageJson || !('swpm' in packageJson)) {
+const searchForProperty = async (packageJson, property) => {
+  if (!packageJson || !(property in packageJson)) {
     return undefined
   }
 
-  const pinned = packageJson?.swpm
-  if (pinned && packageExists(pinned)) {
-    return packageJson?.swpm
+  const prop = packageJson?.[property]
+  if (prop && packageExists(prop)) {
+    return packageJson?.[property]
   }
 
-  console.log(`${chalk.red.bold('Error')}: Package Manager (${chalk.bold(pinned)}) pinned on ${chalk.bold(packageName)} file is not valid.`)
-  console.log(`Use ${chalk.blue.bold('npm --pin <npm|yarn|pnpm>')} to fix it.`)
+  console.log(stripIndents`
+    ${chalk.red.bold('Error')}: the value in (${chalk.bold(prop)}) property on ${chalk.bold(packageName)} file is not valid.
+    Use ${chalk.blue.bold('npm --pin <npm|yarn|pnpm>')} to fix it.
+  `)
   process.exit(1)
 }
 
@@ -32,21 +34,29 @@ const searchForLockFiles = async () => {
 }
 
 export const getCurrentPackageManager = async () => {
-  const pinned = await searchOnPackageJson()
+  const packageJson = await getPackageJson()
+
+  const pinned = await searchForProperty(packageJson, 'swpm')
   if (pinned) {
     return pinned
   }
 
+  // https://nodejs.org/api/corepack.html
+  const packageManager = await searchForProperty(packageJson, 'packageManager')
+  if (packageManager) {
+    return packageManager
+  }
+
   const lock = await searchForLockFiles()
   if (lock) {
     return lock
   }
 
-  console.log(`
-${chalk.red.bold('Error')}: no Package Manager was found.
+  console.log(stripIndents`
+    ${chalk.red.bold('Error')}: no Package Manager was found.
 
-Please review if the current path has a ${chalk.bold('package.json')} or a ${chalk.bold('lock')} file.
-Highly recommend pin a Package Manager with ${chalk.blue.bold('swpm --pin <npm|yarn|pnpm>')} command.
-`)
+    Please review if the current path has a ${chalk.bold('package.json')} or a ${chalk.bold('lock')} file.
+    Highly recommend pin a Package Manager with ${chalk.blue.bold('swpm --pin <npm|yarn|pnpm>')} command.
+  `)
   process.exit(1)
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swpm",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "engines": {
     "node": ">=16.15.0"
   },