@jayree/sfdx-plugin-manifest 3.4.5 → 3.4.7
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.
- package/CHANGELOG.md +18 -0
- package/README.md +3 -3
- package/lib/SDR-extra/api/statusMatrix.d.ts +152 -0
- package/lib/SDR-extra/api/statusMatrix.js +220 -0
- package/lib/SDR-extra/api/statusMatrix.js.map +1 -0
- package/lib/SDR-extra/collections/componentSetExtra.d.ts +2 -11
- package/lib/SDR-extra/collections/componentSetExtra.js +1 -1
- package/lib/SDR-extra/collections/componentSetExtra.js.map +1 -1
- package/lib/SDR-extra/collections/index.d.ts +2 -1
- package/lib/SDR-extra/collections/index.js +1 -1
- package/lib/SDR-extra/collections/index.js.map +1 -1
- package/lib/SDR-extra/collections/types.d.ts +11 -0
- package/lib/SDR-extra/collections/types.js +2 -0
- package/lib/SDR-extra/collections/types.js.map +1 -0
- package/lib/SDR-extra/index.d.ts +3 -3
- package/lib/SDR-extra/index.js +3 -3
- package/lib/SDR-extra/index.js.map +1 -1
- package/lib/SDR-extra/resolve/gitDiffResolver.js +2 -3
- package/lib/SDR-extra/resolve/gitDiffResolver.js.map +1 -1
- package/lib/SDR-extra/resolve/index.d.ts +2 -2
- package/lib/SDR-extra/resolve/index.js +2 -2
- package/lib/SDR-extra/resolve/index.js.map +1 -1
- package/lib/SDR-extra/shared/gitComponentSetArray.js.map +1 -0
- package/lib/SDR-extra/{utils → shared/local}/localGitRepo.js +1 -1
- package/lib/SDR-extra/shared/local/localGitRepo.js.map +1 -0
- package/lib/SDR-extra/shared/local/moveDetection.js.map +1 -0
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/npm-shrinkwrap.json +32 -32
- package/oclif.lock +34 -34
- package/oclif.manifest.json +1 -1
- package/package.json +5 -5
- package/lib/SDR-extra/utils/gitComponentSetArray.js.map +0 -1
- package/lib/SDR-extra/utils/index.d.ts +0 -2
- package/lib/SDR-extra/utils/index.js +0 -9
- package/lib/SDR-extra/utils/index.js.map +0 -1
- package/lib/SDR-extra/utils/localGitRepo.js.map +0 -1
- package/lib/SDR-extra/utils/moveDetection.js.map +0 -1
- package/lib/SDR-extra/utils/statusMatrix.d.ts +0 -10
- package/lib/SDR-extra/utils/statusMatrix.js +0 -78
- package/lib/SDR-extra/utils/statusMatrix.js.map +0 -1
- /package/lib/SDR-extra/{utils → shared}/gitComponentSetArray.d.ts +0 -0
- /package/lib/SDR-extra/{utils → shared}/gitComponentSetArray.js +0 -0
- /package/lib/SDR-extra/{utils → shared/local}/localGitRepo.d.ts +0 -0
- /package/lib/SDR-extra/{utils → shared/local}/moveDetection.d.ts +0 -0
- /package/lib/SDR-extra/{utils → shared/local}/moveDetection.js +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
## [3.4.7](https://github.com/jayree/sfdx-plugin-manifest/compare/3.4.6...3.4.7) (2024-08-16)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **deps:** bump @jayree/changelog from 1.2.1 to 1.2.2 ([#1441](https://github.com/jayree/sfdx-plugin-manifest/issues/1441)) ([572ccfe](https://github.com/jayree/sfdx-plugin-manifest/commit/572ccfe3ffb879eade1e0a49dd7bc995ce09dfcf))
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
## [3.4.6](https://github.com/jayree/sfdx-plugin-manifest/compare/3.4.5...3.4.6) (2024-08-16)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Bug Fixes
|
|
14
|
+
|
|
15
|
+
* new sdr-extra exports ([9ee6e28](https://github.com/jayree/sfdx-plugin-manifest/commit/9ee6e280e2ee3afbd6b5e32b790eb1d79c7a6dd3))
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
1
19
|
## [3.4.5](https://github.com/jayree/sfdx-plugin-manifest/compare/3.4.4...3.4.5) (2024-08-10)
|
|
2
20
|
|
|
3
21
|
|
package/README.md
CHANGED
|
@@ -60,7 +60,7 @@ EXAMPLES
|
|
|
60
60
|
$ sf jayree manifest cleanup --manifest=package.xml --file=packageignore.xml
|
|
61
61
|
```
|
|
62
62
|
|
|
63
|
-
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/3.4.
|
|
63
|
+
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/3.4.7/src/commands/jayree/manifest/cleanup.ts)_
|
|
64
64
|
|
|
65
65
|
### `sf jayree manifest generate`
|
|
66
66
|
|
|
@@ -98,7 +98,7 @@ EXAMPLES
|
|
|
98
98
|
<Package xmlns='http://soap.sforce.com/2006/04/metadata'>...</Package>
|
|
99
99
|
```
|
|
100
100
|
|
|
101
|
-
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/3.4.
|
|
101
|
+
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/3.4.7/src/commands/jayree/manifest/generate.ts)_
|
|
102
102
|
|
|
103
103
|
### `sf jayree manifest git diff REF1 [REF2]`
|
|
104
104
|
|
|
@@ -181,5 +181,5 @@ FLAG DESCRIPTIONS
|
|
|
181
181
|
The location can be an absolute path or relative to the current working directory.
|
|
182
182
|
```
|
|
183
183
|
|
|
184
|
-
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/3.4.
|
|
184
|
+
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/3.4.7/src/commands/jayree/manifest/git/diff.ts)_
|
|
185
185
|
<!-- commandsstop -->
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
import { StatusRow } from 'isomorphic-git';
|
|
2
|
+
/**
|
|
3
|
+
* Efficiently get the status of multiple files at once.
|
|
4
|
+
*
|
|
5
|
+
* The returned `StatusMatrix` is admittedly not the easiest format to read.
|
|
6
|
+
* However it conveys a large amount of information in dense format that should make it easy to create reports about the current state of the repository;
|
|
7
|
+
* without having to do multiple, time-consuming isomorphic-git calls.
|
|
8
|
+
* My hope is that the speed and flexibility of the function will make up for the learning curve of interpreting the return value.
|
|
9
|
+
*
|
|
10
|
+
* ```js live
|
|
11
|
+
* // get the status of all the files in 'src'
|
|
12
|
+
* let status = await git.statusMatrix({
|
|
13
|
+
* fs,
|
|
14
|
+
* dir: '/tutorial',
|
|
15
|
+
* filter: f => f.startsWith('src/')
|
|
16
|
+
* })
|
|
17
|
+
* console.log(status)
|
|
18
|
+
* ```
|
|
19
|
+
*
|
|
20
|
+
* ```js live
|
|
21
|
+
* // get the status of all the JSON and Markdown files
|
|
22
|
+
* let status = await git.statusMatrix({
|
|
23
|
+
* fs,
|
|
24
|
+
* dir: '/tutorial',
|
|
25
|
+
* filter: f => f.endsWith('.json') || f.endsWith('.md')
|
|
26
|
+
* })
|
|
27
|
+
* console.log(status)
|
|
28
|
+
* ```
|
|
29
|
+
*
|
|
30
|
+
* The result is returned as a 2D array.
|
|
31
|
+
* The outer array represents the files and/or blobs in the repo, in alphabetical order.
|
|
32
|
+
* The inner arrays describe the status of the file:
|
|
33
|
+
* the first value is the filepath, and the next three are integers
|
|
34
|
+
* representing the HEAD status, WORKDIR status, and STAGE status of the entry.
|
|
35
|
+
*
|
|
36
|
+
* ```js
|
|
37
|
+
* // example StatusMatrix
|
|
38
|
+
* [
|
|
39
|
+
* ["a.txt", 0, 2, 0], // new, untracked
|
|
40
|
+
* ["b.txt", 0, 2, 2], // added, staged
|
|
41
|
+
* ["c.txt", 0, 2, 3], // added, staged, with unstaged changes
|
|
42
|
+
* ["d.txt", 1, 1, 1], // unmodified
|
|
43
|
+
* ["e.txt", 1, 2, 1], // modified, unstaged
|
|
44
|
+
* ["f.txt", 1, 2, 2], // modified, staged
|
|
45
|
+
* ["g.txt", 1, 2, 3], // modified, staged, with unstaged changes
|
|
46
|
+
* ["h.txt", 1, 0, 1], // deleted, unstaged
|
|
47
|
+
* ["i.txt", 1, 0, 0], // deleted, staged
|
|
48
|
+
* ["j.txt", 1, 2, 0], // deleted, staged, with unstaged-modified changes (new file of the same name)
|
|
49
|
+
* ["k.txt", 1, 1, 0], // deleted, staged, with unstaged changes (new file of the same name)
|
|
50
|
+
* ]
|
|
51
|
+
* ```
|
|
52
|
+
*
|
|
53
|
+
* - The HEAD status is either absent (0) or present (1).
|
|
54
|
+
* - The WORKDIR status is either absent (0), identical to HEAD (1), or different from HEAD (2).
|
|
55
|
+
* - The STAGE status is either absent (0), identical to HEAD (1), identical to WORKDIR (2), or different from WORKDIR (3).
|
|
56
|
+
*
|
|
57
|
+
* ```ts
|
|
58
|
+
* type Filename = string
|
|
59
|
+
* type HeadStatus = 0 | 1
|
|
60
|
+
* type WorkdirStatus = 0 | 1 | 2
|
|
61
|
+
* type StageStatus = 0 | 1 | 2 | 3
|
|
62
|
+
*
|
|
63
|
+
* type StatusRow = [Filename, HeadStatus, WorkdirStatus, StageStatus]
|
|
64
|
+
*
|
|
65
|
+
* type StatusMatrix = StatusRow[]
|
|
66
|
+
* ```
|
|
67
|
+
*
|
|
68
|
+
* > Think of the natural progression of file modifications as being from HEAD (previous) -> WORKDIR (current) -> STAGE (next).
|
|
69
|
+
* > Then HEAD is "version 1", WORKDIR is "version 2", and STAGE is "version 3".
|
|
70
|
+
* > Then, imagine a "version 0" which is before the file was created.
|
|
71
|
+
* > Then the status value in each column corresponds to the oldest version of the file it is identical to.
|
|
72
|
+
* > (For a file to be identical to "version 0" means the file is deleted.)
|
|
73
|
+
*
|
|
74
|
+
* Here are some examples of queries you can answer using the result:
|
|
75
|
+
*
|
|
76
|
+
* #### Q: What files have been deleted?
|
|
77
|
+
* ```js
|
|
78
|
+
* const FILE = 0, WORKDIR = 2
|
|
79
|
+
*
|
|
80
|
+
* const filenames = (await statusMatrix({ dir }))
|
|
81
|
+
* .filter(row => row[WORKDIR] === 0)
|
|
82
|
+
* .map(row => row[FILE])
|
|
83
|
+
* ```
|
|
84
|
+
*
|
|
85
|
+
* #### Q: What files have unstaged changes?
|
|
86
|
+
* ```js
|
|
87
|
+
* const FILE = 0, WORKDIR = 2, STAGE = 3
|
|
88
|
+
*
|
|
89
|
+
* const filenames = (await statusMatrix({ dir }))
|
|
90
|
+
* .filter(row => row[WORKDIR] !== row[STAGE])
|
|
91
|
+
* .map(row => row[FILE])
|
|
92
|
+
* ```
|
|
93
|
+
*
|
|
94
|
+
* #### Q: What files have been modified since the last commit?
|
|
95
|
+
* ```js
|
|
96
|
+
* const FILE = 0, HEAD = 1, WORKDIR = 2
|
|
97
|
+
*
|
|
98
|
+
* const filenames = (await statusMatrix({ dir }))
|
|
99
|
+
* .filter(row => row[HEAD] !== row[WORKDIR])
|
|
100
|
+
* .map(row => row[FILE])
|
|
101
|
+
* ```
|
|
102
|
+
*
|
|
103
|
+
* #### Q: What files will NOT be changed if I commit right now?
|
|
104
|
+
* ```js
|
|
105
|
+
* const FILE = 0, HEAD = 1, STAGE = 3
|
|
106
|
+
*
|
|
107
|
+
* const filenames = (await statusMatrix({ dir }))
|
|
108
|
+
* .filter(row => row[HEAD] === row[STAGE])
|
|
109
|
+
* .map(row => row[FILE])
|
|
110
|
+
* ```
|
|
111
|
+
*
|
|
112
|
+
* For reference, here are all possible combinations:
|
|
113
|
+
*
|
|
114
|
+
* | HEAD | WORKDIR | STAGE | `git status --short` equivalent |
|
|
115
|
+
* | ---- | ------- | ----- | ------------------------------- |
|
|
116
|
+
* | 0 | 0 | 0 | `` |
|
|
117
|
+
* | 0 | 0 | 3 | `AD` |
|
|
118
|
+
* | 0 | 2 | 0 | `??` |
|
|
119
|
+
* | 0 | 2 | 2 | `A ` |
|
|
120
|
+
* | 0 | 2 | 3 | `AM` |
|
|
121
|
+
* | 1 | 0 | 0 | `D ` |
|
|
122
|
+
* | 1 | 0 | 1 | ` D` |
|
|
123
|
+
* | 1 | 0 | 3 | `MD` |
|
|
124
|
+
* | 1 | 1 | 0 | `D ` + `??` |
|
|
125
|
+
* | 1 | 1 | 1 | `` |
|
|
126
|
+
* | 1 | 1 | 3 | `MM` |
|
|
127
|
+
* | 1 | 2 | 0 | `D ` + `??` |
|
|
128
|
+
* | 1 | 2 | 1 | ` M` |
|
|
129
|
+
* | 1 | 2 | 2 | `M ` |
|
|
130
|
+
* | 1 | 2 | 3 | `MM` |
|
|
131
|
+
*
|
|
132
|
+
* @param {object} args
|
|
133
|
+
* @param {string} args.dir - The [working tree](dir-vs-gitdir.md) directory path
|
|
134
|
+
* @param {string} [args.gitdir=join(dir, '.git')] - [required] The [git directory](dir-vs-gitdir.md) path
|
|
135
|
+
* @param {string} [args.ref1 = 'HEAD'] - Optionally specify a different commit to compare against the workdir and stage instead of the HEAD
|
|
136
|
+
* @param {string} [args.ref2 = 'STAGE'] - Optionally specify a different commit to compare against the <ref1> commit instead of the workdir and stage
|
|
137
|
+
* @param {string[]} [args.filepaths = ['.']] - Limit the query to the given files and directories
|
|
138
|
+
* @param {function(string): boolean} [args.filter] - Filter the results to only those whose filepath matches a function.
|
|
139
|
+
* @param {boolean} [args.ignored = false] - include ignored files in the result
|
|
140
|
+
*
|
|
141
|
+
* @returns {Promise<Array<StatusRow>>} Resolves with a status matrix, described below.
|
|
142
|
+
* @see StatusRow
|
|
143
|
+
*/
|
|
144
|
+
export declare function statusMatrix({ dir, gitdir, ref1, ref2, filepaths, filter, ignored: shouldIgnore, }: {
|
|
145
|
+
dir: string;
|
|
146
|
+
gitdir?: string;
|
|
147
|
+
ref1: string;
|
|
148
|
+
ref2?: string;
|
|
149
|
+
filepaths?: string[];
|
|
150
|
+
filter?: ((arg0: string) => boolean) | undefined;
|
|
151
|
+
ignored?: boolean;
|
|
152
|
+
}): Promise<StatusRow[]>;
|
|
@@ -0,0 +1,220 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) 2023, jayree
|
|
3
|
+
* All rights reserved.
|
|
4
|
+
* Licensed under the BSD 3-Clause license.
|
|
5
|
+
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
|
+
*/
|
|
7
|
+
// https://github.com/isomorphic-git/isomorphic-git/blob/main/src/api/statusMatrix.js
|
|
8
|
+
import fs from 'node:fs/promises';
|
|
9
|
+
import { join } from 'node:path';
|
|
10
|
+
import { STAGE } from 'isomorphic-git';
|
|
11
|
+
import { TREE } from 'isomorphic-git';
|
|
12
|
+
import { WORKDIR } from 'isomorphic-git';
|
|
13
|
+
import { walk as _walk } from 'isomorphic-git';
|
|
14
|
+
import { isIgnored as _isIgnored } from 'isomorphic-git';
|
|
15
|
+
import { worthWalking } from '../utils/worthWalking.js';
|
|
16
|
+
/**
|
|
17
|
+
* Efficiently get the status of multiple files at once.
|
|
18
|
+
*
|
|
19
|
+
* The returned `StatusMatrix` is admittedly not the easiest format to read.
|
|
20
|
+
* However it conveys a large amount of information in dense format that should make it easy to create reports about the current state of the repository;
|
|
21
|
+
* without having to do multiple, time-consuming isomorphic-git calls.
|
|
22
|
+
* My hope is that the speed and flexibility of the function will make up for the learning curve of interpreting the return value.
|
|
23
|
+
*
|
|
24
|
+
* ```js live
|
|
25
|
+
* // get the status of all the files in 'src'
|
|
26
|
+
* let status = await git.statusMatrix({
|
|
27
|
+
* fs,
|
|
28
|
+
* dir: '/tutorial',
|
|
29
|
+
* filter: f => f.startsWith('src/')
|
|
30
|
+
* })
|
|
31
|
+
* console.log(status)
|
|
32
|
+
* ```
|
|
33
|
+
*
|
|
34
|
+
* ```js live
|
|
35
|
+
* // get the status of all the JSON and Markdown files
|
|
36
|
+
* let status = await git.statusMatrix({
|
|
37
|
+
* fs,
|
|
38
|
+
* dir: '/tutorial',
|
|
39
|
+
* filter: f => f.endsWith('.json') || f.endsWith('.md')
|
|
40
|
+
* })
|
|
41
|
+
* console.log(status)
|
|
42
|
+
* ```
|
|
43
|
+
*
|
|
44
|
+
* The result is returned as a 2D array.
|
|
45
|
+
* The outer array represents the files and/or blobs in the repo, in alphabetical order.
|
|
46
|
+
* The inner arrays describe the status of the file:
|
|
47
|
+
* the first value is the filepath, and the next three are integers
|
|
48
|
+
* representing the HEAD status, WORKDIR status, and STAGE status of the entry.
|
|
49
|
+
*
|
|
50
|
+
* ```js
|
|
51
|
+
* // example StatusMatrix
|
|
52
|
+
* [
|
|
53
|
+
* ["a.txt", 0, 2, 0], // new, untracked
|
|
54
|
+
* ["b.txt", 0, 2, 2], // added, staged
|
|
55
|
+
* ["c.txt", 0, 2, 3], // added, staged, with unstaged changes
|
|
56
|
+
* ["d.txt", 1, 1, 1], // unmodified
|
|
57
|
+
* ["e.txt", 1, 2, 1], // modified, unstaged
|
|
58
|
+
* ["f.txt", 1, 2, 2], // modified, staged
|
|
59
|
+
* ["g.txt", 1, 2, 3], // modified, staged, with unstaged changes
|
|
60
|
+
* ["h.txt", 1, 0, 1], // deleted, unstaged
|
|
61
|
+
* ["i.txt", 1, 0, 0], // deleted, staged
|
|
62
|
+
* ["j.txt", 1, 2, 0], // deleted, staged, with unstaged-modified changes (new file of the same name)
|
|
63
|
+
* ["k.txt", 1, 1, 0], // deleted, staged, with unstaged changes (new file of the same name)
|
|
64
|
+
* ]
|
|
65
|
+
* ```
|
|
66
|
+
*
|
|
67
|
+
* - The HEAD status is either absent (0) or present (1).
|
|
68
|
+
* - The WORKDIR status is either absent (0), identical to HEAD (1), or different from HEAD (2).
|
|
69
|
+
* - The STAGE status is either absent (0), identical to HEAD (1), identical to WORKDIR (2), or different from WORKDIR (3).
|
|
70
|
+
*
|
|
71
|
+
* ```ts
|
|
72
|
+
* type Filename = string
|
|
73
|
+
* type HeadStatus = 0 | 1
|
|
74
|
+
* type WorkdirStatus = 0 | 1 | 2
|
|
75
|
+
* type StageStatus = 0 | 1 | 2 | 3
|
|
76
|
+
*
|
|
77
|
+
* type StatusRow = [Filename, HeadStatus, WorkdirStatus, StageStatus]
|
|
78
|
+
*
|
|
79
|
+
* type StatusMatrix = StatusRow[]
|
|
80
|
+
* ```
|
|
81
|
+
*
|
|
82
|
+
* > Think of the natural progression of file modifications as being from HEAD (previous) -> WORKDIR (current) -> STAGE (next).
|
|
83
|
+
* > Then HEAD is "version 1", WORKDIR is "version 2", and STAGE is "version 3".
|
|
84
|
+
* > Then, imagine a "version 0" which is before the file was created.
|
|
85
|
+
* > Then the status value in each column corresponds to the oldest version of the file it is identical to.
|
|
86
|
+
* > (For a file to be identical to "version 0" means the file is deleted.)
|
|
87
|
+
*
|
|
88
|
+
* Here are some examples of queries you can answer using the result:
|
|
89
|
+
*
|
|
90
|
+
* #### Q: What files have been deleted?
|
|
91
|
+
* ```js
|
|
92
|
+
* const FILE = 0, WORKDIR = 2
|
|
93
|
+
*
|
|
94
|
+
* const filenames = (await statusMatrix({ dir }))
|
|
95
|
+
* .filter(row => row[WORKDIR] === 0)
|
|
96
|
+
* .map(row => row[FILE])
|
|
97
|
+
* ```
|
|
98
|
+
*
|
|
99
|
+
* #### Q: What files have unstaged changes?
|
|
100
|
+
* ```js
|
|
101
|
+
* const FILE = 0, WORKDIR = 2, STAGE = 3
|
|
102
|
+
*
|
|
103
|
+
* const filenames = (await statusMatrix({ dir }))
|
|
104
|
+
* .filter(row => row[WORKDIR] !== row[STAGE])
|
|
105
|
+
* .map(row => row[FILE])
|
|
106
|
+
* ```
|
|
107
|
+
*
|
|
108
|
+
* #### Q: What files have been modified since the last commit?
|
|
109
|
+
* ```js
|
|
110
|
+
* const FILE = 0, HEAD = 1, WORKDIR = 2
|
|
111
|
+
*
|
|
112
|
+
* const filenames = (await statusMatrix({ dir }))
|
|
113
|
+
* .filter(row => row[HEAD] !== row[WORKDIR])
|
|
114
|
+
* .map(row => row[FILE])
|
|
115
|
+
* ```
|
|
116
|
+
*
|
|
117
|
+
* #### Q: What files will NOT be changed if I commit right now?
|
|
118
|
+
* ```js
|
|
119
|
+
* const FILE = 0, HEAD = 1, STAGE = 3
|
|
120
|
+
*
|
|
121
|
+
* const filenames = (await statusMatrix({ dir }))
|
|
122
|
+
* .filter(row => row[HEAD] === row[STAGE])
|
|
123
|
+
* .map(row => row[FILE])
|
|
124
|
+
* ```
|
|
125
|
+
*
|
|
126
|
+
* For reference, here are all possible combinations:
|
|
127
|
+
*
|
|
128
|
+
* | HEAD | WORKDIR | STAGE | `git status --short` equivalent |
|
|
129
|
+
* | ---- | ------- | ----- | ------------------------------- |
|
|
130
|
+
* | 0 | 0 | 0 | `` |
|
|
131
|
+
* | 0 | 0 | 3 | `AD` |
|
|
132
|
+
* | 0 | 2 | 0 | `??` |
|
|
133
|
+
* | 0 | 2 | 2 | `A ` |
|
|
134
|
+
* | 0 | 2 | 3 | `AM` |
|
|
135
|
+
* | 1 | 0 | 0 | `D ` |
|
|
136
|
+
* | 1 | 0 | 1 | ` D` |
|
|
137
|
+
* | 1 | 0 | 3 | `MD` |
|
|
138
|
+
* | 1 | 1 | 0 | `D ` + `??` |
|
|
139
|
+
* | 1 | 1 | 1 | `` |
|
|
140
|
+
* | 1 | 1 | 3 | `MM` |
|
|
141
|
+
* | 1 | 2 | 0 | `D ` + `??` |
|
|
142
|
+
* | 1 | 2 | 1 | ` M` |
|
|
143
|
+
* | 1 | 2 | 2 | `M ` |
|
|
144
|
+
* | 1 | 2 | 3 | `MM` |
|
|
145
|
+
*
|
|
146
|
+
* @param {object} args
|
|
147
|
+
* @param {string} args.dir - The [working tree](dir-vs-gitdir.md) directory path
|
|
148
|
+
* @param {string} [args.gitdir=join(dir, '.git')] - [required] The [git directory](dir-vs-gitdir.md) path
|
|
149
|
+
* @param {string} [args.ref1 = 'HEAD'] - Optionally specify a different commit to compare against the workdir and stage instead of the HEAD
|
|
150
|
+
* @param {string} [args.ref2 = 'STAGE'] - Optionally specify a different commit to compare against the <ref1> commit instead of the workdir and stage
|
|
151
|
+
* @param {string[]} [args.filepaths = ['.']] - Limit the query to the given files and directories
|
|
152
|
+
* @param {function(string): boolean} [args.filter] - Filter the results to only those whose filepath matches a function.
|
|
153
|
+
* @param {boolean} [args.ignored = false] - include ignored files in the result
|
|
154
|
+
*
|
|
155
|
+
* @returns {Promise<Array<StatusRow>>} Resolves with a status matrix, described below.
|
|
156
|
+
* @see StatusRow
|
|
157
|
+
*/
|
|
158
|
+
export async function statusMatrix({ dir, gitdir = join(dir, '.git'), ref1 = 'HEAD', ref2, filepaths = ['.'], filter, ignored: shouldIgnore = false, }) {
|
|
159
|
+
return _walk({
|
|
160
|
+
fs,
|
|
161
|
+
dir,
|
|
162
|
+
gitdir,
|
|
163
|
+
trees: [TREE({ ref: ref1 }), ref2 ? TREE({ ref: ref2 }) : WORKDIR(), ref2 ? TREE({ ref: ref2 }) : STAGE()],
|
|
164
|
+
// eslint-disable-next-line complexity
|
|
165
|
+
async map(filepath, [head, workdir, stage]) {
|
|
166
|
+
// Ignore ignored files, but only if they are not already tracked.
|
|
167
|
+
if (!head && !stage && workdir) {
|
|
168
|
+
if (!shouldIgnore) {
|
|
169
|
+
const isIgnored = await _isIgnored({
|
|
170
|
+
fs,
|
|
171
|
+
dir,
|
|
172
|
+
filepath,
|
|
173
|
+
});
|
|
174
|
+
if (isIgnored) {
|
|
175
|
+
return null;
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
// match against base paths
|
|
180
|
+
if (!filepaths.some((base) => worthWalking(filepath, base))) {
|
|
181
|
+
return null;
|
|
182
|
+
}
|
|
183
|
+
// Late filter against file names
|
|
184
|
+
if (filter) {
|
|
185
|
+
if (!filter(filepath))
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
188
|
+
const [headType, workdirType, stageType] = await Promise.all([head?.type(), workdir?.type(), stage?.type()]);
|
|
189
|
+
const isBlob = [headType, workdirType, stageType].includes('blob');
|
|
190
|
+
// For now, bail on directories unless the file is also a blob in another tree
|
|
191
|
+
if ((headType === 'tree' || headType === 'special') && !isBlob)
|
|
192
|
+
return;
|
|
193
|
+
if (headType === 'commit')
|
|
194
|
+
return null;
|
|
195
|
+
if ((workdirType === 'tree' || workdirType === 'special') && !isBlob)
|
|
196
|
+
return;
|
|
197
|
+
if (stageType === 'commit')
|
|
198
|
+
return null;
|
|
199
|
+
if ((stageType === 'tree' || stageType === 'special') && !isBlob)
|
|
200
|
+
return;
|
|
201
|
+
// Figure out the oids for files, using the staged oid for the working dir oid if the stats match.
|
|
202
|
+
const headOid = headType === 'blob' ? await head?.oid() : undefined;
|
|
203
|
+
const stageOid = stageType === 'blob' ? await stage?.oid() : undefined;
|
|
204
|
+
let workdirOid;
|
|
205
|
+
if (headType !== 'blob' && workdirType === 'blob' && stageType !== 'blob') {
|
|
206
|
+
// We don't actually NEED the sha. Any sha will do
|
|
207
|
+
// TODO: update this logic to handle N trees instead of just 3.
|
|
208
|
+
workdirOid = '42';
|
|
209
|
+
}
|
|
210
|
+
else if (workdirType === 'blob') {
|
|
211
|
+
workdirOid = await workdir?.oid();
|
|
212
|
+
}
|
|
213
|
+
const entry = [undefined, headOid, workdirOid, stageOid];
|
|
214
|
+
const result = entry.map((value) => entry.indexOf(value));
|
|
215
|
+
result.shift(); // remove leading undefined entry
|
|
216
|
+
return [filepath, ...result];
|
|
217
|
+
},
|
|
218
|
+
});
|
|
219
|
+
}
|
|
220
|
+
//# sourceMappingURL=statusMatrix.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"statusMatrix.js","sourceRoot":"","sources":["../../../src/SDR-extra/api/statusMatrix.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,5 @@
|
|
|
1
|
-
import { ComponentSet
|
|
2
|
-
|
|
3
|
-
/**
|
|
4
|
-
* Git ref to resolve components against
|
|
5
|
-
*/
|
|
6
|
-
ref: string | string[];
|
|
7
|
-
/**
|
|
8
|
-
* File paths or directory paths to resolve components against
|
|
9
|
-
*/
|
|
10
|
-
fsPaths?: string[];
|
|
11
|
-
} & OptionalTreeRegistryOptions;
|
|
1
|
+
import { ComponentSet } from '@salesforce/source-deploy-retrieve';
|
|
2
|
+
import { FromGitDiffOptions } from './types.js';
|
|
12
3
|
export declare class ComponentSetExtra extends ComponentSet {
|
|
13
4
|
/**
|
|
14
5
|
* Resolve metadata components from git diff <ref> HEAD.
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
6
|
*/
|
|
7
7
|
import path from 'node:path';
|
|
8
|
-
import { ComponentSet, RegistryAccess
|
|
8
|
+
import { ComponentSet, RegistryAccess } from '@salesforce/source-deploy-retrieve';
|
|
9
9
|
import { SfProject, Lifecycle, Logger } from '@salesforce/core';
|
|
10
10
|
import fs from 'graceful-fs';
|
|
11
11
|
import { GitDiffResolver } from '../resolve/gitDiffResolver.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"componentSetExtra.js","sourceRoot":"","sources":["../../../src/SDR-extra/collections/componentSetExtra.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,
|
|
1
|
+
{"version":3,"file":"componentSetExtra.js","sourceRoot":"","sources":["../../../src/SDR-extra/collections/componentSetExtra.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export { ComponentSetExtra } from './componentSetExtra.js';
|
|
2
|
+
export { FromGitDiffOptions } from './types.js';
|
|
@@ -4,5 +4,5 @@
|
|
|
4
4
|
* Licensed under the BSD 3-Clause license.
|
|
5
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
6
|
*/
|
|
7
|
-
export
|
|
7
|
+
export { ComponentSetExtra } from './componentSetExtra.js';
|
|
8
8
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/SDR-extra/collections/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/SDR-extra/collections/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { OptionalTreeRegistryOptions } from '@salesforce/source-deploy-retrieve';
|
|
2
|
+
export type FromGitDiffOptions = {
|
|
3
|
+
/**
|
|
4
|
+
* Git ref to resolve components against
|
|
5
|
+
*/
|
|
6
|
+
ref: string | string[];
|
|
7
|
+
/**
|
|
8
|
+
* File paths or directory paths to resolve components against
|
|
9
|
+
*/
|
|
10
|
+
fsPaths?: string[];
|
|
11
|
+
} & OptionalTreeRegistryOptions;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/SDR-extra/collections/types.ts"],"names":[],"mappings":""}
|
package/lib/SDR-extra/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export
|
|
2
|
-
export
|
|
3
|
-
export
|
|
1
|
+
export { ComponentSetExtra, FromGitDiffOptions } from './collections/index.js';
|
|
2
|
+
export { GitDiffResolver, VirtualTreeContainerExtra } from './resolve/index.js';
|
|
3
|
+
export { statusMatrix } from './api/statusMatrix.js';
|
package/lib/SDR-extra/index.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Licensed under the BSD 3-Clause license.
|
|
5
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
6
|
*/
|
|
7
|
-
export
|
|
8
|
-
export
|
|
9
|
-
export
|
|
7
|
+
export { ComponentSetExtra } from './collections/index.js';
|
|
8
|
+
export { GitDiffResolver, VirtualTreeContainerExtra } from './resolve/index.js';
|
|
9
|
+
export { statusMatrix } from './api/statusMatrix.js';
|
|
10
10
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/SDR-extra/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/SDR-extra/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,iBAAiB,EAAsB,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC"}
|
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
import path from 'node:path';
|
|
8
8
|
import { ComponentSet, RegistryAccess, MetadataResolver } from '@salesforce/source-deploy-retrieve';
|
|
9
9
|
import { SfError, Lifecycle, Logger } from '@salesforce/core';
|
|
10
|
-
import { GitRepo } from '../
|
|
11
|
-
import { getComponentSets, getGroupedFiles } from '../
|
|
10
|
+
import { GitRepo } from '../shared/local/localGitRepo.js';
|
|
11
|
+
import { getComponentSets, getGroupedFiles } from '../shared/gitComponentSetArray.js';
|
|
12
12
|
import { VirtualTreeContainerExtra } from '../resolve/treeContainersExtra.js';
|
|
13
13
|
const logger = Logger.childFromRoot('gitDiff:resolver');
|
|
14
14
|
/**
|
|
@@ -79,7 +79,6 @@ export class GitDiffResolver {
|
|
|
79
79
|
}
|
|
80
80
|
return cs;
|
|
81
81
|
}
|
|
82
|
-
// eslint-disable-next-line complexity
|
|
83
82
|
async gitChangesAsComponentSet(byPackageDir) {
|
|
84
83
|
const [projectConfig] = await Promise.all([
|
|
85
84
|
this.project.resolveProjectConfig(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitDiffResolver.js","sourceRoot":"","sources":["../../../src/SDR-extra/resolve/gitDiffResolver.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACpG,OAAO,EAAa,OAAO,EAAE,SAAS,EAAE,MAAM,EAAmB,MAAM,kBAAkB,CAAC;AAC1F,OAAO,EAAE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"gitDiffResolver.js","sourceRoot":"","sources":["../../../src/SDR-extra/resolve/gitDiffResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export
|
|
2
|
-
export
|
|
1
|
+
export { GitDiffResolver } from './gitDiffResolver.js';
|
|
2
|
+
export { VirtualTreeContainerExtra } from './treeContainersExtra.js';
|
|
@@ -4,6 +4,6 @@
|
|
|
4
4
|
* Licensed under the BSD 3-Clause license.
|
|
5
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
6
|
*/
|
|
7
|
-
export
|
|
8
|
-
export
|
|
7
|
+
export { GitDiffResolver } from './gitDiffResolver.js';
|
|
8
|
+
export { VirtualTreeContainerExtra } from './treeContainersExtra.js';
|
|
9
9
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/SDR-extra/resolve/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/SDR-extra/resolve/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gitComponentSetArray.js","sourceRoot":"","sources":["../../../src/SDR-extra/shared/gitComponentSetArray.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,8 +16,8 @@ import { excludeLwcLocalOnlyTest, folderContainsPath } from '@salesforce/source-
|
|
|
16
16
|
import { HEAD, WORKDIR, IS_WINDOWS, ensureWindows, ensurePosix, toFilenames, } from '@salesforce/source-tracking/lib/shared/local/functions.js';
|
|
17
17
|
import { getMatches } from '@salesforce/source-tracking/lib/shared/local/moveDetection.js';
|
|
18
18
|
import { parseMetadataXml } from '@salesforce/source-deploy-retrieve/lib/src/utils/index.js';
|
|
19
|
+
import { statusMatrix } from '../../api/statusMatrix.js';
|
|
19
20
|
import { filenameMatchesToMap, getLogMessage } from './moveDetection.js';
|
|
20
|
-
import { statusMatrix } from './statusMatrix.js';
|
|
21
21
|
export const STAGE = 3;
|
|
22
22
|
const redirectToCliRepoError = (e) => {
|
|
23
23
|
if (e instanceof git.Errors.InternalError) {
|