@teambit/dependency-resolver 0.0.1133 → 0.0.1134

package/dist/apply-updates.d.ts

@@ -1,13 +1,17 @@
-import { OutdatedPkg } from './get-all-policy-pkgs';
+import { ComponentID } from '@teambit/component';
+import { MergedOutdatedPkg } from './dependency-resolver.main.runtime';
 import { VariantPolicyConfigObject, WorkspacePolicyEntry } from './policy';
+export interface UpdatedComponent {
+    componentId: ComponentID;
+    config: Record<string, any>;
+}
 /**
  * Applies updates to policies.
  */
-export declare function applyUpdates(outdatedPkgs: Array<Omit<OutdatedPkg, 'currentRange'>>, { variantPoliciesByPatterns, componentPoliciesById, }: {
+export declare function applyUpdates(outdatedPkgs: Array<Omit<MergedOutdatedPkg, 'currentRange'>>, { variantPoliciesByPatterns, }: {
     variantPoliciesByPatterns: Record<string, VariantPolicyConfigObject>;
-    componentPoliciesById: Record<string, any>;
 }): {
     updatedVariants: string[];
-    updatedComponents: string[];
+    updatedComponents: UpdatedComponent[];
     updatedWorkspacePolicyEntries: WorkspacePolicyEntry[];
 };

package/dist/apply-updates.js

@@ -9,60 +9,73 @@ exports.applyUpdates = applyUpdates;
  * Applies updates to policies.
  */
 function applyUpdates(outdatedPkgs, {
-  variantPoliciesByPatterns,
-  componentPoliciesById
+  variantPoliciesByPatterns
 }) {
   const updatedWorkspacePolicyEntries = [];
   const updatedVariants = new Set();
-  const updatedComponents = new Set();
+  const updatedComponents = new Map();
   for (const outdatedPkg of outdatedPkgs) {
-    switch (outdatedPkg.source) {
-      case 'rootPolicy':
-      case 'component-model':
-        updatedWorkspacePolicyEntries.push({
-          dependencyId: outdatedPkg.name,
-          value: {
-            version: outdatedPkg.latestRange
-          },
-          lifecycleType: outdatedPkg.targetField === 'peerDependencies' ? 'peer' : 'runtime'
-        });
-        break;
-      case 'variants':
-        if (outdatedPkg.variantPattern) {
-          var _variantPoliciesByPat, _variantPoliciesByPat2, _variantPoliciesByPat3;
-          const {
-            variantPattern,
-            targetField,
-            name
-          } = outdatedPkg;
-          updatedVariants.add(outdatedPkg.variantPattern);
-          // eslint-disable-next-line dot-notation
-          if ((_variantPoliciesByPat = variantPoliciesByPatterns[variantPattern]) !== null && _variantPoliciesByPat !== void 0 && (_variantPoliciesByPat2 = _variantPoliciesByPat[targetField]) !== null && _variantPoliciesByPat2 !== void 0 && (_variantPoliciesByPat3 = _variantPoliciesByPat2[name]) !== null && _variantPoliciesByPat3 !== void 0 && _variantPoliciesByPat3['version']) {
-            // eslint-disable-line
-            variantPoliciesByPatterns[variantPattern][targetField][name]['version'] = outdatedPkg.latestRange; // eslint-disable-line
-          } else {
-            variantPoliciesByPatterns[variantPattern][targetField][name] = outdatedPkg.latestRange; // eslint-disable-line
-          }
+    var _outdatedPkg$dependen;
+    if (outdatedPkg.source === 'component' || outdatedPkg.source === 'rootPolicy' && (_outdatedPkg$dependen = outdatedPkg.dependentComponents) !== null && _outdatedPkg$dependen !== void 0 && _outdatedPkg$dependen.length && !outdatedPkg.isAuto) {
+      var _outdatedPkg$dependen2;
+      // eslint-disable-next-line
+      ((_outdatedPkg$dependen2 = outdatedPkg.dependentComponents) !== null && _outdatedPkg$dependen2 !== void 0 ? _outdatedPkg$dependen2 : [outdatedPkg.componentId]).forEach(componentId => {
+        const id = componentId.toString();
+        if (!updatedComponents.has(id)) {
+          updatedComponents.set(id, {
+            componentId,
+            config: {
+              policy: {}
+            }
+          });
         }
-
-        break;
-      case 'component':
-        if (outdatedPkg.componentId) {
-          updatedComponents.add(outdatedPkg.componentId);
-          if (componentPoliciesById[outdatedPkg.componentId][outdatedPkg.targetField][outdatedPkg.name].version) {
-            componentPoliciesById[outdatedPkg.componentId][outdatedPkg.targetField][outdatedPkg.name].version = outdatedPkg.latestRange;
-          } else {
-            componentPoliciesById[outdatedPkg.componentId][outdatedPkg.targetField][outdatedPkg.name] = outdatedPkg.latestRange;
-          }
+        const {
+          config
+        } = updatedComponents.get(id); // eslint-disable-line
+        if (!config.policy[outdatedPkg.targetField]) {
+          config.policy[outdatedPkg.targetField] = {};
         }
-        break;
-      default:
-        throw new Error(`Unsupported policy source for update: ${outdatedPkg.source}`);
+        config.policy[outdatedPkg.targetField][outdatedPkg.name] = outdatedPkg.latestRange;
+      });
+    } else {
+      switch (outdatedPkg.source) {
+        case 'rootPolicy':
+        case 'component-model':
+          updatedWorkspacePolicyEntries.push({
+            dependencyId: outdatedPkg.name,
+            value: {
+              version: outdatedPkg.latestRange
+            },
+            lifecycleType: outdatedPkg.targetField === 'peerDependencies' ? 'peer' : 'runtime'
+          });
+          break;
+        case 'variants':
+          if (outdatedPkg.variantPattern) {
+            var _variantPoliciesByPat, _variantPoliciesByPat2, _variantPoliciesByPat3;
+            const {
+              variantPattern,
+              targetField,
+              name
+            } = outdatedPkg;
+            updatedVariants.add(outdatedPkg.variantPattern);
+            // eslint-disable-next-line dot-notation
+            if ((_variantPoliciesByPat = variantPoliciesByPatterns[variantPattern]) !== null && _variantPoliciesByPat !== void 0 && (_variantPoliciesByPat2 = _variantPoliciesByPat[targetField]) !== null && _variantPoliciesByPat2 !== void 0 && (_variantPoliciesByPat3 = _variantPoliciesByPat2[name]) !== null && _variantPoliciesByPat3 !== void 0 && _variantPoliciesByPat3['version']) {
+              // eslint-disable-line
+              variantPoliciesByPatterns[variantPattern][targetField][name]['version'] = outdatedPkg.latestRange; // eslint-disable-line
+            } else {
+              variantPoliciesByPatterns[variantPattern][targetField][name] = outdatedPkg.latestRange; // eslint-disable-line
+            }
+          }
+
+          break;
+        default:
+          throw new Error(`Unsupported policy source for update: ${outdatedPkg.source}`);
+      }
     }
   }
   return {
     updatedVariants: Array.from(updatedVariants),
-    updatedComponents: Array.from(updatedComponents),
+    updatedComponents: Array.from(updatedComponents.values()),
     updatedWorkspacePolicyEntries
   };
 }

package/dist/apply-updates.js.map

@@ -1 +1 @@
-{"version":3,"names":["applyUpdates","outdatedPkgs","variantPoliciesByPatterns","componentPoliciesById","updatedWorkspacePolicyEntries","updatedVariants","Set","updatedComponents","outdatedPkg","source","push","dependencyId","name","value","version","latestRange","lifecycleType","targetField","variantPattern","_variantPoliciesByPat","_variantPoliciesByPat2","_variantPoliciesByPat3","add","componentId","Error","Array","from"],"sources":["apply-updates.ts"],"sourcesContent":["import { OutdatedPkg } from './get-all-policy-pkgs';\nimport { VariantPolicyConfigObject, WorkspacePolicyEntry } from './policy';\n\n/**\n * Applies updates to policies.\n */\nexport function applyUpdates(\n  outdatedPkgs: Array<Omit<OutdatedPkg, 'currentRange'>>,\n  {\n    variantPoliciesByPatterns,\n    componentPoliciesById,\n  }: {\n    variantPoliciesByPatterns: Record<string, VariantPolicyConfigObject>;\n    componentPoliciesById: Record<string, any>;\n  }\n): {\n  updatedVariants: string[];\n  updatedComponents: string[];\n  updatedWorkspacePolicyEntries: WorkspacePolicyEntry[];\n} {\n  const updatedWorkspacePolicyEntries: WorkspacePolicyEntry[] = [];\n  const updatedVariants = new Set<string>();\n  const updatedComponents = new Set<string>();\n\n  for (const outdatedPkg of outdatedPkgs) {\n    switch (outdatedPkg.source) {\n      case 'rootPolicy':\n      case 'component-model':\n        updatedWorkspacePolicyEntries.push({\n          dependencyId: outdatedPkg.name,\n          value: {\n            version: outdatedPkg.latestRange,\n          },\n          lifecycleType: outdatedPkg.targetField === 'peerDependencies' ? 'peer' : 'runtime',\n        });\n        break;\n      case 'variants':\n        if (outdatedPkg.variantPattern) {\n          const { variantPattern, targetField, name } = outdatedPkg;\n          updatedVariants.add(outdatedPkg.variantPattern);\n          // eslint-disable-next-line dot-notation\n          if (variantPoliciesByPatterns[variantPattern]?.[targetField]?.[name]?.['version']) {\n            // eslint-disable-line\n            variantPoliciesByPatterns[variantPattern][targetField]![name]['version'] = outdatedPkg.latestRange; // eslint-disable-line\n          } else {\n            variantPoliciesByPatterns[variantPattern][targetField]![name] = outdatedPkg.latestRange; // eslint-disable-line\n          }\n        }\n        break;\n      case 'component':\n        if (outdatedPkg.componentId) {\n          updatedComponents.add(outdatedPkg.componentId);\n          if (componentPoliciesById[outdatedPkg.componentId][outdatedPkg.targetField][outdatedPkg.name].version) {\n            componentPoliciesById[outdatedPkg.componentId][outdatedPkg.targetField][outdatedPkg.name].version =\n              outdatedPkg.latestRange;\n          } else {\n            componentPoliciesById[outdatedPkg.componentId][outdatedPkg.targetField][outdatedPkg.name] =\n              outdatedPkg.latestRange;\n          }\n        }\n        break;\n      default:\n        throw new Error(`Unsupported policy source for update: ${outdatedPkg.source}`);\n    }\n  }\n  return {\n    updatedVariants: Array.from(updatedVariants),\n    updatedComponents: Array.from(updatedComponents),\n    updatedWorkspacePolicyEntries,\n  };\n}\n"],"mappings":";;;;;;;AAGA;AACA;AACA;AACO,SAASA,YAAYA,CAC1BC,YAAsD,EACtD;EACEC,yBAAyB;EACzBC;AAIF,CAAC,EAKD;EACA,MAAMC,6BAAqD,GAAG,EAAE;EAChE,MAAMC,eAAe,GAAG,IAAIC,GAAG,CAAS,CAAC;EACzC,MAAMC,iBAAiB,GAAG,IAAID,GAAG,CAAS,CAAC;EAE3C,KAAK,MAAME,WAAW,IAAIP,YAAY,EAAE;IACtC,QAAQO,WAAW,CAACC,MAAM;MACxB,KAAK,YAAY;MACjB,KAAK,iBAAiB;QACpBL,6BAA6B,CAACM,IAAI,CAAC;UACjCC,YAAY,EAAEH,WAAW,CAACI,IAAI;UAC9BC,KAAK,EAAE;YACLC,OAAO,EAAEN,WAAW,CAACO;UACvB,CAAC;UACDC,aAAa,EAAER,WAAW,CAACS,WAAW,KAAK,kBAAkB,GAAG,MAAM,GAAG;QAC3E,CAAC,CAAC;QACF;MACF,KAAK,UAAU;QACb,IAAIT,WAAW,CAACU,cAAc,EAAE;UAAA,IAAAC,qBAAA,EAAAC,sBAAA,EAAAC,sBAAA;UAC9B,MAAM;YAAEH,cAAc;YAAED,WAAW;YAAEL;UAAK,CAAC,GAAGJ,WAAW;UACzDH,eAAe,CAACiB,GAAG,CAACd,WAAW,CAACU,cAAc,CAAC;UAC/C;UACA,KAAAC,qBAAA,GAAIjB,yBAAyB,CAACgB,cAAc,CAAC,cAAAC,qBAAA,gBAAAC,sBAAA,GAAzCD,qBAAA,CAA4CF,WAAW,CAAC,cAAAG,sBAAA,gBAAAC,sBAAA,GAAxDD,sBAAA,CAA2DR,IAAI,CAAC,cAAAS,sBAAA,eAAhEA,sBAAA,CAAmE,SAAS,CAAC,EAAE;YACjF;YACAnB,yBAAyB,CAACgB,cAAc,CAAC,CAACD,WAAW,CAAC,CAAEL,IAAI,CAAC,CAAC,SAAS,CAAC,GAAGJ,WAAW,CAACO,WAAW,CAAC,CAAC;UACtG,CAAC,MAAM;YACLb,yBAAyB,CAACgB,cAAc,CAAC,CAACD,WAAW,CAAC,CAAEL,IAAI,CAAC,GAAGJ,WAAW,CAACO,WAAW,CAAC,CAAC;UAC3F;QACF;;QACA;MACF,KAAK,WAAW;QACd,IAAIP,WAAW,CAACe,WAAW,EAAE;UAC3BhB,iBAAiB,CAACe,GAAG,CAACd,WAAW,CAACe,WAAW,CAAC;UAC9C,IAAIpB,qBAAqB,CAACK,WAAW,CAACe,WAAW,CAAC,CAACf,WAAW,CAACS,WAAW,CAAC,CAACT,WAAW,CAACI,IAAI,CAAC,CAACE,OAAO,EAAE;YACrGX,qBAAqB,CAACK,WAAW,CAACe,WAAW,CAAC,CAACf,WAAW,CAACS,WAAW,CAAC,CAACT,WAAW,CAACI,IAAI,CAAC,CAACE,OAAO,GAC/FN,WAAW,CAACO,WAAW;UAC3B,CAAC,MAAM;YACLZ,qBAAqB,CAACK,WAAW,CAACe,WAAW,CAAC,CAACf,WAAW,CAACS,WAAW,CAAC,CAACT,WAAW,CAACI,IAAI,CAAC,GACvFJ,WAAW,CAACO,WAAW;UAC3B;QACF;QACA;MACF;QACE,MAAM,IAAIS,KAAK,CAAE,yCAAwChB,WAAW,CAACC,MAAO,EAAC,CAAC;IAClF;EACF;EACA,OAAO;IACLJ,eAAe,EAAEoB,KAAK,CAACC,IAAI,CAACrB,eAAe,CAAC;IAC5CE,iBAAiB,EAAEkB,KAAK,CAACC,IAAI,CAACnB,iBAAiB,CAAC;IAChDH;EACF,CAAC;AACH"}
+{"version":3,"names":["applyUpdates","outdatedPkgs","variantPoliciesByPatterns","updatedWorkspacePolicyEntries","updatedVariants","Set","updatedComponents","Map","outdatedPkg","_outdatedPkg$dependen","source","dependentComponents","length","isAuto","_outdatedPkg$dependen2","componentId","forEach","id","toString","has","set","config","policy","get","targetField","name","latestRange","push","dependencyId","value","version","lifecycleType","variantPattern","_variantPoliciesByPat","_variantPoliciesByPat2","_variantPoliciesByPat3","add","Error","Array","from","values"],"sources":["apply-updates.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component';\nimport { MergedOutdatedPkg } from './dependency-resolver.main.runtime';\nimport { VariantPolicyConfigObject, WorkspacePolicyEntry } from './policy';\n\nexport interface UpdatedComponent {\n  componentId: ComponentID;\n  config: Record<string, any>;\n}\n\n/**\n * Applies updates to policies.\n */\nexport function applyUpdates(\n  outdatedPkgs: Array<Omit<MergedOutdatedPkg, 'currentRange'>>,\n  {\n    variantPoliciesByPatterns,\n  }: {\n    variantPoliciesByPatterns: Record<string, VariantPolicyConfigObject>;\n  }\n): {\n  updatedVariants: string[];\n  updatedComponents: UpdatedComponent[];\n  updatedWorkspacePolicyEntries: WorkspacePolicyEntry[];\n} {\n  const updatedWorkspacePolicyEntries: WorkspacePolicyEntry[] = [];\n  const updatedVariants = new Set<string>();\n  const updatedComponents = new Map<string, UpdatedComponent>();\n\n  for (const outdatedPkg of outdatedPkgs) {\n    if (\n      outdatedPkg.source === 'component' ||\n      (outdatedPkg.source === 'rootPolicy' && outdatedPkg.dependentComponents?.length && !outdatedPkg.isAuto)\n    ) {\n      // eslint-disable-next-line\n      (outdatedPkg.dependentComponents ?? [outdatedPkg.componentId!]).forEach((componentId) => {\n        const id = componentId.toString();\n        if (!updatedComponents.has(id)) {\n          updatedComponents.set(id, { componentId, config: { policy: {} } });\n        }\n        const { config } = updatedComponents.get(id)!; // eslint-disable-line\n        if (!config.policy[outdatedPkg.targetField]) {\n          config.policy[outdatedPkg.targetField] = {};\n        }\n        config.policy[outdatedPkg.targetField][outdatedPkg.name] = outdatedPkg.latestRange;\n      });\n    } else {\n      switch (outdatedPkg.source) {\n        case 'rootPolicy':\n        case 'component-model':\n          updatedWorkspacePolicyEntries.push({\n            dependencyId: outdatedPkg.name,\n            value: {\n              version: outdatedPkg.latestRange,\n            },\n            lifecycleType: outdatedPkg.targetField === 'peerDependencies' ? 'peer' : 'runtime',\n          });\n          break;\n        case 'variants':\n          if (outdatedPkg.variantPattern) {\n            const { variantPattern, targetField, name } = outdatedPkg;\n            updatedVariants.add(outdatedPkg.variantPattern);\n            // eslint-disable-next-line dot-notation\n            if (variantPoliciesByPatterns[variantPattern]?.[targetField]?.[name]?.['version']) {\n              // eslint-disable-line\n              variantPoliciesByPatterns[variantPattern][targetField]![name]['version'] = outdatedPkg.latestRange; // eslint-disable-line\n            } else {\n              variantPoliciesByPatterns[variantPattern][targetField]![name] = outdatedPkg.latestRange; // eslint-disable-line\n            }\n          }\n          break;\n        default:\n          throw new Error(`Unsupported policy source for update: ${outdatedPkg.source}`);\n      }\n    }\n  }\n  return {\n    updatedVariants: Array.from(updatedVariants),\n    updatedComponents: Array.from(updatedComponents.values()),\n    updatedWorkspacePolicyEntries,\n  };\n}\n"],"mappings":"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"}

package/dist/apply-updates.spec.js

@@ -1,5 +1,12 @@
 "use strict";
 
+function _component() {
+  const data = require("@teambit/component");
+  _component = function () {
+    return data;
+  };
+  return data;
+}
 function _applyUpdates() {
   const data = require("./apply-updates");
   _applyUpdates = function () {
@@ -22,8 +29,7 @@ describe('applyUpdates()', () => {
       source: 'rootPolicy',
       targetField: 'peerDependencies'
     }], {
-      variantPoliciesByPatterns: {},
-      componentPoliciesById: {}
+      variantPoliciesByPatterns: {}
     });
     // @ts-ignore
     expect(updatedWorkspacePolicyEntries).toStrictEqual([{
@@ -111,8 +117,7 @@ describe('applyUpdates()', () => {
       variantPattern: 'variant3',
       targetField: 'peerDependencies'
     }], {
-      variantPoliciesByPatterns,
-      componentPoliciesById: {}
+      variantPoliciesByPatterns
     });
     // @ts-ignore
     expect(variantPoliciesByPatterns.variant1).toStrictEqual({
@@ -164,67 +169,46 @@ describe('applyUpdates()', () => {
     });
   });
   it('should apply updates on component dependencies', () => {
-    const componentPoliciesById = {
-      component1: {
-        dependencies: {
-          'component1-runtime-dep1': {
-            version: '1.0.0',
-            resolveFromEnv: true
-          },
-          'component1-runtime-dep2': '1.0.0'
-        },
-        devDependencies: {
-          'component1-dev-dep1': '1.0.0',
-          'component1-dev-dep2': '1.0.0'
-        },
-        peerDependencies: {
-          'component1-peer-dep1': '1.0.0',
-          'component1-peer-dep2': '1.0.0'
-        }
-      }
-    };
-    (0, _applyUpdates().applyUpdates)([{
+    const {
+      updatedComponents
+    } = (0, _applyUpdates().applyUpdates)([{
       name: 'component1-runtime-dep1',
       latestRange: '2.0.0',
       source: 'component',
-      componentId: 'component1',
+      componentId: _component().ComponentID.fromString('scope/component1'),
       targetField: 'dependencies'
     }, {
       name: 'component1-dev-dep1',
       latestRange: '2.0.0',
       source: 'component',
-      componentId: 'component1',
+      componentId: _component().ComponentID.fromString('scope/component1'),
       targetField: 'devDependencies'
     }, {
       name: 'component1-peer-dep1',
       latestRange: '2.0.0',
       source: 'component',
-      componentId: 'component1',
+      componentId: _component().ComponentID.fromString('scope/component1'),
       targetField: 'peerDependencies'
     }], {
-      variantPoliciesByPatterns: {},
-      componentPoliciesById
+      variantPoliciesByPatterns: {}
     });
     // @ts-ignore
-    expect(componentPoliciesById).toStrictEqual({
-      component1: {
-        dependencies: {
-          'component1-runtime-dep1': {
-            version: '2.0.0',
-            resolveFromEnv: true
+    expect(updatedComponents).toStrictEqual([{
+      componentId: _component().ComponentID.fromString('scope/component1'),
+      config: {
+        policy: {
+          dependencies: {
+            'component1-runtime-dep1': '2.0.0'
           },
-          'component1-runtime-dep2': '1.0.0'
-        },
-        devDependencies: {
-          'component1-dev-dep1': '2.0.0',
-          'component1-dev-dep2': '1.0.0'
-        },
-        peerDependencies: {
-          'component1-peer-dep1': '2.0.0',
-          'component1-peer-dep2': '1.0.0'
+          devDependencies: {
+            'component1-dev-dep1': '2.0.0'
+          },
+          peerDependencies: {
+            'component1-peer-dep1': '2.0.0'
+          }
         }
       }
-    });
+    }]);
   });
 });
 

package/dist/apply-updates.spec.js.map

@@ -1 +1 @@
-{"version":3,"names":["_applyUpdates","data","require","describe","it","updatedWorkspacePolicyEntries","applyUpdates","name","latestRange","source","targetField","variantPoliciesByPatterns","componentPoliciesById","expect","toStrictEqual","dependencyId","value","version","lifecycleType","updateExisting","variant1","dependencies","resolveFromEnv","devDependencies","peerDependencies","variant2","variant3","variantPattern","component1","componentId"],"sources":["apply-updates.spec.ts"],"sourcesContent":["import { applyUpdates } from './apply-updates';\n\ndescribe('applyUpdates()', () => {\n  it('should apply updates on root dependencies', () => {\n    const { updatedWorkspacePolicyEntries } = applyUpdates(\n      [\n        {\n          name: 'lodash',\n          latestRange: '2.0.0',\n          source: 'rootPolicy',\n          targetField: 'dependencies' as const,\n        },\n        {\n          name: 'react-dom',\n          latestRange: '2.0.0',\n          source: 'rootPolicy',\n          targetField: 'peerDependencies' as const,\n        },\n      ],\n      {\n        variantPoliciesByPatterns: {},\n        componentPoliciesById: {},\n      }\n    );\n    // @ts-ignore\n    expect(updatedWorkspacePolicyEntries).toStrictEqual(\n      [\n        {\n          dependencyId: 'lodash',\n          value: {\n            version: '2.0.0',\n          },\n          lifecycleType: 'runtime',\n        },\n        {\n          dependencyId: 'react-dom',\n          value: {\n            version: '2.0.0',\n          },\n          lifecycleType: 'peer',\n        },\n      ],\n      // @ts-ignore\n      { updateExisting: true }\n    );\n  });\n  it('should apply updates on variant dependencies', () => {\n    const variantPoliciesByPatterns = {\n      variant1: {\n        dependencies: {\n          'variant1-runtime-dep1': { version: '1.0.0', resolveFromEnv: true },\n          'variant1-runtime-dep2': '1.0.0',\n        },\n        devDependencies: {\n          'variant1-dev-dep1': '1.0.0',\n          'variant1-dev-dep2': '1.0.0',\n        },\n        peerDependencies: {\n          'variant1-peer-dep1': '1.0.0',\n          'variant1-peer-dep2': '1.0.0',\n        },\n      },\n      variant2: {\n        dependencies: {\n          'variant2-runtime-dep1': '1.0.0',\n          'variant2-runtime-dep2': '1.0.0',\n        },\n        devDependencies: {\n          'variant2-dev-dep1': '1.0.0',\n          'variant2-dev-dep2': '1.0.0',\n        },\n        peerDependencies: {\n          'variant2-peer-dep1': '1.0.0',\n          'variant2-peer-dep2': '1.0.0',\n        },\n      },\n      variant3: {\n        dependencies: {\n          'variant3-runtime-dep1': '1.0.0',\n          'variant3-runtime-dep2': '1.0.0',\n        },\n        devDependencies: {\n          'variant3-dev-dep1': '1.0.0',\n          'variant3-dev-dep2': '1.0.0',\n        },\n        peerDependencies: {\n          'variant3-peer-dep1': '1.0.0',\n          'variant3-peer-dep2': '1.0.0',\n        },\n      },\n    };\n    applyUpdates(\n      [\n        {\n          name: 'variant1-runtime-dep1',\n          latestRange: '2.0.0',\n          source: 'variants',\n          variantPattern: 'variant1',\n          targetField: 'dependencies',\n        },\n        {\n          name: 'variant2-dev-dep1',\n          latestRange: '2.0.0',\n          source: 'variants',\n          variantPattern: 'variant2',\n          targetField: 'devDependencies',\n        },\n        {\n          name: 'variant3-peer-dep1',\n          latestRange: '2.0.0',\n          source: 'variants',\n          variantPattern: 'variant3',\n          targetField: 'peerDependencies',\n        },\n      ],\n      {\n        variantPoliciesByPatterns,\n        componentPoliciesById: {},\n      }\n    );\n    // @ts-ignore\n    expect(variantPoliciesByPatterns.variant1).toStrictEqual({\n      dependencies: {\n        'variant1-runtime-dep1': { version: '2.0.0', resolveFromEnv: true },\n        'variant1-runtime-dep2': '1.0.0',\n      },\n      devDependencies: {\n        'variant1-dev-dep1': '1.0.0',\n        'variant1-dev-dep2': '1.0.0',\n      },\n      peerDependencies: {\n        'variant1-peer-dep1': '1.0.0',\n        'variant1-peer-dep2': '1.0.0',\n      },\n    });\n    // @ts-ignore\n    expect(variantPoliciesByPatterns.variant2).toStrictEqual({\n      dependencies: {\n        'variant2-runtime-dep1': '1.0.0',\n        'variant2-runtime-dep2': '1.0.0',\n      },\n      devDependencies: {\n        'variant2-dev-dep1': '2.0.0',\n        'variant2-dev-dep2': '1.0.0',\n      },\n      peerDependencies: {\n        'variant2-peer-dep1': '1.0.0',\n        'variant2-peer-dep2': '1.0.0',\n      },\n    });\n    // @ts-ignore\n    expect(variantPoliciesByPatterns.variant3).toStrictEqual({\n      dependencies: {\n        'variant3-runtime-dep1': '1.0.0',\n        'variant3-runtime-dep2': '1.0.0',\n      },\n      devDependencies: {\n        'variant3-dev-dep1': '1.0.0',\n        'variant3-dev-dep2': '1.0.0',\n      },\n      peerDependencies: {\n        'variant3-peer-dep1': '2.0.0',\n        'variant3-peer-dep2': '1.0.0',\n      },\n    });\n  });\n  it('should apply updates on component dependencies', () => {\n    const componentPoliciesById = {\n      component1: {\n        dependencies: {\n          'component1-runtime-dep1': { version: '1.0.0', resolveFromEnv: true },\n          'component1-runtime-dep2': '1.0.0',\n        },\n        devDependencies: {\n          'component1-dev-dep1': '1.0.0',\n          'component1-dev-dep2': '1.0.0',\n        },\n        peerDependencies: {\n          'component1-peer-dep1': '1.0.0',\n          'component1-peer-dep2': '1.0.0',\n        },\n      },\n    };\n    applyUpdates(\n      [\n        {\n          name: 'component1-runtime-dep1',\n          latestRange: '2.0.0',\n          source: 'component',\n          componentId: 'component1',\n          targetField: 'dependencies',\n        },\n        {\n          name: 'component1-dev-dep1',\n          latestRange: '2.0.0',\n          source: 'component',\n          componentId: 'component1',\n          targetField: 'devDependencies',\n        },\n        {\n          name: 'component1-peer-dep1',\n          latestRange: '2.0.0',\n          source: 'component',\n          componentId: 'component1',\n          targetField: 'peerDependencies',\n        },\n      ],\n      {\n        variantPoliciesByPatterns: {},\n        componentPoliciesById,\n      }\n    );\n    // @ts-ignore\n    expect(componentPoliciesById).toStrictEqual({\n      component1: {\n        dependencies: {\n          'component1-runtime-dep1': { version: '2.0.0', resolveFromEnv: true },\n          'component1-runtime-dep2': '1.0.0',\n        },\n        devDependencies: {\n          'component1-dev-dep1': '2.0.0',\n          'component1-dev-dep2': '1.0.0',\n        },\n        peerDependencies: {\n          'component1-peer-dep1': '2.0.0',\n          'component1-peer-dep2': '1.0.0',\n        },\n      },\n    });\n  });\n});\n"],"mappings":"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"}
+{"version":3,"names":["_component","data","require","_applyUpdates","describe","it","updatedWorkspacePolicyEntries","applyUpdates","name","latestRange","source","targetField","variantPoliciesByPatterns","expect","toStrictEqual","dependencyId","value","version","lifecycleType","updateExisting","variant1","dependencies","resolveFromEnv","devDependencies","peerDependencies","variant2","variant3","variantPattern","updatedComponents","componentId","ComponentID","fromString","config","policy"],"sources":["apply-updates.spec.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component';\nimport { applyUpdates } from './apply-updates';\n\ndescribe('applyUpdates()', () => {\n  it('should apply updates on root dependencies', () => {\n    const { updatedWorkspacePolicyEntries } = applyUpdates(\n      [\n        {\n          name: 'lodash',\n          latestRange: '2.0.0',\n          source: 'rootPolicy',\n          targetField: 'dependencies' as const,\n        },\n        {\n          name: 'react-dom',\n          latestRange: '2.0.0',\n          source: 'rootPolicy',\n          targetField: 'peerDependencies' as const,\n        },\n      ],\n      {\n        variantPoliciesByPatterns: {},\n      }\n    );\n    // @ts-ignore\n    expect(updatedWorkspacePolicyEntries).toStrictEqual(\n      [\n        {\n          dependencyId: 'lodash',\n          value: {\n            version: '2.0.0',\n          },\n          lifecycleType: 'runtime',\n        },\n        {\n          dependencyId: 'react-dom',\n          value: {\n            version: '2.0.0',\n          },\n          lifecycleType: 'peer',\n        },\n      ],\n      // @ts-ignore\n      { updateExisting: true }\n    );\n  });\n  it('should apply updates on variant dependencies', () => {\n    const variantPoliciesByPatterns = {\n      variant1: {\n        dependencies: {\n          'variant1-runtime-dep1': { version: '1.0.0', resolveFromEnv: true },\n          'variant1-runtime-dep2': '1.0.0',\n        },\n        devDependencies: {\n          'variant1-dev-dep1': '1.0.0',\n          'variant1-dev-dep2': '1.0.0',\n        },\n        peerDependencies: {\n          'variant1-peer-dep1': '1.0.0',\n          'variant1-peer-dep2': '1.0.0',\n        },\n      },\n      variant2: {\n        dependencies: {\n          'variant2-runtime-dep1': '1.0.0',\n          'variant2-runtime-dep2': '1.0.0',\n        },\n        devDependencies: {\n          'variant2-dev-dep1': '1.0.0',\n          'variant2-dev-dep2': '1.0.0',\n        },\n        peerDependencies: {\n          'variant2-peer-dep1': '1.0.0',\n          'variant2-peer-dep2': '1.0.0',\n        },\n      },\n      variant3: {\n        dependencies: {\n          'variant3-runtime-dep1': '1.0.0',\n          'variant3-runtime-dep2': '1.0.0',\n        },\n        devDependencies: {\n          'variant3-dev-dep1': '1.0.0',\n          'variant3-dev-dep2': '1.0.0',\n        },\n        peerDependencies: {\n          'variant3-peer-dep1': '1.0.0',\n          'variant3-peer-dep2': '1.0.0',\n        },\n      },\n    };\n    applyUpdates(\n      [\n        {\n          name: 'variant1-runtime-dep1',\n          latestRange: '2.0.0',\n          source: 'variants',\n          variantPattern: 'variant1',\n          targetField: 'dependencies',\n        },\n        {\n          name: 'variant2-dev-dep1',\n          latestRange: '2.0.0',\n          source: 'variants',\n          variantPattern: 'variant2',\n          targetField: 'devDependencies',\n        },\n        {\n          name: 'variant3-peer-dep1',\n          latestRange: '2.0.0',\n          source: 'variants',\n          variantPattern: 'variant3',\n          targetField: 'peerDependencies',\n        },\n      ],\n      {\n        variantPoliciesByPatterns,\n      }\n    );\n    // @ts-ignore\n    expect(variantPoliciesByPatterns.variant1).toStrictEqual({\n      dependencies: {\n        'variant1-runtime-dep1': { version: '2.0.0', resolveFromEnv: true },\n        'variant1-runtime-dep2': '1.0.0',\n      },\n      devDependencies: {\n        'variant1-dev-dep1': '1.0.0',\n        'variant1-dev-dep2': '1.0.0',\n      },\n      peerDependencies: {\n        'variant1-peer-dep1': '1.0.0',\n        'variant1-peer-dep2': '1.0.0',\n      },\n    });\n    // @ts-ignore\n    expect(variantPoliciesByPatterns.variant2).toStrictEqual({\n      dependencies: {\n        'variant2-runtime-dep1': '1.0.0',\n        'variant2-runtime-dep2': '1.0.0',\n      },\n      devDependencies: {\n        'variant2-dev-dep1': '2.0.0',\n        'variant2-dev-dep2': '1.0.0',\n      },\n      peerDependencies: {\n        'variant2-peer-dep1': '1.0.0',\n        'variant2-peer-dep2': '1.0.0',\n      },\n    });\n    // @ts-ignore\n    expect(variantPoliciesByPatterns.variant3).toStrictEqual({\n      dependencies: {\n        'variant3-runtime-dep1': '1.0.0',\n        'variant3-runtime-dep2': '1.0.0',\n      },\n      devDependencies: {\n        'variant3-dev-dep1': '1.0.0',\n        'variant3-dev-dep2': '1.0.0',\n      },\n      peerDependencies: {\n        'variant3-peer-dep1': '2.0.0',\n        'variant3-peer-dep2': '1.0.0',\n      },\n    });\n  });\n  it('should apply updates on component dependencies', () => {\n    const { updatedComponents } = applyUpdates(\n      [\n        {\n          name: 'component1-runtime-dep1',\n          latestRange: '2.0.0',\n          source: 'component',\n          componentId: ComponentID.fromString('scope/component1'),\n          targetField: 'dependencies',\n        },\n        {\n          name: 'component1-dev-dep1',\n          latestRange: '2.0.0',\n          source: 'component',\n          componentId: ComponentID.fromString('scope/component1'),\n          targetField: 'devDependencies',\n        },\n        {\n          name: 'component1-peer-dep1',\n          latestRange: '2.0.0',\n          source: 'component',\n          componentId: ComponentID.fromString('scope/component1'),\n          targetField: 'peerDependencies',\n        },\n      ],\n      {\n        variantPoliciesByPatterns: {},\n      }\n    );\n    // @ts-ignore\n    expect(updatedComponents).toStrictEqual([\n      {\n        componentId: ComponentID.fromString('scope/component1'),\n        config: {\n          policy: {\n            dependencies: {\n              'component1-runtime-dep1': '2.0.0',\n            },\n            devDependencies: {\n              'component1-dev-dep1': '2.0.0',\n            },\n            peerDependencies: {\n              'component1-peer-dep1': '2.0.0',\n            },\n          },\n        },\n      },\n    ]);\n  });\n});\n"],"mappings":"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"}

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

@@ -18,6 +18,7 @@ import semver from 'semver';
 import { AspectLoaderMain } from '@teambit/aspect-loader';
 import { GlobalConfigMain } from '@teambit/global-config';
 import { Registries } from './registry';
+import { UpdatedComponent } from './apply-updates';
 import { DependencyInstaller, PreInstallSubscriberList, PostInstallSubscriberList, DepInstallerContext } from './dependency-installer';
 import { DependencyVersionResolver } from './dependency-version-resolver';
 import { DepLinkerContext, DependencyLinker, LinkingOptions } from './dependency-linker';
@@ -431,14 +432,17 @@ export declare class DependencyResolverMain {
     /**
      * Return a list of outdated policy dependencies.
      */
-    getOutdatedPkgsFromPolicies({ rootDir, variantPoliciesByPatterns, componentPoliciesById, components, patterns, forceVersionBump, }: {
+    getOutdatedPkgsFromPolicies({ rootDir, variantPoliciesByPatterns, componentPolicies, components, patterns, forceVersionBump, }: {
         rootDir: string;
         variantPoliciesByPatterns: Record<string, VariantPolicyConfigObject>;
-        componentPoliciesById: Record<string, any>;
+        componentPolicies: Array<{
+            componentId: ComponentID;
+            policy: any;
+        }>;
         components: Component[];
         patterns?: string[];
         forceVersionBump?: 'major' | 'minor' | 'patch';
-    }): Promise<OutdatedPkg[]>;
+    }): Promise<MergedOutdatedPkg[]>;
     /**
      * Accepts a list of package dependency policies and returns a list of outdated policies extended with their "latestRange"
      */
@@ -460,10 +464,9 @@ export declare class DependencyResolverMain {
      */
     applyUpdates(outdatedPkgs: Array<Omit<OutdatedPkg, 'currentRange'>>, options: {
         variantPoliciesByPatterns: Record<string, any>;
-        componentPoliciesById: Record<string, any>;
     }): {
         updatedVariants: string[];
-        updatedComponents: string[];
+        updatedComponents: UpdatedComponent[];
     };
     static runtime: import("@teambit/bit").RuntimeDefinition;
     static dependencies: Aspect[];
@@ -498,3 +501,7 @@ export declare class DependencyResolverMain {
     getInjectedDirs(rootDir: string, componentDir: string, packageName: string): Promise<string[]>;
     getWorkspaceDepsOfBitRoots(manifests: ProjectManifest[]): Record<string, string>;
 }
+export interface MergedOutdatedPkg extends OutdatedPkg {
+    dependentComponents?: ComponentID[];
+    hasDifferentRanges?: boolean;
+}

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

@@ -1233,7 +1233,7 @@ class DependencyResolverMain {
   async getOutdatedPkgsFromPolicies({
     rootDir,
     variantPoliciesByPatterns,
-    componentPoliciesById,
+    componentPolicies,
     components,
     patterns,
     forceVersionBump
@@ -1249,14 +1249,15 @@ class DependencyResolverMain {
         name: dep.getPackageName(),
         // eslint-disable-line
         version: dep.version,
-        componentId: component.id.toString(),
+        isAuto: dep.source === 'auto',
+        componentId: component.id,
         lifecycleType: dep.lifecycle
       }));
     }))).flat();
     let allPkgs = (0, _getAllPolicyPkgs().getAllPolicyPkgs)({
       rootPolicy: this.getWorkspacePolicyFromConfig(),
       variantPoliciesByPatterns,
-      componentPoliciesById,
+      componentPolicies,
       componentModelVersions
     });
     if (patterns !== null && patterns !== void 0 && patterns.length) {
@@ -1267,10 +1268,11 @@ class DependencyResolverMain {
         name
       }) => selectedPkgNames.has(name));
     }
-    return this.getOutdatedPkgs({
+    const outdatedPkgs = await this.getOutdatedPkgs({
       rootDir,
       forceVersionBump
     }, allPkgs);
+    return mergeOutdatedPkgs(outdatedPkgs);
   }
 
   /**
@@ -1316,8 +1318,7 @@ class DependencyResolverMain {
       updatedComponents,
       updatedWorkspacePolicyEntries
     } = (0, _applyUpdates().applyUpdates)(outdatedPkgs, {
-      variantPoliciesByPatterns: options.variantPoliciesByPatterns,
-      componentPoliciesById: options.componentPoliciesById
+      variantPoliciesByPatterns: options.variantPoliciesByPatterns
     });
     this.addToRootPolicy(updatedWorkspacePolicyEntries, {
       updateExisting: true
@@ -1423,5 +1424,45 @@ function newVersionRange(currentRange, forceVersionBump) {
       return null;
   }
 }
+function mergeOutdatedPkgs(outdatedPkgs) {
+  const mergedOutdatedPkgs = {};
+  const outdatedPkgsNotFromComponentModel = [];
+  for (const outdatedPkg of outdatedPkgs) {
+    if (outdatedPkg.source === 'component-model' && outdatedPkg.componentId) {
+      if (!mergedOutdatedPkgs[outdatedPkg.name]) {
+        mergedOutdatedPkgs[outdatedPkg.name] = _objectSpread(_objectSpread({}, (0, _lodash().omit)(outdatedPkg, ['componentId'])), {}, {
+          source: 'rootPolicy',
+          dependentComponents: [outdatedPkg.componentId]
+        });
+      } else {
+        if (mergedOutdatedPkgs[outdatedPkg.name].currentRange !== outdatedPkg.currentRange) {
+          mergedOutdatedPkgs[outdatedPkg.name].hasDifferentRanges = true;
+        }
+        mergedOutdatedPkgs[outdatedPkg.name].currentRange = tryPickLowestRange(mergedOutdatedPkgs[outdatedPkg.name].currentRange, outdatedPkg.currentRange);
+        mergedOutdatedPkgs[outdatedPkg.name].dependentComponents.push(outdatedPkg.componentId);
+        if (outdatedPkg.targetField === 'dependencies') {
+          mergedOutdatedPkgs[outdatedPkg.name].targetField = outdatedPkg.targetField;
+        }
+      }
+    } else {
+      outdatedPkgsNotFromComponentModel.push(outdatedPkg);
+    }
+  }
+  return [...Object.values(mergedOutdatedPkgs), ...outdatedPkgsNotFromComponentModel];
+}
+function tryPickLowestRange(range1, range2) {
+  if (range1 === '*' || range2 === '*') return '*';
+  try {
+    return _semver().default.lt(rangeToVersion(range1), rangeToVersion(range2)) ? range1 : range2;
+  } catch (_unused2) {
+    return '*';
+  }
+}
+function rangeToVersion(range) {
+  if (range.startsWith('~') || range.startsWith('^')) {
+    return range.substring(1);
+  }
+  return range;
+}
 
 //# sourceMappingURL=dependency-resolver.main.runtime.js.map