wip

Author: gameroman

server/api/registry/analysis/[...pkg].get.ts

@@ -8,7 +8,6 @@ import type {
 import {
   analyzePackage,
   getCreatePackageName,
-  fetchPackageWithTypesAndFiles,
 } from '#shared/utils/package-analysis'
 import {
   getDevDependencySuggestion,
@@ -21,6 +20,7 @@ import {
 } from '#shared/utils/constants'
 import { parseRepoUrl } from '#shared/utils/git-providers'
 import { encodePackageName } from '#shared/utils/npm'
+import { fetchPackageWithTypesAndFiles } from '#server/utils/file-tree'
 import { getLatestVersionBatch } from 'fast-npm-meta'
 
 export default defineCachedEventHandler(

server/api/registry/badge/[type]/[...pkg].get.ts

@@ -6,7 +6,7 @@ import { PackageRouteParamsSchema } from '#shared/schemas/package'
 import { CACHE_MAX_AGE_ONE_HOUR, ERROR_NPM_FETCH_FAILED } from '#shared/utils/constants'
 import { fetchNpmPackage } from '#server/utils/npm'
 import { assertValidPackageName } from '#shared/utils/npm'
-import { detectTypesStatus, fetchPackageWithTypesAndFiles } from '#shared/utils/package-analysis'
+import { fetchPackageWithTypesAndFiles } from '#server/utils/file-tree'
 import { handleApiError } from '#server/utils/error-handler'
 
 const NPM_DOWNLOADS_API = 'https://api.npmjs.org/downloads/point'

server/utils/file-tree.ts

@@ -1,3 +1,5 @@
+import { flattenFileTree } from '#server/utils/import-resolver'
+
 /**
  * Fetch the file tree from jsDelivr API.
  * Returns a nested tree structure of all files in the package.
@@ -83,3 +85,44 @@ export async function getPackageFileTree(
     tree,
   }
 }
+
+export async function fetchPackageWithTypesAndFiles(
+  packageName: string,
+  version?: string,
+): Promise<{
+  pkg: AnalysisPackageJson
+  typesPackage?: TypesPackageInfo
+  files?: Set<string>
+}> {
+  // Fetch main package data
+  const encodedName = encodePackageName(packageName)
+  const versionSuffix = version ? `/${version}` : '/latest'
+
+  const pkg = await $fetch<AnalysisPackageJson>(`${NPM_REGISTRY}/${encodedName}${versionSuffix}`)
+
+  let typesPackage: TypesPackageInfo | undefined
+  let files: Set<string> | undefined
+
+  // Only attempt to fetch @types + file tree when the package doesn't ship its own types
+  if (!hasBuiltInTypes(pkg)) {
+    const typesPkgName = getTypesPackageName(packageName)
+    const resolvedVersion = pkg.version ?? version ?? 'latest'
+
+    // Fetch both in parallel — they're independent
+    const [typesResult, fileTreeResult] = await Promise.allSettled([
+      fetchTypesPackageInfo(typesPkgName),
+      getPackageFileTree(packageName, resolvedVersion),
+    ])
+
+    if (typesResult.status === 'fulfilled') {
+      typesPackage = typesResult.value
+    }
+
+    if (fileTreeResult.status === 'fulfilled') {
+      files = flattenFileTree(fileTreeResult.value.tree)
+    }
+  }
+
+  return { pkg, typesPackage, files }
+}
+

shared/utils/package-analysis.ts

@@ -3,7 +3,6 @@
  */
 
 import { getLatestVersion } from 'fast-npm-meta'
-import { flattenFileTree } from '#server/utils/import-resolver'
 
 export type ModuleFormat = 'esm' | 'cjs' | 'dual' | 'unknown'
 
@@ -128,46 +127,6 @@ async function fetchTypesPackageInfo(packageName: string): Promise<TypesPackageI
   }
 }
 
-export async function fetchPackageWithTypesAndFiles(
-  packageName: string,
-  version?: string,
-): Promise<{
-  pkg: AnalysisPackageJson
-  typesPackage?: TypesPackageInfo
-  files?: Set<string>
-}> {
-  // Fetch main package data
-  const encodedName = encodePackageName(packageName)
-  const versionSuffix = version ? `/${version}` : '/latest'
-
-  const pkg = await $fetch<AnalysisPackageJson>(`${NPM_REGISTRY}/${encodedName}${versionSuffix}`)
-
-  let typesPackage: TypesPackageInfo | undefined
-  let files: Set<string> | undefined
-
-  // Only attempt to fetch @types + file tree when the package doesn't ship its own types
-  if (!hasBuiltInTypes(pkg)) {
-    const typesPkgName = getTypesPackageName(packageName)
-    const resolvedVersion = pkg.version ?? version ?? 'latest'
-
-    // Fetch both in parallel — they're independent
-    const [typesResult, fileTreeResult] = await Promise.allSettled([
-      fetchTypesPackageInfo(typesPkgName),
-      getPackageFileTree(packageName, resolvedVersion),
-    ])
-
-    if (typesResult.status === 'fulfilled') {
-      typesPackage = typesResult.value
-    }
-
-    if (fileTreeResult.status === 'fulfilled') {
-      files = flattenFileTree(fileTreeResult.value.tree)
-    }
-  }
-
-  return { pkg, typesPackage, files }
-}
-
 /**
  * Recursively analyze exports field for module format indicators
  */