@ms-cloudpack/package-utilities 0.5.1 → 0.7.0

package/CHANGELOG.json

@@ -2,7 +2,52 @@
   "name": "@ms-cloudpack/package-utilities",
   "entries": [
     {
-      "date": "Tue, 02 Aug 2022 20:04:01 GMT",
+      "date": "Tue, 16 Aug 2022 08:11:49 GMT",
+      "tag": "@ms-cloudpack/package-utilities_v0.7.0",
+      "version": "0.7.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "dzearing@microsoft.com",
+            "package": "@ms-cloudpack/package-utilities",
+            "commit": "2187bf0fedddd542358718315866fcb6255cfcf2",
+            "comment": "Removing unused code."
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 12 Aug 2022 08:12:39 GMT",
+      "tag": "@ms-cloudpack/package-utilities_v0.6.1",
+      "version": "0.6.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "dzearing@microsoft.com",
+            "package": "@ms-cloudpack/package-utilities",
+            "commit": "06b0e23a9cff634baf090a7310f9af625ca3922e",
+            "comment": "* evaluateImportsFromEntries: removing console logging\n* getExportPathFromEntry: adding \"module\" to the default list of conditions to use when deriving entry paths.\n* resolveImportFromPackagePath: removing console logging\n* resolvePackageEntries: if the browser entry is a string, resolve that over main or module."
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 05 Aug 2022 08:12:21 GMT",
+      "tag": "@ms-cloudpack/package-utilities_v0.6.0",
+      "version": "0.6.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "dzearing@microsoft.com",
+            "package": "@ms-cloudpack/package-utilities",
+            "commit": "8aaedf79e1b7b0b33f19ab560f233bc9bd27b5e5",
+            "comment": "Tweaking a variety of API surface to prep for ori integration. Lots of improvements to how we resolve modules, lots of tests added."
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 02 Aug 2022 20:04:16 GMT",
       "tag": "@ms-cloudpack/package-utilities_v0.5.1",
       "version": "0.5.1",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,39 @@
 # Change Log - @ms-cloudpack/package-utilities
 
-This log was last generated on Tue, 02 Aug 2022 20:04:01 GMT and should not be manually modified.
+This log was last generated on Tue, 16 Aug 2022 08:11:49 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.7.0
+
+Tue, 16 Aug 2022 08:11:49 GMT
+
+### Minor changes
+
+- Removing unused code. (dzearing@microsoft.com)
+
+## 0.6.1
+
+Fri, 12 Aug 2022 08:12:39 GMT
+
+### Patches
+
+- * evaluateImportsFromEntries: removing console logging
+* getExportPathFromEntry: adding "module" to the default list of conditions to use when deriving entry paths.
+* resolveImportFromPackagePath: removing console logging
+* resolvePackageEntries: if the browser entry is a string, resolve that over main or module. (dzearing@microsoft.com)
+
+## 0.6.0
+
+Fri, 05 Aug 2022 08:12:21 GMT
+
+### Minor changes
+
+- Tweaking a variety of API surface to prep for ori integration. Lots of improvements to how we resolve modules, lots of tests added. (dzearing@microsoft.com)
+
 ## 0.5.1
 
-Tue, 02 Aug 2022 20:04:01 GMT
+Tue, 02 Aug 2022 20:04:16 GMT
 
 ### Patches
 

package/README.md

@@ -0,0 +1,3 @@
+# @ms-cloudpack/package-utilities
+
+Provides utilities for reading package definitions and extracting information from them, such as resolve maps and import maps.

package/lib/createImportMap.js

@@ -13,9 +13,12 @@ export async function createImportMap(resolveMap, bundleServerUrl, packageDefini
             // Initialize scopes
             importMap.scopes ?? (importMap.scopes = {});
             for (const scopedEntry of Object.values(resolveEntry.scopedVersions)) {
-                for (const requiredById of scopedEntry.requiredBy) {
+                for (const requiredById of Object.keys(scopedEntry.requiredBy)) {
                     const requiredByUrl = `${bundleServerUrl}/${requiredById}/`;
-                    importMap.scopes[requiredByUrl] = await getImportMapFromEntry(scopedEntry, bundleServerUrl, packageDefinitions);
+                    importMap.scopes[requiredByUrl] = {
+                        ...importMap.scopes[requiredByUrl],
+                        ...(await getImportMapFromEntry(scopedEntry, bundleServerUrl, packageDefinitions)),
+                    };
                 }
             }
         }

package/lib/createImportMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createImportMap.js","sourceRoot":"","sources":["../src/createImportMap.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAQ9B,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,UAAsB,EACtB,eAAuB,EACvB,kBAAgD;IAEhD,MAAM,SAAS,GAAc;QAC3B,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QACpD,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,qBAAqB,CAAC,YAAY,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAEzG,IAAI,YAAY,CAAC,cAAc,EAAE;YAC/B,oBAAoB;YACpB,SAAS,CAAC,MAAM,KAAhB,SAAS,CAAC,MAAM,GAAK,EAAE,EAAC;YAExB,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE;gBACpE,KAAK,MAAM,YAAY,IAAI,WAAW,CAAC,UAAU,EAAE;oBACjD,MAAM,aAAa,GAAG,GAAG,eAAe,IAAI,YAAY,GAAG,CAAC;oBAC5D,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,MAAM,qBAAqB,CAC3D,WAAW,EACX,eAAe,EACf,kBAAkB,CACnB,CAAC;iBACH;aACF;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,KAAsB,EACtB,eAAuB,EACvB,kBAAgD;IAEhD,MAAM,SAAS,GAA2B,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAEtG,IAAI,UAAU,EAAE;QACd,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC;QACjC,MAAM,OAAO,GAAG,GAAG,eAAe,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,GAAG,CAAC;QAE/E,IAAI,UAAU,CAAC,OAAO,EAAE;YACtB,KAAK,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBACzE,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;gBAEtD,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE;oBAC3B,MAAM,UAAU,GAAuB,sBAAsB,CAAC,WAAW,CAAC,CAAC;oBAE3E,IAAI,UAAU,EAAE;wBACd,SAAS,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;qBAC5D;iBACF;aACF;SACF;aAAM;YACL,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;SAC7F;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"createImportMap.js","sourceRoot":"","sources":["../src/createImportMap.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAQ9B,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,UAAsB,EACtB,eAAuB,EACvB,kBAAgD;IAEhD,MAAM,SAAS,GAAc;QAC3B,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QACpD,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,qBAAqB,CAAC,YAAY,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAEzG,IAAI,YAAY,CAAC,cAAc,EAAE;YAC/B,oBAAoB;YACpB,SAAS,CAAC,MAAM,KAAhB,SAAS,CAAC,MAAM,GAAK,EAAE,EAAC;YAExB,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE;gBACpE,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE;oBAC9D,MAAM,aAAa,GAAG,GAAG,eAAe,IAAI,YAAY,GAAG,CAAC;oBAE5D,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG;wBAChC,GAAG,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC;wBAClC,GAAG,CAAC,MAAM,qBAAqB,CAAC,WAAW,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC;qBACnF,CAAC;iBACH;aACF;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,KAAsB,EACtB,eAAuB,EACvB,kBAAgD;IAEhD,MAAM,SAAS,GAA2B,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAEtG,IAAI,UAAU,EAAE;QACd,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC;QACjC,MAAM,OAAO,GAAG,GAAG,eAAe,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,GAAG,CAAC;QAE/E,IAAI,UAAU,CAAC,OAAO,EAAE;YACtB,KAAK,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBACzE,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;gBAEtD,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE;oBAC3B,MAAM,UAAU,GAAuB,sBAAsB,CAAC,WAAW,CAAC,CAAC;oBAE3E,IAAI,UAAU,EAAE;wBACd,SAAS,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;qBAC5D;iBACF;aACF;SACF;aAAM;YACL,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;SAC7F;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/lib/createImportMap.test.js

@@ -1,6 +1,6 @@
 import { createImportMap } from './createImportMap.js';
 const bundleServerUrl = 'http://localhost:12345';
-const basicResolveMapEntry = { name: 'a', version: '1.0.0', path: 'path/a', requiredBy: [] };
+const basicResolveMapEntry = { name: 'a', version: '1.0.0', path: 'path/a', requiredBy: {} };
 describe('createImportMap', () => {
     it('can translate a package with no entries', async () => {
         const resolveMap = {

package/lib/createResolveMap.d.ts

@@ -3,16 +3,15 @@ export declare type ResolveMapEntry = {
     name: string;
     version: string;
     path: string;
-    requiredBy: string[];
+    requiredBy: Record<string, string>;
     scopedVersions?: {
         [version: string]: ResolveMapEntry;
     };
 };
-export declare type PartialResolveMapEntry = Omit<ResolveMapEntry, 'requiredBy'> & {
-    requiredBy: Set<string>;
-};
 export declare type ResolveMap = Record<string, ResolveMapEntry>;
 export declare function createResolveMap(options: {
     appPath: string;
     additionalPaths?: string[];
+    gitRootPath?: string;
+    strictVersioning?: boolean;
 }): Promise<ResolveMap>;

package/lib/createResolveMap.js

@@ -1,29 +1,46 @@
 import { getPackageDefinition } from './getPackageDefinition.js';
 import { findPackagePath } from './findPackagePath.js';
+import fs from 'fs';
+const { realpath } = fs.promises;
 export async function createResolveMap(options) {
     var _a, _b, _c, _d;
-    const { appPath, additionalPaths = [] } = options;
+    const { appPath, additionalPaths = [], gitRootPath, strictVersioning } = options;
     const visitedPaths = new Set([appPath, ...additionalPaths]);
-    const pathsToVisit = [appPath, ...additionalPaths];
     const allEntries = {};
-    while (pathsToVisit.length) {
-        const packagePath = pathsToVisit.shift();
-        if (packagePath) {
-            const definition = await getPackageDefinition(packagePath, true);
-            if (definition && definition.name && definition.version) {
-                const packageId = `${definition.name}@${definition.version}`;
-                const namedEntries = (allEntries[_a = definition.name] ?? (allEntries[_a] = {}));
-                namedEntries[_b = definition.version] ?? (namedEntries[_b] = createMapEntry(definition, packagePath));
-                for (const depName of Object.keys(definition?.dependencies || {})) {
-                    const dependencyPath = findPackagePath(depName, packagePath);
-                    const dependencyDefinition = await getPackageDefinition(dependencyPath, true);
-                    if (dependencyDefinition && dependencyDefinition.name && dependencyDefinition.version) {
-                        const dependencyNamedEntries = (allEntries[_c = dependencyDefinition.name] ?? (allEntries[_c] = {}));
-                        const dependencyEntry = (dependencyNamedEntries[_d = dependencyDefinition.version] ?? (dependencyNamedEntries[_d] = createMapEntry(dependencyDefinition, dependencyPath)));
-                        dependencyEntry.requiredBy.add(packageId);
-                        if (!visitedPaths.has(dependencyPath)) {
-                            visitedPaths.add(dependencyPath);
-                            pathsToVisit.push(dependencyPath);
+    const appDefinition = await getPackageDefinition(appPath, true);
+    const appId = `${appDefinition?.name}@${appDefinition?.version}`;
+    if (!appDefinition) {
+        throw new Error(`Could not find package.json for ${appPath}`);
+    }
+    for (const rootPath of [appPath, ...additionalPaths]) {
+        const pathsToVisit = [rootPath];
+        while (pathsToVisit.length) {
+            let packagePath = pathsToVisit.shift();
+            if (packagePath) {
+                packagePath = await realpath(packagePath);
+                const definition = await getPackageDefinition(packagePath, true);
+                if (definition && definition.name && definition.version) {
+                    const packageId = `${definition.name}@${definition.version}`;
+                    const namedEntries = (allEntries[_a = definition.name] ?? (allEntries[_a] = {}));
+                    namedEntries[_b = definition.version] ?? (namedEntries[_b] = createMapEntry(definition, packagePath));
+                    const packageDependencies = [
+                        ...Object.keys(definition?.dependencies || {}),
+                        ...Object.keys(definition?.peerDependencies || {}),
+                    ];
+                    for (const depName of packageDependencies) {
+                        const requiredVersion = definition?.dependencies?.[depName] || definition?.peerDependencies?.[depName];
+                        const dependencyPath = await findPackagePath(depName, strictVersioning ? requiredVersion : undefined, packagePath, gitRootPath, !!definition?.peerDependencies?.[depName]);
+                        if (dependencyPath) {
+                            const dependencyDefinition = await getPackageDefinition(dependencyPath, true);
+                            if (dependencyDefinition?.name && dependencyDefinition.version) {
+                                const dependencyNamedEntries = (allEntries[_c = dependencyDefinition.name] ?? (allEntries[_c] = {}));
+                                const dependencyEntry = (dependencyNamedEntries[_d = dependencyDefinition.version] ?? (dependencyNamedEntries[_d] = createMapEntry(dependencyDefinition, dependencyPath)));
+                                dependencyEntry.requiredBy[packageId] = requiredVersion;
+                                if (!visitedPaths.has(dependencyPath)) {
+                                    visitedPaths.add(dependencyPath);
+                                    pathsToVisit.push(dependencyPath);
+                                }
+                            }
                         }
                     }
                 }
@@ -35,18 +52,24 @@ export async function createResolveMap(options) {
     const resolveMap = {};
     for (const [name, versions] of Object.entries(allEntries)) {
         const [dominantVersion, ...otherVersions] = Object.keys(versions).sort((a, b) => {
-            return versions[a].requiredBy.size < versions[b].requiredBy.size ? 1 : -1;
+            if (versions[a].requiredBy[appId]) {
+                return -1;
+            }
+            if (versions[b].requiredBy[appId]) {
+                return 1;
+            }
+            // If both are transient to the app, sort by the number of dependencies.
+            const aDependentCount = Object.keys(versions[a].requiredBy).length;
+            const bDependentCount = Object.keys(versions[b].requiredBy).length;
+            return aDependentCount > bDependentCount ? -1 : 1;
         });
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const entry = (resolveMap[name] = allEntries[name][dominantVersion]);
-        entry.requiredBy = Array.from(entry.requiredBy);
         if (otherVersions?.length) {
-            entry.scopedVersions = {};
-            for (const otherVersion of otherVersions) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                const scopedEntry = (entry.scopedVersions[otherVersion] = versions[otherVersion]);
-                scopedEntry.requiredBy = Array.from(scopedEntry.requiredBy);
-            }
+            entry.scopedVersions = otherVersions.reduce((scopedVersions, version) => {
+                scopedVersions[version] = allEntries[name][version];
+                return scopedVersions;
+            }, {});
         }
     }
     return resolveMap;
@@ -57,7 +80,7 @@ function createMapEntry(packageDefinition, packagePath) {
         name,
         version,
         path: packagePath,
-        requiredBy: new Set(),
+        requiredBy: {},
     };
 }
 //# sourceMappingURL=createResolveMap.js.map

package/lib/createResolveMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createResolveMap.js","sourceRoot":"","sources":["../src/createResolveMap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createResolveMap.js","sourceRoot":"","sources":["../src/createResolveMap.ts"],"names":[],"mappings":"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"}

package/lib/createResolveMap.test.js

@@ -2,36 +2,263 @@ import { slash } from '@ms-cloudpack/path-utilities';
 import path from 'path';
 import { createResolveMap } from './createResolveMap.js';
 import { filterJson } from './filterJson.js';
-import { testProject1Path } from '../src/testPaths.js';
-const createResolveMapSafe = async (options) => filterJson(await createResolveMap(options), 'path', (oldPath) => slash(path.relative(testProject1Path, oldPath)));
+import { testProject1Path, testProjectFluentPath, testRepoPath, testUninstalledProjectPath, testWithReact16Path, testWithReact17Path, testWithUnmetDependenciesPath, testWithUnmetPeerDependenciesPath, } from '../src/testPaths.js';
+import os from 'os';
+import { v4 as uuid } from 'uuid';
+import fsExtra from 'fs-extra';
+import fs from 'fs';
+import { writeJson } from '@ms-cloudpack/json-utilities';
+import { fileURLToPath } from 'url';
+const { ensureDir, rmdir } = fsExtra;
+const { realpath } = fs.promises;
+const createResolveMapSafe = async (options) => {
+    const resolveMap = await createResolveMap(options);
+    return filterJson(resolveMap, 'path', (oldPath) => {
+        return slash(path.relative(options.appPath, oldPath));
+    });
+};
+const currentPath = path.dirname(fileURLToPath(import.meta.url));
+let tempFolderPath;
+/*
+ * Helper which builds a temporary app install directory given a recursive array of [name, version, deps] recursive tuples.
+ */
+const constructDependencies = async (dependency, appPath = tempFolderPath) => {
+    const [name, version, deps] = dependency;
+    await ensureDir(appPath);
+    await writeJson(path.join(appPath, 'package.json'), {
+        name,
+        version,
+        dependencies: deps?.reduce((acc, [name, version]) => ({ ...acc, [name]: version }), {}),
+    });
+    if (deps) {
+        for (const dep of deps) {
+            await constructDependencies(dep, path.join(appPath, 'node_modules', dep[0]));
+        }
+    }
+    return appPath;
+};
 describe('createResolveMap', () => {
+    beforeEach(async () => {
+        tempFolderPath = path.join(os.tmpdir(), uuid());
+        await ensureDir(tempFolderPath);
+        tempFolderPath = await realpath(tempFolderPath);
+    });
+    afterEach(async () => {
+        await rmdir(tempFolderPath, { recursive: true });
+    });
     it('can create a resolve map', async () => {
         expect(await createResolveMapSafe({ appPath: testProject1Path })).toMatchInlineSnapshot(`
       Object {
         "b": Object {
           "name": "b",
           "path": "node_modules/b",
-          "requiredBy": Array [
-            "test-project-1@0.0.1",
-          ],
+          "requiredBy": Object {
+            "test-project-1@0.0.1": "^1.0.0",
+          },
           "version": "1.0.0",
         },
         "c": Object {
           "name": "c",
           "path": "node_modules/c",
-          "requiredBy": Array [
-            "test-project-1@0.0.1",
-          ],
+          "requiredBy": Object {
+            "test-project-1@0.0.1": "^1.0.0",
+          },
           "version": "1.0.0",
         },
         "test-project-1": Object {
           "name": "test-project-1",
           "path": "",
-          "requiredBy": Array [],
+          "requiredBy": Object {},
           "version": "0.0.1",
         },
       }
     `);
     });
+    it('can create a resolve map for a project with a fluent package', async () => {
+        expect(await createResolveMapSafe({ appPath: testProjectFluentPath })).toMatchInlineSnapshot(`
+      Object {
+        "@fluentui/react": Object {
+          "name": "@fluentui/react",
+          "path": "node_modules/@fluentui/react",
+          "requiredBy": Object {
+            "test-project-fluent@1.0.0": "^8.42.0",
+          },
+          "version": "8.82.1",
+        },
+        "@fluentui/theme": Object {
+          "name": "@fluentui/theme",
+          "path": "node_modules/@fluentui/theme",
+          "requiredBy": Object {
+            "@fluentui/react@8.82.1": "^2.6.7",
+          },
+          "version": "2.6.7",
+        },
+        "@fluentui/utilities": Object {
+          "name": "@fluentui/utilities",
+          "path": "node_modules/@fluentui/utilities",
+          "requiredBy": Object {
+            "@fluentui/react@8.82.1": "^8.9.0",
+            "@fluentui/theme@2.6.7": "^8.9.0",
+          },
+          "version": "8.9.0",
+        },
+        "test-project-fluent": Object {
+          "name": "test-project-fluent",
+          "path": "",
+          "requiredBy": Object {},
+          "version": "1.0.0",
+        },
+      }
+    `);
+    });
+    it('prefers react 18 when most depend on it', async () => {
+        expect(await createResolveMapSafe({
+            appPath: await constructDependencies([
+                'testApp',
+                '1.0.0',
+                [
+                    ['library-a', '1.0.0', [['react', '17.0.0']]],
+                    ['library-b', '1.0.0', [['react', '18.0.0']]],
+                    ['react', '18.0.0'],
+                ],
+            ]),
+        })).toMatchInlineSnapshot(`
+      Object {
+        "library-a": Object {
+          "name": "library-a",
+          "path": "node_modules/library-a",
+          "requiredBy": Object {
+            "testApp@1.0.0": "1.0.0",
+          },
+          "version": "1.0.0",
+        },
+        "library-b": Object {
+          "name": "library-b",
+          "path": "node_modules/library-b",
+          "requiredBy": Object {
+            "testApp@1.0.0": "1.0.0",
+          },
+          "version": "1.0.0",
+        },
+        "react": Object {
+          "name": "react",
+          "path": "node_modules/react",
+          "requiredBy": Object {
+            "library-b@1.0.0": "18.0.0",
+            "testApp@1.0.0": "18.0.0",
+          },
+          "scopedVersions": Object {
+            "17.0.0": Object {
+              "name": "react",
+              "path": "node_modules/library-a/node_modules/react",
+              "requiredBy": Object {
+                "library-a@1.0.0": "17.0.0",
+              },
+              "version": "17.0.0",
+            },
+          },
+          "version": "18.0.0",
+        },
+        "testApp": Object {
+          "name": "testApp",
+          "path": "",
+          "requiredBy": Object {},
+          "version": "1.0.0",
+        },
+      }
+    `);
+    });
+    it('prefers react 17 because it is most used transient dependency', async () => {
+        const resolveMap = await createResolveMapSafe({
+            appPath: await constructDependencies([
+                'testApp',
+                '1.0.0',
+                [
+                    ['library-a', '1.0.0', [['react', '17.0.0', []]]],
+                    ['library-b', '1.0.0', [['react', '17.0.0', []]]],
+                    ['library-c', '1.0.0', [['react', '18.0.0', []]]],
+                ],
+            ]),
+        });
+        expect(resolveMap['react'].version).toBe('17.0.0');
+    });
+    it('prefers react 18 because it is an app dependency', async () => {
+        const resolveMap = await createResolveMapSafe({
+            appPath: await constructDependencies([
+                'testApp',
+                '1.0.0',
+                [
+                    ['library-a', '1.0.0', [['react', '17.0.0', []]]],
+                    ['library-b', '1.0.0', [['react', '17.0.0', []]]],
+                    ['react', '18.0.0', []],
+                ],
+            ]),
+        });
+        expect(resolveMap['react'].version).toBe('18.0.0');
+    });
+    it('can support monorepo scenarios and resolve the repo react version', async () => {
+        expect(await createResolveMapSafe({
+            appPath: path.join(testRepoPath, 'packages/app-with-installed-react'),
+            gitRootPath: testRepoPath,
+        })).toMatchInlineSnapshot(`
+      Object {
+        "app-with-installed-react": Object {
+          "name": "app-with-installed-react",
+          "path": "",
+          "requiredBy": Object {},
+          "version": "1.0.0",
+        },
+        "react": Object {
+          "name": "react",
+          "path": "../../node_modules/react",
+          "requiredBy": Object {
+            "app-with-installed-react@1.0.0": "999.0.0",
+          },
+          "version": "999.0.0",
+        },
+      }
+    `);
+    });
+    it('can throw when the monorepo is missing a semver required version of react using strict versioning checks', async () => {
+        expect(createResolveMapSafe({
+            appPath: path.join(testRepoPath, 'packages/app-with-missing-react'),
+            gitRootPath: testRepoPath,
+            strictVersioning: true,
+        })).rejects.toBeTruthy();
+    });
+    it(`can throw an error if a dependency is missing`, async () => {
+        expect(createResolveMapSafe({
+            appPath: testUninstalledProjectPath,
+            gitRootPath: testUninstalledProjectPath,
+        })).rejects.toBeTruthy();
+    });
+    it(`can throw an error if appPath doesn't exist`, async () => {
+        expect(createResolveMapSafe({ appPath: path.join(testUninstalledProjectPath, 'does-not-exist') })).rejects.toBeTruthy();
+    });
+    it(`can throw an error if appPath exists but is missing package.json`, () => {
+        expect(createResolveMapSafe({ appPath: currentPath })).rejects.toBeTruthy();
+    });
+    // In this test, react-dom has a peer dependency on react, and should be listed in requiredBy. Otherwise
+    // when react-dom imports react, it will use the app's version (which is not what we want.)
+    it(`can prefer react 16 but scope react 17`, async () => {
+        expect(await createResolveMapSafe({ appPath: testWithReact16Path, additionalPaths: [testWithReact17Path] })).toMatchSnapshot();
+    });
+    it(`can prefer react 17 but scope react 16`, async () => {
+        expect(await createResolveMapSafe({ appPath: testWithReact17Path, additionalPaths: [testWithReact16Path] })).toMatchSnapshot();
+    });
+    // it(`can prefer app dependencies that align with library semver requirements`, () => { });
+    it(`can fail with an unmet dependency`, () => {
+        expect(createResolveMapSafe({
+            appPath: testWithUnmetDependenciesPath,
+            gitRootPath: testWithUnmetDependenciesPath,
+        })).rejects.toBeTruthy();
+    });
+    // Because repos depend on things which have unmet peers, we have to avoid failing when we can't resolve them.
+    it(`can succeed with unmet peer dependencies`, async () => {
+        expect(await createResolveMapSafe({
+            appPath: testWithUnmetPeerDependenciesPath,
+            gitRootPath: testWithUnmetPeerDependenciesPath,
+        })).toMatchSnapshot();
+    });
 });
 //# sourceMappingURL=createResolveMap.test.js.map

package/lib/createResolveMap.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"createResolveMap.test.js","sourceRoot":"","sources":["../src/createResolveMap.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,oBAAoB,GAA4B,KAAK,EAAE,OAAO,EAAE,EAAE,CACtE,UAAU,CAAC,MAAM,gBAAgB,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;AAEpH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;QACxC,MAAM,CAAC,MAAM,oBAAoB,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;KAyBvF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"createResolveMap.test.js","sourceRoot":"","sources":["../src/createResolveMap.test.ts"],"names":[],"mappings":"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"}

package/lib/detectModuleType.js

@@ -24,6 +24,13 @@ export async function detectModuleTypeFromSource(source) {
  * @returns "esm" | "cjs" | undefined
  */
 export async function detectModuleType(filePath) {
-    return await detectModuleTypeFromSource(removeComments((await readFile(filePath)).toString()));
+    let source;
+    try {
+        source = await (await readFile(filePath, 'utf8')).toString();
+    }
+    catch (e) {
+        return undefined;
+    }
+    return await detectModuleTypeFromSource(removeComments(source));
 }
 //# sourceMappingURL=detectModuleType.js.map

package/lib/detectModuleType.js.map

@@ -1 +1 @@
-{"version":3,"file":"detectModuleType.js","sourceRoot":"","sources":["../src/detectModuleType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAEjC,SAAS,cAAc,CAAC,MAAc;IACpC,kDAAkD;IAClD,OAAO,MAAM,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,iBAAiB;AACjF,CAAC;AAID;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,MAAc;IAC7D,IAAI,MAA8B,CAAC;IAEnC,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAEvC,IACE,OAAO,CAAC,KAAK,CACX,wGAAwG,CACzG,EACD;QACA,MAAM,GAAG,KAAK,CAAC;KAChB;SAAM,IAAI,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,EAAE;QAClE,MAAM,GAAG,KAAK,CAAC;KAChB;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,QAAgB;IACrD,OAAO,MAAM,0BAA0B,CAAC,cAAc,CAAC,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;AACjG,CAAC"}
+{"version":3,"file":"detectModuleType.js","sourceRoot":"","sources":["../src/detectModuleType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAEjC,SAAS,cAAc,CAAC,MAAc;IACpC,kDAAkD;IAClD,OAAO,MAAM,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,iBAAiB;AACjF,CAAC;AAID;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,MAAc;IAC7D,IAAI,MAA8B,CAAC;IAEnC,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAEvC,IACE,OAAO,CAAC,KAAK,CACX,wGAAwG,CACzG,EACD;QACA,MAAM,GAAG,KAAK,CAAC;KAChB;SAAM,IAAI,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,EAAE;QAClE,MAAM,GAAG,KAAK,CAAC;KAChB;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,QAAgB;IACrD,IAAI,MAAc,CAAC;IAEnB,IAAI;QACF,MAAM,GAAG,MAAM,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;KAC9D;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,MAAM,0BAA0B,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;AAClE,CAAC"}

package/lib/detectModuleType.test.js

@@ -1,4 +1,7 @@
-import { detectModuleTypeFromSource } from './detectModuleType.js';
+import { fileURLToPath } from 'url';
+import { detectModuleType, detectModuleTypeFromSource } from './detectModuleType.js';
+import path from 'path';
+const currentPath = path.dirname(fileURLToPath(import.meta.url));
 describe('detectModuleTypeFromSource', () => {
     it('can detect imports mean esm', async () => {
         expect(await detectModuleTypeFromSource(`import react from 'react';`)).toBe('esm');
@@ -18,5 +21,8 @@ describe('detectModuleTypeFromSource', () => {
     it('can detect no modules', async () => {
         expect(await detectModuleTypeFromSource(`const hello = 'hello';`)).toBeUndefined();
     });
+    it('can return undefined for missing source', async () => {
+        expect(await detectModuleType(path.join(currentPath, 'does-not-exist.js'))).toBeUndefined();
+    });
 });
 //# sourceMappingURL=detectModuleType.test.js.map

package/lib/detectModuleType.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"detectModuleType.test.js","sourceRoot":"","sources":["../src/detectModuleType.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,CAAC,MAAM,0BAA0B,CAAC,4BAA4B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,CAAC,MAAM,0BAA0B,CAAC,2BAA2B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,CAAC,MAAM,0BAA0B,CAAC,8BAA8B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,CAAC,MAAM,0BAA0B,CAAC,yBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,CAAC,MAAM,0BAA0B,CAAC,0DAA0D,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACrC,MAAM,CAAC,MAAM,0BAA0B,CAAC,wBAAwB,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACrF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"detectModuleType.test.js","sourceRoot":"","sources":["../src/detectModuleType.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjE,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,CAAC,MAAM,0BAA0B,CAAC,4BAA4B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,CAAC,MAAM,0BAA0B,CAAC,2BAA2B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,CAAC,MAAM,0BAA0B,CAAC,8BAA8B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,CAAC,MAAM,0BAA0B,CAAC,yBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,CAAC,MAAM,0BAA0B,CAAC,0DAA0D,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACrC,MAAM,CAAC,MAAM,0BAA0B,CAAC,wBAAwB,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACrF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,CAAC,MAAM,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IAC9F,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}