perf, reduce the usage of componentDefaultScopeFromComponentDirAndNameWithoutConfigFile (#9604)

Author: davidfirst

e2e/harmony/update-cmd.e2e.ts

@@ -26,7 +26,6 @@ describe('update command', function () {
         });
         helper.command.ejectConf('comp2');
         componentJson = helper.componentJson.read('comp2');
-        delete componentJson.componentId.scope;
         componentJson.extensions = {
           'teambit.dependencies/dependency-resolver': {
             policy: {

scopes/workspace/workspace/component-config-file/component-config-file.ts

@@ -47,7 +47,6 @@ export class ComponentConfigFile {
   static async load(
     componentDir: PathOsBasedAbsolute,
     aspectListFactory: (extensionDataList: ExtensionDataList) => Promise<AspectList>,
-    outsideDefaultScope?: string
   ): Promise<ComponentConfigFile | undefined> {
     const filePath = ComponentConfigFile.composePath(componentDir);
     const isExist = await fs.pathExists(filePath);
@@ -58,7 +57,10 @@ export class ComponentConfigFile {
     const parsed: ComponentConfigFileJson = parseComponentJsonContent(content, componentDir);
     const indent = detectIndent(content).indent;
     const newLine = detectNewline(content);
-    const componentId = ComponentID.fromObject(parsed.componentId, parsed.defaultScope || outsideDefaultScope);
+    if (!parsed.componentId.scope) {
+      throw new Error(`component.json file at ${componentDir} is invalid, it must contain 'scope' property in the componentId`);
+    }
+    const componentId = ComponentID.fromObject(parsed.componentId);
     const aspects = await aspectListFactory(ExtensionDataList.fromConfigObject(parsed.extensions));
 
     return new ComponentConfigFile(

scopes/workspace/workspace/workspace.main.runtime.ts

@@ -241,7 +241,7 @@ export class WorkspaceMain {
       // This component from scope here are only used for merging the extensions with the workspace components
       const componentFromScope = await workspace.scope.get(componentId);
       const { extensions } = await workspace.componentExtensions(componentId, componentFromScope, undefined, loadOpts);
-      const defaultScope = await workspace.componentDefaultScope(componentId);
+      const defaultScope = componentId.scope;
 
       const extensionsWithLegacyIdsP = extensions.map(async (extension) => {
         if (extension.extensionId) {

scopes/workspace/workspace/workspace.ts

@@ -1285,6 +1285,9 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     return path.join(this.path, relativeComponentDir);
   }
 
+  /**
+   * @deprecated long long ago we added it to the componentId object. use `componentId.scope` instead.
+   */
   async componentDefaultScope(componentId: ComponentID): Promise<string | undefined> {
     const relativeComponentDir = this.componentDir(componentId, { ignoreVersion: true }, { relative: true });
     return this.componentDefaultScopeFromComponentDirAndName(relativeComponentDir, componentId.fullName);
@@ -1294,10 +1297,6 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     relativeComponentDir: PathOsBasedRelative,
     name: string
   ): Promise<string | undefined> {
-    const componentConfigFile = await this.componentConfigFileFromComponentDirAndName(relativeComponentDir, name);
-    if (componentConfigFile && componentConfigFile.defaultScope) {
-      return componentConfigFile.defaultScope;
-    }
     const bitMapId = this.consumer.bitMap.getExistingBitId(name, false);
     const bitMapEntry = bitMapId ? this.consumer.bitMap.getComponent(bitMapId) : undefined;
     if (bitMapEntry && bitMapEntry.defaultScope) {
@@ -1590,7 +1589,7 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
    */
   public async componentConfigFile(id: ComponentID): Promise<ComponentConfigFile | undefined> {
     const relativeComponentDir = this.componentDir(id, { ignoreVersion: true }, { relative: true });
-    return this.componentConfigFileFromComponentDirAndName(relativeComponentDir, id.fullName);
+    return this.componentConfigFileFromComponentDirAndName(relativeComponentDir);
   }
 
   /**
@@ -1608,17 +1607,13 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
 
   private async componentConfigFileFromComponentDirAndName(
     relativeComponentDir: PathOsBasedRelative,
-    name: string
   ): Promise<ComponentConfigFile | undefined> {
     let componentConfigFile;
     if (relativeComponentDir) {
       const absComponentDir = this.componentDirToAbsolute(relativeComponentDir);
-      const defaultScopeFromVariantsOrWs =
-        await this.componentDefaultScopeFromComponentDirAndNameWithoutConfigFile(relativeComponentDir, name);
       componentConfigFile = await ComponentConfigFile.load(
         absComponentDir,
         this.createAspectList.bind(this),
-        defaultScopeFromVariantsOrWs
       );
     }