npq 3.8.0 → 3.9.0

package/__tests__/marshalls.tasks.test.js

@@ -13,19 +13,19 @@ test('running marshall tasks succeeds', async () => {
   })
 
   const config = {
-    pkgs: ['express', 'semver'],
+    pkgs: [{ packageName: 'express' }, { packageName: 'semver' }],
     packageRepoUtils: new PackageRepoUtilsMock()
   }
 
-  const tasks = await marshalls.tasks(config)
-  expect(tasks.pkgs).toEqual(['express', 'semver'])
-  expect(tasks.marshalls).toEqual({
-    'test.marshall': {
-      status: null,
-      errors: [],
-      warnings: [],
-      data: { express: 'mock data check', semver: 'mock data check' }
-    }
+  const results = await marshalls.tasks(config)
+
+  expect(results[0]['test.marshall']).toEqual({
+    status: null,
+    errors: [],
+    warnings: [],
+    data: { express: 'mock data check', semver: 'mock data check' },
+    marshall: 'test.marshall',
+    categoryId: 'PackageHealth'
   })
 })
 
@@ -35,13 +35,12 @@ test('running marshall tasks fails', async () => {
   })
 
   const config = {
-    pkgs: ['express', 'dockly'],
+    pkgs: [{ packageName: 'express' }, { packageName: 'dockly' }],
     packageRepoUtils: new PackageRepoUtilsMock()
   }
 
-  const context = {
-    pkgs: ['express', 'dockly'],
-    marshalls: {
+  const mockedResults = [
+    {
       'test.marshall': {
         status: null,
         errors: [{ pkg: 'dockly', message: 'simulating mock error' }],
@@ -49,12 +48,12 @@ test('running marshall tasks fails', async () => {
         data: { express: 'mock data check' }
       }
     }
-  }
+  ]
 
-  await expect(marshalls.tasks(config)).resolves.toMatchObject(context)
+  await expect(marshalls.tasks(config)).resolves.toMatchObject(mockedResults)
 })
 
-test('running marshall tasks throws error when single package is not found', async () => {
+test('running marshall tasks includes an error when single package is not found', async () => {
   const PackageRepoUtilsNotFoundMock = class Fake {
     getPackageInfo() {
       return Promise.resolve({ error: 'Not found' })
@@ -70,10 +69,20 @@ test('running marshall tasks throws error when single package is not found', asy
     packageRepoUtils: new PackageRepoUtilsNotFoundMock()
   }
 
-  await expect(marshalls.tasks(config)).resolves.toEqual({
-    error: true,
-    message: 'Package not found: nonexistent-package'
-  })
+  const mockedResults = [
+    {
+      not_found: {
+        status: null,
+        errors: [{ pkg: 'nonexistent-package', message: 'Package not found' }],
+        warnings: [],
+        data: {},
+        marshall: 'not_found',
+        categoryId: 'PackageHealth'
+      }
+    }
+  ]
+
+  await expect(marshalls.tasks(config)).resolves.toMatchObject(mockedResults)
 })
 
 test('running marshall tasks filters out not found packages when multiple packages provided', async () => {
@@ -100,7 +109,22 @@ test('running marshall tasks filters out not found packages when multiple packag
   }
 
   const result = await marshalls.tasks(config)
-  // Should filter out the nonexistent package and keep only express and semver
-  expect(result.pkgs).toHaveLength(2)
-  expect(result.pkgs).toEqual([{ packageName: 'express' }, { packageName: 'semver' }])
+
+  expect(result[0]['not_found']).toEqual({
+    status: null,
+    errors: [{ pkg: 'nonexistent-package', message: 'Package not found' }],
+    warnings: [],
+    data: {},
+    marshall: 'not_found',
+    categoryId: 'PackageHealth'
+  })
+
+  expect(result[1]['test.marshall']).toEqual({
+    status: null,
+    errors: [],
+    warnings: [],
+    data: { express: 'mock data check', semver: 'mock data check' },
+    marshall: 'test.marshall',
+    categoryId: 'PackageHealth'
+  })
 })

package/__tests__/marshalls.typosquatting.test.js

@@ -3,12 +3,13 @@ const TyposquattingMarshall = require('../lib/marshalls/typosquatting.marshall')
 describe('Typosquatting Marshall', () => {
   test('should remove duplicate entries from similar packages', async () => {
     const typosquattingMarshall = new TyposquattingMarshall({
-      packageRepoUtils: null
+      packageRepoUtils: {
+        isPackageInAllowList: jest.fn(() => {
+          return false // Simulate that the package is not in the allow list
+        })
+      }
     })
 
-    // Mock the top packages data to include duplicates
-    const originalTopPackages = require('../data/top-packages.json')
-
     // Create a test package that would match multiple similar packages
     const pkg = {
       packageName: 'ghtml' // This should match 'html' which appears multiple times in the data
@@ -21,9 +22,7 @@ describe('Typosquatting Marshall', () => {
     } catch (error) {
       // Check that the error message doesn't contain duplicate entries
       const errorMessage = error.message
-      expect(errorMessage).toContain(
-        'Package name could be a typosquatting attempt for popular package(s):'
-      )
+      expect(errorMessage).toContain('Potential typosquatting with popular package(s):')
 
       // Extract the package names from the error message
       const packagesList = errorMessage.split('popular package(s): ')[1]
@@ -41,7 +40,11 @@ describe('Typosquatting Marshall', () => {
 
   test('should not report typosquatting for packages in top packages list', async () => {
     const typosquattingMarshall = new TyposquattingMarshall({
-      packageRepoUtils: null
+      packageRepoUtils: {
+        isPackageInAllowList: jest.fn(() => {
+          return true
+        })
+      }
     })
 
     // Test with a package that exists in the top packages list
@@ -55,7 +58,11 @@ describe('Typosquatting Marshall', () => {
 
   test('should not report typosquatting for packages with no similar matches', async () => {
     const typosquattingMarshall = new TyposquattingMarshall({
-      packageRepoUtils: null
+      packageRepoUtils: {
+        isPackageInAllowList: jest.fn(() => {
+          return false // Simulate that the package is not in the allow list
+        })
+      }
     })
 
     // Test with a package that has no similar matches

package/__tests__/marshalls.version-maturity.test.js

@@ -34,7 +34,7 @@ describe('Version Maturity Marshall', () => {
         packageVersion: '1.0.0'
       })
     ).rejects.toThrow(
-      'detected a recently published version (published 2 hours ago) - consider waiting for community review'
+      'Detected a recently published version (published 2 hours ago) - consider waiting for community review'
     )
   })
 
@@ -61,7 +61,7 @@ describe('Version Maturity Marshall', () => {
         packageVersion: '1.0.0'
       })
     ).rejects.toThrow(
-      'detected a recently published version (published 3 days ago) - consider waiting for community review'
+      'Detected a recently published version (published 3 days ago) - consider waiting for community review'
     )
   })
 
@@ -88,7 +88,7 @@ describe('Version Maturity Marshall', () => {
         packageVersion: '1.0.0'
       })
     ).rejects.toThrow(
-      'detected a recently published version (published 1 day ago) - consider waiting for community review'
+      'Detected a recently published version (published 1 day ago) - consider waiting for community review'
     )
   })
 
@@ -135,7 +135,7 @@ describe('Version Maturity Marshall', () => {
         packageName: 'test-package',
         packageVersion: '1.0.0'
       })
-    ).rejects.toThrow('could not determine package version information')
+    ).rejects.toThrow('Could not determine package version information')
   })
 
   test('should throw error when version release date is missing', async () => {
@@ -157,7 +157,7 @@ describe('Version Maturity Marshall', () => {
         packageName: 'test-package',
         packageVersion: '1.0.0'
       })
-    ).rejects.toThrow('could not determine release date for version 1.0.0')
+    ).rejects.toThrow('Could not determine release date for version 1.0.0')
   })
 
   test('should handle version aliases correctly', async () => {
@@ -188,7 +188,7 @@ describe('Version Maturity Marshall', () => {
         packageVersion: 'latest'
       })
     ).rejects.toThrow(
-      'detected a recently published version (published 2 days ago) - consider waiting for community review'
+      'Detected a recently published version (published 2 days ago) - consider waiting for community review'
     )
   })
 })

package/__tests__/packageRepoUtils.test.js

@@ -157,7 +157,7 @@ test('repo utils returns valid semver for different cases of version asked', asy
   expect(result).toEqual('3.1.0')
 
   await expect(packageRepoUtils.getSemVer(packageName, 'next')).rejects.toThrow(
-    'could not find dist-tag next for package testPackage'
+    'Could not find dist-tag next for package testPackage'
   )
 })
 
@@ -186,12 +186,12 @@ test('repo utils resolves semver ranges by finding the highest satisfying versio
 
   // Test invalid semver range that doesn't match any version
   await expect(packageRepoUtils.getSemVer(packageName, '^10.0.0')).rejects.toThrow(
-    'could not find dist-tag ^10.0.0 for package testPackage'
+    'Could not find dist-tag ^10.0.0 for package testPackage'
   )
 
   // Test invalid semver range with version 2 (no 2.x versions in mock)
   await expect(packageRepoUtils.getSemVer(packageName, '2')).rejects.toThrow(
-    'could not find dist-tag 2 for package testPackage'
+    'Could not find dist-tag 2 for package testPackage'
   )
 })
 
@@ -246,6 +246,6 @@ test('repo utils resolves semver ranges with multiple versions', async () => {
 
   // Test that non-existent major versions still fail appropriately
   await expect(packageRepoUtils.getSemVer(packageName, '10')).rejects.toThrow(
-    'could not find dist-tag 10 for package @astrojs/vue'
+    'Could not find dist-tag 10 for package @astrojs/vue'
   )
 })