Updates the TS patch (#2026)

* Updates the TS patch

* Removes debug

* Fixes the e2e test path

* Fixes e2e

* Uses createRequireFromPath when necessary

* Reverts changeFile

* Adds debug

* Adds versions

* Debug

Author: arcanis

.github/workflows/e2e-typescript-workflow.yml

@@ -28,6 +28,11 @@ jobs:
       run: |
         node ./scripts/run-yarn.js build:cli
 
+    - name: 'Checking some behaviors against the latest TypeScript'
+      run: |
+        yarn up typescript
+        yarn node ./scripts/test-typescript-patch.js
+
     - name: 'Installing all versions of TS'
       run: |
         source scripts/e2e-setup-ci.sh

.pnp.js

@@ -2,13 +2,16 @@
   "editor.tabSize": 2,
   "files.eol": "\n",
   "typescript.tsdk": ".yarn/sdks/typescript/lib",
+  "typescript.tsserver.watchOptions": {
+    "watchFile": "useFsEventsOnParentDirectory",
+    "watchDirectory": "useFsEvents"
+  },
   "npm.packageManager": "yarn",
   "eslint.validate": [
     "javascript",
     "typescript",
     "typescriptreact"
   ],
-  "eslint.enable": true,
   "eslint.nodePath": ".yarn/sdks",
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true

.vscode/settings.json

@@ -0,0 +1,35 @@
+releases:
+  "@yarnpkg/cli": minor
+  "@yarnpkg/fslib": patch
+  "@yarnpkg/plugin-compat": minor
+
+declined:
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@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-node-modules"
+  - "@yarnpkg/plugin-npm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - vscode-zipfs
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/json-proxy"
+  - "@yarnpkg/pnp"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/shell"

.yarn/cache/typescript-patch-73b6585552-8c5cbec804.zip renamed to .yarn/cache/typescript-patch-0e83f8c11a-2537751eed.zip

@@ -8,14 +8,17 @@ JSPATCH="$THIS_DIR"/../../sources/patches/typescript.patch.ts
 
 FIRST_PR_COMMIT="5d50de3"
 
+# Defines which commits need to be cherry-picked onto which other commit to
+# generate a patch suitable for the specified range.
 HASHES=(
-  # Patch   # Base    # Ranges
-  "426f5a7" "e39bdc3" ">=3.2 <3.5"
-  "426f5a7" "cf7b2d4" ">=3.5 <=3.6"
-  "426f5a7" "cda54b8" ">3.6 <3.7"
-  "2f85932" "e39bdc3" ">=3.7 <3.9"
-  "3af06df" "551f0dd" ">=3.9 <4.1"
-  "ce3da5a" "69972a3" ">=4.1"
+  # From    # To      # Onto    # Ranges
+  "5d50de3" "426f5a7" "e39bdc3" ">=3.2 <3.5"
+  "5d50de3" "426f5a7" "cf7b2d4" ">=3.5 <=3.6"
+  "5d50de3" "426f5a7" "cda54b8" ">3.6 <3.7"
+  "5d50de3" "2f85932" "e39bdc3" ">=3.7 <3.9"
+  "5d50de3" "3af06df" "551f0dd" ">=3.9 <4.0"
+  "6dbdd2f" "6dbdd2f" "56865f7" ">=4.0 <4.1"
+  "746d79b" "746d79b" "69972a3" ">=4.1"
 )
 
 mkdir -p "$TEMP_DIR"
@@ -44,33 +47,34 @@ reset-git() {
 }
 
 build-dir-for() {
-  local HASH="$1"
-  local CHERRY_PICK="$2"
+  local CHERRYPICK_ONTO="$1"
+  local CHERRYPICK_TO="$2"
 
-  local BUILD_DIR="$TEMP_DIR"/builds/"$HASH"
+  local BUILD_DIR="$TEMP_DIR"/builds/"$CHERRYPICK_ONTO"
 
-  if [[ ! -z "$CHERRY_PICK" ]]; then
-    BUILD_DIR="$BUILD_DIR-$CHERRY_PICK"
+  if [[ ! -z "$CHERRYPICK_TO" ]]; then
+    BUILD_DIR="$BUILD_DIR-$CHERRYPICK_TO"
   fi
 
   echo "$BUILD_DIR"
 }
 
 make-build-for() {
-  local HASH="$1"
-  local CHERRY_PICK="$2"
+  local CHERRYPICK_ONTO="$1"
+  local CHERRYPICK_FROM="$2"
+  local CHERRYPICK_TO="$3"
 
-  local BUILD_DIR="$(build-dir-for "$HASH" "$CHERRY_PICK")"
+  local BUILD_DIR="$(build-dir-for "$CHERRYPICK_ONTO" "$CHERRYPICK_TO")"
 
   if [[ ! -e "$BUILD_DIR" ]]; then
     mkdir -p "$BUILD_DIR"
-    reset-git "$HASH"
+    reset-git "$CHERRYPICK_ONTO"
 
-    if [[ ! -z "$CHERRY_PICK" ]]; then
-      if git merge-base --is-ancestor "$HASH" "$CHERRY_PICK"; then
-        git merge --no-edit "$CHERRY_PICK"
+    if [[ ! -z "$CHERRYPICK_TO" ]]; then
+      if git merge-base --is-ancestor "$CHERRYPICK_ONTO" "$CHERRYPICK_TO"; then
+        git merge --no-edit "$CHERRYPICK_TO"
       else
-        git cherry-pick "$FIRST_PR_COMMIT"^.."$CHERRY_PICK"
+        git cherry-pick "$CHERRYPICK_FROM"^.."$CHERRYPICK_TO"
       fi
     fi
 
@@ -81,6 +85,8 @@ make-build-for() {
         break
       else
         echo "Something is wrong; typescript.js got generated with a stupid size" >& /dev/stderr
+        cat -e lib/typescript.js
+
         if [[ $n -eq 1 ]]; then
           exit 1
         fi
@@ -100,16 +106,17 @@ rm -f "$PATCHFILE" && touch "$PATCHFILE"
 rm -f "$JSPATCH" && touch "$JSPATCH"
 
 while [[ ${#HASHES[@]} -gt 0 ]]; do
-  HASH="${HASHES[0]}"
-  BASE="${HASHES[1]}"
-  RANGE="${HASHES[2]}"
-  HASHES=("${HASHES[@]:3}")
+  CHERRYPICK_FROM="${HASHES[0]}"
+  CHERRYPICK_TO="${HASHES[1]}"
+  CHERRYPICK_ONTO="${HASHES[2]}"
+  RANGE="${HASHES[3]}"
+  HASHES=("${HASHES[@]:4}")
 
-  make-build-for "$BASE"
-  ORIG_DIR=$(build-dir-for "$BASE")
+  make-build-for "$CHERRYPICK_ONTO"
+  ORIG_DIR=$(build-dir-for "$CHERRYPICK_ONTO")
 
-  make-build-for "$BASE" "$HASH"
-  PATCHED_DIR=$(build-dir-for "$BASE" "$HASH")
+  make-build-for "$CHERRYPICK_ONTO" "$CHERRYPICK_FROM" "$CHERRYPICK_TO"
+  PATCHED_DIR=$(build-dir-for "$CHERRYPICK_ONTO" "$CHERRYPICK_FROM")
 
   DIFF="$THIS_DIR"/patch."${HASH}"-on-"${BASE}".diff
 

.yarn/cache/typescript-patch-938c94d26d-452cdd20d8.zip

@@ -0,0 +1,17 @@
+# `@yarnpkg/fslib`
+
+A TypeScript library abstracting the Node filesystem APIs. We use it for three main reasons:
+
+## Type-safe paths
+
+Our library has two path types, `NativePath` and `PortablePath`. Most interfaces only accept the later, and instances of the former need to be transformed back and forth using our type-safe utilities before being usable.
+
+## Custom filesystems
+
+The FSLib implements various transparent filesystem layers for a variety of purposes. For instance we use it in Yarn in order to abstract away the zip archive manipulation logic, which is implemented in `ZipFS` and exposed through a Node-like interface (called `FakeFS`).
+
+All `FakeFS` implementations can be transparently layered on top of the builtin Node `fs` module, and that's for instance how we can add support for in-zip package loading without you having to care about the exact package format.
+
+## Promisified API
+
+All methods from the `FakeFS` interface are promisified by default (and suffixed for greater clarity, for instance we offer both `readFileSync` and `readFilePromise`).

.yarn/cache/typescript-patch-9883035a7b-af7d80d889.zip

@@ -4,7 +4,7 @@ import {FakeFS}            from '../FakeFS';
 import {Path, convertPath} from '../path';
 
 // 1980-01-01, like Fedora
-const defaultTime = 315532800;
+const defaultTime = new Date(315532800 * 1000);
 
 export type CopyOptions = {
   stableTime: boolean,
@@ -45,32 +45,40 @@ async function copyImpl<P1 extends Path, P2 extends Path>(prelayout: Operations,
   const destinationStat = await maybeLStat(destinationFs, destination);
   const sourceStat = await sourceFs.lstatPromise(source);
 
-  if (opts.stableTime)
-    postlayout.push(() => updateTime(destination, defaultTime, defaultTime));
-  else
-    postlayout.push(() => updateTime(destination, sourceStat.atime, sourceStat.mtime));
+  const referenceTime = opts.stableTime
+    ? {mtime: defaultTime, atime: defaultTime} as const
+    : sourceStat;
 
+  let updated: boolean;
   switch (true) {
     case sourceStat.isDirectory(): {
-      await copyFolder(prelayout, postlayout, updateTime, destinationFs, destination, destinationStat, sourceFs, source, sourceStat, opts);
+      updated = await copyFolder(prelayout, postlayout, updateTime, destinationFs, destination, destinationStat, sourceFs, source, sourceStat, opts);
     } break;
 
     case sourceStat.isFile(): {
-      await copyFile(prelayout, postlayout, updateTime, destinationFs, destination, destinationStat, sourceFs, source, sourceStat, opts);
+      updated = await copyFile(prelayout, postlayout, updateTime, destinationFs, destination, destinationStat, sourceFs, source, sourceStat, opts);
     } break;
 
     case sourceStat.isSymbolicLink(): {
-      await copySymlink(prelayout, postlayout, updateTime, destinationFs, destination, destinationStat, sourceFs, source, sourceStat, opts);
+      updated = await copySymlink(prelayout, postlayout, updateTime, destinationFs, destination, destinationStat, sourceFs, source, sourceStat, opts);
     } break;
 
     default: {
       throw new Error(`Unsupported file type (${sourceStat.mode})`);
     } break;
   }
 
-  postlayout.push(() => {
-    return destinationFs.chmodPromise(destination, sourceStat.mode & 0o777);
-  });
+  if (updated || destinationStat?.mtime?.getTime() !== referenceTime.mtime.getTime() || destinationStat?.atime?.getTime() !== referenceTime.atime.getTime()) {
+    postlayout.push(() => updateTime(destination, referenceTime.atime, referenceTime.mtime));
+    updated = true;
+  }
+
+  if (destinationStat === null || (destinationStat.mode & 0o777) !== (sourceStat.mode & 0o777)) {
+    postlayout.push(() => destinationFs.chmodPromise(destination, sourceStat.mode & 0o777));
+    updated = true;
+  }
+
+  return updated;
 }
 
 async function maybeLStat<P extends Path>(baseFs: FakeFS<P>, p: P) {
@@ -87,24 +95,36 @@ async function copyFolder<P1 extends Path, P2 extends Path>(prelayout: Operation
       prelayout.push(async () => destinationFs.removePromise(destination));
       destinationStat = null;
     } else {
-      return;
+      return false;
     }
   }
 
-  if (destinationStat === null)
+  let updated = false;
+
+  if (destinationStat === null) {
     prelayout.push(async () => destinationFs.mkdirPromise(destination, {mode: sourceStat.mode}));
+    updated = true;
+  }
 
   const entries = await sourceFs.readdirPromise(source);
 
   if (opts.stableSort) {
     for (const entry of entries.sort()) {
-      await copyImpl(prelayout, postlayout, updateTime, destinationFs, destinationFs.pathUtils.join(destination, entry), sourceFs, sourceFs.pathUtils.join(source, entry), opts);
+      if (await copyImpl(prelayout, postlayout, updateTime, destinationFs, destinationFs.pathUtils.join(destination, entry), sourceFs, sourceFs.pathUtils.join(source, entry), opts)) {
+        updated = true;
+      }
     }
   } else {
-    await Promise.all(entries.map(async entry => {
+    const entriesUpdateStatus = await Promise.all(entries.map(async entry => {
       await copyImpl(prelayout, postlayout, updateTime, destinationFs, destinationFs.pathUtils.join(destination, entry), sourceFs, sourceFs.pathUtils.join(source, entry), opts);
     }));
+
+    if (entriesUpdateStatus.some(status => status)) {
+      updated = true;
+    }
   }
+
+  return updated;
 }
 
 async function copyFile<P1 extends Path, P2 extends Path>(prelayout: Operations, postlayout: Operations, updateTime: typeof FakeFS.prototype.utimesPromise, destinationFs: FakeFS<P1>, destination: P1, destinationStat: Stats | null, sourceFs: FakeFS<P2>, source: P2, sourceStat: Stats, opts: CopyOptions) {
@@ -113,15 +133,16 @@ async function copyFile<P1 extends Path, P2 extends Path>(prelayout: Operations,
       prelayout.push(async () => destinationFs.removePromise(destination));
       destinationStat = null;
     } else {
-      return;
+      return false;
     }
   }
 
-  if (destinationFs as any === sourceFs as any) {
-    prelayout.push(async () => destinationFs.copyFilePromise(source as any as P1, destination, fs.constants.COPYFILE_FICLONE));
-  } else {
-    prelayout.push(async () => destinationFs.writeFilePromise(destination, await sourceFs.readFilePromise(source)));
-  }
+  const op = destinationFs as any === sourceFs as any
+    ? async () => destinationFs.copyFilePromise(source as any as P1, destination, fs.constants.COPYFILE_FICLONE)
+    : async () => destinationFs.writeFilePromise(destination, await sourceFs.readFilePromise(source));
+
+  prelayout.push(async () => op());
+  return true;
 }
 
 async function copySymlink<P1 extends Path, P2 extends Path>(prelayout: Operations, postlayout: Operations, updateTime: typeof FakeFS.prototype.utimesPromise, destinationFs: FakeFS<P1>, destination: P1, destinationStat: Stats | null, sourceFs: FakeFS<P2>, source: P2, sourceStat: Stats, opts: CopyOptions) {
@@ -130,10 +151,13 @@ async function copySymlink<P1 extends Path, P2 extends Path>(prelayout: Operatio
       prelayout.push(async () => destinationFs.removePromise(destination));
       destinationStat = null;
     } else {
-      return;
+      return false;
     }
   }
 
-  const target = await sourceFs.readlinkPromise(source);
-  prelayout.push(async () => destinationFs.symlinkPromise(convertPath(destinationFs.pathUtils, target), destination));
+  prelayout.push(async () => {
+    await destinationFs.symlinkPromise(convertPath(destinationFs.pathUtils, await sourceFs.readlinkPromise(source)), destination);
+  });
+
+  return true;
 }

.yarn/cache/typescript-patch-87ac58776a-cf3413606d.zip renamed to .yarn/cache/typescript-patch-e90e409c79-a779c72a2d.zip

@@ -0,0 +1,48 @@
+const {createRequire, createRequireFromPath} = require(`module`);
+const path = require(`path`);
+const ts = require(`typescript`);
+
+const tsconfigFile = ts.readJsonConfigFile(
+  require.resolve(`@yarnpkg/monorepo/package.json`),
+  ts.sys.readFile,
+);
+
+const compilerOptions = ts.parseJsonSourceFileConfigFileContent(
+  tsconfigFile,
+  ts.sys,
+  path.dirname(tsconfigFile.fileName),
+);
+
+const compilerHost = ts.createCompilerHost(compilerOptions,);
+const program = ts.createProgram(compilerOptions.fileNames, compilerOptions, compilerHost);
+const moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, compilerHost);
+const rootSourceFile = program.getSourceFile(require.resolve(`@yarnpkg/core/sources/Project.ts`));
+
+const TESTS = [
+  [`@yarnpkg/core/sources/Configuration.ts`, `./Configuration`],
+  [`@yarnpkg/fslib/README.md`, `@yarnpkg/fslib/README.md`],
+  [`@yarnpkg/fslib/package.json`, `@yarnpkg/fslib/package`],
+  [`@yarnpkg/fslib/sources/ZipFS.ts`, `@yarnpkg/fslib/sources/ZipFS`],
+  [`@yarnpkg/fslib/sources/index.ts`, `@yarnpkg/fslib`],
+];
+
+const requireFactory = createRequire
+  ? createRequire
+  : createRequireFromPath;
+
+for (const [test, expected] of TESTS) {
+  const actual = ts.moduleSpecifiers.getModuleSpecifier(
+    compilerOptions,
+    rootSourceFile,
+    rootSourceFile.fileName,
+    requireFactory(rootSourceFile.fileName).resolve(test),
+    moduleSpecifierResolutionHost,
+  );
+
+  if (actual === expected) {
+    console.log(`\x1b[32m✓\x1b[0m ${actual}`);
+  } else {
+    console.log(`\x1b[31m✗\x1b[0m ${actual} !== ${expected}`);
+    process.exitCode = 1;
+  }
+}