feat(filter)!: replace glob with regex

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 20.15.0
+          node-version: 22.20.0
 
       - run: npm ci
       - run: npm test

src/lib/cli-options.ts

@@ -38,7 +38,7 @@ export function getCliOptions() {
     )
     .option(
       "--filter <FILTER>",
-      "filter packages by wildcard pattern matching from package.json file",
+      "filter packages by regex pattern matching from package.json file",
     )
     .option(
       "--warn-days <NUMBER>",
@@ -62,8 +62,8 @@ export function getCliOptions() {
 Examples:
   $ npm-check-last-publish --sort name --order asc
   $ npm-check-last-publish --sort average
-  $ npm-check-last-publish --filter "@types/*"
-  $ npm-check-last-publish --filter "react-*"
+  $ npm-check-last-publish --filter @types
+  $ npm-check-last-publish --filter "^react.*s$"
   $ npm-check-last-publish --warn-days 60 --error-days 120
   $ npm-check-last-publish --output json > report.json
   $ npm-check-last-publish --output csv > report.csv

src/lib/expand-package-patterns.ts

@@ -1,14 +1,10 @@
-import { globRegex } from "./glob-regex.ts";
-
 export function expandPackagePatterns(
   pattern: string,
   allNames: string[],
 ): string[] {
-  if (!pattern.includes("*")) return [pattern];
-
-  const regex = globRegex(pattern);
   const matched = allNames.filter((pkg) => {
-    return regex.test(pkg);
+    return new RegExp(pattern).test(pkg);
   });
+
   return [...new Set(matched)];
 }

src/lib/fetch-packages.ts

@@ -1,76 +1,37 @@
-import { styleText } from "node:util";
-import type { PackagePublishInfo } from "../types.ts";
 import { expandPackagePatterns } from "./expand-package-patterns.ts";
-import { getPackagePublishDate } from "./get-package-publish-date.ts";
-import { progressBar } from "./progress-bar.ts";
 import { readPackageJson } from "./read-package-json.ts";
 
-type PackageInfoResult = {
-  results: (PackagePublishInfo | null)[];
-  errors: { package: string; error: Error }[];
-};
+export class NoPackageFoundError extends Error {
+  constructor() {
+    super("No packages found to check.");
+    this.name = "NoPackageFoundError";
+  }
+}
 
 export async function fetchPackageInfoList(
   inputPackages: string[],
   filter: string,
-): Promise<PackageInfoResult> {
+): Promise<string[]> {
   let packagesToCheck: string[];
 
   const shouldReadFromPackage = inputPackages.length === 0 || filter;
   if (shouldReadFromPackage) {
-    try {
-      const packageJSON = await readPackageJson();
-      const allDependencies = {
-        ...packageJSON.dependencies,
-        ...packageJSON.devDependencies,
-      };
-      packagesToCheck = Object.keys(allDependencies);
-      packagesToCheck = filter
-        ? expandPackagePatterns(filter, packagesToCheck)
-        : packagesToCheck;
-    } catch (e) {
-      if (e instanceof Error && e.message === "FILE_NOT_FOUND") {
-        console.error(
-          styleText(
-            "redBright",
-            `[ERROR]: Cannot find ${styleText(
-              "bold",
-              "package.json",
-            )}. Please ensure that the file exists in your current working directory. \n`,
-          ),
-        );
-        process.exit(1);
-      }
-
-      throw e;
-    }
+    const packageJSON = await readPackageJson();
+    const allDependencies = {
+      ...packageJSON.dependencies,
+      ...packageJSON.devDependencies,
+    };
+    packagesToCheck = Object.keys(allDependencies);
+    packagesToCheck = filter
+      ? expandPackagePatterns(filter, packagesToCheck)
+      : packagesToCheck;
   } else {
     packagesToCheck = inputPackages.map((p) => p.toLowerCase());
   }
 
   if (packagesToCheck.length === 0) {
-    throw new Error("No matching packages found for given patterns.");
-  }
-
-  const errors: { package: string; error: Error }[] = [];
-  const results: (PackagePublishInfo | null)[] = [];
-
-  progressBar.start(packagesToCheck.length, 0);
-
-  for (const pkgName of packagesToCheck) {
-    try {
-      const info = await getPackagePublishDate(pkgName);
-      results.push(info);
-    } catch (err) {
-      const message =
-        err instanceof Error ? err.message.split("\n")[0] : String(err);
-      errors.push({ package: pkgName, error: new Error(message) });
-      results.push(null);
-    }
-    progressBar.increment();
+    throw new NoPackageFoundError();
   }
 
-  progressBar.stop();
-
-  return { results, errors };
+  return packagesToCheck;
 }

src/lib/format-package-info.ts

@@ -1,18 +1,23 @@
-import type { PackageInfo, PackagePublishInfo, Thresholds } from "../types.ts";
+import { errorPackageInfo, type PackageInfo } from "../models/package-info.ts";
+import type { PackagePublishInfo } from "../models/package-publish-info.ts";
+import type { Thresholds } from "../types.ts";
 import { getAveragePublishDays } from "./get-average-publish-days.ts";
 import { getColorArea } from "./get-color-area.ts";
 
 interface FormatPackageOptions {
-  pkg: PackagePublishInfo;
+  publishInfo: PackagePublishInfo;
   thresholds: Thresholds;
 }
 
 export function formatPackageInfo({
-  pkg,
+  publishInfo,
   thresholds,
 }: FormatPackageOptions): PackageInfo {
+  if (publishInfo.tag === "Error")
+    return errorPackageInfo(publishInfo.packageName);
+
   const { packageName, packagePublishDate, packageVersion, publishedTimes } =
-    pkg;
+    publishInfo;
 
   const averagePublishDays = getAveragePublishDays(publishedTimes);
 

src/lib/get-package-publish-date.ts

@@ -1,15 +1,18 @@
+import type { PackagePublishInfo } from "../models/package-publish-info.ts";
 import { getPackageVersionsDetail } from "./get-package-versions-detail.ts";
 
-export const getPackagePublishDate = async (packageName: string) => {
-  try {
-    const { packageVersion, publishedTimes } =
-      await getPackageVersionsDetail(packageName);
-    const packagePublishDate = new Date(publishedTimes[packageVersion]);
-    return { packagePublishDate, packageVersion, packageName, publishedTimes };
-  } catch (error: unknown) {
-    const e = error as Error;
-    throw new Error(
-      `Failed to fetch package info for "${packageName}": ${e.message}`,
-    );
-  }
+export const getPackagePublishDate = async (
+  packageName: string,
+): Promise<PackagePublishInfo> => {
+  const { packageVersion, publishedTimes } =
+    await getPackageVersionsDetail(packageName);
+  const packagePublishDate = new Date(publishedTimes[packageVersion]);
+
+  return {
+    tag: "OK",
+    packagePublishDate,
+    packageVersion,
+    packageName,
+    publishedTimes,
+  };
 };

src/lib/get-package-versions-detail.ts

@@ -8,13 +8,28 @@ type PackageVersionsDetail = {
 
 const execPromise = util.promisify(exec);
 
+export class PackageNotFoundError extends Error {
+  public packageName: string;
+
+  constructor(packageName: string) {
+    super(`Package "${packageName}" not found on npm registry.`);
+    this.name = "PackageNotFoundError";
+    this.packageName = packageName;
+  }
+}
+
 export const getPackageVersionsDetail = async (packageName: string) => {
-  const { stdout: packageInfoStdout } = await execPromise(
-    `npm view ${packageName} time version --json`,
-  );
-  const packageInfo: PackageVersionsDetail = JSON.parse(packageInfoStdout);
-  return {
-    packageVersion: packageInfo.version,
-    publishedTimes: packageInfo.time,
-  };
+  try {
+    const { stdout: packageInfoStdout } = await execPromise(
+      `npm view ${packageName} time version --json`,
+    );
+
+    const packageInfo: PackageVersionsDetail = JSON.parse(packageInfoStdout);
+    return {
+      packageVersion: packageInfo.version,
+      publishedTimes: packageInfo.time,
+    };
+  } catch {
+    throw new PackageNotFoundError(packageName);
+  }
 };

src/lib/sort-packages.ts

@@ -1,4 +1,5 @@
-import type { PackageInfo, SortBy, SortOrder } from "../types.js";
+import type { PackageInfo } from "../models/package-info.ts";
+import type { SortBy, SortOrder } from "../types.js";
 
 export function sortPackages(
   list: PackageInfo[],
@@ -13,9 +14,26 @@ export function sortPackages(
         result = a.name.localeCompare(b.name);
         break;
       case "average":
+        if (a.averagePublishDays == null) {
+          result = -1;
+          break;
+        }
+        if (b.averagePublishDays == null) {
+          result = 1;
+          break;
+        }
+
         result = a.averagePublishDays - b.averagePublishDays;
         break;
       default:
+        if (a.date == null) {
+          result = -1;
+          break;
+        }
+        if (b.date == null) {
+          result = 1;
+          break;
+        }
         result = a.date.getTime() - b.date.getTime();
     }