diff --git a/docs/usage/self-hosted-configuration.md b/docs/usage/self-hosted-configuration.md
index 7c3239f2228a1746b0bc1a0565d8efd4914b78dc..f1c466174b4d990dfb624c91908bfbec2c85f8a7 100644
--- a/docs/usage/self-hosted-configuration.md
+++ b/docs/usage/self-hosted-configuration.md
@@ -34,7 +34,7 @@ The command to install dependencies is necessary because, by default, the instal
"postUpgradeTasks": {
"commands": [
"npm ci --ignore-scripts",
- "npx ng update {{{depName}}} --from={{{fromVersion}}} --to={{{toVersion}}} --migrateOnly --allowDirty --force"
+ "npx ng update {{{depName}}} --from={{{currentVersion}}} --to={{{toVersion}}} --migrateOnly --allowDirty --force"
],
"fileFilters": ["**/**"]
}
diff --git a/lib/config/migration.ts b/lib/config/migration.ts
index 03dd90a9de84797de5d3adcb779453d7148b40ad..026ffab6c8e12f5c183e8ec2afc378a0560dd2c4 100644
--- a/lib/config/migration.ts
+++ b/lib/config/migration.ts
@@ -504,7 +504,7 @@ export function migrateConfig(
migratedConfig.binarySource = 'global';
}
const migratedTemplates = {
- currentVersion: 'fromVersion',
+ fromVersion: 'currentVersion',
newVersion: 'newValue',
newValueMajor: 'newMajor',
newValueMinor: 'newMinor',
diff --git a/lib/manager/common.ts b/lib/manager/common.ts
index 34d0115ed4c5b64f995599abdc9a75844f51ae80..f5bb6444bba4723cd00f1b51790f9e1b643c2b34 100644
--- a/lib/manager/common.ts
+++ b/lib/manager/common.ts
@@ -141,7 +141,7 @@ export interface LookupUpdate {
isRange?: boolean;
isRollback?: boolean;
isSingleVersion?: boolean;
- fromVersion?: string;
+ currentVersion?: string;
newDigest?: string;
newDigestShort?: string;
newMajor?: number;
@@ -165,7 +165,7 @@ export interface PackageDependency<T = Record<string, any>> extends Package<T> {
displayFrom?: string;
displayTo?: string;
fixedVersion?: string;
- fromVersion?: string;
+ currentVersion?: string;
lockedVersion?: string;
propSource?: string;
registryUrls?: string[];
diff --git a/lib/manager/npm/index.ts b/lib/manager/npm/index.ts
index d17181db0e7eeffb01865ecd4e35a9b8f2e40684..7f2db9958959ddf214b850cfc7c6e4e5dd305f4b 100644
--- a/lib/manager/npm/index.ts
+++ b/lib/manager/npm/index.ts
@@ -14,6 +14,6 @@ export const defaultConfig = {
versioning: npmVersioning.id,
prBodyDefinitions: {
Change:
- "[{{#if displayFrom}}`{{{displayFrom}}}` -> {{else}}{{#if currentValue}}`{{{currentValue}}}` -> {{/if}}{{/if}}{{#if displayTo}}`{{{displayTo}}}`{{else}}`{{{newValue}}}`{{/if}}]({{#if depName}}https://renovatebot.com/diffs/npm/{{replace '/' '%2f' depName}}/{{{fromVersion}}}/{{{toVersion}}}{{/if}})",
+ "[{{#if displayFrom}}`{{{displayFrom}}}` -> {{else}}{{#if currentValue}}`{{{currentValue}}}` -> {{/if}}{{/if}}{{#if displayTo}}`{{{displayTo}}}`{{else}}`{{{newValue}}}`{{/if}}]({{#if depName}}https://renovatebot.com/diffs/npm/{{replace '/' '%2f' depName}}/{{{currentVersion}}}/{{{toVersion}}}{{/if}})",
},
};
diff --git a/lib/manager/pip_requirements/__snapshots__/extract.spec.ts.snap b/lib/manager/pip_requirements/__snapshots__/extract.spec.ts.snap
index 32eb886babd26f65b1438a76cd6814b8f5eeb68f..3583724d4440b207053d2e0a086c7ee0a054af34 100644
--- a/lib/manager/pip_requirements/__snapshots__/extract.spec.ts.snap
+++ b/lib/manager/pip_requirements/__snapshots__/extract.spec.ts.snap
@@ -5,21 +5,21 @@ Object {
"deps": Array [
Object {
"currentValue": "==0.3.1",
+ "currentVersion": "0.3.1",
"datasource": "pypi",
"depName": "some-package",
- "fromVersion": "0.3.1",
},
Object {
"currentValue": "==1.0.0",
+ "currentVersion": "1.0.0",
"datasource": "pypi",
"depName": "some-other-package",
- "fromVersion": "1.0.0",
},
Object {
"currentValue": "==1.9",
+ "currentVersion": "1.9",
"datasource": "pypi",
"depName": "not_semver",
- "fromVersion": "1.9",
},
],
"registryUrls": Array [
@@ -32,33 +32,33 @@ exports[`lib/manager/pip_requirements/extract extractPackageFile() extracts mult
Array [
Object {
"currentValue": "==1",
+ "currentVersion": "1",
"datasource": "pypi",
"depName": "Django",
- "fromVersion": "1",
},
Object {
"currentValue": "==0.6.27",
+ "currentVersion": "0.6.27",
"datasource": "pypi",
"depName": "distribute",
- "fromVersion": "0.6.27",
},
Object {
"currentValue": "==0.2",
+ "currentVersion": "0.2",
"datasource": "pypi",
"depName": "dj-database-url",
- "fromVersion": "0.2",
},
Object {
"currentValue": "==2.4.5",
+ "currentVersion": "2.4.5",
"datasource": "pypi",
"depName": "psycopg2",
- "fromVersion": "2.4.5",
},
Object {
"currentValue": "==0.1.2",
+ "currentVersion": "0.1.2",
"datasource": "pypi",
"depName": "wsgiref",
- "fromVersion": "0.1.2",
},
]
`;
@@ -67,34 +67,34 @@ exports[`lib/manager/pip_requirements/extract extractPackageFile() handles comme
Array [
Object {
"currentValue": "==1.11.23",
+ "currentVersion": "1.11.23",
"datasource": "pypi",
"depName": "Django",
- "fromVersion": "1.11.23",
},
Object {
"currentValue": "==0.6.27",
+ "currentVersion": "0.6.27",
"datasource": "pypi",
"depName": "distribute",
- "fromVersion": "0.6.27",
"skipReason": "ignored",
},
Object {
"currentValue": "==0.2",
+ "currentVersion": "0.2",
"datasource": "pypi",
"depName": "dj-database-url",
- "fromVersion": "0.2",
},
Object {
"currentValue": "==2.4.5",
+ "currentVersion": "2.4.5",
"datasource": "pypi",
"depName": "psycopg2",
- "fromVersion": "2.4.5",
},
Object {
"currentValue": "==0.1.2",
+ "currentVersion": "0.1.2",
"datasource": "pypi",
"depName": "wsgiref",
- "fromVersion": "0.1.2",
},
]
`;
@@ -104,15 +104,15 @@ Object {
"deps": Array [
Object {
"currentValue": "==2.0.12",
+ "currentVersion": "2.0.12",
"datasource": "pypi",
"depName": "Django",
- "fromVersion": "2.0.12",
},
Object {
"currentValue": "==4.1.1",
+ "currentVersion": "4.1.1",
"datasource": "pypi",
"depName": "celery",
- "fromVersion": "4.1.1",
},
Object {
"currentValue": " == 3.2.1",
@@ -121,21 +121,21 @@ Object {
},
Object {
"currentValue": "==0.3.1",
+ "currentVersion": "0.3.1",
"datasource": "pypi",
"depName": "some-package",
- "fromVersion": "0.3.1",
},
Object {
"currentValue": "==1.0.0",
+ "currentVersion": "1.0.0",
"datasource": "pypi",
"depName": "some-other-package",
- "fromVersion": "1.0.0",
},
Object {
"currentValue": "==1.9",
+ "currentVersion": "1.9",
"datasource": "pypi",
"depName": "not_semver",
- "fromVersion": "1.9",
},
],
"registryUrls": Array [
@@ -150,15 +150,15 @@ Object {
"deps": Array [
Object {
"currentValue": "==2.0.12",
+ "currentVersion": "2.0.12",
"datasource": "pypi",
"depName": "Django",
- "fromVersion": "2.0.12",
},
Object {
"currentValue": "==4.1.1",
+ "currentVersion": "4.1.1",
"datasource": "pypi",
"depName": "celery",
- "fromVersion": "4.1.1",
},
Object {
"currentValue": " == 3.2.1",
@@ -167,21 +167,21 @@ Object {
},
Object {
"currentValue": "==0.3.1",
+ "currentVersion": "0.3.1",
"datasource": "pypi",
"depName": "some-package",
- "fromVersion": "0.3.1",
},
Object {
"currentValue": "==1.0.0",
+ "currentVersion": "1.0.0",
"datasource": "pypi",
"depName": "some-other-package",
- "fromVersion": "1.0.0",
},
Object {
"currentValue": "==1.9",
+ "currentVersion": "1.9",
"datasource": "pypi",
"depName": "not_semver",
- "fromVersion": "1.9",
},
],
"registryUrls": Array [
@@ -196,15 +196,15 @@ Object {
"deps": Array [
Object {
"currentValue": "==2.0.12",
+ "currentVersion": "2.0.12",
"datasource": "pypi",
"depName": "Django",
- "fromVersion": "2.0.12",
},
Object {
"currentValue": "==4.1.1",
+ "currentVersion": "4.1.1",
"datasource": "pypi",
"depName": "celery",
- "fromVersion": "4.1.1",
},
Object {
"currentValue": " == 3.2.1",
@@ -213,21 +213,21 @@ Object {
},
Object {
"currentValue": "==0.3.1",
+ "currentVersion": "0.3.1",
"datasource": "pypi",
"depName": "some-package",
- "fromVersion": "0.3.1",
},
Object {
"currentValue": "==1.0.0",
+ "currentVersion": "1.0.0",
"datasource": "pypi",
"depName": "some-other-package",
- "fromVersion": "1.0.0",
},
Object {
"currentValue": "==1.9",
+ "currentVersion": "1.9",
"datasource": "pypi",
"depName": "not_semver",
- "fromVersion": "1.9",
},
],
"registryUrls": Array [
@@ -242,15 +242,15 @@ Object {
"deps": Array [
Object {
"currentValue": "==2.0.12",
+ "currentVersion": "2.0.12",
"datasource": "pypi",
"depName": "Django",
- "fromVersion": "2.0.12",
},
Object {
"currentValue": "==4.1.1",
+ "currentVersion": "4.1.1",
"datasource": "pypi",
"depName": "celery",
- "fromVersion": "4.1.1",
},
Object {
"currentValue": " == 3.2.1",
diff --git a/lib/manager/pip_requirements/extract.ts b/lib/manager/pip_requirements/extract.ts
index 23bfd8dd88bde13e51bd0e1d2b53310dfae9d57b..095ab69fe693eaaeae6f08b6a05d3b883cf4ad41 100644
--- a/lib/manager/pip_requirements/extract.ts
+++ b/lib/manager/pip_requirements/extract.ts
@@ -71,7 +71,7 @@ export function extractPackageFile(
datasource: datasourcePypi.id,
};
if (currentValue?.startsWith('==')) {
- dep.fromVersion = currentValue.replace(/^==/, '');
+ dep.currentVersion = currentValue.replace(/^==/, '');
}
return dep;
})
diff --git a/lib/util/cache/repository/index.spec.ts b/lib/util/cache/repository/index.spec.ts
index f6d635a0298a9a55ff46f191e32dc4ea4738e097..af6546d60d56f09f4cdbb63fc8e19711b724f3b7 100644
--- a/lib/util/cache/repository/index.spec.ts
+++ b/lib/util/cache/repository/index.spec.ts
@@ -47,6 +47,19 @@ describe('lib/util/cache/repository', () => {
expect(fs.readFile.mock.calls).toHaveLength(1);
expect(fs.outputFile.mock.calls).toHaveLength(1);
});
+ it('migrates', async () => {
+ fs.readFile.mockResolvedValueOnce(
+ '{"repository":"abc/def","branches":[{"upgrades":[{"fromVersion":"1.0.0"}]}]}' as any
+ );
+ await repositoryCache.initialize({
+ ...config,
+ repositoryCache: 'enabled',
+ });
+ expect(repositoryCache.getCache().branches[0].upgrades[0]).toEqual({
+ currentVersion: '1.0.0',
+ });
+ await repositoryCache.finalize();
+ });
it('gets', () => {
expect(repositoryCache.getCache()).toEqual({ scan: {} });
});
diff --git a/lib/util/cache/repository/index.ts b/lib/util/cache/repository/index.ts
index b5f45d7554388a3c4f394173cd19015848045dd1..3ff538fad650857b2a471b84570abf2bbfd2500a 100644
--- a/lib/util/cache/repository/index.ts
+++ b/lib/util/cache/repository/index.ts
@@ -17,7 +17,7 @@ export interface BranchUpgradeCache {
datasource?: string;
depName?: string;
fixedVersion?: string;
- fromVersion?: string;
+ currentVersion?: string;
lookupName?: string;
newDigest?: string;
newValue?: string;
@@ -87,6 +87,15 @@ export function getCache(): Cache {
cache = cache || Object.create({});
delete cache.init;
cache.scan = cache.scan || Object.create({});
+ for (const branch of cache.branches || []) {
+ for (const upgrade of (branch.upgrades || []) as any) {
+ // migrate fromVersion to currentVersion
+ if (upgrade.fromVersion) {
+ upgrade.currentVersion = upgrade.fromVersion;
+ delete upgrade.fromVersion;
+ }
+ }
+ }
return cache;
}
diff --git a/lib/util/package-rules.spec.ts b/lib/util/package-rules.spec.ts
index 097d3895b7a4d0da11bf860d943501d654411c0f..acc3b2150c6ac4e1877619464e59afbe0f2e096b 100644
--- a/lib/util/package-rules.spec.ts
+++ b/lib/util/package-rules.spec.ts
@@ -467,7 +467,7 @@ describe('applyPackageRules()', () => {
...{
depName: 'test',
currentValue: '^1.0.0',
- fromVersion: '1.0.3',
+ currentVersion: '1.0.3',
},
});
expect(res1.x).toBeDefined();
@@ -495,7 +495,7 @@ describe('applyPackageRules()', () => {
...{
depName: 'test',
currentValue: '2.4.6',
- fromVersion: '2.4.6',
+ currentVersion: '2.4.6',
},
});
expect(res1.x).toBeDefined();
@@ -542,7 +542,7 @@ describe('applyPackageRules()', () => {
...{
depName: 'test',
currentValue: '4.6.0',
- fromVersion: '4.6.0',
+ currentVersion: '4.6.0',
},
});
expect(res1.x).toBeDefined();
@@ -562,7 +562,7 @@ describe('applyPackageRules()', () => {
...{
depName: 'test',
currentValue: '4.6.0',
- fromVersion: '4.6.0',
+ currentVersion: '4.6.0',
},
});
const res2 = applyPackageRules({
@@ -570,7 +570,7 @@ describe('applyPackageRules()', () => {
...{
depName: 'test',
currentValue: '5.6.0',
- fromVersion: '5.6.0',
+ currentVersion: '5.6.0',
},
});
expect(res1.x).toBeDefined();
@@ -591,7 +591,7 @@ describe('applyPackageRules()', () => {
...{
depName: 'test',
currentValue: '4.6.0',
- fromVersion: '4.6.0',
+ currentVersion: '4.6.0',
},
});
const res2 = applyPackageRules({
@@ -599,7 +599,7 @@ describe('applyPackageRules()', () => {
...{
depName: 'test',
currentValue: '5.6.0',
- fromVersion: '5.6.0',
+ currentVersion: '5.6.0',
},
});
expect(res1.x).toBeUndefined();
diff --git a/lib/util/package-rules.ts b/lib/util/package-rules.ts
index 29b850d1d8746e01a629eb3ec39211a957ec8023..ba52d25b9971cd01530580f0a6b709faa63f7d83 100644
--- a/lib/util/package-rules.ts
+++ b/lib/util/package-rules.ts
@@ -12,7 +12,7 @@ export interface Config extends Record<string, any> {
depTypes?: string[];
depName?: string;
currentValue?: string;
- fromVersion?: string;
+ currentVersion?: string;
lockedVersion?: string;
updateType?: UpdateType;
isBump?: boolean;
@@ -32,7 +32,7 @@ function matchesRule(inputConfig: Config, packageRule: PackageRule): boolean {
depTypes,
depName,
currentValue,
- fromVersion,
+ currentVersion,
lockedVersion,
updateType,
isBump,
@@ -198,7 +198,7 @@ function matchesRule(inputConfig: Config, packageRule: PackageRule): boolean {
const compareVersion =
currentValue && version.isVersion(currentValue)
? currentValue // it's a version so we can match against it
- : lockedVersion || fromVersion; // need to match against this fromVersion, if available
+ : lockedVersion || currentVersion; // need to match against this currentVersion, if available
if (compareVersion) {
// istanbul ignore next
if (version.isVersion(compareVersion)) {
diff --git a/lib/util/template/index.ts b/lib/util/template/index.ts
index 86ca71253f4f90d69a55b74f77dd96608c9e576f..d7027572634397af74e4c082ae3c6d59f6c0f30d 100644
--- a/lib/util/template/index.ts
+++ b/lib/util/template/index.ts
@@ -40,6 +40,8 @@ export const allowedFields = {
baseBranch: 'The baseBranch for this branch/PR',
body: 'The body of the release notes',
currentValue: 'The extracted current value of the dependency being updated',
+ currentVersion:
+ 'The version that would be currently installed. For example, if currentValue is ^3.0.0 then currentVersion might be 3.1.0.',
datasource: 'The datasource used to look up the upgrade',
depName: 'The name of the dependency being updated',
depNameLinked:
@@ -50,8 +52,6 @@ export const allowedFields = {
depType: 'The dependency type (if extracted - manager-dependent)',
displayFrom: 'The current value, formatted for display',
displayTo: 'The to value, formatted for display',
- fromVersion:
- 'The version that would be currently installed. For example, if currentValue is ^3.0.0 then fromVersion might be 3.1.0.',
hasReleaseNotes: 'true if the upgrade has release notes',
isLockfileUpdate: 'true if the branch is a lock file update',
isMajor: 'true if the upgrade is major',
diff --git a/lib/versioning/cargo/index.spec.ts b/lib/versioning/cargo/index.spec.ts
index 634f4c8f1e849184b9abf6d0ef2e14d79f1a003c..50bbd83a16a2698cd06c3b01ec955575cbf7dcf3 100644
--- a/lib/versioning/cargo/index.spec.ts
+++ b/lib/versioning/cargo/index.spec.ts
@@ -108,7 +108,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: null,
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toBeNull();
@@ -116,7 +116,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '*',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('*');
@@ -126,7 +126,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '=1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -134,7 +134,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: ' =1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -144,7 +144,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '= 1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('= 1.1.0');
@@ -152,7 +152,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: ' = 1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -160,7 +160,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: ' = 1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -168,7 +168,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '= 1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('= 1.1.0');
@@ -178,7 +178,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('1.1.0');
@@ -188,7 +188,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.7',
})
).toEqual('^1.0');
@@ -198,7 +198,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '2.0.7',
})
).toEqual('^2.0.0');
@@ -208,7 +208,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '1.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '2.0.7',
})
).toEqual('2.0.0');
@@ -218,7 +218,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '2.1.7',
})
).toEqual('^2');
@@ -228,7 +228,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~1',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.7',
})
).toEqual('~1');
@@ -238,7 +238,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '5.1.7',
})
).toEqual('5');
@@ -246,7 +246,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '6.1.7',
})
).toEqual('6');
@@ -256,7 +256,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5.0',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '5.0.7',
})
).toEqual('5.0');
@@ -265,7 +265,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5.0',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '5.1.7',
})
).toEqual('5.1');
@@ -273,7 +273,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5.0',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '6.1.7',
})
).toEqual('6.1');
@@ -283,7 +283,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5.0',
rangeStrategy: 'replace',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '6.1.7',
})
).toEqual('6.1');
@@ -293,7 +293,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '=1.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -303,7 +303,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '1.0.*',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('1.1.*');
@@ -313,7 +313,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '1.*',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '2.1.0',
})
).toEqual('2.*');
@@ -323,7 +323,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~0.6.1',
rangeStrategy: 'replace',
- fromVersion: '0.6.8',
+ currentVersion: '0.6.8',
toVersion: '0.7.0-rc.2',
})
).toEqual('~0.7.0-rc');
@@ -333,7 +333,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '<1.3.4',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.5.0',
})
).toEqual('<1.5.1');
@@ -341,7 +341,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '< 1.3.4',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.5.0',
})
).toEqual('< 1.5.1');
@@ -349,7 +349,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '< 1.3.4',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.5.0',
})
).toEqual('< 1.5.1');
@@ -359,7 +359,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '<=1.3.4',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.5.0',
})
).toEqual('<=1.5.0');
@@ -367,7 +367,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '<= 1.3.4',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.5.0',
})
).toEqual('<= 1.5.0');
@@ -375,7 +375,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '<= 1.3.4',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.5.0',
})
).toEqual('<= 1.5.0');
@@ -385,7 +385,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 0.1.21, < 0.2.0',
rangeStrategy: 'bump',
- fromVersion: '0.1.21',
+ currentVersion: '0.1.21',
toVersion: '0.1.24',
})
).toEqual('>= 0.1.24, < 0.2.0');
@@ -393,7 +393,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 0.1.21, <= 0.2.0',
rangeStrategy: 'bump',
- fromVersion: '0.1.21',
+ currentVersion: '0.1.21',
toVersion: '0.1.24',
})
).toEqual('>= 0.1.24, <= 0.2.0');
@@ -401,7 +401,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 0.0.1, <= 0.1',
rangeStrategy: 'bump',
- fromVersion: '0.0.1',
+ currentVersion: '0.0.1',
toVersion: '0.0.2',
})
).toEqual('>= 0.0.2, <= 0.1');
@@ -409,7 +409,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 1.2.3, <= 1',
rangeStrategy: 'bump',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.2.4',
})
).toEqual('>= 1.2.4, <= 1');
@@ -417,7 +417,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 1.2.3, <= 1.0',
rangeStrategy: 'bump',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.2.4',
})
).toEqual('>= 1.2.4, <= 1.2');
@@ -425,7 +425,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 0.0.1, < 0.1',
rangeStrategy: 'bump',
- fromVersion: '0.1.0',
+ currentVersion: '0.1.0',
toVersion: '0.2.1',
})
).toEqual('>= 0.2.1, < 0.3');
diff --git a/lib/versioning/cargo/index.ts b/lib/versioning/cargo/index.ts
index 8f58e434bbd7a01bab25b47e4e10813e809a3917..c7f3d9da712b1468455e12ee4dee03c275d797c3 100644
--- a/lib/versioning/cargo/index.ts
+++ b/lib/versioning/cargo/index.ts
@@ -75,7 +75,7 @@ const isSingleVersion = (constraint: string): string | boolean =>
function getNewValue({
currentValue,
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
}: NewValueConfig): string {
if (!currentValue || currentValue === '*') {
@@ -92,7 +92,7 @@ function getNewValue({
const newSemver = npm.getNewValue({
currentValue: cargo2npm(currentValue),
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
});
let newCargo = npm2cargo(newSemver);
diff --git a/lib/versioning/common.ts b/lib/versioning/common.ts
index 192ddf0b11b7fa63e5d1ea25568b6e005c2cd252..2e705051e64f78c608a06fcfab4b638452497c01 100644
--- a/lib/versioning/common.ts
+++ b/lib/versioning/common.ts
@@ -9,7 +9,7 @@ export type RangeStrategy = _RangeStrategy;
export interface NewValueConfig {
currentValue: string;
rangeStrategy: RangeStrategy;
- fromVersion?: string;
+ currentVersion?: string;
toVersion: string;
}
export interface VersioningApi {
diff --git a/lib/versioning/composer/index.spec.ts b/lib/versioning/composer/index.spec.ts
index 89e7f3044c164d421e3e7ede86db2b152e403168..8ef3c4ffd73690334731b1d6389dc7f090599c53 100644
--- a/lib/versioning/composer/index.spec.ts
+++ b/lib/versioning/composer/index.spec.ts
@@ -170,7 +170,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~1.0',
rangeStrategy: 'pin',
- fromVersion: '1.0',
+ currentVersion: '1.0',
toVersion: 'V1.1',
})
).toEqual('V1.1');
@@ -178,7 +178,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1.0',
rangeStrategy: 'pin',
- fromVersion: '1.0',
+ currentVersion: '1.0',
toVersion: 'V1.1',
})
).toEqual('V1.1');
@@ -188,7 +188,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: 'v1.0',
rangeStrategy: 'replace',
- fromVersion: '1.0',
+ currentVersion: '1.0',
toVersion: '1.1',
})
).toEqual('v1.1');
@@ -198,7 +198,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.7',
})
).toEqual('^1.0');
@@ -208,7 +208,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '<2.7.14',
rangeStrategy: 'bump',
- fromVersion: '2.0.3',
+ currentVersion: '2.0.3',
toVersion: '2.0.4',
})
).toEqual('<2.7.14');
@@ -218,7 +218,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.3.5',
})
).toEqual('^1.3.5');
@@ -228,7 +228,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.3.5',
})
).toEqual('^1');
@@ -238,7 +238,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1.0',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '2.3.5',
})
).toEqual('^2.0');
@@ -248,7 +248,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~0.2',
rangeStrategy: 'replace',
- fromVersion: '0.2.0',
+ currentVersion: '0.2.0',
toVersion: '0.3.0',
})
).toEqual('~0.3');
@@ -256,7 +256,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~0.2',
rangeStrategy: 'replace',
- fromVersion: '0.2.0',
+ currentVersion: '0.2.0',
toVersion: '1.1.0',
})
).toEqual('~1.0');
@@ -266,7 +266,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~4',
rangeStrategy: 'replace',
- fromVersion: '4.0.0',
+ currentVersion: '4.0.0',
toVersion: '4.2.0',
})
).toEqual('~4');
@@ -274,7 +274,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~4',
rangeStrategy: 'replace',
- fromVersion: '4.0.0',
+ currentVersion: '4.0.0',
toVersion: '5.1.0',
})
).toEqual('~5');
@@ -284,7 +284,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~4.0',
rangeStrategy: 'replace',
- fromVersion: '4.0.0',
+ currentVersion: '4.0.0',
toVersion: '5.1.0',
})
).toEqual('~5.0');
@@ -292,7 +292,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~4.0',
rangeStrategy: 'replace',
- fromVersion: '4.0.0',
+ currentVersion: '4.0.0',
toVersion: '4.1.0',
})
).toEqual('~4.1');
@@ -300,7 +300,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~1.2 || ~2.0',
rangeStrategy: 'replace',
- fromVersion: '2.0.0',
+ currentVersion: '2.0.0',
toVersion: '3.1.0',
})
).toEqual('~3.0');
@@ -308,7 +308,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~1.2 || ~2.0',
rangeStrategy: 'widen',
- fromVersion: '2.0.0',
+ currentVersion: '2.0.0',
toVersion: '3.1.0',
})
).toEqual('~1.2 || ~2.0 || ~3.0');
@@ -318,7 +318,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '+4.0.0',
rangeStrategy: 'replace',
- fromVersion: '4.0.0',
+ currentVersion: '4.0.0',
toVersion: '4.2.0',
})
).toEqual('4.2.0');
@@ -328,7 +328,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: 'v4.0.0',
rangeStrategy: 'replace',
- fromVersion: '4.0.0',
+ currentVersion: '4.0.0',
toVersion: '4.2.0',
})
).toEqual('v4.2.0');
@@ -338,7 +338,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^v1.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.7',
})
).toEqual('^v1.1');
@@ -348,7 +348,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^v1.0@beta',
rangeStrategy: 'bump',
- fromVersion: '1.0.0-beta3',
+ currentVersion: '1.0.0-beta3',
toVersion: '1.0.0-beta5',
})
).toEqual('^v1.0.0-beta5@beta');
@@ -358,7 +358,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^v1.0@beta',
rangeStrategy: 'replace',
- fromVersion: '1.0.0-beta3',
+ currentVersion: '1.0.0-beta3',
toVersion: '2.0.0-beta5',
})
).toEqual('^v2.0.0-beta5@beta');
@@ -368,7 +368,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^4.0@alpha',
rangeStrategy: 'replace',
- fromVersion: '4.0.0-alpha1',
+ currentVersion: '4.0.0-alpha1',
toVersion: '4.0.0-beta5',
})
).toEqual('^4.0.0-beta5@alpha');
@@ -378,7 +378,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '3.6.*',
rangeStrategy: 'replace',
- fromVersion: '3.6.0',
+ currentVersion: '3.6.0',
toVersion: '3.7',
})
).toEqual('3.7.*');
@@ -387,7 +387,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: 'v3.1.*',
rangeStrategy: 'replace',
- fromVersion: '3.1.10',
+ currentVersion: '3.1.10',
toVersion: '3.2.0',
})
).toEqual('v3.2.*'); // #5388
@@ -397,7 +397,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^0.1',
rangeStrategy: 'update-lockfile',
- fromVersion: '0.1.0',
+ currentVersion: '0.1.0',
toVersion: '0.1.1',
})
).toEqual('^0.1');
@@ -405,7 +405,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^0.1',
rangeStrategy: 'update-lockfile',
- fromVersion: '0.1.0',
+ currentVersion: '0.1.0',
toVersion: '0.2.0',
})
).toEqual('^0.2');
@@ -414,7 +414,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^5.1',
rangeStrategy: 'update-lockfile',
- fromVersion: '5.1.0',
+ currentVersion: '5.1.0',
toVersion: '5.2.0',
})
).toEqual('^5.1');
@@ -422,7 +422,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^5.1',
rangeStrategy: 'update-lockfile',
- fromVersion: '5.1.0',
+ currentVersion: '5.1.0',
toVersion: '6.0.0',
})
).toEqual('^6.0');
@@ -431,7 +431,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^5',
rangeStrategy: 'update-lockfile',
- fromVersion: '5.1.0',
+ currentVersion: '5.1.0',
toVersion: '5.2.0',
})
).toEqual('^5');
@@ -439,7 +439,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^5',
rangeStrategy: 'update-lockfile',
- fromVersion: '5.1.0',
+ currentVersion: '5.1.0',
toVersion: '6.0.0',
})
).toEqual('^6');
diff --git a/lib/versioning/composer/index.ts b/lib/versioning/composer/index.ts
index 9e6f5947f7ca89f259d7dd0aa492fd18dc4a663d..9d32665e54b3f93ce23692d29a96892bf2c468c0 100644
--- a/lib/versioning/composer/index.ts
+++ b/lib/versioning/composer/index.ts
@@ -118,7 +118,7 @@ const minSatisfyingVersion = (versions: string[], range: string): string =>
function getNewValue({
currentValue,
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
}: NewValueConfig): string {
if (rangeStrategy === 'pin') {
@@ -131,7 +131,7 @@ function getNewValue({
return getNewValue({
currentValue,
rangeStrategy: 'replace',
- fromVersion,
+ currentVersion,
toVersion,
});
}
@@ -155,7 +155,7 @@ function getNewValue({
} else if (/^[~^]([0-9]*(?:\.[0-9]*)?)$/.test(currentValue)) {
const operator = currentValue.substr(0, 1);
// handle ~4.1 case
- if (fromVersion && toMajor > getMajor(fromVersion)) {
+ if (currentVersion && toMajor > getMajor(currentVersion)) {
newValue = `${operator}${toMajor}.0`;
} else {
newValue = `${operator}${toMajor}.${toMinor}`;
@@ -168,7 +168,7 @@ function getNewValue({
newValue = npm.getNewValue({
currentValue: normalizeVersion(currentValue),
rangeStrategy,
- fromVersion: normalizeVersion(fromVersion),
+ currentVersion: normalizeVersion(currentVersion),
toVersion: padZeroes(normalizeVersion(toVersion)),
});
}
@@ -177,7 +177,7 @@ function getNewValue({
const replacementValue = getNewValue({
currentValue: lastValue,
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
});
if (rangeStrategy === 'replace') {
@@ -188,7 +188,7 @@ function getNewValue({
}
if (!newValue) {
logger.warn(
- { currentValue, rangeStrategy, fromVersion, toVersion },
+ { currentValue, rangeStrategy, currentVersion, toVersion },
'Unsupported composer value'
);
newValue = toVersion;
diff --git a/lib/versioning/docker/index.spec.ts b/lib/versioning/docker/index.spec.ts
index c3bd586317d4613fce7260108228d480a7584367..f6519a2bc3736a577b692a104b90ffc122213857 100644
--- a/lib/versioning/docker/index.spec.ts
+++ b/lib/versioning/docker/index.spec.ts
@@ -155,7 +155,7 @@ describe('docker.', () => {
docker.getNewValue({
currentValue: null,
rangeStrategy: null,
- fromVersion: null,
+ currentVersion: null,
toVersion: '1.2.3',
})
).toBe('1.2.3');
diff --git a/lib/versioning/gradle/index.spec.ts b/lib/versioning/gradle/index.spec.ts
index 6228d94c3a79673ae70e08fe2f666a2f6e186b39..35f9c63781e93e88a08bfec8d4603f86c1228e2b 100644
--- a/lib/versioning/gradle/index.spec.ts
+++ b/lib/versioning/gradle/index.spec.ts
@@ -232,7 +232,7 @@ describe('versioning/gradle', () => {
api.getNewValue({
currentValue: '1',
rangeStrategy: null,
- fromVersion: null,
+ currentVersion: null,
toVersion: '1.1',
})
).toBe('1.1');
@@ -240,7 +240,7 @@ describe('versioning/gradle', () => {
api.getNewValue({
currentValue: '[1.2.3,]',
rangeStrategy: null,
- fromVersion: null,
+ currentVersion: null,
toVersion: '1.2.4',
})
).toBeNull();
@@ -259,12 +259,12 @@ describe('versioning/gradle', () => {
['[1.2.3,)', '1.2.3', '1.2.4'],
['[1.2.3,[', '1.2.3', '1.2.4'],
];
- sample.forEach(([currentValue, fromVersion, toVersion]) => {
+ sample.forEach(([currentValue, currentVersion, toVersion]) => {
expect(
api.getNewValue({
currentValue,
rangeStrategy: 'pin',
- fromVersion,
+ currentVersion,
toVersion,
})
).toEqual(toVersion);
diff --git a/lib/versioning/hashicorp/index.spec.ts b/lib/versioning/hashicorp/index.spec.ts
index 21a2b19272f24526066eb55dab26f84870b67b66..e0ccfe675113f0c20736024ea975c3b48ff095ad 100644
--- a/lib/versioning/hashicorp/index.spec.ts
+++ b/lib/versioning/hashicorp/index.spec.ts
@@ -55,7 +55,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~> 1.2',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('~> 2.0');
@@ -63,7 +63,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~> 1.2.0',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('~> 2.0.0');
@@ -73,7 +73,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 1.0.0, <= 2.0.0',
rangeStrategy: 'widen',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('>= 1.0.0, <= 2.0.7');
diff --git a/lib/versioning/hashicorp/index.ts b/lib/versioning/hashicorp/index.ts
index 88ccab86f6f3e868c2c57142a237b2172190741b..13f37aac1fc4cadf3a08ec6b02ec5736ce1f7a49 100644
--- a/lib/versioning/hashicorp/index.ts
+++ b/lib/versioning/hashicorp/index.ts
@@ -32,7 +32,7 @@ const minSatisfyingVersion = (versions: string[], range: string): string =>
function getNewValue({
currentValue,
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
}: NewValueConfig): string {
// handle specia. ~> 1.2 case
@@ -45,7 +45,7 @@ function getNewValue({
return npm.getNewValue({
currentValue,
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
});
}
diff --git a/lib/versioning/hex/index.spec.ts b/lib/versioning/hex/index.spec.ts
index b6579867251fba2a8a295cf463327bbdba318909..b8e633339ed9e463f366f3981c47b43a4b5002ec 100644
--- a/lib/versioning/hex/index.spec.ts
+++ b/lib/versioning/hex/index.spec.ts
@@ -79,7 +79,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '== 1.2.3',
rangeStrategy: 'pin',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('== 2.0.7');
@@ -89,7 +89,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '== 3.6.1',
rangeStrategy: 'bump',
- fromVersion: '3.6.1',
+ currentVersion: '3.6.1',
toVersion: '3.6.2',
})
).toEqual('== 3.6.2');
@@ -99,7 +99,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '== 3.6.1',
rangeStrategy: 'replace',
- fromVersion: '3.6.1',
+ currentVersion: '3.6.1',
toVersion: '3.6.2',
})
).toEqual('== 3.6.2');
@@ -109,7 +109,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '~> 1.2',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('~> 2.0');
@@ -117,7 +117,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '~> 1.2',
rangeStrategy: 'pin',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('== 2.0.7');
@@ -125,7 +125,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '~> 1.2',
rangeStrategy: 'bump',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('~> 2.0');
@@ -133,7 +133,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '~> 1.2',
rangeStrategy: 'bump',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.3.1',
})
).toEqual('~> 1.3');
@@ -141,7 +141,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '~> 1.2.0',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('~> 2.0.0');
@@ -149,7 +149,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '~> 1.2.0',
rangeStrategy: 'pin',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('== 2.0.7');
@@ -157,7 +157,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '~> 1.2.0',
rangeStrategy: 'bump',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('~> 2.0.7');
@@ -168,7 +168,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '>= 1.0.0 and <= 2.0.0',
rangeStrategy: 'widen',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('>= 1.0.0 and <= 2.0.7');
@@ -176,7 +176,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '>= 1.0.0 and <= 2.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('<= 2.0.7');
@@ -184,7 +184,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '>= 1.0.0 and <= 2.0.0',
rangeStrategy: 'pin',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('== 2.0.7');
@@ -194,7 +194,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '>= 1.0.0 or <= 2.0.0',
rangeStrategy: 'widen',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('>= 1.0.0 or <= 2.0.7');
@@ -202,7 +202,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '>= 1.0.0 or <= 2.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('<= 2.0.7');
@@ -210,7 +210,7 @@ describe('lib/versioning/hex', () => {
hexScheme.getNewValue({
currentValue: '>= 1.0.0 or <= 2.0.0',
rangeStrategy: 'pin',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.7',
})
).toEqual('== 2.0.7');
diff --git a/lib/versioning/hex/index.ts b/lib/versioning/hex/index.ts
index b5219e6318901d05bdc43f62633efc364c154064..58bbf21bfb8da158768ca203d02d9cdf86ca51f9 100644
--- a/lib/versioning/hex/index.ts
+++ b/lib/versioning/hex/index.ts
@@ -59,13 +59,13 @@ const minSatisfyingVersion = (versions: string[], range: string): string =>
const getNewValue = ({
currentValue,
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
}: NewValueConfig): string => {
let newSemver = npm.getNewValue({
currentValue: hex2npm(currentValue),
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
});
newSemver = npm2hex(newSemver);
diff --git a/lib/versioning/ivy/index.spec.ts b/lib/versioning/ivy/index.spec.ts
index d83fc446656ea0bf232ddc02ad66a8fb2d6a9e9c..ae13b85bc321f8a87975b7513df3b95512a88f44 100644
--- a/lib/versioning/ivy/index.spec.ts
+++ b/lib/versioning/ivy/index.spec.ts
@@ -158,7 +158,7 @@ describe('versioning/ivy/index', () => {
ivy.getNewValue({
currentValue: '1',
rangeStrategy: 'auto',
- fromVersion: '1',
+ currentVersion: '1',
toVersion: '1.1',
})
).toBe('1.1');
@@ -166,7 +166,7 @@ describe('versioning/ivy/index', () => {
ivy.getNewValue({
currentValue: '[1.2.3,]',
rangeStrategy: 'auto',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.2.4',
})
).toBe('[1.2.3,]');
@@ -187,12 +187,12 @@ describe('versioning/ivy/index', () => {
['latest.integration', '1.0', '2.0'],
['latest', '1.0', '2.0'],
];
- sample.forEach(([currentValue, fromVersion, toVersion]) => {
+ sample.forEach(([currentValue, currentVersion, toVersion]) => {
expect(
getNewValue({
currentValue,
rangeStrategy: 'pin',
- fromVersion,
+ currentVersion,
toVersion,
})
).toEqual(toVersion);
diff --git a/lib/versioning/maven/index.spec.ts b/lib/versioning/maven/index.spec.ts
index fc2658a4d97405fd3d5974af841f29fd6667110a..e5cca91c7bf4872096094bb444705c801bb5f2ae 100644
--- a/lib/versioning/maven/index.spec.ts
+++ b/lib/versioning/maven/index.spec.ts
@@ -391,7 +391,7 @@ describe('versioning/maven/index', () => {
maven.getNewValue({
currentValue: '1',
rangeStrategy: null,
- fromVersion: null,
+ currentVersion: null,
toVersion: '1.1',
})
).toBe('1.1');
@@ -399,7 +399,7 @@ describe('versioning/maven/index', () => {
maven.getNewValue({
currentValue: '[1.2.3,]',
rangeStrategy: null,
- fromVersion: null,
+ currentVersion: null,
toVersion: '1.2.4',
})
).toBe('[1.2.3,]');
@@ -418,12 +418,12 @@ describe('versioning/maven/index', () => {
['[1.2.3,)', '1.2.3', '1.2.4'],
['[1.2.3,[', '1.2.3', '1.2.4'],
];
- sample.forEach(([currentValue, fromVersion, toVersion]) => {
+ sample.forEach(([currentValue, currentVersion, toVersion]) => {
expect(
getNewValue({
currentValue,
rangeStrategy: 'pin',
- fromVersion,
+ currentVersion,
toVersion,
})
).toEqual(toVersion);
diff --git a/lib/versioning/node/index.spec.ts b/lib/versioning/node/index.spec.ts
index 91e1fc3c0e2e38d9da085166078f6421a32cbcc5..3437d7b73f37384633c95c24618822f1fd4c2eea 100644
--- a/lib/versioning/node/index.spec.ts
+++ b/lib/versioning/node/index.spec.ts
@@ -14,7 +14,7 @@ describe('semver.getNewValue()', () => {
nodever.getNewValue({
currentValue: '1.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: 'v1.1.0',
})
).toEqual('1.1.0');
@@ -24,7 +24,7 @@ describe('semver.getNewValue()', () => {
nodever.getNewValue({
currentValue: '~8.0.0',
rangeStrategy: 'replace',
- fromVersion: '8.0.2',
+ currentVersion: '8.0.2',
toVersion: 'v8.2.0',
})
).toEqual('~8.2.0');
diff --git a/lib/versioning/node/index.ts b/lib/versioning/node/index.ts
index 8662b9dfe382a18c639393e6282cb1b2b320be5c..a1bf183c1ebd166da8421fa55f881e6bf53e4b5a 100644
--- a/lib/versioning/node/index.ts
+++ b/lib/versioning/node/index.ts
@@ -11,13 +11,13 @@ export const supportsRanges = false;
function getNewValue({
currentValue,
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
}: NewValueConfig): string {
const res = npm.getNewValue({
currentValue,
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
});
if (isVersion(res)) {
diff --git a/lib/versioning/npm/index.spec.ts b/lib/versioning/npm/index.spec.ts
index 98d24bbc948052fc57d9251d15d14a19240cae2c..6fb4dafe44577414563ef8390d24cf3a4032e793 100644
--- a/lib/versioning/npm/index.spec.ts
+++ b/lib/versioning/npm/index.spec.ts
@@ -45,7 +45,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '=1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -55,7 +55,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.7',
})
).toEqual('^1.0');
@@ -65,7 +65,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.7-prerelease.1',
})
).toEqual('^1.0.7-prerelease.1');
@@ -75,7 +75,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.7',
})
).toEqual('^1.0.7');
@@ -85,7 +85,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~> 1.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.7',
})
).toEqual('~> 1.1.0');
@@ -95,7 +95,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.7',
})
).toEqual('^1.1');
@@ -105,7 +105,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~1.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.7',
})
).toEqual('~1.1');
@@ -115,7 +115,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~1.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.7-prerelease.1',
})
).toEqual('~1.0.7-prerelease.1');
@@ -125,7 +125,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '2.1.7',
})
).toEqual('^2');
@@ -135,7 +135,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~1',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.7',
})
).toEqual('~1');
@@ -145,7 +145,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '5.1.7',
})
).toEqual('5');
@@ -153,7 +153,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '6.1.7',
})
).toEqual('6');
@@ -163,7 +163,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5.0',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '5.0.7',
})
).toEqual('5.0');
@@ -171,7 +171,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5.0',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '5.1.7',
})
).toEqual('5.1');
@@ -179,7 +179,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5.0',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '6.1.7',
})
).toEqual('6.1');
@@ -189,7 +189,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>=1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('>=1.1.0');
@@ -197,7 +197,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('>= 1.1.0');
@@ -207,7 +207,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '=1.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -217,7 +217,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '1.0.*',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('1.1.*');
@@ -227,7 +227,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '1.*',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '2.1.0',
})
).toEqual('2.*');
@@ -237,7 +237,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~0.6.1',
rangeStrategy: 'replace',
- fromVersion: '0.6.8',
+ currentVersion: '0.6.8',
toVersion: '0.7.0-rc.2',
})
).toEqual('~0.7.0-rc');
@@ -247,7 +247,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 0.1.21 < 0.2.0',
rangeStrategy: 'bump',
- fromVersion: '0.1.21',
+ currentVersion: '0.1.21',
toVersion: '0.1.24',
})
).toEqual('>= 0.1.24 < 0.2.0');
@@ -255,7 +255,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 0.1.21 <= 0.2.0',
rangeStrategy: 'bump',
- fromVersion: '0.1.21',
+ currentVersion: '0.1.21',
toVersion: '0.1.24',
})
).toEqual('>= 0.1.24 <= 0.2.0');
@@ -263,7 +263,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 0.0.1 <= 0.1',
rangeStrategy: 'bump',
- fromVersion: '0.0.1',
+ currentVersion: '0.0.1',
toVersion: '0.0.2',
})
).toEqual('>= 0.0.2 <= 0.1');
@@ -271,7 +271,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 0.0.1 < 0.1',
rangeStrategy: 'bump',
- fromVersion: '0.1.0',
+ currentVersion: '0.1.0',
toVersion: '0.2.1',
})
).toEqual('>= 0.2.1 < 0.3');
@@ -279,7 +279,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 0.0.1 < 0.0.4',
rangeStrategy: 'bump',
- fromVersion: '0.0.4',
+ currentVersion: '0.0.4',
toVersion: '0.0.5',
})
).toEqual('>= 0.0.5 < 0.0.6');
@@ -287,7 +287,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 0.0.1 < 1',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.1',
})
).toEqual('>= 1.0.1 < 2');
@@ -295,7 +295,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '>= 0.0.1 < 1',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.1',
})
).toEqual('>= 1.0.1 < 2');
diff --git a/lib/versioning/npm/range.ts b/lib/versioning/npm/range.ts
index f454495ae6be8d4b13fb84c821c024254eefe9d4..d829f3cc264a2bb823033d4dfab1f10227f423e2 100644
--- a/lib/versioning/npm/range.ts
+++ b/lib/versioning/npm/range.ts
@@ -14,7 +14,7 @@ import { NewValueConfig } from '../common';
export function getNewValue({
currentValue,
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
}: NewValueConfig): string {
if (rangeStrategy === 'pin' || isVersion(currentValue)) {
@@ -27,7 +27,7 @@ export function getNewValue({
return getNewValue({
currentValue,
rangeStrategy: 'replace',
- fromVersion,
+ currentVersion,
toVersion,
});
}
@@ -37,7 +37,7 @@ export function getNewValue({
const newValue = getNewValue({
currentValue,
rangeStrategy: 'replace',
- fromVersion,
+ currentVersion,
toVersion,
});
if (element.operator?.startsWith('<')) {
@@ -71,7 +71,7 @@ export function getNewValue({
return getNewValue({
currentValue,
rangeStrategy: 'replace',
- fromVersion,
+ currentVersion,
toVersion,
});
}
@@ -123,7 +123,7 @@ export function getNewValue({
const bumpedSubRange = getNewValue({
currentValue: subRange,
rangeStrategy: 'bump',
- fromVersion,
+ currentVersion,
toVersion,
});
if (satisfies(toVersion, bumpedSubRange)) {
@@ -132,7 +132,7 @@ export function getNewValue({
return getNewValue({
currentValue: subRange,
rangeStrategy: 'replace',
- fromVersion,
+ currentVersion,
toVersion,
});
});
@@ -147,10 +147,10 @@ export function getNewValue({
return `~> ${toVersionMajor}.${toVersionMinor}.0`;
}
if (element.operator === '^') {
- if (suffix.length || !fromVersion) {
+ if (suffix.length || !currentVersion) {
return `^${toVersionMajor}.${toVersionMinor}.${toVersionPatch}${suffix}`;
}
- if (toVersionMajor === major(fromVersion)) {
+ if (toVersionMajor === major(currentVersion)) {
if (toVersionMajor === 0) {
if (toVersionMinor === 0) {
return `^${toVersion}`;
diff --git a/lib/versioning/pep440/index.spec.ts b/lib/versioning/pep440/index.spec.ts
index 199acb23b0ddad0f2714cf8c8b1f4a1093bdb9e7..089866dedb9896328c4f774dfa5c94af9d3ddf3e 100644
--- a/lib/versioning/pep440/index.spec.ts
+++ b/lib/versioning/pep440/index.spec.ts
@@ -136,7 +136,7 @@ describe('pep440.getNewValue()', () => {
const bumped = getNewValue({
currentValue,
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.2.3',
});
it(`bumps '${currentValue}' to '${expectedBump}'`, () => {
@@ -146,7 +146,7 @@ describe('pep440.getNewValue()', () => {
const replaced = getNewValue({
currentValue,
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.2.3',
});
const needReplace = pep440.matches('1.2.3', currentValue);
@@ -158,7 +158,7 @@ describe('pep440.getNewValue()', () => {
const pinned = getNewValue({
currentValue,
rangeStrategy: 'pin',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.2.3',
});
const expectedPin = '==1.2.3';
@@ -171,7 +171,7 @@ describe('pep440.getNewValue()', () => {
const invalid = getNewValue({
currentValue: '==1.0.0',
rangeStrategy: 'update-lockfile',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.2.3',
});
expect(invalid).toEqual('==1.2.3');
diff --git a/lib/versioning/pep440/range.ts b/lib/versioning/pep440/range.ts
index 48f9dfeacbd0ab11831c97268ba52247e1ec1e5f..5e347381de4215d723d3e7beb773c1af70c96b26 100644
--- a/lib/versioning/pep440/range.ts
+++ b/lib/versioning/pep440/range.ts
@@ -38,14 +38,14 @@ interface Range {
export function getNewValue({
currentValue,
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
}: NewValueConfig): string {
// easy pin
if (rangeStrategy === 'pin') {
return '==' + toVersion;
}
- if (currentValue === fromVersion) {
+ if (currentValue === currentVersion) {
return toVersion;
}
const ranges: Range[] = parseRange(currentValue);
@@ -73,7 +73,7 @@ export function getNewValue({
return getNewValue({
currentValue,
rangeStrategy: 'replace',
- fromVersion,
+ currentVersion,
toVersion,
});
}
diff --git a/lib/versioning/poetry/index.spec.ts b/lib/versioning/poetry/index.spec.ts
index d9f882c53d5b03fb74a37ab8b8cd5960ec87a04b..0b7614d86a53c09ca13c31422f5daabc1086c6d6 100644
--- a/lib/versioning/poetry/index.spec.ts
+++ b/lib/versioning/poetry/index.spec.ts
@@ -118,7 +118,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('1.1.0');
@@ -126,7 +126,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: ' 1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('1.1.0');
@@ -134,7 +134,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('1.1.0');
@@ -144,7 +144,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '=1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -152,7 +152,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '= 1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -162,7 +162,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '= 1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -170,7 +170,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: ' = 1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -178,7 +178,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: ' = 1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -186,7 +186,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '= 1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -196,7 +196,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.7',
})
).toEqual('^1.0');
@@ -206,7 +206,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '2.0.7',
})
).toEqual('^2.0.0');
@@ -216,7 +216,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '1.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '2.0.7',
})
).toEqual('2.0.7');
@@ -226,7 +226,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '1.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '^2.0.7',
})
).toEqual('^2.0.7');
@@ -236,7 +236,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '2.1.7',
})
).toEqual('^2');
@@ -246,7 +246,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~1',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.7',
})
).toEqual('~1');
@@ -256,7 +256,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '5.1.7',
})
).toEqual('5');
@@ -264,7 +264,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '6.1.7',
})
).toEqual('6');
@@ -274,7 +274,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5.0',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '5.0.7',
})
).toEqual('5.0');
@@ -282,7 +282,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5.0',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '5.1.7',
})
).toEqual('5.1');
@@ -290,7 +290,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5.0',
rangeStrategy: 'bump',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '6.1.7',
})
).toEqual('6.1');
@@ -300,7 +300,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '5.0',
rangeStrategy: 'replace',
- fromVersion: '5.0.0',
+ currentVersion: '5.0.0',
toVersion: '6.1.7',
})
).toEqual('6.1');
@@ -310,7 +310,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '=1.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('=1.1.0');
@@ -320,7 +320,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.7-prerelease.1',
})
).toEqual('^1.0.7-prerelease.1');
@@ -330,7 +330,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1.0.0',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.7',
})
).toEqual('^1.0.7');
@@ -340,7 +340,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~1.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.7',
})
).toEqual('~1.1');
@@ -350,7 +350,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '1.0.*',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('1.1.*');
@@ -360,7 +360,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '1.*',
rangeStrategy: 'replace',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '2.1.0',
})
).toEqual('2.*');
@@ -370,7 +370,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~0.6.1',
rangeStrategy: 'replace',
- fromVersion: '0.6.8',
+ currentVersion: '0.6.8',
toVersion: '0.7.0-rc.2',
})
).toEqual('~0.7.0-rc');
@@ -380,7 +380,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '<1.3.4',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.5.0',
})
).toEqual('<1.5.1');
@@ -388,7 +388,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '< 1.3.4',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.5.0',
})
).toEqual('< 1.5.1');
@@ -396,7 +396,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '< 1.3.4',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.5.0',
})
).toEqual('< 1.5.1');
@@ -406,7 +406,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '<=1.3.4',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.5.0',
})
).toEqual('<=1.5.0');
@@ -414,7 +414,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '<= 1.3.4',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.5.0',
})
).toEqual('<= 1.5.0');
@@ -422,7 +422,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '<= 1.3.4',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '1.5.0',
})
).toEqual('<= 1.5.0');
@@ -432,7 +432,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1.2',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.0',
})
).toEqual('^2.0');
@@ -440,7 +440,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^1',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.0',
})
).toEqual('^2');
@@ -450,7 +450,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~1.2',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.0',
})
).toEqual('~2.0');
@@ -458,7 +458,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '~1',
rangeStrategy: 'replace',
- fromVersion: '1.2.3',
+ currentVersion: '1.2.3',
toVersion: '2.0.0',
})
).toEqual('~2');
@@ -468,7 +468,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '^2.2',
rangeStrategy: 'widen',
- fromVersion: '2.2.0',
+ currentVersion: '2.2.0',
toVersion: '3.0.0',
})
).toEqual('^2.2 || ^3.0.0');
diff --git a/lib/versioning/poetry/index.ts b/lib/versioning/poetry/index.ts
index da67842e8100659d3f7e616e065f006d039bf887..7c94774ed6e0af343873abc9ce34546aef71b315 100644
--- a/lib/versioning/poetry/index.ts
+++ b/lib/versioning/poetry/index.ts
@@ -86,7 +86,7 @@ function handleShort(
function getNewValue({
currentValue,
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
}: NewValueConfig): string {
if (rangeStrategy === 'replace') {
@@ -111,7 +111,7 @@ function getNewValue({
const newSemver = npm.getNewValue({
currentValue: poetry2npm(currentValue),
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
});
const newPoetry = npm2poetry(newSemver);
diff --git a/lib/versioning/regex/index.spec.ts b/lib/versioning/regex/index.spec.ts
index 8adba6f0d0d778de4764c7f6b098c82a04163c6e..c289cd509a7bfb46a14e72afad45e01f0ddf9f7d 100644
--- a/lib/versioning/regex/index.spec.ts
+++ b/lib/versioning/regex/index.spec.ts
@@ -332,7 +332,7 @@ describe('regex', () => {
regex.getNewValue({
currentValue: null,
rangeStrategy: null,
- fromVersion: null,
+ currentVersion: null,
toVersion: '1.2.3',
})
).toBe('1.2.3');
diff --git a/lib/versioning/ruby/index.spec.ts b/lib/versioning/ruby/index.spec.ts
index d67091c7f29577cf201ad9ebe804360f555de650..daf20595f33124822725e395c98ef49925adf9ac 100644
--- a/lib/versioning/ruby/index.spec.ts
+++ b/lib/versioning/ruby/index.spec.ts
@@ -384,12 +384,18 @@ describe('semverRuby', () => {
],
["'0.0.11'", "'0.0.10'", 'replace', '0.0.10', '0.0.11'],
].forEach(
- ([expected, currentValue, rangeStrategy, fromVersion, toVersion]) => {
+ ([
+ expected,
+ currentValue,
+ rangeStrategy,
+ currentVersion,
+ toVersion,
+ ]) => {
expect(
semverRuby.getNewValue({
currentValue,
rangeStrategy: rangeStrategy as RangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
})
).toEqual(expected);
@@ -432,7 +438,7 @@ describe('semverRuby', () => {
semverRuby.getNewValue({
currentValue: '>= 3.2, < 5.0',
rangeStrategy: 'replace',
- fromVersion: '4.0.2',
+ currentVersion: '4.0.2',
toVersion: '6.0.1',
})
).toMatchSnapshot();
@@ -442,7 +448,7 @@ describe('semverRuby', () => {
semverRuby.getNewValue({
currentValue: '~> 5.2, >= 5.2.5',
rangeStrategy: 'replace',
- fromVersion: '5.3.0',
+ currentVersion: '5.3.0',
toVersion: '6.0.1',
})
).toEqual('~> 6.0, >= 6.0.1');
@@ -452,7 +458,7 @@ describe('semverRuby', () => {
semverRuby.getNewValue({
currentValue: '~> 5.2.0, >= 5.2.5',
rangeStrategy: 'replace',
- fromVersion: '5.2.5',
+ currentVersion: '5.2.5',
toVersion: '5.3.1',
})
).toEqual('~> 5.3.0, >= 5.3.1');
@@ -462,7 +468,7 @@ describe('semverRuby', () => {
semverRuby.getNewValue({
currentValue: '4.2.0',
rangeStrategy: 'replace',
- fromVersion: '4.2.0',
+ currentVersion: '4.2.0',
toVersion: '4.2.5.1',
})
).toEqual('4.2.5.1');
@@ -470,7 +476,7 @@ describe('semverRuby', () => {
semverRuby.getNewValue({
currentValue: '4.2.5.1',
rangeStrategy: 'replace',
- fromVersion: '4.2.5.1',
+ currentVersion: '4.2.5.1',
toVersion: '4.3.0',
})
).toEqual('4.3.0');
@@ -480,7 +486,7 @@ describe('semverRuby', () => {
semverRuby.getNewValue({
currentValue: '~> 1',
rangeStrategy: 'replace',
- fromVersion: '1.2.0',
+ currentVersion: '1.2.0',
toVersion: '2.0.3',
})
).toEqual('~> 2');
@@ -490,7 +496,7 @@ describe('semverRuby', () => {
semverRuby.getNewValue({
currentValue: '= 5.2.2',
rangeStrategy: 'replace',
- fromVersion: '5.2.2',
+ currentVersion: '5.2.2',
toVersion: '5.2.2.1',
})
).toEqual('= 5.2.2.1');
@@ -526,12 +532,18 @@ describe('semverRuby', () => {
['~> 5.0, < 6', '~> 4.0, < 5', 'replace', '4.7.5', '5.0.1'],
['~> 5.1, < 6', '~> 4.0, < 5', 'replace', '4.7.5', '5.1.0'], // ideally this should be ~> 5.0
].forEach(
- ([expected, currentValue, rangeStrategy, fromVersion, toVersion]) => {
+ ([
+ expected,
+ currentValue,
+ rangeStrategy,
+ currentVersion,
+ toVersion,
+ ]) => {
expect(
semverRuby.getNewValue({
currentValue,
rangeStrategy: rangeStrategy as RangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
})
).toEqual(expected);
@@ -543,12 +555,18 @@ describe('semverRuby', () => {
['~> 6.0.0', '~> 6.0.0', 'update-lockfile', '6.0.2', '6.0.3'],
['~> 7.0.0', '~> 6.0.0', 'update-lockfile', '6.0.2', '7.0.0'],
].forEach(
- ([expected, currentValue, rangeStrategy, fromVersion, toVersion]) => {
+ ([
+ expected,
+ currentValue,
+ rangeStrategy,
+ currentVersion,
+ toVersion,
+ ]) => {
expect(
semverRuby.getNewValue({
currentValue,
rangeStrategy: rangeStrategy as RangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
})
).toEqual(expected);
diff --git a/lib/versioning/ruby/index.ts b/lib/versioning/ruby/index.ts
index ee262da18a61b99e80d4184e40b5ed32783ebe69..6af8fdcb3727fde565af2f9bbc498e21e2a370d2 100644
--- a/lib/versioning/ruby/index.ts
+++ b/lib/versioning/ruby/index.ts
@@ -81,14 +81,14 @@ const minSatisfyingVersion = (versions: string[], range: string): string =>
const getNewValue = ({
currentValue,
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
}: NewValueConfig): string => {
let newValue = null;
if (isVersion(currentValue)) {
newValue = currentValue.startsWith('v') ? 'v' + toVersion : toVersion;
- } else if (currentValue.replace(/^=\s*/, '') === fromVersion) {
- newValue = currentValue.replace(fromVersion, toVersion);
+ } else if (currentValue.replace(/^=\s*/, '') === currentVersion) {
+ newValue = currentValue.replace(currentVersion, toVersion);
} else {
switch (rangeStrategy) {
case 'update-lockfile':
@@ -98,7 +98,7 @@ const getNewValue = ({
newValue = getNewValue({
currentValue,
rangeStrategy: 'replace',
- fromVersion,
+ currentVersion,
toVersion,
});
}
diff --git a/lib/versioning/semver/index.spec.ts b/lib/versioning/semver/index.spec.ts
index 52ba6b0214a74aaa494ddc14797950e9a79d85b4..0b20973a8d5e300f52feef7d2179d066e8d153f6 100644
--- a/lib/versioning/semver/index.spec.ts
+++ b/lib/versioning/semver/index.spec.ts
@@ -45,7 +45,7 @@ describe('semver.getNewValue()', () => {
semver.getNewValue({
currentValue: '=1.0.0',
rangeStrategy: 'bump',
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
})
).toEqual('1.1.0');
diff --git a/lib/versioning/swift/index.spec.ts b/lib/versioning/swift/index.spec.ts
index ef2892442c1dfe18f7f8e2e924a5569a211f2bb6..1599fafd54f4ababafe0b28a864c2ff5d15a0971 100644
--- a/lib/versioning/swift/index.spec.ts
+++ b/lib/versioning/swift/index.spec.ts
@@ -99,11 +99,11 @@ describe('getNewValue()', () => {
['"1.2.3"..<"1.2.4"', 'auto', '1.2.3', '1.2.5', '"1.2.3"..<"1.2.5"'],
['..."1.2.4"', 'auto', '1.2.3', '1.2.5', '..."1.2.5"'],
['..<"1.2.4"', 'auto', '1.2.3', '1.2.5', '..<"1.2.5"'],
- ].forEach(([range, rangeStrategy, fromVersion, toVersion, result]) => {
+ ].forEach(([range, rangeStrategy, currentVersion, toVersion, result]) => {
const newValue = getNewValue({
currentValue: range,
rangeStrategy: rangeStrategy as RangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
});
expect(newValue).toEqual(result);
diff --git a/lib/versioning/swift/range.ts b/lib/versioning/swift/range.ts
index f4edebffe54cc691e42358c3b9dd07de5c7934ad..ecefa077bae0d6552019c9fa8ef4e79209ea6345 100644
--- a/lib/versioning/swift/range.ts
+++ b/lib/versioning/swift/range.ts
@@ -19,11 +19,11 @@ function toSemverRange(range: string): string {
return `>=${version}`;
}
} else if (binaryRange.test(range)) {
- const [, fromVersion, op, toVersion] = binaryRange.exec(range);
- if (semver.valid(fromVersion) && semver.valid(toVersion)) {
+ const [, currentVersion, op, toVersion] = binaryRange.exec(range);
+ if (semver.valid(currentVersion) && semver.valid(toVersion)) {
return op === '..<'
- ? `>=${fromVersion} <${toVersion}`
- : `>=${fromVersion} <=${toVersion}`;
+ ? `>=${currentVersion} <${toVersion}`
+ : `>=${currentVersion} <=${toVersion}`;
}
} else if (toRange.test(range)) {
const [, op, toVersion] = toRange.exec(range);
@@ -36,7 +36,7 @@ function toSemverRange(range: string): string {
function getNewValue({
currentValue,
- fromVersion,
+ currentVersion,
toVersion,
}: NewValueConfig): string {
if (fromParam.test(currentValue)) {
diff --git a/lib/workers/pr/body/index.ts b/lib/workers/pr/body/index.ts
index 502c945ef72bb7a1ee9c9b3d7fe23cdbad0987ec..61435f7ad262b12bf6ff0c9f5f938cda20ca83e7 100644
--- a/lib/workers/pr/body/index.ts
+++ b/lib/workers/pr/body/index.ts
@@ -54,12 +54,12 @@ function massageUpdateMetadata(config: BranchConfig): void {
references.push(`[changelog](${changelogUrl})`);
}
upgrade.references = references.join(', ');
- const { fromVersion, toVersion, updateType, versioning } = upgrade;
+ const { currentVersion, toVersion, updateType, versioning } = upgrade;
// istanbul ignore if
if (updateType === 'minor') {
try {
const version = get(versioning);
- if (version.getMinor(fromVersion) === version.getMinor(toVersion)) {
+ if (version.getMinor(currentVersion) === version.getMinor(toVersion)) {
upgrade.updateType = 'patch';
}
} catch (err) {
diff --git a/lib/workers/pr/changelog/__snapshots__/releases.spec.ts.snap b/lib/workers/pr/changelog/__snapshots__/releases.spec.ts.snap
index dc71b45c36d3edc3aa444ef1c03346ba39cca43d..8fd69cdb70bad82ba4ea32b507931217d699801f 100644
--- a/lib/workers/pr/changelog/__snapshots__/releases.spec.ts.snap
+++ b/lib/workers/pr/changelog/__snapshots__/releases.spec.ts.snap
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`workers/pr/changelog/releases getReleaseNotes() should contain both fromVersion toVersion unstable 1`] = `
+exports[`workers/pr/changelog/releases getReleaseNotes() should contain both currentVersion toVersion unstable 1`] = `
Array [
Object {
"version": "1.0.1-rc0",
@@ -23,7 +23,7 @@ Array [
]
`;
-exports[`workers/pr/changelog/releases getReleaseNotes() should contain fromVersion unstable 1`] = `
+exports[`workers/pr/changelog/releases getReleaseNotes() should contain currentVersion unstable 1`] = `
Array [
Object {
"version": "1.0.1-rc0",
diff --git a/lib/workers/pr/changelog/github.spec.ts b/lib/workers/pr/changelog/github.spec.ts
index aa562938425ae125ca50883d4a262b06d8dd269f..c37c6790b9c6fe9114f239b80706fc695579e578 100644
--- a/lib/workers/pr/changelog/github.spec.ts
+++ b/lib/workers/pr/changelog/github.spec.ts
@@ -12,7 +12,7 @@ const upgrade: BranchUpgradeConfig = {
depName: 'renovate',
endpoint: 'https://api.github.com/',
versioning: semverVersioning.id,
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '3.0.0',
sourceUrl: 'https://github.com/chalk/chalk',
releases: [
@@ -43,11 +43,11 @@ describe(getName(__filename), () => {
expect(
await getChangeLogJSON({
...upgrade,
- fromVersion: null,
+ currentVersion: null,
})
).toBeNull();
});
- it('returns null if no fromVersion', async () => {
+ it('returns null if no currentVersion', async () => {
expect(
await getChangeLogJSON({
...upgrade,
@@ -55,11 +55,11 @@ describe(getName(__filename), () => {
})
).toBeNull();
});
- it('returns null if fromVersion equals toVersion', async () => {
+ it('returns null if currentVersion equals toVersion', async () => {
expect(
await getChangeLogJSON({
...upgrade,
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.0',
})
).toBeNull();
diff --git a/lib/workers/pr/changelog/gitlab.spec.ts b/lib/workers/pr/changelog/gitlab.spec.ts
index 1ba89095e1fa7e697c578f70bc607c6fcde560b4..f1fdacf599e710c26c4cedaac65671908b54b22a 100644
--- a/lib/workers/pr/changelog/gitlab.spec.ts
+++ b/lib/workers/pr/changelog/gitlab.spec.ts
@@ -13,7 +13,7 @@ const upgrade: BranchUpgradeConfig = {
endpoint: 'https://gitlab.com/api/v4/ ',
depName: 'renovate',
versioning: semverVersioning.id,
- fromVersion: '5.2.0',
+ currentVersion: '5.2.0',
toVersion: '5.7.0',
sourceUrl: 'https://gitlab.com/meno/dropzone/',
releases: [
@@ -50,17 +50,17 @@ describe(getName(__filename), () => {
expect(
await getChangeLogJSON({
...upgrade,
- fromVersion: null,
+ currentVersion: null,
})
).toBeNull();
expect(httpMock.getTrace()).toBeEmpty();
});
- it('returns null if fromVersion equals toVersion', async () => {
+ it('returns null if currentVersion equals toVersion', async () => {
httpMock.scope(baseUrl);
expect(
await getChangeLogJSON({
...upgrade,
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.0',
})
).toBeNull();
diff --git a/lib/workers/pr/changelog/index.spec.ts b/lib/workers/pr/changelog/index.spec.ts
index f45ceab56c5c1c49bcc394430f7a577afafea8b1..d77a7629512e379ac8f53280de23421d7e8b4947 100644
--- a/lib/workers/pr/changelog/index.spec.ts
+++ b/lib/workers/pr/changelog/index.spec.ts
@@ -14,7 +14,7 @@ const upgrade: BranchConfig = partial<BranchConfig>({
endpoint: 'https://api.github.com/',
depName: 'renovate',
versioning: semverVersioning.id,
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '3.0.0',
sourceUrl: 'https://github.com/chalk/chalk',
releases: [
@@ -52,12 +52,12 @@ describe(getName(__filename), () => {
expect(
await getChangeLogJSON({
...upgrade,
- fromVersion: null,
+ currentVersion: null,
})
).toBeNull();
expect(httpMock.getTrace()).toHaveLength(0);
});
- it('returns null if no fromVersion', async () => {
+ it('returns null if no currentVersion', async () => {
httpMock.scope(githubApiHost);
expect(
await getChangeLogJSON({
@@ -67,12 +67,12 @@ describe(getName(__filename), () => {
).toBeNull();
expect(httpMock.getTrace()).toHaveLength(0);
});
- it('returns null if fromVersion equals toVersion', async () => {
+ it('returns null if currentVersion equals toVersion', async () => {
httpMock.scope(githubApiHost);
expect(
await getChangeLogJSON({
...upgrade,
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.0.0',
})
).toBeNull();
diff --git a/lib/workers/pr/changelog/index.ts b/lib/workers/pr/changelog/index.ts
index efb383a005a62bd83c49bc67c0bc3c734c9951c6..f64b7eed0adf60c54e3ff3c55ac0f445ad3e1bb2 100644
--- a/lib/workers/pr/changelog/index.ts
+++ b/lib/workers/pr/changelog/index.ts
@@ -11,17 +11,17 @@ export * from './common';
export async function getChangeLogJSON(
args: BranchUpgradeConfig
): Promise<ChangeLogResult | null> {
- const { sourceUrl, versioning, fromVersion, toVersion } = args;
+ const { sourceUrl, versioning, currentVersion, toVersion } = args;
try {
- if (!(sourceUrl && fromVersion && toVersion)) {
+ if (!(sourceUrl && currentVersion && toVersion)) {
return null;
}
const version = allVersioning.get(versioning);
- if (version.equals(fromVersion, toVersion)) {
+ if (version.equals(currentVersion, toVersion)) {
return null;
}
logger.debug(
- `Fetching changelog: ${sourceUrl} (${fromVersion} -> ${toVersion})`
+ `Fetching changelog: ${sourceUrl} (${currentVersion} -> ${toVersion})`
);
const releases = args.releases || (await getInRangeReleases(args));
diff --git a/lib/workers/pr/changelog/releases.spec.ts b/lib/workers/pr/changelog/releases.spec.ts
index 7e590f660473fb83dd51825703a9e2c30a52b534..8793d03ee1b3716b4a53905225261bcbd54fdcab 100644
--- a/lib/workers/pr/changelog/releases.spec.ts
+++ b/lib/workers/pr/changelog/releases.spec.ts
@@ -46,19 +46,19 @@ describe(getName(__filename), () => {
datasource: 'some-datasource',
depName: 'some-depname',
versioning: npmVersioning.id,
- fromVersion: '1.0.0',
+ currentVersion: '1.0.0',
toVersion: '1.1.0',
});
const res = await releases.getInRangeReleases(config);
expect(res).toMatchSnapshot();
expect(res).toHaveLength(3);
});
- it('should contain fromVersion unstable', async () => {
+ it('should contain currentVersion unstable', async () => {
const config = partial<BranchUpgradeConfig>({
datasource: 'some-datasource',
depName: 'some-depname',
versioning: npmVersioning.id,
- fromVersion: '1.0.1-rc0',
+ currentVersion: '1.0.1-rc0',
toVersion: '1.1.0',
});
const res = await releases.getInRangeReleases(config);
@@ -70,19 +70,19 @@ describe(getName(__filename), () => {
datasource: 'some-datasource',
depName: 'some-depname',
versioning: npmVersioning.id,
- fromVersion: '1.0.1',
+ currentVersion: '1.0.1',
toVersion: '1.2.0-rc1',
});
const res = await releases.getInRangeReleases(config);
expect(res).toMatchSnapshot();
expect(res).toHaveLength(4);
});
- it('should contain both fromVersion toVersion unstable', async () => {
+ it('should contain both currentVersion toVersion unstable', async () => {
const config = partial<BranchUpgradeConfig>({
datasource: 'some-datasource',
depName: 'some-depname',
versioning: npmVersioning.id,
- fromVersion: '1.0.1-rc0',
+ currentVersion: '1.0.1-rc0',
toVersion: '1.2.0-rc1',
});
const res = await releases.getInRangeReleases(config);
@@ -94,7 +94,7 @@ describe(getName(__filename), () => {
datasource: 'some-datasource',
depName: 'some-depname',
versioning: dockerVersioning.id,
- fromVersion: '1.0.1-rc0',
+ currentVersion: '1.0.1-rc0',
toVersion: '1.2.0-rc0',
});
const res = await releases.getInRangeReleases(config);
diff --git a/lib/workers/pr/changelog/releases.ts b/lib/workers/pr/changelog/releases.ts
index 60728b6c7e973be3b31eeaf0e2522e965fd1f64f..2c65921cfc3a00a8bba891905e13e9b9e0be8060 100644
--- a/lib/workers/pr/changelog/releases.ts
+++ b/lib/workers/pr/changelog/releases.ts
@@ -23,7 +23,7 @@ function matchesUnstable(
export async function getInRangeReleases(
config: BranchUpgradeConfig
): Promise<Release[] | null> {
- const { versioning, fromVersion, toVersion, depName, datasource } = config;
+ const { versioning, currentVersion, toVersion, depName, datasource } = config;
// istanbul ignore if
if (!isGetPkgReleasesConfig(config)) {
return null;
@@ -33,17 +33,19 @@ export async function getInRangeReleases(
const version = get(versioning);
const releases = pkgReleases
- .filter((release) => version.isCompatible(release.version, fromVersion))
+ .filter((release) =>
+ version.isCompatible(release.version, currentVersion)
+ )
.filter(
(release) =>
- version.equals(release.version, fromVersion) ||
- version.isGreaterThan(release.version, fromVersion)
+ version.equals(release.version, currentVersion) ||
+ version.isGreaterThan(release.version, currentVersion)
)
.filter((release) => !version.isGreaterThan(release.version, toVersion))
.filter(
(release) =>
version.isStable(release.version) ||
- matchesUnstable(version, fromVersion, release.version) ||
+ matchesUnstable(version, currentVersion, release.version) ||
matchesUnstable(version, toVersion, release.version)
);
if (version.valueToVersion) {
diff --git a/lib/workers/pr/changelog/source-github.ts b/lib/workers/pr/changelog/source-github.ts
index fbb2fbca891e0c34d3295ec2588d5541e8466f38..e467de8da22fce72eb8ca5f4f194fabface886e6 100644
--- a/lib/workers/pr/changelog/source-github.ts
+++ b/lib/workers/pr/changelog/source-github.ts
@@ -28,7 +28,7 @@ function getCachedTags(
export async function getChangeLogJSON({
versioning,
- fromVersion,
+ currentVersion,
toVersion,
sourceUrl,
releases,
@@ -113,7 +113,7 @@ export async function getChangeLogJSON({
const changelogReleases: ChangeLogRelease[] = [];
// compare versions
const include = (v: string): boolean =>
- version.isGreaterThan(v, fromVersion) &&
+ version.isGreaterThan(v, currentVersion) &&
!version.isGreaterThan(v, toVersion);
for (let i = 1; i < validReleases.length; i += 1) {
const prev = validReleases[i - 1];
diff --git a/lib/workers/pr/changelog/source-gitlab.ts b/lib/workers/pr/changelog/source-gitlab.ts
index e5a760fbb38abbc3f33c3e428c5d4b607cbd2ddf..b8927668f0ca77ca75fdc662242798ad2bab4419 100644
--- a/lib/workers/pr/changelog/source-gitlab.ts
+++ b/lib/workers/pr/changelog/source-gitlab.ts
@@ -30,7 +30,7 @@ function getCachedTags(
export async function getChangeLogJSON({
versioning,
- fromVersion,
+ currentVersion,
toVersion,
sourceUrl,
releases,
@@ -91,7 +91,7 @@ export async function getChangeLogJSON({
const changelogReleases: ChangeLogRelease[] = [];
// compare versions
const include = (v: string): boolean =>
- version.isGreaterThan(v, fromVersion) &&
+ version.isGreaterThan(v, currentVersion) &&
!version.isGreaterThan(v, toVersion);
for (let i = 1; i < validReleases.length; i += 1) {
const prev = validReleases[i - 1];
diff --git a/lib/workers/pr/index.ts b/lib/workers/pr/index.ts
index 4ab68cb8ece66a930e81f36f730d88f5d9fc5928..ced9946d09412e09423c5a1e3b7f71ce6df18f29 100644
--- a/lib/workers/pr/index.ts
+++ b/lib/workers/pr/index.ts
@@ -239,7 +239,7 @@ export async function ensurePr(
for (const upgrade of upgrades) {
const upgradeKey = `${upgrade.depType}-${upgrade.depName}-${
upgrade.manager
- }-${upgrade.fromVersion || upgrade.currentValue}-${upgrade.toVersion}`;
+ }-${upgrade.currentVersion || upgrade.currentValue}-${upgrade.toVersion}`;
if (processedUpgrades.includes(upgradeKey)) {
continue; // eslint-disable-line no-continue
}
diff --git a/lib/workers/repository/cache.ts b/lib/workers/repository/cache.ts
index c46e10481f589e421f5df0bc57934e5fff4eaa4c..5171f603cd74c789da41263215fd7ec397a925b8 100644
--- a/lib/workers/repository/cache.ts
+++ b/lib/workers/repository/cache.ts
@@ -22,7 +22,7 @@ function generateBranchUpgradeCache(
depName,
lookupName,
fixedVersion,
- fromVersion,
+ currentVersion,
toVersion,
currentDigest,
newDigest,
@@ -33,7 +33,7 @@ function generateBranchUpgradeCache(
depName,
lookupName,
fixedVersion,
- fromVersion,
+ currentVersion,
toVersion,
currentDigest,
newDigest,
diff --git a/lib/workers/repository/process/lookup/__snapshots__/index.spec.ts.snap b/lib/workers/repository/process/lookup/__snapshots__/index.spec.ts.snap
index fd70b9e161f9e42bc623f9aa3c8ed365b03603a1..56cfe30c2c3140240f8587b224a522313da13e94 100644
--- a/lib/workers/repository/process/lookup/__snapshots__/index.spec.ts.snap
+++ b/lib/workers/repository/process/lookup/__snapshots__/index.spec.ts.snap
@@ -11,7 +11,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "latest",
- "fromVersion": "0.4.4",
+ "currentVersion": "0.4.4",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -67,7 +67,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() disables major relea
Array [
Object {
"bucket": "latest",
- "fromVersion": "1.0.0",
+ "currentVersion": "1.0.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -100,7 +100,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "non-major",
- "fromVersion": "0.9.4",
+ "currentVersion": "0.9.4",
"isRange": true,
"isSingleVersion": true,
"newMajor": 0,
@@ -117,7 +117,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "major",
- "fromVersion": "0.9.4",
+ "currentVersion": "0.9.4",
"isRange": true,
"isSingleVersion": true,
"newMajor": 1,
@@ -152,7 +152,7 @@ Object {
Object {
"blockedByPin": true,
"bucket": "non-major",
- "fromVersion": "8.0.0",
+ "currentVersion": "8.0.0",
"isSingleVersion": true,
"newDigest": "sha256:abcdef1234567890",
"newDigestShort": "abcdef1",
@@ -216,7 +216,7 @@ Object {
"updates": Array [
Object {
"bucket": "non-major",
- "fromVersion": "8.0.0",
+ "currentVersion": "8.0.0",
"isSingleVersion": true,
"newDigest": "sha256:abcdef1234567890",
"newDigestShort": "abcdef1",
@@ -255,7 +255,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() handles git submodul
Object {
"updates": Array [
Object {
- "fromVersion": undefined,
+ "currentVersion": undefined,
"newValue": "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
"newVersion": "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
"toVersion": undefined,
@@ -282,7 +282,7 @@ Object {
"updates": Array [
Object {
"bucket": "major",
- "fromVersion": "0.9.99",
+ "currentVersion": "0.9.99",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 3,
@@ -322,7 +322,7 @@ Marking the latest version of an npm package as deprecated results in the entire
"updates": Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.3.0",
+ "currentVersion": "1.3.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -347,7 +347,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "major",
- "fromVersion": "0.9.7",
+ "currentVersion": "0.9.7",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -381,7 +381,7 @@ Object {
"updates": Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.3.0",
+ "currentVersion": "1.3.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -421,7 +421,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() replaces major compl
Array [
Object {
"bucket": "major",
- "fromVersion": "2.7.0",
+ "currentVersion": "2.7.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 3,
@@ -457,7 +457,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() replaces minor compl
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.3.0",
+ "currentVersion": "1.3.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -477,7 +477,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() replaces non-range i
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.0.0",
+ "currentVersion": "1.0.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -503,7 +503,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() returns additional u
Array [
Object {
"bucket": "patch",
- "fromVersion": "0.4.0",
+ "currentVersion": "0.4.0",
"isSingleVersion": true,
"newMajor": 0,
"newMinor": 4,
@@ -518,7 +518,7 @@ Array [
},
Object {
"bucket": "minor",
- "fromVersion": "0.4.0",
+ "currentVersion": "0.4.0",
"isSingleVersion": true,
"newMajor": 0,
"newMinor": 9,
@@ -559,7 +559,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.4.0",
+ "currentVersion": "0.4.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -593,7 +593,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "non-major",
- "fromVersion": "0.4.4",
+ "currentVersion": "0.4.4",
"isSingleVersion": true,
"newMajor": 0,
"newMinor": 9,
@@ -635,7 +635,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "major",
- "fromVersion": "0.4.4",
+ "currentVersion": "0.4.4",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -668,7 +668,7 @@ Object {
"updates": Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.3.0",
+ "currentVersion": "1.3.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -689,7 +689,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() returns minor update
Array [
Object {
"bucket": "non-major",
- "fromVersion": "0.9.0",
+ "currentVersion": "0.9.0",
"isSingleVersion": true,
"newMajor": 0,
"newMinor": 9,
@@ -708,7 +708,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.9.0",
+ "currentVersion": "0.9.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -735,7 +735,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() returns minor update
Array [
Object {
"bucket": "non-major",
- "fromVersion": "0.9.0",
+ "currentVersion": "0.9.0",
"isSingleVersion": true,
"newMajor": 0,
"newMinor": 9,
@@ -754,7 +754,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.9.0",
+ "currentVersion": "0.9.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -781,7 +781,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() returns multiple upd
Array [
Object {
"bucket": "non-major",
- "fromVersion": "0.4.0",
+ "currentVersion": "0.4.0",
"isSingleVersion": true,
"newMajor": 0,
"newMinor": 9,
@@ -825,7 +825,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.4.0",
+ "currentVersion": "0.4.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -852,7 +852,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() returns one update i
Array [
Object {
"bucket": "latest",
- "fromVersion": "0.4.0",
+ "currentVersion": "0.4.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -911,7 +911,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() returns patch minor
Array [
Object {
"bucket": "patch",
- "fromVersion": "0.8.0",
+ "currentVersion": "0.8.0",
"isSingleVersion": true,
"newMajor": 0,
"newMinor": 8,
@@ -935,7 +935,7 @@ Array [
},
Object {
"bucket": "minor",
- "fromVersion": "0.8.0",
+ "currentVersion": "0.8.0",
"isSingleVersion": true,
"newMajor": 0,
"newMinor": 9,
@@ -955,7 +955,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.8.0",
+ "currentVersion": "0.8.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -982,7 +982,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() returns patch update
Array [
Object {
"bucket": "non-major",
- "fromVersion": "0.9.0",
+ "currentVersion": "0.9.0",
"isSingleVersion": true,
"newMajor": 0,
"newMinor": 9,
@@ -1001,7 +1001,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.9.0",
+ "currentVersion": "0.9.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -1028,7 +1028,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() returns patch update
Array [
Object {
"bucket": "patch",
- "fromVersion": "0.9.0",
+ "currentVersion": "0.9.0",
"isSingleVersion": true,
"newMajor": 0,
"newMinor": 9,
@@ -1047,7 +1047,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.9.0",
+ "currentVersion": "0.9.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -1083,7 +1083,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.9.99",
+ "currentVersion": "0.9.99",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -1124,7 +1124,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() should allow unstabl
Array [
Object {
"bucket": "non-major",
- "fromVersion": "3.1.0-dev.20180731",
+ "currentVersion": "3.1.0-dev.20180731",
"isSingleVersion": true,
"newMajor": 3,
"newMinor": 1,
@@ -1150,7 +1150,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() should allow unstabl
Array [
Object {
"bucket": "non-major",
- "fromVersion": "2.5.16",
+ "currentVersion": "2.5.16",
"isSingleVersion": true,
"newMajor": 2,
"newMinor": 5,
@@ -1178,7 +1178,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() should follow dist-t
Array [
Object {
"bucket": "non-major",
- "fromVersion": "3.0.1-insiders.20180713",
+ "currentVersion": "3.0.1-insiders.20180713",
"isSingleVersion": true,
"newMajor": 3,
"newMinor": 0,
@@ -1194,7 +1194,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() should ignore unstab
Array [
Object {
"bucket": "major",
- "fromVersion": "1.4.4",
+ "currentVersion": "1.4.4",
"isSingleVersion": true,
"newMajor": 2,
"newMinor": 0,
@@ -1209,7 +1209,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() should jump unstable
Array [
Object {
"bucket": "non-major",
- "fromVersion": "3.0.0-insiders.20180706",
+ "currentVersion": "3.0.0-insiders.20180706",
"isSingleVersion": true,
"newMajor": 3,
"newMinor": 0,
@@ -1225,7 +1225,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() should not jump unst
Array [
Object {
"bucket": "non-major",
- "fromVersion": "3.0.1-insiders.20180726",
+ "currentVersion": "3.0.1-insiders.20180726",
"isSingleVersion": true,
"newMajor": 3,
"newMinor": 0,
@@ -1255,7 +1255,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() should treat zero ze
Array [
Object {
"bucket": "non-major",
- "fromVersion": "0.0.34",
+ "currentVersion": "0.0.34",
"isRange": true,
"isSingleVersion": false,
"newMajor": 0,
@@ -1280,7 +1280,7 @@ Object {
"updates": Array [
Object {
"bucket": "major",
- "fromVersion": "8",
+ "currentVersion": "8",
"isSingleVersion": true,
"newMajor": 9,
"newMinor": null,
@@ -1304,7 +1304,7 @@ Object {
"updates": Array [
Object {
"bucket": "non-major",
- "fromVersion": "8.1",
+ "currentVersion": "8.1",
"isSingleVersion": true,
"newMajor": 8,
"newMinor": 2,
@@ -1315,7 +1315,7 @@ Object {
},
Object {
"bucket": "major",
- "fromVersion": "8.1",
+ "currentVersion": "8.1",
"isSingleVersion": true,
"newMajor": 9,
"newMinor": 0,
@@ -1339,7 +1339,7 @@ Object {
"updates": Array [
Object {
"bucket": "non-major",
- "fromVersion": "8.1.0",
+ "currentVersion": "8.1.0",
"isSingleVersion": true,
"newMajor": 8,
"newMinor": 2,
@@ -1377,7 +1377,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() supports > latest ve
Array [
Object {
"bucket": "major",
- "fromVersion": "1.4.1",
+ "currentVersion": "1.4.1",
"isSingleVersion": true,
"newMajor": 2,
"newMinor": 0,
@@ -1398,7 +1398,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() supports complex maj
Array [
Object {
"bucket": "major",
- "fromVersion": "2.7.0",
+ "currentVersion": "2.7.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 3,
@@ -1434,7 +1434,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() supports complex maj
Array [
Object {
"bucket": "major",
- "fromVersion": "2.7.0",
+ "currentVersion": "2.7.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 3,
@@ -1469,7 +1469,7 @@ Array [
exports[`workers/repository/process/lookup .lookupUpdates() supports complex ranges 1`] = `
Object {
"bucket": "non-major",
- "fromVersion": "0.8.12",
+ "currentVersion": "0.8.12",
"isRange": true,
"isSingleVersion": false,
"newMajor": 0,
@@ -1494,7 +1494,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() supports complex til
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.3.0",
+ "currentVersion": "1.3.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -1514,7 +1514,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() supports in-range ca
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.0.0",
+ "currentVersion": "1.0.0",
"isBump": true,
"isRange": true,
"isSingleVersion": false,
@@ -1542,7 +1542,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() supports in-range gt
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.0.0",
+ "currentVersion": "1.0.0",
"isBump": true,
"isRange": true,
"isSingleVersion": false,
@@ -1570,7 +1570,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() supports in-range ti
Array [
Object {
"bucket": "patch",
- "fromVersion": "1.0.0",
+ "currentVersion": "1.0.0",
"isBump": true,
"isRange": true,
"isSingleVersion": false,
@@ -1583,7 +1583,7 @@ Array [
},
Object {
"bucket": "minor",
- "fromVersion": "1.0.0",
+ "currentVersion": "1.0.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -1609,7 +1609,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() supports in-range ti
Array [
Object {
"bucket": "patch",
- "fromVersion": "1.0.0",
+ "currentVersion": "1.0.0",
"isBump": true,
"isRange": true,
"isSingleVersion": false,
@@ -1622,7 +1622,7 @@ Array [
},
Object {
"bucket": "minor",
- "fromVersion": "1.0.0",
+ "currentVersion": "1.0.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -1648,9 +1648,9 @@ exports[`workers/repository/process/lookup .lookupUpdates() supports lock file u
Array [
Object {
"bucket": "patch",
+ "currentVersion": "0.4.0",
"displayFrom": "0.4.0",
"displayTo": "0.4.4",
- "fromVersion": "0.4.0",
"isLockfileUpdate": true,
"isRange": true,
"isSingleVersion": true,
@@ -1667,7 +1667,7 @@ Array [
},
Object {
"bucket": "minor",
- "fromVersion": "0.4.4",
+ "currentVersion": "0.4.4",
"isRange": true,
"isSingleVersion": false,
"newMajor": 0,
@@ -1709,7 +1709,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.4.4",
+ "currentVersion": "0.4.4",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -1737,7 +1737,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() supports majorgte up
Array [
Object {
"bucket": "latest",
- "fromVersion": "0.9.0",
+ "currentVersion": "0.9.0",
"isBump": true,
"isRange": true,
"isSingleVersion": false,
@@ -1780,7 +1780,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "non-major",
- "fromVersion": "0.4.4",
+ "currentVersion": "0.4.4",
"isSingleVersion": true,
"newMajor": 0,
"newMinor": 9,
@@ -1822,7 +1822,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "major",
- "fromVersion": "0.4.4",
+ "currentVersion": "0.4.4",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -1856,7 +1856,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "non-major",
- "fromVersion": "0.4.4",
+ "currentVersion": "0.4.4",
"isSingleVersion": true,
"newMajor": 0,
"newMinor": 9,
@@ -1898,7 +1898,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "major",
- "fromVersion": "0.4.4",
+ "currentVersion": "0.4.4",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -1925,7 +1925,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades .x complex
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.3.0",
+ "currentVersion": "1.3.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -1945,7 +1945,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades .x major ra
Array [
Object {
"bucket": "major",
- "fromVersion": "0.9.7",
+ "currentVersion": "0.9.7",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -1980,7 +1980,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "non-major",
- "fromVersion": "1.3.0",
+ "currentVersion": "1.3.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -1999,7 +1999,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades .x minor ra
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.3.0",
+ "currentVersion": "1.3.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2019,7 +2019,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades equal minor
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.3.1",
+ "currentVersion": "1.3.1",
"isRange": true,
"isSingleVersion": true,
"newMajor": 1,
@@ -2039,7 +2039,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades less than e
Array [
Object {
"bucket": "major",
- "fromVersion": "1.4.1",
+ "currentVersion": "1.4.1",
"isRange": true,
"isSingleVersion": false,
"newMajor": 2,
@@ -2061,7 +2061,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades less than e
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.3.0",
+ "currentVersion": "1.3.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2081,7 +2081,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades less than e
Array [
Object {
"bucket": "non-major",
- "fromVersion": "0.7.2",
+ "currentVersion": "0.7.2",
"isRange": true,
"isSingleVersion": false,
"newMajor": 0,
@@ -2115,7 +2115,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.7.2",
+ "currentVersion": "0.7.2",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2143,7 +2143,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades less than m
Array [
Object {
"bucket": "major",
- "fromVersion": "0.9.7",
+ "currentVersion": "0.9.7",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2171,7 +2171,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades less than r
Array [
Object {
"bucket": "non-major",
- "fromVersion": "0.7.1",
+ "currentVersion": "0.7.1",
"isRange": true,
"isSingleVersion": false,
"newMajor": 0,
@@ -2206,7 +2206,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.7.1",
+ "currentVersion": "0.7.1",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2234,7 +2234,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades major great
Array [
Object {
"bucket": "major",
- "fromVersion": "0.9.7",
+ "currentVersion": "0.9.7",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2262,7 +2262,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades major less
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.0.0",
+ "currentVersion": "1.0.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2289,7 +2289,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades major less
Array [
Object {
"bucket": "major",
- "fromVersion": "0.9.7",
+ "currentVersion": "0.9.7",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2317,7 +2317,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades minor great
Array [
Object {
"bucket": "non-major",
- "fromVersion": "0.8.0",
+ "currentVersion": "0.8.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 0,
@@ -2350,7 +2350,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.8.0",
+ "currentVersion": "0.8.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2378,7 +2378,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades minor great
Array [
Object {
"bucket": "non-major",
- "fromVersion": "0.7.2",
+ "currentVersion": "0.7.2",
"isRange": true,
"isSingleVersion": false,
"newMajor": 0,
@@ -2412,7 +2412,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.7.2",
+ "currentVersion": "0.7.2",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2447,7 +2447,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "non-major",
- "fromVersion": "1.0.1",
+ "currentVersion": "1.0.1",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -2472,7 +2472,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades multiple ca
Array [
Object {
"bucket": "non-major",
- "fromVersion": "0.7.2",
+ "currentVersion": "0.7.2",
"isRange": true,
"isSingleVersion": false,
"newMajor": 0,
@@ -2506,7 +2506,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.7.2",
+ "currentVersion": "0.7.2",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2534,7 +2534,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades multiple ti
Array [
Object {
"bucket": "non-major",
- "fromVersion": "0.7.2",
+ "currentVersion": "0.7.2",
"isRange": true,
"isSingleVersion": false,
"newMajor": 0,
@@ -2568,7 +2568,7 @@ Array [
},
Object {
"bucket": "major",
- "fromVersion": "0.7.2",
+ "currentVersion": "0.7.2",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2596,7 +2596,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades shorthand m
Array [
Object {
"bucket": "major",
- "fromVersion": "0.9.7",
+ "currentVersion": "0.9.7",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2624,7 +2624,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades shorthand m
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.3.0",
+ "currentVersion": "1.3.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2651,7 +2651,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "non-major",
- "fromVersion": "1.3.0",
+ "currentVersion": "1.3.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -2670,7 +2670,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() upgrades tilde range
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.3.0",
+ "currentVersion": "1.3.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2690,7 +2690,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() uses minimum version
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.0.0",
+ "currentVersion": "1.0.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 0,
@@ -2713,7 +2713,7 @@ Array [
Object {
"blockedByPin": true,
"bucket": "non-major",
- "fromVersion": "1.0.0",
+ "currentVersion": "1.0.0",
"isSingleVersion": true,
"newMajor": 1,
"newMinor": 4,
@@ -2739,7 +2739,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() widens .x OR ranges
Array [
Object {
"bucket": "major",
- "fromVersion": "2.7.0",
+ "currentVersion": "2.7.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 3,
@@ -2775,7 +2775,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() widens major ranged
Array [
Object {
"bucket": "major",
- "fromVersion": "2.7.0",
+ "currentVersion": "2.7.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 3,
@@ -2811,7 +2811,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() widens minor ranged
Array [
Object {
"bucket": "non-major",
- "fromVersion": "1.3.0",
+ "currentVersion": "1.3.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 1,
@@ -2831,7 +2831,7 @@ exports[`workers/repository/process/lookup .lookupUpdates() widens stanndalone m
Array [
Object {
"bucket": "major",
- "fromVersion": "2.7.0",
+ "currentVersion": "2.7.0",
"isRange": true,
"isSingleVersion": false,
"newMajor": 3,
diff --git a/lib/workers/repository/process/lookup/filter.ts b/lib/workers/repository/process/lookup/filter.ts
index 7f6c8be91fdfcde284159abc3256ea215695f51e..3c8dfd0be4b3461cbd98993815f373ce052e6f39 100644
--- a/lib/workers/repository/process/lookup/filter.ts
+++ b/lib/workers/repository/process/lookup/filter.ts
@@ -20,7 +20,7 @@ export interface FilterConfig {
export function filterVersions(
config: FilterConfig,
- fromVersion: string,
+ currentVersion: string,
latestVersion: string,
releases: Release[]
): Release[] {
@@ -43,18 +43,18 @@ export function filterVersions(
return true;
}
versioning = allVersioning.get(config.versioning);
- if (!fromVersion) {
+ if (!currentVersion) {
return [];
}
// Leave only versions greater than current
let filteredVersions = releases.filter((v) =>
- versioning.isGreaterThan(v.version, fromVersion)
+ versioning.isGreaterThan(v.version, currentVersion)
);
// Don't upgrade from non-deprecated to deprecated
const fromRelease = releases.find(
- (release) => release.version === fromVersion
+ (release) => release.version === currentVersion
);
if (ignoreDeprecated && fromRelease && !fromRelease.isDeprecated) {
filteredVersions = filteredVersions.filter((v) => {
@@ -120,14 +120,17 @@ export function filterVersions(
}
// if current is unstable then allow unstable in the current major only
- if (!isVersionStable(fromVersion)) {
+ if (!isVersionStable(currentVersion)) {
// Allow unstable only in current major
return filteredVersions.filter(
(v) =>
isVersionStable(v.version) ||
- (versioning.getMajor(v.version) === versioning.getMajor(fromVersion) &&
- versioning.getMinor(v.version) === versioning.getMinor(fromVersion) &&
- versioning.getPatch(v.version) === versioning.getPatch(fromVersion))
+ (versioning.getMajor(v.version) ===
+ versioning.getMajor(currentVersion) &&
+ versioning.getMinor(v.version) ===
+ versioning.getMinor(currentVersion) &&
+ versioning.getPatch(v.version) ===
+ versioning.getPatch(currentVersion))
);
}
@@ -145,8 +148,8 @@ export function filterVersions(
if (respectLatest === false) {
return filteredVersions;
}
- // No filtering if fromVersion is already past latest
- if (versioning.isGreaterThan(fromVersion, latestVersion)) {
+ // No filtering if currentVersion is already past latest
+ if (versioning.isGreaterThan(currentVersion, latestVersion)) {
return filteredVersions;
}
return filteredVersions.filter(
diff --git a/lib/workers/repository/process/lookup/index.ts b/lib/workers/repository/process/lookup/index.ts
index 74fe563c3566d053b985f521584014a03437db73..811bcf01fc047bb8a4278e8b430ef96ec3c33a79 100644
--- a/lib/workers/repository/process/lookup/index.ts
+++ b/lib/workers/repository/process/lookup/index.ts
@@ -58,15 +58,15 @@ export interface LookupUpdateConfig
function getType(
config: LookupUpdateConfig,
- fromVersion: string,
+ currentVersion: string,
toVersion: string
): UpdateType {
const { versioning } = config;
const version = allVersioning.get(versioning);
- if (version.getMajor(toVersion) > version.getMajor(fromVersion)) {
+ if (version.getMajor(toVersion) > version.getMajor(currentVersion)) {
return 'major';
}
- if (version.getMinor(toVersion) > version.getMinor(fromVersion)) {
+ if (version.getMinor(toVersion) > version.getMinor(currentVersion)) {
return 'minor';
}
if (config.separateMinorPatch) {
@@ -114,7 +114,7 @@ function getFromVersion(
function getBucket(
config: LookupUpdateConfig,
- fromVersion: string,
+ currentVersion: string,
toVersion: string,
versioning: allVersioning.VersioningApi
): string {
@@ -126,7 +126,7 @@ function getBucket(
if (!separateMajorMinor) {
return 'latest';
}
- const fromMajor = versioning.getMajor(fromVersion);
+ const fromMajor = versioning.getMajor(currentVersion);
const toMajor = versioning.getMajor(toVersion);
if (fromMajor !== toMajor) {
if (separateMultipleMajor) {
@@ -135,7 +135,9 @@ function getBucket(
return 'major';
}
if (separateMinorPatch) {
- if (versioning.getMinor(fromVersion) === versioning.getMinor(toVersion)) {
+ if (
+ versioning.getMinor(currentVersion) === versioning.getMinor(toVersion)
+ ) {
return 'patch';
}
return 'minor';
@@ -263,7 +265,7 @@ export async function lookupUpdates(
const nonDeprecatedVersions = releases
.filter((release) => !release.isDeprecated)
.map((release) => release.version);
- const fromVersion =
+ const currentVersion =
getFromVersion(
config,
rangeStrategy,
@@ -277,7 +279,7 @@ export async function lookupUpdates(
allVersions.map((v) => v.version)
);
if (
- fromVersion &&
+ currentVersion &&
rangeStrategy === 'pin' &&
!versioning.isSingleVersion(currentValue)
) {
@@ -287,13 +289,13 @@ export async function lookupUpdates(
newValue: versioning.getNewValue({
currentValue,
rangeStrategy,
- fromVersion,
- toVersion: fromVersion,
+ currentVersion,
+ toVersion: currentVersion,
}),
- newMajor: versioning.getMajor(fromVersion),
+ newMajor: versioning.getMajor(currentVersion),
});
}
- let filterStart = fromVersion;
+ let filterStart = currentVersion;
if (lockedVersion && rangeStrategy === 'update-lockfile') {
// Look for versions greater than the current locked version that still satisfy the package.json range
filterStart = lockedVersion;
@@ -315,7 +317,7 @@ export async function lookupUpdates(
for (const release of filteredVersions) {
const bucket = getBucket(
config,
- fromVersion,
+ currentVersion,
release.version,
versioning
);
@@ -331,18 +333,22 @@ export async function lookupUpdates(
);
const bucketRelease = sortedReleases.pop();
const toVersion = bucketRelease.version;
- const update: LookupUpdate = { fromVersion, toVersion, newValue: null };
+ const update: LookupUpdate = {
+ currentVersion,
+ toVersion,
+ newValue: null,
+ };
update.bucket = bucket;
try {
update.newValue = versioning.getNewValue({
currentValue,
rangeStrategy,
- fromVersion,
+ currentVersion,
toVersion,
});
} catch (err) /* istanbul ignore next */ {
logger.warn(
- { err, currentValue, rangeStrategy, fromVersion, toVersion },
+ { err, currentValue, rangeStrategy, currentVersion, toVersion },
'getNewValue error'
);
update.newValue = currentValue;
@@ -359,7 +365,7 @@ export async function lookupUpdates(
);
continue; // eslint-disable-line no-continue
}
- update.fromVersion = lockedVersion;
+ update.currentVersion = lockedVersion;
update.displayFrom = lockedVersion;
update.displayTo = toVersion;
update.isSingleVersion = true;
@@ -367,7 +373,7 @@ export async function lookupUpdates(
update.newMajor = versioning.getMajor(toVersion);
update.newMinor = versioning.getMinor(toVersion);
update.updateType =
- update.updateType || getType(config, fromVersion, toVersion);
+ update.updateType || getType(config, currentVersion, toVersion);
update.isSingleVersion =
update.isSingleVersion || !!versioning.isSingleVersion(update.newValue);
if (!versioning.isVersion(update.newValue)) {
@@ -445,7 +451,9 @@ export async function lookupUpdates(
if (versioning.valueToVersion) {
for (const update of res.updates || []) {
update.newVersion = versioning.valueToVersion(update.newValue);
- update.fromVersion = versioning.valueToVersion(update.fromVersion);
+ update.currentVersion = versioning.valueToVersion(
+ update.currentVersion
+ );
update.toVersion = versioning.valueToVersion(update.toVersion);
}
}
diff --git a/lib/workers/repository/updates/__snapshots__/generate.spec.ts.snap b/lib/workers/repository/updates/__snapshots__/generate.spec.ts.snap
index 14b906d10e19ae67a80f3205311bf847b187387d..5c2437fb22acfe612629c3f15cef681ca36377b9 100644
--- a/lib/workers/repository/updates/__snapshots__/generate.spec.ts.snap
+++ b/lib/workers/repository/updates/__snapshots__/generate.spec.ts.snap
@@ -120,11 +120,11 @@ Object {
"commitBodyTable": true,
"commitMessage": "",
"currentValue": "0.5.7",
+ "currentVersion": "0.5.7",
"datasource": "npm",
"depName": "@types/some-dep",
"displayFrom": "0.5.7",
"displayTo": "",
- "fromVersion": "0.5.7",
"isRange": false,
"prTitle": "some-title",
"prettyDepType": "dependency",
diff --git a/lib/workers/repository/updates/generate.spec.ts b/lib/workers/repository/updates/generate.spec.ts
index f9d438e34313e14d62639f9dbfba6d7496a70cf8..07d42d70e6a848e95a98442267c3b211fb6e276d 100644
--- a/lib/workers/repository/updates/generate.spec.ts
+++ b/lib/workers/repository/updates/generate.spec.ts
@@ -370,7 +370,7 @@ describe('workers/repository/updates/generate', () => {
branchName: 'some-branch',
prTitle: 'some-title',
currentValue: '0.5.7',
- fromVersion: '0.5.7',
+ currentVersion: '0.5.7',
toVersion: '0.5.8',
group: {},
},
diff --git a/lib/workers/repository/updates/generate.ts b/lib/workers/repository/updates/generate.ts
index 5b7da66351ace2bc1c5d1766fca8f6abaf075d28..151aad668a7360128acf84a4d0b016d1d62253b3 100644
--- a/lib/workers/repository/updates/generate.ts
+++ b/lib/workers/repository/updates/generate.ts
@@ -39,13 +39,13 @@ function getTableValues(
datasource,
lookupName,
depName,
- fromVersion,
+ currentVersion,
toVersion,
displayFrom,
displayTo,
} = upgrade;
const name = lookupName || depName;
- const from = fromVersion || displayFrom;
+ const from = currentVersion || displayFrom;
const to = toVersion || displayTo;
if (datasource && name && from && to) {
return [datasource, name, from, to];
@@ -55,7 +55,7 @@ function getTableValues(
datasource,
lookupName,
depName,
- fromVersion,
+ currentVersion,
toVersion,
displayFrom,
displayTo,