sfdx-git-delta 5.0.2 → 5.0.5
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 +21 -0
- package/README.md +2 -2
- package/lib/main.d.ts +2 -2
- package/lib/main.js +7 -5
- package/lib/main.js.map +1 -1
- package/lib/metadata/metadataManager.js +15 -14
- package/lib/metadata/metadataManager.js.map +1 -1
- package/lib/metadata/v51.json +1 -0
- package/lib/metadata/v52.json +1 -0
- package/lib/metadata/v53.json +1 -0
- package/lib/metadata/v54.json +1 -0
- package/lib/service/customObjectHandler.js +1 -1
- package/lib/service/customObjectHandler.js.map +1 -1
- package/lib/service/inFileHandler.d.ts +3 -2
- package/lib/service/inFileHandler.js +35 -27
- package/lib/service/inFileHandler.js.map +1 -1
- package/lib/service/inFolderHandler.js +9 -8
- package/lib/service/inFolderHandler.js.map +1 -1
- package/lib/service/inResourceHandler.d.ts +1 -1
- package/lib/service/inResourceHandler.js +10 -11
- package/lib/service/inResourceHandler.js.map +1 -1
- package/lib/service/standardHandler.d.ts +7 -3
- package/lib/service/standardHandler.js +25 -11
- package/lib/service/standardHandler.js.map +1 -1
- package/lib/service/subCustomObjectHandler.js +4 -3
- package/lib/service/subCustomObjectHandler.js.map +1 -1
- package/lib/service/waveHandler.js +9 -9
- package/lib/service/waveHandler.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/metadataConstants.js.map +1 -1
- package/lib/utils/packageConstructor.js +17 -21
- package/lib/utils/packageConstructor.js.map +1 -1
- package/lib/utils/repoGitDiff.d.ts +2 -0
- package/lib/utils/repoGitDiff.js +31 -18
- package/lib/utils/repoGitDiff.js.map +1 -1
- package/lib/utils/typeUtils.js +1 -1
- package/lib/utils/typeUtils.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,27 @@
|
|
|
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.5](https://github.com/scolladon/sfdx-git-delta/compare/v5.0.4...v5.0.5) (2022-03-23)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* xml header displayed twice for inFile delta generated ([#274](https://github.com/scolladon/sfdx-git-delta/issues/274)) ([bf1d278](https://github.com/scolladon/sfdx-git-delta/commit/bf1d27895cd2cdbc4a66dcae73a62d3bd67c9391))
|
|
11
|
+
|
|
12
|
+
### [5.0.4](https://github.com/scolladon/sfdx-git-delta/compare/v5.0.3...v5.0.4) (2022-03-22)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
* binary filtering for git diff --numstat parsing and document meta type file regression ([#271](https://github.com/scolladon/sfdx-git-delta/issues/271)) ([91c582c](https://github.com/scolladon/sfdx-git-delta/commit/91c582ce4a0f822b8a513558aceb856ecc8b7656))
|
|
18
|
+
|
|
19
|
+
### [5.0.3](https://github.com/scolladon/sfdx-git-delta/compare/v5.0.2...v5.0.3) (2022-03-18)
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
### Bug Fixes
|
|
23
|
+
|
|
24
|
+
* 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))
|
|
25
|
+
|
|
5
26
|
### [5.0.2](https://github.com/scolladon/sfdx-git-delta/compare/v5.0.1...v5.0.2) (2022-03-16)
|
|
6
27
|
|
|
7
28
|
### [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.5/src/commands/sgd/source/delta.ts)_
|
|
185
185
|
<!-- commandsstop -->
|
|
186
186
|
|
|
187
187
|
### Windows users
|
|
@@ -451,7 +451,7 @@ console.log(JSON.stringify(work))
|
|
|
451
451
|
- [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) - Validate XML, Parse XML to JS/JSON and vise versa, or parse XML to Nimn rapidly without C/C++ based libraries and no callback
|
|
452
452
|
- [fs-extra](https://github.com/jprichardson/node-fs-extra) - Node.js: extra methods for the fs object like copy(), remove(), mkdirs().
|
|
453
453
|
- [ignore](https://github.com/kaelzhang/node-ignore#readme) - is a manager, filter and parser which implemented in pure JavaScript according to the .gitignore spec 2.22.1.
|
|
454
|
-
- [
|
|
454
|
+
- [xmlbuilder2](https://github.com/oozcitak/xmlbuilder2) - An XML builder for node.js.
|
|
455
455
|
- [micromatch](https://github.com/micromatch/micromatch) - a file glob matcher utility
|
|
456
456
|
|
|
457
457
|
## Versioning
|
package/lib/main.d.ts
CHANGED
package/lib/main.js
CHANGED
|
@@ -21,7 +21,7 @@ module.exports = async (config) => {
|
|
|
21
21
|
const treatDiff = async (config, lines, metadata) => {
|
|
22
22
|
const work = {
|
|
23
23
|
config: config,
|
|
24
|
-
diffs: { package:
|
|
24
|
+
diffs: { package: new Map(), destructiveChanges: new Map() },
|
|
25
25
|
warnings: [],
|
|
26
26
|
};
|
|
27
27
|
const typeHandlerFactory = new TypeHandlerFactory(work, metadata);
|
|
@@ -46,7 +46,7 @@ const treatPackages = async (dcJson, config, metadata) => {
|
|
|
46
46
|
{
|
|
47
47
|
filename: `${PACKAGE_FILE_NAME}.${XML_FILE_EXTENSION}`,
|
|
48
48
|
folder: DESTRUCTIVE_CHANGES_FILE_NAME,
|
|
49
|
-
xmlContent: pc.constructPackage(
|
|
49
|
+
xmlContent: pc.constructPackage(new Map()),
|
|
50
50
|
},
|
|
51
51
|
].map(async (op) => {
|
|
52
52
|
const location = join(config.output, op.folder, op.filename);
|
|
@@ -56,8 +56,10 @@ const treatPackages = async (dcJson, config, metadata) => {
|
|
|
56
56
|
const cleanPackages = dcJson => {
|
|
57
57
|
const additive = dcJson[PACKAGE_FILE_NAME];
|
|
58
58
|
const destructive = dcJson[DESTRUCTIVE_CHANGES_FILE_NAME];
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
for (const [type, members] of additive) {
|
|
60
|
+
if (destructive.has(type)) {
|
|
61
|
+
destructive.set(type, new Set([...destructive.get(type)].filter(element => !members.has(element))));
|
|
62
|
+
}
|
|
63
|
+
}
|
|
62
64
|
};
|
|
63
65
|
//# sourceMappingURL=main.js.map
|
package/lib/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,kBAAkB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AAChE,MAAM,kBAAkB,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAA;AAClE,MAAM,eAAe,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AAC7D,MAAM,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAElD,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAC1C,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAEhC,MAAM,6BAA6B,GAAG,oBAAoB,CAAA;AAC1D,MAAM,iBAAiB,GAAG,SAAS,CAAA;AACnC,MAAM,kBAAkB,GAAG,KAAK,CAAA;AAEhC,MAAM,CAAC,OAAO,GAAG,KAAK,EAAC,MAAM,EAAC,EAAE;IAC9B,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,CAAA;IACvC,MAAM,SAAS,CAAC,cAAc,EAAE,CAAA;IAEhC,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,aAAa,CAClD,eAAe,EACf,MAAM,CAAC,UAAU,CAClB,CAAA;IACD,MAAM,iBAAiB,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAE3D,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,QAAQ,EAAE,CAAA;IAChD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;IACrD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;IAClD,MAAM,IAAI,GAAG;QACX,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,kBAAkB,EAAE,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.js"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
const { resolve } = require('path');
|
|
3
3
|
const { readdir } = require('fs').promises;
|
|
4
|
+
const LATEST = 'latest';
|
|
4
5
|
let _apiMap;
|
|
5
|
-
const describeMetadata =
|
|
6
|
+
const describeMetadata = new Map();
|
|
6
7
|
const getApiMap = async () => {
|
|
7
8
|
if (!_apiMap) {
|
|
8
9
|
const dir = await readdir(__dirname);
|
|
@@ -10,28 +11,28 @@ const getApiMap = async () => {
|
|
|
10
11
|
.filter(file => /^[a-z]+\d+\.json$/.test(file))
|
|
11
12
|
.reduce((accu, file) => {
|
|
12
13
|
const version = file.match(/\d+/)[0];
|
|
13
|
-
accu
|
|
14
|
-
accu.
|
|
15
|
-
|
|
14
|
+
accu.set(version, file);
|
|
15
|
+
if (!accu.has(LATEST) || accu.get(LATEST) < version)
|
|
16
|
+
accu.set(LATEST, version);
|
|
16
17
|
return accu;
|
|
17
|
-
},
|
|
18
|
-
_apiMap.
|
|
18
|
+
}, new Map());
|
|
19
|
+
_apiMap.set(LATEST, _apiMap.get(_apiMap.get(LATEST)));
|
|
19
20
|
}
|
|
20
21
|
return _apiMap;
|
|
21
22
|
};
|
|
22
23
|
module.exports = {
|
|
23
24
|
getDefinition: async (grouping, apiVersion) => {
|
|
24
|
-
if (!describeMetadata
|
|
25
|
+
if (!describeMetadata.has(apiVersion)) {
|
|
25
26
|
const apiMap = await getApiMap();
|
|
26
|
-
const apiFile =
|
|
27
|
-
? apiMap
|
|
28
|
-
: apiMap.
|
|
29
|
-
describeMetadata
|
|
27
|
+
const apiFile = apiMap.has(apiVersion)
|
|
28
|
+
? apiMap.get(apiVersion)
|
|
29
|
+
: apiMap.get(LATEST);
|
|
30
|
+
describeMetadata.set(apiVersion, require(resolve(__dirname, apiFile)));
|
|
30
31
|
}
|
|
31
|
-
return describeMetadata
|
|
32
|
-
metadata
|
|
32
|
+
return describeMetadata.get(apiVersion).reduce((metadata, describe) => {
|
|
33
|
+
metadata.set(describe[grouping], describe);
|
|
33
34
|
return metadata;
|
|
34
|
-
},
|
|
35
|
+
}, new Map());
|
|
35
36
|
},
|
|
36
37
|
};
|
|
37
38
|
//# sourceMappingURL=metadataManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataManager.js","sourceRoot":"","sources":["../../src/metadata/metadataManager.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AACnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAA;AAE1C,IAAI,OAAO,CAAA;AACX,MAAM,gBAAgB,GAAG,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"metadataManager.js","sourceRoot":"","sources":["../../src/metadata/metadataManager.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AACnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAA;AAE1C,MAAM,MAAM,GAAG,QAAQ,CAAA;AAEvB,IAAI,OAAO,CAAA;AACX,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAA;AAElC,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,CAAA;QACpC,OAAO,GAAG,GAAG;aACV,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9C,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACrB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YACpC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;YACvB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO;gBACjD,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;YAC3B,OAAO,IAAI,CAAA;QACb,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;QACf,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;KACtD;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,OAAO,GAAG;IACf,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE;QAC5C,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YACrC,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAA;YAChC,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;gBACpC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;gBACxB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACtB,gBAAgB,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;SACvE;QAED,OAAO,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;YACpE,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;YAC1C,OAAO,QAAQ,CAAA;QACjB,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;IACf,CAAC;CACF,CAAA"}
|
package/lib/metadata/v51.json
CHANGED
package/lib/metadata/v52.json
CHANGED
package/lib/metadata/v53.json
CHANGED
package/lib/metadata/v54.json
CHANGED
|
@@ -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,14 +4,15 @@ 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
|
-
_handleInDiff(): Promise<
|
|
9
|
+
_handleInDiff(): Promise<Map<any, any>>;
|
|
9
10
|
_preProcessHandleInDiff(line: any, data: any): void;
|
|
10
11
|
_postProcessHandleInDiff(line: any, data: any): void;
|
|
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
|
}
|
|
@@ -9,7 +9,7 @@ const { XMLBuilder, XMLParser } = require('fast-xml-parser');
|
|
|
9
9
|
const FULLNAME = 'fullName';
|
|
10
10
|
const FULLNAME_XML_TAG = new RegExp(`<${FULLNAME}>(.*)</${FULLNAME}>`);
|
|
11
11
|
const XML_TAG = new RegExp(`^[${MINUS}${PLUS}]?\\s*<([^(/><.)]+)>\\s*$`);
|
|
12
|
-
const
|
|
12
|
+
const XML_HEADER_TAG_END = '?>';
|
|
13
13
|
const XML_PARSER_OPTION = {
|
|
14
14
|
ignoreAttributes: false,
|
|
15
15
|
ignoreNameSpace: false,
|
|
@@ -26,16 +26,12 @@ class InFileHandler extends StandardHandler {
|
|
|
26
26
|
constructor(line, type, work, metadata) {
|
|
27
27
|
var _a;
|
|
28
28
|
super(line, type, work, metadata);
|
|
29
|
-
this.parentMetadata = StandardHandler.metadata
|
|
29
|
+
this.parentMetadata = StandardHandler.metadata.get(this.type);
|
|
30
30
|
this.customLabelElementName = `${basename(this.line).split('.')[0]}.`;
|
|
31
31
|
InFileHandler.xmlObjectToPackageType =
|
|
32
|
-
(_a = InFileHandler.xmlObjectToPackageType) !== null && _a !== void 0 ? _a :
|
|
33
|
-
.filter(meta => !!StandardHandler.metadata
|
|
34
|
-
.reduce((acc, meta) =>
|
|
35
|
-
acc[StandardHandler.metadata[meta].xmlTag] =
|
|
36
|
-
StandardHandler.metadata[meta];
|
|
37
|
-
return acc;
|
|
38
|
-
}, {});
|
|
32
|
+
(_a = InFileHandler.xmlObjectToPackageType) !== null && _a !== void 0 ? _a : [...StandardHandler.metadata.keys()]
|
|
33
|
+
.filter(meta => { var _a; return !!((_a = StandardHandler.metadata.get(meta)) === null || _a === void 0 ? void 0 : _a.xmlTag); })
|
|
34
|
+
.reduce((acc, meta) => acc.set(StandardHandler.metadata.get(meta).xmlTag, StandardHandler.metadata.get(meta)), new Map());
|
|
39
35
|
}
|
|
40
36
|
async handleAddition() {
|
|
41
37
|
const addition = super.handleAddition();
|
|
@@ -60,17 +56,18 @@ class InFileHandler extends StandardHandler {
|
|
|
60
56
|
: [metadataContent[subType]];
|
|
61
57
|
metadataContent[subType] = meta.filter(elem => {
|
|
62
58
|
var _a;
|
|
63
|
-
return (_a = toAdd
|
|
59
|
+
return (_a = toAdd
|
|
60
|
+
.get(InFileHandler.xmlObjectToPackageType.get(subType).directoryName)) === null || _a === void 0 ? void 0 : _a.has(elem.fullName);
|
|
64
61
|
});
|
|
65
62
|
});
|
|
66
63
|
const xmlBuilder = new XMLBuilder(JSON_PARSER_OPTION);
|
|
67
|
-
const xmlContent =
|
|
68
|
-
await outputFile(join(this.config.output, this.line), xmlContent);
|
|
64
|
+
const xmlContent = xmlBuilder.build(result.fileContent);
|
|
65
|
+
await outputFile(join(this.config.output, this.line), xmlContent.replace(XML_HEADER_TAG_END, `${XML_HEADER_TAG_END}\n`));
|
|
69
66
|
}
|
|
70
67
|
async _handleInDiff() {
|
|
71
68
|
const data = {
|
|
72
|
-
toDel:
|
|
73
|
-
toAdd:
|
|
69
|
+
toDel: new Map(),
|
|
70
|
+
toAdd: new Map(),
|
|
74
71
|
potentialType: null,
|
|
75
72
|
subType: null,
|
|
76
73
|
fullName: null,
|
|
@@ -97,7 +94,6 @@ class InFileHandler extends StandardHandler {
|
|
|
97
94
|
}
|
|
98
95
|
}
|
|
99
96
|
_postProcessHandleInDiff(line, data) {
|
|
100
|
-
var _a, _b;
|
|
101
97
|
let tempMap;
|
|
102
98
|
if (line.startsWith(MINUS) && line.includes(FULLNAME)) {
|
|
103
99
|
tempMap = data.toDel;
|
|
@@ -106,22 +102,31 @@ class InFileHandler extends StandardHandler {
|
|
|
106
102
|
tempMap = data.toAdd;
|
|
107
103
|
}
|
|
108
104
|
if (tempMap) {
|
|
109
|
-
tempMap
|
|
110
|
-
|
|
105
|
+
if (!tempMap.has(data.subType)) {
|
|
106
|
+
tempMap.set(data.subType, new Set());
|
|
107
|
+
}
|
|
108
|
+
tempMap.get(data.subType).add(data.fullName);
|
|
111
109
|
data.subType = data.fullName = null;
|
|
112
110
|
}
|
|
113
111
|
}
|
|
114
112
|
_treatInFileResult(toRemove, toAdd) {
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
113
|
+
for (const [type, members] of toRemove) {
|
|
114
|
+
;
|
|
115
|
+
[...members]
|
|
116
|
+
.filter(elem => !toAdd.has(type) || !toAdd.get(type).has(elem))
|
|
117
|
+
.forEach(fullName => this._fillPackageFromDiff(this.diffs.destructiveChanges, type, fullName));
|
|
118
|
+
}
|
|
119
|
+
for (const [type, members] of toAdd) {
|
|
120
|
+
for (let fullName of members) {
|
|
121
|
+
this._fillPackageFromDiff(this.diffs.package, type, fullName);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
119
124
|
}
|
|
120
125
|
async _parseFile() {
|
|
121
126
|
const file = await this._readFile();
|
|
122
127
|
const xmlParser = new XMLParser(XML_PARSER_OPTION);
|
|
123
|
-
const result =
|
|
124
|
-
const authorizedKeys = Object.keys(Object.values(result)[0]).filter(tag =>
|
|
128
|
+
const result = xmlParser.parse(file);
|
|
129
|
+
const authorizedKeys = Object.keys(Object.values(result)[0]).filter(tag => InFileHandler.xmlObjectToPackageType.has(tag));
|
|
125
130
|
return {
|
|
126
131
|
authorizedKeys: authorizedKeys,
|
|
127
132
|
fileContent: result,
|
|
@@ -133,16 +138,19 @@ class InFileHandler extends StandardHandler {
|
|
|
133
138
|
}
|
|
134
139
|
}
|
|
135
140
|
_fillPackageFromDiff(packageObject, subType, value) {
|
|
136
|
-
var _a;
|
|
137
141
|
const elementFullName = `${(subType !== LABEL_DIRECTORY_NAME ? this.customLabelElementName : '') +
|
|
138
142
|
value}`;
|
|
139
|
-
|
|
140
|
-
|
|
143
|
+
if (!packageObject.has(subType)) {
|
|
144
|
+
packageObject.set(subType, new Set());
|
|
145
|
+
}
|
|
146
|
+
packageObject
|
|
147
|
+
.get(subType)
|
|
148
|
+
.add(StandardHandler.cleanUpPackageMember(elementFullName));
|
|
141
149
|
}
|
|
142
150
|
static _matchAllowedXmlTag(matchResult) {
|
|
143
151
|
return (!!matchResult &&
|
|
144
152
|
!!matchResult[1] &&
|
|
145
|
-
|
|
153
|
+
InFileHandler.xmlObjectToPackageType.has(matchResult[1]));
|
|
146
154
|
}
|
|
147
155
|
}
|
|
148
156
|
module.exports = InFileHandler;
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"inFileHandler.js","sourceRoot":"","sources":["../../src/service/inFileHandler.js"],"names":[],"mappings":"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"}
|
|
@@ -9,25 +9,26 @@ class InFolderHandler extends StandardHandler {
|
|
|
9
9
|
await super.handleAddition();
|
|
10
10
|
if (!this.config.generateDelta)
|
|
11
11
|
return;
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
folderName = `${folderName}.${StandardHandler.metadata[this.type].xmlName.toLowerCase() +
|
|
12
|
+
const [, , folderPath, folderName] = this._parseLine();
|
|
13
|
+
const folderFileName = `${folderName}.${StandardHandler.metadata.get(this.type).xmlName.toLowerCase() +
|
|
15
14
|
INFOLDER_SUFFIX +
|
|
16
15
|
METAFILE_SUFFIX}`;
|
|
17
|
-
this._copyFiles(normalize(join(this.config.repo, folderPath,
|
|
16
|
+
this._copyFiles(normalize(join(this.config.repo, folderPath, folderFileName)), normalize(join(this.config.output, folderPath, folderFileName)));
|
|
18
17
|
}
|
|
19
18
|
_fillPackage(packageObject) {
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
if (!packageObject.has(this.type)) {
|
|
20
|
+
packageObject.set(this.type, new Set());
|
|
21
|
+
}
|
|
22
22
|
const packageMember = this.splittedLine
|
|
23
23
|
.slice(this.splittedLine.indexOf(this.type) + 1)
|
|
24
24
|
.join(sep)
|
|
25
25
|
.replace(META_REGEX, '')
|
|
26
26
|
.replace(INFOLDER_SUFFIX_REGEX, '')
|
|
27
27
|
.replace(EXTENSION_SUFFIX_REGEX, '');
|
|
28
|
-
packageObject
|
|
28
|
+
packageObject
|
|
29
|
+
.get(this.type)
|
|
30
|
+
.add(StandardHandler.cleanUpPackageMember(packageMember));
|
|
29
31
|
}
|
|
30
32
|
}
|
|
31
33
|
module.exports = InFolderHandler;
|
|
32
|
-
const RegExpEscape = s => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
33
34
|
//# sourceMappingURL=inFolderHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inFolderHandler.js","sourceRoot":"","sources":["../../src/service/inFolderHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACpD,MAAM,EACJ,eAAe,EACf,UAAU,EACV,eAAe,GAChB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AACzC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAEhD,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,GAAG,eAAe,GAAG,CAAC,CAAA;AAC/D,MAAM,sBAAsB,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,CAAA;AACtD,MAAM,eAAgB,SAAQ,eAAe;IAC3C,KAAK,CAAC,cAAc;QAClB,MAAM,KAAK,CAAC,cAAc,EAAE,CAAA;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;YAAE,OAAM;QAEtC,MAAM,
|
|
1
|
+
{"version":3,"file":"inFolderHandler.js","sourceRoot":"","sources":["../../src/service/inFolderHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACpD,MAAM,EACJ,eAAe,EACf,UAAU,EACV,eAAe,GAChB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AACzC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAEhD,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,GAAG,eAAe,GAAG,CAAC,CAAA;AAC/D,MAAM,sBAAsB,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,CAAA;AACtD,MAAM,eAAgB,SAAQ,eAAe;IAC3C,KAAK,CAAC,cAAc;QAClB,MAAM,KAAK,CAAC,cAAc,EAAE,CAAA;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;YAAE,OAAM;QAEtC,MAAM,CAAC,EAAE,AAAD,EAAG,UAAU,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QAEtD,MAAM,cAAc,GAAG,GAAG,UAAU,IAClC,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE;YAC7D,eAAe;YACf,eACF,EAAE,CAAA;QAEF,IAAI,CAAC,UAAU,CACb,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,EAC7D,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,CAChE,CAAA;IACH,CAAC;IAED,YAAY,CAAC,aAAa;QACxB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACjC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;SACxC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY;aACpC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC/C,IAAI,CAAC,GAAG,CAAC;aACT,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;aACvB,OAAO,CAAC,qBAAqB,EAAE,EAAE,CAAC;aAClC,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAA;QAEtC,aAAa;aACV,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;aACd,GAAG,CAAC,eAAe,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAA;IAC7D,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,eAAe,CAAA"}
|
|
@@ -5,7 +5,7 @@ const { readdir } = require('fs').promises;
|
|
|
5
5
|
const { pathExists } = require('fs-extra');
|
|
6
6
|
const { META_REGEX, METAFILE_SUFFIX } = require('../utils/metadataConstants');
|
|
7
7
|
const STATICRESOURCE_TYPE = 'staticresources';
|
|
8
|
-
const elementSrc =
|
|
8
|
+
const elementSrc = new Map();
|
|
9
9
|
class ResourceHandler extends StandardHandler {
|
|
10
10
|
constructor(line, type, work, metadata) {
|
|
11
11
|
super(line, type, work, metadata);
|
|
@@ -14,11 +14,12 @@ class ResourceHandler extends StandardHandler {
|
|
|
14
14
|
await super.handleAddition();
|
|
15
15
|
if (!this.config.generateDelta)
|
|
16
16
|
return;
|
|
17
|
-
const [, srcPath, elementName] = this._parseLine();
|
|
18
|
-
const [targetPath] = `${join(this.config.output, this.line)}`.match(new RegExp(`.*[/\\\\]${StandardHandler.metadata
|
|
17
|
+
const [, , srcPath, elementName] = this._parseLine();
|
|
18
|
+
const [targetPath] = `${join(this.config.output, this.line)}`.match(new RegExp(`.*[/\\\\]${StandardHandler.metadata.get(this.type).directoryName}`, 'u'));
|
|
19
19
|
await this._buildElementMap(srcPath);
|
|
20
20
|
const matchingFiles = this._buildMatchingFiles(elementName);
|
|
21
|
-
await Promise.all(elementSrc
|
|
21
|
+
await Promise.all(elementSrc
|
|
22
|
+
.get(srcPath)
|
|
22
23
|
.filter(src => (this.type === STATICRESOURCE_TYPE &&
|
|
23
24
|
src.startsWith(parse(elementName).name)) ||
|
|
24
25
|
matchingFiles.includes(src))
|
|
@@ -34,9 +35,6 @@ class ResourceHandler extends StandardHandler {
|
|
|
34
35
|
super.handleDeletion();
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
|
-
_parseLine() {
|
|
38
|
-
return join(this.config.repo, this.line).match(new RegExp(`(?<path>.*[/\\\\]${StandardHandler.metadata[this.type].directoryName})[/\\\\](?<name>[^/\\\\]*)+`, 'u'));
|
|
39
|
-
}
|
|
40
38
|
_getElementName() {
|
|
41
39
|
const parsedPath = this._getParsedPath();
|
|
42
40
|
return StandardHandler.cleanUpPackageMember(parsedPath.name);
|
|
@@ -49,14 +47,15 @@ class ResourceHandler extends StandardHandler {
|
|
|
49
47
|
_buildMatchingFiles(elementName) {
|
|
50
48
|
const parsedElementName = parse(elementName).name;
|
|
51
49
|
const matchingFiles = [parsedElementName];
|
|
52
|
-
if (StandardHandler.metadata
|
|
53
|
-
matchingFiles.push(`${parsedElementName}.${StandardHandler.metadata
|
|
50
|
+
if (StandardHandler.metadata.get(this.type).metaFile) {
|
|
51
|
+
matchingFiles.push(`${parsedElementName}.${StandardHandler.metadata.get(this.type).suffix}${METAFILE_SUFFIX}`);
|
|
54
52
|
}
|
|
55
53
|
return matchingFiles;
|
|
56
54
|
}
|
|
57
55
|
async _buildElementMap(srcPath) {
|
|
58
|
-
if (!
|
|
59
|
-
|
|
56
|
+
if (!elementSrc.has(srcPath)) {
|
|
57
|
+
const dirContent = await readdir(srcPath);
|
|
58
|
+
elementSrc.set(srcPath, dirContent);
|
|
60
59
|
}
|
|
61
60
|
}
|
|
62
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inResourceHandler.js","sourceRoot":"","sources":["../../src/service/inResourceHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACpD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAClD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAA;AAC1C,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAC1C,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AAE7E,MAAM,mBAAmB,GAAG,iBAAiB,CAAA;AAC7C,MAAM,UAAU,GAAG,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"inResourceHandler.js","sourceRoot":"","sources":["../../src/service/inResourceHandler.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>;
|
|
@@ -26,6 +24,12 @@ declare class StandardHandler {
|
|
|
26
24
|
_fillPackage(packageObject: any): void;
|
|
27
25
|
_fillPackageWithParameter(params: any): void;
|
|
28
26
|
_copyWithMetaFile(src: any, dst: any): Promise<void>;
|
|
27
|
+
_getMetaTypeFilePath(path: any): string;
|
|
29
28
|
_copyFiles(src: any, dst: any): Promise<void>;
|
|
30
29
|
_readFile(): Promise<Buffer & string>;
|
|
30
|
+
_parseLine(): RegExpMatchArray;
|
|
31
31
|
}
|
|
32
|
+
declare namespace StandardHandler {
|
|
33
|
+
export { FSE_BIGINT_ERROR };
|
|
34
|
+
}
|
|
35
|
+
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,
|
|
@@ -12,6 +13,7 @@ const FSE_COPYSYNC_OPTION = {
|
|
|
12
13
|
preserveTimestamps: false,
|
|
13
14
|
};
|
|
14
15
|
const copiedFiles = new Set();
|
|
16
|
+
const RegExpEscape = s => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
15
17
|
class StandardHandler {
|
|
16
18
|
constructor(line, type, work, metadata) {
|
|
17
19
|
var _a;
|
|
@@ -23,14 +25,14 @@ class StandardHandler {
|
|
|
23
25
|
this.config = work.config;
|
|
24
26
|
this.splittedLine = this.line.split(sep);
|
|
25
27
|
this.warnings = work.warnings;
|
|
26
|
-
if (StandardHandler.metadata
|
|
28
|
+
if (StandardHandler.metadata.get(this.type).metaFile === true) {
|
|
27
29
|
this.line = this.line.replace(METAFILE_SUFFIX, '');
|
|
28
30
|
}
|
|
29
|
-
this.suffixRegex = new RegExp(`\\.${StandardHandler.metadata
|
|
31
|
+
this.suffixRegex = new RegExp(`\\.${StandardHandler.metadata.get(this.type).suffix}$`);
|
|
30
32
|
this.handlerMap = {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
33
|
+
[ADDITION]: this.handleAddition,
|
|
34
|
+
[DELETION]: this.handleDeletion,
|
|
35
|
+
[MODIFICATION]: this.handleModification,
|
|
34
36
|
};
|
|
35
37
|
}
|
|
36
38
|
async handle() {
|
|
@@ -77,17 +79,24 @@ class StandardHandler {
|
|
|
77
79
|
});
|
|
78
80
|
}
|
|
79
81
|
_fillPackageWithParameter(params) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
82
|
+
if (!params.package.has(params.type)) {
|
|
83
|
+
params.package.set(params.type, new Set());
|
|
84
|
+
}
|
|
85
|
+
params.package.get(params.type).add(params.elementName);
|
|
83
86
|
}
|
|
84
87
|
async _copyWithMetaFile(src, dst) {
|
|
85
88
|
const file = this._copyFiles(src, dst);
|
|
86
|
-
if (StandardHandler.metadata
|
|
89
|
+
if (StandardHandler.metadata.get(this.type).metaFile === true) {
|
|
90
|
+
const metaFile = this._copyFiles(this._getMetaTypeFilePath(src), this._getMetaTypeFilePath(dst));
|
|
87
91
|
await this._copyFiles(src + METAFILE_SUFFIX, dst + METAFILE_SUFFIX);
|
|
92
|
+
await metaFile;
|
|
88
93
|
}
|
|
89
94
|
await file;
|
|
90
95
|
}
|
|
96
|
+
_getMetaTypeFilePath(path) {
|
|
97
|
+
const parsedPath = parse(path);
|
|
98
|
+
return join(parsedPath.dir, `${parsedPath.name}.${StandardHandler.metadata.get(this.type).suffix}${METAFILE_SUFFIX}`);
|
|
99
|
+
}
|
|
91
100
|
async _copyFiles(src, dst) {
|
|
92
101
|
if (copiedFiles.has(src))
|
|
93
102
|
return;
|
|
@@ -98,7 +107,7 @@ class StandardHandler {
|
|
|
98
107
|
await copy(src, dst, FSE_COPYSYNC_OPTION);
|
|
99
108
|
}
|
|
100
109
|
catch (error) {
|
|
101
|
-
if (error.message ===
|
|
110
|
+
if (error.message === FSE_BIGINT_ERROR) {
|
|
102
111
|
// Handle this fse issue manually (https://github.com/jprichardson/node-fs-extra/issues/657)
|
|
103
112
|
await copyFile(src, dst);
|
|
104
113
|
}
|
|
@@ -115,10 +124,15 @@ class StandardHandler {
|
|
|
115
124
|
});
|
|
116
125
|
return file;
|
|
117
126
|
}
|
|
127
|
+
_parseLine() {
|
|
128
|
+
const regexRepo = this.config.repo !== '.' ? this.config.repo : '';
|
|
129
|
+
return join(this.config.repo, this.line).match(new RegExp(`(${RegExpEscape(regexRepo)})(?<path>.*[/\\\\]${RegExpEscape(StandardHandler.metadata.get(this.type).directoryName)})[/\\\\](?<name>[^/\\\\]*)+`, 'u'));
|
|
130
|
+
}
|
|
118
131
|
static cleanUpPackageMember(packageMember) {
|
|
119
132
|
return `${packageMember}`.replace(/\\+/g, PACKAGE_MEMBER_PATH_SEP);
|
|
120
133
|
}
|
|
121
134
|
}
|
|
122
135
|
StandardHandler.PACKAGE_MEMBER_PATH_SEP = PACKAGE_MEMBER_PATH_SEP;
|
|
123
136
|
module.exports = StandardHandler;
|
|
137
|
+
module.exports.FSE_BIGINT_ERROR = FSE_BIGINT_ERROR;
|
|
124
138
|
//# 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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"}
|
|
@@ -21,11 +21,12 @@ class SubCustomObjectHandler extends StandardHandler {
|
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
_fillPackage(packageObject) {
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
if (!packageObject.has(this.type)) {
|
|
25
|
+
packageObject.set(this.type, new Set());
|
|
26
|
+
}
|
|
26
27
|
const prefix = this.splittedLine[this.splittedLine.indexOf(this.type) - 1];
|
|
27
28
|
const elementName = this._getElementName();
|
|
28
|
-
packageObject
|
|
29
|
+
packageObject.get(this.type).add(`${prefix}.${elementName}`);
|
|
29
30
|
}
|
|
30
31
|
}
|
|
31
32
|
SubCustomObjectHandler.SUB_OBJECT_TYPES = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subCustomObjectHandler.js","sourceRoot":"","sources":["../../src/service/subCustomObjectHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACpD,MAAM,EACJ,iBAAiB,EACjB,sBAAsB,GACvB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AACzC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAErC,MAAM,sBAAuB,SAAQ,eAAe;IAClD,cAAc;QACZ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,KAAK,CAAC,cAAc,EAAE,CAAA;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;YAAE,OAAM;QAEtC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QACnC,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC,iBAAiB,CAAC,EAAE;YACrC,MAAM,mBAAmB,GAAG,IAAI,CAAC,YAAY;iBAC1C,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBAChD,IAAI,CAAC,GAAG,CAAC,CAAA;YACZ,MAAM,gBAAgB,GACpB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;YAE7D,MAAM,gBAAgB,GAAG,IAAI,CAC3B,mBAAmB,EACnB,GAAG,gBAAgB,IAAI,sBAAsB,EAAE,CAChD,CAAA;YAED,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAAC,EACxC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAC3C,CAAA;SACF;IACH,CAAC;IAED,YAAY,CAAC,aAAa
|
|
1
|
+
{"version":3,"file":"subCustomObjectHandler.js","sourceRoot":"","sources":["../../src/service/subCustomObjectHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACpD,MAAM,EACJ,iBAAiB,EACjB,sBAAsB,GACvB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AACzC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAErC,MAAM,sBAAuB,SAAQ,eAAe;IAClD,cAAc;QACZ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,KAAK,CAAC,cAAc,EAAE,CAAA;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;YAAE,OAAM;QAEtC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QACnC,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC,iBAAiB,CAAC,EAAE;YACrC,MAAM,mBAAmB,GAAG,IAAI,CAAC,YAAY;iBAC1C,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBAChD,IAAI,CAAC,GAAG,CAAC,CAAA;YACZ,MAAM,gBAAgB,GACpB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;YAE7D,MAAM,gBAAgB,GAAG,IAAI,CAC3B,mBAAmB,EACnB,GAAG,gBAAgB,IAAI,sBAAsB,EAAE,CAChD,CAAA;YAED,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAAC,EACxC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAC3C,CAAA;SACF;IACH,CAAC;IAED,YAAY,CAAC,aAAa;QACxB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACjC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;SACxC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAC1E,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,EAAE,CAAA;QAE1C,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,WAAW,EAAE,CAAC,CAAA;IAC9D,CAAC;;AAEM,uCAAgB,GAAG;IACxB,mBAAmB;IACnB,gBAAgB;IAChB,WAAW;IACX,QAAQ;IACR,WAAW;IACX,aAAa;IACb,OAAO;IACP,gBAAgB;IAChB,aAAa;IACb,iBAAiB;IACjB,UAAU;CACX,CAAA;AAGH,MAAM,CAAC,OAAO,GAAG,sBAAsB,CAAA"}
|
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
const StandardHandler = require('./standardHandler');
|
|
3
3
|
const { parse } = require('path');
|
|
4
|
-
const WAVE_SUBTYPE =
|
|
4
|
+
const WAVE_SUBTYPE = new Map();
|
|
5
5
|
class WaveHandler extends StandardHandler {
|
|
6
6
|
constructor(line, type, work, metadata) {
|
|
7
7
|
super(line, type, work, metadata);
|
|
8
|
-
StandardHandler.metadata
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
}, WAVE_SUBTYPE);
|
|
8
|
+
StandardHandler.metadata
|
|
9
|
+
.get(this.type)
|
|
10
|
+
.content.reduce((acc, val) => acc.set(val.suffix, val.xmlName), WAVE_SUBTYPE);
|
|
12
11
|
this.ext = parse(this.line).ext.substring(1);
|
|
13
12
|
this.suffixRegex = new RegExp(`\\.${this.ext}$`);
|
|
14
13
|
}
|
|
15
14
|
_fillPackage(packageObject) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
15
|
+
const type = WAVE_SUBTYPE.get(this.ext);
|
|
16
|
+
if (!packageObject.has(type)) {
|
|
17
|
+
packageObject.set(type, new Set());
|
|
18
|
+
}
|
|
19
|
+
packageObject.get(type).add(this._getElementName());
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
module.exports = WaveHandler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waveHandler.js","sourceRoot":"","sources":["../../src/service/waveHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACpD,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAM,YAAY,GAAG,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"waveHandler.js","sourceRoot":"","sources":["../../src/service/waveHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACpD,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAE,CAAA;AAE9B,MAAM,WAAY,SAAQ,eAAe;IACvC,YAAY,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ;QACpC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QAEjC,eAAe,CAAC,QAAQ;aACrB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;aACd,OAAO,CAAC,MAAM,CACb,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,EAC9C,YAAY,CACb,CAAA;QACH,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAC5C,IAAI,CAAC,WAAW,GAAG,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,GAAG,GAAG,CAAC,CAAA;IAClD,CAAC;IAED,YAAY,CAAC,aAAa;QACxB,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACvC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC5B,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;SACnC;QACD,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAA;IACrD,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,WAAW,CAAA"}
|
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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataConstants.js","sourceRoot":"","sources":["../../src/utils/metadataConstants.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"metadataConstants.js","sourceRoot":"","sources":["../../src/utils/metadataConstants.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,MAAM,eAAe,GAAG,WAAW,CAAA;AACnC,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,GAAG,eAAe,GAAG,CAAC,CAAA;AACpD,MAAM,sBAAsB,GAAG,SAAS,eAAe,EAAE,CAAA;AACzD,MAAM,iBAAiB,GAAG,2BAA2B,CAAA;AACrD,MAAM,oBAAoB,GAAG,QAAQ,CAAA;AACrC,MAAM,eAAe,GAAG,QAAQ,CAAA;AAChC,MAAM,oBAAoB,GAAG,UAAU,eAAe,EAAE,CAAA;AACxD,MAAM,kCAAkC,GAAG,oBAAoB,eAAe,EAAE,CAAA;AAChF,MAAM,eAAe,GAAG,QAAQ,CAAA;AAChC,MAAM,CAAC,OAAO,CAAC,eAAe,GAAG,eAAe,CAAA;AAChD,MAAM,CAAC,OAAO,CAAC,UAAU,GAAG,UAAU,CAAA;AACtC,MAAM,CAAC,OAAO,CAAC,sBAAsB,GAAG,sBAAsB,CAAA;AAC9D,MAAM,CAAC,OAAO,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;AACpD,MAAM,CAAC,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;AAC1D,MAAM,CAAC,OAAO,CAAC,eAAe,GAAG,eAAe,CAAA;AAChD,MAAM,CAAC,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;AAC1D,MAAM,CAAC,OAAO,CAAC,eAAe,GAAG,eAAe,CAAA;AAChD,MAAM,CAAC,OAAO,CAAC,kCAAkC;IAC/C,kCAAkC,CAAA"}
|
|
@@ -1,36 +1,36 @@
|
|
|
1
1
|
'use strict';
|
|
2
|
-
const
|
|
3
|
-
const xmlConf = { indent: ' ', newline: '\n',
|
|
2
|
+
const { create } = require('xmlbuilder2');
|
|
3
|
+
const xmlConf = { indent: ' ', newline: '\n', prettyPrint: true };
|
|
4
4
|
module.exports = class PackageConstructor {
|
|
5
5
|
constructor(config, metadata) {
|
|
6
6
|
this.config = config;
|
|
7
7
|
this.metadata = metadata;
|
|
8
|
-
this.looseMetadata =
|
|
9
|
-
.filter(type => this.metadata
|
|
10
|
-
.flatMap(type => this.metadata
|
|
8
|
+
this.looseMetadata = [...this.metadata.keys()]
|
|
9
|
+
.filter(type => this.metadata.get(type).content)
|
|
10
|
+
.flatMap(type => this.metadata.get(type).content.map(content => content.xmlName));
|
|
11
11
|
}
|
|
12
12
|
constructPackage(strucDiffPerType) {
|
|
13
|
-
if (!strucDiffPerType)
|
|
13
|
+
if (!strucDiffPerType)
|
|
14
14
|
return;
|
|
15
|
-
}
|
|
16
|
-
|
|
15
|
+
const xml = create({ version: '1.0', encoding: 'UTF-8' }).ele('Package', {
|
|
16
|
+
xmlns: 'http://soap.sforce.com/2006/04/metadata',
|
|
17
|
+
});
|
|
17
18
|
const sortTypes = sortTypesWithMetadata(this.metadata);
|
|
18
|
-
|
|
19
|
-
.filter(type =>
|
|
20
|
-
this.looseMetadata.includes(type))
|
|
19
|
+
Array.from(strucDiffPerType.keys())
|
|
20
|
+
.filter(type => this.metadata.has(type) || this.looseMetadata.includes(type))
|
|
21
21
|
.sort(sortTypes)
|
|
22
22
|
.forEach(metadataType => {
|
|
23
23
|
var _a, _b;
|
|
24
|
-
return [...strucDiffPerType
|
|
24
|
+
return [...strucDiffPerType.get(metadataType)]
|
|
25
25
|
.sort()
|
|
26
26
|
.reduce((type, member) => {
|
|
27
|
-
type.ele('members').
|
|
27
|
+
type.ele('members').txt(member);
|
|
28
28
|
return type;
|
|
29
29
|
}, xml.ele('types'))
|
|
30
30
|
.ele('name')
|
|
31
|
-
.
|
|
31
|
+
.txt((_b = (_a = this.metadata.get(metadataType)) === null || _a === void 0 ? void 0 : _a.xmlName) !== null && _b !== void 0 ? _b : metadataType);
|
|
32
32
|
});
|
|
33
|
-
xml.ele('version').
|
|
33
|
+
xml.ele('version').txt(`${this.config.apiVersion}.0`);
|
|
34
34
|
return xml.end(xmlConf);
|
|
35
35
|
}
|
|
36
36
|
};
|
|
@@ -38,12 +38,8 @@ const sortTypesWithMetadata = metadata => (x, y) => {
|
|
|
38
38
|
var _a, _b, _c, _d;
|
|
39
39
|
if (x === 'objects')
|
|
40
40
|
return -1; // @deprecated To remove when the order will not impact the result of the deployment
|
|
41
|
-
const xMeta = (_b = (_a = metadata
|
|
42
|
-
const yMeta = (_d = (_c = metadata
|
|
41
|
+
const xMeta = (_b = (_a = metadata.get(x)) === null || _a === void 0 ? void 0 : _a.xmlName) !== null && _b !== void 0 ? _b : x;
|
|
42
|
+
const yMeta = (_d = (_c = metadata.get(y)) === null || _c === void 0 ? void 0 : _c.xmlName) !== null && _d !== void 0 ? _d : y;
|
|
43
43
|
return xMeta.localeCompare(yMeta);
|
|
44
44
|
};
|
|
45
|
-
const getXML = () => xmlbuilder
|
|
46
|
-
.create('Package')
|
|
47
|
-
.att('xmlns', 'http://soap.sforce.com/2006/04/metadata')
|
|
48
|
-
.dec('1.0', 'UTF-8');
|
|
49
45
|
//# sourceMappingURL=packageConstructor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageConstructor.js","sourceRoot":"","sources":["../../src/utils/packageConstructor.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,
|
|
1
|
+
{"version":3,"file":"packageConstructor.js","sourceRoot":"","sources":["../../src/utils/packageConstructor.js"],"names":[],"mappings":"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"}
|
|
@@ -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){2}/;
|
|
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]: [] });
|
|
@@ -82,17 +99,15 @@ class RepoGitDiff {
|
|
|
82
99
|
}
|
|
83
100
|
_filterInternal(line, deletedRenamed) {
|
|
84
101
|
return (!deletedRenamed.includes(line) &&
|
|
85
|
-
line
|
|
86
|
-
.split(path.sep)
|
|
87
|
-
.some(part => Object.prototype.hasOwnProperty.call(this.metadata, part)));
|
|
102
|
+
line.split(path.sep).some(part => this.metadata.has(part)));
|
|
88
103
|
}
|
|
89
104
|
static _addIncludes(lines, setup) {
|
|
90
105
|
return setup.flatMap(obj => micromatch(lines, obj.content).map(include => `${obj.prefix} ${include}`));
|
|
91
106
|
}
|
|
92
107
|
static async _setupIncludes(config) {
|
|
93
108
|
const setup = await Promise.all([
|
|
94
|
-
{ include: config.include, prefix:
|
|
95
|
-
{ include: config.includeDestructive, prefix:
|
|
109
|
+
{ include: config.include, prefix: ADDITION },
|
|
110
|
+
{ include: config.includeDestructive, prefix: DELETION },
|
|
96
111
|
]
|
|
97
112
|
.filter(obj => obj.include)
|
|
98
113
|
.map(async (obj) => {
|
|
@@ -133,9 +148,7 @@ class RepoGitDiff {
|
|
|
133
148
|
if (pathType.includes(type)) {
|
|
134
149
|
comparisonName = line
|
|
135
150
|
.split(path.sep)
|
|
136
|
-
.reduce((acc, value) => acc ||
|
|
137
|
-
? acc + value
|
|
138
|
-
: acc, '');
|
|
151
|
+
.reduce((acc, value) => (acc || this.metadata.has(value) ? acc + value : acc), '');
|
|
139
152
|
}
|
|
140
153
|
return comparisonName;
|
|
141
154
|
}
|
|
@@ -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/lib/utils/typeUtils.js
CHANGED
|
@@ -3,7 +3,7 @@ const CustomObject = require('../service/customObjectHandler');
|
|
|
3
3
|
const { sep } = require('path');
|
|
4
4
|
const haveSubTypes = [CustomObject.OBJECT_TYPE, ''];
|
|
5
5
|
module.exports.getType = (line, metadata) => line.split(sep).reduce((acc, value, _, arr) => {
|
|
6
|
-
acc =
|
|
6
|
+
acc = metadata.has(value) ? value : acc;
|
|
7
7
|
if (!haveSubTypes.includes(acc))
|
|
8
8
|
arr.splice(1);
|
|
9
9
|
return acc;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeUtils.js","sourceRoot":"","sources":["../../src/utils/typeUtils.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,YAAY,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC9D,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAE/B,MAAM,YAAY,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;AAEnD,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAC1C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE;IAC5C,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"typeUtils.js","sourceRoot":"","sources":["../../src/utils/typeUtils.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,YAAY,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC9D,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAE/B,MAAM,YAAY,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;AAEnD,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAC1C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE;IAC5C,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAA;IACvC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC9C,OAAO,GAAG,CAAA;AACZ,CAAC,EAAE,EAAE,CAAC,CAAA"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"5.0.
|
|
1
|
+
{"version":"5.0.5","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.5",
|
|
4
4
|
"description": "Generate the sfdx content in source format and destructive change from two git commits",
|
|
5
5
|
"keyword": [
|
|
6
6
|
"salesforce",
|
|
@@ -29,14 +29,14 @@
|
|
|
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",
|
|
36
36
|
"ignore": "^5.1.8",
|
|
37
37
|
"micromatch": "^4.0.4",
|
|
38
38
|
"tslib": "^2.3.1",
|
|
39
|
-
"
|
|
39
|
+
"xmlbuilder2": "^3.0.2"
|
|
40
40
|
},
|
|
41
41
|
"license": "MIT",
|
|
42
42
|
"bugs": {
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"test:debug": "node --inspect node_modules/.bin/jest",
|
|
56
56
|
"test:debug:break": "node --inspect-brk node_modules/.bin/jest",
|
|
57
57
|
"postpack": "rm -f oclif.manifest.json ; prettier --write README.md",
|
|
58
|
-
"postrelease": "
|
|
58
|
+
"postrelease": "yarn release:tags && yarn release:github",
|
|
59
59
|
"prepack": "rm -rf lib && tsc -b && oclif-dev manifest && oclif-dev readme",
|
|
60
60
|
"prepare": "husky install",
|
|
61
61
|
"release": "standard-version --no-verify --commit-all",
|
|
@@ -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",
|