ignore or-chains, fixes #43

This commit is contained in:
silverwind 2020-05-25 18:14:37 +02:00
parent 9e8eab6193
commit 9f342114d7
Signed by: silverwind
GPG Key ID: 2E62B41C93869443
3 changed files with 10 additions and 8 deletions

@ -15,6 +15,7 @@
"updates": "file:." "updates": "file:."
}, },
"peerDependencies": { "peerDependencies": {
"@babel/preset-env": "~6.0.0" "@babel/preset-env": "~6.0.0",
"svgstore": "^1.0.0 || ^2.0.0"
} }
} }

12
test.js

@ -81,14 +81,14 @@ function makeTest(args, expected) {
// Parse results, with custom validation for the dynamic "age" property // Parse results, with custom validation for the dynamic "age" property
for (const dependencyType of dependencyTypes) { for (const dependencyType of dependencyTypes) {
for (const [dependencyName, data] of Object.entries(expected[dependencyType] || {})) { for (const [dependencyName, actual] of Object.entries(results[dependencyType] || {})) {
for (const [key, value] of Object.entries(data || {})) { for (const [key, actualValue] of Object.entries(actual || {})) {
const resultValue = results[dependencyType][dependencyName][key]; const expectedValue = expected[dependencyType][dependencyName][key];
if (key === "age") { if (key === "age") {
expect(resultValue).toBeInstanceOf(String); expect(typeof actualValue).toEqual("string");
expect(resultValue.length > 0).toBeTruthy(); expect(actualValue.length > 0).toBeTruthy();
} else { } else {
expect(resultValue).toEqual(value); expect(expectedValue).toEqual(actualValue);
} }
} }
} }

@ -551,7 +551,8 @@ function findVersion(data, versions, {range, semvers, usePre, useRel, useGreates
} }
function findNewVersion(data, opts) { function findNewVersion(data, opts) {
if (opts.range === "*") return "*"; if (opts.range === "*") return null; // ignore wildcard
if (opts.range.includes("||")) return null; // ignore or-chains
const versions = Object.keys(data.versions).filter(version => semver.valid(version)); const versions = Object.keys(data.versions).filter(version => semver.valid(version));
const version = findVersion(data, versions, opts); const version = findVersion(data, versions, opts);