@teambit/workspace 0.0.1020 → 0.0.1022

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';
@@ -603,7 +610,7 @@ class Workspace {
     } catch (err) {
       return null;
     }
-    const flattenedEdges = versionObj.flattenedEdges;
+    const flattenedEdges = await versionObj.getFlattenedEdges(this.scope.legacyScope.objects);
     if (!flattenedEdges.length && versionObj.flattenedDependencies.length) {
       // there are flattenedDependencies, so must be edges, if they're empty, it's because the component was tagged
       // with a version < ~0.0.901, so this flattenedEdges wasn't exist.
@@ -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));