Add details.agentSupported check

Author: jdalton

src/commands/optimize/add-overrides.ts

@@ -132,7 +132,7 @@ export async function addOverrides(
       // Roughly check Node range as semver.coerce will strip leading
       // v's, carets (^), comparators (<,<=,>,>=,=), and tildes (~).
       semver.coerce(data.engines.node)!,
-      `>=${pkgEnvDetails.pkgRequirements.node}`
+      pkgEnvDetails.pkgRequirements.node
     )
   )
 

src/utils/package-environment.ts

@@ -266,8 +266,9 @@ export async function detectPackageEnvironment({
   let pkgMinAgentVersion = minSupportedAgentVersion
   let pkgMinNodeVersion = minSupportedNodeVersion
   if (pkgJson) {
-    const agentRange = pkgJson.engines?.[agent]
-    const nodeRange = pkgJson.engines?.['node']
+    const { engines } = pkgJson
+    const agentRange = engines?.[agent]
+    const nodeRange = engines?.['node']
     if (isNonEmptyString(agentRange)) {
       // Roughly check agent range as semver.coerce will strip leading
       // v's, carets (^), comparators (<,<=,>,>=,=), and tildes (~).
@@ -339,8 +340,8 @@ export async function detectPackageEnvironment({
     pkgPath,
     pkgSupported,
     pkgRequirements: {
-      agent: pkgMinAgentVersion,
-      node: pkgMinNodeVersion
+      agent: `>=${pkgMinAgentVersion}`,
+      node: `>=${pkgMinNodeVersion}`
     }
   }
 }
@@ -373,17 +374,31 @@ export async function detectAndValidatePackageEnvironment(
       )
     }
   })
+  const { agent, agentVersion } = details
+  if (!details.agentSupported) {
+    const minVersion = constants.minimumVersionByAgent.get(agent)!
+    logger?.fail(
+      cmdPrefixMessage(
+        cmdName,
+        `Requires ${agent} >=${minVersion}. Current version: ${agentVersion ?? 'unknown'}.`
+      )
+    )
+    return
+  }
   if (!details.pkgSupported) {
     logger?.fail(
-      cmdPrefixMessage(cmdName, 'No supported Node or browser range detected')
+      cmdPrefixMessage(
+        cmdName,
+        `Package engine "node" or "${agent}" range not met`
+      )
     )
     return
   }
-  if (details.agent === VLT) {
+  if (agent === VLT) {
     logger?.fail(
       cmdPrefixMessage(
         cmdName,
-        `${details.agent} does not support overrides. Soon, though ⚡`
+        `${agent} does not support overrides. Soon, though ⚡`
       )
     )
     return
@@ -401,11 +416,11 @@ export async function detectAndValidatePackageEnvironment(
     logger?.fail(cmdPrefixMessage(cmdName, `No ${PACKAGE_JSON} found`))
     return
   }
-  if (prod && (details.agent === BUN || details.agent === YARN_BERRY)) {
+  if (prod && (agent === BUN || agent === YARN_BERRY)) {
     logger?.fail(
       cmdPrefixMessage(
         cmdName,
-        `--prod not supported for ${details.agent}${details.agentVersion ? `@${details.agentVersion.version}` : ''}`
+        `--prod not supported for ${agent}${agentVersion ? `@${agentVersion}` : ''}`
       )
     )
     return