@teambit/dependency-resolver 1.0.107 → 1.0.108

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

@@ -385,9 +385,8 @@ class DependencyResolverMain {
    * Here is the PR where initially dedupe was turned off for pnpm: https://github.com/teambit/bit/pull/5410
    */
   supportsDedupingOnExistingRoot() {
-    var _packageManager$suppo;
     const packageManager = this.getPackageManager();
-    return (packageManager === null || packageManager === void 0 || (_packageManager$suppo = packageManager.supportsDedupingOnExistingRoot) === null || _packageManager$suppo === void 0 ? void 0 : _packageManager$suppo.call(packageManager)) === true && !this.isolatedCapsules();
+    return packageManager?.supportsDedupingOnExistingRoot?.() === true && !this.isolatedCapsules();
   }
   setConfig(config) {
     this.config = config;
@@ -477,9 +476,9 @@ class DependencyResolverMain {
     dependencyList.forEach(dep => {
       const found = componentPolicy.find(dep.id);
       // if no policy found, the dependency was auto-resolved from the source code
-      dep.source = (found === null || found === void 0 ? void 0 : found.source) || 'auto';
-      dep.hidden = found === null || found === void 0 ? void 0 : found.hidden;
-      dep.optional = found === null || found === void 0 ? void 0 : found.optional;
+      dep.source = found?.source || 'auto';
+      dep.hidden = found?.hidden;
+      dep.optional = found?.optional;
     });
     return dependencyList;
   }
@@ -500,12 +499,11 @@ class DependencyResolverMain {
   async getDependencies(component, {
     includeHidden = false
   } = {}) {
-    var _entry$data;
     const entry = component.get(_dependencyResolver().DependencyResolverAspect.id);
     if (!entry) {
       return _dependencies().DependencyList.fromArray([]);
     }
-    const serializedDependencies = (entry === null || entry === void 0 || (_entry$data = entry.data) === null || _entry$data === void 0 ? void 0 : _entry$data.dependencies) || [];
+    const serializedDependencies = entry?.data?.dependencies || [];
     const depList = await this.getDependenciesFromSerializedDependencies(serializedDependencies);
     if (includeHidden) return depList;
     return depList.filterHidden();
@@ -587,14 +585,14 @@ class DependencyResolverMain {
    * @memberof DependencyResolverMain
    */
   async getWorkspaceManifest(name = _constants2().ROOT_NAME, version = new (_semver().SemVer)('1.0.0'), rootPolicy, rootDir, components, options = defaultCreateFromComponentsOptions, context = {}) {
-    const statusMessage = context !== null && context !== void 0 && context.inCapsule ? `(capsule) deduping dependencies for installation in root dir ${rootDir}` : 'deduping dependencies for installation';
-    if (!(context !== null && context !== void 0 && context.inCapsule)) {
+    const statusMessage = context?.inCapsule ? `(capsule) deduping dependencies for installation in root dir ${rootDir}` : 'deduping dependencies for installation';
+    if (!context?.inCapsule) {
       this.logger.setStatusLine(statusMessage);
     }
     const concreteOpts = _objectSpread(_objectSpread({}, defaultCreateFromComponentsOptions), options);
     const workspaceManifestFactory = new (_manifest().WorkspaceManifestFactory)(this, this.aspectLoader);
     const res = await workspaceManifestFactory.createFromComponents(name, version, rootPolicy, rootDir, components, concreteOpts);
-    if (!(context !== null && context !== void 0 && context.inCapsule)) {
+    if (!context?.inCapsule) {
       this.logger.consoleSuccess();
     }
     return res;
@@ -604,12 +602,10 @@ class DependencyResolverMain {
    * get the package name of a component.
    */
   getPackageName(component) {
-    var _this$getDepResolverD;
-    return ((_this$getDepResolverD = this.getDepResolverData(component)) === null || _this$getDepResolverD === void 0 ? void 0 : _this$getDepResolverD.packageName) ?? this.calcPackageName(component);
+    return this.getDepResolverData(component)?.packageName ?? this.calcPackageName(component);
   }
   getDepResolverData(component) {
-    var _component$state$aspe;
-    return (_component$state$aspe = component.state.aspects.get(_dependencyResolver().DependencyResolverAspect.id)) === null || _component$state$aspe === void 0 ? void 0 : _component$state$aspe.data;
+    return component.state.aspects.get(_dependencyResolver().DependencyResolverAspect.id)?.data;
   }
   calcPackageName(component) {
     return (0, _componentIdToPackageName().default)(component.state._consumer);
@@ -680,7 +676,7 @@ class DependencyResolverMain {
    * get a component dependency linker.
    */
   getLinker(options = {}) {
-    const linkingOptions = Object.assign({}, defaultLinkingOptions, (options === null || options === void 0 ? void 0 : options.linkingOptions) || {});
+    const linkingOptions = Object.assign({}, defaultLinkingOptions, options?.linkingOptions || {});
     // TODO: we should somehow pass the cache root dir to the package manager constructor
     return new (_dependencyLinker().DependencyLinker)(this, this.aspectLoader, this.componentAspect, this.envs, this.logger, options.rootDir, linkingOptions, options.linkingContext);
   }
@@ -745,7 +741,7 @@ class DependencyResolverMain {
 
     // Take config from the package manager (npmrc) config if defined
     const proxyConfigFromPackageManager = await this.getProxyConfigFromPackageManager();
-    if (proxyConfigFromPackageManager !== null && proxyConfigFromPackageManager !== void 0 && proxyConfigFromPackageManager.httpProxy || proxyConfigFromPackageManager !== null && proxyConfigFromPackageManager !== void 0 && proxyConfigFromPackageManager.httpsProxy) {
+    if (proxyConfigFromPackageManager?.httpProxy || proxyConfigFromPackageManager?.httpsProxy) {
       this.logger.debug(`proxy config taken from the package manager config (npmrc). proxy: ${proxyConfigFromPackageManager.httpProxy} httpsProxy: ${proxyConfigFromPackageManager.httpsProxy}`);
       return proxyConfigFromPackageManager;
     }
@@ -791,8 +787,8 @@ class DependencyResolverMain {
   async getNetworkConfigFromPackageManager() {
     const packageManager = this.getPackageManager();
     let networkConfigFromPackageManager = {};
-    if (typeof (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getNetworkConfig) === 'function') {
-      networkConfigFromPackageManager = await (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getNetworkConfig());
+    if (typeof packageManager?.getNetworkConfig === 'function') {
+      networkConfigFromPackageManager = await packageManager?.getNetworkConfig();
     } else {
       const systemPm = this.getSystemPackageManager();
       if (!systemPm.getNetworkConfig) throw new Error('system package manager must implement `getNetworkConfig()`');
@@ -803,8 +799,8 @@ class DependencyResolverMain {
   async getProxyConfigFromPackageManager() {
     const packageManager = this.getPackageManager();
     let proxyConfigFromPackageManager = {};
-    if (packageManager !== null && packageManager !== void 0 && packageManager.getProxyConfig && typeof (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getProxyConfig) === 'function') {
-      proxyConfigFromPackageManager = await (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getProxyConfig());
+    if (packageManager?.getProxyConfig && typeof packageManager?.getProxyConfig === 'function') {
+      proxyConfigFromPackageManager = await packageManager?.getProxyConfig();
     } else {
       const systemPm = this.getSystemPackageManager();
       if (!systemPm.getProxyConfig) throw new Error('system package manager must implement `getProxyConfig()`');
@@ -821,7 +817,6 @@ class DependencyResolverMain {
    * without causing unmet peer dependency issues in some of the dependencies.
    */
   async getMissingPeerDependencies(rootDir, rootPolicy, componentDirectoryMap, options) {
-    var _peerDependencyIssues;
     this.logger.setStatusLine('finding missing peer dependencies');
     const packageManager = this.getPackageManager();
     let peerDependencyIssues;
@@ -831,21 +826,21 @@ class DependencyResolverMain {
       rootPolicy,
       rootDir
     }));
-    if (packageManager !== null && packageManager !== void 0 && packageManager.getPeerDependencyIssues && typeof (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getPeerDependencyIssues) === 'function') {
-      peerDependencyIssues = await (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getPeerDependencyIssues(rootDir, manifests, options));
+    if (packageManager?.getPeerDependencyIssues && typeof packageManager?.getPeerDependencyIssues === 'function') {
+      peerDependencyIssues = await packageManager?.getPeerDependencyIssues(rootDir, manifests, options);
     } else {
       const systemPm = this.getSystemPackageManager();
       if (!systemPm.getPeerDependencyIssues) throw new Error('system package manager must implement `getPeerDependencyIssues()`');
-      peerDependencyIssues = await (systemPm === null || systemPm === void 0 ? void 0 : systemPm.getPeerDependencyIssues(rootDir, manifests, options));
+      peerDependencyIssues = await systemPm?.getPeerDependencyIssues(rootDir, manifests, options);
     }
     this.logger.consoleSuccess();
-    return (_peerDependencyIssues = peerDependencyIssues['.']) === null || _peerDependencyIssues === void 0 ? void 0 : _peerDependencyIssues.intersections;
+    return peerDependencyIssues['.']?.intersections;
   }
   async getRegistries() {
     const packageManager = this.getPackageManager();
     let registries;
-    if (packageManager !== null && packageManager !== void 0 && packageManager.getRegistries && typeof (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getRegistries) === 'function') {
-      registries = await (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getRegistries());
+    if (packageManager?.getRegistries && typeof packageManager?.getRegistries === 'function') {
+      registries = await packageManager?.getRegistries();
     } else {
       const systemPm = this.getSystemPackageManager();
       if (!systemPm.getRegistries) throw new Error('system package manager must implement `getRegistries()`');
@@ -938,10 +933,9 @@ class DependencyResolverMain {
     });
   }
   async persistConfig(workspaceDir) {
-    var _this$configAspect$wo;
-    await ((_this$configAspect$wo = this.configAspect.workspaceConfig) === null || _this$configAspect$wo === void 0 ? void 0 : _this$configAspect$wo.write({
+    await this.configAspect.workspaceConfig?.write({
       dir: workspaceDir
-    }));
+    });
     this.clearCache();
   }
 
@@ -1014,7 +1008,7 @@ class DependencyResolverMain {
   }
   getEnvManifest(envComponent, legacyFiles) {
     const object = this.envs.getEnvManifest(envComponent, legacyFiles);
-    const policy = object === null || object === void 0 ? void 0 : object.policy;
+    const policy = object?.policy;
     if (!policy) return undefined;
     const allPoliciesFromEnv = _envPolicy().EnvPolicy.fromConfigObject(policy, {
       includeLegacyPeersInSelfPolicy: envComponent && this.envs.isCoreEnv(envComponent.id.toStringWithoutVersion())
@@ -1098,7 +1092,7 @@ class DependencyResolverMain {
       }
     });
     const currentExtension = configuredExtensions.findExtension(_dependencyResolver().DependencyResolverAspect.id);
-    const currentConfig = currentExtension === null || currentExtension === void 0 ? void 0 : currentExtension.config;
+    const currentConfig = currentExtension?.config;
     if (currentConfig && currentConfig.policy) {
       policiesFromConfig = _policy().VariantPolicy.fromConfigObject(currentConfig.policy, {
         source: 'config'
@@ -1115,7 +1109,7 @@ class DependencyResolverMain {
    */
   async getPoliciesFromEnvForItself(id, legacyFiles) {
     const envPolicy = await this.getEnvPolicyFromEnvLegacyId(id, legacyFiles);
-    return envPolicy === null || envPolicy === void 0 ? void 0 : envPolicy.selfPolicy;
+    return envPolicy?.selfPolicy;
   }
   updateDepsOnLegacyTag(component, idTransformer) {
     const entry = component.extensions.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id);
@@ -1155,7 +1149,7 @@ class DependencyResolverMain {
   async calcComponentEnvDepDetectors(extensions) {
     const envDef = await this.envs.calculateEnvFromExtensions(extensions);
     const depEnv = envDef.env;
-    if (typeof (depEnv === null || depEnv === void 0 ? void 0 : depEnv.getDepDetectors) === 'function') {
+    if (typeof depEnv?.getDepDetectors === 'function') {
       return depEnv.getDepDetectors();
     }
     return null;
@@ -1213,7 +1207,7 @@ class DependencyResolverMain {
         const resolvedDep = resolvedParentDeps.findDependency(dep.id, {
           ignoreVersion: true
         });
-        dep.id = (resolvedDep === null || resolvedDep === void 0 ? void 0 : resolvedDep.id) ?? dep.id;
+        dep.id = resolvedDep?.id ?? dep.id;
         await this.resolveRequireableExtensionManifestDepsVersionsRecursively(dep.id, dep);
       });
     };
@@ -1222,9 +1216,9 @@ class DependencyResolverMain {
       await updateDirectDepsVersions(manifest.dependencies);
     }
     // @ts-ignore
-    if (manifest !== null && manifest !== void 0 && manifest._runtimes) {
+    if (manifest?._runtimes) {
       // @ts-ignore
-      await (0, _pMapSeries().default)(manifest === null || manifest === void 0 ? void 0 : manifest._runtimes, async runtime => {
+      await (0, _pMapSeries().default)(manifest?._runtimes, async runtime => {
         if (runtime.dependencies) {
           runtime.dependencies = runtime.dependencies.map(dep => this.aspectLoader.cloneManifest(dep));
           await updateDirectDepsVersions(runtime.dependencies);
@@ -1267,7 +1261,7 @@ class DependencyResolverMain {
       componentPolicies,
       componentModelVersions
     });
-    if (patterns !== null && patterns !== void 0 && patterns.length) {
+    if (patterns?.length) {
       const selectedPkgNames = new Set((0, _multimatch().default)(allPkgs.map(({
         name
       }) => name), patterns));
@@ -1399,7 +1393,7 @@ class DependencyResolverMain {
    */
   async getInjectedDirs(rootDir, componentDir, packageName) {
     const packageManager = this.getPackageManager();
-    if (typeof (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getInjectedDirs) === 'function') {
+    if (typeof packageManager?.getInjectedDirs === 'function') {
       return packageManager.getInjectedDirs(rootDir, componentDir, packageName);
     }
     return [];