@ms-cloudpack/cli 0.39.16 → 0.40.0

package/lib/index.js

@@ -1,4 +1,4 @@
-import { PackageDefinitions, getVersion } from '@ms-cloudpack/package-utilities';
+import { getVersion } from '@ms-cloudpack/package-utilities';
 import { TaskReporter, bold, debugLoggingConfig, defaultLoggingConfig, verboseLoggingConfig, } from '@ms-cloudpack/task-reporter';
 import { Command } from 'commander';
 import glob from 'glob';
@@ -7,8 +7,9 @@ import { fileURLToPath, pathToFileURL } from 'url';
 import { initTelemetry, setSharedTelemetryAttributes } from './initTelemetry.js';
 import { PerfMarkerCliEntry } from './performance/markers.js';
 import { readConfig } from '@ms-cloudpack/config';
-const filename = fileURLToPath(import.meta.url);
-const dirname = path.dirname(filename);
+import { readJson } from '@ms-cloudpack/json-utilities';
+const currentFilePath = fileURLToPath(import.meta.url);
+const currentPath = path.dirname(currentFilePath);
 /**
  * Entry point for the cloudpack CLI.
  * Resolves all commands defined within the "./commands" folder.
@@ -41,26 +42,22 @@ export async function main(testOptions) {
         useVerboseLogging,
         telemetryConfig: config.telemetry,
     }, reporter);
-    // Make sure the package has a valid definition.
-    const definition = await PackageDefinitions.getInstance().get(appPath);
-    if (!definition) {
-        throw new Error(`There was no package.json located at "${appPath}".`);
-    }
+    const definition = (await readJson(path.join(appPath, 'package.json')));
     setSharedTelemetryAttributes({
         verb,
         arguments: argv.slice(3).join(' '),
         environment: process.env.CI || process.env.TF_BUILD ? 'ci' : 'local',
-        appName: definition.name || '<unkown>',
+        appName: definition.name || '<unknown>',
     });
     // Ensure the glob works in tests
-    const commandsGlob = `commands/*/index${path.extname(filename)}`;
-    const commands = glob.sync(commandsGlob, { cwd: dirname });
+    const commandsGlob = `commands/*/index${path.extname(currentFilePath)}`;
+    const commands = glob.sync(commandsGlob, { cwd: currentPath });
     if (!commands.length) {
         // There was an issue with the glob above not working in tests, so make sure that doesn't happen again
-        throw new Error(`No commands found under "${dirname}".`);
+        throw new Error(`No commands found under "${currentPath}".`);
     }
     for (const commandPath of commands) {
-        const commandFunction = (await import(pathToFileURL(path.join(dirname, commandPath)).toString()));
+        const commandFunction = (await import(pathToFileURL(path.join(currentPath, commandPath)).toString()));
         commandFunction.init(program, { reporter, appPath, config });
     }
     program.option('-v, --verbose', 'Show additional details about the running tasks. (default: false)');

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { PackageDefinitions, getVersion } from '@ms-cloudpack/package-utilities';\nimport {\n  TaskReporter,\n  bold,\n  debugLoggingConfig,\n  defaultLoggingConfig,\n  verboseLoggingConfig,\n} from '@ms-cloudpack/task-reporter';\nimport { Command } from 'commander';\nimport glob from 'glob';\nimport path from 'path';\nimport { fileURLToPath, pathToFileURL } from 'url';\nimport { initTelemetry, setSharedTelemetryAttributes } from './initTelemetry.js';\nimport { PerfMarkerCliEntry } from './performance/markers.js';\nimport { readConfig } from '@ms-cloudpack/config';\nimport type { CommandFunction } from './types/CommandFunction.js';\n\nconst filename = fileURLToPath(import.meta.url);\nconst dirname = path.dirname(filename);\n\n/**\n * Entry point for the cloudpack CLI.\n * Resolves all commands defined within the \"./commands\" folder.\n */\nexport async function main(testOptions?: {\n  appPath: string;\n  argv: string[];\n  reporter: TaskReporter;\n  preParseOverrides?: (program: Command) => void;\n}) {\n  performance.mark(PerfMarkerCliEntry);\n\n  const argv = testOptions?.argv || process.argv;\n  const appPath = testOptions?.appPath || process.cwd();\n  const reporter = testOptions?.reporter || new TaskReporter();\n  const config = await readConfig(appPath);\n\n  const program = new Command();\n  const plainTextMode = argv.includes('--no-color') || argv.includes('-n');\n  const version = getVersion(import.meta.url);\n  const useDebugLogging = argv.includes('--debug') || argv.includes('-d');\n  const verb = argv[2];\n  const useVerboseLogging = argv.includes('--verbose') || argv.includes('-v') || verb === 'bundle';\n\n  program.name('cloudpack').version(version).usage('<command> [options]');\n\n  reporter.setOptions({\n    productName: 'Cloudpack',\n    version,\n    plainTextMode,\n    description: () => `Running \"${bold(argv.slice(2).join(' '))}\"`,\n    helpMessage: config.helpMessage,\n    ...defaultLoggingConfig,\n    ...(useVerboseLogging && verboseLoggingConfig),\n    ...(useDebugLogging && debugLoggingConfig),\n  });\n\n  await initTelemetry(\n    {\n      useDebugLogging,\n      useVerboseLogging,\n      telemetryConfig: config.telemetry,\n    },\n    reporter,\n  );\n\n  // Make sure the package has a valid definition.\n  const definition = await PackageDefinitions.getInstance().get(appPath);\n\n  if (!definition) {\n    throw new Error(`There was no package.json located at \"${appPath}\".`);\n  }\n\n  setSharedTelemetryAttributes({\n    verb,\n    arguments: argv.slice(3).join(' '),\n    environment: process.env.CI || process.env.TF_BUILD ? 'ci' : 'local',\n    appName: definition.name || '<unkown>',\n  });\n\n  // Ensure the glob works in tests\n  const commandsGlob = `commands/*/index${path.extname(filename)}`;\n  const commands = glob.sync(commandsGlob, { cwd: dirname });\n  if (!commands.length) {\n    // There was an issue with the glob above not working in tests, so make sure that doesn't happen again\n    throw new Error(`No commands found under \"${dirname}\".`);\n  }\n\n  for (const commandPath of commands) {\n    const commandFunction = (await import(pathToFileURL(path.join(dirname, commandPath)).toString())) as {\n      init: CommandFunction;\n    };\n\n    commandFunction.init(program, { reporter, appPath, config });\n  }\n\n  program.option('-v, --verbose', 'Show additional details about the running tasks. (default: false)');\n  program.option('-d, --debug', 'Show debug information (superset of --verbose). (default: false)');\n  program.option('-n, --no-color', 'Disable colors in the output. (default: false)');\n\n  testOptions?.preParseOverrides?.(program);\n\n  await program.parseAsync(argv);\n\n  if (program.args.length === 0) {\n    program.help();\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { getVersion } from '@ms-cloudpack/package-utilities';\nimport {\n  TaskReporter,\n  bold,\n  debugLoggingConfig,\n  defaultLoggingConfig,\n  verboseLoggingConfig,\n} from '@ms-cloudpack/task-reporter';\nimport { Command } from 'commander';\nimport glob from 'glob';\nimport path from 'path';\nimport { fileURLToPath, pathToFileURL } from 'url';\nimport { initTelemetry, setSharedTelemetryAttributes } from './initTelemetry.js';\nimport { PerfMarkerCliEntry } from './performance/markers.js';\nimport { readConfig } from '@ms-cloudpack/config';\nimport type { CommandFunction } from './types/CommandFunction.js';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\n\nconst currentFilePath = fileURLToPath(import.meta.url);\nconst currentPath = path.dirname(currentFilePath);\n\n/**\n * Entry point for the cloudpack CLI.\n * Resolves all commands defined within the \"./commands\" folder.\n */\nexport async function main(testOptions?: {\n  appPath: string;\n  argv: string[];\n  reporter: TaskReporter;\n  preParseOverrides?: (program: Command) => void;\n}) {\n  performance.mark(PerfMarkerCliEntry);\n\n  const argv = testOptions?.argv || process.argv;\n  const appPath = testOptions?.appPath || process.cwd();\n  const reporter = testOptions?.reporter || new TaskReporter();\n  const config = await readConfig(appPath);\n\n  const program = new Command();\n  const plainTextMode = argv.includes('--no-color') || argv.includes('-n');\n  const version = getVersion(import.meta.url);\n  const useDebugLogging = argv.includes('--debug') || argv.includes('-d');\n  const verb = argv[2];\n  const useVerboseLogging = argv.includes('--verbose') || argv.includes('-v') || verb === 'bundle';\n\n  program.name('cloudpack').version(version).usage('<command> [options]');\n\n  reporter.setOptions({\n    productName: 'Cloudpack',\n    version,\n    plainTextMode,\n    description: () => `Running \"${bold(argv.slice(2).join(' '))}\"`,\n    helpMessage: config.helpMessage,\n    ...defaultLoggingConfig,\n    ...(useVerboseLogging && verboseLoggingConfig),\n    ...(useDebugLogging && debugLoggingConfig),\n  });\n\n  await initTelemetry(\n    {\n      useDebugLogging,\n      useVerboseLogging,\n      telemetryConfig: config.telemetry,\n    },\n    reporter,\n  );\n\n  const definition = (await readJson(path.join(appPath, 'package.json'))) as PackageJson;\n\n  setSharedTelemetryAttributes({\n    verb,\n    arguments: argv.slice(3).join(' '),\n    environment: process.env.CI || process.env.TF_BUILD ? 'ci' : 'local',\n    appName: definition.name || '<unknown>',\n  });\n\n  // Ensure the glob works in tests\n  const commandsGlob = `commands/*/index${path.extname(currentFilePath)}`;\n  const commands = glob.sync(commandsGlob, { cwd: currentPath });\n  if (!commands.length) {\n    // There was an issue with the glob above not working in tests, so make sure that doesn't happen again\n    throw new Error(`No commands found under \"${currentPath}\".`);\n  }\n\n  for (const commandPath of commands) {\n    const commandFunction = (await import(pathToFileURL(path.join(currentPath, commandPath)).toString())) as {\n      init: CommandFunction;\n    };\n\n    commandFunction.init(program, { reporter, appPath, config });\n  }\n\n  program.option('-v, --verbose', 'Show additional details about the running tasks. (default: false)');\n  program.option('-d, --debug', 'Show debug information (superset of --verbose). (default: false)');\n  program.option('-n, --no-color', 'Disable colors in the output. (default: false)');\n\n  testOptions?.preParseOverrides?.(program);\n\n  await program.parseAsync(argv);\n\n  if (program.args.length === 0) {\n    program.help();\n  }\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"bundleTask.d.ts","sourceRoot":"","sources":["../../src/tasks/bundleTask.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,YAAY,EAElB,MAAM,6BAA6B,CAAC;AAIrC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAM/D,wBAAsB,UAAU,CAAC,EAC/B,aAAa,EACb,OAAY,EACZ,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB,0BAwDA"}
+{"version":3,"file":"bundleTask.d.ts","sourceRoot":"","sources":["../../src/tasks/bundleTask.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,YAAY,EAElB,MAAM,6BAA6B,CAAC;AAIrC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAO/D,wBAAsB,UAAU,CAAC,EAC/B,aAAa,EACb,OAAY,EACZ,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB,0BAwDA"}

package/lib/tasks/bundleTask.js

@@ -8,6 +8,7 @@ import { prepareOutputPath } from '../common/prepareOutputPath.js';
 import { formatBundleErrors } from './formatBundleErrors.js';
 import { getFileSizeSync } from './getFileSizeSync.js';
 import { hashPackage } from './hashPackage.js';
+import { getPackageSettings } from '@ms-cloudpack/config';
 export async function bundleTask({ bundleRequest, options = {}, reporter, }) {
     const { packageName, version } = bundleRequest;
     const { force } = options || {};
@@ -20,10 +21,10 @@ export async function bundleTask({ bundleRequest, options = {}, reporter, }) {
         else {
             await bundle(bundleRequest, force);
         }
-        const result = (bundleRequest.result || (bundleRequest.result = {}));
-        result.outputFiles || (result.outputFiles = []);
-        result.errors || (result.errors = []);
-        result.warnings || (result.warnings = []);
+        const result = (bundleRequest.result ??= {});
+        result.outputFiles ??= [];
+        result.errors ??= [];
+        result.warnings ??= [];
         if (!result.outputFiles.length) {
             result.warnings.push({
                 text: `No output files were found for "${packageName}" in "${bundleRequest.outputPath}"`,
@@ -55,6 +56,8 @@ export async function bundleTask({ bundleRequest, options = {}, reporter, }) {
     return bundleRequest;
 }
 async function bundle(bundleRequest, force) {
+    const { packages, config } = bundleRequest;
+    const context = { packages, config };
     // If force is set, dispose the existing result.
     if (force && bundleRequest?.result?.dispose) {
         bundleRequest.result.dispose();
@@ -65,14 +68,20 @@ async function bundle(bundleRequest, force) {
     if ((isExternal || enableCacheInternalPackages) && !force) {
         bundleRequest.result = await readJson(path.join(outputPath, 'result.json'));
     }
+    const { bundlerType, bundlerOptions } = getPackageSettings({
+        name: bundleRequest.packageName,
+        version: bundleRequest.version,
+        config,
+    }) || {};
     const bundleOptions = {
+        bundlerType,
+        overrideOptions: bundlerOptions,
         inputPath: packagePath,
         outputPath,
         incremental: !isExternal,
-        packages: bundleRequest.packages,
         sourcemap: disableSourceMaps ? undefined : 'linked',
-        entries: await getEntriesMapFromPackage({ inputPath: packagePath, packages: bundleRequest.packages }),
-        external: await getExternalsFromPackage({ inputPath: packagePath, packages: bundleRequest.packages }),
+        entries: await getEntriesMapFromPackage({ inputPath: packagePath }, context),
+        external: await getExternalsFromPackage({ inputPath: packagePath }, context),
     };
     const hash = !isExternal && enableCacheInternalPackages
         ? await hashPackage({ packagePath, isExternal, additionalProperties: bundleOptions })

package/lib/tasks/bundleTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundleTask.js","sourceRoot":"","sources":["../../src/tasks/bundleTask.ts"],"names":[],"mappings":"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","sourcesContent":["import { bundle as bundleInternal, getEntriesMapFromPackage, getExternalsFromPackage } from '@ms-cloudpack/bundler';\nimport { readJson, writeJson } from '@ms-cloudpack/json-utilities';\nimport { safeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport {\n  bulletedList,\n  formatPackageName,\n  type TaskReporter,\n  type TaskReporterTaskResult,\n} from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport { findImports } from '../commands/init/findImports.js';\nimport { prepareOutputPath } from '../common/prepareOutputPath.js';\nimport type { BundleTaskOptions } from '../types/BundleTaskOptions.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport { formatBundleErrors } from './formatBundleErrors.js';\nimport { getFileSizeSync } from './getFileSizeSync.js';\nimport { hashPackage } from './hashPackage.js';\nimport type { BundleOptions } from '@ms-cloudpack/bundler-types';\n\nexport async function bundleTask({\n  bundleRequest,\n  options = {},\n  reporter,\n}: {\n  bundleRequest: BundleRequest;\n  options?: BundleTaskOptions;\n  reporter?: TaskReporter;\n}) {\n  const { packageName, version } = bundleRequest;\n  const { force } = options || {};\n\n  const { rebuild } = bundleRequest?.result || {};\n  const taskName = `${rebuild ? `Re-bundle` : `Bundle`} ${formatPackageName({ name: packageName, version })}`;\n\n  const executeBundle = async (): Promise<TaskReporterTaskResult> => {\n    if (rebuild) {\n      bundleRequest.result = await rebuild();\n    } else {\n      await bundle(bundleRequest, force);\n    }\n\n    const result = (bundleRequest.result ||= {});\n\n    result.outputFiles ||= [];\n    result.errors ||= [];\n    result.warnings ||= [];\n\n    if (!result.outputFiles.length) {\n      result.warnings.push({\n        text: `No output files were found for \"${packageName}\" in \"${bundleRequest.outputPath}\"`,\n      });\n    }\n\n    return {\n      status: result.errors.length ? 'fail' : 'complete',\n      ...(result.errors?.length\n        ? formatBundleErrors(result.errors)\n        : {\n            details: bulletedList([\n              `Package: ${bundleRequest.packageName}@${bundleRequest.version}`,\n              `Bundler: ${bundleRequest.result?.bundlerName || 'unknown'}`,\n              `Input path: ${bundleRequest.packagePath}`,\n              `Entries:`,\n              Object.values(bundleRequest.result?.entries || {}),\n              `Output path: ${bundleRequest.outputPath}`,\n              bundleRequest.result?.outputFiles?.map(\n                (file) =>\n                  `${safeRelativePath(path.relative(bundleRequest.outputPath, file.outputPath))} (${getFileSizeSync(\n                    file.outputPath,\n                  )})`,\n              ),\n            ]),\n          }),\n    };\n  };\n\n  if (reporter) {\n    await reporter.runTask(taskName, executeBundle);\n  } else {\n    await executeBundle();\n  }\n\n  return bundleRequest;\n}\n\nasync function bundle(bundleRequest: BundleRequest, force?: boolean): Promise<BundleRequest> {\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, outputPath, isExternal, disableSourceMaps, enableFindImports, enableCacheInternalPackages } =\n    bundleRequest;\n\n  // Rehydrate the result if not incremental.\n  if ((isExternal || enableCacheInternalPackages) && !force) {\n    bundleRequest.result = await readJson(path.join(outputPath, 'result.json'));\n  }\n\n  const bundleOptions: BundleOptions = {\n    inputPath: packagePath,\n    outputPath,\n    incremental: !isExternal,\n    packages: bundleRequest.packages,\n    sourcemap: disableSourceMaps ? undefined : 'linked',\n    entries: await getEntriesMapFromPackage({ inputPath: packagePath, packages: bundleRequest.packages }),\n    external: await getExternalsFromPackage({ inputPath: packagePath, packages: bundleRequest.packages }),\n  };\n\n  const hash =\n    !isExternal && enableCacheInternalPackages\n      ? await hashPackage({ packagePath, isExternal, additionalProperties: bundleOptions })\n      : undefined;\n\n  if (\n    bundleRequest.result?.errors?.length === 0 &&\n    // Dependencies are undefined if the older version of bundleTask was used to bundle the package.\n    // In this case, we need to bundle it again with the new version to have dependencies defined in the result.json.\n    (!enableFindImports || !!bundleRequest.result?.dependencies) &&\n    // Internal packages should be re-bundled if the package hash has changed.\n    (isExternal || (enableCacheInternalPackages && bundleRequest.result.hash === hash))\n  ) {\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    bundleRequest.result = await bundleInternal(bundleOptions);\n    bundleRequest.result.hash = hash;\n\n    if (enableFindImports) {\n      // Find imports that are in the output files and set dependencies.\n      const outputFilePaths = bundleRequest.result.outputFiles?.map((f) => f.outputPath);\n      const imports = outputFilePaths && (await findImports(outputFilePaths));\n      bundleRequest.result.dependencies = imports && Object.keys(imports);\n    }\n\n    // Write the result to disk.\n    if (isExternal || enableCacheInternalPackages) {\n      bundleRequest.result.rawInput = bundleRequest.result.rawOutput = undefined;\n      await writeJson(path.join(outputPath, 'result.json'), bundleRequest.result);\n    }\n  }\n\n  return bundleRequest;\n}\n"]}
+{"version":3,"file":"bundleTask.js","sourceRoot":"","sources":["../../src/tasks/bundleTask.ts"],"names":[],"mappings":"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","sourcesContent":["import { bundle as bundleInternal, getEntriesMapFromPackage, getExternalsFromPackage } from '@ms-cloudpack/bundler';\nimport { readJson, writeJson } from '@ms-cloudpack/json-utilities';\nimport { safeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport {\n  bulletedList,\n  formatPackageName,\n  type TaskReporter,\n  type TaskReporterTaskResult,\n} from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport { findImports } from '../commands/init/findImports.js';\nimport { prepareOutputPath } from '../common/prepareOutputPath.js';\nimport type { BundleTaskOptions } from '../types/BundleTaskOptions.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport { formatBundleErrors } from './formatBundleErrors.js';\nimport { getFileSizeSync } from './getFileSizeSync.js';\nimport { hashPackage } from './hashPackage.js';\nimport type { BundleOptions } from '@ms-cloudpack/bundler-types';\nimport { getPackageSettings } from '@ms-cloudpack/config';\n\nexport async function bundleTask({\n  bundleRequest,\n  options = {},\n  reporter,\n}: {\n  bundleRequest: BundleRequest;\n  options?: BundleTaskOptions;\n  reporter?: TaskReporter;\n}) {\n  const { packageName, version } = bundleRequest;\n  const { force } = options || {};\n\n  const { rebuild } = bundleRequest?.result || {};\n  const taskName = `${rebuild ? `Re-bundle` : `Bundle`} ${formatPackageName({ name: packageName, version })}`;\n\n  const executeBundle = async (): Promise<TaskReporterTaskResult> => {\n    if (rebuild) {\n      bundleRequest.result = await rebuild();\n    } else {\n      await bundle(bundleRequest, force);\n    }\n\n    const result = (bundleRequest.result ??= {});\n\n    result.outputFiles ??= [];\n    result.errors ??= [];\n    result.warnings ??= [];\n\n    if (!result.outputFiles.length) {\n      result.warnings.push({\n        text: `No output files were found for \"${packageName}\" in \"${bundleRequest.outputPath}\"`,\n      });\n    }\n\n    return {\n      status: result.errors.length ? 'fail' : 'complete',\n      ...(result.errors?.length\n        ? formatBundleErrors(result.errors)\n        : {\n            details: bulletedList([\n              `Package: ${bundleRequest.packageName}@${bundleRequest.version}`,\n              `Bundler: ${bundleRequest.result?.bundlerName || 'unknown'}`,\n              `Input path: ${bundleRequest.packagePath}`,\n              `Entries:`,\n              Object.values(bundleRequest.result?.entries || {}),\n              `Output path: ${bundleRequest.outputPath}`,\n              bundleRequest.result?.outputFiles?.map(\n                (file) =>\n                  `${safeRelativePath(path.relative(bundleRequest.outputPath, file.outputPath))} (${getFileSizeSync(\n                    file.outputPath,\n                  )})`,\n              ),\n            ]),\n          }),\n    };\n  };\n\n  if (reporter) {\n    await reporter.runTask(taskName, executeBundle);\n  } else {\n    await executeBundle();\n  }\n\n  return bundleRequest;\n}\n\nasync function bundle(bundleRequest: BundleRequest, force?: boolean): Promise<BundleRequest> {\n  const { packages, config } = bundleRequest;\n  const context = { packages, config };\n\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, outputPath, isExternal, disableSourceMaps, enableFindImports, enableCacheInternalPackages } =\n    bundleRequest;\n\n  // Rehydrate the result if not incremental.\n  if ((isExternal || enableCacheInternalPackages) && !force) {\n    bundleRequest.result = await readJson(path.join(outputPath, 'result.json'));\n  }\n\n  const { bundlerType, bundlerOptions } =\n    getPackageSettings({\n      name: bundleRequest.packageName,\n      version: bundleRequest.version,\n      config,\n    }) || {};\n  const bundleOptions: BundleOptions = {\n    bundlerType,\n    overrideOptions: bundlerOptions,\n    inputPath: packagePath,\n    outputPath,\n    incremental: !isExternal,\n    sourcemap: disableSourceMaps ? undefined : 'linked',\n    entries: await getEntriesMapFromPackage({ inputPath: packagePath }, context),\n    external: await getExternalsFromPackage({ inputPath: packagePath }, context),\n  };\n\n  const hash =\n    !isExternal && enableCacheInternalPackages\n      ? await hashPackage({ packagePath, isExternal, additionalProperties: bundleOptions })\n      : undefined;\n\n  if (\n    bundleRequest.result?.errors?.length === 0 &&\n    // Dependencies are undefined if the older version of bundleTask was used to bundle the package.\n    // In this case, we need to bundle it again with the new version to have dependencies defined in the result.json.\n    (!enableFindImports || !!bundleRequest.result?.dependencies) &&\n    // Internal packages should be re-bundled if the package hash has changed.\n    (isExternal || (enableCacheInternalPackages && bundleRequest.result.hash === hash))\n  ) {\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    bundleRequest.result = await bundleInternal(bundleOptions);\n    bundleRequest.result.hash = hash;\n\n    if (enableFindImports) {\n      // Find imports that are in the output files and set dependencies.\n      const outputFilePaths = bundleRequest.result.outputFiles?.map((f) => f.outputPath);\n      const imports = outputFilePaths && (await findImports(outputFilePaths));\n      bundleRequest.result.dependencies = imports && Object.keys(imports);\n    }\n\n    // Write the result to disk.\n    if (isExternal || enableCacheInternalPackages) {\n      bundleRequest.result.rawInput = bundleRequest.result.rawOutput = undefined;\n      await writeJson(path.join(outputPath, 'result.json'), bundleRequest.result);\n    }\n  }\n\n  return bundleRequest;\n}\n"]}

package/lib/tasks/resolveDependenciesTask.d.ts

@@ -1,12 +1,16 @@
-import { type ResolveMap, type PackageDefinitions } from '@ms-cloudpack/package-utilities';
-import type { TaskContext } from '../types/TaskContext.js';
+import { type ResolveMap } from '@ms-cloudpack/package-utilities';
+import { type TaskReporter } from '@ms-cloudpack/task-reporter';
+import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
 /**
  * Resolves the locations of dependencies and returns the resolve map, logging results
  * to the task reporter.
  */
 export declare function resolveDependenciesTask(options: {
+    appPath: string;
     additionalPaths?: string[];
     linkedPaths?: string[];
-    packages?: PackageDefinitions;
-}, context: TaskContext): Promise<ResolveMap>;
+}, context: {
+    reporter: TaskReporter;
+    packages: PackageDefinitionsCache;
+}): Promise<ResolveMap>;
 //# sourceMappingURL=resolveDependenciesTask.d.ts.map

package/lib/tasks/resolveDependenciesTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveDependenciesTask.d.ts","sourceRoot":"","sources":["../../src/tasks/resolveDependenciesTask.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EAGf,KAAK,kBAAkB,EACxB,MAAM,iCAAiC,CAAC;AAGzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE;IACP,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B,EACD,OAAO,EAAE,WAAW,uBAsCrB"}
+{"version":3,"file":"resolveDependenciesTask.d.ts","sourceRoot":"","sources":["../../src/tasks/resolveDependenciesTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAA0C,MAAM,iCAAiC,CAAC;AAC1G,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAElG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,EACD,OAAO,EAAE;IAAE,QAAQ,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,uBAAuB,CAAA;CAAE,uBA0CvE"}

package/lib/tasks/resolveDependenciesTask.js

@@ -1,4 +1,4 @@
-import { createResolveMap, } from '@ms-cloudpack/package-utilities';
+import { createResolveMap } from '@ms-cloudpack/package-utilities';
 import { cyan, yellow, bulletedList, bold } from '@ms-cloudpack/task-reporter';
 import { PerfMarkerCliEntry, PerfMeasurementTimeToResolveDependencies } from '../performance/markers.js';
 /**
@@ -6,8 +6,8 @@ import { PerfMarkerCliEntry, PerfMeasurementTimeToResolveDependencies } from '..
  * to the task reporter.
  */
 export async function resolveDependenciesTask(options, context) {
-    const { additionalPaths, linkedPaths, packages } = options;
-    const { reporter, appPath } = context;
+    const { appPath, additionalPaths, linkedPaths } = options;
+    const { reporter, packages } = context;
     let resolveMap;
     if (performance.getEntriesByName(PerfMarkerCliEntry).length) {
         performance.measure(PerfMeasurementTimeToResolveDependencies, PerfMarkerCliEntry);
@@ -19,6 +19,7 @@ export async function resolveDependenciesTask(options, context) {
             additionalPaths,
             linkedPaths,
             useStrictVersioning: false,
+        }, {
             packages,
         });
         const { allPackages, duplicatedPackages } = getPackagesFromResolveMap(resolveMap);

package/lib/tasks/resolveDependenciesTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveDependenciesTask.js","sourceRoot":"","sources":["../../src/tasks/resolveDependenciesTask.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type ResolveMap,\n  createResolveMap,\n  type ResolveMapEntry,\n  type PackageDefinitions,\n} from '@ms-cloudpack/package-utilities';\nimport { cyan, yellow, bulletedList, bold } from '@ms-cloudpack/task-reporter';\nimport { PerfMarkerCliEntry, PerfMeasurementTimeToResolveDependencies } from '../performance/markers.js';\nimport type { TaskContext } from '../types/TaskContext.js';\n\n/**\n * Resolves the locations of dependencies and returns the resolve map, logging results\n * to the task reporter.\n */\nexport async function resolveDependenciesTask(\n  options: {\n    additionalPaths?: string[];\n    linkedPaths?: string[];\n    packages?: PackageDefinitions;\n  },\n  context: TaskContext,\n) {\n  const { additionalPaths, linkedPaths, packages } = options;\n  const { reporter, appPath } = context;\n  let resolveMap: ResolveMap | undefined;\n\n  if (performance.getEntriesByName(PerfMarkerCliEntry).length) {\n    performance.measure(PerfMeasurementTimeToResolveDependencies, PerfMarkerCliEntry);\n  }\n  // Grab the installed dependency locations.\n  await reporter.runTask('Resolving dependencies', async () => {\n    resolveMap = await createResolveMap({\n      appPath,\n      additionalPaths,\n      linkedPaths,\n      useStrictVersioning: false,\n      packages,\n    });\n\n    const { allPackages, duplicatedPackages } = getPackagesFromResolveMap(resolveMap);\n    const message = `Found ${cyan(allPackages.size)} total packages, ${\n      duplicatedPackages.size ? `${yellow(duplicatedPackages.size)} with multiple versions.` : `no duplicates.`\n    }`;\n    const extended = bulletedList(\n      Array.from(duplicatedPackages.entries()).map(\n        ([name, versions]) => `${bold(name)}: ${Array.from(versions).join(', ')}`,\n      ),\n    );\n\n    return {\n      message,\n      extended,\n      forceShow: true,\n    };\n  });\n\n  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- will be defined after the task runs\n  return resolveMap!;\n}\n\n/**\n * Given a resolveMap, returns a map of all packages and a map of packages with multiple versions.\n * This is used to log the results of the resolve task.\n */\nfunction getPackagesFromResolveMap(resolveMap: ResolveMap) {\n  const allPackages = new Map<string, ResolveMapEntry>();\n  const duplicatedPackages = new Map<string, Set<string>>();\n\n  function addEntry(entry: ResolveMapEntry) {\n    if (allPackages.has(entry.name)) {\n      if (!duplicatedPackages.has(entry.name)) {\n        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n        duplicatedPackages.set(entry.name, new Set([allPackages.get(entry.name)!.version]));\n      }\n      const dupeSet = duplicatedPackages.get(entry.name);\n\n      dupeSet?.add(entry.version);\n    } else {\n      allPackages.set(entry.name, entry);\n    }\n  }\n\n  for (const currentEntry of Object.values(resolveMap)) {\n    addEntry(currentEntry);\n\n    if (currentEntry.scopedVersions) {\n      for (const scopedEntry of Object.values(currentEntry.scopedVersions)) {\n        addEntry(scopedEntry);\n      }\n    }\n  }\n\n  return {\n    allPackages,\n    duplicatedPackages,\n  };\n}\n"]}
+{"version":3,"file":"resolveDependenciesTask.js","sourceRoot":"","sources":["../../src/tasks/resolveDependenciesTask.ts"],"names":[],"mappings":"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","sourcesContent":["import { type ResolveMap, createResolveMap, type ResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { cyan, yellow, bulletedList, bold, type TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { PerfMarkerCliEntry, PerfMeasurementTimeToResolveDependencies } from '../performance/markers.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\n/**\n * Resolves the locations of dependencies and returns the resolve map, logging results\n * to the task reporter.\n */\nexport async function resolveDependenciesTask(\n  options: {\n    appPath: string;\n    additionalPaths?: string[];\n    linkedPaths?: string[];\n  },\n  context: { reporter: TaskReporter; packages: PackageDefinitionsCache },\n) {\n  const { appPath, additionalPaths, linkedPaths } = options;\n  const { reporter, packages } = context;\n  let resolveMap: ResolveMap | undefined;\n\n  if (performance.getEntriesByName(PerfMarkerCliEntry).length) {\n    performance.measure(PerfMeasurementTimeToResolveDependencies, PerfMarkerCliEntry);\n  }\n  // Grab the installed dependency locations.\n  await reporter.runTask('Resolving dependencies', async () => {\n    resolveMap = await createResolveMap(\n      {\n        appPath,\n        additionalPaths,\n        linkedPaths,\n        useStrictVersioning: false,\n      },\n      {\n        packages,\n      },\n    );\n\n    const { allPackages, duplicatedPackages } = getPackagesFromResolveMap(resolveMap);\n    const message = `Found ${cyan(allPackages.size)} total packages, ${\n      duplicatedPackages.size ? `${yellow(duplicatedPackages.size)} with multiple versions.` : `no duplicates.`\n    }`;\n    const extended = bulletedList(\n      Array.from(duplicatedPackages.entries()).map(\n        ([name, versions]) => `${bold(name)}: ${Array.from(versions).join(', ')}`,\n      ),\n    );\n\n    return {\n      message,\n      extended,\n      forceShow: true,\n    };\n  });\n\n  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- will be defined after the task runs\n  return resolveMap!;\n}\n\n/**\n * Given a resolveMap, returns a map of all packages and a map of packages with multiple versions.\n * This is used to log the results of the resolve task.\n */\nfunction getPackagesFromResolveMap(resolveMap: ResolveMap) {\n  const allPackages = new Map<string, ResolveMapEntry>();\n  const duplicatedPackages = new Map<string, Set<string>>();\n\n  function addEntry(entry: ResolveMapEntry) {\n    if (allPackages.has(entry.name)) {\n      if (!duplicatedPackages.has(entry.name)) {\n        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n        duplicatedPackages.set(entry.name, new Set([allPackages.get(entry.name)!.version]));\n      }\n      const dupeSet = duplicatedPackages.get(entry.name);\n\n      dupeSet?.add(entry.version);\n    } else {\n      allPackages.set(entry.name, entry);\n    }\n  }\n\n  for (const currentEntry of Object.values(resolveMap)) {\n    addEntry(currentEntry);\n\n    if (currentEntry.scopedVersions) {\n      for (const scopedEntry of Object.values(currentEntry.scopedVersions)) {\n        addEntry(scopedEntry);\n      }\n    }\n  }\n\n  return {\n    allPackages,\n    duplicatedPackages,\n  };\n}\n"]}

package/lib/types/BundleRequest.d.ts

@@ -1,4 +1,5 @@
 import type { BundleResult, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
+import type { CloudpackConfig } from '@ms-cloudpack/config';
 /**
  * Tracks a given bundle request and its result.
  */
@@ -19,6 +20,7 @@ export interface BundleRequest {
     disableSourceMaps?: boolean;
     enableFindImports?: boolean;
     enableCacheInternalPackages?: boolean;
-    packages?: PackageDefinitionsCache;
+    packages: PackageDefinitionsCache;
+    config: CloudpackConfig;
 }
 //# sourceMappingURL=BundleRequest.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"BundleRequest.d.ts","sourceRoot":"","sources":["../../src/types/BundleRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAEzF;;GAEG;AAEH,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,YAAY,GAAG;QAAE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnE,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,QAAQ,CAAC,EAAE,uBAAuB,CAAC;CACpC"}
+{"version":3,"file":"BundleRequest.d.ts","sourceRoot":"","sources":["../../src/types/BundleRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACzF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;GAEG;AAEH,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,YAAY,GAAG;QAAE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnE,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,QAAQ,EAAE,uBAAuB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;CACzB"}

package/lib/types/BundleRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"BundleRequest.js","sourceRoot":"","sources":["../../src/types/BundleRequest.ts"],"names":[],"mappings":"","sourcesContent":["import type { BundleResult, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\n/**\n * Tracks a given bundle request and its result.\n */\n\nexport interface BundleRequest {\n  id: string;\n  packageName: string;\n  version: string;\n  packagePath: string;\n  outputPath: string;\n  isExternal: boolean;\n  bundlerType?: string;\n  result?: BundleResult & { dependencies?: string[]; hash?: string };\n  resultFromCache?: boolean;\n  isRebuildRequired?: boolean;\n  disableSourceMaps?: boolean;\n  enableFindImports?: boolean;\n  enableCacheInternalPackages?: boolean;\n  packages?: PackageDefinitionsCache;\n}\n"]}
+{"version":3,"file":"BundleRequest.js","sourceRoot":"","sources":["../../src/types/BundleRequest.ts"],"names":[],"mappings":"","sourcesContent":["import type { BundleResult, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\n/**\n * Tracks a given bundle request and its result.\n */\n\nexport interface BundleRequest {\n  id: string;\n  packageName: string;\n  version: string;\n  packagePath: string;\n  outputPath: string;\n  isExternal: boolean;\n  bundlerType?: string;\n  result?: BundleResult & { dependencies?: string[]; hash?: string };\n  resultFromCache?: boolean;\n  isRebuildRequired?: boolean;\n  disableSourceMaps?: boolean;\n  enableFindImports?: boolean;\n  enableCacheInternalPackages?: boolean;\n  packages: PackageDefinitionsCache;\n  config: CloudpackConfig;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.39.16",
+  "version": "0.40.0",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -10,18 +10,18 @@
     "cloudpack": "./bin/cloudpack.js"
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.6.20",
-    "@ms-cloudpack/bundler": "^0.13.3",
-    "@ms-cloudpack/config": "^0.7.5",
-    "@ms-cloudpack/create-express-app": "^1.3.7",
-    "@ms-cloudpack/data-bus": "^0.3.0",
-    "@ms-cloudpack/json-utilities": "^0.0.6",
-    "@ms-cloudpack/overlay": "^0.13.10",
-    "@ms-cloudpack/package-utilities": "^3.1.5",
-    "@ms-cloudpack/path-string-parsing": "^1.0.2",
-    "@ms-cloudpack/path-utilities": "^2.3.0",
-    "@ms-cloudpack/task-reporter": "^0.5.2",
-    "@ms-cloudpack/telemetry": "^0.3.4",
+    "@ms-cloudpack/api-server": "^0.7.0",
+    "@ms-cloudpack/bundler": "^0.14.0",
+    "@ms-cloudpack/config": "^0.8.0",
+    "@ms-cloudpack/create-express-app": "^1.3.8",
+    "@ms-cloudpack/data-bus": "^0.3.1",
+    "@ms-cloudpack/json-utilities": "^0.0.7",
+    "@ms-cloudpack/overlay": "^0.13.12",
+    "@ms-cloudpack/package-utilities": "^4.0.0",
+    "@ms-cloudpack/path-string-parsing": "^1.0.3",
+    "@ms-cloudpack/path-utilities": "^2.3.1",
+    "@ms-cloudpack/task-reporter": "^0.5.3",
+    "@ms-cloudpack/telemetry": "^0.3.5",
     "chokidar": "^3.5.3",
     "commander": "^11.0.0",
     "es-module-lexer": "^1.0.3",

package/lib/commands/init/patchAllInternalPackageExports.d.ts

@@ -1,11 +0,0 @@
-import type { ResolveMap } from '@ms-cloudpack/package-utilities';
-import type { PackageOverride } from '@ms-cloudpack/config';
-/**
- * Update internal package.json definitions with required exports map entries. Used when the init "fix" option
- * is provided.
- */
-export declare function patchAllInternalPackageExports(options: {
-    resolveMap: ResolveMap;
-    packageOverrides: PackageOverride[];
-}): Promise<void>;
-//# sourceMappingURL=patchAllInternalPackageExports.d.ts.map

package/lib/commands/init/patchAllInternalPackageExports.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"patchAllInternalPackageExports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/patchAllInternalPackageExports.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;;GAGG;AACH,wBAAsB,8BAA8B,CAAC,OAAO,EAAE;IAC5D,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,EAAE,eAAe,EAAE,CAAC;CACrC,iBAcA"}

package/lib/commands/init/patchAllInternalPackageExports.js

@@ -1,18 +0,0 @@
-import { patchPackageExports } from './patchPackageExports.js';
-/**
- * Update internal package.json definitions with required exports map entries. Used when the init "fix" option
- * is provided.
- */
-export async function patchAllInternalPackageExports(options) {
-    const { resolveMap, packageOverrides } = options;
-    console.info('Patching package exports...');
-    for (const mapEntry of Object.values(resolveMap)) {
-        await patchPackageExports({ mapEntry, packageOverrides });
-        if (mapEntry.scopedVersions) {
-            for (const scopedVersion of Object.values(mapEntry.scopedVersions)) {
-                await patchPackageExports({ mapEntry: scopedVersion, packageOverrides });
-            }
-        }
-    }
-}
-//# sourceMappingURL=patchAllInternalPackageExports.js.map

package/lib/commands/init/patchAllInternalPackageExports.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"patchAllInternalPackageExports.js","sourceRoot":"","sources":["../../../src/commands/init/patchAllInternalPackageExports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAI/D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,OAGpD;IACC,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IAEjD,OAAO,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IAE5C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAChD,MAAM,mBAAmB,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAE1D,IAAI,QAAQ,CAAC,cAAc,EAAE;YAC3B,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;gBAClE,MAAM,mBAAmB,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC,CAAC;aAC1E;SACF;KACF;AACH,CAAC","sourcesContent":["import { patchPackageExports } from './patchPackageExports.js';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { PackageOverride } from '@ms-cloudpack/config';\n\n/**\n * Update internal package.json definitions with required exports map entries. Used when the init \"fix\" option\n * is provided.\n */\nexport async function patchAllInternalPackageExports(options: {\n  resolveMap: ResolveMap;\n  packageOverrides: PackageOverride[];\n}) {\n  const { resolveMap, packageOverrides } = options;\n\n  console.info('Patching package exports...');\n\n  for (const mapEntry of Object.values(resolveMap)) {\n    await patchPackageExports({ mapEntry, packageOverrides });\n\n    if (mapEntry.scopedVersions) {\n      for (const scopedVersion of Object.values(mapEntry.scopedVersions)) {\n        await patchPackageExports({ mapEntry: scopedVersion, packageOverrides });\n      }\n    }\n  }\n}\n"]}

package/lib/commands/init/patchPackageExports.d.ts

@@ -1,10 +0,0 @@
-import type { ResolveMapEntry } from '@ms-cloudpack/package-utilities';
-import type { PackageOverride } from '@ms-cloudpack/config';
-/**
- * Update a single package.json definition with the required exports map entries.
- */
-export declare function patchPackageExports(options: {
-    mapEntry: ResolveMapEntry;
-    packageOverrides: PackageOverride[];
-}): Promise<void>;
-//# sourceMappingURL=patchPackageExports.d.ts.map

package/lib/commands/init/patchPackageExports.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"patchPackageExports.d.ts","sourceRoot":"","sources":["../../../src/commands/init/patchPackageExports.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG5D;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE;IAAE,QAAQ,EAAE,eAAe,CAAC;IAAC,gBAAgB,EAAE,eAAe,EAAE,CAAA;CAAE,iBAqBpH"}

package/lib/commands/init/patchPackageExports.js

@@ -1,25 +0,0 @@
-import path from 'path';
-import { isExternalPackage } from '@ms-cloudpack/package-utilities';
-import { writeJson, readJson } from '@ms-cloudpack/json-utilities';
-import { findPackageOverride } from '../../common/findPackageOverride.js';
-/**
- * Update a single package.json definition with the required exports map entries.
- */
-export async function patchPackageExports(options) {
-    const { mapEntry, packageOverrides } = options;
-    if (!isExternalPackage(mapEntry.path)) {
-        const definitionPath = path.join(mapEntry.path, 'package.json');
-        // Read the raw definition.
-        const definition = await readJson(definitionPath);
-        if (definition) {
-            // Remove the override.
-            const override = findPackageOverride(packageOverrides, mapEntry.name, mapEntry.version);
-            if (override?.overrides?.exports) {
-                definition.exports = override.overrides.exports;
-                await writeJson(path.join(mapEntry.path, 'package.json'), definition);
-                packageOverrides.splice(packageOverrides.indexOf(override), 1);
-            }
-        }
-    }
-}
-//# sourceMappingURL=patchPackageExports.js.map

package/lib/commands/init/patchPackageExports.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"patchPackageExports.js","sourceRoot":"","sources":["../../../src/commands/init/patchPackageExports.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAK1E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAA2E;IACnH,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IAE/C,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACrC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEhE,2BAA2B;QAC3B,MAAM,UAAU,GAA4B,MAAM,QAAQ,CAAC,cAAc,CAAC,CAAC;QAE3E,IAAI,UAAU,EAAE;YACd,uBAAuB;YACvB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;YAExF,IAAI,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE;gBAChC,UAAU,CAAC,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC;gBAChD,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,UAAU,CAAC,CAAC;gBAEtE,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;aAChE;SACF;KACF;AACH,CAAC","sourcesContent":["import path from 'path';\nimport { isExternalPackage } from '@ms-cloudpack/package-utilities';\nimport { writeJson, readJson } from '@ms-cloudpack/json-utilities';\nimport { findPackageOverride } from '../../common/findPackageOverride.js';\nimport type { ResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport type { PackageOverride } from '@ms-cloudpack/config';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\n\n/**\n * Update a single package.json definition with the required exports map entries.\n */\nexport async function patchPackageExports(options: { mapEntry: ResolveMapEntry; packageOverrides: PackageOverride[] }) {\n  const { mapEntry, packageOverrides } = options;\n\n  if (!isExternalPackage(mapEntry.path)) {\n    const definitionPath = path.join(mapEntry.path, 'package.json');\n\n    // Read the raw definition.\n    const definition: PackageJson | undefined = await readJson(definitionPath);\n\n    if (definition) {\n      // Remove the override.\n      const override = findPackageOverride(packageOverrides, mapEntry.name, mapEntry.version);\n\n      if (override?.overrides?.exports) {\n        definition.exports = override.overrides.exports;\n        await writeJson(path.join(mapEntry.path, 'package.json'), definition);\n\n        packageOverrides.splice(packageOverrides.indexOf(override), 1);\n      }\n    }\n  }\n}\n"]}

package/lib/commands/init/preparePackageOverride.d.ts

@@ -1,16 +0,0 @@
-import type { PackageOverride } from '@ms-cloudpack/config';
-import type { PackageJson, PackageJsonExports } from '@ms-cloudpack/bundler-types';
-/**
- * Returns an existing package override, or if missing, creates one and returns that.
- */
-export declare function preparePackageOverride(options: {
-    dependencyDefinition: PackageJson;
-    exports: PackageJsonExports;
-    isInternal: boolean;
-    packageOverrides: PackageOverride[];
-}): PackageOverride & {
-    overrides: {
-        exports: PackageJsonExports;
-    };
-};
-//# sourceMappingURL=preparePackageOverride.d.ts.map

package/lib/commands/init/preparePackageOverride.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"preparePackageOverride.d.ts","sourceRoot":"","sources":["../../../src/commands/init/preparePackageOverride.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEnF;;GAEG;AAEH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE;IAC9C,oBAAoB,EAAE,WAAW,CAAC;IAClC,OAAO,EAAE,kBAAkB,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC;IACpB,gBAAgB,EAAE,eAAe,EAAE,CAAC;CACrC,GAAG,eAAe,GAAG;IAAE,SAAS,EAAE;QAAE,OAAO,EAAE,kBAAkB,CAAA;KAAE,CAAA;CAAE,CA2BnE"}

package/lib/commands/init/preparePackageOverride.js

@@ -1,23 +0,0 @@
-import { findPackageOverride } from '../../common/findPackageOverride.js';
-/**
- * Returns an existing package override, or if missing, creates one and returns that.
- */
-export function preparePackageOverride(options) {
-    const { dependencyDefinition, exports, isInternal, packageOverrides } = options;
-    let entryOverride = findPackageOverride(packageOverrides, dependencyDefinition.name || '', dependencyDefinition.version || '');
-    if (!entryOverride) {
-        entryOverride = {
-            name: dependencyDefinition.name || '',
-            versionRequirement: `^${dependencyDefinition.version}`,
-            overrides: {
-                exports,
-            },
-        };
-        if (isInternal) {
-            entryOverride.isInternal = true;
-        }
-        packageOverrides.push(entryOverride);
-    }
-    return entryOverride;
-}
-//# sourceMappingURL=preparePackageOverride.js.map

package/lib/commands/init/preparePackageOverride.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"preparePackageOverride.js","sourceRoot":"","sources":["../../../src/commands/init/preparePackageOverride.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAI1E;;GAEG;AAEH,MAAM,UAAU,sBAAsB,CAAC,OAKtC;IACC,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IAEhF,IAAI,aAAa,GAAG,mBAAmB,CACrC,gBAAgB,EAChB,oBAAoB,CAAC,IAAI,IAAI,EAAE,EAC/B,oBAAoB,CAAC,OAAO,IAAI,EAAE,CACnC,CAAC;IAEF,IAAI,CAAC,aAAa,EAAE;QAClB,aAAa,GAAG;YACd,IAAI,EAAE,oBAAoB,CAAC,IAAI,IAAI,EAAE;YACrC,kBAAkB,EAAE,IAAI,oBAAoB,CAAC,OAAO,EAAE;YAEtD,SAAS,EAAE;gBACT,OAAO;aACR;SACF,CAAC;QAEF,IAAI,UAAU,EAAE;YACd,aAAa,CAAC,UAAU,GAAG,IAAI,CAAC;SACjC;QAED,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;KACtC;IAED,OAAO,aAAiF,CAAC;AAC3F,CAAC","sourcesContent":["import { findPackageOverride } from '../../common/findPackageOverride.js';\nimport type { PackageOverride } from '@ms-cloudpack/config';\nimport type { PackageJson, PackageJsonExports } from '@ms-cloudpack/bundler-types';\n\n/**\n * Returns an existing package override, or if missing, creates one and returns that.\n */\n\nexport function preparePackageOverride(options: {\n  dependencyDefinition: PackageJson;\n  exports: PackageJsonExports;\n  isInternal: boolean;\n  packageOverrides: PackageOverride[];\n}): PackageOverride & { overrides: { exports: PackageJsonExports } } {\n  const { dependencyDefinition, exports, isInternal, packageOverrides } = options;\n\n  let entryOverride = findPackageOverride(\n    packageOverrides,\n    dependencyDefinition.name || '',\n    dependencyDefinition.version || '',\n  );\n\n  if (!entryOverride) {\n    entryOverride = {\n      name: dependencyDefinition.name || '',\n      versionRequirement: `^${dependencyDefinition.version}`,\n\n      overrides: {\n        exports,\n      },\n    };\n\n    if (isInternal) {\n      entryOverride.isInternal = true;\n    }\n\n    packageOverrides.push(entryOverride);\n  }\n\n  return entryOverride as PackageOverride & { overrides: { exports: PackageJsonExports } };\n}\n"]}

package/lib/common/createPackageOverrideTransform.d.ts

@@ -1,7 +0,0 @@
-import type { CloudpackConfig } from '@ms-cloudpack/config';
-import type { PackageDefinitionTransform } from '@ms-cloudpack/bundler-types';
-/**
- * Creates a transform to be registered with a PackageDefinitions registry for overriding package.json definitions.
- */
-export declare function createPackageOverrideTransform(config: CloudpackConfig): PackageDefinitionTransform;
-//# sourceMappingURL=createPackageOverrideTransform.d.ts.map

package/lib/common/createPackageOverrideTransform.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"createPackageOverrideTransform.d.ts","sourceRoot":"","sources":["../../src/common/createPackageOverrideTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAe,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAG3F;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,eAAe,GAAG,0BAA0B,CAgBlG"}

package/lib/common/createPackageOverrideTransform.js

@@ -1,19 +0,0 @@
-import { findPackageOverride } from './findPackageOverride.js';
-/**
- * Creates a transform to be registered with a PackageDefinitions registry for overriding package.json definitions.
- */
-export function createPackageOverrideTransform(config) {
-    const { packageOverrides = [] } = config;
-    return (packageDefinition) => {
-        const { name = '', version = '' } = packageDefinition;
-        const packageOverride = findPackageOverride(packageOverrides, name, version);
-        if (packageOverride) {
-            return {
-                ...packageDefinition,
-                ...packageOverride.overrides,
-            };
-        }
-        return undefined;
-    };
-}
-//# sourceMappingURL=createPackageOverrideTransform.js.map

package/lib/common/createPackageOverrideTransform.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"createPackageOverrideTransform.js","sourceRoot":"","sources":["../../src/common/createPackageOverrideTransform.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;GAEG;AACH,MAAM,UAAU,8BAA8B,CAAC,MAAuB;IACpE,MAAM,EAAE,gBAAgB,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IAEzC,OAAO,CAAC,iBAA8B,EAAE,EAAE;QACxC,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,iBAAiB,CAAC;QACtD,MAAM,eAAe,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7E,IAAI,eAAe,EAAE;YACnB,OAAO;gBACL,GAAG,iBAAiB;gBACpB,GAAG,eAAe,CAAC,SAAS;aAC7B,CAAC;SACH;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { CloudpackConfig } from '@ms-cloudpack/config';\nimport type { PackageJson, PackageDefinitionTransform } from '@ms-cloudpack/bundler-types';\nimport { findPackageOverride } from './findPackageOverride.js';\n\n/**\n * Creates a transform to be registered with a PackageDefinitions registry for overriding package.json definitions.\n */\nexport function createPackageOverrideTransform(config: CloudpackConfig): PackageDefinitionTransform {\n  const { packageOverrides = [] } = config;\n\n  return (packageDefinition: PackageJson) => {\n    const { name = '', version = '' } = packageDefinition;\n    const packageOverride = findPackageOverride(packageOverrides, name, version);\n\n    if (packageOverride) {\n      return {\n        ...packageDefinition,\n        ...packageOverride.overrides,\n      };\n    }\n\n    return undefined;\n  };\n}\n"]}