@teambit/workspace 0.0.956 → 0.0.958

package/dist/merge-conflict-file.js

@@ -0,0 +1,150 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.promise.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.string.trim.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MergeConflictFile = void 0;
+function _defineProperty2() {
+  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+  _defineProperty2 = function () {
+    return data;
+  };
+  return data;
+}
+function _constants() {
+  const data = require("@teambit/legacy/dist/constants");
+  _constants = function () {
+    return data;
+  };
+  return data;
+}
+function _path() {
+  const data = _interopRequireDefault(require("path"));
+  _path = function () {
+    return data;
+  };
+  return data;
+}
+function _fsExtra() {
+  const data = _interopRequireDefault(require("fs-extra"));
+  _fsExtra = function () {
+    return data;
+  };
+  return data;
+}
+function _mergeConfigConflict() {
+  const data = require("./exceptions/merge-config-conflict");
+  _mergeConfigConflict = function () {
+    return data;
+  };
+  return data;
+}
+const idPrefix = `[*]`;
+const idDivider = '-'.repeat(80);
+class MergeConflictFile {
+  constructor(workspacePath) {
+    this.workspacePath = workspacePath;
+    (0, _defineProperty2().default)(this, "conflictPerId", void 0);
+  }
+  addConflict(id, conflict) {
+    if (!this.conflictPerId) this.conflictPerId = {};
+    this.conflictPerId[id] = conflict;
+  }
+  removeConflict(id) {
+    var _this$conflictPerId;
+    (_this$conflictPerId = this.conflictPerId) === null || _this$conflictPerId === void 0 ? true : delete _this$conflictPerId[id];
+  }
+  async getConflict(id) {
+    await this.loadIfNeeded();
+    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);
+    if (!configMergeContent) return undefined;
+    try {
+      return JSON.parse(configMergeContent);
+    } catch (err) {
+      if (this.stringHasConflictMarker(configMergeContent)) {
+        throw new (_mergeConfigConflict().MergeConfigConflict)(this.getPath());
+      }
+      throw new Error(`unable to parse the merge-conflict entry for ${id} as the JSON is invalid. err: ${err.message}`);
+    }
+  }
+  hasConflict() {
+    return Boolean(this.conflictPerId && Object.keys(this.conflictPerId).length);
+  }
+  getPath() {
+    return _path().default.join(this.workspacePath, _constants().MergeConfigFilename);
+  }
+  async loadIfNeeded() {
+    if (this.conflictPerId) return; // already loaded
+    const fileContent = await this.getFileContentIfExists();
+    if (!fileContent) {
+      this.conflictPerId = {}; // to indicate that it's loaded
+      return;
+    }
+    const parsedConflict = this.parseConflict(fileContent);
+    this.conflictPerId = parsedConflict;
+  }
+  async write() {
+    if (!this.hasConflict()) return;
+    const afterFormat = this.formatConflicts();
+    await _fsExtra().default.writeFile(this.getPath(), afterFormat);
+  }
+  async delete() {
+    await _fsExtra().default.remove(this.getPath());
+  }
+  formatConflicts() {
+    const conflictPerId = this.conflictPerId;
+    if (!conflictPerId) throw new Error('conflictPerId is not populated');
+    const title = `# Resolve configuration conflicts per component and make sure the Component ID remain in place`;
+    const conflicts = Object.keys(conflictPerId).map(id => {
+      const conflict = conflictPerId[id];
+      return `${idDivider}
+${idPrefix} ${id}
+${idDivider}
+${conflict}`;
+    }).join('\n\n');
+    return `${title}\n\n${conflicts}`;
+  }
+  stringHasConflictMarker(str) {
+    return str.includes('<<<<<<<') || str.includes('>>>>>>>');
+  }
+  parseConflict(conflict) {
+    // remove irrelevant lines
+    conflict = conflict.split('\n').filter(line => line !== idDivider && !line.startsWith('#')).join('\n');
+    // split by id
+    const conflictPerId = {};
+    const split = conflict.split(idPrefix);
+    split.forEach(conflictItem => {
+      const conflictItemSplit = conflictItem.split('\n');
+      const [rawId, ...conflictStr] = conflictItemSplit;
+      const id = rawId.trim();
+      if (!id) return; // first line has it empty
+      conflictPerId[id] = conflictStr.join('\n');
+    });
+    return conflictPerId;
+  }
+  async getFileContentIfExists() {
+    const filePath = this.getPath();
+    let fileContent;
+    try {
+      fileContent = await _fsExtra().default.readFile(filePath, 'utf-8');
+    } catch (err) {
+      if (err.code === 'ENOENT') {
+        return undefined;
+      }
+      throw err;
+    }
+    return fileContent;
+  }
+}
+exports.MergeConflictFile = MergeConflictFile;
+
+//# sourceMappingURL=merge-conflict-file.js.map

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

@@ -0,0 +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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"}

package/dist/{preview-1673407641139.js → preview-1673580548831.js}

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

package/dist/workspace.d.ts

@@ -35,6 +35,7 @@ import { OnComponentAddSlot, OnComponentChangeSlot, OnComponentLoadSlot, OnCompo
 import { WorkspaceComponentLoader } from './workspace-component/workspace-component-loader';
 import { ShouldLoadFunc } from './build-graph-from-fs';
 import { BitMap } from './bit-map';
+import { MergeConflictFile } from './merge-conflict-file';
 export declare type EjectConfResult = {
     configPath: string;
 };
@@ -83,9 +84,9 @@ export declare class Workspace implements ComponentFactory {
      */
     private componentAspect;
     private dependencyResolver;
-    private variants;
+    readonly variants: VariantsMain;
     private aspectLoader;
-    private logger;
+    readonly logger: Logger;
     private componentList;
     /**
      * private reference to the instance of Harmony.
@@ -99,7 +100,7 @@ export declare class Workspace implements ComponentFactory {
      * on component change slot.
      */
     private onComponentChangeSlot;
-    private envs;
+    readonly envs: EnvsMain;
     /**
      * on component add slot.
      */
@@ -115,7 +116,7 @@ export declare class Workspace implements ComponentFactory {
     bitMap: BitMap;
     private _cachedListIds?;
     private componentLoadedSelfAsAspects;
-    private warnedAboutMisconfiguredEnvs;
+    private aspectsMerger;
     constructor(
     /**
      * private pubsub.
@@ -372,14 +373,11 @@ export declare class Workspace implements ComponentFactory {
         }>;
         errors?: Error[];
     }>;
-    getConfigMergeFilePath(componentId: ComponentID): string;
+    getConfigMergeFilePath(): string;
+    getConflictMergeFile(): MergeConflictFile;
     listComponentsDuringMerge(): Promise<ComponentID[]>;
-    private getConfigMergeFile;
     getUnmergedComponent(componentId: ComponentID): Promise<Component | undefined>;
-    private getUnmergedData;
-    private warnAboutMisconfiguredEnv;
     isModified(component: Component): Promise<boolean>;
-    private filterEnvsFromExtensionsIfNeeded;
     triggerOnPreWatch(componentIds: ComponentID[], watchOpts: WatchOptions): Promise<void>;
     /**
      * filter the given component-ids and set default-scope only to the new ones.
@@ -396,12 +394,6 @@ export declare class Workspace implements ComponentFactory {
     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>;
-    /**
-     * This will mutate the entries with extensionId prop to have resolved legacy id
-     * This should be worked on the extension data list not the new aspect list
-     * @param extensionList
-     */
-    private resolveExtensionListIds;
     private isVendorComponentByComponentDir;
     /**
      * return the component config from its folder (component.json)
@@ -427,11 +419,6 @@ export declare class Workspace implements ComponentFactory {
     resolveAspects(runtimeName?: string, componentIds?: ComponentID[], opts?: ResolveAspectsOptions): Promise<AspectDefinition[]>;
     private groupIdsByWorkspaceAndScope;
     private groupComponentsByWorkspaceAndScope;
-    /**
-     * Load all unloaded extensions from a list
-     * @param extensions list of extensions with config to load
-     */
-    loadExtensions(extensions: ExtensionDataList, originatedFrom?: ComponentID, throwOnError?: boolean): Promise<void>;
     /**
      * Provides a cache folder, unique per key.
      * Return value may be undefined, if workspace folder is unconventional (bare-scope, no node_modules, etc)
@@ -498,5 +485,11 @@ export declare class Workspace implements ComponentFactory {
         changed: ComponentID[];
         unchanged: ComponentID[];
     }>;
+    updateEnvForComponents(envIdStr?: string, pattern?: string): Promise<{
+        updated: {
+            [envId: string]: ComponentID[];
+        };
+        alreadyUpToDate: ComponentID[];
+    }>;
 }
 export default Workspace;