perf: convert chmod calls to mode arguments (#3254)

* perf: convert `chmod` calls to `mode` arguments

* chore: update hook

* feat: implement support for writeFile mode in ZipFS

.yarn/versions/390a50ae.yml

@@ -0,0 +1,38 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/core": patch
+  "@yarnpkg/fslib": minor
+  "@yarnpkg/plugin-essentials": patch
+  "@yarnpkg/plugin-pnp": patch
+  "@yarnpkg/pnp": patch
+  "@yarnpkg/sdks": patch
+
+declined:
+  - "@yarnpkg/esbuild-plugin-pnp"
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-exec"
+  - "@yarnpkg/plugin-file"
+  - "@yarnpkg/plugin-git"
+  - "@yarnpkg/plugin-github"
+  - "@yarnpkg/plugin-http"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-link"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - vscode-zipfs
+  - "@yarnpkg/builder"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/json-proxy"
+  - "@yarnpkg/nm"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/shell"

packages/plugin-essentials/sources/commands/set/version.ts

@@ -179,8 +179,7 @@ export async function setVersion(configuration: Configuration, bundleVersion: st
   await xfs.removePromise(ppath.dirname(absolutePath));
   await xfs.mkdirPromise(ppath.dirname(absolutePath), {recursive: true});
 
-  await xfs.writeFilePromise(absolutePath, bundleBuffer);
-  await xfs.chmodPromise(absolutePath, 0o755);
+  await xfs.writeFilePromise(absolutePath, bundleBuffer, {mode: 0o755});
 
   if (updateConfig) {
     await Configuration.updateConfiguration(projectCwd, {

packages/plugin-pnp/sources/PnpLinker.ts

@@ -301,19 +301,25 @@ export class PnpInstaller implements Installer {
     if (this.opts.project.configuration.get(`pnpEnableInlining`)) {
       const loaderFile = generateInlinedScript(pnpSettings);
 
-      await xfs.changeFilePromise(pnpPath.cjs, loaderFile, {automaticNewlines: true});
-      await xfs.chmodPromise(pnpPath.cjs, 0o755);
+      await xfs.changeFilePromise(pnpPath.cjs, loaderFile, {
+        automaticNewlines: true,
+        mode: 0o755,
+      });
 
       await xfs.removePromise(pnpDataPath);
     } else {
       const dataLocation = ppath.relative(ppath.dirname(pnpPath.cjs), pnpDataPath);
       const {dataFile, loaderFile} = generateSplitScript({...pnpSettings, dataLocation});
 
-      await xfs.changeFilePromise(pnpPath.cjs, loaderFile, {automaticNewlines: true});
-      await xfs.chmodPromise(pnpPath.cjs, 0o755);
+      await xfs.changeFilePromise(pnpPath.cjs, loaderFile, {
+        automaticNewlines: true,
+        mode: 0o755,
+      });
 
-      await xfs.changeFilePromise(pnpDataPath, dataFile, {automaticNewlines: true});
-      await xfs.chmodPromise(pnpDataPath, 0o644);
+      await xfs.changeFilePromise(pnpDataPath, dataFile, {
+        automaticNewlines: true,
+        mode: 0o644,
+      });
     }
 
     const pnpUnpluggedFolder = this.opts.project.configuration.get(`pnpUnpluggedFolder`);

packages/yarnpkg-core/sources/scriptUtils.ts

@@ -39,8 +39,9 @@ async function makePathWrapper(location: PortablePath, name: Filename, argv0: Na
     await xfs.writeFilePromise(ppath.format({dir: location, name, ext: `.cmd`}), cmdScript);
   }
 
-  await xfs.writeFilePromise(ppath.join(location, name), `#!/bin/sh\nexec "${argv0}" ${args.map(arg => `'${arg.replace(/'/g, `'"'"'`)}'`).join(` `)} "$@"\n`);
-  await xfs.chmodPromise(ppath.join(location, name), 0o755);
+  await xfs.writeFilePromise(ppath.join(location, name), `#!/bin/sh\nexec "${argv0}" ${args.map(arg => `'${arg.replace(/'/g, `'"'"'`)}'`).join(` `)} "$@"\n`, {
+    mode: 0o755,
+  });
 }
 
 async function detectPackageManager(location: PortablePath): Promise<PackageManagerSelection | null> {

packages/yarnpkg-core/sources/tgzUtils.ts

@@ -127,17 +127,15 @@ export async function extractArchiveTo<T extends FakeFS<PortablePath>>(tgz: Buff
       case `Directory`: {
         targetFs.mkdirpSync(ppath.dirname(mappedPath), {chmod: 0o755, utimes: [safeTime, safeTime]});
 
-        targetFs.mkdirSync(mappedPath);
-        targetFs.chmodSync(mappedPath, mode);
+        targetFs.mkdirSync(mappedPath, {mode});
         targetFs.utimesSync(mappedPath, safeTime, safeTime);
       } break;
 
       case `OldFile`:
       case `File`: {
         targetFs.mkdirpSync(ppath.dirname(mappedPath), {chmod: 0o755, utimes: [safeTime, safeTime]});
 
-        targetFs.writeFileSync(mappedPath, await miscUtils.bufferStream(entry as unknown as Readable));
-        targetFs.chmodSync(mappedPath, mode);
+        targetFs.writeFileSync(mappedPath, await miscUtils.bufferStream(entry as unknown as Readable), {mode});
         targetFs.utimesSync(mappedPath, safeTime, safeTime);
       } break;
 

packages/yarnpkg-fslib/sources/FakeFS.ts

@@ -81,6 +81,7 @@ export type WatchFileOptions = Partial<{
 
 export type ChangeFileOptions = Partial<{
   automaticNewlines: boolean,
+  mode: number,
 }>;
 
 export type WatchCallback = (
@@ -452,13 +453,13 @@ export abstract class FakeFS<P extends Path> {
   async changeFilePromise(p: P, content: string, opts?: ChangeFileOptions): Promise<void>;
   async changeFilePromise(p: P, content: Buffer | string, opts: ChangeFileOptions = {}) {
     if (Buffer.isBuffer(content)) {
-      return this.changeFileBufferPromise(p, content);
+      return this.changeFileBufferPromise(p, content, opts);
     } else {
       return this.changeFileTextPromise(p, content, opts);
     }
   }
 
-  private async changeFileBufferPromise(p: P, content: Buffer) {
+  private async changeFileBufferPromise(p: P, content: Buffer, {mode}: ChangeFileOptions = {}) {
     let current = Buffer.alloc(0);
     try {
       current = await this.readFilePromise(p);
@@ -469,10 +470,10 @@ export abstract class FakeFS<P extends Path> {
     if (Buffer.compare(current, content) === 0)
       return;
 
-    await this.writeFilePromise(p, content);
+    await this.writeFilePromise(p, content, {mode});
   }
 
-  private async changeFileTextPromise(p: P, content: string, {automaticNewlines}: ChangeFileOptions = {}) {
+  private async changeFileTextPromise(p: P, content: string, {automaticNewlines, mode}: ChangeFileOptions = {}) {
     let current = ``;
     try {
       current = await this.readFilePromise(p, `utf8`);
@@ -487,20 +488,20 @@ export abstract class FakeFS<P extends Path> {
     if (current === normalizedContent)
       return;
 
-    await this.writeFilePromise(p, normalizedContent);
+    await this.writeFilePromise(p, normalizedContent, {mode});
   }
 
   changeFileSync(p: P, content: Buffer): void;
   changeFileSync(p: P, content: string, opts?: ChangeFileOptions): void;
   changeFileSync(p: P, content: Buffer | string, opts: ChangeFileOptions = {}) {
     if (Buffer.isBuffer(content)) {
-      return this.changeFileBufferSync(p, content);
+      return this.changeFileBufferSync(p, content, opts);
     } else {
       return this.changeFileTextSync(p, content, opts);
     }
   }
 
-  private changeFileBufferSync(p: P, content: Buffer) {
+  private changeFileBufferSync(p: P, content: Buffer, {mode}: ChangeFileOptions = {}) {
     let current = Buffer.alloc(0);
     try {
       current = this.readFileSync(p);
@@ -511,10 +512,10 @@ export abstract class FakeFS<P extends Path> {
     if (Buffer.compare(current, content) === 0)
       return;
 
-    this.writeFileSync(p, content);
+    this.writeFileSync(p, content, {mode});
   }
 
-  private changeFileTextSync(p: P, content: string, {automaticNewlines = false}: ChangeFileOptions = {}) {
+  private changeFileTextSync(p: P, content: string, {automaticNewlines = false, mode}: ChangeFileOptions = {}) {
     let current = ``;
     try {
       current = this.readFileSync(p, `utf8`);
@@ -529,7 +530,7 @@ export abstract class FakeFS<P extends Path> {
     if (current === normalizedContent)
       return;
 
-    this.writeFileSync(p, normalizedContent);
+    this.writeFileSync(p, normalizedContent, {mode});
   }
 
   async movePromise(fromP: P, toP: P) {