@teambit/workspace 0.0.1021 → 0.0.1022

package/dist/aspects-merger.js

@@ -102,7 +102,7 @@ class AspectsMerger {
     const bitMapExtensions = bitMapEntry === null || bitMapEntry === void 0 ? void 0 : bitMapEntry.config;
     let configMerge;
     try {
-      configMerge = await this.mergeConflictFile.getConflictParsed(componentId.toStringWithoutVersion());
+      configMerge = this.mergeConflictFile.getConflictParsed(componentId.toStringWithoutVersion());
     } catch (err) {
       if (!(err instanceof _mergeConfigConflict().MergeConfigConflict)) {
         throw err;

package/dist/aspects-merger.js.map

@@ -1 +1 @@
-{"version":3,"names":["AspectsMerger","constructor","workspace","harmony","consumer","mergeConflictFile","MergeConflictFile","path","getDepsDataOfMergeConfig","id","mergeConfigDepsResolverDataCache","toString","merge","componentId","componentFromScope","excludeOrigins","configFileExtensions","variantsExtensions","wsDefaultExtensions","mergeFromScope","errors","bitMapEntry","bitMap","getComponentIfExist","_legacy","bitMapExtensions","config","configMerge","getConflictParsed","toStringWithoutVersion","err","MergeConfigConflict","logger","error","push","adjustEnvsOnConfigMerge","conf","env","EnvsAspect","split","unmergedData","getUnmergedData","unmergedDataMergeConf","mergedConfig","getMergeConfigCombined","undefined","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","extensionDataListFiltered","envIsCurrentlySet","filterEnvsFromExtensionsIfNeeded","warnAboutMisconfiguredEnv","setDataListAsSpecific","forEach","dataEntry","includes","extensionDataList","fromArray","continuePropagating","propagate","appliedRules","sortedMatches","pattern","specificity","isDefaultExtension","Promise","all","list","resolveExtensionListIds","afterMerge","mergeConfigs","ext","loadExtensions","withoutRemoved","beforeMerge","fromScope","policy","findCoreExtension","DependencyResolverAspect","mergeConfigObj","key","dep","force","reduce","acc","current","name","version","scope","legacyScope","objects","unmergedComponents","getEntry","hasId","envAspect","envFromEnvsAspect","envs","getCoreEnvsIds","warnedAboutMisconfiguredEnvs","envId","resolveComponentId","get","isUsingEnvEnv","consoleWarning","data","aspectsRegisteredAsEnvs","aspect","getEnvDefinitionByStringId","nonEnvs","e","envAspectExt","find","ids","listIds","envAspectId","found","isEqualWithoutVersion","Boolean","originatedFrom","throwOnError","workspaceAspectsLoader","getWorkspaceAspectsLoader","loadComponentsExtensions","extensionList","promises"],"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 { Consumer } from '@teambit/legacy/dist/consumer';\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';\n\nexport class AspectsMerger {\n  private consumer: Consumer;\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.consumer = workspace.consumer;\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.consumer.bitMap.getComponentIfExist(componentId._legacy);\n    const bitMapExtensions = bitMapEntry?.config;\n\n    let configMerge: Record<string, any> | undefined;\n    try {\n      configMerge = await 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 { extensionDataListFiltered, envIsCurrentlySet } = await this.filterEnvsFromExtensionsIfNeeded(\n        extsWithoutSelf,\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    // 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    await Promise.all(extensionsToMerge.map((list) => this.resolveExtensionListIds(list.extensions)));\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) => this.workspace.envs.getEnvDefinitionByStringId(aspect.stringId))\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        if (\n          (envFromEnvsAspect && e.stringId === envFromEnvsAspect) ||\n          (envFromEnvsAspect && e.extensionId?.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    throwOnError = false\n  ): Promise<void> {\n    const workspaceAspectsLoader = this.workspace.getWorkspaceAspectsLoader();\n    return workspaceAspectsLoader.loadComponentsExtensions(extensions, originatedFrom, throwOnError);\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(extensionList: ExtensionDataList): Promise<ExtensionDataList> {\n    const promises = extensionList.map(async (entry) => {\n      if (entry.extensionId) {\n        const id = await this.workspace.resolveComponentId(entry.extensionId);\n        entry.extensionId = id._legacy;\n      }\n\n      return entry;\n    });\n    await Promise.all(promises);\n    return extensionList;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["AspectsMerger","constructor","workspace","harmony","consumer","mergeConflictFile","MergeConflictFile","path","getDepsDataOfMergeConfig","id","mergeConfigDepsResolverDataCache","toString","merge","componentId","componentFromScope","excludeOrigins","configFileExtensions","variantsExtensions","wsDefaultExtensions","mergeFromScope","errors","bitMapEntry","bitMap","getComponentIfExist","_legacy","bitMapExtensions","config","configMerge","getConflictParsed","toStringWithoutVersion","err","MergeConfigConflict","logger","error","push","adjustEnvsOnConfigMerge","conf","env","EnvsAspect","split","unmergedData","getUnmergedData","unmergedDataMergeConf","mergedConfig","getMergeConfigCombined","undefined","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","extensionDataListFiltered","envIsCurrentlySet","filterEnvsFromExtensionsIfNeeded","warnAboutMisconfiguredEnv","setDataListAsSpecific","forEach","dataEntry","includes","extensionDataList","fromArray","continuePropagating","propagate","appliedRules","sortedMatches","pattern","specificity","isDefaultExtension","Promise","all","list","resolveExtensionListIds","afterMerge","mergeConfigs","ext","loadExtensions","withoutRemoved","beforeMerge","fromScope","policy","findCoreExtension","DependencyResolverAspect","mergeConfigObj","key","dep","force","reduce","acc","current","name","version","scope","legacyScope","objects","unmergedComponents","getEntry","hasId","envAspect","envFromEnvsAspect","envs","getCoreEnvsIds","warnedAboutMisconfiguredEnvs","envId","resolveComponentId","get","isUsingEnvEnv","consoleWarning","data","aspectsRegisteredAsEnvs","aspect","getEnvDefinitionByStringId","nonEnvs","e","envAspectExt","find","ids","listIds","envAspectId","found","isEqualWithoutVersion","Boolean","originatedFrom","throwOnError","workspaceAspectsLoader","getWorkspaceAspectsLoader","loadComponentsExtensions","extensionList","promises"],"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 { Consumer } from '@teambit/legacy/dist/consumer';\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';\n\nexport class AspectsMerger {\n  private consumer: Consumer;\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.consumer = workspace.consumer;\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.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 { extensionDataListFiltered, envIsCurrentlySet } = await this.filterEnvsFromExtensionsIfNeeded(\n        extsWithoutSelf,\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    // 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    await Promise.all(extensionsToMerge.map((list) => this.resolveExtensionListIds(list.extensions)));\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) => this.workspace.envs.getEnvDefinitionByStringId(aspect.stringId))\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        if (\n          (envFromEnvsAspect && e.stringId === envFromEnvsAspect) ||\n          (envFromEnvsAspect && e.extensionId?.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    throwOnError = false\n  ): Promise<void> {\n    const workspaceAspectsLoader = this.workspace.getWorkspaceAspectsLoader();\n    return workspaceAspectsLoader.loadComponentsExtensions(extensions, originatedFrom, throwOnError);\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(extensionList: ExtensionDataList): Promise<ExtensionDataList> {\n    const promises = extensionList.map(async (entry) => {\n      if (entry.extensionId) {\n        const id = await this.workspace.resolveComponentId(entry.extensionId);\n        entry.extensionId = id._legacy;\n      }\n\n      return entry;\n    });\n    await Promise.all(promises);\n    return extensionList;\n  }\n}\n"],"mappings":"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"}

package/dist/merge-conflict-file.d.ts

@@ -8,7 +8,8 @@ export declare class MergeConflictFile {
     addConflict(id: string, conflict: string): void;
     removeConflict(id: string): void;
     getConflict(id: string): Promise<string | undefined>;
-    getConflictParsed(id: string): Promise<Record<string, any> | undefined>;
+    getConflictAssumeIsLoaded(id: string): string | undefined;
+    getConflictParsed(id: string): Record<string, any> | undefined;
     hasConflict(): boolean;
     getPath(): string;
     loadIfNeeded(): Promise<void>;

package/dist/merge-conflict-file.js

@@ -64,8 +64,12 @@ class MergeConflictFile {
     if (!this.conflictPerId) throw new Error(`this.conflictPerId must be instantiated after load`);
     return this.conflictPerId[id];
   }
-  async getConflictParsed(id) {
-    const configMergeContent = await this.getConflict(id);
+  getConflictAssumeIsLoaded(id) {
+    if (!this.conflictPerId) throw new Error(`MergeConflictFile was not loaded yet, please load it before calling this function`);
+    return this.conflictPerId[id];
+  }
+  getConflictParsed(id) {
+    const configMergeContent = this.getConflictAssumeIsLoaded(id);
     if (!configMergeContent) return undefined;
     try {
       return JSON.parse(configMergeContent);

package/dist/merge-conflict-file.js.map

@@ -1 +1 @@
-{"version":3,"names":["idPrefix","idDivider","repeat","MergeConflictFile","constructor","workspacePath","addConflict","id","conflict","conflictPerId","removeConflict","getConflict","loadIfNeeded","Error","getConflictParsed","configMergeContent","undefined","JSON","parse","err","stringHasConflictMarker","MergeConfigConflict","getPath","message","hasConflict","Boolean","Object","keys","length","path","join","MergeConfigFilename","fileContent","getFileContentIfExists","parsedConflict","parseConflict","write","afterFormat","formatConflicts","fs","writeFile","delete","remove","title","conflicts","map","str","includes","split","filter","line","startsWith","forEach","conflictItem","conflictItemSplit","rawId","conflictStr","trim","filePath","readFile","code"],"sources":["merge-conflict-file.ts"],"sourcesContent":["import { MergeConfigFilename } from '@teambit/legacy/dist/constants';\nimport path from 'path';\nimport fs from 'fs-extra';\nimport { MergeConfigConflict } from './exceptions/merge-config-conflict';\n\nconst idPrefix = `[*]`;\nconst idDivider = '-'.repeat(80);\ntype ConflictPerId = { [compIdWithoutVersion: string]: string };\n\nexport class MergeConflictFile {\n  conflictPerId: ConflictPerId | undefined;\n  constructor(private workspacePath: string) {}\n\n  addConflict(id: string, conflict: string) {\n    if (!this.conflictPerId) this.conflictPerId = {};\n    this.conflictPerId[id] = conflict;\n  }\n\n  removeConflict(id: string) {\n    delete this.conflictPerId?.[id];\n  }\n\n  async getConflict(id: string): Promise<string | undefined> {\n    await this.loadIfNeeded();\n    if (!this.conflictPerId) throw new Error(`this.conflictPerId must be instantiated after load`);\n    return this.conflictPerId[id];\n  }\n\n  async getConflictParsed(id: string): Promise<Record<string, any> | undefined> {\n    const configMergeContent = await this.getConflict(id);\n    if (!configMergeContent) return undefined;\n    try {\n      return JSON.parse(configMergeContent);\n    } catch (err: any) {\n      if (this.stringHasConflictMarker(configMergeContent)) {\n        throw new MergeConfigConflict(this.getPath());\n      }\n      throw new Error(`unable to parse the merge-conflict entry for ${id} as the JSON is invalid. err: ${err.message}`);\n    }\n  }\n\n  hasConflict(): boolean {\n    return Boolean(this.conflictPerId && Object.keys(this.conflictPerId).length);\n  }\n\n  getPath() {\n    return path.join(this.workspacePath, MergeConfigFilename);\n  }\n\n  async loadIfNeeded() {\n    if (this.conflictPerId) return; // already loaded\n    const fileContent = await this.getFileContentIfExists();\n    if (!fileContent) {\n      this.conflictPerId = {}; // to indicate that it's loaded\n      return;\n    }\n    const parsedConflict = this.parseConflict(fileContent);\n    this.conflictPerId = parsedConflict;\n  }\n\n  async write() {\n    if (!this.hasConflict()) return;\n    const afterFormat = this.formatConflicts();\n    await fs.writeFile(this.getPath(), afterFormat);\n  }\n\n  async delete() {\n    await fs.remove(this.getPath());\n  }\n\n  private formatConflicts(): string {\n    const conflictPerId = this.conflictPerId;\n    if (!conflictPerId) throw new Error('conflictPerId is not populated');\n    const title = `# Resolve configuration conflicts per component and make sure the Component ID remain in place`;\n    const conflicts = Object.keys(conflictPerId)\n      .map((id) => {\n        const conflict = conflictPerId[id];\n        return `${idDivider}\n${idPrefix} ${id}\n${idDivider}\n${conflict}`;\n      })\n      .join('\\n\\n');\n    return `${title}\\n\\n${conflicts}`;\n  }\n\n  private stringHasConflictMarker(str: string): boolean {\n    return str.includes('<<<<<<<') || str.includes('>>>>>>>');\n  }\n\n  private parseConflict(conflict: string): ConflictPerId {\n    // remove irrelevant lines\n    conflict = conflict\n      .split('\\n')\n      .filter((line) => line !== idDivider && !line.startsWith('#'))\n      .join('\\n');\n    // split by id\n    const conflictPerId: ConflictPerId = {};\n    const split = conflict.split(idPrefix);\n    split.forEach((conflictItem) => {\n      const conflictItemSplit = conflictItem.split('\\n');\n      const [rawId, ...conflictStr] = conflictItemSplit;\n      const id = rawId.trim();\n      if (!id) return; // first line has it empty\n      conflictPerId[id] = conflictStr.join('\\n');\n    });\n    return conflictPerId;\n  }\n\n  private async getFileContentIfExists(): Promise<string | undefined> {\n    const filePath = this.getPath();\n    let fileContent: string;\n    try {\n      fileContent = await fs.readFile(filePath, 'utf-8');\n    } catch (err: any) {\n      if (err.code === 'ENOENT') {\n        return undefined;\n      }\n      throw err;\n    }\n    return fileContent;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["idPrefix","idDivider","repeat","MergeConflictFile","constructor","workspacePath","addConflict","id","conflict","conflictPerId","removeConflict","getConflict","loadIfNeeded","Error","getConflictAssumeIsLoaded","getConflictParsed","configMergeContent","undefined","JSON","parse","err","stringHasConflictMarker","MergeConfigConflict","getPath","message","hasConflict","Boolean","Object","keys","length","path","join","MergeConfigFilename","fileContent","getFileContentIfExists","parsedConflict","parseConflict","write","afterFormat","formatConflicts","fs","writeFile","delete","remove","title","conflicts","map","str","includes","split","filter","line","startsWith","forEach","conflictItem","conflictItemSplit","rawId","conflictStr","trim","filePath","readFile","code"],"sources":["merge-conflict-file.ts"],"sourcesContent":["import { MergeConfigFilename } from '@teambit/legacy/dist/constants';\nimport path from 'path';\nimport fs from 'fs-extra';\nimport { MergeConfigConflict } from './exceptions/merge-config-conflict';\n\nconst idPrefix = `[*]`;\nconst idDivider = '-'.repeat(80);\ntype ConflictPerId = { [compIdWithoutVersion: string]: string };\n\nexport class MergeConflictFile {\n  conflictPerId: ConflictPerId | undefined;\n  constructor(private workspacePath: string) {}\n\n  addConflict(id: string, conflict: string) {\n    if (!this.conflictPerId) this.conflictPerId = {};\n    this.conflictPerId[id] = conflict;\n  }\n\n  removeConflict(id: string) {\n    delete this.conflictPerId?.[id];\n  }\n\n  async getConflict(id: string): Promise<string | undefined> {\n    await this.loadIfNeeded();\n    if (!this.conflictPerId) throw new Error(`this.conflictPerId must be instantiated after load`);\n    return this.conflictPerId[id];\n  }\n\n  getConflictAssumeIsLoaded(id: string): string | undefined {\n    if (!this.conflictPerId)\n      throw new Error(`MergeConflictFile was not loaded yet, please load it before calling this function`);\n    return this.conflictPerId[id];\n  }\n\n  getConflictParsed(id: string): Record<string, any> | undefined {\n    const configMergeContent = this.getConflictAssumeIsLoaded(id);\n    if (!configMergeContent) return undefined;\n    try {\n      return JSON.parse(configMergeContent);\n    } catch (err: any) {\n      if (this.stringHasConflictMarker(configMergeContent)) {\n        throw new MergeConfigConflict(this.getPath());\n      }\n      throw new Error(`unable to parse the merge-conflict entry for ${id} as the JSON is invalid. err: ${err.message}`);\n    }\n  }\n\n  hasConflict(): boolean {\n    return Boolean(this.conflictPerId && Object.keys(this.conflictPerId).length);\n  }\n\n  getPath() {\n    return path.join(this.workspacePath, MergeConfigFilename);\n  }\n\n  async loadIfNeeded() {\n    if (this.conflictPerId) return; // already loaded\n    const fileContent = await this.getFileContentIfExists();\n    if (!fileContent) {\n      this.conflictPerId = {}; // to indicate that it's loaded\n      return;\n    }\n    const parsedConflict = this.parseConflict(fileContent);\n    this.conflictPerId = parsedConflict;\n  }\n\n  async write() {\n    if (!this.hasConflict()) return;\n    const afterFormat = this.formatConflicts();\n    await fs.writeFile(this.getPath(), afterFormat);\n  }\n\n  async delete() {\n    await fs.remove(this.getPath());\n  }\n\n  private formatConflicts(): string {\n    const conflictPerId = this.conflictPerId;\n    if (!conflictPerId) throw new Error('conflictPerId is not populated');\n    const title = `# Resolve configuration conflicts per component and make sure the Component ID remain in place`;\n    const conflicts = Object.keys(conflictPerId)\n      .map((id) => {\n        const conflict = conflictPerId[id];\n        return `${idDivider}\n${idPrefix} ${id}\n${idDivider}\n${conflict}`;\n      })\n      .join('\\n\\n');\n    return `${title}\\n\\n${conflicts}`;\n  }\n\n  private stringHasConflictMarker(str: string): boolean {\n    return str.includes('<<<<<<<') || str.includes('>>>>>>>');\n  }\n\n  private parseConflict(conflict: string): ConflictPerId {\n    // remove irrelevant lines\n    conflict = conflict\n      .split('\\n')\n      .filter((line) => line !== idDivider && !line.startsWith('#'))\n      .join('\\n');\n    // split by id\n    const conflictPerId: ConflictPerId = {};\n    const split = conflict.split(idPrefix);\n    split.forEach((conflictItem) => {\n      const conflictItemSplit = conflictItem.split('\\n');\n      const [rawId, ...conflictStr] = conflictItemSplit;\n      const id = rawId.trim();\n      if (!id) return; // first line has it empty\n      conflictPerId[id] = conflictStr.join('\\n');\n    });\n    return conflictPerId;\n  }\n\n  private async getFileContentIfExists(): Promise<string | undefined> {\n    const filePath = this.getPath();\n    let fileContent: string;\n    try {\n      fileContent = await fs.readFile(filePath, 'utf-8');\n    } catch (err: any) {\n      if (err.code === 'ENOENT') {\n        return undefined;\n      }\n      throw err;\n    }\n    return fileContent;\n  }\n}\n"],"mappings":"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"}

package/dist/{preview-1679542267429.js → preview-1679607263760.js}

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

package/dist/workspace.d.ts

@@ -334,6 +334,11 @@ export declare class Workspace implements ComponentFactory {
     getConfigMergeFilePath(): string;
     getConflictMergeFile(): MergeConflictFile;
     getDepsDataOfMergeConfig(id: BitId): Record<string, any> | undefined;
+    getWorkspaceJsonConflictFromMergeConfig(): {
+        data?: Record<string, any>;
+        conflict: boolean;
+    };
+    getWorkspaceIssues(): Error[];
     listComponentsDuringMerge(): Promise<ComponentID[]>;
     getUnmergedComponent(componentId: ComponentID): Promise<Component | undefined>;
     isModified(component: Component): Promise<boolean>;

package/dist/workspace.js

@@ -290,6 +290,13 @@ function _workspaceAspectsLoader() {
   };
   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';
@@ -1112,6 +1119,36 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
   getDepsDataOfMergeConfig(id) {
     return this.aspectsMerger.getDepsDataOfMergeConfig(id);
   }
+  getWorkspaceJsonConflictFromMergeConfig() {
+    const configMergeFile = this.getConflictMergeFile();
+    let data;
+    let conflict = false;
+    try {
+      data = configMergeFile.getConflictParsed('WORKSPACE');
+    } catch (err) {
+      if (!(err instanceof _mergeConfigConflict().MergeConfigConflict)) {
+        throw err;
+      }
+      conflict = true;
+      this.logger.error(`unable to parse the config file for the workspace due to conflicts`);
+    }
+    return {
+      data,
+      conflict
+    };
+  }
+  getWorkspaceIssues() {
+    const errors = [];
+    const configMergeFile = this.getConflictMergeFile();
+    try {
+      configMergeFile.getConflictParsed('WORKSPACE');
+    } catch (err) {
+      if (err instanceof _mergeConfigConflict().MergeConfigConflict) {
+        errors.push(err);
+      }
+    }
+    return errors;
+  }
   async listComponentsDuringMerge() {
     const unmergedComps = this.scope.legacyScope.objects.unmergedComponents.getComponents();
     const bitIds = unmergedComps.map(u => new (_legacyBitId().BitId)(u.id));