@zenfs/devel 1.2.2 → 1.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,9 +4,10 @@ import { Argument, Command, Option } from 'commander';
4
4
  import { existsSync } from 'node:fs';
5
5
  import { text } from 'node:stream/consumers';
6
6
  import { styleText } from 'node:util';
7
+ import * as semver from 'semver';
7
8
  import { configPath, saveRepo, savedRepo } from '../node_compat/config.js';
8
9
  import * as core from '../node_compat/index.js';
9
- import { displayPath, formatMark, pad, parseIntegers, parseList, parsePositiveInteger, parseRegex, printFields, printPRTable, semverStyles, statusStyles, } from '../node_compat/output.js';
10
+ import { displayPath, formatMark, pad, parseIntegers, parseList, parsePositiveInteger, parseRegex, parseVersion, printFields, printPRTable, semverStyles, statusStyles, } from '../node_compat/output.js';
10
11
  const statuses = Object.keys(statusStyles);
11
12
  const semvers = Object.keys(semverStyles);
12
13
  const tags = ['native', 'internal', 'docs', 'test', 'windows', 'perf', 'stability', 'deprecation', 'revert', 'backport'];
@@ -18,7 +19,7 @@ const cli = new Command('node-compat')
18
19
  .option('--ref <ref>', 'Ref to read from (default: upstream of main, or HEAD)')
19
20
  .option('--state <file>', 'Marks file', core.defaultMarksPath)
20
21
  .addHelpText('after', `\nThe first clone used is saved to ${displayPath(configPath)}.`);
21
- const sinceOption = new Option('--since <version>', 'Released in this version or later, or unreleased').default('4');
22
+ const sinceOption = new Option('--since <version>', 'Released in this version or later, or unreleased').argParser(parseVersion).default('4');
22
23
  /**
23
24
  * Loads the Node.js clone and marks, saving the clone if it is the first one used.
24
25
  */
@@ -34,7 +35,7 @@ function load(createMarks = false) {
34
35
  node = new core.NodeRepository({ repo, ref: options.ref });
35
36
  }
36
37
  catch (error) {
37
- return cli.error(`error: ${error instanceof Error ? error.message : String(error)}`);
38
+ return cli.error(`error: ${Error.isError(error) ? error.message : String(error)}`);
38
39
  }
39
40
  if (node.path != saved && (!saved || options.persist)) {
40
41
  saveRepo(node.path);
@@ -42,8 +43,10 @@ function load(createMarks = false) {
42
43
  }
43
44
  return { node, marks, analysis: new core.Analysis(node, marks) };
44
45
  }
45
- function sinceFilter(node, since) {
46
- return { since, landedSince: node.releaseDate(since) };
46
+ function sinceFilter(node, since, includePrerelease = true) {
47
+ const opt = { includePrerelease };
48
+ const version = semver.minVersion(since, opt)?.version ?? cli.error(`error: No version matches ${since}.`);
49
+ return { since: version, landedSince: node.releaseDate(version) };
47
50
  }
48
51
  cli.command('summary', { isDefault: true })
49
52
  .description('Overview of PRs, API coverage, and pending features')
@@ -65,8 +68,8 @@ cli.command('summary', { isDefault: true })
65
68
  console.log(styleText('bold', 'ZenFS'.padEnd(9)), core.zenfs.version);
66
69
  console.log(styleText('bold', 'Marks'.padEnd(9)), `${marks.size} in ${displayPath(cli.opts().state)}\n`);
67
70
  console.log(styleText('bold', since == '4' ? 'PRs' : `PRs since ${since}`), styleText('dim', `(${prs.length})`));
68
- for (const semver of semvers) {
69
- const group = counts[semver];
71
+ for (const bump of semvers) {
72
+ const group = counts[bump];
70
73
  if (!group)
71
74
  continue;
72
75
  const total = Object.values(group).reduce((sum, count) => sum + count, 0);
@@ -74,7 +77,7 @@ cli.command('summary', { isDefault: true })
74
77
  .filter(status => group[status])
75
78
  .map(status => styleText(statusStyles[status], `${group[status]} ${status}`))
76
79
  .join(', ');
77
- console.log(' ', pad(styleText(semverStyles[semver], semver), 11), String(total).padStart(4), ' ', breakdown);
80
+ console.log(' ', pad(styleText(semverStyles[bump], bump), 11), String(total).padStart(4), ' ', breakdown);
78
81
  }
79
82
  const compatPercent = Math.floor((present / apis.length) * 100);
80
83
  console.log(styleText('bold', '\nAPI compatibility:'), present + '/' + apis.length, `(${styleText(['bold', compatPercent == 100 ? 'green' : 'yellow'], compatPercent + '%')})`);
@@ -35,7 +35,7 @@ export default function makeIndex(root = '.', options = {}) {
35
35
  }
36
36
  }
37
37
  catch (e) {
38
- const error = e instanceof Error ? e : new Error(String(e));
38
+ const error = Error.isError(e) ? e : new Error(String(e));
39
39
  if (!options.onError)
40
40
  throw error;
41
41
  options.onError(path, error);
@@ -1,4 +1,5 @@
1
- import { compareVersions, isVersion } from './versions.js';
1
+ // SPDX-License-Identifier: LGPL-3.0-or-later
2
+ import * as semver from 'semver';
2
3
  import * as zenfs from './zenfs.js';
3
4
  /**
4
5
  * Combines Node.js data, the ZenFS probe, and manual marks.
@@ -31,7 +32,7 @@ export class Analysis {
31
32
  return [...prs].filter(({ pr, status }) => {
32
33
  if (filter.unreleased && pr.releases.length)
33
34
  return false;
34
- if (since && pr.releases.length && !pr.releases.some(release => compareVersions(release.version, since) >= 0))
35
+ if (since && pr.releases.length && !pr.releases.some(release => semver.gte(release.version, since)))
35
36
  return false;
36
37
  if (landedSince && !pr.releases.length && (pr.commits[0]?.date ?? '') < landedSince)
37
38
  return false;
@@ -61,7 +62,7 @@ export class Analysis {
61
62
  return;
62
63
  const prs = [...this.prs.values()].filter(({ pr }) => this.node.releaseIncludes(release.version, pr.releases.map(release => release.version)));
63
64
  const apis = [...this.apis.values()].filter(({ api }) => {
64
- const added = api.added.filter(isVersion);
65
+ const added = api.added.filter(version => semver.valid(version));
65
66
  return (!added.length || this.node.releaseIncludes(release.version, added)) && !this.node.releaseIncludes(release.version, api.removed);
66
67
  });
67
68
  const pending = prs.filter(({ status }) => status == 'pending');
@@ -74,7 +75,7 @@ export class Analysis {
74
75
  */
75
76
  lastComplete(latest) {
76
77
  for (const { version } of this.node.releases) {
77
- if (latest && compareVersions(version, latest) > 0)
78
+ if (latest && semver.gt(version, latest))
78
79
  continue;
79
80
  const coverage = this.coverage(version);
80
81
  if (coverage?.complete)
@@ -1,5 +1,6 @@
1
- import { parseVersion } from './versions.js';
2
- const releaseHeading = /^## (?<date>\d{4}-\d{2}-\d{2}), Version (?<version>\d+\.\d+\.\d+)/;
1
+ // SPDX-License-Identifier: LGPL-3.0-or-later
2
+ import * as semver from 'semver';
3
+ const releaseHeading = /^## (?<date>\d{4}-\d{2}-\d{2}), Version (?<version>\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?)/;
3
4
  const changelogLine = /^\* \\\[\[`(?<commit>[0-9a-f]+)`\]\([^)]*\)\] - (?<rest>.+?)\s*\[#(?<pr>\d+)\]\(https:\/\/github\.com\/nodejs\/node\/pull\/\d+\)\s*$/;
4
5
  /**
5
6
  * Parses the commit lines of a changelog, including the duplicates listed under notable changes.
@@ -11,19 +12,19 @@ export function parse(text) {
11
12
  const heading = releaseHeading.exec(line);
12
13
  if (heading?.groups) {
13
14
  const { date, version } = heading.groups;
14
- release = { version, line: parseVersion(version)[0], date };
15
+ release = { version, line: semver.major(version), date };
15
16
  continue;
16
17
  }
17
18
  const match = release && changelogLine.exec(line);
18
19
  if (!release || !match?.groups)
19
20
  continue;
20
21
  let rest = match.groups.rest;
21
- let semver = 'patch';
22
+ let bump = 'patch';
22
23
  for (let tag; (tag = /^\*\*\((?<tag>[^)]+)\)\*\*\s*/.exec(rest)); rest = rest.slice(tag[0].length)) {
23
24
  if (tag.groups?.tag == 'SEMVER-MAJOR')
24
- semver = 'major';
25
- if (tag.groups?.tag == 'SEMVER-MINOR' && semver != 'major')
26
- semver = 'minor';
25
+ bump = 'major';
26
+ if (tag.groups?.tag == 'SEMVER-MINOR' && bump != 'major')
27
+ bump = 'minor';
27
28
  }
28
29
  const revert = /^_\*\*Revert\*\*_ "/.test(rest);
29
30
  if (revert)
@@ -46,7 +47,7 @@ export function parse(text) {
46
47
  subsystems: subject.groups.subsystems.split(',').map(name => name.trim()),
47
48
  title,
48
49
  author,
49
- semver,
50
+ semver: bump,
50
51
  revert,
51
52
  release,
52
53
  });
@@ -6,5 +6,4 @@ export * from './git.js';
6
6
  export * from './node.js';
7
7
  export * from './pr.js';
8
8
  export * from './state.js';
9
- export * from './versions.js';
10
9
  export * as zenfs from './zenfs.js';
@@ -7,5 +7,4 @@ export * from './git.js';
7
7
  export * from './node.js';
8
8
  export * from './pr.js';
9
9
  export * from './state.js';
10
- export * from './versions.js';
11
10
  export * as zenfs from './zenfs.js';
@@ -4,7 +4,7 @@ import { matchesSubsystem, readApiHistory, readCommits } from './commits.js';
4
4
  import * as docs from './docs.js';
5
5
  import { Repository } from './git.js';
6
6
  import { PR } from './pr.js';
7
- import { compareVersions, isVersion, parseVersion } from './versions.js';
7
+ import * as semver from 'semver';
8
8
  export class NodeRepository extends Repository {
9
9
  prs = new Map();
10
10
  apis = new Map();
@@ -45,7 +45,7 @@ export class NodeRepository extends Repository {
45
45
  pr.apis.changed.push(api.id);
46
46
  }
47
47
  }
48
- this.releases = [...releases.values()].sort((left, right) => compareVersions(right.version, left.version));
48
+ this.releases = [...releases.values()].sort((left, right) => semver.rcompare(left.version, right.version));
49
49
  for (const release of this.releases.toReversed()) {
50
50
  this.releaseDates.set(release.version, release.date);
51
51
  if (!this.lineStarts.has(release.line))
@@ -61,17 +61,18 @@ export class NodeRepository extends Repository {
61
61
  * @param versions Versions, optionally prefixed with `v`
62
62
  */
63
63
  releaseIncludes(target, versions) {
64
- const [line] = parseVersion(target);
64
+ const line = semver.major(target);
65
65
  const lineStart = this.lineStarts.get(line);
66
- return versions.some(version => {
67
- if (!isVersion(version))
66
+ return versions.some(input => {
67
+ const version = semver.valid(input);
68
+ if (!version)
68
69
  return false;
69
- const [major] = parseVersion(version);
70
+ const major = semver.major(version);
70
71
  if (major == line)
71
- return compareVersions(version, target) <= 0;
72
+ return semver.lte(version, target);
72
73
  if (major > line || !lineStart)
73
74
  return false;
74
- const date = this.releaseDates.get(version.replace(/^v/, ''));
75
+ const date = this.releaseDates.get(version);
75
76
  return !date || date <= lineStart;
76
77
  });
77
78
  }
@@ -79,7 +80,7 @@ export class NodeRepository extends Repository {
79
80
  * Date of the first release at or after a version.
80
81
  */
81
82
  releaseDate(version) {
82
- return this.releases.filter(release => compareVersions(release.version, version) >= 0).at(-1)?.date;
83
+ return this.releases.filter(release => semver.gte(release.version, version)).at(-1)?.date;
83
84
  }
84
85
  /**
85
86
  * Resolves a PR number, `#number`, PR URL, or case-insensitive API ID.
@@ -10,6 +10,7 @@ export declare const semverStyles: Record<PR['semver'], InspectColor>;
10
10
  */
11
11
  export declare function parseList<const T extends string = string>(choices?: readonly T[]): (value: string, previous: T[] | undefined) => T[];
12
12
  export declare function parseIntegers(value: string, previous: number[] | undefined): number[];
13
+ export declare function parseVersion(value: string): string;
13
14
  export declare function parsePositiveInteger(value: string): number;
14
15
  /**
15
16
  * Compiles a case-insensitive pattern.
@@ -2,6 +2,7 @@
2
2
  import { InvalidArgumentError } from 'commander';
3
3
  import { homedir } from 'node:os';
4
4
  import { relative } from 'node:path';
5
+ import * as semver from 'semver';
5
6
  import { stripVTControlCharacters, styleText } from 'node:util';
6
7
  export function displayPath(path) {
7
8
  const fromCwd = relative(process.cwd(), path);
@@ -33,6 +34,11 @@ export function parseIntegers(value, previous) {
33
34
  throw new InvalidArgumentError('Expected integers.');
34
35
  return [...(previous ?? []), ...numbers];
35
36
  }
37
+ export function parseVersion(value) {
38
+ if (!semver.validRange(value))
39
+ throw new InvalidArgumentError('Expected a version.');
40
+ return value;
41
+ }
36
42
  export function parsePositiveInteger(value) {
37
43
  const number = Number(value);
38
44
  if (!Number.isSafeInteger(number) || number < 1)
@@ -1,5 +1,5 @@
1
1
  import { parseSubject } from './commits.js';
2
- import { compareVersions } from './versions.js';
2
+ import * as semver from 'semver';
3
3
  export class PR {
4
4
  number;
5
5
  title = '';
@@ -84,7 +84,7 @@ export class PR {
84
84
  addRelease(entry) {
85
85
  if (!this.releases.some(release => release.version == entry.release.version)) {
86
86
  this.releases.push(entry.release);
87
- this.releases.sort((left, right) => compareVersions(left.version, right.version));
87
+ this.releases.sort((left, right) => semver.compare(left.version, right.version));
88
88
  }
89
89
  if (this.semver == 'unreleased' || entry.semver == 'major' || (entry.semver == 'minor' && this.semver == 'patch'))
90
90
  this.semver = entry.semver;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zenfs/devel",
3
- "version": "1.2.2",
3
+ "version": "1.2.3",
4
4
  "description": "Tooling for developing ZenFS packages",
5
5
  "funding": {
6
6
  "type": "individual",
@@ -66,6 +66,7 @@
66
66
  "commander": "^15.0.0",
67
67
  "globals": "^17.3.0",
68
68
  "kerium": "^1.5.0",
69
+ "semver": "^7.8.6",
69
70
  "typescript-eslint": "^8.58.0",
70
71
  "utilium": "^3.11.0"
71
72
  },
@@ -81,7 +82,8 @@
81
82
  "devDependencies": {
82
83
  "@commander-js/extra-typings": "^15.0.0",
83
84
  "@types/node": "^26.0.0",
84
- "@zenfs/core": "^2.8.0",
85
+ "@types/semver": "^7.8.0",
86
+ "@zenfs/core": "^2.9.0",
85
87
  "eslint": "^10.1.0",
86
88
  "prettier": "^3.2.5",
87
89
  "typescript": "^6.0.0"
@@ -1,9 +0,0 @@
1
- /**
2
- * @param version A full or partial version, optionally prefixed with `v`
3
- */
4
- export declare function parseVersion(version: string): [major: number, minor: number, patch: number];
5
- /**
6
- * Whether `version` is a full version, optionally prefixed with `v`, rather than a placeholder like `REPLACEME`
7
- */
8
- export declare function isVersion(version: string): boolean;
9
- export declare function compareVersions(left: string, right: string): number;
@@ -1,19 +0,0 @@
1
- // SPDX-License-Identifier: LGPL-3.0-or-later
2
- /**
3
- * @param version A full or partial version, optionally prefixed with `v`
4
- */
5
- export function parseVersion(version) {
6
- const [major = 0, minor = 0, patch = 0] = version.replace(/^v/, '').split('.').map(Number);
7
- return [major, minor, patch];
8
- }
9
- /**
10
- * Whether `version` is a full version, optionally prefixed with `v`, rather than a placeholder like `REPLACEME`
11
- */
12
- export function isVersion(version) {
13
- return /^v?\d+\.\d+\.\d+$/.test(version);
14
- }
15
- export function compareVersions(left, right) {
16
- const [leftMajor, leftMinor, leftPatch] = parseVersion(left);
17
- const [rightMajor, rightMinor, rightPatch] = parseVersion(right);
18
- return leftMajor - rightMajor || leftMinor - rightMinor || leftPatch - rightPatch;
19
- }