fix(fslib): handle .zip in the middle of file name again (#3042)

* fix(fslib): handle .zip in the middle of file name again * Update ZipOpenFS.ts * chore: update hook * chore: versions Co-authored-by: Maël Nison <[email protected]> Co-authored-by: merceyz <[email protected]>
yarnpkg · Jul 18, 2021 · 7b97a5d · 7b97a5d
1 parent 84aa9e7
commit 7b97a5d
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 10 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/versions/5f918c2c.yml b/.yarn/versions/5f918c2c.yml
@@ -0,0 +1,36 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/fslib": patch
+  "@yarnpkg/plugin-pnp": patch
+  "@yarnpkg/pnp": patch
+
+declined:
+  - "@yarnpkg/esbuild-plugin-pnp"
+  - "@yarnpkg/plugin-compat"
+  - "@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-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - vscode-zipfs
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/json-proxy"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/shell"
diff --git a/packages/yarnpkg-fslib/sources/ZipOpenFS.ts b/packages/yarnpkg-fslib/sources/ZipOpenFS.ts
@@ -21,15 +21,22 @@ const DOT_ZIP = `.zip`;
  * The indexOf-based implementation is ~3.7x faster than a RegExp-based implementation.
  */
 export const getArchivePart = (path: string) => {
-  const idx = path.indexOf(DOT_ZIP);
+  let idx = path.indexOf(DOT_ZIP);
   if (idx <= 0)
     return null;
 
-  // Disallow files named ".zip"
-  if (path[idx - 1] === ppath.sep)
-    return null;
+  let nextCharIdx = idx;
+  while (idx >= 0) {
+    nextCharIdx = idx + DOT_ZIP.length;
+    if (path[nextCharIdx] === ppath.sep)
+      break;
+
+    // Disallow files named ".zip"
+    if (path[idx - 1] === ppath.sep)
+      return null;
 
-  const nextCharIdx = idx + DOT_ZIP.length;
+    idx = path.indexOf(DOT_ZIP, nextCharIdx);
+  }
 
   // The path either has to end in ".zip" or contain an archive subpath (".zip/...")
   if (path.length > nextCharIdx && path[nextCharIdx] !== ppath.sep)

diff --git a/packages/yarnpkg-fslib/tests/ZipOpenFS.test.ts b/packages/yarnpkg-fslib/tests/ZipOpenFS.test.ts
@@ -30,6 +30,9 @@ describe(`getArchivePart`, () => {
     [`./a/b/c/.zip`, null],
     [`./a/b/c/foo.zipp`, null],
     [`./a/b/c/foo.zip/bar/baz/qux.zip`, `./a/b/c/foo.zip`],
+    [`./a/b/c/foo.zip-bar.zip`, `./a/b/c/foo.zip-bar.zip`],
+    [`./a/b/c/foo.zip-bar.zip/bar/baz/qux.zip`, `./a/b/c/foo.zip-bar.zip`],
+    [`./a/b/c/foo.zip-bar/foo.zip-bar/foo.zip-bar.zip/d`, `./a/b/c/foo.zip-bar/foo.zip-bar/foo.zip-bar.zip`],
   ] as const;
 
   for (const [path, result] of tests) {

diff --git a/packages/yarnpkg-pnp/sources/hook.js b/packages/yarnpkg-pnp/sources/hook.js