@ms-cloudpack/api-server 0.25.2 → 0.26.1

package/lib/utilities/bundleTask.js

@@ -16,23 +16,13 @@ export async function bundleTask(params) {
     const { bundleRequest, options = {}, reporter, telemetryClient } = params;
     const { packageName, version } = bundleRequest;
     const { force } = options || {};
-    const bundleResult = bundleRequest.result;
-    const taskName = `${bundleResult?.rebuild ? `Re-bundle` : `Bundle`} ${formatPackageName({
+    const taskName = `Bundle ${formatPackageName({
         name: packageName,
         version,
     })}`;
     telemetryClient?.performance.registerAggregator(diskCacheRatioMetricEventAggregator);
     const executeBundle = async () => {
-        if (bundleResult?.rebuild) {
-            bundleRequest.result = {
-                ...(await bundleResult.rebuild()),
-                outputPath: bundleResult.outputPath,
-            };
-            bundleRequest.resultFromCache = false;
-        }
-        else {
-            await bundle(bundleRequest, force);
-        }
+        await bundle(bundleRequest, force);
         diskCacheRatioMetricEventAggregator?.record({
             isCacheHit: !!bundleRequest.resultFromCache,
             isExternal: bundleRequest.isExternal,
@@ -86,10 +76,10 @@ async function bundle(bundleRequest, force) {
         bundleRequest.result.dispose();
         bundleRequest.result = undefined;
     }
-    const { packagePath, isExternal, disableSourceMaps, enableFindImports, enableCacheInternalPackages } = bundleRequest;
+    const { packagePath, isExternal, disableSourceMaps, shouldFindImports, shouldCacheInternalPackages } = bundleRequest;
     const outputPath = bundleRequest.outputPath ?? (await getBundleLocation({ packagePath }, context)).path;
     // Rehydrate the result if not incremental.
-    if ((isExternal || enableCacheInternalPackages) && !force) {
+    if (bundleRequest.result === undefined && (isExternal || shouldCacheInternalPackages) && !force) {
         bundleRequest.result = await readJson(path.join(outputPath, 'result.json'));
     }
     const { userPackageSettings } = getPackageSettings({
@@ -108,7 +98,7 @@ async function bundle(bundleRequest, force) {
         entries: await getEntriesMapFromPackage({ inputPath: packagePath }, context),
         external: await getExternalsFromPackage({ inputPath: packagePath }, context),
     };
-    const hash = !isExternal && enableCacheInternalPackages
+    const hash = !isExternal && shouldCacheInternalPackages
         ? features?.hashPackages
             ? await packageHashes.get({ packagePath, isSourceHashingEnabled: true, shouldRecalculate: true })
             : await hashPackage({ packagePath, isExternal, additionalProperties: bundleOptions })
@@ -122,21 +112,30 @@ async function bundle(bundleRequest, force) {
         bundleRequest.resultFromCache = false;
         // Only use cached result if it's successful.
         await prepareOutputPath(outputPath);
-        const bundleInternalResult = await bundleInternal(bundleOptions);
-        bundleRequest.result = {
-            ...bundleInternalResult,
-            outputPath: bundleOptions.outputPath ?? outputPath,
-            hash,
-        };
+        if (bundleRequest.result?.rebuild) {
+            bundleRequest.result = {
+                ...(await bundleRequest.result.rebuild()),
+                outputPath: bundleRequest.result.outputPath,
+                hash,
+            };
+        }
+        else {
+            const bundleInternalResult = await bundleInternal(bundleOptions);
+            bundleRequest.result = {
+                ...bundleInternalResult,
+                outputPath: bundleOptions.outputPath ?? outputPath,
+                hash,
+            };
+        }
         // Write the result to disk.
-        if (isExternal || enableCacheInternalPackages) {
+        if (isExternal || shouldCacheInternalPackages) {
             const result = { ...bundleRequest.result };
             // Clear the rawInput/output properties.
             result.rawInput = result.rawOutput = undefined;
             await writeJson(path.join(outputPath, 'result.json'), bundleRequest.result);
         }
     }
-    if (enableFindImports && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {
+    if (shouldFindImports && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {
         const importsPath = path.join(outputPath, 'imports.json');
         let imports = await readJson(importsPath);
         // If we couldn't rehydrate imports from cache, compute them.

package/lib/utilities/bundleTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundleTask.js","sourceRoot":"","sources":["../../src/utilities/bundleTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,cAAc,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AACpH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EACL,YAAY,EACZ,iBAAiB,GAGlB,MAAM,6BAA6B,CAAC;AACrC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAGnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,mCAAmC,EAAE,MAAM,0CAA0C,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,MAKhC;IACC,MAAM,EAAE,aAAa,EAAE,OAAO,GAAG,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;IAC1E,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAC/C,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAEhC,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC;IAC1C,MAAM,QAAQ,GAAG,GAAG,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,IAAI,iBAAiB,CAAC;QACtF,IAAI,EAAE,WAAW;QACjB,OAAO;KACR,CAAC,EAAE,CAAC;IAEL,eAAe,EAAE,WAAW,CAAC,kBAAkB,CAAC,mCAAmC,CAAC,CAAC;IAErF,MAAM,aAAa,GAAG,KAAK,IAAqC,EAAE;QAChE,IAAI,YAAY,EAAE,OAAO,EAAE;YACzB,aAAa,CAAC,MAAM,GAAG;gBACrB,GAAG,CAAC,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;gBACjC,UAAU,EAAE,YAAY,CAAC,UAAU;aACpC,CAAC;YACF,aAAa,CAAC,eAAe,GAAG,KAAK,CAAC;SACvC;aAAM;YACL,MAAM,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;SACpC;QAED,mCAAmC,EAAE,MAAM,CAAC;YAC1C,UAAU,EAAE,CAAC,CAAC,aAAa,CAAC,eAAe;YAC3C,UAAU,EAAE,aAAa,CAAC,UAAU;SACrC,CAAC,CAAC;QAEH,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;QAEjC,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;gBACL,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,4BAA4B,WAAW,IAAI,OAAO,GAAG;aAC/D,CAAC;SACH;QAED,MAAM,CAAC,WAAW,KAAK,EAAE,CAAC;QAC1B,MAAM,CAAC,MAAM,KAAK,EAAE,CAAC;QACrB,MAAM,CAAC,QAAQ,KAAK,EAAE,CAAC;QAEvB,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE;YACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,mCAAmC,WAAW,SAAS,MAAM,CAAC,UAAU,GAAG;aAClF,CAAC,CAAC;SACJ;QAED,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU;YAClD,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM;gBACvB,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC;gBACnC,CAAC,CAAC;oBACE,OAAO,EAAE,YAAY,CAAC;wBACpB,YAAY,aAAa,CAAC,WAAW,IAAI,aAAa,CAAC,OAAO,EAAE;wBAChE,YAAY,MAAM,CAAC,WAAW,IAAI,SAAS,EAAE;wBAC7C,eAAe,aAAa,CAAC,WAAW,EAAE;wBAC1C,UAAU;wBACV,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;wBACnC,gBAAgB,MAAM,CAAC,UAAU,EAAE;wBACnC,MAAM,CAAC,WAAW,EAAE,GAAG,CACrB,CAAC,IAAI,EAAE,EAAE,CACP,GAAG,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,eAAe,CACxF,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CACjD,GAAG,CACP;qBACF,CAAC;iBACH,CAAC;SACP,CAAC;IACJ,CAAC,CAAC;IAEF,IAAI,QAAQ,EAAE;QACZ,MAAM,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;KACjD;SAAM;QACL,MAAM,aAAa,EAAE,CAAC;KACvB;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,KAAK,UAAU,MAAM,CAAC,aAA4B,EAAE,KAAe;IACjE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,aAAa,CAAC;IAC1D,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;IACpD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE5B,gDAAgD;IAChD,IAAI,KAAK,IAAI,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE;QAC3C,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAC/B,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC;KAClC;IAED,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,2BAA2B,EAAE,GAAG,aAAa,CAAC;IAErH,MAAM,UAAU,GAAG,aAAa,CAAC,UAAU,IAAI,CAAC,MAAM,iBAAiB,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAExG,2CAA2C;IAC3C,IAAI,CAAC,UAAU,IAAI,2BAA2B,CAAC,IAAI,CAAC,KAAK,EAAE;QACzD,aAAa,CAAC,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC;KAC7E;IAED,MAAM,EAAE,mBAAmB,EAAE,GAC3B,kBAAkB,CAAC;QACjB,IAAI,EAAE,aAAa,CAAC,WAAW;QAC/B,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,MAAM;KACP,CAAC,IAAI,EAAE,CAAC;IACX,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,mBAAmB,IAAI,EAAE,CAAC;IAElE,MAAM,aAAa,GAAkB;QACnC,WAAW,EAAE,aAAa,CAAC,WAAW,IAAI,WAAW;QACrD,eAAe,EAAE,cAAc;QAC/B,SAAS,EAAE,WAAW;QACtB,UAAU;QACV,WAAW,EAAE,CAAC,UAAU;QACxB,SAAS,EAAE,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;QACnD,OAAO,EAAE,MAAM,wBAAwB,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC;QAC5E,QAAQ,EAAE,MAAM,uBAAuB,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC;KAC7E,CAAC;IAEF,MAAM,IAAI,GACR,CAAC,UAAU,IAAI,2BAA2B;QACxC,CAAC,CAAC,QAAQ,EAAE,YAAY;YACtB,CAAC,CAAC,MAAM,aAAa,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,sBAAsB,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;YACjG,CAAC,CAAC,MAAM,WAAW,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,oBAAoB,EAAE,aAAa,EAAE,CAAC;QACvF,CAAC,CAAC,SAAS,CAAC;IAEhB,yCAAyC;IACzC,IAAI,CAAC,KAAK,IAAI,mBAAmB,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE;QAC1D,OAAO,CAAC,KAAK,CAAC,2BAA2B,aAAa,CAAC,WAAW,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/F,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC;KACtC;SAAM;QACL,aAAa,CAAC,eAAe,GAAG,KAAK,CAAC;QAEtC,6CAA6C;QAC7C,MAAM,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAEpC,MAAM,oBAAoB,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,CAAC;QACjE,aAAa,CAAC,MAAM,GAAG;YACrB,GAAG,oBAAoB;YACvB,UAAU,EAAE,aAAa,CAAC,UAAU,IAAI,UAAU;YAClD,IAAI;SACL,CAAC;QAEF,4BAA4B;QAC5B,IAAI,UAAU,IAAI,2BAA2B,EAAE;YAC7C,MAAM,MAAM,GAAG,EAAE,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC;YAE3C,wCAAwC;YACxC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;YAE/C,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;SAC7E;KACF;IAED,IAAI,iBAAiB,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;QAC3G,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAC1D,IAAI,OAAO,GAAG,MAAM,QAAQ,CAA2B,WAAW,CAAC,CAAC;QAEpE,6DAA6D;QAC7D,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;YAExG,OAAO,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,CAAC;YAEzC,8DAA8D;YAC9D,mEAAmE;YACnE,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;SACjC;QAED,aAAa,CAAC,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvC,kEAAkE;QAClE,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7G,aAAa,CAAC,MAAM,CAAC,OAAO,GAAG,eAAe,IAAI,CAAC,MAAM,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;KACxF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC","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 './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';\nimport { isCachedResultValid } from './isCachedResultValid.js';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport { diskCacheRatioMetricEventAggregator } from './diskCacheRatioMetricEventAggregator.js';\nimport { getBundleLocation } from './getBundleLocation.js';\n\nexport async function bundleTask(params: {\n  bundleRequest: BundleRequest;\n  options?: BundleTaskOptions;\n  reporter?: TaskReporter;\n  telemetryClient?: TelemetryClient;\n}): Promise<BundleRequest> {\n  const { bundleRequest, options = {}, reporter, telemetryClient } = params;\n  const { packageName, version } = bundleRequest;\n  const { force } = options || {};\n\n  const bundleResult = bundleRequest.result;\n  const taskName = `${bundleResult?.rebuild ? `Re-bundle` : `Bundle`} ${formatPackageName({\n    name: packageName,\n    version,\n  })}`;\n\n  telemetryClient?.performance.registerAggregator(diskCacheRatioMetricEventAggregator);\n\n  const executeBundle = async (): Promise<TaskReporterTaskResult> => {\n    if (bundleResult?.rebuild) {\n      bundleRequest.result = {\n        ...(await bundleResult.rebuild()),\n        outputPath: bundleResult.outputPath,\n      };\n      bundleRequest.resultFromCache = false;\n    } else {\n      await bundle(bundleRequest, force);\n    }\n\n    diskCacheRatioMetricEventAggregator?.record({\n      isCacheHit: !!bundleRequest.resultFromCache,\n      isExternal: bundleRequest.isExternal,\n    });\n\n    const { result } = bundleRequest;\n\n    if (!result) {\n      return {\n        status: 'fail',\n        details: `No result was found for \"${packageName}@${version}\"`,\n      };\n    }\n\n    result.outputFiles ??= [];\n    result.errors ??= [];\n    result.warnings ??= [];\n\n    if (!result.outputFiles.length && !result.errors?.length) {\n      result.warnings.push({\n        text: `No output files were found for \"${packageName}\" in \"${result.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: ${result.bundlerName || 'unknown'}`,\n              `Input path: ${bundleRequest.packagePath}`,\n              `Entries:`,\n              Object.values(result.entries || {}),\n              `Output path: ${result.outputPath}`,\n              result.outputFiles?.map(\n                (file) =>\n                  `${safeRelativePath(path.relative(result.outputPath, file.outputPath))} (${getFileSizeSync(\n                    path.resolve(result.outputPath, 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, packageHashes } = bundleRequest;\n  const context = { packages, config, packageHashes };\n  const { features } = 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, isExternal, disableSourceMaps, enableFindImports, enableCacheInternalPackages } = bundleRequest;\n\n  const outputPath = bundleRequest.outputPath ?? (await getBundleLocation({ packagePath }, context)).path;\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 { userPackageSettings } =\n    getPackageSettings({\n      name: bundleRequest.packageName,\n      version: bundleRequest.version,\n      config,\n    }) || {};\n  const { bundlerType, bundlerOptions } = userPackageSettings || {};\n\n  const bundleOptions: BundleOptions = {\n    bundlerType: bundleRequest.bundlerType || 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      ? features?.hashPackages\n        ? await packageHashes.get({ packagePath, isSourceHashingEnabled: true, shouldRecalculate: true })\n        : await hashPackage({ packagePath, isExternal, additionalProperties: bundleOptions })\n      : undefined;\n\n  // if the cached result is valid, use it.\n  if (!force && isCachedResultValid({ bundleRequest, hash })) {\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    const bundleInternalResult = await bundleInternal(bundleOptions);\n    bundleRequest.result = {\n      ...bundleInternalResult,\n      outputPath: bundleOptions.outputPath ?? outputPath,\n      hash,\n    };\n\n    // Write the result to disk.\n    if (isExternal || enableCacheInternalPackages) {\n      const result = { ...bundleRequest.result };\n\n      // Clear the rawInput/output properties.\n      result.rawInput = result.rawOutput = undefined;\n\n      await writeJson(path.join(outputPath, 'result.json'), bundleRequest.result);\n    }\n  }\n\n  if (enableFindImports && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {\n    const importsPath = path.join(outputPath, 'imports.json');\n    let imports = await readJson<Record<string, string[]>>(importsPath);\n\n    // If we couldn't rehydrate imports from cache, compute them.\n    if (!imports) {\n      const scriptPaths = bundleRequest.result.outputFiles.map((f) => path.resolve(outputPath, f.outputPath));\n\n      imports = await findImports(scriptPaths);\n\n      // Write to cache for future use. (Ignore the promise result.)\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      writeJson(importsPath, imports);\n    }\n\n    bundleRequest.result.imports = imports;\n\n    // Find imports that are in the output files and set dependencies.\n    const outputFilePaths = bundleRequest.result.outputFiles?.map((f) => path.resolve(outputPath, f.outputPath));\n    bundleRequest.result.imports = outputFilePaths && (await findImports(outputFilePaths));\n  }\n\n  return bundleRequest;\n}\n"]}
+{"version":3,"file":"bundleTask.js","sourceRoot":"","sources":["../../src/utilities/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 './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';\nimport { isCachedResultValid } from './isCachedResultValid.js';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport { diskCacheRatioMetricEventAggregator } from './diskCacheRatioMetricEventAggregator.js';\nimport { getBundleLocation } from './getBundleLocation.js';\n\nexport async function bundleTask(params: {\n  bundleRequest: BundleRequest;\n  options?: BundleTaskOptions;\n  reporter?: TaskReporter;\n  telemetryClient?: TelemetryClient;\n}): Promise<BundleRequest> {\n  const { bundleRequest, options = {}, reporter, telemetryClient } = params;\n  const { packageName, version } = bundleRequest;\n  const { force } = options || {};\n\n  const taskName = `Bundle ${formatPackageName({\n    name: packageName,\n    version,\n  })}`;\n\n  telemetryClient?.performance.registerAggregator(diskCacheRatioMetricEventAggregator);\n\n  const executeBundle = async (): Promise<TaskReporterTaskResult> => {\n    await bundle(bundleRequest, force);\n\n    diskCacheRatioMetricEventAggregator?.record({\n      isCacheHit: !!bundleRequest.resultFromCache,\n      isExternal: bundleRequest.isExternal,\n    });\n\n    const { result } = bundleRequest;\n\n    if (!result) {\n      return {\n        status: 'fail',\n        details: `No result was found for \"${packageName}@${version}\"`,\n      };\n    }\n\n    result.outputFiles ??= [];\n    result.errors ??= [];\n    result.warnings ??= [];\n\n    if (!result.outputFiles.length && !result.errors?.length) {\n      result.warnings.push({\n        text: `No output files were found for \"${packageName}\" in \"${result.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: ${result.bundlerName || 'unknown'}`,\n              `Input path: ${bundleRequest.packagePath}`,\n              `Entries:`,\n              Object.values(result.entries || {}),\n              `Output path: ${result.outputPath}`,\n              result.outputFiles?.map(\n                (file) =>\n                  `${safeRelativePath(path.relative(result.outputPath, file.outputPath))} (${getFileSizeSync(\n                    path.resolve(result.outputPath, 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, packageHashes } = bundleRequest;\n  const context = { packages, config, packageHashes };\n  const { features } = 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, isExternal, disableSourceMaps, shouldFindImports, shouldCacheInternalPackages } = bundleRequest;\n\n  const outputPath = bundleRequest.outputPath ?? (await getBundleLocation({ packagePath }, context)).path;\n\n  // Rehydrate the result if not incremental.\n  if (bundleRequest.result === undefined && (isExternal || shouldCacheInternalPackages) && !force) {\n    bundleRequest.result = await readJson(path.join(outputPath, 'result.json'));\n  }\n\n  const { userPackageSettings } =\n    getPackageSettings({\n      name: bundleRequest.packageName,\n      version: bundleRequest.version,\n      config,\n    }) || {};\n  const { bundlerType, bundlerOptions } = userPackageSettings || {};\n\n  const bundleOptions: BundleOptions = {\n    bundlerType: bundleRequest.bundlerType || 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 && shouldCacheInternalPackages\n      ? features?.hashPackages\n        ? await packageHashes.get({ packagePath, isSourceHashingEnabled: true, shouldRecalculate: true })\n        : await hashPackage({ packagePath, isExternal, additionalProperties: bundleOptions })\n      : undefined;\n\n  // if the cached result is valid, use it.\n  if (!force && isCachedResultValid({ bundleRequest, hash })) {\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,\n      };\n    } else {\n      const bundleInternalResult = await bundleInternal(bundleOptions);\n      bundleRequest.result = {\n        ...bundleInternalResult,\n        outputPath: bundleOptions.outputPath ?? outputPath,\n        hash,\n      };\n    }\n\n    // Write the result to disk.\n    if (isExternal || shouldCacheInternalPackages) {\n      const result = { ...bundleRequest.result };\n\n      // Clear the rawInput/output properties.\n      result.rawInput = result.rawOutput = undefined;\n\n      await writeJson(path.join(outputPath, 'result.json'), bundleRequest.result);\n    }\n  }\n\n  if (shouldFindImports && !bundleRequest.result?.errors?.length && bundleRequest.result?.outputFiles?.length) {\n    const importsPath = path.join(outputPath, 'imports.json');\n    let imports = await readJson<Record<string, string[]>>(importsPath);\n\n    // If we couldn't rehydrate imports from cache, compute them.\n    if (!imports) {\n      const scriptPaths = bundleRequest.result.outputFiles.map((f) => path.resolve(outputPath, f.outputPath));\n\n      imports = await findImports(scriptPaths);\n\n      // Write to cache for future use. (Ignore the promise result.)\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      writeJson(importsPath, imports);\n    }\n\n    bundleRequest.result.imports = imports;\n\n    // Find imports that are in the output files and set dependencies.\n    const outputFilePaths = bundleRequest.result.outputFiles?.map((f) => path.resolve(outputPath, f.outputPath));\n    bundleRequest.result.imports = outputFilePaths && (await findImports(outputFilePaths));\n  }\n\n  return bundleRequest;\n}\n"]}

package/lib/utilities/createBundleRequestForPackage.d.ts

@@ -8,7 +8,7 @@ export declare function createBundleRequestForPackage(options: {
     outputPath?: string;
     bundlerType?: string;
     disableSourceMaps?: boolean;
-    enableFindImports?: boolean;
+    shouldFindImports?: boolean;
     disableCache?: boolean;
 }, context: {
     config: CloudpackConfig;

package/lib/utilities/createBundleRequestForPackage.js

@@ -11,9 +11,9 @@ export function createBundleRequestForPackage(options, context) {
         outputPath: options.outputPath,
         version,
         disableSourceMaps: options.disableSourceMaps ?? features.disableSourceMaps,
-        enableFindImports: options.enableFindImports ?? features.enqueueDependencies,
+        shouldFindImports: options.shouldFindImports ?? features.enqueueDependencies,
         disableCache: options.disableCache,
-        enableCacheInternalPackages: features.cacheInternalPackages,
+        shouldCacheInternalPackages: features.cacheInternalPackages,
         hashPackages: features.hashPackages,
         bundlerType: options.bundlerType,
         ...context,

package/lib/utilities/createBundleRequestForPackage.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBundleRequestForPackage.js","sourceRoot":"","sources":["../../src/utilities/createBundleRequestForPackage.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,6BAA6B,CAC3C,OAOC,EACD,OAIC;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IACjC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IACjC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;IAEzD,OAAO;QACL,EAAE,EAAE,IAAI;QACR,WAAW,EAAE,IAAI;QACjB,WAAW,EAAE,IAAI;QACjB,UAAU,EAAE,CAAC,CAAC,UAAU;QACxB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,OAAO;QACP,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,QAAQ,CAAC,iBAAiB;QAC1E,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,QAAQ,CAAC,mBAAmB;QAC5E,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,2BAA2B,EAAE,QAAQ,CAAC,qBAAqB;QAC3D,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,GAAG,OAAO;KACX,CAAC;AACJ,CAAC","sourcesContent":["import type { CloudpackConfig } from '@ms-cloudpack/config';\nimport type { ResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\nexport function createBundleRequestForPackage(\n  options: {\n    packageEntry: ResolveMapEntry;\n    outputPath?: string;\n    bundlerType?: string;\n    disableSourceMaps?: boolean;\n    enableFindImports?: boolean;\n    disableCache?: boolean;\n  },\n  context: {\n    config: CloudpackConfig;\n    packages: PackageDefinitionsCache;\n    packageHashes: PackageHashes;\n  },\n): BundleRequest {\n  const { packageEntry } = options;\n  const { config } = context;\n  const { features = {} } = config;\n  const { path, version, name, isExternal } = packageEntry;\n\n  return {\n    id: path,\n    packagePath: path,\n    packageName: name,\n    isExternal: !!isExternal,\n    outputPath: options.outputPath,\n    version,\n    disableSourceMaps: options.disableSourceMaps ?? features.disableSourceMaps,\n    enableFindImports: options.enableFindImports ?? features.enqueueDependencies,\n    disableCache: options.disableCache,\n    enableCacheInternalPackages: features.cacheInternalPackages,\n    hashPackages: features.hashPackages,\n    bundlerType: options.bundlerType,\n    ...context,\n  };\n}\n"]}
+{"version":3,"file":"createBundleRequestForPackage.js","sourceRoot":"","sources":["../../src/utilities/createBundleRequestForPackage.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,6BAA6B,CAC3C,OAOC,EACD,OAIC;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IACjC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IACjC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;IAEzD,OAAO;QACL,EAAE,EAAE,IAAI;QACR,WAAW,EAAE,IAAI;QACjB,WAAW,EAAE,IAAI;QACjB,UAAU,EAAE,CAAC,CAAC,UAAU;QACxB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,OAAO;QACP,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,QAAQ,CAAC,iBAAiB;QAC1E,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,QAAQ,CAAC,mBAAmB;QAC5E,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,2BAA2B,EAAE,QAAQ,CAAC,qBAAqB;QAC3D,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,GAAG,OAAO;KACX,CAAC;AACJ,CAAC","sourcesContent":["import type { CloudpackConfig } from '@ms-cloudpack/config';\nimport type { ResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\nexport function createBundleRequestForPackage(\n  options: {\n    packageEntry: ResolveMapEntry;\n    outputPath?: string;\n    bundlerType?: string;\n    disableSourceMaps?: boolean;\n    shouldFindImports?: boolean;\n    disableCache?: boolean;\n  },\n  context: {\n    config: CloudpackConfig;\n    packages: PackageDefinitionsCache;\n    packageHashes: PackageHashes;\n  },\n): BundleRequest {\n  const { packageEntry } = options;\n  const { config } = context;\n  const { features = {} } = config;\n  const { path, version, name, isExternal } = packageEntry;\n\n  return {\n    id: path,\n    packagePath: path,\n    packageName: name,\n    isExternal: !!isExternal,\n    outputPath: options.outputPath,\n    version,\n    disableSourceMaps: options.disableSourceMaps ?? features.disableSourceMaps,\n    shouldFindImports: options.shouldFindImports ?? features.enqueueDependencies,\n    disableCache: options.disableCache,\n    shouldCacheInternalPackages: features.cacheInternalPackages,\n    hashPackages: features.hashPackages,\n    bundlerType: options.bundlerType,\n    ...context,\n  };\n}\n"]}

package/lib/utilities/findImports.d.ts

@@ -1,6 +1,7 @@
+import type { DetectedImports } from '../types/DetectedImports.js';
 /**
- * Returns a dictionary where key is the package name and value is a set of required paths.
- * Eg. `{ '@fluentui/react': [ '.', './lib/Button' ] }`
+ * Returns a mapping from dependency name to list of paths that are actually imported in the
+ * searched files. e.g. `{ '@fluentui/react': [ '.', './lib/Button' ] }`
  */
-export declare function findImports(filePaths: string[]): Promise<Record<string, string[]>>;
+export declare function findImports(filePaths: string[]): Promise<DetectedImports>;
 //# sourceMappingURL=findImports.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"findImports.d.ts","sourceRoot":"","sources":["../../src/utilities/findImports.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,wBAAsB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CA6ExF"}
+{"version":3,"file":"findImports.d.ts","sourceRoot":"","sources":["../../src/utilities/findImports.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE;;;GAGG;AACH,wBAAsB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CA6E/E"}

package/lib/utilities/findImports.js

@@ -4,8 +4,8 @@ import path from 'path';
 import { parseImportString } from '@ms-cloudpack/path-string-parsing';
 import { builtinModules } from 'module';
 /**
- * Returns a dictionary where key is the package name and value is a set of required paths.
- * Eg. `{ '@fluentui/react': [ '.', './lib/Button' ] }`
+ * Returns a mapping from dependency name to list of paths that are actually imported in the
+ * searched files. e.g. `{ '@fluentui/react': [ '.', './lib/Button' ] }`
  */
 export async function findImports(filePaths) {
     const requiredExports = {};

package/lib/utilities/findImports.js.map

@@ -1 +1 @@
-{"version":3,"file":"findImports.js","sourceRoot":"","sources":["../../src/utilities/findImports.ts"],"names":[],"mappings":"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","sourcesContent":["import { parse } from 'es-module-lexer';\nimport fsPromises from 'fs/promises';\nimport path from 'path';\nimport { parseImportString, type ImportStringResult } from '@ms-cloudpack/path-string-parsing';\nimport { builtinModules } from 'module';\n\n/**\n * Returns a dictionary where key is the package name and value is a set of required paths.\n * Eg. `{ '@fluentui/react': [ '.', './lib/Button' ] }`\n */\nexport async function findImports(filePaths: string[]): Promise<Record<string, string[]>> {\n  const requiredExports: Record<string, Set<string>> = {};\n  const visitedPaths = new Set(filePaths);\n  const pathsToParse: string[] = [...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 source = await fsPromises.readFile(filePath, 'utf-8');\n    let rawImports: ReturnType<typeof parse>[0];\n    try {\n      // es-module-lexer/parse may return Promise in some conditions\n      // although it is not declared in the type definition\n      // https://github.com/guybedford/es-module-lexer/issues/155\n      [rawImports] = await (parse(source) as unknown as Promise<ReturnType<typeof parse>>);\n    } catch (err) {\n      // This could happen if the source file isn't valid JS\n      // (unlikely after adding the check above to only attempt parsing JS/TS files)\n      console.warn(`Failed to parse ${filePath}:`, err, '\\nSource is:\\n', source);\n      continue;\n    }\n    const imports = Array.from(new Set(rawImports))\n      .map((i) => {\n        // The 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        //\n        //   import { Button } from '@fluentui/react/lib/Button';\n        //\n        // The \"n\" property would be \"@fluentui/react/lib/Button\".\n        // The \"s\" and \"e\" properties represent the start/end character positions of\n        // the import source. The \"ss\" and \"se\" properties represent the start/end\n        // character positions of the import specifier starting with \"import\". This\n        // may be useful for determining if the import is sync or async.\n        //\n        // Currently when the import source is a backtick string, the \"n\" property\n        // is undefined. This is a bug in es-module-lexer. We may need to handle this\n        // at the javascript layer and expand it into multiple potential imports.\n        if (!i.n) {\n          console.debug(\n            `Found an import that didn't parse correctly:\\nFilename:\\n${filePath}\\n\\nImport:\\n${source.slice(\n              i.s,\n              i.e,\n            )}`,\n          );\n          return undefined;\n        }\n\n        return parseImportString(i.n);\n      })\n      .filter(Boolean) as ImportStringResult[];\n\n    for (const { packageName, importPath } 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        }\n      } else if (packageName && !packageName.startsWith('node:') && !builtinModules.includes(packageName)) {\n        requiredExports[packageName] ??= new Set();\n        requiredExports[packageName].add(importPath || '.');\n      }\n    }\n  }\n\n  return Object.entries(requiredExports).reduce(\n    (acc, [packageName, importPaths]) => {\n      acc[packageName] = Array.from(importPaths);\n      return acc;\n    },\n    {} as Record<string, string[]>,\n  );\n}\n"]}
+{"version":3,"file":"findImports.js","sourceRoot":"","sources":["../../src/utilities/findImports.ts"],"names":[],"mappings":"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","sourcesContent":["import { parse } from 'es-module-lexer';\nimport fsPromises from 'fs/promises';\nimport path from 'path';\nimport { parseImportString, type ImportStringResult } from '@ms-cloudpack/path-string-parsing';\nimport { builtinModules } from 'module';\nimport type { DetectedImports } from '../types/DetectedImports.js';\n\n/**\n * Returns a mapping from dependency name to list of paths that are actually imported in the\n * searched files. e.g. `{ '@fluentui/react': [ '.', './lib/Button' ] }`\n */\nexport async function findImports(filePaths: string[]): Promise<DetectedImports> {\n  const requiredExports: Record<string, Set<string>> = {};\n  const visitedPaths = new Set(filePaths);\n  const pathsToParse: string[] = [...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 source = await fsPromises.readFile(filePath, 'utf-8');\n    let rawImports: ReturnType<typeof parse>[0];\n    try {\n      // es-module-lexer/parse may return Promise in some conditions\n      // although it is not declared in the type definition\n      // https://github.com/guybedford/es-module-lexer/issues/155\n      [rawImports] = await (parse(source) as unknown as Promise<ReturnType<typeof parse>>);\n    } catch (err) {\n      // This could happen if the source file isn't valid JS\n      // (unlikely after adding the check above to only attempt parsing JS/TS files)\n      console.warn(`Failed to parse ${filePath}:`, err, '\\nSource is:\\n', source);\n      continue;\n    }\n    const imports = Array.from(new Set(rawImports))\n      .map((i) => {\n        // The 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        //\n        //   import { Button } from '@fluentui/react/lib/Button';\n        //\n        // The \"n\" property would be \"@fluentui/react/lib/Button\".\n        // The \"s\" and \"e\" properties represent the start/end character positions of\n        // the import source. The \"ss\" and \"se\" properties represent the start/end\n        // character positions of the import specifier starting with \"import\". This\n        // may be useful for determining if the import is sync or async.\n        //\n        // Currently when the import source is a backtick string, the \"n\" property\n        // is undefined. This is a bug in es-module-lexer. We may need to handle this\n        // at the javascript layer and expand it into multiple potential imports.\n        if (!i.n) {\n          console.debug(\n            `Found an import that didn't parse correctly:\\nFilename:\\n${filePath}\\n\\nImport:\\n${source.slice(\n              i.s,\n              i.e,\n            )}`,\n          );\n          return undefined;\n        }\n\n        return parseImportString(i.n);\n      })\n      .filter(Boolean) as ImportStringResult[];\n\n    for (const { packageName, importPath } 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        }\n      } else if (packageName && !packageName.startsWith('node:') && !builtinModules.includes(packageName)) {\n        requiredExports[packageName] ??= new Set();\n        requiredExports[packageName].add(importPath || '.');\n      }\n    }\n  }\n\n  return Object.entries(requiredExports).reduce(\n    (acc, [packageName, importPaths]) => {\n      acc[packageName] = Array.from(importPaths);\n      return acc;\n    },\n    {} as Record<string, string[]>,\n  );\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"isCachedResultValid.d.ts","sourceRoot":"","sources":["../../src/utilities/isCachedResultValid.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D,UAAU,0BAA0B;IAClC,aAAa,EAAE,aAAa,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAmChF"}
+{"version":3,"file":"isCachedResultValid.d.ts","sourceRoot":"","sources":["../../src/utilities/isCachedResultValid.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D,UAAU,0BAA0B;IAClC,aAAa,EAAE,aAAa,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAwChF"}

package/lib/utilities/isCachedResultValid.js

@@ -6,7 +6,7 @@ import path from 'path';
  */
 export function isCachedResultValid(options) {
     const { bundleRequest, hash } = options;
-    const { disableCache, enableCacheInternalPackages, isExternal, result } = bundleRequest;
+    const { disableCache, shouldCacheInternalPackages, isExternal, result } = bundleRequest;
     if (disableCache) {
         // The result is not valid if disableCache is true.
         return false;
@@ -23,8 +23,12 @@ export function isCachedResultValid(options) {
         // outputPath used to be an optional field, however, we do not want it to be undefined anymore.
         return false;
     }
-    if (enableCacheInternalPackages && !isExternal && result.hash !== hash) {
-        // The package is internal, enableCacheInternalPackages is enabled but hashes do not match, this is an invalid result.
+    if (!shouldCacheInternalPackages && !isExternal) {
+        // The package is internal, shouldCacheInternalPackages is disabled, this is an invalid result.
+        return false;
+    }
+    if (!isExternal && (result.hash == undefined || result.hash != hash)) {
+        // Internal packages are invalid if the package hash has changed or it is undefined.
         return false;
     }
     // Output files must be relative

package/lib/utilities/isCachedResultValid.js.map

@@ -1 +1 @@
-{"version":3,"file":"isCachedResultValid.js","sourceRoot":"","sources":["../../src/utilities/isCachedResultValid.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAQxB;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAmC;IACrE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACxC,MAAM,EAAE,YAAY,EAAE,2BAA2B,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAExF,IAAI,YAAY,EAAE;QAChB,mDAAmD;QACnD,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,MAAM,EAAE;QACX,oDAAoD;QACpD,OAAO,KAAK,CAAC;KACd;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE;QACzB,6CAA6C;QAC7C,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,+FAA+F;QAC/F,OAAO,KAAK,CAAC;KACd;IAED,IAAI,2BAA2B,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;QACtE,sHAAsH;QACtH,OAAO,KAAK,CAAC;KACd;IAED,gCAAgC;IAChC,IAAI,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAAE;QAC7E,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import path from 'path';\nimport type { BundleRequest } from '../types/BundleRequest.js';\n\ninterface IsCachedResultValidOptions {\n  bundleRequest: BundleRequest;\n  hash?: string;\n}\n\n/**\n * Validates the result of a bundle request.\n * @param options - The options to use when validating the result.\n * @returns True if the result is valid, false otherwise.\n */\nexport function isCachedResultValid(options: IsCachedResultValidOptions): boolean {\n  const { bundleRequest, hash } = options;\n  const { disableCache, enableCacheInternalPackages, isExternal, result } = bundleRequest;\n\n  if (disableCache) {\n    // The result is not valid if disableCache is true.\n    return false;\n  }\n\n  if (!result) {\n    // The result is undefined, so the result is invalid\n    return false;\n  }\n\n  if (result.errors?.length) {\n    // There are errors, so the result is invalid\n    return false;\n  }\n\n  if (!result.outputPath) {\n    // outputPath used to be an optional field, however, we do not want it to be undefined anymore.\n    return false;\n  }\n\n  if (enableCacheInternalPackages && !isExternal && result.hash !== hash) {\n    // The package is internal, enableCacheInternalPackages is enabled but hashes do not match, this is an invalid result.\n    return false;\n  }\n\n  // Output files must be relative\n  if (result.outputFiles?.find(({ outputPath }) => path.isAbsolute(outputPath))) {\n    return false;\n  }\n\n  return true;\n}\n"]}
+{"version":3,"file":"isCachedResultValid.js","sourceRoot":"","sources":["../../src/utilities/isCachedResultValid.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAQxB;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAmC;IACrE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACxC,MAAM,EAAE,YAAY,EAAE,2BAA2B,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAExF,IAAI,YAAY,EAAE;QAChB,mDAAmD;QACnD,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,MAAM,EAAE;QACX,oDAAoD;QACpD,OAAO,KAAK,CAAC;KACd;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE;QACzB,6CAA6C;QAC7C,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,+FAA+F;QAC/F,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,2BAA2B,IAAI,CAAC,UAAU,EAAE;QAC/C,+FAA+F;QAC/F,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,SAAS,IAAI,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE;QACpE,oFAAoF;QACpF,OAAO,KAAK,CAAC;KACd;IAED,gCAAgC;IAChC,IAAI,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAAE;QAC7E,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import path from 'path';\nimport type { BundleRequest } from '../types/BundleRequest.js';\n\ninterface IsCachedResultValidOptions {\n  bundleRequest: BundleRequest;\n  hash?: string;\n}\n\n/**\n * Validates the result of a bundle request.\n * @param options - The options to use when validating the result.\n * @returns True if the result is valid, false otherwise.\n */\nexport function isCachedResultValid(options: IsCachedResultValidOptions): boolean {\n  const { bundleRequest, hash } = options;\n  const { disableCache, shouldCacheInternalPackages, isExternal, result } = bundleRequest;\n\n  if (disableCache) {\n    // The result is not valid if disableCache is true.\n    return false;\n  }\n\n  if (!result) {\n    // The result is undefined, so the result is invalid\n    return false;\n  }\n\n  if (result.errors?.length) {\n    // There are errors, so the result is invalid\n    return false;\n  }\n\n  if (!result.outputPath) {\n    // outputPath used to be an optional field, however, we do not want it to be undefined anymore.\n    return false;\n  }\n\n  if (!shouldCacheInternalPackages && !isExternal) {\n    // The package is internal, shouldCacheInternalPackages is disabled, this is an invalid result.\n    return false;\n  }\n\n  if (!isExternal && (result.hash == undefined || result.hash != hash)) {\n    // Internal packages are invalid if the package hash has changed or it is undefined.\n    return false;\n  }\n\n  // Output files must be relative\n  if (result.outputFiles?.find(({ outputPath }) => path.isAbsolute(outputPath))) {\n    return false;\n  }\n\n  return true;\n}\n"]}

package/lib/utilities/matchingZodObject.d.ts

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+/**
+ * Zod shape object matching type `T`, with any optional properties remapped to required properties
+ * with type `originalType | undefined`.
+ */
+type MatchingZodShape<T extends object> = {
+    [k in keyof Required<T>]: z.ZodType<T[k]>;
+};
+/**
+ * Get a Zod object that strictly matches the expected type, including any optional properties.
+ */
+export declare function matchingZodObject<Expected extends object>(shape: MatchingZodShape<Expected>): z.ZodObject<MatchingZodShape<Expected>, "strict", z.ZodTypeAny, Expected, Expected>;
+export {};
+//# sourceMappingURL=matchingZodObject.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"matchingZodObject.d.ts","sourceRoot":"","sources":["../../src/utilities/matchingZodObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,KAAK,gBAAgB,CAAC,CAAC,SAAS,MAAM,IAAI;KACvC,CAAC,IAAI,MAAM,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC1C,CAAC;AAEF;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,SAAS,MAAM,EAAE,KAAK,EAAE,gBAAgB,CAAC,QAAQ,CAAC,uFAG3F"}

package/lib/utilities/matchingZodObject.js

@@ -0,0 +1,9 @@
+import { z } from 'zod';
+/**
+ * Get a Zod object that strictly matches the expected type, including any optional properties.
+ */
+export function matchingZodObject(shape) {
+    // Cast the return value to convert back to the original type with optional properties
+    return z.object(shape).strict();
+}
+//# sourceMappingURL=matchingZodObject.js.map

package/lib/utilities/matchingZodObject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"matchingZodObject.js","sourceRoot":"","sources":["../../src/utilities/matchingZodObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAUxB;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAA0B,KAAiC;IAC1F,sFAAsF;IACtF,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAA2E,CAAC;AAC3G,CAAC","sourcesContent":["import { z } from 'zod';\n\n/**\n * Zod shape object matching type `T`, with any optional properties remapped to required properties\n * with type `originalType | undefined`.\n */\ntype MatchingZodShape<T extends object> = {\n  [k in keyof Required<T>]: z.ZodType<T[k]>;\n};\n\n/**\n * Get a Zod object that strictly matches the expected type, including any optional properties.\n */\nexport function matchingZodObject<Expected extends object>(shape: MatchingZodShape<Expected>) {\n  // Cast the return value to convert back to the original type with optional properties\n  return z.object(shape).strict() as z.ZodObject<typeof shape, 'strict', z.ZodTypeAny, Expected, Expected>;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.25.2",
+  "version": "0.26.1",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -28,22 +28,22 @@
     "@lage-run/scheduler": "^1.1.9",
     "@lage-run/target-graph": "^0.8.7",
     "@lage-run/hasher": "^1.0.5",
-    "@ms-cloudpack/bundler": "^0.15.5",
+    "@ms-cloudpack/bundler": "^0.15.7",
     "@ms-cloudpack/bundler-types": "^0.20.0",
-    "@ms-cloudpack/config": "^0.14.7",
+    "@ms-cloudpack/config": "^0.14.8",
     "@ms-cloudpack/create-express-app": "^1.3.12",
     "@ms-cloudpack/data-bus": "^0.4.1",
     "@ms-cloudpack/file-watcher": "^0.1.1",
-    "@ms-cloudpack/json-utilities": "^0.0.8",
-    "@ms-cloudpack/package-hashes": "^0.1.0",
-    "@ms-cloudpack/package-utilities": "^5.3.1",
+    "@ms-cloudpack/json-utilities": "^0.1.0",
+    "@ms-cloudpack/package-hashes": "^0.1.1",
+    "@ms-cloudpack/package-utilities": "^5.3.2",
     "@ms-cloudpack/path-string-parsing": "^1.1.1",
     "@ms-cloudpack/path-utilities": "^2.3.5",
     "@ms-cloudpack/task-reporter": "^0.10.0",
     "@ms-cloudpack/telemetry": "^0.4.3",
     "@ms-cloudpack/remote-cache": "^0.1.15",
-    "@trpc/client": "^10.40.0",
-    "@trpc/server": "^10.40.0",
+    "@trpc/client": "^10.41.0",
+    "@trpc/server": "^10.41.0",
     "cors": "^2.8.5",
     "es-module-lexer": "^1.0.3",
     "fast-glob": "^3.2.12",