@salesforce/source-deploy-retrieve 11.1.0 → 11.1.2
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/lib/src/client/metadataApiRetrieve.d.ts +1 -1
- package/lib/src/collections/componentSetBuilder.js +12 -1
- package/lib/src/collections/componentSetBuilder.js.map +1 -1
- package/lib/src/convert/metadataConverter.js +0 -3
- package/lib/src/convert/metadataConverter.js.map +1 -1
- package/lib/src/convert/streams.d.ts +2 -1
- package/lib/src/convert/streams.js +4 -7
- package/lib/src/convert/streams.js.map +1 -1
- package/lib/src/resolve/adapters/baseSourceAdapter.d.ts +2 -2
- package/lib/src/resolve/adapters/baseSourceAdapter.js.map +1 -1
- package/lib/src/resolve/connectionResolver.d.ts +1 -3
- package/lib/src/resolve/connectionResolver.js +44 -83
- package/lib/src/resolve/connectionResolver.js.map +1 -1
- package/lib/src/resolve/forceIgnore.js.map +1 -1
- package/lib/src/resolve/metadataResolver.d.ts +1 -0
- package/lib/src/resolve/metadataResolver.js +4 -3
- package/lib/src/resolve/metadataResolver.js.map +1 -1
- package/lib/src/resolve/sourceComponent.d.ts +2 -2
- package/package.json +2 -3
|
@@ -18,7 +18,7 @@ export declare class RetrieveResult implements MetadataTransferResult {
|
|
|
18
18
|
}
|
|
19
19
|
export declare class MetadataApiRetrieve extends MetadataTransfer<MetadataApiRetrieveStatus, RetrieveResult, MetadataApiRetrieveOptions> {
|
|
20
20
|
static DEFAULT_OPTIONS: Partial<MetadataApiRetrieveOptions>;
|
|
21
|
-
private options;
|
|
21
|
+
private readonly options;
|
|
22
22
|
private orgId?;
|
|
23
23
|
constructor(options: MetadataApiRetrieveOptions);
|
|
24
24
|
/**
|
|
@@ -40,6 +40,7 @@ const minimatch_1 = __importDefault(require("minimatch"));
|
|
|
40
40
|
const sourceComponent_1 = require("../resolve/sourceComponent");
|
|
41
41
|
const componentSet_1 = require("../collections/componentSet");
|
|
42
42
|
const registryAccess_1 = require("../registry/registryAccess");
|
|
43
|
+
const resolve_1 = require("../resolve");
|
|
43
44
|
const types_1 = require("./types");
|
|
44
45
|
;
|
|
45
46
|
const messages = new core_1.Messages('@salesforce/source-deploy-retrieve', 'sdr', new Map([["md_request_fail", "Metadata API request failed: %s"], ["error_convert_invalid_format", "Invalid conversion format '%s'"], ["error_could_not_infer_type", "%s: Could not infer a metadata type"], ["error_unexpected_child_type", "Unexpected child metadata [%s] found for parent type [%s]"], ["noParent", "Could not find parent type for %s (%s)"], ["error_expected_source_files", "%s: Expected source files for type '%s'"], ["error_failed_convert", "Component conversion failed: %s"], ["error_merge_metadata_target_unsupported", "Merge convert for metadata target format currently unsupported"], ["error_missing_adapter", "Missing adapter '%s' for metadata type '%s'"], ["error_missing_transformer", "Missing transformer '%s' for metadata type '%s'"], ["error_missing_type_definition", "Missing metadata type definition in registry for id '%s'."], ["error_missing_child_type_definition", "Type %s does not have a child type definition %s."], ["noChildTypes", "No child types found in registry for %s (reading %s at %s)"], ["error_no_metadata_xml_ignore", "Metadata xml file %s is forceignored but is required for %s."], ["noSourceIgnore", "%s metadata types require source files, but %s is forceignored."], ["noSourceIgnore.actions", "- Metadata types with content are composed of two files: a content file (ie MyApexClass.cls) and a -meta.xml file (i.e MyApexClass.cls-meta.xml). You must include both files in your .forceignore file. Or try appending \u201C\\*\u201D to your existing .forceignore entry.\n\nSee <https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_exclude_source.htm> for examples"], ["error_path_not_found", "%s: File or folder not found"], ["noContentFound", "SourceComponent %s (metadata type = %s) is missing its content file."], ["noContentFound.actions", ["Ensure the content file exists in the expected location.", "If the content file is in your .forceignore file, ensure the meta-xml file is also ignored to completely exclude it."]], ["error_parsing_xml", "SourceComponent %s (metadata type = %s) does not have an associated metadata xml to parse"], ["error_expected_file_path", "%s: path is to a directory, expected a file"], ["error_expected_directory_path", "%s: path is to a file, expected a directory"], ["error_directory_not_found_or_not_directory", "%s: path is not a directory"], ["error_no_directory_stream", "%s doesn't support readable streams on directories."], ["error_no_source_to_deploy", "No source-backed components present in the package."], ["error_no_components_to_retrieve", "No components in the package to retrieve."], ["error_static_resource_expected_archive_type", "A StaticResource directory must have a content type of application/zip or application/jar - found %s for %s."], ["error_static_resource_missing_resource_file", "A StaticResource must have an associated .resource file, missing %s.resource-meta.xml"], ["error_no_job_id", "The %s operation is missing a job ID. Initialize an operation with an ID, or start a new job."], ["missingApiVersion", "Could not determine an API version to use for the generated manifest. Tried looking for sourceApiVersion in sfdx-project.json, apiVersion from config vars, and the highest apiVersion from the APEX REST endpoint. Using API version 58.0 as a last resort."], ["invalid_xml_parsing", "error parsing %s due to:\\n message: %s\\n line: %s\\n code: %s"], ["zipBufferError", "Zip buffer was not created during conversion"], ["undefinedComponentSet", "Unable to construct a componentSet. Check the logs for more information."], ["replacementsFileNotRead", "The file \"%s\" specified in the \"replacements\" property of sfdx-project.json could not be read."], ["unsupportedBundleType", "Unsupported Bundle Type: %s"], ["filePathGeneratorNoTypeSupport", "Type not supported for filepath generation: %s"], ["missingFolderType", "The registry has %s as is inFolder but it does not have a folderType"], ["tooManyFiles", "Multiple files found for path: %s."], ["cantGetName", "Unable to calculate fullName from path: %s (%s)"], ["missingMetaFileSuffix", "The metadata registry is configured incorrectly for %s. Expected a metaFileSuffix."], ["uniqueIdElementNotInRegistry", "No uniqueIdElement found in registry for %s (reading %s at %s)."], ["uniqueIdElementNotInChild", "The uniqueIdElement %s was not found the child (reading %s at %s)."], ["suggest_type_header", "A metadata type lookup for \"%s\" found the following close matches:"], ["suggest_type_did_you_mean", "-- Did you mean \".%s%s\" instead for the \"%s\" metadata type?"], ["suggest_type_more_suggestions", "Additional suggestions:\nConfirm the file name, extension, and directory names are correct. Validate against the registry at:\n<https://github.com/forcedotcom/source-deploy-retrieve/blob/main/src/registry/metadataRegistry.json>\n\nIf the type is not listed in the registry, check that it has Metadata API support via the Metadata Coverage Report:\n<https://developer.salesforce.com/docs/metadata-coverage>\n\nIf the type is available via Metadata API but not in the registry\n\n- Open an issue <https://github.com/forcedotcom/cli/issues>\n- Add the type via PR. Instructions: <https://github.com/forcedotcom/source-deploy-retrieve/blob/main/contributing/metadata.md>"]]));
|
|
@@ -52,6 +53,7 @@ class ComponentSetBuilder {
|
|
|
52
53
|
*
|
|
53
54
|
* @param options: options for creating a ComponentSet
|
|
54
55
|
*/
|
|
56
|
+
// eslint-disable-next-line complexity
|
|
55
57
|
static async build(options) {
|
|
56
58
|
const logger = core_1.Logger.childFromRoot('componentSetBuilder');
|
|
57
59
|
let componentSet;
|
|
@@ -121,7 +123,16 @@ class ComponentSetBuilder {
|
|
|
121
123
|
include: componentSetFilter,
|
|
122
124
|
registry: registryAccess,
|
|
123
125
|
});
|
|
124
|
-
|
|
126
|
+
if (resolvedComponents.forceIgnoredPaths) {
|
|
127
|
+
// if useFsForceIgnore = true, then we won't be able to resolve a forceignored path,
|
|
128
|
+
// which we need to do to get the ignored source component
|
|
129
|
+
const resolver = new resolve_1.MetadataResolver(registryAccess, undefined, false);
|
|
130
|
+
for (const ignoredPath of resolvedComponents.forceIgnoredPaths ?? []) {
|
|
131
|
+
resolver.getComponentsFromPath(ignoredPath).map((ignored) => {
|
|
132
|
+
componentSet = componentSet?.filter((resolved) => !(resolved.fullName === ignored.name && resolved.type === ignored.type));
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
}
|
|
125
136
|
resolvedComponents.toArray().map(addToComponentSet(componentSet));
|
|
126
137
|
}
|
|
127
138
|
// Resolve metadata entries with an org connection
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"componentSetBuilder.js","sourceRoot":"","sources":["../../../src/collections/componentSetBuilder.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,gDAAkC;AAClC,2CAA8E;AAC9E,8DAA6B;AAC7B,0DAAkC;AAElC,gEAA6D;AAC7D,8DAA2D;AAC3D,+DAA4D;AAG5D,mCAAwE;;AAGxE,MAAM,QAAQ,OAAG,eAAQ,CAAc,oCAAoC,EAAE,KAAK,6pKAAC,CAAC;AAyCpF,MAAa,mBAAmB;IAC9B;;;;;;;OAOG;
|
|
1
|
+
{"version":3,"file":"componentSetBuilder.js","sourceRoot":"","sources":["../../../src/collections/componentSetBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -133,9 +133,6 @@ function getMergeConfigOutputs(output, targetFormatIsSource, registry) {
|
|
|
133
133
|
mergeSet.add(component.parent ?? component);
|
|
134
134
|
}
|
|
135
135
|
const writer = new streams_1.StandardWriter(output.defaultDirectory);
|
|
136
|
-
if (output.forceIgnoredPaths) {
|
|
137
|
-
writer.forceIgnoredPaths = output.forceIgnoredPaths;
|
|
138
|
-
}
|
|
139
136
|
return {
|
|
140
137
|
writer,
|
|
141
138
|
mergeSet,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataConverter.js","sourceRoot":"","sources":["../../../src/convert/metadataConverter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"metadataConverter.js","sourceRoot":"","sources":["../../../src/convert/metadataConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { SourcePath } from '../common/types';
|
|
|
8
8
|
import { ComponentSet } from '../collections/componentSet';
|
|
9
9
|
import { RegistryAccess } from '../registry/registryAccess';
|
|
10
10
|
import { FileResponseSuccess } from '../client/types';
|
|
11
|
+
import { ForceIgnore } from '../resolve';
|
|
11
12
|
import { ConvertContext } from './convertContext/convertContext';
|
|
12
13
|
import { SfdxFileFormat, WriterFormat } from './types';
|
|
13
14
|
export declare const pipeline: typeof cbPipeline.__promisify__;
|
|
@@ -27,7 +28,6 @@ export declare class ComponentConverter extends Transform {
|
|
|
27
28
|
_flush(callback: (err: Error | undefined, data?: WriterFormat) => void): Promise<void>;
|
|
28
29
|
}
|
|
29
30
|
export declare abstract class ComponentWriter extends Writable {
|
|
30
|
-
forceIgnoredPaths: Set<string>;
|
|
31
31
|
protected rootDestination?: SourcePath;
|
|
32
32
|
protected logger: Logger;
|
|
33
33
|
constructor(rootDestination?: SourcePath);
|
|
@@ -36,6 +36,7 @@ export declare class StandardWriter extends ComponentWriter {
|
|
|
36
36
|
/** filepaths that converted files were written to */
|
|
37
37
|
readonly converted: string[];
|
|
38
38
|
readonly deleted: FileResponseSuccess[];
|
|
39
|
+
readonly forceignore: ForceIgnore;
|
|
39
40
|
constructor(rootDestination: SourcePath);
|
|
40
41
|
_write(chunk: WriterFormat, encoding: string, callback: (err?: Error) => void): Promise<void>;
|
|
41
42
|
}
|
|
@@ -21,6 +21,7 @@ const core_2 = require("@salesforce/core");
|
|
|
21
21
|
const constants_1 = require("../common/constants");
|
|
22
22
|
const fileSystemHandler_1 = require("../utils/fileSystemHandler");
|
|
23
23
|
const types_1 = require("../client/types");
|
|
24
|
+
const resolve_1 = require("../resolve");
|
|
24
25
|
const metadataTransformerFactory_1 = require("./transformers/metadataTransformerFactory");
|
|
25
26
|
const convertContext_1 = require("./convertContext/convertContext");
|
|
26
27
|
;
|
|
@@ -31,7 +32,6 @@ const stream2buffer = async (stream) => new Promise((resolve, reject) => {
|
|
|
31
32
|
const buf = Array();
|
|
32
33
|
stream.on('data', (chunk) => buf.push(chunk));
|
|
33
34
|
stream.on('end', () => resolve(Buffer.concat(buf)));
|
|
34
|
-
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
35
35
|
stream.on('error', (err) => reject(`error converting stream - ${err}`));
|
|
36
36
|
});
|
|
37
37
|
exports.stream2buffer = stream2buffer;
|
|
@@ -101,7 +101,6 @@ exports.ComponentConverter = ComponentConverter;
|
|
|
101
101
|
class ComponentWriter extends node_stream_1.Writable {
|
|
102
102
|
constructor(rootDestination) {
|
|
103
103
|
super({ objectMode: true });
|
|
104
|
-
this.forceIgnoredPaths = new Set();
|
|
105
104
|
this.rootDestination = rootDestination;
|
|
106
105
|
this.logger = core_2.Logger.childFromRoot(this.constructor.name);
|
|
107
106
|
}
|
|
@@ -113,6 +112,7 @@ class StandardWriter extends ComponentWriter {
|
|
|
113
112
|
/** filepaths that converted files were written to */
|
|
114
113
|
this.converted = [];
|
|
115
114
|
this.deleted = [];
|
|
115
|
+
this.forceignore = resolve_1.ForceIgnore.findAndCreate(rootDestination);
|
|
116
116
|
}
|
|
117
117
|
async _write(chunk, encoding, callback) {
|
|
118
118
|
let err;
|
|
@@ -124,8 +124,7 @@ class StandardWriter extends ComponentWriter {
|
|
|
124
124
|
// queue is empty when that call exits and overall less memory is consumed.
|
|
125
125
|
await Promise.all(chunk.writeInfos
|
|
126
126
|
.map(makeWriteInfoAbsolute(this.rootDestination))
|
|
127
|
-
.filter(existsOrDoesntMatchIgnored(this.
|
|
128
|
-
.filter((info) => !this.forceIgnoredPaths.has(info.output))
|
|
127
|
+
.filter(existsOrDoesntMatchIgnored(this.forceignore))
|
|
129
128
|
.map((info) => {
|
|
130
129
|
if (info.shouldDelete) {
|
|
131
130
|
this.deleted.push({
|
|
@@ -251,7 +250,5 @@ const makeWriteInfoAbsolute = (rootDestination = '') => (writeInfo) => ({
|
|
|
251
250
|
...writeInfo,
|
|
252
251
|
output: (0, node_path_1.isAbsolute)(writeInfo.output) ? writeInfo.output : (0, node_path_1.join)(rootDestination, writeInfo.output),
|
|
253
252
|
});
|
|
254
|
-
const existsOrDoesntMatchIgnored = (
|
|
255
|
-
[...ignoredPaths].every((ignoredPath) => !(0, node_path_1.dirname)(ignoredPath).includes((0, node_path_1.dirname)(writeInfo.output)) &&
|
|
256
|
-
!(0, node_path_1.basename)(ignoredPath).includes((0, node_path_1.basename)(writeInfo.output)));
|
|
253
|
+
const existsOrDoesntMatchIgnored = (forceignore) => (writeInfo) => (0, graceful_fs_1.existsSync)(writeInfo.output) || forceignore.accepts(writeInfo.output);
|
|
257
254
|
//# sourceMappingURL=streams.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":";;;;;;AAAA;;;;;GAKG;AACH,
|
|
1
|
+
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { MetadataXml, SourceAdapter } from '../types';
|
|
2
2
|
import { ForceIgnore } from '../forceIgnore';
|
|
3
|
-
import { TreeContainer } from '../treeContainers';
|
|
3
|
+
import { NodeFSTreeContainer, TreeContainer } from '../treeContainers';
|
|
4
4
|
import { SourceComponent } from '../sourceComponent';
|
|
5
5
|
import { SourcePath } from '../../common/types';
|
|
6
6
|
import { MetadataType } from '../../registry/types';
|
|
@@ -16,7 +16,7 @@ export declare abstract class BaseSourceAdapter implements SourceAdapter {
|
|
|
16
16
|
*/
|
|
17
17
|
protected ownFolder: boolean;
|
|
18
18
|
protected metadataWithContent: boolean;
|
|
19
|
-
constructor(type: MetadataType, registry?: RegistryAccess, forceIgnore?: ForceIgnore, tree?:
|
|
19
|
+
constructor(type: MetadataType, registry?: RegistryAccess, forceIgnore?: ForceIgnore, tree?: NodeFSTreeContainer);
|
|
20
20
|
getComponent(path: SourcePath, isResolvingSource?: boolean): SourceComponent | undefined;
|
|
21
21
|
/**
|
|
22
22
|
* Control whether metadata and content metadata files are allowed for an adapter.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/baseSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAAmD;AACnD,2CAAqD;AACrD,mDAAoD;AAEpD,2CAAyE;AACzE,gDAA6C;AAC7C,sDAAuE;AACvE,wDAAqD;AAGrD,kEAA+D;;AAG/D,MAAM,QAAQ,OAAG,eAAQ,CAAc,oCAAoC,EAAE,KAAK,6pKAAC,CAAC;AAEpF,MAAsB,iBAAiB;IAarC,YACE,IAAkB,EAClB,QAAQ,GAAG,IAAI,+BAAc,EAAE,EAC/B,
|
|
1
|
+
{"version":3,"file":"baseSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/baseSourceAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Connection
|
|
1
|
+
import { Connection } from '@salesforce/core';
|
|
2
2
|
import { RegistryAccess } from '../registry/registryAccess';
|
|
3
3
|
import { FileProperties } from '../client/types';
|
|
4
4
|
import { MetadataComponent } from './types';
|
|
@@ -10,11 +10,9 @@ export type ResolveConnectionResult = {
|
|
|
10
10
|
* Resolve MetadataComponents from an org connection
|
|
11
11
|
*/
|
|
12
12
|
export declare class ConnectionResolver {
|
|
13
|
-
protected logger: Logger;
|
|
14
13
|
private connection;
|
|
15
14
|
private registry;
|
|
16
15
|
private mdTypeNames;
|
|
17
16
|
constructor(connection: Connection, registry?: RegistryAccess, mdTypes?: string[]);
|
|
18
17
|
resolve(componentFilter?: (component: Partial<FileProperties>) => boolean): Promise<ResolveConnectionResult>;
|
|
19
|
-
private listMembers;
|
|
20
18
|
}
|
|
@@ -7,9 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.ConnectionResolver = void 0;
|
|
10
|
-
const ts_retry_promise_1 = require("ts-retry-promise");
|
|
11
10
|
const core_1 = require("@salesforce/core");
|
|
12
|
-
const kit_1 = require("@salesforce/kit");
|
|
13
11
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
14
12
|
const registryAccess_1 = require("../registry/registryAccess");
|
|
15
13
|
const standardvalueset_1 = require("../registry/standardvalueset");
|
|
@@ -23,7 +21,6 @@ class ConnectionResolver {
|
|
|
23
21
|
constructor(connection, registry = new registryAccess_1.RegistryAccess(), mdTypes) {
|
|
24
22
|
this.connection = connection;
|
|
25
23
|
this.registry = registry;
|
|
26
|
-
this.logger = core_1.Logger.childFromRoot(this.constructor.name);
|
|
27
24
|
this.mdTypeNames = mdTypes?.length
|
|
28
25
|
? // ensure the types passed in are valid per the registry
|
|
29
26
|
mdTypes.filter((t) => this.registry.getTypeByName(t))
|
|
@@ -34,18 +31,18 @@ class ConnectionResolver {
|
|
|
34
31
|
const childrenPromises = [];
|
|
35
32
|
const componentTypes = new Set();
|
|
36
33
|
const lifecycle = core_1.Lifecycle.getInstance();
|
|
37
|
-
const componentFromDescribe = (await Promise.all(this.mdTypeNames.map((type) => this.
|
|
34
|
+
const componentFromDescribe = (await Promise.all(this.mdTypeNames.map((type) => listMembers(this.registry)(this.connection)({ type })))).flat();
|
|
38
35
|
for (const component of componentFromDescribe) {
|
|
39
36
|
let componentType;
|
|
40
|
-
if (
|
|
37
|
+
if (isNonEmptyString(component.type)) {
|
|
41
38
|
componentType = this.registry.getTypeByName(component.type);
|
|
42
39
|
}
|
|
43
|
-
else if (
|
|
40
|
+
else if (isNonEmptyString(component.fileName)) {
|
|
44
41
|
// fix { type: { "$": { "xsi:nil": "true" } } }
|
|
45
42
|
componentType = (0, ts_types_1.ensurePlainObject)(this.registry.getTypeBySuffix((0, path_1.extName)(component.fileName)), `No type found for ${component.fileName} when matching by suffix. Check the file extension.`);
|
|
46
43
|
component.type = componentType.name;
|
|
47
44
|
}
|
|
48
|
-
else if (component.type
|
|
45
|
+
else if (!isNonEmptyString(component.type) && !isNonEmptyString(component.fileName)) {
|
|
49
46
|
// has no type and has no filename! Warn and skip that component.
|
|
50
47
|
// eslint-disable-next-line no-await-in-loop
|
|
51
48
|
await Promise.all([
|
|
@@ -61,10 +58,9 @@ class ConnectionResolver {
|
|
|
61
58
|
}
|
|
62
59
|
Aggregator.push(component);
|
|
63
60
|
componentTypes.add(componentType);
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
type: this.registry.getTypeByName(folderContentType).name,
|
|
61
|
+
if (componentType.folderContentType) {
|
|
62
|
+
childrenPromises.push(listMembers(this.registry)(this.connection)({
|
|
63
|
+
type: this.registry.getTypeByName(componentType.folderContentType).name,
|
|
68
64
|
folder: component.fullName,
|
|
69
65
|
}));
|
|
70
66
|
}
|
|
@@ -73,7 +69,7 @@ class ConnectionResolver {
|
|
|
73
69
|
const childTypes = componentType.children?.types;
|
|
74
70
|
if (childTypes) {
|
|
75
71
|
Object.values(childTypes).map((childType) => {
|
|
76
|
-
childrenPromises.push(this.
|
|
72
|
+
childrenPromises.push(listMembers(this.registry)(this.connection)({ type: childType.name }));
|
|
77
73
|
});
|
|
78
74
|
}
|
|
79
75
|
}
|
|
@@ -88,81 +84,46 @@ class ConnectionResolver {
|
|
|
88
84
|
apiVersion: this.connection.getApiVersion(),
|
|
89
85
|
};
|
|
90
86
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
// throw error if PollingClient timed out.
|
|
107
|
-
if (error instanceof ts_retry_promise_1.NotRetryableError) {
|
|
108
|
-
throw ts_retry_promise_1.NotRetryableError;
|
|
87
|
+
}
|
|
88
|
+
exports.ConnectionResolver = ConnectionResolver;
|
|
89
|
+
const listMembers = (registry) => (connection) => async (query) => {
|
|
90
|
+
const mdType = registry.getTypeByName(query.type);
|
|
91
|
+
// Workaround because metadata.list({ type: 'StandardValueSet' }) returns []
|
|
92
|
+
if (mdType.name === registry.getRegistry().types.standardvalueset.name) {
|
|
93
|
+
const members = [];
|
|
94
|
+
const standardValueSetPromises = standardvalueset_1.standardValueSet.fullnames.map(async (standardValueSetFullName) => {
|
|
95
|
+
try {
|
|
96
|
+
const standardValueSetRecord = await connection.singleRecordQuery(`SELECT Id, MasterLabel, Metadata FROM StandardValueSet WHERE MasterLabel = '${standardValueSetFullName}'`, { tooling: true });
|
|
97
|
+
return (standardValueSetRecord.Metadata.standardValue.length && {
|
|
98
|
+
fullName: standardValueSetRecord.MasterLabel,
|
|
99
|
+
fileName: `${mdType.directoryName}/${standardValueSetRecord.MasterLabel}.${mdType.suffix}`,
|
|
100
|
+
type: mdType.name,
|
|
101
|
+
});
|
|
109
102
|
}
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
// if the Metadata Type doesn't return a correct fileName then help it out
|
|
114
|
-
for (const m of members) {
|
|
115
|
-
if (typeof m.fileName == 'object') {
|
|
116
|
-
const t = this.registry.getTypeByName(query.type);
|
|
117
|
-
m.fileName = `${t.directoryName}/${m.fullName}.${t.suffix}`;
|
|
103
|
+
catch (err) {
|
|
104
|
+
const logger = core_1.Logger.childFromRoot('ConnectionResolver.listMembers');
|
|
105
|
+
logger.debug(err);
|
|
118
106
|
}
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
try {
|
|
124
|
-
// The 'singleRecordQuery' method was having connection errors, using `retry` resolves this
|
|
125
|
-
// Note that this type of connection retry logic may someday be added to jsforce v2
|
|
126
|
-
// Once that happens this logic could be reverted
|
|
127
|
-
const standardValueSetRecord = await (0, ts_retry_promise_1.retry)(async () => {
|
|
128
|
-
try {
|
|
129
|
-
return await this.connection.singleRecordQuery(`SELECT Id, MasterLabel, Metadata FROM StandardValueSet WHERE MasterLabel = '${standardValueSetFullName}'`, { tooling: true });
|
|
130
|
-
}
|
|
131
|
-
catch (err) {
|
|
132
|
-
// We exit the retry loop with `NotRetryableError` if we get an (expected) unsupported metadata type error
|
|
133
|
-
const error = err;
|
|
134
|
-
if (error.message.includes('either inaccessible or not supported in Metadata API')) {
|
|
135
|
-
this.logger.debug('Expected error:', error.message);
|
|
136
|
-
throw new ts_retry_promise_1.NotRetryableError(error.message);
|
|
137
|
-
}
|
|
138
|
-
// Otherwise throw the err so we can retry again
|
|
139
|
-
throw err;
|
|
140
|
-
}
|
|
141
|
-
});
|
|
142
|
-
return (standardValueSetRecord.Metadata.standardValue.length && {
|
|
143
|
-
fullName: standardValueSetRecord.MasterLabel,
|
|
144
|
-
fileName: `${this.registry.getRegistry().types.standardvalueset.directoryName}/${standardValueSetRecord.MasterLabel}.${this.registry.getRegistry().types.standardvalueset.suffix}`,
|
|
145
|
-
type: this.registry.getRegistry().types.standardvalueset.name,
|
|
146
|
-
});
|
|
147
|
-
}
|
|
148
|
-
catch (err) {
|
|
149
|
-
// error.message here will be overwritten by 'ts-retry-promise'
|
|
150
|
-
// Example error.message from the library: "All retries failed" or "Met not retryable error"
|
|
151
|
-
// 'ts-retry-promise' exposes the actual error on `error.lastError`
|
|
152
|
-
const error = err;
|
|
153
|
-
if (error.lastError?.message) {
|
|
154
|
-
this.logger.debug(error.lastError.message);
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
});
|
|
158
|
-
for await (const standardValueSetResult of standardValueSetPromises) {
|
|
159
|
-
if (standardValueSetResult) {
|
|
160
|
-
members.push(standardValueSetResult);
|
|
161
|
-
}
|
|
107
|
+
});
|
|
108
|
+
for await (const standardValueSetResult of standardValueSetPromises) {
|
|
109
|
+
if (standardValueSetResult) {
|
|
110
|
+
members.push(standardValueSetResult);
|
|
162
111
|
}
|
|
163
112
|
}
|
|
164
113
|
return members;
|
|
165
114
|
}
|
|
166
|
-
|
|
167
|
-
|
|
115
|
+
try {
|
|
116
|
+
return (await connection.metadata.list(query)).map(inferFilenamesFromType(mdType));
|
|
117
|
+
}
|
|
118
|
+
catch (error) {
|
|
119
|
+
const logger = core_1.Logger.childFromRoot('ConnectionResolver.listMembers');
|
|
120
|
+
logger.debug(error.message);
|
|
121
|
+
return [];
|
|
122
|
+
}
|
|
123
|
+
};
|
|
124
|
+
/* if the Metadata Type doesn't return a correct fileName then help it out */
|
|
125
|
+
const inferFilenamesFromType = (metadataType) => (member) => typeof member.fileName === 'object'
|
|
126
|
+
? { ...member, fileName: `${metadataType.directoryName}/${member.fullName}.${metadataType.suffix}` }
|
|
127
|
+
: member;
|
|
128
|
+
const isNonEmptyString = (value) => typeof value === 'string' && value.length > 0;
|
|
168
129
|
//# sourceMappingURL=connectionResolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectionResolver.js","sourceRoot":"","sources":["../../../src/resolve/connectionResolver.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"connectionResolver.js","sourceRoot":"","sources":["../../../src/resolve/connectionResolver.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAAoF;AACpF,mDAAsF;AACtF,+DAA4D;AAE5D,mEAAgE;AAEhE,wCAAwC;;AAMxC,MAAM,QAAQ,OAAG,eAAQ,CAAc,oCAAoC,EAAE,KAAK,6pKAAC,CAAC;AAOpF;;GAEG;AACH,MAAa,kBAAkB;IAQ7B,YAAmB,UAAsB,EAAE,QAAQ,GAAG,IAAI,+BAAc,EAAE,EAAE,OAAkB;QAC5F,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,OAAO,EAAE,MAAM;YAChC,CAAC,CAAC,wDAAwD;gBACxD,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YACvD,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC1E,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,kBAAkB,CAAC,SAAkC,EAAW,EAAE,CAAC,IAAA,wBAAa,EAAC,SAAS,CAAC;QAE3F,MAAM,UAAU,GAAmC,EAAE,CAAC;QACtD,MAAM,gBAAgB,GAA6C,EAAE,CAAC;QACtE,MAAM,cAAc,GAAsB,IAAI,GAAG,EAAE,CAAC;QACpD,MAAM,SAAS,GAAG,gBAAS,CAAC,WAAW,EAAE,CAAC;QAE1C,MAAM,qBAAqB,GAAG,CAC5B,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CACzG,CAAC,IAAI,EAAE,CAAC;QAET,KAAK,MAAM,SAAS,IAAI,qBAAqB,EAAE,CAAC;YAC9C,IAAI,aAA2B,CAAC;YAChC,IAAI,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrC,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC9D,CAAC;iBAAM,IAAI,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAChD,+CAA+C;gBAC/C,aAAa,GAAG,IAAA,4BAAiB,EAC/B,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAA,cAAO,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,EAC1D,qBAAqB,SAAS,CAAC,QAAQ,sDAAsD,CAC9F,CAAC;gBACF,SAAS,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;YACtC,CAAC;iBAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACtF,kEAAkE;gBAClE,4CAA4C;gBAC5C,MAAM,OAAO,CAAC,GAAG,CAAC;oBAChB,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,4BAA4B,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;oBAC9F,SAAS,CAAC,aAAa,CAAC,EAAE,kBAAkB,EAAE,SAAS,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC;iBACvF,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;iBAAM,CAAC;gBACN,kEAAkE;gBAClE,mCAAmC;gBACnC,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,4BAA4B,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,EACvE,oBAAoB,EACpB,CAAC,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC,CAAC,CACvD,CAAC;YACJ,CAAC;YAED,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3B,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAClC,IAAI,aAAa,CAAC,iBAAiB,EAAE,CAAC;gBACpC,gBAAgB,CAAC,IAAI,CACnB,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAC1C,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,IAAI;oBACvE,MAAM,EAAE,SAAS,CAAC,QAAQ;iBAC3B,CAAC,CACH,CAAC;YACJ,CAAC;QACH,CAAC;QAED,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;YAC3C,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC;YACjD,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;oBAC1C,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC/F,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,IAAI,KAAK,EAAE,MAAM,cAAc,IAAI,gBAAgB,EAAE,CAAC;YACpD,UAAU,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;QACrC,CAAC;QAED,OAAO;YACL,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBACjE,QAAQ,EAAE,IAAA,uBAAY,EAAC,SAAS,CAAC,QAAQ,EAAE,sCAAsC,SAAS,CAAC,QAAQ,EAAE,CAAC;gBACtG,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAC/B,IAAA,uBAAY,EAAC,SAAS,CAAC,IAAI,EAAE,kCAAkC,SAAS,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ,GAAG,CAAC,CAC7G;aACF,CAAC,CAAC;YACH,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE;SAC5C,CAAC;IACJ,CAAC;CACF;AA7FD,gDA6FC;AAED,MAAM,WAAW,GACf,CAAC,QAAwB,EAAE,EAAE,CAC7B,CAAC,UAAsB,EAAE,EAAE,CAC3B,KAAK,EAAE,KAAwB,EAAqC,EAAE;IACpE,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElD,4EAA4E;IAC5E,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;QACvE,MAAM,OAAO,GAA6B,EAAE,CAAC;QAE7C,MAAM,wBAAwB,GAAG,mCAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,wBAAwB,EAAE,EAAE;YACjG,IAAI,CAAC;gBACH,MAAM,sBAAsB,GAAsB,MAAM,UAAU,CAAC,iBAAiB,CAClF,+EAA+E,wBAAwB,GAAG,EAC1G,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;gBAEF,OAAO,CACL,sBAAsB,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,IAAI;oBACtD,QAAQ,EAAE,sBAAsB,CAAC,WAAW;oBAC5C,QAAQ,EAAE,GAAG,MAAM,CAAC,aAAa,IAAI,sBAAsB,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE;oBAC1F,IAAI,EAAE,MAAM,CAAC,IAAI;iBAClB,CACF,CAAC;YACJ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,MAAM,GAAG,aAAM,CAAC,aAAa,CAAC,gCAAgC,CAAC,CAAC;gBACtE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,sBAAsB,IAAI,wBAAwB,EAAE,CAAC;YACpE,IAAI,sBAAsB,EAAE,CAAC;gBAC3B,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,CAAC;QACH,OAAO,CAAC,MAAM,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC;IACrF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,aAAM,CAAC,aAAa,CAAC,gCAAgC,CAAC,CAAC;QACtE,MAAM,CAAC,KAAK,CAAE,KAAe,CAAC,OAAO,CAAC,CAAC;QACvC,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAEJ,6EAA6E;AAC7E,MAAM,sBAAsB,GAC1B,CAAC,YAA0B,EAAE,EAAE,CAC/B,CAAC,MAA8B,EAA0B,EAAE,CACzD,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ;IACjC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,aAAa,IAAI,MAAM,CAAC,QAAQ,IAAI,YAAY,CAAC,MAAM,EAAE,EAAE;IACpG,CAAC,CAAC,MAAM,CAAC;AAEf,MAAM,gBAAgB,GAAG,CAAC,KAAyB,EAAW,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forceIgnore.js","sourceRoot":"","sources":["../../../src/resolve/forceIgnore.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,yCAAoD;AACpD,yDAA8C;AAC9C,6CAA2C;AAC3C,2CAA6C;AAE7C,kEAAsD;AAEtD,MAAa,WAAW;IAOtB,YAAmB,eAAe,GAAG,EAAE;QAF/B,mBAAc,
|
|
1
|
+
{"version":3,"file":"forceIgnore.js","sourceRoot":"","sources":["../../../src/resolve/forceIgnore.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,yCAAoD;AACpD,yDAA8C;AAC9C,6CAA2C;AAC3C,2CAA6C;AAE7C,kEAAsD;AAEtD,MAAa,WAAW;IAOtB,YAAmB,eAAe,GAAG,EAAE;QAF/B,mBAAc,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,6BAA6B,EAAE,2BAA2B,CAAC,CAAC;QAGzG,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAA,0BAAY,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACxD,sCAAsC;YACtC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,kDAAkD;gBAClD,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC5B,0DAA0D;oBAC1D,KAAK,gBAAS,CAAC,WAAW,EAAE,CAAC,WAAW,CACtC,2LAA2L,CAC5L,CAAC;gBACJ,CAAC;gBACD,qEAAqE;gBACrE,IAAI,CAAC,MAAM,GAAG,IAAA,eAAM,GAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC,CAAC;gBAE7E,IAAI,CAAC,oBAAoB,GAAG,IAAA,mBAAO,EAAC,eAAe,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,4BAA4B;QAC9B,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,aAAa,CAAC,IAAgB;QAC1C,IAAI,wBAAwB,GAAG,EAAE,CAAC;QAClC,MAAM,iBAAiB,GAAG,IAAA,4BAAQ,EAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAChE,IAAI,iBAAiB,EAAE,CAAC;YACtB,wBAAwB,GAAG,IAAA,gBAAI,EAAC,IAAA,mBAAO,EAAC,iBAAiB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QACrF,CAAC;QACD,OAAO,IAAI,WAAW,CAAC,wBAAwB,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,MAAkB;QAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,oBAAoB;YAAE,OAAO,KAAK,CAAC;QAC7D,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAA,oBAAQ,EAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;QAC1E,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEM,OAAO,CAAC,MAAkB;QAC/B,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,oBAAoB;YAAE,OAAO,IAAI,CAAC;QAC5D,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAA,oBAAQ,EAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;QAC3E,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;;AA7DH,kCA8DC;AA7DwB,qBAAS,GAAG,cAAc,AAAjB,CAAkB"}
|
|
@@ -16,6 +16,7 @@ export declare class MetadataResolver {
|
|
|
16
16
|
/**
|
|
17
17
|
* @param registry Custom registry data
|
|
18
18
|
* @param tree `TreeContainer` to traverse with
|
|
19
|
+
* @param useFsForceIgnore false = use default forceignore entries, true = search and use forceignore in project
|
|
19
20
|
*/
|
|
20
21
|
constructor(registry?: RegistryAccess, tree?: TreeContainer, useFsForceIgnore?: boolean);
|
|
21
22
|
/**
|
|
@@ -26,6 +26,7 @@ class MetadataResolver {
|
|
|
26
26
|
/**
|
|
27
27
|
* @param registry Custom registry data
|
|
28
28
|
* @param tree `TreeContainer` to traverse with
|
|
29
|
+
* @param useFsForceIgnore false = use default forceignore entries, true = search and use forceignore in project
|
|
29
30
|
*/
|
|
30
31
|
constructor(registry = new registryAccess_1.RegistryAccess(), tree = new treeContainers_1.NodeFSTreeContainer(), useFsForceIgnore = true) {
|
|
31
32
|
this.registry = registry;
|
|
@@ -167,7 +168,7 @@ const isProbablyPackageManifest = (tree) => (fsPath) => {
|
|
|
167
168
|
* If a type can be determined from a directory path, and the end part of the path isn't
|
|
168
169
|
* the directoryName of the type itself, infer the path is part of a mixedContent component
|
|
169
170
|
*
|
|
170
|
-
* @param
|
|
171
|
+
* @param registry the registry to resolve a type against
|
|
171
172
|
*/
|
|
172
173
|
const resolveDirectoryAsComponent = (registry) => (tree) => (dirPath) => {
|
|
173
174
|
const type = resolveType(registry)(tree)(dirPath);
|
|
@@ -198,8 +199,8 @@ const isMetadata = (registry) => (tree) => (fsPath) => !!(0, path_1.parseMetadat
|
|
|
198
199
|
* Attempt to find similar types for types that could not be inferred
|
|
199
200
|
* To be used after executing the resolveType() method
|
|
200
201
|
*
|
|
201
|
-
* @param fsPath
|
|
202
202
|
* @returns an array of suggestions
|
|
203
|
+
* @param registry a metdata registry to resolve types against
|
|
203
204
|
*/
|
|
204
205
|
const getSuggestionsForUnresolvedTypes = (registry) => (fsPath) => {
|
|
205
206
|
const parsedMetaXml = (0, path_1.parseMetadataXml)(fsPath);
|
|
@@ -301,7 +302,7 @@ const resolveType = (registry) => (tree) => (fsPath) => {
|
|
|
301
302
|
/**
|
|
302
303
|
* Any file with a registered suffix is potentially a content metadata file.
|
|
303
304
|
*
|
|
304
|
-
* @param
|
|
305
|
+
* @param registry a metadata registry to resolve types agsinst
|
|
305
306
|
*/
|
|
306
307
|
const parseAsContentMetadataXml = (registry) => (fsPath) => Boolean(registry.getTypeBySuffix((0, path_1.extName)(fsPath)));
|
|
307
308
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,8 +25,8 @@ export declare class SourceComponent implements MetadataComponent {
|
|
|
25
25
|
parentType?: MetadataType;
|
|
26
26
|
content?: string;
|
|
27
27
|
replacements?: Record<string, MarkedReplacement[]>;
|
|
28
|
-
private treeContainer;
|
|
29
|
-
private forceIgnore;
|
|
28
|
+
private readonly treeContainer;
|
|
29
|
+
private readonly forceIgnore;
|
|
30
30
|
private markedForDelete;
|
|
31
31
|
private destructiveChangesType?;
|
|
32
32
|
constructor(props: ComponentProperties, tree?: TreeContainer, forceIgnore?: ForceIgnore);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/source-deploy-retrieve",
|
|
3
|
-
"version": "11.1.
|
|
3
|
+
"version": "11.1.2",
|
|
4
4
|
"description": "JavaScript library to run Salesforce metadata deploys and retrieves",
|
|
5
5
|
"main": "lib/src/index.js",
|
|
6
6
|
"author": "Salesforce",
|
|
@@ -36,8 +36,7 @@
|
|
|
36
36
|
"jszip": "^3.10.1",
|
|
37
37
|
"mime": "2.6.0",
|
|
38
38
|
"minimatch": "^5.1.6",
|
|
39
|
-
"proxy-agent": "^6.4.0"
|
|
40
|
-
"ts-retry-promise": "^0.7.1"
|
|
39
|
+
"proxy-agent": "^6.4.0"
|
|
41
40
|
},
|
|
42
41
|
"devDependencies": {
|
|
43
42
|
"@jsforce/jsforce-node": "^3.1.0",
|