@teambit/dependency-resolver 1.0.27 → 1.0.30

package/dist/dependency-resolver.main.runtime.js

@@ -121,6 +121,13 @@ function _dependencyResolver() {
   };
   return data;
 }
+function _extensionData() {
+  const data = require("@teambit/legacy/dist/consumer/config/extension-data");
+  _extensionData = function () {
+    return data;
+  };
+  return data;
+}
 function _componentIdToPackageName() {
   const data = _interopRequireDefault(require("@teambit/legacy/dist/utils/bit/component-id-to-package-name"));
   _componentIdToPackageName = function () {
@@ -156,9 +163,9 @@ function _fsExtra() {
   };
   return data;
 }
-function _legacyBitId() {
-  const data = require("@teambit/legacy-bit-id");
-  _legacyBitId = function () {
+function _componentId() {
+  const data = require("@teambit/component-id");
+  _componentId = function () {
     return data;
   };
   return data;
@@ -949,15 +956,19 @@ class DependencyResolverMain {
     const envId = await this.envs.calculateEnvIdFromExtensions(configuredExtensions);
     if (this.envs.isCoreEnv(envId)) {
       const env = await this.envs.calculateEnvFromExtensions(configuredExtensions);
-      return this.getComponentEnvPolicyFromEnv(env.env);
+      return this.getComponentEnvPolicyFromEnv(env.env, {
+        envId
+      });
     }
     const fromFile = await this.getEnvPolicyFromFile(envId);
     if (fromFile) return fromFile;
     const env = await this.envs.calculateEnvFromExtensions(configuredExtensions);
-    return this.getComponentEnvPolicyFromEnv(env.env);
+    return this.getComponentEnvPolicyFromEnv(env.env, {
+      envId
+    });
   }
   async getEnvPolicyFromEnvId(id, legacyFiles) {
-    return this.getEnvPolicyFromEnvLegacyId(id._legacy, legacyFiles);
+    return this.getEnvPolicyFromEnvLegacyId(id, legacyFiles);
   }
   async getEnvPolicyFromEnvLegacyId(id, legacyFiles) {
     const fromFile = await this.getEnvPolicyFromFile(id.toString(), legacyFiles);
@@ -965,26 +976,35 @@ class DependencyResolverMain {
     const envDef = await this.envs.getEnvDefinitionByLegacyId(id);
     if (!envDef) return undefined;
     const env = envDef.env;
-    return this.getComponentEnvPolicyFromEnv(env);
+    return this.getComponentEnvPolicyFromEnv(env, {
+      envId: id.toStringWithoutVersion()
+    });
   }
   async getComponentEnvPolicy(component) {
     // const envComponent = await this.envs.getEnvComponent(component);
     const envId = await this.envs.calculateEnvId(component);
-    if (this.envs.isCoreEnv(envId.toStringWithoutVersion())) {
+    const envIdWithoutVersion = envId.toStringWithoutVersion();
+    if (this.envs.isCoreEnv(envIdWithoutVersion)) {
       const env = this.envs.getEnv(component).env;
-      return this.getComponentEnvPolicyFromEnv(env);
+      return this.getComponentEnvPolicyFromEnv(env, {
+        envId: envIdWithoutVersion
+      });
     }
     const fromFile = await this.getEnvPolicyFromFile(envId.toString());
     if (fromFile) return fromFile;
     this.envsWithoutManifest.add(envId.toString());
     const env = this.envs.getEnv(component).env;
-    return this.getComponentEnvPolicyFromEnv(env);
+    return this.getComponentEnvPolicyFromEnv(env, {
+      envId: envIdWithoutVersion
+    });
   }
   getEnvManifest(envComponent, legacyFiles) {
     const object = this.envs.getEnvManifest(envComponent, legacyFiles);
     const policy = object === null || object === void 0 ? void 0 : object.policy;
     if (!policy) return undefined;
-    const allPoliciesFromEnv = _envPolicy().EnvPolicy.fromConfigObject(policy);
+    const allPoliciesFromEnv = _envPolicy().EnvPolicy.fromConfigObject(policy, {
+      includeLegacyPeersInSelfPolicy: envComponent && this.envs.isCoreEnv(envComponent.id.toStringWithoutVersion())
+    });
     return allPoliciesFromEnv;
   }
   async getEnvPolicyFromFile(envId, legacyFiles) {
@@ -996,11 +1016,14 @@ class DependencyResolverMain {
     const envComponent = await this.envs.getEnvComponentByEnvId(envId, envId);
     return this.getEnvManifest(envComponent);
   }
-  async getComponentEnvPolicyFromEnv(env) {
+  async getComponentEnvPolicyFromEnv(env, options) {
     if (env.getDependencies && typeof env.getDependencies === 'function') {
       const policiesFromEnvConfig = await env.getDependencies();
       if (policiesFromEnvConfig) {
-        const allPoliciesFromEnv = _envPolicy().EnvPolicy.fromConfigObject(policiesFromEnvConfig);
+        const idWithoutVersion = options.envId.split('@')[0];
+        const allPoliciesFromEnv = _envPolicy().EnvPolicy.fromConfigObject(policiesFromEnvConfig, {
+          includeLegacyPeersInSelfPolicy: this.envs.isCoreEnv(idWithoutVersion)
+        });
         return allPoliciesFromEnv;
       }
     }
@@ -1009,7 +1032,9 @@ class DependencyResolverMain {
   async getComponentEnvPolicyFromEnvDefinition(envDef) {
     const fromFile = await this.getEnvPolicyFromFile(envDef.id);
     if (fromFile) return fromFile;
-    return this.getComponentEnvPolicyFromEnv(envDef.env);
+    return this.getComponentEnvPolicyFromEnv(envDef.env, {
+      envId: envDef.id
+    });
   }
 
   /**
@@ -1052,14 +1077,18 @@ class DependencyResolverMain {
         return policyRegistrar === extId || policyRegistrar.includes(extId);
       });
       if (policyTupleToApply && policyTupleToApply[1]) {
-        const currentPolicy = _policy().VariantPolicy.fromConfigObject(policyTupleToApply[1], 'slots');
+        const currentPolicy = _policy().VariantPolicy.fromConfigObject(policyTupleToApply[1], {
+          source: 'slots'
+        });
         policiesFromSlots = _policy().VariantPolicy.mergePolices([policiesFromSlots, currentPolicy]);
       }
     });
     const currentExtension = configuredExtensions.findExtension(_dependencyResolver2().DependencyResolverAspect.id);
     const currentConfig = currentExtension === null || currentExtension === void 0 ? void 0 : currentExtension.config;
     if (currentConfig && currentConfig.policy) {
-      policiesFromConfig = _policy().VariantPolicy.fromConfigObject(currentConfig.policy, 'config');
+      policiesFromConfig = _policy().VariantPolicy.fromConfigObject(currentConfig.policy, {
+        source: 'config'
+      });
     }
     const policiesFromEnvForItself = (await this.getPoliciesFromEnvForItself(id, legacyFiles)) ?? _policy().VariantPolicy.getEmpty();
     const result = _policy().VariantPolicy.mergePolices([policiesFromEnv, policiesFromEnvForItself, policiesFromSlots, policiesFromConfig]);
@@ -1082,7 +1111,7 @@ class DependencyResolverMain {
     const dependencies = (0, _lodash().get)(entry, ['data', 'dependencies'], []);
     dependencies.forEach(dep => {
       if (dep.__type === _dependencies().COMPONENT_DEP_TYPE) {
-        const depId = new (_legacyBitId().BitId)(dep.componentId);
+        const depId = _componentId().ComponentID.fromObject(dep.componentId);
         const newDepId = idTransformer(depId);
         dep.componentId = (newDepId || depId).serialize();
         dep.id = (newDepId || depId).toString();
@@ -1091,22 +1120,6 @@ class DependencyResolverMain {
     });
     return component;
   }
-  updateDepsOnLegacyExport(version, idTransformer) {
-    const entry = version.extensions.findCoreExtension(_dependencyResolver2().DependencyResolverAspect.id);
-    if (!entry) {
-      return version;
-    }
-    const dependencies = (0, _lodash().get)(entry, ['data', 'dependencies'], []);
-    dependencies.forEach(dep => {
-      if (dep.__type === _dependencies().COMPONENT_DEP_TYPE) {
-        const depId = new (_legacyBitId().BitId)(dep.componentId);
-        const newDepId = idTransformer(depId);
-        dep.componentId = (newDepId || depId).serialize();
-        dep.id = (newDepId || depId).toString();
-      }
-    });
-    return version;
-  }
 
   /**
    * Register a new dependency detector. Detectors allow to extend Bit's dependency detection
@@ -1339,6 +1352,20 @@ class DependencyResolverMain {
     if (aspectLoader) aspectLoader.registerOnLoadRequireableExtensionSlot(dependencyResolver.onLoadRequireableExtensionSubscriber.bind(dependencyResolver));
     graphql.register((0, _dependencyResolver3().dependencyResolverSchema)(dependencyResolver));
     envs.registerService(new (_dependencies2().DependenciesService)());
+
+    // this is needed because during tag process, the data.dependencies can be loaded and the componentId can become
+    // an instance of ComponentID class. it needs to be serialized before saved into objects.
+    const serializeDepResolverDataBeforePersist = extDataList => {
+      const entry = extDataList.findCoreExtension(_dependencyResolver2().DependencyResolverAspect.id);
+      if (!entry) return;
+      const dependencies = (0, _lodash().get)(entry, ['data', 'dependencies'], []);
+      dependencies.forEach(dep => {
+        if (dep.__type === _dependencies().COMPONENT_DEP_TYPE) {
+          dep.componentId = dep.componentId instanceof _componentId().ComponentID ? dep.componentId.serialize() : dep.componentId;
+        }
+      });
+    };
+    _extensionData().ExtensionDataList.toModelObjectsHook.push(serializeDepResolverDataBeforePersist);
     return dependencyResolver;
   }
   getEmptyDepsObject() {