sfdx-git-delta 5.7.0 → 5.7.1
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 +7 -0
- package/README.md +1 -1
- package/lib/post-processor/flowTranslationProcessor.js +2 -3
- package/lib/post-processor/flowTranslationProcessor.js.map +1 -1
- package/lib/utils/ignoreHelper.d.ts +7 -3
- package/lib/utils/ignoreHelper.js +33 -9
- package/lib/utils/ignoreHelper.js.map +1 -1
- package/lib/utils/repoGitDiff.d.ts +0 -5
- package/lib/utils/repoGitDiff.js +3 -33
- package/lib/utils/repoGitDiff.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,13 @@
|
|
|
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.7.1 (2022-11-10)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* ignore destructive with ignore when possible ([#388](https://github.com/scolladon/sfdx-git-delta/issues/388)) ([9c1ad91](https://github.com/scolladon/sfdx-git-delta/commit/9c1ad919eac078abf7ab2b002500ebb42d45295e))
|
|
11
|
+
|
|
5
12
|
## 5.7.0 (2022-11-04)
|
|
6
13
|
|
|
7
14
|
|
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.7.
|
|
189
|
+
_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v5.7.1/src/commands/sgd/source/delta.ts)_
|
|
190
190
|
<!-- commandsstop -->
|
|
191
191
|
|
|
192
192
|
### Windows users
|
|
@@ -3,7 +3,7 @@ const BaseProcessor = require('./baseProcessor');
|
|
|
3
3
|
const { FLOW_DIRECTORY_NAME, META_REGEX, METAFILE_SUFFIX, TRANSLATION_EXTENSION, TRANSLATION_TYPE, } = require('../utils/metadataConstants');
|
|
4
4
|
const { copyFiles, scanExtension, readFile, isSubDir, } = require('../utils/fsHelper');
|
|
5
5
|
const { parse, resolve } = require('path');
|
|
6
|
-
const
|
|
6
|
+
const { forPath } = require('../utils/ignoreHelper');
|
|
7
7
|
const { XMLParser } = require('fast-xml-parser');
|
|
8
8
|
const { asArray, XML_PARSER_OPTION } = require('../utils/fxpHelper');
|
|
9
9
|
const { fillPackageWithParameter } = require('../utils/packageHelper');
|
|
@@ -66,8 +66,7 @@ class FlowTranslationProcessor extends BaseProcessor {
|
|
|
66
66
|
async _getIgnoreInstance() {
|
|
67
67
|
let ign;
|
|
68
68
|
if (this.config.ignore) {
|
|
69
|
-
|
|
70
|
-
ign = await helper.forPath(this.config.ignore);
|
|
69
|
+
ign = await forPath(this.config.ignore);
|
|
71
70
|
}
|
|
72
71
|
return ign;
|
|
73
72
|
}
|
|
@@ -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,QAAQ,EACR,QAAQ,GACT,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AAChC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC1C,MAAM,
|
|
1
|
+
{"version":3,"file":"flowTranslationProcessor.js","sourceRoot":"","sources":["../../src/post-processor/flowTranslationProcessor.js"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
|
-
export
|
|
1
|
+
export function forPath(ignorePath: any): Promise<any>;
|
|
2
|
+
export function buildIgnoreHelper(config: any): Promise<IgnoreHelper>;
|
|
2
3
|
declare class IgnoreHelper {
|
|
3
|
-
|
|
4
|
-
|
|
4
|
+
constructor(globalIgnore: any, destructiveIgnore: any);
|
|
5
|
+
globalIgnore: any;
|
|
6
|
+
destructiveIgnore: any;
|
|
7
|
+
keep(line: any): boolean;
|
|
5
8
|
}
|
|
9
|
+
export {};
|
|
@@ -1,17 +1,41 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
const ignore = require('ignore');
|
|
3
3
|
const { readFile } = require('../utils/fsHelper');
|
|
4
|
+
const { ADDITION, DELETION, MODIFICATION, GIT_DIFF_TYPE_REGEX, } = require('./gitConstants');
|
|
4
5
|
class IgnoreHelper {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
6
|
+
constructor(globalIgnore, destructiveIgnore) {
|
|
7
|
+
this.globalIgnore = globalIgnore;
|
|
8
|
+
this.destructiveIgnore = destructiveIgnore ?? globalIgnore;
|
|
9
|
+
}
|
|
10
|
+
keep(line) {
|
|
11
|
+
const changeType = line.charAt(0);
|
|
12
|
+
let ignInstance = null;
|
|
13
|
+
if (DELETION == changeType) {
|
|
14
|
+
ignInstance = this.destructiveIgnore;
|
|
15
|
+
}
|
|
16
|
+
else if ([ADDITION, MODIFICATION].includes(changeType)) {
|
|
17
|
+
ignInstance = this.globalIgnore;
|
|
11
18
|
}
|
|
12
|
-
|
|
19
|
+
const filePath = line.replace(GIT_DIFF_TYPE_REGEX, '');
|
|
20
|
+
return !ignInstance?.ignores(filePath);
|
|
13
21
|
}
|
|
14
22
|
}
|
|
15
|
-
|
|
16
|
-
|
|
23
|
+
const buildIgnoreHelper = async (config) => {
|
|
24
|
+
const globalIgnore = await forPath(config.ignore);
|
|
25
|
+
const destructiveIgnore = await forPath(config.ignoreDestructive);
|
|
26
|
+
return new IgnoreHelper(globalIgnore, destructiveIgnore);
|
|
27
|
+
};
|
|
28
|
+
const ignorePerPath = new Map();
|
|
29
|
+
const forPath = async (ignorePath) => {
|
|
30
|
+
let ign = null;
|
|
31
|
+
if (ignorePath && !ignorePerPath.has(ignorePath)) {
|
|
32
|
+
ign = ignore();
|
|
33
|
+
const content = await readFile(ignorePath);
|
|
34
|
+
ign.add(content.toString());
|
|
35
|
+
ignorePerPath.set(ignorePath, ign);
|
|
36
|
+
}
|
|
37
|
+
return ignorePerPath.get(ignorePath);
|
|
38
|
+
};
|
|
39
|
+
module.exports.forPath = forPath;
|
|
40
|
+
module.exports.buildIgnoreHelper = buildIgnoreHelper;
|
|
17
41
|
//# sourceMappingURL=ignoreHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ignoreHelper.js","sourceRoot":"","sources":["../../src/utils/ignoreHelper.js"],"names":[],"mappings":";AAAA,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"ignoreHelper.js","sourceRoot":"","sources":["../../src/utils/ignoreHelper.js"],"names":[],"mappings":";AAAA,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACjD,MAAM,EACJ,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,mBAAmB,GACpB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAC7B,MAAM,YAAY;IAIhB,YAAY,YAAY,EAAE,iBAAiB;QACzC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,IAAI,YAAY,CAAA;IAC5D,CAAC;IAED,IAAI,CAAC,IAAI;QACP,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAEjC,IAAI,WAAW,GAAG,IAAI,CAAA;QACtB,IAAI,QAAQ,IAAI,UAAU,EAAE;YAC1B,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAA;SACrC;aAAM,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YACxD,WAAW,GAAG,IAAI,CAAC,YAAY,CAAA;SAChC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAA;QAEtD,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC;CACF;AAED,MAAM,iBAAiB,GAAG,KAAK,EAAC,MAAM,EAAC,EAAE;IACvC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACjD,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;IAEjE,OAAO,IAAI,YAAY,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAA;AAC1D,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,IAAI,GAAG,EAAE,CAAA;AAC/B,MAAM,OAAO,GAAG,KAAK,EAAC,UAAU,EAAC,EAAE;IACjC,IAAI,GAAG,GAAG,IAAI,CAAA;IACd,IAAI,UAAU,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;QAChD,GAAG,GAAG,MAAM,EAAE,CAAA;QACd,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAA;QAC1C,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC3B,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;KACnC;IAED,OAAO,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAA;AAChC,MAAM,CAAC,OAAO,CAAC,iBAAiB,GAAG,iBAAiB,CAAA"}
|
|
@@ -10,10 +10,6 @@ declare class RepoGitDiff {
|
|
|
10
10
|
include: any;
|
|
11
11
|
prefix: "D";
|
|
12
12
|
})[]>;
|
|
13
|
-
static _setupIgnore(config: any): Promise<{
|
|
14
|
-
ignore: any;
|
|
15
|
-
helper: any;
|
|
16
|
-
}[]>;
|
|
17
13
|
constructor(config: any, metadata: any);
|
|
18
14
|
config: any;
|
|
19
15
|
metadata: any;
|
|
@@ -28,6 +24,5 @@ declare class RepoGitDiff {
|
|
|
28
24
|
_spawnGitDiff(filter: any, changeType: any): Promise<any[]>;
|
|
29
25
|
_treatResult(lines: any): Promise<any>;
|
|
30
26
|
_filterInternal(line: any, deletedRenamed: any): any;
|
|
31
|
-
_filterIgnore(line: any, ignoreSetup: any): boolean;
|
|
32
27
|
_extractComparisonName(line: any): string;
|
|
33
28
|
}
|
package/lib/utils/repoGitDiff.js
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
const cpUtils = require('./childProcessUtils');
|
|
3
3
|
const { getType } = require('./typeUtils');
|
|
4
|
-
const
|
|
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
8
|
const { readFile } = require('fs').promises;
|
|
9
|
-
const ignore = require('ignore');
|
|
10
9
|
const micromatch = require('micromatch');
|
|
11
10
|
const os = require('os');
|
|
12
11
|
const path = require('path');
|
|
@@ -86,11 +85,11 @@ class RepoGitDiff {
|
|
|
86
85
|
const dEl = this._extractComparisonName(line);
|
|
87
86
|
return AfileNames.some(aEl => !aEl.localeCompare(dEl, undefined, lcSensitivity));
|
|
88
87
|
});
|
|
89
|
-
const
|
|
88
|
+
const ignoreHelper = await buildIgnoreHelper(this.config);
|
|
90
89
|
return lines
|
|
91
90
|
.filter(Boolean)
|
|
92
91
|
.filter(line => this._filterInternal(line, deletedRenamed))
|
|
93
|
-
.filter(line =>
|
|
92
|
+
.filter(line => ignoreHelper.keep(line));
|
|
94
93
|
}
|
|
95
94
|
_filterInternal(line, deletedRenamed) {
|
|
96
95
|
return (!deletedRenamed.includes(line) &&
|
|
@@ -114,35 +113,6 @@ class RepoGitDiff {
|
|
|
114
113
|
}));
|
|
115
114
|
return setup;
|
|
116
115
|
}
|
|
117
|
-
static async _setupIgnore(config) {
|
|
118
|
-
const ignoreHelper = new IgnoreHelper();
|
|
119
|
-
const setup = await Promise.all([
|
|
120
|
-
{ ignore: config.ignore, helper: ignore() },
|
|
121
|
-
{ ignore: config.ignoreDestructive, helper: ignore() },
|
|
122
|
-
].map(async (obj) => {
|
|
123
|
-
if (obj.ignore) {
|
|
124
|
-
obj.helper = await ignoreHelper.forPath(obj.ignore);
|
|
125
|
-
}
|
|
126
|
-
return obj;
|
|
127
|
-
}));
|
|
128
|
-
return setup;
|
|
129
|
-
}
|
|
130
|
-
_filterIgnore(line, ignoreSetup) {
|
|
131
|
-
let helper;
|
|
132
|
-
if (this.config.ignoreDestructive && line.startsWith(DELETION)) {
|
|
133
|
-
helper = ignoreSetup[1].helper;
|
|
134
|
-
}
|
|
135
|
-
else if (this.config.ignore &&
|
|
136
|
-
[ADDITION, MODIFICATION].some(status => line.startsWith(status))) {
|
|
137
|
-
helper = ignoreSetup[0].helper;
|
|
138
|
-
}
|
|
139
|
-
let keepLine = true;
|
|
140
|
-
if (helper) {
|
|
141
|
-
const filePath = line.replace(GIT_DIFF_TYPE_REGEX, '');
|
|
142
|
-
keepLine = !helper?.ignores(filePath);
|
|
143
|
-
}
|
|
144
|
-
return keepLine;
|
|
145
|
-
}
|
|
146
116
|
_extractComparisonName(line) {
|
|
147
117
|
const type = getType(line, this.metadata);
|
|
148
118
|
const el = path.parse(line.replace(GIT_DIFF_TYPE_REGEX, ''));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repoGitDiff.js","sourceRoot":"","sources":["../../src/utils/repoGitDiff.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,OAAO,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAC9C,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AAC1C,MAAM,
|
|
1
|
+
{"version":3,"file":"repoGitDiff.js","sourceRoot":"","sources":["../../src/utils/repoGitDiff.js"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"5.7.
|
|
1
|
+
{"version":"5.7.1","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":[]}}}
|