sfdx-git-delta 7.3.0 → 7.4.0
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/README.md +2 -2
- package/lib/adapter/GitAdapter.d.ts +4 -1
- package/lib/adapter/GitAdapter.js +76 -20
- package/lib/adapter/GitAdapter.js.map +1 -1
- package/lib/adapter/tsgitErrorMap.d.ts +5 -3
- package/lib/adapter/tsgitErrorMap.js +48 -16
- package/lib/adapter/tsgitErrorMap.js.map +1 -1
- package/lib/utils/configValidator.d.ts +3 -0
- package/lib/utils/configValidator.js +26 -7
- package/lib/utils/configValidator.js.map +1 -1
- package/lib/utils/errorUtils.d.ts +3 -0
- package/lib/utils/errorUtils.js +6 -0
- package/lib/utils/errorUtils.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +32 -17
package/README.md
CHANGED
|
@@ -122,7 +122,7 @@ It's also important to implement a way to switch back to full deployment in case
|
|
|
122
122
|
|
|
123
123
|
### Prerequisites
|
|
124
124
|
|
|
125
|
-
No `git` binary is required: the plugin reads the repository's git object store in-process.
|
|
125
|
+
No `git` binary is required: the plugin reads the repository's git object store in-process, including `--ref-format=reftable` and `--object-format=sha256` repositories (the latter isn't hosted by GitHub or GitLab today, so you're unlikely to run into one).
|
|
126
126
|
|
|
127
127
|
**Node v22 or above is required**.
|
|
128
128
|
To check if Salesforce CLI runs under a supported node version for SGD, run `sf --version`. You should see a node version of v22 or above to use SGD.
|
|
@@ -214,7 +214,7 @@ FLAG DESCRIPTIONS
|
|
|
214
214
|
`--source-dir force-app` does not match `nested/force-app/...`.
|
|
215
215
|
```
|
|
216
216
|
|
|
217
|
-
_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v7.
|
|
217
|
+
_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v7.4.0/src/commands/sgd/source/delta.ts)_
|
|
218
218
|
<!-- commandsstop -->
|
|
219
219
|
|
|
220
220
|
### Windows users
|
|
@@ -21,7 +21,8 @@ export type DiffRequest = Readonly<{
|
|
|
21
21
|
scopes: readonly Pathspec[];
|
|
22
22
|
}>;
|
|
23
23
|
export default class GitAdapter implements GitBlobReader {
|
|
24
|
-
private readonly
|
|
24
|
+
private readonly key;
|
|
25
|
+
private readonly repoPath;
|
|
25
26
|
private static instances;
|
|
26
27
|
private static keyFor;
|
|
27
28
|
static getInstance(config: Config): GitAdapter;
|
|
@@ -29,6 +30,8 @@ export default class GitAdapter implements GitBlobReader {
|
|
|
29
30
|
protected readonly blobIdIndex: Map<string, Map<string, ObjectId>>;
|
|
30
31
|
private repoHandle;
|
|
31
32
|
private constructor();
|
|
33
|
+
get repositoryKey(): string;
|
|
34
|
+
private mapError;
|
|
32
35
|
protected getRepo(): Promise<Repository>;
|
|
33
36
|
close(): Promise<void>;
|
|
34
37
|
parseRev(ref: string): Promise<string>;
|
|
@@ -35,7 +35,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
35
35
|
import { once } from 'node:events';
|
|
36
36
|
import { createReadStream } from 'node:fs';
|
|
37
37
|
import { readFile, stat } from 'node:fs/promises';
|
|
38
|
-
import { join } from 'node:path
|
|
38
|
+
import { join, resolve } from 'node:path';
|
|
39
39
|
import { PassThrough, Readable } from 'node:stream';
|
|
40
40
|
import { openRepository, } from '@scolladon/tsgit';
|
|
41
41
|
import { UTF8_ENCODING } from '../constant/fsConstants.js';
|
|
@@ -65,7 +65,8 @@ const IGNORE_WHITESPACE_OPTIONS = {
|
|
|
65
65
|
const LFS_MAGIC = Buffer.from('version https://git-lfs.github.com/spec/v1\n');
|
|
66
66
|
const LFS_POINTER_CAP = 1024;
|
|
67
67
|
export default class GitAdapter {
|
|
68
|
-
|
|
68
|
+
key;
|
|
69
|
+
repoPath;
|
|
69
70
|
static instances = new Map();
|
|
70
71
|
// Normalises the pool key the same way ConfigValidator eventually
|
|
71
72
|
// normalises config.repo (fsUtils#sanitizePath), so two configs that
|
|
@@ -73,13 +74,24 @@ export default class GitAdapter {
|
|
|
73
74
|
// still resolve to one instance. ConfigValidator pools an adapter on the
|
|
74
75
|
// raw config.repo before _sanitizeConfig runs, so without this a single
|
|
75
76
|
// `--repo-dir ./repo` invocation would still allocate two instances.
|
|
76
|
-
|
|
77
|
-
|
|
77
|
+
// Takes the already-resolved (platform-form) path rather than resolving
|
|
78
|
+
// again, so the key and the repository path it is derived from can never
|
|
79
|
+
// drift onto two different resolutions of the same config.repo.
|
|
80
|
+
static keyFor(resolvedRepo) {
|
|
81
|
+
return sanitizePath(resolvedRepo);
|
|
78
82
|
}
|
|
79
83
|
static getInstance(config) {
|
|
80
|
-
|
|
84
|
+
// Resolved to an absolute path first: tsgit's openRepository validates
|
|
85
|
+
// `cwd` eagerly and refuses anything relative outright, which sgd's own
|
|
86
|
+
// CLI default ('./') would otherwise be. This platform-form value is
|
|
87
|
+
// threaded straight through to repository reads (see getRepo and the
|
|
88
|
+
// LFS reads below); the pool key instead takes its posix-sanitized
|
|
89
|
+
// form, since sanitizePath's separator normalisation — safe for an
|
|
90
|
+
// identity key — would corrupt a win32 UNC root if reads used it too.
|
|
91
|
+
const resolvedRepo = resolve(config.repo);
|
|
92
|
+
const key = GitAdapter.keyFor(resolvedRepo);
|
|
81
93
|
if (!GitAdapter.instances.has(key)) {
|
|
82
|
-
GitAdapter.instances.set(key, new GitAdapter(key));
|
|
94
|
+
GitAdapter.instances.set(key, new GitAdapter(key, resolvedRepo));
|
|
83
95
|
}
|
|
84
96
|
return GitAdapter.instances.get(key);
|
|
85
97
|
}
|
|
@@ -96,21 +108,65 @@ export default class GitAdapter {
|
|
|
96
108
|
// caller-supplied scope.
|
|
97
109
|
blobIdIndex;
|
|
98
110
|
repoHandle = null;
|
|
99
|
-
|
|
100
|
-
|
|
111
|
+
// `key` identifies the repository — the pool map key and every
|
|
112
|
+
// user-facing message (mapTsgitError, the debug log below) render it, so
|
|
113
|
+
// a repository that fails the same way twice always reads identically.
|
|
114
|
+
// `repoPath` is the platform-native path actually opened and read from
|
|
115
|
+
// (openRepository's cwd, the LFS reads) — never sanitized, since
|
|
116
|
+
// sanitizePath's posix-only normalisation would corrupt a win32 UNC root.
|
|
117
|
+
constructor(key, repoPath) {
|
|
118
|
+
this.key = key;
|
|
119
|
+
this.repoPath = repoPath;
|
|
101
120
|
this.blobIdIndex = new Map();
|
|
102
121
|
}
|
|
122
|
+
// Read by ConfigValidator to render `error.PathIsNotGit` from the exact
|
|
123
|
+
// same absolute value this adapter renders its own repository-refusal
|
|
124
|
+
// messages from (see mapError below), so the two collapse to one sentence
|
|
125
|
+
// through validateConfig's `new Set(errors)` dedupe instead of reporting
|
|
126
|
+
// the same missing repository twice in different forms.
|
|
127
|
+
get repositoryKey() {
|
|
128
|
+
return this.key;
|
|
129
|
+
}
|
|
130
|
+
// Binds the repository argument every mapTsgitError call site needs so a
|
|
131
|
+
// transposition between it and the adjacent `context: string` argument
|
|
132
|
+
// can no longer compile — mapTsgitError itself stays a pure 3-argument
|
|
133
|
+
// function for its own unit surface.
|
|
134
|
+
mapError(error, context) {
|
|
135
|
+
return mapTsgitError(error, context, this.key);
|
|
136
|
+
}
|
|
103
137
|
getRepo() {
|
|
104
138
|
if (!this.repoHandle) {
|
|
105
|
-
|
|
139
|
+
// sgd only ever reads a repository (revParse, diff, tree walks,
|
|
140
|
+
// blobs) and never runs a verb that fires a hook or a merge driver,
|
|
141
|
+
// so both execution surfaces are switched off outright. The
|
|
142
|
+
// ownership gate is opted out of for the same reason: it would
|
|
143
|
+
// refuse the container-mounted checkouts README.md documents as
|
|
144
|
+
// supported, and tsgit cannot see the `safe.directory` those users
|
|
145
|
+
// already configured for git itself.
|
|
146
|
+
this.repoHandle = openRepository({
|
|
147
|
+
cwd: this.repoPath,
|
|
148
|
+
trust: 'always',
|
|
149
|
+
hooks: false,
|
|
150
|
+
command: false,
|
|
151
|
+
});
|
|
106
152
|
}
|
|
107
153
|
return this.repoHandle;
|
|
108
154
|
}
|
|
109
155
|
async close() {
|
|
110
|
-
if (this.repoHandle)
|
|
111
|
-
|
|
156
|
+
if (!this.repoHandle)
|
|
157
|
+
return;
|
|
158
|
+
const handle = this.repoHandle;
|
|
159
|
+
// A failed open is cached like any other handle, so awaiting it here
|
|
160
|
+
// would rethrow the raw engine error out of main.ts's finally and
|
|
161
|
+
// replace the mapped error the caller already reported. There is
|
|
162
|
+
// nothing to dispose when the open never produced a repository.
|
|
163
|
+
this.repoHandle = null;
|
|
164
|
+
try {
|
|
165
|
+
const repo = await handle;
|
|
112
166
|
await repo.dispose();
|
|
113
|
-
|
|
167
|
+
}
|
|
168
|
+
catch (error) {
|
|
169
|
+
Logger.debug(lazy `GitAdapter.close: releasing '${this.key}' failed: ${() => getErrorMessage(error)}`);
|
|
114
170
|
}
|
|
115
171
|
}
|
|
116
172
|
async parseRev(ref) {
|
|
@@ -119,7 +175,7 @@ export default class GitAdapter {
|
|
|
119
175
|
return await repo.revParse(ref);
|
|
120
176
|
}
|
|
121
177
|
catch (error) {
|
|
122
|
-
throw
|
|
178
|
+
throw this.mapError(error, ref);
|
|
123
179
|
}
|
|
124
180
|
}
|
|
125
181
|
// Builds and RETURNS a tree index for (revision, scopePaths) instead of
|
|
@@ -215,7 +271,7 @@ export default class GitAdapter {
|
|
|
215
271
|
return base;
|
|
216
272
|
}
|
|
217
273
|
catch (error) {
|
|
218
|
-
throw
|
|
274
|
+
throw this.mapError(error, `${from}...${to}`);
|
|
219
275
|
}
|
|
220
276
|
}
|
|
221
277
|
async getFirstCommitRef() {
|
|
@@ -234,7 +290,7 @@ export default class GitAdapter {
|
|
|
234
290
|
return firstCommit;
|
|
235
291
|
}
|
|
236
292
|
catch (error) {
|
|
237
|
-
throw
|
|
293
|
+
throw this.mapError(error, HEAD);
|
|
238
294
|
}
|
|
239
295
|
}
|
|
240
296
|
async resolveObjectId(forRef) {
|
|
@@ -256,12 +312,12 @@ export default class GitAdapter {
|
|
|
256
312
|
let content = await this.readBlobBuffer(forRef);
|
|
257
313
|
if (isLFS(content)) {
|
|
258
314
|
const lfsPath = getLFSObjectContentPath(content);
|
|
259
|
-
content = await readFile(join(this.
|
|
315
|
+
content = await readFile(join(this.repoPath, lfsPath));
|
|
260
316
|
}
|
|
261
317
|
return content;
|
|
262
318
|
}
|
|
263
319
|
catch (error) {
|
|
264
|
-
throw
|
|
320
|
+
throw this.mapError(error, forRef.oid);
|
|
265
321
|
}
|
|
266
322
|
}
|
|
267
323
|
// tsgit's Blob/BlobStream carry no size field, so the only way to know a
|
|
@@ -286,7 +342,7 @@ export default class GitAdapter {
|
|
|
286
342
|
// The pointer itself is tiny, so the accumulated-length guard above
|
|
287
343
|
// never fires for LFS-backed files — size the resolved object instead
|
|
288
344
|
// and escalate oversized ones onto the streaming path.
|
|
289
|
-
const lfsFile = join(this.
|
|
345
|
+
const lfsFile = join(this.repoPath, getLFSObjectContentPath(content));
|
|
290
346
|
const { size } = await stat(lfsFile);
|
|
291
347
|
if (size > SIZE_THRESHOLD) {
|
|
292
348
|
throw new EscalateToStreamingSignal(size, forRef);
|
|
@@ -322,7 +378,7 @@ export default class GitAdapter {
|
|
|
322
378
|
async pipeLfsObject(chunks, head, out) {
|
|
323
379
|
const pointer = await accumulatePointer(chunks, head);
|
|
324
380
|
const lfsPath = getLFSObjectContentPath(pointer);
|
|
325
|
-
createReadStream(join(this.
|
|
381
|
+
createReadStream(join(this.repoPath, lfsPath))
|
|
326
382
|
.on('error', (error) => out.destroy(error))
|
|
327
383
|
.pipe(out);
|
|
328
384
|
}
|
|
@@ -431,7 +487,7 @@ export default class GitAdapter {
|
|
|
431
487
|
});
|
|
432
488
|
}
|
|
433
489
|
catch (error) {
|
|
434
|
-
throw
|
|
490
|
+
throw this.mapError(error, `${spec.from}..${spec.to}`);
|
|
435
491
|
}
|
|
436
492
|
}
|
|
437
493
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GitAdapter.js","sourceRoot":"","sources":["../../src/adapter/GitAdapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"GitAdapter.js","sourceRoot":"","sources":["../../src/adapter/GitAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Normalizes a raw tsgit rejection into a release-compatible Error. Pure —
|
|
3
3
|
* no I/O, never throws itself, always returns an Error for the caller to
|
|
4
|
-
* rethrow. `context` identifies the operation (a ref, an oid, a
|
|
5
|
-
*
|
|
4
|
+
* rethrow. `context` identifies the operation (a ref, an oid, a range) and
|
|
5
|
+
* is interpolated into object-lookup messages; `repoPath` identifies the
|
|
6
|
+
* repository and is interpolated into repository-refusal messages instead,
|
|
7
|
+
* since tsgit renders those down to a bare basename.
|
|
6
8
|
*/
|
|
7
|
-
export declare const mapTsgitError: (error: unknown, context: string) => Error;
|
|
9
|
+
export declare const mapTsgitError: (error: unknown, context: string, repoPath: string) => Error;
|
|
@@ -1,32 +1,64 @@
|
|
|
1
1
|
'use strict';
|
|
2
|
-
import { getErrorMessage } from '../utils/errorUtils.js';
|
|
2
|
+
import { getErrorMessage, RepositoryRefusalError } from '../utils/errorUtils.js';
|
|
3
|
+
import { sanitizeForMessage } from '../utils/messageSanitizer.js';
|
|
3
4
|
// Raw tsgit surfaces this module narrows away from GitAdapter's
|
|
4
|
-
// user-surfacing methods:
|
|
5
|
-
//
|
|
6
|
-
//
|
|
7
|
-
//
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
// user-surfacing methods: a bad ref/oid rejects with `TsgitError` whose
|
|
6
|
+
// `data.code` is 'OBJECT_NOT_FOUND' and whose message is prefixed
|
|
7
|
+
// `OBJECT_NOT_FOUND:`; a repository tsgit refuses to open at all rejects
|
|
8
|
+
// with one of the codes in REFUSAL_MESSAGES below, carried the same way.
|
|
9
|
+
// Neither raw shape is release-compatible. tsgit never sets a top-level
|
|
10
|
+
// `error.code` — every code lives under `error.data.code`.
|
|
10
11
|
const OBJECT_NOT_FOUND_CODE = 'OBJECT_NOT_FOUND';
|
|
11
12
|
const OBJECT_NOT_FOUND_PREFIX = `${OBJECT_NOT_FOUND_CODE}:`;
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
const
|
|
13
|
+
const NOT_A_REPOSITORY_CODE = 'NOT_A_REPOSITORY';
|
|
14
|
+
const REPOSITORY_FORMAT_VERSION_UNSUPPORTED_CODE = 'REPOSITORY_FORMAT_VERSION_UNSUPPORTED';
|
|
15
|
+
const REPOSITORY_EXTENSIONS_UNSUPPORTED_CODE = 'REPOSITORY_EXTENSIONS_UNSUPPORTED';
|
|
16
|
+
const REPOSITORY_EXTENSION_UNSUPPORTED_CODE = 'REPOSITORY_EXTENSION_UNSUPPORTED';
|
|
17
|
+
const dataCodeOf = (error) => error?.data?.code;
|
|
18
|
+
const isObjectNotFound = (error, message) => dataCodeOf(error) === OBJECT_NOT_FOUND_CODE ||
|
|
15
19
|
message.startsWith(OBJECT_NOT_FOUND_PREFIX);
|
|
20
|
+
// tsgit renders every repository path down to its basename, so a mapped
|
|
21
|
+
// message has to be rebuilt from the path sgd itself opened. One sentence
|
|
22
|
+
// per condition, not per code: the three format refusals are not separately
|
|
23
|
+
// actionable — the user's move is the same for all three. The path is
|
|
24
|
+
// untrusted (it can come straight from --repo-dir), so it is sanitized
|
|
25
|
+
// here the same way ConfigValidator sanitizes error.PathIsNotGit's — that
|
|
26
|
+
// shared transformation is what keeps the two renderings byte-identical,
|
|
27
|
+
// which is what lets validateConfig's `new Set(errors)` collapse a
|
|
28
|
+
// same-repository refusal reported through both paths into one sentence.
|
|
29
|
+
const notARepository = (repoPath) => `'${sanitizeForMessage(repoPath)}' is not a git repository`;
|
|
30
|
+
const unreadableFormat = (repoPath) => `'${sanitizeForMessage(repoPath)}' uses a repository format this version of sgd cannot read`;
|
|
31
|
+
const REFUSAL_MESSAGES = new Map([
|
|
32
|
+
[NOT_A_REPOSITORY_CODE, notARepository],
|
|
33
|
+
[REPOSITORY_FORMAT_VERSION_UNSUPPORTED_CODE, unreadableFormat],
|
|
34
|
+
[REPOSITORY_EXTENSIONS_UNSUPPORTED_CODE, unreadableFormat],
|
|
35
|
+
[REPOSITORY_EXTENSION_UNSUPPORTED_CODE, unreadableFormat],
|
|
36
|
+
]);
|
|
37
|
+
const refusalMessageFor = (error, message) => {
|
|
38
|
+
for (const [code, render] of REFUSAL_MESSAGES) {
|
|
39
|
+
if (dataCodeOf(error) === code || message.startsWith(`${code}:`)) {
|
|
40
|
+
return render;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return undefined;
|
|
44
|
+
};
|
|
16
45
|
/**
|
|
17
46
|
* Normalizes a raw tsgit rejection into a release-compatible Error. Pure —
|
|
18
47
|
* no I/O, never throws itself, always returns an Error for the caller to
|
|
19
|
-
* rethrow. `context` identifies the operation (a ref, an oid, a
|
|
20
|
-
*
|
|
48
|
+
* rethrow. `context` identifies the operation (a ref, an oid, a range) and
|
|
49
|
+
* is interpolated into object-lookup messages; `repoPath` identifies the
|
|
50
|
+
* repository and is interpolated into repository-refusal messages instead,
|
|
51
|
+
* since tsgit renders those down to a bare basename.
|
|
21
52
|
*/
|
|
22
|
-
export const mapTsgitError = (error, context) => {
|
|
53
|
+
export const mapTsgitError = (error, context, repoPath) => {
|
|
23
54
|
const message = getErrorMessage(error);
|
|
24
|
-
if (isMissingRepo(error, message)) {
|
|
25
|
-
return new Error(`'${context}' is not a git repository`);
|
|
26
|
-
}
|
|
27
55
|
if (isObjectNotFound(error, message)) {
|
|
28
56
|
return new Error(`${context}: not a valid git revision`);
|
|
29
57
|
}
|
|
58
|
+
const renderRefusal = refusalMessageFor(error, message);
|
|
59
|
+
if (renderRefusal) {
|
|
60
|
+
return new RepositoryRefusalError(renderRefusal(repoPath));
|
|
61
|
+
}
|
|
30
62
|
return new Error(`git operation failed: ${message}`);
|
|
31
63
|
};
|
|
32
64
|
//# sourceMappingURL=tsgitErrorMap.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsgitErrorMap.js","sourceRoot":"","sources":["../../src/adapter/tsgitErrorMap.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"tsgitErrorMap.js","sourceRoot":"","sources":["../../src/adapter/tsgitErrorMap.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAEjE,gEAAgE;AAChE,wEAAwE;AACxE,kEAAkE;AAClE,yEAAyE;AACzE,yEAAyE;AACzE,wEAAwE;AACxE,2DAA2D;AAC3D,MAAM,qBAAqB,GAAG,kBAAkB,CAAA;AAChD,MAAM,uBAAuB,GAAG,GAAG,qBAAqB,GAAG,CAAA;AAE3D,MAAM,qBAAqB,GAAG,kBAAkB,CAAA;AAChD,MAAM,0CAA0C,GAC9C,uCAAuC,CAAA;AACzC,MAAM,sCAAsC,GAC1C,mCAAmC,CAAA;AACrC,MAAM,qCAAqC,GAAG,kCAAkC,CAAA;AAIhF,MAAM,UAAU,GAAG,CAAC,KAAc,EAAW,EAAE,CAC5C,KAAwB,EAAE,IAAI,EAAE,IAAI,CAAA;AAEvC,MAAM,gBAAgB,GAAG,CAAC,KAAc,EAAE,OAAe,EAAW,EAAE,CACpE,UAAU,CAAC,KAAK,CAAC,KAAK,qBAAqB;IAC3C,OAAO,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAA;AAE7C,wEAAwE;AACxE,0EAA0E;AAC1E,4EAA4E;AAC5E,sEAAsE;AACtE,uEAAuE;AACvE,0EAA0E;AAC1E,yEAAyE;AACzE,mEAAmE;AACnE,yEAAyE;AACzE,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,EAAE,CAC1C,IAAI,kBAAkB,CAAC,QAAQ,CAAC,2BAA2B,CAAA;AAC7D,MAAM,gBAAgB,GAAG,CAAC,QAAgB,EAAE,EAAE,CAC5C,IAAI,kBAAkB,CAAC,QAAQ,CAAC,4DAA4D,CAAA;AAE9F,MAAM,gBAAgB,GACpB,IAAI,GAAG,CAAC;IACN,CAAC,qBAAqB,EAAE,cAAc,CAAC;IACvC,CAAC,0CAA0C,EAAE,gBAAgB,CAAC;IAC9D,CAAC,sCAAsC,EAAE,gBAAgB,CAAC;IAC1D,CAAC,qCAAqC,EAAE,gBAAgB,CAAC;CAC1D,CAAC,CAAA;AAEJ,MAAM,iBAAiB,GAAG,CACxB,KAAc,EACd,OAAe,EAC6B,EAAE;IAC9C,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,gBAAgB,EAAE,CAAC;QAC9C,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC;YACjE,OAAO,MAAM,CAAA;QACf,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,KAAc,EACd,OAAe,EACf,QAAgB,EACT,EAAE;IACT,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;IACtC,IAAI,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC;QACrC,OAAO,IAAI,KAAK,CAAC,GAAG,OAAO,4BAA4B,CAAC,CAAA;IAC1D,CAAC;IACD,MAAM,aAAa,GAAG,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IACvD,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,IAAI,sBAAsB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC5D,CAAC;IACD,OAAO,IAAI,KAAK,CAAC,yBAAyB,OAAO,EAAE,CAAC,CAAA;AACtD,CAAC,CAAA"}
|
|
@@ -2,6 +2,7 @@ import GitAdapter from '../adapter/GitAdapter.js';
|
|
|
2
2
|
import type { Config } from '../types/config.js';
|
|
3
3
|
import { MessageService } from './MessageService.js';
|
|
4
4
|
import type { SourceDirRejection } from './pathspec.js';
|
|
5
|
+
type ShaKey = 'from' | 'to';
|
|
5
6
|
export default class ConfigValidator {
|
|
6
7
|
protected readonly config: Config;
|
|
7
8
|
private readonly sourceRejections;
|
|
@@ -9,6 +10,7 @@ export default class ConfigValidator {
|
|
|
9
10
|
protected readonly message: MessageService;
|
|
10
11
|
constructor(config: Config, sourceRejections?: readonly SourceDirRejection[]);
|
|
11
12
|
protected _validateGitSha(): Promise<string[]>;
|
|
13
|
+
protected _shaFailureMessage(error: unknown, shaParameter: ShaKey, shaValue: string): string;
|
|
12
14
|
protected _validateSource(): string[];
|
|
13
15
|
validateConfig(): Promise<readonly Error[]>;
|
|
14
16
|
protected _resolveMergeBase(requestedFrom: string, requestedTo: string): Promise<void>;
|
|
@@ -19,3 +21,4 @@ export default class ConfigValidator {
|
|
|
19
21
|
protected _resolveLatestSupportedVersion(): Promise<number | undefined>;
|
|
20
22
|
protected _sanitizeConfig(): void;
|
|
21
23
|
}
|
|
24
|
+
export {};
|
|
@@ -12,7 +12,7 @@ import GitAdapter from '../adapter/GitAdapter.js';
|
|
|
12
12
|
import { GIT_FOLDER } from '../constant/gitConstants.js';
|
|
13
13
|
import { getLatestSupportedVersion } from '../metadata/metadataManager.js';
|
|
14
14
|
import { pushAll } from './arrayUtils.js';
|
|
15
|
-
import { ConfigError, getErrorMessage } from './errorUtils.js';
|
|
15
|
+
import { ConfigError, getErrorMessage, RepositoryRefusalError, } from './errorUtils.js';
|
|
16
16
|
import { pathExists, sanitizePath } from './fsUtils.js';
|
|
17
17
|
import { log } from './LoggingDecorator.js';
|
|
18
18
|
import { Logger, lazy } from './LoggingService.js';
|
|
@@ -48,14 +48,22 @@ export default class ConfigValidator {
|
|
|
48
48
|
Logger.debug(
|
|
49
49
|
// Stryker disable next-line StringLiteral,ArrowFunction -- equivalent: catch log content is observability only
|
|
50
50
|
lazy `_validateGitSha: '${shaParameter}' = '${shaValue}' is not a valid git SHA: ${() => getErrorMessage(error)}`);
|
|
51
|
-
errors.push(this.
|
|
52
|
-
shaParameter,
|
|
53
|
-
sanitizeForMessage(shaValue),
|
|
54
|
-
]));
|
|
51
|
+
errors.push(this._shaFailureMessage(error, shaParameter, shaValue));
|
|
55
52
|
}
|
|
56
53
|
}));
|
|
57
54
|
return errors;
|
|
58
55
|
}
|
|
56
|
+
// A refusal is about the repository, not about either ref: reporting it
|
|
57
|
+
// verbatim replaces two bogus "check the fetch depth" lines with the one
|
|
58
|
+
// thing the user can act on.
|
|
59
|
+
_shaFailureMessage(error, shaParameter, shaValue) {
|
|
60
|
+
if (error instanceof RepositoryRefusalError)
|
|
61
|
+
return error.message;
|
|
62
|
+
return this.message.getMessage('error.ParameterIsNotGitSHA', [
|
|
63
|
+
shaParameter,
|
|
64
|
+
sanitizeForMessage(shaValue),
|
|
65
|
+
]);
|
|
66
|
+
}
|
|
59
67
|
_validateSource() {
|
|
60
68
|
return this.sourceRejections.map(rejection => this.message.getMessage(SOURCE_DIR_REJECTION_MESSAGE_KEYS[rejection.reason], [sanitizeForMessage(rejection.value)]));
|
|
61
69
|
}
|
|
@@ -79,12 +87,23 @@ export default class ConfigValidator {
|
|
|
79
87
|
]);
|
|
80
88
|
const errors = [];
|
|
81
89
|
if (!repoExists) {
|
|
82
|
-
|
|
90
|
+
// Rendered from the adapter's own absolute repository key — not
|
|
91
|
+
// this.config.repo, which is only sanitizePath-normalized, never
|
|
92
|
+
// resolved to absolute — so this collapses with the identical
|
|
93
|
+
// RepositoryRefusalError message a same-repository parseRev failure
|
|
94
|
+
// produces below, instead of reporting the missing repository twice
|
|
95
|
+
// in two different forms.
|
|
96
|
+
errors.push(this.message.getMessage('error.PathIsNotGit', [
|
|
97
|
+
sanitizeForMessage(this.gitAdapter.repositoryKey),
|
|
98
|
+
]));
|
|
83
99
|
}
|
|
84
100
|
pushAll(errors, gitErrors);
|
|
85
101
|
pushAll(errors, changesManifestErrors);
|
|
86
102
|
if (errors.length > 0) {
|
|
87
|
-
|
|
103
|
+
// Two SHA keys against one repository produce the same refusal twice,
|
|
104
|
+
// and a missing .git makes the config check and the engine say the
|
|
105
|
+
// same sentence. Identical strings carry no extra information.
|
|
106
|
+
throw new ConfigError([...new Set(errors)].join(', '));
|
|
88
107
|
}
|
|
89
108
|
// Runs after the SHA validation above so a typo in either ref surfaces
|
|
90
109
|
// as the precise ParameterIsNotGitSHA message instead of the vaguer
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configValidator.js","sourceRoot":"","sources":["../../src/utils/configValidator.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;;;;;;AACZ,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAE5C,OAAO,UAAU,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAE1E,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"configValidator.js","sourceRoot":"","sources":["../../src/utils/configValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,5 +7,8 @@ export declare class ConfigError extends SgdError {
|
|
|
7
7
|
export declare class MetadataRegistryError extends SgdError {
|
|
8
8
|
constructor(message: string);
|
|
9
9
|
}
|
|
10
|
+
export declare class RepositoryRefusalError extends SgdError {
|
|
11
|
+
constructor(message: string);
|
|
12
|
+
}
|
|
10
13
|
export declare const getErrorMessage: (error: unknown) => string;
|
|
11
14
|
export declare const wrapError: (message: string, cause: unknown) => SgdError;
|
package/lib/utils/errorUtils.js
CHANGED
|
@@ -17,6 +17,12 @@ export class MetadataRegistryError extends SgdError {
|
|
|
17
17
|
this.name = 'MetadataRegistryError';
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
|
+
export class RepositoryRefusalError extends SgdError {
|
|
21
|
+
constructor(message) {
|
|
22
|
+
super(message);
|
|
23
|
+
this.name = 'RepositoryRefusalError';
|
|
24
|
+
}
|
|
25
|
+
}
|
|
20
26
|
export const getErrorMessage = (error) => {
|
|
21
27
|
if (error instanceof Error) {
|
|
22
28
|
return error.message;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorUtils.js","sourceRoot":"","sources":["../../src/utils/errorUtils.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,MAAM,OAAO,QAAS,SAAQ,KAAK;IACjC,YAAY,OAAe,EAAE,OAAsB;QACjD,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACvB,IAAI,CAAC,IAAI,GAAG,UAAU,CAAA;IACxB,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,QAAQ;IACvC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,aAAa,CAAA;IAC3B,CAAC;CACF;AAED,MAAM,OAAO,qBAAsB,SAAQ,QAAQ;IACjD,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAA;IACrC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAc,EAAU,EAAE;IACxD,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC,OAAO,CAAA;IACtB,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;AACtB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAAe,EAAE,KAAc,EAAY,EAAE;IACrE,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;AACzC,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"errorUtils.js","sourceRoot":"","sources":["../../src/utils/errorUtils.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,MAAM,OAAO,QAAS,SAAQ,KAAK;IACjC,YAAY,OAAe,EAAE,OAAsB;QACjD,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACvB,IAAI,CAAC,IAAI,GAAG,UAAU,CAAA;IACxB,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,QAAQ;IACvC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,aAAa,CAAA;IAC3B,CAAC;CACF;AAED,MAAM,OAAO,qBAAsB,SAAQ,QAAQ;IACjD,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAA;IACrC,CAAC;CACF;AAED,MAAM,OAAO,sBAAuB,SAAQ,QAAQ;IAClD,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,wBAAwB,CAAA;IACtC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAc,EAAU,EAAE;IACxD,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC,OAAO,CAAA;IACtB,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;AACtB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAAe,EAAE,KAAc,EAAY,EAAE;IACrE,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;AACzC,CAAC,CAAA"}
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sfdx-git-delta",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.4.0",
|
|
4
4
|
"description": "Generate the sfdx content in source format and destructive change from two git commits",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"salesforce",
|
|
@@ -48,17 +48,17 @@
|
|
|
48
48
|
"access": "public"
|
|
49
49
|
},
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"@oclif/core": "4.
|
|
52
|
-
"@salesforce/core": "9.1.
|
|
53
|
-
"@salesforce/sf-plugins-core": "13.0.
|
|
54
|
-
"@salesforce/source-deploy-retrieve": "13.
|
|
55
|
-
"@scolladon/tsgit": "3.
|
|
51
|
+
"@oclif/core": "4.14.0",
|
|
52
|
+
"@salesforce/core": "9.1.5",
|
|
53
|
+
"@salesforce/sf-plugins-core": "13.0.3",
|
|
54
|
+
"@salesforce/source-deploy-retrieve": "13.2.0",
|
|
55
|
+
"@scolladon/tsgit": "3.6.0",
|
|
56
56
|
"ignore": "7.0.6",
|
|
57
57
|
"txml": "6.0.1",
|
|
58
58
|
"zod": "4.4.3"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@biomejs/biome": "2.5.
|
|
61
|
+
"@biomejs/biome": "2.5.10",
|
|
62
62
|
"@commitlint/cli": "21.2.2",
|
|
63
63
|
"@commitlint/config-conventional": "21.2.2",
|
|
64
64
|
"@ls-lint/ls-lint": "2.3.1",
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"@stryker-mutator/core": "10.0.0",
|
|
69
69
|
"@stryker-mutator/vitest-runner": "10.0.0",
|
|
70
70
|
"@types/node": "26.2.0",
|
|
71
|
-
"@vitest/coverage-v8": "4.1.
|
|
71
|
+
"@vitest/coverage-v8": "4.1.11",
|
|
72
72
|
"husky": "9.1.7",
|
|
73
73
|
"knip": "6.32.2",
|
|
74
74
|
"lint-staged": "17.3.0",
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
"ts-node": "10.9.2",
|
|
80
80
|
"typescript": "7.0.2",
|
|
81
81
|
"validate-branch-name": "1.3.2",
|
|
82
|
-
"vitest": "4.1.
|
|
82
|
+
"vitest": "4.1.11",
|
|
83
83
|
"wireit": "0.14.13"
|
|
84
84
|
},
|
|
85
85
|
"overrides": {
|
|
@@ -265,7 +265,9 @@
|
|
|
265
265
|
"__tests__/functional/**/*.test.ts",
|
|
266
266
|
"__tests__/functional/byteEquality/fixtures/**",
|
|
267
267
|
"**/tsconfig.json",
|
|
268
|
-
"vitest.functional.config.ts"
|
|
268
|
+
"vitest.functional.config.ts",
|
|
269
|
+
"package.json",
|
|
270
|
+
"package-lock.json"
|
|
269
271
|
],
|
|
270
272
|
"output": [],
|
|
271
273
|
"dependencies": [
|
|
@@ -278,7 +280,10 @@
|
|
|
278
280
|
"src/**/*.ts",
|
|
279
281
|
"__tests__/integration/**/*.test.ts",
|
|
280
282
|
"**/tsconfig.json",
|
|
281
|
-
"vitest.integration.config.ts"
|
|
283
|
+
"vitest.integration.config.ts",
|
|
284
|
+
"package.json",
|
|
285
|
+
"package-lock.json",
|
|
286
|
+
"__tests__/__utils__/**/*.ts"
|
|
282
287
|
],
|
|
283
288
|
"output": [],
|
|
284
289
|
"dependencies": [
|
|
@@ -298,7 +303,9 @@
|
|
|
298
303
|
"src/**/*.ts",
|
|
299
304
|
"__tests__/perf/**",
|
|
300
305
|
"**/tsconfig.json",
|
|
301
|
-
"vitest.config.perf.ts"
|
|
306
|
+
"vitest.config.perf.ts",
|
|
307
|
+
"package.json",
|
|
308
|
+
"package-lock.json"
|
|
302
309
|
],
|
|
303
310
|
"output": [
|
|
304
311
|
"perf-raw.json",
|
|
@@ -315,7 +322,9 @@
|
|
|
315
322
|
"src/**/*.ts",
|
|
316
323
|
"__tests__/**/*.ts",
|
|
317
324
|
"messages/**",
|
|
318
|
-
"**/tsconfig.json"
|
|
325
|
+
"**/tsconfig.json",
|
|
326
|
+
"package.json",
|
|
327
|
+
"package-lock.json"
|
|
319
328
|
],
|
|
320
329
|
"output": [
|
|
321
330
|
".stryker-tmp/**"
|
|
@@ -325,12 +334,14 @@
|
|
|
325
334
|
]
|
|
326
335
|
},
|
|
327
336
|
"test:mutation:incremental": {
|
|
328
|
-
"command": "FILES=$(git --no-pager diff --name-only --diff-filter=AM --merge-base origin/main src | grep '.ts$' | paste -sd ',' -)
|
|
337
|
+
"command": "FILES=$(git --no-pager diff --name-only --diff-filter=AM --merge-base origin/main src | grep '.ts$' | paste -sd ',' -); if [ -n \"$FILES\" ]; then stryker run --mutate \"$FILES\"; else echo 'No source files changed — skipping mutation testing'; fi",
|
|
329
338
|
"files": [
|
|
330
339
|
"src/**/*.ts",
|
|
331
340
|
"__tests__/**/*.ts",
|
|
332
341
|
"messages/**",
|
|
333
|
-
"**/tsconfig.json"
|
|
342
|
+
"**/tsconfig.json",
|
|
343
|
+
"package.json",
|
|
344
|
+
"package-lock.json"
|
|
334
345
|
],
|
|
335
346
|
"output": [
|
|
336
347
|
".stryker-tmp/**"
|
|
@@ -346,7 +357,9 @@
|
|
|
346
357
|
"__tests__/nut/**/*.nut.ts",
|
|
347
358
|
"messages/**",
|
|
348
359
|
"**/tsconfig.json",
|
|
349
|
-
"vitest.nut.config.ts"
|
|
360
|
+
"vitest.nut.config.ts",
|
|
361
|
+
"package.json",
|
|
362
|
+
"package-lock.json"
|
|
350
363
|
],
|
|
351
364
|
"output": [],
|
|
352
365
|
"dependencies": [
|
|
@@ -361,7 +374,9 @@
|
|
|
361
374
|
"__tests__/**/*.ts",
|
|
362
375
|
"messages/**",
|
|
363
376
|
"**/tsconfig.json",
|
|
364
|
-
"vitest.config.ts"
|
|
377
|
+
"vitest.config.ts",
|
|
378
|
+
"package.json",
|
|
379
|
+
"package-lock.json"
|
|
365
380
|
],
|
|
366
381
|
"output": [
|
|
367
382
|
"reports/coverage/**"
|