@teambit/dependency-resolver 0.0.1157 → 0.0.1159

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (66) hide show
  1. package/dist/apply-updates.js +1 -3
  2. package/dist/apply-updates.js.map +1 -1
  3. package/dist/dependencies/base-dependency.js +4 -9
  4. package/dist/dependencies/base-dependency.js.map +1 -1
  5. package/dist/dependencies/component-dependency/component-dependency-factory.js +5 -11
  6. package/dist/dependencies/component-dependency/component-dependency-factory.js.map +1 -1
  7. package/dist/dependencies/component-dependency/component-dependency.js +0 -1
  8. package/dist/dependencies/component-dependency/component-dependency.js.map +1 -1
  9. package/dist/dependencies/dependency-list-factory.js +1 -2
  10. package/dist/dependencies/dependency-list-factory.js.map +1 -1
  11. package/dist/dependencies/dependency-list.js +0 -3
  12. package/dist/dependencies/dependency-list.js.map +1 -1
  13. package/dist/dependencies.service.js +5 -10
  14. package/dist/dependencies.service.js.map +1 -1
  15. package/dist/dependency-installer.js +8 -14
  16. package/dist/dependency-installer.js.map +1 -1
  17. package/dist/dependency-linker.js +5 -13
  18. package/dist/dependency-linker.js.map +1 -1
  19. package/dist/dependency-resolver.composition.js +1 -1
  20. package/dist/dependency-resolver.composition.js.map +1 -1
  21. package/dist/dependency-resolver.graphql.js +5 -10
  22. package/dist/dependency-resolver.graphql.js.map +1 -1
  23. package/dist/dependency-resolver.main.runtime.js +19 -34
  24. package/dist/dependency-resolver.main.runtime.js.map +1 -1
  25. package/dist/dependency-resolver.main.runtime.spec.js +1 -2
  26. package/dist/dependency-resolver.main.runtime.spec.js.map +1 -1
  27. package/dist/dependency-version-resolver.js +6 -11
  28. package/dist/dependency-version-resolver.js.map +1 -1
  29. package/dist/extend-with-components-from-dir.js +5 -11
  30. package/dist/extend-with-components-from-dir.js.map +1 -1
  31. package/dist/get-all-policy-pkgs.js +5 -14
  32. package/dist/get-all-policy-pkgs.js.map +1 -1
  33. package/dist/manifest/deduping/hoist-dependencies.js +5 -10
  34. package/dist/manifest/deduping/hoist-dependencies.js.map +1 -1
  35. package/dist/manifest/deduping/hoist-dependencies.spec.js +0 -1
  36. package/dist/manifest/deduping/hoist-dependencies.spec.js.map +1 -1
  37. package/dist/manifest/deduping/index-by-dep-id.js +1 -2
  38. package/dist/manifest/deduping/index-by-dep-id.js.map +1 -1
  39. package/dist/manifest/deduping/merge-with-root.js +1 -1
  40. package/dist/manifest/deduping/merge-with-root.js.map +1 -1
  41. package/dist/manifest/manifest.js +4 -9
  42. package/dist/manifest/manifest.js.map +1 -1
  43. package/dist/manifest/workspace-manifest-factory.js +7 -15
  44. package/dist/manifest/workspace-manifest-factory.js.map +1 -1
  45. package/dist/package-manager-legacy.js +5 -14
  46. package/dist/package-manager-legacy.js.map +1 -1
  47. package/dist/policy/env-policy/env-policy.js +3 -3
  48. package/dist/policy/env-policy/env-policy.js.map +1 -1
  49. package/dist/policy/env-policy/validate-env-policy.js +0 -1
  50. package/dist/policy/env-policy/validate-env-policy.js.map +1 -1
  51. package/dist/policy/variant-policy/variant-policy.js +3 -3
  52. package/dist/policy/variant-policy/variant-policy.js.map +1 -1
  53. package/dist/policy/workspace-policy/workspace-policy-factory.js +4 -10
  54. package/dist/policy/workspace-policy/workspace-policy-factory.js.map +1 -1
  55. package/dist/policy/workspace-policy/workspace-policy.js +0 -1
  56. package/dist/policy/workspace-policy/workspace-policy.js.map +1 -1
  57. package/dist/{preview-1694488626516.js → preview-1694624356552.js} +2 -2
  58. package/dist/show-fragments/dependencies.fragment.js +0 -1
  59. package/dist/show-fragments/dependencies.fragment.js.map +1 -1
  60. package/dist/show-fragments/dev-dependencies.fragment.js +0 -1
  61. package/dist/show-fragments/dev-dependencies.fragment.js.map +1 -1
  62. package/dist/show-fragments/peer-dependencies.fragment.js +0 -1
  63. package/dist/show-fragments/peer-dependencies.fragment.js.map +1 -1
  64. package/dist/show-fragments/serialize-by-lifecycle.js +0 -1
  65. package/dist/show-fragments/serialize-by-lifecycle.js.map +1 -1
  66. package/package.json +17 -19
@@ -1,12 +1,5 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
- require("core-js/modules/es.array.flat.js");
5
- require("core-js/modules/es.array.iterator.js");
6
- require("core-js/modules/es.array.unscopables.flat.js");
7
- require("core-js/modules/es.promise.js");
8
- require("core-js/modules/es.regexp.exec.js");
9
- require("core-js/modules/es.string.replace.js");
10
3
  Object.defineProperty(exports, "__esModule", {
11
4
  value: true
12
5
  });
@@ -23,13 +16,6 @@ Object.defineProperty(exports, "ProxyConfig", {
23
16
  return _http().ProxyConfig;
24
17
  }
25
18
  });
26
- function _defineProperty2() {
27
- const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
28
- _defineProperty2 = function () {
29
- return data;
30
- };
31
- return data;
32
- }
33
19
  function _multimatch() {
34
20
  const data = _interopRequireDefault(require("multimatch"));
35
21
  _multimatch = function () {
@@ -319,8 +305,12 @@ function _envPolicy() {
319
305
  }
320
306
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
321
307
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
308
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
322
309
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
323
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2().default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } // TODO: it's weird we take it from here.. think about it../workspace/utils
310
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
311
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
312
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
313
+ function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // TODO: it's weird we take it from here.. think about it../workspace/utils
324
314
  /**
325
315
  * @deprecated use BIT_CLOUD_REGISTRY instead
326
316
  */
@@ -377,7 +367,7 @@ class DependencyResolverMain {
377
367
  * Save list of envs that doesn't contains env.jsonc file
378
368
  * this is used to show warning / instuctions to the user
379
369
  */
380
- (0, _defineProperty2().default)(this, "envsWithoutManifest", new Set());
370
+ _defineProperty(this, "envsWithoutManifest", new Set());
381
371
  }
382
372
  /**
383
373
  * This function is a temporary workaround for installation in capsules with pnpm.
@@ -398,11 +388,10 @@ class DependencyResolverMain {
398
388
  return Boolean(this.config.rootComponents);
399
389
  }
400
390
  isolatedCapsules() {
401
- var _this$config$isolated;
402
391
  const globalConfig = this.globalConfig.getSync(_constants().CFG_ISOLATED_SCOPE_CAPSULES);
403
392
  // @ts-ignore
404
393
  const defaultVal = globalConfig !== undefined ? globalConfig === true || globalConfig === 'true' : true;
405
- const res = (_this$config$isolated = this.config.isolatedCapsules) !== null && _this$config$isolated !== void 0 ? _this$config$isolated : defaultVal;
394
+ const res = this.config.isolatedCapsules ?? defaultVal;
406
395
  return res;
407
396
  }
408
397
  hasHarmonyInRootPolicy() {
@@ -418,8 +407,7 @@ class DependencyResolverMain {
418
407
  return 'isolated';
419
408
  }
420
409
  linkCoreAspects() {
421
- var _this$config$linkCore;
422
- return (_this$config$linkCore = this.config.linkCoreAspects) !== null && _this$config$linkCore !== void 0 ? _this$config$linkCore : DependencyResolverMain.defaultConfig.linkCoreAspects;
410
+ return this.config.linkCoreAspects ?? DependencyResolverMain.defaultConfig.linkCoreAspects;
423
411
  }
424
412
 
425
413
  /**
@@ -598,8 +586,8 @@ class DependencyResolverMain {
598
586
  * get the package name of a component.
599
587
  */
600
588
  getPackageName(component) {
601
- var _this$getDepResolverD, _this$getDepResolverD2;
602
- return (_this$getDepResolverD = (_this$getDepResolverD2 = this.getDepResolverData(component)) === null || _this$getDepResolverD2 === void 0 ? void 0 : _this$getDepResolverD2.packageName) !== null && _this$getDepResolverD !== void 0 ? _this$getDepResolverD : this.calcPackageName(component);
589
+ var _this$getDepResolverD;
590
+ return ((_this$getDepResolverD = this.getDepResolverData(component)) === null || _this$getDepResolverD === void 0 ? void 0 : _this$getDepResolverD.packageName) ?? this.calcPackageName(component);
603
591
  }
604
592
  getDepResolverData(component) {
605
593
  var _component$state$aspe;
@@ -836,7 +824,6 @@ class DependencyResolverMain {
836
824
  return (_peerDependencyIssues = peerDependencyIssues['.']) === null || _peerDependencyIssues === void 0 ? void 0 : _peerDependencyIssues.intersections;
837
825
  }
838
826
  async getRegistries() {
839
- var _this$config$installF;
840
827
  const packageManager = this.getPackageManager();
841
828
  let registries;
842
829
  if (packageManager !== null && packageManager !== void 0 && packageManager.getRegistries && typeof (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getRegistries) === 'function') {
@@ -860,7 +847,7 @@ class DependencyResolverMain {
860
847
  return bitDefaultRegistry;
861
848
  };
862
849
  const bitDefaultRegistry = getDefaultBitRegistry();
863
- const installFromBitDevRegistry = (_this$config$installF = this.config.installFromBitDevRegistry) !== null && _this$config$installF !== void 0 ? _this$config$installF : true;
850
+ const installFromBitDevRegistry = this.config.installFromBitDevRegistry ?? true;
864
851
 
865
852
  // Override default registry to use bit registry in case npmjs is the default - bit registry will proxy it
866
853
  // We check also NPM_REGISTRY.startsWith because the uri might not have the trailing / we have in NPM_REGISTRY
@@ -1059,7 +1046,6 @@ class DependencyResolverMain {
1059
1046
  * @param configuredExtensions
1060
1047
  */
1061
1048
  async mergeVariantPolicies(configuredExtensions, id, legacyFiles) {
1062
- var _await$this$getPolici;
1063
1049
  let policiesFromSlots = _policy().VariantPolicy.getEmpty();
1064
1050
  let policiesFromConfig = _policy().VariantPolicy.getEmpty();
1065
1051
  const policiesFromEnv = await this.getComponentEnvPolicyFromExtension(configuredExtensions);
@@ -1084,7 +1070,7 @@ class DependencyResolverMain {
1084
1070
  if (currentConfig && currentConfig.policy) {
1085
1071
  policiesFromConfig = _policy().VariantPolicy.fromConfigObject(currentConfig.policy, 'config');
1086
1072
  }
1087
- const policiesFromEnvForItself = (_await$this$getPolici = await this.getPoliciesFromEnvForItself(id, legacyFiles)) !== null && _await$this$getPolici !== void 0 ? _await$this$getPolici : _policy().VariantPolicy.getEmpty();
1073
+ const policiesFromEnvForItself = (await this.getPoliciesFromEnvForItself(id, legacyFiles)) ?? _policy().VariantPolicy.getEmpty();
1088
1074
  const result = _policy().VariantPolicy.mergePolices([policiesFromEnv, policiesFromEnvForItself, policiesFromSlots, policiesFromConfig]);
1089
1075
  return result;
1090
1076
  }
@@ -1185,7 +1171,6 @@ class DependencyResolverMain {
1185
1171
  let resolvedParentDeps;
1186
1172
  const updateDirectDepsVersions = deps => {
1187
1173
  return (0, _pMapSeries().default)(deps, async dep => {
1188
- var _resolvedDep$id;
1189
1174
  // Nothing to update (this shouldn't happen ever)
1190
1175
  if (!dep.id) return;
1191
1176
  // In case of core aspect, do not update the version, as it's loaded to harmony without version
@@ -1207,7 +1192,7 @@ class DependencyResolverMain {
1207
1192
  const resolvedDep = resolvedParentDeps.findDependency(dep.id, {
1208
1193
  ignoreVersion: true
1209
1194
  });
1210
- dep.id = (_resolvedDep$id = resolvedDep === null || resolvedDep === void 0 ? void 0 : resolvedDep.id) !== null && _resolvedDep$id !== void 0 ? _resolvedDep$id : dep.id;
1195
+ dep.id = (resolvedDep === null || resolvedDep === void 0 ? void 0 : resolvedDep.id) ?? dep.id;
1211
1196
  await this.resolveRequireableExtensionManifestDepsVersionsRecursively(dep.id, dep);
1212
1197
  });
1213
1198
  };
@@ -1290,7 +1275,7 @@ class DependencyResolverMain {
1290
1275
  return (await resolver.resolveRemoteVersion(spec, {
1291
1276
  rootDir
1292
1277
  })).version;
1293
- } catch (_unused) {
1278
+ } catch {
1294
1279
  // If latest cannot be found for the package, then just ignore it
1295
1280
  return null;
1296
1281
  }
@@ -1390,10 +1375,10 @@ class DependencyResolverMain {
1390
1375
  }
1391
1376
  }
1392
1377
  exports.DependencyResolverMain = DependencyResolverMain;
1393
- (0, _defineProperty2().default)(DependencyResolverMain, "runtime", _cli().MainRuntime);
1394
- (0, _defineProperty2().default)(DependencyResolverMain, "dependencies", [_envs().EnvsAspect, _logger().LoggerAspect, _config().ConfigAspect, _aspectLoader().default, _component().default, _graphql().GraphqlAspect, _globalConfig().default]);
1395
- (0, _defineProperty2().default)(DependencyResolverMain, "slots", [_harmony().Slot.withType(), _harmony().Slot.withType(), _harmony().Slot.withType(), _harmony().Slot.withType(), _harmony().Slot.withType(), _harmony().Slot.withType(), _harmony().Slot.withType(), _harmony().Slot.withType()]);
1396
- (0, _defineProperty2().default)(DependencyResolverMain, "defaultConfig", {
1378
+ _defineProperty(DependencyResolverMain, "runtime", _cli().MainRuntime);
1379
+ _defineProperty(DependencyResolverMain, "dependencies", [_envs().EnvsAspect, _logger().LoggerAspect, _config().ConfigAspect, _aspectLoader().default, _component().default, _graphql().GraphqlAspect, _globalConfig().default]);
1380
+ _defineProperty(DependencyResolverMain, "slots", [_harmony().Slot.withType(), _harmony().Slot.withType(), _harmony().Slot.withType(), _harmony().Slot.withType(), _harmony().Slot.withType(), _harmony().Slot.withType(), _harmony().Slot.withType(), _harmony().Slot.withType()]);
1381
+ _defineProperty(DependencyResolverMain, "defaultConfig", {
1397
1382
  /**
1398
1383
  * default package manager.
1399
1384
  */
@@ -1455,7 +1440,7 @@ function tryPickLowestRange(range1, range2) {
1455
1440
  if (range1 === '*' || range2 === '*') return '*';
1456
1441
  try {
1457
1442
  return _semver().default.lt(rangeToVersion(range1), rangeToVersion(range2)) ? range1 : range2;
1458
- } catch (_unused2) {
1443
+ } catch {
1459
1444
  return '*';
1460
1445
  }
1461
1446
  }