@preventive/upstream 1.0.0-alpha.3 → 1.0.0-alpha.5

package/LICENSE-APACHE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/advisories.d.ts

@@ -6,28 +6,32 @@ import type { Client, RepoName } from './github.js'
 export { HttpError } from './npm.js'
 
 // As purl and stasis name them.
-export type Ecosystem = 'npm' | 'cargo' | 'composer' | 'github'
+export type Ecosystem = 'npm' | 'cargo' | 'composer' | 'soldeer' | 'github'
 
 export interface Package {
   ecosystem: Ecosystem
-  // An npm package name, a crate name, a Composer `vendor/name`, or for
-  // `github`, the repository `owner/name` itself.
+  // An npm package name, a crate name, a Composer `vendor/name`, a Soldeer
+  // project name, or for `github`, the repository `owner/name` itself.
   name: string
   // Its GitHub repository, where the caller knows it (package.json,
   // Cargo.toml, installed.json), for `repoAdvisories` to ask without
-  // looking it up; not for `github` packages, which are their own.
+  // looking it up, and for a `soldeer` package, to ask instead of the one
+  // Soldeer names; not for `github` packages, which are their own.
   github?: RepoName
   // npm and `github`: semver; `github` also takes a branch name or 0.0.0,
   // which every range covers. cargo: semver, build metadata allowed.
   // composer: a release (`v1.2.3`, `1.2.3.4`, `2.0.0-RC1`), dev versions
-  // refused; one semver cannot read is covered by every range.
+  // refused; one semver cannot read is covered by every range. soldeer: as
+  // soldeer.lock has it; one semver cannot read (a bare number, a commit)
+  // is covered by every range.
   versions: string[]
 }
 
 export interface AdvisoryOptions {
-  // The client every GitHub request goes through. Required for `github`
-  // packages, whose repository's published advisories are their only
-  // source, and for `repoAdvisories`; by itself it asks nothing else.
+  // The client every GitHub request goes through. Required for `soldeer`
+  // and `github` packages, whose repository's published advisories are
+  // their only source, and for `repoAdvisories`; by itself it asks nothing
+  // else.
   github?: Client
   // Also asks each npm, cargo and composer package's GitHub repository
   // for its published advisories, which it has before GitHub reviews them
@@ -43,13 +47,18 @@ export interface Advisory {
   ecosystem: Ecosystem
   name: string
   // `registry`: npm's, as `npm audit` has it, one row per vulnerable
-  // range. `osv`: RustSec for cargo, OSV's Packagist records for composer.
+  // range. `osv`: OSV's records for cargo and composer, RustSec's, GitHub's
+  // and malicious packages' (MAL-…) among them; of the records naming each
+  // other as aliases, directly or through others, a version is reported
+  // under one only: RustSec's, else the GHSA, else the first by id. Each
+  // has the others' ids among its aliases.
   // `repository`: published on the package's repository, one row per
   // range, holding only the versions the others' answer does not report
-  // under that GHSA.
+  // under that GHSA. The only source for `soldeer` and `github`, where
+  // every range counts, whichever package it names.
   source: 'registry' | 'osv' | 'repository'
-  // A GHSA, RUSTSEC-…, DRUPAL-CORE-…, or npm:<id> for a registry row
-  // without a GHSA.
+  // A GHSA, RUSTSEC-…, MAL-…, DRUPAL-CORE-… or another OSV id, or
+  // npm:<id> for a registry row without a GHSA.
   id: string
   // The id itself, or an OSV record's one GHSA alias.
   ghsa?: string
@@ -75,8 +84,10 @@ export interface Advisory {
 // Every package, and every one of its versions, is checked against its
 // ecosystem's rules before the first request; a name given twice is
 // merged, and must not name two repositories. npm is asked 250 names a
-// request, OSV 1000 versions; a repository gone, renamed or blocked adds
-// nothing. Any other failure, a malformed answer, or one about something
-// not asked, throws: nothing is left out quietly. Sorted by ecosystem and
-// name. Versions are matched by npm's semver, from the npm beside node.
+// request, OSV 1000 versions, Soldeer one project; a project Soldeer does
+// not have or that names no GitHub repository, and a repository gone,
+// renamed or blocked, add nothing. Any other failure, a malformed answer,
+// or one about something not asked, throws: nothing is left out quietly.
+// Sorted by ecosystem and name. Versions are matched by npm's semver, from
+// the npm beside node, or by the semver peer where there is no npm.
 export function advisories(packages: Iterable<Package>, options?: AdvisoryOptions): Promise<Advisory[]>

package/cargo.d.ts

@@ -1,11 +1,16 @@
 // Hand-written against cargo.js; a change to either belongs with the other.
 //
-// The name is asserted to be a crate name, the version an exact semver
+// A name is asserted to be a crate name, a version an exact semver
 // version, and a checksum 64 lowercase hex digits, before any request or
 // cache path. The cache is setCacheDir's (npm.js).
 
 export { HttpError } from './npm.js'
 
+// Reads crates.io's index for that version and throws unless its sha256
+// is the one given, as for a checksum read off Cargo.lock. The index is
+// read on every call; nothing is cached.
+export function verifyChecksum(name: string, version: string, checksum: string): Promise<void>
+
 // A published version's .crate, whole, in memory. `checksum` is its
 // sha256 as Cargo.lock records it; without one, crates.io's index is read
 // for it on every call, cached crate or not. Either way the bytes are
@@ -17,3 +22,15 @@ export { HttpError } from './npm.js'
 // `~/.cargo`. A file there that does not match is passed over. One in
 // setCacheDir's cache that does not match throws.
 export function getCrate(name: string, version: string, checksum?: string): Promise<Uint8Array>
+
+// What resolveCrateRepos maps each resolved name to: `owner/name`, the
+// GitHub repo the crate's `repository` on crates.io names.
+export interface CrateRepo {
+  github: string
+}
+// Fail-soft, as npm.js's resolvePackageRepos: a crate crates.io does not
+// have, one naming no GitHub repo, and those of a request that fails are
+// absent from the map. crates.io is asked a hundred names a request, a
+// second apart, as it asks; a repo found is cached for a month, and
+// `cachedOnly` answers from that cache alone and never fetches.
+export function resolveCrateRepos(crateNames: Iterable<string>, options?: { cachedOnly?: boolean }): Promise<Map<string, CrateRepo>>

package/cargo.js

@@ -1,2 +1,3 @@
-export { getCrate } from './src/cargo.js'
+export { getCrate, verifyChecksum } from './src/cargo/crate.js'
+export { resolveCrateRepos } from './src/cargo/repos.js'
 export { HttpError } from './src/http.js'

package/github.d.ts

@@ -65,16 +65,20 @@ export interface Client {
   getRepoFile(options: { repo: RepoName; path: string; ref?: string }): Promise<string>
   // The head of `branch`, or of the default branch without one.
   getRepoHead(options: { repo: RepoName; branch?: string }): Promise<{ branch: string; oid: string }>
+  // The commit `tag` names: GitHub's ref for exactly that tag, an annotated
+  // one's tag object followed to the commit, through up to 8 tags of tags.
+  // Refused for a tag on anything but a commit.
+  getRepoTag(options: { repo: RepoName; tag: string }): Promise<{ tag: string; oid: string }>
   // The repo's gzipped tarball at the full commit `sha`, whole, in memory:
   // getRepoTreeTarball's for the tree GitHub names for that commit, asked
   // on every call, cached or not. So its top directory is named for the
   // tree, and files marked `export-subst` are as committed, not rewritten.
   getRepoTarball(options: { repo: RepoName; sha: string }): Promise<Uint8Array>
-  // The id of the tree at `path`, a directory, in the full commit `sha`, or
-  // of its root without one: from the tree GitHub names for the commit,
-  // down GitHub's listings a directory at a time, each hashed back to its
-  // id. Refused where `path` is no directory.
-  getRepoTreeId(options: { repo: RepoName; sha: string; path?: string }): Promise<string>
+  // The id of the tree at `directory`, `/`-separated as npm's is, in the
+  // full commit `sha`, or of its root without one: from the tree GitHub
+  // names for the commit, down GitHub's listings a directory at a time,
+  // each hashed back to its id. Refused where `directory` is none.
+  getRepoTreeId(options: { repo: RepoName; sha: string; directory?: string }): Promise<string>
   // The gzipped tarball of a tree, the repo's own or any subdirectory's, by
   // its id, whole, in memory: GitHub's, its files under one top directory.
   // Its files are hashed back into git's tree and the id must be `tree`,
@@ -90,13 +94,19 @@ export interface Client {
   // has; that repo still gets a tree already cached, pointers and all.
   getRepoTreeTarball(options: { repo: RepoName; tree: string }): Promise<Uint8Array>
   // The repository's published security advisories, as GitHub's
-  // repository advisory objects. One page of 100: GitHub pages this list
-  // by cursor, so a repository with a full page is refused.
+  // repository advisory objects: every page of 100, each found by the
+  // cursor in the one before's Link header. More than 100 pages is an
+  // error.
   listRepoAdvisories(options: { repo: RepoName }): Promise<any[]>
-  // The entries of the directory at `path` in the full commit `sha`, or of
-  // its root, found as getRepoTreeId finds it: GitHub's listing, hashed
-  // back to the tree's id, so none is left out or changed.
-  listRepoDir(options: { repo: RepoName; sha: string; path?: string }): Promise<RepoDirEntry[]>
+  // The entries of `directory` in the full commit `sha`, or of its root,
+  // found as getRepoTreeId finds it: GitHub's listing, hashed back to the
+  // tree's id, so none is left out or changed.
+  listRepoDir(options: { repo: RepoName; sha: string; directory?: string }): Promise<RepoDirEntry[]>
+  // Every page of the repo's tags, as GitHub lists them, each with the
+  // commit GitHub names for it, an annotated tag's included, which
+  // getRepoTag checks is one; more than `maxPages` (100 by default) pages
+  // of 100 is an error, as is a tag with no commit.
+  listRepoTags(options: { repo: RepoName; maxPages?: number }): Promise<{ tag: string; oid: string }[]>
   // Every page of `GET /user/repos`, as GitHub's repository objects; more
   // than `maxPages` (100 by default) pages of 100 is an error.
   listUserRepos(options?: { maxPages?: number }): Promise<any[]>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@preventive/upstream",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.5",
   "description": "Minimal npm, crates.io and Soldeer registry clients, a GitHub client, and a git checkout reader: the calls we use, nothing more",
   "type": "module",
   "exports": {
@@ -42,6 +42,8 @@
     }
   },
   "files": [
+    "LICENSE-APACHE",
+    "LICENSE-MIT",
     "advisories.d.ts",
     "advisories.js",
     "cargo.d.ts",
@@ -68,7 +70,8 @@
     "src/advisories/repos.js",
     "src/args.js",
     "src/cache.js",
-    "src/cargo.js",
+    "src/cargo/crate.js",
+    "src/cargo/repos.js",
     "src/download.js",
     "src/git.js",
     "src/github/client.js",
@@ -80,6 +83,7 @@
     "src/package.js",
     "src/pool.js",
     "src/remote.js",
+    "src/semver-peer.cjs",
     "src/semver.js",
     "src/tree.js",
     "src/soldeer.js"
@@ -90,7 +94,7 @@
   "scripts": {
     "test": "node --test ./tests/*.test.js"
   },
-  "license": "MIT",
+  "license": "MIT OR Apache-2.0",
   "author": {
     "name": "Nikita Skovoroda",
     "email": "chalkerx@gmail.com",
@@ -107,5 +111,13 @@
   "homepage": "https://github.com/PreventiveMeasures/libraries/tree/main/upstream",
   "publishConfig": {
     "access": "public"
+  },
+  "peerDependencies": {
+    "semver": "^7.5.2"
+  },
+  "peerDependenciesMeta": {
+    "semver": {
+      "optional": true
+    }
   }
 }

package/semver.d.ts

@@ -1,7 +1,8 @@
 // Hand-written against semver.js; a change to either belongs with the other.
 
 // npm's own semver, borrowed from the npm beside node and passed through
-// as it is. Without it, every call throws, except valid() on a plain
+// as it is; where there is no npm, the `semver` package, an optional peer
+// dependency. Without either, every call throws, except valid() on a plain
 // MAJOR.MINOR.PATCH with no options.
 export function satisfies(version: string, range: string, options?: { includePrerelease?: boolean; loose?: boolean }): boolean
 export function compareVersions(a: string, b: string, options?: { loose?: boolean }): -1 | 0 | 1

package/src/advisories/common.js

@@ -1,5 +1,5 @@
 import { isStrings, matches } from '../args.js'
-import { satisfies, validRange } from '../semver.js'
+import { satisfies, valid, validRange } from '../semver.js'
 
 export const order = (a, b) => (a > b) - (a < b)
 
@@ -8,9 +8,13 @@ const SEMVER = { includePrerelease: true, loose: true }
 
 export const inRange = (version, range) => satisfies(version, range, SEMVER)
 
-// The asked versions a range `covers`. One semver cannot read covers them
-// all: a missed advisory is worse than a spare one.
-export const covered = (asked, range, covers = inRange) => (validRange(range, SEMVER) === null ? [...asked] : asked.filter((version) => covers(version, range)))
+// A version semver cannot read may be in any range. Whatever it reads is
+// a version, `v1.2.3` and `1.2.3+build` included.
+export const mayBeInRange = (version, range) => valid(version) === null || inRange(version, range)
+
+// The asked versions a range `covers`. One semver cannot read, range or
+// version, covers them all: a missed advisory is worse than a spare one.
+export const covered = (asked, range, covers = mayBeInRange) => (validRange(range, SEMVER) === null ? [...asked] : asked.filter((version) => covers(version, range)))
 
 // Remote text, as long as it is well-formed; anything else is refused as
 // malformed by whoever reads it.

package/src/advisories/github.js

@@ -1,11 +1,11 @@
 import assert from 'node:assert/strict'
 
-import { assertRepo, assertion, isGhsa, isRefName, isStrings } from '../args.js'
+import { assertRepo, assertSoldeerName, assertSoldeerVersion, assertion, isGhsa, isRefName, isStrings } from '../args.js'
 import { isGone } from '../github/client.js'
 import { recover } from '../http.js'
 import { pool } from '../pool.js'
-import { valid } from '../semver.js'
-import { covered, inRange, isText, metrics } from './common.js'
+import { covered, isText, mayBeInRange, metrics } from './common.js'
+import { soldeerRepos } from './repos.js'
 
 const REPOS_AT_ONCE = 4
 
@@ -59,6 +59,12 @@ async function repositoryAdvisories(github, asked, { repoOf, takes = () => true,
   return [...rows.values()]
 }
 
+// Each asked name's repository: as given, `known`, or else looked up.
+async function reposOf(asked, known, lookUp) {
+  const found = await lookUp([...asked.keys()].filter((name) => !known.has(name)))
+  return (name) => known.get(name) ?? found.get(name)
+}
+
 // A maintainer's advisory is on the repository before GitHub reviews it
 // into the databases the registries answer from. With `repoAdvisories`,
 // each package's repository, `known` or else looked up, adds what it
@@ -67,22 +73,32 @@ async function repositoryAdvisories(github, asked, { repoOf, takes = () => true,
 export async function withRepositories(rows, asked, { github, repoAdvisories, known }, { ecosystem, lookUp, covers }) {
   if (!repoAdvisories) return rows
   const reported = new Set(rows.flatMap((row) => [row.id, row.ghsa, ...row.aliases].filter(isGhsa).flatMap((id) => row.versions.map((version) => `${row.name} ${id} ${version}`))))
-  const found = await lookUp([...asked.keys()].filter((name) => !known.has(name)))
-  const repoOf = (name) => known.get(name) ?? found.get(name)
+  const repoOf = await reposOf(asked, known, lookUp)
   const takes = (name, pkg) => pkg?.ecosystem === ecosystem && pkg.name === name
   const added = await repositoryAdvisories(github, asked, { repoOf, takes, covers })
   return [...rows, ...added.map((row) => ({ ...row, versions: row.versions.filter((version) => !reported.has(`${row.name} ${row.id} ${version}`)) }))]
 }
 
 // stasis versions a repository with no version of its own by its branch,
-// or 0.0.0: every range covers those. Whatever semver reads is a version,
-// `v1.2.3` and `1.2.3+build` included.
-const coversPlaceholder = (version, range) => version === '0.0.0' || valid(version) === null || inRange(version, range)
+// or 0.0.0: every range covers those.
+const coversPlaceholder = (version, range) => version === '0.0.0' || mayBeInRange(version, range)
 
 // Dependencies that are GitHub repositories themselves: every range their
 // own published advisories list counts, whichever package it names.
 export const GITHUB = {
+  repositoryOnly: true,
   assertName: assertRepo,
   assertVersion: assertion('a version or a branch name', isRefName),
   advisories: (asked, { github }) => repositoryAdvisories(github, asked, { repoOf: (repo) => repo, covers: coversPlaceholder }),
 }
+
+// Soldeer packages, which no advisory database has: the repository each
+// is published from, as given or else as Soldeer's project names it, is
+// their only source, and every range its advisories list counts, whichever
+// package it names (often the npm package the same release went out as).
+export const SOLDEER = {
+  repositoryOnly: true,
+  assertName: assertSoldeerName,
+  assertVersion: assertSoldeerVersion,
+  advisories: async (asked, { github, known }) => await repositoryAdvisories(github, asked, { repoOf: await reposOf(asked, known, soldeerRepos) }),
+}

package/src/advisories/index.js

@@ -1,12 +1,12 @@
 import assert from 'node:assert/strict'
 
-import { assertArgs, assertBoolean, assertRepo, assertion, optional, sameName } from '../args.js'
+import { assertArgs, assertBoolean, assertRepo, assertion, isIterable, optional, sameName } from '../args.js'
 import { order } from './common.js'
-import { GITHUB, assertClient } from './github.js'
+import { GITHUB, SOLDEER, assertClient } from './github.js'
 import { NPM } from './npm.js'
 import { CARGO, COMPOSER } from './osv.js'
 
-const ECOSYSTEMS = { npm: NPM, cargo: CARGO, composer: COMPOSER, github: GITHUB }
+const ECOSYSTEMS = { npm: NPM, cargo: CARGO, composer: COMPOSER, soldeer: SOLDEER, github: GITHUB }
 const byNumbers = new Intl.Collator('en', { numeric: true }).compare
 const assertEcosystem = assertion(`one of ${Object.keys(ECOSYSTEMS).join(', ')}`, (value) => typeof value === 'string' && Object.hasOwn(ECOSYSTEMS, value))
 const assertVersions = assertion('a non-empty array', (value) => Array.isArray(value) && value.length > 0)
@@ -14,7 +14,7 @@ const assertVersions = assertion('a non-empty array', (value) => Array.isArray(v
 // Ecosystem → name → { versions, github? }, a name given twice merged.
 // Every package is checked before any is used.
 function collect(packages) {
-  assert.ok(typeof packages?.[Symbol.iterator] === 'function' && typeof packages !== 'string', 'advisories: packages must be an iterable of { ecosystem, name, github?, versions }')
+  assert.ok(isIterable(packages), 'advisories: packages must be an iterable of { ecosystem, name, github?, versions }')
   const byEcosystem = new Map()
   for (const pkg of packages) {
     assertArgs('advisories', pkg, { ecosystem: assertEcosystem, name: null, github: optional(assertRepo), versions: assertVersions }, 'package')
@@ -37,7 +37,7 @@ export async function advisories(packages, options = {}) {
   assertArgs('advisories', options, { github: optional(assertClient), repoAdvisories: optional(assertBoolean) })
   assert.ok(!options.repoAdvisories || options.github, 'advisories: repoAdvisories needs a github client')
   const byEcosystem = collect(packages)
-  assert.ok(!byEcosystem.has('github') || options.github, 'advisories: github packages need a github client')
+  for (const ecosystem of byEcosystem.keys()) assert.ok(!ECOSYSTEMS[ecosystem].repositoryOnly || options.github, `advisories: ${ecosystem} packages need a github client`)
   const found = await Promise.all([...byEcosystem].map(async ([ecosystem, named]) => {
     const { compare = byNumbers, advisories: find } = ECOSYSTEMS[ecosystem]
     const names = [...named.keys()].toSorted()