isomorphic-git 1.25.1 → 1.25.3

package/README.md

@@ -365,6 +365,8 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/DanilKazanov"><img src="https://avatars.githubusercontent.com/u/139755256?v=4?s=60" width="60px;" alt=""/><br /><sub><b>DanilKazanov</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=DanilKazanov" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=DanilKazanov" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=DanilKazanov" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://api.github.com/users/hisco"><img src="https://avatars.githubusercontent.com/u/39222286?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Eyal Hisco</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3Ahisco" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/scolladon"><img src="https://avatars.githubusercontent.com/u/522422?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Sebastien</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=scolladon" title="Code">💻</a></td>
   </tr>
 </table>
 

package/browser-tests.json

@@ -1,11 +1,12 @@
 [
   "Chrome Headless 79.0.3945.0 (Linux x86_64)",
-  "X Firefox 120.0 (Ubuntu 0.0.0)",
-  "Chrome 117.0.0.0 (Android 10)",
+  "Firefox 121.0 (Ubuntu 0.0.0)",
+  "X Chrome 117.0.0.0 (Android 10)",
   "Edge 79.0.309.65 (Windows 10)",
-  "Safari 13.1 (Mac OS 10.15.4)",
   "Mobile Safari 13.0 (iOS 13.0)",
+  "Safari 13.1 (Mac OS 10.15.4)",
+  "Chrome Headless 79.0.3945.0 (Linux x86_64)",
+  "X Chrome 117.0.0.0 (Android 10)",
   "Chrome Headless 79.0.3945.0 (Linux x86_64)",
-  "Firefox 120.0 (Ubuntu 0.0.0)",
   "Chrome 117.0.0.0 (Android 10)"
 ]

package/index.cjs

@@ -1448,16 +1448,32 @@ function compareRefNames(a, b) {
   return tmp
 }
 
+const memo = new Map();
 function normalizePath(path) {
+  let normalizedPath = memo.get(path);
+  if (!normalizedPath) {
+    normalizedPath = normalizePathInternal(path);
+    memo.set(path, normalizedPath);
+  }
+  return normalizedPath
+}
+
+function normalizePathInternal(path) {
+  path = path
+    .split('/./')
+    .join('/') // Replace '/./' with '/'
+    .replace(/\/{2,}/g, '/'); // Replace consecutive '/'
+
+  if (path === '/.') return '/' // if path === '/.' return '/'
+  if (path === './') return '.' // if path === './' return '.'
+
+  if (path.startsWith('./')) path = path.slice(2); // Remove leading './'
+  if (path.endsWith('/.')) path = path.slice(0, -2); // Remove trailing '/.'
+  if (path.length > 1 && path.endsWith('/')) path = path.slice(0, -1); // Remove trailing '/'
+
+  if (path === '') return '.' // if path === '' return '.'
+
   return path
-    .replace(/\/\.\//g, '/') // Replace '/./' with '/'
-    .replace(/\/{2,}/g, '/') // Replace consecutive '/'
-    .replace(/^\/\.$/, '/') // if path === '/.' return '/'
-    .replace(/^\.\/$/, '.') // if path === './' return '.'
-    .replace(/^\.\//, '') // Remove leading './'
-    .replace(/\/\.$/, '') // Remove trailing '/.'
-    .replace(/(.+)\/$/, '$1') // Remove trailing '/'
-    .replace(/^$/, '.') // if path === '' return '.'
 }
 
 // For some reason path.posix.join is undefined in webpack
@@ -2457,6 +2473,7 @@ class StreamReader {
     let { done, value } = await this.stream.next();
     if (done) {
       this._ended = true;
+      if (!value) return Buffer.alloc(0)
     }
     if (value) {
       value = Buffer.from(value);
@@ -6839,7 +6856,7 @@ class GitPktLine {
         if (buffer == null) return true
         return buffer
       } catch (err) {
-        console.log('error', err);
+        stream.error = err;
         return true
       }
     }
@@ -7316,8 +7333,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.25.1',
-  agent: 'git/isomorphic-git@1.25.1',
+  version: '1.25.3',
+  agent: 'git/isomorphic-git@1.25.3',
 };
 
 class FIFO {
@@ -7348,8 +7365,8 @@ class FIFO {
   }
 
   destroy(err) {
-    this._ended = true;
     this.error = err;
+    this.end();
   }
 
   async next() {
@@ -7444,7 +7461,7 @@ class GitSideBand {
       if (line === true) {
         packetlines.end();
         progress.end();
-        packfile.end();
+        input.error ? packfile.destroy(input.error) : packfile.end();
         return
       }
       // Examine first byte to determine which output "stream" to use
@@ -7463,12 +7480,14 @@ class GitSideBand {
           // fatal error message just before stream aborts
           const error = line.slice(1);
           progress.write(error);
+          packetlines.end();
+          progress.end();
           packfile.destroy(new Error(error.toString('utf8')));
           return
         }
         default: {
           // Not part of the side-band-64k protocol
-          packetlines.write(line.slice(0));
+          packetlines.write(line);
         }
       }
       // Careful not to blow up the stack.
@@ -7586,7 +7605,15 @@ async function parseUploadPackResponse(stream) {
         nak = true;
       }
       if (done) {
-        resolve({ shallows, unshallows, acks, nak, packfile, progress });
+        stream.error
+          ? reject(stream.error)
+          : resolve({ shallows, unshallows, acks, nak, packfile, progress });
+      }
+    }).finally(() => {
+      if (!done) {
+        stream.error
+          ? reject(stream.error)
+          : resolve({ shallows, unshallows, acks, nak, packfile, progress });
       }
     });
   })
@@ -7952,6 +7979,7 @@ async function _fetch({
     });
   }
   const packfile = Buffer.from(await collect(response.packfile));
+  if (raw.body.error) throw raw.body.error
   const packfileSha = packfile.slice(-20).toString('hex');
   const res = {
     defaultBranch: response.HEAD,

package/index.js

@@ -1442,16 +1442,32 @@ function compareRefNames(a, b) {
   return tmp
 }
 
+const memo = new Map();
 function normalizePath(path) {
+  let normalizedPath = memo.get(path);
+  if (!normalizedPath) {
+    normalizedPath = normalizePathInternal(path);
+    memo.set(path, normalizedPath);
+  }
+  return normalizedPath
+}
+
+function normalizePathInternal(path) {
+  path = path
+    .split('/./')
+    .join('/') // Replace '/./' with '/'
+    .replace(/\/{2,}/g, '/'); // Replace consecutive '/'
+
+  if (path === '/.') return '/' // if path === '/.' return '/'
+  if (path === './') return '.' // if path === './' return '.'
+
+  if (path.startsWith('./')) path = path.slice(2); // Remove leading './'
+  if (path.endsWith('/.')) path = path.slice(0, -2); // Remove trailing '/.'
+  if (path.length > 1 && path.endsWith('/')) path = path.slice(0, -1); // Remove trailing '/'
+
+  if (path === '') return '.' // if path === '' return '.'
+
   return path
-    .replace(/\/\.\//g, '/') // Replace '/./' with '/'
-    .replace(/\/{2,}/g, '/') // Replace consecutive '/'
-    .replace(/^\/\.$/, '/') // if path === '/.' return '/'
-    .replace(/^\.\/$/, '.') // if path === './' return '.'
-    .replace(/^\.\//, '') // Remove leading './'
-    .replace(/\/\.$/, '') // Remove trailing '/.'
-    .replace(/(.+)\/$/, '$1') // Remove trailing '/'
-    .replace(/^$/, '.') // if path === '' return '.'
 }
 
 // For some reason path.posix.join is undefined in webpack
@@ -2451,6 +2467,7 @@ class StreamReader {
     let { done, value } = await this.stream.next();
     if (done) {
       this._ended = true;
+      if (!value) return Buffer.alloc(0)
     }
     if (value) {
       value = Buffer.from(value);
@@ -6833,7 +6850,7 @@ class GitPktLine {
         if (buffer == null) return true
         return buffer
       } catch (err) {
-        console.log('error', err);
+        stream.error = err;
         return true
       }
     }
@@ -7310,8 +7327,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.25.1',
-  agent: 'git/isomorphic-git@1.25.1',
+  version: '1.25.3',
+  agent: 'git/isomorphic-git@1.25.3',
 };
 
 class FIFO {
@@ -7342,8 +7359,8 @@ class FIFO {
   }
 
   destroy(err) {
-    this._ended = true;
     this.error = err;
+    this.end();
   }
 
   async next() {
@@ -7438,7 +7455,7 @@ class GitSideBand {
       if (line === true) {
         packetlines.end();
         progress.end();
-        packfile.end();
+        input.error ? packfile.destroy(input.error) : packfile.end();
         return
       }
       // Examine first byte to determine which output "stream" to use
@@ -7457,12 +7474,14 @@ class GitSideBand {
           // fatal error message just before stream aborts
           const error = line.slice(1);
           progress.write(error);
+          packetlines.end();
+          progress.end();
           packfile.destroy(new Error(error.toString('utf8')));
           return
         }
         default: {
           // Not part of the side-band-64k protocol
-          packetlines.write(line.slice(0));
+          packetlines.write(line);
         }
       }
       // Careful not to blow up the stack.
@@ -7580,7 +7599,15 @@ async function parseUploadPackResponse(stream) {
         nak = true;
       }
       if (done) {
-        resolve({ shallows, unshallows, acks, nak, packfile, progress });
+        stream.error
+          ? reject(stream.error)
+          : resolve({ shallows, unshallows, acks, nak, packfile, progress });
+      }
+    }).finally(() => {
+      if (!done) {
+        stream.error
+          ? reject(stream.error)
+          : resolve({ shallows, unshallows, acks, nak, packfile, progress });
       }
     });
   })
@@ -7946,6 +7973,7 @@ async function _fetch({
     });
   }
   const packfile = Buffer.from(await collect(response.packfile));
+  if (raw.body.error) throw raw.body.error
   const packfileSha = packfile.slice(-20).toString('hex');
   const res = {
     defaultBranch: response.HEAD,