@teambit/workspace 1.0.14 → 1.0.16
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 +4 -0
- package/dist/aspects-merger.js +27 -9
- package/dist/aspects-merger.js.map +1 -1
- package/dist/bit-map.d.ts +4 -2
- package/dist/bit-map.js +24 -14
- package/dist/bit-map.js.map +1 -1
- package/dist/{preview-1696302977046.js → preview-1696389277748.js} +2 -2
- package/dist/scope-subcommands/scope-set.cmd.js +2 -1
- package/dist/scope-subcommands/scope-set.cmd.js.map +1 -1
- package/dist/workspace.d.ts +1 -1
- package/dist/workspace.js +10 -4
- package/dist/workspace.js.map +1 -1
- package/package.json +27 -27
- package/scope-subcommands/scope-set.cmd.ts +2 -1
package/dist/aspects-merger.d.ts
CHANGED
|
@@ -29,6 +29,10 @@ export declare class AspectsMerger {
|
|
|
29
29
|
}>;
|
|
30
30
|
errors?: Error[];
|
|
31
31
|
}>;
|
|
32
|
+
/**
|
|
33
|
+
* before version 0.0.882 it was possible to save Version object with the same extension twice.
|
|
34
|
+
*/
|
|
35
|
+
private getComponentFromScopeWithoutDuplications;
|
|
32
36
|
/**
|
|
33
37
|
* from the merge-config we get the dep-resolver policy as an array, because it needs to support "force" prop.
|
|
34
38
|
* however, when we save the config, we want to save it as an object, so we need split the data into two:
|
package/dist/aspects-merger.js
CHANGED
|
@@ -80,11 +80,9 @@ class AspectsMerger {
|
|
|
80
80
|
*/
|
|
81
81
|
// eslint-disable-next-line complexity
|
|
82
82
|
async merge(componentId, componentFromScope, excludeOrigins = []) {
|
|
83
|
-
var _componentFromScope$c;
|
|
84
83
|
// TODO: consider caching this result
|
|
85
84
|
let configFileExtensions;
|
|
86
85
|
let variantsExtensions;
|
|
87
|
-
let wsDefaultExtensions;
|
|
88
86
|
const mergeFromScope = true;
|
|
89
87
|
const errors = [];
|
|
90
88
|
const bitMapEntry = this.workspace.consumer.bitMap.getComponentIfExist(componentId._legacy);
|
|
@@ -127,7 +125,7 @@ class AspectsMerger {
|
|
|
127
125
|
adjustEnvsOnConfigMerge(mergeConfigCombined || {});
|
|
128
126
|
const configMergeExtensions = mergeConfigCombined ? _extensionData().ExtensionDataList.fromConfigObject(mergeConfigCombined) : undefined;
|
|
129
127
|
this.removeAutoDepsFromConfig(componentId, configMergeExtensions);
|
|
130
|
-
const scopeExtensions = (componentFromScope
|
|
128
|
+
const scopeExtensions = this.getComponentFromScopeWithoutDuplications(componentFromScope);
|
|
131
129
|
// backward compatibility. previously, it was saved as an array into the model (when there was merge-config)
|
|
132
130
|
this.removeAutoDepsFromConfig(componentId, scopeExtensions, true);
|
|
133
131
|
const [specific, nonSpecific] = (0, _lodash().partition)(scopeExtensions, entry => entry.config[_workspace().AspectSpecificField] === true);
|
|
@@ -161,7 +159,15 @@ class AspectsMerger {
|
|
|
161
159
|
}
|
|
162
160
|
removedExtensionIds.push(...extensions.filter(extData => extData.isRemoved).map(extData => extData.stringId));
|
|
163
161
|
const extsWithoutRemoved = extensions.filterRemovedExtensions();
|
|
164
|
-
const
|
|
162
|
+
const getSelfExt = () => {
|
|
163
|
+
const bitId = componentId._legacy;
|
|
164
|
+
const self = extsWithoutRemoved.findExtension(bitId.toStringWithoutVersion(), true);
|
|
165
|
+
if (self) return self;
|
|
166
|
+
if (bitId.hasScope()) return undefined;
|
|
167
|
+
// for some reason, new aspects get their extensionId wrong, including the scope. it's BitId which should not have it.
|
|
168
|
+
return extsWithoutRemoved.findExtension(bitId.changeScope(componentId.scope).toStringWithoutVersion(), true);
|
|
169
|
+
};
|
|
170
|
+
const selfInMergedExtensions = getSelfExt();
|
|
165
171
|
const extsWithoutSelf = selfInMergedExtensions !== null && selfInMergedExtensions !== void 0 && selfInMergedExtensions.extensionId ? extsWithoutRemoved.remove(selfInMergedExtensions.extensionId) : extsWithoutRemoved;
|
|
166
172
|
const preferWorkspaceVersion = origin !== 'BitmapFile' && origin !== 'ComponentJsonFile';
|
|
167
173
|
// it's important to do this resolution before the merge, otherwise we have issues with extensions
|
|
@@ -218,11 +224,6 @@ class AspectsMerger {
|
|
|
218
224
|
});
|
|
219
225
|
}
|
|
220
226
|
continuePropagating = continuePropagating && ((variantConfig === null || variantConfig === void 0 ? void 0 : variantConfig.propagate) ?? true);
|
|
221
|
-
// Do not apply default extensions on the default extensions (it will create infinite loop when loading them)
|
|
222
|
-
const isDefaultExtension = wsDefaultExtensions === null || wsDefaultExtensions === void 0 ? void 0 : wsDefaultExtensions.findExtension(componentId.toString(), true, true);
|
|
223
|
-
if (wsDefaultExtensions && continuePropagating && !isDefaultExtension && !excludeOrigins.includes('WorkspaceDefault')) {
|
|
224
|
-
await addExtensionsToMerge(wsDefaultExtensions, 'WorkspaceDefault');
|
|
225
|
-
}
|
|
226
227
|
if (mergeFromScope && continuePropagating && !excludeOrigins.includes('ModelNonSpecific')) {
|
|
227
228
|
await addExtensionsToMerge(scopeExtensionsNonSpecific, 'ModelNonSpecific');
|
|
228
229
|
}
|
|
@@ -237,6 +238,23 @@ class AspectsMerger {
|
|
|
237
238
|
};
|
|
238
239
|
}
|
|
239
240
|
|
|
241
|
+
/**
|
|
242
|
+
* before version 0.0.882 it was possible to save Version object with the same extension twice.
|
|
243
|
+
*/
|
|
244
|
+
getComponentFromScopeWithoutDuplications(componentFromScope) {
|
|
245
|
+
if (!componentFromScope) return new (_extensionData().ExtensionDataList)();
|
|
246
|
+
const scopeExtensions = componentFromScope.config.extensions;
|
|
247
|
+
const scopeExtIds = scopeExtensions.ids;
|
|
248
|
+
const scopeExtHasDuplications = scopeExtIds.length !== (0, _lodash().uniq)(scopeExtIds).length;
|
|
249
|
+
if (!scopeExtHasDuplications) {
|
|
250
|
+
return scopeExtensions;
|
|
251
|
+
}
|
|
252
|
+
// let's remove this duplicated extension blindly without trying to merge. (no need to merge coz it's old data from scope
|
|
253
|
+
// which will be overridden anyway by the workspace or other config strategies).
|
|
254
|
+
const arr = (0, _lodash().uniqWith)(scopeExtensions, _extensionData().ignoreVersionPredicate);
|
|
255
|
+
return _extensionData().ExtensionDataList.fromArray(arr);
|
|
256
|
+
}
|
|
257
|
+
|
|
240
258
|
/**
|
|
241
259
|
* from the merge-config we get the dep-resolver policy as an array, because it needs to support "force" prop.
|
|
242
260
|
* however, when we save the config, we want to save it as an object, so we need split the data into two:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_envs","data","require","_dependencyResolver","_extensionData","_lodash","_mergeConfigConflict","_workspace","_mergeConflictFile","_defineProperty","obj","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","AspectsMerger","constructor","workspace","harmony","mergeConflictFile","MergeConflictFile","path","getDepsDataOfMergeConfig","id","mergeConfigDepsResolverDataCache","toString","merge","componentId","componentFromScope","excludeOrigins","_componentFromScope$c","configFileExtensions","variantsExtensions","wsDefaultExtensions","mergeFromScope","errors","bitMapEntry","consumer","bitMap","getComponentIfExist","_legacy","bitMapExtensions","config","configMerge","getConflictParsed","toStringWithoutVersion","err","MergeConfigConflict","logger","error","push","adjustEnvsOnConfigMerge","conf","_conf$EnvsAspect$id","env","EnvsAspect","split","unmergedData","getUnmergedData","unmergedDataMergeConf","mergedConfig","getMergeConfigCombined","mergeWith","objValue","srcValue","Array","isArray","concat","mergeConfigCombined","configMergeExtensions","ExtensionDataList","fromConfigObject","removeAutoDepsFromConfig","scopeExtensions","extensions","specific","nonSpecific","partition","entry","AspectSpecificField","scopeExtensionsNonSpecific","scopeExtensionsSpecific","componentConfigFile","aspects","toLegacy","relativeComponentDir","componentDir","ignoreVersion","relative","variantConfig","variants","byRootDirAndName","fullName","clone","extensionsToMerge","envWasFoundPreviously","removedExtensionIds","addExtensionsToMerge","origin","extraData","length","filter","extData","isRemoved","map","stringId","extsWithoutRemoved","filterRemovedExtensions","selfInMergedExtensions","findExtension","toStringWithoutScopeAndVersion","extsWithoutSelf","extensionId","remove","preferWorkspaceVersion","extsWithUpdatedIds","resolveExtensionListIds","extensionDataListFiltered","envIsCurrentlySet","filterEnvsFromExtensionsIfNeeded","warnAboutMisconfiguredEnv","setDataListAsSpecific","forEach","dataEntry","includes","extensionDataList","fromArray","continuePropagating","propagate","appliedRules","sortedMatches","pattern","specificity","isDefaultExtension","afterMerge","mergeConfigs","ext","loadExtensions","withoutRemoved","beforeMerge","fromScope","_conf$findCoreExtensi","policy","findCoreExtension","DependencyResolverAspect","mergeConfigObj","dep","force","reduce","acc","current","name","version","scope","legacyScope","objects","unmergedComponents","getEntry","hasId","envAspect","envFromEnvsAspect","envs","getCoreEnvsIds","warnedAboutMisconfiguredEnvs","envId","resolveComponentId","get","isUsingEnvEnv","consoleWarning","aspectsRegisteredAsEnvs","aspect","_aspect$newExtensionI","getEnvDefinitionByStringId","newExtensionId","nonEnvs","e","_e$extensionId","_e$newExtensionId","envAspectExt","find","_e$extensionId2","ids","listIds","envAspectId","found","isEqualWithoutVersion","Boolean","originatedFrom","opts","workspaceAspectsLoader","getWorkspaceAspectsLoader","loadComponentsExtensions","extensionList","promises","idFromWorkspace","getIdIfExist","Promise","all","exports"],"sources":["aspects-merger.ts"],"sourcesContent":["import { Harmony } from '@teambit/harmony';\nimport { Component, ComponentID } from '@teambit/component';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { EnvsAspect } from '@teambit/envs';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { partition, mergeWith, merge } from 'lodash';\nimport { MergeConfigConflict } from './exceptions/merge-config-conflict';\nimport { AspectSpecificField, ExtensionsOrigin, Workspace } from './workspace';\nimport { MergeConflictFile } from './merge-conflict-file';\nimport { WorkspaceLoadAspectsOptions } from './workspace-aspects-loader';\n\nexport class AspectsMerger {\n private warnedAboutMisconfiguredEnvs: string[] = []; // cache env-ids that have been errored about not having \"env\" type\n readonly mergeConflictFile: MergeConflictFile;\n private mergeConfigDepsResolverDataCache: { [compIdStr: string]: Record<string, any> } = {};\n constructor(private workspace: Workspace, private harmony: Harmony) {\n this.mergeConflictFile = new MergeConflictFile(workspace.path);\n }\n\n getDepsDataOfMergeConfig(id: BitId) {\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 let wsDefaultExtensions: ExtensionDataList | undefined;\n const mergeFromScope = true;\n const errors: Error[] = [];\n\n const bitMapEntry = this.workspace.consumer.bitMap.getComponentIfExist(componentId._legacy);\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 = componentFromScope?.config?.extensions || new ExtensionDataList();\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 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(\n componentId._legacy.toStringWithoutScopeAndVersion(),\n true,\n true\n );\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 await this.warnAboutMisconfiguredEnv(componentId, extensions);\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 // Do not apply default extensions on the default extensions (it will create infinite loop when loading them)\n const isDefaultExtension = wsDefaultExtensions?.findExtension(componentId.toString(), true, true);\n if (\n wsDefaultExtensions &&\n continuePropagating &&\n !isDefaultExtension &&\n !excludeOrigins.includes('WorkspaceDefault')\n ) {\n await addExtensionsToMerge(wsDefaultExtensions, 'WorkspaceDefault');\n }\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 await this.loadExtensions(afterMerge, componentId);\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 * 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 LegacyDependencyResolver.registerOnComponentAutoDetectOverridesGetter hook\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 private getUnmergedData(componentId: ComponentID): UnmergedComponent | undefined {\n return this.workspace.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);\n }\n\n private async warnAboutMisconfiguredEnv(componentId: ComponentID, extensionDataList: ExtensionDataList) {\n if (!(await this.workspace.hasId(componentId))) {\n // if this is a dependency and not belong to the workspace, don't show the warning\n return;\n }\n const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n const envFromEnvsAspect = envAspect?.config.env;\n if (!envFromEnvsAspect) return;\n if (this.workspace.envs.getCoreEnvsIds().includes(envFromEnvsAspect)) return;\n if (this.warnedAboutMisconfiguredEnvs.includes(envFromEnvsAspect)) return;\n let env: Component;\n try {\n const envId = await this.workspace.resolveComponentId(envFromEnvsAspect);\n env = await this.workspace.get(envId);\n } catch (err) {\n return; // unable to get the component for some reason. don't sweat it. forget about the warning\n }\n if (!this.workspace.envs.isUsingEnvEnv(env)) {\n this.warnedAboutMisconfiguredEnvs.push(envFromEnvsAspect);\n this.workspace.logger.consoleWarning(\n `env \"${envFromEnvsAspect}\" is not of type env. (correct the env's type, or component config with \"bit env set ${envFromEnvsAspect} teambit.envs/env\")`\n );\n }\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.filter((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 (envFromEnvsAspect && e.newExtensionId?.toStringWithoutVersion() === envFromEnvsAspect) ||\n aspectsRegisteredAsEnvs.includes(e.stringId)\n ) {\n return false;\n }\n return true;\n });\n // still, aspect env may have other data other then config.env.\n if (envAspect) delete envAspect.config.env;\n return { extensionDataListFiltered: new ExtensionDataList(...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 = await this.workspace.listIds();\n const envAspectId = envAspectExt?.extensionId;\n const found = envAspectId && ids.find((id) => id._legacy.isEqualWithoutVersion(envAspectId));\n if (found) {\n envAspectExt.extensionId = found._legacy;\n }\n }\n return { extensionDataListFiltered: extensionDataList, envIsCurrentlySet: Boolean(envFromEnvsAspect) };\n }\n\n /**\n * Load all unloaded extensions from a list\n * @param extensions list of extensions with config to load\n */\n private async loadExtensions(\n extensions: ExtensionDataList,\n originatedFrom?: ComponentID,\n opts: WorkspaceLoadAspectsOptions = {}\n ): Promise<void> {\n const workspaceAspectsLoader = this.workspace.getWorkspaceAspectsLoader();\n return workspaceAspectsLoader.loadComponentsExtensions(extensions, originatedFrom, opts);\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 BitId) 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 BitId is wrong, it has the scope-name due to incorrect BitId.parse\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._legacy;\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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"}
|
|
1
|
+
{"version":3,"names":["_envs","data","require","_dependencyResolver","_extensionData","_lodash","_mergeConfigConflict","_workspace","_mergeConflictFile","_defineProperty","obj","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","AspectsMerger","constructor","workspace","harmony","mergeConflictFile","MergeConflictFile","path","getDepsDataOfMergeConfig","id","mergeConfigDepsResolverDataCache","toString","merge","componentId","componentFromScope","excludeOrigins","configFileExtensions","variantsExtensions","mergeFromScope","errors","bitMapEntry","consumer","bitMap","getComponentIfExist","_legacy","bitMapExtensions","config","configMerge","getConflictParsed","toStringWithoutVersion","err","MergeConfigConflict","logger","error","push","adjustEnvsOnConfigMerge","conf","_conf$EnvsAspect$id","env","EnvsAspect","split","unmergedData","getUnmergedData","unmergedDataMergeConf","mergedConfig","getMergeConfigCombined","mergeWith","objValue","srcValue","Array","isArray","concat","mergeConfigCombined","configMergeExtensions","ExtensionDataList","fromConfigObject","removeAutoDepsFromConfig","scopeExtensions","getComponentFromScopeWithoutDuplications","specific","nonSpecific","partition","entry","AspectSpecificField","scopeExtensionsNonSpecific","scopeExtensionsSpecific","componentConfigFile","aspects","toLegacy","relativeComponentDir","componentDir","ignoreVersion","relative","variantConfig","variants","byRootDirAndName","fullName","extensions","clone","extensionsToMerge","envWasFoundPreviously","removedExtensionIds","addExtensionsToMerge","origin","extraData","length","filter","extData","isRemoved","map","stringId","extsWithoutRemoved","filterRemovedExtensions","getSelfExt","bitId","self","findExtension","hasScope","changeScope","scope","selfInMergedExtensions","extsWithoutSelf","extensionId","remove","preferWorkspaceVersion","extsWithUpdatedIds","resolveExtensionListIds","extensionDataListFiltered","envIsCurrentlySet","filterEnvsFromExtensionsIfNeeded","warnAboutMisconfiguredEnv","setDataListAsSpecific","forEach","dataEntry","includes","extensionDataList","fromArray","continuePropagating","propagate","appliedRules","sortedMatches","pattern","specificity","afterMerge","mergeConfigs","ext","loadExtensions","withoutRemoved","beforeMerge","scopeExtIds","ids","scopeExtHasDuplications","uniq","arr","uniqWith","ignoreVersionPredicate","fromScope","_conf$findCoreExtensi","policy","findCoreExtension","DependencyResolverAspect","mergeConfigObj","dep","force","reduce","acc","current","name","version","legacyScope","objects","unmergedComponents","getEntry","hasId","envAspect","envFromEnvsAspect","envs","getCoreEnvsIds","warnedAboutMisconfiguredEnvs","envId","resolveComponentId","get","isUsingEnvEnv","consoleWarning","aspectsRegisteredAsEnvs","aspect","_aspect$newExtensionI","getEnvDefinitionByStringId","newExtensionId","nonEnvs","e","_e$extensionId","_e$newExtensionId","envAspectExt","find","_e$extensionId2","listIds","envAspectId","found","isEqualWithoutVersion","Boolean","originatedFrom","opts","workspaceAspectsLoader","getWorkspaceAspectsLoader","loadComponentsExtensions","extensionList","promises","idFromWorkspace","getIdIfExist","Promise","all","exports"],"sources":["aspects-merger.ts"],"sourcesContent":["import { Harmony } from '@teambit/harmony';\nimport { Component, ComponentID } from '@teambit/component';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { EnvsAspect } from '@teambit/envs';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { ExtensionDataList, ignoreVersionPredicate } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { partition, mergeWith, merge, uniq, uniqWith } from 'lodash';\nimport { MergeConfigConflict } from './exceptions/merge-config-conflict';\nimport { AspectSpecificField, ExtensionsOrigin, Workspace } from './workspace';\nimport { MergeConflictFile } from './merge-conflict-file';\nimport { WorkspaceLoadAspectsOptions } from './workspace-aspects-loader';\n\nexport class AspectsMerger {\n private warnedAboutMisconfiguredEnvs: string[] = []; // cache env-ids that have been errored about not having \"env\" type\n readonly mergeConflictFile: MergeConflictFile;\n private mergeConfigDepsResolverDataCache: { [compIdStr: string]: Record<string, any> } = {};\n constructor(private workspace: Workspace, private harmony: Harmony) {\n this.mergeConflictFile = new MergeConflictFile(workspace.path);\n }\n\n getDepsDataOfMergeConfig(id: BitId) {\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._legacy);\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 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 getSelfExt = () => {\n const bitId = componentId._legacy;\n const self = extsWithoutRemoved.findExtension(bitId.toStringWithoutVersion(), true);\n if (self) return self;\n if (bitId.hasScope()) return undefined;\n // for some reason, new aspects get their extensionId wrong, including the scope. it's BitId which should not have it.\n return extsWithoutRemoved.findExtension(bitId.changeScope(componentId.scope).toStringWithoutVersion(), true);\n };\n const selfInMergedExtensions = getSelfExt();\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 await this.warnAboutMisconfiguredEnv(componentId, extensions);\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 await this.loadExtensions(afterMerge, componentId);\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, ignoreVersionPredicate);\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 LegacyDependencyResolver.registerOnComponentAutoDetectOverridesGetter hook\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 private getUnmergedData(componentId: ComponentID): UnmergedComponent | undefined {\n return this.workspace.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);\n }\n\n private async warnAboutMisconfiguredEnv(componentId: ComponentID, extensionDataList: ExtensionDataList) {\n if (!(await this.workspace.hasId(componentId))) {\n // if this is a dependency and not belong to the workspace, don't show the warning\n return;\n }\n const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n const envFromEnvsAspect = envAspect?.config.env;\n if (!envFromEnvsAspect) return;\n if (this.workspace.envs.getCoreEnvsIds().includes(envFromEnvsAspect)) return;\n if (this.warnedAboutMisconfiguredEnvs.includes(envFromEnvsAspect)) return;\n let env: Component;\n try {\n const envId = await this.workspace.resolveComponentId(envFromEnvsAspect);\n env = await this.workspace.get(envId);\n } catch (err) {\n return; // unable to get the component for some reason. don't sweat it. forget about the warning\n }\n if (!this.workspace.envs.isUsingEnvEnv(env)) {\n this.warnedAboutMisconfiguredEnvs.push(envFromEnvsAspect);\n this.workspace.logger.consoleWarning(\n `env \"${envFromEnvsAspect}\" is not of type env. (correct the env's type, or component config with \"bit env set ${envFromEnvsAspect} teambit.envs/env\")`\n );\n }\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.filter((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 (envFromEnvsAspect && e.newExtensionId?.toStringWithoutVersion() === envFromEnvsAspect) ||\n aspectsRegisteredAsEnvs.includes(e.stringId)\n ) {\n return false;\n }\n return true;\n });\n // still, aspect env may have other data other then config.env.\n if (envAspect) delete envAspect.config.env;\n return { extensionDataListFiltered: new ExtensionDataList(...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 = await this.workspace.listIds();\n const envAspectId = envAspectExt?.extensionId;\n const found = envAspectId && ids.find((id) => id._legacy.isEqualWithoutVersion(envAspectId));\n if (found) {\n envAspectExt.extensionId = found._legacy;\n }\n }\n return { extensionDataListFiltered: extensionDataList, envIsCurrentlySet: Boolean(envFromEnvsAspect) };\n }\n\n /**\n * Load all unloaded extensions from a list\n * @param extensions list of extensions with config to load\n */\n private async loadExtensions(\n extensions: ExtensionDataList,\n originatedFrom?: ComponentID,\n opts: WorkspaceLoadAspectsOptions = {}\n ): Promise<void> {\n const workspaceAspectsLoader = this.workspace.getWorkspaceAspectsLoader();\n return workspaceAspectsLoader.loadComponentsExtensions(extensions, originatedFrom, opts);\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 BitId) 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 BitId is wrong, it has the scope-name due to incorrect BitId.parse\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._legacy;\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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"}
|
package/dist/bit-map.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { Consumer } from '@teambit/legacy/dist/consumer';
|
|
|
4
4
|
import { GetBitMapComponentOptions } from '@teambit/legacy/dist/consumer/bit-map/bit-map';
|
|
5
5
|
import ComponentMap from '@teambit/legacy/dist/consumer/bit-map/component-map';
|
|
6
6
|
import { LaneId } from '@teambit/lane-id';
|
|
7
|
+
import { BitId } from '@teambit/legacy-bit-id';
|
|
7
8
|
export declare type MergeOptions = {
|
|
8
9
|
mergeStrategy?: 'theirs' | 'ours' | 'manual';
|
|
9
10
|
};
|
|
@@ -22,6 +23,7 @@ export declare class BitMap {
|
|
|
22
23
|
* returns a boolean indicating whether a change has been made.
|
|
23
24
|
*/
|
|
24
25
|
addComponentConfig(id: ComponentID, aspectId: string, config?: Record<string, any>, shouldMergeConfig?: boolean): boolean;
|
|
26
|
+
updateDefaultScope(oldScope: string, newScope: string): BitId[];
|
|
25
27
|
markAsChanged(): void;
|
|
26
28
|
removeComponentConfig(id: ComponentID, aspectId: string, markWithMinusIfNotExist: boolean): boolean;
|
|
27
29
|
removeEntireConfig(id: ComponentID): boolean;
|
|
@@ -37,8 +39,8 @@ export declare class BitMap {
|
|
|
37
39
|
* throws if not found
|
|
38
40
|
* @see getBitmapEntryIfExist
|
|
39
41
|
*/
|
|
40
|
-
getBitmapEntry(id: ComponentID, { ignoreVersion
|
|
41
|
-
getBitmapEntryIfExist(id: ComponentID, { ignoreVersion
|
|
42
|
+
getBitmapEntry(id: ComponentID, { ignoreVersion }?: GetBitMapComponentOptions): ComponentMap;
|
|
43
|
+
getBitmapEntryIfExist(id: ComponentID, { ignoreVersion }?: GetBitMapComponentOptions): ComponentMap | undefined;
|
|
42
44
|
getAspectIdFromConfig(componentId: ComponentID, aspectId: ComponentID, ignoreAspectVersion?: boolean): string | undefined;
|
|
43
45
|
/**
|
|
44
46
|
* components that were not tagged yet are safe to rename them from the .bitmap file.
|
package/dist/bit-map.js
CHANGED
|
@@ -68,7 +68,7 @@ class BitMap {
|
|
|
68
68
|
addComponentConfig(id, aspectId, config = {}, shouldMergeConfig = false) {
|
|
69
69
|
if (!aspectId || typeof aspectId !== 'string') throw new Error(`expect aspectId to be string, got ${aspectId}`);
|
|
70
70
|
const bitMapEntry = this.getBitmapEntry(id, {
|
|
71
|
-
|
|
71
|
+
ignoreVersion: true
|
|
72
72
|
});
|
|
73
73
|
const currentConfig = (bitMapEntry.config ||= {})[aspectId];
|
|
74
74
|
if ((0, _lodash().isEqual)(currentConfig, config)) {
|
|
@@ -94,13 +94,27 @@ class BitMap {
|
|
|
94
94
|
return true; // changes have been made
|
|
95
95
|
}
|
|
96
96
|
|
|
97
|
+
updateDefaultScope(oldScope, newScope) {
|
|
98
|
+
const changedId = [];
|
|
99
|
+
this.legacyBitMap.components.forEach(componentMap => {
|
|
100
|
+
// only new components (not snapped/tagged) can be changed
|
|
101
|
+
if (componentMap.defaultScope === oldScope && !componentMap.id.hasVersion()) {
|
|
102
|
+
componentMap.defaultScope = newScope;
|
|
103
|
+
changedId.push(componentMap.id);
|
|
104
|
+
}
|
|
105
|
+
});
|
|
106
|
+
if (changedId.length) {
|
|
107
|
+
this.legacyBitMap.markAsChanged();
|
|
108
|
+
}
|
|
109
|
+
return changedId;
|
|
110
|
+
}
|
|
97
111
|
markAsChanged() {
|
|
98
112
|
this.legacyBitMap.markAsChanged();
|
|
99
113
|
}
|
|
100
114
|
removeComponentConfig(id, aspectId, markWithMinusIfNotExist) {
|
|
101
115
|
if (!aspectId || typeof aspectId !== 'string') throw new Error(`expect aspectId to be string, got ${aspectId}`);
|
|
102
116
|
const bitMapEntry = this.getBitmapEntry(id, {
|
|
103
|
-
|
|
117
|
+
ignoreVersion: true
|
|
104
118
|
});
|
|
105
119
|
const currentConfig = (bitMapEntry.config ||= {})[aspectId];
|
|
106
120
|
if (currentConfig) {
|
|
@@ -118,7 +132,7 @@ class BitMap {
|
|
|
118
132
|
|
|
119
133
|
removeEntireConfig(id) {
|
|
120
134
|
const bitMapEntry = this.getBitmapEntry(id, {
|
|
121
|
-
|
|
135
|
+
ignoreVersion: true
|
|
122
136
|
});
|
|
123
137
|
if (!bitMapEntry.config) return false;
|
|
124
138
|
delete bitMapEntry.config;
|
|
@@ -127,14 +141,14 @@ class BitMap {
|
|
|
127
141
|
}
|
|
128
142
|
setEntireConfig(id, config) {
|
|
129
143
|
const bitMapEntry = this.getBitmapEntry(id, {
|
|
130
|
-
|
|
144
|
+
ignoreVersion: true
|
|
131
145
|
});
|
|
132
146
|
bitMapEntry.config = config;
|
|
133
147
|
this.legacyBitMap.markAsChanged();
|
|
134
148
|
}
|
|
135
149
|
removeDefaultScope(id) {
|
|
136
150
|
const bitMapEntry = this.getBitmapEntry(id, {
|
|
137
|
-
|
|
151
|
+
ignoreVersion: true
|
|
138
152
|
});
|
|
139
153
|
if (bitMapEntry.defaultScope) {
|
|
140
154
|
delete bitMapEntry.defaultScope;
|
|
@@ -143,7 +157,7 @@ class BitMap {
|
|
|
143
157
|
}
|
|
144
158
|
setDefaultScope(id, defaultScope) {
|
|
145
159
|
const bitMapEntry = this.getBitmapEntry(id, {
|
|
146
|
-
|
|
160
|
+
ignoreVersion: true
|
|
147
161
|
});
|
|
148
162
|
bitMapEntry.defaultScope = defaultScope;
|
|
149
163
|
this.legacyBitMap.markAsChanged();
|
|
@@ -162,21 +176,17 @@ class BitMap {
|
|
|
162
176
|
* @see getBitmapEntryIfExist
|
|
163
177
|
*/
|
|
164
178
|
getBitmapEntry(id, {
|
|
165
|
-
ignoreVersion
|
|
166
|
-
ignoreScopeAndVersion
|
|
179
|
+
ignoreVersion
|
|
167
180
|
} = {}) {
|
|
168
181
|
return this.legacyBitMap.getComponent(id._legacy, {
|
|
169
|
-
ignoreVersion
|
|
170
|
-
ignoreScopeAndVersion
|
|
182
|
+
ignoreVersion
|
|
171
183
|
});
|
|
172
184
|
}
|
|
173
185
|
getBitmapEntryIfExist(id, {
|
|
174
|
-
ignoreVersion
|
|
175
|
-
ignoreScopeAndVersion
|
|
186
|
+
ignoreVersion
|
|
176
187
|
} = {}) {
|
|
177
188
|
return this.legacyBitMap.getComponentIfExist(id._legacy, {
|
|
178
|
-
ignoreVersion
|
|
179
|
-
ignoreScopeAndVersion
|
|
189
|
+
ignoreVersion
|
|
180
190
|
});
|
|
181
191
|
}
|
|
182
192
|
getAspectIdFromConfig(componentId, aspectId, ignoreAspectVersion = false) {
|
package/dist/bit-map.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_lodash","data","require","_bitMap","_interopRequireDefault","_config","_bitError","_envs","_lastModified","obj","__esModule","default","BitMap","constructor","legacyBitMap","consumer","mergeBitmaps","bitmapContent","otherBitmapContent","opts","LegacyBitMap","mergeContent","addComponentConfig","id","aspectId","config","shouldMergeConfig","Error","bitMapEntry","getBitmapEntry","ignoreScopeAndVersion","currentConfig","isEqual","getNewConfig","merge","newConfig","markAsChanged","removeComponentConfig","markWithMinusIfNotExist","REMOVE_EXTENSION_SPECIAL_SIGN","removeEntireConfig","setEntireConfig","removeDefaultScope","defaultScope","setDefaultScope","write","writeBitMap","ignoreVersion","getComponent","_legacy","getBitmapEntryIfExist","getComponentIfExist","getAspectIdFromConfig","componentId","ignoreAspectVersion","undefined","toString","allVersions","Object","keys","filter","startsWith","toStringWithoutVersion","length","BitError","join","renameNewComponent","sourceId","targetId","hasVersion","fullName","removeComponent","setComponent","scope","renameAspectInConfig","components","forEach","componentMap","EnvsAspect","envConfig","env","getExportedLaneId","isLaneExported","laneId","makeComponentsAvailableOnMain","ids","isAvailableOnCurrentLane","onLanesOnly","hasChanged","takeSnapshot","map","comp","clone","restoreFromSnapshot","componentMaps","_invalidateCache","getLastModifiedBitmapThroughBit","bitmapHistoryDir","getBitmapHistoryDir","stat","getPathStatIfExist","mtimeMs","exports"],"sources":["bit-map.ts"],"sourcesContent":["import { isEqual, merge } from 'lodash';\nimport { ComponentID } from '@teambit/component-id';\nimport LegacyBitMap from '@teambit/legacy/dist/consumer/bit-map';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { GetBitMapComponentOptions } from '@teambit/legacy/dist/consumer/bit-map/bit-map';\nimport ComponentMap from '@teambit/legacy/dist/consumer/bit-map/component-map';\nimport { REMOVE_EXTENSION_SPECIAL_SIGN } from '@teambit/legacy/dist/consumer/config';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport EnvsAspect from '@teambit/envs';\nimport { getPathStatIfExist } from '@teambit/legacy/dist/utils/fs/last-modified';\n\nexport type MergeOptions = {\n mergeStrategy?: 'theirs' | 'ours' | 'manual';\n};\n/**\n * consider extracting to a new component.\n * (pro: making Workspace aspect smaller. con: it's an implementation details of the workspace)\n */\nexport class BitMap {\n constructor(private legacyBitMap: LegacyBitMap, private consumer: Consumer) {}\n\n mergeBitmaps(bitmapContent: string, otherBitmapContent: string, opts: MergeOptions = {}): string {\n return LegacyBitMap.mergeContent(bitmapContent, otherBitmapContent, opts);\n }\n\n /**\n * adds component config to the .bitmap file.\n * later, upon `bit tag`, the data is saved in the scope.\n * returns a boolean indicating whether a change has been made.\n */\n addComponentConfig(\n id: ComponentID,\n aspectId: string,\n config: Record<string, any> = {},\n shouldMergeConfig = false\n ): boolean {\n if (!aspectId || typeof aspectId !== 'string') throw new Error(`expect aspectId to be string, got ${aspectId}`);\n const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n const currentConfig = (bitMapEntry.config ||= {})[aspectId];\n if (isEqual(currentConfig, config)) {\n return false; // no changes\n }\n const getNewConfig = () => {\n if (!config) return null;\n if (!shouldMergeConfig) return config;\n // should merge\n if (!currentConfig) return config;\n if (currentConfig === '-') return config;\n // lodash merge performs a deep merge. (the native concatenation don't)\n return merge(currentConfig, config);\n };\n const newConfig = getNewConfig();\n if (newConfig) {\n bitMapEntry.config[aspectId] = newConfig;\n } else {\n delete bitMapEntry.config[aspectId];\n }\n this.legacyBitMap.markAsChanged();\n\n return true; // changes have been made\n }\n\n markAsChanged() {\n this.legacyBitMap.markAsChanged();\n }\n\n removeComponentConfig(id: ComponentID, aspectId: string, markWithMinusIfNotExist: boolean): boolean {\n if (!aspectId || typeof aspectId !== 'string') throw new Error(`expect aspectId to be string, got ${aspectId}`);\n const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n const currentConfig = (bitMapEntry.config ||= {})[aspectId];\n if (currentConfig) {\n delete bitMapEntry.config[aspectId];\n } else {\n if (!markWithMinusIfNotExist) {\n return false; // no changes\n }\n bitMapEntry.config[aspectId] = REMOVE_EXTENSION_SPECIAL_SIGN;\n }\n\n this.legacyBitMap.markAsChanged();\n\n return true; // changes have been made\n }\n\n removeEntireConfig(id: ComponentID): boolean {\n const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n if (!bitMapEntry.config) return false;\n delete bitMapEntry.config;\n this.legacyBitMap.markAsChanged();\n return true;\n }\n\n setEntireConfig(id: ComponentID, config: Record<string, any>) {\n const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n bitMapEntry.config = config;\n this.legacyBitMap.markAsChanged();\n }\n\n removeDefaultScope(id: ComponentID) {\n const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n if (bitMapEntry.defaultScope) {\n delete bitMapEntry.defaultScope;\n this.legacyBitMap.markAsChanged();\n }\n }\n\n setDefaultScope(id: ComponentID, defaultScope: string) {\n const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n bitMapEntry.defaultScope = defaultScope;\n this.legacyBitMap.markAsChanged();\n }\n\n /**\n * write .bitmap object to the filesystem\n */\n async write() {\n await this.consumer.writeBitMap();\n }\n\n /**\n * get the data saved in the .bitmap file for this component-id.\n * throws if not found\n * @see getBitmapEntryIfExist\n */\n getBitmapEntry(\n id: ComponentID,\n { ignoreVersion, ignoreScopeAndVersion }: GetBitMapComponentOptions = {}\n ): ComponentMap {\n return this.legacyBitMap.getComponent(id._legacy, { ignoreVersion, ignoreScopeAndVersion });\n }\n\n getBitmapEntryIfExist(\n id: ComponentID,\n { ignoreVersion, ignoreScopeAndVersion }: GetBitMapComponentOptions = {}\n ): ComponentMap | undefined {\n return this.legacyBitMap.getComponentIfExist(id._legacy, { ignoreVersion, ignoreScopeAndVersion });\n }\n\n getAspectIdFromConfig(\n componentId: ComponentID,\n aspectId: ComponentID,\n ignoreAspectVersion = false\n ): string | undefined {\n const bitMapEntry = this.getBitmapEntry(componentId);\n const config = bitMapEntry.config;\n if (!config) {\n return undefined;\n }\n if (config[aspectId.toString()]) {\n return aspectId.toString();\n }\n if (!ignoreAspectVersion) {\n return undefined;\n }\n const allVersions = Object.keys(config).filter((id) => id.startsWith(`${aspectId.toStringWithoutVersion()}@`));\n if (allVersions.length > 1) {\n throw new BitError(\n `error: the same aspect ${\n aspectId.toStringWithoutVersion\n } configured multiple times for \"${componentId.toString()}\"\\n${allVersions.join('\\n')}`\n );\n }\n return allVersions.length === 1 ? allVersions[0] : undefined;\n }\n\n /**\n * components that were not tagged yet are safe to rename them from the .bitmap file.\n */\n renameNewComponent(sourceId: ComponentID, targetId: ComponentID) {\n const bitMapEntry = this.getBitmapEntry(sourceId);\n if (bitMapEntry.id.hasVersion()) {\n throw new Error(`unable to rename tagged or exported component: ${bitMapEntry.id.toString()}`);\n }\n if (sourceId.isEqual(targetId)) {\n throw new Error(`source-id and target-id are equal: \"${sourceId.toString()}\"`);\n }\n if (sourceId.fullName !== targetId.fullName) {\n this.legacyBitMap.removeComponent(bitMapEntry.id);\n bitMapEntry.id = targetId._legacy;\n this.legacyBitMap.setComponent(bitMapEntry.id, bitMapEntry);\n }\n if (sourceId.scope !== targetId.scope) {\n this.setDefaultScope(targetId, targetId.scope);\n }\n }\n\n /**\n * helpful when reaming an aspect and this aspect is used in the config of other components.\n */\n renameAspectInConfig(sourceId: ComponentID, targetId: ComponentID) {\n this.legacyBitMap.components.forEach((componentMap) => {\n const config = componentMap.config;\n if (!config) return;\n Object.keys(config).forEach((aspectId) => {\n if (aspectId === sourceId.toString()) {\n config[targetId.toString()] = config[aspectId];\n delete config[aspectId];\n this.markAsChanged();\n }\n if (aspectId === EnvsAspect.id) {\n const envConfig = config[aspectId];\n if (envConfig !== REMOVE_EXTENSION_SPECIAL_SIGN && envConfig.env === sourceId.toString()) {\n envConfig.env = targetId.toString();\n this.markAsChanged();\n }\n }\n });\n componentMap.config = config;\n });\n }\n\n removeComponent(id: ComponentID) {\n this.legacyBitMap.removeComponent(id._legacy);\n }\n\n /**\n * this is the lane-id of the recently exported lane. in case of a new lane, which was not exported yet, this will be\n * empty.\n */\n getExportedLaneId(): LaneId | undefined {\n return this.legacyBitMap.isLaneExported ? this.legacyBitMap.laneId : undefined;\n }\n\n makeComponentsAvailableOnMain(ids: ComponentID[]) {\n ids.forEach((id) => {\n const componentMap = this.getBitmapEntry(id);\n componentMap.isAvailableOnCurrentLane = true;\n delete componentMap.onLanesOnly;\n });\n this.legacyBitMap.markAsChanged();\n }\n\n /**\n * whether .bitmap file has changed in-memory\n */\n hasChanged(): boolean {\n return this.legacyBitMap.hasChanged;\n }\n\n takeSnapshot(): ComponentMap[] {\n return this.legacyBitMap.components.map((comp) => comp.clone());\n }\n\n restoreFromSnapshot(componentMaps: ComponentMap[]) {\n this.legacyBitMap.components = componentMaps;\n this.legacyBitMap._invalidateCache();\n }\n\n /**\n * .bitmap file could be changed by other sources (e.g. manually or by \"git pull\") not only by bit.\n * this method returns the timestamp when the .bitmap has changed through bit. (e.g. as part of snap/tag/export/merge\n * process)\n */\n async getLastModifiedBitmapThroughBit(): Promise<number | undefined> {\n const bitmapHistoryDir = this.consumer.getBitmapHistoryDir();\n const stat = await getPathStatIfExist(bitmapHistoryDir);\n if (!stat) return undefined;\n return stat.mtimeMs;\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"names":["_lodash","data","require","_bitMap","_interopRequireDefault","_config","_bitError","_envs","_lastModified","obj","__esModule","default","BitMap","constructor","legacyBitMap","consumer","mergeBitmaps","bitmapContent","otherBitmapContent","opts","LegacyBitMap","mergeContent","addComponentConfig","id","aspectId","config","shouldMergeConfig","Error","bitMapEntry","getBitmapEntry","ignoreVersion","currentConfig","isEqual","getNewConfig","merge","newConfig","markAsChanged","updateDefaultScope","oldScope","newScope","changedId","components","forEach","componentMap","defaultScope","hasVersion","push","length","removeComponentConfig","markWithMinusIfNotExist","REMOVE_EXTENSION_SPECIAL_SIGN","removeEntireConfig","setEntireConfig","removeDefaultScope","setDefaultScope","write","writeBitMap","getComponent","_legacy","getBitmapEntryIfExist","getComponentIfExist","getAspectIdFromConfig","componentId","ignoreAspectVersion","undefined","toString","allVersions","Object","keys","filter","startsWith","toStringWithoutVersion","BitError","join","renameNewComponent","sourceId","targetId","fullName","removeComponent","setComponent","scope","renameAspectInConfig","EnvsAspect","envConfig","env","getExportedLaneId","isLaneExported","laneId","makeComponentsAvailableOnMain","ids","isAvailableOnCurrentLane","onLanesOnly","hasChanged","takeSnapshot","map","comp","clone","restoreFromSnapshot","componentMaps","_invalidateCache","getLastModifiedBitmapThroughBit","bitmapHistoryDir","getBitmapHistoryDir","stat","getPathStatIfExist","mtimeMs","exports"],"sources":["bit-map.ts"],"sourcesContent":["import { isEqual, merge } from 'lodash';\nimport { ComponentID } from '@teambit/component-id';\nimport LegacyBitMap from '@teambit/legacy/dist/consumer/bit-map';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { GetBitMapComponentOptions } from '@teambit/legacy/dist/consumer/bit-map/bit-map';\nimport ComponentMap from '@teambit/legacy/dist/consumer/bit-map/component-map';\nimport { REMOVE_EXTENSION_SPECIAL_SIGN } from '@teambit/legacy/dist/consumer/config';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport EnvsAspect from '@teambit/envs';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { getPathStatIfExist } from '@teambit/legacy/dist/utils/fs/last-modified';\n\nexport type MergeOptions = {\n mergeStrategy?: 'theirs' | 'ours' | 'manual';\n};\n/**\n * consider extracting to a new component.\n * (pro: making Workspace aspect smaller. con: it's an implementation details of the workspace)\n */\nexport class BitMap {\n constructor(private legacyBitMap: LegacyBitMap, private consumer: Consumer) {}\n\n mergeBitmaps(bitmapContent: string, otherBitmapContent: string, opts: MergeOptions = {}): string {\n return LegacyBitMap.mergeContent(bitmapContent, otherBitmapContent, opts);\n }\n\n /**\n * adds component config to the .bitmap file.\n * later, upon `bit tag`, the data is saved in the scope.\n * returns a boolean indicating whether a change has been made.\n */\n addComponentConfig(\n id: ComponentID,\n aspectId: string,\n config: Record<string, any> = {},\n shouldMergeConfig = false\n ): boolean {\n if (!aspectId || typeof aspectId !== 'string') throw new Error(`expect aspectId to be string, got ${aspectId}`);\n const bitMapEntry = this.getBitmapEntry(id, { ignoreVersion: true });\n const currentConfig = (bitMapEntry.config ||= {})[aspectId];\n if (isEqual(currentConfig, config)) {\n return false; // no changes\n }\n const getNewConfig = () => {\n if (!config) return null;\n if (!shouldMergeConfig) return config;\n // should merge\n if (!currentConfig) return config;\n if (currentConfig === '-') return config;\n // lodash merge performs a deep merge. (the native concatenation don't)\n return merge(currentConfig, config);\n };\n const newConfig = getNewConfig();\n if (newConfig) {\n bitMapEntry.config[aspectId] = newConfig;\n } else {\n delete bitMapEntry.config[aspectId];\n }\n this.legacyBitMap.markAsChanged();\n\n return true; // changes have been made\n }\n\n updateDefaultScope(oldScope: string, newScope: string) {\n const changedId: BitId[] = [];\n this.legacyBitMap.components.forEach((componentMap) => {\n // only new components (not snapped/tagged) can be changed\n if (componentMap.defaultScope === oldScope && !componentMap.id.hasVersion()) {\n componentMap.defaultScope = newScope;\n changedId.push(componentMap.id);\n }\n });\n if (changedId.length) {\n this.legacyBitMap.markAsChanged();\n }\n return changedId;\n }\n\n markAsChanged() {\n this.legacyBitMap.markAsChanged();\n }\n\n removeComponentConfig(id: ComponentID, aspectId: string, markWithMinusIfNotExist: boolean): boolean {\n if (!aspectId || typeof aspectId !== 'string') throw new Error(`expect aspectId to be string, got ${aspectId}`);\n const bitMapEntry = this.getBitmapEntry(id, { ignoreVersion: true });\n const currentConfig = (bitMapEntry.config ||= {})[aspectId];\n if (currentConfig) {\n delete bitMapEntry.config[aspectId];\n } else {\n if (!markWithMinusIfNotExist) {\n return false; // no changes\n }\n bitMapEntry.config[aspectId] = REMOVE_EXTENSION_SPECIAL_SIGN;\n }\n\n this.legacyBitMap.markAsChanged();\n\n return true; // changes have been made\n }\n\n removeEntireConfig(id: ComponentID): boolean {\n const bitMapEntry = this.getBitmapEntry(id, { ignoreVersion: true });\n if (!bitMapEntry.config) return false;\n delete bitMapEntry.config;\n this.legacyBitMap.markAsChanged();\n return true;\n }\n\n setEntireConfig(id: ComponentID, config: Record<string, any>) {\n const bitMapEntry = this.getBitmapEntry(id, { ignoreVersion: true });\n bitMapEntry.config = config;\n this.legacyBitMap.markAsChanged();\n }\n\n removeDefaultScope(id: ComponentID) {\n const bitMapEntry = this.getBitmapEntry(id, { ignoreVersion: true });\n if (bitMapEntry.defaultScope) {\n delete bitMapEntry.defaultScope;\n this.legacyBitMap.markAsChanged();\n }\n }\n\n setDefaultScope(id: ComponentID, defaultScope: string) {\n const bitMapEntry = this.getBitmapEntry(id, { ignoreVersion: true });\n bitMapEntry.defaultScope = defaultScope;\n this.legacyBitMap.markAsChanged();\n }\n\n /**\n * write .bitmap object to the filesystem\n */\n async write() {\n await this.consumer.writeBitMap();\n }\n\n /**\n * get the data saved in the .bitmap file for this component-id.\n * throws if not found\n * @see getBitmapEntryIfExist\n */\n getBitmapEntry(id: ComponentID, { ignoreVersion }: GetBitMapComponentOptions = {}): ComponentMap {\n return this.legacyBitMap.getComponent(id._legacy, { ignoreVersion });\n }\n\n getBitmapEntryIfExist(id: ComponentID, { ignoreVersion }: GetBitMapComponentOptions = {}): ComponentMap | undefined {\n return this.legacyBitMap.getComponentIfExist(id._legacy, { ignoreVersion });\n }\n\n getAspectIdFromConfig(\n componentId: ComponentID,\n aspectId: ComponentID,\n ignoreAspectVersion = false\n ): string | undefined {\n const bitMapEntry = this.getBitmapEntry(componentId);\n const config = bitMapEntry.config;\n if (!config) {\n return undefined;\n }\n if (config[aspectId.toString()]) {\n return aspectId.toString();\n }\n if (!ignoreAspectVersion) {\n return undefined;\n }\n const allVersions = Object.keys(config).filter((id) => id.startsWith(`${aspectId.toStringWithoutVersion()}@`));\n if (allVersions.length > 1) {\n throw new BitError(\n `error: the same aspect ${\n aspectId.toStringWithoutVersion\n } configured multiple times for \"${componentId.toString()}\"\\n${allVersions.join('\\n')}`\n );\n }\n return allVersions.length === 1 ? allVersions[0] : undefined;\n }\n\n /**\n * components that were not tagged yet are safe to rename them from the .bitmap file.\n */\n renameNewComponent(sourceId: ComponentID, targetId: ComponentID) {\n const bitMapEntry = this.getBitmapEntry(sourceId);\n if (bitMapEntry.id.hasVersion()) {\n throw new Error(`unable to rename tagged or exported component: ${bitMapEntry.id.toString()}`);\n }\n if (sourceId.isEqual(targetId)) {\n throw new Error(`source-id and target-id are equal: \"${sourceId.toString()}\"`);\n }\n if (sourceId.fullName !== targetId.fullName) {\n this.legacyBitMap.removeComponent(bitMapEntry.id);\n bitMapEntry.id = targetId._legacy;\n this.legacyBitMap.setComponent(bitMapEntry.id, bitMapEntry);\n }\n if (sourceId.scope !== targetId.scope) {\n this.setDefaultScope(targetId, targetId.scope);\n }\n }\n\n /**\n * helpful when reaming an aspect and this aspect is used in the config of other components.\n */\n renameAspectInConfig(sourceId: ComponentID, targetId: ComponentID) {\n this.legacyBitMap.components.forEach((componentMap) => {\n const config = componentMap.config;\n if (!config) return;\n Object.keys(config).forEach((aspectId) => {\n if (aspectId === sourceId.toString()) {\n config[targetId.toString()] = config[aspectId];\n delete config[aspectId];\n this.markAsChanged();\n }\n if (aspectId === EnvsAspect.id) {\n const envConfig = config[aspectId];\n if (envConfig !== REMOVE_EXTENSION_SPECIAL_SIGN && envConfig.env === sourceId.toString()) {\n envConfig.env = targetId.toString();\n this.markAsChanged();\n }\n }\n });\n componentMap.config = config;\n });\n }\n\n removeComponent(id: ComponentID) {\n this.legacyBitMap.removeComponent(id._legacy);\n }\n\n /**\n * this is the lane-id of the recently exported lane. in case of a new lane, which was not exported yet, this will be\n * empty.\n */\n getExportedLaneId(): LaneId | undefined {\n return this.legacyBitMap.isLaneExported ? this.legacyBitMap.laneId : undefined;\n }\n\n makeComponentsAvailableOnMain(ids: ComponentID[]) {\n ids.forEach((id) => {\n const componentMap = this.getBitmapEntry(id);\n componentMap.isAvailableOnCurrentLane = true;\n delete componentMap.onLanesOnly;\n });\n this.legacyBitMap.markAsChanged();\n }\n\n /**\n * whether .bitmap file has changed in-memory\n */\n hasChanged(): boolean {\n return this.legacyBitMap.hasChanged;\n }\n\n takeSnapshot(): ComponentMap[] {\n return this.legacyBitMap.components.map((comp) => comp.clone());\n }\n\n restoreFromSnapshot(componentMaps: ComponentMap[]) {\n this.legacyBitMap.components = componentMaps;\n this.legacyBitMap._invalidateCache();\n }\n\n /**\n * .bitmap file could be changed by other sources (e.g. manually or by \"git pull\") not only by bit.\n * this method returns the timestamp when the .bitmap has changed through bit. (e.g. as part of snap/tag/export/merge\n * process)\n */\n async getLastModifiedBitmapThroughBit(): Promise<number | undefined> {\n const bitmapHistoryDir = this.consumer.getBitmapHistoryDir();\n const stat = await getPathStatIfExist(bitmapHistoryDir);\n if (!stat) return undefined;\n return stat.mtimeMs;\n }\n}\n"],"mappings":";;;;;;AAAA,SAAAA,QAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,OAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAE,QAAA;EAAA,MAAAF,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAC,OAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAIA,SAAAI,QAAA;EAAA,MAAAJ,IAAA,GAAAC,OAAA;EAAAG,OAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,UAAA;EAAA,MAAAL,IAAA,GAAAC,OAAA;EAAAI,SAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAM,MAAA;EAAA,MAAAN,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAK,KAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAO,cAAA;EAAA,MAAAP,IAAA,GAAAC,OAAA;EAAAM,aAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAiF,SAAAG,uBAAAK,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAKjF;AACA;AACA;AACA;AACO,MAAMG,MAAM,CAAC;EAClBC,WAAWA,CAASC,YAA0B,EAAUC,QAAkB,EAAE;IAAA,KAAxDD,YAA0B,GAA1BA,YAA0B;IAAA,KAAUC,QAAkB,GAAlBA,QAAkB;EAAG;EAE7EC,YAAYA,CAACC,aAAqB,EAAEC,kBAA0B,EAAEC,IAAkB,GAAG,CAAC,CAAC,EAAU;IAC/F,OAAOC,iBAAY,CAACC,YAAY,CAACJ,aAAa,EAAEC,kBAAkB,EAAEC,IAAI,CAAC;EAC3E;;EAEA;AACF;AACA;AACA;AACA;EACEG,kBAAkBA,CAChBC,EAAe,EACfC,QAAgB,EAChBC,MAA2B,GAAG,CAAC,CAAC,EAChCC,iBAAiB,GAAG,KAAK,EAChB;IACT,IAAI,CAACF,QAAQ,IAAI,OAAOA,QAAQ,KAAK,QAAQ,EAAE,MAAM,IAAIG,KAAK,CAAE,qCAAoCH,QAAS,EAAC,CAAC;IAC/G,MAAMI,WAAW,GAAG,IAAI,CAACC,cAAc,CAACN,EAAE,EAAE;MAAEO,aAAa,EAAE;IAAK,CAAC,CAAC;IACpE,MAAMC,aAAa,GAAG,CAACH,WAAW,CAACH,MAAM,KAAK,CAAC,CAAC,EAAED,QAAQ,CAAC;IAC3D,IAAI,IAAAQ,iBAAO,EAACD,aAAa,EAAEN,MAAM,CAAC,EAAE;MAClC,OAAO,KAAK,CAAC,CAAC;IAChB;;IACA,MAAMQ,YAAY,GAAGA,CAAA,KAAM;MACzB,IAAI,CAACR,MAAM,EAAE,OAAO,IAAI;MACxB,IAAI,CAACC,iBAAiB,EAAE,OAAOD,MAAM;MACrC;MACA,IAAI,CAACM,aAAa,EAAE,OAAON,MAAM;MACjC,IAAIM,aAAa,KAAK,GAAG,EAAE,OAAON,MAAM;MACxC;MACA,OAAO,IAAAS,eAAK,EAACH,aAAa,EAAEN,MAAM,CAAC;IACrC,CAAC;IACD,MAAMU,SAAS,GAAGF,YAAY,CAAC,CAAC;IAChC,IAAIE,SAAS,EAAE;MACbP,WAAW,CAACH,MAAM,CAACD,QAAQ,CAAC,GAAGW,SAAS;IAC1C,CAAC,MAAM;MACL,OAAOP,WAAW,CAACH,MAAM,CAACD,QAAQ,CAAC;IACrC;IACA,IAAI,CAACV,YAAY,CAACsB,aAAa,CAAC,CAAC;IAEjC,OAAO,IAAI,CAAC,CAAC;EACf;;EAEAC,kBAAkBA,CAACC,QAAgB,EAAEC,QAAgB,EAAE;IACrD,MAAMC,SAAkB,GAAG,EAAE;IAC7B,IAAI,CAAC1B,YAAY,CAAC2B,UAAU,CAACC,OAAO,CAAEC,YAAY,IAAK;MACrD;MACA,IAAIA,YAAY,CAACC,YAAY,KAAKN,QAAQ,IAAI,CAACK,YAAY,CAACpB,EAAE,CAACsB,UAAU,CAAC,CAAC,EAAE;QAC3EF,YAAY,CAACC,YAAY,GAAGL,QAAQ;QACpCC,SAAS,CAACM,IAAI,CAACH,YAAY,CAACpB,EAAE,CAAC;MACjC;IACF,CAAC,CAAC;IACF,IAAIiB,SAAS,CAACO,MAAM,EAAE;MACpB,IAAI,CAACjC,YAAY,CAACsB,aAAa,CAAC,CAAC;IACnC;IACA,OAAOI,SAAS;EAClB;EAEAJ,aAAaA,CAAA,EAAG;IACd,IAAI,CAACtB,YAAY,CAACsB,aAAa,CAAC,CAAC;EACnC;EAEAY,qBAAqBA,CAACzB,EAAe,EAAEC,QAAgB,EAAEyB,uBAAgC,EAAW;IAClG,IAAI,CAACzB,QAAQ,IAAI,OAAOA,QAAQ,KAAK,QAAQ,EAAE,MAAM,IAAIG,KAAK,CAAE,qCAAoCH,QAAS,EAAC,CAAC;IAC/G,MAAMI,WAAW,GAAG,IAAI,CAACC,cAAc,CAACN,EAAE,EAAE;MAAEO,aAAa,EAAE;IAAK,CAAC,CAAC;IACpE,MAAMC,aAAa,GAAG,CAACH,WAAW,CAACH,MAAM,KAAK,CAAC,CAAC,EAAED,QAAQ,CAAC;IAC3D,IAAIO,aAAa,EAAE;MACjB,OAAOH,WAAW,CAACH,MAAM,CAACD,QAAQ,CAAC;IACrC,CAAC,MAAM;MACL,IAAI,CAACyB,uBAAuB,EAAE;QAC5B,OAAO,KAAK,CAAC,CAAC;MAChB;;MACArB,WAAW,CAACH,MAAM,CAACD,QAAQ,CAAC,GAAG0B,uCAA6B;IAC9D;IAEA,IAAI,CAACpC,YAAY,CAACsB,aAAa,CAAC,CAAC;IAEjC,OAAO,IAAI,CAAC,CAAC;EACf;;EAEAe,kBAAkBA,CAAC5B,EAAe,EAAW;IAC3C,MAAMK,WAAW,GAAG,IAAI,CAACC,cAAc,CAACN,EAAE,EAAE;MAAEO,aAAa,EAAE;IAAK,CAAC,CAAC;IACpE,IAAI,CAACF,WAAW,CAACH,MAAM,EAAE,OAAO,KAAK;IACrC,OAAOG,WAAW,CAACH,MAAM;IACzB,IAAI,CAACX,YAAY,CAACsB,aAAa,CAAC,CAAC;IACjC,OAAO,IAAI;EACb;EAEAgB,eAAeA,CAAC7B,EAAe,EAAEE,MAA2B,EAAE;IAC5D,MAAMG,WAAW,GAAG,IAAI,CAACC,cAAc,CAACN,EAAE,EAAE;MAAEO,aAAa,EAAE;IAAK,CAAC,CAAC;IACpEF,WAAW,CAACH,MAAM,GAAGA,MAAM;IAC3B,IAAI,CAACX,YAAY,CAACsB,aAAa,CAAC,CAAC;EACnC;EAEAiB,kBAAkBA,CAAC9B,EAAe,EAAE;IAClC,MAAMK,WAAW,GAAG,IAAI,CAACC,cAAc,CAACN,EAAE,EAAE;MAAEO,aAAa,EAAE;IAAK,CAAC,CAAC;IACpE,IAAIF,WAAW,CAACgB,YAAY,EAAE;MAC5B,OAAOhB,WAAW,CAACgB,YAAY;MAC/B,IAAI,CAAC9B,YAAY,CAACsB,aAAa,CAAC,CAAC;IACnC;EACF;EAEAkB,eAAeA,CAAC/B,EAAe,EAAEqB,YAAoB,EAAE;IACrD,MAAMhB,WAAW,GAAG,IAAI,CAACC,cAAc,CAACN,EAAE,EAAE;MAAEO,aAAa,EAAE;IAAK,CAAC,CAAC;IACpEF,WAAW,CAACgB,YAAY,GAAGA,YAAY;IACvC,IAAI,CAAC9B,YAAY,CAACsB,aAAa,CAAC,CAAC;EACnC;;EAEA;AACF;AACA;EACE,MAAMmB,KAAKA,CAAA,EAAG;IACZ,MAAM,IAAI,CAACxC,QAAQ,CAACyC,WAAW,CAAC,CAAC;EACnC;;EAEA;AACF;AACA;AACA;AACA;EACE3B,cAAcA,CAACN,EAAe,EAAE;IAAEO;EAAyC,CAAC,GAAG,CAAC,CAAC,EAAgB;IAC/F,OAAO,IAAI,CAAChB,YAAY,CAAC2C,YAAY,CAAClC,EAAE,CAACmC,OAAO,EAAE;MAAE5B;IAAc,CAAC,CAAC;EACtE;EAEA6B,qBAAqBA,CAACpC,EAAe,EAAE;IAAEO;EAAyC,CAAC,GAAG,CAAC,CAAC,EAA4B;IAClH,OAAO,IAAI,CAAChB,YAAY,CAAC8C,mBAAmB,CAACrC,EAAE,CAACmC,OAAO,EAAE;MAAE5B;IAAc,CAAC,CAAC;EAC7E;EAEA+B,qBAAqBA,CACnBC,WAAwB,EACxBtC,QAAqB,EACrBuC,mBAAmB,GAAG,KAAK,EACP;IACpB,MAAMnC,WAAW,GAAG,IAAI,CAACC,cAAc,CAACiC,WAAW,CAAC;IACpD,MAAMrC,MAAM,GAAGG,WAAW,CAACH,MAAM;IACjC,IAAI,CAACA,MAAM,EAAE;MACX,OAAOuC,SAAS;IAClB;IACA,IAAIvC,MAAM,CAACD,QAAQ,CAACyC,QAAQ,CAAC,CAAC,CAAC,EAAE;MAC/B,OAAOzC,QAAQ,CAACyC,QAAQ,CAAC,CAAC;IAC5B;IACA,IAAI,CAACF,mBAAmB,EAAE;MACxB,OAAOC,SAAS;IAClB;IACA,MAAME,WAAW,GAAGC,MAAM,CAACC,IAAI,CAAC3C,MAAM,CAAC,CAAC4C,MAAM,CAAE9C,EAAE,IAAKA,EAAE,CAAC+C,UAAU,CAAE,GAAE9C,QAAQ,CAAC+C,sBAAsB,CAAC,CAAE,GAAE,CAAC,CAAC;IAC9G,IAAIL,WAAW,CAACnB,MAAM,GAAG,CAAC,EAAE;MAC1B,MAAM,KAAIyB,oBAAQ,EACf,0BACChD,QAAQ,CAAC+C,sBACV,mCAAkCT,WAAW,CAACG,QAAQ,CAAC,CAAE,MAAKC,WAAW,CAACO,IAAI,CAAC,IAAI,CAAE,EACxF,CAAC;IACH;IACA,OAAOP,WAAW,CAACnB,MAAM,KAAK,CAAC,GAAGmB,WAAW,CAAC,CAAC,CAAC,GAAGF,SAAS;EAC9D;;EAEA;AACF;AACA;EACEU,kBAAkBA,CAACC,QAAqB,EAAEC,QAAqB,EAAE;IAC/D,MAAMhD,WAAW,GAAG,IAAI,CAACC,cAAc,CAAC8C,QAAQ,CAAC;IACjD,IAAI/C,WAAW,CAACL,EAAE,CAACsB,UAAU,CAAC,CAAC,EAAE;MAC/B,MAAM,IAAIlB,KAAK,CAAE,kDAAiDC,WAAW,CAACL,EAAE,CAAC0C,QAAQ,CAAC,CAAE,EAAC,CAAC;IAChG;IACA,IAAIU,QAAQ,CAAC3C,OAAO,CAAC4C,QAAQ,CAAC,EAAE;MAC9B,MAAM,IAAIjD,KAAK,CAAE,uCAAsCgD,QAAQ,CAACV,QAAQ,CAAC,CAAE,GAAE,CAAC;IAChF;IACA,IAAIU,QAAQ,CAACE,QAAQ,KAAKD,QAAQ,CAACC,QAAQ,EAAE;MAC3C,IAAI,CAAC/D,YAAY,CAACgE,eAAe,CAAClD,WAAW,CAACL,EAAE,CAAC;MACjDK,WAAW,CAACL,EAAE,GAAGqD,QAAQ,CAAClB,OAAO;MACjC,IAAI,CAAC5C,YAAY,CAACiE,YAAY,CAACnD,WAAW,CAACL,EAAE,EAAEK,WAAW,CAAC;IAC7D;IACA,IAAI+C,QAAQ,CAACK,KAAK,KAAKJ,QAAQ,CAACI,KAAK,EAAE;MACrC,IAAI,CAAC1B,eAAe,CAACsB,QAAQ,EAAEA,QAAQ,CAACI,KAAK,CAAC;IAChD;EACF;;EAEA;AACF;AACA;EACEC,oBAAoBA,CAACN,QAAqB,EAAEC,QAAqB,EAAE;IACjE,IAAI,CAAC9D,YAAY,CAAC2B,UAAU,CAACC,OAAO,CAAEC,YAAY,IAAK;MACrD,MAAMlB,MAAM,GAAGkB,YAAY,CAAClB,MAAM;MAClC,IAAI,CAACA,MAAM,EAAE;MACb0C,MAAM,CAACC,IAAI,CAAC3C,MAAM,CAAC,CAACiB,OAAO,CAAElB,QAAQ,IAAK;QACxC,IAAIA,QAAQ,KAAKmD,QAAQ,CAACV,QAAQ,CAAC,CAAC,EAAE;UACpCxC,MAAM,CAACmD,QAAQ,CAACX,QAAQ,CAAC,CAAC,CAAC,GAAGxC,MAAM,CAACD,QAAQ,CAAC;UAC9C,OAAOC,MAAM,CAACD,QAAQ,CAAC;UACvB,IAAI,CAACY,aAAa,CAAC,CAAC;QACtB;QACA,IAAIZ,QAAQ,KAAK0D,eAAU,CAAC3D,EAAE,EAAE;UAC9B,MAAM4D,SAAS,GAAG1D,MAAM,CAACD,QAAQ,CAAC;UAClC,IAAI2D,SAAS,KAAKjC,uCAA6B,IAAIiC,SAAS,CAACC,GAAG,KAAKT,QAAQ,CAACV,QAAQ,CAAC,CAAC,EAAE;YACxFkB,SAAS,CAACC,GAAG,GAAGR,QAAQ,CAACX,QAAQ,CAAC,CAAC;YACnC,IAAI,CAAC7B,aAAa,CAAC,CAAC;UACtB;QACF;MACF,CAAC,CAAC;MACFO,YAAY,CAAClB,MAAM,GAAGA,MAAM;IAC9B,CAAC,CAAC;EACJ;EAEAqD,eAAeA,CAACvD,EAAe,EAAE;IAC/B,IAAI,CAACT,YAAY,CAACgE,eAAe,CAACvD,EAAE,CAACmC,OAAO,CAAC;EAC/C;;EAEA;AACF;AACA;AACA;EACE2B,iBAAiBA,CAAA,EAAuB;IACtC,OAAO,IAAI,CAACvE,YAAY,CAACwE,cAAc,GAAG,IAAI,CAACxE,YAAY,CAACyE,MAAM,GAAGvB,SAAS;EAChF;EAEAwB,6BAA6BA,CAACC,GAAkB,EAAE;IAChDA,GAAG,CAAC/C,OAAO,CAAEnB,EAAE,IAAK;MAClB,MAAMoB,YAAY,GAAG,IAAI,CAACd,cAAc,CAACN,EAAE,CAAC;MAC5CoB,YAAY,CAAC+C,wBAAwB,GAAG,IAAI;MAC5C,OAAO/C,YAAY,CAACgD,WAAW;IACjC,CAAC,CAAC;IACF,IAAI,CAAC7E,YAAY,CAACsB,aAAa,CAAC,CAAC;EACnC;;EAEA;AACF;AACA;EACEwD,UAAUA,CAAA,EAAY;IACpB,OAAO,IAAI,CAAC9E,YAAY,CAAC8E,UAAU;EACrC;EAEAC,YAAYA,CAAA,EAAmB;IAC7B,OAAO,IAAI,CAAC/E,YAAY,CAAC2B,UAAU,CAACqD,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAACC,KAAK,CAAC,CAAC,CAAC;EACjE;EAEAC,mBAAmBA,CAACC,aAA6B,EAAE;IACjD,IAAI,CAACpF,YAAY,CAAC2B,UAAU,GAAGyD,aAAa;IAC5C,IAAI,CAACpF,YAAY,CAACqF,gBAAgB,CAAC,CAAC;EACtC;;EAEA;AACF;AACA;AACA;AACA;EACE,MAAMC,+BAA+BA,CAAA,EAAgC;IACnE,MAAMC,gBAAgB,GAAG,IAAI,CAACtF,QAAQ,CAACuF,mBAAmB,CAAC,CAAC;IAC5D,MAAMC,IAAI,GAAG,MAAM,IAAAC,kCAAkB,EAACH,gBAAgB,CAAC;IACvD,IAAI,CAACE,IAAI,EAAE,OAAOvC,SAAS;IAC3B,OAAOuC,IAAI,CAACE,OAAO;EACrB;AACF;AAACC,OAAA,CAAA9F,MAAA,GAAAA,MAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@1.0.
|
|
2
|
-
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@1.0.
|
|
1
|
+
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@1.0.16/dist/workspace.composition.js';
|
|
2
|
+
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@1.0.16/dist/workspace.docs.mdx';
|
|
3
3
|
|
|
4
4
|
export const compositions = [compositions_0];
|
|
5
5
|
export const overview = [overview_0];
|
|
@@ -36,7 +36,8 @@ class ScopeSetCmd {
|
|
|
36
36
|
}]);
|
|
37
37
|
_defineProperty(this, "options", []);
|
|
38
38
|
_defineProperty(this, "group", 'development');
|
|
39
|
-
_defineProperty(this, "extendedDescription", `default scopes for components are set in the bitmap file. the default scope for a workspace is set in the workspace.jsonc
|
|
39
|
+
_defineProperty(this, "extendedDescription", `default scopes for components are set in the bitmap file. the default scope for a workspace is set in the workspace.jsonc.
|
|
40
|
+
a component is set with a scope (as oppose to default scope) only once it is versioned.'
|
|
40
41
|
|
|
41
42
|
${(0, _constants().PATTERN_HELP)('scope set scope-name')}`);
|
|
42
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_constants","data","require","_chalk","_interopRequireDefault","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","ScopeSetCmd","constructor","workspace","name","description","COMPONENT_PATTERN_HELP","PATTERN_HELP","report","scopeName","pattern","componentsIds","idsByPattern","changedIds","setDefaultScopeToComponents","chalk","green","bold","reset","map","id","toString","join","oldScope","defaultScope","setDefaultScope","exports"],"sources":["scope-set.cmd.ts"],"sourcesContent":["import { Command } from '@teambit/cli';\nimport { PATTERN_HELP, COMPONENT_PATTERN_HELP } from '@teambit/legacy/dist/constants';\nimport chalk from 'chalk';\nimport { Workspace } from '../workspace';\n\nexport class ScopeSetCmd implements Command {\n name = 'set <scope-name> [component-pattern]';\n description =\n 'Sets the scope for specified component/s. If no component is specified, sets the default scope of the workspace';\n arguments = [\n { name: 'scope-name', description: 'name of the scope to set' },\n {\n name: 'component-pattern',\n description: COMPONENT_PATTERN_HELP,\n },\n ];\n options = [];\n group = 'development';\n extendedDescription = `default scopes for components are set in the bitmap file. the default scope for a workspace is set in the workspace.jsonc
|
|
1
|
+
{"version":3,"names":["_constants","data","require","_chalk","_interopRequireDefault","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","ScopeSetCmd","constructor","workspace","name","description","COMPONENT_PATTERN_HELP","PATTERN_HELP","report","scopeName","pattern","componentsIds","idsByPattern","changedIds","setDefaultScopeToComponents","chalk","green","bold","reset","map","id","toString","join","oldScope","defaultScope","setDefaultScope","exports"],"sources":["scope-set.cmd.ts"],"sourcesContent":["import { Command } from '@teambit/cli';\nimport { PATTERN_HELP, COMPONENT_PATTERN_HELP } from '@teambit/legacy/dist/constants';\nimport chalk from 'chalk';\nimport { Workspace } from '../workspace';\n\nexport class ScopeSetCmd implements Command {\n name = 'set <scope-name> [component-pattern]';\n description =\n 'Sets the scope for specified component/s. If no component is specified, sets the default scope of the workspace';\n arguments = [\n { name: 'scope-name', description: 'name of the scope to set' },\n {\n name: 'component-pattern',\n description: COMPONENT_PATTERN_HELP,\n },\n ];\n options = [];\n group = 'development';\n extendedDescription = `default scopes for components are set in the bitmap file. the default scope for a workspace is set in the workspace.jsonc.\na component is set with a scope (as oppose to default scope) only once it is versioned.'\n\n${PATTERN_HELP('scope set scope-name')}`;\n\n constructor(private workspace: Workspace) {}\n\n async report([scopeName, pattern]: [string, string]) {\n if (pattern) {\n const componentsIds = await this.workspace.idsByPattern(pattern);\n const changedIds = await this.workspace.setDefaultScopeToComponents(componentsIds, scopeName);\n return chalk.green(`successfully set ${chalk.bold(scopeName)} as the default-scope for the following component(s):\n ${chalk.reset(changedIds.map((id) => id.toString()).join('\\n'))}`);\n }\n const oldScope = this.workspace.defaultScope;\n await this.workspace.setDefaultScope(scopeName);\n return chalk.green(\n `successfully set the workspace's default-scope to ${chalk.bold(scopeName)}. (previous scope was \"${oldScope}\")`\n );\n }\n}\n"],"mappings":"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"}
|
package/dist/workspace.d.ts
CHANGED
|
@@ -51,7 +51,7 @@ export interface EjectConfOptions {
|
|
|
51
51
|
propagate?: boolean;
|
|
52
52
|
override?: boolean;
|
|
53
53
|
}
|
|
54
|
-
export declare type ExtensionsOrigin = 'BitmapFile' | 'ModelSpecific' | 'ModelNonSpecific' | 'ConfigMerge' | 'WorkspaceVariants' | 'ComponentJsonFile' | '
|
|
54
|
+
export declare type ExtensionsOrigin = 'BitmapFile' | 'ModelSpecific' | 'ModelNonSpecific' | 'ConfigMerge' | 'WorkspaceVariants' | 'ComponentJsonFile' | 'FinalAfterMerge';
|
|
55
55
|
/**
|
|
56
56
|
* API of the Bit Workspace
|
|
57
57
|
*/
|
package/dist/workspace.js
CHANGED
|
@@ -651,7 +651,7 @@ class Workspace {
|
|
|
651
651
|
const allIds = this.consumer.bitMap.getAllBitIdsFromAllLanes();
|
|
652
652
|
const availableIds = this.consumer.bitMap.getAllIdsAvailableOnLane();
|
|
653
653
|
if (allIds.length === availableIds.length) return [];
|
|
654
|
-
const unavailableIds = allIds.filter(id => !availableIds.
|
|
654
|
+
const unavailableIds = allIds.filter(id => !availableIds.hasWithoutVersion(id));
|
|
655
655
|
if (!unavailableIds.length) return [];
|
|
656
656
|
const removedIds = this.consumer.bitMap.getRemoved();
|
|
657
657
|
const compsWithHead = [];
|
|
@@ -974,7 +974,7 @@ it's possible that the version ${component.id.version} belong to ${idStr.split('
|
|
|
974
974
|
const componentFromScope = await this.scope.get(id);
|
|
975
975
|
const {
|
|
976
976
|
extensions
|
|
977
|
-
} = await this.componentExtensions(id, componentFromScope, ['
|
|
977
|
+
} = await this.componentExtensions(id, componentFromScope, ['WorkspaceVariants']);
|
|
978
978
|
return extensions;
|
|
979
979
|
}
|
|
980
980
|
|
|
@@ -1214,7 +1214,7 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
|
|
|
1214
1214
|
if (componentConfigFile && componentConfigFile.defaultScope) {
|
|
1215
1215
|
return componentConfigFile.defaultScope;
|
|
1216
1216
|
}
|
|
1217
|
-
const bitMapId = this.consumer.bitMap.getExistingBitId(name);
|
|
1217
|
+
const bitMapId = this.consumer.bitMap.getExistingBitId(name, false);
|
|
1218
1218
|
const bitMapEntry = bitMapId ? this.consumer.bitMap.getComponent(bitMapId) : undefined;
|
|
1219
1219
|
if (bitMapEntry && bitMapEntry.defaultScope) {
|
|
1220
1220
|
return bitMapEntry.defaultScope;
|
|
@@ -1332,6 +1332,9 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
|
|
|
1332
1332
|
if (this.defaultScope === scopeName) {
|
|
1333
1333
|
throw new Error(`the default-scope is already set as "${scopeName}", nothing to change`);
|
|
1334
1334
|
}
|
|
1335
|
+
if (!(0, _legacyBitId().isValidScopeName)(scopeName)) {
|
|
1336
|
+
throw new (_legacyBitId().InvalidScopeName)(scopeName);
|
|
1337
|
+
}
|
|
1335
1338
|
const config = this.harmony.get('teambit.harmony/config');
|
|
1336
1339
|
(_config$workspaceConf = config.workspaceConfig) === null || _config$workspaceConf === void 0 || _config$workspaceConf.setExtension(_workspace().WorkspaceAspect.id, {
|
|
1337
1340
|
defaultScope: scopeName
|
|
@@ -1339,10 +1342,13 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
|
|
|
1339
1342
|
mergeIntoExisting: true,
|
|
1340
1343
|
ignoreVersion: true
|
|
1341
1344
|
});
|
|
1345
|
+
// fix also comps using the old default-scope
|
|
1346
|
+
this.bitMap.updateDefaultScope(this.config.defaultScope, scopeName);
|
|
1342
1347
|
this.config.defaultScope = scopeName;
|
|
1343
1348
|
await ((_config$workspaceConf2 = config.workspaceConfig) === null || _config$workspaceConf2 === void 0 ? void 0 : _config$workspaceConf2.write({
|
|
1344
1349
|
dir: _path2().default.dirname(config.workspaceConfig.path)
|
|
1345
1350
|
}));
|
|
1351
|
+
await this.bitMap.write();
|
|
1346
1352
|
}
|
|
1347
1353
|
async addSpecificComponentConfig(id, aspectId, config = {}, {
|
|
1348
1354
|
shouldMergeWithExisting,
|
|
@@ -1548,7 +1554,7 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
|
|
|
1548
1554
|
const relativeComponentDir = this.componentDirFromLegacyId(bitId, bitMapOptions, {
|
|
1549
1555
|
relative: true
|
|
1550
1556
|
});
|
|
1551
|
-
const defaultScope = await this.componentDefaultScopeFromComponentDirAndName(relativeComponentDir, bitId.
|
|
1557
|
+
const defaultScope = await this.componentDefaultScopeFromComponentDirAndName(relativeComponentDir, bitId.name);
|
|
1552
1558
|
return defaultScope;
|
|
1553
1559
|
};
|
|
1554
1560
|
|