@salesforce/source-deploy-retrieve 11.1.0 → 11.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- import { Connection, Logger } from '@salesforce/core';
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.listMembers({ type })))).flat();
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 (typeof component.type === 'string' && component.type.length) {
37
+ if (isNonEmptyString(component.type)) {
41
38
  componentType = this.registry.getTypeByName(component.type);
42
39
  }
43
- else if (typeof component.fileName === 'string' && component.fileName.length) {
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 === undefined && component.fileName === undefined) {
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
- const folderContentType = componentType.folderContentType;
65
- if (folderContentType) {
66
- childrenPromises.push(this.listMembers({
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.listMembers({ type: childType.name }));
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
- async listMembers(query) {
92
- let members = [];
93
- const pollingOptions = {
94
- frequency: kit_1.Duration.milliseconds(1000),
95
- timeout: kit_1.Duration.minutes(3),
96
- poll: async () => {
97
- const res = (0, kit_1.ensureArray)(await this.connection.metadata.list(query));
98
- return { completed: true, payload: res };
99
- },
100
- };
101
- const pollingClient = await core_1.PollingClient.create(pollingOptions);
102
- try {
103
- members = await pollingClient.subscribe();
104
- }
105
- catch (error) {
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
- this.logger.debug(error.message);
111
- members = [];
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
- // Workaround because metadata.list({ type: 'StandardValueSet' }) returns []
121
- if (query.type === this.registry.getRegistry().types.standardvalueset.name && members.length === 0) {
122
- const standardValueSetPromises = standardvalueset_1.standardValueSet.fullnames.map(async (standardValueSetFullName) => {
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
- exports.ConnectionResolver = ConnectionResolver;
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":"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"}
1
+ {"version":3,"file":"connectionResolver.js","sourceRoot":"","sources":["../../../src/resolve/connectionResolver.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@salesforce/source-deploy-retrieve",
3
- "version": "11.1.0",
3
+ "version": "11.1.1",
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",