@ms-cloudpack/api-server 0.36.0 → 0.37.1

package/lib/utilities/getBundleInfo.js

@@ -7,9 +7,7 @@ import { getImportsAndExports } from './getImportsAndExports.js';
  */
 export async function getBundleInfo(params) {
     const { outputPath, outputFiles, exportsMap, isExternal } = params;
-    const bundleInfo = {
-        entry: {},
-    };
+    const bundleInfo = {};
     // If there are no output files, return the empty bundle info.
     if (!outputFiles.length) {
         return bundleInfo;
@@ -54,7 +52,7 @@ export async function getBundleInfo(params) {
             continue;
         }
         const safePath = localPathToSafe[filePath];
-        if (safePath === undefined) {
+        if (safePath === undefined || !outputFileInfo[safePath]) {
             throw new Error(`Found file that was not expected to be processed: ${filePath}`);
         }
         const parseResult = await getImportsAndExports(filePath);
@@ -62,12 +60,9 @@ export async function getBundleInfo(params) {
             continue;
         }
         const { exportNames, imports } = parseResult;
-        const { entry, produces } = outputFileInfo[safePath] || {
-            entry: safePath,
-            produces: new Set(),
-        };
+        const { entry, produces } = outputFileInfo[safePath];
         exportNames.forEach((name) => produces.add(name));
-        bundleInfo.entry[entry] ??= {
+        bundleInfo[entry] ??= {
             bundlePath: safePath,
             produces: Array.from(produces),
             consumes: [],
@@ -83,15 +78,19 @@ export async function getBundleInfo(params) {
             }
             else if (packageName && !packageName.startsWith('node:')) {
                 // Find if the import is already in the consumes list.
-                const entryIndex = bundleInfo.entry[entry].consumes.findIndex((c) => c.packageName === packageName && c.importPath === importPath);
+                const entryIndex = bundleInfo[entry].consumes.findIndex((c) => c.packageName === packageName && c.importPath === importPath);
                 if (entryIndex < 0) {
                     // If not, add it.
-                    bundleInfo.entry[entry].consumes.push({ packageName, importPath: importPath || '.', names: [...names] });
+                    bundleInfo[entry].consumes.push({
+                        packageName: packageName,
+                        importPath: importPath || '.',
+                        names: [...names],
+                    });
                 }
                 else {
                     // If so, add the names to the existing entry.
                     // This is necessary because the same import may be used in multiple places.
-                    bundleInfo.entry[entry].consumes[entryIndex].names = Array.from(new Set([...names, ...bundleInfo.entry[entry].consumes[entryIndex].names]));
+                    bundleInfo[entry].consumes[entryIndex].names = Array.from(new Set([...names, ...bundleInfo[entry].consumes[entryIndex].names]));
                 }
             }
         }
@@ -99,7 +98,7 @@ export async function getBundleInfo(params) {
             // Multiple entries for the same path.
             for (const repeatedEntry of repeatedExports[safePath]) {
                 if (repeatedEntry !== entry) {
-                    bundleInfo.entry[repeatedEntry] = bundleInfo.entry[entry];
+                    bundleInfo[repeatedEntry] = bundleInfo[entry];
                 }
             }
         }

package/lib/utilities/getBundleInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"getBundleInfo.js","sourceRoot":"","sources":["../../src/utilities/getBundleInfo.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleOutputFile, PackageJsonExports } from '@ms-cloudpack/common-types';\nimport { getRuntimeEntryPaths } from '@ms-cloudpack/import-map';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport type { BundleInfo } from '../types/BundleInfo.js';\nimport { getImportsAndExports } from './getImportsAndExports.js';\n/**\n * Returns a mapping from entry file path to list of paths that are produced and consumed in the searched files.\n */\nexport async function getBundleInfo(params: {\n  outputPath: string;\n  outputFiles: BundleOutputFile[];\n  exportsMap: PackageJsonExports;\n  isExternal: boolean;\n}): Promise<BundleInfo> {\n  const { outputPath, outputFiles, exportsMap, isExternal } = params;\n  const bundleInfo: BundleInfo = {\n    entry: {},\n  };\n\n  // If there are no output files, return the empty bundle info.\n  if (!outputFiles.length) {\n    return bundleInfo;\n  }\n\n  /** Mapping from output file (safe/normalized relative path) to possible entry path and exports. */\n  const outputFileInfo: Record<string, { entry: string; produces: Set<string> }> = {};\n  outputFiles.forEach((file) => {\n    // Normalize the path to start with ./ (or . for an empty path)\n    const safePath = normalizeRelativePath(file.outputPath);\n    // Store safe path to possible entry path and exports.\n    outputFileInfo[safePath] = {\n      entry: safePath,\n      produces: new Set<string>(file.exports),\n    };\n  });\n\n  const repeatedExports: Record<string, string[]> = {};\n  const entryPaths = getRuntimeEntryPaths({ isExternal, exportsMap });\n\n  for (const [importPath, actualEntryPath] of Object.entries(entryPaths)) {\n    const safePath = normalizeRelativePath(actualEntryPath);\n\n    if (outputFileInfo[safePath]) {\n      if (repeatedExports[safePath]) {\n        repeatedExports[safePath].push(importPath);\n      } else {\n        // Change best guess entry path to exports map entry.\n        outputFileInfo[safePath].entry = importPath;\n        repeatedExports[safePath] = [importPath];\n      }\n    }\n  }\n\n  const localPathToSafe: Record<string, string> = {};\n  Object.keys(outputFileInfo).forEach((safePath) => {\n    localPathToSafe[path.resolve(outputPath, safePath)] = safePath;\n  });\n\n  const filePaths = Object.keys(localPathToSafe);\n  const visitedPaths = new Set(filePaths);\n  const pathsToParse = [...filePaths];\n\n  while (pathsToParse.length) {\n    const filePath = pathsToParse.shift();\n    // Ignore any non-JS/TS files such as SVGs and sourcemaps\n    if (!filePath || path.extname(filePath) !== '.js') {\n      continue;\n    }\n\n    const safePath = localPathToSafe[filePath];\n    if (safePath === undefined) {\n      throw new Error(`Found file that was not expected to be processed: ${filePath}`);\n    }\n\n    const parseResult = await getImportsAndExports(filePath);\n    if (!parseResult) {\n      continue;\n    }\n    const { exportNames, imports } = parseResult;\n\n    const { entry, produces } = outputFileInfo[safePath] || {\n      entry: safePath,\n      produces: new Set<string>(),\n    };\n    exportNames.forEach((name) => produces.add(name));\n\n    bundleInfo.entry[entry] ??= {\n      bundlePath: safePath,\n      produces: Array.from(produces),\n      consumes: [],\n    };\n\n    for (const { packageName, importPath, names } of imports) {\n      if (packageName?.startsWith('.')) {\n        const localPath = path.resolve(path.dirname(filePath), packageName, importPath || '');\n\n        if (!visitedPaths.has(localPath)) {\n          visitedPaths.add(localPath);\n          pathsToParse.push(localPath);\n          localPathToSafe[localPath] = importPath;\n        }\n      } else if (packageName && !packageName.startsWith('node:')) {\n        // Find if the import is already in the consumes list.\n        const entryIndex = bundleInfo.entry[entry].consumes.findIndex(\n          (c) => c.packageName === packageName && c.importPath === importPath,\n        );\n        if (entryIndex < 0) {\n          // If not, add it.\n          bundleInfo.entry[entry].consumes.push({ packageName, importPath: importPath || '.', names: [...names] });\n        } else {\n          // If so, add the names to the existing entry.\n          // This is necessary because the same import may be used in multiple places.\n          bundleInfo.entry[entry].consumes[entryIndex].names = Array.from(\n            new Set([...names, ...bundleInfo.entry[entry].consumes[entryIndex].names]),\n          );\n        }\n      }\n    }\n    if (repeatedExports[safePath]?.length > 1) {\n      // Multiple entries for the same path.\n      for (const repeatedEntry of repeatedExports[safePath]) {\n        if (repeatedEntry !== entry) {\n          bundleInfo.entry[repeatedEntry] = bundleInfo.entry[entry];\n        }\n      }\n    }\n  }\n\n  return bundleInfo;\n}\n"]}
+{"version":3,"file":"getBundleInfo.js","sourceRoot":"","sources":["../../src/utilities/getBundleInfo.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleOutputFile, PackageJsonExports } from '@ms-cloudpack/common-types';\nimport { getRuntimeEntryPaths } from '@ms-cloudpack/import-map';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport type { BundleInfo } from '../types/BundleInfo.js';\nimport { getImportsAndExports } from './getImportsAndExports.js';\n/**\n * Returns a mapping from entry file path to list of paths that are produced and consumed in the searched files.\n */\nexport async function getBundleInfo(params: {\n  outputPath: string;\n  outputFiles: BundleOutputFile[];\n  exportsMap: PackageJsonExports;\n  isExternal: boolean;\n}): Promise<BundleInfo> {\n  const { outputPath, outputFiles, exportsMap, isExternal } = params;\n  const bundleInfo: BundleInfo = {};\n\n  // If there are no output files, return the empty bundle info.\n  if (!outputFiles.length) {\n    return bundleInfo;\n  }\n\n  /** Mapping from output file (safe/normalized relative path) to possible entry path and exports. */\n  const outputFileInfo: Record<string, { entry: string; produces: Set<string> }> = {};\n  outputFiles.forEach((file) => {\n    // Normalize the path to start with ./ (or . for an empty path)\n    const safePath = normalizeRelativePath(file.outputPath);\n    // Store safe path to possible entry path and exports.\n    outputFileInfo[safePath] = {\n      entry: safePath,\n      produces: new Set<string>(file.exports),\n    };\n  });\n\n  const repeatedExports: Record<string, string[]> = {};\n  const entryPaths = getRuntimeEntryPaths({ isExternal, exportsMap });\n\n  for (const [importPath, actualEntryPath] of Object.entries(entryPaths)) {\n    const safePath = normalizeRelativePath(actualEntryPath);\n\n    if (outputFileInfo[safePath]) {\n      if (repeatedExports[safePath]) {\n        repeatedExports[safePath].push(importPath);\n      } else {\n        // Change best guess entry path to exports map entry.\n        outputFileInfo[safePath].entry = importPath;\n        repeatedExports[safePath] = [importPath];\n      }\n    }\n  }\n\n  const localPathToSafe: Record<string, string> = {};\n  Object.keys(outputFileInfo).forEach((safePath) => {\n    localPathToSafe[path.resolve(outputPath, safePath)] = safePath;\n  });\n\n  const filePaths = Object.keys(localPathToSafe);\n  const visitedPaths = new Set(filePaths);\n  const pathsToParse = [...filePaths];\n\n  while (pathsToParse.length) {\n    const filePath = pathsToParse.shift();\n    // Ignore any non-JS/TS files such as SVGs and sourcemaps\n    if (!filePath || path.extname(filePath) !== '.js') {\n      continue;\n    }\n\n    const safePath = localPathToSafe[filePath];\n    if (safePath === undefined || !outputFileInfo[safePath]) {\n      throw new Error(`Found file that was not expected to be processed: ${filePath}`);\n    }\n\n    const parseResult = await getImportsAndExports(filePath);\n    if (!parseResult) {\n      continue;\n    }\n    const { exportNames, imports } = parseResult;\n\n    const { entry, produces } = outputFileInfo[safePath];\n    exportNames.forEach((name) => produces.add(name));\n\n    bundleInfo[entry] ??= {\n      bundlePath: safePath,\n      produces: Array.from(produces),\n      consumes: [],\n    };\n\n    for (const { packageName, importPath, names } of imports) {\n      if (packageName?.startsWith('.')) {\n        const localPath = path.resolve(path.dirname(filePath), packageName, importPath || '');\n\n        if (!visitedPaths.has(localPath)) {\n          visitedPaths.add(localPath);\n          pathsToParse.push(localPath);\n          localPathToSafe[localPath] = importPath;\n        }\n      } else if (packageName && !packageName.startsWith('node:')) {\n        // Find if the import is already in the consumes list.\n        const entryIndex = bundleInfo[entry].consumes.findIndex(\n          (c) => c.packageName === packageName && c.importPath === importPath,\n        );\n        if (entryIndex < 0) {\n          // If not, add it.\n          bundleInfo[entry].consumes.push({\n            packageName: packageName,\n            importPath: importPath || '.',\n            names: [...names],\n          });\n        } else {\n          // If so, add the names to the existing entry.\n          // This is necessary because the same import may be used in multiple places.\n          bundleInfo[entry].consumes[entryIndex].names = Array.from(\n            new Set([...names, ...bundleInfo[entry].consumes[entryIndex].names]),\n          );\n        }\n      }\n    }\n    if (repeatedExports[safePath]?.length > 1) {\n      // Multiple entries for the same path.\n      for (const repeatedEntry of repeatedExports[safePath]) {\n        if (repeatedEntry !== entry) {\n          bundleInfo[repeatedEntry] = bundleInfo[entry];\n        }\n      }\n    }\n  }\n\n  return bundleInfo;\n}\n"]}

package/lib/utilities/getConsumedDependencies.js

@@ -6,8 +6,8 @@
 export function getConsumedDependencies(info) {
     const consumedDependencies = new Set();
     // Iterate through imports and find their path from the resolve map.
-    for (const entryInfo of Object.values(info.entry)) {
-        // iterate through all package names of result.info.entry.consumes
+    for (const entryInfo of Object.values(info)) {
+        // iterate through all package names of result.info.consumes
         for (const consume of entryInfo.consumes) {
             consumedDependencies.add(consume.packageName);
         }

package/lib/utilities/getConsumedDependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"getConsumedDependencies.js","sourceRoot":"","sources":["../../src/utilities/getConsumedDependencies.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAAgB;IACtD,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/C,oEAAoE;IACpE,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,kEAAkE;QAClE,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACzC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC","sourcesContent":["import type { BundleInfo } from '../types/BundleInfo.js';\n\n/**\n * Get the set of dependencies consumed by the given bundle info.\n * @param info - The bundle info.\n * @returns The deduplicated set of dependencies consumed by the given bundle info.\n */\nexport function getConsumedDependencies(info: BundleInfo) {\n  const consumedDependencies = new Set<string>();\n  // Iterate through imports and find their path from the resolve map.\n  for (const entryInfo of Object.values(info.entry)) {\n    // iterate through all package names of result.info.entry.consumes\n    for (const consume of entryInfo.consumes) {\n      consumedDependencies.add(consume.packageName);\n    }\n  }\n\n  return consumedDependencies;\n}\n"]}
+{"version":3,"file":"getConsumedDependencies.js","sourceRoot":"","sources":["../../src/utilities/getConsumedDependencies.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAAgB;IACtD,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/C,oEAAoE;IACpE,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,4DAA4D;QAC5D,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACzC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC","sourcesContent":["import type { BundleInfo } from '../types/BundleInfo.js';\n\n/**\n * Get the set of dependencies consumed by the given bundle info.\n * @param info - The bundle info.\n * @returns The deduplicated set of dependencies consumed by the given bundle info.\n */\nexport function getConsumedDependencies(info: BundleInfo) {\n  const consumedDependencies = new Set<string>();\n  // Iterate through imports and find their path from the resolve map.\n  for (const entryInfo of Object.values(info)) {\n    // iterate through all package names of result.info.consumes\n    for (const consume of entryInfo.consumes) {\n      consumedDependencies.add(consume.packageName);\n    }\n  }\n\n  return consumedDependencies;\n}\n"]}

package/lib/utilities/getConsumedPaths.js

@@ -6,8 +6,8 @@
 export function getConsumedPaths(info) {
     const consumedPaths = {};
     // Iterate through imports and find their path from the resolve map.
-    for (const entryInfo of Object.values(info.entry)) {
-        // iterate through all package names of result.info.entry.consumes
+    for (const entryInfo of Object.values(info)) {
+        // iterate through all package names of result.info.consumes
         for (const consume of entryInfo.consumes) {
             consumedPaths[consume.packageName] ??= new Set();
             consumedPaths[consume.packageName].add(consume.importPath);

package/lib/utilities/getConsumedPaths.js.map

@@ -1 +1 @@
-{"version":3,"file":"getConsumedPaths.js","sourceRoot":"","sources":["../../src/utilities/getConsumedPaths.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAgB;IAC/C,MAAM,aAAa,GAAgC,EAAE,CAAC;IACtD,oEAAoE;IACpE,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,kEAAkE;QAClE,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACzC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,GAAG,EAAE,CAAC;YACjD,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC","sourcesContent":["import type { BundleInfo } from '../types/BundleInfo.js';\n\n/**\n * Get a record of the consumed dependencies and their import paths by the given bundle info.\n * @param info - The bundle info.\n * @returns The record of consumed dependencies and their import paths.\n */\nexport function getConsumedPaths(info: BundleInfo) {\n  const consumedPaths: Record<string, Set<string>> = {};\n  // Iterate through imports and find their path from the resolve map.\n  for (const entryInfo of Object.values(info.entry)) {\n    // iterate through all package names of result.info.entry.consumes\n    for (const consume of entryInfo.consumes) {\n      consumedPaths[consume.packageName] ??= new Set();\n      consumedPaths[consume.packageName].add(consume.importPath);\n    }\n  }\n\n  return consumedPaths;\n}\n"]}
+{"version":3,"file":"getConsumedPaths.js","sourceRoot":"","sources":["../../src/utilities/getConsumedPaths.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAgB;IAC/C,MAAM,aAAa,GAAgC,EAAE,CAAC;IACtD,oEAAoE;IACpE,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,4DAA4D;QAC5D,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACzC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,GAAG,EAAE,CAAC;YACjD,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC","sourcesContent":["import type { BundleInfo } from '../types/BundleInfo.js';\n\n/**\n * Get a record of the consumed dependencies and their import paths by the given bundle info.\n * @param info - The bundle info.\n * @returns The record of consumed dependencies and their import paths.\n */\nexport function getConsumedPaths(info: BundleInfo) {\n  const consumedPaths: Record<string, Set<string>> = {};\n  // Iterate through imports and find their path from the resolve map.\n  for (const entryInfo of Object.values(info)) {\n    // iterate through all package names of result.info.consumes\n    for (const consume of entryInfo.consumes) {\n      consumedPaths[consume.packageName] ??= new Set();\n      consumedPaths[consume.packageName].add(consume.importPath);\n    }\n  }\n\n  return consumedPaths;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.36.0",
+  "version": "0.37.1",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -27,20 +27,20 @@
     "@lage-run/logger": "^1.3.0",
     "@lage-run/scheduler": "^1.1.9",
     "@lage-run/target-graph": "^0.8.9",
-    "@ms-cloudpack/bundler": "^0.19.2",
-    "@ms-cloudpack/common-types": "^0.2.1",
-    "@ms-cloudpack/config": "^0.19.0",
-    "@ms-cloudpack/create-express-app": "^1.6.2",
+    "@ms-cloudpack/bundler": "^0.19.4",
+    "@ms-cloudpack/common-types": "^0.2.3",
+    "@ms-cloudpack/config": "^0.19.2",
+    "@ms-cloudpack/create-express-app": "^1.6.4",
     "@ms-cloudpack/data-bus": "^0.4.2",
     "@ms-cloudpack/file-watcher": "^0.1.2",
-    "@ms-cloudpack/import-map": "^0.2.2",
+    "@ms-cloudpack/import-map": "^0.2.4",
     "@ms-cloudpack/json-utilities": "^0.1.4",
-    "@ms-cloudpack/package-hashes": "^0.5.2",
-    "@ms-cloudpack/package-utilities": "^7.1.2",
+    "@ms-cloudpack/package-hashes": "^0.5.4",
+    "@ms-cloudpack/package-utilities": "^7.1.4",
     "@ms-cloudpack/path-string-parsing": "^1.2.1",
-    "@ms-cloudpack/path-utilities": "^2.6.1",
-    "@ms-cloudpack/remote-cache": "^0.6.3",
-    "@ms-cloudpack/task-reporter": "^0.12.0",
+    "@ms-cloudpack/path-utilities": "^2.7.1",
+    "@ms-cloudpack/remote-cache": "^0.6.5",
+    "@ms-cloudpack/task-reporter": "^0.13.1",
     "@ms-cloudpack/telemetry": "^0.5.1",
     "@trpc/client": "^10.45.0",
     "@trpc/server": "^10.45.0",

package/lib/utilities/formatBundleErrors.d.ts

@@ -1,9 +0,0 @@
-import type { BundleMessage } from '@ms-cloudpack/common-types';
-export declare function formatBundleErrors(errors: BundleMessage[] | undefined): {
-    message?: undefined;
-    details?: undefined;
-} | {
-    message: string;
-    details: string;
-};
-//# sourceMappingURL=formatBundleErrors.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"formatBundleErrors.d.ts","sourceRoot":"","sources":["../../src/utilities/formatBundleErrors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAGhE,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,SAAS;;;;;;EAOrE"}

package/lib/utilities/formatBundleErrors.js

@@ -1,15 +0,0 @@
-import { darkGrey, red, bulletedList, plural } from '@ms-cloudpack/task-reporter';
-export function formatBundleErrors(errors) {
-    if (!errors?.length)
-        return {};
-    return {
-        message: plural(errors.length, 'error$s found'),
-        details: bulletedList(errors.map((error) => formatError(error))),
-    };
-}
-function formatError(error) {
-    const { text, source, location } = error;
-    const fileLocation = location && darkGrey(`${location.file}:${location.line}:${location.column}`);
-    return [`[${source}]`, fileLocation, red(text)].filter(Boolean).join(' ');
-}
-//# sourceMappingURL=formatBundleErrors.js.map

package/lib/utilities/formatBundleErrors.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"formatBundleErrors.js","sourceRoot":"","sources":["../../src/utilities/formatBundleErrors.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAElF,MAAM,UAAU,kBAAkB,CAAC,MAAmC;IACpE,IAAI,CAAC,MAAM,EAAE,MAAM;QAAE,OAAO,EAAE,CAAC;IAE/B,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;QAC/C,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;KACjE,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAoB;IACvC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAEzC,MAAM,YAAY,GAAG,QAAQ,IAAI,QAAQ,CAAC,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAClG,OAAO,CAAC,IAAI,MAAM,GAAG,EAAE,YAAY,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5E,CAAC","sourcesContent":["import type { BundleMessage } from '@ms-cloudpack/common-types';\nimport { darkGrey, red, bulletedList, plural } from '@ms-cloudpack/task-reporter';\n\nexport function formatBundleErrors(errors: BundleMessage[] | undefined) {\n  if (!errors?.length) return {};\n\n  return {\n    message: plural(errors.length, 'error$s found'),\n    details: bulletedList(errors.map((error) => formatError(error))),\n  };\n}\n\nfunction formatError(error: BundleMessage) {\n  const { text, source, location } = error;\n\n  const fileLocation = location && darkGrey(`${location.file}:${location.line}:${location.column}`);\n  return [`[${source}]`, fileLocation, red(text)].filter(Boolean).join(' ');\n}\n"]}