@teambit/workspace 0.0.937 → 0.0.938

package/dist/exceptions/merge-config-conflict.d.ts

@@ -0,0 +1,4 @@
+import { BitError } from '@teambit/bit-error';
+export declare class MergeConfigConflict extends BitError {
+    constructor(filePath: string);
+}

package/dist/exceptions/merge-config-conflict.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MergeConfigConflict = void 0;
+function _bitError() {
+  const data = require("@teambit/bit-error");
+  _bitError = function () {
+    return data;
+  };
+  return data;
+}
+class MergeConfigConflict extends _bitError().BitError {
+  constructor(filePath) {
+    super(`unable to parse the merge-config file ${filePath} as it has unresolved conflicts`);
+  }
+}
+exports.MergeConfigConflict = MergeConfigConflict;
+
+//# sourceMappingURL=merge-config-conflict.js.map

package/dist/exceptions/merge-config-conflict.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MergeConfigConflict","BitError","constructor","filePath"],"sources":["merge-config-conflict.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\n\nexport class MergeConfigConflict extends BitError {\n  constructor(filePath: string) {\n    super(`unable to parse the merge-config file ${filePath} as it has unresolved conflicts`);\n  }\n}\n"],"mappings":";;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEO,MAAMA,mBAAmB,SAASC,oBAAQ,CAAC;EAChDC,WAAW,CAACC,QAAgB,EAAE;IAC5B,KAAK,CAAE,yCAAwCA,QAAS,iCAAgC,CAAC;EAC3F;AACF;AAAC"}

package/dist/{preview-1671506809302.js → preview-1671593083147.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@0.0.937/dist/workspace.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@0.0.937/dist/workspace.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@0.0.938/dist/workspace.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@0.0.938/dist/workspace.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/dist/workspace-component/workspace-component-loader.js

@@ -127,6 +127,13 @@ function _workspaceComponent() {
   };
   return data;
 }
+function _mergeConfigConflict() {
+  const data = require("../exceptions/merge-config-conflict");
+  _mergeConfigConflict = function () {
+    return data;
+  };
+  return data;
+}
 class WorkspaceComponentLoader {
   // cache loaded components
   constructor(workspace, logger, dependencyResolver, envs) {
@@ -240,8 +247,12 @@ class WorkspaceComponentLoader {
       return componentFromScope;
     }
     const {
-      extensions
+      extensions,
+      errors
     } = await this.workspace.componentExtensions(id, componentFromScope);
+    if (errors !== null && errors !== void 0 && errors.some(err => err instanceof _mergeConfigConflict().MergeConfigConflict)) {
+      consumerComponent.issues.getOrCreate(_componentIssues().IssuesClasses.MergeConfigHasConflict).data = true;
+    }
     const extensionsFromConsumerComponent = consumerComponent.extensions || new (_extensionData().ExtensionDataList)();
     // Merge extensions added by the legacy code in memory (for example data of dependency resolver)
     const extensionDataList = _extensionData().ExtensionDataList.mergeConfigs([extensionsFromConsumerComponent, extensions]).filterRemovedExtensions();
@@ -311,16 +322,8 @@ class WorkspaceComponentLoader {
     // Move to deps resolver main runtime once we switch ws<> deps resolver direction
     const policy = await this.dependencyResolver.mergeVariantPolicies(component.config.extensions, component.id._legacy, component.state._consumer.files);
     const dependenciesList = await this.dependencyResolver.extractDepsFromLegacy(component, policy);
-    let dependenciesFromUnmergedHead;
-    // Get dependencies from unmerged head if needed
-    // we take it from there, as they might not be installed yet and we need to get their versions from the model
-    const unmergedComponent = await this.workspace.getUnmergedComponent(component.id);
-    if (unmergedComponent) {
-      dependenciesFromUnmergedHead = await this.dependencyResolver.extractDepsFromLegacy(unmergedComponent, policy);
-    }
-    const mergedDependencies = dependenciesFromUnmergedHead ? _dependencyResolver().DependencyList.merge([dependenciesList, dependenciesFromUnmergedHead]) : dependenciesList;
     const depResolverData = {
-      dependencies: mergedDependencies.serialize(),
+      dependencies: dependenciesList.serialize(),
       policy: policy.serialize()
     };
 

package/dist/workspace-component/workspace-component-loader.js.map

@@ -1 +1 @@
-{"version":3,"names":["WorkspaceComponentLoader","constructor","workspace","logger","dependencyResolver","envs","componentsCache","createInMemoryCache","maxSize","getMaxSizeForComponents","getMany","ids","loadOpts","idsWithoutEmpty","compact","errors","longProcessLogger","createLongProcessLogger","length","componentsP","mapSeries","id","logProgress","toString","get","undefined","catch","err","isComponentNotExistsError","push","components","forEach","console","warn","filteredComponents","end","getInvalid","consumer","loadComponent","_legacy","ConsumerComponent","isComponentInvalidByErrorType","componentId","legacyComponent","useCache","storeInCache","bitIdWithVersion","getLatestVersionNumber","bitmapIdsFromCurrentLane","version","changeVersion","fromCache","getFromCache","consumerComponent","getConsumerComponent","updatedId","ComponentID","fromLegacy","scope","component","loadOne","addMultipleEnvsIssueIfNeeded","saveInCache","getIfExist","getAllEnvsConfiguredOnComponent","envIds","uniq","map","env","state","issues","getOrCreate","IssuesClasses","MultipleEnvs","data","clearCache","deleteAll","clearComponentCache","idStr","cacheKey","keys","startsWith","delete","componentFromScope","MissingBitMapComponent","extensions","componentExtensions","extensionsFromConsumerComponent","ExtensionDataList","extensionDataList","mergeConfigs","filterRemovedExtensions","State","Config","mainFile","createAspectList","ComponentFS","fromVinyls","files","dependencies","workspaceComponent","WorkspaceComponent","head","tags","updatedComp","executeLoadSlot","newComponentFromState","createComponentCacheKey","set","isEqual","debug","name","message","ComponentNotFound","ComponentNotFoundInPath","_consumer","removed","envsData","getEnvSystemDescriptor","policy","mergeVariantPolicies","config","dependenciesList","extractDepsFromLegacy","dependenciesFromUnmergedHead","unmergedComponent","getUnmergedComponent","mergedDependencies","DependencyList","merge","depResolverData","serialize","Promise","all","upsertExtensionData","EnvsAspect","DependencyResolverAspect","aspectListWithEnvsAndDeps","aspects","entries","onComponentLoadSlot","toArray","promises","extension","onLoad","updatedAspectList","TagMap","existingExtension","findExtension","Object","assign","getDataEntry","ExtensionDataEntry","JSON","stringify","sortKeys","obj","fromPairs","sort","k1","k2","localeCompare"],"sources":["workspace-component-loader.ts"],"sourcesContent":["import { Component, ComponentFS, ComponentID, Config, InvalidComponent, State, TagMap } from '@teambit/component';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport mapSeries from 'p-map-series';\nimport { compact, fromPairs, uniq } from 'lodash';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { MissingBitMapComponent } from '@teambit/legacy/dist/consumer/bit-map/exceptions';\nimport { getLatestVersionNumber } from '@teambit/legacy/dist/utils';\nimport { IssuesClasses } from '@teambit/component-issues';\nimport { ComponentNotFound } from '@teambit/legacy/dist/scope/exceptions';\nimport { DependencyList, DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { Logger } from '@teambit/logger';\nimport { EnvsAspect, EnvsMain } from '@teambit/envs';\nimport { ExtensionDataEntry } from '@teambit/legacy/dist/consumer/config';\nimport { getMaxSizeForComponents, InMemoryCache } from '@teambit/legacy/dist/cache/in-memory-cache';\nimport { createInMemoryCache } from '@teambit/legacy/dist/cache/cache-factory';\nimport ComponentNotFoundInPath from '@teambit/legacy/dist/consumer/component/exceptions/component-not-found-in-path';\nimport { ComponentLoadOptions } from '@teambit/legacy/dist/consumer/component/component-loader';\nimport { Workspace } from '../workspace';\nimport { WorkspaceComponent } from './workspace-component';\n\nexport class WorkspaceComponentLoader {\n  private componentsCache: InMemoryCache<Component>; // cache loaded components\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private dependencyResolver: DependencyResolverMain,\n    private envs: EnvsMain\n  ) {\n    this.componentsCache = createInMemoryCache({ maxSize: getMaxSizeForComponents() });\n  }\n\n  async getMany(ids: Array<ComponentID>, loadOpts?: ComponentLoadOptions): Promise<Component[]> {\n    const idsWithoutEmpty = compact(ids);\n    const errors: { id: ComponentID; err: Error }[] = [];\n    const longProcessLogger = this.logger.createLongProcessLogger('loading components', ids.length);\n    const componentsP = mapSeries(idsWithoutEmpty, async (id: ComponentID) => {\n      longProcessLogger.logProgress(id.toString());\n      return this.get(id, undefined, undefined, undefined, loadOpts).catch((err) => {\n        if (this.isComponentNotExistsError(err)) {\n          errors.push({\n            id,\n            err,\n          });\n          return undefined;\n        }\n        throw err;\n      });\n    });\n    const components = await componentsP;\n    errors.forEach((err) => {\n      this.logger.console(`failed loading component ${err.id.toString()}, see full error in debug.log file`);\n      this.logger.warn(`failed loading component ${err.id.toString()}`, err.err);\n    });\n    // remove errored components\n    const filteredComponents: Component[] = compact(components);\n    longProcessLogger.end();\n    return filteredComponents;\n  }\n\n  async getInvalid(ids: Array<ComponentID>): Promise<InvalidComponent[]> {\n    const idsWithoutEmpty = compact(ids);\n    const errors: InvalidComponent[] = [];\n    const longProcessLogger = this.logger.createLongProcessLogger('loading components', ids.length);\n    await mapSeries(idsWithoutEmpty, async (id: ComponentID) => {\n      longProcessLogger.logProgress(id.toString());\n      try {\n        await this.workspace.consumer.loadComponent(id._legacy);\n      } catch (err: any) {\n        if (ConsumerComponent.isComponentInvalidByErrorType(err)) {\n          errors.push({\n            id,\n            err,\n          });\n          return;\n        }\n        throw err;\n      }\n    });\n    return errors;\n  }\n\n  async get(\n    componentId: ComponentID,\n    legacyComponent?: ConsumerComponent,\n    useCache = true,\n    storeInCache = true,\n    loadOpts?: ComponentLoadOptions\n  ): Promise<Component> {\n    const bitIdWithVersion: BitId = getLatestVersionNumber(\n      this.workspace.consumer.bitmapIdsFromCurrentLane,\n      componentId._legacy\n    );\n    const id = bitIdWithVersion.version ? componentId.changeVersion(bitIdWithVersion.version) : componentId;\n    const fromCache = this.getFromCache(id, loadOpts);\n    if (fromCache && useCache) {\n      return fromCache;\n    }\n    const consumerComponent = legacyComponent || (await this.getConsumerComponent(id));\n    // in case of out-of-sync, the id may changed during the load process\n    const updatedId = consumerComponent ? ComponentID.fromLegacy(consumerComponent.id, id.scope) : id;\n    const component = await this.loadOne(updatedId, consumerComponent, loadOpts);\n    if (storeInCache) {\n      this.addMultipleEnvsIssueIfNeeded(component); // it's in storeInCache block, otherwise, it wasn't fully loaded\n      this.saveInCache(component, loadOpts);\n    }\n    return component;\n  }\n\n  async getIfExist(componentId: ComponentID) {\n    try {\n      return await this.get(componentId);\n    } catch (err: any) {\n      if (this.isComponentNotExistsError(err)) {\n        return undefined;\n      }\n      throw err;\n    }\n  }\n\n  private addMultipleEnvsIssueIfNeeded(component: Component) {\n    const envs = this.envs.getAllEnvsConfiguredOnComponent(component);\n    const envIds = uniq(envs.map((env) => env.id));\n    if (envIds.length < 2) {\n      return;\n    }\n    component.state.issues.getOrCreate(IssuesClasses.MultipleEnvs).data = envIds;\n  }\n\n  clearCache() {\n    this.componentsCache.deleteAll();\n  }\n  clearComponentCache(id: ComponentID) {\n    const idStr = id.toString();\n    for (const cacheKey of this.componentsCache.keys()) {\n      if (cacheKey === idStr || cacheKey.startsWith(`${idStr}:`)) {\n        this.componentsCache.delete(cacheKey);\n      }\n    }\n  }\n\n  private async loadOne(id: ComponentID, consumerComponent?: ConsumerComponent, loadOpts?: ComponentLoadOptions) {\n    const componentFromScope = await this.workspace.scope.get(id);\n    if (!consumerComponent) {\n      if (!componentFromScope) throw new MissingBitMapComponent(id.toString());\n      return componentFromScope;\n    }\n    const { extensions } = await this.workspace.componentExtensions(id, componentFromScope);\n    const extensionsFromConsumerComponent = consumerComponent.extensions || new ExtensionDataList();\n    // Merge extensions added by the legacy code in memory (for example data of dependency resolver)\n    const extensionDataList = ExtensionDataList.mergeConfigs([\n      extensionsFromConsumerComponent,\n      extensions,\n    ]).filterRemovedExtensions();\n\n    // temporarily mutate consumer component extensions until we remove all direct access from legacy to extensions data\n    // TODO: remove this once we remove all direct access from legacy code to extensions data\n    consumerComponent.extensions = extensionDataList;\n\n    const state = new State(\n      new Config(consumerComponent.mainFile, extensionDataList),\n      await this.workspace.createAspectList(extensionDataList),\n      ComponentFS.fromVinyls(consumerComponent.files),\n      consumerComponent.dependencies,\n      consumerComponent\n    );\n    if (componentFromScope) {\n      // Removed by @gilad. do not mutate the component from the scope\n      // componentFromScope.state = state;\n      // const workspaceComponent = WorkspaceComponent.fromComponent(componentFromScope, this.workspace);\n      const workspaceComponent = new WorkspaceComponent(\n        componentFromScope.id,\n        componentFromScope.head,\n        state,\n        componentFromScope.tags,\n        this.workspace\n      );\n      const updatedComp = await this.executeLoadSlot(workspaceComponent, loadOpts);\n      return updatedComp;\n    }\n    return this.executeLoadSlot(this.newComponentFromState(id, state), loadOpts);\n  }\n\n  private saveInCache(component: Component, loadOpts?: ComponentLoadOptions): void {\n    const cacheKey = createComponentCacheKey(component.id, loadOpts);\n    this.componentsCache.set(cacheKey, component);\n  }\n\n  /**\n   * make sure that not only the id-str match, but also the legacy-id.\n   * this is needed because the ComponentID.toString() is the same whether or not the legacy-id has\n   * scope-name, as it includes the defaultScope if the scope is empty.\n   * as a result, when out-of-sync is happening and the id is changed to include scope-name in the\n   * legacy-id, the component is the cache has the old id.\n   */\n  private getFromCache(id: ComponentID, loadOpts?: ComponentLoadOptions): Component | undefined {\n    const cacheKey = createComponentCacheKey(id, loadOpts);\n    const fromCache = this.componentsCache.get(cacheKey);\n    if (fromCache && fromCache.id._legacy.isEqual(id._legacy)) {\n      return fromCache;\n    }\n    return undefined;\n  }\n\n  private async getConsumerComponent(id: ComponentID): Promise<ConsumerComponent | undefined> {\n    try {\n      return await this.workspace.consumer.loadComponent(id._legacy);\n    } catch (err: any) {\n      // don't return undefined for any error. otherwise, if the component is invalid (e.g. main\n      // file is missing) it returns the model component later unexpectedly, or if it's new, it\n      // shows MissingBitMapComponent error incorrectly.\n      if (this.isComponentNotExistsError(err)) {\n        this.logger.debug(\n          `failed loading component \"${id.toString()}\" from the workspace due to \"${err.name}\" error\\n${err.message}`\n        );\n        return undefined;\n      }\n      throw err;\n    }\n  }\n\n  private isComponentNotExistsError(err: Error): boolean {\n    return (\n      err instanceof ComponentNotFound ||\n      err instanceof MissingBitMapComponent ||\n      err instanceof ComponentNotFoundInPath\n    );\n  }\n\n  private async executeLoadSlot(component: Component, loadOpts?: ComponentLoadOptions) {\n    if (component.state._consumer.removed) {\n      // if it was soft-removed now, the component is not in the FS. loading aspects such as composition ends up with\n      // errors as they try to read component files from the filesystem.\n      return component;\n    }\n\n    // Special load events which runs from the workspace but should run from the correct aspect\n    // TODO: remove this once those extensions dependent on workspace\n    const envsData = await this.workspace.getEnvSystemDescriptor(component);\n\n    // Move to deps resolver main runtime once we switch ws<> deps resolver direction\n    const policy = await this.dependencyResolver.mergeVariantPolicies(\n      component.config.extensions,\n      component.id._legacy,\n      component.state._consumer.files\n    );\n    const dependenciesList = await this.dependencyResolver.extractDepsFromLegacy(component, policy);\n    let dependenciesFromUnmergedHead;\n    // Get dependencies from unmerged head if needed\n    // we take it from there, as they might not be installed yet and we need to get their versions from the model\n    const unmergedComponent = await this.workspace.getUnmergedComponent(component.id);\n    if (unmergedComponent) {\n      dependenciesFromUnmergedHead = await this.dependencyResolver.extractDepsFromLegacy(unmergedComponent, policy);\n    }\n    const mergedDependencies = dependenciesFromUnmergedHead\n      ? DependencyList.merge([dependenciesList, dependenciesFromUnmergedHead])\n      : dependenciesList;\n\n    const depResolverData = {\n      dependencies: mergedDependencies.serialize(),\n      policy: policy.serialize(),\n    };\n\n    // Make sure we are adding the envs / deps data first because other on load events might depend on it\n    await Promise.all([\n      this.upsertExtensionData(component, EnvsAspect.id, envsData),\n      this.upsertExtensionData(component, DependencyResolverAspect.id, depResolverData),\n    ]);\n\n    // We are updating the component state with the envs and deps data here, so in case we have other slots that depend on this data\n    // they will be able to get it, as it's very common use case that during on load someone want to access to the component env for example\n    const aspectListWithEnvsAndDeps = await this.workspace.createAspectList(component.state.config.extensions);\n    component.state.aspects = aspectListWithEnvsAndDeps;\n\n    const entries = this.workspace.onComponentLoadSlot.toArray();\n    const promises = entries.map(async ([extension, onLoad]) => {\n      const data = await onLoad(component, loadOpts);\n      return this.upsertExtensionData(component, extension, data);\n    });\n\n    await Promise.all(promises);\n\n    // Update the aspect list to have changes happened during the on load slot (new data added above)\n    const updatedAspectList = await this.workspace.createAspectList(component.state.config.extensions);\n    component.state.aspects = updatedAspectList;\n    return component;\n  }\n\n  private newComponentFromState(id: ComponentID, state: State): Component {\n    return new WorkspaceComponent(id, null, state, new TagMap(), this.workspace);\n  }\n\n  private async upsertExtensionData(component: Component, extension: string, data: any) {\n    if (!data) return;\n    const existingExtension = component.state.config.extensions.findExtension(extension);\n    if (existingExtension) {\n      // Only merge top level of extension data\n      Object.assign(existingExtension.data, data);\n      return;\n    }\n    component.state.config.extensions.push(await this.getDataEntry(extension, data));\n  }\n\n  private async getDataEntry(extension: string, data: { [key: string]: any }): Promise<ExtensionDataEntry> {\n    // TODO: @gilad we need to refactor the extension data entry api.\n    return new ExtensionDataEntry(undefined, undefined, extension, undefined, data);\n  }\n}\n\nfunction createComponentCacheKey(id: ComponentID, loadOpts?: ComponentLoadOptions): string {\n  return `${id.toString()}:${JSON.stringify(sortKeys(loadOpts ?? {}))}`;\n}\n\nfunction sortKeys(obj: Object) {\n  return fromPairs(Object.entries(obj).sort(([k1], [k2]) => k1.localeCompare(k2)));\n}\n"],"mappings":"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"}
+{"version":3,"names":["WorkspaceComponentLoader","constructor","workspace","logger","dependencyResolver","envs","componentsCache","createInMemoryCache","maxSize","getMaxSizeForComponents","getMany","ids","loadOpts","idsWithoutEmpty","compact","errors","longProcessLogger","createLongProcessLogger","length","componentsP","mapSeries","id","logProgress","toString","get","undefined","catch","err","isComponentNotExistsError","push","components","forEach","console","warn","filteredComponents","end","getInvalid","consumer","loadComponent","_legacy","ConsumerComponent","isComponentInvalidByErrorType","componentId","legacyComponent","useCache","storeInCache","bitIdWithVersion","getLatestVersionNumber","bitmapIdsFromCurrentLane","version","changeVersion","fromCache","getFromCache","consumerComponent","getConsumerComponent","updatedId","ComponentID","fromLegacy","scope","component","loadOne","addMultipleEnvsIssueIfNeeded","saveInCache","getIfExist","getAllEnvsConfiguredOnComponent","envIds","uniq","map","env","state","issues","getOrCreate","IssuesClasses","MultipleEnvs","data","clearCache","deleteAll","clearComponentCache","idStr","cacheKey","keys","startsWith","delete","componentFromScope","MissingBitMapComponent","extensions","componentExtensions","some","MergeConfigConflict","MergeConfigHasConflict","extensionsFromConsumerComponent","ExtensionDataList","extensionDataList","mergeConfigs","filterRemovedExtensions","State","Config","mainFile","createAspectList","ComponentFS","fromVinyls","files","dependencies","workspaceComponent","WorkspaceComponent","head","tags","updatedComp","executeLoadSlot","newComponentFromState","createComponentCacheKey","set","isEqual","debug","name","message","ComponentNotFound","ComponentNotFoundInPath","_consumer","removed","envsData","getEnvSystemDescriptor","policy","mergeVariantPolicies","config","dependenciesList","extractDepsFromLegacy","depResolverData","serialize","Promise","all","upsertExtensionData","EnvsAspect","DependencyResolverAspect","aspectListWithEnvsAndDeps","aspects","entries","onComponentLoadSlot","toArray","promises","extension","onLoad","updatedAspectList","TagMap","existingExtension","findExtension","Object","assign","getDataEntry","ExtensionDataEntry","JSON","stringify","sortKeys","obj","fromPairs","sort","k1","k2","localeCompare"],"sources":["workspace-component-loader.ts"],"sourcesContent":["import { Component, ComponentFS, ComponentID, Config, InvalidComponent, State, TagMap } from '@teambit/component';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport mapSeries from 'p-map-series';\nimport { compact, fromPairs, uniq } from 'lodash';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { MissingBitMapComponent } from '@teambit/legacy/dist/consumer/bit-map/exceptions';\nimport { getLatestVersionNumber } from '@teambit/legacy/dist/utils';\nimport { IssuesClasses } from '@teambit/component-issues';\nimport { ComponentNotFound } from '@teambit/legacy/dist/scope/exceptions';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { Logger } from '@teambit/logger';\nimport { EnvsAspect, EnvsMain } from '@teambit/envs';\nimport { ExtensionDataEntry } from '@teambit/legacy/dist/consumer/config';\nimport { getMaxSizeForComponents, InMemoryCache } from '@teambit/legacy/dist/cache/in-memory-cache';\nimport { createInMemoryCache } from '@teambit/legacy/dist/cache/cache-factory';\nimport ComponentNotFoundInPath from '@teambit/legacy/dist/consumer/component/exceptions/component-not-found-in-path';\nimport { ComponentLoadOptions } from '@teambit/legacy/dist/consumer/component/component-loader';\nimport { Workspace } from '../workspace';\nimport { WorkspaceComponent } from './workspace-component';\nimport { MergeConfigConflict } from '../exceptions/merge-config-conflict';\n\nexport class WorkspaceComponentLoader {\n  private componentsCache: InMemoryCache<Component>; // cache loaded components\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private dependencyResolver: DependencyResolverMain,\n    private envs: EnvsMain\n  ) {\n    this.componentsCache = createInMemoryCache({ maxSize: getMaxSizeForComponents() });\n  }\n\n  async getMany(ids: Array<ComponentID>, loadOpts?: ComponentLoadOptions): Promise<Component[]> {\n    const idsWithoutEmpty = compact(ids);\n    const errors: { id: ComponentID; err: Error }[] = [];\n    const longProcessLogger = this.logger.createLongProcessLogger('loading components', ids.length);\n    const componentsP = mapSeries(idsWithoutEmpty, async (id: ComponentID) => {\n      longProcessLogger.logProgress(id.toString());\n      return this.get(id, undefined, undefined, undefined, loadOpts).catch((err) => {\n        if (this.isComponentNotExistsError(err)) {\n          errors.push({\n            id,\n            err,\n          });\n          return undefined;\n        }\n        throw err;\n      });\n    });\n    const components = await componentsP;\n    errors.forEach((err) => {\n      this.logger.console(`failed loading component ${err.id.toString()}, see full error in debug.log file`);\n      this.logger.warn(`failed loading component ${err.id.toString()}`, err.err);\n    });\n    // remove errored components\n    const filteredComponents: Component[] = compact(components);\n    longProcessLogger.end();\n    return filteredComponents;\n  }\n\n  async getInvalid(ids: Array<ComponentID>): Promise<InvalidComponent[]> {\n    const idsWithoutEmpty = compact(ids);\n    const errors: InvalidComponent[] = [];\n    const longProcessLogger = this.logger.createLongProcessLogger('loading components', ids.length);\n    await mapSeries(idsWithoutEmpty, async (id: ComponentID) => {\n      longProcessLogger.logProgress(id.toString());\n      try {\n        await this.workspace.consumer.loadComponent(id._legacy);\n      } catch (err: any) {\n        if (ConsumerComponent.isComponentInvalidByErrorType(err)) {\n          errors.push({\n            id,\n            err,\n          });\n          return;\n        }\n        throw err;\n      }\n    });\n    return errors;\n  }\n\n  async get(\n    componentId: ComponentID,\n    legacyComponent?: ConsumerComponent,\n    useCache = true,\n    storeInCache = true,\n    loadOpts?: ComponentLoadOptions\n  ): Promise<Component> {\n    const bitIdWithVersion: BitId = getLatestVersionNumber(\n      this.workspace.consumer.bitmapIdsFromCurrentLane,\n      componentId._legacy\n    );\n    const id = bitIdWithVersion.version ? componentId.changeVersion(bitIdWithVersion.version) : componentId;\n    const fromCache = this.getFromCache(id, loadOpts);\n    if (fromCache && useCache) {\n      return fromCache;\n    }\n    const consumerComponent = legacyComponent || (await this.getConsumerComponent(id));\n    // in case of out-of-sync, the id may changed during the load process\n    const updatedId = consumerComponent ? ComponentID.fromLegacy(consumerComponent.id, id.scope) : id;\n    const component = await this.loadOne(updatedId, consumerComponent, loadOpts);\n    if (storeInCache) {\n      this.addMultipleEnvsIssueIfNeeded(component); // it's in storeInCache block, otherwise, it wasn't fully loaded\n      this.saveInCache(component, loadOpts);\n    }\n    return component;\n  }\n\n  async getIfExist(componentId: ComponentID) {\n    try {\n      return await this.get(componentId);\n    } catch (err: any) {\n      if (this.isComponentNotExistsError(err)) {\n        return undefined;\n      }\n      throw err;\n    }\n  }\n\n  private addMultipleEnvsIssueIfNeeded(component: Component) {\n    const envs = this.envs.getAllEnvsConfiguredOnComponent(component);\n    const envIds = uniq(envs.map((env) => env.id));\n    if (envIds.length < 2) {\n      return;\n    }\n    component.state.issues.getOrCreate(IssuesClasses.MultipleEnvs).data = envIds;\n  }\n\n  clearCache() {\n    this.componentsCache.deleteAll();\n  }\n  clearComponentCache(id: ComponentID) {\n    const idStr = id.toString();\n    for (const cacheKey of this.componentsCache.keys()) {\n      if (cacheKey === idStr || cacheKey.startsWith(`${idStr}:`)) {\n        this.componentsCache.delete(cacheKey);\n      }\n    }\n  }\n\n  private async loadOne(id: ComponentID, consumerComponent?: ConsumerComponent, loadOpts?: ComponentLoadOptions) {\n    const componentFromScope = await this.workspace.scope.get(id);\n    if (!consumerComponent) {\n      if (!componentFromScope) throw new MissingBitMapComponent(id.toString());\n      return componentFromScope;\n    }\n    const { extensions, errors } = await this.workspace.componentExtensions(id, componentFromScope);\n    if (errors?.some((err) => err instanceof MergeConfigConflict)) {\n      consumerComponent.issues.getOrCreate(IssuesClasses.MergeConfigHasConflict).data = true;\n    }\n\n    const extensionsFromConsumerComponent = consumerComponent.extensions || new ExtensionDataList();\n    // Merge extensions added by the legacy code in memory (for example data of dependency resolver)\n    const extensionDataList = ExtensionDataList.mergeConfigs([\n      extensionsFromConsumerComponent,\n      extensions,\n    ]).filterRemovedExtensions();\n\n    // temporarily mutate consumer component extensions until we remove all direct access from legacy to extensions data\n    // TODO: remove this once we remove all direct access from legacy code to extensions data\n    consumerComponent.extensions = extensionDataList;\n\n    const state = new State(\n      new Config(consumerComponent.mainFile, extensionDataList),\n      await this.workspace.createAspectList(extensionDataList),\n      ComponentFS.fromVinyls(consumerComponent.files),\n      consumerComponent.dependencies,\n      consumerComponent\n    );\n    if (componentFromScope) {\n      // Removed by @gilad. do not mutate the component from the scope\n      // componentFromScope.state = state;\n      // const workspaceComponent = WorkspaceComponent.fromComponent(componentFromScope, this.workspace);\n      const workspaceComponent = new WorkspaceComponent(\n        componentFromScope.id,\n        componentFromScope.head,\n        state,\n        componentFromScope.tags,\n        this.workspace\n      );\n      const updatedComp = await this.executeLoadSlot(workspaceComponent, loadOpts);\n      return updatedComp;\n    }\n    return this.executeLoadSlot(this.newComponentFromState(id, state), loadOpts);\n  }\n\n  private saveInCache(component: Component, loadOpts?: ComponentLoadOptions): void {\n    const cacheKey = createComponentCacheKey(component.id, loadOpts);\n    this.componentsCache.set(cacheKey, component);\n  }\n\n  /**\n   * make sure that not only the id-str match, but also the legacy-id.\n   * this is needed because the ComponentID.toString() is the same whether or not the legacy-id has\n   * scope-name, as it includes the defaultScope if the scope is empty.\n   * as a result, when out-of-sync is happening and the id is changed to include scope-name in the\n   * legacy-id, the component is the cache has the old id.\n   */\n  private getFromCache(id: ComponentID, loadOpts?: ComponentLoadOptions): Component | undefined {\n    const cacheKey = createComponentCacheKey(id, loadOpts);\n    const fromCache = this.componentsCache.get(cacheKey);\n    if (fromCache && fromCache.id._legacy.isEqual(id._legacy)) {\n      return fromCache;\n    }\n    return undefined;\n  }\n\n  private async getConsumerComponent(id: ComponentID): Promise<ConsumerComponent | undefined> {\n    try {\n      return await this.workspace.consumer.loadComponent(id._legacy);\n    } catch (err: any) {\n      // don't return undefined for any error. otherwise, if the component is invalid (e.g. main\n      // file is missing) it returns the model component later unexpectedly, or if it's new, it\n      // shows MissingBitMapComponent error incorrectly.\n      if (this.isComponentNotExistsError(err)) {\n        this.logger.debug(\n          `failed loading component \"${id.toString()}\" from the workspace due to \"${err.name}\" error\\n${err.message}`\n        );\n        return undefined;\n      }\n      throw err;\n    }\n  }\n\n  private isComponentNotExistsError(err: Error): boolean {\n    return (\n      err instanceof ComponentNotFound ||\n      err instanceof MissingBitMapComponent ||\n      err instanceof ComponentNotFoundInPath\n    );\n  }\n\n  private async executeLoadSlot(component: Component, loadOpts?: ComponentLoadOptions) {\n    if (component.state._consumer.removed) {\n      // if it was soft-removed now, the component is not in the FS. loading aspects such as composition ends up with\n      // errors as they try to read component files from the filesystem.\n      return component;\n    }\n\n    // Special load events which runs from the workspace but should run from the correct aspect\n    // TODO: remove this once those extensions dependent on workspace\n    const envsData = await this.workspace.getEnvSystemDescriptor(component);\n\n    // Move to deps resolver main runtime once we switch ws<> deps resolver direction\n    const policy = await this.dependencyResolver.mergeVariantPolicies(\n      component.config.extensions,\n      component.id._legacy,\n      component.state._consumer.files\n    );\n    const dependenciesList = await this.dependencyResolver.extractDepsFromLegacy(component, policy);\n\n    const depResolverData = {\n      dependencies: dependenciesList.serialize(),\n      policy: policy.serialize(),\n    };\n\n    // Make sure we are adding the envs / deps data first because other on load events might depend on it\n    await Promise.all([\n      this.upsertExtensionData(component, EnvsAspect.id, envsData),\n      this.upsertExtensionData(component, DependencyResolverAspect.id, depResolverData),\n    ]);\n\n    // We are updating the component state with the envs and deps data here, so in case we have other slots that depend on this data\n    // they will be able to get it, as it's very common use case that during on load someone want to access to the component env for example\n    const aspectListWithEnvsAndDeps = await this.workspace.createAspectList(component.state.config.extensions);\n    component.state.aspects = aspectListWithEnvsAndDeps;\n\n    const entries = this.workspace.onComponentLoadSlot.toArray();\n    const promises = entries.map(async ([extension, onLoad]) => {\n      const data = await onLoad(component, loadOpts);\n      return this.upsertExtensionData(component, extension, data);\n    });\n\n    await Promise.all(promises);\n\n    // Update the aspect list to have changes happened during the on load slot (new data added above)\n    const updatedAspectList = await this.workspace.createAspectList(component.state.config.extensions);\n    component.state.aspects = updatedAspectList;\n    return component;\n  }\n\n  private newComponentFromState(id: ComponentID, state: State): Component {\n    return new WorkspaceComponent(id, null, state, new TagMap(), this.workspace);\n  }\n\n  private async upsertExtensionData(component: Component, extension: string, data: any) {\n    if (!data) return;\n    const existingExtension = component.state.config.extensions.findExtension(extension);\n    if (existingExtension) {\n      // Only merge top level of extension data\n      Object.assign(existingExtension.data, data);\n      return;\n    }\n    component.state.config.extensions.push(await this.getDataEntry(extension, data));\n  }\n\n  private async getDataEntry(extension: string, data: { [key: string]: any }): Promise<ExtensionDataEntry> {\n    // TODO: @gilad we need to refactor the extension data entry api.\n    return new ExtensionDataEntry(undefined, undefined, extension, undefined, data);\n  }\n}\n\nfunction createComponentCacheKey(id: ComponentID, loadOpts?: ComponentLoadOptions): string {\n  return `${id.toString()}:${JSON.stringify(sortKeys(loadOpts ?? {}))}`;\n}\n\nfunction sortKeys(obj: Object) {\n  return fromPairs(Object.entries(obj).sort(([k1], [k2]) => k1.localeCompare(k2)));\n}\n"],"mappings":"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"}

package/dist/workspace.d.ts

@@ -55,7 +55,7 @@ export declare type TrackData = {
         [aspectName: string]: any;
     };
 };
-export declare type ExtensionsOrigin = 'BitmapFile' | 'ModelSpecific' | 'ModelNonSpecific' | 'UnmergedSpecific' | 'UnmergedNonSpecific' | 'WorkspaceVariants' | 'ComponentJsonFile' | 'WorkspaceDefault' | 'FinalAfterMerge';
+export declare type ExtensionsOrigin = 'BitmapFile' | 'ModelSpecific' | 'ModelNonSpecific' | 'ConfigMerge' | 'WorkspaceVariants' | 'ComponentJsonFile' | 'WorkspaceDefault' | 'FinalAfterMerge';
 export declare type TrackResult = {
     componentName: string;
     files: string[];
@@ -370,9 +370,13 @@ export declare class Workspace implements ComponentFactory {
             origin: ExtensionsOrigin;
             extraData: any;
         }>;
+        errors?: Error[];
     }>;
-    private getUnmergedHead;
+    getConfigMergeFilePath(componentId: ComponentID): string;
+    listComponentsDuringMerge(): Promise<ComponentID[]>;
+    private getConfigMergeFile;
     getUnmergedComponent(componentId: ComponentID): Promise<Component | undefined>;
+    private getUnmergedData;
     private warnAboutMisconfiguredEnv;
     isModified(component: Component): Promise<boolean>;
     private filterEnvsFromExtensionsIfNeeded;

package/dist/workspace.js

@@ -214,6 +214,13 @@ function _lodash() {
   };
   return data;
 }
+function _constants() {
+  const data = require("@teambit/legacy/dist/constants");
+  _constants = function () {
+    return data;
+  };
+  return data;
+}
 function _path2() {
   const data = _interopRequireDefault(require("path"));
   _path2 = function () {
@@ -312,6 +319,13 @@ function _buildGraphIdsFromFs() {
   };
   return data;
 }
+function _mergeConfigConflict() {
+  const data = require("./exceptions/merge-config-conflict");
+  _mergeConfigConflict = function () {
+    return data;
+  };
+  return data;
+}
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2().default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 const AspectSpecificField = '__specific';
@@ -1209,19 +1223,46 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     let variantsExtensions;
     let wsDefaultExtensions;
     const mergeFromScope = true;
+    const errors = [];
     const bitMapEntry = this.consumer.bitMap.getComponentIfExist(componentId._legacy);
     const bitMapExtensions = bitMapEntry === null || bitMapEntry === void 0 ? void 0 : bitMapEntry.config;
-    const unmergedHead = this.getUnmergedHead(componentId);
-    let unmergedExtensions;
-    let unmergedExtensionsSpecific;
-    let unmergedExtensionsNonSpecific;
-    if (unmergedHead) {
-      const versionInstance = await this.scope.legacyScope.getVersionInstance(componentId._legacy.changeVersion(unmergedHead.toString()));
-      unmergedExtensions = versionInstance.extensions;
-      const [specific, nonSpecific] = (0, _lodash().partition)(unmergedExtensions, entry => entry.config[AspectSpecificField] === true);
-      unmergedExtensionsSpecific = new (_extensionData().ExtensionDataList)(...specific);
-      unmergedExtensionsNonSpecific = new (_extensionData().ExtensionDataList)(...nonSpecific);
-    }
+    let configMergeFile;
+    try {
+      configMergeFile = await this.getConfigMergeFile(componentId);
+    } catch (err) {
+      if (!(err instanceof _mergeConfigConflict().MergeConfigConflict)) {
+        throw err;
+      }
+      this.logger.error(`unable to parse the config file for ${componentId.toString()} due to conflicts`);
+      errors.push(err);
+    }
+    const adjustEnvsOnConfigMerge = conf => {
+      var _conf$EnvsAspect$id;
+      const env = (_conf$EnvsAspect$id = conf[_envs().EnvsAspect.id]) === null || _conf$EnvsAspect$id === void 0 ? void 0 : _conf$EnvsAspect$id.env;
+      if (!env) return;
+      const [id] = env.split('@');
+      conf[_envs().EnvsAspect.id] = {
+        env: id
+      };
+      conf[env] = {};
+    };
+    const unmergedData = this.getUnmergedData(componentId);
+    const unmergedDataMergeConf = unmergedData === null || unmergedData === void 0 ? void 0 : unmergedData.mergedConfig;
+    const getMergeConfigCombined = () => {
+      if (!configMergeFile && !unmergedDataMergeConf) return undefined;
+      if (!configMergeFile) return unmergedDataMergeConf;
+      if (!unmergedDataMergeConf) return configMergeFile;
+      return (0, _lodash().mergeWith)(configMergeFile, unmergedDataMergeConf, (objValue, srcValue) => {
+        if (Array.isArray(objValue)) {
+          // critical for dependencyResolver.policy.*dependencies. otherwise, it will override the array
+          return objValue.concat(srcValue);
+        }
+        return undefined;
+      });
+    };
+    const mergeConfigCombined = getMergeConfigCombined();
+    adjustEnvsOnConfigMerge(mergeConfigCombined || {});
+    const configMergeExtensions = mergeConfigCombined ? _extensionData().ExtensionDataList.fromConfigObject(mergeConfigCombined) : undefined;
     const scopeExtensions = (componentFromScope === null || componentFromScope === void 0 ? void 0 : (_componentFromScope$c = componentFromScope.config) === null || _componentFromScope$c === void 0 ? void 0 : _componentFromScope$c.extensions) || new (_extensionData().ExtensionDataList)();
     const [specific, nonSpecific] = (0, _lodash().partition)(scopeExtensions, entry => entry.config[AspectSpecificField] === true);
     const scopeExtensionsNonSpecific = new (_extensionData().ExtensionDataList)(...nonSpecific);
@@ -1278,6 +1319,9 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     const setDataListAsSpecific = extensions => {
       extensions.forEach(dataEntry => dataEntry.config[AspectSpecificField] = true);
     };
+    if (configMergeExtensions && !excludeOrigins.includes('ConfigMerge')) {
+      await addExtensionsToMerge(_extensionData().ExtensionDataList.fromArray(configMergeExtensions), 'ConfigMerge');
+    }
     if (bitMapExtensions && !excludeOrigins.includes('BitmapFile')) {
       const extensionDataList = _extensionData().ExtensionDataList.fromConfigObject(bitMapExtensions);
       setDataListAsSpecific(extensionDataList);
@@ -1287,9 +1331,6 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
       setDataListAsSpecific(configFileExtensions);
       await addExtensionsToMerge(configFileExtensions, 'ComponentJsonFile');
     }
-    if (unmergedExtensionsSpecific && !excludeOrigins.includes('UnmergedSpecific')) {
-      await addExtensionsToMerge(_extensionData().ExtensionDataList.fromArray(unmergedExtensionsSpecific), 'UnmergedSpecific');
-    }
     if (!excludeOrigins.includes('ModelSpecific')) {
       await addExtensionsToMerge(_extensionData().ExtensionDataList.fromArray(scopeExtensionsSpecific), 'ModelSpecific');
     }
@@ -1312,9 +1353,6 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     if (wsDefaultExtensions && continuePropagating && !isDefaultExtension && !excludeOrigins.includes('WorkspaceDefault')) {
       await addExtensionsToMerge(wsDefaultExtensions, 'WorkspaceDefault');
     }
-    if (unmergedExtensionsNonSpecific && mergeFromScope && continuePropagating && !excludeOrigins.includes('UnmergedNonSpecific')) {
-      await addExtensionsToMerge(unmergedExtensionsNonSpecific, 'UnmergedNonSpecific');
-    }
     if (mergeFromScope && continuePropagating && !excludeOrigins.includes('ModelNonSpecific')) {
       await addExtensionsToMerge(scopeExtensionsNonSpecific, 'ModelNonSpecific');
     }
@@ -1328,12 +1366,37 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     const extensions = _extensionData().ExtensionDataList.fromArray(withoutRemoved);
     return {
       extensions,
-      beforeMerge: extensionsToMerge
+      beforeMerge: extensionsToMerge,
+      errors
     };
   }
-  getUnmergedHead(componentId) {
-    const unmerged = this.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);
-    return unmerged === null || unmerged === void 0 ? void 0 : unmerged.head;
+  getConfigMergeFilePath(componentId) {
+    const compDir = this.componentDir(componentId, {
+      ignoreVersion: true
+    });
+    return _path2().default.join(compDir, _constants().MergeConfigFilename);
+  }
+  async listComponentsDuringMerge() {
+    const unmergedComps = this.scope.legacyScope.objects.unmergedComponents.getComponents();
+    const bitIds = unmergedComps.map(u => new (_legacyBitId().BitId)(u.id));
+    return this.resolveMultipleComponentIds(bitIds);
+  }
+  async getConfigMergeFile(componentId) {
+    const configMergePath = this.getConfigMergeFilePath(componentId);
+    let fileContent;
+    try {
+      fileContent = await _fsExtra().default.readFile(configMergePath, 'utf-8');
+    } catch (err) {
+      if (err.code === 'ENOENT') {
+        return undefined;
+      }
+      throw err;
+    }
+    try {
+      return JSON.parse(fileContent);
+    } catch (err) {
+      throw new (_mergeConfigConflict().MergeConfigConflict)(configMergePath);
+    }
   }
   async getUnmergedComponent(componentId) {
     const unmerged = this.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);
@@ -1342,6 +1405,9 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     }
     return undefined;
   }
+  getUnmergedData(componentId) {
+    return this.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);
+  }
   async warnAboutMisconfiguredEnv(componentId, extensionDataList) {
     if (!(await this.hasId(componentId))) {
       // if this is a dependency and not belong to the workspace, don't show the warning