Extract normalization logic to shared utility function and regenerate dist

Co-authored-by: felickz <1760475+felickz@users.noreply.github.com>

Author: Copilot

__tests__/main.test.ts

@@ -1,3 +1,5 @@
+import {normalizeCweId} from '../src/utils'
+
 describe('main', () => {
   it('placeholder test', () => {
     // This is a placeholder test to prevent Jest from failing
@@ -6,36 +8,28 @@ describe('main', () => {
   })
 
   describe('CWE ID normalization', () => {
-    const codeQlCweTagPrefix = 'external/cwe/cwe-'
-    
-    function normalizeCweId(tag: string): string {
-      const cweId = tag.replace(codeQlCweTagPrefix, '')
-      const normalizedId = String(parseInt(cweId, 10))
-      return normalizedId
-    }
-
     it('should handle CWE IDs with leading zeros', () => {
-      // Test that cwe-099 maps to 99
-      const normalizedId = normalizeCweId('external/cwe/cwe-099')
+      // Test that 099 maps to 99
+      const normalizedId = normalizeCweId('099')
       expect(normalizedId).toBe('99')
     })
 
     it('should handle CWE IDs without leading zeros', () => {
-      // Test that cwe-89 maps to 89
-      const normalizedId = normalizeCweId('external/cwe/cwe-89')
+      // Test that 89 maps to 89
+      const normalizedId = normalizeCweId('89')
       expect(normalizedId).toBe('89')
     })
 
     it('should handle CWE IDs with multiple leading zeros', () => {
-      // Test that cwe-020 maps to 20
-      const normalizedId = normalizeCweId('external/cwe/cwe-020')
+      // Test that 020 maps to 20
+      const normalizedId = normalizeCweId('020')
       expect(normalizedId).toBe('20')
     })
 
-    it('should return NaN for non-numeric CWE IDs', () => {
-      // Test that invalid CWE IDs return NaN
-      const normalizedId = normalizeCweId('external/cwe/cwe-abc')
-      expect(normalizedId).toBe('NaN')
+    it('should return null for non-numeric CWE IDs', () => {
+      // Test that invalid CWE IDs return null
+      const normalizedId = normalizeCweId('abc')
+      expect(normalizedId).toBeNull()
     })
   })
 })

dist/index.js

@@ -5,7 +5,7 @@ import * as core from '@actions/core'
 import {DOMParser} from '@xmldom/xmldom'
 import * as xpath from 'xpath'
 import {JSONPath} from 'jsonpath-plus'
-import {LogLevel, log} from './utils'
+import {LogLevel, log, normalizeCweId} from './utils'
 
 let sarifFilePath: string
 let outputFilePath: string
@@ -104,12 +104,11 @@ JSONPath({
       if (tag.startsWith(codeQlCweTagPrefix)) {
         const cweId = tag.replace(codeQlCweTagPrefix, '')
         // Normalize CWE ID by converting to integer to remove leading zeros
-        const parsedCweId = parseInt(cweId, 10)
+        const normalizedCweId = normalizeCweId(cweId)
         // Skip if the CWE ID is not a valid number
-        if (Number.isNaN(parsedCweId)) {
+        if (normalizedCweId === null) {
           continue
         }
-        const normalizedCweId = String(parsedCweId)
         if (cweIds.includes(normalizedCweId)) {
           tags.push(securityStandardTag)
           tags.push(...cweCategories[normalizedCweId])

dist/index.js.map

@@ -41,3 +41,16 @@ export function log(message: string, level = LogLevel.Info): void {
     }
   }
 }
+
+/**
+ * Normalize a CWE ID by removing leading zeros
+ * @param cweId - The CWE ID string (e.g., "099", "020", "89")
+ * @returns The normalized CWE ID string (e.g., "99", "20", "89") or null if invalid
+ */
+export function normalizeCweId(cweId: string): string | null {
+  const parsedCweId = parseInt(cweId, 10)
+  if (Number.isNaN(parsedCweId)) {
+    return null
+  }
+  return String(parsedCweId)
+}