@ms-cloudpack/package-utilities 7.1.7 → 7.2.1

package/lib/createExportsMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createExportsMap.d.ts","sourceRoot":"","sources":["../src/createExportsMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAI/G;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,EACD,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,eAAe,CAAA;CAAE,GACtE,OAAO,CAAC,kBAAkB,CAAC,CAsF7B"}
+{"version":3,"file":"createExportsMap.d.ts","sourceRoot":"","sources":["../src/createExportsMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAI/G;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,EACD,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,eAAe,CAAA;CAAE,GACtE,OAAO,CAAC,kBAAkB,CAAC,CAqG7B"}

package/lib/createExportsMap.js

@@ -17,24 +17,34 @@ export async function createExportsMap(options, context) {
     const { browser, main, module, types, typings, type } = definition;
     const exports = {};
     const typesPath = types || typings;
-    await addExportsMapEntry({
-        exports,
-        packagePath,
-        filePath: 'index.js',
-        typesPath,
-        condition: type === 'module' ? 'import' : 'default',
-    }, context);
-    main &&
-        (await addExportsMapEntry({
+    // Only try to add `index.js` as an entry if main/module/browser isn't available.
+    if (!(main || module || browser)) {
+        await addExportsMapEntry({
+            exports,
+            packagePath,
+            filePath: 'index.js',
+            typesPath,
+            condition: type === 'module' ? 'import' : 'default',
+        }, context);
+    }
+    if (main) {
+        await addExportsMapEntry({
             exports,
             packagePath,
             filePath: main,
             typesPath,
             condition: type === 'module' ? 'import' : 'default',
-        }, context),
-            context);
-    module &&
-        (await addExportsMapEntry({ exports, packagePath, filePath: module, typesPath, condition: 'import' }, context));
+        }, context);
+    }
+    if (module) {
+        await addExportsMapEntry({
+            exports,
+            packagePath,
+            filePath: module,
+            typesPath,
+            condition: 'import',
+        }, context);
+    }
     if (browser) {
         if (typeof definition.browser === 'string') {
             await addExportsMapEntry({ exports, packagePath, filePath: definition.browser, condition: 'browser' }, context);

package/lib/createExportsMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createExportsMap.js","sourceRoot":"","sources":["../src/createExportsMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAGC,EACD,OAAuE;IAEvE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7B,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAErG,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,oCAAoC,WAAW,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,qEAAqE;IACrE,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,OAAO,UAAU,CAAC,OAAO,CAAC;IAC5B,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;IACnE,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,MAAM,SAAS,GAAG,KAAK,IAAI,OAAO,CAAC;IAEnC,MAAM,kBAAkB,CACtB;QACE,OAAO;QACP,WAAW;QACX,QAAQ,EAAE,UAAU;QACpB,SAAS;QACT,SAAS,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;KACpD,EACD,OAAO,CACR,CAAC;IACF,IAAI;QACF,CAAC,MAAM,kBAAkB,CACvB;YACE,OAAO;YACP,WAAW;YACX,QAAQ,EAAE,IAAI;YACd,SAAS;YACT,SAAS,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;SACpD,EACD,OAAO,CACR;YACD,OAAO,CAAC,CAAC;IACX,MAAM;QACJ,CAAC,MAAM,kBAAkB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;IAElH,IAAI,OAAO,EAAE,CAAC;QACZ,IAAI,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC3C,MAAM,kBAAkB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,OAAO,CAAC,CAAC;QAClH,CAAC;aAAM,IAAI,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAClD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC9D,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBACxC,SAAS;gBACX,CAAC;gBAED,MAAM,eAAe,GAAG,qBAAqB,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,qBAAqB,CAAC,GAAG,CAAC,CAAC;gBAE7F,MAAM,WAAW,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAEpD,IAAI,CAAC,eAAe,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC5C,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;gBAC7C,CAAC;gBAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;oBACrC,MAAM,kBAAkB,CACtB;wBACE,OAAO;wBACP,WAAW;wBACX,UAAU;wBACV,QAAQ,EAAE,KAAK;wBACf,SAAS,EAAE,SAAS;qBACrB,EACD,OAAO,CACR,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,qEAAqE;IACrE,+CAA+C;IAC/C,mEAAmE;IACnE,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtC,CAAC,MAAM,kBAAkB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,gBAAgB,EAAE,EAAE,OAAO,CAAC,CAAC;YACvF,CAAC,MAAM,kBAAkB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,OAAO,CAAC,CAAC;YACxF,CAAC,MAAM,kBAAkB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache, PackageJsonExports } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { addExportsMapEntry } from './addExportsMapEntry.js';\n\n/**\n * Given a package path, generates an export map for the package.\n */\nexport async function createExportsMap(\n  options: {\n    packagePath: string;\n    disableTransforms?: boolean;\n  },\n  context: { packages: PackageDefinitionsCache; config: CloudpackConfig },\n): Promise<PackageJsonExports> {\n  const { packagePath } = options;\n  const { packages } = context;\n  const definition = await packages.get(packagePath, { disableTransforms: options.disableTransforms });\n\n  if (!definition) {\n    throw new Error(`Package definition not found for ${packagePath}`);\n  }\n\n  // Don't create an exports map for a definition that already has one.\n  if (definition.exports) {\n    return definition.exports;\n  }\n\n  const { browser, main, module, types, typings, type } = definition;\n  const exports = {};\n  const typesPath = types || typings;\n\n  await addExportsMapEntry(\n    {\n      exports,\n      packagePath,\n      filePath: 'index.js',\n      typesPath,\n      condition: type === 'module' ? 'import' : 'default',\n    },\n    context,\n  );\n  main &&\n    (await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: main,\n        typesPath,\n        condition: type === 'module' ? 'import' : 'default',\n      },\n      context,\n    ),\n    context);\n  module &&\n    (await addExportsMapEntry({ exports, packagePath, filePath: module, typesPath, condition: 'import' }, context));\n\n  if (browser) {\n    if (typeof definition.browser === 'string') {\n      await addExportsMapEntry({ exports, packagePath, filePath: definition.browser, condition: 'browser' }, context);\n    } else if (typeof definition.browser === 'object') {\n      for (const [key, value] of Object.entries(definition.browser)) {\n        if (!value || typeof value !== 'string') {\n          continue;\n        }\n\n        const isDefaultImport = normalizeRelativePath(module || main) === normalizeRelativePath(key);\n\n        const importPaths = isDefaultImport ? ['.'] : [key];\n\n        if (!isDefaultImport && key.endsWith('.js')) {\n          importPaths.push(key.replace(/\\.js$/, ''));\n        }\n\n        for (const importPath of importPaths) {\n          await addExportsMapEntry(\n            {\n              exports,\n              packagePath,\n              importPath,\n              filePath: value,\n              condition: 'browser',\n            },\n            context,\n          );\n        }\n      }\n    }\n  }\n\n  // If we couldn't infer the exports map shape from existing metadata,\n  // formulate based off inferred file structure.\n  // Note: CRA defaults to src/index.js, Vite defaults to src/main.js\n  if (Object.keys(exports).length === 0) {\n    (await addExportsMapEntry({ exports, packagePath, filePath: './lib/index.js' }, context)) ||\n      (await addExportsMapEntry({ exports, packagePath, filePath: './lib/main.js' }, context)) ||\n      (await addExportsMapEntry({ exports, packagePath, filePath: './index.js' }, context));\n  }\n\n  return exports;\n}\n"]}
+{"version":3,"file":"createExportsMap.js","sourceRoot":"","sources":["../src/createExportsMap.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache, PackageJsonExports } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { addExportsMapEntry } from './addExportsMapEntry.js';\n\n/**\n * Given a package path, generates an export map for the package.\n */\nexport async function createExportsMap(\n  options: {\n    packagePath: string;\n    disableTransforms?: boolean;\n  },\n  context: { packages: PackageDefinitionsCache; config: CloudpackConfig },\n): Promise<PackageJsonExports> {\n  const { packagePath } = options;\n  const { packages } = context;\n  const definition = await packages.get(packagePath, { disableTransforms: options.disableTransforms });\n\n  if (!definition) {\n    throw new Error(`Package definition not found for ${packagePath}`);\n  }\n\n  // Don't create an exports map for a definition that already has one.\n  if (definition.exports) {\n    return definition.exports;\n  }\n\n  const { browser, main, module, types, typings, type } = definition;\n  const exports = {};\n  const typesPath = types || typings;\n\n  // Only try to add `index.js` as an entry if main/module/browser isn't available.\n  if (!(main || module || browser)) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: 'index.js',\n        typesPath,\n        condition: type === 'module' ? 'import' : 'default',\n      },\n      context,\n    );\n  }\n\n  if (main) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: main,\n        typesPath,\n        condition: type === 'module' ? 'import' : 'default',\n      },\n      context,\n    );\n  }\n\n  if (module) {\n    await addExportsMapEntry(\n      {\n        exports,\n        packagePath,\n        filePath: module,\n        typesPath,\n        condition: 'import',\n      },\n      context,\n    );\n  }\n\n  if (browser) {\n    if (typeof definition.browser === 'string') {\n      await addExportsMapEntry({ exports, packagePath, filePath: definition.browser, condition: 'browser' }, context);\n    } else if (typeof definition.browser === 'object') {\n      for (const [key, value] of Object.entries(definition.browser)) {\n        if (!value || typeof value !== 'string') {\n          continue;\n        }\n\n        const isDefaultImport = normalizeRelativePath(module || main) === normalizeRelativePath(key);\n\n        const importPaths = isDefaultImport ? ['.'] : [key];\n\n        if (!isDefaultImport && key.endsWith('.js')) {\n          importPaths.push(key.replace(/\\.js$/, ''));\n        }\n\n        for (const importPath of importPaths) {\n          await addExportsMapEntry(\n            {\n              exports,\n              packagePath,\n              importPath,\n              filePath: value,\n              condition: 'browser',\n            },\n            context,\n          );\n        }\n      }\n    }\n  }\n\n  // If we couldn't infer the exports map shape from existing metadata,\n  // formulate based off inferred file structure.\n  // Note: CRA defaults to src/index.js, Vite defaults to src/main.js\n  if (Object.keys(exports).length === 0) {\n    (await addExportsMapEntry({ exports, packagePath, filePath: './lib/index.js' }, context)) ||\n      (await addExportsMapEntry({ exports, packagePath, filePath: './lib/main.js' }, context)) ||\n      (await addExportsMapEntry({ exports, packagePath, filePath: './index.js' }, context));\n  }\n\n  return exports;\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"findPackagesFromPath.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/findPackagesFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAuC,MAAM,4BAA4B,CAAC;AAM/G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOzD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP;;OAEG;IACH,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,EACD,OAAO,EAAE;IACP;;OAEG;IACH,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,UAAU,CAAC,CA2CrB"}
+{"version":3,"file":"findPackagesFromPath.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/findPackagesFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAuC,MAAM,4BAA4B,CAAC;AAM/G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOzD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP;;OAEG;IACH,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,EACD,OAAO,EAAE;IACP;;OAEG;IACH,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,UAAU,CAAC,CAiDrB"}

package/lib/createResolveMap/findPackagesFromPath.js

@@ -39,7 +39,12 @@ export async function findPackagesFromPath(options, context) {
             if (!visitedPaths.has(packagePath)) {
                 visitedPaths.add(packagePath);
                 const dependencyPaths = await visitPackage({ packagePath, packageMap, rootPath, importerContext }, context);
-                pathsToVisit.push(...dependencyPaths);
+                for (const dependencyPath of dependencyPaths) {
+                    // Let's avoid pushing tons of things into the work queue that we'll be skipping later.
+                    if (!visitedPaths.has(dependencyPath.packagePath)) {
+                        pathsToVisit.push(dependencyPath);
+                    }
+                }
             }
         }
     }

package/lib/createResolveMap/findPackagesFromPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"findPackagesFromPath.js","sourceRoot":"","sources":["../../src/createResolveMap/findPackagesFromPath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionsCache, PackageImporterContext, PackageJson } from '@ms-cloudpack/common-types';\nimport { isFolder } from '@ms-cloudpack/path-utilities';\nimport glob from 'fast-glob';\nimport path from 'path';\nimport { findPackage } from '../findPackage.js';\nimport { isExternalPackage } from '../isExternalPackage.js';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport type { ResolveMapEntry } from '../types/ResolveMapEntry.js';\nimport { getDependencies } from '../getDependencies.js';\nimport { findProjectRoot } from '../findProjectRoot.js';\n\ntype PackagePathInfo = { packagePath: string; importerContext?: PackageImporterContext };\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 (mainly used for testing).\n     * If not specified, will look for the project/git root of the first path in the paths array.\n     */\n    rootPath?: 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\\nMake sure the path exists and try again.`);\n    }\n\n    const rootPath = options.rootPath || findProjectRoot(searchPath, { noPackageRoot: true });\n\n    let pathsToVisit: PackagePathInfo[];\n\n    if (discoverPackages) {\n      const packagePaths = await glob('**/package.json', { cwd: searchPath, ignore: ['**/node_modules/**'] });\n\n      pathsToVisit = packagePaths.map((p) => ({ packagePath: path.dirname(path.join(searchPath, p)) }));\n    } else {\n      pathsToVisit = [{ packagePath: searchPath }];\n    }\n\n    while (pathsToVisit.length) {\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked length\n      const { packagePath, importerContext } = pathsToVisit.shift()!;\n\n      // There's a very slight possibility (not yet observed even in large repos) that both semver\n      // and non-semver dependencies could resolve to the same package name and version and therefore\n      // be installed at the same path. (If the non-semver dependency was encountered first, the\n      // version and possibly name in the package definition would have been transformed to match by\n      // getNonSemverTransform.) It would be possible to detect this case if needed, but for now we're\n      // not going to bother because it's so rare/theoretical and the effect in practice will probably\n      // be the same as a dependency that's forced with `resolutions` to a version violating semver.\n      if (!visitedPaths.has(packagePath)) {\n        visitedPaths.add(packagePath);\n\n        const dependencyPaths = await visitPackage({ packagePath, packageMap, rootPath, importerContext }, 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: PackagePathInfo & {\n    packageMap: PackageMap;\n    rootPath: string | undefined;\n  },\n  context: Parameters<typeof findPackagesFromPath>[1],\n) {\n  const { packagePath, packageMap, rootPath, importerContext } = options;\n  const { packages } = context;\n\n  const packageDefinition = await packages.get(packagePath, { importerContext });\n  if (!packageDefinition) {\n    throw new Error(\n      `Could not find package definition at \"${packagePath}\".\\n\\n` +\n        `Make sure the package.json file exists and try again.\\n`,\n    );\n  }\n  if (!(packageDefinition.name && packageDefinition.version)) {\n    return [];\n  }\n\n  const { name, version } = packageDefinition;\n  const entry = ensurePackageEntry({\n    packageName: importerContext?.importedName || name,\n    packagePath: packagePath,\n    packageMap,\n    definition: packageDefinition,\n  });\n\n  // Add all dependencies to the list of paths to visit.\n  const dependencies = getDependencies(packageDefinition) as Record<string, string>;\n\n  const dependencyPaths: PackagePathInfo[] = [];\n\n  for (const [dependencyName, versionRequirement] of Object.entries(dependencies)) {\n    const depImporterContext: PackageImporterContext = {\n      parentName: name,\n      parentVersion: version,\n      importedName: dependencyName,\n      versionRequirement,\n    };\n\n    const dependencyPackage = await findPackage(\n      { dependencyName, startPath: packagePath, rootPath, importerContext: depImporterContext },\n      context,\n    );\n    if (!dependencyPackage) {\n      if (packageDefinition.peerDependencies?.[dependencyName]) {\n        // Ignore missing peer dependencies\n        continue;\n      }\n\n      throw new Error(\n        `A dependency could not be found:\\n` +\n          `  * Dependency: ${dependencyName} (Required: ${versionRequirement})\\n` +\n          `  * Required by: ${packagePath}\\n\\n` +\n          `Make sure the dependency is installed and try again.`,\n      );\n    }\n\n    const { packagePath: dependencyPath, definition: dependencyDefinition } = dependencyPackage;\n\n    if (!(dependencyDefinition.name && dependencyDefinition.version)) {\n      throw new Error(`\"${dependencyPath}/package.json\" is missing a name or version.`);\n    }\n\n    const dependencyEntry = ensurePackageEntry({\n      packagePath: dependencyPath,\n      packageName: dependencyName,\n      packageMap,\n      definition: dependencyDefinition,\n    });\n\n    entry.dependencies[dependencyName] = dependencyDefinition.version;\n    dependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;\n\n    dependencyPaths.push({\n      packagePath: dependencyPath,\n      importerContext: depImporterContext,\n    });\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  packageName: string;\n  packageMap: PackageMap;\n  definition: PackageJson;\n}): ResolveMapEntry {\n  const { packagePath = '', packageName: name, packageMap, definition } = options;\n  // the caller verified that these are set\n  const { version } = definition as Required<PackageJson>;\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"]}
+{"version":3,"file":"findPackagesFromPath.js","sourceRoot":"","sources":["../../src/createResolveMap/findPackagesFromPath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionsCache, PackageImporterContext, PackageJson } from '@ms-cloudpack/common-types';\nimport { isFolder } from '@ms-cloudpack/path-utilities';\nimport glob from 'fast-glob';\nimport path from 'path';\nimport { findPackage } from '../findPackage.js';\nimport { isExternalPackage } from '../isExternalPackage.js';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport type { ResolveMapEntry } from '../types/ResolveMapEntry.js';\nimport { getDependencies } from '../getDependencies.js';\nimport { findProjectRoot } from '../findProjectRoot.js';\n\ntype PackagePathInfo = { packagePath: string; importerContext?: PackageImporterContext };\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 (mainly used for testing).\n     * If not specified, will look for the project/git root of the first path in the paths array.\n     */\n    rootPath?: 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\\nMake sure the path exists and try again.`);\n    }\n\n    const rootPath = options.rootPath || findProjectRoot(searchPath, { noPackageRoot: true });\n\n    let pathsToVisit: PackagePathInfo[];\n\n    if (discoverPackages) {\n      const packagePaths = await glob('**/package.json', { cwd: searchPath, ignore: ['**/node_modules/**'] });\n\n      pathsToVisit = packagePaths.map((p) => ({ packagePath: path.dirname(path.join(searchPath, p)) }));\n    } else {\n      pathsToVisit = [{ packagePath: searchPath }];\n    }\n\n    while (pathsToVisit.length) {\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked length\n      const { packagePath, importerContext } = pathsToVisit.shift()!;\n\n      // There's a very slight possibility (not yet observed even in large repos) that both semver\n      // and non-semver dependencies could resolve to the same package name and version and therefore\n      // be installed at the same path. (If the non-semver dependency was encountered first, the\n      // version and possibly name in the package definition would have been transformed to match by\n      // getNonSemverTransform.) It would be possible to detect this case if needed, but for now we're\n      // not going to bother because it's so rare/theoretical and the effect in practice will probably\n      // be the same as a dependency that's forced with `resolutions` to a version violating semver.\n      if (!visitedPaths.has(packagePath)) {\n        visitedPaths.add(packagePath);\n\n        const dependencyPaths = await visitPackage({ packagePath, packageMap, rootPath, importerContext }, context);\n\n        for (const dependencyPath of dependencyPaths) {\n          // Let's avoid pushing tons of things into the work queue that we'll be skipping later.\n          if (!visitedPaths.has(dependencyPath.packagePath)) {\n            pathsToVisit.push(dependencyPath);\n          }\n        }\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: PackagePathInfo & {\n    packageMap: PackageMap;\n    rootPath: string | undefined;\n  },\n  context: Parameters<typeof findPackagesFromPath>[1],\n) {\n  const { packagePath, packageMap, rootPath, importerContext } = options;\n  const { packages } = context;\n\n  const packageDefinition = await packages.get(packagePath, { importerContext });\n  if (!packageDefinition) {\n    throw new Error(\n      `Could not find package definition at \"${packagePath}\".\\n\\n` +\n        `Make sure the package.json file exists and try again.\\n`,\n    );\n  }\n  if (!(packageDefinition.name && packageDefinition.version)) {\n    return [];\n  }\n\n  const { name, version } = packageDefinition;\n  const entry = ensurePackageEntry({\n    packageName: importerContext?.importedName || name,\n    packagePath: packagePath,\n    packageMap,\n    definition: packageDefinition,\n  });\n\n  // Add all dependencies to the list of paths to visit.\n  const dependencies = getDependencies(packageDefinition) as Record<string, string>;\n\n  const dependencyPaths: PackagePathInfo[] = [];\n\n  for (const [dependencyName, versionRequirement] of Object.entries(dependencies)) {\n    const depImporterContext: PackageImporterContext = {\n      parentName: name,\n      parentVersion: version,\n      importedName: dependencyName,\n      versionRequirement,\n    };\n\n    const dependencyPackage = await findPackage(\n      { dependencyName, startPath: packagePath, rootPath, importerContext: depImporterContext },\n      context,\n    );\n    if (!dependencyPackage) {\n      if (packageDefinition.peerDependencies?.[dependencyName]) {\n        // Ignore missing peer dependencies\n        continue;\n      }\n\n      throw new Error(\n        `A dependency could not be found:\\n` +\n          `  * Dependency: ${dependencyName} (Required: ${versionRequirement})\\n` +\n          `  * Required by: ${packagePath}\\n\\n` +\n          `Make sure the dependency is installed and try again.`,\n      );\n    }\n\n    const { packagePath: dependencyPath, definition: dependencyDefinition } = dependencyPackage;\n\n    if (!(dependencyDefinition.name && dependencyDefinition.version)) {\n      throw new Error(`\"${dependencyPath}/package.json\" is missing a name or version.`);\n    }\n\n    const dependencyEntry = ensurePackageEntry({\n      packagePath: dependencyPath,\n      packageName: dependencyName,\n      packageMap,\n      definition: dependencyDefinition,\n    });\n\n    entry.dependencies[dependencyName] = dependencyDefinition.version;\n    dependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;\n\n    dependencyPaths.push({\n      packagePath: dependencyPath,\n      importerContext: depImporterContext,\n    });\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  packageName: string;\n  packageMap: PackageMap;\n  definition: PackageJson;\n}): ResolveMapEntry {\n  const { packagePath = '', packageName: name, packageMap, definition } = options;\n  // the caller verified that these are set\n  const { version } = definition as Required<PackageJson>;\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/findFileInPackage.js

@@ -24,7 +24,7 @@ export async function findFileInPackage(options, context) {
     let sourcePath;
     let typesPath;
     const isInternal = !isExternalPackage(packagePath);
-    const candidates = getCandidates({ filePath: originalPath, packagePath }, context);
+    const candidates = await getCandidates({ filePath: originalPath, packagePath }, context);
     // Try and resolve a physical file given the candidates.
     // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem
     filePath = candidates.find((candidate) => isFileSync(path.join(packagePath, candidate)));

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 type { CloudpackConfig, PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';\nimport { intermediateToSourcePath, isFileSync, sourceToIntermediatePath } from '@ms-cloudpack/path-utilities';\nimport path from 'path';\nimport { flattenExportsMap } from './flattenExportsMap.js';\nimport { getCandidates } from './getCandidates.js';\nimport { getExportsMap } from './getExportsMap.js';\nimport { isExternalPackage } from './isExternalPackage.js';\n\nconst sourceExtensions = ['.ts', '.tsx', '.cts', '.mts', '.jsx'];\nconst javascriptExtensions = ['.js', '.mjs', '.cjs'];\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 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 */\nexport async function findFileInPackage(\n  options: FindFileInPackageOptions,\n  context: { packages: PackageDefinitionsCache; config: CloudpackConfig },\n): Promise<FindFileInPackageResult> {\n  const originalPath = normalizeRelativePath(options.filePath);\n  const packagePath = slash(options.packagePath);\n  let filePath: string | undefined;\n  let sourcePath: string | undefined;\n  let typesPath: string | undefined;\n  const isInternal = !isExternalPackage(packagePath);\n  const candidates = getCandidates({ filePath: originalPath, packagePath }, context);\n\n  // Try and resolve a physical file given the candidates.\n  // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem\n  filePath = candidates.find((candidate) => isFileSync(path.join(packagePath, candidate)));\n\n  const isNestedPackageDefinition =\n    filePath && path.basename(filePath) === 'package.json' && path.basename(originalPath) !== '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: normalizeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, entryPath))),\n          },\n          context,\n        )),\n        typesPath:\n          typesPath && normalizeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, typesPath))),\n      };\n    }\n  }\n\n  // If the resolved file is a typescript file in an internal package, try to resolve the intermediate.\n  if (filePath && sourceExtensions.includes(path.extname(filePath))) {\n    sourcePath = filePath;\n    filePath = isInternal ? sourceToIntermediatePath(filePath) : undefined;\n  }\n\n  // If we haven't resolved a sourcePath, try to resolve it from the intermediate.\n  if (isInternal && filePath && !sourcePath) {\n    const ext = path.extname(filePath);\n    const isJavaScriptExt = javascriptExtensions.includes(ext);\n\n    if (isJavaScriptExt) {\n      // Not a TS file, but a JS file. Try to find the source.\n      sourcePath = intermediateToSourcePath(filePath, packagePath);\n\n      // If we couldn't find a TS file, clear sourcePath.\n      if (sourcePath === filePath) {\n        sourcePath = undefined;\n      }\n    }\n  }\n\n  // Try to resolve the typesPath\n  if (sourcePath && filePath) {\n    typesPath = filePath.replace(/\\.js$/, '.d.ts');\n\n    // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem\n    if (!isInternal && !isFileSync(path.join(packagePath, typesPath))) {\n      typesPath = undefined;\n    }\n  }\n\n  if (typesPath) {\n    result.typesPath = normalizeRelativePath(typesPath);\n  }\n\n  if (filePath) {\n    result.filePath = normalizeRelativePath(filePath);\n  }\n\n  if (sourcePath) {\n    result.sourcePath = normalizeRelativePath(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 type { CloudpackConfig, PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';\nimport { intermediateToSourcePath, isFileSync, sourceToIntermediatePath } from '@ms-cloudpack/path-utilities';\nimport path from 'path';\nimport { flattenExportsMap } from './flattenExportsMap.js';\nimport { getCandidates } from './getCandidates.js';\nimport { getExportsMap } from './getExportsMap.js';\nimport { isExternalPackage } from './isExternalPackage.js';\n\nconst sourceExtensions = ['.ts', '.tsx', '.cts', '.mts', '.jsx'];\nconst javascriptExtensions = ['.js', '.mjs', '.cjs'];\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 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 */\nexport async function findFileInPackage(\n  options: FindFileInPackageOptions,\n  context: { packages: PackageDefinitionsCache; config: CloudpackConfig },\n): Promise<FindFileInPackageResult> {\n  const originalPath = normalizeRelativePath(options.filePath);\n  const packagePath = slash(options.packagePath);\n  let filePath: string | undefined;\n  let sourcePath: string | undefined;\n  let typesPath: string | undefined;\n  const isInternal = !isExternalPackage(packagePath);\n  const candidates = await getCandidates({ filePath: originalPath, packagePath }, context);\n\n  // Try and resolve a physical file given the candidates.\n  // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem\n  filePath = candidates.find((candidate) => isFileSync(path.join(packagePath, candidate)));\n\n  const isNestedPackageDefinition =\n    filePath && path.basename(filePath) === 'package.json' && path.basename(originalPath) !== '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: normalizeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, entryPath))),\n          },\n          context,\n        )),\n        typesPath:\n          typesPath && normalizeRelativePath(path.relative(packagePath, path.join(nestedDefinitionPath, typesPath))),\n      };\n    }\n  }\n\n  // If the resolved file is a typescript file in an internal package, try to resolve the intermediate.\n  if (filePath && sourceExtensions.includes(path.extname(filePath))) {\n    sourcePath = filePath;\n    filePath = isInternal ? sourceToIntermediatePath(filePath) : undefined;\n  }\n\n  // If we haven't resolved a sourcePath, try to resolve it from the intermediate.\n  if (isInternal && filePath && !sourcePath) {\n    const ext = path.extname(filePath);\n    const isJavaScriptExt = javascriptExtensions.includes(ext);\n\n    if (isJavaScriptExt) {\n      // Not a TS file, but a JS file. Try to find the source.\n      sourcePath = intermediateToSourcePath(filePath, packagePath);\n\n      // If we couldn't find a TS file, clear sourcePath.\n      if (sourcePath === filePath) {\n        sourcePath = undefined;\n      }\n    }\n  }\n\n  // Try to resolve the typesPath\n  if (sourcePath && filePath) {\n    typesPath = filePath.replace(/\\.js$/, '.d.ts');\n\n    // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem\n    if (!isInternal && !isFileSync(path.join(packagePath, typesPath))) {\n      typesPath = undefined;\n    }\n  }\n\n  if (typesPath) {\n    result.typesPath = normalizeRelativePath(typesPath);\n  }\n\n  if (filePath) {\n    result.filePath = normalizeRelativePath(filePath);\n  }\n\n  if (sourcePath) {\n    result.sourcePath = normalizeRelativePath(sourcePath);\n  }\n\n  return result;\n}\n"]}

package/lib/findPackageOutputPaths.d.ts

@@ -0,0 +1,21 @@
+import { type PackageDefinitionsCache } from '@ms-cloudpack/common-types';
+/**
+ * Given a package path, read the package definition's main and modules, if present,
+ * to uncover cjs and esm output paths. If both main and module are present, and they
+ * point to the same filename in distinct paths, we can infer the common ancestor to
+ * derive cjs/esm output paths. This is particularly useful in getCandidates, where
+ * we need to translate a request import file path into a physical file.
+ *
+ * Paths are normalized - slashes will be forward, paths are relative and start with a period,
+ * and they will always end with a trailing slash to make it easy to replace within
+ * findCandidates.
+ *
+ * If there is not enough info to conclude the output paths, return undefined.
+ */
+export declare function findPackageOutputPaths(packagePath: string, context: {
+    packages: PackageDefinitionsCache;
+}): Promise<{
+    cjsPath: string;
+    esmPath: string;
+} | undefined>;
+//# sourceMappingURL=findPackageOutputPaths.d.ts.map

package/lib/findPackageOutputPaths.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findPackageOutputPaths.d.ts","sourceRoot":"","sources":["../src/findPackageOutputPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAK1E;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GAC7C,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CA+E3D"}

package/lib/findPackageOutputPaths.js

@@ -0,0 +1,84 @@
+import { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';
+import { isFileSync, isFolderSync } from '@ms-cloudpack/path-utilities';
+import path from 'path';
+/**
+ * Given a package path, read the package definition's main and modules, if present,
+ * to uncover cjs and esm output paths. If both main and module are present, and they
+ * point to the same filename in distinct paths, we can infer the common ancestor to
+ * derive cjs/esm output paths. This is particularly useful in getCandidates, where
+ * we need to translate a request import file path into a physical file.
+ *
+ * Paths are normalized - slashes will be forward, paths are relative and start with a period,
+ * and they will always end with a trailing slash to make it easy to replace within
+ * findCandidates.
+ *
+ * If there is not enough info to conclude the output paths, return undefined.
+ */
+export async function findPackageOutputPaths(packagePath, context) {
+    const packageDefinition = await context.packages.get(packagePath, { disableTransforms: true });
+    if (!packageDefinition) {
+        throw new Error(`Package definition not found for ${packagePath}`);
+    }
+    const { exports, main, module } = packageDefinition;
+    // If an exports map is provided, or we're missing main or module, don't
+    // try and derive an output path. We don't have enough information.
+    if (exports || !main || !module || main === module) {
+        return undefined;
+    }
+    // We should only attempt to find package output paths if main and module
+    // are filenames that have extensions.
+    const mainExt = path.extname(main);
+    const moduleExt = path.extname(module);
+    // If main/module have an extension, we need to remove the filename to get the folder.
+    let cjsPath = main;
+    let esmPath = module;
+    // If either are folders, we should assume we're looking for index.js within the folder.
+    if (!mainExt) {
+        // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem
+        if (isFolderSync(path.resolve(packagePath, main))) {
+            cjsPath = slash(path.join(main, 'index.js'));
+            // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem
+        }
+        else if (isFileSync(path.resolve(packagePath, main + '.js'))) {
+            cjsPath = main + '.js';
+        }
+    }
+    if (!moduleExt) {
+        // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem
+        if (isFolderSync(path.resolve(packagePath, module))) {
+            esmPath = slash(path.join(module, 'index.js'));
+            // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem
+        }
+        else if (isFileSync(path.resolve(packagePath, module + '.js'))) {
+            esmPath = module + '.js';
+        }
+    }
+    // If the filenames don't match (ignoring extensions because of cjs vs mjs), we could
+    // be in an asymmetrical case (e.g. main: /dist/foo.js vs module: /dist-esm/src/bar.js)
+    if (path.basename(cjsPath, mainExt) !== path.basename(esmPath, moduleExt)) {
+        return undefined;
+    }
+    // Ignore the filenames (which might differ on extension, js vs cjs vs mjs.)
+    cjsPath = path.dirname(cjsPath);
+    esmPath = path.dirname(esmPath);
+    // They are different - strip off the common paths at the end to derive
+    // the unique cjs/esm output paths.
+    // For example, if main is `lib/cjs/foo/bar/index.js' and module is `lib/esm/foo/bar/index.js`,
+    // then the cjsOutputPath is `lib/cjs` and the esmOutputPath is `lib/esm`.
+    const mainParts = cjsPath?.split('/');
+    const moduleParts = esmPath?.split('/');
+    const commonParts = [];
+    while (mainParts.length &&
+        moduleParts.length &&
+        mainParts[mainParts.length - 1] === moduleParts[moduleParts.length - 1]) {
+        commonParts.unshift(mainParts.pop());
+        moduleParts.pop();
+    }
+    cjsPath = normalizeRelativePath(mainParts.length ? mainParts.join('/') : cjsPath || '') + '/';
+    esmPath = normalizeRelativePath(moduleParts.length ? moduleParts.join('/') : esmPath || '') + '/';
+    if (cjsPath === esmPath || cjsPath === './' || esmPath === './') {
+        return undefined;
+    }
+    return { cjsPath, esmPath };
+}
+//# sourceMappingURL=findPackageOutputPaths.js.map

package/lib/findPackageOutputPaths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"findPackageOutputPaths.js","sourceRoot":"","sources":["../src/findPackageOutputPaths.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,WAAmB,EACnB,OAA8C;IAE9C,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/F,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,oCAAoC,WAAW,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,iBAAiB,CAAC;IAEpD,wEAAwE;IACxE,mEAAmE;IACnE,IAAI,OAAO,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACnD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,yEAAyE;IACzE,sCAAsC;IACtC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAEvC,sFAAsF;IACtF,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,OAAO,GAAG,MAAM,CAAC;IAErB,wFAAwF;IACxF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,qEAAqE;QACrE,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;YAClD,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;YAC7C,qEAAqE;QACvE,CAAC;aAAM,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;YAC/D,OAAO,GAAG,IAAI,GAAG,KAAK,CAAC;QACzB,CAAC;IACH,CAAC;IACD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,qEAAqE;QACrE,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;YACpD,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;YAC/C,qEAAqE;QACvE,CAAC;aAAM,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;YACjE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,qFAAqF;IACrF,uFAAuF;IACvF,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;QAC1E,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,4EAA4E;IAC5E,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEhC,uEAAuE;IACvE,mCAAmC;IACnC,+FAA+F;IAC/F,0EAA0E;IAC1E,MAAM,SAAS,GAAG,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,EAAE,CAAC;IAEvB,OACE,SAAS,CAAC,MAAM;QAChB,WAAW,CAAC,MAAM;QAClB,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,EACvE,CAAC;QACD,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC;QACrC,WAAW,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,OAAO,GAAG,qBAAqB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC;IAC9F,OAAO,GAAG,qBAAqB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC;IAElG,IAAI,OAAO,KAAK,OAAO,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QAChE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AAC9B,CAAC","sourcesContent":["import { type PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { normalizeRelativePath, slash } from '@ms-cloudpack/path-string-parsing';\nimport { isFileSync, isFolderSync } from '@ms-cloudpack/path-utilities';\nimport path from 'path';\n\n/**\n * Given a package path, read the package definition's main and modules, if present,\n * to uncover cjs and esm output paths. If both main and module are present, and they\n * point to the same filename in distinct paths, we can infer the common ancestor to\n * derive cjs/esm output paths. This is particularly useful in getCandidates, where\n * we need to translate a request import file path into a physical file.\n *\n * Paths are normalized - slashes will be forward, paths are relative and start with a period,\n * and they will always end with a trailing slash to make it easy to replace within\n * findCandidates.\n *\n * If there is not enough info to conclude the output paths, return undefined.\n */\nexport async function findPackageOutputPaths(\n  packagePath: string,\n  context: { packages: PackageDefinitionsCache },\n): Promise<{ cjsPath: string; esmPath: string } | undefined> {\n  const packageDefinition = await context.packages.get(packagePath, { disableTransforms: true });\n\n  if (!packageDefinition) {\n    throw new Error(`Package definition not found for ${packagePath}`);\n  }\n\n  const { exports, main, module } = packageDefinition;\n\n  // If an exports map is provided, or we're missing main or module, don't\n  // try and derive an output path. We don't have enough information.\n  if (exports || !main || !module || main === module) {\n    return undefined;\n  }\n\n  // We should only attempt to find package output paths if main and module\n  // are filenames that have extensions.\n  const mainExt = path.extname(main);\n  const moduleExt = path.extname(module);\n\n  // If main/module have an extension, we need to remove the filename to get the folder.\n  let cjsPath = main;\n  let esmPath = module;\n\n  // If either are folders, we should assume we're looking for index.js within the folder.\n  if (!mainExt) {\n    // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem\n    if (isFolderSync(path.resolve(packagePath, main))) {\n      cjsPath = slash(path.join(main, 'index.js'));\n      // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem\n    } else if (isFileSync(path.resolve(packagePath, main + '.js'))) {\n      cjsPath = main + '.js';\n    }\n  }\n  if (!moduleExt) {\n    // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem\n    if (isFolderSync(path.resolve(packagePath, module))) {\n      esmPath = slash(path.join(module, 'index.js'));\n      // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem\n    } else if (isFileSync(path.resolve(packagePath, module + '.js'))) {\n      esmPath = module + '.js';\n    }\n  }\n\n  // If the filenames don't match (ignoring extensions because of cjs vs mjs), we could\n  // be in an asymmetrical case (e.g. main: /dist/foo.js vs module: /dist-esm/src/bar.js)\n  if (path.basename(cjsPath, mainExt) !== path.basename(esmPath, moduleExt)) {\n    return undefined;\n  }\n\n  // Ignore the filenames (which might differ on extension, js vs cjs vs mjs.)\n  cjsPath = path.dirname(cjsPath);\n  esmPath = path.dirname(esmPath);\n\n  // They are different - strip off the common paths at the end to derive\n  // the unique cjs/esm output paths.\n  // For example, if main is `lib/cjs/foo/bar/index.js' and module is `lib/esm/foo/bar/index.js`,\n  // then the cjsOutputPath is `lib/cjs` and the esmOutputPath is `lib/esm`.\n  const mainParts = cjsPath?.split('/');\n  const moduleParts = esmPath?.split('/');\n  const commonParts = [];\n\n  while (\n    mainParts.length &&\n    moduleParts.length &&\n    mainParts[mainParts.length - 1] === moduleParts[moduleParts.length - 1]\n  ) {\n    commonParts.unshift(mainParts.pop());\n    moduleParts.pop();\n  }\n\n  cjsPath = normalizeRelativePath(mainParts.length ? mainParts.join('/') : cjsPath || '') + '/';\n  esmPath = normalizeRelativePath(moduleParts.length ? moduleParts.join('/') : esmPath || '') + '/';\n\n  if (cjsPath === esmPath || cjsPath === './' || esmPath === './') {\n    return undefined;\n  }\n\n  return { cjsPath, esmPath };\n}\n"]}

package/lib/getCandidates.d.ts

@@ -1,4 +1,4 @@
-import { type CloudpackConfig } from '@ms-cloudpack/common-types';
+import { type CloudpackConfig, type PackageDefinitionsCache } from '@ms-cloudpack/common-types';
 /**
  * Given a packagePath and a filePath from its exports map (or main/module), build candidate paths
  * to look for the physical file in order of priority. For internal packages, we try to discover
@@ -11,5 +11,6 @@ export declare function getCandidates(options: {
     packagePath: string;
 }, context: {
     config: CloudpackConfig;
-}): string[];
+    packages: PackageDefinitionsCache;
+}): Promise<string[]>;
 //# sourceMappingURL=getCandidates.d.ts.map

package/lib/getCandidates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getCandidates.d.ts","sourceRoot":"","sources":["../src/getCandidates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AA0BlE;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EAClD,OAAO,EAAE;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,YA0DrC"}
+{"version":3,"file":"getCandidates.d.ts","sourceRoot":"","sources":["../src/getCandidates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AA2BhG;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EAClD,OAAO,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,uBAAuB,CAAA;CAAE,qBA2ExE"}

package/lib/getCandidates.js

@@ -1,6 +1,7 @@
 import { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';
 import path from 'path';
 import { isExternalPackage } from './isExternalPackage.js';
+import { findPackageOutputPaths } from './findPackageOutputPaths.js';
 // Mappings to possible candidate extensions for a given input extension.
 const externalExtensions = ['.js', '.mjs', '.cjs'];
 const internalExtensions = ['.ts', '.tsx', '.mts', '.cts', '.jsx', '.js', '.mjs', '.cjs'];
@@ -29,7 +30,8 @@ const externalExtensionMap = {
  * and expand folder paths as well for ambiguous references. For external packages, we prioritize
  * intermediate paths.
  */
-export function getCandidates(options, context) {
+export async function getCandidates(options, context) {
+    const outputPaths = await findPackageOutputPaths(options.packagePath, context);
     const { filePath, packagePath } = options;
     const resolveWebExtensions = Boolean(context.config.features?.resolveWebExtensions);
     const isBlankPath = !filePath || filePath === '.';
@@ -43,9 +45,29 @@ export function getCandidates(options, context) {
         ? [...defaultExtensions.map((ext) => `.web${ext}`), ...defaultExtensions]
         : defaultExtensions;
     const extensions = (isInternal ? internalExtensionMap : externalExtensionMap)[originalExt] || defaultExtensionsWithSuffixes;
-    const pathsToAdd = [originalPath];
-    if (isInternal && originalPath.startsWith('./lib')) {
-        pathsToAdd.unshift(originalPath.replace(/^\.\/lib/, './src'));
+    const pathsToAdd = [];
+    // For internal packages, we try and resolve the source file name first.
+    const { esmPath, cjsPath } = outputPaths || {};
+    if (isInternal) {
+        if (cjsPath && esmPath) {
+            if (originalPath.startsWith(esmPath)) {
+                pathsToAdd.push(originalPath.replace(esmPath, './src/'));
+            }
+            else if (originalPath.startsWith(cjsPath)) {
+                pathsToAdd.push(originalPath.replace(cjsPath, './src/'));
+            }
+        }
+        else if (originalPath.startsWith('./lib/')) {
+            pathsToAdd.push(originalPath.replace(/^\.\/lib\//, './src/'));
+        }
+    }
+    if (esmPath && cjsPath) {
+        // We have a distinct esm output path. If the original path refers to the cjsPath,
+        // refer only to the esm path.
+        pathsToAdd.push(originalPath.replace(cjsPath, esmPath));
+    }
+    else {
+        pathsToAdd.push(originalPath);
     }
     for (let currentPath of pathsToAdd) {
         const unrecognizedExt = originalExt && !extensions.includes(path.extname(currentPath));
@@ -59,18 +81,13 @@ export function getCandidates(options, context) {
         }
         // For non-extension references, we might be referring to a folder, or a barrel file within a folder. Add the
         // appropriate extensions for the barrel file, and fall back to a package.json in the case of nested definitions.
-        if (!originalExt) {
-            if (isBlankPath) {
-                candidates.push('./package.json');
-            }
-            else {
-                // Trim trailing slash
-                if (endsWithSlash) {
-                    currentPath = currentPath.slice(0, -1);
-                }
-                candidates.push(...expandExtensions(currentPath + '/index', extensions));
-                candidates.push(currentPath + '/package.json');
+        if (!originalExt && !isBlankPath) {
+            // Trim trailing slash
+            if (endsWithSlash) {
+                currentPath = currentPath.slice(0, -1);
             }
+            candidates.push(...expandExtensions(currentPath + '/index', extensions));
+            candidates.push(currentPath + '/package.json');
         }
         // For external packages, we try and resolve the original file name last.
         if (!isInternal && unrecognizedExt) {

package/lib/getCandidates.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCandidates.js","sourceRoot":"","sources":["../src/getCandidates.ts"],"names":[],"mappings":"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","sourcesContent":["import { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { type CloudpackConfig } from '@ms-cloudpack/common-types';\nimport path from 'path';\nimport { isExternalPackage } from './isExternalPackage.js';\n\n// Mappings to possible candidate extensions for a given input extension.\nconst externalExtensions = ['.js', '.mjs', '.cjs'];\nconst internalExtensions = ['.ts', '.tsx', '.mts', '.cts', '.jsx', '.js', '.mjs', '.cjs'];\nconst internalExtensionMap: Record<string, string[]> = {\n  '.ts': ['.ts', '.js'],\n  '.tsx': ['.tsx', '.js'],\n  '.mts': ['.mts', '.mjs', '.js'],\n  '.cts': ['.cts', '.cjs', '.js'],\n  '.jsx': ['.jsx', '.js'],\n  '.js': ['.ts', '.tsx', '.mts', '.cts', '.jsx', '.js'],\n  '.mjs': ['.mjs', '.js'],\n  '.cjs': ['.cjs', '.js'],\n};\nconst externalExtensionMap: Record<string, string[]> = {\n  '.ts': ['.js'],\n  '.tsx': ['.js'],\n  '.mts': ['.mjs'],\n  '.cts': ['.cjs'],\n  '.jsx': ['.js'],\n  '.js': ['.js'],\n};\n\n/**\n * Given a packagePath and a filePath from its exports map (or main/module), build candidate paths\n * to look for the physical file in order of priority. For internal packages, we try to discover\n * source files first, and then fallback to the original file name. We also search for index files\n * and expand folder paths as well for ambiguous references. For external packages, we prioritize\n * intermediate paths.\n */\nexport function getCandidates(\n  options: { filePath: string; packagePath: string },\n  context: { config: CloudpackConfig },\n) {\n  const { filePath, packagePath } = options;\n  const resolveWebExtensions = Boolean(context.config.features?.resolveWebExtensions);\n  const isBlankPath = !filePath || filePath === '.';\n  const originalPath = isBlankPath ? './index' : normalizeRelativePath(filePath);\n  const originalExt = path.extname(originalPath);\n  const isInternal = !isExternalPackage(packagePath);\n  const endsWithSlash = originalPath.endsWith('/');\n  const candidates = [];\n  const defaultExtensions = isInternal ? internalExtensions : externalExtensions;\n  const defaultExtensionsWithSuffixes = resolveWebExtensions\n    ? [...defaultExtensions.map((ext) => `.web${ext}`), ...defaultExtensions]\n    : defaultExtensions;\n  const extensions =\n    (isInternal ? internalExtensionMap : externalExtensionMap)[originalExt] || defaultExtensionsWithSuffixes;\n  const pathsToAdd = [originalPath];\n\n  if (isInternal && originalPath.startsWith('./lib')) {\n    pathsToAdd.unshift(originalPath.replace(/^\\.\\/lib/, './src'));\n  }\n\n  for (let currentPath of pathsToAdd) {\n    const unrecognizedExt = originalExt && !extensions.includes(path.extname(currentPath));\n\n    // For internal packages, we try and resolve the original file name first.\n    if (isInternal && unrecognizedExt) {\n      candidates.push(currentPath);\n    }\n\n    // If the path doesn't end with a slash, it could be a file. Add extensions.\n    if (!endsWithSlash) {\n      candidates.push(...expandExtensions(currentPath, extensions));\n    }\n\n    // For non-extension references, we might be referring to a folder, or a barrel file within a folder. Add the\n    // appropriate extensions for the barrel file, and fall back to a package.json in the case of nested definitions.\n    if (!originalExt) {\n      if (isBlankPath) {\n        candidates.push('./package.json');\n      } else {\n        // Trim trailing slash\n        if (endsWithSlash) {\n          currentPath = currentPath.slice(0, -1);\n        }\n\n        candidates.push(...expandExtensions(currentPath + '/index', extensions));\n        candidates.push(currentPath + '/package.json');\n      }\n    }\n\n    // For external packages, we try and resolve the original file name last.\n    if (!isInternal && unrecognizedExt) {\n      candidates.push(currentPath);\n    }\n  }\n\n  return candidates;\n}\n\n/**\n * Given a filepath and list of extensions, maps extensions to prepend the filepath. In the case that\n * the filepath has an extension already in the list, avoids appending the extension twice.\n *\n * For example, filePath = './foo/bar.js' with extensions ['.ts', '.js'] would result in:\n *\n * ['./foo/bar.ts.js', './foo/bar.js'].\n *\n */\nfunction expandExtensions(filePath: string, extensions: string[]) {\n  const result: string[] = [];\n  const ext = path.extname(filePath);\n\n  if (extensions.includes(ext)) {\n    filePath = `${filePath.slice(0, -ext.length)}`;\n  }\n\n  for (const currentExt of extensions) {\n    result.push(filePath + currentExt);\n  }\n\n  return result;\n}\n"]}
+{"version":3,"file":"getCandidates.js","sourceRoot":"","sources":["../src/getCandidates.ts"],"names":[],"mappings":"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","sourcesContent":["import { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { type CloudpackConfig, type PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport path from 'path';\nimport { isExternalPackage } from './isExternalPackage.js';\nimport { findPackageOutputPaths } from './findPackageOutputPaths.js';\n\n// Mappings to possible candidate extensions for a given input extension.\nconst externalExtensions = ['.js', '.mjs', '.cjs'];\nconst internalExtensions = ['.ts', '.tsx', '.mts', '.cts', '.jsx', '.js', '.mjs', '.cjs'];\nconst internalExtensionMap: Record<string, string[]> = {\n  '.ts': ['.ts', '.js'],\n  '.tsx': ['.tsx', '.js'],\n  '.mts': ['.mts', '.mjs', '.js'],\n  '.cts': ['.cts', '.cjs', '.js'],\n  '.jsx': ['.jsx', '.js'],\n  '.js': ['.ts', '.tsx', '.mts', '.cts', '.jsx', '.js'],\n  '.mjs': ['.mjs', '.js'],\n  '.cjs': ['.cjs', '.js'],\n};\nconst externalExtensionMap: Record<string, string[]> = {\n  '.ts': ['.js'],\n  '.tsx': ['.js'],\n  '.mts': ['.mjs'],\n  '.cts': ['.cjs'],\n  '.jsx': ['.js'],\n  '.js': ['.js'],\n};\n\n/**\n * Given a packagePath and a filePath from its exports map (or main/module), build candidate paths\n * to look for the physical file in order of priority. For internal packages, we try to discover\n * source files first, and then fallback to the original file name. We also search for index files\n * and expand folder paths as well for ambiguous references. For external packages, we prioritize\n * intermediate paths.\n */\nexport async function getCandidates(\n  options: { filePath: string; packagePath: string },\n  context: { config: CloudpackConfig; packages: PackageDefinitionsCache },\n) {\n  const outputPaths = await findPackageOutputPaths(options.packagePath, context);\n  const { filePath, packagePath } = options;\n  const resolveWebExtensions = Boolean(context.config.features?.resolveWebExtensions);\n  const isBlankPath = !filePath || filePath === '.';\n  const originalPath = isBlankPath ? './index' : normalizeRelativePath(filePath);\n  const originalExt = path.extname(originalPath);\n  const isInternal = !isExternalPackage(packagePath);\n  const endsWithSlash = originalPath.endsWith('/');\n  const candidates = [];\n  const defaultExtensions = isInternal ? internalExtensions : externalExtensions;\n  const defaultExtensionsWithSuffixes = resolveWebExtensions\n    ? [...defaultExtensions.map((ext) => `.web${ext}`), ...defaultExtensions]\n    : defaultExtensions;\n  const extensions =\n    (isInternal ? internalExtensionMap : externalExtensionMap)[originalExt] || defaultExtensionsWithSuffixes;\n\n  const pathsToAdd: string[] = [];\n\n  // For internal packages, we try and resolve the source file name first.\n  const { esmPath, cjsPath } = outputPaths || {};\n\n  if (isInternal) {\n    if (cjsPath && esmPath) {\n      if (originalPath.startsWith(esmPath)) {\n        pathsToAdd.push(originalPath.replace(esmPath, './src/'));\n      } else if (originalPath.startsWith(cjsPath)) {\n        pathsToAdd.push(originalPath.replace(cjsPath, './src/'));\n      }\n    } else if (originalPath.startsWith('./lib/')) {\n      pathsToAdd.push(originalPath.replace(/^\\.\\/lib\\//, './src/'));\n    }\n  }\n\n  if (esmPath && cjsPath) {\n    // We have a distinct esm output path. If the original path refers to the cjsPath,\n    // refer only to the esm path.\n    pathsToAdd.push(originalPath.replace(cjsPath, esmPath));\n  } else {\n    pathsToAdd.push(originalPath);\n  }\n\n  for (let currentPath of pathsToAdd) {\n    const unrecognizedExt = originalExt && !extensions.includes(path.extname(currentPath));\n\n    // For internal packages, we try and resolve the original file name first.\n    if (isInternal && unrecognizedExt) {\n      candidates.push(currentPath);\n    }\n\n    // If the path doesn't end with a slash, it could be a file. Add extensions.\n    if (!endsWithSlash) {\n      candidates.push(...expandExtensions(currentPath, extensions));\n    }\n\n    // For non-extension references, we might be referring to a folder, or a barrel file within a folder. Add the\n    // appropriate extensions for the barrel file, and fall back to a package.json in the case of nested definitions.\n    if (!originalExt && !isBlankPath) {\n      // Trim trailing slash\n      if (endsWithSlash) {\n        currentPath = currentPath.slice(0, -1);\n      }\n\n      candidates.push(...expandExtensions(currentPath + '/index', extensions));\n      candidates.push(currentPath + '/package.json');\n    }\n\n    // For external packages, we try and resolve the original file name last.\n    if (!isInternal && unrecognizedExt) {\n      candidates.push(currentPath);\n    }\n  }\n\n  return candidates;\n}\n\n/**\n * Given a filepath and list of extensions, maps extensions to prepend the filepath. In the case that\n * the filepath has an extension already in the list, avoids appending the extension twice.\n *\n * For example, filePath = './foo/bar.js' with extensions ['.ts', '.js'] would result in:\n *\n * ['./foo/bar.ts.js', './foo/bar.js'].\n *\n */\nfunction expandExtensions(filePath: string, extensions: string[]) {\n  const result: string[] = [];\n  const ext = path.extname(filePath);\n\n  if (extensions.includes(ext)) {\n    filePath = `${filePath.slice(0, -ext.length)}`;\n  }\n\n  for (const currentExt of extensions) {\n    result.push(filePath + currentExt);\n  }\n\n  return result;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/package-utilities",
-  "version": "7.1.7",
+  "version": "7.2.1",
   "description": "Utilities for resolving/parsing packages and their imports.",
   "license": "MIT",
   "type": "module",
@@ -14,11 +14,11 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.2.5",
+    "@ms-cloudpack/common-types": "^0.3.0",
     "@ms-cloudpack/json-utilities": "^0.1.4",
-    "@ms-cloudpack/package-overrides": "^0.7.6",
+    "@ms-cloudpack/package-overrides": "^0.7.7",
     "@ms-cloudpack/path-string-parsing": "^1.2.1",
-    "@ms-cloudpack/path-utilities": "^2.7.3",
+    "@ms-cloudpack/path-utilities": "^2.7.4",
     "acorn": "^8.11.2",
     "acorn-walk": "^8.2.1",
     "fast-glob": "^3.2.12",