sfdx-git-delta 5.11.2 → 5.11.4
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 +14 -0
- package/README.md +1 -1
- package/lib/utils/childProcessUtils.d.ts +1 -1
- package/lib/utils/childProcessUtils.js +10 -1
- package/lib/utils/childProcessUtils.js.map +1 -1
- package/lib/utils/fileGitDiff.js +2 -1
- package/lib/utils/fileGitDiff.js.map +1 -1
- package/lib/utils/fsHelper.d.ts +1 -0
- package/lib/utils/fsHelper.js +21 -10
- package/lib/utils/fsHelper.js.map +1 -1
- package/lib/utils/repoGitDiff.js +7 -9
- package/lib/utils/repoGitDiff.js.map +1 -1
- package/lib/utils/repoSetup.js +3 -1
- package/lib/utils/repoSetup.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +13 -13
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,20 @@
|
|
|
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.11.4 (2023-02-01)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* binary file copy ([#440](https://github.com/scolladon/sfdx-git-delta/issues/440)) ([b0e363a](https://github.com/scolladon/sfdx-git-delta/commit/b0e363a2bdcdb438ea651def621bd4cf03ac1782))
|
|
11
|
+
|
|
12
|
+
### 5.11.3 (2023-01-30)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
* windows path separator with git ([#436](https://github.com/scolladon/sfdx-git-delta/issues/436)) ([b760a7e](https://github.com/scolladon/sfdx-git-delta/commit/b760a7ee0381777bdd7d422d1df7f3b291cab9d2))
|
|
18
|
+
|
|
5
19
|
### 5.11.2 (2023-01-26)
|
|
6
20
|
|
|
7
21
|
|
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.11.
|
|
189
|
+
_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v5.11.4/src/commands/sgd/source/delta.ts)_
|
|
190
190
|
<!-- commandsstop -->
|
|
191
191
|
|
|
192
192
|
### Windows users
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export const EOLRegex: RegExp;
|
|
2
|
-
export function getStreamContent(stream: any): Promise<
|
|
2
|
+
export function getStreamContent(stream: any): Promise<Buffer>;
|
|
3
3
|
export function linify(stream: any): AsyncGenerator<string, void, unknown>;
|
|
4
4
|
export function treatPathSep(data: any): any;
|
|
5
5
|
export function sanitizePath(data: any): any;
|
|
@@ -3,6 +3,15 @@ const { normalize, sep } = require('path');
|
|
|
3
3
|
const EOLRegex = /\r?\n/g;
|
|
4
4
|
const treatPathSep = data => data.replace(/[/\\]+/g, sep);
|
|
5
5
|
const sanitizePath = data => data !== null && data !== undefined ? normalize(treatPathSep(data)) : data;
|
|
6
|
+
// REFACTOR using native readLine https://nodejs.org/api/readline.html when using node 19.5
|
|
7
|
+
/*
|
|
8
|
+
const linify = stream => {
|
|
9
|
+
return createInterface({
|
|
10
|
+
input: stream,
|
|
11
|
+
crlfDelay: Infinity,
|
|
12
|
+
historySize: 0,
|
|
13
|
+
})
|
|
14
|
+
*/
|
|
6
15
|
async function* linify(stream) {
|
|
7
16
|
let previous = '';
|
|
8
17
|
for await (const chunk of stream) {
|
|
@@ -23,7 +32,7 @@ const getStreamContent = async (stream) => {
|
|
|
23
32
|
for await (const chunk of stream.stdout) {
|
|
24
33
|
content.push(chunk);
|
|
25
34
|
}
|
|
26
|
-
return
|
|
35
|
+
return Buffer.concat(content);
|
|
27
36
|
};
|
|
28
37
|
module.exports.EOLRegex = EOLRegex;
|
|
29
38
|
module.exports.getStreamContent = getStreamContent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"childProcessUtils.js","sourceRoot":"","sources":["../../src/utils/childProcessUtils.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAE1C,MAAM,QAAQ,GAAG,QAAQ,CAAA;AAEzB,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;AAEzD,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE,CAC1B,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;AAE5E,KAAK,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM;IAC3B,IAAI,QAAQ,GAAG,EAAE,CAAA;IACjB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE;QAChC,QAAQ,IAAI,KAAK,CAAA;QACjB,IAAI,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACxC,OAAO,QAAQ,IAAI,CAAC,EAAE;YACpB,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;YACjC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAA;YACvC,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;SACrC;KACF;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,QAAQ,CAAA;KACf;AACH,CAAC;AAED,MAAM,gBAAgB,GAAG,KAAK,EAAC,MAAM,EAAC,EAAE;IACtC,MAAM,OAAO,GAAG,EAAE,CAAA;IAClB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE;QACvC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;KACpB;
|
|
1
|
+
{"version":3,"file":"childProcessUtils.js","sourceRoot":"","sources":["../../src/utils/childProcessUtils.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAE1C,MAAM,QAAQ,GAAG,QAAQ,CAAA;AAEzB,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;AAEzD,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE,CAC1B,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;AAE5E,2FAA2F;AAC3F;;;;;;;EAOE;AACF,KAAK,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM;IAC3B,IAAI,QAAQ,GAAG,EAAE,CAAA;IACjB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE;QAChC,QAAQ,IAAI,KAAK,CAAA;QACjB,IAAI,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACxC,OAAO,QAAQ,IAAI,CAAC,EAAE;YACpB,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;YACjC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAA;YACvC,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;SACrC;KACF;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,QAAQ,CAAA;KACf;AACH,CAAC;AAED,MAAM,gBAAgB,GAAG,KAAK,EAAC,MAAM,EAAC,EAAE;IACtC,MAAM,OAAO,GAAG,EAAE,CAAA;IAClB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE;QACvC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;KACpB;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AAC/B,CAAC,CAAA;AAED,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAA;AAClC,MAAM,CAAC,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;AAClD,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAA;AAC9B,MAAM,CAAC,OAAO,CAAC,YAAY,GAAG,YAAY,CAAA;AAC1C,MAAM,CAAC,OAAO,CAAC,YAAY,GAAG,YAAY,CAAA"}
|
package/lib/utils/fileGitDiff.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
const { spawn } = require('child_process');
|
|
3
3
|
const { linify } = require('./childProcessUtils');
|
|
4
|
+
const { gitPathSeparatorNormalizer } = require('./fsHelper');
|
|
4
5
|
const { IGNORE_WHITESPACE_PARAMS, UTF8_ENCODING } = require('./gitConstants');
|
|
5
6
|
const unitDiffParams = ['--no-pager', 'diff', '--no-prefix', '-U200'];
|
|
6
7
|
module.exports = (filePath, config) => {
|
|
@@ -13,7 +14,7 @@ module.exports = (filePath, config) => {
|
|
|
13
14
|
config.from,
|
|
14
15
|
config.to,
|
|
15
16
|
'--',
|
|
16
|
-
filePath,
|
|
17
|
+
gitPathSeparatorNormalizer(filePath),
|
|
17
18
|
], { cwd: config.repo, encoding: UTF8_ENCODING });
|
|
18
19
|
return linify(gitDiff.stdout);
|
|
19
20
|
};
|
|
@@ -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,wBAAwB,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE7E,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,wBAAwB;QAC1B,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,QAAQ;
|
|
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,EAAE,wBAAwB,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE7E,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,wBAAwB;QAC1B,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.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export function scanExtension(dir: any, ext: any, config: any): AsyncGenerator<any, void, unknown>;
|
|
2
2
|
export function copyFiles(config: any, src: any): Promise<void>;
|
|
3
|
+
export function gitPathSeparatorNormalizer(path: any): any;
|
|
3
4
|
export function isSubDir(parent: any, dir: any): boolean;
|
|
4
5
|
export function pathExists(path: any, config: any): Promise<boolean>;
|
|
5
6
|
export function readDir(dir: any, config: any): Promise<string[]>;
|
package/lib/utils/fsHelper.js
CHANGED
|
@@ -8,36 +8,46 @@ const { EOLRegex, getStreamContent, treatPathSep, } = require('./childProcessUti
|
|
|
8
8
|
const FOLDER = 'tree';
|
|
9
9
|
const FATAL = 'fatal';
|
|
10
10
|
const showCmd = ['--no-pager', 'show'];
|
|
11
|
+
const gitPathSeparatorNormalizer = path => path?.replace(/\\+/g, '/');
|
|
11
12
|
const copiedFiles = new Set();
|
|
12
13
|
const copyFiles = async (config, src) => {
|
|
13
14
|
if (copiedFiles.has(src))
|
|
14
15
|
return;
|
|
15
16
|
copiedFiles.add(src);
|
|
16
|
-
const
|
|
17
|
-
|
|
17
|
+
const bufferData = await readPathFromGitAsBuffer(src, config);
|
|
18
|
+
const utf8Data = bufferData?.toString(UTF8_ENCODING);
|
|
19
|
+
if (!utf8Data) {
|
|
18
20
|
return;
|
|
19
21
|
}
|
|
20
|
-
if (
|
|
21
|
-
const [header, , ...files] =
|
|
22
|
+
if (utf8Data.startsWith(FOLDER)) {
|
|
23
|
+
const [header, , ...files] = utf8Data.split(EOLRegex);
|
|
22
24
|
const folder = header.split(':')[1];
|
|
23
25
|
for (const file of files) {
|
|
24
26
|
const fileSrc = join(folder, file);
|
|
25
27
|
await copyFiles(config, fileSrc);
|
|
26
28
|
}
|
|
27
29
|
}
|
|
28
|
-
else if (
|
|
29
|
-
throw new Error(
|
|
30
|
+
else if (utf8Data.startsWith(FATAL)) {
|
|
31
|
+
throw new Error(utf8Data);
|
|
30
32
|
}
|
|
31
33
|
else {
|
|
32
34
|
const dst = join(config.output, treatPathSep(src));
|
|
33
|
-
|
|
35
|
+
// Use Buffer to output the file content
|
|
36
|
+
// Let fs implementation detect the encoding ("utf8" or "binary")
|
|
37
|
+
await outputFile(dst, bufferData);
|
|
34
38
|
}
|
|
35
39
|
};
|
|
36
|
-
const
|
|
37
|
-
const
|
|
40
|
+
const readPathFromGitAsBuffer = async (path, config) => {
|
|
41
|
+
const normalizedPath = gitPathSeparatorNormalizer(path);
|
|
42
|
+
const bufferData = await getStreamContent(spawn('git', [...showCmd, `${config.to}:${normalizedPath}`], {
|
|
38
43
|
cwd: config.repo,
|
|
39
44
|
}));
|
|
40
|
-
return
|
|
45
|
+
return bufferData;
|
|
46
|
+
};
|
|
47
|
+
const readPathFromGit = async (path, config) => {
|
|
48
|
+
const bufferData = await readPathFromGitAsBuffer(path, config);
|
|
49
|
+
const utf8Data = bufferData.toString(UTF8_ENCODING);
|
|
50
|
+
return utf8Data;
|
|
41
51
|
};
|
|
42
52
|
const pathExists = async (path, config) => {
|
|
43
53
|
const data = await readPathFromGit(path, config);
|
|
@@ -82,6 +92,7 @@ const isSubDir = (parent, dir) => {
|
|
|
82
92
|
return !!rel && !rel.startsWith('..') && !isAbsolute(rel);
|
|
83
93
|
};
|
|
84
94
|
module.exports.copyFiles = copyFiles;
|
|
95
|
+
module.exports.gitPathSeparatorNormalizer = gitPathSeparatorNormalizer;
|
|
85
96
|
module.exports.isSubDir = isSubDir;
|
|
86
97
|
module.exports.pathExists = pathExists;
|
|
87
98
|
module.exports.readDir = readDir;
|
|
@@ -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;AACrB,MAAM,KAAK,GAAG,OAAO,CAAA;AAErB,MAAM,OAAO,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;AACtC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAE,CAAA;AAE7B,MAAM,SAAS,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;IACtC,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAM;IAChC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAEpB,MAAM,
|
|
1
|
+
{"version":3,"file":"fsHelper.js","sourceRoot":"","sources":["../../src/utils/fsHelper.js"],"names":[],"mappings":"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"}
|
package/lib/utils/repoGitDiff.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
'use strict';
|
|
2
|
-
const
|
|
2
|
+
const { linify, treatPathSep } = require('./childProcessUtils');
|
|
3
3
|
const { getType } = require('./typeUtils');
|
|
4
4
|
const { buildIgnoreHelper } = require('./ignoreHelper');
|
|
5
5
|
const { ADDITION, DELETION, GIT_DIFF_TYPE_REGEX, IGNORE_WHITESPACE_PARAMS, 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
|
-
const { readFile } = require('./fsHelper');
|
|
8
|
+
const { gitPathSeparatorNormalizer, readFile } = require('./fsHelper');
|
|
9
9
|
const micromatch = require('micromatch');
|
|
10
10
|
const os = require('os');
|
|
11
11
|
const { parse, sep } = require('path');
|
|
@@ -47,8 +47,8 @@ class RepoGitDiff {
|
|
|
47
47
|
}
|
|
48
48
|
const gitLs = spawn('git', [...allFilesParams, this.config.to], this.spawnConfig);
|
|
49
49
|
const lines = [];
|
|
50
|
-
for await (const line of
|
|
51
|
-
lines.push(
|
|
50
|
+
for await (const line of linify(gitLs.stdout)) {
|
|
51
|
+
lines.push(treatPathSep(line));
|
|
52
52
|
}
|
|
53
53
|
return RepoGitDiff._addIncludes(lines, includeSetup);
|
|
54
54
|
}
|
|
@@ -69,12 +69,10 @@ class RepoGitDiff {
|
|
|
69
69
|
...this.ignoreWhitespaceParams,
|
|
70
70
|
this.config.from,
|
|
71
71
|
this.config.to,
|
|
72
|
-
this.config.source,
|
|
72
|
+
gitPathSeparatorNormalizer(this.config.source),
|
|
73
73
|
], this.spawnConfig);
|
|
74
|
-
for await (const line of
|
|
75
|
-
lines.push(
|
|
76
|
-
.treatPathSep(line)
|
|
77
|
-
.replace(NUM_STAT_REGEX, `${changeType}${TAB}`));
|
|
74
|
+
for await (const line of linify(gitDiff.stdout)) {
|
|
75
|
+
lines.push(treatPathSep(line).replace(NUM_STAT_REGEX, `${changeType}${TAB}`));
|
|
78
76
|
}
|
|
79
77
|
return lines;
|
|
80
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repoGitDiff.js","sourceRoot":"","sources":["../../src/utils/repoGitDiff.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,
|
|
1
|
+
{"version":3,"file":"repoGitDiff.js","sourceRoot":"","sources":["../../src/utils/repoGitDiff.js"],"names":[],"mappings":"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"}
|
package/lib/utils/repoSetup.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
const { getStreamContent } = require('./childProcessUtils');
|
|
3
|
+
const { UTF8_ENCODING } = require('./gitConstants');
|
|
3
4
|
const { spawn } = require('child_process');
|
|
4
5
|
const commitCheckParams = ['cat-file', '-t'];
|
|
5
6
|
const gitConfig = ['config', 'core.quotepath', 'off'];
|
|
@@ -14,9 +15,10 @@ class RepoSetup {
|
|
|
14
15
|
await getStreamContent(spawn('git', gitConfig, this.spawnConfig));
|
|
15
16
|
}
|
|
16
17
|
async getCommitRefType(commitRef) {
|
|
17
|
-
|
|
18
|
+
const data = await getStreamContent(spawn('git', [...commitCheckParams, commitRef], {
|
|
18
19
|
cwd: this.config.repo,
|
|
19
20
|
}));
|
|
21
|
+
return data?.toString(UTF8_ENCODING);
|
|
20
22
|
}
|
|
21
23
|
}
|
|
22
24
|
module.exports = RepoSetup;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repoSetup.js","sourceRoot":"","sources":["../../src/utils/repoSetup.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAC3D,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAC1C,MAAM,iBAAiB,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;AAC5C,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAA;AAErD,MAAM,SAAS;IACb,YAAY,MAAM;QAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,WAAW,GAAG;YACjB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;SACtB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,MAAM,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAA;IACnE,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,SAAS;QAC9B,
|
|
1
|
+
{"version":3,"file":"repoSetup.js","sourceRoot":"","sources":["../../src/utils/repoSetup.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAC3D,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AACnD,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAC1C,MAAM,iBAAiB,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;AAC5C,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAA;AAErD,MAAM,SAAS;IACb,YAAY,MAAM;QAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,WAAW,GAAG;YACjB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;SACtB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,MAAM,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAA;IACnE,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,SAAS;QAC9B,MAAM,IAAI,GAAG,MAAM,gBAAgB,CACjC,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,iBAAiB,EAAE,SAAS,CAAC,EAAE;YAC9C,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;SACtB,CAAC,CACH,CAAA;QAED,OAAO,IAAI,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;IACtC,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,SAAS,CAAA"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"5.11.
|
|
1
|
+
{"version":"5.11.4","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.11.
|
|
3
|
+
"version": "5.11.4",
|
|
4
4
|
"description": "Generate the sfdx content in source format and destructive change from two git commits",
|
|
5
5
|
"keyword": [
|
|
6
6
|
"salesforce",
|
|
@@ -26,16 +26,16 @@
|
|
|
26
26
|
},
|
|
27
27
|
"author": "Sebastien Colladon <colladonsebastien@gmail.com>",
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@oclif/command": "^1.8.
|
|
30
|
-
"@oclif/config": "^1.18.
|
|
29
|
+
"@oclif/command": "^1.8.22",
|
|
30
|
+
"@oclif/config": "^1.18.8",
|
|
31
31
|
"@oclif/errors": "^1.3.6",
|
|
32
|
-
"@salesforce/command": "^5.2.
|
|
32
|
+
"@salesforce/command": "^5.2.43",
|
|
33
33
|
"@salesforce/core": "^3.33.1",
|
|
34
34
|
"fast-xml-parser": "^4.0.15",
|
|
35
35
|
"fs-extra": "^11.1.0",
|
|
36
36
|
"ignore": "^5.2.4",
|
|
37
37
|
"micromatch": "^4.0.5",
|
|
38
|
-
"tslib": "^2.
|
|
38
|
+
"tslib": "^2.5.0",
|
|
39
39
|
"xmlbuilder2": "^3.0.2"
|
|
40
40
|
},
|
|
41
41
|
"license": "MIT",
|
|
@@ -71,30 +71,30 @@
|
|
|
71
71
|
"@commitlint/config-angular": "^17.4.2",
|
|
72
72
|
"@commitlint/prompt-cli": "^17.4.2",
|
|
73
73
|
"@oclif/dev-cli": "^1.26.10",
|
|
74
|
-
"@oclif/plugin-help": "^5.2.
|
|
75
|
-
"@oclif/test": "^2.3.
|
|
74
|
+
"@oclif/plugin-help": "^5.2.2",
|
|
75
|
+
"@oclif/test": "^2.3.4",
|
|
76
76
|
"@salesforce/dev-config": "^3.1.0",
|
|
77
77
|
"@types/chai": "^4.3.4",
|
|
78
78
|
"@types/mocha": "^10.0.1",
|
|
79
79
|
"@types/node": "^18.11.18",
|
|
80
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
81
|
-
"@typescript-eslint/parser": "^5.
|
|
80
|
+
"@typescript-eslint/eslint-plugin": "^5.50.0",
|
|
81
|
+
"@typescript-eslint/parser": "^5.50.0",
|
|
82
82
|
"conventional-github-releaser": "^3.1.5",
|
|
83
|
-
"eslint": "^8.
|
|
83
|
+
"eslint": "^8.33.0",
|
|
84
84
|
"eslint-config-prettier": "^8.6.0",
|
|
85
85
|
"eslint-config-salesforce-typescript": "^1.1.1",
|
|
86
86
|
"eslint-plugin-import": "^2.27.5",
|
|
87
|
-
"eslint-plugin-jsdoc": "^39.
|
|
87
|
+
"eslint-plugin-jsdoc": "^39.7.5",
|
|
88
88
|
"eslint-plugin-prettier": "^4.2.1",
|
|
89
89
|
"husky": "^8.0.3",
|
|
90
|
-
"jest": "^29.4.
|
|
90
|
+
"jest": "^29.4.1",
|
|
91
91
|
"lint-staged": "^13.1.0",
|
|
92
92
|
"nyc": "^15.1.0",
|
|
93
93
|
"prettier": "^2.8.3",
|
|
94
94
|
"prettier-eslint": "^15.0.1",
|
|
95
95
|
"standard-version": "^9.5.0",
|
|
96
96
|
"ts-node": "^10.9.1",
|
|
97
|
-
"typescript": "^4.9.
|
|
97
|
+
"typescript": "^4.9.5",
|
|
98
98
|
"yarn-upgrade-all": "^0.7.2"
|
|
99
99
|
},
|
|
100
100
|
"oclif": {
|