isomorphic-git 1.41.9 → 1.42.1

package/index.js

@@ -28,7 +28,7 @@ import diff3Merge from 'diff3';
  * @property {Object} [agent] - An HTTP or HTTPS agent that manages connections for the HTTP client (Node.js only)
  * @property {AsyncIterableIterator<Uint8Array>} [body] - An async iterator of Uint8Arrays that make up the body of POST requests
  * @property {ProgressCallback} [onProgress] - Reserved for future use (emitting `GitProgressEvent`s)
- * @property {object} [signal] - Reserved for future use (canceling a request)
+ * @property {AbortSignal} [signal] - Signal to abort the HTTP request
  * @property {Object} [fetchOptions={}] - Additional options to pass to fetch (Web) or simple-get (Node)
  */
 
@@ -9384,6 +9384,7 @@ class GitRemoteHTTP {
    * @param {string} args.service - The Git service (e.g., "git-upload-pack").
    * @param {string} args.url - The URL of the remote repository.
    * @param {Object<string, string>} args.headers - HTTP headers to include in the request.
+   * @param {AbortSignal} [args.signal] - Signal to abort the operation.
    * @param {1 | 2} args.protocolVersion - The Git protocol version to use.
    * @returns {Promise<Object>} - The parsed response from the remote repository.
    * @throws {HttpError} - If the HTTP request fails.
@@ -9400,6 +9401,7 @@ class GitRemoteHTTP {
     service,
     url: _origUrl,
     headers,
+    signal,
     protocolVersion,
   }) {
     let { url, auth } = extractAuthFromUrl(_origUrl);
@@ -9420,6 +9422,7 @@ class GitRemoteHTTP {
         method: 'GET',
         url: `${proxifiedURL}/info/refs?service=${service}`,
         headers,
+        signal,
       });
 
       // the default loop behavior
@@ -9495,6 +9498,7 @@ class GitRemoteHTTP {
    * @param {Object<string, string>} [args.headers] - HTTP headers to include in the request.
    * @param {any} args.body - The request body to send.
    * @param {any} args.auth - Authentication credentials.
+   * @param {AbortSignal} [args.signal] - Signal to abort the operation.
    * @returns {Promise<GitHttpResponse>} - The HTTP response from the remote repository.
    * @throws {HttpError} - If the HTTP request fails.
    */
@@ -9507,6 +9511,7 @@ class GitRemoteHTTP {
     auth,
     body,
     headers,
+    signal,
   }) {
     // We already have the "correct" auth value at this point, but
     // we need to strip out the username/password from the URL yet again.
@@ -9525,6 +9530,7 @@ class GitRemoteHTTP {
       url: `${url}/${service}`,
       body,
       headers,
+      signal,
     });
     if (res.statusCode !== 200) {
       const { response } = stringifyBody(res);
@@ -9760,8 +9766,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.41.9',
-  agent: 'git/isomorphic-git@1.41.9',
+  version: '1.42.1',
+  agent: 'git/isomorphic-git@1.42.1',
 };
 
 class FIFO {
@@ -12070,6 +12076,30 @@ async function getConfigAll({
  *
  */
 
+// Assign `value` at the `/`-separated `path` inside `root`, creating the
+// intermediate objects as we go.
+//
+// Ref names come straight off the wire, so a path segment must never be allowed
+// to walk out of `root` and into the prototype chain. The `hasOwnProperty` check
+// takes care of inherited keys such as `constructor` by shadowing them with a
+// fresh object; `__proto__` gets no such treatment because assigning it invokes
+// the setter instead of creating an own property, so refs containing it are
+// dropped.
+//
+// NB: deliberately not a JSDoc comment. `__tests__/__helpers__/generate-docs.cjs`
+// turns every documented function in `src/api` into a public doc page.
+function assignRefPath(root, path, value) {
+  const parts = path.split('/');
+  const last = parts.pop();
+  if (last === '__proto__' || parts.includes('__proto__')) return
+  let o = root;
+  for (const part of parts) {
+    if (!Object.prototype.hasOwnProperty.call(o, part)) o[part] = {};
+    o = o[part];
+  }
+  o[last] = value;
+}
+
 /**
  * List a remote servers branches, tags, and capabilities.
  *
@@ -12134,25 +12164,11 @@ async function getRemoteInfo({
     // Convert the flat list into an object tree, because I figure 99% of the time
     // that will be easier to use.
     for (const [ref, oid] of remote.refs) {
-      const parts = ref.split('/');
-      const last = parts.pop();
-      let o = result;
-      for (const part of parts) {
-        o[part] = o[part] || {};
-        o = o[part];
-      }
-      o[last] = oid;
+      assignRefPath(result, ref, oid);
     }
     // Merge symrefs on top of refs to more closely match actual git repo layouts
     for (const [symref, ref] of remote.symrefs) {
-      const parts = symref.split('/');
-      const last = parts.pop();
-      let o = result;
-      for (const part of parts) {
-        o[part] = o[part] || {};
-        o = o[part];
-      }
-      o[last] = ref;
+      assignRefPath(result, symref, ref);
     }
     return result
   } catch (err) {
@@ -14326,6 +14342,7 @@ async function writeReceivePackRequest({
  * @param {boolean} [args.delete = false]
  * @param {string} [args.url]
  * @param {string} [args.corsProxy]
+ * @param {AbortSignal} [args.signal]
  * @param {Object<string, string>} [args.headers]
  *
  * @returns {Promise<PushResult>}
@@ -14349,6 +14366,7 @@ async function _push({
   delete: _delete = false,
   corsProxy,
   headers = {},
+  signal,
 }) {
   const ref = _ref || (await _currentBranch({ fs, gitdir }));
   if (typeof ref === 'undefined') {
@@ -14397,6 +14415,7 @@ async function _push({
     url,
     headers,
     protocolVersion: 1,
+    signal,
   });
   const auth = httpRemote.auth; // hack to get new credentials from CredentialManager API
   let fullRemoteRef;
@@ -14444,13 +14463,20 @@ async function _push({
 
     // If remote branch is present, look for a common merge base.
     if (oldoid !== '0000000000000000000000000000000000000000') {
-      // trick to speed up common force push scenarios
-      const mergebase = await _findMergeBase({
-        fs,
-        cache,
-        gitdir,
-        oids: [oid, oldoid],
-      });
+      // Speeds up common force-push / thin-pack scenarios. The advertised
+      // remote tip may be absent locally (e.g. remote advanced since clone);
+      // that is normal and must not surface as NotFoundError from merge-base.
+      let mergebase = [];
+      try {
+        mergebase = await _findMergeBase({
+          fs,
+          cache,
+          gitdir,
+          oids: [oid, oldoid],
+        });
+      } catch (e) {
+        mergebase = [];
+      }
       for (const oid of mergebase) finish.push(oid);
       if (thinPack) {
         skipObjects = await listObjects({ fs, cache, gitdir, oids: mergebase });
@@ -14552,6 +14578,7 @@ async function _push({
     auth,
     headers,
     body: [...packstream1, ...packstream2],
+    signal,
   });
   const { packfile, progress } = await GitSideBand.demux(res.body);
   if (onMessage) {
@@ -14628,6 +14655,7 @@ async function _push({
  * @param {string} [args.corsProxy] - Optional [CORS proxy](https://www.npmjs.com/%40isomorphic-git/cors-proxy). Overrides value in repo config.
  * @param {Object<string, string>} [args.headers] - Additional headers to include in HTTP requests, similar to git's `extraHeader` config
  * @param {object} [args.cache] - a [cache](cache.md) object
+ * @param {AbortSignal} [args.signal] - Optional signal to abort the push operation
  *
  * @returns {Promise<PushResult>} Resolves successfully when push completes with a detailed description of the operation from the server.
  * @see PushResult
@@ -14665,6 +14693,7 @@ async function push({
   corsProxy,
   headers = {},
   cache = {},
+  signal,
 }) {
   try {
     assertParameter('fs', fs);
@@ -14692,6 +14721,7 @@ async function push({
       delete: _delete,
       corsProxy,
       headers,
+      signal,
     })
   } catch (err) {
     err.caller = 'git.push';

package/index.umd.min.d.ts

@@ -301,9 +301,9 @@ export type GitHttpRequest = {
      */
     onProgress?: ProgressCallback | undefined;
     /**
-     * - Reserved for future use (canceling a request)
+     * - Signal to abort the HTTP request
      */
-    signal?: object;
+    signal?: AbortSignal | undefined;
     /**
      * - Additional options to pass to fetch (Web) or simple-get (Node)
      */
@@ -1659,17 +1659,6 @@ export function getConfigAll({ fs, dir, gitdir, path, }: {
     gitdir?: string | undefined;
     path: string;
 }): Promise<Array<any>>;
-/**
- *
- * @typedef {Object} GetRemoteInfoResult - The object returned has the following schema:
- * @property {string[]} capabilities - The list of capabilities returned by the server (part of the Git protocol)
- * @property {Object} [refs]
- * @property {string} [HEAD] - The default branch of the remote
- * @property {Object<string, string>} [refs.heads] - The branches on the remote
- * @property {Object<string, string>} [refs.pull] - The special branches representing pull requests (non-standard)
- * @property {Object<string, string>} [refs.tags] - The tags on the remote
- *
- */
 /**
  * List a remote servers branches, tags, and capabilities.
  *
@@ -2516,6 +2505,7 @@ export function pull({ fs: _fs, http, onProgress, onMessage, onAuth, onAuthSucce
  * @param {string} [args.corsProxy] - Optional [CORS proxy](https://www.npmjs.com/%40isomorphic-git/cors-proxy). Overrides value in repo config.
  * @param {Object<string, string>} [args.headers] - Additional headers to include in HTTP requests, similar to git's `extraHeader` config
  * @param {object} [args.cache] - a [cache](cache.md) object
+ * @param {AbortSignal} [args.signal] - Optional signal to abort the push operation
  *
  * @returns {Promise<PushResult>} Resolves successfully when push completes with a detailed description of the operation from the server.
  * @see PushResult
@@ -2533,7 +2523,7 @@ export function pull({ fs: _fs, http, onProgress, onMessage, onAuth, onAuthSucce
  * console.log(pushResult)
  *
  */
-export function push({ fs, http, onProgress, onMessage, onAuth, onAuthSuccess, onAuthFailure, onPrePush, dir, gitdir, ref, remoteRef, remote, url, force, delete: _delete, corsProxy, headers, cache, }: {
+export function push({ fs, http, onProgress, onMessage, onAuth, onAuthSuccess, onAuthFailure, onPrePush, dir, gitdir, ref, remoteRef, remote, url, force, delete: _delete, corsProxy, headers, cache, signal, }: {
     fs: FsClient;
     http: HttpClient;
     onProgress?: ProgressCallback | undefined;
@@ -2555,6 +2545,7 @@ export function push({ fs, http, onProgress, onMessage, onAuth, onAuthSuccess, o
         [x: string]: string;
     } | undefined;
     cache?: object;
+    signal?: AbortSignal | undefined;
 }): Promise<PushResult>;
 /**
  *
@@ -4503,7 +4494,7 @@ declare namespace NoCommitError {
  * @property {Object} [agent] - An HTTP or HTTPS agent that manages connections for the HTTP client (Node.js only)
  * @property {AsyncIterableIterator<Uint8Array>} [body] - An async iterator of Uint8Arrays that make up the body of POST requests
  * @property {ProgressCallback} [onProgress] - Reserved for future use (emitting `GitProgressEvent`s)
- * @property {object} [signal] - Reserved for future use (canceling a request)
+ * @property {AbortSignal} [signal] - Signal to abort the HTTP request
  * @property {Object} [fetchOptions={}] - Additional options to pass to fetch (Web) or simple-get (Node)
  */
 /**