fixup

Author: aduh95

sources/specUtils.ts

@@ -83,6 +83,11 @@ function parsePackageJSON(packageJSONContent: CorepackPackageJSON, localEnv?: Lo
 
       debugUtils.log(`Using ${localEnvVersion} defined in .corepack.env`);
       version = localEnvVersion;
+    } else {
+      const {packageManager: pm} = packageJSONContent;
+      if (pm?.startsWith(`${packageManager.name}@`) && semverSatisfies(pm.slice(packageManager.name.length + 1), version)) {
+        return pm;
+      }
     }
 
 
@@ -156,11 +161,12 @@ export async function loadSpec(initialCwd: string): Promise<LoadSpecResult> {
     const envFilePath = path.join(currCwd, `.corepack.env`);
     debugUtils.log(`Checking ${envFilePath}`);
     try {
-      localEnv = parseEnv(await fs.promises.readFile(envFilePath, `utf8`)) as LocalEnvFile;
+      localEnv = {...process.env, ...parseEnv(await fs.promises.readFile(envFilePath, `utf8`))};
     } catch (err) {
-      if ((err as NodeError)?.code !== `ENOENT`) {
+      if ((err as NodeError)?.code !== `ENOENT`)
         throw err;
-      }
+
+      localEnv = process.env;
     }
 
     selection = {data, manifestPath, localEnv};

sources/types.ts

@@ -146,4 +146,4 @@ export interface Locator {
   reference: string;
 }
 
-export type LocalEnvFile = Record<"COREPACK_ENABLE_AUTO_PIN" | "COREPACK_ENABLE_STRICT" | "COREPACK_INTEGRITY_KEYS" | "COREPACK_PACKAGE_MANAGER", string>;
+export type LocalEnvFile = Record<string, string | undefined>;

tests/main.test.ts

@@ -261,28 +261,86 @@ it(`should prefer devEngines to packageManager`, async () => {
   });
 });
 
-it(`should accept range in devEngines only if a specific version is provided in .corepack.env`, async () => {
-  await xfs.mktempPromise(async cwd => {
-    await xfs.writeJsonPromise(ppath.join(cwd, `package.json` as PortablePath), {
-      devEngines: {
-        packageManager: {
-          name: `pnpm`,
-          version: `6.x`,
+describe(`should accept range in devEngines only if a specific version is provided`, () => {
+  it(`either in .corepack.env`, async() => {
+    await xfs.mktempPromise(async cwd => {
+      await xfs.writeJsonPromise(ppath.join(cwd, `package.json` as PortablePath), {
+        devEngines: {
+          packageManager: {
+            name: `pnpm`,
+            version: `6.x`,
+          },
         },
-      },
+      });
+      await expect(runCli(cwd, [`pnpm`, `--version`])).resolves.toMatchObject({
+        exitCode: 1,
+        stderr: `Invalid package manager specification in package.json (pnpm@6.x); expected a semver version\n`,
+        stdout: ``,
+      });
+
+      await xfs.writeFilePromise(ppath.join(cwd, `.corepack.env` as PortablePath),
+        `COREPACK_DEV_ENGINES_PNPM=6.6.2+sha224.eb5c0acad3b0f40ecdaa2db9aa5a73134ad256e17e22d1419a2ab073\n`);
+      await expect(runCli(cwd, [`pnpm`, `--version`])).resolves.toMatchObject({
+        exitCode: 0,
+        stderr: ``,
+        stdout: `6.6.2\n`,
+      });
     });
-    await expect(runCli(cwd, [`pnpm`, `--version`])).resolves.toMatchObject({
-      exitCode: 1,
-      stderr: `Invalid package manager specification in package.json (pnpm@6.x); expected a semver version\n`,
-      stdout: ``,
+  });
+  it(`either in env`, async() => {
+    await xfs.mktempPromise(async cwd => {
+      await xfs.writeJsonPromise(ppath.join(cwd, `package.json` as PortablePath), {
+        devEngines: {
+          packageManager: {
+            name: `pnpm`,
+            version: `6.x`,
+          },
+        },
+      });
+      await expect(runCli(cwd, [`pnpm`, `--version`])).resolves.toMatchObject({
+        exitCode: 1,
+        stderr: `Invalid package manager specification in package.json (pnpm@6.x); expected a semver version\n`,
+        stdout: ``,
+      });
+
+      process.env.COREPACK_DEV_ENGINES_PNPM = `6.6.2+sha224.eb5c0acad3b0f40ecdaa2db9aa5a73134ad256e17e22d1419a2ab073`;
+      await expect(runCli(cwd, [`pnpm`, `--version`])).resolves.toMatchObject({
+        exitCode: 0,
+        stderr: ``,
+        stdout: `6.6.2\n`,
+      });
     });
+  });
+  it(`either in package.json#packageManager`, async() => {
+    await xfs.mktempPromise(async cwd => {
+      await xfs.writeJsonPromise(ppath.join(cwd, `package.json` as PortablePath), {
+        devEngines: {
+          packageManager: {
+            name: `pnpm`,
+            version: `6.x`,
+          },
+        },
+      });
+      await expect(runCli(cwd, [`pnpm`, `--version`])).resolves.toMatchObject({
+        exitCode: 1,
+        stderr: `Invalid package manager specification in package.json (pnpm@6.x); expected a semver version\n`,
+        stdout: ``,
+      });
 
-    await xfs.writeFilePromise(ppath.join(cwd, `.corepack.env` as PortablePath),
-      `COREPACK_DEV_ENGINES_PNPM=6.6.2+sha224.eb5c0acad3b0f40ecdaa2db9aa5a73134ad256e17e22d1419a2ab073\n`);
-    await expect(runCli(cwd, [`pnpm`, `--version`])).resolves.toMatchObject({
-      exitCode: 0,
-      stderr: ``,
-      stdout: `6.6.2\n`,
+      await xfs.writeJsonPromise(ppath.join(cwd, `package.json` as PortablePath), {
+        devEngines: {
+          packageManager: {
+            name: `pnpm`,
+            version: `6.x`,
+          },
+        },
+        packageManager: `pnpm@6.6.2+sha224.eb5c0acad3b0f40ecdaa2db9aa5a73134ad256e17e22d1419a2ab073`,
+      });
+      await expect(runCli(cwd, [`pnpm`, `--version`])).resolves.toMatchObject({
+        exitCode: 0,
+        stderr: ``,
+        stdout: `6.6.2\n`,
+      });
     });
   });
 });