@teambit/dependency-resolver 1.0.276 → 1.0.278

package/dist/dependency-resolver.main.runtime.d.ts

@@ -1,6 +1,6 @@
 import { Component, ComponentMap, ComponentMain, IComponent } from '@teambit/component';
 import type { ConfigMain } from '@teambit/config';
-import { DependenciesEnv, EnvDefinition, EnvsMain } from '@teambit/envs';
+import type { DependenciesEnv, EnvDefinition, EnvJsonc, EnvsMain } from '@teambit/envs';
 import { SlotRegistry, ExtensionManifest, Aspect } from '@teambit/harmony';
 import { RequireableComponent } from '@teambit/harmony.modules.requireable-component';
 import type { LoggerMain } from '@teambit/logger';
@@ -295,6 +295,14 @@ export declare class DependencyResolverMain {
     getEnvPolicyFromEnvLegacyId(id: ComponentID, legacyFiles?: SourceFile[]): Promise<EnvPolicy | undefined>;
     getComponentEnvPolicy(component: Component): Promise<EnvPolicy>;
     getEnvManifest(envComponent?: Component, legacyFiles?: SourceFile[]): EnvPolicy | undefined;
+    /**
+     * Merge policy from parent and child env.jsonc files
+     * The rule is that for each type of dependency (dev, runtime, peer) we check each item.
+     * if a dep with a name exists on the child we will take the entire object from the child (including the version,
+     * supported range, force etc')
+     * if a dep exists with a version value "-" we will remove it from the policy
+     */
+    mergeEnvManifestPolicy(parent: EnvJsonc, child: EnvJsonc): Object;
     private getEnvPolicyFromFile;
     getComponentEnvPolicyFromEnv(env: DependenciesEnv, options: {
         envId: string;

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

@@ -1042,6 +1042,34 @@ class DependencyResolverMain {
     });
     return allPoliciesFromEnv;
   }
+
+  /**
+   * Merge policy from parent and child env.jsonc files
+   * The rule is that for each type of dependency (dev, runtime, peer) we check each item.
+   * if a dep with a name exists on the child we will take the entire object from the child (including the version,
+   * supported range, force etc')
+   * if a dep exists with a version value "-" we will remove it from the policy
+   */
+  mergeEnvManifestPolicy(parent, child) {
+    const policy = {};
+    ['peers', 'dev', 'runtime'].forEach(key => {
+      policy[key] = (0, _lodash().cloneDeep)(parent.policy?.[key] || []);
+      const childEntries = (0, _lodash().cloneDeep)(child.policy?.[key] || []);
+      policy[key] = policy[key].filter(entry => {
+        const foundChildEntry = childEntries.find(childEntry => {
+          return childEntry.name === entry.name;
+        });
+        return !foundChildEntry;
+      });
+      policy[key] = policy[key].concat(childEntries);
+      policy[key] = policy[key].filter(entry => {
+        return entry.version !== '-';
+      });
+    });
+    return {
+      policy
+    };
+  }
   async getEnvPolicyFromFile(envId, legacyFiles) {
     const isCoreEnv = this.envs.isCoreEnv(envId);
     if (isCoreEnv) return undefined;
@@ -1377,6 +1405,7 @@ class DependencyResolverMain {
     if (aspectLoader) aspectLoader.registerOnLoadRequireableExtensionSlot(dependencyResolver.onLoadRequireableExtensionSubscriber.bind(dependencyResolver));
     graphql.register((0, _dependencyResolver2().dependencyResolverSchema)(dependencyResolver));
     envs.registerService(new (_dependencies2().DependenciesService)());
+    envs.registerEnvJsoncMergeCustomizer(dependencyResolver.mergeEnvManifestPolicy.bind(dependencyResolver));
 
     // 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.