@teambit/workspace 1.0.493 → 1.0.495

package/dist/workspace.js

@@ -11,6 +11,13 @@ function _memoizee() {
   };
   return data;
 }
+function _commentJson() {
+  const data = require("comment-json");
+  _commentJson = function () {
+    return data;
+  };
+  return data;
+}
 function _pMapSeries() {
   const data = _interopRequireDefault(require("p-map-series"));
   _pMapSeries = function () {
@@ -912,8 +919,8 @@ it's possible that the version ${component.id.version} belong to ${idStr.split('
     });
     return results;
   }
-  async triggerOnComponentAdd(id, watchOpts) {
-    const component = await this.get(id);
+  async triggerOnComponentAdd(id, watchOpts, loadOptions) {
+    const component = await this.get(id, undefined, undefined, undefined, loadOptions);
     const onAddEntries = this.onComponentAddSlot.toArray(); // e.g. [ [ 'teambit.bit/compiler', [Function: bound onComponentChange] ] ]
     const results = [];
     const files = component.state.filesystem.files.map(file => file.path);
@@ -1704,20 +1711,40 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
       throw new Error(`findComponentIdFromPackageName supports only packages that start with @, got ${packageName}`);
     }
     const errMsgPrefix = `unable to resolve a component-id from the package-name ${packageName}, `;
-    const pkgJsonPath = _path().default.join(this.path, 'node_modules', packageName, 'package.json');
-    let pkgJson;
-    try {
-      pkgJson = await _fsExtra().default.readJson(pkgJsonPath);
-    } catch {
-      // never mind the reason. probably it's not there.
+    const fromPackageJson = await this.resolveComponentIdFromPackageJsonInNM(packageName, errMsgPrefix);
+    if (fromPackageJson) return fromPackageJson;
+    const fromRegistryManifest = await this.resolveComponentIdFromRegistryManifest(packageName, errMsgPrefix);
+    if (fromRegistryManifest) return fromRegistryManifest;
+    const fromWsComponents = await this.resolveComponentIdFromWsComponents(packageName);
+    if (fromWsComponents) return fromWsComponents;
+    throw new (_bitError().BitError)(errMsgPrefix);
+  }
+  async resolveComponentIdFromWsComponents(packageName) {
+    const ids = this.consumer.bitMap.getAllIdsAvailableOnLane();
+    const [, name] = packageName.split('/');
+    const foundByName = ids.filter(id => id.fullName.includes(name));
+    const idsToSearch = foundByName;
+    if (!idsToSearch.length) {
+      return undefined;
     }
-    if (pkgJson) {
-      const compId = pkgJson.componentId;
-      if (!compId) {
-        throw new (_bitError().BitError)(`${errMsgPrefix}the package.json file has no componentId field, it's probably not a component`);
-      }
-      return _componentId().ComponentID.fromObject(compId);
+    // if (!foundByName.length) {
+    //   const foundByScope = ids.filter(id => id.toString().includes(scope.replace('@', '')));
+    //   idsToSearch = foundByScope;
+    // }
+    const comps = await this.getMany(idsToSearch, {
+      loadExtensions: false,
+      storeInCache: false,
+      loadSeedersAsAspects: false
+    });
+    const found = comps.find(comp => {
+      const currPackageName = this.dependencyResolver.getPackageName(comp);
+      return currPackageName === packageName;
+    });
+    if (found) {
+      return found.id;
     }
+  }
+  async resolveComponentIdFromRegistryManifest(packageName, errMsgPrefix) {
     const url = `https://node-registry.bit.cloud/${packageName}`;
     const token = await this.globalConfig.get(_legacy5().CFG_USER_TOKEN_KEY);
     const headers = token ? (0, _scope2().getAuthHeader)(token) : {};
@@ -1725,7 +1752,7 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
       headers
     });
     if (!res.ok) {
-      throw new (_bitError().BitError)(`${errMsgPrefix}got ${res.statusText} from the url: ${url}`);
+      return undefined;
     }
     const data = await res.json();
     const latest = data['dist-tags'].latest;
@@ -1736,6 +1763,22 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     if (!compId) throw new (_bitError().BitError)(`${errMsgPrefix}the package.json of version "${latest}" has no componentId field, it's probably not a component`);
     return _componentId().ComponentID.fromObject(compId).changeVersion(undefined);
   }
+  async resolveComponentIdFromPackageJsonInNM(packageName, errMsgPrefix) {
+    const pkgJsonPath = _path().default.join(this.path, 'node_modules', packageName, 'package.json');
+    let pkgJson;
+    try {
+      pkgJson = await _fsExtra().default.readJson(pkgJsonPath);
+      if (!pkgJson) return undefined;
+      const compId = pkgJson.componentId;
+      if (!compId) {
+        throw new (_bitError().BitError)(`${errMsgPrefix}the package.json file has no componentId field, it's probably not a component`);
+      }
+      return _componentId().ComponentID.fromObject(compId);
+    } catch {
+      // never mind the reason. probably it's not there.
+      return undefined;
+    }
+  }
 
   /**
    * Transform the id to ComponentId and get the exact id as appear in bitmap
@@ -1952,6 +1995,42 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     if (!comp) throw new (_bitError().BitError)(`unable to find ${envId.toString()} in the workspace or in the remote`);
     return comp.id.toString();
   }
+  async resolveEnvManifest(envId, envExtendsDeps = []) {
+    if (this.aspectLoader.isCoreEnv(envId)) return {};
+    const splitted = envId.split('@');
+    const envIdWithVersion = envId.startsWith('@') ? `@${splitted[1]}` : splitted[0];
+    const foundEnv = envExtendsDeps.find(dep => dep.id.toStringWithoutVersion() === envIdWithVersion || dep.packageName === envIdWithVersion);
+    let id = envId;
+    if (foundEnv?.id) {
+      if (foundEnv.id.version.includes('-new')) {
+        id = foundEnv.id.toStringWithoutVersion();
+      } else {
+        id = foundEnv.id.toString();
+      }
+    }
+    const resolvedEnvComponentId = await this.resolveComponentId(id);
+
+    // We need to load the env component with the slot and extensions to get the env manifest of the parent
+    // already resolved
+    const envComponent = await this.get(resolvedEnvComponentId, undefined, true, true, {
+      executeLoadSlot: true,
+      loadExtensions: true
+    });
+
+    // TODO: caching this
+    const alreadyResolved = this.envs.getEnvManifest(envComponent);
+    if (alreadyResolved) return alreadyResolved;
+
+    // TODO: caching this
+    const envJson = envComponent.filesystem.files.find(file => {
+      return file.relative === 'env.jsonc' || file.relative === 'env.json';
+    });
+    if (!envJson) {
+      throw new (_bitError().BitError)(`unable to find env.jsonc file in ${envId}`);
+    }
+    const envManifest = (0, _commentJson().parse)(envJson.contents.toString('utf8'), undefined, true);
+    return envManifest;
+  }
 
   /**
    * remove env configuration from the .bitmap file, so then other configuration, such as "variants" will take place
@@ -2073,8 +2152,8 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     });
     return this.dependencyResolver.getInjectedDirs(this.path, relativeCompDir, this.dependencyResolver.getPackageName(component));
   }
-  async getAutoDetectOverrides(configuredExtensions, id, legacyFiles) {
-    let policy = await this.dependencyResolver.mergeVariantPolicies(configuredExtensions, id, legacyFiles);
+  async getAutoDetectOverrides(configuredExtensions, id, legacyFiles, envExtendedDeps) {
+    let policy = await this.dependencyResolver.mergeVariantPolicies(configuredExtensions, id, legacyFiles, envExtendedDeps);
     // this is needed for "bit install" to install the dependencies from the merge config (see https://github.com/teambit/bit/pull/6849)
     const depsDataOfMergeConfig = this.getDepsDataOfMergeConfig(id);
     if (depsDataOfMergeConfig) {