Address PR comments

Author: edvilme

api/scripts/test-package.cjs

@@ -31,6 +31,10 @@ assert.strictEqual(packResult.length, 1, 'Expected npm pack to produce exactly o
 const tarballPath = path.join(packageRoot, packResult[0].filename);
 const testRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'python-environments-api-'));
 
+function canonicalPath(value) {
+    return fs.realpathSync.native(path.resolve(value));
+}
+
 try {
     fs.writeFileSync(
         path.join(testRoot, 'package.json'),
@@ -73,28 +77,50 @@ try {
         runNodeScript(typescriptCli, ['--project', path.join(consumerRoot, 'tsconfig.json')], packageRoot);
     }
 
+    const installedPackageRoot = path.join(testRoot, 'node_modules', '@vscode', 'python-environments');
+    const installedPackageJson = JSON.parse(fs.readFileSync(path.join(installedPackageRoot, 'package.json'), 'utf8'));
+    assert.strictEqual(installedPackageJson.main, './out/cjs/main.cjs');
+    assert.strictEqual(installedPackageJson.types, './out/cjs/main.d.ts');
+    assert.deepStrictEqual(installedPackageJson.exports, {
+        import: {
+            types: './out/esm/main.d.ts',
+            default: './out/esm/main.mjs',
+        },
+        require: {
+            types: './out/cjs/main.d.ts',
+            default: './out/cjs/main.cjs',
+        },
+    });
+
+    for (const target of [
+        installedPackageJson.main,
+        installedPackageJson.types,
+        installedPackageJson.exports.import.types,
+        installedPackageJson.exports.import.default,
+        installedPackageJson.exports.require.types,
+        installedPackageJson.exports.require.default,
+    ]) {
+        assert.ok(fs.statSync(path.resolve(installedPackageRoot, target)).isFile(), `${target} must be a file`);
+    }
+
     const requireFromConsumer = createRequire(path.join(testRoot, 'legacy', 'consumer.cjs'));
     assert.strictEqual(
-        requireFromConsumer.resolve('@vscode/python-environments'),
-        path.join(testRoot, 'node_modules', '@vscode', 'python-environments', 'out', 'cjs', 'main.cjs'),
+        canonicalPath(requireFromConsumer.resolve('@vscode/python-environments')),
+        canonicalPath(path.join(installedPackageRoot, installedPackageJson.exports.require.default)),
         'CommonJS consumers should resolve the packaged CommonJS entry point',
     );
 
     const esmEntryPoint = execFileSync(
         process.execPath,
-        [
-            '--input-type=module',
-            '--eval',
-            "console.log(import.meta.resolve('@vscode/python-environments'))",
-        ],
+        ['--input-type=module', '--eval', "console.log(import.meta.resolve('@vscode/python-environments'))"],
         {
             cwd: path.join(testRoot, 'modern'),
             encoding: 'utf8',
         },
     ).trim();
     assert.strictEqual(
-        fileURLToPath(esmEntryPoint),
-        path.join(testRoot, 'node_modules', '@vscode', 'python-environments', 'out', 'esm', 'main.mjs'),
+        canonicalPath(fileURLToPath(esmEntryPoint)),
+        canonicalPath(path.join(installedPackageRoot, installedPackageJson.exports.import.default)),
         'ES module consumers should resolve the packaged ES module entry point',
     );
 } finally {

api/test/consumer.ts

@@ -5,12 +5,19 @@ import type {
     PythonPackageGetterApi,
 } from '@vscode/python-environments';
 
-const getAvailableVersions: PythonPackageGetterApi['getPackageAvailableVersions'] = async (
-    _environment: PythonEnvironment,
-    _packageName: string,
-): Promise<Pep440Version[] | undefined> => [];
+type Equal<Left, Right> =
+    (<Value>() => Value extends Left ? 1 : 2) extends <Value>() => Value extends Right ? 1 : 2 ? true : false;
 
-const refreshPackages: PackageManager['refresh'] = async (_environment: PythonEnvironment): Promise<void> => {};
+type AvailableVersionsReturn = ReturnType<PythonPackageGetterApi['getPackageAvailableVersions']>;
+type RefreshReturn = ReturnType<PackageManager['refresh']>;
 
-void getAvailableVersions;
-void refreshPackages;
+const availableVersionsReturnIsExact: Equal<AvailableVersionsReturn, Promise<Pep440Version[] | undefined>> = true;
+const refreshReturnIsExact: Equal<RefreshReturn, Promise<void>> = true;
+
+declare const api: PythonPackageGetterApi;
+declare const environment: PythonEnvironment;
+const availableVersions: Promise<Pep440Version[] | undefined> = api.getPackageAvailableVersions(environment, 'example');
+
+void availableVersionsReturnIsExact;
+void refreshReturnIsExact;
+void availableVersions;

build/azure-pipeline.npm.yml

@@ -75,7 +75,7 @@ extends:
                 workingDirectory: $(Build.SourcesDirectory)/api
                 displayName: Install package dependencies
 
-              - script: cp ../src/api.ts src/main.ts
+              - script: mkdir -p src && cp ../src/api.ts src/main.ts
                 workingDirectory: $(Build.SourcesDirectory)/api
                 displayName: Copy src/api.ts to API package entry point