@herodevs/cli 1.5.0-beta.1 → 1.5.0-beta.2

package/README.md

@@ -16,7 +16,7 @@ $ npm install -g @herodevs/cli
 $ hd COMMAND
 running command...
 $ hd (--version)
-@herodevs/cli/1.5.0-beta.1 linux-x64 node-v22.14.0
+@herodevs/cli/1.5.0-beta.2 linux-x64 node-v22.14.0
 $ hd --help [COMMAND]
 USAGE
   $ hd COMMAND
@@ -81,7 +81,7 @@ EXAMPLES
   $ hd report committers --csv
 ```
 
-_See code: [src/commands/report/committers.ts](https://github.com/herodevs/cli/blob/v1.5.0-beta.1/src/commands/report/committers.ts)_
+_See code: [src/commands/report/committers.ts](https://github.com/herodevs/cli/blob/v1.5.0-beta.2/src/commands/report/committers.ts)_
 
 ## `hd report purls`
 
@@ -115,7 +115,7 @@ EXAMPLES
   $ hd report purls --save --csv
 ```
 
-_See code: [src/commands/report/purls.ts](https://github.com/herodevs/cli/blob/v1.5.0-beta.1/src/commands/report/purls.ts)_
+_See code: [src/commands/report/purls.ts](https://github.com/herodevs/cli/blob/v1.5.0-beta.2/src/commands/report/purls.ts)_
 
 ## `hd scan eol`
 
@@ -149,7 +149,7 @@ EXAMPLES
   $ hd scan eol -a --dir=./my-project
 ```
 
-_See code: [src/commands/scan/eol.ts](https://github.com/herodevs/cli/blob/v1.5.0-beta.1/src/commands/scan/eol.ts)_
+_See code: [src/commands/scan/eol.ts](https://github.com/herodevs/cli/blob/v1.5.0-beta.2/src/commands/scan/eol.ts)_
 
 ## `hd scan sbom`
 
@@ -177,7 +177,7 @@ EXAMPLES
   $ hd scan sbom --file=path/to/sbom.json
 ```
 
-_See code: [src/commands/scan/sbom.ts](https://github.com/herodevs/cli/blob/v1.5.0-beta.1/src/commands/scan/sbom.ts)_
+_See code: [src/commands/scan/sbom.ts](https://github.com/herodevs/cli/blob/v1.5.0-beta.2/src/commands/scan/sbom.ts)_
 
 ## `hd update [CHANNEL]`
 

package/bin/dev.js

@@ -8,4 +8,7 @@ process.env.GRAPHQL_HOST = 'http://localhost:3000';
 // Dev
 // process.env.GRAPHQL_HOST = 'https://api.dev.nes.herodevs.com';
 
+// Prod
+// process.env.GRAPHQL_HOST = 'https://api.nes.herodevs.com';
+
 await execute({ development: true, dir: import.meta.url });

package/dist/api/queries/nes/sbom.js

@@ -13,8 +13,7 @@ export const M_SCAN = {
                 eolAt
                 daysEol
                 status
-                # TODO: uncomment vulnCount once backend changes are deployed 
-                # vulnCount
+                vulnCount
               }
             }
             diagnostics

package/dist/service/eol/eol.svc.d.ts

@@ -1,3 +1,4 @@
+import type { PackageURL } from 'packageurl-js';
 import { type Sbom } from './cdx.svc.ts';
 export interface CdxGenOptions {
     projectType?: string[];
@@ -10,3 +11,4 @@ export type CdxCreator = (dir: string, opts: CdxGenOptions) => Promise<{
 }>;
 export declare function createSbom(directory: string, opts?: ScanOptions): Promise<any>;
 export declare function validateIsCycloneDxSbom(sbom: unknown): asserts sbom is Sbom;
+export declare function resolvePurlPackageName(purl: PackageURL): string;

package/dist/service/eol/eol.svc.js

@@ -23,3 +23,27 @@ export function validateIsCycloneDxSbom(sbom) {
         throw new Error('Invalid SBOM: missing or invalid components array');
     }
 }
+const purlPackageNameRules = {
+    npm: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
+    maven: (p) => (p.namespace ? `${p.namespace}:${p.name}` : p.name),
+    pypi: (p) => p.name.toLowerCase(),
+    nuget: (p) => p.name,
+    gem: (p) => p.name,
+    composer: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
+    golang: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
+    cargo: (p) => p.name,
+    conan: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
+    github: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
+    bitbucket: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
+    docker: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
+};
+function isKnownEcosystemType(type) {
+    return type in purlPackageNameRules;
+}
+export function resolvePurlPackageName(purl) {
+    if (!isKnownEcosystemType(purl.type)) {
+        debugLogger(`Unsupported package type: ${purl.type}, falling back to name only`);
+        return purl.name;
+    }
+    return purlPackageNameRules[purl.type](purl);
+}

package/dist/service/nes/nes.svc.js

@@ -3,12 +3,6 @@ import { debugLogger } from "../log.svc.js";
 export const buildScanResult = (scan) => {
     const components = new Map();
     for (const c of scan.components) {
-        const { status } = c.info;
-        // TODO: remove this once backend changes are deployed
-        // @ts-expect-error
-        if (status === 'LTS') {
-            c.info.status = 'SUPPORTED';
-        }
         components.set(c.purl, c);
     }
     return {

package/dist/ui/eol.ui.js

@@ -1,6 +1,7 @@
 import { ux } from '@oclif/core';
 import { makeTable } from '@oclif/table';
 import { PackageURL } from 'packageurl-js';
+import { resolvePurlPackageName } from "../service/eol/eol.svc.js";
 import { parseMomentToSimpleDate } from "./date.ui.js";
 import { INDICATORS, MAX_PURL_LENGTH, MAX_TABLE_COLUMN_WIDTH, STATUS_COLORS } from "./shared.ui.js";
 export function truncateString(purl, maxLength) {
@@ -63,13 +64,24 @@ export function createStatusDisplay(components, all) {
 }
 export function createTableForStatus(grouped, status) {
     const data = grouped[status].map((component) => convertComponentToTableRow(component));
+    if (status === 'EOL' || status === 'SUPPORTED') {
+        return makeTable({
+            data,
+            columns: [
+                { key: 'name', name: 'NAME', width: MAX_TABLE_COLUMN_WIDTH },
+                { key: 'version', name: 'VERSION', width: 10 },
+                { key: 'eol', name: 'EOL', width: 12 },
+                { key: 'daysEol', name: 'DAYS EOL', width: 10 },
+                { key: 'type', name: 'TYPE', width: 12 },
+                { key: 'vulnCount', name: '# OF VULNS', width: 12 },
+            ],
+        });
+    }
     return makeTable({
         data,
         columns: [
             { key: 'name', name: 'NAME', width: MAX_TABLE_COLUMN_WIDTH },
             { key: 'version', name: 'VERSION', width: 10 },
-            { key: 'eol', name: 'EOL', width: 12 },
-            { key: 'daysEol', name: 'DAYS EOL', width: 10 },
             { key: 'type', name: 'TYPE', width: 12 },
             { key: 'vulnCount', name: '# OF VULNS', width: 12 },
         ],
@@ -79,7 +91,7 @@ export function convertComponentToTableRow(component) {
     const purlParts = PackageURL.fromString(component.purl);
     const { eolAt, daysEol, vulnCount } = component.info;
     return {
-        name: purlParts.name,
+        name: resolvePurlPackageName(purlParts),
         version: purlParts.version ?? '',
         eol: parseMomentToSimpleDate(eolAt),
         daysEol: daysEol,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herodevs/cli",
-  "version": "1.5.0-beta.1",
+  "version": "1.5.0-beta.2",
   "author": "HeroDevs, Inc",
   "bin": {
     "hd": "./bin/run.js"
@@ -26,10 +26,13 @@
     "prepack": "oclif manifest && oclif readme",
     "pretest": "npm run lint && npm run typecheck",
     "readme": "npm run ci:fix && npm run build && npm exec oclif readme",
+    "release": "./scripts/release.sh",
+    "pre:release:publish": "npm run prepack && git add README.md",
+    "release:publish:beta": "npm run release -- --publish",
+    "release:publish:latest": "npm run release -- --latest --publish",
     "test": "globstar -- node --import tsx --test \"test/**/*.test.ts\"",
-    "typecheck": "tsc --noEmit",
-    "version": "oclif readme && git add README.md",
-    "test:e2e": "globstar -- node --import tsx --test \"e2e/**/*.test.ts\""
+    "test:e2e": "globstar -- node --import tsx --test \"e2e/**/*.test.ts\"",
+    "typecheck": "tsc --noEmit"
   },
   "keywords": [
     "herodevs",
@@ -37,7 +40,7 @@
     "herodevs cli"
   ],
   "dependencies": {
-    "@apollo/client": "^3.13.7",
+    "@apollo/client": "^3.13.8",
     "@cyclonedx/cdxgen": "^11.2.4",
     "@oclif/core": "^4",
     "@oclif/plugin-help": "^6",
@@ -54,6 +57,7 @@
     "@types/node": "^22",
     "@types/sinon": "^17.0.4",
     "@types/update-notifier": "^6.0.8",
+    "commit-and-tag-version": "^12.5.1",
     "globstar": "^1.0.0",
     "oclif": "^4",
     "shx": "^0.4.0",