@teambit/workspace 0.0.807 → 0.0.810

package/component-config-file/component-config-file.ts

@@ -8,7 +8,7 @@ import fs from 'fs-extra';
 import path from 'path';
 import stringifyPackage from 'stringify-package';
 import { REMOVE_EXTENSION_SPECIAL_SIGN } from '@teambit/legacy/dist/consumer/config';
-
+import { merge } from 'lodash';
 import { AlreadyExistsError } from './exceptions';
 
 interface ComponentConfigFileOptions {
@@ -82,10 +82,24 @@ export class ComponentConfigFile {
     return fs.writeJsonSync(filePath, json, { spaces: this.options.indent, EOL: this.options.newLine });
   }
 
-  async addAspect(aspectId: string, config: any, resolveComponentId: ResolveComponentIdFunc) {
+  async addAspect(
+    aspectId: string,
+    config: any,
+    resolveComponentId: ResolveComponentIdFunc,
+    shouldMergeConfig = false
+  ) {
     const existing = this.aspects.get(aspectId);
+
     if (existing) {
-      existing.config = config;
+      const getNewConfig = () => {
+        if (!shouldMergeConfig) return config;
+        if (!config || config === '-') return config;
+        if (!existing.config) return config;
+        // @ts-ignore
+        if (existing.config === '-') return config;
+        return merge(existing.config, config);
+      };
+      existing.config = getNewConfig();
     } else {
       const aspectEntry = await this.aspectEntryFromConfigObject(aspectId, config, resolveComponentId);
       this.aspects.entries.push(aspectEntry);

package/dist/bit-map.d.ts

@@ -17,7 +17,7 @@ export declare class BitMap {
      * later, upon `bit tag`, the data is saved in the scope.
      * returns a boolean indicating whether a change has been made.
      */
-    addComponentConfig(id: ComponentID, aspectId: string, config?: Record<string, any>): boolean;
+    addComponentConfig(id: ComponentID, aspectId: string, config?: Record<string, any>, shouldMergeConfig?: boolean): boolean;
     removeComponentConfig(id: ComponentID, aspectId: string, markWithMinusIfNotExist: boolean): boolean;
     removeEntireConfig(id: ComponentID): boolean;
     setEntireConfig(id: ComponentID, config: Record<string, any>): void;

package/dist/bit-map.js

@@ -53,7 +53,7 @@ class BitMap {
    */
 
 
-  addComponentConfig(id, aspectId, config = {}) {
+  addComponentConfig(id, aspectId, config = {}, shouldMergeConfig = false) {
     if (!aspectId || typeof aspectId !== 'string') throw new Error(`expect aspectId to be string, got ${aspectId}`);
     const bitMapEntry = this.getBitmapEntry(id, {
       ignoreScopeAndVersion: true
@@ -64,10 +64,22 @@ class BitMap {
       return false; // no changes
     }
 
-    if (!config) {
-      delete bitMapEntry.config[aspectId];
+    const getNewConfig = () => {
+      if (!config) return null;
+      if (!shouldMergeConfig) return config; // should merge
+
+      if (!currentConfig) return config;
+      if (currentConfig === '-') return config; // lodash merge performs a deep merge. (the native concatenation don't)
+
+      return (0, _lodash().merge)(currentConfig, config);
+    };
+
+    const newConfig = getNewConfig();
+
+    if (newConfig) {
+      bitMapEntry.config[aspectId] = newConfig;
     } else {
-      bitMapEntry.config[aspectId] = config;
+      delete bitMapEntry.config[aspectId];
     }
 
     this.legacyBitMap.markAsChanged();

package/dist/bit-map.js.map

@@ -1 +1 @@
-{"version":3,"names":["BitMap","constructor","legacyBitMap","consumer","addComponentConfig","id","aspectId","config","Error","bitMapEntry","getBitmapEntry","ignoreScopeAndVersion","currentConfig","isEqual","markAsChanged","removeComponentConfig","markWithMinusIfNotExist","REMOVE_EXTENSION_SPECIAL_SIGN","removeEntireConfig","setEntireConfig","removeDefaultScope","defaultScope","setDefaultScope","write","writeBitMap","ignoreVersion","getComponent","_legacy","getAspectIdFromConfig","componentId","ignoreAspectVersion","undefined","toString","allVersions","Object","keys","filter","startsWith","toStringWithoutVersion","length","BitError","join","renameNewComponent","sourceId","targetId","hasVersion","removeComponent","setComponent","getExportedLaneId","isLaneExported","laneId","hasChanged"],"sources":["bit-map.ts"],"sourcesContent":["import { isEqual } from 'lodash';\nimport { ComponentID } from '@teambit/component-id';\nimport LegacyBitMap from '@teambit/legacy/dist/consumer/bit-map';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { GetBitMapComponentOptions } from '@teambit/legacy/dist/consumer/bit-map/bit-map';\nimport ComponentMap from '@teambit/legacy/dist/consumer/bit-map/component-map';\nimport { REMOVE_EXTENSION_SPECIAL_SIGN } from '@teambit/legacy/dist/consumer/config';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\n/**\n * consider extracting to a new component.\n * (pro: making Workspace aspect smaller. con: it's an implementation details of the workspace)\n */\nexport class BitMap {\n  constructor(private legacyBitMap: LegacyBitMap, private consumer: Consumer) {}\n\n  /**\n   * adds component config to the .bitmap file.\n   * later, upon `bit tag`, the data is saved in the scope.\n   * returns a boolean indicating whether a change has been made.\n   */\n  addComponentConfig(id: ComponentID, aspectId: string, config: Record<string, any> = {}): boolean {\n    if (!aspectId || typeof aspectId !== 'string') throw new Error(`expect aspectId to be string, got ${aspectId}`);\n    const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n    const currentConfig = (bitMapEntry.config ||= {})[aspectId];\n    if (isEqual(currentConfig, config)) {\n      return false; // no changes\n    }\n    if (!config) {\n      delete bitMapEntry.config[aspectId];\n    } else {\n      bitMapEntry.config[aspectId] = config;\n    }\n    this.legacyBitMap.markAsChanged();\n\n    return true; // changes have been made\n  }\n\n  removeComponentConfig(id: ComponentID, aspectId: string, markWithMinusIfNotExist: boolean): boolean {\n    if (!aspectId || typeof aspectId !== 'string') throw new Error(`expect aspectId to be string, got ${aspectId}`);\n    const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n    const currentConfig = (bitMapEntry.config ||= {})[aspectId];\n    if (currentConfig) {\n      delete bitMapEntry.config[aspectId];\n    } else {\n      if (!markWithMinusIfNotExist) {\n        return false; // no changes\n      }\n      bitMapEntry.config[aspectId] = REMOVE_EXTENSION_SPECIAL_SIGN;\n    }\n\n    this.legacyBitMap.markAsChanged();\n\n    return true; // changes have been made\n  }\n\n  removeEntireConfig(id: ComponentID): boolean {\n    const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n    if (!bitMapEntry.config) return false;\n    delete bitMapEntry.config;\n    this.legacyBitMap.markAsChanged();\n    return true;\n  }\n\n  setEntireConfig(id: ComponentID, config: Record<string, any>) {\n    const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n    bitMapEntry.config = config;\n    this.legacyBitMap.markAsChanged();\n  }\n\n  removeDefaultScope(id: ComponentID) {\n    const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n    if (bitMapEntry.defaultScope) {\n      delete bitMapEntry.defaultScope;\n      this.legacyBitMap.markAsChanged();\n    }\n  }\n\n  setDefaultScope(id: ComponentID, defaultScope: string) {\n    const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n    bitMapEntry.defaultScope = defaultScope;\n    this.legacyBitMap.markAsChanged();\n  }\n\n  /**\n   * write .bitmap object to the filesystem\n   */\n  async write() {\n    await this.consumer.writeBitMap();\n  }\n\n  /**\n   * get the data saved in the .bitmap file for this component-id.\n   */\n  getBitmapEntry(\n    id: ComponentID,\n    { ignoreVersion, ignoreScopeAndVersion }: GetBitMapComponentOptions = {}\n  ): ComponentMap {\n    return this.legacyBitMap.getComponent(id._legacy, { ignoreVersion, ignoreScopeAndVersion });\n  }\n\n  getAspectIdFromConfig(\n    componentId: ComponentID,\n    aspectId: ComponentID,\n    ignoreAspectVersion = false\n  ): string | undefined {\n    const bitMapEntry = this.getBitmapEntry(componentId);\n    const config = bitMapEntry.config;\n    if (!config) {\n      return undefined;\n    }\n    if (config[aspectId.toString()]) {\n      return aspectId.toString();\n    }\n    if (!ignoreAspectVersion) {\n      return undefined;\n    }\n    const allVersions = Object.keys(config).filter((id) => id.startsWith(`${aspectId.toStringWithoutVersion()}@`));\n    if (allVersions.length > 1) {\n      throw new BitError(\n        `error: the same aspect ${\n          aspectId.toStringWithoutVersion\n        } configured multiple times for \"${componentId.toString()}\"\\n${allVersions.join('\\n')}`\n      );\n    }\n    return allVersions.length === 1 ? allVersions[0] : undefined;\n  }\n\n  /**\n   * components that were not tagged yet are safe to rename them from the .bitmap file.\n   */\n  renameNewComponent(sourceId: ComponentID, targetId: ComponentID) {\n    const bitMapEntry = this.getBitmapEntry(sourceId);\n    if (bitMapEntry.id.hasVersion()) {\n      throw new Error(`unable to rename tagged or exported component: ${bitMapEntry.id.toString()}`);\n    }\n    this.legacyBitMap.removeComponent(bitMapEntry.id);\n    bitMapEntry.id = targetId._legacy;\n    this.legacyBitMap.setComponent(bitMapEntry.id, bitMapEntry);\n  }\n\n  /**\n   * this is the lane-id of the recently exported lane. in case of a new lane, which was not exported yet, this will be\n   * empty.\n   */\n  getExportedLaneId(): LaneId | undefined {\n    return this.legacyBitMap.isLaneExported ? this.legacyBitMap.laneId : undefined;\n  }\n\n  /**\n   * whether .bitmap file has changed in-memory\n   */\n  hasChanged(): boolean {\n    return this.legacyBitMap.hasChanged;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["BitMap","constructor","legacyBitMap","consumer","addComponentConfig","id","aspectId","config","shouldMergeConfig","Error","bitMapEntry","getBitmapEntry","ignoreScopeAndVersion","currentConfig","isEqual","getNewConfig","merge","newConfig","markAsChanged","removeComponentConfig","markWithMinusIfNotExist","REMOVE_EXTENSION_SPECIAL_SIGN","removeEntireConfig","setEntireConfig","removeDefaultScope","defaultScope","setDefaultScope","write","writeBitMap","ignoreVersion","getComponent","_legacy","getAspectIdFromConfig","componentId","ignoreAspectVersion","undefined","toString","allVersions","Object","keys","filter","startsWith","toStringWithoutVersion","length","BitError","join","renameNewComponent","sourceId","targetId","hasVersion","removeComponent","setComponent","getExportedLaneId","isLaneExported","laneId","hasChanged"],"sources":["bit-map.ts"],"sourcesContent":["import { isEqual, merge } from 'lodash';\nimport { ComponentID } from '@teambit/component-id';\nimport LegacyBitMap from '@teambit/legacy/dist/consumer/bit-map';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { GetBitMapComponentOptions } from '@teambit/legacy/dist/consumer/bit-map/bit-map';\nimport ComponentMap from '@teambit/legacy/dist/consumer/bit-map/component-map';\nimport { REMOVE_EXTENSION_SPECIAL_SIGN } from '@teambit/legacy/dist/consumer/config';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\n/**\n * consider extracting to a new component.\n * (pro: making Workspace aspect smaller. con: it's an implementation details of the workspace)\n */\nexport class BitMap {\n  constructor(private legacyBitMap: LegacyBitMap, private consumer: Consumer) {}\n\n  /**\n   * adds component config to the .bitmap file.\n   * later, upon `bit tag`, the data is saved in the scope.\n   * returns a boolean indicating whether a change has been made.\n   */\n  addComponentConfig(\n    id: ComponentID,\n    aspectId: string,\n    config: Record<string, any> = {},\n    shouldMergeConfig = false\n  ): boolean {\n    if (!aspectId || typeof aspectId !== 'string') throw new Error(`expect aspectId to be string, got ${aspectId}`);\n    const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n    const currentConfig = (bitMapEntry.config ||= {})[aspectId];\n    if (isEqual(currentConfig, config)) {\n      return false; // no changes\n    }\n    const getNewConfig = () => {\n      if (!config) return null;\n      if (!shouldMergeConfig) return config;\n      // should merge\n      if (!currentConfig) return config;\n      if (currentConfig === '-') return config;\n      // lodash merge performs a deep merge. (the native concatenation don't)\n      return merge(currentConfig, config);\n    };\n    const newConfig = getNewConfig();\n    if (newConfig) {\n      bitMapEntry.config[aspectId] = newConfig;\n    } else {\n      delete bitMapEntry.config[aspectId];\n    }\n    this.legacyBitMap.markAsChanged();\n\n    return true; // changes have been made\n  }\n\n  removeComponentConfig(id: ComponentID, aspectId: string, markWithMinusIfNotExist: boolean): boolean {\n    if (!aspectId || typeof aspectId !== 'string') throw new Error(`expect aspectId to be string, got ${aspectId}`);\n    const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n    const currentConfig = (bitMapEntry.config ||= {})[aspectId];\n    if (currentConfig) {\n      delete bitMapEntry.config[aspectId];\n    } else {\n      if (!markWithMinusIfNotExist) {\n        return false; // no changes\n      }\n      bitMapEntry.config[aspectId] = REMOVE_EXTENSION_SPECIAL_SIGN;\n    }\n\n    this.legacyBitMap.markAsChanged();\n\n    return true; // changes have been made\n  }\n\n  removeEntireConfig(id: ComponentID): boolean {\n    const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n    if (!bitMapEntry.config) return false;\n    delete bitMapEntry.config;\n    this.legacyBitMap.markAsChanged();\n    return true;\n  }\n\n  setEntireConfig(id: ComponentID, config: Record<string, any>) {\n    const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n    bitMapEntry.config = config;\n    this.legacyBitMap.markAsChanged();\n  }\n\n  removeDefaultScope(id: ComponentID) {\n    const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n    if (bitMapEntry.defaultScope) {\n      delete bitMapEntry.defaultScope;\n      this.legacyBitMap.markAsChanged();\n    }\n  }\n\n  setDefaultScope(id: ComponentID, defaultScope: string) {\n    const bitMapEntry = this.getBitmapEntry(id, { ignoreScopeAndVersion: true });\n    bitMapEntry.defaultScope = defaultScope;\n    this.legacyBitMap.markAsChanged();\n  }\n\n  /**\n   * write .bitmap object to the filesystem\n   */\n  async write() {\n    await this.consumer.writeBitMap();\n  }\n\n  /**\n   * get the data saved in the .bitmap file for this component-id.\n   */\n  getBitmapEntry(\n    id: ComponentID,\n    { ignoreVersion, ignoreScopeAndVersion }: GetBitMapComponentOptions = {}\n  ): ComponentMap {\n    return this.legacyBitMap.getComponent(id._legacy, { ignoreVersion, ignoreScopeAndVersion });\n  }\n\n  getAspectIdFromConfig(\n    componentId: ComponentID,\n    aspectId: ComponentID,\n    ignoreAspectVersion = false\n  ): string | undefined {\n    const bitMapEntry = this.getBitmapEntry(componentId);\n    const config = bitMapEntry.config;\n    if (!config) {\n      return undefined;\n    }\n    if (config[aspectId.toString()]) {\n      return aspectId.toString();\n    }\n    if (!ignoreAspectVersion) {\n      return undefined;\n    }\n    const allVersions = Object.keys(config).filter((id) => id.startsWith(`${aspectId.toStringWithoutVersion()}@`));\n    if (allVersions.length > 1) {\n      throw new BitError(\n        `error: the same aspect ${\n          aspectId.toStringWithoutVersion\n        } configured multiple times for \"${componentId.toString()}\"\\n${allVersions.join('\\n')}`\n      );\n    }\n    return allVersions.length === 1 ? allVersions[0] : undefined;\n  }\n\n  /**\n   * components that were not tagged yet are safe to rename them from the .bitmap file.\n   */\n  renameNewComponent(sourceId: ComponentID, targetId: ComponentID) {\n    const bitMapEntry = this.getBitmapEntry(sourceId);\n    if (bitMapEntry.id.hasVersion()) {\n      throw new Error(`unable to rename tagged or exported component: ${bitMapEntry.id.toString()}`);\n    }\n    this.legacyBitMap.removeComponent(bitMapEntry.id);\n    bitMapEntry.id = targetId._legacy;\n    this.legacyBitMap.setComponent(bitMapEntry.id, bitMapEntry);\n  }\n\n  /**\n   * this is the lane-id of the recently exported lane. in case of a new lane, which was not exported yet, this will be\n   * empty.\n   */\n  getExportedLaneId(): LaneId | undefined {\n    return this.legacyBitMap.isLaneExported ? this.legacyBitMap.laneId : undefined;\n  }\n\n  /**\n   * whether .bitmap file has changed in-memory\n   */\n  hasChanged(): boolean {\n    return this.legacyBitMap.hasChanged;\n  }\n}\n"],"mappings":"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"}

package/dist/component-config-file/component-config-file.d.ts

@@ -25,7 +25,7 @@ export declare class ComponentConfigFile {
     static load(componentDir: PathOsBasedAbsolute, aspectListFactory: (extensionDataList: ExtensionDataList) => Promise<AspectList>, outsideDefaultScope?: string): Promise<ComponentConfigFile | undefined>;
     static composePath(componentRootFolder: string): string;
     write(options?: WriteConfigFileOptions): Promise<void>;
-    addAspect(aspectId: string, config: any, resolveComponentId: ResolveComponentIdFunc): Promise<void>;
+    addAspect(aspectId: string, config: any, resolveComponentId: ResolveComponentIdFunc, shouldMergeConfig?: boolean): Promise<void>;
     removeAspect(aspectId: string, markWithMinusIfNotExist: boolean, resolveComponentId: ResolveComponentIdFunc): Promise<void>;
     private aspectEntryFromConfigObject;
     toJson(): ComponentConfigFileJson;

package/dist/component-config-file/component-config-file.js

@@ -101,6 +101,16 @@ function _config() {
   return data;
 }
 
+function _lodash() {
+  const data = require("lodash");
+
+  _lodash = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _exceptions() {
   const data = require("./exceptions");
 
@@ -168,11 +178,20 @@ class ComponentConfigFile {
     });
   }
 
-  async addAspect(aspectId, config, resolveComponentId) {
+  async addAspect(aspectId, config, resolveComponentId, shouldMergeConfig = false) {
     const existing = this.aspects.get(aspectId);
 
     if (existing) {
-      existing.config = config;
+      const getNewConfig = () => {
+        if (!shouldMergeConfig) return config;
+        if (!config || config === '-') return config;
+        if (!existing.config) return config; // @ts-ignore
+
+        if (existing.config === '-') return config;
+        return (0, _lodash().merge)(existing.config, config);
+      };
+
+      existing.config = getNewConfig();
     } else {
       const aspectEntry = await this.aspectEntryFromConfigObject(aspectId, config, resolveComponentId);
       this.aspects.entries.push(aspectEntry);

package/dist/component-config-file/component-config-file.js.map

@@ -1 +1 @@
-{"version":3,"names":["DEFAULT_INDENT","DEFAULT_NEWLINE","ComponentConfigFile","constructor","componentId","aspects","componentDir","propagate","options","indent","newLine","defaultScope","load","aspectListFactory","outsideDefaultScope","filePath","composePath","isExist","fs","pathExists","undefined","content","readFile","parsed","parseComponentJsonContent","detectIndent","amount","detectNewline","ComponentID","fromObject","ExtensionDataList","fromConfigObject","extensions","Boolean","componentRootFolder","path","join","COMPONENT_CONFIG_FILE_NAME","write","json","toJson","override","AlreadyExistsError","writeJsonSync","spaces","EOL","addAspect","aspectId","config","resolveComponentId","existing","get","aspectEntry","aspectEntryFromConfigObject","entries","push","removeAspect","markWithMinusIfNotExist","aspectList","withoutEntries","REMOVE_EXTENSION_SPECIAL_SIGN","id","legacyEntry","configEntryToDataEntry","AspectEntry","toObject","toConfigObject","toString","stringifyPackage","str","dir","JSON","parse","err","Error","message"],"sources":["component-config-file.ts"],"sourcesContent":["import { ComponentID, AspectList, AspectEntry, ResolveComponentIdFunc } from '@teambit/component';\nimport { COMPONENT_CONFIG_FILE_NAME } from '@teambit/legacy/dist/constants';\nimport { ExtensionDataList, configEntryToDataEntry } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { PathOsBasedAbsolute } from '@teambit/legacy/dist/utils/path';\nimport detectIndent from 'detect-indent';\nimport detectNewline from 'detect-newline';\nimport fs from 'fs-extra';\nimport path from 'path';\nimport stringifyPackage from 'stringify-package';\nimport { REMOVE_EXTENSION_SPECIAL_SIGN } from '@teambit/legacy/dist/consumer/config';\n\nimport { AlreadyExistsError } from './exceptions';\n\ninterface ComponentConfigFileOptions {\n  indent: number;\n  newLine: '\\r\\n' | '\\n' | undefined;\n}\n\ninterface WriteConfigFileOptions {\n  override?: boolean;\n}\n\ninterface ComponentConfigFileJson {\n  componentId: any;\n  // TODO: think if we want to change it to aspects\n  extensions: any;\n  propagate: boolean;\n  defaultScope?: string;\n}\n\nconst DEFAULT_INDENT = 2;\nconst DEFAULT_NEWLINE = '\\n';\n\nexport class ComponentConfigFile {\n  constructor(\n    public componentId: ComponentID,\n    public aspects: AspectList,\n    private componentDir: PathOsBasedAbsolute,\n    public propagate: boolean = false,\n    private options: ComponentConfigFileOptions = { indent: DEFAULT_INDENT, newLine: DEFAULT_NEWLINE },\n    public defaultScope?: string\n  ) {}\n\n  static async load(\n    componentDir: PathOsBasedAbsolute,\n    aspectListFactory: (extensionDataList: ExtensionDataList) => Promise<AspectList>,\n    outsideDefaultScope?: string\n  ): Promise<ComponentConfigFile | undefined> {\n    const filePath = ComponentConfigFile.composePath(componentDir);\n    const isExist = await fs.pathExists(filePath);\n    if (!isExist) {\n      return undefined;\n    }\n    const content = await fs.readFile(filePath, 'utf-8');\n    const parsed: ComponentConfigFileJson = parseComponentJsonContent(content, componentDir);\n    const indent = detectIndent(content).amount;\n    const newLine = detectNewline(content);\n    const componentId = ComponentID.fromObject(parsed.componentId, parsed.defaultScope || outsideDefaultScope);\n    const aspects = await aspectListFactory(ExtensionDataList.fromConfigObject(parsed.extensions));\n\n    return new ComponentConfigFile(\n      componentId,\n      aspects,\n      componentDir,\n      Boolean(parsed.propagate),\n      { indent, newLine },\n      parsed.defaultScope\n    );\n  }\n\n  static composePath(componentRootFolder: string) {\n    return path.join(componentRootFolder, COMPONENT_CONFIG_FILE_NAME);\n  }\n\n  async write(options: WriteConfigFileOptions = {}): Promise<void> {\n    const json = this.toJson();\n    const filePath = ComponentConfigFile.composePath(this.componentDir);\n    const isExist = await fs.pathExists(filePath);\n    if (isExist && !options.override) {\n      throw new AlreadyExistsError(filePath);\n    }\n    return fs.writeJsonSync(filePath, json, { spaces: this.options.indent, EOL: this.options.newLine });\n  }\n\n  async addAspect(aspectId: string, config: any, resolveComponentId: ResolveComponentIdFunc) {\n    const existing = this.aspects.get(aspectId);\n    if (existing) {\n      existing.config = config;\n    } else {\n      const aspectEntry = await this.aspectEntryFromConfigObject(aspectId, config, resolveComponentId);\n      this.aspects.entries.push(aspectEntry);\n    }\n  }\n\n  async removeAspect(aspectId: string, markWithMinusIfNotExist: boolean, resolveComponentId: ResolveComponentIdFunc) {\n    const existing = this.aspects.get(aspectId);\n    if (existing) {\n      const aspectList = this.aspects.withoutEntries([aspectId]);\n      this.aspects = aspectList;\n    } else if (markWithMinusIfNotExist) {\n      await this.addAspect(aspectId, REMOVE_EXTENSION_SPECIAL_SIGN, resolveComponentId);\n    }\n  }\n\n  private async aspectEntryFromConfigObject(id: string, config: any, resolveComponentId: ResolveComponentIdFunc) {\n    const aspectId = await resolveComponentId(id);\n    const legacyEntry = configEntryToDataEntry(id, config);\n    return new AspectEntry(aspectId, legacyEntry);\n  }\n\n  toJson(): ComponentConfigFileJson {\n    return {\n      componentId: this.componentId.toObject(),\n      propagate: this.propagate,\n      defaultScope: this.defaultScope,\n      extensions: this.aspects.toConfigObject(),\n    };\n  }\n\n  toString(): string {\n    const json = this.toJson();\n    return stringifyPackage(json, this.options.indent, this.options.newLine);\n  }\n}\n\nfunction parseComponentJsonContent(str: string, dir: string) {\n  try {\n    return JSON.parse(str);\n  } catch (err: any) {\n    throw new Error(`failed parsing component.json file at ${dir}. original error: ${err.message}`);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["DEFAULT_INDENT","DEFAULT_NEWLINE","ComponentConfigFile","constructor","componentId","aspects","componentDir","propagate","options","indent","newLine","defaultScope","load","aspectListFactory","outsideDefaultScope","filePath","composePath","isExist","fs","pathExists","undefined","content","readFile","parsed","parseComponentJsonContent","detectIndent","amount","detectNewline","ComponentID","fromObject","ExtensionDataList","fromConfigObject","extensions","Boolean","componentRootFolder","path","join","COMPONENT_CONFIG_FILE_NAME","write","json","toJson","override","AlreadyExistsError","writeJsonSync","spaces","EOL","addAspect","aspectId","config","resolveComponentId","shouldMergeConfig","existing","get","getNewConfig","merge","aspectEntry","aspectEntryFromConfigObject","entries","push","removeAspect","markWithMinusIfNotExist","aspectList","withoutEntries","REMOVE_EXTENSION_SPECIAL_SIGN","id","legacyEntry","configEntryToDataEntry","AspectEntry","toObject","toConfigObject","toString","stringifyPackage","str","dir","JSON","parse","err","Error","message"],"sources":["component-config-file.ts"],"sourcesContent":["import { ComponentID, AspectList, AspectEntry, ResolveComponentIdFunc } from '@teambit/component';\nimport { COMPONENT_CONFIG_FILE_NAME } from '@teambit/legacy/dist/constants';\nimport { ExtensionDataList, configEntryToDataEntry } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { PathOsBasedAbsolute } from '@teambit/legacy/dist/utils/path';\nimport detectIndent from 'detect-indent';\nimport detectNewline from 'detect-newline';\nimport fs from 'fs-extra';\nimport path from 'path';\nimport stringifyPackage from 'stringify-package';\nimport { REMOVE_EXTENSION_SPECIAL_SIGN } from '@teambit/legacy/dist/consumer/config';\nimport { merge } from 'lodash';\nimport { AlreadyExistsError } from './exceptions';\n\ninterface ComponentConfigFileOptions {\n  indent: number;\n  newLine: '\\r\\n' | '\\n' | undefined;\n}\n\ninterface WriteConfigFileOptions {\n  override?: boolean;\n}\n\ninterface ComponentConfigFileJson {\n  componentId: any;\n  // TODO: think if we want to change it to aspects\n  extensions: any;\n  propagate: boolean;\n  defaultScope?: string;\n}\n\nconst DEFAULT_INDENT = 2;\nconst DEFAULT_NEWLINE = '\\n';\n\nexport class ComponentConfigFile {\n  constructor(\n    public componentId: ComponentID,\n    public aspects: AspectList,\n    private componentDir: PathOsBasedAbsolute,\n    public propagate: boolean = false,\n    private options: ComponentConfigFileOptions = { indent: DEFAULT_INDENT, newLine: DEFAULT_NEWLINE },\n    public defaultScope?: string\n  ) {}\n\n  static async load(\n    componentDir: PathOsBasedAbsolute,\n    aspectListFactory: (extensionDataList: ExtensionDataList) => Promise<AspectList>,\n    outsideDefaultScope?: string\n  ): Promise<ComponentConfigFile | undefined> {\n    const filePath = ComponentConfigFile.composePath(componentDir);\n    const isExist = await fs.pathExists(filePath);\n    if (!isExist) {\n      return undefined;\n    }\n    const content = await fs.readFile(filePath, 'utf-8');\n    const parsed: ComponentConfigFileJson = parseComponentJsonContent(content, componentDir);\n    const indent = detectIndent(content).amount;\n    const newLine = detectNewline(content);\n    const componentId = ComponentID.fromObject(parsed.componentId, parsed.defaultScope || outsideDefaultScope);\n    const aspects = await aspectListFactory(ExtensionDataList.fromConfigObject(parsed.extensions));\n\n    return new ComponentConfigFile(\n      componentId,\n      aspects,\n      componentDir,\n      Boolean(parsed.propagate),\n      { indent, newLine },\n      parsed.defaultScope\n    );\n  }\n\n  static composePath(componentRootFolder: string) {\n    return path.join(componentRootFolder, COMPONENT_CONFIG_FILE_NAME);\n  }\n\n  async write(options: WriteConfigFileOptions = {}): Promise<void> {\n    const json = this.toJson();\n    const filePath = ComponentConfigFile.composePath(this.componentDir);\n    const isExist = await fs.pathExists(filePath);\n    if (isExist && !options.override) {\n      throw new AlreadyExistsError(filePath);\n    }\n    return fs.writeJsonSync(filePath, json, { spaces: this.options.indent, EOL: this.options.newLine });\n  }\n\n  async addAspect(\n    aspectId: string,\n    config: any,\n    resolveComponentId: ResolveComponentIdFunc,\n    shouldMergeConfig = false\n  ) {\n    const existing = this.aspects.get(aspectId);\n\n    if (existing) {\n      const getNewConfig = () => {\n        if (!shouldMergeConfig) return config;\n        if (!config || config === '-') return config;\n        if (!existing.config) return config;\n        // @ts-ignore\n        if (existing.config === '-') return config;\n        return merge(existing.config, config);\n      };\n      existing.config = getNewConfig();\n    } else {\n      const aspectEntry = await this.aspectEntryFromConfigObject(aspectId, config, resolveComponentId);\n      this.aspects.entries.push(aspectEntry);\n    }\n  }\n\n  async removeAspect(aspectId: string, markWithMinusIfNotExist: boolean, resolveComponentId: ResolveComponentIdFunc) {\n    const existing = this.aspects.get(aspectId);\n    if (existing) {\n      const aspectList = this.aspects.withoutEntries([aspectId]);\n      this.aspects = aspectList;\n    } else if (markWithMinusIfNotExist) {\n      await this.addAspect(aspectId, REMOVE_EXTENSION_SPECIAL_SIGN, resolveComponentId);\n    }\n  }\n\n  private async aspectEntryFromConfigObject(id: string, config: any, resolveComponentId: ResolveComponentIdFunc) {\n    const aspectId = await resolveComponentId(id);\n    const legacyEntry = configEntryToDataEntry(id, config);\n    return new AspectEntry(aspectId, legacyEntry);\n  }\n\n  toJson(): ComponentConfigFileJson {\n    return {\n      componentId: this.componentId.toObject(),\n      propagate: this.propagate,\n      defaultScope: this.defaultScope,\n      extensions: this.aspects.toConfigObject(),\n    };\n  }\n\n  toString(): string {\n    const json = this.toJson();\n    return stringifyPackage(json, this.options.indent, this.options.newLine);\n  }\n}\n\nfunction parseComponentJsonContent(str: string, dir: string) {\n  try {\n    return JSON.parse(str);\n  } catch (err: any) {\n    throw new Error(`failed parsing component.json file at ${dir}. original error: ${err.message}`);\n  }\n}\n"],"mappings":"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"}

package/dist/workspace.d.ts

@@ -390,7 +390,7 @@ export declare class Workspace implements ComponentFactory {
      */
     setDefaultScopeToComponents(componentIds: ComponentID[], scopeName: string): Promise<ComponentID[]>;
     setDefaultScope(scopeName: string): Promise<void>;
-    addSpecificComponentConfig(id: ComponentID, aspectId: string, config?: Record<string, any>): Promise<void>;
+    addSpecificComponentConfig(id: ComponentID, aspectId: string, config?: Record<string, any>, shouldMergeWithExisting?: boolean): Promise<void>;
     removeSpecificComponentConfig(id: ComponentID, aspectId: string, markWithMinusIfNotExist: boolean): Promise<void>;
     getAspectIdFromConfig(componentId: ComponentID, aspectIdStr: string, ignoreAspectVersion?: boolean): Promise<string | undefined>;
     getSpecificComponentConfig(id: ComponentID, aspectId: string): Promise<any>;

package/dist/workspace.js

@@ -1707,16 +1707,16 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     }));
   }
 
-  async addSpecificComponentConfig(id, aspectId, config = {}) {
+  async addSpecificComponentConfig(id, aspectId, config = {}, shouldMergeWithExisting = false) {
     const componentConfigFile = await this.componentConfigFile(id);
 
     if (componentConfigFile) {
-      await componentConfigFile.addAspect(aspectId, config, this.resolveComponentId.bind(this));
+      await componentConfigFile.addAspect(aspectId, config, this.resolveComponentId.bind(this), shouldMergeWithExisting);
       await componentConfigFile.write({
         override: true
       });
     } else {
-      this.bitMap.addComponentConfig(id, aspectId, config);
+      this.bitMap.addComponentConfig(id, aspectId, config, shouldMergeWithExisting);
     }
   }
 
@@ -1935,6 +1935,7 @@ needed-for: ${neededFor || '<unknown>'}`);
   }
 
   async resolveAspects(runtimeName, componentIds, opts) {
+    this.logger.debug(`workspace resolveAspects, runtimeName: ${runtimeName}, componentIds: ${componentIds}`);
     const defaultOpts = {
       excludeCore: false,
       requestedOnly: false
@@ -1954,7 +1955,9 @@ needed-for: ${neededFor || '<unknown>'}`);
     } = await this.groupIdsByWorkspaceAndScope(componentIdsToResolve);
     const wsComponents = await this.getMany(workspaceIds);
     const aspectDefs = await this.aspectLoader.resolveAspects(wsComponents, async component => {
-      stringIds.push(component.id._legacy.toString());
+      const compStringId = component.id._legacy.toString();
+
+      stringIds.push(compStringId);
       const localPath = this.getComponentPackagePath(component);
       const isExist = await _fsExtra().default.pathExists(localPath);
 
@@ -1962,15 +1965,17 @@ needed-for: ${neededFor || '<unknown>'}`);
         missingPaths = true;
       }
 
+      const runtimePath = runtimeName ? await this.aspectLoader.getRuntimePath(component, localPath, runtimeName) : null;
+      this.logger.debug(`workspace resolveAspects, resolving id: ${compStringId}, localPath: ${localPath}, runtimePath: ${runtimePath}`);
       return {
         aspectPath: localPath,
-        runtimePath: runtimeName ? await this.aspectLoader.getRuntimePath(component, localPath, runtimeName) : null
+        runtimePath
       };
     });
     let scopeAspectDefs = [];
 
     if (scopeIds.length) {
-      scopeAspectDefs = await this.scope.resolveAspects(runtimeName, scopeIds);
+      scopeAspectDefs = await this.scope.resolveAspects(runtimeName, scopeIds, mergedOpts);
     }
 
     let coreAspectDefs = await Promise.all(coreAspectsIds.map(async coreId => {