@teambit/merging 1.0.1239 → 1.0.1240

package/dist/merge-dependencies.d.ts

@@ -0,0 +1,48 @@
+import type { MergeStrategy } from '@teambit/component.modules.merge-helper';
+import type { ComponentIdList } from '@teambit/component-id';
+import type { ExtensionDataList } from '@teambit/legacy.extension-data';
+import { Dependencies } from '@teambit/legacy.consumer-component';
+declare const COMPONENT_DEPS_FIELDS: readonly ['dependencies', 'devDependencies', 'peerDependencies'];
+declare const PACKAGE_DEPS_FIELDS: readonly ['packageDependencies', 'devPackageDependencies', 'peerPackageDependencies'];
+type ComponentDepsField = (typeof COMPONENT_DEPS_FIELDS)[number];
+type PackageDepsField = (typeof PACKAGE_DEPS_FIELDS)[number];
+/**
+ * the dependency fields shared by a Version object and a ConsumerComponent.
+ */
+export type DependenciesSnapshot = {
+    [field in ComponentDepsField]: Dependencies;
+} & {
+    [field in PackageDepsField]: Record<string, string>;
+};
+/**
+ * the dependencies of a Version, with the package names of the component dependencies, same as a component loaded from
+ * the scope has them (see ModelComponent.toConsumerComponent). without them, a dependency of a Version and the same
+ * dependency of a loaded component are not equal.
+ * returns copies, so they can be changed (e.g. set to a component that is snapped) without changing the Version.
+ */
+export declare function getDependenciesOfVersion(version: DependenciesSnapshot & {
+    extensions: ExtensionDataList;
+}): DependenciesSnapshot;
+/**
+ * 3-way merge of the resolved dependencies of a component: base (the common snap), current (the target lane) and
+ * other (the merged lane/main).
+ *
+ * a workspace merge gets the dependencies of the merged component by re-detecting them from the merged files. a bare
+ * scope has no node_modules to resolve imports against, so it merges the dependencies that each side resolved when it
+ * was snapped instead: a dependency added or removed on one side, or whose version or type (runtime/dev/peer) changed
+ * on one side, is taken from that side. it's close to what the detection finds, not identical. e.g. when one side
+ * removed an import of a dependency from one file and the other side added an import of it to another file, the
+ * dependency is removed, although the merged files still import it.
+ *
+ * each dependency is keyed by its name, and its field (runtime/dev/peer) is part of what is compared, so a dependency
+ * that moved between fields on one side is taken from that side, and it's never added to two fields.
+ * when both sides changed the same dependency differently, "theirs" takes other, any other strategy keeps current
+ * (in "manual", such a version conflict is reported by the config-merger, which stops the merge before the snap).
+ * the returned component dependencies are copies, so they can be changed without changing the inputs.
+ *
+ * `laneComponentIds` are the components of the current lane. a dependency on one of them gets the lane's version
+ * anyway (see MergingMain.setLaneVersionsOfDeps), so its version is not compared. otherwise, the lane snap of it would
+ * look like a change on the lane, and a removal of it on the other side would be lost.
+ */
+export declare function mergeDependencies(base: DependenciesSnapshot, current: DependenciesSnapshot, other: DependenciesSnapshot, mergeStrategy?: MergeStrategy, laneComponentIds?: ComponentIdList): DependenciesSnapshot;
+export {};

package/dist/merge-dependencies.js

@@ -0,0 +1,138 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDependenciesOfVersion = getDependenciesOfVersion;
+exports.mergeDependencies = mergeDependencies;
+function _lodash() {
+  const data = require("lodash");
+  _lodash = function () {
+    return data;
+  };
+  return data;
+}
+function _legacy() {
+  const data = require("@teambit/legacy.consumer-component");
+  _legacy = function () {
+    return data;
+  };
+  return data;
+}
+function _objects() {
+  const data = require("@teambit/objects");
+  _objects = function () {
+    return data;
+  };
+  return data;
+}
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+const COMPONENT_DEPS_FIELDS = ['dependencies', 'devDependencies', 'peerDependencies'];
+const PACKAGE_DEPS_FIELDS = ['packageDependencies', 'devPackageDependencies', 'peerPackageDependencies'];
+
+/**
+ * the dependency fields shared by a Version object and a ConsumerComponent.
+ */
+
+/**
+ * the dependencies of a Version, with the package names of the component dependencies, same as a component loaded from
+ * the scope has them (see ModelComponent.toConsumerComponent). without them, a dependency of a Version and the same
+ * dependency of a loaded component are not equal.
+ * returns copies, so they can be changed (e.g. set to a component that is snapped) without changing the Version.
+ */
+function getDependenciesOfVersion(version) {
+  const withPackageNames = deps => new (_legacy().Dependencies)(_objects().ModelComponent.addDepsInfoFromDepsResolver(deps, version.extensions));
+  return {
+    dependencies: withPackageNames(version.dependencies),
+    devDependencies: withPackageNames(version.devDependencies),
+    peerDependencies: withPackageNames(version.peerDependencies),
+    packageDependencies: _objectSpread({}, version.packageDependencies),
+    devPackageDependencies: _objectSpread({}, version.devPackageDependencies),
+    peerPackageDependencies: _objectSpread({}, version.peerPackageDependencies)
+  };
+}
+
+/**
+ * 3-way merge of the resolved dependencies of a component: base (the common snap), current (the target lane) and
+ * other (the merged lane/main).
+ *
+ * a workspace merge gets the dependencies of the merged component by re-detecting them from the merged files. a bare
+ * scope has no node_modules to resolve imports against, so it merges the dependencies that each side resolved when it
+ * was snapped instead: a dependency added or removed on one side, or whose version or type (runtime/dev/peer) changed
+ * on one side, is taken from that side. it's close to what the detection finds, not identical. e.g. when one side
+ * removed an import of a dependency from one file and the other side added an import of it to another file, the
+ * dependency is removed, although the merged files still import it.
+ *
+ * each dependency is keyed by its name, and its field (runtime/dev/peer) is part of what is compared, so a dependency
+ * that moved between fields on one side is taken from that side, and it's never added to two fields.
+ * when both sides changed the same dependency differently, "theirs" takes other, any other strategy keeps current
+ * (in "manual", such a version conflict is reported by the config-merger, which stops the merge before the snap).
+ * the returned component dependencies are copies, so they can be changed without changing the inputs.
+ *
+ * `laneComponentIds` are the components of the current lane. a dependency on one of them gets the lane's version
+ * anyway (see MergingMain.setLaneVersionsOfDeps), so its version is not compared. otherwise, the lane snap of it would
+ * look like a change on the lane, and a removal of it on the other side would be lost.
+ */
+function mergeDependencies(base, current, other, mergeStrategy, laneComponentIds) {
+  const componentDeps = snapshot => new Map(COMPONENT_DEPS_FIELDS.flatMap(field => snapshot[field].get().map(dep => [dep.id.toStringWithoutVersion(), {
+    field,
+    value: dep
+  }])));
+  // all the persisted data is compared (e.g. the import paths and the version range), not only the id, so a change of
+  // any of them on one side is not lost. (no methods are called, a loaded component has the dependencies as plain objects)
+  const isSameDep = (a, b) => (laneComponentIds?.hasWithoutVersion(a.id) ? a.id.isEqualWithoutVersion(b.id) : a.id.isEqual(b.id)) && a.packageName === b.packageName && a.versionRange === b.versionRange && (0, _lodash().isEqual)(a.relativePaths, b.relativePaths);
+  const mergedCompDeps = mergeEntries(componentDeps(base), componentDeps(current), componentDeps(other), mergeStrategy, isSameDep);
+  const packageDeps = snapshot => new Map(PACKAGE_DEPS_FIELDS.flatMap(field => Object.entries(snapshot[field] || {}).map(([name, version]) => [name, {
+    field,
+    value: version
+  }])));
+  const mergedPkgDeps = mergeEntries(packageDeps(base), packageDeps(current), packageDeps(other), mergeStrategy, (a, b) => a === b);
+  const compDepsOf = field => new (_legacy().Dependencies)(mergedCompDeps.filter(entry => entry.field === field).map(({
+    value
+  }) => cloneDependency(value)));
+  const pkgDepsOf = field => Object.fromEntries(mergedPkgDeps.filter(entry => entry.field === field).map(({
+    key,
+    value
+  }) => [key, value]));
+  return {
+    dependencies: compDepsOf('dependencies'),
+    devDependencies: compDepsOf('devDependencies'),
+    peerDependencies: compDepsOf('peerDependencies'),
+    packageDependencies: pkgDepsOf('packageDependencies'),
+    devPackageDependencies: pkgDepsOf('devPackageDependencies'),
+    peerPackageDependencies: pkgDepsOf('peerPackageDependencies')
+  };
+}
+/**
+ * 3-way merge of the entries of each key. an entry is unchanged between two sides when it's in the same field with an
+ * equal value. returns the merged entries that exist (not removed).
+ */
+function mergeEntries(base, current, other, mergeStrategy, isEqualValue) {
+  return (0, _lodash().union)([...current.keys()], [...other.keys()]).flatMap(key => {
+    const merged = mergeValue(base.get(key), current.get(key), other.get(key), mergeStrategy, (a, b) => a.field === b.field && isEqualValue(a.value, b.value));
+    return merged ? [_objectSpread({
+      key
+    }, merged)] : [];
+  });
+}
+
+/**
+ * returns undefined when the merged result is "absent" (removed or never existed).
+ */
+function mergeValue(base, current, other, mergeStrategy, isEqualValue) {
+  const equal = (a, b) => a === undefined || b === undefined ? a === b : isEqualValue(a, b);
+  if (equal(current, other)) return current;
+  if (equal(base, current)) return other; // changed (or removed) on other only
+  if (equal(base, other)) return current; // changed (or removed) on current only
+  return mergeStrategy === 'theirs' ? other : current;
+}
+function cloneDependency(dep) {
+  const clone = _legacy().Dependency.getClone(dep);
+  return new (_legacy().Dependency)(clone.id, clone.relativePaths, clone.packageName, clone.versionRange);
+}
+
+//# sourceMappingURL=merge-dependencies.js.map

package/dist/merge-dependencies.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_lodash","data","require","_legacy","_objects","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","COMPONENT_DEPS_FIELDS","PACKAGE_DEPS_FIELDS","getDependenciesOfVersion","version","withPackageNames","deps","Dependencies","ModelComponent","addDepsInfoFromDepsResolver","extensions","dependencies","devDependencies","peerDependencies","packageDependencies","devPackageDependencies","peerPackageDependencies","mergeDependencies","base","current","other","mergeStrategy","laneComponentIds","componentDeps","snapshot","Map","flatMap","field","get","map","dep","id","toStringWithoutVersion","isSameDep","a","b","hasWithoutVersion","isEqualWithoutVersion","isEqual","packageName","versionRange","relativePaths","mergedCompDeps","mergeEntries","packageDeps","entries","name","mergedPkgDeps","compDepsOf","entry","cloneDependency","pkgDepsOf","fromEntries","key","isEqualValue","union","merged","mergeValue","equal","undefined","clone","Dependency","getClone"],"sources":["merge-dependencies.ts"],"sourcesContent":["import type { MergeStrategy } from '@teambit/component.modules.merge-helper';\nimport { isEqual, union } from 'lodash';\nimport type { ComponentIdList } from '@teambit/component-id';\nimport type { ExtensionDataList } from '@teambit/legacy.extension-data';\nimport { Dependencies, Dependency } from '@teambit/legacy.consumer-component';\nimport { ModelComponent } from '@teambit/objects';\n\nconst COMPONENT_DEPS_FIELDS = ['dependencies', 'devDependencies', 'peerDependencies'] as const;\nconst PACKAGE_DEPS_FIELDS = ['packageDependencies', 'devPackageDependencies', 'peerPackageDependencies'] as const;\n\ntype ComponentDepsField = (typeof COMPONENT_DEPS_FIELDS)[number];\ntype PackageDepsField = (typeof PACKAGE_DEPS_FIELDS)[number];\n\n/**\n * the dependency fields shared by a Version object and a ConsumerComponent.\n */\nexport type DependenciesSnapshot = { [field in ComponentDepsField]: Dependencies } & {\n  [field in PackageDepsField]: Record<string, string>;\n};\n\n/**\n * the dependencies of a Version, with the package names of the component dependencies, same as a component loaded from\n * the scope has them (see ModelComponent.toConsumerComponent). without them, a dependency of a Version and the same\n * dependency of a loaded component are not equal.\n * returns copies, so they can be changed (e.g. set to a component that is snapped) without changing the Version.\n */\nexport function getDependenciesOfVersion(\n  version: DependenciesSnapshot & { extensions: ExtensionDataList }\n): DependenciesSnapshot {\n  const withPackageNames = (deps: Dependencies) =>\n    new Dependencies(ModelComponent.addDepsInfoFromDepsResolver(deps, version.extensions));\n  return {\n    dependencies: withPackageNames(version.dependencies),\n    devDependencies: withPackageNames(version.devDependencies),\n    peerDependencies: withPackageNames(version.peerDependencies),\n    packageDependencies: { ...version.packageDependencies },\n    devPackageDependencies: { ...version.devPackageDependencies },\n    peerPackageDependencies: { ...version.peerPackageDependencies },\n  };\n}\n\n/**\n * 3-way merge of the resolved dependencies of a component: base (the common snap), current (the target lane) and\n * other (the merged lane/main).\n *\n * a workspace merge gets the dependencies of the merged component by re-detecting them from the merged files. a bare\n * scope has no node_modules to resolve imports against, so it merges the dependencies that each side resolved when it\n * was snapped instead: a dependency added or removed on one side, or whose version or type (runtime/dev/peer) changed\n * on one side, is taken from that side. it's close to what the detection finds, not identical. e.g. when one side\n * removed an import of a dependency from one file and the other side added an import of it to another file, the\n * dependency is removed, although the merged files still import it.\n *\n * each dependency is keyed by its name, and its field (runtime/dev/peer) is part of what is compared, so a dependency\n * that moved between fields on one side is taken from that side, and it's never added to two fields.\n * when both sides changed the same dependency differently, \"theirs\" takes other, any other strategy keeps current\n * (in \"manual\", such a version conflict is reported by the config-merger, which stops the merge before the snap).\n * the returned component dependencies are copies, so they can be changed without changing the inputs.\n *\n * `laneComponentIds` are the components of the current lane. a dependency on one of them gets the lane's version\n * anyway (see MergingMain.setLaneVersionsOfDeps), so its version is not compared. otherwise, the lane snap of it would\n * look like a change on the lane, and a removal of it on the other side would be lost.\n */\nexport function mergeDependencies(\n  base: DependenciesSnapshot,\n  current: DependenciesSnapshot,\n  other: DependenciesSnapshot,\n  mergeStrategy?: MergeStrategy,\n  laneComponentIds?: ComponentIdList\n): DependenciesSnapshot {\n  const componentDeps = (snapshot: DependenciesSnapshot) =>\n    new Map(\n      COMPONENT_DEPS_FIELDS.flatMap((field) =>\n        snapshot[field].get().map((dep) => [dep.id.toStringWithoutVersion(), { field, value: dep }] as const)\n      )\n    );\n  // all the persisted data is compared (e.g. the import paths and the version range), not only the id, so a change of\n  // any of them on one side is not lost. (no methods are called, a loaded component has the dependencies as plain objects)\n  const isSameDep = (a: Dependency, b: Dependency) =>\n    (laneComponentIds?.hasWithoutVersion(a.id) ? a.id.isEqualWithoutVersion(b.id) : a.id.isEqual(b.id)) &&\n    a.packageName === b.packageName &&\n    a.versionRange === b.versionRange &&\n    isEqual(a.relativePaths, b.relativePaths);\n  const mergedCompDeps = mergeEntries(\n    componentDeps(base),\n    componentDeps(current),\n    componentDeps(other),\n    mergeStrategy,\n    isSameDep\n  );\n  const packageDeps = (snapshot: DependenciesSnapshot) =>\n    new Map(\n      PACKAGE_DEPS_FIELDS.flatMap((field) =>\n        Object.entries(snapshot[field] || {}).map(([name, version]) => [name, { field, value: version }] as const)\n      )\n    );\n  const mergedPkgDeps = mergeEntries(\n    packageDeps(base),\n    packageDeps(current),\n    packageDeps(other),\n    mergeStrategy,\n    (a, b) => a === b\n  );\n  const compDepsOf = (field: ComponentDepsField) =>\n    new Dependencies(\n      mergedCompDeps.filter((entry) => entry.field === field).map(({ value }) => cloneDependency(value))\n    );\n  const pkgDepsOf = (field: PackageDepsField) =>\n    Object.fromEntries(mergedPkgDeps.filter((entry) => entry.field === field).map(({ key, value }) => [key, value]));\n  return {\n    dependencies: compDepsOf('dependencies'),\n    devDependencies: compDepsOf('devDependencies'),\n    peerDependencies: compDepsOf('peerDependencies'),\n    packageDependencies: pkgDepsOf('packageDependencies'),\n    devPackageDependencies: pkgDepsOf('devPackageDependencies'),\n    peerPackageDependencies: pkgDepsOf('peerPackageDependencies'),\n  };\n}\n\ntype FieldEntry<Field, Value> = { field: Field; value: Value };\n\n/**\n * 3-way merge of the entries of each key. an entry is unchanged between two sides when it's in the same field with an\n * equal value. returns the merged entries that exist (not removed).\n */\nfunction mergeEntries<Field, Value>(\n  base: Map<string, FieldEntry<Field, Value>>,\n  current: Map<string, FieldEntry<Field, Value>>,\n  other: Map<string, FieldEntry<Field, Value>>,\n  mergeStrategy: MergeStrategy | undefined,\n  isEqualValue: (a: Value, b: Value) => boolean\n): Array<FieldEntry<Field, Value> & { key: string }> {\n  return union([...current.keys()], [...other.keys()]).flatMap((key) => {\n    const merged = mergeValue(\n      base.get(key),\n      current.get(key),\n      other.get(key),\n      mergeStrategy,\n      (a, b) => a.field === b.field && isEqualValue(a.value, b.value)\n    );\n    return merged ? [{ key, ...merged }] : [];\n  });\n}\n\n/**\n * returns undefined when the merged result is \"absent\" (removed or never existed).\n */\nfunction mergeValue<T>(\n  base: T | undefined,\n  current: T | undefined,\n  other: T | undefined,\n  mergeStrategy: MergeStrategy | undefined,\n  isEqualValue: (a: T, b: T) => boolean\n): T | undefined {\n  const equal = (a?: T, b?: T) => (a === undefined || b === undefined ? a === b : isEqualValue(a, b));\n  if (equal(current, other)) return current;\n  if (equal(base, current)) return other; // changed (or removed) on other only\n  if (equal(base, other)) return current; // changed (or removed) on current only\n  return mergeStrategy === 'theirs' ? other : current;\n}\n\nfunction cloneDependency(dep: Dependency): Dependency {\n  const clone = Dependency.getClone(dep);\n  return new Dependency(clone.id, clone.relativePaths, clone.packageName, clone.versionRange);\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/merge-dependencies.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/merge-dependencies.spec.js

@@ -0,0 +1,299 @@
+"use strict";
+
+function _chai() {
+  const data = require("chai");
+  _chai = function () {
+    return data;
+  };
+  return data;
+}
+function _componentId() {
+  const data = require("@teambit/component-id");
+  _componentId = function () {
+    return data;
+  };
+  return data;
+}
+function _legacy() {
+  const data = require("@teambit/legacy.consumer-component");
+  _legacy = function () {
+    return data;
+  };
+  return data;
+}
+function _legacy2() {
+  const data = require("@teambit/legacy.extension-data");
+  _legacy2 = function () {
+    return data;
+  };
+  return data;
+}
+function _mergeDependencies() {
+  const data = require("./merge-dependencies");
+  _mergeDependencies = function () {
+    return data;
+  };
+  return data;
+}
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+// a component loaded from the scope has its dependencies as plain objects (see Dependencies.getClone())
+const asLoaded = deps => new (_legacy().Dependencies)(deps.map(dep => _legacy().Dependency.getClone(dep)));
+const toDeps = (ids = []) => asLoaded(ids.map(id => {
+  const compId = _componentId().ComponentID.fromString(id);
+  return new (_legacy().Dependency)(compId, [], `@my-scope/${compId.fullName}`);
+}));
+function snapshot({
+  comps,
+  devComps,
+  pkgs,
+  devPkgs
+}) {
+  return {
+    dependencies: toDeps(comps),
+    devDependencies: toDeps(devComps),
+    peerDependencies: toDeps(),
+    packageDependencies: pkgs || {},
+    devPackageDependencies: devPkgs || {},
+    peerPackageDependencies: {}
+  };
+}
+const idsOf = deps => deps.get().map(dep => dep.id.toString());
+describe('mergeDependencies', () => {
+  describe('packages', () => {
+    const base = snapshot({
+      pkgs: {
+        lodash: '4.17.20',
+        'is-string': '1.0.5',
+        chalk: '4.0.0'
+      }
+    });
+    // current (the lane) bumped chalk
+    const current = snapshot({
+      pkgs: {
+        lodash: '4.17.20',
+        'is-string': '1.0.5',
+        chalk: '4.1.0'
+      }
+    });
+    // other (main) bumped lodash, removed is-string and added is-number
+    const other = snapshot({
+      pkgs: {
+        lodash: '4.17.21',
+        chalk: '4.0.0',
+        'is-number': '7.0.0'
+      }
+    });
+    const merged = (0, _mergeDependencies().mergeDependencies)(base, current, other, 'manual');
+    it('should take a version bump of either side', () => {
+      (0, _chai().expect)(merged.packageDependencies.lodash).to.equal('4.17.21');
+      (0, _chai().expect)(merged.packageDependencies.chalk).to.equal('4.1.0');
+    });
+    it('should remove a package that was removed on other', () => {
+      (0, _chai().expect)(merged.packageDependencies).to.not.have.property('is-string');
+    });
+    it('should add a package that was added on other', () => {
+      (0, _chai().expect)(merged.packageDependencies['is-number']).to.equal('7.0.0');
+    });
+  });
+  describe('a package that moved from runtime to dev on other', () => {
+    const base = snapshot({
+      pkgs: {
+        chai: '4.0.0'
+      }
+    });
+    const current = snapshot({
+      pkgs: {
+        chai: '4.0.0'
+      }
+    });
+    const other = snapshot({
+      devPkgs: {
+        chai: '4.0.0'
+      }
+    });
+    const merged = (0, _mergeDependencies().mergeDependencies)(base, current, other, 'manual');
+    it('should be a dev dependency only', () => {
+      (0, _chai().expect)(merged.packageDependencies).to.deep.equal({});
+      (0, _chai().expect)(merged.devPackageDependencies).to.deep.equal({
+        chai: '4.0.0'
+      });
+    });
+  });
+  describe('both sides changed the version of the same package differently', () => {
+    const base = snapshot({
+      pkgs: {
+        lodash: '4.17.19'
+      }
+    });
+    const current = snapshot({
+      pkgs: {
+        lodash: '4.17.20'
+      }
+    });
+    const other = snapshot({
+      pkgs: {
+        lodash: '4.17.21'
+      }
+    });
+    it('should keep current unless the strategy is "theirs"', () => {
+      (0, _chai().expect)((0, _mergeDependencies().mergeDependencies)(base, current, other, 'manual').packageDependencies.lodash).to.equal('4.17.20');
+      (0, _chai().expect)((0, _mergeDependencies().mergeDependencies)(base, current, other, 'ours').packageDependencies.lodash).to.equal('4.17.20');
+      (0, _chai().expect)((0, _mergeDependencies().mergeDependencies)(base, current, other, 'theirs').packageDependencies.lodash).to.equal('4.17.21');
+    });
+  });
+  describe('a package removed on current and changed on other', () => {
+    const base = snapshot({
+      pkgs: {
+        lodash: '4.17.19'
+      }
+    });
+    const current = snapshot({});
+    const other = snapshot({
+      pkgs: {
+        lodash: '4.17.21'
+      }
+    });
+    it('should keep current (removed) unless the strategy is "theirs"', () => {
+      (0, _chai().expect)((0, _mergeDependencies().mergeDependencies)(base, current, other, 'manual').packageDependencies).to.deep.equal({});
+      (0, _chai().expect)((0, _mergeDependencies().mergeDependencies)(base, current, other, 'theirs').packageDependencies.lodash).to.equal('4.17.21');
+    });
+  });
+  describe('components', () => {
+    const base = snapshot({
+      comps: ['my-scope/a@0.0.1', 'my-scope/e@0.0.1', 'my-scope/old@0.0.1']
+    });
+    const current = snapshot({
+      comps: ['my-scope/a@0.0.1', 'my-scope/e@0.0.1', 'my-scope/old@0.0.1']
+    });
+    const other = snapshot({
+      comps: ['my-scope/a@0.0.1', 'my-scope/e@0.0.2', 'my-scope/f@0.0.1']
+    });
+    const merged = (0, _mergeDependencies().mergeDependencies)(base, current, other, 'manual');
+    it('should take the added, removed and updated component dependencies of other', () => {
+      (0, _chai().expect)(idsOf(merged.dependencies)).to.have.members(['my-scope/a@0.0.1', 'my-scope/e@0.0.2', 'my-scope/f@0.0.1']);
+    });
+    it('should keep the package-name of the dependencies', () => {
+      const f = merged.dependencies.get().find(dep => dep.id.fullName === 'f');
+      (0, _chai().expect)(f?.packageName).to.equal('@my-scope/f');
+    });
+    it('should return copies of the dependencies of the inputs', () => {
+      const e = merged.dependencies.get().find(dep => dep.id.fullName === 'e');
+      (0, _chai().expect)(other.dependencies.get()).to.not.include(e);
+    });
+  });
+  describe('a dependency that moved to another field on one side and changed its version on the other side', () => {
+    const base = snapshot({
+      comps: ['my-scope/b@0.0.1'],
+      pkgs: {
+        chai: '4.0.0'
+      }
+    });
+    const current = snapshot({
+      comps: ['my-scope/b@0.0.2'],
+      pkgs: {
+        chai: '4.1.0'
+      }
+    });
+    const other = snapshot({
+      devComps: ['my-scope/b@0.0.1'],
+      devPkgs: {
+        chai: '4.0.0'
+      }
+    });
+    const merged = (0, _mergeDependencies().mergeDependencies)(base, current, other, 'manual');
+    it('should keep it in one field only', () => {
+      (0, _chai().expect)(idsOf(merged.dependencies)).to.deep.equal(['my-scope/b@0.0.2']);
+      (0, _chai().expect)(idsOf(merged.devDependencies)).to.deep.equal([]);
+      (0, _chai().expect)(merged.packageDependencies).to.deep.equal({
+        chai: '4.1.0'
+      });
+      (0, _chai().expect)(merged.devPackageDependencies).to.deep.equal({});
+    });
+  });
+  describe('a component dependency that other imports from another file too', () => {
+    const relativePath = sourceRelativePath => ({
+      sourceRelativePath,
+      destinationRelativePath: 'index.ts',
+      importSpecifiers: []
+    });
+    const depWithPaths = paths => asLoaded([new (_legacy().Dependency)(_componentId().ComponentID.fromString('my-scope/b@0.0.1'), paths.map(relativePath), '@my-scope/b')]);
+    const base = _objectSpread(_objectSpread({}, snapshot({})), {}, {
+      dependencies: depWithPaths(['a.ts'])
+    });
+    const current = _objectSpread(_objectSpread({}, snapshot({})), {}, {
+      dependencies: depWithPaths(['a.ts'])
+    });
+    const other = _objectSpread(_objectSpread({}, snapshot({})), {}, {
+      dependencies: depWithPaths(['a.ts', 'b.ts'])
+    });
+    it('should take the import paths of other', () => {
+      const [merged] = (0, _mergeDependencies().mergeDependencies)(base, current, other, 'manual').dependencies.get();
+      (0, _chai().expect)(merged.relativePaths.map(paths => paths.sourceRelativePath)).to.deep.equal(['a.ts', 'b.ts']);
+    });
+  });
+  describe('a peer component dependency whose version range changed on other only', () => {
+    const peerWithRange = range => asLoaded([new (_legacy().Dependency)(_componentId().ComponentID.fromString('my-scope/b@1.0.0'), [], '@my-scope/b', range)]);
+    const base = _objectSpread(_objectSpread({}, snapshot({})), {}, {
+      peerDependencies: peerWithRange('^1.0.0')
+    });
+    const current = _objectSpread(_objectSpread({}, snapshot({})), {}, {
+      peerDependencies: peerWithRange('^1.0.0')
+    });
+    const other = _objectSpread(_objectSpread({}, snapshot({})), {}, {
+      peerDependencies: peerWithRange('^1.0.0 || ^2.0.0')
+    });
+    it('should take the version range of other', () => {
+      const [merged] = (0, _mergeDependencies().mergeDependencies)(base, current, other, 'manual').peerDependencies.get();
+      (0, _chai().expect)(merged.versionRange).to.equal('^1.0.0 || ^2.0.0');
+    });
+  });
+  describe('a dependency on a lane component that other removed', () => {
+    // b was snapped on the lane, so current has the lane snap of it. other removed the dependency.
+    const base = snapshot({
+      comps: ['my-scope/b@0.0.1']
+    });
+    const current = snapshot({
+      comps: [`my-scope/b@${'a'.repeat(40)}`]
+    });
+    const other = snapshot({});
+    it('should be removed when b is on the lane, as only its version changed on current', () => {
+      const laneIds = _componentId().ComponentIdList.fromArray([_componentId().ComponentID.fromString(`my-scope/b@${'a'.repeat(40)}`)]);
+      (0, _chai().expect)(idsOf((0, _mergeDependencies().mergeDependencies)(base, current, other, 'manual', laneIds).dependencies)).to.deep.equal([]);
+    });
+    it('should be kept when b is not on the lane, as both sides changed it', () => {
+      (0, _chai().expect)((0, _mergeDependencies().mergeDependencies)(base, current, other, 'manual').dependencies.get()).to.have.lengthOf(1);
+    });
+  });
+  describe('a component dependency that other removed, with base and other from Versions', () => {
+    // a Version has the package names in the dependency-resolver data only, a component loaded from the scope (current)
+    // has them on the dependencies as well
+    const asVersion = deps => {
+      const depsData = deps.dependencies.get().map(dep => ({
+        id: dep.id.toString(),
+        packageName: dep.packageName
+      }));
+      return (0, _mergeDependencies().getDependenciesOfVersion)(_objectSpread(_objectSpread({}, deps), {}, {
+        dependencies: asLoaded(deps.dependencies.get().map(dep => new (_legacy().Dependency)(dep.id, dep.relativePaths))),
+        extensions: _legacy2().ExtensionDataList.fromArray([new (_legacy2().ExtensionDataEntry)(undefined, undefined, 'teambit.dependencies/dependency-resolver', undefined, {
+          dependencies: depsData
+        })])
+      }));
+    };
+    const base = asVersion(snapshot({
+      comps: ['my-scope/b@0.0.1']
+    }));
+    const current = snapshot({
+      comps: ['my-scope/b@0.0.1']
+    });
+    const other = asVersion(snapshot({}));
+    it('should be removed', () => {
+      (0, _chai().expect)(idsOf((0, _mergeDependencies().mergeDependencies)(base, current, other, 'manual').dependencies)).to.deep.equal([]);
+    });
+  });
+});
+
+//# sourceMappingURL=merge-dependencies.spec.js.map

package/dist/merge-dependencies.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_chai","data","require","_componentId","_legacy","_legacy2","_mergeDependencies","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","asLoaded","deps","Dependencies","map","dep","Dependency","getClone","toDeps","ids","id","compId","ComponentID","fromString","fullName","snapshot","comps","devComps","pkgs","devPkgs","dependencies","devDependencies","peerDependencies","packageDependencies","devPackageDependencies","peerPackageDependencies","idsOf","get","toString","describe","base","lodash","chalk","current","other","merged","mergeDependencies","it","expect","to","equal","not","have","property","chai","deep","members","f","find","packageName","include","relativePath","sourceRelativePath","destinationRelativePath","importSpecifiers","depWithPaths","paths","relativePaths","peerWithRange","range","versionRange","repeat","laneIds","ComponentIdList","fromArray","lengthOf","asVersion","depsData","getDependenciesOfVersion","extensions","ExtensionDataList","ExtensionDataEntry","undefined"],"sources":["merge-dependencies.spec.ts"],"sourcesContent":["import { expect } from 'chai';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { Dependencies, Dependency } from '@teambit/legacy.consumer-component';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy.extension-data';\nimport type { DependenciesSnapshot } from './merge-dependencies';\nimport { getDependenciesOfVersion, mergeDependencies } from './merge-dependencies';\n\ntype SnapshotInput = {\n  comps?: string[]; // runtime component deps, e.g. \"my-scope/b@0.0.1\"\n  devComps?: string[];\n  pkgs?: Record<string, string>;\n  devPkgs?: Record<string, string>;\n};\n\n// a component loaded from the scope has its dependencies as plain objects (see Dependencies.getClone())\nconst asLoaded = (deps: Dependency[]) => new Dependencies(deps.map((dep) => Dependency.getClone(dep) as Dependency));\n\nconst toDeps = (ids: string[] = []) =>\n  asLoaded(\n    ids.map((id) => {\n      const compId = ComponentID.fromString(id);\n      return new Dependency(compId, [], `@my-scope/${compId.fullName}`);\n    })\n  );\n\nfunction snapshot({ comps, devComps, pkgs, devPkgs }: SnapshotInput): DependenciesSnapshot {\n  return {\n    dependencies: toDeps(comps),\n    devDependencies: toDeps(devComps),\n    peerDependencies: toDeps(),\n    packageDependencies: pkgs || {},\n    devPackageDependencies: devPkgs || {},\n    peerPackageDependencies: {},\n  };\n}\n\nconst idsOf = (deps: Dependencies) => deps.get().map((dep) => dep.id.toString());\n\ndescribe('mergeDependencies', () => {\n  describe('packages', () => {\n    const base = snapshot({ pkgs: { lodash: '4.17.20', 'is-string': '1.0.5', chalk: '4.0.0' } });\n    // current (the lane) bumped chalk\n    const current = snapshot({ pkgs: { lodash: '4.17.20', 'is-string': '1.0.5', chalk: '4.1.0' } });\n    // other (main) bumped lodash, removed is-string and added is-number\n    const other = snapshot({ pkgs: { lodash: '4.17.21', chalk: '4.0.0', 'is-number': '7.0.0' } });\n    const merged = mergeDependencies(base, current, other, 'manual');\n    it('should take a version bump of either side', () => {\n      expect(merged.packageDependencies.lodash).to.equal('4.17.21');\n      expect(merged.packageDependencies.chalk).to.equal('4.1.0');\n    });\n    it('should remove a package that was removed on other', () => {\n      expect(merged.packageDependencies).to.not.have.property('is-string');\n    });\n    it('should add a package that was added on other', () => {\n      expect(merged.packageDependencies['is-number']).to.equal('7.0.0');\n    });\n  });\n  describe('a package that moved from runtime to dev on other', () => {\n    const base = snapshot({ pkgs: { chai: '4.0.0' } });\n    const current = snapshot({ pkgs: { chai: '4.0.0' } });\n    const other = snapshot({ devPkgs: { chai: '4.0.0' } });\n    const merged = mergeDependencies(base, current, other, 'manual');\n    it('should be a dev dependency only', () => {\n      expect(merged.packageDependencies).to.deep.equal({});\n      expect(merged.devPackageDependencies).to.deep.equal({ chai: '4.0.0' });\n    });\n  });\n  describe('both sides changed the version of the same package differently', () => {\n    const base = snapshot({ pkgs: { lodash: '4.17.19' } });\n    const current = snapshot({ pkgs: { lodash: '4.17.20' } });\n    const other = snapshot({ pkgs: { lodash: '4.17.21' } });\n    it('should keep current unless the strategy is \"theirs\"', () => {\n      expect(mergeDependencies(base, current, other, 'manual').packageDependencies.lodash).to.equal('4.17.20');\n      expect(mergeDependencies(base, current, other, 'ours').packageDependencies.lodash).to.equal('4.17.20');\n      expect(mergeDependencies(base, current, other, 'theirs').packageDependencies.lodash).to.equal('4.17.21');\n    });\n  });\n  describe('a package removed on current and changed on other', () => {\n    const base = snapshot({ pkgs: { lodash: '4.17.19' } });\n    const current = snapshot({});\n    const other = snapshot({ pkgs: { lodash: '4.17.21' } });\n    it('should keep current (removed) unless the strategy is \"theirs\"', () => {\n      expect(mergeDependencies(base, current, other, 'manual').packageDependencies).to.deep.equal({});\n      expect(mergeDependencies(base, current, other, 'theirs').packageDependencies.lodash).to.equal('4.17.21');\n    });\n  });\n  describe('components', () => {\n    const base = snapshot({ comps: ['my-scope/a@0.0.1', 'my-scope/e@0.0.1', 'my-scope/old@0.0.1'] });\n    const current = snapshot({ comps: ['my-scope/a@0.0.1', 'my-scope/e@0.0.1', 'my-scope/old@0.0.1'] });\n    const other = snapshot({ comps: ['my-scope/a@0.0.1', 'my-scope/e@0.0.2', 'my-scope/f@0.0.1'] });\n    const merged = mergeDependencies(base, current, other, 'manual');\n    it('should take the added, removed and updated component dependencies of other', () => {\n      expect(idsOf(merged.dependencies)).to.have.members(['my-scope/a@0.0.1', 'my-scope/e@0.0.2', 'my-scope/f@0.0.1']);\n    });\n    it('should keep the package-name of the dependencies', () => {\n      const f = merged.dependencies.get().find((dep) => dep.id.fullName === 'f');\n      expect(f?.packageName).to.equal('@my-scope/f');\n    });\n    it('should return copies of the dependencies of the inputs', () => {\n      const e = merged.dependencies.get().find((dep) => dep.id.fullName === 'e');\n      expect(other.dependencies.get()).to.not.include(e);\n    });\n  });\n  describe('a dependency that moved to another field on one side and changed its version on the other side', () => {\n    const base = snapshot({ comps: ['my-scope/b@0.0.1'], pkgs: { chai: '4.0.0' } });\n    const current = snapshot({ comps: ['my-scope/b@0.0.2'], pkgs: { chai: '4.1.0' } });\n    const other = snapshot({ devComps: ['my-scope/b@0.0.1'], devPkgs: { chai: '4.0.0' } });\n    const merged = mergeDependencies(base, current, other, 'manual');\n    it('should keep it in one field only', () => {\n      expect(idsOf(merged.dependencies)).to.deep.equal(['my-scope/b@0.0.2']);\n      expect(idsOf(merged.devDependencies)).to.deep.equal([]);\n      expect(merged.packageDependencies).to.deep.equal({ chai: '4.1.0' });\n      expect(merged.devPackageDependencies).to.deep.equal({});\n    });\n  });\n  describe('a component dependency that other imports from another file too', () => {\n    const relativePath = (sourceRelativePath: string) => ({\n      sourceRelativePath,\n      destinationRelativePath: 'index.ts',\n      importSpecifiers: [],\n    });\n    const depWithPaths = (paths: string[]) =>\n      asLoaded([new Dependency(ComponentID.fromString('my-scope/b@0.0.1'), paths.map(relativePath), '@my-scope/b')]);\n    const base = { ...snapshot({}), dependencies: depWithPaths(['a.ts']) };\n    const current = { ...snapshot({}), dependencies: depWithPaths(['a.ts']) };\n    const other = { ...snapshot({}), dependencies: depWithPaths(['a.ts', 'b.ts']) };\n    it('should take the import paths of other', () => {\n      const [merged] = mergeDependencies(base, current, other, 'manual').dependencies.get();\n      expect(merged.relativePaths.map((paths) => paths.sourceRelativePath)).to.deep.equal(['a.ts', 'b.ts']);\n    });\n  });\n  describe('a peer component dependency whose version range changed on other only', () => {\n    const peerWithRange = (range: string) =>\n      asLoaded([new Dependency(ComponentID.fromString('my-scope/b@1.0.0'), [], '@my-scope/b', range)]);\n    const base = { ...snapshot({}), peerDependencies: peerWithRange('^1.0.0') };\n    const current = { ...snapshot({}), peerDependencies: peerWithRange('^1.0.0') };\n    const other = { ...snapshot({}), peerDependencies: peerWithRange('^1.0.0 || ^2.0.0') };\n    it('should take the version range of other', () => {\n      const [merged] = mergeDependencies(base, current, other, 'manual').peerDependencies.get();\n      expect(merged.versionRange).to.equal('^1.0.0 || ^2.0.0');\n    });\n  });\n  describe('a dependency on a lane component that other removed', () => {\n    // b was snapped on the lane, so current has the lane snap of it. other removed the dependency.\n    const base = snapshot({ comps: ['my-scope/b@0.0.1'] });\n    const current = snapshot({ comps: [`my-scope/b@${'a'.repeat(40)}`] });\n    const other = snapshot({});\n    it('should be removed when b is on the lane, as only its version changed on current', () => {\n      const laneIds = ComponentIdList.fromArray([ComponentID.fromString(`my-scope/b@${'a'.repeat(40)}`)]);\n      expect(idsOf(mergeDependencies(base, current, other, 'manual', laneIds).dependencies)).to.deep.equal([]);\n    });\n    it('should be kept when b is not on the lane, as both sides changed it', () => {\n      expect(mergeDependencies(base, current, other, 'manual').dependencies.get()).to.have.lengthOf(1);\n    });\n  });\n  describe('a component dependency that other removed, with base and other from Versions', () => {\n    // a Version has the package names in the dependency-resolver data only, a component loaded from the scope (current)\n    // has them on the dependencies as well\n    const asVersion = (deps: DependenciesSnapshot) => {\n      const depsData = deps.dependencies.get().map((dep) => ({ id: dep.id.toString(), packageName: dep.packageName }));\n      return getDependenciesOfVersion({\n        ...deps,\n        dependencies: asLoaded(deps.dependencies.get().map((dep) => new Dependency(dep.id, dep.relativePaths))),\n        extensions: ExtensionDataList.fromArray([\n          new ExtensionDataEntry(undefined, undefined, 'teambit.dependencies/dependency-resolver', undefined, {\n            dependencies: depsData,\n          }),\n        ]),\n      });\n    };\n    const base = asVersion(snapshot({ comps: ['my-scope/b@0.0.1'] }));\n    const current = snapshot({ comps: ['my-scope/b@0.0.1'] });\n    const other = asVersion(snapshot({}));\n    it('should be removed', () => {\n      expect(idsOf(mergeDependencies(base, current, other, 'manual').dependencies)).to.deep.equal([]);\n    });\n  });\n});\n"],"mappings":"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","ignoreList":[]}

package/dist/merge-status-provider.js

@@ -74,6 +74,13 @@ function _builder() {
   };
   return data;
 }
+function _mergeDependencies() {
+  const data = require("./merge-dependencies");
+  _mergeDependencies = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -185,13 +192,24 @@ other:   ${otherLaneHead.toString()}`);
       currentLabel,
       baseComponent
     });
+    // a workspace re-detects the dependencies from the merged files. a bare scope can't, it merges the resolved ones.
+    const getDependenciesMergeResult = () => {
+      if (this.workspace) return undefined;
+      // "theirs" with a file conflict takes all the files of other (see applyModifiedVersion), so the dependencies too
+      if (mergeResults.hasConflicts && this.options.mergeStrategy === _componentModules().MergeOptions.theirs) {
+        return (0, _mergeDependencies().getDependenciesOfVersion)(otherComponent);
+      }
+      return (0, _mergeDependencies().mergeDependencies)((0, _mergeDependencies().getDependenciesOfVersion)(baseComponent), currentComponent, (0, _mergeDependencies().getDependenciesOfVersion)(otherComponent), this.options.mergeStrategy, this.currentLane?.toComponentIdsIncludeUpdateDependents());
+    };
+    const dependenciesMergeResult = getDependenciesMergeResult();
     return {
       currentComponent,
       id,
       mergeResults,
       divergeData,
       configMergeResult,
-      dataMergeResult
+      dataMergeResult,
+      dependenciesMergeResult
     };
   }
   mergeExtensionsData(currentExtensions, baseExtensions, otherExtensions) {