Skip to content

Commit d50563d

Browse files
committed
refactor: fix PR comments
1 parent 2b58245 commit d50563d

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
lines changed

lib/controllers/update-controller-base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export class UpdateControllerBase {
5656
const currentPlatformVersion = this.$platformCommandHelper.getCurrentPlatformVersion(lowercasePlatform, projectData);
5757
const platformData = this.$platformsDataService.getPlatformData(lowercasePlatform, projectData);
5858
if (currentPlatformVersion) {
59-
return await this.$packageInstallationManager.maxSatisfyingVersionSafe(platformData.frameworkPackageName, currentPlatformVersion) || currentPlatformVersion;
59+
return await this.$packageInstallationManager.getMaxSatisfyingVersionSafe(platformData.frameworkPackageName, currentPlatformVersion) || currentPlatformVersion;
6060
}
6161
}
6262

lib/controllers/update-controller.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ export class UpdateController extends UpdateControllerBase implements IUpdateCon
139139
const devDependencies = projectData.devDependencies || {};
140140
const dependencies = projectData.dependencies || {};
141141
const projectVersion = dependencies[dependency] || devDependencies[dependency];
142-
const maxSatisfyingTargetVersion = await this.$packageInstallationManager.maxSatisfyingVersionSafe(dependency, targetVersion);
143-
const maxSatisfyingProjectVersion = await this.$packageInstallationManager.maxSatisfyingVersionSafe(dependency, projectVersion);
142+
const maxSatisfyingTargetVersion = await this.$packageInstallationManager.getMaxSatisfyingVersionSafe(dependency, targetVersion);
143+
const maxSatisfyingProjectVersion = await this.$packageInstallationManager.getMaxSatisfyingVersionSafe(dependency, projectVersion);
144144
return maxSatisfyingProjectVersion && maxSatisfyingTargetVersion && semver.gt(maxSatisfyingTargetVersion, maxSatisfyingProjectVersion);
145145
}
146146

@@ -177,7 +177,7 @@ export class UpdateController extends UpdateControllerBase implements IUpdateCon
177177
return false;
178178
}
179179

180-
const maxTemplateRuntimeVersion = await this.$packageInstallationManager.maxSatisfyingVersionSafe(frameworkPackageName, templateRuntimeVersion);
180+
const maxTemplateRuntimeVersion = await this.$packageInstallationManager.getMaxSatisfyingVersionSafe(frameworkPackageName, templateRuntimeVersion);
181181
const maxRuntimeVersion = await this.getMaxRuntimeVersion({ platform, projectData });
182182

183183
return maxTemplateRuntimeVersion && maxRuntimeVersion && semver.gt(maxTemplateRuntimeVersion, maxRuntimeVersion);

lib/declarations.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ interface IPackageInstallationManager {
9898
getLatestVersion(packageName: string): Promise<string>;
9999
getNextVersion(packageName: string): Promise<string>;
100100
getLatestCompatibleVersion(packageName: string, referenceVersion?: string): Promise<string>;
101-
maxSatisfyingVersion(packageName: string, versionRange: string): Promise<string>;
101+
getMaxSatisfyingVersion(packageName: string, versionRange: string): Promise<string>;
102102
getLatestCompatibleVersionSafe(packageName: string, referenceVersion?: string): Promise<string>;
103103
getInspectorFromCache(inspectorNpmPackageName: string, projectDir: string): Promise<string>;
104104
clearInspectorCache(): void;
105105
getInstalledDependencyVersion(packageName: string, projectDir?: string): Promise<string>;
106-
maxSatisfyingVersionSafe(packageName: string, versionIdentifier: string): Promise<string>;
106+
getMaxSatisfyingVersionSafe(packageName: string, versionIdentifier: string): Promise<string>;
107107
}
108108

109109
/**

lib/package-installation-manager.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@ export class PackageInstallationManager implements IPackageInstallationManager {
3333
return latestVersion;
3434
}
3535

36-
return await this.maxSatisfyingVersion(packageName, compatibleVersionRange) || latestVersion;
36+
return await this.getMaxSatisfyingVersion(packageName, compatibleVersionRange) || latestVersion;
3737
}
3838

39-
public async maxSatisfyingVersion(packageName: string, versionRange: string): Promise<string> {
39+
public async getMaxSatisfyingVersion(packageName: string, versionRange: string): Promise<string> {
4040
const data = await this.$packageManager.view(packageName, { "versions": true });
4141

4242
return semver.maxSatisfying(data, versionRange);
4343
}
4444

45-
public async maxSatisfyingVersionSafe(packageName: string, versionIdentifier: string): Promise<string> {
45+
public async getMaxSatisfyingVersionSafe(packageName: string, versionIdentifier: string): Promise<string> {
4646
let maxDependencyVersion;
4747
if (semver.valid(versionIdentifier)) {
4848
maxDependencyVersion = versionIdentifier;
4949
} else if (semver.validRange(versionIdentifier)) {
50-
maxDependencyVersion = await this.maxSatisfyingVersion(packageName, versionIdentifier);
50+
maxDependencyVersion = await this.getMaxSatisfyingVersion(packageName, versionIdentifier);
5151
} else {
5252
maxDependencyVersion = await this.$packageManager.getTagVersion(packageName, versionIdentifier);
5353
}
@@ -60,7 +60,7 @@ export class PackageInstallationManager implements IPackageInstallationManager {
6060
const devDependencies = projectData.devDependencies || {};
6161
const dependencies = projectData.dependencies || {};
6262
const referencedVersion = dependencies[packageName] || devDependencies[packageName];
63-
const installedVersion = await this.maxSatisfyingVersionSafe(packageName, referencedVersion);
63+
const installedVersion = await this.getMaxSatisfyingVersionSafe(packageName, referencedVersion);
6464

6565
return installedVersion;
6666
}

test/services/webpack/webpack-compiler-service.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ function createTestInjector(): IInjector {
1515
testInjector.register("hooksService", {});
1616
testInjector.register("hostInfo", {});
1717
testInjector.register("logger", {});
18+
testInjector.register("errors", {});
19+
testInjector.register("packageInstallationManager", {});
1820
testInjector.register("mobileHelper", {});
1921
testInjector.register("cleanupService", {});
2022

test/stubs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,15 +249,15 @@ export class PackageInstallationManagerStub implements IPackageInstallationManag
249249
return Promise.resolve("");
250250
}
251251

252-
async maxSatisfyingVersion(): Promise<string> {
252+
async getMaxSatisfyingVersion(): Promise<string> {
253253
return "";
254254
}
255255

256256
async getInstalledDependencyVersion(packageName: string, projectDir?: string): Promise<string> {
257257
return Promise.resolve("");
258258
}
259259

260-
async maxSatisfyingVersionSafe(packageName: string, versionIdentifier: string): Promise<string> {
260+
async getMaxSatisfyingVersionSafe(packageName: string, versionIdentifier: string): Promise<string> {
261261
return Promise.resolve(versionIdentifier);
262262
}
263263
}

0 commit comments

Comments
 (0)