@ms-cloudpack/api-server 0.56.6 → 0.56.8

package/lib/utilities/addOverride.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,KAAK,eAAe,EACrB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE,KAAK,cAAc,GAAG;IACpB,kDAAkD;IAClD,aAAa,EAAE,OAAO,CAAC;IACvB,sEAAsE;IACtE,KAAK,EAAE,eAAe,GAAG,SAAS,CAAC;CACpC,CAAC;AAaF;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,SAAS,CAAC,GAC7C,OAAO,CAAC,cAAc,CAAC,CAiHzB"}
+{"version":3,"file":"addOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,KAAK,eAAe,EACrB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE,KAAK,cAAc,GAAG;IACpB,kDAAkD;IAClD,aAAa,EAAE,OAAO,CAAC;IACvB,sEAAsE;IACtE,KAAK,EAAE,eAAe,GAAG,SAAS,CAAC;CACpC,CAAC;AAaF;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,SAAS,CAAC,GAC7C,OAAO,CAAC,cAAc,CAAC,CA2GzB"}

package/lib/utilities/addOverride.js

@@ -57,9 +57,7 @@ export async function addOverride(options, context) {
         const generatedConfig = await readGeneratedConfig(appPath);
         // Ensure packageSettings exists.
         const generatedPackageSettings = await ensureGeneratedSettingsForPackage({ packagePath }, { config: { generated: generatedConfig }, packages });
-        if (generatedPackageSettings?.exports &&
-            generatedPackageSettings.exports[normalizedImportPath] ===
-                null) {
+        if (generatedPackageSettings?.exports && generatedPackageSettings.exports[normalizedImportPath] === null) {
             delete generatedPackageSettings.exports[normalizedImportPath];
             deletedNullExport = true;
             if (Object.keys(generatedPackageSettings.exports).length === 0) {

package/lib/utilities/addOverride.js.map

@@ -1 +1 @@
-{"version":3,"file":"addOverride.js","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"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","sourcesContent":["import { ensureGeneratedSettingsForPackage, readGeneratedConfig, writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { parseRequestInfo } from '@ms-cloudpack/import-map';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getExportsMap,\n  type ResolveMapEntry,\n} from '@ms-cloudpack/package-utilities';\nimport { makeUrl, normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport type { Context } from '../types/Context.js';\nimport type { OverrideOptions } from '../types/OverrideOptions.js';\n\ntype OverrideReturn = {\n  /** Whether the override was successfully added */\n  addedOverride: boolean;\n  /** The entry (if any) in the resolve map the override was added to */\n  entry: ResolveMapEntry | undefined;\n};\n\n/**\n * Helper so that when addOverride is called multiple times in quick succession, we only process one at a time.\n * This is to avoid that multiple calls of addOverride first read the same version of the generated config,\n * then write the same version of the config with its corresponding update,\n * which would result in the last call overwriting the changes of the previous calls.\n */\nlet overrideInProcess: Promise<OverrideReturn> = Promise.resolve({\n  addedOverride: false,\n  entry: undefined,\n});\n\n/**\n * The addOverride method is triggered by a user action in the overlay, when we detect new usage of an import path\n * that isn't recognized. When the user triggers this override, we write it to the cloudpack generated config.\n */\nexport async function addOverride(\n  options: OverrideOptions,\n  context: Pick<Context, 'packages' | 'session'>,\n): Promise<OverrideReturn> {\n  overrideInProcess = overrideInProcess.then(async () => {\n    const { packageName, importPath, version, issuerUrl } = options;\n    const { session, packages } = context;\n    const { appPath } = session.config;\n    let addedOverride = false;\n    let deletedNullExport = false;\n    let requiredBy = undefined;\n\n    if (importPath.endsWith('/')) {\n      console.error(`The import path \"${importPath}\" is invalid. Please remove the trailing slash and try again.`);\n      return { addedOverride, entry: undefined };\n    }\n\n    if (issuerUrl) {\n      const { packageName: issuerName, version: issuerVersion } = parseRequestInfo(makeUrl(issuerUrl).pathname);\n      requiredBy = { name: issuerName, version: issuerVersion };\n    }\n\n    const entry = findResolveMapEntry({\n      packageName,\n      resolveMap: session.resolveMap,\n      definition: requiredBy,\n      version,\n    });\n\n    if (!entry) {\n      console.error(`Could not find entry of package \"${packageName}\" in resolve map`);\n      return { addedOverride, entry };\n    }\n\n    const packagePath = entry.path;\n\n    // Get current exports. We want to add an additional entry to what's there - not replace the default exports,\n    // so we need the full map for the package.\n    const exports = await getExportsMap({ packagePath }, { packages, config: session.config });\n    const flattenedExports = flattenExportsMap(exports);\n    const normalizedImportPath = normalizeRelativePath(importPath);\n\n    // Return false if the import path already exists in the exports map.\n    if (flattenedExports[normalizedImportPath]) {\n      console.debug(`The import path \"${importPath}\" already exists in the exports map for \"${packageName}\".`);\n      return { addedOverride, entry };\n    }\n\n    // Parse the generated config if it exists.\n    const generatedConfig = await readGeneratedConfig(appPath);\n\n    // Ensure packageSettings exists.\n    const generatedPackageSettings = await ensureGeneratedSettingsForPackage(\n      { packagePath },\n      { config: { generated: generatedConfig }, packages },\n    );\n\n    if (\n      generatedPackageSettings?.exports &&\n      (generatedPackageSettings.exports as Record<string, string | Record<string, string>>)[normalizedImportPath] ===\n        null\n    ) {\n      delete (generatedPackageSettings.exports as Record<string, string | Record<string, string>>)[\n        normalizedImportPath\n      ];\n      deletedNullExport = true;\n\n      if (Object.keys(generatedPackageSettings.exports).length === 0) {\n        delete generatedPackageSettings.exports;\n      }\n      addedOverride = true;\n    } else {\n      const generatedExports = (generatedPackageSettings.exports ??= {});\n\n      // Add the single new exports entry to the exports map.\n      addedOverride = await addExportsMapEntry(\n        {\n          exports: generatedExports,\n          packagePath,\n          importPath,\n        },\n        { packages, config: session.config },\n      );\n\n      if (!addedOverride) {\n        console.warn(\n          `Unable to add override for package \"${packageName}\" to \"cloudpack.generated.json\".` +\n            ` The file \"${normalizedImportPath}\" could not be found.` +\n            ` Please check the import path and try again.`,\n        );\n        return { addedOverride, entry };\n      }\n    }\n\n    // Write the updated generated config\n    session.config.generated = generatedConfig;\n    const result = await writeGeneratedConfig(generatedConfig, appPath);\n    const desc = `\"${packageName}\" (path \"${normalizedImportPath}\")`;\n    if (result !== 'no-op') {\n      if (deletedNullExport) {\n        console.log(`Removed generated null export for ${desc} from \"cloudpack.generated.json\".`);\n        if (result === 'deleted') {\n          console.log(`Deleted \"cloudpack.generated.json\" because it's now empty.`);\n        }\n      } else if (result === 'written') {\n        console.log(`Added override for ${desc} to \"cloudpack.generated.json\".`);\n      }\n    }\n\n    // Apply the generated exports again to ensure the exports are up to date.\n    await packages.get(packagePath, { refresh: true });\n\n    return { addedOverride, entry };\n  });\n\n  return overrideInProcess;\n}\n"]}
+{"version":3,"file":"addOverride.js","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"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","sourcesContent":["import { ensureGeneratedSettingsForPackage, readGeneratedConfig, writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { parseRequestInfo } from '@ms-cloudpack/import-map';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getExportsMap,\n  type ResolveMapEntry,\n} from '@ms-cloudpack/package-utilities';\nimport { makeUrl, normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport type { Context } from '../types/Context.js';\nimport type { OverrideOptions } from '../types/OverrideOptions.js';\n\ntype OverrideReturn = {\n  /** Whether the override was successfully added */\n  addedOverride: boolean;\n  /** The entry (if any) in the resolve map the override was added to */\n  entry: ResolveMapEntry | undefined;\n};\n\n/**\n * Helper so that when addOverride is called multiple times in quick succession, we only process one at a time.\n * This is to avoid that multiple calls of addOverride first read the same version of the generated config,\n * then write the same version of the config with its corresponding update,\n * which would result in the last call overwriting the changes of the previous calls.\n */\nlet overrideInProcess: Promise<OverrideReturn> = Promise.resolve({\n  addedOverride: false,\n  entry: undefined,\n});\n\n/**\n * The addOverride method is triggered by a user action in the overlay, when we detect new usage of an import path\n * that isn't recognized. When the user triggers this override, we write it to the cloudpack generated config.\n */\nexport async function addOverride(\n  options: OverrideOptions,\n  context: Pick<Context, 'packages' | 'session'>,\n): Promise<OverrideReturn> {\n  overrideInProcess = overrideInProcess.then(async () => {\n    const { packageName, importPath, version, issuerUrl } = options;\n    const { session, packages } = context;\n    const { appPath } = session.config;\n    let addedOverride = false;\n    let deletedNullExport = false;\n    let requiredBy = undefined;\n\n    if (importPath.endsWith('/')) {\n      console.error(`The import path \"${importPath}\" is invalid. Please remove the trailing slash and try again.`);\n      return { addedOverride, entry: undefined };\n    }\n\n    if (issuerUrl) {\n      const { packageName: issuerName, version: issuerVersion } = parseRequestInfo(makeUrl(issuerUrl).pathname);\n      requiredBy = { name: issuerName, version: issuerVersion };\n    }\n\n    const entry = findResolveMapEntry({\n      packageName,\n      resolveMap: session.resolveMap,\n      definition: requiredBy,\n      version,\n    });\n\n    if (!entry) {\n      console.error(`Could not find entry of package \"${packageName}\" in resolve map`);\n      return { addedOverride, entry };\n    }\n\n    const packagePath = entry.path;\n\n    // Get current exports. We want to add an additional entry to what's there - not replace the default exports,\n    // so we need the full map for the package.\n    const exports = await getExportsMap({ packagePath }, { packages, config: session.config });\n    const flattenedExports = flattenExportsMap(exports);\n    const normalizedImportPath = normalizeRelativePath(importPath);\n\n    // Return false if the import path already exists in the exports map.\n    if (flattenedExports[normalizedImportPath]) {\n      console.debug(`The import path \"${importPath}\" already exists in the exports map for \"${packageName}\".`);\n      return { addedOverride, entry };\n    }\n\n    // Parse the generated config if it exists.\n    const generatedConfig = await readGeneratedConfig(appPath);\n\n    // Ensure packageSettings exists.\n    const generatedPackageSettings = await ensureGeneratedSettingsForPackage(\n      { packagePath },\n      { config: { generated: generatedConfig }, packages },\n    );\n\n    if (generatedPackageSettings?.exports && generatedPackageSettings.exports[normalizedImportPath] === null) {\n      delete generatedPackageSettings.exports[normalizedImportPath];\n      deletedNullExport = true;\n\n      if (Object.keys(generatedPackageSettings.exports).length === 0) {\n        delete generatedPackageSettings.exports;\n      }\n      addedOverride = true;\n    } else {\n      const generatedExports = (generatedPackageSettings.exports ??= {});\n\n      // Add the single new exports entry to the exports map.\n      addedOverride = await addExportsMapEntry(\n        {\n          exports: generatedExports,\n          packagePath,\n          importPath,\n        },\n        { packages, config: session.config },\n      );\n\n      if (!addedOverride) {\n        console.warn(\n          `Unable to add override for package \"${packageName}\" to \"cloudpack.generated.json\".` +\n            ` The file \"${normalizedImportPath}\" could not be found.` +\n            ` Please check the import path and try again.`,\n        );\n        return { addedOverride, entry };\n      }\n    }\n\n    // Write the updated generated config\n    session.config.generated = generatedConfig;\n    const result = await writeGeneratedConfig(generatedConfig, appPath);\n    const desc = `\"${packageName}\" (path \"${normalizedImportPath}\")`;\n    if (result !== 'no-op') {\n      if (deletedNullExport) {\n        console.log(`Removed generated null export for ${desc} from \"cloudpack.generated.json\".`);\n        if (result === 'deleted') {\n          console.log(`Deleted \"cloudpack.generated.json\" because it's now empty.`);\n        }\n      } else if (result === 'written') {\n        console.log(`Added override for ${desc} to \"cloudpack.generated.json\".`);\n      }\n    }\n\n    // Apply the generated exports again to ensure the exports are up to date.\n    await packages.get(packagePath, { refresh: true });\n\n    return { addedOverride, entry };\n  });\n\n  return overrideInProcess;\n}\n"]}

package/lib/utilities/bundleTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAOvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,MAAM,yBAAyB,GAAG,iBAAiB,GAAG;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,CAAC;AAC7F,MAAM,MAAM,yBAAyB,GAAG,cAAc,CACpD,UAAU,GAAG,eAAe,GAAG,UAAU,GAAG,iBAAiB,EAC7D,YAAY,GAAG,QAAQ,GAAG,UAAU,GAAG,WAAW,CACnD,CAAC;AAEF;;GAEG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,IAAI,CAAC,CAiIf"}
+{"version":3,"file":"bundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAOvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,MAAM,yBAAyB,GAAG,iBAAiB,GAAG;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,CAAC;AAC7F,MAAM,MAAM,yBAAyB,GAAG,cAAc,CACpD,UAAU,GAAG,eAAe,GAAG,UAAU,GAAG,iBAAiB,EAC7D,YAAY,GAAG,QAAQ,GAAG,UAAU,GAAG,WAAW,CACnD,CAAC;AAEF;;GAEG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,IAAI,CAAC,CAoIf"}

package/lib/utilities/bundleTask.js

@@ -78,6 +78,9 @@ export async function bundleTask(options, context) {
                         bundlerCapabilities,
                     };
                     const bundleInternalResult = await bundle(bundleOptions, { config });
+                    if (bundleInternalResult.bundler) {
+                        span.setAttribute('bundler', bundleInternalResult.bundler);
+                    }
                     bundleRequest.result = {
                         ...bundleInternalResult,
                         outputPath: bundleOptions.outputPath ?? outputPath,

package/lib/utilities/bundleTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundleTask.js","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"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","sourcesContent":["import { bundle, getEntriesMapFromPackage, getExternalsFromPackage } from '@ms-cloudpack/bundler';\nimport type { BundleOptions } from '@ms-cloudpack/common-types';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { getExportsMap } from '@ms-cloudpack/package-utilities';\nimport { formatPackageName } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport { prepareOutputPath } from '../common/prepareOutputPath.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { BundleTaskOptions } from '../types/BundleTaskOptions.js';\nimport { getBundleInfo } from './getBundleInfo.js';\nimport { getBundleLocation } from './getBundleLocation.js';\nimport { isCachedResultValid } from './isCachedResultValid.js';\nimport { readResultFromCache } from './readResultFromCache.js';\nimport { saveResultToCache } from './saveResultToCache.js';\nimport { formatBundleTaskResult } from './formatBundleTaskResult.js';\nimport type { PartialContext } from '../types/Context.js';\n\nexport type BundleTaskInternalOptions = BundleTaskOptions & { bundleRequest: BundleRequest };\nexport type BundleTaskInternalContext = PartialContext<\n  'packages' | 'packageHashes' | 'reporter' | 'telemetryClient',\n  'resolveMap' | 'config' | 'sequence' | 'cachePath'\n>;\n\n/**\n * Create and run a TaskReporter task which calls `bundle()` from `@ms-cloudpack/bundler` and formats the result.\n */\nexport async function bundleTask(\n  options: BundleTaskInternalOptions,\n  context: BundleTaskInternalContext,\n): Promise<void> {\n  const { bundleRequest, force, hash, sourceHash } = options;\n  const { packageName, version } = bundleRequest;\n  const { reporter, telemetryClient, packageHashes, packages, session } = context;\n  const { config, sequence } = session;\n  const { mode } = config;\n  const { retryCount } = options;\n\n  const taskName = `Bundle ${formatPackageName({\n    name: packageName,\n    version,\n  })}${retryCount ? ` (retry ${retryCount})` : ''}`;\n\n  await reporter.runTask(taskName, async () => {\n    await telemetryClient.tracer.startActiveSpan('BUNDLE_TASK', async (span) => {\n      // If force is set, dispose the existing result.\n      if (force && bundleRequest?.result?.dispose) {\n        bundleRequest.result.dispose();\n        bundleRequest.result = undefined;\n      }\n\n      const { packagePath, isExternal, isIncremental, disableSourceMaps, shouldGetBundleInfo } = bundleRequest;\n\n      const outputPath =\n        bundleRequest.outputPath ??\n        (await getBundleLocation({ packagePath, shouldRecalculate: force, hash }, context)).path;\n\n      // Rehydrate the result if not incremental.\n      if (bundleRequest.result === undefined && !force) {\n        bundleRequest.result = await readResultFromCache(outputPath, {\n          inputPath: packagePath,\n        });\n      }\n\n      const cacheValidationHash = !isExternal\n        ? sourceHash ||\n          (await packageHashes.get({ packagePath, isSourceHashingEnabled: true, shouldRecalculate: true }))\n        : undefined;\n\n      // if the cached result is valid, use it.\n      if (!force && isCachedResultValid({ bundleRequest, hash: cacheValidationHash })) {\n        console.debug(`Using cached result for ${bundleRequest.packageName}@${bundleRequest.version}`);\n        bundleRequest.resultFromCache = true;\n      } else {\n        bundleRequest.resultFromCache = false;\n\n        // Only use cached result if it's successful.\n        await prepareOutputPath(outputPath);\n\n        if (bundleRequest.result?.rebuild) {\n          bundleRequest.result = {\n            ...(await bundleRequest.result.rebuild()),\n            outputPath: bundleRequest.result.outputPath,\n            hash: cacheValidationHash,\n          };\n        } else {\n          const {\n            bundler,\n            bundlerOptions,\n            inlinedDependencies,\n            dynamicImports,\n            bundlerCapabilities,\n            ignoredBundlerWarnings,\n          } = (await packages.get(packagePath)).cloudpack || {};\n\n          const bundleOptions: BundleOptions = {\n            bundler,\n            minify: mode === 'production',\n            bundlerOptions,\n            inputPath: packagePath,\n            outputPath,\n            incremental: isIncremental !== undefined ? isIncremental : false,\n            sourcemap: !disableSourceMaps,\n            entries: await getEntriesMapFromPackage({ inputPath: packagePath }, { packages, config }),\n            inlined: inlinedDependencies,\n            external: await getExternalsFromPackage({ inputPath: packagePath }, { packages }),\n            dynamicImports,\n            ignoredBundlerWarnings,\n            bundlerCapabilities,\n          };\n\n          const bundleInternalResult = await bundle(bundleOptions, { config });\n          bundleRequest.result = {\n            ...bundleInternalResult,\n            outputPath: bundleOptions.outputPath ?? outputPath,\n            hash: cacheValidationHash,\n          };\n        }\n\n        // Write the result to disk.\n        await saveResultToCache(bundleRequest.result);\n      }\n\n      // If we should find required imports and exports per bundle\n      if (shouldGetBundleInfo && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {\n        const bundleInfoPath = path.join(outputPath, 'bundle-info.json');\n\n        // Exports map is needed to find the bundle info per entry we intend to bundle.\n        // Exports map is used instead of bundleRequest.entries since it is easier to use\n        // because it contains the paths other packages use to import the entry and\n        // the relative location of the bundled files.\n        const exportsMap = await getExportsMap({ packagePath }, { packages, config });\n\n        const bundleInfo = await getBundleInfo({\n          outputPath,\n          outputFiles: bundleRequest.result.outputFiles,\n          exportsMap,\n          isExternal,\n          packagePath,\n        });\n\n        bundleRequest.result.info = bundleInfo;\n\n        // Write to cache for future use. (Ignore the promise result.)\n        // eslint-disable-next-line @typescript-eslint/no-floating-promises\n        writeJson(bundleInfoPath, bundleInfo);\n      }\n\n      span.setAttributes({\n        sequence,\n        isCacheHit: !!bundleRequest.resultFromCache,\n        isExternal: bundleRequest.isExternal,\n      });\n\n      const taskResult = formatBundleTaskResult(bundleRequest);\n\n      return taskResult;\n    });\n  });\n}\n"]}
+{"version":3,"file":"bundleTask.js","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAElG,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAGnE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AASrE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAAkC,EAClC,OAAkC;IAElC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC3D,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAC/C,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAChF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACrC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACxB,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAE/B,MAAM,QAAQ,GAAG,UAAU,iBAAiB,CAAC;QAC3C,IAAI,EAAE,WAAW;QACjB,OAAO;KACR,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,WAAW,UAAU,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAElD,MAAM,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QAC1C,MAAM,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACzE,gDAAgD;YAChD,IAAI,KAAK,IAAI,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;gBAC5C,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBAC/B,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC;YACnC,CAAC;YAED,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,aAAa,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,GAAG,aAAa,CAAC;YAEzG,MAAM,UAAU,GACd,aAAa,CAAC,UAAU;gBACxB,CAAC,MAAM,iBAAiB,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;YAE3F,2CAA2C;YAC3C,IAAI,aAAa,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,KAAK,EAAE,CAAC;gBACjD,aAAa,CAAC,MAAM,GAAG,MAAM,mBAAmB,CAAC,UAAU,EAAE;oBAC3D,SAAS,EAAE,WAAW;iBACvB,CAAC,CAAC;YACL,CAAC;YAED,MAAM,mBAAmB,GAAG,CAAC,UAAU;gBACrC,CAAC,CAAC,UAAU;oBACV,CAAC,MAAM,aAAa,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,sBAAsB,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;gBACnG,CAAC,CAAC,SAAS,CAAC;YAEd,yCAAyC;YACzC,IAAI,CAAC,KAAK,IAAI,mBAAmB,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC,EAAE,CAAC;gBAChF,OAAO,CAAC,KAAK,CAAC,2BAA2B,aAAa,CAAC,WAAW,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC/F,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC;YACvC,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,eAAe,GAAG,KAAK,CAAC;gBAEtC,6CAA6C;gBAC7C,MAAM,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBAEpC,IAAI,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;oBAClC,aAAa,CAAC,MAAM,GAAG;wBACrB,GAAG,CAAC,MAAM,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;wBACzC,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,UAAU;wBAC3C,IAAI,EAAE,mBAAmB;qBAC1B,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,EACJ,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,cAAc,EACd,mBAAmB,EACnB,sBAAsB,GACvB,GAAG,CAAC,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC;oBAEtD,MAAM,aAAa,GAAkB;wBACnC,OAAO;wBACP,MAAM,EAAE,IAAI,KAAK,YAAY;wBAC7B,cAAc;wBACd,SAAS,EAAE,WAAW;wBACtB,UAAU;wBACV,WAAW,EAAE,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK;wBAChE,SAAS,EAAE,CAAC,iBAAiB;wBAC7B,OAAO,EAAE,MAAM,wBAAwB,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;wBACzF,OAAO,EAAE,mBAAmB;wBAC5B,QAAQ,EAAE,MAAM,uBAAuB,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;wBACjF,cAAc;wBACd,sBAAsB;wBACtB,mBAAmB;qBACpB,CAAC;oBAEF,MAAM,oBAAoB,GAAG,MAAM,MAAM,CAAC,aAAa,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;oBACrE,IAAI,oBAAoB,CAAC,OAAO,EAAE,CAAC;wBACjC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;oBAC7D,CAAC;oBACD,aAAa,CAAC,MAAM,GAAG;wBACrB,GAAG,oBAAoB;wBACvB,UAAU,EAAE,aAAa,CAAC,UAAU,IAAI,UAAU;wBAClD,IAAI,EAAE,mBAAmB;qBAC1B,CAAC;gBACJ,CAAC;gBAED,4BAA4B;gBAC5B,MAAM,iBAAiB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAChD,CAAC;YAED,4DAA4D;YAC5D,IAAI,mBAAmB,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;gBAC9G,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;gBAEjE,+EAA+E;gBAC/E,iFAAiF;gBACjF,2EAA2E;gBAC3E,8CAA8C;gBAC9C,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBAE9E,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC;oBACrC,UAAU;oBACV,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,WAAW;oBAC7C,UAAU;oBACV,UAAU;oBACV,WAAW;iBACZ,CAAC,CAAC;gBAEH,aAAa,CAAC,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC;gBAEvC,8DAA8D;gBAC9D,mEAAmE;gBACnE,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;YACxC,CAAC;YAED,IAAI,CAAC,aAAa,CAAC;gBACjB,QAAQ;gBACR,UAAU,EAAE,CAAC,CAAC,aAAa,CAAC,eAAe;gBAC3C,UAAU,EAAE,aAAa,CAAC,UAAU;aACrC,CAAC,CAAC;YAEH,MAAM,UAAU,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;YAEzD,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { bundle, getEntriesMapFromPackage, getExternalsFromPackage } from '@ms-cloudpack/bundler';\nimport type { BundleOptions } from '@ms-cloudpack/common-types';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { getExportsMap } from '@ms-cloudpack/package-utilities';\nimport { formatPackageName } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport { prepareOutputPath } from '../common/prepareOutputPath.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { BundleTaskOptions } from '../types/BundleTaskOptions.js';\nimport { getBundleInfo } from './getBundleInfo.js';\nimport { getBundleLocation } from './getBundleLocation.js';\nimport { isCachedResultValid } from './isCachedResultValid.js';\nimport { readResultFromCache } from './readResultFromCache.js';\nimport { saveResultToCache } from './saveResultToCache.js';\nimport { formatBundleTaskResult } from './formatBundleTaskResult.js';\nimport type { PartialContext } from '../types/Context.js';\n\nexport type BundleTaskInternalOptions = BundleTaskOptions & { bundleRequest: BundleRequest };\nexport type BundleTaskInternalContext = PartialContext<\n  'packages' | 'packageHashes' | 'reporter' | 'telemetryClient',\n  'resolveMap' | 'config' | 'sequence' | 'cachePath'\n>;\n\n/**\n * Create and run a TaskReporter task which calls `bundle()` from `@ms-cloudpack/bundler` and formats the result.\n */\nexport async function bundleTask(\n  options: BundleTaskInternalOptions,\n  context: BundleTaskInternalContext,\n): Promise<void> {\n  const { bundleRequest, force, hash, sourceHash } = options;\n  const { packageName, version } = bundleRequest;\n  const { reporter, telemetryClient, packageHashes, packages, session } = context;\n  const { config, sequence } = session;\n  const { mode } = config;\n  const { retryCount } = options;\n\n  const taskName = `Bundle ${formatPackageName({\n    name: packageName,\n    version,\n  })}${retryCount ? ` (retry ${retryCount})` : ''}`;\n\n  await reporter.runTask(taskName, async () => {\n    await telemetryClient.tracer.startActiveSpan('BUNDLE_TASK', async (span) => {\n      // If force is set, dispose the existing result.\n      if (force && bundleRequest?.result?.dispose) {\n        bundleRequest.result.dispose();\n        bundleRequest.result = undefined;\n      }\n\n      const { packagePath, isExternal, isIncremental, disableSourceMaps, shouldGetBundleInfo } = bundleRequest;\n\n      const outputPath =\n        bundleRequest.outputPath ??\n        (await getBundleLocation({ packagePath, shouldRecalculate: force, hash }, context)).path;\n\n      // Rehydrate the result if not incremental.\n      if (bundleRequest.result === undefined && !force) {\n        bundleRequest.result = await readResultFromCache(outputPath, {\n          inputPath: packagePath,\n        });\n      }\n\n      const cacheValidationHash = !isExternal\n        ? sourceHash ||\n          (await packageHashes.get({ packagePath, isSourceHashingEnabled: true, shouldRecalculate: true }))\n        : undefined;\n\n      // if the cached result is valid, use it.\n      if (!force && isCachedResultValid({ bundleRequest, hash: cacheValidationHash })) {\n        console.debug(`Using cached result for ${bundleRequest.packageName}@${bundleRequest.version}`);\n        bundleRequest.resultFromCache = true;\n      } else {\n        bundleRequest.resultFromCache = false;\n\n        // Only use cached result if it's successful.\n        await prepareOutputPath(outputPath);\n\n        if (bundleRequest.result?.rebuild) {\n          bundleRequest.result = {\n            ...(await bundleRequest.result.rebuild()),\n            outputPath: bundleRequest.result.outputPath,\n            hash: cacheValidationHash,\n          };\n        } else {\n          const {\n            bundler,\n            bundlerOptions,\n            inlinedDependencies,\n            dynamicImports,\n            bundlerCapabilities,\n            ignoredBundlerWarnings,\n          } = (await packages.get(packagePath)).cloudpack || {};\n\n          const bundleOptions: BundleOptions = {\n            bundler,\n            minify: mode === 'production',\n            bundlerOptions,\n            inputPath: packagePath,\n            outputPath,\n            incremental: isIncremental !== undefined ? isIncremental : false,\n            sourcemap: !disableSourceMaps,\n            entries: await getEntriesMapFromPackage({ inputPath: packagePath }, { packages, config }),\n            inlined: inlinedDependencies,\n            external: await getExternalsFromPackage({ inputPath: packagePath }, { packages }),\n            dynamicImports,\n            ignoredBundlerWarnings,\n            bundlerCapabilities,\n          };\n\n          const bundleInternalResult = await bundle(bundleOptions, { config });\n          if (bundleInternalResult.bundler) {\n            span.setAttribute('bundler', bundleInternalResult.bundler);\n          }\n          bundleRequest.result = {\n            ...bundleInternalResult,\n            outputPath: bundleOptions.outputPath ?? outputPath,\n            hash: cacheValidationHash,\n          };\n        }\n\n        // Write the result to disk.\n        await saveResultToCache(bundleRequest.result);\n      }\n\n      // If we should find required imports and exports per bundle\n      if (shouldGetBundleInfo && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {\n        const bundleInfoPath = path.join(outputPath, 'bundle-info.json');\n\n        // Exports map is needed to find the bundle info per entry we intend to bundle.\n        // Exports map is used instead of bundleRequest.entries since it is easier to use\n        // because it contains the paths other packages use to import the entry and\n        // the relative location of the bundled files.\n        const exportsMap = await getExportsMap({ packagePath }, { packages, config });\n\n        const bundleInfo = await getBundleInfo({\n          outputPath,\n          outputFiles: bundleRequest.result.outputFiles,\n          exportsMap,\n          isExternal,\n          packagePath,\n        });\n\n        bundleRequest.result.info = bundleInfo;\n\n        // Write to cache for future use. (Ignore the promise result.)\n        // eslint-disable-next-line @typescript-eslint/no-floating-promises\n        writeJson(bundleInfoPath, bundleInfo);\n      }\n\n      span.setAttributes({\n        sequence,\n        isCacheHit: !!bundleRequest.resultFromCache,\n        isExternal: bundleRequest.isExternal,\n      });\n\n      const taskResult = formatBundleTaskResult(bundleRequest);\n\n      return taskResult;\n    });\n  });\n}\n"]}

package/lib/utilities/editCloudpackConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editCloudpackConfig.d.ts","sourceRoot":"","sources":["../../src/utilities/editCloudpackConfig.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,MAAM,iBAUpD"}
+{"version":3,"file":"editCloudpackConfig.d.ts","sourceRoot":"","sources":["../../src/utilities/editCloudpackConfig.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,MAAM,iBAIpD"}

package/lib/utilities/editCloudpackConfig.js

@@ -1,17 +1,10 @@
-import { writeJson } from '@ms-cloudpack/json-utilities';
-import { isFile } from '@ms-cloudpack/path-utilities';
 import { execSync } from 'child_process';
-import { getConfigPath, configTemplate } from '@ms-cloudpack/config';
+import { ensureAppConfig } from '@ms-cloudpack/config';
 /**
  * Opens the cloudpack config file in the editor.
  */
 export async function editCloudpackConfig(cwd) {
-    const { appConfigPath } = getConfigPath(cwd);
-    // Check if file exists
-    if (!(await isFile(appConfigPath))) {
-        // Create file with default config
-        await writeJson(appConfigPath, configTemplate);
-    }
+    const appConfigPath = await ensureAppConfig(cwd);
     execSync(`code --goto ${JSON.stringify(appConfigPath)}`, { cwd });
 }
 //# sourceMappingURL=editCloudpackConfig.js.map

package/lib/utilities/editCloudpackConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"editCloudpackConfig.js","sourceRoot":"","sources":["../../src/utilities/editCloudpackConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAErE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAAW;IACnD,MAAM,EAAE,aAAa,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IAE7C,uBAAuB;IACvB,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;QACnC,kCAAkC;QAClC,MAAM,SAAS,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IACjD,CAAC;IAED,QAAQ,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;AACpE,CAAC","sourcesContent":["import { writeJson } from '@ms-cloudpack/json-utilities';\nimport { isFile } from '@ms-cloudpack/path-utilities';\nimport { execSync } from 'child_process';\nimport { getConfigPath, configTemplate } from '@ms-cloudpack/config';\n\n/**\n * Opens the cloudpack config file in the editor.\n */\nexport async function editCloudpackConfig(cwd: string) {\n  const { appConfigPath } = getConfigPath(cwd);\n\n  // Check if file exists\n  if (!(await isFile(appConfigPath))) {\n    // Create file with default config\n    await writeJson(appConfigPath, configTemplate);\n  }\n\n  execSync(`code --goto ${JSON.stringify(appConfigPath)}`, { cwd });\n}\n"]}
+{"version":3,"file":"editCloudpackConfig.js","sourceRoot":"","sources":["../../src/utilities/editCloudpackConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAAW;IACnD,MAAM,aAAa,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,CAAC;IAEjD,QAAQ,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;AACpE,CAAC","sourcesContent":["import { execSync } from 'child_process';\nimport { ensureAppConfig } from '@ms-cloudpack/config';\n\n/**\n * Opens the cloudpack config file in the editor.\n */\nexport async function editCloudpackConfig(cwd: string) {\n  const appConfigPath = await ensureAppConfig(cwd);\n\n  execSync(`code --goto ${JSON.stringify(appConfigPath)}`, { cwd });\n}\n"]}

package/lib/utilities/getBundleInfo.d.ts

@@ -1,7 +1,8 @@
 import type { BundleOutputFile, PackageJsonExports } from '@ms-cloudpack/common-types';
 import type { BundleInfo } from '../types/BundleInfo.js';
 /**
- * Returns a mapping from entry file path to list of paths that are produced and consumed in the searched files.
+ * Returns a mapping from entry file path (exports map key) to list of paths that are produced
+ * and consumed in that file.
  */
 export declare function getBundleInfo(params: {
     packagePath: string;

package/lib/utilities/getBundleInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getBundleInfo.d.ts","sourceRoot":"","sources":["../../src/utilities/getBundleInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAIvF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;GAEG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,UAAU,EAAE,OAAO,CAAC;CACrB,GAAG,OAAO,CAAC,UAAU,CAAC,CAuHtB"}
+{"version":3,"file":"getBundleInfo.d.ts","sourceRoot":"","sources":["../../src/utilities/getBundleInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAIvF,OAAO,KAAK,EAAmB,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAG1E;;;GAGG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,UAAU,EAAE,OAAO,CAAC;CACrB,GAAG,OAAO,CAAC,UAAU,CAAC,CA+FtB"}

package/lib/utilities/getBundleInfo.js

@@ -1,9 +1,10 @@
 import { getRuntimeEntryPaths } from '@ms-cloudpack/import-map';
-import { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';
+import { normalizedPathRelativeTo } from '@ms-cloudpack/path-utilities';
 import path from 'path';
 import { getImportsAndExports } from './getImportsAndExports.js';
 /**
- * Returns a mapping from entry file path to list of paths that are produced and consumed in the searched files.
+ * Returns a mapping from entry file path (exports map key) to list of paths that are produced
+ * and consumed in that file.
  */
 export async function getBundleInfo(params) {
     const { packagePath, outputPath, outputFiles, exportsMap, isExternal } = params;
@@ -12,97 +13,74 @@ export async function getBundleInfo(params) {
     if (!outputFiles.length) {
         return bundleInfo;
     }
-    /** Mapping from output file (safe/normalized relative path) to possible entry path and exports. */
-    const outputFileInfo = {};
-    outputFiles.forEach((file) => {
-        // Normalize the path to start with ./ (or . for an empty path)
-        const safePath = normalizeRelativePath(file.outputPath);
-        // Store safe path to possible entry path and exports.
-        outputFileInfo[safePath] = {
-            entry: safePath,
-            produces: new Set(file.exports),
-        };
-    });
-    const repeatedExports = {};
-    const entryPaths = getRuntimeEntryPaths({ packagePath, isExternal, exportsMap });
-    for (const [importPath, actualEntryPath] of Object.entries(entryPaths)) {
-        const safePath = normalizeRelativePath(actualEntryPath);
-        if (outputFileInfo[safePath]) {
-            if (repeatedExports[safePath]) {
-                repeatedExports[safePath].push(importPath);
-            }
-            else {
-                // Change best guess entry path to exports map entry.
-                outputFileInfo[safePath].entry = importPath;
-                repeatedExports[safePath] = [importPath];
-            }
-        }
+    /** Mapping from normalized relative output file path to info about which entry paths
+     * (exports map keys) pointed to that file, and what export names it produces.
+     * Usually there's at most one entry path per output file. */
+    const outputFileInfo = Object.fromEntries(outputFiles.map((file) => [
+        file.outputPath,
+        { exportsKeys: [], produces: new Set(file.exports) },
+    ]));
+    // For each entry path (exports map key), get the normalized relative path to the output file
+    // that will be used at runtime based on conditions.
+    const entryToOutputFile = getRuntimeEntryPaths({ packagePath, isExternal, exportsMap });
+    // Update the output file info with the entry paths (exports keys) that point to each output file.
+    // Usually there's at most one per output file (or none if it's a shared chunk).
+    for (const [entryPath, relOutputFile] of Object.entries(entryToOutputFile)) {
+        outputFileInfo[relOutputFile]?.exportsKeys.push(entryPath);
     }
-    const localPathToSafe = {};
-    Object.keys(outputFileInfo).forEach((safePath) => {
-        localPathToSafe[path.resolve(outputPath, safePath)] = safePath;
-    });
-    const filePaths = Object.keys(localPathToSafe);
-    const visitedPaths = new Set(filePaths);
-    const pathsToParse = [...filePaths];
-    while (pathsToParse.length) {
-        const filePath = pathsToParse.shift();
+    // Build the bundle info based on imports and exports for each output file.
+    // exportsKeys are the export map key(s) that point to the output file.
+    for (const [relOutputFile, { exportsKeys, produces }] of Object.entries(outputFileInfo)) {
         // Ignore any non-JS/TS files such as SVGs and sourcemaps
-        if (!filePath || path.extname(filePath) !== '.js') {
+        if (path.extname(relOutputFile) !== '.js') {
             continue;
         }
-        const safePath = localPathToSafe[filePath];
-        if (safePath === undefined || !outputFileInfo[safePath]) {
-            throw new Error(`Found file that was not expected to be processed: ${filePath}`);
-        }
-        const parseResult = await getImportsAndExports(filePath, packagePath);
+        const absOutputFile = path.resolve(outputPath, relOutputFile);
+        const parseResult = await getImportsAndExports(absOutputFile, packagePath);
         if (!parseResult) {
             continue;
         }
         const { exportNames, imports, dynamicImports } = parseResult;
-        const { entry, produces } = outputFileInfo[safePath];
         exportNames.forEach((name) => produces.add(name));
-        bundleInfo[entry] ??= {
-            bundlePath: safePath,
+        // Create a bundle info entry for this output file.
+        // If there wasn't an exports map key pointing to this file, just use the output path.
+        const pathsInBundleInfo = exportsKeys.length ? exportsKeys : [relOutputFile];
+        const fileBundleInfo = bundleInfo[pathsInBundleInfo[0]] || {
+            bundlePath: relOutputFile,
             produces: Array.from(produces),
             consumes: [],
         };
+        // Use the same object for all paths that point to this file.
+        pathsInBundleInfo.forEach((p) => (bundleInfo[p] = fileBundleInfo));
         if (dynamicImports.length) {
-            bundleInfo[entry].dynamicImports = dynamicImports;
+            fileBundleInfo.dynamicImports = dynamicImports;
         }
         for (const { packageName, importPath, names } of imports) {
-            if (packageName?.startsWith('.')) {
-                const localPath = path.resolve(path.dirname(filePath), packageName, importPath || '');
-                if (!visitedPaths.has(localPath)) {
-                    visitedPaths.add(localPath);
-                    pathsToParse.push(localPath);
-                    localPathToSafe[localPath] = importPath;
+            if (packageName === '.') {
+                const localPath = normalizedPathRelativeTo(outputPath, path.resolve(path.dirname(absOutputFile), importPath));
+                // Pretty sure any path in the current package which is imported in the bundle output should be
+                // in outputFiles, but make it obvious if not.
+                if (!outputFileInfo[localPath]) {
+                    throw new Error(`Imported local file not found in output files for ${outputPath}: ${localPath} ` +
+                        `(imported from ${absOutputFile} with import path "${importPath}")`);
                 }
             }
-            else if (packageName && !packageName.startsWith('node:')) {
-                // Find if the import is already in the consumes list.
-                const entryIndex = bundleInfo[entry].consumes.findIndex((c) => c.packageName === packageName && c.importPath === importPath);
-                if (entryIndex < 0) {
-                    // If not, add it.
-                    bundleInfo[entry].consumes.push({
+            else if (!packageName.startsWith('node:')) {
+                // Find if the imported package is already in the consumes list.
+                const consumesFromPackage = fileBundleInfo.consumes.find((c) => c.packageName === packageName && c.importPath === importPath);
+                if (consumesFromPackage) {
+                    // If so, add the names to the existing entry.
+                    // This is necessary because the same import may be used in multiple places.
+                    consumesFromPackage.names = Array.from(new Set([...names, ...consumesFromPackage.names]));
+                }
+                else {
+                    // Otherwise, add it.
+                    fileBundleInfo.consumes.push({
                         packageName: packageName,
                         importPath: importPath || '.',
                         names: [...names],
                     });
                 }
-                else {
-                    // If so, add the names to the existing entry.
-                    // This is necessary because the same import may be used in multiple places.
-                    bundleInfo[entry].consumes[entryIndex].names = Array.from(new Set([...names, ...bundleInfo[entry].consumes[entryIndex].names]));
-                }
-            }
-        }
-        if (repeatedExports[safePath]?.length > 1) {
-            // Multiple entries for the same path.
-            for (const repeatedEntry of repeatedExports[safePath]) {
-                if (repeatedEntry !== entry) {
-                    bundleInfo[repeatedEntry] = bundleInfo[entry];
-                }
             }
         }
     }

package/lib/utilities/getBundleInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"getBundleInfo.js","sourceRoot":"","sources":["../../src/utilities/getBundleInfo.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleOutputFile, PackageJsonExports } from '@ms-cloudpack/common-types';\nimport { getRuntimeEntryPaths } from '@ms-cloudpack/import-map';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport type { BundleInfo } from '../types/BundleInfo.js';\nimport { getImportsAndExports } from './getImportsAndExports.js';\n/**\n * Returns a mapping from entry file path to list of paths that are produced and consumed in the searched files.\n */\nexport async function getBundleInfo(params: {\n  packagePath: string;\n  outputPath: string;\n  outputFiles: BundleOutputFile[];\n  exportsMap: PackageJsonExports;\n  isExternal: boolean;\n}): Promise<BundleInfo> {\n  const { packagePath, outputPath, outputFiles, exportsMap, isExternal } = params;\n  const bundleInfo: BundleInfo = {};\n\n  // If there are no output files, return the empty bundle info.\n  if (!outputFiles.length) {\n    return bundleInfo;\n  }\n\n  /** Mapping from output file (safe/normalized relative path) to possible entry path and exports. */\n  const outputFileInfo: Record<string, { entry: string; produces: Set<string> }> = {};\n  outputFiles.forEach((file) => {\n    // Normalize the path to start with ./ (or . for an empty path)\n    const safePath = normalizeRelativePath(file.outputPath);\n    // Store safe path to possible entry path and exports.\n    outputFileInfo[safePath] = {\n      entry: safePath,\n      produces: new Set<string>(file.exports),\n    };\n  });\n\n  const repeatedExports: Record<string, string[]> = {};\n  const entryPaths = getRuntimeEntryPaths({ packagePath, isExternal, exportsMap });\n\n  for (const [importPath, actualEntryPath] of Object.entries(entryPaths)) {\n    const safePath = normalizeRelativePath(actualEntryPath);\n\n    if (outputFileInfo[safePath]) {\n      if (repeatedExports[safePath]) {\n        repeatedExports[safePath].push(importPath);\n      } else {\n        // Change best guess entry path to exports map entry.\n        outputFileInfo[safePath].entry = importPath;\n        repeatedExports[safePath] = [importPath];\n      }\n    }\n  }\n\n  const localPathToSafe: Record<string, string> = {};\n  Object.keys(outputFileInfo).forEach((safePath) => {\n    localPathToSafe[path.resolve(outputPath, safePath)] = safePath;\n  });\n\n  const filePaths = Object.keys(localPathToSafe);\n  const visitedPaths = new Set(filePaths);\n  const pathsToParse = [...filePaths];\n\n  while (pathsToParse.length) {\n    const filePath = pathsToParse.shift();\n    // Ignore any non-JS/TS files such as SVGs and sourcemaps\n    if (!filePath || path.extname(filePath) !== '.js') {\n      continue;\n    }\n\n    const safePath = localPathToSafe[filePath];\n    if (safePath === undefined || !outputFileInfo[safePath]) {\n      throw new Error(`Found file that was not expected to be processed: ${filePath}`);\n    }\n\n    const parseResult = await getImportsAndExports(filePath, packagePath);\n    if (!parseResult) {\n      continue;\n    }\n    const { exportNames, imports, dynamicImports } = parseResult;\n\n    const { entry, produces } = outputFileInfo[safePath];\n    exportNames.forEach((name) => produces.add(name));\n\n    bundleInfo[entry] ??= {\n      bundlePath: safePath,\n      produces: Array.from(produces),\n      consumes: [],\n    };\n\n    if (dynamicImports.length) {\n      bundleInfo[entry].dynamicImports = dynamicImports;\n    }\n\n    for (const { packageName, importPath, names } of imports) {\n      if (packageName?.startsWith('.')) {\n        const localPath = path.resolve(path.dirname(filePath), packageName, importPath || '');\n\n        if (!visitedPaths.has(localPath)) {\n          visitedPaths.add(localPath);\n          pathsToParse.push(localPath);\n          localPathToSafe[localPath] = importPath;\n        }\n      } else if (packageName && !packageName.startsWith('node:')) {\n        // Find if the import is already in the consumes list.\n        const entryIndex = bundleInfo[entry].consumes.findIndex(\n          (c) => c.packageName === packageName && c.importPath === importPath,\n        );\n        if (entryIndex < 0) {\n          // If not, add it.\n          bundleInfo[entry].consumes.push({\n            packageName: packageName,\n            importPath: importPath || '.',\n            names: [...names],\n          });\n        } else {\n          // If so, add the names to the existing entry.\n          // This is necessary because the same import may be used in multiple places.\n          bundleInfo[entry].consumes[entryIndex].names = Array.from(\n            new Set([...names, ...bundleInfo[entry].consumes[entryIndex].names]),\n          );\n        }\n      }\n    }\n    if (repeatedExports[safePath]?.length > 1) {\n      // Multiple entries for the same path.\n      for (const repeatedEntry of repeatedExports[safePath]) {\n        if (repeatedEntry !== entry) {\n          bundleInfo[repeatedEntry] = bundleInfo[entry];\n        }\n      }\n    }\n  }\n\n  return bundleInfo;\n}\n"]}
+{"version":3,"file":"getBundleInfo.js","sourceRoot":"","sources":["../../src/utilities/getBundleInfo.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleOutputFile, PackageJsonExports } from '@ms-cloudpack/common-types';\nimport { getRuntimeEntryPaths } from '@ms-cloudpack/import-map';\nimport { normalizedPathRelativeTo } from '@ms-cloudpack/path-utilities';\nimport path from 'path';\nimport type { BundleEntryInfo, BundleInfo } from '../types/BundleInfo.js';\nimport { getImportsAndExports } from './getImportsAndExports.js';\n\n/**\n * Returns a mapping from entry file path (exports map key) to list of paths that are produced\n * and consumed in that file.\n */\nexport async function getBundleInfo(params: {\n  packagePath: string;\n  outputPath: string;\n  outputFiles: BundleOutputFile[];\n  exportsMap: PackageJsonExports;\n  isExternal: boolean;\n}): Promise<BundleInfo> {\n  const { packagePath, outputPath, outputFiles, exportsMap, isExternal } = params;\n  const bundleInfo: BundleInfo = {};\n\n  // If there are no output files, return the empty bundle info.\n  if (!outputFiles.length) {\n    return bundleInfo;\n  }\n\n  /** Mapping from normalized relative output file path to info about which entry paths\n   * (exports map keys) pointed to that file, and what export names it produces.\n   * Usually there's at most one entry path per output file. */\n  const outputFileInfo = Object.fromEntries(\n    outputFiles.map((file) => [\n      file.outputPath,\n      { exportsKeys: [] as string[], produces: new Set<string>(file.exports) },\n    ]),\n  );\n\n  // For each entry path (exports map key), get the normalized relative path to the output file\n  // that will be used at runtime based on conditions.\n  const entryToOutputFile = getRuntimeEntryPaths({ packagePath, isExternal, exportsMap });\n\n  // Update the output file info with the entry paths (exports keys) that point to each output file.\n  // Usually there's at most one per output file (or none if it's a shared chunk).\n  for (const [entryPath, relOutputFile] of Object.entries(entryToOutputFile)) {\n    outputFileInfo[relOutputFile]?.exportsKeys.push(entryPath);\n  }\n\n  // Build the bundle info based on imports and exports for each output file.\n  // exportsKeys are the export map key(s) that point to the output file.\n  for (const [relOutputFile, { exportsKeys, produces }] of Object.entries(outputFileInfo)) {\n    // Ignore any non-JS/TS files such as SVGs and sourcemaps\n    if (path.extname(relOutputFile) !== '.js') {\n      continue;\n    }\n\n    const absOutputFile = path.resolve(outputPath, relOutputFile);\n\n    const parseResult = await getImportsAndExports(absOutputFile, packagePath);\n    if (!parseResult) {\n      continue;\n    }\n    const { exportNames, imports, dynamicImports } = parseResult;\n\n    exportNames.forEach((name) => produces.add(name));\n\n    // Create a bundle info entry for this output file.\n    // If there wasn't an exports map key pointing to this file, just use the output path.\n    const pathsInBundleInfo = exportsKeys.length ? exportsKeys : [relOutputFile];\n    const fileBundleInfo: BundleEntryInfo = bundleInfo[pathsInBundleInfo[0]] || {\n      bundlePath: relOutputFile,\n      produces: Array.from(produces),\n      consumes: [],\n    };\n    // Use the same object for all paths that point to this file.\n    pathsInBundleInfo.forEach((p) => (bundleInfo[p] = fileBundleInfo));\n\n    if (dynamicImports.length) {\n      fileBundleInfo.dynamicImports = dynamicImports;\n    }\n\n    for (const { packageName, importPath, names } of imports) {\n      if (packageName === '.') {\n        const localPath = normalizedPathRelativeTo(outputPath, path.resolve(path.dirname(absOutputFile), importPath));\n        // Pretty sure any path in the current package which is imported in the bundle output should be\n        // in outputFiles, but make it obvious if not.\n        if (!outputFileInfo[localPath]) {\n          throw new Error(\n            `Imported local file not found in output files for ${outputPath}: ${localPath} ` +\n              `(imported from ${absOutputFile} with import path \"${importPath}\")`,\n          );\n        }\n      } else if (!packageName.startsWith('node:')) {\n        // Find if the imported package is already in the consumes list.\n        const consumesFromPackage = fileBundleInfo.consumes.find(\n          (c) => c.packageName === packageName && c.importPath === importPath,\n        );\n        if (consumesFromPackage) {\n          // If so, add the names to the existing entry.\n          // This is necessary because the same import may be used in multiple places.\n          consumesFromPackage.names = Array.from(new Set([...names, ...consumesFromPackage.names]));\n        } else {\n          // Otherwise, add it.\n          fileBundleInfo.consumes.push({\n            packageName: packageName,\n            importPath: importPath || '.',\n            names: [...names],\n          });\n        }\n      }\n    }\n  }\n\n  return bundleInfo;\n}\n"]}

package/lib/utilities/getImportsAndExports.d.ts

@@ -6,6 +6,7 @@ import type { ConsumedImport, DynamicImport } from '../types/BundleInfo.js';
 export declare function getImportsAndExports(filePath: string, packagePath?: string): Promise<{
     exportNames: Set<string>;
     imports: ConsumedImport[];
+    /** Dynamic (async) imports with non-literal paths consumed by this file. */
     dynamicImports: DynamicImport[];
 } | undefined>;
 //# sourceMappingURL=getImportsAndExports.d.ts.map

package/lib/utilities/getImportsAndExports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getImportsAndExports.d.ts","sourceRoot":"","sources":["../../src/utilities/getImportsAndExports.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAE5E;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CACN;IACE,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC,GACD,SAAS,CACZ,CAuIA"}
+{"version":3,"file":"getImportsAndExports.d.ts","sourceRoot":"","sources":["../../src/utilities/getImportsAndExports.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAE5E;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CACN;IACE,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,4EAA4E;IAC5E,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC,GACD,SAAS,CACZ,CAqIA"}

package/lib/utilities/getImportsAndExports.js

@@ -34,85 +34,86 @@ export async function getImportsAndExports(filePath, packagePath) {
     // es-module-lexer doesn't handle export * from statements correctly as it parses them as
     // imports but not as exports. We need to handle them separately.
     // TODO: Remove when https://github.com/guybedford/es-module-lexer/issues/76 is fixed
-    const exportStarImport = [];
+    const exportStarPaths = [];
     const imports = [];
     const dynamicImports = [];
     for (const imprt of new Set(rawImports)) {
-        // es-module-lexer returns entries where the "n" property equals the import source.
-        // This includes the package name and path. For example, in this case:
+        if (imprt.d === -2) {
+            continue; // -2 means import.meta, which we don't care about
+        }
+        // es-module-lexer returns objects where the "n" property is the import source,
+        // e.g. "@fluentui/react/lib/Button" for this import:
         //   import { Button } from '@fluentui/react/lib/Button';
-        // imprt.n is "@fluentui/react/lib/Button"
+        // However, "n" will be undefined for import() if isn't a plain string literal.
         let importPath = imprt.n;
         // ss and se point to the entire import string's start/end
         const importCode = source.slice(imprt.ss, imprt.se);
         // s and e point to the specificer's start/end, including quotes -- e.g. "@fluentui/react/lib/Button"
         const importSpecifier = source.slice(imprt.s, imprt.e);
-        if (!importPath) {
-            if (imprt.d === -2) {
-                continue; // -2 means import.meta, which we don't care about
-            }
-            // Currently when the import source is a backtick string, the path ("n" property) is undefined.
-            // This is a limitation in es-module-lexer.
-            if (/^`[^$`]+`$/.test(importSpecifier)) {
-                // If it's a static string which happened to use backticks for some reason, we can parse that.
-                importPath = importSpecifier.slice(1, -1);
+        // Currently when the import source is a backtick string, the path ("n" property) is undefined.
+        // This is a limitation in es-module-lexer.
+        if (/^`[^$`]+`$/.test(importSpecifier)) {
+            // If it's a static string which happened to use backticks for some reason, we can parse that.
+            importPath = importSpecifier.slice(1, -1);
+        }
+        // Handle literal paths first
+        if (importPath) {
+            // Handling `export * from` import statements
+            if (/export\s*\*\s*from/.test(importCode)) {
+                exportStarPaths.push(importPath);
             }
-            else if (packagePath) {
-                // Find the original source of the import.
-                let rawSourceMap;
-                let originalSource = null;
-                try {
-                    rawSourceMap = JSON.parse(await fsPromises.readFile(`${filePath}.map`, 'utf-8'));
-                    const consumer = await new SourceMapConsumer(rawSourceMap);
-                    const pos = getLineAndColumn(source, imprt.s);
-                    const originalPos = consumer.originalPositionFor(pos);
-                    originalSource = originalPos.source;
-                    consumer.destroy(); // Clean up the consumer
-                    if (originalSource === null) {
-                        console.debug(`Failed to find original source for import:\nFilename:${filePath}\nImport:\n  ${importCode}`);
-                    }
-                }
-                catch (err) {
-                    console.debug(`Failed to read sourcemap for import:\nFilename:${filePath}\nImport:\n  ${importCode}`, err);
-                }
-                // Original source where the import was found.
-                const absoluteImportSpecifier = originalSource
-                    ? path.resolve(path.dirname(filePath), originalSource)
-                    : filePath;
-                let packageName = '.'; // Default to local package
-                // Remove leading quote from the import specifier if it exists.
-                const lazyCleanImportSpecifier = importSpecifier.replace(/^["'`]/, '');
-                if (!lazyCleanImportSpecifier.startsWith('.')) {
-                    packageName = parseImportString(lazyCleanImportSpecifier).packageName;
-                }
-                dynamicImports.push({
-                    packageName,
-                    // Relative path from package path to file with import. Prefer original source if available.
-                    // or use the file path if original source is not available.
-                    importOrigin: normalizedPathRelativeTo(packagePath, absoluteImportSpecifier),
-                    importSpecifier,
-                });
-                continue;
+            let importedNames;
+            if (imprt.d >= 0) {
+                // This is a dynamic import. In this case we don't know which names are used, so assume all of them.
+                importedNames = ['*'];
             }
             else {
-                console.debug(`Found an import that didn't have a static path:\nFilename:${filePath}\nImport:\n  ${importCode}`);
-                continue;
+                // Parse the import string into its component parts.
+                importedNames = parseNamedImports(importCode);
             }
+            imports.push({
+                ...parseImportString(importPath),
+                names: Array.from(new Set(importedNames)),
+            });
         }
-        // Handling export * from import statements
-        if (importCode.includes('export * from')) {
-            exportStarImport.push(importPath);
+        else if (packagePath) {
+            // Non-literal path.
+            // Find the original source of the import.
+            let rawSourceMap;
+            let originalSource = null;
+            try {
+                rawSourceMap = JSON.parse(await fsPromises.readFile(`${filePath}.map`, 'utf-8'));
+                const consumer = await new SourceMapConsumer(rawSourceMap);
+                const pos = getLineAndColumn(source, imprt.s);
+                originalSource = consumer.originalPositionFor(pos).source;
+                consumer.destroy(); // Clean up the consumer
+                if (originalSource === null) {
+                    console.debug(`Failed to find original source for import:\nFilename:${filePath}\nImport:\n  ${importCode}`);
+                }
+            }
+            catch (err) {
+                console.debug(`Failed to read sourcemap for import:\nFilename:${filePath}\nImport:\n  ${importCode}`, err);
+            }
+            // Original source where the import was found.
+            const absoluteImportSpecifier = originalSource ? path.resolve(path.dirname(filePath), originalSource) : filePath;
+            // TODO: This will give a bad path for a lot of template or concatenated strings
+            let packageName = '.'; // Default to local package
+            // Remove leading quote from the import specifier if it exists.
+            const cleanImportSpecifier = importSpecifier.replace(/^["'`]/, '');
+            if (!cleanImportSpecifier.startsWith('.')) {
+                packageName = parseImportString(cleanImportSpecifier).packageName;
+            }
+            dynamicImports.push({
+                packageName,
+                // Relative path from package path to file with import. Prefer original source if available.
+                // or use the file path if original source is not available.
+                importOrigin: normalizedPathRelativeTo(packagePath, absoluteImportSpecifier),
+                importSpecifier,
+            });
         }
-        // Parse the import string into its component parts.
-        const importedNames = parseNamedImports(importCode);
-        if (imprt.d >= 0 && !importedNames.length) {
-            // This is a dynamic import. In this case we don't know which names are used, so assume all of them.
-            importedNames.push('*');
+        else {
+            console.debug(`Found an import that didn't have a static path:\nFilename:${filePath}\nImport:\n  ${importCode}`);
         }
-        imports.push({
-            ...parseImportString(importPath),
-            names: Array.from(new Set(importedNames)),
-        });
     }
     // Processing exports is cheap as we already have to parse the source.
     // Helps find exports uncaught by output files.
@@ -127,7 +128,7 @@ export async function getImportsAndExports(filePath, packagePath) {
             console.debug(`Found an export that didn't parse correctly:\nFilename: ${filePath}\nExport:\n  ${source.slice(exprt.s, exprt.e)}`);
         }
     }
-    for (const exportPath of exportStarImport) {
+    for (const exportPath of exportStarPaths) {
         // This follows the following convention: https://github.com/guybedford/es-module-lexer/issues/76#issuecomment-868561807
         exportNames.add(`*${exportPath}`);
     }

package/lib/utilities/getImportsAndExports.js.map

@@ -1 +1 @@
-{"version":3,"file":"getImportsAndExports.js","sourceRoot":"","sources":["../../src/utilities/getImportsAndExports.ts"],"names":[],"mappings":"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","sourcesContent":["import { parseImportString, parseNamedImports } from '@ms-cloudpack/path-string-parsing';\nimport { parse, type ImportSpecifier, type ExportSpecifier } from 'es-module-lexer';\nimport fsPromises from 'fs/promises';\nimport { SourceMapConsumer, type RawSourceMap } from 'source-map';\nimport path from 'path';\nimport { normalizedPathRelativeTo } from '@ms-cloudpack/path-utilities';\nimport type { ConsumedImport, DynamicImport } from '../types/BundleInfo.js';\n\n/**\n * Get info about imports and exports from a file.\n * Returns undefined if the file doesn't exist or can't be parsed.\n */\nexport async function getImportsAndExports(\n  filePath: string,\n  packagePath?: string,\n): Promise<\n  | {\n      exportNames: Set<string>;\n      imports: ConsumedImport[];\n      dynamicImports: DynamicImport[];\n    }\n  | undefined\n> {\n  let source: string;\n  try {\n    source = await fsPromises.readFile(filePath, 'utf-8');\n  } catch (err) {\n    // This could happen if a package is missing a file.\n    console.warn(`Failed to read ${filePath}:`, err);\n    return;\n  }\n\n  let rawImports: readonly ImportSpecifier[];\n  let rawExports: readonly ExportSpecifier[];\n  try {\n    // es-module-lexer/parse may return Promise in some conditions\n    // https://github.com/guybedford/es-module-lexer/issues/155\n    // eslint-disable-next-line @typescript-eslint/await-thenable\n    [rawImports, rawExports] = await parse(source);\n  } catch (err) {\n    // This could happen if the source file isn't valid JS\n    console.warn(`Failed to parse ${filePath}: ${err}\\nSource is:\\n${source}`);\n    return;\n  }\n\n  // es-module-lexer doesn't handle export * from statements correctly as it parses them as\n  // imports but not as exports. We need to handle them separately.\n  // TODO: Remove when https://github.com/guybedford/es-module-lexer/issues/76 is fixed\n  const exportStarImport = [];\n\n  const imports: ConsumedImport[] = [];\n  const dynamicImports: DynamicImport[] = [];\n  for (const imprt of new Set(rawImports)) {\n    // es-module-lexer returns entries where the \"n\" property equals the import source.\n    // This includes the package name and path. For example, in this case:\n    //   import { Button } from '@fluentui/react/lib/Button';\n    // imprt.n is \"@fluentui/react/lib/Button\"\n    let importPath = imprt.n;\n    // ss and se point to the entire import string's start/end\n    const importCode = source.slice(imprt.ss, imprt.se);\n    // s and e point to the specificer's start/end, including quotes -- e.g. \"@fluentui/react/lib/Button\"\n    const importSpecifier = source.slice(imprt.s, imprt.e);\n\n    if (!importPath) {\n      if (imprt.d === -2) {\n        continue; // -2 means import.meta, which we don't care about\n      }\n\n      // Currently when the import source is a backtick string, the path (\"n\" property) is undefined.\n      // This is a limitation in es-module-lexer.\n      if (/^`[^$`]+`$/.test(importSpecifier)) {\n        // If it's a static string which happened to use backticks for some reason, we can parse that.\n        importPath = importSpecifier.slice(1, -1);\n      } else if (packagePath) {\n        // Find the original source of the import.\n        let rawSourceMap: RawSourceMap;\n        let originalSource: string | null = null;\n        try {\n          rawSourceMap = JSON.parse(await fsPromises.readFile(`${filePath}.map`, 'utf-8')) as RawSourceMap;\n          const consumer = await new SourceMapConsumer(rawSourceMap);\n          const pos = getLineAndColumn(source, imprt.s);\n          const originalPos = consumer.originalPositionFor(pos);\n          originalSource = originalPos.source;\n          consumer.destroy(); // Clean up the consumer\n          if (originalSource === null) {\n            console.debug(`Failed to find original source for import:\\nFilename:${filePath}\\nImport:\\n  ${importCode}`);\n          }\n        } catch (err) {\n          console.debug(`Failed to read sourcemap for import:\\nFilename:${filePath}\\nImport:\\n  ${importCode}`, err);\n        }\n\n        // Original source where the import was found.\n        const absoluteImportSpecifier = originalSource\n          ? path.resolve(path.dirname(filePath), originalSource)\n          : filePath;\n\n        let packageName = '.'; // Default to local package\n        // Remove leading quote from the import specifier if it exists.\n        const lazyCleanImportSpecifier = importSpecifier.replace(/^[\"'`]/, '');\n        if (!lazyCleanImportSpecifier.startsWith('.')) {\n          packageName = parseImportString(lazyCleanImportSpecifier).packageName;\n        }\n        dynamicImports.push({\n          packageName,\n          // Relative path from package path to file with import. Prefer original source if available.\n          // or use the file path if original source is not available.\n          importOrigin: normalizedPathRelativeTo(packagePath, absoluteImportSpecifier),\n          importSpecifier,\n        });\n        continue;\n      } else {\n        console.debug(\n          `Found an import that didn't have a static path:\\nFilename:${filePath}\\nImport:\\n  ${importCode}`,\n        );\n        continue;\n      }\n    }\n\n    // Handling export * from import statements\n    if (importCode.includes('export * from')) {\n      exportStarImport.push(importPath);\n    }\n\n    // Parse the import string into its component parts.\n    const importedNames = parseNamedImports(importCode);\n    if (imprt.d >= 0 && !importedNames.length) {\n      // This is a dynamic import. In this case we don't know which names are used, so assume all of them.\n      importedNames.push('*');\n    }\n\n    imports.push({\n      ...parseImportString(importPath),\n      names: Array.from(new Set<string>(importedNames)),\n    });\n  }\n\n  // Processing exports is cheap as we already have to parse the source.\n  // Helps find exports uncaught by output files.\n  const exportNames = new Set<string>();\n  for (const exprt of rawExports) {\n    if (exprt.n) {\n      // Exports don't need to be parsed as it is\n      // already in the format we need.\n      exportNames.add(exprt.n);\n    } else {\n      console.debug(\n        `Found an export that didn't parse correctly:\\nFilename: ${filePath}\\nExport:\\n  ${source.slice(exprt.s, exprt.e)}`,\n      );\n    }\n  }\n\n  for (const exportPath of exportStarImport) {\n    // This follows the following convention: https://github.com/guybedford/es-module-lexer/issues/76#issuecomment-868561807\n    exportNames.add(`*${exportPath}`);\n  }\n\n  return { exportNames, imports, dynamicImports };\n}\n\nfunction getLineAndColumn(source: string, position: number): { line: number; column: number } {\n  let line = 1;\n  let column = 1;\n\n  for (let i = 0; i < position; i++) {\n    if (source[i] === '\\n') {\n      line++;\n      column = 1;\n    } else {\n      column++;\n    }\n  }\n\n  return { line, column };\n}\n"]}
+{"version":3,"file":"getImportsAndExports.js","sourceRoot":"","sources":["../../src/utilities/getImportsAndExports.ts"],"names":[],"mappings":"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","sourcesContent":["import { parseImportString, parseNamedImports } from '@ms-cloudpack/path-string-parsing';\nimport { parse, type ImportSpecifier, type ExportSpecifier } from 'es-module-lexer';\nimport fsPromises from 'fs/promises';\nimport { SourceMapConsumer, type RawSourceMap } from 'source-map';\nimport path from 'path';\nimport { normalizedPathRelativeTo } from '@ms-cloudpack/path-utilities';\nimport type { ConsumedImport, DynamicImport } from '../types/BundleInfo.js';\n\n/**\n * Get info about imports and exports from a file.\n * Returns undefined if the file doesn't exist or can't be parsed.\n */\nexport async function getImportsAndExports(\n  filePath: string,\n  packagePath?: string,\n): Promise<\n  | {\n      exportNames: Set<string>;\n      imports: ConsumedImport[];\n      /** Dynamic (async) imports with non-literal paths consumed by this file. */\n      dynamicImports: DynamicImport[];\n    }\n  | undefined\n> {\n  let source: string;\n  try {\n    source = await fsPromises.readFile(filePath, 'utf-8');\n  } catch (err) {\n    // This could happen if a package is missing a file.\n    console.warn(`Failed to read ${filePath}:`, err);\n    return;\n  }\n\n  let rawImports: readonly ImportSpecifier[];\n  let rawExports: readonly ExportSpecifier[];\n  try {\n    // es-module-lexer/parse may return Promise in some conditions\n    // https://github.com/guybedford/es-module-lexer/issues/155\n    // eslint-disable-next-line @typescript-eslint/await-thenable\n    [rawImports, rawExports] = await parse(source);\n  } catch (err) {\n    // This could happen if the source file isn't valid JS\n    console.warn(`Failed to parse ${filePath}: ${err}\\nSource is:\\n${source}`);\n    return;\n  }\n\n  // es-module-lexer doesn't handle export * from statements correctly as it parses them as\n  // imports but not as exports. We need to handle them separately.\n  // TODO: Remove when https://github.com/guybedford/es-module-lexer/issues/76 is fixed\n  const exportStarPaths: string[] = [];\n\n  const imports: ConsumedImport[] = [];\n  const dynamicImports: DynamicImport[] = [];\n  for (const imprt of new Set(rawImports)) {\n    if (imprt.d === -2) {\n      continue; // -2 means import.meta, which we don't care about\n    }\n\n    // es-module-lexer returns objects where the \"n\" property is the import source,\n    // e.g. \"@fluentui/react/lib/Button\" for this import:\n    //   import { Button } from '@fluentui/react/lib/Button';\n    // However, \"n\" will be undefined for import() if isn't a plain string literal.\n    let importPath = imprt.n;\n    // ss and se point to the entire import string's start/end\n    const importCode = source.slice(imprt.ss, imprt.se);\n    // s and e point to the specificer's start/end, including quotes -- e.g. \"@fluentui/react/lib/Button\"\n    const importSpecifier = source.slice(imprt.s, imprt.e);\n\n    // Currently when the import source is a backtick string, the path (\"n\" property) is undefined.\n    // This is a limitation in es-module-lexer.\n    if (/^`[^$`]+`$/.test(importSpecifier)) {\n      // If it's a static string which happened to use backticks for some reason, we can parse that.\n      importPath = importSpecifier.slice(1, -1);\n    }\n\n    // Handle literal paths first\n    if (importPath) {\n      // Handling `export * from` import statements\n      if (/export\\s*\\*\\s*from/.test(importCode)) {\n        exportStarPaths.push(importPath);\n      }\n\n      let importedNames: string[];\n      if (imprt.d >= 0) {\n        // This is a dynamic import. In this case we don't know which names are used, so assume all of them.\n        importedNames = ['*'];\n      } else {\n        // Parse the import string into its component parts.\n        importedNames = parseNamedImports(importCode);\n      }\n\n      imports.push({\n        ...parseImportString(importPath),\n        names: Array.from(new Set(importedNames)),\n      });\n    } else if (packagePath) {\n      // Non-literal path.\n      // Find the original source of the import.\n      let rawSourceMap: RawSourceMap;\n      let originalSource: string | null = null;\n      try {\n        rawSourceMap = JSON.parse(await fsPromises.readFile(`${filePath}.map`, 'utf-8')) as RawSourceMap;\n        const consumer = await new SourceMapConsumer(rawSourceMap);\n        const pos = getLineAndColumn(source, imprt.s);\n        originalSource = consumer.originalPositionFor(pos).source;\n        consumer.destroy(); // Clean up the consumer\n        if (originalSource === null) {\n          console.debug(`Failed to find original source for import:\\nFilename:${filePath}\\nImport:\\n  ${importCode}`);\n        }\n      } catch (err) {\n        console.debug(`Failed to read sourcemap for import:\\nFilename:${filePath}\\nImport:\\n  ${importCode}`, err);\n      }\n\n      // Original source where the import was found.\n      const absoluteImportSpecifier = originalSource ? path.resolve(path.dirname(filePath), originalSource) : filePath;\n\n      // TODO: This will give a bad path for a lot of template or concatenated strings\n      let packageName = '.'; // Default to local package\n      // Remove leading quote from the import specifier if it exists.\n      const cleanImportSpecifier = importSpecifier.replace(/^[\"'`]/, '');\n      if (!cleanImportSpecifier.startsWith('.')) {\n        packageName = parseImportString(cleanImportSpecifier).packageName;\n      }\n      dynamicImports.push({\n        packageName,\n        // Relative path from package path to file with import. Prefer original source if available.\n        // or use the file path if original source is not available.\n        importOrigin: normalizedPathRelativeTo(packagePath, absoluteImportSpecifier),\n        importSpecifier,\n      });\n    } else {\n      console.debug(`Found an import that didn't have a static path:\\nFilename:${filePath}\\nImport:\\n  ${importCode}`);\n    }\n  }\n\n  // Processing exports is cheap as we already have to parse the source.\n  // Helps find exports uncaught by output files.\n  const exportNames = new Set<string>();\n  for (const exprt of rawExports) {\n    if (exprt.n) {\n      // Exports don't need to be parsed as it is\n      // already in the format we need.\n      exportNames.add(exprt.n);\n    } else {\n      console.debug(\n        `Found an export that didn't parse correctly:\\nFilename: ${filePath}\\nExport:\\n  ${source.slice(exprt.s, exprt.e)}`,\n      );\n    }\n  }\n\n  for (const exportPath of exportStarPaths) {\n    // This follows the following convention: https://github.com/guybedford/es-module-lexer/issues/76#issuecomment-868561807\n    exportNames.add(`*${exportPath}`);\n  }\n\n  return { exportNames, imports, dynamicImports };\n}\n\nfunction getLineAndColumn(source: string, position: number): { line: number; column: number } {\n  let line = 1;\n  let column = 1;\n\n  for (let i = 0; i < position; i++) {\n    if (source[i] === '\\n') {\n      line++;\n      column = 1;\n    } else {\n      column++;\n    }\n  }\n\n  return { line, column };\n}\n"]}

package/lib/utilities/validateOverride.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/validateOverride.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAGnE;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,UAAU,CAAC,GAC7C,OAAO,CAAC,OAAO,CAAC,CA4DlB"}
+{"version":3,"file":"validateOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/validateOverride.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAGnE;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,UAAU,CAAC,GAC7C,OAAO,CAAC,OAAO,CAAC,CAqDlB"}

package/lib/utilities/validateOverride.js

@@ -40,10 +40,6 @@ export async function validateOverride(options, context) {
     const generatedConfig = await readGeneratedConfig(appPath);
     // Ensure packageSettings exists.
     const generatedPackageSettings = await ensureGeneratedSettingsForPackage({ packagePath: entry.path }, { config: { generated: generatedConfig }, packages });
-    if (generatedPackageSettings?.exports &&
-        generatedPackageSettings.exports[normalizeRelativePath(importPath)] === null) {
-        return true;
-    }
-    return false;
+    return (!!generatedPackageSettings?.exports && generatedPackageSettings.exports[normalizeRelativePath(importPath)] === null);
 }
 //# sourceMappingURL=validateOverride.js.map

package/lib/utilities/validateOverride.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateOverride.js","sourceRoot":"","sources":["../../src/utilities/validateOverride.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACzF,OAAO,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAGnF,OAAO,EAAE,iCAAiC,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE9F;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAAwB,EACxB,OAA8C;IAE9C,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAE3B,IAAI,UAAU,GAA4B,SAAS,CAAC;IAEpD,sEAAsE;IACtE,+EAA+E;IAC/E,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC;QACrF,UAAU,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,KAAK,GAAG,mBAAmB,CAAC;QAChC,WAAW;QACX,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,UAAU,EAAE,UAAU;KACvB,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,iBAAiB,CAC1C;QACE,WAAW,EAAE,KAAK,CAAC,IAAI;QACvB,QAAQ,EAAE,UAAU;KACrB,EACD,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CACrC,CAAC;IAEF,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAED,2CAA2C;IAC3C,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAE3D,iCAAiC;IACjC,MAAM,wBAAwB,GAAG,MAAM,iCAAiC,CACtE,EAAE,WAAW,EAAE,KAAK,CAAC,IAAI,EAAE,EAC3B,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,EAAE,QAAQ,EAAE,CACrD,CAAC;IAEF,IACE,wBAAwB,EAAE,OAAO;QAChC,wBAAwB,CAAC,OAA2D,CACnF,qBAAqB,CAAC,UAAU,CAAC,CAClC,KAAK,IAAI,EACV,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import type { PackageJson } from '@ms-cloudpack/common-types';\nimport { parseRequestInfo } from '@ms-cloudpack/import-map';\nimport { findFileInPackage, findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { makeUrl, normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport type { Context } from '../types/Context.js';\nimport type { OverrideOptions } from '../types/OverrideOptions.js';\nimport { ensureGeneratedSettingsForPackage, readGeneratedConfig } from '@ms-cloudpack/config';\n\n/**\n * Given a package name, import path, and optional issuerUrl, returns a boolean indicating if the given\n * override is valid.\n */\nexport async function validateOverride(\n  options: OverrideOptions,\n  context: Pick<Context, 'session' | 'packages'>,\n): Promise<boolean> {\n  const { packageName, importPath, issuerUrl } = options;\n  const { session, packages } = context;\n  const { config } = session;\n  const { appPath } = config;\n\n  let requiredBy: PackageJson | undefined = undefined;\n\n  // Import paths with trailing slashes are not supported by import maps\n  // in browser as they interpret the trailing slash as a wildcard partial match.\n  if (importPath.endsWith('/')) {\n    return false;\n  }\n\n  if (issuerUrl) {\n    const { packageName: name, version } = parseRequestInfo(makeUrl(issuerUrl).pathname);\n    requiredBy = { name, version };\n  }\n\n  const entry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n    definition: requiredBy,\n  });\n\n  if (!entry) {\n    return false;\n  }\n\n  const { filePath } = await findFileInPackage(\n    {\n      packagePath: entry.path,\n      filePath: importPath,\n    },\n    { packages, config: session.config },\n  );\n\n  if (filePath) {\n    return true;\n  }\n\n  // Parse the generated config if it exists.\n  const generatedConfig = await readGeneratedConfig(appPath);\n\n  // Ensure packageSettings exists.\n  const generatedPackageSettings = await ensureGeneratedSettingsForPackage(\n    { packagePath: entry.path },\n    { config: { generated: generatedConfig }, packages },\n  );\n\n  if (\n    generatedPackageSettings?.exports &&\n    (generatedPackageSettings.exports as Record<string, string | Record<string, string>>)[\n      normalizeRelativePath(importPath)\n    ] === null\n  ) {\n    return true;\n  }\n\n  return false;\n}\n"]}
+{"version":3,"file":"validateOverride.js","sourceRoot":"","sources":["../../src/utilities/validateOverride.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACzF,OAAO,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAGnF,OAAO,EAAE,iCAAiC,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE9F;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAAwB,EACxB,OAA8C;IAE9C,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAE3B,IAAI,UAAU,GAA4B,SAAS,CAAC;IAEpD,sEAAsE;IACtE,+EAA+E;IAC/E,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC;QACrF,UAAU,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,KAAK,GAAG,mBAAmB,CAAC;QAChC,WAAW;QACX,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,UAAU,EAAE,UAAU;KACvB,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,iBAAiB,CAC1C;QACE,WAAW,EAAE,KAAK,CAAC,IAAI;QACvB,QAAQ,EAAE,UAAU;KACrB,EACD,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CACrC,CAAC;IAEF,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAED,2CAA2C;IAC3C,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAE3D,iCAAiC;IACjC,MAAM,wBAAwB,GAAG,MAAM,iCAAiC,CACtE,EAAE,WAAW,EAAE,KAAK,CAAC,IAAI,EAAE,EAC3B,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,EAAE,QAAQ,EAAE,CACrD,CAAC;IAEF,OAAO,CACL,CAAC,CAAC,wBAAwB,EAAE,OAAO,IAAI,wBAAwB,CAAC,OAAO,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC,KAAK,IAAI,CACpH,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageJson } from '@ms-cloudpack/common-types';\nimport { parseRequestInfo } from '@ms-cloudpack/import-map';\nimport { findFileInPackage, findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { makeUrl, normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport type { Context } from '../types/Context.js';\nimport type { OverrideOptions } from '../types/OverrideOptions.js';\nimport { ensureGeneratedSettingsForPackage, readGeneratedConfig } from '@ms-cloudpack/config';\n\n/**\n * Given a package name, import path, and optional issuerUrl, returns a boolean indicating if the given\n * override is valid.\n */\nexport async function validateOverride(\n  options: OverrideOptions,\n  context: Pick<Context, 'session' | 'packages'>,\n): Promise<boolean> {\n  const { packageName, importPath, issuerUrl } = options;\n  const { session, packages } = context;\n  const { config } = session;\n  const { appPath } = config;\n\n  let requiredBy: PackageJson | undefined = undefined;\n\n  // Import paths with trailing slashes are not supported by import maps\n  // in browser as they interpret the trailing slash as a wildcard partial match.\n  if (importPath.endsWith('/')) {\n    return false;\n  }\n\n  if (issuerUrl) {\n    const { packageName: name, version } = parseRequestInfo(makeUrl(issuerUrl).pathname);\n    requiredBy = { name, version };\n  }\n\n  const entry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n    definition: requiredBy,\n  });\n\n  if (!entry) {\n    return false;\n  }\n\n  const { filePath } = await findFileInPackage(\n    {\n      packagePath: entry.path,\n      filePath: importPath,\n    },\n    { packages, config: session.config },\n  );\n\n  if (filePath) {\n    return true;\n  }\n\n  // Parse the generated config if it exists.\n  const generatedConfig = await readGeneratedConfig(appPath);\n\n  // Ensure packageSettings exists.\n  const generatedPackageSettings = await ensureGeneratedSettingsForPackage(\n    { packagePath: entry.path },\n    { config: { generated: generatedConfig }, packages },\n  );\n\n  return (\n    !!generatedPackageSettings?.exports && generatedPackageSettings.exports[normalizeRelativePath(importPath)] === null\n  );\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.56.6",
+  "version": "0.56.8",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -27,21 +27,21 @@
     "@lage-run/logger": "^1.3.0",
     "@lage-run/scheduler": "^1.2.1",
     "@lage-run/target-graph": "^0.9.0",
-    "@ms-cloudpack/bundler": "^0.23.16",
-    "@ms-cloudpack/common-types": "^0.23.3",
-    "@ms-cloudpack/config": "^0.32.4",
-    "@ms-cloudpack/create-express-app": "^1.10.5",
+    "@ms-cloudpack/bundler": "^0.23.18",
+    "@ms-cloudpack/common-types": "^0.23.4",
+    "@ms-cloudpack/config": "^0.33.1",
+    "@ms-cloudpack/create-express-app": "^1.10.6",
     "@ms-cloudpack/data-bus": "^0.4.2",
     "@ms-cloudpack/file-watcher": "^0.1.2",
-    "@ms-cloudpack/import-map": "^0.8.14",
+    "@ms-cloudpack/import-map": "^0.8.16",
     "@ms-cloudpack/json-utilities": "^0.1.8",
-    "@ms-cloudpack/package-hashes": "^0.7.10",
-    "@ms-cloudpack/package-utilities": "^10.2.11",
+    "@ms-cloudpack/package-hashes": "^0.7.12",
+    "@ms-cloudpack/package-utilities": "^10.4.0",
     "@ms-cloudpack/path-string-parsing": "^1.2.5",
-    "@ms-cloudpack/path-utilities": "^2.7.53",
-    "@ms-cloudpack/remote-cache": "^0.9.9",
+    "@ms-cloudpack/path-utilities": "^2.7.54",
+    "@ms-cloudpack/remote-cache": "^0.9.11",
     "@ms-cloudpack/task-reporter": "^0.14.6",
-    "@ms-cloudpack/telemetry": "^0.9.3",
+    "@ms-cloudpack/telemetry": "^0.9.5",
     "@trpc/client": "11.0.0-rc.608",
     "@trpc/server": "11.0.0-rc.608",
     "cors": "^2.8.5",