Merge remote-tracking branch 'upstream/main' into feat/package-health-score

# Conflicts:
#	i18n/locales/ar-EG.json
#	i18n/locales/fr-FR.json

Author: hamdibenjarrar

app/components/Compare/FacetBarChart.vue

@@ -131,7 +131,7 @@ const config = computed<VueUiHorizontalBarConfig>(() => {
         csv: false,
         altCopy: true,
       },
-      buttonTitle: {
+      buttonTitles: {
         img: $t('package.trends.download_file', { fileType: 'PNG' }),
         svg: $t('package.trends.download_file', { fileType: 'SVG' }),
         altCopy: $t('package.trends.copy_alt.button_label'),

app/components/Package/HealthScore.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
 interface HealthScoreDimension {
   score: number
   weight: number
@@ -58,13 +58,13 @@ function scoreBarColor(score: number): string {
 }
 
 const dimensions = computed(() => {
-  if (!data.value) return []
+  if (!data.value?.dimensions) return []
   const d = data.value.dimensions
   return [
-    { key: 'maintenance', label: $t('package.health_score.dimension_maintenance'), score: d.maintenance.score, weight: d.maintenance.weight },
-    { key: 'quality', label: $t('package.health_score.dimension_quality'), score: d.quality.score, weight: d.quality.weight },
-    { key: 'security', label: $t('package.health_score.dimension_security'), score: d.security.score, weight: d.security.weight },
-    { key: 'popularity', label: $t('package.health_score.dimension_popularity'), score: d.popularity.score, weight: d.popularity.weight },
+    { key: 'maintenance', label: $t('package.health_score.dimension_maintenance'), score: d.maintenance?.score ?? 0, weight: d.maintenance?.weight ?? 0 },
+    { key: 'quality', label: $t('package.health_score.dimension_quality'), score: d.quality?.score ?? 0, weight: d.quality?.weight ?? 0 },
+    { key: 'security', label: $t('package.health_score.dimension_security'), score: d.security?.score ?? 0, weight: d.security?.weight ?? 0 },
+    { key: 'popularity', label: $t('package.health_score.dimension_popularity'), score: d.popularity?.score ?? 0, weight: d.popularity?.weight ?? 0 },
   ]
 })
 </script>
@@ -147,7 +147,7 @@ const dimensions = computed(() => {
 
       <!-- Footer link -->
       <a
-        :href="`https://npm-pulse.vercel.app/api/v1/score/${packageName}`"
+        :href="`https://npm-pulse.vercel.app/api/v1/score/${props.packageName}`"
         target="_blank"
         rel="noopener noreferrer"
         class="inline-flex items-center gap-1 text-xs text-fg-subtle hover:text-fg transition-colors duration-150 underline underline-offset-2 decoration-fg-subtle/40"

app/pages/package/[[org]]/[name].vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script setup lang="ts">
 import { assertValidPackageName } from '#shared/utils/npm'
 import { getDependencyCount } from '~/utils/npm/dependency-count'
 

i18n/locales/ar-EG.json

@@ -35,6 +35,7 @@ export default defineNuxtModule({
       'https://registry.npmjs.org',
       'https://api.npmjs.org',
       'https://npm.antfu.dev',
+      'https://npm-pulse.vercel.app',
       BLUESKY_API,
       ...ALL_KNOWN_GIT_API_ORIGINS,
       // Local CLI connector (npmx CLI communicates via localhost)

i18n/locales/fr-FR.json

@@ -6,7 +6,12 @@ export function parsePackageParams(segments: string[]): {
   rawPackageName: string
   rawVersion: string | undefined
 } {
-  const vIndex = segments.indexOf('v')
+  let vIndex = segments.indexOf('v')
+
+  // If we encounter ".../v/v/...", treat the second "v" as the version delimiter.
+  if (segments[vIndex] === 'v' && segments[vIndex + 1] === 'v') {
+    vIndex++
+  }
 
   if (vIndex !== -1 && vIndex < segments.length - 1) {
     return {

modules/security-headers.ts

@@ -37,7 +37,12 @@ export interface ParsedPackageParams {
  */
 export function parsePackageParam(pkgParam: string): ParsedPackageParams {
   const segments = pkgParam.split('/')
-  const vIndex = segments.indexOf('v')
+  let vIndex = segments.indexOf('v')
+
+  // If we encounter ".../v/v/...", treat the second "v" as the version delimiter.
+  if (segments[vIndex] === 'v' && segments[vIndex + 1] === 'v') {
+    vIndex++
+  }
 
   if (vIndex !== -1 && vIndex < segments.length - 1) {
     return {

server/utils/parse-package-params.ts

@@ -49,5 +49,14 @@ describe('parsePackageParams', () => {
         rawVersion: '1.0.0',
       })
     })
+
+    it('parses scoped package names whose package segment is literally v', () => {
+      const segments = ['@scope', 'v', 'v', '1.2.3']
+      const result = parsePackageParams(segments)
+      expect(result).toEqual({
+        rawPackageName: '@scope/v',
+        rawVersion: '1.2.3',
+      })
+    })
   })
 })

shared/utils/parse-package-param.ts

@@ -85,6 +85,15 @@ describe('parsePackageParam', () => {
         rest: [],
       })
     })
+
+    it('parses scoped package names whose package segment is literally v', () => {
+      const result = parsePackageParam('@scope/v/v/1.2.3/dist/index.js')
+      expect(result).toEqual({
+        packageName: '@scope/v',
+        version: '1.2.3',
+        rest: ['dist', 'index.js'],
+      })
+    })
   })
 
   describe('edge cases', () => {