sfdx-git-delta 5.0.2 → 5.0.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 +7 -0
- package/README.md +1 -1
- package/lib/service/customObjectHandler.js +1 -1
- package/lib/service/customObjectHandler.js.map +1 -1
- package/lib/service/inFileHandler.d.ts +2 -1
- package/lib/service/inFileHandler.js +1 -1
- package/lib/service/inFileHandler.js.map +1 -1
- package/lib/service/inResourceHandler.d.ts +1 -0
- package/lib/service/standardHandler.d.ts +5 -3
- package/lib/service/standardHandler.js +7 -5
- package/lib/service/standardHandler.js.map +1 -1
- package/lib/utils/cliHelper.js +2 -1
- package/lib/utils/cliHelper.js.map +1 -1
- package/lib/utils/gitConstants.d.ts +2 -0
- package/lib/utils/gitConstants.js +3 -1
- package/lib/utils/gitConstants.js.map +1 -1
- package/lib/utils/repoGitDiff.d.ts +2 -0
- package/lib/utils/repoGitDiff.js +29 -12
- package/lib/utils/repoGitDiff.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +3 -3
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.0.3](https://github.com/scolladon/sfdx-git-delta/compare/v5.0.2...v5.0.3) (2022-03-18)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* ignore white space parameter `--ignore-whitepsace, -W` ([#267](https://github.com/scolladon/sfdx-git-delta/issues/267)) ([d9f560e](https://github.com/scolladon/sfdx-git-delta/commit/d9f560eb1af28b749c08af4018dd626fe4720222))
|
|
11
|
+
|
|
5
12
|
### [5.0.2](https://github.com/scolladon/sfdx-git-delta/compare/v5.0.1...v5.0.2) (2022-03-16)
|
|
6
13
|
|
|
7
14
|
### [5.0.1](https://github.com/scolladon/sfdx-git-delta/compare/v5.0.0...v5.0.1) (2022-03-16)
|
package/README.md
CHANGED
|
@@ -181,7 +181,7 @@ OPTIONS
|
|
|
181
181
|
this command invocation
|
|
182
182
|
```
|
|
183
183
|
|
|
184
|
-
_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v5.0.
|
|
184
|
+
_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v5.0.3/src/commands/sgd/source/delta.ts)_
|
|
185
185
|
<!-- commandsstop -->
|
|
186
186
|
|
|
187
187
|
### Windows users
|
|
@@ -19,7 +19,7 @@ class CustomObjectHandler extends StandardHandler {
|
|
|
19
19
|
async _handleMasterDetailException() {
|
|
20
20
|
if (this.type !== CustomObjectHandler.OBJECT_TYPE)
|
|
21
21
|
return;
|
|
22
|
-
const fieldsFolder = join(this.config.repo,
|
|
22
|
+
const fieldsFolder = join(this.config.repo, parse(this.line).dir, FIELD_DIRECTORY_NAME);
|
|
23
23
|
const exists = await pathExists(fieldsFolder);
|
|
24
24
|
if (!exists)
|
|
25
25
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customObjectHandler.js","sourceRoot":"","sources":["../../src/service/customObjectHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACpD,MAAM,WAAW,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAA;AACnD,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAC1D,MAAM,EACJ,oBAAoB,EACpB,iBAAiB,GAClB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AACzC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAChD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAA;AACpD,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAE1C,MAAM,eAAe,GAAG;IACtB,QAAQ,EAAE,aAAa;CACxB,CAAA;AAED,MAAM,mBAAoB,SAAQ,eAAe;IAC/C,KAAK,CAAC,cAAc;QAClB,MAAM,KAAK,CAAC,cAAc,EAAE,CAAA;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;YAAE,OAAM;QACtC,MAAM,IAAI,CAAC,4BAA4B,EAAE,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,4BAA4B;QAChC,IAAI,IAAI,CAAC,IAAI,KAAK,mBAAmB,CAAC,WAAW;YAAE,OAAM;QAEzD,MAAM,YAAY,GAAG,IAAI,CACvB,IAAI,CAAC,MAAM,CAAC,IAAI,EAChB,
|
|
1
|
+
{"version":3,"file":"customObjectHandler.js","sourceRoot":"","sources":["../../src/service/customObjectHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACpD,MAAM,WAAW,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAA;AACnD,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAC1D,MAAM,EACJ,oBAAoB,EACpB,iBAAiB,GAClB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AACzC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAChD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAA;AACpD,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAE1C,MAAM,eAAe,GAAG;IACtB,QAAQ,EAAE,aAAa;CACxB,CAAA;AAED,MAAM,mBAAoB,SAAQ,eAAe;IAC/C,KAAK,CAAC,cAAc;QAClB,MAAM,KAAK,CAAC,cAAc,EAAE,CAAA;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;YAAE,OAAM;QACtC,MAAM,IAAI,CAAC,4BAA4B,EAAE,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,4BAA4B;QAChC,IAAI,IAAI,CAAC,IAAI,KAAK,mBAAmB,CAAC,WAAW;YAAE,OAAM;QAEzD,MAAM,YAAY,GAAG,IAAI,CACvB,IAAI,CAAC,MAAM,CAAC,IAAI,EAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EACpB,oBAAoB,CACrB,CAAA;QACD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,CAAA;QAC7C,IAAI,CAAC,MAAM;YAAE,OAAM;QAEnB,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAA;QAC1C,MAAM,mBAAmB,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,KAAK,EAAC,SAAS,EAAC,EAAE;YACtE,MAAM,OAAO,GAAG,MAAM,QAAQ,CAC5B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,CAAC,EAClD,eAAe,CAChB,CAAA;YACD,OAAO,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAA;QAC5C,CAAC,CAAC,CAAA;QAEF,MAAM,OAAO,CAAC,GAAG,CACf,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAC9B,IAAI,CAAC,UAAU,CACb,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,CAAC,EAC9C,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,CACjD,CACF,CACF,CAAA;IACH,CAAC;;AAEM,+BAAW,GAAG,SAAS,CAAA;AAGhC,MAAM,CAAC,OAAO,GAAG,mBAAmB,CAAA"}
|
|
@@ -4,6 +4,7 @@ declare class InFileHandler extends StandardHandler {
|
|
|
4
4
|
static _matchAllowedXmlTag(matchResult: any): any;
|
|
5
5
|
parentMetadata: any;
|
|
6
6
|
customLabelElementName: string;
|
|
7
|
+
handleDeletion(): Promise<void>;
|
|
7
8
|
_handleFileWriting(toAdd: any): Promise<void>;
|
|
8
9
|
_handleInDiff(): Promise<{}>;
|
|
9
10
|
_preProcessHandleInDiff(line: any, data: any): void;
|
|
@@ -11,7 +12,7 @@ declare class InFileHandler extends StandardHandler {
|
|
|
11
12
|
_treatInFileResult(toRemove: any, toAdd: any): void;
|
|
12
13
|
_parseFile(): Promise<{
|
|
13
14
|
authorizedKeys: string[];
|
|
14
|
-
fileContent:
|
|
15
|
+
fileContent: any;
|
|
15
16
|
}>;
|
|
16
17
|
_fillPackageFromDiff(packageObject: any, subType: any, value: any): void;
|
|
17
18
|
}
|
|
@@ -120,7 +120,7 @@ class InFileHandler extends StandardHandler {
|
|
|
120
120
|
async _parseFile() {
|
|
121
121
|
const file = await this._readFile();
|
|
122
122
|
const xmlParser = new XMLParser(XML_PARSER_OPTION);
|
|
123
|
-
const result =
|
|
123
|
+
const result = xmlParser.parse(file);
|
|
124
124
|
const authorizedKeys = Object.keys(Object.values(result)[0]).filter(tag => Object.prototype.hasOwnProperty.call(InFileHandler.xmlObjectToPackageType, tag));
|
|
125
125
|
return {
|
|
126
126
|
authorizedKeys: authorizedKeys,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inFileHandler.js","sourceRoot":"","sources":["../../src/service/inFileHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,WAAW,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAA;AACnD,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AACxD,MAAM,EACJ,oBAAoB,EACpB,eAAe,GAChB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AACzC,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACpD,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAC1C,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC1C,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAE5D,MAAM,QAAQ,GAAG,UAAU,CAAA;AAC3B,MAAM,gBAAgB,GAAG,IAAI,MAAM,CAAC,IAAI,QAAQ,UAAU,QAAQ,GAAG,CAAC,CAAA;AACtE,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,KAAK,KAAK,GAAG,IAAI,2BAA2B,CAAC,CAAA;AACxE,MAAM,UAAU,GAAG,0CAA0C,CAAA;AAC7D,MAAM,iBAAiB,GAAG;IACxB,gBAAgB,EAAE,KAAK;IACvB,eAAe,EAAE,KAAK;IACtB,cAAc,EAAE,KAAK;IACrB,mBAAmB,EAAE,KAAK;IAC1B,UAAU,EAAE,IAAI;CACjB,CAAA;AACD,MAAM,kBAAkB,GAAG;IACzB,GAAG,iBAAiB;IACpB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;CACjB,CAAA;AAED,MAAM,aAAc,SAAQ,eAAe;IAGzC,YAAY,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ;;QACpC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QACjC,IAAI,CAAC,cAAc,GAAG,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACzD,IAAI,CAAC,sBAAsB,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;QACrE,aAAa,CAAC,sBAAsB;YAClC,MAAA,aAAa,CAAC,sBAAsB,mCACpC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAClC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;iBACvD,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBACpB,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;oBACxC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;gBAEhC,OAAO,GAAG,CAAA;YACZ,CAAC,EAAE,EAAE,CAAC,CAAA;IACZ,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,EAAE,CAAA;QACvC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;QAExC,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;QACpC,MAAM,QAAQ,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;IAC5B,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,KAAK;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;YAAE,OAAM;QACtC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;QACtC,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;QAE5D,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACtC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;gBAClD,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC;gBAC1B,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAA;YAC9B,eAAe,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;;gBAC5C,OAAA,MAAA,KAAK,CAAC,aAAa,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,0CAAE,GAAG,CACrE,IAAI,CAAC,QAAQ,CACd,CAAA;aAAA,CACF,CAAA;QACH,CAAC,CAAC,CAAA;QACF,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,kBAAkB,CAAC,CAAA;QACrD,MAAM,UAAU,GAAG,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QACpE,MAAM,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,CAAA;IACnE,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,GAAG;YACX,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,IAAI;SACf,CAAA;QAED,MAAM,mBAAmB,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAC/D,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,mBAAmB,EAAE;YAC5C,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACxC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ;gBAAE,SAAQ;YAC7C,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;SAC1C;QACD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QAC/C,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;IAED,uBAAuB,CAAC,IAAI,EAAE,IAAI;QAChC,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC/B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;YAC/C,IAAI,CAAC,OAAO,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,EAAE,CAAA;SAC5E;QACD,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAC7C,IAAI,aAAa,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAAE;YACxD,IAAI,CAAC,aAAa,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;YACzC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;SACrB;IACH,CAAC;IAED,wBAAwB,CAAC,IAAI,EAAE,IAAI;;QACjC,IAAI,OAAO,CAAA;QACX,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACrD,OAAO,GAAG,IAAI,CAAC,KAAK,CAAA;SACrB;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC1D,OAAO,GAAG,IAAI,CAAC,KAAK,CAAA;SACrB;QACD,IAAI,OAAO,EAAE;YACX,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;gBACnB,MAAA,MAAA,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,0CAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,mCAAI,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;YACvE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;SACpC;IACH,CAAC;IAED,kBAAkB,CAAC,QAAQ,EAAE,KAAK;QAChC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CACnC,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;aAChB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aACtD,OAAO,CAAC,QAAQ,CAAC,EAAE,CAClB,IAAI,CAAC,oBAAoB,CACvB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAC7B,IAAI,EACJ,QAAQ,CACT,CACF,CACJ,CAAA;QACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAChC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAC7B,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAC9D,CACF,CAAA;IACH,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QACnC,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAA;QAClD,MAAM,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"inFileHandler.js","sourceRoot":"","sources":["../../src/service/inFileHandler.js"],"names":[],"mappings":"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"}
|
|
@@ -13,9 +13,7 @@ declare class StandardHandler {
|
|
|
13
13
|
warnings: any;
|
|
14
14
|
suffixRegex: RegExp;
|
|
15
15
|
handlerMap: {
|
|
16
|
-
|
|
17
|
-
D: () => void;
|
|
18
|
-
M: () => Promise<void>;
|
|
16
|
+
[x: string]: () => void;
|
|
19
17
|
};
|
|
20
18
|
handle(): Promise<void>;
|
|
21
19
|
handleAddition(): Promise<void>;
|
|
@@ -29,3 +27,7 @@ declare class StandardHandler {
|
|
|
29
27
|
_copyFiles(src: any, dst: any): Promise<void>;
|
|
30
28
|
_readFile(): Promise<Buffer & string>;
|
|
31
29
|
}
|
|
30
|
+
declare namespace StandardHandler {
|
|
31
|
+
export { FSE_BIGINT_ERROR };
|
|
32
|
+
}
|
|
33
|
+
declare const FSE_BIGINT_ERROR: "Source and destination must not be the same.";
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
const { copyFile, readFile } = require('fs').promises;
|
|
3
3
|
const { join, parse, sep } = require('path');
|
|
4
4
|
const { copy, copySync, pathExists } = require('fs-extra');
|
|
5
|
-
const { GIT_DIFF_TYPE_REGEX, UTF8_ENCODING } = require('../utils/gitConstants');
|
|
5
|
+
const { ADDITION, DELETION, GIT_DIFF_TYPE_REGEX, MODIFICATION, UTF8_ENCODING, } = require('../utils/gitConstants');
|
|
6
6
|
const { META_REGEX, METAFILE_SUFFIX } = require('../utils/metadataConstants');
|
|
7
7
|
const PACKAGE_MEMBER_PATH_SEP = '/';
|
|
8
|
+
const FSE_BIGINT_ERROR = 'Source and destination must not be the same.';
|
|
8
9
|
const FSE_COPYSYNC_OPTION = {
|
|
9
10
|
overwrite: true,
|
|
10
11
|
errorOnExist: false,
|
|
@@ -28,9 +29,9 @@ class StandardHandler {
|
|
|
28
29
|
}
|
|
29
30
|
this.suffixRegex = new RegExp(`\\.${StandardHandler.metadata[this.type].suffix}$`);
|
|
30
31
|
this.handlerMap = {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
[ADDITION]: this.handleAddition,
|
|
33
|
+
[DELETION]: this.handleDeletion,
|
|
34
|
+
[MODIFICATION]: this.handleModification,
|
|
34
35
|
};
|
|
35
36
|
}
|
|
36
37
|
async handle() {
|
|
@@ -98,7 +99,7 @@ class StandardHandler {
|
|
|
98
99
|
await copy(src, dst, FSE_COPYSYNC_OPTION);
|
|
99
100
|
}
|
|
100
101
|
catch (error) {
|
|
101
|
-
if (error.message ===
|
|
102
|
+
if (error.message === FSE_BIGINT_ERROR) {
|
|
102
103
|
// Handle this fse issue manually (https://github.com/jprichardson/node-fs-extra/issues/657)
|
|
103
104
|
await copyFile(src, dst);
|
|
104
105
|
}
|
|
@@ -121,4 +122,5 @@ class StandardHandler {
|
|
|
121
122
|
}
|
|
122
123
|
StandardHandler.PACKAGE_MEMBER_PATH_SEP = PACKAGE_MEMBER_PATH_SEP;
|
|
123
124
|
module.exports = StandardHandler;
|
|
125
|
+
module.exports.FSE_BIGINT_ERROR = FSE_BIGINT_ERROR;
|
|
124
126
|
//# sourceMappingURL=standardHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"standardHandler.js","sourceRoot":"","sources":["../../src/service/standardHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAA;AACrD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5C,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAC1D,MAAM,
|
|
1
|
+
{"version":3,"file":"standardHandler.js","sourceRoot":"","sources":["../../src/service/standardHandler.js"],"names":[],"mappings":"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"}
|
package/lib/utils/cliHelper.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
const asyncFilter = require('./asyncFilter');
|
|
3
3
|
const RepoSetup = require('./repoSetup');
|
|
4
4
|
const { sanitizePath } = require('./childProcessUtils');
|
|
5
|
+
const { GIT_FOLDER } = require('./gitConstants');
|
|
5
6
|
const { stat } = require('fs').promises;
|
|
6
7
|
const { join } = require('path');
|
|
7
8
|
const fsExists = async (dir, fn) => {
|
|
@@ -16,7 +17,7 @@ const fsExists = async (dir, fn) => {
|
|
|
16
17
|
const dirExists = async (dir) => await fsExists(dir, 'isDirectory');
|
|
17
18
|
const fileExists = async (file) => await fsExists(file, 'isFile');
|
|
18
19
|
const isGit = async (dir) => {
|
|
19
|
-
return await dirExists(join(dir,
|
|
20
|
+
return await dirExists(join(dir, GIT_FOLDER));
|
|
20
21
|
};
|
|
21
22
|
class CLIHelper {
|
|
22
23
|
constructor(config) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cliHelper.js","sourceRoot":"","sources":["../../src/utils/cliHelper.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAC5C,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AACxC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"cliHelper.js","sourceRoot":"","sources":["../../src/utils/cliHelper.js"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
export var ADDITION: string;
|
|
2
2
|
export var DELETION: string;
|
|
3
|
+
export var MODIFICATION: string;
|
|
3
4
|
export var GIT_DIFF_TYPE_REGEX: RegExp;
|
|
5
|
+
export var GIT_FOLDER: string;
|
|
4
6
|
export var MINUS: string;
|
|
5
7
|
export var IGNORE_WHITESPACE_PARAMS: string[];
|
|
6
8
|
export var PLUS: string;
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
module.exports.ADDITION = 'A';
|
|
3
3
|
module.exports.DELETION = 'D';
|
|
4
|
+
module.exports.MODIFICATION = 'M';
|
|
4
5
|
module.exports.GIT_DIFF_TYPE_REGEX = /^.\s+/u;
|
|
6
|
+
module.exports.GIT_FOLDER = '.git';
|
|
5
7
|
module.exports.MINUS = '-';
|
|
6
8
|
module.exports.IGNORE_WHITESPACE_PARAMS = [
|
|
7
9
|
'--ignore-all-space',
|
|
8
10
|
'--ignore-blank-lines',
|
|
9
11
|
'--ignore-cr-at-eol',
|
|
10
|
-
'--word-diff-regex',
|
|
12
|
+
'--word-diff-regex=|[^[:space:]]',
|
|
11
13
|
];
|
|
12
14
|
module.exports.PLUS = '+';
|
|
13
15
|
module.exports.UTF8_ENCODING = 'utf8';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitConstants.js","sourceRoot":"","sources":["../../src/utils/gitConstants.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAA;AAC7B,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAA;AAC7B,MAAM,CAAC,OAAO,CAAC,mBAAmB,GAAG,QAAQ,CAAA;AAC7C,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG,GAAG,CAAA;AAC1B,MAAM,CAAC,OAAO,CAAC,wBAAwB,GAAG;IACxC,oBAAoB;IACpB,sBAAsB;IACtB,oBAAoB;IACpB,
|
|
1
|
+
{"version":3,"file":"gitConstants.js","sourceRoot":"","sources":["../../src/utils/gitConstants.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,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,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,wBAAwB,GAAG;IACxC,oBAAoB;IACpB,sBAAsB;IACtB,oBAAoB;IACpB,iCAAiC;CAClC,CAAA;AACD,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,GAAG,CAAA;AACzB,MAAM,CAAC,OAAO,CAAC,aAAa,GAAG,MAAM,CAAA"}
|
|
@@ -17,9 +17,11 @@ declare class RepoGitDiff {
|
|
|
17
17
|
cwd: any;
|
|
18
18
|
encoding: string;
|
|
19
19
|
};
|
|
20
|
+
ignoreWhitespaceParams: string[];
|
|
20
21
|
getLines(): Promise<any[]>;
|
|
21
22
|
_getIncludedFiles(): Promise<any>;
|
|
22
23
|
_getFilteredDiff(): Promise<any>;
|
|
24
|
+
_spawnGitDiff(filter: any, changeType: any): Promise<any[]>;
|
|
23
25
|
_treatResult(lines: any): Promise<any>;
|
|
24
26
|
_filterInternal(line: any, deletedRenamed: any): any;
|
|
25
27
|
_filterIgnore(line: any, ignoreSetup: any): boolean;
|
package/lib/utils/repoGitDiff.js
CHANGED
|
@@ -4,14 +4,20 @@ const CustomObject = require('../service/customObjectHandler');
|
|
|
4
4
|
const InTranslation = require('../service/inTranslationHandler');
|
|
5
5
|
const SubCustomObject = require('../service/subCustomObjectHandler');
|
|
6
6
|
const { getType } = require('../utils/typeUtils');
|
|
7
|
-
const { ADDITION, DELETION, GIT_DIFF_TYPE_REGEX, IGNORE_WHITESPACE_PARAMS, UTF8_ENCODING, } = require('./gitConstants');
|
|
7
|
+
const { ADDITION, DELETION, GIT_DIFF_TYPE_REGEX, IGNORE_WHITESPACE_PARAMS, MODIFICATION, UTF8_ENCODING, } = require('./gitConstants');
|
|
8
8
|
const { spawn } = require('child_process');
|
|
9
9
|
const { readFile } = require('fs').promises;
|
|
10
10
|
const ignore = require('ignore');
|
|
11
11
|
const micromatch = require('micromatch');
|
|
12
12
|
const os = require('os');
|
|
13
13
|
const path = require('path');
|
|
14
|
-
const
|
|
14
|
+
const DIFF_FILTER = '--diff-filter';
|
|
15
|
+
const fullDiffParams = ['--no-pager', 'diff', '--numstat', '--no-renames'];
|
|
16
|
+
const filterDeleted = [`${DIFF_FILTER}=${DELETION}`];
|
|
17
|
+
const filterAdded = [`${DIFF_FILTER}=${ADDITION}`];
|
|
18
|
+
const filterModification = [`${DIFF_FILTER}=${MODIFICATION}`];
|
|
19
|
+
const TAB = '\t';
|
|
20
|
+
const NUM_STAT_REGEX = /^\d+\t\d+\t/;
|
|
15
21
|
const allFilesParams = ['ls-files'];
|
|
16
22
|
const lcSensitivity = {
|
|
17
23
|
sensitivity: 'accent',
|
|
@@ -29,6 +35,9 @@ class RepoGitDiff {
|
|
|
29
35
|
cwd: this.config.repo,
|
|
30
36
|
encoding: UTF8_ENCODING,
|
|
31
37
|
};
|
|
38
|
+
this.ignoreWhitespaceParams = this.config.ignoreWhitespace
|
|
39
|
+
? IGNORE_WHITESPACE_PARAMS
|
|
40
|
+
: [];
|
|
32
41
|
}
|
|
33
42
|
async getLines() {
|
|
34
43
|
const lines = await Promise.all([
|
|
@@ -50,22 +59,30 @@ class RepoGitDiff {
|
|
|
50
59
|
return RepoGitDiff._addIncludes(lines, includeSetup);
|
|
51
60
|
}
|
|
52
61
|
async _getFilteredDiff() {
|
|
53
|
-
const
|
|
54
|
-
|
|
55
|
-
|
|
62
|
+
const lines = await Promise.all([
|
|
63
|
+
this._spawnGitDiff(filterAdded, ADDITION),
|
|
64
|
+
this._spawnGitDiff(filterDeleted, DELETION),
|
|
65
|
+
this._spawnGitDiff(filterModification, MODIFICATION),
|
|
66
|
+
]);
|
|
67
|
+
const treatedLines = await this._treatResult(lines.flat());
|
|
68
|
+
return treatedLines;
|
|
69
|
+
}
|
|
70
|
+
async _spawnGitDiff(filter, changeType) {
|
|
71
|
+
const lines = [];
|
|
56
72
|
const gitDiff = spawn('git', [
|
|
57
73
|
...fullDiffParams,
|
|
58
|
-
...
|
|
74
|
+
...filter,
|
|
75
|
+
...this.ignoreWhitespaceParams,
|
|
59
76
|
this.config.from,
|
|
60
77
|
this.config.to,
|
|
61
78
|
this.config.source,
|
|
62
79
|
], this.spawnConfig);
|
|
63
|
-
const lines = [];
|
|
64
80
|
for await (const line of cpUtils.linify(gitDiff.stdout)) {
|
|
65
|
-
lines.push(cpUtils
|
|
81
|
+
lines.push(cpUtils
|
|
82
|
+
.treatPathSep(line)
|
|
83
|
+
.replace(NUM_STAT_REGEX, `${changeType}${TAB}`));
|
|
66
84
|
}
|
|
67
|
-
|
|
68
|
-
return treatedLines;
|
|
85
|
+
return lines;
|
|
69
86
|
}
|
|
70
87
|
async _treatResult(lines) {
|
|
71
88
|
const linesPerDiffType = lines.reduce((acc, line) => { var _a; return ((_a = acc[line.charAt(0)]) === null || _a === void 0 ? void 0 : _a.push(line), acc); }, { [ADDITION]: [], [DELETION]: [] });
|
|
@@ -91,8 +108,8 @@ class RepoGitDiff {
|
|
|
91
108
|
}
|
|
92
109
|
static async _setupIncludes(config) {
|
|
93
110
|
const setup = await Promise.all([
|
|
94
|
-
{ include: config.include, prefix:
|
|
95
|
-
{ include: config.includeDestructive, prefix:
|
|
111
|
+
{ include: config.include, prefix: ADDITION },
|
|
112
|
+
{ include: config.includeDestructive, prefix: DELETION },
|
|
96
113
|
]
|
|
97
114
|
.filter(obj => obj.include)
|
|
98
115
|
.map(async (obj) => {
|
|
@@ -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,YAAY,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC9D,MAAM,aAAa,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAA;AAChE,MAAM,eAAe,GAAG,OAAO,CAAC,mCAAmC,CAAC,CAAA;AACpE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACjD,MAAM,EACJ,QAAQ,EACR,QAAQ,EACR,mBAAmB,EACnB,wBAAwB,EACxB,aAAa,GACd,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAC7B,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAC1C,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAA;AAC3C,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAChC,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;
|
|
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.0.
|
|
1
|
+
{"version":"5.0.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 API version","default":54},"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.0.
|
|
3
|
+
"version": "5.0.3",
|
|
4
4
|
"description": "Generate the sfdx content in source format and destructive change from two git commits",
|
|
5
5
|
"keyword": [
|
|
6
6
|
"salesforce",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@oclif/command": "^1.8.15",
|
|
30
30
|
"@oclif/config": "^1.18.2",
|
|
31
31
|
"@oclif/errors": "^1.3.5",
|
|
32
|
-
"@salesforce/command": "^
|
|
32
|
+
"@salesforce/command": "^5.0.1",
|
|
33
33
|
"@salesforce/core": "^2.28.1",
|
|
34
34
|
"fast-xml-parser": "^4",
|
|
35
35
|
"fs-extra": "^10.0.0",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"eslint-config-prettier": "^8.3.0",
|
|
82
82
|
"eslint-config-salesforce-typescript": "^0.2.8",
|
|
83
83
|
"eslint-plugin-import": "^2.24.2",
|
|
84
|
-
"eslint-plugin-jsdoc": "^
|
|
84
|
+
"eslint-plugin-jsdoc": "^38.0.4",
|
|
85
85
|
"eslint-plugin-prettier": "^4.0.0",
|
|
86
86
|
"husky": "^7.0.2",
|
|
87
87
|
"jest": "^27.2.5",
|