Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions lib/modules/datasource/common.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,24 @@ describe('modules/datasource/common', () => {
});
});

it('should return all releases when no configConstraints', () => {
const config = {
datasource: 'pypi',
packageName: 'bar',
versioning: 'pep440',
constraintsFiltering: 'strict' as const,
};
const releaseResult = {
releases: [
{ version: '1.0.0', constraints: { python: ['^1.0.0'] } },
{ version: '2.0.0' },
],
};
expect(applyConstraintsFiltering(releaseResult, config)).toEqual({
releases: [{ version: '1.0.0' }, { version: '2.0.0' }],
});
});

it('should match exact constraints', () => {
const config = {
datasource: 'pypi',
Expand Down
111 changes: 106 additions & 5 deletions lib/modules/datasource/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,17 +187,51 @@ export function applyConstraintsFiltering<
const filteredReleases: string[] = [];
const startingLength = releaseResult.releases.length;
releaseResult.releases = filterMap(releaseResult.releases, (release) => {
logger.trace(
{
release,
versioning: versioningName,
},
`applyConstraintsFiltering(${release.version})`,
);
const releaseConstraints = release.constraints;
delete release.constraints;

logger.trace(
{
release,
versioning: versioningName,
configConstraints: configConstraints ?? 'undefined',
releaseConstraints: releaseConstraints ?? 'undefined',
},
`applyConstraintsFiltering(${release.version}): checking constraints`,
);
if (!configConstraints || !releaseConstraints) {
return release;
}

for (const [name, configConstraint] of Object.entries(
configConstraints,
) as [ConstraintName, string][]) {
if (!versioning.isValid(configConstraint)) {
logger.trace(
{
release,
versioning: versioningName,
constraintName: name,
constraint: configConstraint,
},
`applyConstraintsFiltering(${release.version}) for constraint ${name}`,
);

const isValid = versioning.isValid(configConstraint);
logger.trace(
{
release,
versioning: versioningName,
},
`applyConstraintsFiltering(${release.version}): versioning.isValid(${configConstraint})=${isValid}`,
);
if (!isValid) {
logger.once.warn(
{
packageName: config.packageName,
Expand All @@ -210,13 +244,28 @@ export function applyConstraintsFiltering<
}

const constraint = releaseConstraints[name];
logger.trace(
{
release,
versioning: versioningName,
},
`applyConstraintsFiltering(${release.version}): releaseConstraints[${name}]=${JSON.stringify(constraint)}`,
);
if (!isNonEmptyArray(constraint)) {
// A release with no constraints is OK
continue;
}

let satisfiesConstraints = false;
for (const releaseConstraint of constraint) {
logger.trace(
{
release,
versioning: versioningName,
releaseConstraint,
},
`applyConstraintsFiltering(${release.version}): releaseConstraint=${releaseConstraint}`,
);
if (!releaseConstraint) {
satisfiesConstraints = true;
logger.once.debug(
Expand All @@ -230,7 +279,16 @@ export function applyConstraintsFiltering<
break;
}

if (!versioning.isValid(releaseConstraint)) {
const isValid = versioning.isValid(releaseConstraint);
logger.trace(
{
release,
versioning: versioningName,
releaseConstraint,
},
`applyConstraintsFiltering(${release.version}): versioning.isValid(${releaseConstraint})=${isValid}`,
);
if (!isValid) {
logger.once.debug(
{
packageName: config.packageName,
Expand All @@ -242,22 +300,65 @@ export function applyConstraintsFiltering<
break;
}

if (configConstraint === releaseConstraint) {
const isEqual = configConstraint === releaseConstraint;
logger.trace(
{
release,
versioning: versioningName,
configConstraint,
releaseConstraint,
},
`applyConstraintsFiltering(${release.version}): ${configConstraint} === ${releaseConstraint}=${isValid}`,
);
if (isEqual) {
satisfiesConstraints = true;
break;
}

if (versioning.subset?.(configConstraint, releaseConstraint)) {
const isSubset = versioning.subset?.(
configConstraint,
releaseConstraint,
);
logger.trace(
{
release,
versioning: versioningName,
configConstraint,
releaseConstraint,
},
`applyConstraintsFiltering(${release.version}): versioning.subset?.(${configConstraint}, ${releaseConstraint}=${isSubset}`,
);
if (isSubset) {
satisfiesConstraints = true;
break;
}

if (versioning.matches(configConstraint, releaseConstraint)) {
const doesMatch = versioning.matches(
configConstraint,
releaseConstraint,
);
logger.trace(
{
release,
versioning: versioningName,
configConstraint,
releaseConstraint,
},
`applyConstraintsFiltering(${release.version}): versioning.matches(${configConstraint}, ${releaseConstraint}=${isSubset}`,
);
if (doesMatch) {
satisfiesConstraints = true;
break;
}
}

logger.trace(
{
release,
versioning: versioningName,
},
`applyConstraintsFiltering(${release.version}): satisfiesConstraints=${satisfiesConstraints}`,
);
if (!satisfiesConstraints) {
filteredReleases.push(release.version);
return null;
Expand Down
Loading