sfdx-git-delta 5.13.1 → 5.13.3
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 +6 -6
- package/lib/post-processor/flowTranslationProcessor.js +1 -1
- package/lib/post-processor/flowTranslationProcessor.js.map +1 -1
- package/lib/service/inFileHandler.js +1 -1
- package/lib/service/inFileHandler.js.map +1 -1
- package/lib/utils/fileGitDiff.js +2 -2
- package/lib/utils/fileGitDiff.js.map +1 -1
- package/lib/utils/fsHelper.js +1 -5
- package/lib/utils/fsHelper.js.map +1 -1
- package/lib/utils/gitConstants.d.ts +2 -1
- package/lib/utils/gitConstants.js +9 -4
- package/lib/utils/gitConstants.js.map +1 -1
- package/lib/utils/repoGitDiff.js +2 -2
- package/lib/utils/repoGitDiff.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +13 -13
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,24 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
## [5.13.3](https://github.com/scolladon/sfdx-git-delta/compare/v5.13.2...v5.13.3) (2023-02-26)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* `fsHelper.pathExist` when path does not exist ([#482](https://github.com/scolladon/sfdx-git-delta/issues/482)) ([fef6734](https://github.com/scolladon/sfdx-git-delta/commit/fef6734c947c7811d5d6995320f996fdfd329d2a))
|
|
11
|
+
* flow translation post processing ([#487](https://github.com/scolladon/sfdx-git-delta/issues/487)) ([225c435](https://github.com/scolladon/sfdx-git-delta/commit/225c4356a95fc781f4fbe938d57709a7fa795a6e))
|
|
12
|
+
* in file comparison while ignoring whitespace ([#478](https://github.com/scolladon/sfdx-git-delta/issues/478) ([0855dcc](https://github.com/scolladon/sfdx-git-delta/commit/0855dcc5bdae8cfe47788fd3201f9a44c9b2743c))
|
|
13
|
+
* typos in readme ([a3459b0](https://github.com/scolladon/sfdx-git-delta/commit/a3459b0e61cee0d270a0f4c4007316a6a6b496eb))
|
|
14
|
+
|
|
15
|
+
## [5.13.2](https://github.com/scolladon/sfdx-git-delta/compare/v5.13.1...v5.13.2) (2023-02-16)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Bug Fixes
|
|
19
|
+
|
|
20
|
+
* version output usage ([ea23411](https://github.com/scolladon/sfdx-git-delta/commit/ea23411d58ee24748f31a0309d85d2d42f4466e6))
|
|
21
|
+
* version output usage in release automation ([#467](https://github.com/scolladon/sfdx-git-delta/issues/467)) ([ea23411](https://github.com/scolladon/sfdx-git-delta/commit/ea23411d58ee24748f31a0309d85d2d42f4466e6))
|
|
22
|
+
|
|
5
23
|
## [5.13.1](https://github.com/scolladon/sfdx-git-delta/compare/v5.13.0...v5.13.1) (2023-02-16)
|
|
6
24
|
|
|
7
25
|
|
package/README.md
CHANGED
|
@@ -186,7 +186,7 @@ OPTIONS
|
|
|
186
186
|
this command invocation
|
|
187
187
|
```
|
|
188
188
|
|
|
189
|
-
_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v5.13.
|
|
189
|
+
_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v5.13.3/src/commands/sgd/source/delta.ts)_
|
|
190
190
|
<!-- commandsstop -->
|
|
191
191
|
|
|
192
192
|
### Windows users
|
|
@@ -215,7 +215,7 @@ In CI/CD pipelines, branches are not checked out locally when the repository is
|
|
|
215
215
|
If you do not specify the remote in CI context, the git pointer check will raise an error (as the branch is not created locally).
|
|
216
216
|
This applies to both `--from` and `--to` parameters as they both accept git pointers.
|
|
217
217
|
|
|
218
|
-
|
|
218
|
+
Example comparing `HEAD` with a `development` branch when the CI clone the repository with `origin` set as reference to the remote:
|
|
219
219
|
|
|
220
220
|
```sh
|
|
221
221
|
sfdx sgd:source:delta --to "HEAD" --from "origin/development" --output .
|
|
@@ -223,7 +223,7 @@ sfdx sgd:source:delta --to "HEAD" --from "origin/development" --output .
|
|
|
223
223
|
|
|
224
224
|
Use global variable when you need to easily switch sgd version (`vX.X.X` format) or channel (`stable`, `latest`, `latest-rc`) in your pipeline, without having to commit a new version of your pipeline.
|
|
225
225
|
|
|
226
|
-
|
|
226
|
+
Example with [github action](https://docs.github.com/en/actions/learn-github-actions/variables#using-the-vars-context-to-access-configuration-variable-values), [create a variable](https://docs.github.com/en/actions/learn-github-actions/variables#creating-configuration-variables-for-a-repository) SGD_VERSION and use it in the plugin installation phase
|
|
227
227
|
|
|
228
228
|
```yaml
|
|
229
229
|
- name: Install SGD
|
|
@@ -291,7 +291,7 @@ which means:
|
|
|
291
291
|
|
|
292
292
|
> Analyze the difference between HEAD (latest commit) and HEAD~1 (previous commit), and output the result in the current folder.
|
|
293
293
|
|
|
294
|
-
The `sfdx sgd:source:delta` command produces 2
|
|
294
|
+
The `sfdx sgd:source:delta` command produces 2 useful artifacts:
|
|
295
295
|
|
|
296
296
|
**1) A `package.xml` file, inside a `package` folder.** This `package.xml` file contains just the added/changed metadata to deploy to the target org.
|
|
297
297
|
|
|
@@ -315,7 +315,7 @@ sfdx force:source:deploy -x package/package.xml --postdestructivechanges destruc
|
|
|
315
315
|
|
|
316
316
|
And voilà! 🥳
|
|
317
317
|
|
|
318
|
-
However, keep in mind
|
|
318
|
+
However, keep in mind that the above command will fail if the destructive change was supposed to be executed before the deployment (i.e. as `--predestructivechanges`), or if a warning occurs during deployment. Make sure to protect your CI/CD pipeline from those scenarios, so that it doesn't get stuck by a failed destructive change.
|
|
319
319
|
|
|
320
320
|
If needed, you can also split the added/modified metadata deployment from the deleted/renamed metadata deployment, as in the below examples:
|
|
321
321
|
|
|
@@ -363,7 +363,7 @@ _Content of the output folder when using the --generate-delta option, with the s
|
|
|
363
363
|
|
|
364
364
|
|
|
365
365
|
> ⚠️ Use `--generate-delta (-d)` when `--to (-t)` value is set to "HEAD" or to the "HEAD commit SHA".
|
|
366
|
-
> If you need to use it with `--to (-t)` pointing to another commit than "HEAD", checkout that commit first.
|
|
366
|
+
> If you need to use it with `--to (-t)` pointing to another commit than "HEAD", checkout that commit first. Example:
|
|
367
367
|
>
|
|
368
368
|
> ```sh
|
|
369
369
|
> # move HEAD to the wanted past commit
|
|
@@ -20,7 +20,7 @@ class FlowTranslationProcessor extends BaseProcessor {
|
|
|
20
20
|
}
|
|
21
21
|
async _buildFlowDefinitionsMap() {
|
|
22
22
|
this.translationPaths.clear();
|
|
23
|
-
const translationsIterator = scanExtension(this.config.source, EXTENSION, this.work);
|
|
23
|
+
const translationsIterator = scanExtension(this.config.source, EXTENSION, this.work.config);
|
|
24
24
|
const ign = await this._getIgnoreInstance();
|
|
25
25
|
for await (const translationPath of translationsIterator) {
|
|
26
26
|
const translationName = getTranslationName(translationPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flowTranslationProcessor.js","sourceRoot":"","sources":["../../src/post-processor/flowTranslationProcessor.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAChD,MAAM,EACJ,mBAAmB,EACnB,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,gBAAgB,GACjB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AACzC,MAAM,EACJ,SAAS,EACT,aAAa,EACb,eAAe,EACf,QAAQ,GACT,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AAChC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AACjC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AACpD,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAChD,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACpE,MAAM,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAA;AAEtE,MAAM,kBAAkB,GAAG,eAAe,CAAC,EAAE,CAC3C,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAErD,MAAM,SAAS,GAAG,GAAG,qBAAqB,GAAG,eAAe,EAAE,CAAA;AAC9D,MAAM,wBAAyB,SAAQ,aAAa;IAGlD,YAAY,IAAI,EAAE,QAAQ;QACxB,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QACrB,IAAI,CAAC,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAA;QACrC,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAA;IACrC,CAAC;IAED,KAAK,CAAC,wBAAwB;QAC5B,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAA;QAE7B,MAAM,oBAAoB,GAAG,aAAa,CACxC,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,SAAS,EACT,IAAI,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"flowTranslationProcessor.js","sourceRoot":"","sources":["../../src/post-processor/flowTranslationProcessor.js"],"names":[],"mappings":"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"}
|
|
@@ -96,7 +96,7 @@ class InFileHandler extends StandardHandler {
|
|
|
96
96
|
for (const [type, members] of toRemove) {
|
|
97
97
|
;
|
|
98
98
|
[...members]
|
|
99
|
-
.filter(elem => !toAdd.
|
|
99
|
+
.filter(elem => !toAdd.get(type)?.has(elem))
|
|
100
100
|
.forEach(fullName => this._fillPackageFromDiff(this.diffs.destructiveChanges, type, fullName));
|
|
101
101
|
}
|
|
102
102
|
for (const [type, members] of toAdd) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inFileHandler.js","sourceRoot":"","sources":["../../src/service/inFileHandler.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"inFileHandler.js","sourceRoot":"","sources":["../../src/service/inFileHandler.js"],"names":[],"mappings":"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"}
|
package/lib/utils/fileGitDiff.js
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
const { spawn } = require('child_process');
|
|
3
3
|
const { linify } = require('./childProcessUtils');
|
|
4
4
|
const { gitPathSeparatorNormalizer } = require('./fsHelper');
|
|
5
|
-
const {
|
|
5
|
+
const { IGNORE_WHITESPACE_PARAMS_FOR_FILE, UTF8_ENCODING, } = require('./gitConstants');
|
|
6
6
|
const unitDiffParams = ['--no-pager', 'diff', '--no-prefix', '-U200'];
|
|
7
7
|
module.exports = (filePath, config) => {
|
|
8
8
|
const ignoreWhitespaceParams = config.ignoreWhitespace
|
|
9
|
-
?
|
|
9
|
+
? IGNORE_WHITESPACE_PARAMS_FOR_FILE
|
|
10
10
|
: [];
|
|
11
11
|
const gitDiff = spawn('git', [
|
|
12
12
|
...unitDiffParams,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileGitDiff.js","sourceRoot":"","sources":["../../src/utils/fileGitDiff.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAC1C,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AACjD,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;AAC5D,MAAM,
|
|
1
|
+
{"version":3,"file":"fileGitDiff.js","sourceRoot":"","sources":["../../src/utils/fileGitDiff.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAC1C,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AACjD,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;AAC5D,MAAM,EACJ,iCAAiC,EACjC,aAAa,GACd,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE7B,MAAM,cAAc,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAA;AAErE,MAAM,CAAC,OAAO,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;IACpC,MAAM,sBAAsB,GAAG,MAAM,CAAC,gBAAgB;QACpD,CAAC,CAAC,iCAAiC;QACnC,CAAC,CAAC,EAAE,CAAA;IACN,MAAM,OAAO,GAAG,KAAK,CACnB,KAAK,EACL;QACE,GAAG,cAAc;QACjB,GAAG,sBAAsB;QACzB,MAAM,CAAC,IAAI;QACX,MAAM,CAAC,EAAE;QACT,IAAI;QACJ,0BAA0B,CAAC,QAAQ,CAAC;KACrC,EACD,EAAE,GAAG,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,CAC9C,CAAA;IAED,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;AAC/B,CAAC,CAAA"}
|
package/lib/utils/fsHelper.js
CHANGED
|
@@ -6,7 +6,6 @@ const { spawn } = require('child_process');
|
|
|
6
6
|
const { UTF8_ENCODING } = require('../utils/gitConstants');
|
|
7
7
|
const { EOLRegex, getStreamContent, treatPathSep, } = require('./childProcessUtils');
|
|
8
8
|
const FOLDER = 'tree';
|
|
9
|
-
const FATAL = 'fatal';
|
|
10
9
|
const showCmd = ['--no-pager', 'show'];
|
|
11
10
|
const gitPathSeparatorNormalizer = path => path?.replace(/\\+/g, '/');
|
|
12
11
|
const copiedFiles = new Set();
|
|
@@ -27,9 +26,6 @@ const copyFiles = async (config, src) => {
|
|
|
27
26
|
await copyFiles(config, fileSrc);
|
|
28
27
|
}
|
|
29
28
|
}
|
|
30
|
-
else if (utf8Data.startsWith(FATAL)) {
|
|
31
|
-
throw new Error(utf8Data);
|
|
32
|
-
}
|
|
33
29
|
else {
|
|
34
30
|
const dst = join(config.output, treatPathSep(src));
|
|
35
31
|
// Use Buffer to output the file content
|
|
@@ -51,7 +47,7 @@ const readPathFromGit = async (path, config) => {
|
|
|
51
47
|
};
|
|
52
48
|
const pathExists = async (path, config) => {
|
|
53
49
|
const data = await readPathFromGit(path, config);
|
|
54
|
-
return data
|
|
50
|
+
return !!data;
|
|
55
51
|
};
|
|
56
52
|
const readDir = async (dir, config) => {
|
|
57
53
|
const data = await readPathFromGit(dir, config);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fsHelper.js","sourceRoot":"","sources":["../../src/utils/fsHelper.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAA;AACvD,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AACtD,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAC1C,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAC1D,MAAM,EACJ,QAAQ,EACR,gBAAgB,EAChB,YAAY,GACb,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAElC,MAAM,MAAM,GAAG,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"fsHelper.js","sourceRoot":"","sources":["../../src/utils/fsHelper.js"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,9 @@ export const POINTER_REF_TYPES: string[];
|
|
|
5
5
|
export const GIT_DIFF_TYPE_REGEX: RegExp;
|
|
6
6
|
export const GIT_FOLDER: ".git";
|
|
7
7
|
export const MINUS: "-";
|
|
8
|
-
export const
|
|
8
|
+
export const IGNORE_WHITESPACE_PARAMS_FOR_REPO: string[];
|
|
9
9
|
export const PLUS: "+";
|
|
10
10
|
export const UTF8_ENCODING: "utf8";
|
|
11
11
|
export const COMMIT_REF_TYPE: "commit";
|
|
12
12
|
export const TAG_REF_TYPE: "tag";
|
|
13
|
+
export const IGNORE_WHITESPACE_PARAMS_FOR_FILE: string[];
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
const COMMIT_REF_TYPE = 'commit';
|
|
3
3
|
const TAG_REF_TYPE = 'tag';
|
|
4
|
+
const IGNORE_WHITESPACE_PARAMS_FOR_FILE = [
|
|
5
|
+
'--ignore-all-space',
|
|
6
|
+
'--ignore-blank-lines',
|
|
7
|
+
'--ignore-cr-at-eol',
|
|
8
|
+
];
|
|
4
9
|
module.exports.ADDITION = 'A';
|
|
5
10
|
module.exports.DELETION = 'D';
|
|
6
11
|
module.exports.MODIFICATION = 'M';
|
|
@@ -10,10 +15,10 @@ module.exports.POINTER_REF_TYPES = [COMMIT_REF_TYPE, TAG_REF_TYPE];
|
|
|
10
15
|
module.exports.GIT_DIFF_TYPE_REGEX = /^.\s+/u;
|
|
11
16
|
module.exports.GIT_FOLDER = '.git';
|
|
12
17
|
module.exports.MINUS = '-';
|
|
13
|
-
module.exports.
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
18
|
+
module.exports.IGNORE_WHITESPACE_PARAMS_FOR_FILE =
|
|
19
|
+
IGNORE_WHITESPACE_PARAMS_FOR_FILE;
|
|
20
|
+
module.exports.IGNORE_WHITESPACE_PARAMS_FOR_REPO = [
|
|
21
|
+
...IGNORE_WHITESPACE_PARAMS_FOR_FILE,
|
|
17
22
|
'--word-diff-regex=|[^[:space:]]',
|
|
18
23
|
];
|
|
19
24
|
module.exports.PLUS = '+';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitConstants.js","sourceRoot":"","sources":["../../src/utils/gitConstants.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,eAAe,GAAG,QAAQ,CAAA;AAChC,MAAM,YAAY,GAAG,KAAK,CAAA;AAC1B,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAA;AAC7B,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAA;AAC7B,MAAM,CAAC,OAAO,CAAC,YAAY,GAAG,GAAG,CAAA;AACjC,MAAM,CAAC,OAAO,CAAC,eAAe,GAAG,eAAe,CAAA;AAChD,MAAM,CAAC,OAAO,CAAC,YAAY,GAAG,YAAY,CAAA;AAC1C,MAAM,CAAC,OAAO,CAAC,iBAAiB,GAAG,CAAC,eAAe,EAAE,YAAY,CAAC,CAAA;AAClE,MAAM,CAAC,OAAO,CAAC,mBAAmB,GAAG,QAAQ,CAAA;AAC7C,MAAM,CAAC,OAAO,CAAC,UAAU,GAAG,MAAM,CAAA;AAClC,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG,GAAG,CAAA;AAC1B,MAAM,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"gitConstants.js","sourceRoot":"","sources":["../../src/utils/gitConstants.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,eAAe,GAAG,QAAQ,CAAA;AAChC,MAAM,YAAY,GAAG,KAAK,CAAA;AAC1B,MAAM,iCAAiC,GAAG;IACxC,oBAAoB;IACpB,sBAAsB;IACtB,oBAAoB;CACrB,CAAA;AACD,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAA;AAC7B,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAA;AAC7B,MAAM,CAAC,OAAO,CAAC,YAAY,GAAG,GAAG,CAAA;AACjC,MAAM,CAAC,OAAO,CAAC,eAAe,GAAG,eAAe,CAAA;AAChD,MAAM,CAAC,OAAO,CAAC,YAAY,GAAG,YAAY,CAAA;AAC1C,MAAM,CAAC,OAAO,CAAC,iBAAiB,GAAG,CAAC,eAAe,EAAE,YAAY,CAAC,CAAA;AAClE,MAAM,CAAC,OAAO,CAAC,mBAAmB,GAAG,QAAQ,CAAA;AAC7C,MAAM,CAAC,OAAO,CAAC,UAAU,GAAG,MAAM,CAAA;AAClC,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG,GAAG,CAAA;AAC1B,MAAM,CAAC,OAAO,CAAC,iCAAiC;IAC9C,iCAAiC,CAAA;AACnC,MAAM,CAAC,OAAO,CAAC,iCAAiC,GAAG;IACjD,GAAG,iCAAiC;IACpC,iCAAiC;CAClC,CAAA;AACD,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,GAAG,CAAA;AACzB,MAAM,CAAC,OAAO,CAAC,aAAa,GAAG,MAAM,CAAA"}
|
package/lib/utils/repoGitDiff.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
const { linify, treatPathSep } = require('./childProcessUtils');
|
|
3
3
|
const { getType } = require('./typeUtils');
|
|
4
4
|
const { buildIgnoreHelper } = require('./ignoreHelper');
|
|
5
|
-
const { ADDITION, DELETION, GIT_DIFF_TYPE_REGEX,
|
|
5
|
+
const { ADDITION, DELETION, GIT_DIFF_TYPE_REGEX, IGNORE_WHITESPACE_PARAMS_FOR_REPO, MODIFICATION, UTF8_ENCODING, } = require('./gitConstants');
|
|
6
6
|
const { SUB_OBJECT_TYPES, OBJECT_TYPE, OBJECT_TRANSLATION_TYPE, } = require('./metadataConstants');
|
|
7
7
|
const { spawn } = require('child_process');
|
|
8
8
|
const { gitPathSeparatorNormalizer, readFile } = require('./fsHelper');
|
|
@@ -30,7 +30,7 @@ class RepoGitDiff {
|
|
|
30
30
|
encoding: UTF8_ENCODING,
|
|
31
31
|
};
|
|
32
32
|
this.ignoreWhitespaceParams = this.config.ignoreWhitespace
|
|
33
|
-
?
|
|
33
|
+
? IGNORE_WHITESPACE_PARAMS_FOR_REPO
|
|
34
34
|
: [];
|
|
35
35
|
}
|
|
36
36
|
async getLines() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repoGitDiff.js","sourceRoot":"","sources":["../../src/utils/repoGitDiff.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAC/D,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AAC1C,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AACvD,MAAM,EACJ,QAAQ,EACR,QAAQ,EACR,mBAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"repoGitDiff.js","sourceRoot":"","sources":["../../src/utils/repoGitDiff.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAC/D,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AAC1C,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AACvD,MAAM,EACJ,QAAQ,EACR,QAAQ,EACR,mBAAmB,EACnB,iCAAiC,EACjC,YAAY,EACZ,aAAa,GACd,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAC7B,MAAM,EACJ,gBAAgB,EAChB,WAAW,EACX,uBAAuB,GACxB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAClC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAC1C,MAAM,EAAE,0BAA0B,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;AACtE,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;AACxC,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AACxB,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAEtC,MAAM,WAAW,GAAG,eAAe,CAAA;AAEnC,MAAM,cAAc,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,CAAA;AAC1E,MAAM,aAAa,GAAG,CAAC,GAAG,WAAW,IAAI,QAAQ,EAAE,CAAC,CAAA;AACpD,MAAM,WAAW,GAAG,CAAC,GAAG,WAAW,IAAI,QAAQ,EAAE,CAAC,CAAA;AAClD,MAAM,kBAAkB,GAAG,CAAC,GAAG,WAAW,IAAI,YAAY,EAAE,CAAC,CAAA;AAC7D,MAAM,GAAG,GAAG,IAAI,CAAA;AAChB,MAAM,cAAc,GAAG,iBAAiB,CAAA;AACxC,MAAM,cAAc,GAAG,CAAC,SAAS,EAAE,aAAa,EAAE,IAAI,CAAC,CAAA;AACvD,MAAM,aAAa,GAAG;IACpB,WAAW,EAAE,QAAQ;CACtB,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,WAAW,EAAE,uBAAuB,EAAE,GAAG,gBAAgB,CAAC,CAAA;AAC5E,MAAM,WAAW;IACf,YAAY,MAAM,EAAE,QAAQ;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,WAAW,GAAG;YACjB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACrB,QAAQ,EAAE,aAAa;SACxB,CAAA;QACD,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB;YACxD,CAAC,CAAC,iCAAiC;YACnC,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC9B,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,gBAAgB,EAAE;SACxB,CAAC,CAAA;QAEF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAClE,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,OAAM;SACP;QAED,MAAM,KAAK,GAAG,KAAK,CACjB,KAAK,EACL,CAAC,GAAG,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EACnC,IAAI,CAAC,WAAW,CACjB,CAAA;QACD,MAAM,KAAK,GAAG,EAAE,CAAA;QAChB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YAC7C,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAA;SAC/B;QACD,OAAO,WAAW,CAAC,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;IACtD,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC9B,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,QAAQ,CAAC;YACzC,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,QAAQ,CAAC;YAC3C,IAAI,CAAC,aAAa,CAAC,kBAAkB,EAAE,YAAY,CAAC;SACrD,CAAC,CAAA;QACF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;QAC1D,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,UAAU;QACpC,MAAM,KAAK,GAAG,EAAE,CAAA;QAChB,MAAM,OAAO,GAAG,KAAK,CACnB,KAAK,EACL;YACE,GAAG,cAAc;YACjB,GAAG,MAAM;YACT,GAAG,IAAI,CAAC,sBAAsB;YAC9B,IAAI,CAAC,MAAM,CAAC,IAAI;YAChB,IAAI,CAAC,MAAM,CAAC,EAAE;YACd,0BAA0B,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;SAC/C,EACD,IAAI,CAAC,WAAW,CACjB,CAAA;QACD,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAC/C,KAAK,CAAC,IAAI,CACR,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,UAAU,GAAG,GAAG,EAAE,CAAC,CAClE,CAAA;SACF;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAK;QACtB,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,CACnC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EACrD,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CACnC,CAAA;QACD,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CACvD,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAClC,CAAA;QACD,MAAM,cAAc,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAC9D,MAAM,GAAG,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAA;YAC7C,OAAO,UAAU,CAAC,IAAI,CACpB,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,EAAE,aAAa,CAAC,CACzD,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAEzD,OAAO,KAAK;aACT,MAAM,CAAC,OAAO,CAAC;aACf,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;aAC1D,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC5C,CAAC;IAED,eAAe,CAAC,IAAI,EAAE,cAAc;QAClC,OAAO,CACL,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC9B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CACtD,CAAA;IACH,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK;QAC9B,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CACzB,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAChC,YAAY,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,GAAG,GAAG,GAAG,YAAY,CAAC,YAAY,CAAC,EAAE,CACnE,CACF,CAAA;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM;QAChC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B;YACE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE;YAC7C,EAAE,OAAO,EAAE,MAAM,CAAC,kBAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE;SACzD;aACE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;aAC1B,GAAG,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;YACf,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAC3C,OAAO;gBACL,GAAG,GAAG;gBACN,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;aAC1D,CAAA;QACH,CAAC,CAAC,CACL,CAAA;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,sBAAsB,CAAC,IAAI;QACzB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QACzC,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,CAAA;QACvD,IAAI,cAAc,GAAG,EAAE,CAAC,IAAI,CAAA;QAC5B,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC3B,cAAc,GAAG,IAAI;iBAClB,KAAK,CAAC,GAAG,CAAC;iBACV,MAAM,CACL,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,EACrE,EAAE,CACH,CAAA;SACJ;QACD,OAAO,cAAc,CAAA;IACvB,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,WAAW,CAAA"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"5.13.
|
|
1
|
+
{"version":"5.13.3","commands":{"sgd:source:delta":{"id":"sgd:source:delta","description":"Generate the sfdx content in source format and destructive change from two git commits","usage":"<%= command.id %> -f <string> [-t <string>] [-r <filepath>] [-i <filepath>] [-D <filepath>] [-s <filepath>] [-W] [-o <filepath>] [-a <number>] [-d] [-n <filepath>] [-N <filepath>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"sfdx-git-delta","pluginType":"core","aliases":[],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"to":{"name":"to","type":"option","char":"t","description":"commit sha to where the diff is done","default":"HEAD"},"from":{"name":"from","type":"option","char":"f","description":"commit sha from where the diff is done [git rev-list --max-parents=0 HEAD]","required":true},"repo":{"name":"repo","type":"option","char":"r","description":"git repository location","default":"."},"ignore":{"name":"ignore","type":"option","char":"i","description":"file listing paths to explicitly ignore for any diff actions"},"ignore-destructive":{"name":"ignore-destructive","type":"option","char":"D","description":"file listing paths to explicitly ignore for any destructive actions"},"source":{"name":"source","type":"option","char":"s","description":"source folder focus location related to --repo","default":"."},"ignore-whitespace":{"name":"ignore-whitespace","type":"boolean","char":"W","description":"ignore git diff whitespace (space, tab, eol) changes","allowNo":false},"output":{"name":"output","type":"option","char":"o","description":"source package specific output","default":"./output"},"api-version":{"name":"api-version","type":"option","char":"a","description":"salesforce metadata API version, default to sfdx-project.json \"sourceApiVersion\" attribut or latest version"},"generate-delta":{"name":"generate-delta","type":"boolean","char":"d","description":"generate delta files in [--output] folder","allowNo":false},"include":{"name":"include","type":"option","char":"n","description":"file listing paths to explicitly include for any diff actions"},"include-destructive":{"name":"include-destructive","type":"option","char":"N","description":"file listing paths to explicitly include for any destructive actions"}},"args":[]}}}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sfdx-git-delta",
|
|
3
|
-
"version": "5.13.
|
|
3
|
+
"version": "5.13.3",
|
|
4
4
|
"description": "Generate the sfdx content in source format and destructive change from two git commits",
|
|
5
5
|
"keyword": [
|
|
6
6
|
"salesforce",
|
|
@@ -28,9 +28,9 @@
|
|
|
28
28
|
"@oclif/command": "^1.8.22",
|
|
29
29
|
"@oclif/config": "^1.18.8",
|
|
30
30
|
"@oclif/errors": "^1.3.6",
|
|
31
|
-
"@salesforce/command": "^5.3.
|
|
32
|
-
"@salesforce/core": "^3.33.
|
|
33
|
-
"fast-xml-parser": "^4.1.
|
|
31
|
+
"@salesforce/command": "^5.3.2",
|
|
32
|
+
"@salesforce/core": "^3.33.5",
|
|
33
|
+
"fast-xml-parser": "^4.1.3",
|
|
34
34
|
"fs-extra": "^11.1.0",
|
|
35
35
|
"ignore": "^5.2.4",
|
|
36
36
|
"micromatch": "^4.0.5",
|
|
@@ -62,19 +62,19 @@
|
|
|
62
62
|
"upgrade:dependencies": "yarn yarn-upgrade-all"
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
|
-
"@commitlint/cli": "^17.4.
|
|
66
|
-
"@commitlint/config-conventional": "^17.4.
|
|
67
|
-
"@commitlint/prompt-cli": "^17.4.
|
|
65
|
+
"@commitlint/cli": "^17.4.4",
|
|
66
|
+
"@commitlint/config-conventional": "^17.4.4",
|
|
67
|
+
"@commitlint/prompt-cli": "^17.4.4",
|
|
68
68
|
"@oclif/dev-cli": "^1.26.10",
|
|
69
|
-
"@oclif/plugin-help": "^5.2.
|
|
70
|
-
"@oclif/test": "^2.3.
|
|
69
|
+
"@oclif/plugin-help": "^5.2.6",
|
|
70
|
+
"@oclif/test": "^2.3.8",
|
|
71
71
|
"@salesforce/dev-config": "^3.1.0",
|
|
72
72
|
"@types/chai": "^4.3.4",
|
|
73
73
|
"@types/mocha": "^10.0.1",
|
|
74
|
-
"@types/node": "^18.
|
|
75
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
76
|
-
"@typescript-eslint/parser": "^5.
|
|
77
|
-
"eslint": "^8.
|
|
74
|
+
"@types/node": "^18.14.1",
|
|
75
|
+
"@typescript-eslint/eslint-plugin": "^5.53.0",
|
|
76
|
+
"@typescript-eslint/parser": "^5.53.0",
|
|
77
|
+
"eslint": "^8.35.0",
|
|
78
78
|
"eslint-config-prettier": "^8.6.0",
|
|
79
79
|
"eslint-config-salesforce-typescript": "^1.1.1",
|
|
80
80
|
"eslint-plugin-import": "^2.27.5",
|