Merge branch 'main' into dependabot/npm_and_yarn/oclif/plugin-help-6.2.35

Author: v3nant

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.2.2/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.3.3/schema.json",
   "assist": { "actions": { "source": { "organizeImports": "on" } } },
   "linter": {
     "enabled": true,

e2e/scan/eol.test.ts

@@ -93,14 +93,14 @@ describe('scan:eol e2e', () => {
 
   describe('default arguments', () => {
     it('runs scan:eol with file flag and shows results', async () => {
-      const { stdout } = await execAsync(`node bin/run.js scan:eol --file ${simpleSbom}`);
+      const { stdout } = await run(`scan:eol --file ${simpleSbom}`);
       match(stdout, /Scan results:/, 'Should show results header');
       match(stdout, /1( .*)End-of-Life \(EOL\)/, 'Should show EOL count of 1');
       match(stdout, /total packages scanned/i, 'Should show total packages scanned');
     });
 
     it('runs scan:eol with --json and produces valid JSON', async () => {
-      const { stdout } = await execAsync(`node bin/run.js scan:eol --file ${simpleSbom} --json`);
+      const { stdout } = await run(`scan:eol --file ${simpleSbom} --json`);
       doesNotMatch(stdout, /Scan results:/, 'Should not show results header');
       doesNotThrow(() => JSON.parse(stdout), 'Output should be valid JSON');
     });

package-lock.json

@@ -39,28 +39,28 @@
     "herodevs cli"
   ],
   "dependencies": {
-    "@amplitude/analytics-node": "^1.5.21",
-    "@apollo/client": "^3.13.8",
+    "@amplitude/analytics-node": "^1.5.22",
+    "@apollo/client": "^4.0.9",
     "@cyclonedx/cdxgen": "^11.11.0",
     "@herodevs/eol-shared": "github:herodevs/eol-shared#v0.1.12",
     "@oclif/core": "^4.8.0",
     "@oclif/plugin-help": "^6.2.35",
-    "@oclif/plugin-update": "^4.7.13",
+    "@oclif/plugin-update": "^4.7.14",
     "node-machine-id": "^1.1.12",
     "ora": "^9.0.0",
     "packageurl-js": "^2.0.1",
     "terminal-link": "^5.0.0",
     "update-notifier": "^7.3.1"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.3.3",
+    "@biomejs/biome": "^2.3.4",
     "@oclif/test": "^4.1.13",
     "@types/inquirer": "^9.0.9",
     "@types/node": "^24.10.0",
     "@types/sinon": "^17.0.4",
     "@types/update-notifier": "^6.0.8",
     "globstar": "^1.0.0",
-    "oclif": "^4.22.38",
+    "oclif": "^4.22.47",
     "shx": "^0.4.0",
     "sinon": "^21.0.0",
     "ts-node": "^10.9.2",
@@ -110,4 +110,4 @@
     }
   },
   "types": "dist/index.d.ts"
-}
+}

package.json

@@ -21,9 +21,7 @@ set -o pipefail # Catch errors in piped commands
 # - Proper cleanup of temporary files
 # - Error handling for failed operations
 #
-# Usage:
-#   Beta release:  curl -sSfL https://raw.githubusercontent.com/herodevs/cli/refs/heads/main/scripts/install.sh | bash
-#   Latest release: curl -sSfL https://raw.githubusercontent.com/herodevs/cli/refs/heads/main/scripts/install.sh | bash -s -- --latest
+# Usage: curl -sSfL https://raw.githubusercontent.com/herodevs/cli/refs/heads/main/scripts/install.sh | bash
 #=============================================================================
 
 # Configuration
@@ -34,8 +32,7 @@ INSTALL_DIR="$HOME/.herodevs"
 BIN_DIR="$INSTALL_DIR/bin"
 GITHUB_API_URL="https://api.github.com/repos/${REPO_OWNER}/${REPO_NAME}/releases"
 TMP_DIR=""
-USE_BETA=true
-# LATEST_VERSION="v2.0.0-beta.13"
+LATEST_VERSION="v2.0.0-beta.13"
 DEBUG=${DEBUG:-}
 
 # Colors for output
@@ -81,26 +78,6 @@ error_exit() {
   exit 1
 }
 
-# Parse arguments
-while [ $# -gt 0 ]; do
-  case $1 in
-  -l | --latest)
-    USE_BETA=false
-    shift
-    ;;
-  -h | --help)
-    # Help text goes to the original stdout
-    emit "Usage: $0 [-l|--latest]"
-    emit "  -l, --latest    Install latest release (default: install beta)"
-    emit "  -h, --help      Show this help message"
-    exit 0
-    ;;
-  *)
-    error_exit "Unknown option: $1"
-    ;;
-  esac
-done
-
 # Cleanup on exit/interrupt
 cleanup() {
   if [ -n "$TMP_DIR" ] && [ -d "$TMP_DIR" ]; then
@@ -113,49 +90,6 @@ trap cleanup EXIT INT TERM
 
 log "INFO" "Installing HeroDevs CLI"
 
-# Get release version (beta or latest)
-get_version() {
-  local use_beta="$1"
-  local releases_data="$2"
-
-  log "INFO" "Extracting release version"
-  local all_tags
-  local latest_release
-  local beta_release
-  local version_tag
-  
-  # Split complex command chains for Bash 3 compatibility
-  all_tags=$(echo "$releases_data" | grep -o '"tag_name": "[^"]*"')
-  all_tags=$(echo "$all_tags" | cut -d'"' -f4)
-  
-  # Get latest non-beta release
-  latest_release=$(echo "$all_tags" | grep -v "beta" | head -n 1)
-  
-  # Get latest beta release
-  beta_release=$(echo "$all_tags" | grep "beta" | head -n 1)
-
-  log "DEBUG" "All tags: $all_tags"
-  log "DEBUG" "Latest release: $latest_release"
-  log "DEBUG" "Beta release: $beta_release"
-
-  if [ "$use_beta" = "true" ]; then
-    version_tag="$beta_release"
-    if [ -z "$version_tag" ]; then
-      log "ERROR" "No beta release found. Please try again later or use --latest to install the latest stable release."
-      exit 1
-    fi
-  else
-    version_tag="$latest_release"
-    if [ -z "$version_tag" ]; then
-      error_exit "No latest release found. Please try again later."
-    fi
-  fi
-
-  log "INFO" "Using version: $version_tag"
-  # Output actual return value to the original stdout (FD 3)
-  emit "$version_tag"
-}
-
 # Download and install
 install() {
   # Fetch releases from GitHub
@@ -171,21 +105,13 @@ install() {
     error_exit "Empty response from GitHub API. Please try again later."
   fi
 
-  # Ensure the response contains release data
-  if ! echo "$releases" | grep -q '"tag_name"'; then
-    error_exit "Invalid response from GitHub API. Please try again later."
-  fi
-
-  # Determine VERSION_TAG
-  VERSION_TAG=$(get_version "$USE_BETA" "$releases" 3>&1 1>&2)
-
-  local version_tag="$VERSION_TAG"
+  local version_tag="$LATEST_VERSION"
 
   # Remove 'v' prefix if present
   local version
   version=${version_tag#v}
 
-  log "DEBUG" "Version string: $version"
+  log "INFO" "Installing version: $version"
 
   # Detect system
   local os
@@ -207,7 +133,7 @@ install() {
   pattern="${os}-${arch}"
 
   # Extract all browser_download_url values for the matching release
-  release_block=$(echo "$releases" | awk -v tag="\"$VERSION_TAG\"" '
+  release_block=$(echo "$releases" | awk -v tag="\"$LATEST_VERSION\"" '
     BEGIN {found=0; block=""}
     $0 ~ tag {found=1}
     found {
@@ -227,7 +153,7 @@ install() {
 
   # Ensure we found a matching asset
   if [ -z "$download_url" ]; then
-    error_exit "No release found system $pattern for release $VERSION_TAG"
+    error_exit "No release found system $pattern for release $LATEST_VERSION"
   fi
 
   log "DEBUG" "Download URL: $download_url"

scripts/install.sh

@@ -1,4 +1,4 @@
-import { gql } from '@apollo/client/core/core.cjs';
+import { gql } from '@apollo/client/core';
 
 export const createReportMutation = gql`
 mutation createReport($input: CreateEolReportInput) {

src/api/gql-operations.ts

@@ -1,16 +1,21 @@
-import { ApolloClient, HttpLink, InMemoryCache } from '@apollo/client/core/index.js';
+import { ApolloClient, HttpLink, InMemoryCache } from '@apollo/client/core';
 import type {
   CreateEolReportInput,
   EolReport,
   EolReportMutationResponse,
   EolReportQueryResponse,
   GetEolReportInput,
 } from '@herodevs/eol-shared';
+import type { GraphQLFormattedError } from 'graphql';
 import { config } from '../config/constants.ts';
 import { debugLogger } from '../service/log.svc.ts';
 import { stripTypename } from '../utils/strip-typename.ts';
 import { createReportMutation, getEolReportQuery } from './gql-operations.ts';
 
+type GraphQLExecutionResult = {
+  errors?: ReadonlyArray<GraphQLFormattedError>;
+};
+
 export const createApollo = (uri: string) =>
   new ApolloClient({
     cache: new InMemoryCache(),
@@ -28,13 +33,17 @@ export const createApollo = (uri: string) =>
 
 export const SbomScanner = (client: ReturnType<typeof createApollo>) => {
   return async (input: CreateEolReportInput): Promise<EolReport> => {
-    const res = await client.mutate<EolReportMutationResponse, { input: CreateEolReportInput }>({
+    let res: Awaited<ReturnType<typeof client.mutate<EolReportMutationResponse, { input: CreateEolReportInput }>>>;
+    res = await client.mutate<EolReportMutationResponse, { input: CreateEolReportInput }>({
       mutation: createReportMutation,
       variables: { input },
     });
 
-    if (res?.errors?.length) {
-      debugLogger('GraphQL errors in createReport: %o', res.errors);
+    if (res?.error || (res as GraphQLExecutionResult)?.errors) {
+      debugLogger(
+        'Error returned from createReport mutation: %o',
+        res.error || (res as GraphQLExecutionResult | undefined)?.errors,
+      );
       throw new Error('Failed to create EOL report');
     }
 
@@ -64,11 +73,16 @@ export const SbomScanner = (client: ReturnType<typeof createApollo>) => {
 
     for (let i = 0; i < pages.length; i += config.concurrentPageRequests) {
       const batch = pages.slice(i, i + config.concurrentPageRequests);
-      const batchResponses = await Promise.all(batch);
+      let batchResponses: Awaited<
+        ReturnType<typeof client.query<EolReportQueryResponse, { input: GetEolReportInput }>>
+      >[];
+
+      batchResponses = await Promise.all(batch);
 
       for (const response of batchResponses) {
-        if (response?.errors?.length) {
-          debugLogger('GraphQL errors in getReport query: %o', response.errors);
+        const queryErrors = (response as GraphQLExecutionResult | undefined)?.errors;
+        if (response?.error || queryErrors?.length || !response.data?.eol) {
+          debugLogger('Error in getReport query response: %o', response?.error ?? queryErrors ?? response);
           throw new Error('Failed to fetch EOL report');
         }