@salesforce/source-deploy-retrieve 5.0.0 → 5.1.0
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 +50 -44
- package/LICENSE.txt +12 -0
- package/README.md +2 -2
- package/lib/src/client/deployStrategies/auraDeploy.d.ts +2 -2
- package/lib/src/client/deployStrategies/auraDeploy.js +98 -108
- package/lib/src/client/deployStrategies/auraDeploy.js.map +1 -1
- package/lib/src/client/deployStrategies/baseDeploy.d.ts +1 -1
- package/lib/src/client/deployStrategies/baseDeploy.js +37 -38
- package/lib/src/client/deployStrategies/baseDeploy.js.map +1 -1
- package/lib/src/client/deployStrategies/containerDeploy.d.ts +2 -2
- package/lib/src/client/deployStrategies/containerDeploy.js +57 -72
- package/lib/src/client/deployStrategies/containerDeploy.js.map +1 -1
- package/lib/src/client/deployStrategies/index.js +4 -3
- package/lib/src/client/deployStrategies/index.js.map +1 -1
- package/lib/src/client/deployStrategies/lwcDeploy.d.ts +2 -2
- package/lib/src/client/deployStrategies/lwcDeploy.js +98 -109
- package/lib/src/client/deployStrategies/lwcDeploy.js.map +1 -1
- package/lib/src/client/diagnosticUtil.d.ts +1 -1
- package/lib/src/client/diagnosticUtil.js +11 -11
- package/lib/src/client/diagnosticUtil.js.map +1 -1
- package/lib/src/client/index.d.ts +1 -1
- package/lib/src/client/index.js +1 -1
- package/lib/src/client/index.js.map +1 -1
- package/lib/src/client/metadataApiDeploy.d.ts +4 -4
- package/lib/src/client/metadataApiDeploy.js +57 -73
- package/lib/src/client/metadataApiDeploy.js.map +1 -1
- package/lib/src/client/metadataApiRetrieve.d.ts +2 -2
- package/lib/src/client/metadataApiRetrieve.js +86 -106
- package/lib/src/client/metadataApiRetrieve.js.map +1 -1
- package/lib/src/client/metadataTransfer.d.ts +2 -2
- package/lib/src/client/metadataTransfer.js +101 -118
- package/lib/src/client/metadataTransfer.js.map +1 -1
- package/lib/src/client/retrieveUtil.d.ts +1 -1
- package/lib/src/client/retrieveUtil.js +17 -17
- package/lib/src/client/retrieveUtil.js.map +1 -1
- package/lib/src/client/toolingApi.d.ts +2 -2
- package/lib/src/client/toolingApi.js +71 -94
- package/lib/src/client/toolingApi.js.map +1 -1
- package/lib/src/client/types.js +1 -14
- package/lib/src/client/types.js.map +1 -1
- package/lib/src/collections/componentSet.d.ts +5 -2
- package/lib/src/collections/componentSet.js +77 -91
- package/lib/src/collections/componentSet.js.map +1 -1
- package/lib/src/collections/index.js +1 -0
- package/lib/src/collections/index.js.map +1 -1
- package/lib/src/collections/lazyCollection.js +5 -1
- package/lib/src/collections/lazyCollection.js.map +1 -1
- package/lib/src/common/constants.js +1 -1
- package/lib/src/common/constants.js.map +1 -1
- package/lib/src/common/index.d.ts +1 -1
- package/lib/src/common/index.js +1 -0
- package/lib/src/common/index.js.map +1 -1
- package/lib/src/convert/convertContext.d.ts +8 -10
- package/lib/src/convert/convertContext.js +162 -197
- package/lib/src/convert/convertContext.js.map +1 -1
- package/lib/src/convert/index.js +1 -0
- package/lib/src/convert/index.js.map +1 -1
- package/lib/src/convert/metadataConverter.d.ts +2 -17
- package/lib/src/convert/metadataConverter.js +106 -111
- package/lib/src/convert/metadataConverter.js.map +1 -1
- package/lib/src/convert/streams.d.ts +4 -4
- package/lib/src/convert/streams.js +111 -147
- package/lib/src/convert/streams.js.map +1 -1
- package/lib/src/convert/transformers/baseMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/decomposedMetadataTransformer.d.ts +2 -1
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js +125 -133
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/defaultMetadataTransformer.d.ts +1 -1
- package/lib/src/convert/transformers/defaultMetadataTransformer.js +11 -23
- package/lib/src/convert/transformers/defaultMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/index.js +1 -0
- package/lib/src/convert/transformers/index.js.map +1 -1
- package/lib/src/convert/transformers/metadataTransformerFactory.js +1 -1
- package/lib/src/convert/transformers/metadataTransformerFactory.js.map +1 -1
- package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.d.ts +1 -1
- package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.js +18 -29
- package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/staticResourceMetadataTransformer.d.ts +1 -1
- package/lib/src/convert/transformers/staticResourceMetadataTransformer.js +78 -132
- package/lib/src/convert/transformers/staticResourceMetadataTransformer.js.map +1 -1
- package/lib/src/convert/types.d.ts +1 -1
- package/lib/src/errors/index.js.map +1 -1
- package/lib/src/i18n/i18n.js +3 -2
- package/lib/src/i18n/i18n.js.map +1 -1
- package/lib/src/i18n/index.js +3 -4
- package/lib/src/i18n/index.js.map +1 -1
- package/lib/src/i18n/localization.js +4 -4
- package/lib/src/i18n/localization.js.map +1 -1
- package/lib/src/index.js +1 -4
- package/lib/src/index.js.map +1 -1
- package/lib/src/registry/index.js +1 -4
- package/lib/src/registry/index.js.map +1 -1
- package/lib/src/registry/{registry.json → metadataRegistry.json} +35 -2
- package/lib/src/registry/nonSupportedTypes.js +5 -7
- package/lib/src/registry/nonSupportedTypes.js.map +1 -1
- package/lib/src/registry/registry.d.ts +33 -0
- package/lib/src/registry/registry.js +2 -2
- package/lib/src/registry/registry.js.map +1 -1
- package/lib/src/registry/registryAccess.d.ts +2 -0
- package/lib/src/registry/registryAccess.js +3 -1
- package/lib/src/registry/registryAccess.js.map +1 -1
- package/lib/src/registry/types.js +0 -35
- package/lib/src/registry/types.js.map +1 -1
- package/lib/src/resolve/adapters/baseSourceAdapter.d.ts +2 -2
- package/lib/src/resolve/adapters/baseSourceAdapter.js +20 -16
- package/lib/src/resolve/adapters/baseSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/bundleSourceAdapter.d.ts +1 -1
- package/lib/src/resolve/adapters/bundleSourceAdapter.js +0 -6
- package/lib/src/resolve/adapters/bundleSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/decomposedSourceAdapter.d.ts +1 -1
- package/lib/src/resolve/adapters/decomposedSourceAdapter.js +6 -13
- package/lib/src/resolve/adapters/decomposedSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/defaultSourceAdapter.d.ts +1 -1
- package/lib/src/resolve/adapters/defaultSourceAdapter.js +0 -6
- package/lib/src/resolve/adapters/defaultSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/index.js +1 -0
- package/lib/src/resolve/adapters/index.js.map +1 -1
- package/lib/src/resolve/adapters/matchingContentSourceAdapter.d.ts +1 -1
- package/lib/src/resolve/adapters/matchingContentSourceAdapter.js +2 -2
- package/lib/src/resolve/adapters/matchingContentSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/mixedContentSourceAdapter.d.ts +1 -1
- package/lib/src/resolve/adapters/mixedContentSourceAdapter.js +6 -6
- package/lib/src/resolve/adapters/mixedContentSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/sourceAdapterFactory.js +2 -2
- package/lib/src/resolve/adapters/sourceAdapterFactory.js.map +1 -1
- package/lib/src/resolve/forceIgnore.js +9 -14
- package/lib/src/resolve/forceIgnore.js.map +1 -1
- package/lib/src/resolve/index.d.ts +1 -1
- package/lib/src/resolve/index.js +1 -0
- package/lib/src/resolve/index.js.map +1 -1
- package/lib/src/resolve/manifestResolver.js +25 -36
- package/lib/src/resolve/manifestResolver.js.map +1 -1
- package/lib/src/resolve/metadataResolver.d.ts +6 -5
- package/lib/src/resolve/metadataResolver.js +18 -23
- package/lib/src/resolve/metadataResolver.js.map +1 -1
- package/lib/src/resolve/sourceComponent.d.ts +4 -4
- package/lib/src/resolve/sourceComponent.js +32 -44
- package/lib/src/resolve/sourceComponent.js.map +1 -1
- package/lib/src/resolve/treeContainers.d.ts +9 -1
- package/lib/src/resolve/treeContainers.js +46 -32
- package/lib/src/resolve/treeContainers.js.map +1 -1
- package/lib/src/resolve/types.d.ts +2 -2
- package/lib/src/utils/collections.js +1 -1
- package/lib/src/utils/collections.js.map +1 -1
- package/lib/src/utils/fileSystemHandler.js +1 -1
- package/lib/src/utils/fileSystemHandler.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/metadata.js +1 -3
- package/lib/src/utils/metadata.js.map +1 -1
- package/lib/src/utils/path.d.ts +5 -1
- package/lib/src/utils/path.js +8 -4
- package/lib/src/utils/path.js.map +1 -1
- package/package.json +40 -38
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nonDecomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/nonDecomposedMetadataTransformer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG
|
|
1
|
+
{"version":3,"file":"nonDecomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/nonDecomposedMetadataTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { BaseMetadataTransformer } from './baseMetadataTransformer';
|
|
2
1
|
import { WriteInfo } from '..';
|
|
3
2
|
import { SourceComponent } from '../../resolve';
|
|
3
|
+
import { BaseMetadataTransformer } from './baseMetadataTransformer';
|
|
4
4
|
export declare class StaticResourceMetadataTransformer extends BaseMetadataTransformer {
|
|
5
5
|
static readonly ARCHIVE_MIME_TYPES: Set<string>;
|
|
6
6
|
private static readonly DEFAULT_CONTENT_TYPE;
|
|
@@ -1,32 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
12
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
13
|
-
var m = o[Symbol.asyncIterator], i;
|
|
14
|
-
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
15
|
-
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
16
|
-
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
17
|
-
};
|
|
18
|
-
var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
|
|
19
|
-
var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
|
|
20
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
21
|
-
var g = generator.apply(thisArg, _arguments || []), i, q = [];
|
|
22
|
-
return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
|
|
23
|
-
function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
|
|
24
|
-
function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
|
|
25
|
-
function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
|
|
26
|
-
function fulfill(value) { resume("next", value); }
|
|
27
|
-
function reject(value) { resume("throw", value); }
|
|
28
|
-
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
29
|
-
};
|
|
30
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
3
|
exports.StaticResourceMetadataTransformer = void 0;
|
|
32
4
|
/*
|
|
@@ -35,137 +7,111 @@ exports.StaticResourceMetadataTransformer = void 0;
|
|
|
35
7
|
* Licensed under the BSD 3-Clause license.
|
|
36
8
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
37
9
|
*/
|
|
38
|
-
const
|
|
10
|
+
const path_1 = require("path");
|
|
39
11
|
const archiver_1 = require("archiver");
|
|
40
12
|
const mime_1 = require("mime");
|
|
41
13
|
const unzipper_1 = require("unzipper");
|
|
42
|
-
const path_1 = require("path");
|
|
43
14
|
const utils_1 = require("../../utils");
|
|
44
15
|
const errors_1 = require("../../errors");
|
|
16
|
+
const baseMetadataTransformer_1 = require("./baseMetadataTransformer");
|
|
45
17
|
class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMetadataTransformer {
|
|
46
|
-
toMetadataFormat(component) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
];
|
|
71
|
-
});
|
|
18
|
+
async toMetadataFormat(component) {
|
|
19
|
+
const { content, type, xml } = component;
|
|
20
|
+
let contentSource;
|
|
21
|
+
if (await this.componentIsExpandedArchive(component)) {
|
|
22
|
+
// toolbelt was using level 9 for static resources, so we'll do the same.
|
|
23
|
+
// Otherwise, you'll see errors like https://github.com/forcedotcom/cli/issues/1098
|
|
24
|
+
const zip = (0, archiver_1.create)('zip', { zlib: { level: 9 } });
|
|
25
|
+
zip.directory(content, false);
|
|
26
|
+
void zip.finalize();
|
|
27
|
+
contentSource = zip;
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
contentSource = component.tree.stream(content);
|
|
31
|
+
}
|
|
32
|
+
return [
|
|
33
|
+
{
|
|
34
|
+
source: contentSource,
|
|
35
|
+
output: (0, path_1.join)(type.directoryName, `${(0, utils_1.baseName)(content)}.${type.suffix}`),
|
|
36
|
+
},
|
|
37
|
+
{
|
|
38
|
+
source: component.tree.stream(xml),
|
|
39
|
+
output: (0, path_1.join)(type.directoryName, (0, path_1.basename)(xml)),
|
|
40
|
+
},
|
|
41
|
+
];
|
|
72
42
|
}
|
|
73
|
-
toSourceFormat(component, mergeWith) {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
const
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
try {
|
|
88
|
-
for (var _b = __asyncValues(this.createWriteInfosFromArchive(zipBuffer, baseContentPath)), _c; _c = yield _b.next(), !_c.done;) {
|
|
89
|
-
const info = _c.value;
|
|
90
|
-
writeInfos.push(info);
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
94
|
-
finally {
|
|
95
|
-
try {
|
|
96
|
-
if (_c && !_c.done && (_a = _b.return)) yield _a.call(_b);
|
|
97
|
-
}
|
|
98
|
-
finally { if (e_1) throw e_1.error; }
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
else {
|
|
102
|
-
const extension = this.getExtensionFromType(componentContentType);
|
|
103
|
-
writeInfos.push({
|
|
104
|
-
source: component.tree.stream(content),
|
|
105
|
-
output: `${baseContentPath}.${extension}`,
|
|
106
|
-
});
|
|
43
|
+
async toSourceFormat(component, mergeWith) {
|
|
44
|
+
const { xml, content } = component;
|
|
45
|
+
const writeInfos = [];
|
|
46
|
+
if (content) {
|
|
47
|
+
const componentContentType = await this.getContentType(component);
|
|
48
|
+
const mergeContentPath = mergeWith === null || mergeWith === void 0 ? void 0 : mergeWith.content;
|
|
49
|
+
const baseContentPath = this.getBaseContentPath(component, mergeWith);
|
|
50
|
+
// only unzip an archive component if there isn't a merge component, or the merge component is itself expanded
|
|
51
|
+
const shouldUnzipArchive = StaticResourceMetadataTransformer.ARCHIVE_MIME_TYPES.has(componentContentType) &&
|
|
52
|
+
(!mergeWith || mergeWith.tree.isDirectory(mergeContentPath));
|
|
53
|
+
if (shouldUnzipArchive) {
|
|
54
|
+
const zipBuffer = await component.tree.readFile(content);
|
|
55
|
+
for await (const info of this.createWriteInfosFromArchive(zipBuffer, baseContentPath)) {
|
|
56
|
+
writeInfos.push(info);
|
|
107
57
|
}
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
const extension = this.getExtensionFromType(componentContentType);
|
|
108
61
|
writeInfos.push({
|
|
109
|
-
source: component.tree.stream(
|
|
110
|
-
output:
|
|
62
|
+
source: component.tree.stream(content),
|
|
63
|
+
output: `${baseContentPath}.${extension}`,
|
|
111
64
|
});
|
|
112
65
|
}
|
|
113
|
-
|
|
114
|
-
|
|
66
|
+
writeInfos.push({
|
|
67
|
+
source: component.tree.stream(xml),
|
|
68
|
+
output: (mergeWith === null || mergeWith === void 0 ? void 0 : mergeWith.xml) || component.getPackageRelativePath((0, path_1.basename)(xml), 'source'),
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
return writeInfos;
|
|
115
72
|
}
|
|
116
73
|
getBaseContentPath(component, mergeWith) {
|
|
117
74
|
const baseContentPath = (mergeWith === null || mergeWith === void 0 ? void 0 : mergeWith.content) || component.getPackageRelativePath(component.content, 'source');
|
|
118
|
-
return path_1.join(path_1.dirname(baseContentPath), utils_1.baseName(baseContentPath));
|
|
75
|
+
return (0, path_1.join)((0, path_1.dirname)(baseContentPath), (0, utils_1.baseName)(baseContentPath));
|
|
119
76
|
}
|
|
120
77
|
/**
|
|
121
78
|
* "Expanded" refers to a component whose content file is a zip file, and its current
|
|
122
79
|
* state is unzipped.
|
|
123
80
|
*/
|
|
124
|
-
componentIsExpandedArchive(component) {
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
return true;
|
|
131
|
-
}
|
|
132
|
-
throw new errors_1.LibraryError('error_static_resource_expected_archive_type', [
|
|
133
|
-
contentType,
|
|
134
|
-
component.name,
|
|
135
|
-
]);
|
|
81
|
+
async componentIsExpandedArchive(component) {
|
|
82
|
+
const { content, tree } = component;
|
|
83
|
+
if (tree.isDirectory(content)) {
|
|
84
|
+
const contentType = await this.getContentType(component);
|
|
85
|
+
if (StaticResourceMetadataTransformer.ARCHIVE_MIME_TYPES.has(contentType)) {
|
|
86
|
+
return true;
|
|
136
87
|
}
|
|
137
|
-
|
|
138
|
-
}
|
|
88
|
+
throw new errors_1.LibraryError('error_static_resource_expected_archive_type', [contentType, component.name]);
|
|
89
|
+
}
|
|
90
|
+
return false;
|
|
139
91
|
}
|
|
140
|
-
createWriteInfosFromArchive(zipBuffer, baseDir) {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
});
|
|
149
|
-
}
|
|
92
|
+
async *createWriteInfosFromArchive(zipBuffer, baseDir) {
|
|
93
|
+
const directory = await unzipper_1.Open.buffer(zipBuffer);
|
|
94
|
+
for (const entry of directory.files) {
|
|
95
|
+
if (entry.type === 'File') {
|
|
96
|
+
yield {
|
|
97
|
+
source: entry.stream(),
|
|
98
|
+
output: (0, path_1.join)(baseDir, entry.path),
|
|
99
|
+
};
|
|
150
100
|
}
|
|
151
|
-
}
|
|
101
|
+
}
|
|
152
102
|
}
|
|
153
|
-
getContentType(component) {
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
]);
|
|
160
|
-
}
|
|
161
|
-
return resource.contentType;
|
|
162
|
-
});
|
|
103
|
+
async getContentType(component) {
|
|
104
|
+
const resource = (await component.parseXml()).StaticResource;
|
|
105
|
+
if (!resource || !Object.prototype.hasOwnProperty.call(resource, 'contentType')) {
|
|
106
|
+
throw new errors_1.LibraryError('error_static_resource_missing_resource_file', [(0, path_1.join)('staticresources', component.name)]);
|
|
107
|
+
}
|
|
108
|
+
return resource.contentType;
|
|
163
109
|
}
|
|
164
110
|
getExtensionFromType(contentType) {
|
|
165
111
|
// return registered ext, fallback, or the default (application/octet-stream -> bin)
|
|
166
|
-
return (mime_1.getExtension(contentType) ||
|
|
112
|
+
return ((0, mime_1.getExtension)(contentType) ||
|
|
167
113
|
StaticResourceMetadataTransformer.FALLBACK_TYPE_MAP.get(contentType) ||
|
|
168
|
-
mime_1.getExtension(StaticResourceMetadataTransformer.DEFAULT_CONTENT_TYPE));
|
|
114
|
+
(0, mime_1.getExtension)(StaticResourceMetadataTransformer.DEFAULT_CONTENT_TYPE));
|
|
169
115
|
}
|
|
170
116
|
}
|
|
171
117
|
exports.StaticResourceMetadataTransformer = StaticResourceMetadataTransformer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"staticResourceMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/staticResourceMetadataTransformer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"staticResourceMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/staticResourceMetadataTransformer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA+C;AAE/C,uCAAmD;AACnD,+BAAoC;AACpC,uCAAgC;AAEhC,uCAAuC;AAEvC,yCAA4C;AAG5C,uEAAoE;AAEpE,MAAa,iCAAkC,SAAQ,iDAAuB;IAgBrE,KAAK,CAAC,gBAAgB,CAAC,SAA0B;QACtD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;QAEzC,IAAI,aAAuB,CAAC;QAE5B,IAAI,MAAM,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,EAAE;YACpD,yEAAyE;YACzE,mFAAmF;YACnF,MAAM,GAAG,GAAG,IAAA,iBAAa,EAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACzD,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC9B,KAAK,GAAG,CAAC,QAAQ,EAAE,CAAC;YACpB,aAAa,GAAG,GAAG,CAAC;SACrB;aAAM;YACL,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SAChD;QAED,OAAO;YACL;gBACE,MAAM,EAAE,aAAa;gBACrB,MAAM,EAAE,IAAA,WAAI,EAAC,IAAI,CAAC,aAAa,EAAE,GAAG,IAAA,gBAAQ,EAAC,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;aACxE;YACD;gBACE,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;gBAClC,MAAM,EAAE,IAAA,WAAI,EAAC,IAAI,CAAC,aAAa,EAAE,IAAA,eAAQ,EAAC,GAAG,CAAC,CAAC;aAChD;SACF,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,SAA0B,EAAE,SAA2B;QACjF,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;QACnC,MAAM,UAAU,GAAgB,EAAE,CAAC;QAEnC,IAAI,OAAO,EAAE;YACX,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YAClE,MAAM,gBAAgB,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,CAAC;YAC5C,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YAEtE,8GAA8G;YAC9G,MAAM,kBAAkB,GACtB,iCAAiC,CAAC,kBAAkB,CAAC,GAAG,CAAC,oBAAoB,CAAC;gBAC9E,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAE/D,IAAI,kBAAkB,EAAE;gBACtB,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACzD,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAI,CAAC,2BAA2B,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE;oBACrF,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACvB;aACF;iBAAM;gBACL,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;gBAClE,UAAU,CAAC,IAAI,CAAC;oBACd,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;oBACtC,MAAM,EAAE,GAAG,eAAe,IAAI,SAAS,EAAE;iBAC1C,CAAC,CAAC;aACJ;YAED,UAAU,CAAC,IAAI,CAAC;gBACd,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;gBAClC,MAAM,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,KAAI,SAAS,CAAC,sBAAsB,CAAC,IAAA,eAAQ,EAAC,GAAG,CAAC,EAAE,QAAQ,CAAC;aACpF,CAAC,CAAC;SACJ;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,kBAAkB,CAAC,SAA0B,EAAE,SAA2B;QAChF,MAAM,eAAe,GAAG,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,KAAI,SAAS,CAAC,sBAAsB,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC5G,OAAO,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,eAAe,CAAC,EAAE,IAAA,gBAAQ,EAAC,eAAe,CAAC,CAAC,CAAC;IACnE,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,0BAA0B,CAAC,SAA0B;QACjE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC;QACpC,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YAC7B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YACzD,IAAI,iCAAiC,CAAC,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;gBACzE,OAAO,IAAI,CAAC;aACb;YACD,MAAM,IAAI,qBAAY,CAAC,6CAA6C,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;SACtG;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,CAAC,2BAA2B,CAAC,SAAiB,EAAE,OAAe;QAC3E,MAAM,SAAS,GAAG,MAAM,eAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/C,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,KAAK,EAAE;YACnC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;gBACzB,MAAM;oBACJ,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE;oBACtB,MAAM,EAAE,IAAA,WAAI,EAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC;iBAClC,CAAC;aACH;SACF;IACH,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,SAA0B;QACrD,MAAM,QAAQ,GAAG,CAAC,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,cAAyB,CAAC;QAExE,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE;YAC/E,MAAM,IAAI,qBAAY,CAAC,6CAA6C,EAAE,CAAC,IAAA,WAAI,EAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAClH;QAED,OAAO,QAAQ,CAAC,WAAqB,CAAC;IACxC,CAAC;IAEO,oBAAoB,CAAC,WAAmB;QAC9C,oFAAoF;QACpF,OAAO,CACL,IAAA,mBAAY,EAAC,WAAW,CAAC;YACzB,iCAAiC,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC;YACpE,IAAA,mBAAY,EAAC,iCAAiC,CAAC,oBAAoB,CAAC,CACrE,CAAC;IACJ,CAAC;;AAlIH,8EAmIC;AAlIwB,oDAAkB,GAAG,IAAI,GAAG,CAAC;IAClD,iBAAiB;IACjB,8BAA8B;IAC9B,iBAAiB;CAClB,CAAC,CAAC;AACqB,sDAAoB,GAAG,0BAA0B,CAAC;AAClD,mDAAiB,GAAG,IAAI,GAAG,CAAiB;IAClE,CAAC,iBAAiB,EAAE,IAAI,CAAC;IACzB,CAAC,0BAA0B,EAAE,IAAI,CAAC;IAClC,CAAC,8BAA8B,EAAE,KAAK,CAAC;IACvC,CAAC,aAAa,EAAE,MAAM,CAAC;IACvB,CAAC,aAAa,EAAE,KAAK,CAAC;IACtB,CAAC,UAAU,EAAE,KAAK,CAAC;CACpB,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { SourcePath } from '../common/types';
|
|
3
2
|
import { Readable } from 'stream';
|
|
3
|
+
import { SourcePath } from '../common/types';
|
|
4
4
|
import { MetadataComponent, SourceComponent } from '../resolve';
|
|
5
5
|
export declare type WriteInfo = {
|
|
6
6
|
output: SourcePath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/errors/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,kCAA8B;AAI9B,MAAa,YAAa,SAAQ,KAAK;IACrC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/errors/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,kCAA8B;AAI9B,MAAa,YAAa,SAAQ,KAAK;IACrC,YAAmB,UAAkB,EAAE,IAAwB;QAC7D,KAAK,CAAC,UAAG,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAClC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;CACF;AAND,oCAMC;AAED,MAAa,aAAc,SAAQ,YAAY;IAC7C,YAAmB,UAAkB,EAAE,IAAwB;QAC7D,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF;AAJD,sCAIC;AAED,MAAa,kBAAmB,SAAQ,aAAa;IACnD,YAAmB,UAAkB,EAAE,IAAwB;QAC7D,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF;AAJD,gDAIC;AAED,MAAa,wBAAyB,SAAQ,aAAa;IACzD,YAAmB,IAAkB,EAAE,YAAwB,EAAE,UAAU,GAAG,6BAA6B;QACzG,KAAK,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,CAAC;CACF;AAJD,4DAIC;AAED,MAAa,qBAAsB,SAAQ,aAAa;IACtD,YAAmB,UAAkB,EAAE,IAAwB;QAC7D,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF;AAJD,sDAIC;AAED,MAAa,iBAAkB,SAAQ,YAAY;IACjD,YAAmB,UAAkB,EAAE,IAAwB;QAC7D,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF;AAJD,8CAIC;AAED,MAAa,WAAY,SAAQ,iBAAiB;IAChD,YAAmB,UAAkB,EAAE,IAAwB;QAC7D,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF;AAJD,kCAIC;AAED,MAAa,qBAAsB,SAAQ,YAAY;IACrD,YAAmB,UAAkB,EAAE,IAAwB;QAC7D,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF;AAJD,sDAIC;AAED;;GAEG;AACH,MAAa,eAAgB,SAAQ,YAAY;IAC/C,YAAmB,aAAoB;QACrC,KAAK,CAAC,sBAAsB,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;IACnC,CAAC;CACF;AALD,0CAKC;AAED,MAAa,iBAAkB,SAAQ,YAAY;IACjD,YAAmB,UAAkB,EAAE,IAAwB;QAC7D,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF;AAJD,8CAIC;AAED,MAAa,wBAAyB,SAAQ,YAAY;IACxD,YAAmB,UAAkB,EAAE,IAAwB;QAC7D,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF;AAJD,4DAIC;AAED,MAAa,iBAAkB,SAAQ,YAAY;IACjD,YAAmB,SAAiB;QAClC,KAAK,CAAC,iBAAiB,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IACxC,CAAC;CACF;AAJD,8CAIC"}
|
package/lib/src/i18n/i18n.js
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.messages = void 0;
|
|
2
4
|
/*
|
|
3
5
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
4
6
|
* All rights reserved.
|
|
5
7
|
* Licensed under the BSD 3-Clause license.
|
|
6
8
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
9
|
*/
|
|
8
|
-
|
|
9
|
-
exports.messages = void 0;
|
|
10
|
+
/* eslint camelcase: 0 */
|
|
10
11
|
/**
|
|
11
12
|
* Conventions:
|
|
12
13
|
* _message: is for unformatted text that will be shown as-is to
|
package/lib/src/i18n/i18n.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../../src/i18n/i18n.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../../src/i18n/i18n.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB;;;;;;;;;GASG;AACU,QAAA,QAAQ,GAAG;IACtB,eAAe,EAAE,iCAAiC;IAClD,kBAAkB,EAAE,gCAAgC;IACpD,sCAAsC,EAAE,yCAAyC;IACjF,6BAA6B,EAAE,mBAAmB;IAClD,mCAAmC,EAAE,kCAAkC;IACvE,+BAA+B,EAAE,0DAA0D;IAC3F,2BAA2B,EAAE,8CAA8C;IAC3E,0BAA0B,EAAE,qCAAqC;IACjE,mBAAmB,EAAE,mDAAmD;IACxE,sBAAsB,EAAE,kCAAkC;IAC1D,sCAAsC,EAAE,yBAAyB;IACjE,4BAA4B,EAAE,gCAAgC;IAC9D,6BAA6B,EAAE,sDAAsD;IACrF,0BAA0B,EAAE,qCAAqC;IACjE,2BAA2B,EAAE,2DAA2D;IACxF,2BAA2B,EAAE,yCAAyC;IACtE,oBAAoB,EAAE,iCAAiC;IACvD,uCAAuC,EAAE,gEAAgE;IACzG,yBAAyB,EAAE,sEAAsE;IACjG,2BAA2B,EAAE,yBAAyB;IACtD,qBAAqB,EAAE,6CAA6C;IACpE,yBAAyB,EAAE,iDAAiD;IAC5E,0BAA0B,EAAE,wCAAwC;IACpE,sCAAsC,EAAE,2CAA2C;IACnF,6BAA6B,EAAE,0DAA0D;IACzF,mCAAmC,EAAE,kDAAkD;IACvF,4BAA4B,EAAE,6DAA6D;IAC3F,sBAAsB,EAAE,+DAA+D;IACvF,oBAAoB,EAAE,8BAA8B;IACpD,mCAAmC,EAAE,gFAAgF;IACrH,0BAA0B,EAAE,oEAAoE;IAChG,4BAA4B,EAAE,gCAAgC;IAC9D,4BAA4B,EAAE,gCAAgC;IAC9D,2BAA2B,EAAE,6BAA6B;IAC1D,iBAAiB,EAAE,sEAAsE;IACzF,wBAAwB,EAAE,6CAA6C;IACvE,6BAA6B,EAAE,6CAA6C;IAC5E,yBAAyB,EAAE,qDAAqD;IAChF,yBAAyB,EAAE,oDAAoD;IAC/E,+BAA+B,EAAE,0CAA0C;IAC3E,qBAAqB,EAAE,mDAAmD;IAC1E,2CAA2C,EACzC,6GAA6G;IAC/G,2CAA2C,EACzC,uFAAuF;IACzF,eAAe,EAAE,+FAA+F;IAChH,iCAAiC,EAAE,6EAA6E;IAChH,qCAAqC,EAAE,4EAA4E;CACpH,CAAC"}
|
package/lib/src/i18n/index.js
CHANGED
|
@@ -6,16 +6,15 @@
|
|
|
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.nls = void 0;
|
|
9
|
+
exports.Message = exports.Localization = exports.nls = void 0;
|
|
10
10
|
const i18n_1 = require("./i18n");
|
|
11
11
|
const localization_1 = require("./localization");
|
|
12
12
|
function loadMessageBundle() {
|
|
13
13
|
try {
|
|
14
|
-
|
|
15
|
-
return layer;
|
|
14
|
+
return new localization_1.Message(i18n_1.messages);
|
|
16
15
|
}
|
|
17
16
|
catch (e) {
|
|
18
|
-
|
|
17
|
+
process.emitWarning('Cannot find messages in i18n module');
|
|
19
18
|
}
|
|
20
19
|
}
|
|
21
20
|
exports.nls = new localization_1.Localization(loadMessageBundle());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/i18n/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iCAAkC;AAClC,iDAAuD;AAEvD,SAAS,iBAAiB;IACxB,IAAI;QACF,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/i18n/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iCAAkC;AAClC,iDAAuD;AAEvD,SAAS,iBAAiB;IACxB,IAAI;QACF,OAAO,IAAI,sBAAO,CAAC,eAAQ,CAAC,CAAC;KAC9B;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,WAAW,CAAC,qCAAqC,CAAC,CAAC;KAC5D;AACH,CAAC;AAEY,QAAA,GAAG,GAAG,IAAI,2BAAY,CAAC,iBAAiB,EAAE,CAAC,CAAC;AACzD,+CAAuD;AAA9C,4GAAA,YAAY,OAAA;AAAE,uGAAA,OAAO,OAAA"}
|
|
@@ -36,7 +36,7 @@ class Message {
|
|
|
36
36
|
args = [args];
|
|
37
37
|
}
|
|
38
38
|
if (!possibleLabel) {
|
|
39
|
-
|
|
39
|
+
process.emitWarning(`Missing label for key: ${label}`);
|
|
40
40
|
possibleLabel = `${MISSING_LABEL_MSG} ${label}`;
|
|
41
41
|
if (Array.isArray(args) && args.length >= 1) {
|
|
42
42
|
args.forEach((arg) => {
|
|
@@ -48,11 +48,11 @@ class Message {
|
|
|
48
48
|
if (Array.isArray(args) && args.length >= 1) {
|
|
49
49
|
const expectedNumArgs = possibleLabel.split('%s').length - 1;
|
|
50
50
|
if (args.length !== expectedNumArgs) {
|
|
51
|
-
// just log it, we might want to hide some in some
|
|
52
|
-
|
|
51
|
+
// just log it, we might want to hide some in some languages on purpose
|
|
52
|
+
process.emitWarning(`Arguments do not match for label '${label}', got ${args.length} but want ${expectedNumArgs}`);
|
|
53
53
|
}
|
|
54
54
|
args.unshift(possibleLabel);
|
|
55
|
-
// eslint-disable-next-line prefer-spread
|
|
55
|
+
// eslint-disable-next-line prefer-spread,@typescript-eslint/no-unsafe-return
|
|
56
56
|
return util.format.apply(util, args);
|
|
57
57
|
}
|
|
58
58
|
return possibleLabel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localization.js","sourceRoot":"","sources":["../../../src/i18n/localization.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6BAA6B;
|
|
1
|
+
{"version":3,"file":"localization.js","sourceRoot":"","sources":["../../../src/i18n/localization.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6BAA6B;AAE7B,MAAM,iBAAiB,GAAG,uBAAuB,CAAC;AAMlD,MAAa,YAAY;IAGvB,YAAmB,QAAiB;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,QAAQ,CAAC,KAAa,EAAE,IAAwB;QACrD,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;CACF;AAVD,oCAUC;AAMD,MAAa,OAAO;IAGlB,YAAmB,QAAuB;QACxC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,QAAQ,CAAC,KAAa,EAAE,IAAwB;QACrD,IAAI,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEzC,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,aAAa,EAAE;YAChD,OAAO,aAAa,CAAC;SACtB;QAED,oFAAoF;QACpF,8BAA8B;QAC9B,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACtD,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;SACvD;aAAM,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC9D,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;SACf;QAED,IAAI,CAAC,aAAa,EAAE;YAClB,OAAO,CAAC,WAAW,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAC;YACvD,aAAa,GAAG,GAAG,iBAAiB,IAAI,KAAK,EAAE,CAAC;YAEhD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC3C,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACnB,aAAa,IAAI,KAAK,GAAG,GAAG,CAAC;gBAC/B,CAAC,CAAC,CAAC;aACJ;YACD,OAAO,aAAa,CAAC;SACtB;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE;YAC3C,MAAM,eAAe,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAC7D,IAAI,IAAI,CAAC,MAAM,KAAK,eAAe,EAAE;gBACnC,uEAAuE;gBACvE,OAAO,CAAC,WAAW,CACjB,qCAAqC,KAAK,UAAU,IAAI,CAAC,MAAM,aAAa,eAAe,EAAE,CAC9F,CAAC;aACH;YAED,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAC5B,6EAA6E;YAC7E,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACtC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEO,QAAQ,CAAC,KAAa;QAC5B,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SAC7B;aAAM;YACL,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;CACF;AA1DD,0BA0DC"}
|
package/lib/src/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.registry = exports.RegistryAccess = exports.DestructiveChangesType = exports.ComponentSet = exports.LazyCollection = exports.ForceIgnore = exports.SourceComponent = exports.ZipTreeContainer = exports.VirtualTreeContainer = exports.NodeFSTreeContainer = exports.TreeContainer = exports.ManifestResolver = exports.MetadataResolver = exports.MetadataConverter = exports.ComponentStatus = exports.RequestStatus = exports.ToolingApi = exports.RetrieveResult = exports.MetadataApiRetrieve = exports.DeployResult = exports.MetadataApiDeploy = void 0;
|
|
3
4
|
/*
|
|
4
5
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
5
6
|
* All rights reserved.
|
|
@@ -14,7 +15,6 @@ Object.defineProperty(exports, "RetrieveResult", { enumerable: true, get: functi
|
|
|
14
15
|
Object.defineProperty(exports, "ToolingApi", { enumerable: true, get: function () { return client_1.ToolingApi; } });
|
|
15
16
|
Object.defineProperty(exports, "RequestStatus", { enumerable: true, get: function () { return client_1.RequestStatus; } });
|
|
16
17
|
Object.defineProperty(exports, "ComponentStatus", { enumerable: true, get: function () { return client_1.ComponentStatus; } });
|
|
17
|
-
Object.defineProperty(exports, "ToolingDeployStatus", { enumerable: true, get: function () { return client_1.ToolingDeployStatus; } });
|
|
18
18
|
var convert_1 = require("./convert");
|
|
19
19
|
Object.defineProperty(exports, "MetadataConverter", { enumerable: true, get: function () { return convert_1.MetadataConverter; } });
|
|
20
20
|
var resolve_1 = require("./resolve");
|
|
@@ -33,7 +33,4 @@ Object.defineProperty(exports, "DestructiveChangesType", { enumerable: true, get
|
|
|
33
33
|
var registry_1 = require("./registry");
|
|
34
34
|
Object.defineProperty(exports, "RegistryAccess", { enumerable: true, get: function () { return registry_1.RegistryAccess; } });
|
|
35
35
|
Object.defineProperty(exports, "registry", { enumerable: true, get: function () { return registry_1.registry; } });
|
|
36
|
-
Object.defineProperty(exports, "DecompositionStrategy", { enumerable: true, get: function () { return registry_1.DecompositionStrategy; } });
|
|
37
|
-
Object.defineProperty(exports, "RecompositionStrategy", { enumerable: true, get: function () { return registry_1.RecompositionStrategy; } });
|
|
38
|
-
Object.defineProperty(exports, "TransformerStrategy", { enumerable: true, get: function () { return registry_1.TransformerStrategy; } });
|
|
39
36
|
//# sourceMappingURL=index.js.map
|
package/lib/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,mCAiDkB;AAhDhB,2GAAA,iBAAiB,OAAA;AAEjB,sGAAA,YAAY,OAAA;AACZ,6GAAA,mBAAmB,OAAA;AAEnB,wGAAA,cAAc,OAAA;AACd,oGAAA,UAAU,OAAA;AAUV,uGAAA,aAAa,OAAA;AAiBb,yGAAA,eAAe,OAAA;AAgBjB,qCAWmB;AAVjB,4GAAA,iBAAiB,OAAA;AAWnB,qCAgBmB;AAfjB,2GAAA,gBAAgB,OAAA;AAChB,2GAAA,gBAAgB,OAAA;AAChB,wGAAA,aAAa,OAAA;AACb,8GAAA,mBAAmB,OAAA;AACnB,+GAAA,oBAAoB,OAAA;AACpB,2GAAA,gBAAgB,OAAA;AAChB,0GAAA,eAAe,OAAA;AAQf,sGAAA,WAAW,OAAA;AAGb,6CAUuB;AATrB,6GAAA,cAAc,OAAA;AACd,2GAAA,YAAY,OAAA;AAKZ,qHAAA,sBAAsB,OAAA;AAIxB,uCAQoB;AAPlB,0GAAA,cAAc,OAAA;AACd,oGAAA,QAAQ,OAAA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RegistryAccess = exports.registry = void 0;
|
|
3
4
|
/*
|
|
4
5
|
* Copyright (c) 2021, salesforce.com, inc.
|
|
5
6
|
* All rights reserved.
|
|
@@ -10,8 +11,4 @@ var registry_1 = require("./registry");
|
|
|
10
11
|
Object.defineProperty(exports, "registry", { enumerable: true, get: function () { return registry_1.registry; } });
|
|
11
12
|
var registryAccess_1 = require("./registryAccess");
|
|
12
13
|
Object.defineProperty(exports, "RegistryAccess", { enumerable: true, get: function () { return registryAccess_1.RegistryAccess; } });
|
|
13
|
-
var types_1 = require("./types");
|
|
14
|
-
Object.defineProperty(exports, "DecompositionStrategy", { enumerable: true, get: function () { return types_1.DecompositionStrategy; } });
|
|
15
|
-
Object.defineProperty(exports, "RecompositionStrategy", { enumerable: true, get: function () { return types_1.RecompositionStrategy; } });
|
|
16
|
-
Object.defineProperty(exports, "TransformerStrategy", { enumerable: true, get: function () { return types_1.TransformerStrategy; } });
|
|
17
14
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/registry/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/registry/index.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,mDAAkD;AAAzC,gHAAA,cAAc,OAAA"}
|
|
@@ -2401,6 +2401,35 @@
|
|
|
2401
2401
|
"directoryName": "dataMappingSchema",
|
|
2402
2402
|
"strictDirectoryName": false
|
|
2403
2403
|
},
|
|
2404
|
+
"datamappingobjectdefinition": {
|
|
2405
|
+
"id": "datamappingobjectdefinition",
|
|
2406
|
+
"name": "DataMappingObjectDefinition",
|
|
2407
|
+
"suffix": "dataMappingObjectDefinition",
|
|
2408
|
+
"directoryName": "dataMappingObjectDefinitions",
|
|
2409
|
+
"inFolder": false,
|
|
2410
|
+
"strictDirectoryName": true,
|
|
2411
|
+
"children": {
|
|
2412
|
+
"types": {
|
|
2413
|
+
"datamappingfielddefinition": {
|
|
2414
|
+
"id": "datamappingfielddefinition",
|
|
2415
|
+
"name": "DataMappingFieldDefinition",
|
|
2416
|
+
"directoryName": "fieldDefinitions",
|
|
2417
|
+
"suffix": "fieldDefinition"
|
|
2418
|
+
}
|
|
2419
|
+
},
|
|
2420
|
+
"directories": {
|
|
2421
|
+
"fieldDefinitions": "datamappingfielddefinition"
|
|
2422
|
+
},
|
|
2423
|
+
"suffixes": {
|
|
2424
|
+
"fieldDefinition": "datamappingfielddefinition"
|
|
2425
|
+
}
|
|
2426
|
+
},
|
|
2427
|
+
"strategies": {
|
|
2428
|
+
"adapter": "decomposed",
|
|
2429
|
+
"transformer": "decomposed",
|
|
2430
|
+
"decomposition": "topLevel"
|
|
2431
|
+
}
|
|
2432
|
+
},
|
|
2404
2433
|
"datamapping": {
|
|
2405
2434
|
"id": "datamapping",
|
|
2406
2435
|
"name": "DataMapping",
|
|
@@ -2842,6 +2871,8 @@
|
|
|
2842
2871
|
"ConversationVendorFieldDefinition": "conversationvendorfielddef",
|
|
2843
2872
|
"schedulingRule": "schedulingrule",
|
|
2844
2873
|
"dataMappingSchema": "datamappingschema",
|
|
2874
|
+
"dataMappingObjectDefinition": "datamappingobjectdefinition",
|
|
2875
|
+
"fieldDefinition": "datamappingfielddefinition",
|
|
2845
2876
|
"dataMapping": "datamapping",
|
|
2846
2877
|
"federationDataMappingUsage": "federationdatamappingusage",
|
|
2847
2878
|
"connectedSystem": "connectedsystem",
|
|
@@ -2884,7 +2915,8 @@
|
|
|
2884
2915
|
"accessControlPolicies": "accesscontrolpolicy",
|
|
2885
2916
|
"integrationHub": "integrationhubsettings",
|
|
2886
2917
|
"ObjectHierarchyRelationship": "objecthierarchyrelationship",
|
|
2887
|
-
"IndustriesManufacturingSettings": "industriesmanufacturingsettings"
|
|
2918
|
+
"IndustriesManufacturingSettings": "industriesmanufacturingsettings",
|
|
2919
|
+
"dataMappingObjectDefinitions": "datamappingobjectdefinition"
|
|
2888
2920
|
},
|
|
2889
2921
|
"childTypes": {
|
|
2890
2922
|
"customlabel": "customlabels",
|
|
@@ -2917,7 +2949,8 @@
|
|
|
2917
2949
|
"managedtopic": "managedtopics",
|
|
2918
2950
|
"sharingcriteriarule": "sharingrules",
|
|
2919
2951
|
"botversion": "bot",
|
|
2920
|
-
"customfieldtranslation": "customobjecttranslation"
|
|
2952
|
+
"customfieldtranslation": "customobjecttranslation",
|
|
2953
|
+
"datamappingfielddefinition": "datamappingobjectdefinition"
|
|
2921
2954
|
},
|
|
2922
2955
|
"apiVersion": "53.0"
|
|
2923
2956
|
}
|
|
@@ -15,10 +15,10 @@ exports.hasUnsupportedFeatures = exports.metadataTypes = exports.settings = expo
|
|
|
15
15
|
* */
|
|
16
16
|
exports.features = [
|
|
17
17
|
'SUSTAINABILITYAPP',
|
|
18
|
-
'SERVICECATALOG',
|
|
18
|
+
'SERVICECATALOG', // ERROR running force:org:create: ServiceCatalog is not a valid Features value.
|
|
19
19
|
];
|
|
20
20
|
exports.settings = [
|
|
21
|
-
'botSettings',
|
|
21
|
+
'botSettings', // have not successfully deployed this because of licensing errors when deploying settings
|
|
22
22
|
];
|
|
23
23
|
exports.metadataTypes = [
|
|
24
24
|
'EmailTemplateFolder',
|
|
@@ -36,7 +36,7 @@ exports.metadataTypes = [
|
|
|
36
36
|
'CustomValue',
|
|
37
37
|
'StandardValue',
|
|
38
38
|
];
|
|
39
|
-
|
|
39
|
+
const hasUnsupportedFeatures = (type) => {
|
|
40
40
|
var _a;
|
|
41
41
|
if (!((_a = type.scratchDefinitions) === null || _a === void 0 ? void 0 : _a.developer)) {
|
|
42
42
|
return true;
|
|
@@ -47,9 +47,7 @@ exports.hasUnsupportedFeatures = (type) => {
|
|
|
47
47
|
exports.features.some((feature) => scratchDef.features.includes(feature))) {
|
|
48
48
|
return true;
|
|
49
49
|
}
|
|
50
|
-
|
|
51
|
-
return true;
|
|
52
|
-
}
|
|
53
|
-
return false;
|
|
50
|
+
return scratchDef.settings && exports.settings.some((setting) => scratchDef.settings[setting]);
|
|
54
51
|
};
|
|
52
|
+
exports.hasUnsupportedFeatures = hasUnsupportedFeatures;
|
|
55
53
|
//# sourceMappingURL=nonSupportedTypes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nonSupportedTypes.js","sourceRoot":"","sources":["../../../src/registry/nonSupportedTypes.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH;;;;;KAKK;AACQ,QAAA,QAAQ,GAAG;IACtB,mBAAmB;IACnB,gBAAgB;
|
|
1
|
+
{"version":3,"file":"nonSupportedTypes.js","sourceRoot":"","sources":["../../../src/registry/nonSupportedTypes.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH;;;;;KAKK;AACQ,QAAA,QAAQ,GAAG;IACtB,mBAAmB;IACnB,gBAAgB,EAAE,iFAAiF;CACpG,CAAC;AAEW,QAAA,QAAQ,GAAG;IACtB,aAAa,EAAE,0FAA0F;CAC1G,CAAC;AACW,QAAA,aAAa,GAAG;IAC3B,qBAAqB;IAErB,+CAA+C;IAC/C,eAAe;IACf,sBAAsB;IACtB,6BAA6B;IAC7B,6BAA6B;IAC7B,oBAAoB;IACpB,0BAA0B;IAC1B,eAAe;IACf,4BAA4B;IAC5B,6BAA6B;IAC7B,iCAAiC;IACjC,aAAa;IACb,eAAe;CAChB,CAAC;AAEK,MAAM,sBAAsB,GAAG,CAAC,IAAwB,EAAW,EAAE;;IAC1E,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,SAAS,CAAA,EAAE;QACvC,OAAO,IAAI,CAAC;KACb;IACD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAK9D,CAAC;IACF,IACE,UAAU,CAAC,QAAQ;QACnB,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;QAC9B,gBAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EACjE;QACA,OAAO,IAAI,CAAC;KACb;IACD,OAAO,UAAU,CAAC,QAAQ,IAAI,gBAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;AACzF,CAAC,CAAC;AAlBW,QAAA,sBAAsB,0BAkBjC"}
|