@teambit/dependencies 1.0.173 → 1.0.174

package/artifacts/__bit_junit.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="38" failures="0" errors="0" skipped="0">
-  <testsuite name="teambit.dependencies/dependencies@1.0.173" tests="38" failures="0" errors="0" skipped="0">
+  <testsuite name="teambit.dependencies/dependencies@1.0.174" tests="38" failures="0" errors="0" skipped="0">
     <testcase classname="dist/dependencies.spec.js" name="should add the snap prefix" time="0.001"/>
-    <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/testing-library__jest-dom" time="0.001"/>
+    <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/testing-library__jest-dom"/>
     <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/chai"/>
     <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/mocha"/>
     <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/classnames"/>
     <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/cors"/>
-    <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/cross-spawn" time="0.001"/>
+    <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/cross-spawn"/>
     <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/dagre"/>
     <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/didyoumean"/>
     <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/eslint"/>
@@ -35,7 +35,7 @@
     <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/socket.io-client"/>
     <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/ua-parser-js"/>
     <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/url-join"/>
-    <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/url-parse"/>
+    <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/url-parse" time="0.001"/>
     <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/webpack"/>
     <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/webpack-dev-server"/>
     <testcase classname="dist/dependencies-loader/package-to-definetly-typed.spec.js" name="should map to @types/webpack-merge"/>

package/artifacts/schema.json

@@ -3252,7 +3252,7 @@
   "componentId": {
     "scope": "teambit.dependencies",
     "name": "dependencies",
-    "version": "1.0.173"
+    "version": "1.0.174"
   },
   "taggedModuleExports": []
 }

package/dependencies-loader/apply-overrides.ts

@@ -19,6 +19,7 @@ import { DebugDependencies, FileType } from './auto-detect-deps';
 export type AllDependencies = {
   dependencies: Dependency[];
   devDependencies: Dependency[];
+  peerDependencies: Dependency[];
 };
 
 export type AllPackagesDependencies = {
@@ -60,6 +61,7 @@ export class ApplyOverrides {
     this.allDependencies = {
       dependencies: [],
       devDependencies: [],
+      peerDependencies: [],
     };
     this.allPackagesDependencies = {
       packageDependencies: {},
@@ -203,12 +205,11 @@ export class ApplyOverrides {
   }
 
   private _getComponentIdToAdd(
-    field: string,
-    dependency: string
-  ): { componentId?: ComponentID; packageName?: string } | undefined {
-    if (field === 'peerDependencies') return undefined;
+    dependency: string,
+    versionRange: string
+  ): { componentId?: ComponentID; packageName?: string; versionRange: string } {
     const packageData = this._resolvePackageData(dependency);
-    return { componentId: packageData?.componentId, packageName: packageData?.name };
+    return { componentId: packageData?.componentId, packageName: packageData?.name, versionRange };
   }
 
   getDependenciesToAddManually(
@@ -223,7 +224,7 @@ export class ApplyOverrides {
       if (!overrides[depField]) return;
       Object.keys(overrides[depField]).forEach((dependency) => {
         const dependencyValue = overrides[depField][dependency];
-        const componentData = this._getComponentIdToAdd(depField, dependency);
+        const componentData = this._getComponentIdToAdd(dependency, dependencyValue);
         if (componentData?.componentId) {
           const dependencyExist = existingDependencies[depField].find((d) =>
             d.id.isEqualWithoutVersion(componentData.componentId)
@@ -259,7 +260,9 @@ export class ApplyOverrides {
     DEPENDENCIES_FIELDS.forEach((depField) => {
       if (components[depField] && components[depField].length) {
         components[depField].forEach((depData) =>
-          this.allDependencies[depField].push(new Dependency(depData.componentId, [], depData.packageName))
+          this.allDependencies[depField].push(
+            new Dependency(depData.componentId, [], depData.packageName, depData.versionRange)
+          )
         );
       }
       if (packages[depField] && !isEmpty(packages[depField])) {
@@ -278,6 +281,12 @@ export class ApplyOverrides {
         delete this.allPackagesDependencies.packageDependencies[peerName];
       }
     }
+    if (components.peerDependencies) {
+      const componentPeers = new Set(components.peerDependencies.map(({ packageName }) => packageName));
+      this.allDependencies.dependencies = this.allDependencies.dependencies.filter(
+        (dep) => !dep.packageName || !componentPeers.has(dep.packageName)
+      );
+    }
   }
 
   /**
@@ -353,7 +362,7 @@ export class ApplyOverrides {
     if (!wsPolicy) return;
     const wsPeer = wsPolicy.peerDependencies || {};
     const wsRegular = wsPolicy.dependencies || {};
-    const peerDeps = this.allPackagesDependencies.peerPackageDependencies || {};
+    const peerPackageDeps = this.allPackagesDependencies.peerPackageDependencies || {};
     // we are not iterate component deps since they are resolved from what actually installed
     // the policy used for installation only in that case
     ['packageDependencies', 'devPackageDependencies', 'peerPackageDependencies'].forEach((field) => {
@@ -362,14 +371,31 @@ export class ApplyOverrides {
         const regularVersionFromWsPolicy = wsRegular[pkgName];
         if (peerVersionFromWsPolicy) {
           delete this.allPackagesDependencies[field][pkgName];
-          peerDeps[pkgName] = peerVersionFromWsPolicy;
+          peerPackageDeps[pkgName] = peerVersionFromWsPolicy;
         } else if (regularVersionFromWsPolicy) {
           delete this.allPackagesDependencies.peerPackageDependencies?.[pkgName];
           this.allPackagesDependencies[field][pkgName] = regularVersionFromWsPolicy;
         }
       });
     });
-    this.allPackagesDependencies.peerPackageDependencies = peerDeps;
+    this.allPackagesDependencies.peerPackageDependencies = peerPackageDeps;
+
+    const peerDeps = this.allDependencies.peerDependencies ?? [];
+    ['dependencies', 'devDependencies'].forEach((field) => {
+      for (const dep of this.allDependencies[field]) {
+        const pkgName = dep.packageName;
+        const peerVersionFromWsPolicy = wsPeer[pkgName];
+        const regularVersionFromWsPolicy = wsRegular[pkgName];
+        if (peerVersionFromWsPolicy) {
+          dep.versionRange = peerVersionFromWsPolicy;
+          peerDeps.push(dep);
+        } else if (regularVersionFromWsPolicy) {
+          dep.versionRange = regularVersionFromWsPolicy;
+        }
+      }
+      this.allDependencies[field] = this.allDependencies[field].filter(({ packageName }) => !wsPeer[packageName]);
+    });
+    this.allDependencies.peerDependencies = peerDeps;
   }
 
   /**
@@ -419,6 +445,10 @@ export class ApplyOverrides {
           return dep.packageName === pkgName;
         });
 
+        const existsInCompsPeerDeps = this.allDependencies.peerDependencies.find((dep) => {
+          return dep.packageName === pkgName;
+        });
+
         if (
           // We are checking originAllPackagesDependencies instead of allPackagesDependencies
           // as it might be already removed from allPackagesDependencies at this point if it was set with
@@ -429,6 +459,7 @@ export class ApplyOverrides {
           !this.originAllPackagesDependencies.peerPackageDependencies[pkgName] &&
           !existsInCompsDeps &&
           !existsInCompsDevDeps &&
+          !existsInCompsPeerDeps &&
           // Check if it was orignally exists in the component
           // as we might have a policy which looks like this:
           // "components": {
@@ -479,7 +510,16 @@ export class ApplyOverrides {
           pkgVal !== MANUALLY_REMOVE_DEPENDENCY &&
           ((!existsInCompsDeps && !existsInCompsDevDeps) || field === 'peerDependencies')
         ) {
-          this.allPackagesDependencies[key][pkgName] = pkgVal;
+          if ((existsInCompsDeps || existsInCompsDevDeps) && field === 'peerDependencies') {
+            const comp = (existsInCompsDeps ?? existsInCompsDevDeps) as Dependency;
+            comp.versionRange = pkgVal;
+            this.allDependencies.peerDependencies.push(comp);
+          } else {
+            this.allPackagesDependencies[key][pkgName] = pkgVal;
+          }
+          if (existsInCompsPeerDeps) {
+            existsInCompsPeerDeps.versionRange = pkgVal;
+          }
         }
       });
     });

package/dependencies-loader/auto-detect-deps.ts

@@ -24,7 +24,7 @@ import {
 } from '@teambit/legacy/dist/consumer/component/dependencies/files-dependency-builder/types/dependency-tree-type';
 import { DevFilesMain } from '@teambit/dev-files';
 import { Workspace } from '@teambit/workspace';
-import { AspectLoaderMain, getCoreAspectPackageName } from '@teambit/aspect-loader';
+import { AspectLoaderMain } from '@teambit/aspect-loader';
 import { ResolvedPackageData } from '@teambit/legacy/dist/utils/packages';
 import { DependencyDetector } from '@teambit/legacy/dist/consumer/component/dependencies/files-dependency-builder/detector-hook';
 import { packageToDefinetlyTyped } from './package-to-definetly-typed';
@@ -81,6 +81,7 @@ export class AutoDetectDeps {
     this.allDependencies = {
       dependencies: [],
       devDependencies: [],
+      peerDependencies: [],
     };
     this.allPackagesDependencies = {
       packageDependencies: {},
@@ -506,18 +507,6 @@ export class AutoDetectDeps {
     } else this.issues.getOrCreate(IssuesClasses.ResolveErrors).data[originFile] = error.message;
   }
 
-  private getCoreAspectsPackagesAndIds(): Record<string, string> {
-    const allCoreAspectsIds = this.aspectLoader.getCoreAspectIds();
-    const coreAspectsPackagesAndIds = {};
-
-    allCoreAspectsIds.forEach((id) => {
-      const packageName = getCoreAspectPackageName(id);
-      coreAspectsPackagesAndIds[packageName] = id;
-    });
-
-    return coreAspectsPackagesAndIds;
-  }
-
   /**
    * when a user uses core-extensions these core-extensions should not be dependencies.
    * here, we filter them out from all places they could entered as dependencies.
@@ -525,7 +514,7 @@ export class AutoDetectDeps {
    * which case we recognizes that the current originFile is a core-extension and avoid filtering.
    */
   private processCoreAspects(originFile: PathLinuxRelative) {
-    const coreAspects = this.getCoreAspectsPackagesAndIds();
+    const coreAspects = this.aspectLoader.getCoreAspectsPackagesAndIds();
 
     // const scopes = coreAspects.map((id) => {
     //   const id = id.split()

package/dependencies-loader/dependencies-data.ts

@@ -25,6 +25,7 @@ export class DependenciesData {
       allDependencies: {
         dependencies: allDependencies.dependencies.map((dep) => dep.serialize()),
         devDependencies: allDependencies.devDependencies.map((dep) => dep.serialize()),
+        peerDependencies: allDependencies.peerDependencies.map((dep) => dep.serialize()),
       },
       // for backward compatibility. version < 1.5.1 expected this to be saved in the fs cache.
       overridesDependencies: {
@@ -39,8 +40,11 @@ export class DependenciesData {
     const dataParsed = JSON.parse(data);
     const dependencies = dataParsed.allDependencies.dependencies.map((dep) => Dependency.deserialize(dep));
     const devDependencies = dataParsed.allDependencies.devDependencies.map((dep) => Dependency.deserialize(dep));
+    const peerDependencies = (dataParsed.allDependencies.peerDependencies ?? []).map((dep) =>
+      Dependency.deserialize(dep)
+    );
     const issuesList = IssuesList.deserialize(dataParsed.issues);
-    const allDependencies = { dependencies, devDependencies };
+    const allDependencies = { dependencies, devDependencies, peerDependencies };
     const coreAspects = dataParsed.coreAspects;
     return new DependenciesData(allDependencies, dataParsed.allPackagesDependencies, issuesList, coreAspects);
   }

package/dependencies-loader/dependencies-loader.ts

@@ -138,6 +138,7 @@ export class DependenciesLoader {
   ) {
     this.component.setDependencies(dependenciesData.allDependencies.dependencies);
     this.component.setDevDependencies(dependenciesData.allDependencies.devDependencies);
+    this.component.setPeerDependencies(dependenciesData.allDependencies.peerDependencies);
     this.component.packageDependencies = dependenciesData.allPackagesDependencies.packageDependencies ?? {};
     this.component.devPackageDependencies = dependenciesData.allPackagesDependencies.devPackageDependencies ?? {};
     this.component.peerPackageDependencies = dependenciesData.allPackagesDependencies.peerPackageDependencies ?? {};

package/dependencies-loader/dependencies-versions-resolver.ts

@@ -12,7 +12,7 @@ import Dependency from '@teambit/legacy/dist/consumer/component/dependencies/dep
 import OverridesDependencies from './overrides-dependencies';
 import { DebugComponentsDependency, getValidVersion } from './auto-detect-deps';
 
-type DepType = 'dependencies' | 'devDependencies';
+type DepType = 'dependencies' | 'devDependencies' | 'peerDependencies';
 
 export function updateDependenciesVersions(
   depsResolver: DependencyResolverMain,
@@ -28,6 +28,7 @@ export function updateDependenciesVersions(
 
   updateDependencies(component.dependencies, 'dependencies');
   updateDependencies(component.devDependencies, 'devDependencies');
+  updateDependencies(component.peerDependencies, 'peerDependencies');
   if (updateExtensionsVersions) {
     updateExtensions(component.extensions);
   }

package/dist/dependencies-loader/apply-overrides.d.ts

@@ -11,6 +11,7 @@ import { DebugDependencies } from './auto-detect-deps';
 export type AllDependencies = {
     dependencies: Dependency[];
     devDependencies: Dependency[];
+    peerDependencies: Dependency[];
 };
 export type AllPackagesDependencies = {
     packageDependencies: Record<string, string>;

package/dist/dependencies-loader/apply-overrides.js

@@ -108,7 +108,8 @@ class ApplyOverrides {
     this.componentFromModel = this.component.componentFromModel;
     this.allDependencies = {
       dependencies: [],
-      devDependencies: []
+      devDependencies: [],
+      peerDependencies: []
     };
     this.allPackagesDependencies = {
       packageDependencies: {},
@@ -222,12 +223,12 @@ class ApplyOverrides {
     const packageObject = (0, _packages().resolvePackageData)(basePath, modulePath);
     return packageObject;
   }
-  _getComponentIdToAdd(field, dependency) {
-    if (field === 'peerDependencies') return undefined;
+  _getComponentIdToAdd(dependency, versionRange) {
     const packageData = this._resolvePackageData(dependency);
     return {
       componentId: packageData?.componentId,
-      packageName: packageData?.name
+      packageName: packageData?.name,
+      versionRange
     };
   }
   getDependenciesToAddManually(packageJson, existingDependencies) {
@@ -239,7 +240,7 @@ class ApplyOverrides {
       if (!overrides[depField]) return;
       Object.keys(overrides[depField]).forEach(dependency => {
         const dependencyValue = overrides[depField][dependency];
-        const componentData = this._getComponentIdToAdd(depField, dependency);
+        const componentData = this._getComponentIdToAdd(dependency, dependencyValue);
         if (componentData?.componentId) {
           const dependencyExist = existingDependencies[depField].find(d => d.id.isEqualWithoutVersion(componentData.componentId));
           if (!dependencyExist) {
@@ -272,7 +273,7 @@ class ApplyOverrides {
     } = dependencies;
     _constants().DEPENDENCIES_FIELDS.forEach(depField => {
       if (components[depField] && components[depField].length) {
-        components[depField].forEach(depData => this.allDependencies[depField].push(new (_dependencies().Dependency)(depData.componentId, [], depData.packageName)));
+        components[depField].forEach(depData => this.allDependencies[depField].push(new (_dependencies().Dependency)(depData.componentId, [], depData.packageName, depData.versionRange)));
       }
       if (packages[depField] && !(0, _lodash().isEmpty)(packages[depField])) {
         Object.assign(this.allPackagesDependencies[this._pkgFieldMapping(depField)], packages[depField]);
@@ -290,6 +291,12 @@ class ApplyOverrides {
         delete this.allPackagesDependencies.packageDependencies[peerName];
       }
     }
+    if (components.peerDependencies) {
+      const componentPeers = new Set(components.peerDependencies.map(({
+        packageName
+      }) => packageName));
+      this.allDependencies.dependencies = this.allDependencies.dependencies.filter(dep => !dep.packageName || !componentPeers.has(dep.packageName));
+    }
   }
 
   /**
@@ -356,7 +363,7 @@ class ApplyOverrides {
     if (!wsPolicy) return;
     const wsPeer = wsPolicy.peerDependencies || {};
     const wsRegular = wsPolicy.dependencies || {};
-    const peerDeps = this.allPackagesDependencies.peerPackageDependencies || {};
+    const peerPackageDeps = this.allPackagesDependencies.peerPackageDependencies || {};
     // we are not iterate component deps since they are resolved from what actually installed
     // the policy used for installation only in that case
     ['packageDependencies', 'devPackageDependencies', 'peerPackageDependencies'].forEach(field => {
@@ -365,14 +372,32 @@ class ApplyOverrides {
         const regularVersionFromWsPolicy = wsRegular[pkgName];
         if (peerVersionFromWsPolicy) {
           delete this.allPackagesDependencies[field][pkgName];
-          peerDeps[pkgName] = peerVersionFromWsPolicy;
+          peerPackageDeps[pkgName] = peerVersionFromWsPolicy;
         } else if (regularVersionFromWsPolicy) {
           delete this.allPackagesDependencies.peerPackageDependencies?.[pkgName];
           this.allPackagesDependencies[field][pkgName] = regularVersionFromWsPolicy;
         }
       });
     });
-    this.allPackagesDependencies.peerPackageDependencies = peerDeps;
+    this.allPackagesDependencies.peerPackageDependencies = peerPackageDeps;
+    const peerDeps = this.allDependencies.peerDependencies ?? [];
+    ['dependencies', 'devDependencies'].forEach(field => {
+      for (const dep of this.allDependencies[field]) {
+        const pkgName = dep.packageName;
+        const peerVersionFromWsPolicy = wsPeer[pkgName];
+        const regularVersionFromWsPolicy = wsRegular[pkgName];
+        if (peerVersionFromWsPolicy) {
+          dep.versionRange = peerVersionFromWsPolicy;
+          peerDeps.push(dep);
+        } else if (regularVersionFromWsPolicy) {
+          dep.versionRange = regularVersionFromWsPolicy;
+        }
+      }
+      this.allDependencies[field] = this.allDependencies[field].filter(({
+        packageName
+      }) => !wsPeer[packageName]);
+    });
+    this.allDependencies.peerDependencies = peerDeps;
   }
 
   /**
@@ -415,12 +440,15 @@ class ApplyOverrides {
         const existsInCompsDevDeps = this.allDependencies.devDependencies.find(dep => {
           return dep.packageName === pkgName;
         });
+        const existsInCompsPeerDeps = this.allDependencies.peerDependencies.find(dep => {
+          return dep.packageName === pkgName;
+        });
         if (
         // We are checking originAllPackagesDependencies instead of allPackagesDependencies
         // as it might be already removed from allPackagesDependencies at this point if it was set with
         // "-" in runtime/dev
         // in such case we still want to apply it here
-        !this.originAllPackagesDependencies.packageDependencies[pkgName] && !this.originAllPackagesDependencies.devPackageDependencies[pkgName] && !this.originAllPackagesDependencies.peerPackageDependencies[pkgName] && !existsInCompsDeps && !existsInCompsDevDeps &&
+        !this.originAllPackagesDependencies.packageDependencies[pkgName] && !this.originAllPackagesDependencies.devPackageDependencies[pkgName] && !this.originAllPackagesDependencies.peerPackageDependencies[pkgName] && !existsInCompsDeps && !existsInCompsDevDeps && !existsInCompsPeerDeps &&
         // Check if it was orignally exists in the component
         // as we might have a policy which looks like this:
         // "components": {
@@ -461,7 +489,16 @@ class ApplyOverrides {
         // also the version here might have a range (^ or ~ for example) so we can't
         // just put it as is, as it is not valid for component deps to have range
         if (pkgVal !== _constants().MANUALLY_REMOVE_DEPENDENCY && (!existsInCompsDeps && !existsInCompsDevDeps || field === 'peerDependencies')) {
-          this.allPackagesDependencies[key][pkgName] = pkgVal;
+          if ((existsInCompsDeps || existsInCompsDevDeps) && field === 'peerDependencies') {
+            const comp = existsInCompsDeps ?? existsInCompsDevDeps;
+            comp.versionRange = pkgVal;
+            this.allDependencies.peerDependencies.push(comp);
+          } else {
+            this.allPackagesDependencies[key][pkgName] = pkgVal;
+          }
+          if (existsInCompsPeerDeps) {
+            existsInCompsPeerDeps.versionRange = pkgVal;
+          }
         }
       });
     });