@salesforce/source-deploy-retrieve 4.4.4 → 4.4.8
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 +28 -0
- package/lib/src/convert/streams.js.map +1 -1
- package/lib/src/registry/registry.d.ts +3 -0
- package/lib/src/registry/registry.json +3 -0
- package/lib/src/registry/registryAccess.d.ts +10 -0
- package/lib/src/registry/registryAccess.js +22 -1
- package/lib/src/registry/registryAccess.js.map +1 -1
- package/lib/src/resolve/adapters/baseSourceAdapter.js +31 -20
- package/lib/src/resolve/adapters/baseSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/decomposedSourceAdapter.js +2 -1
- package/lib/src/resolve/adapters/decomposedSourceAdapter.js.map +1 -1
- package/lib/src/resolve/forceIgnore.d.ts +0 -5
- package/lib/src/resolve/forceIgnore.js +8 -89
- package/lib/src/resolve/forceIgnore.js.map +1 -1
- package/lib/src/resolve/manifestResolver.d.ts +1 -0
- package/lib/src/resolve/manifestResolver.js +24 -4
- package/lib/src/resolve/manifestResolver.js.map +1 -1
- package/lib/src/resolve/metadataResolver.d.ts +3 -0
- package/lib/src/resolve/metadataResolver.js +22 -1
- package/lib/src/resolve/metadataResolver.js.map +1 -1
- package/lib/src/resolve/sourceComponent.js +6 -9
- package/lib/src/resolve/sourceComponent.js.map +1 -1
- package/lib/src/utils/index.d.ts +1 -1
- package/lib/src/utils/index.js +1 -0
- package/lib/src/utils/index.js.map +1 -1
- package/lib/src/utils/path.d.ts +22 -1
- package/lib/src/utils/path.js +32 -1
- package/lib/src/utils/path.js.map +1 -1
- package/package.json +2 -3
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,34 @@
|
|
|
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
|
+
### [4.4.8](https://github.com/forcedotcom/source-deploy-retrieve/compare/v4.4.7...v4.4.8) (2021-09-30)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* resolve CustomFieldTranslations properly ([#461](https://github.com/forcedotcom/source-deploy-retrieve/issues/461)) ([cf764bb](https://github.com/forcedotcom/source-deploy-retrieve/commit/cf764bb9ce02844553e6374efa1d538e414ab697))
|
|
11
|
+
|
|
12
|
+
### [4.4.7](https://github.com/forcedotcom/source-deploy-retrieve/compare/v4.4.6...v4.4.7) (2021-09-28)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
* release sfdx-core update ([#462](https://github.com/forcedotcom/source-deploy-retrieve/issues/462)) ([ed44dff](https://github.com/forcedotcom/source-deploy-retrieve/commit/ed44dfff1757eb307f24fcbcdc1efa0e7f197ca7))
|
|
18
|
+
|
|
19
|
+
### [4.4.6](https://github.com/forcedotcom/source-deploy-retrieve/compare/v4.4.5...v4.4.6) (2021-09-24)
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
### Bug Fixes
|
|
23
|
+
|
|
24
|
+
* resolve folderContentTypes in mdapi format for windows ([#457](https://github.com/forcedotcom/source-deploy-retrieve/issues/457)) ([25fbec5](https://github.com/forcedotcom/source-deploy-retrieve/commit/25fbec55720e7bab39a9e7e4f0368f44882c15de))
|
|
25
|
+
|
|
26
|
+
### [4.4.5](https://github.com/forcedotcom/source-deploy-retrieve/compare/v4.4.4...v4.4.5) (2021-09-23)
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
### Bug Fixes
|
|
30
|
+
|
|
31
|
+
* adds support for nested InFolder metadata types ([#455](https://github.com/forcedotcom/source-deploy-retrieve/issues/455)) ([b2b90a7](https://github.com/forcedotcom/source-deploy-retrieve/commit/b2b90a7093a60d264776b663f6280ba3a101c237))
|
|
32
|
+
|
|
5
33
|
### [4.4.4](https://github.com/forcedotcom/source-deploy-retrieve/compare/v4.4.3...v4.4.4) (2021-09-20)
|
|
6
34
|
|
|
7
35
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,uCAA6D;AAC7D,2BAAuC;AACvC,+BAA2D;AAC3D,mCAA+E;AAC/E,+BAAiC;AACjC,wCAA+D;AAE/D,kEAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":"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"}
|
|
@@ -1432,6 +1432,7 @@ export declare const registry: Readonly<{
|
|
|
1432
1432
|
name: string;
|
|
1433
1433
|
suffix: string;
|
|
1434
1434
|
directoryName: string;
|
|
1435
|
+
inFolder: boolean;
|
|
1435
1436
|
folderType: string;
|
|
1436
1437
|
};
|
|
1437
1438
|
territory2rule: {
|
|
@@ -1439,6 +1440,7 @@ export declare const registry: Readonly<{
|
|
|
1439
1440
|
name: string;
|
|
1440
1441
|
suffix: string;
|
|
1441
1442
|
directoryName: string;
|
|
1443
|
+
inFolder: boolean;
|
|
1442
1444
|
folderType: string;
|
|
1443
1445
|
};
|
|
1444
1446
|
territory2: {
|
|
@@ -1446,6 +1448,7 @@ export declare const registry: Readonly<{
|
|
|
1446
1448
|
name: string;
|
|
1447
1449
|
suffix: string;
|
|
1448
1450
|
directoryName: string;
|
|
1451
|
+
inFolder: boolean;
|
|
1449
1452
|
folderType: string;
|
|
1450
1453
|
};
|
|
1451
1454
|
campaigninfluencemodel: {
|
|
@@ -1429,6 +1429,7 @@
|
|
|
1429
1429
|
"name": "Territory2Model",
|
|
1430
1430
|
"suffix": "territory2Model",
|
|
1431
1431
|
"directoryName": "territory2Models",
|
|
1432
|
+
"inFolder": false,
|
|
1432
1433
|
"folderType": "territory2model"
|
|
1433
1434
|
},
|
|
1434
1435
|
"territory2rule": {
|
|
@@ -1436,6 +1437,7 @@
|
|
|
1436
1437
|
"name": "Territory2Rule",
|
|
1437
1438
|
"suffix": "territory2Rule",
|
|
1438
1439
|
"directoryName": "rules",
|
|
1440
|
+
"inFolder": false,
|
|
1439
1441
|
"folderType": "territory2model"
|
|
1440
1442
|
},
|
|
1441
1443
|
"territory2": {
|
|
@@ -1443,6 +1445,7 @@
|
|
|
1443
1445
|
"name": "Territory2",
|
|
1444
1446
|
"suffix": "territory2",
|
|
1445
1447
|
"directoryName": "territories",
|
|
1448
|
+
"inFolder": false,
|
|
1446
1449
|
"folderType": "territory2model"
|
|
1447
1450
|
},
|
|
1448
1451
|
"campaigninfluencemodel": {
|
|
@@ -4,6 +4,8 @@ import { MetadataRegistry, MetadataType } from './types';
|
|
|
4
4
|
*/
|
|
5
5
|
export declare class RegistryAccess {
|
|
6
6
|
private registry;
|
|
7
|
+
private strictFolderTypes;
|
|
8
|
+
private folderContentTypes;
|
|
7
9
|
constructor(registry?: MetadataRegistry);
|
|
8
10
|
/**
|
|
9
11
|
* Query a metadata type by its name.
|
|
@@ -34,5 +36,13 @@ export declare class RegistryAccess {
|
|
|
34
36
|
* @returns An array of metadata type objects that require strict parent folder names
|
|
35
37
|
*/
|
|
36
38
|
getStrictFolderTypes(): MetadataType[];
|
|
39
|
+
/**
|
|
40
|
+
* Query for the types that have the folderContentType property defined.
|
|
41
|
+
* E.g., reportFolder, dashboardFolder, documentFolder, emailFolder
|
|
42
|
+
* @see {@link MetadataType.folderContentType}
|
|
43
|
+
*
|
|
44
|
+
* @returns An array of metadata type objects that have folder content
|
|
45
|
+
*/
|
|
46
|
+
getFolderContentTypes(): MetadataType[];
|
|
37
47
|
get apiVersion(): string;
|
|
38
48
|
}
|
|
@@ -67,7 +67,28 @@ class RegistryAccess {
|
|
|
67
67
|
* @returns An array of metadata type objects that require strict parent folder names
|
|
68
68
|
*/
|
|
69
69
|
getStrictFolderTypes() {
|
|
70
|
-
|
|
70
|
+
if (!this.strictFolderTypes) {
|
|
71
|
+
this.strictFolderTypes = Object.values(this.registry.strictDirectoryNames).map((typeId) => this.registry.types[typeId]);
|
|
72
|
+
}
|
|
73
|
+
return this.strictFolderTypes;
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* Query for the types that have the folderContentType property defined.
|
|
77
|
+
* E.g., reportFolder, dashboardFolder, documentFolder, emailFolder
|
|
78
|
+
* @see {@link MetadataType.folderContentType}
|
|
79
|
+
*
|
|
80
|
+
* @returns An array of metadata type objects that have folder content
|
|
81
|
+
*/
|
|
82
|
+
getFolderContentTypes() {
|
|
83
|
+
if (!this.folderContentTypes) {
|
|
84
|
+
this.folderContentTypes = [];
|
|
85
|
+
for (const type of Object.values(this.registry.types)) {
|
|
86
|
+
if (type.folderContentType) {
|
|
87
|
+
this.folderContentTypes.push(type);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
return this.folderContentTypes;
|
|
71
92
|
}
|
|
72
93
|
get apiVersion() {
|
|
73
94
|
return this.registry.apiVersion;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registryAccess.js","sourceRoot":"","sources":["../../../src/registry/registryAccess.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAAyD;AACzD,sCAA0C;AAG1C;;GAEG;AACH,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"registryAccess.js","sourceRoot":"","sources":["../../../src/registry/registryAccess.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAAyD;AACzD,sCAA0C;AAG1C;;GAEG;AACH,MAAa,cAAc;IAMzB,YAAY,WAA6B,mBAAe;QACtD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAC,IAAY;;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACnC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACrD,MAAM,SAAS,SAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,QAAQ,0CAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3E,IAAI,SAAS,EAAE;gBACb,OAAO,SAAS,CAAC;aAClB;YACD,MAAM,IAAI,sBAAa,CAAC,qCAAqC,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;SACvF;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC/B,MAAM,IAAI,sBAAa,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;SACjE;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED;;;;;OAKG;IACI,eAAe,CAAC,MAAc;QACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;SACnC;IACH,CAAC;IAED;;;;;;OAMG;IACI,QAAQ,CAAC,SAA0C;QACxD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAED;;;;;OAKG;IACI,oBAAoB;QACzB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC3B,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAC5E,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CACxC,CAAC;SACH;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED;;;;;;OAMG;IACI,qBAAqB;QAC1B,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;YAC7B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACrD,IAAI,IAAI,CAAC,iBAAiB,EAAE;oBAC1B,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACpC;aACF;SACF;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;IAClC,CAAC;CACF;AA7FD,wCA6FC"}
|
|
@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BaseSourceAdapter = void 0;
|
|
4
4
|
const utils_1 = require("../../utils");
|
|
5
5
|
const errors_1 = require("../../errors");
|
|
6
|
-
const path_1 = require("../../utils/path");
|
|
7
6
|
const forceIgnore_1 = require("../forceIgnore");
|
|
8
|
-
const
|
|
7
|
+
const path_1 = require("path");
|
|
9
8
|
const treeContainers_1 = require("../treeContainers");
|
|
10
9
|
const sourceComponent_1 = require("../sourceComponent");
|
|
11
10
|
const registry_1 = require("../../registry");
|
|
@@ -64,9 +63,9 @@ class BaseSourceAdapter {
|
|
|
64
63
|
if (metaXml) {
|
|
65
64
|
let isRootMetadataXml = false;
|
|
66
65
|
if (this.type.strictDirectoryName) {
|
|
67
|
-
const parentPath =
|
|
68
|
-
const typeDirName =
|
|
69
|
-
const nameMatchesParent =
|
|
66
|
+
const parentPath = path_1.dirname(path);
|
|
67
|
+
const typeDirName = path_1.basename(this.type.inFolder ? path_1.dirname(parentPath) : parentPath);
|
|
68
|
+
const nameMatchesParent = path_1.basename(parentPath) === metaXml.fullName;
|
|
70
69
|
const inTypeDir = typeDirName === this.type.directoryName;
|
|
71
70
|
// if the parent folder name matches the fullName OR parent folder name is
|
|
72
71
|
// metadata type's directory name, it's a root metadata xml.
|
|
@@ -95,45 +94,57 @@ class BaseSourceAdapter {
|
|
|
95
94
|
* @param path File path of a metadata component
|
|
96
95
|
*/
|
|
97
96
|
parseAsContentMetadataXml(path) {
|
|
98
|
-
|
|
99
|
-
|
|
97
|
+
// InFolder metadata can be nested more than 1 level beneath its
|
|
98
|
+
// associated directoryName.
|
|
99
|
+
if (this.type.inFolder) {
|
|
100
|
+
const fullName = utils_1.parseNestedFullName(path, this.type.directoryName);
|
|
101
|
+
if (fullName) {
|
|
102
|
+
return { fullName, suffix: this.type.suffix, path };
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
const parentPath = path_1.dirname(path);
|
|
106
|
+
const parts = parentPath.split(path_1.sep);
|
|
100
107
|
const typeFolderIndex = parts.lastIndexOf(this.type.directoryName);
|
|
101
|
-
// nestedTypes (ex: territory2) have a folderType equal to their type but are themselves
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
: parts.length - 1;
|
|
108
|
+
// nestedTypes (ex: territory2) have a folderType equal to their type but are themselves
|
|
109
|
+
// in a folder per metadata item, with child folders for rules/territories
|
|
110
|
+
const allowedIndex = this.type.folderType === this.type.id ? parts.length - 2 : parts.length - 1;
|
|
105
111
|
if (typeFolderIndex !== allowedIndex) {
|
|
106
112
|
return undefined;
|
|
107
113
|
}
|
|
108
|
-
const match =
|
|
114
|
+
const match = path_1.basename(path).match(/(.+)\.(.+)/);
|
|
109
115
|
if (match && this.type.suffix === match[2]) {
|
|
110
116
|
return { fullName: match[1], suffix: match[2], path: path };
|
|
111
117
|
}
|
|
112
118
|
}
|
|
113
119
|
parseAsFolderMetadataXml(fsPath) {
|
|
114
|
-
const match =
|
|
115
|
-
const parts = fsPath.split(
|
|
120
|
+
const match = path_1.basename(fsPath).match(/(.+)-meta\.xml$/);
|
|
121
|
+
const parts = fsPath.split(path_1.sep);
|
|
116
122
|
if (match && !match[1].includes('.') && parts.length > 1) {
|
|
117
123
|
return { fullName: match[1], suffix: undefined, path: fsPath };
|
|
118
124
|
}
|
|
119
125
|
}
|
|
126
|
+
// Given a MetadataXml, build a fullName from the path and type.
|
|
120
127
|
calculateName(rootMetadata) {
|
|
128
|
+
const { directoryName, inFolder, folderType, folderContentType } = this.type;
|
|
129
|
+
// inFolder types (report, dashboard, emailTemplate, document) and their folder
|
|
130
|
+
// container types (reportFolder, dashboardFolder, emailFolder, documentFolder)
|
|
131
|
+
if (inFolder || folderContentType) {
|
|
132
|
+
return utils_1.parseNestedFullName(rootMetadata.path, directoryName);
|
|
133
|
+
}
|
|
121
134
|
// not using folders? then name is fullname
|
|
122
|
-
if (!
|
|
135
|
+
if (!folderType) {
|
|
123
136
|
return rootMetadata.fullName;
|
|
124
137
|
}
|
|
125
|
-
const grandparentType = this.registry.getTypeByName(
|
|
126
|
-
// type is
|
|
138
|
+
const grandparentType = this.registry.getTypeByName(folderType);
|
|
139
|
+
// type is nested inside another type (ex: Territory2Model). So the names are modelName.ruleName or modelName.territoryName
|
|
127
140
|
if (grandparentType.folderType && grandparentType.folderType !== this.type.id) {
|
|
128
|
-
const splits = rootMetadata.path.split(
|
|
141
|
+
const splits = rootMetadata.path.split(path_1.sep);
|
|
129
142
|
return `${splits[splits.indexOf(grandparentType.directoryName) + 1]}.${rootMetadata.fullName}`;
|
|
130
143
|
}
|
|
131
144
|
// this is the top level of nested types (ex: in a Territory2Model, the Territory2Model)
|
|
132
145
|
if (grandparentType.folderType === this.type.id) {
|
|
133
146
|
return rootMetadata.fullName;
|
|
134
147
|
}
|
|
135
|
-
// other folderType scenarios (report, dashboard, emailTemplate, etc) where the parent is of a different type
|
|
136
|
-
return `${path_1.parentName(rootMetadata.path)}/${rootMetadata.fullName}`;
|
|
137
148
|
}
|
|
138
149
|
}
|
|
139
150
|
exports.BaseSourceAdapter = BaseSourceAdapter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/baseSourceAdapter.ts"],"names":[],"mappings":";;;AAOA,
|
|
1
|
+
{"version":3,"file":"baseSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/baseSourceAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,7 +76,8 @@ class DecomposedSourceAdapter extends mixedContentSourceAdapter_1.MixedContentSo
|
|
|
76
76
|
if (metaXml) {
|
|
77
77
|
const pathToContent = this.trimPathToContent(trigger);
|
|
78
78
|
const childTypeId = this.type.children.suffixes[metaXml.suffix];
|
|
79
|
-
|
|
79
|
+
// If the child is explicitly not addressable, return the parent SourceComponent.
|
|
80
|
+
const triggerIsAChild = !!childTypeId && this.type.children.types[childTypeId].isAddressable !== false;
|
|
80
81
|
const strategy = this.type.strategies.decomposition;
|
|
81
82
|
if (triggerIsAChild &&
|
|
82
83
|
(strategy === "folderPerType" /* FolderPerType */ || isResolvingSource)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decomposedSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/decomposedSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2EAAwE;AAExE,wDAAqD;AACrD,uCAAqE;AAErE,yCAAkD;AAElD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAa,uBAAwB,SAAQ,qDAAyB;IAAtE;;QACY,cAAS,GAAG,IAAI,CAAC;QACjB,wBAAmB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"decomposedSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/decomposedSourceAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,7 @@ export declare class ForceIgnore {
|
|
|
3
3
|
static readonly FILE_NAME = ".forceignore";
|
|
4
4
|
private readonly parser;
|
|
5
5
|
private readonly forceIgnoreDirectory;
|
|
6
|
-
private readonly gitignoreParser;
|
|
7
6
|
private readonly contents?;
|
|
8
|
-
private readonly useNewParser;
|
|
9
7
|
private DEFAULT_IGNORE;
|
|
10
8
|
constructor(forceIgnorePath?: string);
|
|
11
9
|
/**
|
|
@@ -18,7 +16,4 @@ export declare class ForceIgnore {
|
|
|
18
16
|
static findAndCreate(seed: SourcePath): ForceIgnore;
|
|
19
17
|
denies(fsPath: SourcePath): boolean;
|
|
20
18
|
accepts(fsPath: SourcePath): boolean;
|
|
21
|
-
private parseContents;
|
|
22
|
-
private resolveConflict;
|
|
23
|
-
private emitWarning;
|
|
24
19
|
}
|
|
@@ -11,11 +11,6 @@ const index_1 = require("ignore/index");
|
|
|
11
11
|
const path_1 = require("path");
|
|
12
12
|
const fs_1 = require("fs");
|
|
13
13
|
const fileSystemHandler_1 = require("../utils/fileSystemHandler");
|
|
14
|
-
// @ts-ignore this doesn't have typings
|
|
15
|
-
const gitignoreParser = require("gitignore-parser");
|
|
16
|
-
const core_1 = require("@salesforce/core");
|
|
17
|
-
let warn = true;
|
|
18
|
-
const troubleEmittedForPattern = new Set();
|
|
19
14
|
class ForceIgnore {
|
|
20
15
|
constructor(forceIgnorePath = '') {
|
|
21
16
|
this.DEFAULT_IGNORE = [
|
|
@@ -26,17 +21,12 @@ class ForceIgnore {
|
|
|
26
21
|
];
|
|
27
22
|
try {
|
|
28
23
|
this.contents = fs_1.readFileSync(forceIgnorePath, 'utf-8');
|
|
29
|
-
//
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
this.gitignoreParser = gitignoreParser.compile(this.parseContents(this.contents));
|
|
36
|
-
this.forceIgnoreDirectory = path_1.dirname(forceIgnorePath);
|
|
37
|
-
// read the file to determine which parser to use
|
|
38
|
-
this.useNewParser = this.contents.includes('# .forceignore v2');
|
|
39
|
-
// END REMOVE
|
|
24
|
+
// check if file `.forceignore` exists
|
|
25
|
+
if (this.contents !== undefined) {
|
|
26
|
+
// add the default ignore paths, and then parse the .forceignore file
|
|
27
|
+
this.parser = index_1.default().add(`${this.contents}\n${this.DEFAULT_IGNORE.join('\n')}`);
|
|
28
|
+
this.forceIgnoreDirectory = path_1.dirname(forceIgnorePath);
|
|
29
|
+
}
|
|
40
30
|
}
|
|
41
31
|
catch (e) {
|
|
42
32
|
// TODO: log no force ignore
|
|
@@ -59,18 +49,7 @@ class ForceIgnore {
|
|
|
59
49
|
}
|
|
60
50
|
denies(fsPath) {
|
|
61
51
|
try {
|
|
62
|
-
|
|
63
|
-
let denies = false;
|
|
64
|
-
let fctResult = false;
|
|
65
|
-
// if there's a parser, and we're not trying to .forceignore the .forceignore
|
|
66
|
-
const relativePath = path_1.relative(this.forceIgnoreDirectory, fsPath);
|
|
67
|
-
if (this.parser && this.gitignoreParser && !!relativePath) {
|
|
68
|
-
denies = this.parser.ignores(relativePath);
|
|
69
|
-
fctResult = this.gitignoreParser.denies(relativePath);
|
|
70
|
-
// send to look for differences, analytics
|
|
71
|
-
this.resolveConflict(denies, fctResult, relativePath);
|
|
72
|
-
}
|
|
73
|
-
return this.useNewParser ? denies : fctResult;
|
|
52
|
+
return this.parser.ignores(path_1.relative(this.forceIgnoreDirectory, fsPath));
|
|
74
53
|
}
|
|
75
54
|
catch (e) {
|
|
76
55
|
return false;
|
|
@@ -78,72 +57,12 @@ class ForceIgnore {
|
|
|
78
57
|
}
|
|
79
58
|
accepts(fsPath) {
|
|
80
59
|
try {
|
|
81
|
-
|
|
82
|
-
let accepts = true;
|
|
83
|
-
let fctResult = true;
|
|
84
|
-
const relativePath = path_1.relative(this.forceIgnoreDirectory, fsPath);
|
|
85
|
-
if (this.parser && this.gitignoreParser && !!relativePath) {
|
|
86
|
-
accepts = !this.parser.ignores(relativePath);
|
|
87
|
-
fctResult = this.gitignoreParser.accepts(relativePath);
|
|
88
|
-
// send to look for differences, analytics
|
|
89
|
-
this.resolveConflict(accepts, fctResult, relativePath);
|
|
90
|
-
}
|
|
91
|
-
return this.useNewParser ? accepts : fctResult;
|
|
60
|
+
return !this.parser.ignores(path_1.relative(this.forceIgnoreDirectory, fsPath));
|
|
92
61
|
}
|
|
93
62
|
catch (e) {
|
|
94
63
|
return true;
|
|
95
64
|
}
|
|
96
65
|
}
|
|
97
|
-
// REMOVE THIS AFTER GITIGNORE-PARSER DEPRECATED
|
|
98
|
-
parseContents(contents) {
|
|
99
|
-
return contents
|
|
100
|
-
.split('\n')
|
|
101
|
-
.map((line) => line.trim())
|
|
102
|
-
.map((line) => line.replace(/[\\\/]/g, path_1.sep))
|
|
103
|
-
.map((line) => line.replace(/^\\/, ''))
|
|
104
|
-
.join('\n');
|
|
105
|
-
}
|
|
106
|
-
// AFTER GITIGNORE-PARSER DEPRECATED, remove this method
|
|
107
|
-
resolveConflict(newLibraryResults, oldLibraryResults, fsPath) {
|
|
108
|
-
const ignoreItems = this.contents.split('\n');
|
|
109
|
-
const troubledIgnoreLines = new Set();
|
|
110
|
-
if (newLibraryResults !== oldLibraryResults && ignoreItems) {
|
|
111
|
-
ignoreItems
|
|
112
|
-
.filter((ignoreItem) => ignoreItem.length)
|
|
113
|
-
.forEach((ignoreItem) => {
|
|
114
|
-
// we need to run the both of the compilers for a single line to find the problem entry
|
|
115
|
-
const gitignoreResult = gitignoreParser
|
|
116
|
-
.compile(this.parseContents(ignoreItem))
|
|
117
|
-
.accepts(fsPath);
|
|
118
|
-
const ignoreResult = !index_1.default().add([ignoreItem]).ignores(fsPath);
|
|
119
|
-
// print the warning only once per forceignore line item
|
|
120
|
-
if (ignoreResult !== gitignoreResult && !troubledIgnoreLines.has(ignoreItem)) {
|
|
121
|
-
// only show the warning once, it could come from denies() or accepts()
|
|
122
|
-
if (warn) {
|
|
123
|
-
warn = false;
|
|
124
|
-
this.emitWarning('We\'re replacing the current ".forceignore" parser with one that uses the same patterns as "git" uses with ".gitignore". Until we remove the old one, both parsers are available. But we recommend you start using the new parser soon by adding this line to the top of your ".forceignore" file: "# .forceignore v2". Read about the new ".gitgnore" pattern format here: https://git-scm.com/docs/gitignore. Then fix the following lines in your ".forceignore" file because they don\'t adhere to the new formatting rules.');
|
|
125
|
-
}
|
|
126
|
-
if (!troubleEmittedForPattern.has(ignoreItem)) {
|
|
127
|
-
troubleEmittedForPattern.add(ignoreItem);
|
|
128
|
-
this.emitWarning('\t' + ignoreItem);
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
troubledIgnoreLines.add(ignoreItem);
|
|
132
|
-
});
|
|
133
|
-
// send analytics, if they exist.
|
|
134
|
-
core_1.Lifecycle.getInstance().emit('telemetry', {
|
|
135
|
-
eventName: 'FORCE_IGNORE_DIFFERENCE',
|
|
136
|
-
content: this.contents,
|
|
137
|
-
oldLibraryResults,
|
|
138
|
-
newLibraryResults,
|
|
139
|
-
ignoreLines: Array.from(troubledIgnoreLines),
|
|
140
|
-
file: fsPath,
|
|
141
|
-
});
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
emitWarning(warning) {
|
|
145
|
-
process.emitWarning(warning);
|
|
146
|
-
}
|
|
147
66
|
}
|
|
148
67
|
exports.ForceIgnore = ForceIgnore;
|
|
149
68
|
ForceIgnore.FILE_NAME = '.forceignore';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forceIgnore.js","sourceRoot":"","sources":["../../../src/resolve/forceIgnore.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,wCAA8C;AAC9C,+
|
|
1
|
+
{"version":3,"file":"forceIgnore.js","sourceRoot":"","sources":["../../../src/resolve/forceIgnore.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,wCAA8C;AAC9C,+BAA+C;AAC/C,2BAAkC;AAElC,kEAAsD;AAEtD,MAAa,WAAW;IAatB,YAAmB,eAAe,GAAG,EAAE;QAP/B,mBAAc,GAAa;YACjC,UAAU;YACV,OAAO;YACP,6BAA6B;YAC7B,2BAA2B;SAC5B,CAAC;QAGA,IAAI;YACF,IAAI,CAAC,QAAQ,GAAG,iBAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACvD,sCAAsC;YACtC,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;gBAC/B,qEAAqE;gBACrE,IAAI,CAAC,MAAM,GAAG,eAAM,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAClF,IAAI,CAAC,oBAAoB,GAAG,cAAO,CAAC,eAAe,CAAC,CAAC;aACtD;SACF;QAAC,OAAO,CAAC,EAAE;YACV,4BAA4B;SAC7B;IACH,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,aAAa,CAAC,IAAgB;QAC1C,IAAI,wBAAwB,GAAG,EAAE,CAAC;QAClC,MAAM,iBAAiB,GAAG,4BAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAChE,IAAI,iBAAiB,EAAE;YACrB,wBAAwB,GAAG,WAAI,CAAC,cAAO,CAAC,iBAAiB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;SACpF;QACD,OAAO,IAAI,WAAW,CAAC,wBAAwB,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,MAAkB;QAC9B,IAAI;YACF,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,eAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;SACzE;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,OAAO,CAAC,MAAkB;QAC/B,IAAI;YACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,eAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;SAC1E;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC;SACb;IACH,CAAC;;AAzDH,kCA0DC;AAzDwB,qBAAS,GAAG,cAAc,CAAC"}
|
|
@@ -41,11 +41,11 @@ class ManifestResolver {
|
|
|
41
41
|
const typeName = typeMembers.name;
|
|
42
42
|
const type = this.registry.getTypeByName(typeName);
|
|
43
43
|
const parentType = type.folderType ? this.registry.getTypeByName(type.folderType) : undefined;
|
|
44
|
-
|
|
44
|
+
const members = utils_1.normalizeToArray(typeMembers.members);
|
|
45
|
+
for (const fullName of members) {
|
|
45
46
|
let mdType = type;
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
mdType = this.registry.getTypeByName(type.folderType);
|
|
47
|
+
if (this.isNestedInFolder(fullName, type, parentType, members)) {
|
|
48
|
+
mdType = parentType;
|
|
49
49
|
}
|
|
50
50
|
components.push({ fullName, type: mdType });
|
|
51
51
|
}
|
|
@@ -53,6 +53,26 @@ class ManifestResolver {
|
|
|
53
53
|
return { components, apiVersion };
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
|
+
// Use the folderType instead of the type from the manifest when:
|
|
57
|
+
// 1. InFolder types: (report, dashboard, emailTemplate, document)
|
|
58
|
+
// 1a. type.inFolder === true (from registry.json) AND
|
|
59
|
+
// 1b. The fullName doesn't contain a forward slash character AND
|
|
60
|
+
// 1c. The fullName with a slash appended is contained in another member entry
|
|
61
|
+
// OR
|
|
62
|
+
// 2. Non-InFolder, folder types: (territory2, territory2Model, territory2Type, territory2Rule)
|
|
63
|
+
// 2a. type.inFolder !== true (from registry.json) AND
|
|
64
|
+
// 2b. type.folderType has a value (from registry.json) AND
|
|
65
|
+
// 2c. This type's parent type has a folderType that doesn't match its ID.
|
|
66
|
+
isNestedInFolder(fullName, type, parentType, members) {
|
|
67
|
+
// Quick short-circuit for non-folderTypes
|
|
68
|
+
if (!type.folderType) {
|
|
69
|
+
return false;
|
|
70
|
+
}
|
|
71
|
+
const isInFolderType = type.inFolder;
|
|
72
|
+
const isNestedInFolder = !fullName.includes('/') || members.some((m) => m.includes(`${fullName}/`));
|
|
73
|
+
const isNonMatchingFolder = parentType && parentType.folderType !== parentType.id;
|
|
74
|
+
return (isInFolderType && isNestedInFolder) || (!isInFolderType && isNonMatchingFolder);
|
|
75
|
+
}
|
|
56
76
|
}
|
|
57
77
|
exports.ManifestResolver = ManifestResolver;
|
|
58
78
|
//# sourceMappingURL=manifestResolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifestResolver.js","sourceRoot":"","sources":["../../../src/resolve/manifestResolver.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;AAEH,
|
|
1
|
+
{"version":3,"file":"manifestResolver.js","sourceRoot":"","sources":["../../../src/resolve/manifestResolver.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;AAEH,0CAA2D;AAC3D,qDAAsE;AAEtE,qDAAoD;AACpD,oCAA4C;AA4B5C;;GAEG;AACH,MAAa,gBAAgB;IAI3B,YAAY,OAAsB,IAAI,oCAAmB,EAAE,EAAE,QAAQ,GAAG,IAAI,yBAAc,EAAE;QAC1F,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEY,OAAO,CAAC,YAAoB;;YACvC,MAAM,UAAU,GAAwB,EAAE,CAAC;YAE3C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAEpD,MAAM,cAAc,GAA0B,uBAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;gBACtE,SAAS,EAAE,CAAC,SAAS,CAAC;aACvB,CAAC,CAAC,OAAO,CAAC;YACX,MAAM,kBAAkB,GAAG,wBAAgB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAClE,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC;YAE1C,KAAK,MAAM,WAAW,IAAI,kBAAkB,EAAE;gBAC5C,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC;gBAClC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACnD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC9F,MAAM,OAAO,GAAG,wBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;gBAEtD,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE;oBAC9B,IAAI,MAAM,GAAG,IAAI,CAAC;oBAClB,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;wBAC9D,MAAM,GAAG,UAAU,CAAC;qBACrB;oBACD,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;iBAC7C;aACF;YAED,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;QACpC,CAAC;KAAA;IAED,iEAAiE;IACjE,mEAAmE;IACnE,yDAAyD;IACzD,oEAAoE;IACpE,iFAAiF;IACjF,KAAK;IACL,gGAAgG;IAChG,yDAAyD;IACzD,8DAA8D;IAC9D,6EAA6E;IACrE,gBAAgB,CACtB,QAAgB,EAChB,IAAkB,EAClB,UAAwB,EACxB,OAAiB;QAEjB,0CAA0C;QAC1C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC;QACrC,MAAM,gBAAgB,GACpB,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC;QAC7E,MAAM,mBAAmB,GAAG,UAAU,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,EAAE,CAAC;QAElF,OAAO,CAAC,cAAc,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,cAAc,IAAI,mBAAmB,CAAC,CAAC;IAC1F,CAAC;CACF;AAlED,4CAkEC"}
|
|
@@ -12,6 +12,7 @@ export declare class MetadataResolver {
|
|
|
12
12
|
private sourceAdapterFactory;
|
|
13
13
|
private tree;
|
|
14
14
|
private registry;
|
|
15
|
+
private folderContentTypeDirNames;
|
|
15
16
|
/**
|
|
16
17
|
* @param registry Custom registry data
|
|
17
18
|
* @param tree `TreeContainer` to traverse with
|
|
@@ -49,9 +50,11 @@ export declare class MetadataResolver {
|
|
|
49
50
|
* @param fsPath File path of a potential content metadata file
|
|
50
51
|
*/
|
|
51
52
|
private parseAsContentMetadataXml;
|
|
53
|
+
private getFolderContentTypeDirNames;
|
|
52
54
|
/**
|
|
53
55
|
* Identify metadata xml for a folder component:
|
|
54
56
|
* .../email/TestFolder-meta.xml
|
|
57
|
+
* .../reports/foo/bar-meta.xml
|
|
55
58
|
*
|
|
56
59
|
* Do not match this pattern:
|
|
57
60
|
* .../tabs/TestFolder.tab-meta.xml
|
|
@@ -199,19 +199,40 @@ class MetadataResolver {
|
|
|
199
199
|
parseAsContentMetadataXml(fsPath) {
|
|
200
200
|
return !!this.registry.getTypeBySuffix(utils_1.extName(fsPath));
|
|
201
201
|
}
|
|
202
|
+
// Get the array of directoryNames for types that have folderContentType
|
|
203
|
+
getFolderContentTypeDirNames() {
|
|
204
|
+
if (!this.folderContentTypeDirNames) {
|
|
205
|
+
this.folderContentTypeDirNames = this.registry
|
|
206
|
+
.getFolderContentTypes()
|
|
207
|
+
.map((t) => t.directoryName);
|
|
208
|
+
}
|
|
209
|
+
return this.folderContentTypeDirNames;
|
|
210
|
+
}
|
|
202
211
|
/**
|
|
203
212
|
* Identify metadata xml for a folder component:
|
|
204
213
|
* .../email/TestFolder-meta.xml
|
|
214
|
+
* .../reports/foo/bar-meta.xml
|
|
205
215
|
*
|
|
206
216
|
* Do not match this pattern:
|
|
207
217
|
* .../tabs/TestFolder.tab-meta.xml
|
|
208
218
|
*/
|
|
209
219
|
parseAsFolderMetadataXml(fsPath) {
|
|
220
|
+
let folderName;
|
|
210
221
|
const match = path_1.basename(fsPath).match(/(.+)-meta\.xml/);
|
|
211
222
|
if (match && !match[1].includes('.')) {
|
|
212
223
|
const parts = fsPath.split(path_1.sep);
|
|
213
|
-
|
|
224
|
+
if (parts.length > 1) {
|
|
225
|
+
const folderContentTypesDirs = this.getFolderContentTypeDirNames();
|
|
226
|
+
// check if the path contains a folder content name as a directory
|
|
227
|
+
// e.g., `/reports/` and if it does return that folder name.
|
|
228
|
+
folderContentTypesDirs.some((dirName) => {
|
|
229
|
+
if (fsPath.includes(`${path_1.sep}${dirName}${path_1.sep}`)) {
|
|
230
|
+
folderName = dirName;
|
|
231
|
+
}
|
|
232
|
+
});
|
|
233
|
+
}
|
|
214
234
|
}
|
|
235
|
+
return folderName;
|
|
215
236
|
}
|
|
216
237
|
isMetadata(fsPath) {
|
|
217
238
|
return (!!utils_1.parseMetadataXml(fsPath) ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAoD;AACpD,sCAA+C;AAC/C,oCAAiE;AACjE,0EAAuE;AACvE,+CAA4C;AAE5C,qDAAsE;AACtE,+DAA4D;AAI5D;;;GAGG;AACH,MAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -113,22 +113,19 @@ class SourceComponent {
|
|
|
113
113
|
}
|
|
114
114
|
calculateRelativePath(fsPath) {
|
|
115
115
|
var _a, _b;
|
|
116
|
-
const { directoryName, suffix, inFolder, folderType } = this.type;
|
|
116
|
+
const { directoryName, suffix, inFolder, folderType, folderContentType } = this.type;
|
|
117
117
|
// if there isn't a suffix, assume this is a mixed content component that must
|
|
118
118
|
// reside in the directoryName of its type. trimUntil maintains the folder structure
|
|
119
|
-
// the file resides in for the new destination.
|
|
120
|
-
|
|
119
|
+
// the file resides in for the new destination. This also applies to inFolder types:
|
|
120
|
+
// (report, dashboard, emailTemplate, document) and their folder container types:
|
|
121
|
+
// (reportFolder, dashboardFolder, emailFolder, documentFolder)
|
|
122
|
+
if (!suffix || inFolder || folderContentType) {
|
|
121
123
|
return utils_1.trimUntil(fsPath, directoryName);
|
|
122
124
|
}
|
|
123
|
-
// legacy version of folderType
|
|
124
|
-
if (inFolder) {
|
|
125
|
-
return path_1.join(directoryName, this.fullName.split('/')[0], path_1.basename(fsPath));
|
|
126
|
-
}
|
|
127
125
|
if (folderType) {
|
|
128
126
|
// types like Territory2Model have child types inside them. We have to preserve those folder structures
|
|
129
127
|
if (((_a = this.parentType) === null || _a === void 0 ? void 0 : _a.folderType) && ((_b = this.parentType) === null || _b === void 0 ? void 0 : _b.folderType) !== this.type.id) {
|
|
130
|
-
|
|
131
|
-
return fsPathSplits.slice(fsPathSplits.indexOf(this.parentType.directoryName)).join(path_1.sep);
|
|
128
|
+
return utils_1.trimUntil(fsPath, this.parentType.directoryName);
|
|
132
129
|
}
|
|
133
130
|
return path_1.join(directoryName, this.fullName.split('/')[0], path_1.basename(fsPath));
|
|
134
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourceComponent.js","sourceRoot":"","sources":["../../../src/resolve/sourceComponent.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;GAKG;AACH,+
|
|
1
|
+
{"version":3,"file":"sourceComponent.js","sourceRoot":"","sources":["../../../src/resolve/sourceComponent.ts"],"names":[],"mappings":"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"}
|
package/lib/src/utils/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { createFiles } from './fileSystemHandler';
|
|
2
2
|
export { generateMetaXML, generateMetaXMLPath, trimMetaXmlSuffix } from './metadata';
|
|
3
|
-
export { extName, baseName, parseMetadataXml, parentName, trimUntil } from './path';
|
|
3
|
+
export { extName, baseName, parseMetadataXml, parentName, trimUntil, parseNestedFullName, } from './path';
|
|
4
4
|
export { normalizeToArray, deepFreeze } from './collections';
|
package/lib/src/utils/index.js
CHANGED
|
@@ -18,6 +18,7 @@ Object.defineProperty(exports, "baseName", { enumerable: true, get: function ()
|
|
|
18
18
|
Object.defineProperty(exports, "parseMetadataXml", { enumerable: true, get: function () { return path_1.parseMetadataXml; } });
|
|
19
19
|
Object.defineProperty(exports, "parentName", { enumerable: true, get: function () { return path_1.parentName; } });
|
|
20
20
|
Object.defineProperty(exports, "trimUntil", { enumerable: true, get: function () { return path_1.trimUntil; } });
|
|
21
|
+
Object.defineProperty(exports, "parseNestedFullName", { enumerable: true, get: function () { return path_1.parseNestedFullName; } });
|
|
21
22
|
var collections_1 = require("./collections");
|
|
22
23
|
Object.defineProperty(exports, "normalizeToArray", { enumerable: true, get: function () { return collections_1.normalizeToArray; } });
|
|
23
24
|
Object.defineProperty(exports, "deepFreeze", { enumerable: true, get: function () { return collections_1.deepFreeze; } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,yDAAkD;AAAzC,gHAAA,WAAW,OAAA;AACpB,uCAAqF;AAA5E,2GAAA,eAAe,OAAA;AAAE,+GAAA,mBAAmB,OAAA;AAAE,6GAAA,iBAAiB,OAAA;AAChE,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,yDAAkD;AAAzC,gHAAA,WAAW,OAAA;AACpB,uCAAqF;AAA5E,2GAAA,eAAe,OAAA;AAAE,+GAAA,mBAAmB,OAAA;AAAE,6GAAA,iBAAiB,OAAA;AAChE,+BAOgB;AANd,+FAAA,OAAO,OAAA;AACP,gGAAA,QAAQ,OAAA;AACR,wGAAA,gBAAgB,OAAA;AAChB,kGAAA,UAAU,OAAA;AACV,iGAAA,SAAS,OAAA;AACT,2GAAA,mBAAmB,OAAA;AAErB,6CAA6D;AAApD,+GAAA,gBAAgB,OAAA;AAAE,yGAAA,UAAU,OAAA"}
|
package/lib/src/utils/path.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { SourcePath } from '../common';
|
|
2
2
|
import { MetadataXml } from '../resolve';
|
|
3
|
+
import { Optional } from '@salesforce/ts-types';
|
|
3
4
|
/**
|
|
4
5
|
* Get the file or directory name at the end of a path. Different from `path.basename`
|
|
5
6
|
* in that it strips anything after the first '.' in the name.
|
|
@@ -32,4 +33,24 @@ export declare function trimUntil(fsPath: SourcePath, part: string): string;
|
|
|
32
33
|
* @param fsPath - File path to parse
|
|
33
34
|
* @returns MetadataXml info or undefined
|
|
34
35
|
*/
|
|
35
|
-
export declare function parseMetadataXml(fsPath: string): MetadataXml
|
|
36
|
+
export declare function parseMetadataXml(fsPath: string): Optional<MetadataXml>;
|
|
37
|
+
/**
|
|
38
|
+
* Returns the fullName for a nested metadata source file. This is for metadata
|
|
39
|
+
* types that can be nested more than 1 level such as report and reportFolder,
|
|
40
|
+
* dashboard and dashboardFolder, etc. It uses the directory name for the metadata type
|
|
41
|
+
* as the starting point (non-inclusively) to parse the fullName.
|
|
42
|
+
*
|
|
43
|
+
* Examples:
|
|
44
|
+
* (source format path)
|
|
45
|
+
* fsPath: force-app/main/default/reports/foo/bar/My_Report.report-meta.xml
|
|
46
|
+
* returns: foo/bar/My_Report
|
|
47
|
+
*
|
|
48
|
+
* (mdapi format path)
|
|
49
|
+
* fsPath: unpackaged/reports/foo/bar-meta.xml
|
|
50
|
+
* returns: foo/bar
|
|
51
|
+
*
|
|
52
|
+
* @param fsPath - File path to parse
|
|
53
|
+
* @param directoryName - name of directory to use as a parsing index
|
|
54
|
+
* @returns the FullName
|
|
55
|
+
*/
|
|
56
|
+
export declare function parseNestedFullName(fsPath: string, directoryName: string): Optional<string>;
|
package/lib/src/utils/path.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.parseMetadataXml = exports.trimUntil = exports.parentName = exports.extName = exports.baseName = void 0;
|
|
9
|
+
exports.parseNestedFullName = exports.parseMetadataXml = exports.trimUntil = exports.parentName = exports.extName = exports.baseName = void 0;
|
|
10
10
|
const path_1 = require("path");
|
|
11
11
|
/**
|
|
12
12
|
* Get the file or directory name at the end of a path. Different from `path.basename`
|
|
@@ -65,4 +65,35 @@ function parseMetadataXml(fsPath) {
|
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
exports.parseMetadataXml = parseMetadataXml;
|
|
68
|
+
/**
|
|
69
|
+
* Returns the fullName for a nested metadata source file. This is for metadata
|
|
70
|
+
* types that can be nested more than 1 level such as report and reportFolder,
|
|
71
|
+
* dashboard and dashboardFolder, etc. It uses the directory name for the metadata type
|
|
72
|
+
* as the starting point (non-inclusively) to parse the fullName.
|
|
73
|
+
*
|
|
74
|
+
* Examples:
|
|
75
|
+
* (source format path)
|
|
76
|
+
* fsPath: force-app/main/default/reports/foo/bar/My_Report.report-meta.xml
|
|
77
|
+
* returns: foo/bar/My_Report
|
|
78
|
+
*
|
|
79
|
+
* (mdapi format path)
|
|
80
|
+
* fsPath: unpackaged/reports/foo/bar-meta.xml
|
|
81
|
+
* returns: foo/bar
|
|
82
|
+
*
|
|
83
|
+
* @param fsPath - File path to parse
|
|
84
|
+
* @param directoryName - name of directory to use as a parsing index
|
|
85
|
+
* @returns the FullName
|
|
86
|
+
*/
|
|
87
|
+
function parseNestedFullName(fsPath, directoryName) {
|
|
88
|
+
const pathSplits = fsPath.split(path_1.sep);
|
|
89
|
+
// Exit if the directoryName is not included in the file path.
|
|
90
|
+
if (!pathSplits.includes(directoryName)) {
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
const pathPrefix = pathSplits.slice(pathSplits.lastIndexOf(directoryName) + 1);
|
|
94
|
+
const fileName = pathSplits.pop().replace('-meta.xml', '').split('.')[0];
|
|
95
|
+
pathPrefix[pathPrefix.length - 1] = fileName;
|
|
96
|
+
return pathPrefix.join('/');
|
|
97
|
+
}
|
|
98
|
+
exports.parseNestedFullName = parseNestedFullName;
|
|
68
99
|
//# sourceMappingURL=path.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../src/utils/path.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAAuD;
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../src/utils/path.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAAuD;AAKvD;;;;GAIG;AACH,SAAgB,QAAQ,CAAC,MAAkB;IACzC,OAAO,eAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAFD,4BAEC;AAED;;;;;GAKG;AACH,SAAgB,OAAO,CAAC,MAAkB;IACxC,MAAM,KAAK,GAAG,cAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAHD,0BAGC;AAED;;;GAGG;AACH,SAAgB,UAAU,CAAC,MAAkB;IAC3C,OAAO,eAAQ,CAAC,cAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AACnC,CAAC;AAFD,gCAEC;AAED;;;;;GAKG;AACH,SAAgB,SAAS,CAAC,MAAkB,EAAE,IAAY;IACxD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;IACrD,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE;QACpB,OAAO,MAAM,CAAC;KACf;IACD,OAAO,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,UAAG,CAAC,CAAC;AAC1C,CAAC;AAPD,8BAOC;AAED;;;;;;GAMG;AACH,SAAgB,gBAAgB,CAAC,MAAc;IAC7C,MAAM,KAAK,GAAG,eAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC7D,IAAI,KAAK,EAAE;QACT,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;KAC/D;AACH,CAAC;AALD,4CAKC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAgB,mBAAmB,CAAC,MAAc,EAAE,aAAqB;IACvE,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;IACrC,8DAA8D;IAC9D,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;QACvC,OAAO;KACR;IACD,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/E,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACzE,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC;IAC7C,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AAVD,kDAUC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/source-deploy-retrieve",
|
|
3
|
-
"version": "4.4.
|
|
3
|
+
"version": "4.4.8",
|
|
4
4
|
"description": "JavaScript library to run Salesforce metadata deploys and retrieves",
|
|
5
5
|
"main": "lib/src/index.js",
|
|
6
6
|
"author": "Salesforce",
|
|
@@ -27,12 +27,11 @@
|
|
|
27
27
|
"node": ">=12.11.0"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@salesforce/core": "2.
|
|
30
|
+
"@salesforce/core": "2.28.0",
|
|
31
31
|
"@salesforce/kit": "^1.5.0",
|
|
32
32
|
"@salesforce/ts-types": "^1.4.2",
|
|
33
33
|
"archiver": "^5.3.0",
|
|
34
34
|
"fast-xml-parser": "^3.17.4",
|
|
35
|
-
"gitignore-parser": "0.0.2",
|
|
36
35
|
"ignore": "^5.1.8",
|
|
37
36
|
"mime": "2.4.6",
|
|
38
37
|
"unzipper": "0.10.11",
|