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
16 changes: 9 additions & 7 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -24159,7 +24159,7 @@ function getBaseRef() {
var core2 = __toESM(require_core(), 1);
function getProvenance(meta) {
if (meta._npmUser?.trustedPublisher) {
return "trusted";
return "trusted-with-provenance";
}
if (meta.dist?.attestations?.provenance) {
return "provenance";
Expand All @@ -24168,7 +24168,7 @@ function getProvenance(meta) {
}
function getTrustLevel(status) {
switch (status) {
case "trusted":
case "trusted-with-provenance":
return 2;
case "provenance":
return 1;
Expand All @@ -24189,14 +24189,16 @@ async function getProvenanceForPackageVersions(packageName, versions) {
return result;
}
function getMinTrustLevel(statuses) {
const result = { level: 2, status: "trusted" };
let result = null;
for (const status of statuses) {
const level = getTrustLevel(status);
if (level < result.level) {
result.level = level;
result.status = status;
if (result === null || level < result.level) {
result = { level, status };
}
}
if (!result) {
return { level: 0, status: "none" };
}
return result;
}
var metaCache = /* @__PURE__ */ new Map();
Expand Down Expand Up @@ -24536,7 +24538,7 @@ ${packageRows}`
if (!baseVersionSet || baseVersionSet.size === 0) {
continue;
}
if (baseVersionSet.isSubsetOf(currentVersionSet)) {
if (currentVersionSet.isSubsetOf(baseVersionSet)) {
continue;
}
try {
Expand Down
2 changes: 1 addition & 1 deletion src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ ${packageRows}`
continue;
}

if (baseVersionSet.isSubsetOf(currentVersionSet)) {
if (currentVersionSet.isSubsetOf(baseVersionSet)) {
continue;
}

Expand Down
19 changes: 12 additions & 7 deletions src/npm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,14 @@ export interface PackageIndex {
versions: Record<string, PackageMetadata>;
}

export type ProvenanceStatus = 'trusted' | 'provenance' | 'none';
export type ProvenanceStatus =
| 'trusted-with-provenance'
| 'provenance'
| 'none';

export function getProvenance(meta: PackageMetadata): ProvenanceStatus {
if (meta._npmUser?.trustedPublisher) {
return 'trusted';
return 'trusted-with-provenance';
}
if (meta.dist?.attestations?.provenance) {
return 'provenance';
Expand All @@ -36,7 +39,7 @@ export function getProvenance(meta: PackageMetadata): ProvenanceStatus {

export function getTrustLevel(status: ProvenanceStatus): number {
switch (status) {
case 'trusted':
case 'trusted-with-provenance':
return 2;
case 'provenance':
return 1;
Expand Down Expand Up @@ -69,14 +72,16 @@ export interface MinTrustLevelResult {
export function getMinTrustLevel(
statuses: Iterable<ProvenanceStatus>
): MinTrustLevelResult {
const result: MinTrustLevelResult = {level: 2, status: 'trusted'};
let result: MinTrustLevelResult | null = null;
for (const status of statuses) {
const level = getTrustLevel(status);
if (level < result.level) {
result.level = level;
result.status = status;
if (result === null || level < result.level) {
result = {level, status};
}
}
if (!result) {
return {level: 0, status: 'none'};
}
return result;
}

Expand Down