@salesforce/source-deploy-retrieve 10.7.1 → 10.9.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/lib/src/collections/componentSetBuilder.js +1 -0
- package/lib/src/collections/componentSetBuilder.js.map +1 -1
- package/lib/src/convert/replacements.d.ts +6 -1
- package/lib/src/convert/replacements.js +26 -18
- package/lib/src/convert/replacements.js.map +1 -1
- package/lib/src/registry/variants.js +10 -6
- package/lib/src/registry/variants.js.map +1 -1
- package/package.json +1 -1
|
@@ -101,6 +101,7 @@ class ComponentSetBuilder {
|
|
|
101
101
|
componentSet = assertComponentSetIsNotUndefined(componentSet);
|
|
102
102
|
componentSet.apiVersion ??= apiversion;
|
|
103
103
|
componentSet.sourceApiVersion ??= sourceapiversion;
|
|
104
|
+
componentSet.projectDirectory = projectDir;
|
|
104
105
|
logComponents(logger, componentSet);
|
|
105
106
|
return componentSet;
|
|
106
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"componentSetBuilder.js","sourceRoot":"","sources":["../../../src/collections/componentSetBuilder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"componentSetBuilder.js","sourceRoot":"","sources":["../../../src/collections/componentSetBuilder.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,kCAAkC;AAClC,2CAA8E;AAC9E,kCAAkC;AAClC,uCAAuC;AAEvC,8DAA2D;AAC3D,+DAA4D;;AAM5D,MAAM,QAAQ,OAAG,eAAQ,CAAc,oCAAoC,EAAE,KAAK,6pKAAC,CAAC;AAiCpF,MAAa,mBAAmB;IAC9B;;;;;;;OAOG;IAEI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAA4B;QACpD,MAAM,MAAM,GAAG,aAAM,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;QAC3D,IAAI,YAAsC,CAAC;QAE3C,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAChH,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAEjE,IAAI,CAAC;YACH,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CAAC,0CAA0C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAChF,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;gBACvD,YAAY,GAAG,2BAAY,CAAC,UAAU,CAAC;oBACrC,OAAO;oBACP,QAAQ,EAAE,cAAc;iBACzB,CAAC,CAAC;YACL,CAAC;YAED,2FAA2F;YAC3F,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,CAAC,KAAK,CAAC,2CAA2C,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACnF,YAAY,KAAK,IAAI,2BAAY,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;YAC/D,CAAC;YAED,uDAAuD;YACvD,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CAAC,wCAAwC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;gBAC9E,gBAAgB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;gBAExC,MAAM,CAAC,KAAK,CAAC,4BAA4B,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;gBACrG,YAAY,GAAG,MAAM,2BAAY,CAAC,YAAY,CAAC;oBAC7C,YAAY,EAAE,QAAQ,CAAC,YAAY;oBACnC,kBAAkB,EAAE,QAAQ,CAAC,cAAc;oBAC3C,iBAAiB,EAAE,IAAI;oBACvB,cAAc,EAAE,QAAQ,CAAC,qBAAqB;oBAC9C,eAAe,EAAE,QAAQ,CAAC,sBAAsB;oBAChD,QAAQ,EAAE,cAAc;iBACzB,CAAC,CAAC;YACL,CAAC;YAED,+DAA+D;YAC/D,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CAAC,wCAAwC,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAC5F,MAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;gBAC/C,YAAY,KAAK,IAAI,2BAAY,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;gBAC7D,MAAM,kBAAkB,GAAG,IAAI,2BAAY,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;gBAEvE,kCAAkC;gBAClC,QAAQ,CAAC,eAAe;qBACrB,GAAG,CAAC,IAAA,0BAAkB,EAAC,cAAc,CAAC,CAAC;qBACvC,OAAO,CAAC,+BAA+B,CAAC,EAAE,cAAc,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;qBACtF,GAAG,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;qBACpC,GAAG,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,CAAC;gBAE9C,MAAM,CAAC,KAAK,CAAC,mDAAmD,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC7F,MAAM,kBAAkB,GAAG,2BAAY,CAAC,UAAU,CAAC;oBACjD,OAAO,EAAE,cAAc;oBACvB,OAAO,EAAE,kBAAkB;oBAC3B,QAAQ,EAAE,cAAc;iBACzB,CAAC,CAAC;gBACH,YAAY,CAAC,iBAAiB,GAAG,kBAAkB,CAAC,iBAAiB,CAAC;gBACtE,kBAAkB,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAC;YACpE,CAAC;YAED,kDAAkD;YAClD,IAAI,GAAG,EAAE,CAAC;gBACR,YAAY,KAAK,IAAI,2BAAY,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;gBAE7D,MAAM,CAAC,KAAK,CACV,8CAA8C,GAAG,CAAC,QAAQ,IACxD,QAAQ,CAAC,CAAC,CAAC,yBAAyB,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAC9E,EAAE,CACH,CAAC;gBAEF,MAAM,KAAK,GAAgB,QAAQ;oBACjC,CAAC,CAAC,sBAAsB,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,CAAC,IAAA,0BAAkB,EAAC,cAAc,CAAC,CAAC,CAAC;oBAC1F,CAAC,CAAE,IAAI,GAAG,EAAkB,CAAC;gBAE/B,MAAM,cAAc,GAAG,MAAM,2BAAY,CAAC,cAAc,CAAC;oBACvD,oBAAoB,EAAE,CAAC,MAAM,sBAAe,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ;oBAC7G,eAAe,EAAE,qBAAqB,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC;oBAC5D,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;oBAChE,QAAQ,EAAE,cAAc;iBACzB,CAAC,CAAC;gBAEH,cAAc,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,+BAA+B,CAAC,CAAC,CAAC,CAAC;QAC5C,CAAC;QAED,+DAA+D;QAC/D,YAAY,GAAG,gCAAgC,CAAC,YAAY,CAAC,CAAC;QAC9D,YAAY,CAAC,UAAU,KAAK,UAAU,CAAC;QACvC,YAAY,CAAC,gBAAgB,KAAK,gBAAgB,CAAC;QACnD,YAAY,CAAC,gBAAgB,GAAG,UAAU,CAAC;QAE3C,aAAa,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACpC,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AA7GD,kDA6GC;AAED,MAAM,iBAAiB,GACrB,CAAC,EAAgB,EAAE,EAAE,CACrB,CAAC,GAAsB,EAAqB,EAAE;IAC5C,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACZ,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEJ,MAAM,+BAA+B,GAAG,CAAC,CAAU,EAAS,EAAE;IAC5D,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,qDAAqD,CAAC,EAAE,CAAC;QACpG,yFAAyF;QACzF,0FAA0F;QAC1F,MAAM,SAAS,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,IAAI,cAAO,CAAC,gDAAgD,SAAS,GAAG,CAAC,CAAC;IAClF,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,CAAC;IACV,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,QAAgB,EAAU,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;AAEtG,MAAM,gBAAgB,GAAG,CAAC,QAAgB,EAAU,EAAE;IACpD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,gCAAgC,GAAG,CAAC,YAAsC,EAAgB,EAAE;IAChG,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,cAAO,CAAC,uBAAuB,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF;wCACwC;AACxC,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,YAA0B,EAAQ,EAAE;IACzE,MAAM,CAAC,KAAK,CAAC,4BAA4B,YAAY,CAAC,IAAI,IAAI,CAAC,CAAC;IAEhE,MAAM,UAAU,GAAG,YAAY,CAAC,mBAAmB,EAAE,CAAC,OAAO,EAAE,CAAC;IAEhE,UAAU;SACP,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;SACZ,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC;SACpD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/B,IAAI,UAAU,CAAC,MAAM,GAAG,EAAE;QAAE,MAAM,CAAC,KAAK,CAAC,kBAAkB,YAAY,CAAC,IAAI,WAAW,CAAC,CAAC;IAEzF,MAAM,CAAC,KAAK,CAAC,6BAA6B,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC;IACrE,MAAM,CAAC,KAAK,CAAC,mCAAmC,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC;AACnF,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAC5B,GAAc,EACd,KAAkB,EAClB,QAAyB,EACiB,EAAE,CAC5C,QAAQ;IACN,CAAC,CAAC,CAAC,SAAkC,EAAW,EAAE;QAC9C,IAAI,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACzC,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC7C,iFAAiF;YACjF,OAAO,CACL,CAAC,CAAC,UAAU;gBACZ,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,SAAS,CAAC,QAAQ,KAAK,QAAQ,IAAI,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAC7G,CAAC;QACJ,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACH,CAAC,CAAC,yBAAyB;QACzB,sEAAsE;QACtE,2GAA2G;QAC3G,uHAAuH;QACvH,6HAA6H;QAE7H,CAAC,SAAkC,EAAW,EAAE,CAC9C,CAAC,SAAS,EAAE,eAAe,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;AAIzF,gEAAgE;AACzD,MAAM,kBAAkB,GAC7B,CAAC,GAAmB,EAAE,EAAE,CACxB,CAAC,QAAgB,EAA+B,EAAE;IAChD,sGAAsG;IACtG,MAAM,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC3C,4HAA4H;IAC5H,oEAAoE;IACpE,gJAAgJ;IAChJ,IAAI,IAAI,CAAC,aAAa,KAAK,KAAK,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAC7F,MAAM,IAAI,KAAK,CAAC,qCAAqC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;AACpE,CAAC,CAAC;AAdS,QAAA,kBAAkB,sBAc3B;AAEJ,MAAM,+BAA+B,GACnC,CAAC,OAAuF,EAAE,EAAE,CAC5F,CAAC,EAAE,IAAI,EAAE,YAAY,EAA+B,EAAuB,EAAE;AAC3E,uFAAuF;AACvF,wHAAwH;AACxH,mJAAmJ;AACnJ,+IAA+I;AAC/I,8FAA8F;AAE9F,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC;IACpF,CAAC,CAAC,+EAA+E;QAC/E,2BAAY,CAAC,UAAU,CAAC;YACtB,OAAO,EAAE,OAAO,CAAC,cAAc;YAC/B,OAAO,EAAE,IAAI,2BAAY,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,2BAAY,CAAC,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC;YACxF,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC;aACC,mBAAmB,EAAE;aACrB,OAAO,EAAE;YACV,iFAAiF;aAChF,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;AAE3C,4CAA4C;AAC5C,MAAM,sBAAsB,GAAG,CAAC,UAAyC,EAAe,EAAE;IACxF,MAAM,KAAK,GAAgB,IAAI,GAAG,EAAE,CAAC;IACrC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACrB,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;IACpF,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
|
|
@@ -41,7 +41,12 @@ export declare const getContentsOfReplacementFile: (path: string) => Promise<str
|
|
|
41
41
|
* Build the replacements property for a sourceComponent
|
|
42
42
|
*/
|
|
43
43
|
export declare const getReplacements: (cmp: SourceComponent, replacementConfigs?: ReplacementConfig[]) => Promise<SourceComponent['replacements'] | undefined>;
|
|
44
|
-
export declare const matchesFile: (
|
|
44
|
+
export declare const matchesFile: (filename: string) => (r: ReplacementConfig) => boolean;
|
|
45
|
+
/**
|
|
46
|
+
* Regardless of any components, return the ReplacementConfig that are valid with the current env.
|
|
47
|
+
* These can be checked globally and don't need to be checked per component.
|
|
48
|
+
*/
|
|
49
|
+
export declare const envFilter: (replacement: ReplacementConfig) => boolean;
|
|
45
50
|
/** escape any special characters used in the string so it can be used as a regex */
|
|
46
51
|
export declare const stringToRegex: (input: string) => RegExp;
|
|
47
52
|
export declare const posixifyPaths: (f: string) => string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.posixifyPaths = exports.stringToRegex = exports.matchesFile = exports.getReplacements = exports.getContentsOfReplacementFile = exports.getReplacementMarkingStream = exports.replacementIterations = exports.getReplacementStreamForReadable = void 0;
|
|
3
|
+
exports.posixifyPaths = exports.stringToRegex = exports.envFilter = exports.matchesFile = exports.getReplacements = exports.getContentsOfReplacementFile = exports.getReplacementMarkingStream = exports.replacementIterations = exports.getReplacementStreamForReadable = void 0;
|
|
4
4
|
/*
|
|
5
5
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
6
6
|
* All rights reserved.
|
|
@@ -72,10 +72,8 @@ exports.replacementIterations = replacementIterations;
|
|
|
72
72
|
*/
|
|
73
73
|
const getReplacementMarkingStream = async (projectDir) => {
|
|
74
74
|
// remove any that don't agree with current env
|
|
75
|
-
const filteredReplacements =
|
|
76
|
-
|
|
77
|
-
return new ReplacementMarkingStream(filteredReplacements);
|
|
78
|
-
}
|
|
75
|
+
const filteredReplacements = (await readReplacementsFromProject(projectDir)).filter(exports.envFilter);
|
|
76
|
+
return filteredReplacements.length ? new ReplacementMarkingStream(filteredReplacements) : undefined;
|
|
79
77
|
};
|
|
80
78
|
exports.getReplacementMarkingStream = getReplacementMarkingStream;
|
|
81
79
|
/**
|
|
@@ -94,8 +92,8 @@ class ReplacementMarkingStream extends node_stream_1.Transform {
|
|
|
94
92
|
if (!chunk.isMarkedForDelete() && this.replacementConfigs?.length) {
|
|
95
93
|
try {
|
|
96
94
|
chunk.replacements = await (0, exports.getReplacements)(chunk, this.replacementConfigs);
|
|
97
|
-
if (chunk.replacements && chunk.parent
|
|
98
|
-
// Set replacements on the parent of a CustomLabel as well so that recomposing
|
|
95
|
+
if (chunk.replacements && chunk.parent?.type.strategies?.transformer === 'nonDecomposed') {
|
|
96
|
+
// Set replacements on the parent of a nonDecomposed CustomLabel as well so that recomposing
|
|
99
97
|
// doesn't use the non-replaced content from parent cache.
|
|
100
98
|
// See RecompositionFinalizer.recompose() in convertContext.ts
|
|
101
99
|
chunk.parent.replacements = chunk.replacements;
|
|
@@ -140,7 +138,7 @@ const getReplacements = async (cmp, replacementConfigs = []) => {
|
|
|
140
138
|
f,
|
|
141
139
|
await Promise.all(replacementConfigs
|
|
142
140
|
// filter out any that don't match the current file
|
|
143
|
-
.filter((
|
|
141
|
+
.filter((0, exports.matchesFile)(f))
|
|
144
142
|
.map(async (r) => ({
|
|
145
143
|
matchedFilename: f,
|
|
146
144
|
// used during replacement stream to limit warnings to explicit filenames, not globs
|
|
@@ -157,24 +155,23 @@ const getReplacements = async (cmp, replacementConfigs = []) => {
|
|
|
157
155
|
])))
|
|
158
156
|
// filter out any that don't have any replacements
|
|
159
157
|
.filter(([, replacements]) => replacements.length > 0);
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
return Object.fromEntries(replacementsForComponent);
|
|
163
|
-
}
|
|
158
|
+
// turn into a Dictionary-style object so it's easier to lookup by filename
|
|
159
|
+
return replacementsForComponent.length ? Object.fromEntries(replacementsForComponent) : undefined;
|
|
164
160
|
};
|
|
165
161
|
exports.getReplacements = getReplacements;
|
|
166
|
-
const matchesFile = (
|
|
162
|
+
const matchesFile = (filename) => (r) =>
|
|
167
163
|
// filenames will be absolute. We don't have convenient access to the pkgDirs,
|
|
168
164
|
// so we need to be more open than an exact match
|
|
169
|
-
(typeof r.filename === 'string' && (0, exports.posixifyPaths)(
|
|
170
|
-
(typeof r.glob === 'string' && minimatch(
|
|
165
|
+
(typeof r.filename === 'string' && (0, exports.posixifyPaths)(filename).endsWith(r.filename)) ||
|
|
166
|
+
(typeof r.glob === 'string' && minimatch(filename, `**/${r.glob}`));
|
|
171
167
|
exports.matchesFile = matchesFile;
|
|
172
168
|
/**
|
|
173
169
|
* Regardless of any components, return the ReplacementConfig that are valid with the current env.
|
|
174
170
|
* These can be checked globally and don't need to be checked per component.
|
|
175
171
|
*/
|
|
176
|
-
const envFilter = (
|
|
177
|
-
replacement.replaceWhenEnv.every((envConditional) => process.env[envConditional.env] === envConditional.value));
|
|
172
|
+
const envFilter = (replacement) => !replacement.replaceWhenEnv ||
|
|
173
|
+
replacement.replaceWhenEnv.every((envConditional) => process.env[envConditional.env] === envConditional.value.toString());
|
|
174
|
+
exports.envFilter = envFilter;
|
|
178
175
|
/** A "getter" for envs to throw an error when an expected env is not present */
|
|
179
176
|
const getEnvValue = (env, allowUnset = false) => allowUnset
|
|
180
177
|
? new kit_1.Env().getString(env, '')
|
|
@@ -186,7 +183,8 @@ const readReplacementsFromProject = async (projectDir) => {
|
|
|
186
183
|
try {
|
|
187
184
|
const proj = await core_1.SfProject.resolve(projectDir);
|
|
188
185
|
const projJson = (await proj.resolveProjectConfig());
|
|
189
|
-
|
|
186
|
+
const definiteProjectDir = proj.getPath();
|
|
187
|
+
return (projJson.replacements ?? []).map(makeAbsolute(definiteProjectDir));
|
|
190
188
|
}
|
|
191
189
|
catch (e) {
|
|
192
190
|
if (e instanceof core_1.SfError && e.name === 'InvalidProjectWorkspaceError') {
|
|
@@ -203,4 +201,14 @@ new RegExp(input.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'), 'g');
|
|
|
203
201
|
exports.stringToRegex = stringToRegex;
|
|
204
202
|
const posixifyPaths = (f) => f.split(node_path_1.sep).join(node_path_1.posix.sep);
|
|
205
203
|
exports.posixifyPaths = posixifyPaths;
|
|
204
|
+
/** if replaceWithFile is present, resolve it to an absolute path relative to the projectdir */
|
|
205
|
+
const makeAbsolute = (projectDir) => (replacementConfig) => replacementConfig.replaceWithFile
|
|
206
|
+
? {
|
|
207
|
+
...replacementConfig,
|
|
208
|
+
// it could already be absolute?
|
|
209
|
+
replaceWithFile: (0, node_path_1.isAbsolute)(replacementConfig.replaceWithFile)
|
|
210
|
+
? replacementConfig.replaceWithFile
|
|
211
|
+
: (0, node_path_1.join)(projectDir, replacementConfig.replaceWithFile),
|
|
212
|
+
}
|
|
213
|
+
: replacementConfig;
|
|
206
214
|
//# sourceMappingURL=replacements.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replacements.js","sourceRoot":"","sources":["../../../src/convert/replacements.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+CAA4C;AAC5C,6CAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"replacements.js","sourceRoot":"","sources":["../../../src/convert/replacements.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,16 @@ const loadVariants = ({ projectDir } = {}) => {
|
|
|
34
34
|
logger.debug(`using registryPresets [${presets.join(',')}] in ${projJson.getPath()}`);
|
|
35
35
|
}
|
|
36
36
|
const registryFromPresets = presets.reduce((prev, curr) => (0, exports.firstLevelMerge)(prev, loadPreset(curr)), emptyRegistry);
|
|
37
|
+
if (presets.length > 0 || Object.keys(customizations.types).length > 0) {
|
|
38
|
+
void core_1.Lifecycle.getInstance().emitTelemetry({
|
|
39
|
+
library: 'SDR',
|
|
40
|
+
eventName: 'RegistryVariants',
|
|
41
|
+
presetCount: presets.length,
|
|
42
|
+
presets: presets.join(','),
|
|
43
|
+
customizationsCount: Object.keys(customizations.types).length,
|
|
44
|
+
customizationsTypes: Object.keys(customizations.types).join(','),
|
|
45
|
+
});
|
|
46
|
+
}
|
|
37
47
|
return (0, exports.firstLevelMerge)(registryFromPresets, customizations);
|
|
38
48
|
};
|
|
39
49
|
const maybeGetProject = (projectDir) => {
|
|
@@ -44,12 +54,6 @@ const maybeGetProject = (projectDir) => {
|
|
|
44
54
|
return undefined;
|
|
45
55
|
}
|
|
46
56
|
};
|
|
47
|
-
// TODO: this type should maybe live somewhere else and be part of the sfdx-project schema
|
|
48
|
-
// but we don't want circular dependency from sfdx-core to SDR
|
|
49
|
-
// type CustomRegistry = {
|
|
50
|
-
// registryCustomizations: MetadataRegistry;
|
|
51
|
-
// registryPresets: string[];
|
|
52
|
-
// };
|
|
53
57
|
const loadPreset = (preset) => {
|
|
54
58
|
const pathToCheck = path.join(__dirname, 'presets', `${preset}.json`);
|
|
55
59
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variants.js","sourceRoot":"","sources":["../../../src/registry/variants.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,8BAA8B;AAC9B,kCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"variants.js","sourceRoot":"","sources":["../../../src/registry/variants.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED