@jayree/sfdx-plugin-manifest 3.5.33 → 3.6.1
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +18 -0
- package/README.md +3 -3
- package/lib/SDR-extra/api/statusMatrix.d.ts +3 -1
- package/lib/SDR-extra/api/statusMatrix.js +3 -1
- package/lib/SDR-extra/api/statusMatrix.js.map +1 -1
- package/lib/SDR-extra/resolve/treeContainersExtra.js +5 -21
- package/lib/SDR-extra/resolve/treeContainersExtra.js.map +1 -1
- package/lib/SDR-extra/shared/local/localGitRepo.d.ts +9 -2
- package/lib/SDR-extra/shared/local/localGitRepo.js +45 -4
- package/lib/SDR-extra/shared/local/localGitRepo.js.map +1 -1
- package/lib/SDR-extra/shared/local/moveDetection.d.ts +1 -1
- package/lib/SDR-extra/shared/local/moveDetection.js +18 -20
- package/lib/SDR-extra/shared/local/moveDetection.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/npm-shrinkwrap.json +673 -60
- package/oclif.lock +454 -43
- package/oclif.manifest.json +1 -1
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
## [3.6.1](https://github.com/jayree/sfdx-plugin-manifest/compare/3.6.0...3.6.1) (2024-11-02)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **deps:** bump @salesforce/source-deploy-retrieve ([#1544](https://github.com/jayree/sfdx-plugin-manifest/issues/1544)) ([0731bec](https://github.com/jayree/sfdx-plugin-manifest/commit/0731bec8ceaa7e6a387c1364b64aa5d986cd6702))
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
# [3.6.0](https://github.com/jayree/sfdx-plugin-manifest/compare/3.5.33...3.6.0) (2024-10-27)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Features
|
|
14
|
+
|
|
15
|
+
* use isomorphic-git cache ([996ad86](https://github.com/jayree/sfdx-plugin-manifest/commit/996ad8682f4168f23ba1490fc7483a1ec00a8a0b))
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
1
19
|
## [3.5.33](https://github.com/jayree/sfdx-plugin-manifest/compare/3.5.32...3.5.33) (2024-10-26)
|
|
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.
|
|
63
|
+
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/3.6.1/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.
|
|
101
|
+
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/3.6.1/src/commands/jayree/manifest/generate.ts)_
|
|
102
102
|
|
|
103
103
|
### `sf jayree manifest git diff REF1 [REF2]`
|
|
104
104
|
|
|
@@ -181,7 +181,7 @@ 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.
|
|
184
|
+
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/3.6.1/src/commands/jayree/manifest/git/diff.ts)_
|
|
185
185
|
<!-- commandsstop -->
|
|
186
186
|
|
|
187
187
|
## Performance Testing
|
|
@@ -136,17 +136,19 @@ import { StatusRow } from 'isomorphic-git';
|
|
|
136
136
|
* @param {string} [args.ref2 = 'STAGE'] - Optionally specify a different commit to compare against the <ref1> commit instead of the workdir and stage
|
|
137
137
|
* @param {string[]} [args.filepaths = ['.']] - Limit the query to the given files and directories
|
|
138
138
|
* @param {function(string): boolean} [args.filter] - Filter the results to only those whose filepath matches a function.
|
|
139
|
+
* @param {object} [args.cache] - a [cache](cache.md) object
|
|
139
140
|
* @param {boolean} [args.ignored = false] - include ignored files in the result
|
|
140
141
|
*
|
|
141
142
|
* @returns {Promise<Array<StatusRow>>} Resolves with a status matrix, described below.
|
|
142
143
|
* @see StatusRow
|
|
143
144
|
*/
|
|
144
|
-
export declare function statusMatrix({ dir, gitdir, ref1, ref2, filepaths, filter, ignored: shouldIgnore, }: {
|
|
145
|
+
export declare function statusMatrix({ dir, gitdir, ref1, ref2, filepaths, filter, cache, ignored: shouldIgnore, }: {
|
|
145
146
|
dir: string;
|
|
146
147
|
gitdir?: string;
|
|
147
148
|
ref1: string;
|
|
148
149
|
ref2?: string;
|
|
149
150
|
filepaths?: string[];
|
|
150
151
|
filter?: ((arg0: string) => boolean) | undefined;
|
|
152
|
+
cache: unknown;
|
|
151
153
|
ignored?: boolean;
|
|
152
154
|
}): Promise<StatusRow[]>;
|
|
@@ -150,14 +150,16 @@ import { worthWalking } from '../utils/worthWalking.js';
|
|
|
150
150
|
* @param {string} [args.ref2 = 'STAGE'] - Optionally specify a different commit to compare against the <ref1> commit instead of the workdir and stage
|
|
151
151
|
* @param {string[]} [args.filepaths = ['.']] - Limit the query to the given files and directories
|
|
152
152
|
* @param {function(string): boolean} [args.filter] - Filter the results to only those whose filepath matches a function.
|
|
153
|
+
* @param {object} [args.cache] - a [cache](cache.md) object
|
|
153
154
|
* @param {boolean} [args.ignored = false] - include ignored files in the result
|
|
154
155
|
*
|
|
155
156
|
* @returns {Promise<Array<StatusRow>>} Resolves with a status matrix, described below.
|
|
156
157
|
* @see StatusRow
|
|
157
158
|
*/
|
|
158
|
-
export async function statusMatrix({ dir, gitdir = join(dir, '.git'), ref1 = 'HEAD', ref2, filepaths = ['.'], filter, ignored: shouldIgnore = false, }) {
|
|
159
|
+
export async function statusMatrix({ dir, gitdir = join(dir, '.git'), ref1 = 'HEAD', ref2, filepaths = ['.'], filter, cache = {}, ignored: shouldIgnore = false, }) {
|
|
159
160
|
return _walk({
|
|
160
161
|
fs,
|
|
162
|
+
cache,
|
|
161
163
|
dir,
|
|
162
164
|
gitdir,
|
|
163
165
|
trees: [TREE({ ref: ref1 }), ref2 ? TREE({ ref: ref2 }) : WORKDIR(), ref2 ? TREE({ ref: ref2 }) : STAGE()],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statusMatrix.js","sourceRoot":"","sources":["../../../src/SDR-extra/api/statusMatrix.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,qFAAqF;AACrF,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,IAAI,IAAI,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,SAAS,IAAI,UAAU,EAAa,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD
|
|
1
|
+
{"version":3,"file":"statusMatrix.js","sourceRoot":"","sources":["../../../src/SDR-extra/api/statusMatrix.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,12 +6,10 @@
|
|
|
6
6
|
*/
|
|
7
7
|
// https://github.com/forcedotcom/source-deploy-retrieve/blob/main/src/resolve/treeContainers.ts
|
|
8
8
|
import path from 'node:path';
|
|
9
|
-
import fs from 'node:fs/promises';
|
|
10
9
|
import { VirtualTreeContainer } from '@salesforce/source-deploy-retrieve';
|
|
11
10
|
import { parseMetadataXml } from '@salesforce/source-deploy-retrieve/lib/src/utils/index.js';
|
|
12
|
-
import { readBlob as _readBlob, listFiles as _listFiles, resolveRef } from 'isomorphic-git';
|
|
13
|
-
import { ensurePosix, ensureWindows, IS_WINDOWS } from '@salesforce/source-tracking/lib/shared/local/functions.js';
|
|
14
11
|
import { Performance } from '@oclif/core/performance';
|
|
12
|
+
import { GitRepo } from '../shared/local/localGitRepo.js';
|
|
15
13
|
export class VirtualTreeContainerExtra extends VirtualTreeContainer {
|
|
16
14
|
/**
|
|
17
15
|
* Designed for recreating virtual files from a git ref
|
|
@@ -24,8 +22,9 @@ export class VirtualTreeContainerExtra extends VirtualTreeContainer {
|
|
|
24
22
|
*/
|
|
25
23
|
static async fromGitRef(ref, dir, includeBufferForFiles) {
|
|
26
24
|
const marker = Performance.mark('@jayree/sfdx-plugin-manifest', 'VirtualTreeContainerExtra.fromGitRef');
|
|
27
|
-
const
|
|
28
|
-
const
|
|
25
|
+
const localRepo = GitRepo.getInstance({ dir });
|
|
26
|
+
const paths = await localRepo.listFiles(ref);
|
|
27
|
+
const oid = await localRepo.resolveRef(ref);
|
|
29
28
|
const virtualDirectoryByFullPath = new Map();
|
|
30
29
|
for await (const filepath of paths) {
|
|
31
30
|
let dirPath = path.dirname(filepath);
|
|
@@ -34,7 +33,7 @@ export class VirtualTreeContainerExtra extends VirtualTreeContainer {
|
|
|
34
33
|
children: Array.from(new Set(virtualDirectoryByFullPath.get(dirPath)?.children ?? []).add({
|
|
35
34
|
name: path.basename(filepath),
|
|
36
35
|
data: parseMetadataXml(filepath) && includeBufferForFiles.includes(filepath)
|
|
37
|
-
? await readBlob(
|
|
36
|
+
? await localRepo.readBlob(filepath, oid)
|
|
38
37
|
: Buffer.from(''),
|
|
39
38
|
})),
|
|
40
39
|
});
|
|
@@ -51,19 +50,4 @@ export class VirtualTreeContainerExtra extends VirtualTreeContainer {
|
|
|
51
50
|
return new VirtualTreeContainer(Array.from(virtualDirectoryByFullPath.values()));
|
|
52
51
|
}
|
|
53
52
|
}
|
|
54
|
-
async function listFiles(dir, ref) {
|
|
55
|
-
return ref
|
|
56
|
-
? (await _listFiles({ fs, dir, ref })).map((p) => path.join(IS_WINDOWS ? ensureWindows(p) : p))
|
|
57
|
-
: (await fs.readdir(dir, { recursive: true })).map((p) => path.join(IS_WINDOWS ? ensureWindows(p) : p));
|
|
58
|
-
}
|
|
59
|
-
async function readBlob(dir, filepath, oid) {
|
|
60
|
-
return oid
|
|
61
|
-
? Buffer.from((await _readBlob({
|
|
62
|
-
fs,
|
|
63
|
-
dir,
|
|
64
|
-
oid,
|
|
65
|
-
filepath: IS_WINDOWS ? ensurePosix(filepath) : filepath,
|
|
66
|
-
})).blob)
|
|
67
|
-
: fs.readFile(path.resolve(filepath));
|
|
68
|
-
}
|
|
69
53
|
//# sourceMappingURL=treeContainersExtra.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"treeContainersExtra.js","sourceRoot":"","sources":["../../../src/SDR-extra/resolve/treeContainersExtra.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,gGAAgG;AAChG,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"treeContainersExtra.js","sourceRoot":"","sources":["../../../src/SDR-extra/resolve/treeContainersExtra.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,gGAAgG;AAChG,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAoB,MAAM,oCAAoC,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC7F,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAE1D,MAAM,OAAO,yBAA0B,SAAQ,oBAAoB;IACjE;;;;;;;;OAQG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAC5B,GAAW,EACX,GAAW,EACX,qBAA+B;QAE/B,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,8BAA8B,EAAE,sCAAsC,CAAC,CAAC;QAExG,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,0BAA0B,GAAG,IAAI,GAAG,EAA4B,CAAC;QACvE,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;YACnC,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACrC,0BAA0B,CAAC,GAAG,CAAC,OAAO,EAAE;gBACtC,OAAO;gBACP,QAAQ,EAAE,KAAK,CAAC,IAAI,CAClB,IAAI,GAAG,CAAC,0BAA0B,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC;oBACnE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAC7B,IAAI,EACF,gBAAgB,CAAC,QAAQ,CAAC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,QAAQ,CAAC;wBACpE,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC;wBACzC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;iBACtB,CAAC,CACH;aACF,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3C,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAChD,0BAA0B,CAAC,GAAG,CAAC,OAAO,EAAE;oBACtC,OAAO;oBACP,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,0BAA0B,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBAC1G,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,CAAC;QAEf,OAAO,IAAI,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACnF,CAAC;CACF"}
|
|
@@ -4,18 +4,25 @@ import { RegistryAccess } from '@salesforce/source-deploy-retrieve';
|
|
|
4
4
|
export declare const STAGE = 3;
|
|
5
5
|
export type GitRepoOptions = {
|
|
6
6
|
dir: string;
|
|
7
|
-
packageDirs
|
|
8
|
-
registry
|
|
7
|
+
packageDirs?: NamedPackageDir[];
|
|
8
|
+
registry?: RegistryAccess;
|
|
9
9
|
};
|
|
10
10
|
export declare class GitRepo {
|
|
11
11
|
private static instanceMap;
|
|
12
12
|
dir: string;
|
|
13
13
|
private packageDirs;
|
|
14
14
|
private status;
|
|
15
|
+
private cache;
|
|
15
16
|
private lifecycle;
|
|
16
17
|
private readonly registry;
|
|
17
18
|
private constructor();
|
|
18
19
|
static getInstance(options: GitRepoOptions): GitRepo;
|
|
20
|
+
resolveRef(ref: string): Promise<string | undefined>;
|
|
21
|
+
getConfig(p: string): Promise<string>;
|
|
22
|
+
hashBlob(object: Buffer): Promise<string>;
|
|
23
|
+
listFiles(ref: string): Promise<string[]>;
|
|
24
|
+
readBlob(filepath: string, oid?: string): Promise<Buffer>;
|
|
25
|
+
readOid(filepath: string, oid: string): Promise<string>;
|
|
19
26
|
resolveMultiRefString(ref: string): Promise<{
|
|
20
27
|
ref1: string;
|
|
21
28
|
ref2: string;
|
|
@@ -10,9 +10,10 @@ import path from 'node:path';
|
|
|
10
10
|
import os from 'node:os';
|
|
11
11
|
import fs from 'node:fs/promises';
|
|
12
12
|
import { execSync } from 'node:child_process';
|
|
13
|
-
import git from 'isomorphic-git';
|
|
13
|
+
import git, { readBlob as _readBlob, listFiles as _listFiles } from 'isomorphic-git';
|
|
14
14
|
import { Performance } from '@oclif/core/performance';
|
|
15
15
|
import { Lifecycle, SfError } from '@salesforce/core';
|
|
16
|
+
import { RegistryAccess } from '@salesforce/source-deploy-retrieve';
|
|
16
17
|
import { excludeLwcLocalOnlyTest, folderContainsPath } from '@salesforce/source-tracking/lib/shared/functions.js';
|
|
17
18
|
import { HEAD, WORKDIR, IS_WINDOWS, ensureWindows, ensurePosix, toFilenames, } from '@salesforce/source-tracking/lib/shared/local/functions.js';
|
|
18
19
|
import { getMatches } from '@salesforce/source-tracking/lib/shared/local/moveDetection.js';
|
|
@@ -32,12 +33,14 @@ export class GitRepo {
|
|
|
32
33
|
dir;
|
|
33
34
|
packageDirs;
|
|
34
35
|
status;
|
|
36
|
+
cache;
|
|
35
37
|
lifecycle = Lifecycle.getInstance();
|
|
36
38
|
registry;
|
|
37
39
|
constructor(options) {
|
|
38
40
|
this.dir = options.dir;
|
|
39
|
-
this.packageDirs = options.packageDirs
|
|
40
|
-
this.registry = options.registry;
|
|
41
|
+
this.packageDirs = options.packageDirs?.map(packageDirToRelativePosixPath(options.dir)) ?? [];
|
|
42
|
+
this.registry = options.registry ?? new RegistryAccess();
|
|
43
|
+
this.cache = {};
|
|
41
44
|
}
|
|
42
45
|
static getInstance(options) {
|
|
43
46
|
if (!GitRepo.instanceMap.has(options.dir)) {
|
|
@@ -46,6 +49,41 @@ export class GitRepo {
|
|
|
46
49
|
}
|
|
47
50
|
return GitRepo.instanceMap.get(options.dir);
|
|
48
51
|
}
|
|
52
|
+
async resolveRef(ref) {
|
|
53
|
+
return ref ? git.resolveRef({ fs, dir: this.dir, ref }) : undefined;
|
|
54
|
+
}
|
|
55
|
+
async getConfig(p) {
|
|
56
|
+
return (await git.getConfig({ fs, dir: this.dir, path: p }));
|
|
57
|
+
}
|
|
58
|
+
// eslint-disable-next-line class-methods-use-this
|
|
59
|
+
async hashBlob(object) {
|
|
60
|
+
return (await git.hashBlob({ object })).oid;
|
|
61
|
+
}
|
|
62
|
+
async listFiles(ref) {
|
|
63
|
+
return ref
|
|
64
|
+
? (await _listFiles({ fs, dir: this.dir, ref, cache: this.cache })).map((p) => path.join(IS_WINDOWS ? ensureWindows(p) : p))
|
|
65
|
+
: (await fs.readdir(this.dir, { recursive: true })).map((p) => path.join(IS_WINDOWS ? ensureWindows(p) : p));
|
|
66
|
+
}
|
|
67
|
+
async readBlob(filepath, oid) {
|
|
68
|
+
return oid
|
|
69
|
+
? Buffer.from((await _readBlob({
|
|
70
|
+
fs,
|
|
71
|
+
dir: this.dir,
|
|
72
|
+
oid,
|
|
73
|
+
filepath: IS_WINDOWS ? ensurePosix(filepath) : filepath,
|
|
74
|
+
cache: this.cache,
|
|
75
|
+
})).blob)
|
|
76
|
+
: fs.readFile(path.resolve(filepath));
|
|
77
|
+
}
|
|
78
|
+
async readOid(filepath, oid) {
|
|
79
|
+
return (await _readBlob({
|
|
80
|
+
fs,
|
|
81
|
+
dir: this.dir,
|
|
82
|
+
oid,
|
|
83
|
+
filepath: IS_WINDOWS ? ensurePosix(filepath) : filepath,
|
|
84
|
+
cache: this.cache,
|
|
85
|
+
})).oid;
|
|
86
|
+
}
|
|
49
87
|
async resolveMultiRefString(ref) {
|
|
50
88
|
const a = ref.split('.');
|
|
51
89
|
let ref1;
|
|
@@ -66,6 +104,7 @@ export class GitRepo {
|
|
|
66
104
|
fs,
|
|
67
105
|
dir: this.dir,
|
|
68
106
|
oids: [ref2, ref1],
|
|
107
|
+
cache: this.cache,
|
|
69
108
|
}))[0];
|
|
70
109
|
}
|
|
71
110
|
else {
|
|
@@ -136,6 +175,7 @@ export class GitRepo {
|
|
|
136
175
|
try {
|
|
137
176
|
this.status = await statusMatrix({
|
|
138
177
|
dir: this.dir,
|
|
178
|
+
cache: this.cache,
|
|
139
179
|
ref1,
|
|
140
180
|
ref2,
|
|
141
181
|
filepaths: this.packageDirs,
|
|
@@ -204,7 +244,7 @@ export class GitRepo {
|
|
|
204
244
|
}
|
|
205
245
|
}
|
|
206
246
|
}
|
|
207
|
-
const matches = await filenameMatchesToMap(this.registry)(this.dir)(
|
|
247
|
+
const matches = await filenameMatchesToMap(this.registry)(this.dir)(matchingFiles);
|
|
208
248
|
sourceBehaviorOptionsBetaMatches.forEach((key, value) => {
|
|
209
249
|
matches.fullMatches.set(key, value);
|
|
210
250
|
});
|
|
@@ -226,6 +266,7 @@ export class GitRepo {
|
|
|
226
266
|
dir: this.dir,
|
|
227
267
|
ref,
|
|
228
268
|
depth: 1,
|
|
269
|
+
cache: this.cache,
|
|
229
270
|
});
|
|
230
271
|
return { oid: log.oid, parents: log.commit.parent };
|
|
231
272
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localGitRepo.js","sourceRoot":"","sources":["../../../../src/SDR-extra/shared/local/localGitRepo.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"localGitRepo.js","sourceRoot":"","sources":["../../../../src/SDR-extra/shared/local/localGitRepo.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,+FAA+F;AAC/F,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,GAAG,EAAE,EAAa,QAAQ,IAAI,SAAS,EAAE,SAAS,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAChG,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAmB,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,qDAAqD,CAAC;AAClH,OAAO,EACL,IAAI,EACJ,OAAO,EACP,UAAU,EACV,aAAa,EACb,WAAW,EACX,WAAW,GACZ,MAAM,2DAA2D,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,+DAA+D,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC7F,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEzE,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC;AAUvB,MAAM,sBAAsB,GAAG,CAAC,CAAU,EAAS,EAAE;IACnD,IAAI,CAAC,YAAY,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,OAAO,CACvB,uEAAuE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,EAChG,CAAC,CAAC,IAAI,CACP,CAAC;QACF,MAAM,KAAK,CAAC;IACd,CAAC;IACD,MAAM,CAAC,CAAC;AACV,CAAC,CAAC;AACF,MAAM,OAAO,OAAO;IACV,MAAM,CAAC,WAAW,GAAG,IAAI,GAAG,EAAmB,CAAC;IAEjD,GAAG,CAAS;IAEX,WAAW,CAAW;IACtB,MAAM,CAAe;IACrB,KAAK,CAAW;IAEhB,SAAS,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IAE3B,QAAQ,CAAiB;IAE1C,YAAoB,OAAuB;QACzC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,6BAA6B,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9F,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,cAAc,EAAE,CAAC;QACzD,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,OAAuB;QAC/C,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1C,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;YACzC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAY,CAAC;IACzD,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,GAAW;QACjC,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACtE,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,CAAS;QAC9B,OAAO,CAAC,MAAM,GAAG,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAW,CAAC;IACzE,CAAC;IAED,kDAAkD;IAC3C,KAAK,CAAC,QAAQ,CAAC,MAAc;QAClC,OAAO,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,GAAW;QAChC,OAAO,GAAG;YACR,CAAC,CAAC,CAAC,MAAM,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1E,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC7C;YACH,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjH,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,QAAgB,EAAE,GAAY;QAClD,OAAO,GAAG;YACR,CAAC,CAAC,MAAM,CAAC,IAAI,CACT,CACE,MAAM,SAAS,CAAC;gBACd,EAAE;gBACF,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,GAAG;gBACH,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ;gBACvD,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB,CAAC,CACH,CAAC,IAAI,CACP;YACH,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC1C,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,GAAW;QAChD,OAAO,CACL,MAAM,SAAS,CAAC;YACd,EAAE;YACF,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,GAAG;YACH,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ;YACvD,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CACH,CAAC,GAAG,CAAC;IACR,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,GAAW;QAI5C,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,IAAY,CAAC;QACjB,IAAI,IAAwB,CAAC;QAE7B,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACZ,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACzB,CAAC;aAAM,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACd,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,GAAG;4BACrE,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;YAC3B,IAAI,GAAG,CACL,MAAM,GAAG,CAAC,aAAa,CAAC;gBACtB,EAAE;gBACF,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;gBAClB,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB,CAAC,CACH,CAAC,CAAC,CAAW,CAAC;QACjB,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAE/C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,GAAuB;QACzD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YAC/C,OAAO,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAC5C,CAAC;QAED,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/G,IAAI,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACtC,IAAI,WAAW,GAAuB,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QACnE,OAAO,KAAK,CAAC,MAAM,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YACjD,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC3B,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACzC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBAC1C,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvB,4CAA4C;gBAC5C,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;YACzE,CAAC;iBAAM,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjC,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC3B,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACzC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBAC1C,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;oBAC/C,4CAA4C;oBAC5C,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBAClE,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,WAAW,GAAG,SAAS,CAAC;YAC1B,CAAC;QACH,CAAC;QACD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,sDAAsD,CAAC,CAAC;QACpG,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/E,CAAC;IAEM,eAAe;QACpB,OAAO,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACrC,CAAC;IAEM,WAAW;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/E,CAAC;IAEM,kBAAkB;QACvB,OAAO,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IACzC,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/E,CAAC;IAEM,kBAAkB;QACvB,OAAO,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IACxC,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,IAAa;QAChD,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,8BAA8B,EAAE,wBAAwB,CAAC,CAAC;QAC1F,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAEzC,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,GAAG,MAAM,YAAY,CAAC;gBAC/B,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI;gBACJ,IAAI;gBACJ,SAAS,EAAE,IAAI,CAAC,WAAW;gBAC3B,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC;aACrC,CAAC,CAAC;YAEH,0FAA0F;YAC1F,IAAI,UAAU,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACxG,CAAC;YAED,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,sBAAsB,CAAC,CAAC,CAAC,CAAC;QAC5B,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,CAAC;QACf,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAEM,KAAK,CAAC,kBAAkB;QAC7B,MAAM,eAAe,GAAgC;YACnD,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,uCAAuC;YAClD,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,2CAA2C;YACtD,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,0CAA0C;YACrD,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,+CAA+C;YAC1D,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,yCAAyC;YACpD,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,wCAAwC;YACnD,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,gDAAgD;YAC3D,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,qBAAqB;YAChC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,oBAAoB;YAC/B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,iBAAiB;SAC7B,CAAC;QAEF,kBAAkB;QAClB,MAAM,eAAe,GAAc;YACjC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,yDAAyD,EAAE;YACvI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,uDAAuD,EAAE;YACpG,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,qCAAqC,EAAE;YAClF,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,sCAAsC,EAAE;SACzE,CAAC;QAEF,MAAM,cAAc,GAAG,CAAC,GAAc,EAAE,QAAqC,EAAW,EAAE,CACxF,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5E,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC;QAEvF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEtC,MAAM,kBAAkB,GAAG,CAAC,QAAmB,EAAwB,EAAE,CACvE,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,MAAM,WAAW,GAAG,YAAY;iBAC7B,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;iBACpD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE/D,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QACnG,CAAC,CAAC,CAAC;QAEL,MAAM,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,CAAC;IACzD,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI;YAAE,OAAO;QAErE,MAAM,gBAAgB,GAAG,WAAW,CAAC,IAAI,CAAC,8BAA8B,EAAE,+BAA+B,CAAC,CAAC;QAE3G,MAAM,gCAAgC,GAAG,IAAI,GAAG,EAAE,CAAC;QACnD,KAAK,MAAM,eAAe,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;YACpD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC;YAC7D,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;gBACzG,IAAI,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC3C,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;oBAC9C,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;oBAC1C,gCAAgC,CAAC,GAAG,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;gBACvE,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC;QAEnF,gCAAgC,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,KAAa,EAAE,EAAE;YACtE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,IAAI,OAAO,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO;QAE5E,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAEhG,MAAM,WAAW,GAAG;YAClB,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE;YAC/B,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE;YAC7B,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE;SAC/B,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3F,gBAAgB,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,GAAW;QACpC,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC;gBAC1B,EAAE;gBACF,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,GAAG;gBACH,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB,CAAC,CAAC;YACH,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACtD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,uBAAuB,GAAG;4BACN,CACrB,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,2BAA2B;QACvC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,QAAQ,CAAC,wCAAwC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;YAEvG,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC3C,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACtC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBAClC,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;oBAC3B,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAC9B,2CAA2C,KAAK,OAAO,IAAI,+EAA+E,KAAK,IAAI,CACpJ,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,4CAA4C;QAC9C,CAAC;IACH,CAAC;;AAGH,MAAM,6BAA6B,GACjC,CAAC,WAAmB,EAAE,EAAE,CACxB,CAAC,UAA2B,EAAU,EAAE,CACtC,UAAU;IACR,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC9D,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;AAExD,MAAM,UAAU,GACd,CAAC,WAAqB,EAAE,EAAE,CAC1B,CAAC,CAAS,EAAW,EAAE;AACrB,kBAAkB;AAClB,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;IAC3B,eAAe;IACf,uBAAuB,CAAC,CAAC,CAAC;IAC1B,qBAAqB;IACrB,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;IACzB,kFAAkF;IAClF,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC"}
|
|
@@ -11,6 +11,6 @@ export type StringMapsForMatches = {
|
|
|
11
11
|
deleteOnly: StringMap;
|
|
12
12
|
};
|
|
13
13
|
/** composed functions to simplified use by the shadowRepo class */
|
|
14
|
-
export declare const filenameMatchesToMap: (registry: RegistryAccess) => (projectPath: string) => (
|
|
14
|
+
export declare const filenameMatchesToMap: (registry: RegistryAccess) => (projectPath: string) => ({ added, deleted }: AddedAndDeletedFilenames) => Promise<StringMapsForMatches>;
|
|
15
15
|
export declare const getLogMessage: (matches: StringMapsForMatches) => string[];
|
|
16
16
|
export {};
|
|
@@ -9,20 +9,22 @@ import path from 'node:path';
|
|
|
9
9
|
import { isUtf8 } from 'node:buffer';
|
|
10
10
|
import { Lifecycle } from '@salesforce/core';
|
|
11
11
|
import { MetadataResolver, VirtualTreeContainer, } from '@salesforce/source-deploy-retrieve';
|
|
12
|
-
import git from 'isomorphic-git';
|
|
13
|
-
import fs from 'graceful-fs';
|
|
14
12
|
import { Performance } from '@oclif/core/performance';
|
|
15
13
|
import { isDefined } from '@salesforce/source-tracking/lib/shared/guards.js';
|
|
16
14
|
import { uniqueArrayConcat } from '@salesforce/source-tracking/lib/shared/functions.js';
|
|
17
|
-
import { IS_WINDOWS,
|
|
15
|
+
import { IS_WINDOWS, ensureWindows } from '@salesforce/source-tracking/lib/shared/local/functions.js';
|
|
18
16
|
import { buildMap } from '@salesforce/source-tracking/lib/shared/local/moveDetection.js';
|
|
17
|
+
import { GitRepo } from './localGitRepo.js';
|
|
19
18
|
const JOIN_CHAR = '#__#'; // the __ makes it unlikely to be used in metadata names
|
|
19
|
+
let localRepo;
|
|
20
20
|
/** composed functions to simplified use by the shadowRepo class */
|
|
21
|
-
export const filenameMatchesToMap = (registry) => (projectPath) =>
|
|
21
|
+
export const filenameMatchesToMap = (registry) => (projectPath) => async ({ added, deleted }) => {
|
|
22
22
|
const resolver = new MetadataResolver(registry, VirtualTreeContainer.fromFilePaths(uniqueArrayConcat(added, deleted)));
|
|
23
|
+
localRepo = GitRepo.getInstance({
|
|
24
|
+
dir: projectPath,
|
|
25
|
+
registry,
|
|
26
|
+
});
|
|
23
27
|
return compareHashes(await buildMaps(addTypes(resolver)(await toFileInfo({
|
|
24
|
-
projectPath,
|
|
25
|
-
gitDir,
|
|
26
28
|
added,
|
|
27
29
|
deleted,
|
|
28
30
|
}))));
|
|
@@ -76,33 +78,29 @@ const compareHashes = ({ addedMap, deletedMap }) => {
|
|
|
76
78
|
return { fullMatches: matches, deleteOnly: new Map() };
|
|
77
79
|
};
|
|
78
80
|
/** enrich the filenames with basename and oid (hash) */
|
|
79
|
-
const toFileInfo = async ({
|
|
81
|
+
const toFileInfo = async ({ added, deleted, }) => {
|
|
80
82
|
const getInfoMarker = Performance.mark('@jayree/sfdx-plugin-manifest', 'localGitRepo.detectMovedFiles#toFileInfo', {
|
|
81
83
|
addedFiles: added.size,
|
|
82
84
|
deletedFiles: deleted.size,
|
|
83
85
|
});
|
|
84
|
-
const headRef = await
|
|
86
|
+
const headRef = (await localRepo.resolveRef('HEAD'));
|
|
85
87
|
const [addedInfo, deletedInfo] = await Promise.all([
|
|
86
|
-
await Promise.all(Array.from(added).map(getHashForAddedFile
|
|
87
|
-
await Promise.all(Array.from(deleted).map(getHashFromActualFileContents(
|
|
88
|
+
await Promise.all(Array.from(added).map(getHashForAddedFile)),
|
|
89
|
+
await Promise.all(Array.from(deleted).map(getHashFromActualFileContents(headRef))),
|
|
88
90
|
]);
|
|
89
91
|
getInfoMarker?.stop();
|
|
90
92
|
return { addedInfo, deletedInfo };
|
|
91
93
|
};
|
|
92
|
-
const getHashForAddedFile =
|
|
93
|
-
const autocrlf =
|
|
94
|
-
|
|
95
|
-
dir: projectPath,
|
|
96
|
-
path: 'core.autocrlf',
|
|
97
|
-
}));
|
|
98
|
-
let object = await fs.promises.readFile(path.join(projectPath, filepath));
|
|
94
|
+
const getHashForAddedFile = async (filepath) => {
|
|
95
|
+
const autocrlf = await localRepo.getConfig('core.autocrlf');
|
|
96
|
+
let object = await localRepo.readBlob(filepath);
|
|
99
97
|
if (autocrlf === 'true' && isUtf8(object)) {
|
|
100
98
|
object = Buffer.from(object.toString('utf8').replace(/\r\n/g, '\n'));
|
|
101
99
|
}
|
|
102
100
|
return {
|
|
103
101
|
filename: filepath,
|
|
104
102
|
basename: path.basename(filepath),
|
|
105
|
-
hash:
|
|
103
|
+
hash: await localRepo.hashBlob(object),
|
|
106
104
|
};
|
|
107
105
|
};
|
|
108
106
|
const resolveType = (resolver) => (filenames) => filenames
|
|
@@ -116,10 +114,10 @@ const resolveType = (resolver) => (filenames) => filenames
|
|
|
116
114
|
})
|
|
117
115
|
.filter(isDefined);
|
|
118
116
|
/** where we don't have git objects to use, read the file contents to generate the hash */
|
|
119
|
-
const getHashFromActualFileContents = (
|
|
117
|
+
const getHashFromActualFileContents = (oid) => async (filepath) => ({
|
|
120
118
|
filename: filepath,
|
|
121
119
|
basename: path.basename(filepath),
|
|
122
|
-
hash:
|
|
120
|
+
hash: await localRepo.readOid(filepath, oid),
|
|
123
121
|
});
|
|
124
122
|
const removeHashFromEntry = ([k, v]) => [removeHashFromKey(k), v];
|
|
125
123
|
const removeHashFromKey = (hash) => hash.split(JOIN_CHAR).splice(1).join(JOIN_CHAR);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moveDetection.js","sourceRoot":"","sources":["../../../../src/SDR-extra/shared/local/moveDetection.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,6FAA6F;AAC7F,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EACL,gBAAgB,EAGhB,oBAAoB,GACrB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"moveDetection.js","sourceRoot":"","sources":["../../../../src/SDR-extra/shared/local/moveDetection.ts"],"names":[],"mappings":"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"}
|