@ms-cloudpack/package-utilities 5.1.2 → 5.1.3

package/lib/createResolveMap/findPackagesFromPath.js

@@ -1,98 +1,121 @@
 import { isFolder } from '@ms-cloudpack/path-utilities';
 import glob from 'fast-glob';
-import { dirname, join } from 'path';
+import path from 'path';
 import { findGitRoot } from 'workspace-tools';
-import { findPackagePath } from '../findPackagePath.js';
+import { findPackage } from '../findPackage.js';
 import { isExternalPackage } from '../isExternalPackage.js';
 /**
  * Find all packages from a given path. We do this by walking the dependency tree
  * of the app to build a map of all packages and their dependencies.
  */
 export async function findPackagesFromPath(options, context) {
-    const { paths, discoverPackages } = options;
-    const { packages } = context;
+    const { searchPaths, discoverPackages } = options;
     const packageMap = {};
     const visitedPaths = new Set();
-    const pathsToVisit = [];
-    for (const path of paths) {
-        if (!(await isFolder(path))) {
-            throw new Error(`Path ${path} is not a folder.`);
+    for (const searchPath of searchPaths) {
+        if (!(await isFolder(searchPath))) {
+            throw new Error(`Path ${searchPath} is not a folder.`);
         }
         let { gitRootPath } = options;
         if (!gitRootPath) {
             try {
-                gitRootPath = findGitRoot(path);
+                gitRootPath = findGitRoot(searchPath);
             }
             catch (e) {
                 /* ignore */
             }
         }
+        const pathsToVisit = [];
         if (discoverPackages) {
-            const packagePaths = await glob('**/package.json', { cwd: path, ignore: ['**/node_modules/**'] });
-            pathsToVisit.push(...packagePaths.map((p) => dirname(join(path, p))));
+            const packagePaths = await glob('**/package.json', { cwd: searchPath, ignore: ['**/node_modules/**'] });
+            pathsToVisit.push(...packagePaths.map((p) => path.dirname(path.join(searchPath, p))));
         }
         else {
-            pathsToVisit.push(path);
+            pathsToVisit.push(searchPath);
         }
         while (pathsToVisit.length) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked length
             const packagePath = pathsToVisit.shift();
-            if (packagePath && !visitedPaths.has(packagePath)) {
+            if (!visitedPaths.has(packagePath)) {
                 visitedPaths.add(packagePath);
-                const packageDefinition = await packages.get(packagePath);
-                if (!packageDefinition) {
-                    throw new Error(`Could not find package definition at "${packagePath}".`);
-                }
-                if (packageDefinition?.name && packageDefinition.version) {
-                    const { name, version } = packageDefinition;
-                    const entry = initPackageEntry({ path: packagePath, packageMap, definition: packageDefinition });
-                    // Add all dependencies to the list of paths to visit.
-                    const dependencies = {
-                        ...(packageDefinition.dependencies || {}),
-                        ...(packageDefinition.peerDependencies || {}),
-                    };
-                    for (const [dependencyName, versionRequirement] of Object.entries(dependencies)) {
-                        const isPeerDependency = !!packageDefinition.peerDependencies?.[dependencyName];
-                        const dependencyPath = await findPackagePath({
-                            dependencyName,
-                            startPath: packagePath,
-                            gitRootPath,
-                        }, context);
-                        if (dependencyPath) {
-                            const dependencyDefinition = await packages.get(dependencyPath);
-                            if (dependencyDefinition?.name && dependencyDefinition.version) {
-                                const dependencyEntry = initPackageEntry({
-                                    path: dependencyPath,
-                                    packageMap,
-                                    definition: dependencyDefinition,
-                                });
-                                entry.dependencies[dependencyDefinition.name] = dependencyDefinition.version;
-                                dependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;
-                                pathsToVisit.push(dependencyPath);
-                            }
-                        }
-                        else if (!isPeerDependency) {
-                            throw new Error(`Could not find dependency "${dependencyName}" at "${packagePath}" with version requirement "${versionRequirement}".`);
-                        }
-                    }
-                }
+                const dependencyPaths = await visitPackage({ packagePath, packageMap, gitRootPath }, context);
+                pathsToVisit.push(...dependencyPaths);
             }
         }
     }
     return packageMap;
 }
-function initPackageEntry(options) {
-    const { path = '', packageMap, definition } = options;
+/**
+ * Visit a package path, and add entries for the package and its dependencies to `packageMap`.
+ * Returns a list of additional dependency paths to visit.
+ */
+async function visitPackage(options, context) {
+    const { packagePath, packageMap, gitRootPath } = options;
+    const { packages } = context;
+    const packageDefinition = await packages.get(packagePath);
+    if (!packageDefinition) {
+        throw new Error(`Could not find package definition at "${packagePath}".`);
+    }
+    if (!(packageDefinition.name && packageDefinition.version)) {
+        return [];
+    }
+    const { name, version } = packageDefinition;
+    const entry = ensurePackageEntry({ packagePath: packagePath, packageMap, definition: packageDefinition });
+    // Add all dependencies to the list of paths to visit.
+    const dependencies = {
+        ...(packageDefinition.dependencies || {}),
+        ...(packageDefinition.peerDependencies || {}),
+    };
+    const dependencyPaths = [];
+    for (const [dependencyName, versionRequirement] of Object.entries(dependencies)) {
+        const isPeerDependency = !!packageDefinition.peerDependencies?.[dependencyName];
+        const { packagePath: dependencyPath, definition: dependencyDefinition } = (await findPackage({
+            dependencyName,
+            startPath: packagePath,
+            gitRootPath,
+        }, context)) || {};
+        if (dependencyPath && dependencyDefinition) {
+            if (dependencyDefinition.name && dependencyDefinition.version) {
+                const dependencyEntry = ensurePackageEntry({
+                    packagePath: dependencyPath,
+                    packageMap,
+                    definition: dependencyDefinition,
+                });
+                entry.dependencies[dependencyDefinition.name] = dependencyDefinition.version;
+                dependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;
+                dependencyPaths.push(dependencyPath);
+            }
+            else {
+                throw new Error(`"${dependencyPath}/package.json" is missing a name or version.`);
+            }
+        }
+        else if (!isPeerDependency) {
+            throw new Error(`Could not find dependency "${dependencyName}" at "${packagePath}".`);
+        }
+        // Ignore missing peer dependencies
+    }
+    return dependencyPaths;
+}
+/**
+ * If `packageMap` doesn't already have an entry for this package name and version, create one
+ * and add it to `packageMap`. Returns the entry.
+ */
+function ensurePackageEntry(options) {
+    const { packagePath = '', packageMap, definition } = options;
     const { name = '_no_name_', version = '*' } = definition;
-    const mapEntry = (packageMap[name] ??= {});
-    const entry = (mapEntry[version] ??= {
-        name,
-        version,
-        path,
-        dependencies: {},
-        requiredBy: {},
-    });
-    if (isExternalPackage(path)) {
-        entry.isExternal = true;
+    packageMap[name] ??= {};
+    let entry = packageMap[name][version];
+    if (!entry) {
+        entry = packageMap[name][version] = {
+            name,
+            version,
+            path: packagePath,
+            dependencies: {},
+            requiredBy: {},
+        };
+        if (isExternalPackage(packagePath)) {
+            entry.isExternal = true;
+        }
     }
     return entry;
 }

package/lib/createResolveMap/findPackagesFromPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"findPackagesFromPath.js","sourceRoot":"","sources":["../../src/createResolveMap/findPackagesFromPath.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAI5D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAgBC,EACD,OAKC;IAED,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IAC5C,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7B,MAAM,UAAU,GAAe,EAAE,CAAC;IAClC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IACvC,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,mBAAmB,CAAC,CAAC;SAClD;QAED,IAAI,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QAE9B,IAAI,CAAC,WAAW,EAAE;YAChB,IAAI;gBACF,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;aACjC;YAAC,OAAO,CAAC,EAAE;gBACV,YAAY;aACb;SACF;QAED,IAAI,gBAAgB,EAAE;YACpB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;YAElG,YAAY,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACvE;aAAM;YACL,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,YAAY,CAAC,MAAM,EAAE;YAC1B,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;YAEzC,IAAI,WAAW,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;gBACjD,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBAE9B,MAAM,iBAAiB,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBAE1D,IAAI,CAAC,iBAAiB,EAAE;oBACtB,MAAM,IAAI,KAAK,CAAC,yCAAyC,WAAW,IAAI,CAAC,CAAC;iBAC3E;gBAED,IAAI,iBAAiB,EAAE,IAAI,IAAI,iBAAiB,CAAC,OAAO,EAAE;oBACxD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC;oBAC5C,MAAM,KAAK,GAAG,gBAAgB,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAC,CAAC;oBAEjG,sDAAsD;oBACtD,MAAM,YAAY,GAAG;wBACnB,GAAG,CAAC,iBAAiB,CAAC,YAAY,IAAI,EAAE,CAAC;wBACzC,GAAG,CAAC,iBAAiB,CAAC,gBAAgB,IAAI,EAAE,CAAC;qBACpB,CAAC;oBAE5B,KAAK,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;wBAC/E,MAAM,gBAAgB,GAAG,CAAC,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,CAAC,cAAc,CAAC,CAAC;wBAEhF,MAAM,cAAc,GAAG,MAAM,eAAe,CAC1C;4BACE,cAAc;4BACd,SAAS,EAAE,WAAW;4BACtB,WAAW;yBACZ,EACD,OAAO,CACR,CAAC;wBAEF,IAAI,cAAc,EAAE;4BAClB,MAAM,oBAAoB,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;4BAChE,IAAI,oBAAoB,EAAE,IAAI,IAAI,oBAAoB,CAAC,OAAO,EAAE;gCAC9D,MAAM,eAAe,GAAG,gBAAgB,CAAC;oCACvC,IAAI,EAAE,cAAc;oCACpB,UAAU;oCACV,UAAU,EAAE,oBAAoB;iCACjC,CAAC,CAAC;gCAEH,KAAK,CAAC,YAAY,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,OAAO,CAAC;gCAC7E,eAAe,CAAC,UAAU,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,GAAG,kBAAkB,CAAC;gCAEtE,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;6BACnC;yBACF;6BAAM,IAAI,CAAC,gBAAgB,EAAE;4BAC5B,MAAM,IAAI,KAAK,CACb,8BAA8B,cAAc,SAAS,WAAW,+BAA+B,kBAAkB,IAAI,CACtH,CAAC;yBACH;qBACF;iBACF;aACF;SACF;KACF;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,gBAAgB,CAAC,OAA0E;IAClG,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IACtD,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,OAAO,GAAG,GAAG,EAAE,GAAG,UAAU,CAAC;IAEzD,MAAM,QAAQ,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,CAAoC,CAAC;IAC9E,MAAM,KAAK,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK;QACnC,IAAI;QACJ,OAAO;QACP,IAAI;QACJ,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,EAAE;KACf,CAAC,CAAC;IAEH,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE;QAC3B,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC;KACzB;IAED,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import type { PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/bundler-types';\nimport { isFolder } from '@ms-cloudpack/path-utilities';\nimport glob from 'fast-glob';\nimport { dirname, join } from 'path';\nimport { findGitRoot } from 'workspace-tools';\nimport { findPackagePath } from '../findPackagePath.js';\nimport { isExternalPackage } from '../isExternalPackage.js';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport type { ResolveMapEntry } from '../types/ResolveMapEntry.js';\n\n/**\n * Find all packages from a given path. We do this by walking the dependency tree\n * of the app to build a map of all packages and their dependencies.\n */\nexport async function findPackagesFromPath(\n  options: {\n    /**\n     * Paths to search for package.json files and traverse their dependencies to build a PackageMap.\n     */\n    paths: string[];\n\n    /**\n     * Where to stop looking for packages. If not specified, will look for a git root. If one is not\n     * found, will use the first path in the paths array.\n     */\n    gitRootPath?: string;\n\n    /**\n     * If true will glob for all package.json files in the path and add them to the map.\n     */\n    discoverPackages?: boolean;\n  },\n  context: {\n    /**\n     * Package cache.\n     */\n    packages: PackageDefinitionsCache;\n  },\n): Promise<PackageMap> {\n  const { paths, discoverPackages } = options;\n  const { packages } = context;\n  const packageMap: PackageMap = {};\n  const visitedPaths = new Set<string>();\n  const pathsToVisit: string[] = [];\n\n  for (const path of paths) {\n    if (!(await isFolder(path))) {\n      throw new Error(`Path ${path} is not a folder.`);\n    }\n\n    let { gitRootPath } = options;\n\n    if (!gitRootPath) {\n      try {\n        gitRootPath = findGitRoot(path);\n      } catch (e) {\n        /* ignore */\n      }\n    }\n\n    if (discoverPackages) {\n      const packagePaths = await glob('**/package.json', { cwd: path, ignore: ['**/node_modules/**'] });\n\n      pathsToVisit.push(...packagePaths.map((p) => dirname(join(path, p))));\n    } else {\n      pathsToVisit.push(path);\n    }\n\n    while (pathsToVisit.length) {\n      const packagePath = pathsToVisit.shift();\n\n      if (packagePath && !visitedPaths.has(packagePath)) {\n        visitedPaths.add(packagePath);\n\n        const packageDefinition = await packages.get(packagePath);\n\n        if (!packageDefinition) {\n          throw new Error(`Could not find package definition at \"${packagePath}\".`);\n        }\n\n        if (packageDefinition?.name && packageDefinition.version) {\n          const { name, version } = packageDefinition;\n          const entry = initPackageEntry({ path: packagePath, packageMap, definition: packageDefinition });\n\n          // Add all dependencies to the list of paths to visit.\n          const dependencies = {\n            ...(packageDefinition.dependencies || {}),\n            ...(packageDefinition.peerDependencies || {}),\n          } as Record<string, string>;\n\n          for (const [dependencyName, versionRequirement] of Object.entries(dependencies)) {\n            const isPeerDependency = !!packageDefinition.peerDependencies?.[dependencyName];\n\n            const dependencyPath = await findPackagePath(\n              {\n                dependencyName,\n                startPath: packagePath,\n                gitRootPath,\n              },\n              context,\n            );\n\n            if (dependencyPath) {\n              const dependencyDefinition = await packages.get(dependencyPath);\n              if (dependencyDefinition?.name && dependencyDefinition.version) {\n                const dependencyEntry = initPackageEntry({\n                  path: dependencyPath,\n                  packageMap,\n                  definition: dependencyDefinition,\n                });\n\n                entry.dependencies[dependencyDefinition.name] = dependencyDefinition.version;\n                dependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;\n\n                pathsToVisit.push(dependencyPath);\n              }\n            } else if (!isPeerDependency) {\n              throw new Error(\n                `Could not find dependency \"${dependencyName}\" at \"${packagePath}\" with version requirement \"${versionRequirement}\".`,\n              );\n            }\n          }\n        }\n      }\n    }\n  }\n\n  return packageMap;\n}\n\nfunction initPackageEntry(options: { path: string; packageMap: PackageMap; definition: PackageJson }): ResolveMapEntry {\n  const { path = '', packageMap, definition } = options;\n  const { name = '_no_name_', version = '*' } = definition;\n\n  const mapEntry = (packageMap[name] ??= {}) as Record<string, ResolveMapEntry>;\n  const entry = (mapEntry[version] ??= {\n    name,\n    version,\n    path,\n    dependencies: {},\n    requiredBy: {},\n  });\n\n  if (isExternalPackage(path)) {\n    entry.isExternal = true;\n  }\n\n  return entry;\n}\n"]}
+{"version":3,"file":"findPackagesFromPath.js","sourceRoot":"","sources":["../../src/createResolveMap/findPackagesFromPath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/bundler-types';\nimport { isFolder } from '@ms-cloudpack/path-utilities';\nimport glob from 'fast-glob';\nimport path from 'path';\nimport { findGitRoot } from 'workspace-tools';\nimport { findPackage } from '../findPackage.js';\nimport { isExternalPackage } from '../isExternalPackage.js';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport type { ResolveMapEntry } from '../types/ResolveMapEntry.js';\n\n/**\n * Find all packages from a given path. We do this by walking the dependency tree\n * of the app to build a map of all packages and their dependencies.\n */\nexport async function findPackagesFromPath(\n  options: {\n    /**\n     * Paths to search for package.json files and traverse their dependencies to build a PackageMap.\n     */\n    searchPaths: string[];\n\n    /**\n     * Where to stop looking for packages. If not specified, will look for a git root. If one is not\n     * found, will use the first path in the paths array.\n     */\n    gitRootPath?: string;\n\n    /**\n     * If true will glob for all package.json files in the path and add them to the map.\n     */\n    discoverPackages?: boolean;\n  },\n  context: {\n    /**\n     * Package cache.\n     */\n    packages: PackageDefinitionsCache;\n  },\n): Promise<PackageMap> {\n  const { searchPaths, discoverPackages } = options;\n  const packageMap: PackageMap = {};\n  const visitedPaths = new Set<string>();\n\n  for (const searchPath of searchPaths) {\n    if (!(await isFolder(searchPath))) {\n      throw new Error(`Path ${searchPath} is not a folder.`);\n    }\n\n    let { gitRootPath } = options;\n    if (!gitRootPath) {\n      try {\n        gitRootPath = findGitRoot(searchPath);\n      } catch (e) {\n        /* ignore */\n      }\n    }\n\n    const pathsToVisit: string[] = [];\n\n    if (discoverPackages) {\n      const packagePaths = await glob('**/package.json', { cwd: searchPath, ignore: ['**/node_modules/**'] });\n\n      pathsToVisit.push(...packagePaths.map((p) => path.dirname(path.join(searchPath, p))));\n    } else {\n      pathsToVisit.push(searchPath);\n    }\n\n    while (pathsToVisit.length) {\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked length\n      const packagePath = pathsToVisit.shift()!;\n      if (!visitedPaths.has(packagePath)) {\n        visitedPaths.add(packagePath);\n\n        const dependencyPaths = await visitPackage({ packagePath, packageMap, gitRootPath }, context);\n        pathsToVisit.push(...dependencyPaths);\n      }\n    }\n  }\n\n  return packageMap;\n}\n\n/**\n * Visit a package path, and add entries for the package and its dependencies to `packageMap`.\n * Returns a list of additional dependency paths to visit.\n */\nasync function visitPackage(\n  options: {\n    packagePath: string;\n    packageMap: PackageMap;\n    gitRootPath: string | undefined;\n  },\n  context: Parameters<typeof findPackage>[1],\n) {\n  const { packagePath, packageMap, gitRootPath } = options;\n  const { packages } = context;\n\n  const packageDefinition = await packages.get(packagePath);\n  if (!packageDefinition) {\n    throw new Error(`Could not find package definition at \"${packagePath}\".`);\n  }\n  if (!(packageDefinition.name && packageDefinition.version)) {\n    return [];\n  }\n\n  const { name, version } = packageDefinition;\n  const entry = ensurePackageEntry({ packagePath: packagePath, packageMap, definition: packageDefinition });\n\n  // Add all dependencies to the list of paths to visit.\n  const dependencies = {\n    ...(packageDefinition.dependencies || {}),\n    ...(packageDefinition.peerDependencies || {}),\n  } as Record<string, string>;\n\n  const dependencyPaths: string[] = [];\n\n  for (const [dependencyName, versionRequirement] of Object.entries(dependencies)) {\n    const isPeerDependency = !!packageDefinition.peerDependencies?.[dependencyName];\n\n    const { packagePath: dependencyPath, definition: dependencyDefinition } =\n      (await findPackage(\n        {\n          dependencyName,\n          startPath: packagePath,\n          gitRootPath,\n        },\n        context,\n      )) || {};\n\n    if (dependencyPath && dependencyDefinition) {\n      if (dependencyDefinition.name && dependencyDefinition.version) {\n        const dependencyEntry = ensurePackageEntry({\n          packagePath: dependencyPath,\n          packageMap,\n          definition: dependencyDefinition,\n        });\n\n        entry.dependencies[dependencyDefinition.name] = dependencyDefinition.version;\n        dependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;\n\n        dependencyPaths.push(dependencyPath);\n      } else {\n        throw new Error(`\"${dependencyPath}/package.json\" is missing a name or version.`);\n      }\n    } else if (!isPeerDependency) {\n      throw new Error(`Could not find dependency \"${dependencyName}\" at \"${packagePath}\".`);\n    }\n    // Ignore missing peer dependencies\n  }\n\n  return dependencyPaths;\n}\n\n/**\n * If `packageMap` doesn't already have an entry for this package name and version, create one\n * and add it to `packageMap`. Returns the entry.\n */\nfunction ensurePackageEntry(options: {\n  packagePath: string;\n  packageMap: PackageMap;\n  definition: PackageJson;\n}): ResolveMapEntry {\n  const { packagePath = '', packageMap, definition } = options;\n  const { name = '_no_name_', version = '*' } = definition;\n\n  packageMap[name] ??= {};\n\n  let entry = packageMap[name][version];\n  if (!entry) {\n    entry = packageMap[name][version] = {\n      name,\n      version,\n      path: packagePath,\n      dependencies: {},\n      requiredBy: {},\n    };\n\n    if (isExternalPackage(packagePath)) {\n      entry.isExternal = true;\n    }\n  }\n\n  return entry;\n}\n"]}

package/lib/createResolveMap/linkPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"linkPath.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/linkPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,UAAU,CAAC;CACpB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,iBA2FF"}
+{"version":3,"file":"linkPath.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/linkPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,UAAU,CAAC;CACpB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,iBAyFF"}

package/lib/createResolveMap/linkPath.js

@@ -9,7 +9,7 @@ import { slash } from '@ms-cloudpack/path-string-parsing';
 export async function linkPath(options, context) {
     const { linkedPath, appMap } = options;
     const linkMap = await findPackagesFromPath({
-        paths: [linkedPath.path],
+        searchPaths: [linkedPath.path],
         discoverPackages: true,
     }, context);
     const entriesToLink = [];
@@ -42,7 +42,7 @@ export async function linkPath(options, context) {
         linkedEntry.requiredBy = {};
         for (const entry of existingEntries) {
             for (const [requiredById, requirement] of Object.entries(entry.requiredBy)) {
-                const [requiredByName] = parseRequiredBy(requiredById);
+                const requiredByName = parseRequiredBy(requiredById).name;
                 const linkedParentEntry = Object.values(linkMap[requiredByName] || {})[0];
                 const requiredByKey = linkedParentEntry?.isLinked
                     ? `${linkedParentEntry.name}@${linkedParentEntry.version}`
@@ -62,13 +62,11 @@ export async function linkPath(options, context) {
         }
         // Attach the linked entry to the parents' dependencies.
         for (const requiredById of Object.keys(linkedEntry.requiredBy)) {
-            const [requiredByName, requiredByVersion] = parseRequiredBy(requiredById);
+            const { name: requiredByName, version: requiredByVersion } = parseRequiredBy(requiredById);
             let requiredByEntry = appMap[requiredByName][requiredByVersion];
             // If we can't find the requiredBy entry, it likely means that the entry was already replaced with a linked entry
             // in the app map. Fall back to the first entry.
-            if (!requiredByEntry) {
-                requiredByEntry = Object.values(appMap[requiredByName])[0];
-            }
+            requiredByEntry ??= Object.values(appMap[requiredByName])[0];
             requiredByEntry.dependencies[name] = linkedEntry.version;
         }
         // Add the linked entry
@@ -82,7 +80,7 @@ export async function linkPath(options, context) {
 function isContainedInPath(path, basePath) {
     path = normalizePath(path);
     basePath = normalizePath(basePath);
-    return path.indexOf(basePath) === 0;
+    return path.startsWith(basePath);
 }
 function normalizePath(path) {
     let normalizedPath = slash(path);

package/lib/createResolveMap/linkPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"linkPath.js","sourceRoot":"","sources":["../../src/createResolveMap/linkPath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { LinkedPath } from '../types/LinkedPath.js';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport type { ResolveMapEntry } from '../types/ResolveMapEntry.js';\nimport { addLinkedEntryDependencies } from './addLinkedEntryDependencies.js';\nimport { detachEntry } from './detachEntry.js';\nimport { findPackagesFromPath } from './findPackagesFromPath.js';\nimport { parseRequiredBy } from './parseRequiredBy.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\n/**\n * Given a linked path, an appMap, find packages from the linked path and add them to the appMap.\n */\nexport async function linkPath(\n  options: {\n    linkedPath: LinkedPath;\n    appMap: PackageMap;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n) {\n  const { linkedPath, appMap } = options;\n  const linkMap = await findPackagesFromPath(\n    {\n      paths: [linkedPath.path],\n      discoverPackages: true,\n    },\n    context,\n  );\n  const entriesToLink: ResolveMapEntry[] = [];\n  const { path, ignoredPackages = [], includeAll } = linkedPath;\n\n  // Iterate through the linkMap, looking for internal packages to link to the appMap.\n  for (const [packageName, packageVersions] of Object.entries(linkMap)) {\n    const appEntries = Object.values(appMap[packageName] || {});\n\n    if (appEntries.length) {\n      const linkedEntries = Object.values(packageVersions);\n      const linkedEntry = linkedEntries.length === 1 ? linkedEntries[0] : undefined;\n\n      // For linked dependencies, we don't want multiple versions referenced. Remove them\n      // all and add them in a second pass.\n      if (\n        linkedEntry &&\n        !linkedEntry.isExternal &&\n        ignoredPackages.indexOf(packageName) === -1 &&\n        (includeAll || isContainedInPath(linkedEntry.path, path))\n      ) {\n        // Linked packages use an asterisk for the version description. This keeps it semver compatible with\n        // anything.\n        linkedEntry.version += '-linked';\n        linkedEntry.isLinked = true;\n\n        entriesToLink.push(linkedEntry);\n      }\n    }\n  }\n\n  // We now have a list of paths to link. Iterate through them, add them to the appMap,\n  // and ensure their dependencies are satisfied.\n  for (const linkedEntry of entriesToLink) {\n    const { name } = linkedEntry;\n    const existingEntries = Object.values(appMap[name]);\n\n    linkedEntry.requiredBy = {};\n    for (const entry of existingEntries) {\n      for (const [requiredById, requirement] of Object.entries(entry.requiredBy)) {\n        const [requiredByName] = parseRequiredBy(requiredById);\n        const linkedParentEntry = Object.values(linkMap[requiredByName] || {})[0];\n        const requiredByKey = linkedParentEntry?.isLinked\n          ? (`${linkedParentEntry.name}@${linkedParentEntry.version}` as const)\n          : requiredById;\n        linkedEntry.requiredBy[requiredByKey as `${string}@${string}`] = requirement;\n      }\n    }\n  }\n\n  for (const linkedEntry of entriesToLink) {\n    const { name } = linkedEntry;\n    const existingEntries = Object.values(appMap[name]);\n\n    // We need to detach all existing entries from the appMap, along with their dependences. Note - detaching just means that\n    // we disconnect the entry from its parent and children. If the children have no other parents, we disconnect them as well\n    // and recurse through their children.\n    for (const existingEntry of existingEntries) {\n      detachEntry({ appMap, entry: existingEntry });\n    }\n\n    // Attach the linked entry to the parents' dependencies.\n    for (const requiredById of Object.keys(linkedEntry.requiredBy)) {\n      const [requiredByName, requiredByVersion] = parseRequiredBy(requiredById);\n      let requiredByEntry = appMap[requiredByName][requiredByVersion];\n\n      // If we can't find the requiredBy entry, it likely means that the entry was already replaced with a linked entry\n      // in the app map. Fall back to the first entry.\n      if (!requiredByEntry) {\n        requiredByEntry = Object.values(appMap[requiredByName])[0];\n      }\n\n      requiredByEntry.dependencies[name] = linkedEntry.version;\n    }\n\n    // Add the linked entry\n    appMap[linkedEntry.name] = { [linkedEntry.version]: linkedEntry };\n  }\n\n  // Once all linked entries have been added, ensure their dependencies are resolved.\n  for (const linkedEntry of entriesToLink) {\n    await addLinkedEntryDependencies({ linkedEntry, appMap: appMap, linkMap }, context);\n  }\n}\n\nfunction isContainedInPath(path: string, basePath: string) {\n  path = normalizePath(path);\n  basePath = normalizePath(basePath);\n\n  return path.indexOf(basePath) === 0;\n}\n\nfunction normalizePath(path: string) {\n  let normalizedPath = slash(path);\n\n  if (!normalizedPath.endsWith('/')) {\n    normalizedPath += '/';\n  }\n\n  return normalizedPath;\n}\n"]}
+{"version":3,"file":"linkPath.js","sourceRoot":"","sources":["../../src/createResolveMap/linkPath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { LinkedPath } from '../types/LinkedPath.js';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport type { ResolveMapEntry } from '../types/ResolveMapEntry.js';\nimport { addLinkedEntryDependencies } from './addLinkedEntryDependencies.js';\nimport { detachEntry } from './detachEntry.js';\nimport { findPackagesFromPath } from './findPackagesFromPath.js';\nimport { parseRequiredBy } from './parseRequiredBy.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\n/**\n * Given a linked path, an appMap, find packages from the linked path and add them to the appMap.\n */\nexport async function linkPath(\n  options: {\n    linkedPath: LinkedPath;\n    appMap: PackageMap;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n) {\n  const { linkedPath, appMap } = options;\n  const linkMap = await findPackagesFromPath(\n    {\n      searchPaths: [linkedPath.path],\n      discoverPackages: true,\n    },\n    context,\n  );\n  const entriesToLink: ResolveMapEntry[] = [];\n  const { path, ignoredPackages = [], includeAll } = linkedPath;\n\n  // Iterate through the linkMap, looking for internal packages to link to the appMap.\n  for (const [packageName, packageVersions] of Object.entries(linkMap)) {\n    const appEntries = Object.values(appMap[packageName] || {});\n\n    if (appEntries.length) {\n      const linkedEntries = Object.values(packageVersions);\n      const linkedEntry = linkedEntries.length === 1 ? linkedEntries[0] : undefined;\n\n      // For linked dependencies, we don't want multiple versions referenced. Remove them\n      // all and add them in a second pass.\n      if (\n        linkedEntry &&\n        !linkedEntry.isExternal &&\n        ignoredPackages.indexOf(packageName) === -1 &&\n        (includeAll || isContainedInPath(linkedEntry.path, path))\n      ) {\n        // Linked packages use an asterisk for the version description. This keeps it semver compatible with\n        // anything.\n        linkedEntry.version += '-linked';\n        linkedEntry.isLinked = true;\n\n        entriesToLink.push(linkedEntry);\n      }\n    }\n  }\n\n  // We now have a list of paths to link. Iterate through them, add them to the appMap,\n  // and ensure their dependencies are satisfied.\n  for (const linkedEntry of entriesToLink) {\n    const { name } = linkedEntry;\n    const existingEntries = Object.values(appMap[name]);\n\n    linkedEntry.requiredBy = {};\n    for (const entry of existingEntries) {\n      for (const [requiredById, requirement] of Object.entries(entry.requiredBy)) {\n        const requiredByName = parseRequiredBy(requiredById).name;\n        const linkedParentEntry = Object.values(linkMap[requiredByName] || {})[0];\n        const requiredByKey = linkedParentEntry?.isLinked\n          ? (`${linkedParentEntry.name}@${linkedParentEntry.version}` as const)\n          : requiredById;\n        linkedEntry.requiredBy[requiredByKey as `${string}@${string}`] = requirement;\n      }\n    }\n  }\n\n  for (const linkedEntry of entriesToLink) {\n    const { name } = linkedEntry;\n    const existingEntries = Object.values(appMap[name]);\n\n    // We need to detach all existing entries from the appMap, along with their dependences. Note - detaching just means that\n    // we disconnect the entry from its parent and children. If the children have no other parents, we disconnect them as well\n    // and recurse through their children.\n    for (const existingEntry of existingEntries) {\n      detachEntry({ appMap, entry: existingEntry });\n    }\n\n    // Attach the linked entry to the parents' dependencies.\n    for (const requiredById of Object.keys(linkedEntry.requiredBy)) {\n      const { name: requiredByName, version: requiredByVersion } = parseRequiredBy(requiredById);\n      let requiredByEntry = appMap[requiredByName][requiredByVersion];\n\n      // If we can't find the requiredBy entry, it likely means that the entry was already replaced with a linked entry\n      // in the app map. Fall back to the first entry.\n      requiredByEntry ??= Object.values(appMap[requiredByName])[0];\n\n      requiredByEntry.dependencies[name] = linkedEntry.version;\n    }\n\n    // Add the linked entry\n    appMap[linkedEntry.name] = { [linkedEntry.version]: linkedEntry };\n  }\n\n  // Once all linked entries have been added, ensure their dependencies are resolved.\n  for (const linkedEntry of entriesToLink) {\n    await addLinkedEntryDependencies({ linkedEntry, appMap: appMap, linkMap }, context);\n  }\n}\n\nfunction isContainedInPath(path: string, basePath: string) {\n  path = normalizePath(path);\n  basePath = normalizePath(basePath);\n\n  return path.startsWith(basePath);\n}\n\nfunction normalizePath(path: string) {\n  let normalizedPath = slash(path);\n\n  if (!normalizedPath.endsWith('/')) {\n    normalizedPath += '/';\n  }\n\n  return normalizedPath;\n}\n"]}

package/lib/createResolveMap/parseRequiredBy.d.ts

@@ -1,5 +1,8 @@
 /**
  * Given a requiredBy string (e.g. "@fluentui/react@8.8.8"), return the package name and version.
  */
-export declare function parseRequiredBy(requiredBy: string): string[];
+export declare function parseRequiredBy(requiredBy: string): {
+    name: string;
+    version: string;
+};
 //# sourceMappingURL=parseRequiredBy.d.ts.map

package/lib/createResolveMap/parseRequiredBy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseRequiredBy.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/parseRequiredBy.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,YAMjD"}
+{"version":3,"file":"parseRequiredBy.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/parseRequiredBy.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAMrF"}

package/lib/createResolveMap/parseRequiredBy.js

@@ -5,6 +5,6 @@ export function parseRequiredBy(requiredBy) {
     const divideIndex = requiredBy.lastIndexOf('@');
     const name = requiredBy.slice(0, divideIndex);
     const version = requiredBy.slice(divideIndex + 1);
-    return [name, version];
+    return { name, version };
 }
 //# sourceMappingURL=parseRequiredBy.js.map

package/lib/createResolveMap/parseRequiredBy.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseRequiredBy.js","sourceRoot":"","sources":["../../src/createResolveMap/parseRequiredBy.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,UAAkB;IAChD,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;IAElD,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACzB,CAAC","sourcesContent":["/**\n * Given a requiredBy string (e.g. \"@fluentui/react@8.8.8\"), return the package name and version.\n */\nexport function parseRequiredBy(requiredBy: string) {\n  const divideIndex = requiredBy.lastIndexOf('@');\n  const name = requiredBy.slice(0, divideIndex);\n  const version = requiredBy.slice(divideIndex + 1);\n\n  return [name, version];\n}\n"]}
+{"version":3,"file":"parseRequiredBy.js","sourceRoot":"","sources":["../../src/createResolveMap/parseRequiredBy.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,UAAkB;IAChD,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;IAElD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AAC3B,CAAC","sourcesContent":["/**\n * Given a requiredBy string (e.g. \"@fluentui/react@8.8.8\"), return the package name and version.\n */\nexport function parseRequiredBy(requiredBy: string): { name: string; version: string } {\n  const divideIndex = requiredBy.lastIndexOf('@');\n  const name = requiredBy.slice(0, divideIndex);\n  const version = requiredBy.slice(divideIndex + 1);\n\n  return { name, version };\n}\n"]}

package/lib/findFileInPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findFileInPackage.d.ts","sourceRoot":"","sources":["../src/findFileInPackage.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;;GASG;AAEH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GAC7C,OAAO,CAAC,uBAAuB,CAAC,CAqFlC"}
+{"version":3,"file":"findFileInPackage.d.ts","sourceRoot":"","sources":["../src/findFileInPackage.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;;GASG;AAEH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GAC7C,OAAO,CAAC,uBAAuB,CAAC,CAmFlC"}

package/lib/findFileInPackage.js

@@ -47,9 +47,7 @@ export async function findFileInPackage(options, context) {
             sourcePath = undefined;
         }
         if (sourcePath) {
-            if (!filePath) {
-                filePath = sourceToIntermediatePath(sourcePath);
-            }
+            filePath ??= sourceToIntermediatePath(sourcePath);
             typesPath = filePath && path.extname(filePath) === '.js' ? filePath.replace(/\.js$/, '.d.ts') : undefined;
         }
     }

package/lib/findFileInPackage.js.map

@@ -1 +1 @@
-{"version":3,"file":"findFileInPackage.js","sourceRoot":"","sources":["../src/findFileInPackage.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport { intermediateToSourcePath, sourceToIntermediatePath, isFile } from '@ms-cloudpack/path-utilities';\nimport { isExternalPackage } from './isExternalPackage.js';\nimport { safeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { getExportsMap } from './getExportsMap.js';\nimport { flattenExportsMap } from './flattenExportsMap.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\nexport type FindFileInPackageOptions = {\n  packagePath: string;\n  filePath: string;\n};\n\nexport type FindFileInPackageResult = {\n  filePath?: string;\n  typesPath?: string;\n  sourcePath?: string;\n};\n\n/**\n * Given a requested partial filePath, resolves the relative path intermediate path if the file exists, with special\n * consideration for internal packages, which may not have intermediate files but only source files. Paths returned\n * are always relative and start with `./`.\n *\n * This helper is used in deriving if the given package.json entries are actual validate candidates when constructing an\n * exports map from existing metadata. For example, a package.json may list `main` as `lib/index.js`. If this file\n * exists, or in internal packages, if `src/index.tsx` exists, then this is a valid candidate. If the file does not\n * exist, then we should not include it in the exports map.\n */\n\nexport async function findFileInPackage(\n  options: FindFileInPackageOptions,\n  context: { packages: PackageDefinitionsCache },\n): Promise<FindFileInPackageResult> {\n  const { packagePath } = options;\n  let filePath: string | undefined = safeRelativePath(options.filePath);\n  let sourcePath: string | undefined;\n  let typesPath: string | undefined;\n  const isInternal = !isExternalPackage(packagePath);\n\n  const candidates = [\n    filePath,\n    filePath + '.js',\n    safeRelativePath(path.join(filePath, 'index.js')),\n    safeRelativePath(path.join(filePath, 'package.json')),\n  ];\n\n  filePath = undefined;\n  for (const candidate of candidates) {\n    if (await isFile(path.join(packagePath, candidate))) {\n      filePath = candidate;\n      break;\n    }\n  }\n\n  // For internal packages, try and find source/typings and convert to intermediate (which may be missing.)\n  if (isInternal) {\n    for (const candidate of candidates) {\n      const intermediateCandidate = intermediateToSourcePath(candidate, packagePath);\n      if (intermediateCandidate && (await isFile(path.join(packagePath, intermediateCandidate)))) {\n        sourcePath = intermediateCandidate;\n        break;\n      }\n    }\n\n    // If we couldn't find a unique source file, stick with the resolved intermediate file as the only known truth.\n    if (filePath && sourcePath === filePath) {\n      sourcePath = undefined;\n    }\n\n    if (sourcePath) {\n      if (!filePath) {\n        filePath = sourceToIntermediatePath(sourcePath);\n      }\n\n      typesPath = filePath && path.extname(filePath) === '.js' ? filePath.replace(/\\.js$/, '.d.ts') : undefined;\n    }\n  }\n\n  const isNestedPackageDefinition =\n    filePath && path.basename(filePath) === 'package.json' && path.basename(options.filePath) !== 'package.json';\n  const result: FindFileInPackageResult = {};\n\n  if (isNestedPackageDefinition) {\n    const nestedDefinitionPath = path.dirname(path.join(packagePath, filePath as string));\n    const exportsMap = await getExportsMap({ packagePath: nestedDefinitionPath }, context);\n    const entryPath = flattenExportsMap(exportsMap)['.'];\n\n    if (entryPath) {\n      typesPath = flattenExportsMap(exportsMap, { conditions: ['types'] })['.'];\n\n      return {\n        ...(await findFileInPackage(\n          {\n            packagePath,\n            filePath: safeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, entryPath))),\n          },\n          context,\n        )),\n        typesPath:\n          typesPath && safeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, typesPath))),\n      };\n    }\n  }\n\n  if (typesPath) {\n    result.typesPath = safeRelativePath(typesPath);\n  }\n\n  if (filePath) {\n    result.filePath = safeRelativePath(filePath);\n  }\n\n  if (sourcePath) {\n    result.sourcePath = safeRelativePath(sourcePath);\n  }\n\n  return result;\n}\n"]}
+{"version":3,"file":"findFileInPackage.js","sourceRoot":"","sources":["../src/findFileInPackage.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport { intermediateToSourcePath, sourceToIntermediatePath, isFile } from '@ms-cloudpack/path-utilities';\nimport { isExternalPackage } from './isExternalPackage.js';\nimport { safeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { getExportsMap } from './getExportsMap.js';\nimport { flattenExportsMap } from './flattenExportsMap.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\nexport type FindFileInPackageOptions = {\n  packagePath: string;\n  filePath: string;\n};\n\nexport type FindFileInPackageResult = {\n  filePath?: string;\n  typesPath?: string;\n  sourcePath?: string;\n};\n\n/**\n * Given a requested partial filePath, resolves the relative path intermediate path if the file exists, with special\n * consideration for internal packages, which may not have intermediate files but only source files. Paths returned\n * are always relative and start with `./`.\n *\n * This helper is used in deriving if the given package.json entries are actual validate candidates when constructing an\n * exports map from existing metadata. For example, a package.json may list `main` as `lib/index.js`. If this file\n * exists, or in internal packages, if `src/index.tsx` exists, then this is a valid candidate. If the file does not\n * exist, then we should not include it in the exports map.\n */\n\nexport async function findFileInPackage(\n  options: FindFileInPackageOptions,\n  context: { packages: PackageDefinitionsCache },\n): Promise<FindFileInPackageResult> {\n  const { packagePath } = options;\n  let filePath: string | undefined = safeRelativePath(options.filePath);\n  let sourcePath: string | undefined;\n  let typesPath: string | undefined;\n  const isInternal = !isExternalPackage(packagePath);\n\n  const candidates = [\n    filePath,\n    filePath + '.js',\n    safeRelativePath(path.join(filePath, 'index.js')),\n    safeRelativePath(path.join(filePath, 'package.json')),\n  ];\n\n  filePath = undefined;\n  for (const candidate of candidates) {\n    if (await isFile(path.join(packagePath, candidate))) {\n      filePath = candidate;\n      break;\n    }\n  }\n\n  // For internal packages, try and find source/typings and convert to intermediate (which may be missing.)\n  if (isInternal) {\n    for (const candidate of candidates) {\n      const intermediateCandidate = intermediateToSourcePath(candidate, packagePath);\n      if (intermediateCandidate && (await isFile(path.join(packagePath, intermediateCandidate)))) {\n        sourcePath = intermediateCandidate;\n        break;\n      }\n    }\n\n    // If we couldn't find a unique source file, stick with the resolved intermediate file as the only known truth.\n    if (filePath && sourcePath === filePath) {\n      sourcePath = undefined;\n    }\n\n    if (sourcePath) {\n      filePath ??= sourceToIntermediatePath(sourcePath);\n\n      typesPath = filePath && path.extname(filePath) === '.js' ? filePath.replace(/\\.js$/, '.d.ts') : undefined;\n    }\n  }\n\n  const isNestedPackageDefinition =\n    filePath && path.basename(filePath) === 'package.json' && path.basename(options.filePath) !== 'package.json';\n  const result: FindFileInPackageResult = {};\n\n  if (isNestedPackageDefinition) {\n    const nestedDefinitionPath = path.dirname(path.join(packagePath, filePath as string));\n    const exportsMap = await getExportsMap({ packagePath: nestedDefinitionPath }, context);\n    const entryPath = flattenExportsMap(exportsMap)['.'];\n\n    if (entryPath) {\n      typesPath = flattenExportsMap(exportsMap, { conditions: ['types'] })['.'];\n\n      return {\n        ...(await findFileInPackage(\n          {\n            packagePath,\n            filePath: safeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, entryPath))),\n          },\n          context,\n        )),\n        typesPath:\n          typesPath && safeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, typesPath))),\n      };\n    }\n  }\n\n  if (typesPath) {\n    result.typesPath = safeRelativePath(typesPath);\n  }\n\n  if (filePath) {\n    result.filePath = safeRelativePath(filePath);\n  }\n\n  if (sourcePath) {\n    result.sourcePath = safeRelativePath(sourcePath);\n  }\n\n  return result;\n}\n"]}

package/lib/findPackage.d.ts

@@ -0,0 +1,16 @@
+import type { PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/bundler-types';
+/**
+ * Find the package.json contents for `dependencyName`, searching up under `node_modules` folders
+ * starting at `startPath` and ending at `gitRootPath` or the filesystem root.
+ */
+export declare function findPackage(options: {
+    dependencyName: string;
+    startPath: string;
+    gitRootPath?: string;
+}, context: {
+    packages: PackageDefinitionsCache;
+}): Promise<{
+    packagePath: string;
+    definition: PackageJson;
+} | undefined>;
+//# sourceMappingURL=findPackage.d.ts.map

package/lib/findPackage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findPackage.d.ts","sourceRoot":"","sources":["../src/findPackage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAExF;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE;IACP,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,WAAW,CAAA;CAAE,GAAG,SAAS,CAAC,CA6BvE"}

package/lib/{findPackagePath.js → findPackage.js}

@@ -1,6 +1,10 @@
 import path from 'path';
 import fsPromises from 'fs/promises';
-export async function findPackagePath(options, context) {
+/**
+ * Find the package.json contents for `dependencyName`, searching up under `node_modules` folders
+ * starting at `startPath` and ending at `gitRootPath` or the filesystem root.
+ */
+export async function findPackage(options, context) {
     const { dependencyName, gitRootPath, startPath } = options;
     const { packages } = context;
     let packagePath = startPath;
@@ -8,7 +12,7 @@ export async function findPackagePath(options, context) {
         const resolvedPath = path.join(packagePath, 'node_modules', dependencyName);
         const definition = await packages.get(resolvedPath);
         if (definition) {
-            return fsPromises.realpath(resolvedPath);
+            return { packagePath: await fsPromises.realpath(resolvedPath), definition };
         }
         // We haven't found it. Try to move up a directory.
         packagePath = path.dirname(packagePath);
@@ -23,4 +27,4 @@ export async function findPackagePath(options, context) {
     } while ((!gitRootPath || packagePath.length >= gitRootPath.length) && path.dirname(packagePath) !== packagePath);
     return undefined;
 }
-//# sourceMappingURL=findPackagePath.js.map
+//# sourceMappingURL=findPackage.js.map

package/lib/findPackage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"findPackage.js","sourceRoot":"","sources":["../src/findPackage.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,UAAU,MAAM,aAAa,CAAC;AAGrC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAIC,EACD,OAEC;IAED,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC3D,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,IAAI,WAAW,GAAG,SAAS,CAAC;IAE5B,GAAG;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAEpD,IAAI,UAAU,EAAE;YACd,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,UAAU,EAAE,CAAC;SAC7E;QAED,mDAAmD;QACnD,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAExC,oDAAoD;QACpD,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC9C,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;SACzC;QAED,yCAAyC;QACzC,IAAI,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;YACxC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;SACzC;KACF,QAAQ,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,WAAW,EAAE;IAElH,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import path from 'path';\nimport fsPromises from 'fs/promises';\nimport type { PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/bundler-types';\n\n/**\n * Find the package.json contents for `dependencyName`, searching up under `node_modules` folders\n * starting at `startPath` and ending at `gitRootPath` or the filesystem root.\n */\nexport async function findPackage(\n  options: {\n    dependencyName: string;\n    startPath: string;\n    gitRootPath?: string;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<{ packagePath: string; definition: PackageJson } | undefined> {\n  const { dependencyName, gitRootPath, startPath } = options;\n  const { packages } = context;\n\n  let packagePath = startPath;\n\n  do {\n    const resolvedPath = path.join(packagePath, 'node_modules', dependencyName);\n    const definition = await packages.get(resolvedPath);\n\n    if (definition) {\n      return { packagePath: await fsPromises.realpath(resolvedPath), definition };\n    }\n\n    // We haven't found it. Try to move up a directory.\n    packagePath = path.dirname(packagePath);\n\n    // If we moved up into a scope folder, skip over it.\n    if (path.basename(packagePath).startsWith('@')) {\n      packagePath = path.dirname(packagePath);\n    }\n\n    // Skip over nested node_modules folders.\n    if (packagePath.endsWith('node_modules')) {\n      packagePath = path.dirname(packagePath);\n    }\n  } while ((!gitRootPath || packagePath.length >= gitRootPath.length) && path.dirname(packagePath) !== packagePath);\n\n  return undefined;\n}\n"]}

package/lib/getExportPathFromEntry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getExportPathFromEntry.d.ts","sourceRoot":"","sources":["../src/getExportPathFromEntry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAItE;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,kBAAkB,EAC/B,UAAU,SAAM,EAChB,UAAU,WAAoB,GAC7B,MAAM,GAAG,SAAS,CAwBpB"}
+{"version":3,"file":"getExportPathFromEntry.d.ts","sourceRoot":"","sources":["../src/getExportPathFromEntry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAItE;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,kBAAkB,EAC/B,UAAU,SAAM,EAChB,UAAU,WAAoB,GAC7B,MAAM,GAAG,SAAS,CA0BpB"}

package/lib/getExportPathFromEntry.js

@@ -3,11 +3,11 @@ const defaultConditions = ['import', 'module', 'default'];
  * Given an export map entry, return the esm entry string value. (Parses arrays, maps, has a fallback system.)
  */
 export function getExportPathFromEntry(exportEntry, importPath = '.', conditions = defaultConditions) {
-    let exportPath = undefined;
+    let exportPath;
     if (typeof exportEntry === 'string') {
         return exportEntry;
     }
-    else if (Array.isArray(exportEntry)) {
+    if (Array.isArray(exportEntry)) {
         for (const item of exportEntry) {
             exportPath = getExportPathFromEntry(item, importPath, conditions);
             if (exportPath) {

package/lib/getExportPathFromEntry.js.map

@@ -1 +1 @@
-{"version":3,"file":"getExportPathFromEntry.js","sourceRoot":"","sources":["../src/getExportPathFromEntry.ts"],"names":[],"mappings":"AAEA,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE1D;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,WAA+B,EAC/B,UAAU,GAAG,GAAG,EAChB,UAAU,GAAG,iBAAiB;IAE9B,IAAI,UAAU,GAAG,SAAS,CAAC;IAE3B,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;QACnC,OAAO,WAAW,CAAC;KACpB;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QACrC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;YAC9B,UAAU,GAAG,sBAAsB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YAClE,IAAI,UAAU,EAAE;gBACd,OAAO,UAAU,CAAC;aACnB;SACF;KACF;SAAM,IAAI,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;QACzD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YACtD,IAAI,KAAK,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,UAAU,CAAC,EAAE;gBAC7D,UAAU,GAAG,sBAAsB,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;gBACnE,IAAI,UAAU,EAAE;oBACd,OAAO,UAAU,CAAC;iBACnB;aACF;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import type { PackageJsonExports } from '@ms-cloudpack/bundler-types';\n\nconst defaultConditions = ['import', 'module', 'default'];\n\n/**\n * Given an export map entry, return the esm entry string value. (Parses arrays, maps, has a fallback system.)\n */\nexport function getExportPathFromEntry(\n  exportEntry: PackageJsonExports,\n  importPath = '.',\n  conditions = defaultConditions,\n): string | undefined {\n  let exportPath = undefined;\n\n  if (typeof exportEntry === 'string') {\n    return exportEntry;\n  } else if (Array.isArray(exportEntry)) {\n    for (const item of exportEntry) {\n      exportPath = getExportPathFromEntry(item, importPath, conditions);\n      if (exportPath) {\n        return exportPath;\n      }\n    }\n  } else if (exportEntry && typeof exportEntry === 'object') {\n    for (const [key, value] of Object.entries(exportEntry)) {\n      if (value && (conditions.includes(key) || key === importPath)) {\n        exportPath = getExportPathFromEntry(value, importPath, conditions);\n        if (exportPath) {\n          return exportPath;\n        }\n      }\n    }\n  }\n\n  return undefined;\n}\n"]}
+{"version":3,"file":"getExportPathFromEntry.js","sourceRoot":"","sources":["../src/getExportPathFromEntry.ts"],"names":[],"mappings":"AAEA,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE1D;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,WAA+B,EAC/B,UAAU,GAAG,GAAG,EAChB,UAAU,GAAG,iBAAiB;IAE9B,IAAI,UAA8B,CAAC;IAEnC,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;QACnC,OAAO,WAAW,CAAC;KACpB;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QAC9B,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;YAC9B,UAAU,GAAG,sBAAsB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YAClE,IAAI,UAAU,EAAE;gBACd,OAAO,UAAU,CAAC;aACnB;SACF;KACF;SAAM,IAAI,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;QACzD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YACtD,IAAI,KAAK,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,UAAU,CAAC,EAAE;gBAC7D,UAAU,GAAG,sBAAsB,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;gBACnE,IAAI,UAAU,EAAE;oBACd,OAAO,UAAU,CAAC;iBACnB;aACF;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import type { PackageJsonExports } from '@ms-cloudpack/bundler-types';\n\nconst defaultConditions = ['import', 'module', 'default'];\n\n/**\n * Given an export map entry, return the esm entry string value. (Parses arrays, maps, has a fallback system.)\n */\nexport function getExportPathFromEntry(\n  exportEntry: PackageJsonExports,\n  importPath = '.',\n  conditions = defaultConditions,\n): string | undefined {\n  let exportPath: string | undefined;\n\n  if (typeof exportEntry === 'string') {\n    return exportEntry;\n  }\n\n  if (Array.isArray(exportEntry)) {\n    for (const item of exportEntry) {\n      exportPath = getExportPathFromEntry(item, importPath, conditions);\n      if (exportPath) {\n        return exportPath;\n      }\n    }\n  } else if (exportEntry && typeof exportEntry === 'object') {\n    for (const [key, value] of Object.entries(exportEntry)) {\n      if (value && (conditions.includes(key) || key === importPath)) {\n        exportPath = getExportPathFromEntry(value, importPath, conditions);\n        if (exportPath) {\n          return exportPath;\n        }\n      }\n    }\n  }\n\n  return undefined;\n}\n"]}

package/lib/isExternalPackage.js

@@ -2,7 +2,7 @@ import { slash } from '@ms-cloudpack/path-string-parsing';
 export function isExternalPackage(packagePath) {
     if (packagePath) {
         const parts = slash(packagePath).split('/');
-        return parts.indexOf('node_modules') >= 0;
+        return parts.includes('node_modules');
     }
     return false;
 }

package/lib/isExternalPackage.js.map

@@ -1 +1 @@
-{"version":3,"file":"isExternalPackage.js","sourceRoot":"","sources":["../src/isExternalPackage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE1D,MAAM,UAAU,iBAAiB,CAAC,WAAmB;IACnD,IAAI,WAAW,EAAE;QACf,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE5C,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;KAC3C;IAED,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import { slash } from '@ms-cloudpack/path-string-parsing';\n\nexport function isExternalPackage(packagePath: string): boolean {\n  if (packagePath) {\n    const parts = slash(packagePath).split('/');\n\n    return parts.indexOf('node_modules') >= 0;\n  }\n\n  return false;\n}\n"]}
+{"version":3,"file":"isExternalPackage.js","sourceRoot":"","sources":["../src/isExternalPackage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE1D,MAAM,UAAU,iBAAiB,CAAC,WAAmB;IACnD,IAAI,WAAW,EAAE;QACf,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE5C,OAAO,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;KACvC;IAED,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import { slash } from '@ms-cloudpack/path-string-parsing';\n\nexport function isExternalPackage(packagePath: string): boolean {\n  if (packagePath) {\n    const parts = slash(packagePath).split('/');\n\n    return parts.includes('node_modules');\n  }\n\n  return false;\n}\n"]}

package/lib/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.36.3"
+      "packageVersion": "7.36.4"
     }
   ]
 }

package/lib/types/PackageMap.d.ts

@@ -1,4 +1,8 @@
 import type { ResolveMapEntry } from './ResolveMapEntry.js';
+/**
+ * Intermediate type used internally by `createResolveMap` helpers.
+ * Contains info about every discovered version of each package.
+ */
 export type PackageMap = {
     [name: string]: {
         [version: string]: ResolveMapEntry;

package/lib/types/PackageMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PackageMap.d.ts","sourceRoot":"","sources":["../../src/types/PackageMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,IAAI,EAAE,MAAM,GAAG;QACd,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAC;KACpC,CAAC;CACH,CAAC"}
+{"version":3,"file":"PackageMap.d.ts","sourceRoot":"","sources":["../../src/types/PackageMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,IAAI,EAAE,MAAM,GAAG;QACd,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAC;KACpC,CAAC;CACH,CAAC"}

package/lib/types/PackageMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"PackageMap.js","sourceRoot":"","sources":["../../src/types/PackageMap.ts"],"names":[],"mappings":"","sourcesContent":["import type { ResolveMapEntry } from './ResolveMapEntry.js';\n\nexport type PackageMap = {\n  [name: string]: {\n    [version: string]: ResolveMapEntry;\n  };\n};\n"]}
+{"version":3,"file":"PackageMap.js","sourceRoot":"","sources":["../../src/types/PackageMap.ts"],"names":[],"mappings":"","sourcesContent":["import type { ResolveMapEntry } from './ResolveMapEntry.js';\n\n/**\n * Intermediate type used internally by `createResolveMap` helpers.\n * Contains info about every discovered version of each package.\n */\nexport type PackageMap = {\n  [name: string]: {\n    [version: string]: ResolveMapEntry;\n  };\n};\n"]}

package/lib/types/ResolveMapEntry.d.ts

@@ -1,11 +1,38 @@
 export type ResolveMapEntry = {
+    /** Package name. */
     name: string;
+    /**
+     * Resolved/installed package version. For a linked internal package, this will end in `-linked`.
+     * (The docs for `isExternal` explain what "internal" means.)
+     */
     version: string;
+    /** Path to the resolved/installed package. */
     path: string;
+    /** Map from dependency name to resolved/installed version. */
     dependencies: Record<string, string>;
+    /**
+     * Map from requesting package name `@` the actual version of that package to the original
+     * version of this package that it requested.
+     *
+     * Example: if this entry is for package `bar`, and `foo@1.0.0` depends on `"bar": "^2.0.0"`,
+     * this will be `{ "foo@1.0.0": "^2.0.0" }`.
+     */
     requiredBy: Record<`${string}@${string}`, string>;
-    isLinked?: boolean;
+    /**
+     * A package is considered "external" if it was installed from a package manager (its realpath
+     * contains `node_modules`). This is the opposite of "internal", which means that the package
+     * is defined in a local folder/repo.
+     */
     isExternal?: boolean;
+    /**
+     * Whether this package is linked **AND** is internal to its actual folder/repo.
+     * (The docs for `isExternal` explain what "internal" means.)
+     */
+    isLinked?: boolean;
+    /**
+     * Additional installed versions of this package, which are required per semver by some other
+     * package in the map.
+     */
     scopedVersions?: {
         [version: string]: ResolveMapEntry;
     };

package/lib/types/ResolveMapEntry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ResolveMapEntry.d.ts","sourceRoot":"","sources":["../../src/types/ResolveMapEntry.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IAEb,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC,GAAG,MAAM,IAAI,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;IAElD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,cAAc,CAAC,EAAE;QACf,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAC;KACpC,CAAC;CACH,CAAC"}
+{"version":3,"file":"ResolveMapEntry.d.ts","sourceRoot":"","sources":["../../src/types/ResolveMapEntry.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG;IAC5B,oBAAoB;IACpB,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB,8CAA8C;IAC9C,IAAI,EAAE,MAAM,CAAC;IAEb,8DAA8D;IAC9D,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAErC;;;;;;OAMG;IACH,UAAU,EAAE,MAAM,CAAC,GAAG,MAAM,IAAI,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;IAElD;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;OAGG;IACH,cAAc,CAAC,EAAE;QACf,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAC;KACpC,CAAC;CACH,CAAC"}