@mui/internal-code-infra 0.0.4-canary.116 → 0.0.4-canary.118

package/build/utils/build.d.mts

@@ -107,18 +107,3 @@ export declare function markFn<F extends () => Promise<any>>(label: string, fn:
  * @param {string} label
  */
 export declare function measureFn(label: string): PerformanceMeasure;
-/**
- * A utility to map a function over an array of items in a worker pool.
- *
- * This function will create a pool of workers and distribute the items to be processed among them.
- * Each worker will process items sequentially, but multiple workers will run in parallel.
- *
- * @function
- * @template T
- * @template R
- * @param {T[]} items
- * @param {(item: T) => Promise<R>} mapper
- * @param {number} concurrency
- * @returns {Promise<(R|Error)[]>}
- */
-export declare function mapConcurrently<T, R>(items: T[], mapper: (item: T) => Promise<R>, concurrency: number): Promise<(R | Error)[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.0.4-canary.116",
+  "version": "0.0.4-canary.118",
   "author": "MUI Team",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "license": "MIT",
@@ -70,7 +70,7 @@
     "@mui/internal-babel-plugin-display-name": "1.0.4-canary.24",
     "@mui/internal-babel-plugin-minify-errors": "2.0.8-canary.31",
     "@mui/internal-babel-plugin-resolve-imports": "2.0.7-canary.44",
-    "@napi-rs/keyring": "^1.3.0",
+    "@napi-rs/keyring": "^2.0.0",
     "@octokit/auth-action": "^6.0.3",
     "@octokit/oauth-methods": "^6.0.5",
     "@octokit/rest": "^22.0.1",
@@ -187,7 +187,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitSha": "090afd6535535ba4bd6d39958578e5380e48bec2",
+  "gitSha": "846b7b8f4d88160e7afd463516f4b8b2d97d2326",
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
     "typescript": "tsc -noEmit",

package/src/cli/cmdBuild.mjs

@@ -5,13 +5,13 @@ import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 import { sep as posixSep } from 'node:path/posix';
 import * as semver from 'semver';
+import { mapAsync } from 'es-toolkit/array';
 
 import {
   createPackageBin,
   createPackageExports,
   createPackageImports,
   getOutExtension,
-  mapConcurrently,
   validatePkgJson,
 } from '../utils/build.mjs';
 import { readPnpmConfig } from '../utils/pnpm.mjs';
@@ -478,7 +478,7 @@ async function copyHandler({ cwd, globs = [], buildDir, verbose = false }) {
       console.log('⓿ No files to copy.');
     }
   }
-  await mapConcurrently(
+  await mapAsync(
     defaultFiles,
     async (file) => {
       if (typeof file === 'string') {
@@ -491,7 +491,7 @@ async function copyHandler({ cwd, globs = [], buildDir, verbose = false }) {
         await recursiveCopy({ source: file.sourcePath, target: file.targetPath, verbose });
       }
     },
-    20,
+    { concurrency: 20 },
   );
   console.log(`📋 Copied ${defaultFiles.length} files.`);
 }

package/src/cli/cmdCopyFiles.mjs

@@ -2,7 +2,7 @@ import { findWorkspaceDir } from '@pnpm/find-workspace-dir';
 import { globby } from 'globby';
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { mapConcurrently } from '../utils/build.mjs';
+import { mapAsync } from 'es-toolkit/array';
 
 /**
  * @typedef {Object} Args
@@ -106,12 +106,12 @@ async function processGlobs({ globs, cwd, silent = true, buildDir }) {
     });
   });
 
-  await mapConcurrently(
+  await mapAsync(
     filesToProcess,
     async (file) => {
       await recursiveCopy({ source: file.sourcePath, target: file.targetPath, silent });
     },
-    50,
+    { concurrency: 50 },
   );
   return filesToProcess.length;
 }

package/src/cli/cmdVale.mjs

@@ -7,7 +7,7 @@ import * as path from 'node:path';
 import { pipeline } from 'node:stream/promises';
 import { findWorkspaceDir } from '@pnpm/find-workspace-dir';
 import { $ } from 'execa';
-import { mapConcurrently } from '../utils/build.mjs';
+import { mapAsync } from 'es-toolkit/array';
 
 const LATEST_RELEASE_URL = 'https://api.github.com/repos/vale-cli/vale/releases/latest';
 
@@ -342,7 +342,7 @@ export function getReplacementText(alert) {
 export async function applyFixes(results, fixLevel) {
   const entries = Object.entries(results);
 
-  const perFileResults = await mapConcurrently(
+  const perFileResults = await mapAsync(
     entries,
     async ([filePath, alerts]) => {
       const content = await fs.readFile(filePath, 'utf-8');
@@ -406,15 +406,12 @@ export async function applyFixes(results, fixLevel) {
 
       return { fixed: fileFixed, skipped: alerts.length - fixableAlerts.length };
     },
-    10,
+    { concurrency: 10 },
   );
 
   let fixed = 0;
   let skipped = 0;
   for (const result of perFileResults) {
-    if (result instanceof Error) {
-      throw result;
-    }
     fixed += result.fixed;
     skipped += result.skipped;
   }

package/src/cli/cmdValidateBuiltTypes.mjs

@@ -2,8 +2,7 @@
 import { globby } from 'globby';
 import * as fs from 'node:fs/promises';
 import { findWorkspaceDir } from '@pnpm/find-workspace-dir';
-
-import { mapConcurrently } from '../utils/build.mjs';
+import { mapAsync } from 'es-toolkit/array';
 
 const DYNAMIC_PACKAGES_IMPORT_REGEX = /import\((['"])packages\//gm;
 
@@ -22,14 +21,14 @@ async function validateFiles() {
   });
 
   const invalidFiles = (
-    await mapConcurrently(
+    await mapAsync(
       declarationFiles,
       async (declarationFile) => {
         const content = await fs.readFile(declarationFile, 'utf-8');
         const matches = Array.from(content.matchAll(DYNAMIC_PACKAGES_IMPORT_REGEX));
         return matches.length > 0 ? declarationFile : undefined;
       },
-      20,
+      { concurrency: 20 },
     )
   ).filter((file) => typeof file === 'string');
 

package/src/utils/build.mjs

@@ -894,42 +894,3 @@ export function measureFn(label) {
   const endMark = `${label}-end`;
   return performance.measure(label, startMark, endMark);
 }
-
-/**
- * A utility to map a function over an array of items in a worker pool.
- *
- * This function will create a pool of workers and distribute the items to be processed among them.
- * Each worker will process items sequentially, but multiple workers will run in parallel.
- *
- * @function
- * @template T
- * @template R
- * @param {T[]} items
- * @param {(item: T) => Promise<R>} mapper
- * @param {number} concurrency
- * @returns {Promise<(R|Error)[]>}
- */
-export async function mapConcurrently(items, mapper, concurrency) {
-  if (!items.length) {
-    return Promise.resolve([]); // nothing to do
-  }
-  const itemIterator = items.entries();
-  const count = Math.min(concurrency, items.length);
-  const workers = [];
-  /**
-   * @type {(R|Error)[]}
-   */
-  const results = new Array(items.length);
-  for (let i = 0; i < count; i += 1) {
-    const worker = Promise.resolve().then(async () => {
-      for (const [index, item] of itemIterator) {
-        // eslint-disable-next-line no-await-in-loop
-        const res = await mapper(item);
-        results[index] = res;
-      }
-    });
-    workers.push(worker);
-  }
-  await Promise.all(workers);
-  return results;
-}

package/src/utils/extractErrorCodes.mjs

@@ -6,9 +6,10 @@ import minifyErrorsPlugin from '@mui/internal-babel-plugin-minify-errors';
 import { globby } from 'globby';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
+import { mapAsync } from 'es-toolkit/array';
 
 import { getWorkspacePackages } from './pnpm.mjs';
-import { BASE_IGNORES, mapConcurrently } from './build.mjs';
+import { BASE_IGNORES } from './build.mjs';
 
 /**
  * @typedef {Object} Args
@@ -52,7 +53,7 @@ async function getFilesForPackage(pkg) {
  * @param {import('@mui/internal-babel-plugin-minify-errors').Options['detection']} [detection='opt-in']
  */
 async function extractErrorCodesForWorkspace(files, errors, detection = 'opt-in') {
-  await mapConcurrently(
+  await mapAsync(
     files,
     async (fullPath) => {
       const code = await fs.readFile(fullPath, 'utf8');
@@ -71,7 +72,7 @@ async function extractErrorCodesForWorkspace(files, errors, detection = 'opt-in'
         code: false,
       });
     },
-    30,
+    { concurrency: 30 },
   );
 }
 

package/src/utils/typescript.mjs

@@ -9,7 +9,8 @@ import { globby } from 'globby';
 import * as fs from 'node:fs/promises';
 import * as os from 'node:os';
 import * as path from 'node:path';
-import { getOutExtension, mapConcurrently } from '../utils/build.mjs';
+import { mapAsync } from 'es-toolkit/array';
+import { getOutExtension } from '../utils/build.mjs';
 
 const $$ = $({ stdio: 'inherit' });
 
@@ -145,7 +146,7 @@ export async function moveAndTransformDeclarations({ inputDir, buildDir, bundles
     return;
   }
 
-  await mapConcurrently(
+  await mapAsync(
     dtsFiles,
     async (dtsFile) => {
       // Normalize to native separators to make path comparisons reliable on Windows
@@ -198,7 +199,7 @@ export async function moveAndTransformDeclarations({ inputDir, buildDir, bundles
         await fs.unlink(nativeDtsFile);
       }
     },
-    30,
+    { concurrency: 30 },
   );
 }