isomorphic-git 1.32.0 → 1.32.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/README.md +2 -1
  2. package/browser-tests.json +4 -6
  3. package/http/node/index.d.cts +82 -0
  4. package/http/web/index.d.cts +82 -0
  5. package/index.cjs +18 -3
  6. package/index.d.cts +4664 -0
  7. package/index.js +18 -3
  8. package/index.umd.min.js +1 -1
  9. package/index.umd.min.js.map +1 -1
  10. package/package.json +30 -3
  11. package/size_report.html +1 -1
package/README.md CHANGED
@@ -389,7 +389,8 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
389
389
  <td align="center"><a href="https://tomlarkworthy.endpointservices.net/"><img src="https://avatars.githubusercontent.com/u/1848162?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Tom Larkworthy</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=tomlarkworthy" title="Documentation">📖</a></td>
390
390
  <td align="center"><a href="https://github.com/kofta999"><img src="https://avatars.githubusercontent.com/u/99273340?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Mostafa Mahmoud</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=kofta999" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=kofta999" title="Tests">⚠️</a> <a href="#question-kofta999" title="Answering Questions">💬</a></td>
391
391
  <td align="center"><a href="https://github.com/ARBhosale"><img src="https://avatars.githubusercontent.com/u/26981417?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Aniket Bhosale</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=ARBhosale" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=ARBhosale" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=ARBhosale" title="Tests">⚠️</a></td>
392
- <td align="center"><a href="https://github.com/gnillev"><img src="https://avatars.githubusercontent.com/u/8965094?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Mathias Nisted Velling</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=gnillev" title="Code">💻</a><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=gnillev" title="Tests">⚠️</a></td>
392
+ <td align="center"><a href="https://github.com/gnillev"><img src="https://avatars.githubusercontent.com/u/8965094?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Mathias Nisted Velling</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=gnillev" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=gnillev" title="Tests">⚠️</a></td>
393
+ <td align="center"><a href="https://github.com/acandoo"><img src="https://avatars.githubusercontent.com/u/117209328?v=4?s=60" width="60px;" alt=""/><br /><sub><b>acandoo</b></sub></a><br /><a href="#platform-acandoo" title="Packaging/porting to new platform">📦</a> <a href="#userTesting-acandoo" title="User Testing">📓</a></td>
393
394
  </tr>
394
395
  </table>
395
396
 
package/browser-tests.json CHANGED
@@ -1,10 +1,8 @@
1
1
  [
2
- "X Chrome Headless 79.0.3945.0 (Linux x86_64)",
3
- "Firefox 139.0 (Linux x86_64)",
4
- "Chrome 135.0.0.0 (Android 10)",
2
+ "Chrome Headless 79.0.3945.0 (Linux x86_64)",
3
+ "Firefox 140.0 (Linux x86_64)",
5
4
  "Edge 79.0.309.65 (Windows 10)",
6
- "Mobile Safari 14.0 (iOS 14.0.1)",
5
+ "Chrome 137.0.0.0 (Android 10)",
7
6
  "Safari 14.1 (Mac OS 10.15.7)",
8
- "Chrome Headless 79.0.3945.0 (Linux x86_64)",
9
- "Chrome 135.0.0.0 (Android 10)"
7
+ "Mobile Safari 14.0 (iOS 14.0.1)"
10
8
  ]
package/http/node/index.d.cts ADDED
@@ -0,0 +1,82 @@
1
+ export const __esModule: boolean;
2
+ export default index;
3
+ export type GitProgressEvent = {
4
+ phase: string;
5
+ loaded: number;
6
+ total: number;
7
+ };
8
+ export type ProgressCallback = (progress: GitProgressEvent) => void | Promise<void>;
9
+ export type GitHttpRequest = {
10
+ /**
11
+ * - The URL to request
12
+ */
13
+ url: string;
14
+ /**
15
+ * - The HTTP method to use
16
+ */
17
+ method?: string | undefined;
18
+ /**
19
+ * - Headers to include in the HTTP request
20
+ */
21
+ headers?: {
22
+ [x: string]: string;
23
+ } | undefined;
24
+ /**
25
+ * - An HTTP or HTTPS agent that manages connections for the HTTP client (Node.js only)
26
+ */
27
+ agent?: any;
28
+ /**
29
+ * - An async iterator of Uint8Arrays that make up the body of POST requests
30
+ */
31
+ body?: AsyncIterableIterator<Uint8Array>;
32
+ /**
33
+ * - Reserved for future use (emitting `GitProgressEvent`s)
34
+ */
35
+ onProgress?: ProgressCallback | undefined;
36
+ /**
37
+ * - Reserved for future use (canceling a request)
38
+ */
39
+ signal?: object;
40
+ };
41
+ export type GitHttpResponse = {
42
+ /**
43
+ * - The final URL that was fetched after any redirects
44
+ */
45
+ url: string;
46
+ /**
47
+ * - The HTTP method that was used
48
+ */
49
+ method?: string | undefined;
50
+ /**
51
+ * - HTTP response headers
52
+ */
53
+ headers?: {
54
+ [x: string]: string;
55
+ } | undefined;
56
+ /**
57
+ * - An async iterator of Uint8Arrays that make up the body of the response
58
+ */
59
+ body?: AsyncIterableIterator<Uint8Array>;
60
+ /**
61
+ * - The HTTP status code
62
+ */
63
+ statusCode: number;
64
+ /**
65
+ * - The HTTP status message
66
+ */
67
+ statusMessage: string;
68
+ };
69
+ export type HttpFetch = (request: GitHttpRequest) => Promise<GitHttpResponse>;
70
+ export type HttpClient = {
71
+ request: HttpFetch;
72
+ };
73
+ declare namespace index {
74
+ export { request };
75
+ }
76
+ /**
77
+ * HttpClient
78
+ *
79
+ * @param {GitHttpRequest} request
80
+ * @returns {Promise<GitHttpResponse>}
81
+ */
82
+ export function request({ onProgress, url, method, headers, agent, body, }: GitHttpRequest): Promise<GitHttpResponse>;
package/http/web/index.d.cts ADDED
@@ -0,0 +1,82 @@
1
+ export const __esModule: boolean;
2
+ export default index;
3
+ export type GitProgressEvent = {
4
+ phase: string;
5
+ loaded: number;
6
+ total: number;
7
+ };
8
+ export type ProgressCallback = (progress: GitProgressEvent) => void | Promise<void>;
9
+ export type GitHttpRequest = {
10
+ /**
11
+ * - The URL to request
12
+ */
13
+ url: string;
14
+ /**
15
+ * - The HTTP method to use
16
+ */
17
+ method?: string | undefined;
18
+ /**
19
+ * - Headers to include in the HTTP request
20
+ */
21
+ headers?: {
22
+ [x: string]: string;
23
+ } | undefined;
24
+ /**
25
+ * - An HTTP or HTTPS agent that manages connections for the HTTP client (Node.js only)
26
+ */
27
+ agent?: any;
28
+ /**
29
+ * - An async iterator of Uint8Arrays that make up the body of POST requests
30
+ */
31
+ body?: AsyncIterableIterator<Uint8Array>;
32
+ /**
33
+ * - Reserved for future use (emitting `GitProgressEvent`s)
34
+ */
35
+ onProgress?: ProgressCallback | undefined;
36
+ /**
37
+ * - Reserved for future use (canceling a request)
38
+ */
39
+ signal?: object;
40
+ };
41
+ export type GitHttpResponse = {
42
+ /**
43
+ * - The final URL that was fetched after any redirects
44
+ */
45
+ url: string;
46
+ /**
47
+ * - The HTTP method that was used
48
+ */
49
+ method?: string | undefined;
50
+ /**
51
+ * - HTTP response headers
52
+ */
53
+ headers?: {
54
+ [x: string]: string;
55
+ } | undefined;
56
+ /**
57
+ * - An async iterator of Uint8Arrays that make up the body of the response
58
+ */
59
+ body?: AsyncIterableIterator<Uint8Array>;
60
+ /**
61
+ * - The HTTP status code
62
+ */
63
+ statusCode: number;
64
+ /**
65
+ * - The HTTP status message
66
+ */
67
+ statusMessage: string;
68
+ };
69
+ export type HttpFetch = (request: GitHttpRequest) => Promise<GitHttpResponse>;
70
+ export type HttpClient = {
71
+ request: HttpFetch;
72
+ };
73
+ declare namespace index {
74
+ export { request };
75
+ }
76
+ /**
77
+ * HttpClient
78
+ *
79
+ * @param {GitHttpRequest} request
80
+ * @returns {Promise<GitHttpResponse>}
81
+ */
82
+ export function request({ onProgress, url, method, headers, body, }: GitHttpRequest): Promise<GitHttpResponse>;
package/index.cjs CHANGED
@@ -7776,8 +7776,8 @@ function filterCapabilities(server, client) {
7776
7776
 
7777
7777
  const pkg = {
7778
7778
  name: 'isomorphic-git',
7779
- version: '1.32.0',
7780
- agent: 'git/isomorphic-git@1.32.0',
7779
+ version: '1.32.2',
7780
+ agent: 'git/isomorphic-git@1.32.2',
7781
7781
  };
7782
7782
 
7783
7783
  class FIFO {
@@ -9437,7 +9437,22 @@ async function mergeTree({
9437
9437
  : undefined
9438
9438
  }
9439
9439
  case 'true-true': {
9440
- // Modifications
9440
+ // Handle tree-tree merges (directories)
9441
+ if (
9442
+ ours &&
9443
+ theirs &&
9444
+ (await ours.type()) === 'tree' &&
9445
+ (await theirs.type()) === 'tree'
9446
+ ) {
9447
+ return {
9448
+ mode: await ours.mode(),
9449
+ path,
9450
+ oid: await ours.oid(),
9451
+ type: 'tree',
9452
+ }
9453
+ }
9454
+
9455
+ // Modifications - both are blobs
9441
9456
  if (
9442
9457
  ours &&
9443
9458
  theirs &&