@staff0rd/assist 0.1069.2 → 0.1069.4

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.
package/dist/index.js CHANGED
@@ -6,7 +6,7 @@ import { Command } from "commander";
6
6
  // package.json
7
7
  var package_default = {
8
8
  name: "@staff0rd/assist",
9
- version: "0.1069.2",
9
+ version: "0.1069.4",
10
10
  type: "module",
11
11
  main: "dist/index.js",
12
12
  bin: {
@@ -27235,11 +27235,16 @@ import chalk163 from "chalk";
27235
27235
  // src/commands/devlog/resolveVersionSource.ts
27236
27236
  import { execFileSync as execFileSync8 } from "child_process";
27237
27237
 
27238
- // src/commands/devlog/earliestSemverTag.ts
27238
+ // src/commands/devlog/sortedSemverVersions.ts
27239
27239
  import semver2 from "semver";
27240
+ function sortedSemverVersions(tags) {
27241
+ return tags.map((tag) => semver2.clean(tag)).filter((v) => v !== null).sort(semver2.compare);
27242
+ }
27243
+
27244
+ // src/commands/devlog/earliestSemverTag.ts
27240
27245
  function earliestSemverTag(tags) {
27241
- const versions = tags.map((tag) => semver2.clean(tag)).filter((v) => v !== null).sort(semver2.compare);
27242
- return versions.length > 0 ? `v${versions[0]}` : null;
27246
+ const earliest2 = sortedSemverVersions(tags).at(0);
27247
+ return earliest2 ? `v${earliest2}` : null;
27243
27248
  }
27244
27249
 
27245
27250
  // src/commands/devlog/getVersionAtCommit.ts
@@ -27266,18 +27271,38 @@ function isPackageVersionStale(packageVersion, tags) {
27266
27271
  return current2 === null || semver3.lt(current2, latest2);
27267
27272
  }
27268
27273
 
27274
+ // src/commands/devlog/latestSemverTag.ts
27275
+ function latestSemverTag(tags) {
27276
+ const latest2 = sortedSemverVersions(tags).at(-1);
27277
+ return latest2 ? `v${latest2}` : null;
27278
+ }
27279
+
27280
+ // src/commands/devlog/stripToMinor.ts
27281
+ import semver4 from "semver";
27282
+ function stripToMinor(version2) {
27283
+ const parsed = semver4.parse(semver4.coerce(version2));
27284
+ return parsed ? `v${parsed.major}.${parsed.minor}` : `v${version2}`;
27285
+ }
27286
+
27269
27287
  // src/commands/devlog/resolveVersionSource.ts
27270
27288
  function gitTags(...args) {
27271
27289
  return execFileSync8("git", ["tag", "--list", ...args], { encoding: "utf8" }).split("\n").map((t) => t.trim()).filter(Boolean);
27272
27290
  }
27273
27291
  function resolveVersionSource() {
27274
- if (isPackageVersionStale(getVersionAtCommit("HEAD"), gitTags())) {
27292
+ const headVersion = getVersionAtCommit("HEAD");
27293
+ const mergedTags = gitTags("--merged", "HEAD");
27294
+ if (isPackageVersionStale(headVersion, mergedTags)) {
27275
27295
  return {
27276
27296
  kind: "tags",
27277
- versionAt: (hash) => earliestSemverTag(gitTags("--contains", hash))
27297
+ versionAt: (hash) => earliestSemverTag(gitTags("--contains", hash)),
27298
+ current: () => latestSemverTag(mergedTags)
27278
27299
  };
27279
27300
  }
27280
- return { kind: "package", versionAt: getVersionAtCommit };
27301
+ return {
27302
+ kind: "package",
27303
+ versionAt: getVersionAtCommit,
27304
+ current: () => headVersion ? stripToMinor(headVersion) : null
27305
+ };
27281
27306
  }
27282
27307
 
27283
27308
  // src/commands/devlog/next/repoHasTags.ts
@@ -27287,13 +27312,6 @@ function repoHasTags() {
27287
27312
  return output.trim().length > 0;
27288
27313
  }
27289
27314
 
27290
- // src/commands/devlog/stripToMinor.ts
27291
- import semver4 from "semver";
27292
- function stripToMinor(version2) {
27293
- const parsed = semver4.parse(semver4.coerce(version2));
27294
- return parsed ? `v${parsed.major}.${parsed.minor}` : `v${version2}`;
27295
- }
27296
-
27297
27315
  // src/commands/devlog/next/withVersions.ts
27298
27316
  function withVersions(commits2, source, hasTags) {
27299
27317
  const raw = commits2.map((commit2) => source.versionAt(commit2.hash));
@@ -27647,12 +27665,6 @@ import chalk167 from "chalk";
27647
27665
  function printField2(label, value) {
27648
27666
  console.log(`${chalk167.bold(`${label}:`)} ${value ?? chalk167.dim("none")}`);
27649
27667
  }
27650
- function currentVersion() {
27651
- const source = resolveVersionSource();
27652
- const version2 = source.versionAt("HEAD");
27653
- if (!version2) return null;
27654
- return source.kind === "tags" ? version2 : stripToMinor(version2);
27655
- }
27656
27668
  function version() {
27657
27669
  const devDir = resolveDevDir();
27658
27670
  const name = getRepoName();
@@ -27661,7 +27673,7 @@ function version() {
27661
27673
  printField2("name", name);
27662
27674
  printField2("last week", lastWeek);
27663
27675
  printField2("last version", entry?.lastVersion);
27664
- printField2("current", currentVersion());
27676
+ printField2("current", resolveVersionSource().current());
27665
27677
  }
27666
27678
 
27667
27679
  // src/commands/registerDevlog.ts
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@staff0rd/assist",
3
- "version": "0.1069.2",
3
+ "version": "0.1069.4",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "bin": {