Merge branch 'main' into resolve

# Conflicts:
#	src/commands/open-file-in-npmx.ts
#	src/constants.ts
#	src/providers/completion-item/index.ts
#	src/providers/completion-item/version.ts
#	src/providers/diagnostics/index.ts
#	src/providers/diagnostics/rules/engine-mismatch.ts
#	src/utils/document.ts
#	src/utils/file.ts
#	src/utils/resolve.ts
#	tests/diagnostics/context.ts

Author: 9romise

src/commands/open-file-in-npmx.ts

@@ -1,6 +1,6 @@
 import { PACKAGE_JSON_BASENAME } from '#constants'
 import { logger } from '#state'
-import { getPackageManifest } from '#utils/document'
+import { readPackageManifest } from '#utils/file'
 import { npmxFileUrl } from '#utils/links'
 import { env, Uri, window } from 'vscode'
 import { findUp } from 'vscode-find-up'
@@ -27,7 +27,7 @@ export async function openFileInNpmx(fileUri?: Uri) {
   const pkgJsonUri = await findUp(PACKAGE_JSON_BASENAME, {
     cwd: uri,
   })
-  const manifest = pkgJsonUri ? await getPackageManifest(pkgJsonUri) : undefined
+  const manifest = pkgJsonUri ? await readPackageManifest(pkgJsonUri) : undefined
   if (!pkgJsonUri || !manifest) {
     logger.warn(`Could not resolve npmx url: ${uri.toString()}`)
     window.showWarningMessage(`npmx: Could not find package.json for ${uri.toString()}`)

src/providers/completion-item/index.ts

@@ -14,7 +14,7 @@ export function useCompletionItem() {
     const disposable = languages.registerCompletionItemProvider(
       { pattern: SUPPORTED_DOCUMENT_PATTERN },
       new VersionCompletionItemProvider(),
-      ...VERSION_TRIGGER_CHARACTERS,
+      ...VersionCompletionItemProvider.triggers,
     )
 
     onCleanup(() => disposable.dispose())

src/providers/completion-item/version.ts

@@ -7,6 +7,8 @@ import { getResolvedDependencyByOffset } from '#utils/workspace'
 import { CompletionItem, CompletionItemKind } from 'vscode'
 
 export class VersionCompletionItemProvider implements CompletionItemProvider {
+  static triggers = [':', '^', '~', '.', ...Array.from({ length: 10 }).map((_, i) => `${i}`)]
+
   async provideCompletionItems(document: TextDocument, position: Position) {
     const offset = document.offsetAt(position)
     const info = await getResolvedDependencyByOffset(document.uri, offset)

src/providers/diagnostics/rules/engine-mismatch.ts

@@ -1,8 +1,9 @@
 import type { Engines } from 'fast-npm-meta'
 import type { DiagnosticRule } from '..'
+import { isPackageManifestPath } from '#utils/file'
 import { npmxPackageUrl } from '#utils/links'
 import { formatPackageId } from '#utils/package'
-import { getWorkspaceContext, isPackageManifestPath } from '#utils/workspace'
+import { getWorkspaceContext } from '#utils/workspace'
 import Range from 'semver/classes/range'
 import intersects from 'semver/ranges/intersects'
 import subset from 'semver/ranges/subset'
@@ -48,7 +49,7 @@ export function resolveEngineMismatches(
 }
 
 export const checkEngineMismatch: DiagnosticRule = async ({ uri, dep, pkg }) => {
-  if (!isPackageManifestPath(uri.path))
+  if (!isPackageManifestPath(uri))
     return
 
   const resolvedVersion = await dep.resolvedVersion()

src/utils/document.ts src/utils/file.tssrc/utils/document.ts renamed to src/utils/file.ts

@@ -1,20 +1,24 @@
 import type { PackageManifestInfo } from '#types/extractor'
 import type { Uri } from 'vscode'
+import { PACKAGE_JSON_BASENAME } from '#constants'
 import { workspace } from 'vscode'
 
 export async function getDocumentText(uri: Uri) {
   const document = await workspace.openTextDocument(uri)
   return document.getText()
 }
 
+export function isPackageManifestPath(uri: Uri) {
+  return uri.path.endsWith(`/${PACKAGE_JSON_BASENAME}`)
+}
 /**
  * Reads and parses a `package.json` file.
  *
  * @param pkgJsonUri The URI of the `package.json` file.
  * @returns A promise that resolves to the parsed manifest,
  *     or `undefined` if the file is invalid or missing required fields.
  */
-export async function getPackageManifest(pkgJsonUri: Uri): Promise<PackageManifestInfo | undefined> {
+export async function readPackageManifest(pkgJsonUri: Uri): Promise<PackageManifestInfo | undefined> {
   try {
     const content = await workspace.fs.readFile(pkgJsonUri)
     const manifest = JSON.parse(new TextDecoder().decode(content)) as PackageManifestInfo

src/utils/package-manager.ts

@@ -3,14 +3,14 @@ import type { WorkspaceFolder } from 'vscode'
 import { packageManifestExtractorEntry, workspaceCatalogExtractorEntries } from '#extractors'
 import { Uri } from 'vscode'
 import { accessOk } from 'vscode-find-up'
-import { getPackageManifest } from './document'
+import { readPackageManifest } from './file'
 import { parsePackageId } from './package'
 
 export async function detectPackageManager(folder: WorkspaceFolder): Promise<PackageManager> {
   const rootPackageUri = Uri.joinPath(folder.uri, packageManifestExtractorEntry.basename)
 
   if (await accessOk(rootPackageUri)) {
-    const rootPackage = await getPackageManifest(rootPackageUri)
+    const rootPackage = await readPackageManifest(rootPackageUri)
     if (rootPackage?.packageManager) {
       const { name: packageManager } = parsePackageId(rootPackage.packageManager)
       if (packageManager)

src/utils/workspace.ts

@@ -11,17 +11,13 @@ import { memoize } from '#utils/memoize'
 import { resolveExactVersion } from '#utils/package'
 import { detectPackageManager } from '#utils/package-manager'
 import { Uri, workspace } from 'vscode'
-import { getDocumentText } from './document'
+import { getDocumentText, isPackageManifestPath } from './file'
 import { lazyInit } from './shared'
 
 type WithResolvedDependencyInfo<T> = Omit<T, 'dependencies'> & {
   dependencies: ResolvedDependencyInfo[]
 }
 
-export function isPackageManifestPath(path: string) {
-  return path.endsWith(`/${packageManifestExtractorEntry.basename}`)
-}
-
 class WorkspaceContext {
   folder: WorkspaceFolder
   packageManager: PackageManager = 'npm'
@@ -85,7 +81,7 @@ class WorkspaceContext {
     Uri,
     Promise<WithResolvedDependencyInfo<PackageManifestInfo> | undefined>
   >(async (uri) => {
-    if (!isPackageManifestPath(uri.path))
+    if (!isPackageManifestPath(uri))
       return
 
     logger.info(`[workspace-context] load package manifest info: ${uri.path}`)
@@ -145,7 +141,7 @@ export async function getResolvedDependencies(uri: Uri): Promise<ResolvedDepende
     return []
 
   return (
-    isPackageManifestPath(uri.path)
+    isPackageManifestPath(uri)
       ? await ctx.loadPackageManifestInfo(uri)
       : await ctx.loadWorkspaceCatalogInfo(uri)
   )?.dependencies