@teambit/workspace 1.0.530 → 1.0.532
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/dist/aspects-merger.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Harmony } from '@teambit/harmony';
|
|
2
2
|
import { Component } from '@teambit/component';
|
|
3
3
|
import { ComponentID } from '@teambit/component-id';
|
|
4
|
+
import { VariantPolicyConfigArr } from '@teambit/dependency-resolver';
|
|
4
5
|
import { ExtensionDataList } from '@teambit/legacy.extension-data';
|
|
5
6
|
import { ExtensionsOrigin, Workspace } from './workspace';
|
|
6
7
|
import { MergeConflictFile } from './merge-conflict-file';
|
|
@@ -10,7 +11,7 @@ export declare class AspectsMerger {
|
|
|
10
11
|
readonly mergeConflictFile: MergeConflictFile;
|
|
11
12
|
private mergeConfigDepsResolverDataCache;
|
|
12
13
|
constructor(workspace: Workspace, harmony: Harmony);
|
|
13
|
-
getDepsDataOfMergeConfig(id: ComponentID):
|
|
14
|
+
getDepsDataOfMergeConfig(id: ComponentID): VariantPolicyConfigArr;
|
|
14
15
|
/**
|
|
15
16
|
* Calculate the component config based on:
|
|
16
17
|
* the config property in the .bitmap file
|
package/dist/aspects-merger.js
CHANGED
|
@@ -78,7 +78,6 @@ class AspectsMerger {
|
|
|
78
78
|
* defaults extensions from workspace config
|
|
79
79
|
* extensions from the model.
|
|
80
80
|
*/
|
|
81
|
-
// eslint-disable-next-line complexity
|
|
82
81
|
async merge(componentId, componentFromScope, excludeOrigins = []) {
|
|
83
82
|
// TODO: consider caching this result
|
|
84
83
|
let configFileExtensions;
|
|
@@ -97,15 +96,6 @@ class AspectsMerger {
|
|
|
97
96
|
this.workspace.logger.error(`unable to parse the config file for ${componentId.toString()} due to conflicts`);
|
|
98
97
|
errors.push(err);
|
|
99
98
|
}
|
|
100
|
-
const adjustEnvsOnConfigMerge = conf => {
|
|
101
|
-
const env = conf[_envs().EnvsAspect.id]?.env;
|
|
102
|
-
if (!env) return;
|
|
103
|
-
const [id] = env.split('@');
|
|
104
|
-
conf[_envs().EnvsAspect.id] = {
|
|
105
|
-
env: id
|
|
106
|
-
};
|
|
107
|
-
conf[env] = {};
|
|
108
|
-
};
|
|
109
99
|
const unmergedData = this.getUnmergedData(componentId);
|
|
110
100
|
const unmergedDataMergeConf = unmergedData?.mergedConfig;
|
|
111
101
|
const getMergeConfigCombined = () => {
|
|
@@ -121,7 +111,7 @@ class AspectsMerger {
|
|
|
121
111
|
});
|
|
122
112
|
};
|
|
123
113
|
const mergeConfigCombined = getMergeConfigCombined();
|
|
124
|
-
|
|
114
|
+
_legacy().ExtensionDataList.adjustEnvsOnConfigObject(mergeConfigCombined || {});
|
|
125
115
|
const configMergeExtensions = mergeConfigCombined ? _legacy().ExtensionDataList.fromConfigObject(mergeConfigCombined) : undefined;
|
|
126
116
|
this.removeAutoDepsFromConfig(componentId, configMergeExtensions);
|
|
127
117
|
const scopeExtensions = this.getComponentFromScopeWithoutDuplications(componentFromScope);
|
|
@@ -253,30 +243,13 @@ class AspectsMerger {
|
|
|
253
243
|
*/
|
|
254
244
|
removeAutoDepsFromConfig(componentId, conf, fromScope = false) {
|
|
255
245
|
if (!conf) return;
|
|
256
|
-
const
|
|
257
|
-
if (!
|
|
258
|
-
const mergeConfigObj = {};
|
|
259
|
-
['dependencies', 'devDependencies', 'peerDependencies'].forEach(key => {
|
|
260
|
-
if (!policy[key]) return;
|
|
261
|
-
// this is only relevant when it is saved as an array. otherwise, it's always force: true.
|
|
262
|
-
if (!Array.isArray(policy[key])) return;
|
|
263
|
-
mergeConfigObj[key] = policy[key].filter(dep => !dep.force);
|
|
264
|
-
policy[key] = policy[key].filter(dep => dep.force);
|
|
265
|
-
if (!policy[key].length) {
|
|
266
|
-
delete policy[key];
|
|
267
|
-
return;
|
|
268
|
-
}
|
|
269
|
-
// convert to object
|
|
270
|
-
policy[key] = policy[key].reduce((acc, current) => {
|
|
271
|
-
acc[current.name] = current.version;
|
|
272
|
-
return acc;
|
|
273
|
-
}, {});
|
|
274
|
-
});
|
|
246
|
+
const autoDepsObj = conf.extractAutoDepsFromConfig();
|
|
247
|
+
if (!autoDepsObj) return;
|
|
275
248
|
if (!fromScope) {
|
|
276
249
|
if (!this.mergeConfigDepsResolverDataCache[componentId.toString()]) {
|
|
277
250
|
this.mergeConfigDepsResolverDataCache[componentId.toString()] = {};
|
|
278
251
|
}
|
|
279
|
-
this.mergeConfigDepsResolverDataCache[componentId.toString()] = (0, _lodash().merge)(this.mergeConfigDepsResolverDataCache[componentId.toString()],
|
|
252
|
+
this.mergeConfigDepsResolverDataCache[componentId.toString()] = (0, _lodash().merge)(this.mergeConfigDepsResolverDataCache[componentId.toString()], autoDepsObj);
|
|
280
253
|
}
|
|
281
254
|
}
|
|
282
255
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_envs","data","require","_dependencyResolver","_legacy","_lodash","_mergeConfigConflict","_workspace","_mergeConflictFile","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","AspectsMerger","constructor","workspace","harmony","mergeConflictFile","MergeConflictFile","path","getDepsDataOfMergeConfig","id","mergeConfigDepsResolverDataCache","toString","merge","componentId","componentFromScope","excludeOrigins","configFileExtensions","variantsExtensions","mergeFromScope","errors","bitMapEntry","consumer","bitMap","getComponentIfExist","bitMapExtensions","config","configMerge","getConflictParsed","toStringWithoutVersion","err","MergeConfigConflict","logger","error","adjustEnvsOnConfigMerge","conf","env","EnvsAspect","split","unmergedData","getUnmergedData","unmergedDataMergeConf","mergedConfig","getMergeConfigCombined","undefined","mergeWith","objValue","srcValue","Array","isArray","concat","mergeConfigCombined","configMergeExtensions","ExtensionDataList","fromConfigObject","removeAutoDepsFromConfig","scopeExtensions","getComponentFromScopeWithoutDuplications","specific","nonSpecific","partition","entry","AspectSpecificField","scopeExtensionsNonSpecific","scopeExtensionsSpecific","addConfigDepsFromModelToConfigMerge","componentConfigFile","aspects","toLegacy","relativeComponentDir","componentDir","ignoreVersion","relative","variantConfig","variants","byRootDirAndName","fullName","extensions","clone","extensionsToMerge","envWasFoundPreviously","removedExtensionIds","addExtensionsToMerge","origin","extraData","extData","isRemoved","map","stringId","extsWithoutRemoved","filterRemovedExtensions","selfInMergedExtensions","findExtension","extsWithoutSelf","extensionId","remove","preferWorkspaceVersion","extsWithUpdatedIds","resolveExtensionListIds","extensionDataListFiltered","envIsCurrentlySet","filterEnvsFromExtensionsIfNeeded","setDataListAsSpecific","dataEntry","includes","extensionDataList","fromArray","continuePropagating","propagate","appliedRules","sortedMatches","pattern","specificity","afterMerge","mergeConfigs","ext","withoutRemoved","beforeMerge","scopeExtIds","ids","scopeExtHasDuplications","uniq","arr","uniqWith","getCompareExtPredicate","fromScope","policy","findCoreExtension","DependencyResolverAspect","mergeConfigObj","key","dep","force","reduce","acc","current","name","version","mergeConfig","mergeConfigPolicy","scopePolicy","scope","legacyScope","objects","unmergedComponents","getEntry","envAspect","envFromEnvsAspect","aspectsRegisteredAsEnvs","aspect","envs","getEnvDefinitionByStringId","newExtensionId","nonEnvs","clonedEnvAspect","compact","envAspectExt","find","listIds","envAspectId","found","isEqualWithoutVersion","Boolean","extensionList","promises","resolveComponentId","idFromWorkspace","getIdIfExist","Promise","all","exports"],"sources":["aspects-merger.ts"],"sourcesContent":["import { Harmony } from '@teambit/harmony';\nimport { Component } from '@teambit/component';\nimport { UnmergedComponent } from '@teambit/legacy.scope';\nimport { ComponentID } from '@teambit/component-id';\nimport { EnvsAspect } from '@teambit/envs';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { ExtensionDataList, getCompareExtPredicate } from '@teambit/legacy.extension-data';\nimport { partition, mergeWith, merge, uniq, uniqWith, compact } from 'lodash';\nimport { MergeConfigConflict } from './exceptions/merge-config-conflict';\nimport { AspectSpecificField, ExtensionsOrigin, Workspace } from './workspace';\nimport { MergeConflictFile } from './merge-conflict-file';\n\nexport class AspectsMerger {\n readonly mergeConflictFile: MergeConflictFile;\n private mergeConfigDepsResolverDataCache: { [compIdStr: string]: Record<string, any> } = {};\n constructor(\n private workspace: Workspace,\n private harmony: Harmony\n ) {\n this.mergeConflictFile = new MergeConflictFile(workspace.path);\n }\n\n getDepsDataOfMergeConfig(id: ComponentID) {\n return this.mergeConfigDepsResolverDataCache[id.toString()];\n }\n\n /**\n * Calculate the component config based on:\n * the config property in the .bitmap file\n * the component.json file in the component folder\n * matching pattern in the variants config\n * defaults extensions from workspace config\n * extensions from the model.\n */\n // eslint-disable-next-line complexity\n async merge(\n componentId: ComponentID,\n componentFromScope?: Component,\n excludeOrigins: ExtensionsOrigin[] = []\n ): Promise<{\n extensions: ExtensionDataList;\n beforeMerge: Array<{ extensions: ExtensionDataList; origin: ExtensionsOrigin; extraData: any }>; // useful for debugging\n errors?: Error[];\n }> {\n // TODO: consider caching this result\n let configFileExtensions: ExtensionDataList | undefined;\n let variantsExtensions: ExtensionDataList | undefined;\n const mergeFromScope = true;\n const errors: Error[] = [];\n\n const bitMapEntry = this.workspace.consumer.bitMap.getComponentIfExist(componentId);\n const bitMapExtensions = bitMapEntry?.config;\n\n let configMerge: Record<string, any> | undefined;\n try {\n configMerge = this.mergeConflictFile.getConflictParsed(componentId.toStringWithoutVersion());\n } catch (err) {\n if (!(err instanceof MergeConfigConflict)) {\n throw err;\n }\n this.workspace.logger.error(`unable to parse the config file for ${componentId.toString()} due to conflicts`);\n errors.push(err);\n }\n\n const adjustEnvsOnConfigMerge = (conf: Record<string, any>) => {\n const env = conf[EnvsAspect.id]?.env;\n if (!env) return;\n const [id] = env.split('@');\n conf[EnvsAspect.id] = { env: id };\n conf[env] = {};\n };\n\n const unmergedData = this.getUnmergedData(componentId);\n const unmergedDataMergeConf = unmergedData?.mergedConfig;\n const getMergeConfigCombined = () => {\n if (!configMerge && !unmergedDataMergeConf) return undefined;\n if (!configMerge) return unmergedDataMergeConf;\n if (!unmergedDataMergeConf) return configMerge;\n\n return mergeWith(configMerge, unmergedDataMergeConf, (objValue, srcValue) => {\n if (Array.isArray(objValue)) {\n // critical for dependencyResolver.policy.*dependencies. otherwise, it will override the array\n return objValue.concat(srcValue);\n }\n return undefined;\n });\n };\n const mergeConfigCombined = getMergeConfigCombined();\n adjustEnvsOnConfigMerge(mergeConfigCombined || {});\n\n const configMergeExtensions = mergeConfigCombined\n ? ExtensionDataList.fromConfigObject(mergeConfigCombined)\n : undefined;\n\n this.removeAutoDepsFromConfig(componentId, configMergeExtensions);\n const scopeExtensions = this.getComponentFromScopeWithoutDuplications(componentFromScope);\n // backward compatibility. previously, it was saved as an array into the model (when there was merge-config)\n this.removeAutoDepsFromConfig(componentId, scopeExtensions, true);\n const [specific, nonSpecific] = partition(scopeExtensions, (entry) => entry.config[AspectSpecificField] === true);\n const scopeExtensionsNonSpecific = new ExtensionDataList(...nonSpecific);\n const scopeExtensionsSpecific = new ExtensionDataList(...specific);\n\n this.addConfigDepsFromModelToConfigMerge(scopeExtensionsSpecific, mergeConfigCombined);\n\n const componentConfigFile = await this.workspace.componentConfigFile(componentId);\n if (componentConfigFile) {\n configFileExtensions = componentConfigFile.aspects.toLegacy();\n }\n const relativeComponentDir = this.workspace.componentDir(componentId, { ignoreVersion: true }, { relative: true });\n const variantConfig = this.workspace.variants.byRootDirAndName(relativeComponentDir, componentId.fullName);\n if (variantConfig) {\n variantsExtensions = variantConfig.extensions.clone();\n // Do not merge from scope when there is specific variant (which is not *) that match the component\n // if (variantConfig.maxSpecificity > 0) {\n // mergeFromScope = false;\n // }\n }\n // We don't stop on each step because we want to merge the default scope even if propagate=false but the default scope is not defined\n // in the case the same extension pushed twice, the former takes precedence (opposite of Object.assign)\n const extensionsToMerge: Array<{ origin: ExtensionsOrigin; extensions: ExtensionDataList; extraData: any }> = [];\n let envWasFoundPreviously = false;\n const removedExtensionIds: string[] = [];\n\n const addExtensionsToMerge = async (extensions: ExtensionDataList, origin: ExtensionsOrigin, extraData?: any) => {\n if (!extensions.length) {\n return;\n }\n removedExtensionIds.push(...extensions.filter((extData) => extData.isRemoved).map((extData) => extData.stringId));\n const extsWithoutRemoved = extensions.filterRemovedExtensions();\n const selfInMergedExtensions = extsWithoutRemoved.findExtension(componentId.toStringWithoutVersion(), true);\n const extsWithoutSelf = selfInMergedExtensions?.extensionId\n ? extsWithoutRemoved.remove(selfInMergedExtensions.extensionId)\n : extsWithoutRemoved;\n const preferWorkspaceVersion = origin !== 'BitmapFile' && origin !== 'ComponentJsonFile';\n // it's important to do this resolution before the merge, otherwise we have issues with extensions\n // coming from scope with local scope name, as opposed to the same extension comes from the workspace with default scope name\n // also, it's important to do it before filtering the env, because when the env was not exported, it's saved with scope-name\n // inside the \"env\" prop of teambit.envs/env, but without scope-name in the root.\n const extsWithUpdatedIds = await this.resolveExtensionListIds(extsWithoutSelf, preferWorkspaceVersion);\n const { extensionDataListFiltered, envIsCurrentlySet } = await this.filterEnvsFromExtensionsIfNeeded(\n extsWithUpdatedIds,\n envWasFoundPreviously,\n origin\n );\n if (envIsCurrentlySet) {\n envWasFoundPreviously = true;\n }\n\n extensionsToMerge.push({ origin, extensions: extensionDataListFiltered, extraData });\n };\n const setDataListAsSpecific = (extensions: ExtensionDataList) => {\n extensions.forEach((dataEntry) => (dataEntry.config[AspectSpecificField] = true));\n };\n if (bitMapExtensions && !excludeOrigins.includes('BitmapFile')) {\n const extensionDataList = ExtensionDataList.fromConfigObject(bitMapExtensions);\n setDataListAsSpecific(extensionDataList);\n await addExtensionsToMerge(extensionDataList, 'BitmapFile');\n }\n // config-merge is after the .bitmap. because normally if you have config set in .bitmap, you won't\n // be able to lane-merge. (unless you specify --ignore-config-changes).\n // so, if there is config in .bitmap, it probably happened after lane-merge.\n if (configMergeExtensions && !excludeOrigins.includes('ConfigMerge')) {\n await addExtensionsToMerge(ExtensionDataList.fromArray(configMergeExtensions), 'ConfigMerge');\n }\n if (configFileExtensions && !excludeOrigins.includes('ComponentJsonFile')) {\n setDataListAsSpecific(configFileExtensions);\n await addExtensionsToMerge(configFileExtensions, 'ComponentJsonFile');\n }\n if (!excludeOrigins.includes('ModelSpecific')) {\n await addExtensionsToMerge(ExtensionDataList.fromArray(scopeExtensionsSpecific), 'ModelSpecific');\n }\n let continuePropagating = componentConfigFile?.propagate ?? true;\n if (variantsExtensions && continuePropagating && !excludeOrigins.includes('WorkspaceVariants')) {\n const appliedRules = variantConfig?.sortedMatches.map(({ pattern, specificity }) => ({ pattern, specificity }));\n await addExtensionsToMerge(variantsExtensions, 'WorkspaceVariants', { appliedRules });\n }\n continuePropagating = continuePropagating && (variantConfig?.propagate ?? true);\n if (mergeFromScope && continuePropagating && !excludeOrigins.includes('ModelNonSpecific')) {\n await addExtensionsToMerge(scopeExtensionsNonSpecific, 'ModelNonSpecific');\n }\n\n const afterMerge = ExtensionDataList.mergeConfigs(extensionsToMerge.map((ext) => ext.extensions));\n const withoutRemoved = afterMerge.filter((extData) => !removedExtensionIds.includes(extData.stringId));\n const extensions = ExtensionDataList.fromArray(withoutRemoved);\n return {\n extensions,\n beforeMerge: extensionsToMerge,\n errors,\n };\n }\n\n /**\n * before version 0.0.882 it was possible to save Version object with the same extension twice.\n */\n private getComponentFromScopeWithoutDuplications(componentFromScope?: Component) {\n if (!componentFromScope) return new ExtensionDataList();\n const scopeExtensions = componentFromScope.config.extensions;\n const scopeExtIds = scopeExtensions.ids;\n const scopeExtHasDuplications = scopeExtIds.length !== uniq(scopeExtIds).length;\n if (!scopeExtHasDuplications) {\n return scopeExtensions;\n }\n // let's remove this duplicated extension blindly without trying to merge. (no need to merge coz it's old data from scope\n // which will be overridden anyway by the workspace or other config strategies).\n const arr = uniqWith(scopeExtensions, getCompareExtPredicate(true));\n return ExtensionDataList.fromArray(arr);\n }\n\n /**\n * from the merge-config we get the dep-resolver policy as an array, because it needs to support \"force\" prop.\n * however, when we save the config, we want to save it as an object, so we need split the data into two:\n * 1. force: true, which gets saved into the config.\n * 2. force: false, which gets saved into the data.dependencies later on. see the workspace.getAutoDetectOverrides()\n */\n private removeAutoDepsFromConfig(componentId: ComponentID, conf?: ExtensionDataList, fromScope = false) {\n if (!conf) return;\n const policy = conf.findCoreExtension(DependencyResolverAspect.id)?.config.policy;\n if (!policy) return;\n\n const mergeConfigObj = {};\n ['dependencies', 'devDependencies', 'peerDependencies'].forEach((key) => {\n if (!policy[key]) return;\n // this is only relevant when it is saved as an array. otherwise, it's always force: true.\n if (!Array.isArray(policy[key])) return;\n\n mergeConfigObj[key] = policy[key].filter((dep) => !dep.force);\n policy[key] = policy[key].filter((dep) => dep.force);\n\n if (!policy[key].length) {\n delete policy[key];\n return;\n }\n // convert to object\n policy[key] = policy[key].reduce((acc, current) => {\n acc[current.name] = current.version;\n return acc;\n }, {});\n });\n\n if (!fromScope) {\n if (!this.mergeConfigDepsResolverDataCache[componentId.toString()]) {\n this.mergeConfigDepsResolverDataCache[componentId.toString()] = {};\n }\n this.mergeConfigDepsResolverDataCache[componentId.toString()] = merge(\n this.mergeConfigDepsResolverDataCache[componentId.toString()],\n mergeConfigObj\n );\n }\n }\n\n /**\n * this is needed because if the mergeConfig has a policy, it will be used, and any other policy along the line will be ignored.\n * in case the model has some dependencies that were set explicitly they're gonna be ignored.\n * this makes sure to add them to the policy of the mergeConfig.\n * in a way, this is similar to what we do when a user is running `bit deps set` and the component had previous dependencies set,\n * we copy those dependencies along with the current one to the .bitmap file, so they won't get lost.\n */\n private addConfigDepsFromModelToConfigMerge(\n scopeExtensionsSpecific: ExtensionDataList,\n mergeConfig?: Record<string, any>\n ) {\n const mergeConfigPolicy = mergeConfig?.[DependencyResolverAspect.id]?.policy;\n if (!mergeConfigPolicy) return;\n const scopePolicy = scopeExtensionsSpecific.findCoreExtension(DependencyResolverAspect.id)?.config.policy;\n if (!scopePolicy) return;\n Object.keys(scopePolicy).forEach((key) => {\n if (!mergeConfigPolicy[key]) {\n mergeConfigPolicy[key] = scopePolicy[key];\n return;\n }\n // mergeConfigPolicy should take precedence over scopePolicy\n mergeConfigPolicy[key] = { ...scopePolicy[key], ...mergeConfigPolicy[key] };\n });\n }\n\n private getUnmergedData(componentId: ComponentID): UnmergedComponent | undefined {\n return this.workspace.scope.legacyScope.objects.unmergedComponents.getEntry(componentId);\n }\n\n private async filterEnvsFromExtensionsIfNeeded(\n extensionDataList: ExtensionDataList,\n envWasFoundPreviously: boolean,\n origin: ExtensionsOrigin\n ) {\n const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n const envFromEnvsAspect: string | undefined = envAspect?.config.env || envAspect?.data.id;\n const aspectsRegisteredAsEnvs = extensionDataList\n .filter((aspect) =>\n this.workspace.envs.getEnvDefinitionByStringId(aspect.newExtensionId?.toString() || aspect.stringId)\n )\n .map((aspect) => aspect.stringId);\n if (envWasFoundPreviously && (envAspect || aspectsRegisteredAsEnvs.length)) {\n const nonEnvs = extensionDataList.map((e) => {\n // normally the env-id inside the envs aspect doesn't have a version, but the aspect itself has a version.\n // also, the env-id inside the envs aspect includes the default-scope, but the aspect itself doesn't.\n if (\n (envFromEnvsAspect && e.stringId === envFromEnvsAspect) ||\n (envFromEnvsAspect && e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect) ||\n aspectsRegisteredAsEnvs.includes(e.stringId)\n ) {\n return undefined;\n }\n if (e.stringId === envAspect?.stringId) {\n // must clone the env aspect to avoid mutating the original data\n const clonedEnvAspect = e.clone();\n delete clonedEnvAspect.config.env; // aspect env may have other data other then config.env.\n return clonedEnvAspect;\n }\n return e;\n });\n\n return { extensionDataListFiltered: new ExtensionDataList(...compact(nonEnvs)), envIsCurrentlySet: true };\n }\n if (envFromEnvsAspect && (origin === 'ModelNonSpecific' || origin === 'ModelSpecific')) {\n // if env was found, search for this env in the workspace and if found, replace the env-id with the one from the workspace\n const envAspectExt = extensionDataList.find((e) => e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect);\n const ids = this.workspace.listIds();\n const envAspectId = envAspectExt?.extensionId;\n const found = envAspectId && ids.find((id) => id.isEqualWithoutVersion(envAspectId));\n if (found) {\n envAspectExt.extensionId = found;\n }\n }\n return { extensionDataListFiltered: extensionDataList, envIsCurrentlySet: Boolean(envFromEnvsAspect) };\n }\n\n /**\n * This will mutate the entries with extensionId prop to have resolved legacy id\n * This should be worked on the extension data list not the new aspect list\n * @param extensionList\n */\n private async resolveExtensionListIds(\n extensionList: ExtensionDataList,\n preferWorkspaceVersion = false\n ): Promise<ExtensionDataList> {\n const promises = extensionList.map(async (entry) => {\n if (entry.extensionId) {\n // don't pass `entry.extensionId` (as ComponentID) to `resolveComponentId` because then it'll use the optimization\n // of parsing it to ComponentID without checking the workspace. Normally, this optimization is good, but here\n // in case the extension wasn't exported, the ComponentID is wrong, it has the scope-name due to incorrect ComponentID.fromString\n // in configEntryToDataEntry() function. It'd be ideal to fix it from there but it's not easy.\n const componentId = await this.workspace.resolveComponentId(entry.extensionId.toString());\n const idFromWorkspace = preferWorkspaceVersion ? this.workspace.getIdIfExist(componentId) : undefined;\n const id = idFromWorkspace || componentId;\n entry.extensionId = id;\n entry.newExtensionId = id;\n }\n\n return entry;\n });\n await Promise.all(promises);\n return extensionList;\n }\n}\n"],"mappings":";;;;;;AAIA,SAAAA,MAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,KAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAE,oBAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,mBAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,QAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,OAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,QAAA;EAAA,MAAAJ,IAAA,GAAAC,OAAA;EAAAG,OAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,qBAAA;EAAA,MAAAL,IAAA,GAAAC,OAAA;EAAAI,oBAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,WAAA;EAAA,MAAAN,IAAA,GAAAC,OAAA;EAAAK,UAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,mBAAA;EAAA,MAAAP,IAAA,GAAAC,OAAA;EAAAM,kBAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0D,SAAAQ,QAAAC,CAAA,EAAAC,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAJ,CAAA,OAAAG,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAL,CAAA,GAAAC,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAR,CAAA,EAAAC,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAZ,CAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAF,OAAA,CAAAI,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,IAAAe,eAAA,CAAAhB,CAAA,EAAAC,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAAlB,CAAA,EAAAG,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAH,OAAA,CAAAI,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAnB,CAAA,EAAAC,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAD,CAAA;AAAA,SAAAgB,gBAAAhB,CAAA,EAAAC,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAmB,cAAA,CAAAnB,CAAA,MAAAD,CAAA,GAAAG,MAAA,CAAAgB,cAAA,CAAAnB,CAAA,EAAAC,CAAA,IAAAoB,KAAA,EAAAnB,CAAA,EAAAO,UAAA,MAAAa,YAAA,MAAAC,QAAA,UAAAvB,CAAA,CAAAC,CAAA,IAAAC,CAAA,EAAAF,CAAA;AAAA,SAAAoB,eAAAlB,CAAA,QAAAsB,CAAA,GAAAC,YAAA,CAAAvB,CAAA,uCAAAsB,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAvB,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAF,CAAA,GAAAE,CAAA,CAAAwB,MAAA,CAAAC,WAAA,kBAAA3B,CAAA,QAAAwB,CAAA,GAAAxB,CAAA,CAAA4B,IAAA,CAAA1B,CAAA,EAAAD,CAAA,uCAAAuB,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAA5B,CAAA,GAAA6B,MAAA,GAAAC,MAAA,EAAA7B,CAAA;AAEnD,MAAM8B,aAAa,CAAC;EAGzBC,WAAWA,CACDC,SAAoB,EACpBC,OAAgB,EACxB;IAAA,KAFQD,SAAoB,GAApBA,SAAoB;IAAA,KACpBC,OAAgB,GAAhBA,OAAgB;IAAAnB,eAAA;IAAAA,eAAA,2CAH+D,CAAC,CAAC;IAKzF,IAAI,CAACoB,iBAAiB,GAAG,KAAIC,sCAAiB,EAACH,SAAS,CAACI,IAAI,CAAC;EAChE;EAEAC,wBAAwBA,CAACC,EAAe,EAAE;IACxC,OAAO,IAAI,CAACC,gCAAgC,CAACD,EAAE,CAACE,QAAQ,CAAC,CAAC,CAAC;EAC7D;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACE;EACA,MAAMC,KAAKA,CACTC,WAAwB,EACxBC,kBAA8B,EAC9BC,cAAkC,GAAG,EAAE,EAKtC;IACD;IACA,IAAIC,oBAAmD;IACvD,IAAIC,kBAAiD;IACrD,MAAMC,cAAc,GAAG,IAAI;IAC3B,MAAMC,MAAe,GAAG,EAAE;IAE1B,MAAMC,WAAW,GAAG,IAAI,CAACjB,SAAS,CAACkB,QAAQ,CAACC,MAAM,CAACC,mBAAmB,CAACV,WAAW,CAAC;IACnF,MAAMW,gBAAgB,GAAGJ,WAAW,EAAEK,MAAM;IAE5C,IAAIC,WAA4C;IAChD,IAAI;MACFA,WAAW,GAAG,IAAI,CAACrB,iBAAiB,CAACsB,iBAAiB,CAACd,WAAW,CAACe,sBAAsB,CAAC,CAAC,CAAC;IAC9F,CAAC,CAAC,OAAOC,GAAG,EAAE;MACZ,IAAI,EAAEA,GAAG,YAAYC,0CAAmB,CAAC,EAAE;QACzC,MAAMD,GAAG;MACX;MACA,IAAI,CAAC1B,SAAS,CAAC4B,MAAM,CAACC,KAAK,CAAC,uCAAuCnB,WAAW,CAACF,QAAQ,CAAC,CAAC,mBAAmB,CAAC;MAC7GQ,MAAM,CAACxC,IAAI,CAACkD,GAAG,CAAC;IAClB;IAEA,MAAMI,uBAAuB,GAAIC,IAAyB,IAAK;MAC7D,MAAMC,GAAG,GAAGD,IAAI,CAACE,kBAAU,CAAC3B,EAAE,CAAC,EAAE0B,GAAG;MACpC,IAAI,CAACA,GAAG,EAAE;MACV,MAAM,CAAC1B,EAAE,CAAC,GAAG0B,GAAG,CAACE,KAAK,CAAC,GAAG,CAAC;MAC3BH,IAAI,CAACE,kBAAU,CAAC3B,EAAE,CAAC,GAAG;QAAE0B,GAAG,EAAE1B;MAAG,CAAC;MACjCyB,IAAI,CAACC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IAED,MAAMG,YAAY,GAAG,IAAI,CAACC,eAAe,CAAC1B,WAAW,CAAC;IACtD,MAAM2B,qBAAqB,GAAGF,YAAY,EAAEG,YAAY;IACxD,MAAMC,sBAAsB,GAAGA,CAAA,KAAM;MACnC,IAAI,CAAChB,WAAW,IAAI,CAACc,qBAAqB,EAAE,OAAOG,SAAS;MAC5D,IAAI,CAACjB,WAAW,EAAE,OAAOc,qBAAqB;MAC9C,IAAI,CAACA,qBAAqB,EAAE,OAAOd,WAAW;MAE9C,OAAO,IAAAkB,mBAAS,EAAClB,WAAW,EAAEc,qBAAqB,EAAE,CAACK,QAAQ,EAAEC,QAAQ,KAAK;QAC3E,IAAIC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,EAAE;UAC3B;UACA,OAAOA,QAAQ,CAACI,MAAM,CAACH,QAAQ,CAAC;QAClC;QACA,OAAOH,SAAS;MAClB,CAAC,CAAC;IACJ,CAAC;IACD,MAAMO,mBAAmB,GAAGR,sBAAsB,CAAC,CAAC;IACpDT,uBAAuB,CAACiB,mBAAmB,IAAI,CAAC,CAAC,CAAC;IAElD,MAAMC,qBAAqB,GAAGD,mBAAmB,GAC7CE,2BAAiB,CAACC,gBAAgB,CAACH,mBAAmB,CAAC,GACvDP,SAAS;IAEb,IAAI,CAACW,wBAAwB,CAACzC,WAAW,EAAEsC,qBAAqB,CAAC;IACjE,MAAMI,eAAe,GAAG,IAAI,CAACC,wCAAwC,CAAC1C,kBAAkB,CAAC;IACzF;IACA,IAAI,CAACwC,wBAAwB,CAACzC,WAAW,EAAE0C,eAAe,EAAE,IAAI,CAAC;IACjE,MAAM,CAACE,QAAQ,EAAEC,WAAW,CAAC,GAAG,IAAAC,mBAAS,EAACJ,eAAe,EAAGK,KAAK,IAAKA,KAAK,CAACnC,MAAM,CAACoC,gCAAmB,CAAC,KAAK,IAAI,CAAC;IACjH,MAAMC,0BAA0B,GAAG,KAAIV,2BAAiB,EAAC,GAAGM,WAAW,CAAC;IACxE,MAAMK,uBAAuB,GAAG,KAAIX,2BAAiB,EAAC,GAAGK,QAAQ,CAAC;IAElE,IAAI,CAACO,mCAAmC,CAACD,uBAAuB,EAAEb,mBAAmB,CAAC;IAEtF,MAAMe,mBAAmB,GAAG,MAAM,IAAI,CAAC9D,SAAS,CAAC8D,mBAAmB,CAACpD,WAAW,CAAC;IACjF,IAAIoD,mBAAmB,EAAE;MACvBjD,oBAAoB,GAAGiD,mBAAmB,CAACC,OAAO,CAACC,QAAQ,CAAC,CAAC;IAC/D;IACA,MAAMC,oBAAoB,GAAG,IAAI,CAACjE,SAAS,CAACkE,YAAY,CAACxD,WAAW,EAAE;MAAEyD,aAAa,EAAE;IAAK,CAAC,EAAE;MAAEC,QAAQ,EAAE;IAAK,CAAC,CAAC;IAClH,MAAMC,aAAa,GAAG,IAAI,CAACrE,SAAS,CAACsE,QAAQ,CAACC,gBAAgB,CAACN,oBAAoB,EAAEvD,WAAW,CAAC8D,QAAQ,CAAC;IAC1G,IAAIH,aAAa,EAAE;MACjBvD,kBAAkB,GAAGuD,aAAa,CAACI,UAAU,CAACC,KAAK,CAAC,CAAC;MACrD;MACA;MACA;MACA;IACF;IACA;IACA;IACA,MAAMC,iBAAqG,GAAG,EAAE;IAChH,IAAIC,qBAAqB,GAAG,KAAK;IACjC,MAAMC,mBAA6B,GAAG,EAAE;IAExC,MAAMC,oBAAoB,GAAG,MAAAA,CAAOL,UAA6B,EAAEM,MAAwB,EAAEC,SAAe,KAAK;MAC/G,IAAI,CAACP,UAAU,CAAC7F,MAAM,EAAE;QACtB;MACF;MACAiG,mBAAmB,CAACrG,IAAI,CAAC,GAAGiG,UAAU,CAACpG,MAAM,CAAE4G,OAAO,IAAKA,OAAO,CAACC,SAAS,CAAC,CAACC,GAAG,CAAEF,OAAO,IAAKA,OAAO,CAACG,QAAQ,CAAC,CAAC;MACjH,MAAMC,kBAAkB,GAAGZ,UAAU,CAACa,uBAAuB,CAAC,CAAC;MAC/D,MAAMC,sBAAsB,GAAGF,kBAAkB,CAACG,aAAa,CAAC9E,WAAW,CAACe,sBAAsB,CAAC,CAAC,EAAE,IAAI,CAAC;MAC3G,MAAMgE,eAAe,GAAGF,sBAAsB,EAAEG,WAAW,GACvDL,kBAAkB,CAACM,MAAM,CAACJ,sBAAsB,CAACG,WAAW,CAAC,GAC7DL,kBAAkB;MACtB,MAAMO,sBAAsB,GAAGb,MAAM,KAAK,YAAY,IAAIA,MAAM,KAAK,mBAAmB;MACxF;MACA;MACA;MACA;MACA,MAAMc,kBAAkB,GAAG,MAAM,IAAI,CAACC,uBAAuB,CAACL,eAAe,EAAEG,sBAAsB,CAAC;MACtG,MAAM;QAAEG,yBAAyB;QAAEC;MAAkB,CAAC,GAAG,MAAM,IAAI,CAACC,gCAAgC,CAClGJ,kBAAkB,EAClBjB,qBAAqB,EACrBG,MACF,CAAC;MACD,IAAIiB,iBAAiB,EAAE;QACrBpB,qBAAqB,GAAG,IAAI;MAC9B;MAEAD,iBAAiB,CAACnG,IAAI,CAAC;QAAEuG,MAAM;QAAEN,UAAU,EAAEsB,yBAAyB;QAAEf;MAAU,CAAC,CAAC;IACtF,CAAC;IACD,MAAMkB,qBAAqB,GAAIzB,UAA6B,IAAK;MAC/DA,UAAU,CAAC5F,OAAO,CAAEsH,SAAS,IAAMA,SAAS,CAAC7E,MAAM,CAACoC,gCAAmB,CAAC,GAAG,IAAK,CAAC;IACnF,CAAC;IACD,IAAIrC,gBAAgB,IAAI,CAACT,cAAc,CAACwF,QAAQ,CAAC,YAAY,CAAC,EAAE;MAC9D,MAAMC,iBAAiB,GAAGpD,2BAAiB,CAACC,gBAAgB,CAAC7B,gBAAgB,CAAC;MAC9E6E,qBAAqB,CAACG,iBAAiB,CAAC;MACxC,MAAMvB,oBAAoB,CAACuB,iBAAiB,EAAE,YAAY,CAAC;IAC7D;IACA;IACA;IACA;IACA,IAAIrD,qBAAqB,IAAI,CAACpC,cAAc,CAACwF,QAAQ,CAAC,aAAa,CAAC,EAAE;MACpE,MAAMtB,oBAAoB,CAAC7B,2BAAiB,CAACqD,SAAS,CAACtD,qBAAqB,CAAC,EAAE,aAAa,CAAC;IAC/F;IACA,IAAInC,oBAAoB,IAAI,CAACD,cAAc,CAACwF,QAAQ,CAAC,mBAAmB,CAAC,EAAE;MACzEF,qBAAqB,CAACrF,oBAAoB,CAAC;MAC3C,MAAMiE,oBAAoB,CAACjE,oBAAoB,EAAE,mBAAmB,CAAC;IACvE;IACA,IAAI,CAACD,cAAc,CAACwF,QAAQ,CAAC,eAAe,CAAC,EAAE;MAC7C,MAAMtB,oBAAoB,CAAC7B,2BAAiB,CAACqD,SAAS,CAAC1C,uBAAuB,CAAC,EAAE,eAAe,CAAC;IACnG;IACA,IAAI2C,mBAAmB,GAAGzC,mBAAmB,EAAE0C,SAAS,IAAI,IAAI;IAChE,IAAI1F,kBAAkB,IAAIyF,mBAAmB,IAAI,CAAC3F,cAAc,CAACwF,QAAQ,CAAC,mBAAmB,CAAC,EAAE;MAC9F,MAAMK,YAAY,GAAGpC,aAAa,EAAEqC,aAAa,CAACvB,GAAG,CAAC,CAAC;QAAEwB,OAAO;QAAEC;MAAY,CAAC,MAAM;QAAED,OAAO;QAAEC;MAAY,CAAC,CAAC,CAAC;MAC/G,MAAM9B,oBAAoB,CAAChE,kBAAkB,EAAE,mBAAmB,EAAE;QAAE2F;MAAa,CAAC,CAAC;IACvF;IACAF,mBAAmB,GAAGA,mBAAmB,KAAKlC,aAAa,EAAEmC,SAAS,IAAI,IAAI,CAAC;IAC/E,IAAIzF,cAAc,IAAIwF,mBAAmB,IAAI,CAAC3F,cAAc,CAACwF,QAAQ,CAAC,kBAAkB,CAAC,EAAE;MACzF,MAAMtB,oBAAoB,CAACnB,0BAA0B,EAAE,kBAAkB,CAAC;IAC5E;IAEA,MAAMkD,UAAU,GAAG5D,2BAAiB,CAAC6D,YAAY,CAACnC,iBAAiB,CAACQ,GAAG,CAAE4B,GAAG,IAAKA,GAAG,CAACtC,UAAU,CAAC,CAAC;IACjG,MAAMuC,cAAc,GAAGH,UAAU,CAACxI,MAAM,CAAE4G,OAAO,IAAK,CAACJ,mBAAmB,CAACuB,QAAQ,CAACnB,OAAO,CAACG,QAAQ,CAAC,CAAC;IACtG,MAAMX,UAAU,GAAGxB,2BAAiB,CAACqD,SAAS,CAACU,cAAc,CAAC;IAC9D,OAAO;MACLvC,UAAU;MACVwC,WAAW,EAAEtC,iBAAiB;MAC9B3D;IACF,CAAC;EACH;;EAEA;AACF;AACA;EACUqC,wCAAwCA,CAAC1C,kBAA8B,EAAE;IAC/E,IAAI,CAACA,kBAAkB,EAAE,OAAO,KAAIsC,2BAAiB,EAAC,CAAC;IACvD,MAAMG,eAAe,GAAGzC,kBAAkB,CAACW,MAAM,CAACmD,UAAU;IAC5D,MAAMyC,WAAW,GAAG9D,eAAe,CAAC+D,GAAG;IACvC,MAAMC,uBAAuB,GAAGF,WAAW,CAACtI,MAAM,KAAK,IAAAyI,cAAI,EAACH,WAAW,CAAC,CAACtI,MAAM;IAC/E,IAAI,CAACwI,uBAAuB,EAAE;MAC5B,OAAOhE,eAAe;IACxB;IACA;IACA;IACA,MAAMkE,GAAG,GAAG,IAAAC,kBAAQ,EAACnE,eAAe,EAAE,IAAAoE,gCAAsB,EAAC,IAAI,CAAC,CAAC;IACnE,OAAOvE,2BAAiB,CAACqD,SAAS,CAACgB,GAAG,CAAC;EACzC;;EAEA;AACF;AACA;AACA;AACA;AACA;EACUnE,wBAAwBA,CAACzC,WAAwB,EAAEqB,IAAwB,EAAE0F,SAAS,GAAG,KAAK,EAAE;IACtG,IAAI,CAAC1F,IAAI,EAAE;IACX,MAAM2F,MAAM,GAAG3F,IAAI,CAAC4F,iBAAiB,CAACC,8CAAwB,CAACtH,EAAE,CAAC,EAAEgB,MAAM,CAACoG,MAAM;IACjF,IAAI,CAACA,MAAM,EAAE;IAEb,MAAMG,cAAc,GAAG,CAAC,CAAC;IACzB,CAAC,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAAChJ,OAAO,CAAEiJ,GAAG,IAAK;MACvE,IAAI,CAACJ,MAAM,CAACI,GAAG,CAAC,EAAE;MAClB;MACA,IAAI,CAAClF,KAAK,CAACC,OAAO,CAAC6E,MAAM,CAACI,GAAG,CAAC,CAAC,EAAE;MAEjCD,cAAc,CAACC,GAAG,CAAC,GAAGJ,MAAM,CAACI,GAAG,CAAC,CAACzJ,MAAM,CAAE0J,GAAG,IAAK,CAACA,GAAG,CAACC,KAAK,CAAC;MAC7DN,MAAM,CAACI,GAAG,CAAC,GAAGJ,MAAM,CAACI,GAAG,CAAC,CAACzJ,MAAM,CAAE0J,GAAG,IAAKA,GAAG,CAACC,KAAK,CAAC;MAEpD,IAAI,CAACN,MAAM,CAACI,GAAG,CAAC,CAAClJ,MAAM,EAAE;QACvB,OAAO8I,MAAM,CAACI,GAAG,CAAC;QAClB;MACF;MACA;MACAJ,MAAM,CAACI,GAAG,CAAC,GAAGJ,MAAM,CAACI,GAAG,CAAC,CAACG,MAAM,CAAC,CAACC,GAAG,EAAEC,OAAO,KAAK;QACjDD,GAAG,CAACC,OAAO,CAACC,IAAI,CAAC,GAAGD,OAAO,CAACE,OAAO;QACnC,OAAOH,GAAG;MACZ,CAAC,EAAE,CAAC,CAAC,CAAC;IACR,CAAC,CAAC;IAEF,IAAI,CAACT,SAAS,EAAE;MACd,IAAI,CAAC,IAAI,CAAClH,gCAAgC,CAACG,WAAW,CAACF,QAAQ,CAAC,CAAC,CAAC,EAAE;QAClE,IAAI,CAACD,gCAAgC,CAACG,WAAW,CAACF,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;MACpE;MACA,IAAI,CAACD,gCAAgC,CAACG,WAAW,CAACF,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAAC,eAAK,EACnE,IAAI,CAACF,gCAAgC,CAACG,WAAW,CAACF,QAAQ,CAAC,CAAC,CAAC,EAC7DqH,cACF,CAAC;IACH;EACF;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACUhE,mCAAmCA,CACzCD,uBAA0C,EAC1C0E,WAAiC,EACjC;IACA,MAAMC,iBAAiB,GAAGD,WAAW,GAAGV,8CAAwB,CAACtH,EAAE,CAAC,EAAEoH,MAAM;IAC5E,IAAI,CAACa,iBAAiB,EAAE;IACxB,MAAMC,WAAW,GAAG5E,uBAAuB,CAAC+D,iBAAiB,CAACC,8CAAwB,CAACtH,EAAE,CAAC,EAAEgB,MAAM,CAACoG,MAAM;IACzG,IAAI,CAACc,WAAW,EAAE;IAClBvK,MAAM,CAACC,IAAI,CAACsK,WAAW,CAAC,CAAC3J,OAAO,CAAEiJ,GAAG,IAAK;MACxC,IAAI,CAACS,iBAAiB,CAACT,GAAG,CAAC,EAAE;QAC3BS,iBAAiB,CAACT,GAAG,CAAC,GAAGU,WAAW,CAACV,GAAG,CAAC;QACzC;MACF;MACA;MACAS,iBAAiB,CAACT,GAAG,CAAC,GAAApJ,aAAA,CAAAA,aAAA,KAAQ8J,WAAW,CAACV,GAAG,CAAC,GAAKS,iBAAiB,CAACT,GAAG,CAAC,CAAE;IAC7E,CAAC,CAAC;EACJ;EAEQ1F,eAAeA,CAAC1B,WAAwB,EAAiC;IAC/E,OAAO,IAAI,CAACV,SAAS,CAACyI,KAAK,CAACC,WAAW,CAACC,OAAO,CAACC,kBAAkB,CAACC,QAAQ,CAACnI,WAAW,CAAC;EAC1F;EAEA,MAAcuF,gCAAgCA,CAC5CI,iBAAoC,EACpCzB,qBAA8B,EAC9BG,MAAwB,EACxB;IACA,MAAM+D,SAAS,GAAGzC,iBAAiB,CAACb,aAAa,CAACvD,kBAAU,CAAC3B,EAAE,CAAC;IAChE,MAAMyI,iBAAqC,GAAGD,SAAS,EAAExH,MAAM,CAACU,GAAG,IAAI8G,SAAS,EAAEzL,IAAI,CAACiD,EAAE;IACzF,MAAM0I,uBAAuB,GAAG3C,iBAAiB,CAC9ChI,MAAM,CAAE4K,MAAM,IACb,IAAI,CAACjJ,SAAS,CAACkJ,IAAI,CAACC,0BAA0B,CAACF,MAAM,CAACG,cAAc,EAAE5I,QAAQ,CAAC,CAAC,IAAIyI,MAAM,CAAC7D,QAAQ,CACrG,CAAC,CACAD,GAAG,CAAE8D,MAAM,IAAKA,MAAM,CAAC7D,QAAQ,CAAC;IACnC,IAAIR,qBAAqB,KAAKkE,SAAS,IAAIE,uBAAuB,CAACpK,MAAM,CAAC,EAAE;MAC1E,MAAMyK,OAAO,GAAGhD,iBAAiB,CAAClB,GAAG,CAAErH,CAAC,IAAK;QAC3C;QACA;QACA,IACGiL,iBAAiB,IAAIjL,CAAC,CAACsH,QAAQ,KAAK2D,iBAAiB,IACrDA,iBAAiB,IAAIjL,CAAC,CAAC4H,WAAW,EAAEjE,sBAAsB,CAAC,CAAC,KAAKsH,iBAAkB,IACpFC,uBAAuB,CAAC5C,QAAQ,CAACtI,CAAC,CAACsH,QAAQ,CAAC,EAC5C;UACA,OAAO5C,SAAS;QAClB;QACA,IAAI1E,CAAC,CAACsH,QAAQ,KAAK0D,SAAS,EAAE1D,QAAQ,EAAE;UACtC;UACA,MAAMkE,eAAe,GAAGxL,CAAC,CAAC4G,KAAK,CAAC,CAAC;UACjC,OAAO4E,eAAe,CAAChI,MAAM,CAACU,GAAG,CAAC,CAAC;UACnC,OAAOsH,eAAe;QACxB;QACA,OAAOxL,CAAC;MACV,CAAC,CAAC;MAEF,OAAO;QAAEiI,yBAAyB,EAAE,KAAI9C,2BAAiB,EAAC,GAAG,IAAAsG,iBAAO,EAACF,OAAO,CAAC,CAAC;QAAErD,iBAAiB,EAAE;MAAK,CAAC;IAC3G;IACA,IAAI+C,iBAAiB,KAAKhE,MAAM,KAAK,kBAAkB,IAAIA,MAAM,KAAK,eAAe,CAAC,EAAE;MACtF;MACA,MAAMyE,YAAY,GAAGnD,iBAAiB,CAACoD,IAAI,CAAE3L,CAAC,IAAKA,CAAC,CAAC4H,WAAW,EAAEjE,sBAAsB,CAAC,CAAC,KAAKsH,iBAAiB,CAAC;MACjH,MAAM5B,GAAG,GAAG,IAAI,CAACnH,SAAS,CAAC0J,OAAO,CAAC,CAAC;MACpC,MAAMC,WAAW,GAAGH,YAAY,EAAE9D,WAAW;MAC7C,MAAMkE,KAAK,GAAGD,WAAW,IAAIxC,GAAG,CAACsC,IAAI,CAAEnJ,EAAE,IAAKA,EAAE,CAACuJ,qBAAqB,CAACF,WAAW,CAAC,CAAC;MACpF,IAAIC,KAAK,EAAE;QACTJ,YAAY,CAAC9D,WAAW,GAAGkE,KAAK;MAClC;IACF;IACA,OAAO;MAAE7D,yBAAyB,EAAEM,iBAAiB;MAAEL,iBAAiB,EAAE8D,OAAO,CAACf,iBAAiB;IAAE,CAAC;EACxG;;EAEA;AACF;AACA;AACA;AACA;EACE,MAAcjD,uBAAuBA,CACnCiE,aAAgC,EAChCnE,sBAAsB,GAAG,KAAK,EACF;IAC5B,MAAMoE,QAAQ,GAAGD,aAAa,CAAC5E,GAAG,CAAC,MAAO1B,KAAK,IAAK;MAClD,IAAIA,KAAK,CAACiC,WAAW,EAAE;QACrB;QACA;QACA;QACA;QACA,MAAMhF,WAAW,GAAG,MAAM,IAAI,CAACV,SAAS,CAACiK,kBAAkB,CAACxG,KAAK,CAACiC,WAAW,CAAClF,QAAQ,CAAC,CAAC,CAAC;QACzF,MAAM0J,eAAe,GAAGtE,sBAAsB,GAAG,IAAI,CAAC5F,SAAS,CAACmK,YAAY,CAACzJ,WAAW,CAAC,GAAG8B,SAAS;QACrG,MAAMlC,EAAE,GAAG4J,eAAe,IAAIxJ,WAAW;QACzC+C,KAAK,CAACiC,WAAW,GAAGpF,EAAE;QACtBmD,KAAK,CAAC2F,cAAc,GAAG9I,EAAE;MAC3B;MAEA,OAAOmD,KAAK;IACd,CAAC,CAAC;IACF,MAAM2G,OAAO,CAACC,GAAG,CAACL,QAAQ,CAAC;IAC3B,OAAOD,aAAa;EACtB;AACF;AAACO,OAAA,CAAAxK,aAAA,GAAAA,aAAA","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_envs","data","require","_dependencyResolver","_legacy","_lodash","_mergeConfigConflict","_workspace","_mergeConflictFile","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","AspectsMerger","constructor","workspace","harmony","mergeConflictFile","MergeConflictFile","path","getDepsDataOfMergeConfig","id","mergeConfigDepsResolverDataCache","toString","merge","componentId","componentFromScope","excludeOrigins","configFileExtensions","variantsExtensions","mergeFromScope","errors","bitMapEntry","consumer","bitMap","getComponentIfExist","bitMapExtensions","config","configMerge","getConflictParsed","toStringWithoutVersion","err","MergeConfigConflict","logger","error","unmergedData","getUnmergedData","unmergedDataMergeConf","mergedConfig","getMergeConfigCombined","undefined","mergeWith","objValue","srcValue","Array","isArray","concat","mergeConfigCombined","ExtensionDataList","adjustEnvsOnConfigObject","configMergeExtensions","fromConfigObject","removeAutoDepsFromConfig","scopeExtensions","getComponentFromScopeWithoutDuplications","specific","nonSpecific","partition","entry","AspectSpecificField","scopeExtensionsNonSpecific","scopeExtensionsSpecific","addConfigDepsFromModelToConfigMerge","componentConfigFile","aspects","toLegacy","relativeComponentDir","componentDir","ignoreVersion","relative","variantConfig","variants","byRootDirAndName","fullName","extensions","clone","extensionsToMerge","envWasFoundPreviously","removedExtensionIds","addExtensionsToMerge","origin","extraData","extData","isRemoved","map","stringId","extsWithoutRemoved","filterRemovedExtensions","selfInMergedExtensions","findExtension","extsWithoutSelf","extensionId","remove","preferWorkspaceVersion","extsWithUpdatedIds","resolveExtensionListIds","extensionDataListFiltered","envIsCurrentlySet","filterEnvsFromExtensionsIfNeeded","setDataListAsSpecific","dataEntry","includes","extensionDataList","fromArray","continuePropagating","propagate","appliedRules","sortedMatches","pattern","specificity","afterMerge","mergeConfigs","ext","withoutRemoved","beforeMerge","scopeExtIds","ids","scopeExtHasDuplications","uniq","arr","uniqWith","getCompareExtPredicate","conf","fromScope","autoDepsObj","extractAutoDepsFromConfig","mergeConfig","mergeConfigPolicy","DependencyResolverAspect","policy","scopePolicy","findCoreExtension","key","scope","legacyScope","objects","unmergedComponents","getEntry","envAspect","EnvsAspect","envFromEnvsAspect","env","aspectsRegisteredAsEnvs","aspect","envs","getEnvDefinitionByStringId","newExtensionId","nonEnvs","clonedEnvAspect","compact","envAspectExt","find","listIds","envAspectId","found","isEqualWithoutVersion","Boolean","extensionList","promises","resolveComponentId","idFromWorkspace","getIdIfExist","Promise","all","exports"],"sources":["aspects-merger.ts"],"sourcesContent":["import { Harmony } from '@teambit/harmony';\nimport { Component } from '@teambit/component';\nimport { UnmergedComponent } from '@teambit/legacy.scope';\nimport { ComponentID } from '@teambit/component-id';\nimport { EnvsAspect } from '@teambit/envs';\nimport { DependencyResolverAspect, VariantPolicyConfigArr } from '@teambit/dependency-resolver';\nimport { ExtensionDataList, getCompareExtPredicate } from '@teambit/legacy.extension-data';\nimport { partition, mergeWith, merge, uniq, uniqWith, compact } from 'lodash';\nimport { MergeConfigConflict } from './exceptions/merge-config-conflict';\nimport { AspectSpecificField, ExtensionsOrigin, Workspace } from './workspace';\nimport { MergeConflictFile } from './merge-conflict-file';\n\nexport class AspectsMerger {\n readonly mergeConflictFile: MergeConflictFile;\n private mergeConfigDepsResolverDataCache: { [compIdStr: string]: VariantPolicyConfigArr } = {};\n constructor(\n private workspace: Workspace,\n private harmony: Harmony\n ) {\n this.mergeConflictFile = new MergeConflictFile(workspace.path);\n }\n\n getDepsDataOfMergeConfig(id: ComponentID): VariantPolicyConfigArr {\n return this.mergeConfigDepsResolverDataCache[id.toString()];\n }\n\n /**\n * Calculate the component config based on:\n * the config property in the .bitmap file\n * the component.json file in the component folder\n * matching pattern in the variants config\n * defaults extensions from workspace config\n * extensions from the model.\n */\n async merge(\n componentId: ComponentID,\n componentFromScope?: Component,\n excludeOrigins: ExtensionsOrigin[] = []\n ): Promise<{\n extensions: ExtensionDataList;\n beforeMerge: Array<{ extensions: ExtensionDataList; origin: ExtensionsOrigin; extraData: any }>; // useful for debugging\n errors?: Error[];\n }> {\n // TODO: consider caching this result\n let configFileExtensions: ExtensionDataList | undefined;\n let variantsExtensions: ExtensionDataList | undefined;\n const mergeFromScope = true;\n const errors: Error[] = [];\n\n const bitMapEntry = this.workspace.consumer.bitMap.getComponentIfExist(componentId);\n const bitMapExtensions = bitMapEntry?.config;\n\n let configMerge: Record<string, any> | undefined;\n try {\n configMerge = this.mergeConflictFile.getConflictParsed(componentId.toStringWithoutVersion());\n } catch (err) {\n if (!(err instanceof MergeConfigConflict)) {\n throw err;\n }\n this.workspace.logger.error(`unable to parse the config file for ${componentId.toString()} due to conflicts`);\n errors.push(err);\n }\n\n const unmergedData = this.getUnmergedData(componentId);\n const unmergedDataMergeConf = unmergedData?.mergedConfig;\n const getMergeConfigCombined = () => {\n if (!configMerge && !unmergedDataMergeConf) return undefined;\n if (!configMerge) return unmergedDataMergeConf;\n if (!unmergedDataMergeConf) return configMerge;\n\n return mergeWith(configMerge, unmergedDataMergeConf, (objValue, srcValue) => {\n if (Array.isArray(objValue)) {\n // critical for dependencyResolver.policy.*dependencies. otherwise, it will override the array\n return objValue.concat(srcValue);\n }\n return undefined;\n });\n };\n const mergeConfigCombined = getMergeConfigCombined();\n ExtensionDataList.adjustEnvsOnConfigObject(mergeConfigCombined || {});\n\n const configMergeExtensions = mergeConfigCombined\n ? ExtensionDataList.fromConfigObject(mergeConfigCombined)\n : undefined;\n\n this.removeAutoDepsFromConfig(componentId, configMergeExtensions);\n const scopeExtensions = this.getComponentFromScopeWithoutDuplications(componentFromScope);\n // backward compatibility. previously, it was saved as an array into the model (when there was merge-config)\n this.removeAutoDepsFromConfig(componentId, scopeExtensions, true);\n const [specific, nonSpecific] = partition(scopeExtensions, (entry) => entry.config[AspectSpecificField] === true);\n const scopeExtensionsNonSpecific = new ExtensionDataList(...nonSpecific);\n const scopeExtensionsSpecific = new ExtensionDataList(...specific);\n\n this.addConfigDepsFromModelToConfigMerge(scopeExtensionsSpecific, mergeConfigCombined);\n\n const componentConfigFile = await this.workspace.componentConfigFile(componentId);\n if (componentConfigFile) {\n configFileExtensions = componentConfigFile.aspects.toLegacy();\n }\n const relativeComponentDir = this.workspace.componentDir(componentId, { ignoreVersion: true }, { relative: true });\n const variantConfig = this.workspace.variants.byRootDirAndName(relativeComponentDir, componentId.fullName);\n if (variantConfig) {\n variantsExtensions = variantConfig.extensions.clone();\n // Do not merge from scope when there is specific variant (which is not *) that match the component\n // if (variantConfig.maxSpecificity > 0) {\n // mergeFromScope = false;\n // }\n }\n // We don't stop on each step because we want to merge the default scope even if propagate=false but the default scope is not defined\n // in the case the same extension pushed twice, the former takes precedence (opposite of Object.assign)\n const extensionsToMerge: Array<{ origin: ExtensionsOrigin; extensions: ExtensionDataList; extraData: any }> = [];\n let envWasFoundPreviously = false;\n const removedExtensionIds: string[] = [];\n\n const addExtensionsToMerge = async (extensions: ExtensionDataList, origin: ExtensionsOrigin, extraData?: any) => {\n if (!extensions.length) {\n return;\n }\n removedExtensionIds.push(...extensions.filter((extData) => extData.isRemoved).map((extData) => extData.stringId));\n const extsWithoutRemoved = extensions.filterRemovedExtensions();\n const selfInMergedExtensions = extsWithoutRemoved.findExtension(componentId.toStringWithoutVersion(), true);\n const extsWithoutSelf = selfInMergedExtensions?.extensionId\n ? extsWithoutRemoved.remove(selfInMergedExtensions.extensionId)\n : extsWithoutRemoved;\n const preferWorkspaceVersion = origin !== 'BitmapFile' && origin !== 'ComponentJsonFile';\n // it's important to do this resolution before the merge, otherwise we have issues with extensions\n // coming from scope with local scope name, as opposed to the same extension comes from the workspace with default scope name\n // also, it's important to do it before filtering the env, because when the env was not exported, it's saved with scope-name\n // inside the \"env\" prop of teambit.envs/env, but without scope-name in the root.\n const extsWithUpdatedIds = await this.resolveExtensionListIds(extsWithoutSelf, preferWorkspaceVersion);\n const { extensionDataListFiltered, envIsCurrentlySet } = await this.filterEnvsFromExtensionsIfNeeded(\n extsWithUpdatedIds,\n envWasFoundPreviously,\n origin\n );\n if (envIsCurrentlySet) {\n envWasFoundPreviously = true;\n }\n\n extensionsToMerge.push({ origin, extensions: extensionDataListFiltered, extraData });\n };\n const setDataListAsSpecific = (extensions: ExtensionDataList) => {\n extensions.forEach((dataEntry) => (dataEntry.config[AspectSpecificField] = true));\n };\n if (bitMapExtensions && !excludeOrigins.includes('BitmapFile')) {\n const extensionDataList = ExtensionDataList.fromConfigObject(bitMapExtensions);\n setDataListAsSpecific(extensionDataList);\n await addExtensionsToMerge(extensionDataList, 'BitmapFile');\n }\n // config-merge is after the .bitmap. because normally if you have config set in .bitmap, you won't\n // be able to lane-merge. (unless you specify --ignore-config-changes).\n // so, if there is config in .bitmap, it probably happened after lane-merge.\n if (configMergeExtensions && !excludeOrigins.includes('ConfigMerge')) {\n await addExtensionsToMerge(ExtensionDataList.fromArray(configMergeExtensions), 'ConfigMerge');\n }\n if (configFileExtensions && !excludeOrigins.includes('ComponentJsonFile')) {\n setDataListAsSpecific(configFileExtensions);\n await addExtensionsToMerge(configFileExtensions, 'ComponentJsonFile');\n }\n if (!excludeOrigins.includes('ModelSpecific')) {\n await addExtensionsToMerge(ExtensionDataList.fromArray(scopeExtensionsSpecific), 'ModelSpecific');\n }\n let continuePropagating = componentConfigFile?.propagate ?? true;\n if (variantsExtensions && continuePropagating && !excludeOrigins.includes('WorkspaceVariants')) {\n const appliedRules = variantConfig?.sortedMatches.map(({ pattern, specificity }) => ({ pattern, specificity }));\n await addExtensionsToMerge(variantsExtensions, 'WorkspaceVariants', { appliedRules });\n }\n continuePropagating = continuePropagating && (variantConfig?.propagate ?? true);\n if (mergeFromScope && continuePropagating && !excludeOrigins.includes('ModelNonSpecific')) {\n await addExtensionsToMerge(scopeExtensionsNonSpecific, 'ModelNonSpecific');\n }\n\n const afterMerge = ExtensionDataList.mergeConfigs(extensionsToMerge.map((ext) => ext.extensions));\n const withoutRemoved = afterMerge.filter((extData) => !removedExtensionIds.includes(extData.stringId));\n const extensions = ExtensionDataList.fromArray(withoutRemoved);\n return {\n extensions,\n beforeMerge: extensionsToMerge,\n errors,\n };\n }\n\n /**\n * before version 0.0.882 it was possible to save Version object with the same extension twice.\n */\n private getComponentFromScopeWithoutDuplications(componentFromScope?: Component) {\n if (!componentFromScope) return new ExtensionDataList();\n const scopeExtensions = componentFromScope.config.extensions;\n const scopeExtIds = scopeExtensions.ids;\n const scopeExtHasDuplications = scopeExtIds.length !== uniq(scopeExtIds).length;\n if (!scopeExtHasDuplications) {\n return scopeExtensions;\n }\n // let's remove this duplicated extension blindly without trying to merge. (no need to merge coz it's old data from scope\n // which will be overridden anyway by the workspace or other config strategies).\n const arr = uniqWith(scopeExtensions, getCompareExtPredicate(true));\n return ExtensionDataList.fromArray(arr);\n }\n\n /**\n * from the merge-config we get the dep-resolver policy as an array, because it needs to support \"force\" prop.\n * however, when we save the config, we want to save it as an object, so we need split the data into two:\n * 1. force: true, which gets saved into the config.\n * 2. force: false, which gets saved into the data.dependencies later on. see the workspace.getAutoDetectOverrides()\n */\n private removeAutoDepsFromConfig(componentId: ComponentID, conf?: ExtensionDataList, fromScope = false) {\n if (!conf) return;\n const autoDepsObj = conf.extractAutoDepsFromConfig();\n if (!autoDepsObj) return;\n if (!fromScope) {\n if (!this.mergeConfigDepsResolverDataCache[componentId.toString()]) {\n this.mergeConfigDepsResolverDataCache[componentId.toString()] = {};\n }\n this.mergeConfigDepsResolverDataCache[componentId.toString()] = merge(\n this.mergeConfigDepsResolverDataCache[componentId.toString()],\n autoDepsObj\n );\n }\n }\n\n /**\n * this is needed because if the mergeConfig has a policy, it will be used, and any other policy along the line will be ignored.\n * in case the model has some dependencies that were set explicitly they're gonna be ignored.\n * this makes sure to add them to the policy of the mergeConfig.\n * in a way, this is similar to what we do when a user is running `bit deps set` and the component had previous dependencies set,\n * we copy those dependencies along with the current one to the .bitmap file, so they won't get lost.\n */\n private addConfigDepsFromModelToConfigMerge(\n scopeExtensionsSpecific: ExtensionDataList,\n mergeConfig?: Record<string, any>\n ) {\n const mergeConfigPolicy = mergeConfig?.[DependencyResolverAspect.id]?.policy;\n if (!mergeConfigPolicy) return;\n const scopePolicy = scopeExtensionsSpecific.findCoreExtension(DependencyResolverAspect.id)?.config.policy;\n if (!scopePolicy) return;\n Object.keys(scopePolicy).forEach((key) => {\n if (!mergeConfigPolicy[key]) {\n mergeConfigPolicy[key] = scopePolicy[key];\n return;\n }\n // mergeConfigPolicy should take precedence over scopePolicy\n mergeConfigPolicy[key] = { ...scopePolicy[key], ...mergeConfigPolicy[key] };\n });\n }\n\n private getUnmergedData(componentId: ComponentID): UnmergedComponent | undefined {\n return this.workspace.scope.legacyScope.objects.unmergedComponents.getEntry(componentId);\n }\n\n private async filterEnvsFromExtensionsIfNeeded(\n extensionDataList: ExtensionDataList,\n envWasFoundPreviously: boolean,\n origin: ExtensionsOrigin\n ) {\n const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n const envFromEnvsAspect: string | undefined = envAspect?.config.env || envAspect?.data.id;\n const aspectsRegisteredAsEnvs = extensionDataList\n .filter((aspect) =>\n this.workspace.envs.getEnvDefinitionByStringId(aspect.newExtensionId?.toString() || aspect.stringId)\n )\n .map((aspect) => aspect.stringId);\n if (envWasFoundPreviously && (envAspect || aspectsRegisteredAsEnvs.length)) {\n const nonEnvs = extensionDataList.map((e) => {\n // normally the env-id inside the envs aspect doesn't have a version, but the aspect itself has a version.\n // also, the env-id inside the envs aspect includes the default-scope, but the aspect itself doesn't.\n if (\n (envFromEnvsAspect && e.stringId === envFromEnvsAspect) ||\n (envFromEnvsAspect && e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect) ||\n aspectsRegisteredAsEnvs.includes(e.stringId)\n ) {\n return undefined;\n }\n if (e.stringId === envAspect?.stringId) {\n // must clone the env aspect to avoid mutating the original data\n const clonedEnvAspect = e.clone();\n delete clonedEnvAspect.config.env; // aspect env may have other data other then config.env.\n return clonedEnvAspect;\n }\n return e;\n });\n\n return { extensionDataListFiltered: new ExtensionDataList(...compact(nonEnvs)), envIsCurrentlySet: true };\n }\n if (envFromEnvsAspect && (origin === 'ModelNonSpecific' || origin === 'ModelSpecific')) {\n // if env was found, search for this env in the workspace and if found, replace the env-id with the one from the workspace\n const envAspectExt = extensionDataList.find((e) => e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect);\n const ids = this.workspace.listIds();\n const envAspectId = envAspectExt?.extensionId;\n const found = envAspectId && ids.find((id) => id.isEqualWithoutVersion(envAspectId));\n if (found) {\n envAspectExt.extensionId = found;\n }\n }\n return { extensionDataListFiltered: extensionDataList, envIsCurrentlySet: Boolean(envFromEnvsAspect) };\n }\n\n /**\n * This will mutate the entries with extensionId prop to have resolved legacy id\n * This should be worked on the extension data list not the new aspect list\n * @param extensionList\n */\n private async resolveExtensionListIds(\n extensionList: ExtensionDataList,\n preferWorkspaceVersion = false\n ): Promise<ExtensionDataList> {\n const promises = extensionList.map(async (entry) => {\n if (entry.extensionId) {\n // don't pass `entry.extensionId` (as ComponentID) to `resolveComponentId` because then it'll use the optimization\n // of parsing it to ComponentID without checking the workspace. Normally, this optimization is good, but here\n // in case the extension wasn't exported, the ComponentID is wrong, it has the scope-name due to incorrect ComponentID.fromString\n // in configEntryToDataEntry() function. It'd be ideal to fix it from there but it's not easy.\n const componentId = await this.workspace.resolveComponentId(entry.extensionId.toString());\n const idFromWorkspace = preferWorkspaceVersion ? this.workspace.getIdIfExist(componentId) : undefined;\n const id = idFromWorkspace || componentId;\n entry.extensionId = id;\n entry.newExtensionId = id;\n }\n\n return entry;\n });\n await Promise.all(promises);\n return extensionList;\n }\n}\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.
|
|
2
|
-
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.
|
|
1
|
+
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.532/dist/workspace.composition.js';
|
|
2
|
+
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.532/dist/workspace.docs.mdx';
|
|
3
3
|
|
|
4
4
|
export const compositions = [compositions_0];
|
|
5
5
|
export const overview = [overview_0];
|
package/dist/workspace.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { IssuesList } from '@teambit/component-issues';
|
|
|
3
3
|
import type { AspectLoaderMain, AspectDefinition } from '@teambit/aspect-loader';
|
|
4
4
|
import { ComponentMain, Component, ComponentFactory, InvalidComponent, ResolveAspectsOptions, AspectList } from '@teambit/component';
|
|
5
5
|
import { ComponentScopeDirMap, WorkspaceConfig } from '@teambit/config';
|
|
6
|
-
import { DependencyResolverMain, DependencyList } from '@teambit/dependency-resolver';
|
|
6
|
+
import { DependencyResolverMain, DependencyList, VariantPolicyConfigArr } from '@teambit/dependency-resolver';
|
|
7
7
|
import { EnvsMain, EnvJsonc } from '@teambit/envs';
|
|
8
8
|
import { GraphqlMain } from '@teambit/graphql';
|
|
9
9
|
import { Harmony } from '@teambit/harmony';
|
|
@@ -426,7 +426,7 @@ export declare class Workspace implements ComponentFactory {
|
|
|
426
426
|
warnAboutMisconfiguredEnv(envId: string): Promise<void>;
|
|
427
427
|
getConfigMergeFilePath(): string;
|
|
428
428
|
getConflictMergeFile(): MergeConflictFile;
|
|
429
|
-
getDepsDataOfMergeConfig(id: ComponentID):
|
|
429
|
+
getDepsDataOfMergeConfig(id: ComponentID): VariantPolicyConfigArr;
|
|
430
430
|
/**
|
|
431
431
|
* @deprecated
|
|
432
432
|
* the workspace.jsonc conflicts are not written to the config-merge file anymore.
|