@dxup/nuxt 0.0.5 → 0.1.1

package/README.md

@@ -4,7 +4,7 @@
 [![downloads](https://img.shields.io/npm/dm/@dxup/nuxt?color=007EC7&label=downloads)](https://www.npmjs.com/package/@dxup/nuxt)
 [![license](https://img.shields.io/npm/l/@dxup/nuxt?color=007EC7&label=license)](/LICENSE)
 
-This is a collection of TypeScript plugins that improves Nuxt DX.
+This is a TypeScript plugin that improves Nuxt DX.
 
 ## Features
 

package/dist/module.d.ts

@@ -2,9 +2,25 @@ import * as _nuxt_schema0 from "@nuxt/schema";
 
 //#region src/module/index.d.ts
 interface ModuleOptions {
+  /**
+   * Whether to update references when renaming auto imported component files.
+   * @default true
+   */
   components?: boolean;
+  /**
+   * Whether to enable Go to Definition for nitro routes in data fetching methods.
+   * @default true
+   */
   nitroRoutes?: boolean;
+  /**
+   * Whether to enable Go to Definition for runtime config.
+   * @default true
+   */
   runtimeConfig?: boolean;
+  /**
+   * Whether to enable enhanced navigation for auto imported APIs.
+   * @default true
+   */
   unimport?: boolean;
 }
 declare const _default: _nuxt_schema0.NuxtModule<ModuleOptions, ModuleOptions, false>;

package/dist/module.js

@@ -1,4 +1,4 @@
-import { addTemplate, defineNuxtModule } from "@nuxt/kit";
+import { addTemplate, defineNuxtModule, useNitro } from "@nuxt/kit";
 import { Buffer } from "node:buffer";
 import EventEmitter from "node:events";
 import { mkdir, open, readFile, writeFile } from "node:fs/promises";
@@ -85,13 +85,14 @@ var module_default = defineNuxtModule({
 		addTemplate({
 			filename: "dxup/data.json",
 			write: true,
-			getContents() {
+			getContents({ nuxt: nuxt$1 }) {
+				const nitro = useNitro();
+				const nitroRoutes = options.nitroRoutes && Object.fromEntries(nitro.scannedHandlers.filter((item) => item.route).map((item) => [`${item.route}+${item.method ?? "get"}`, item.handler]));
 				const data = {
-					buildDir: nuxt.options.buildDir,
-					serverDir: nuxt.options.serverDir,
-					configFiles: [...nuxt.options._nuxtConfigFiles, ...nuxt.options._layers.map((layer) => layer._configFile).filter(Boolean)],
+					buildDir: nuxt$1.options.buildDir,
+					configFiles: [...nuxt$1.options._nuxtConfigFiles, ...nuxt$1.options._layers.map((layer) => layer._configFile).filter(Boolean)],
 					components: options.components,
-					nitroRoutes: options.nitroRoutes,
+					nitroRoutes,
 					runtimeConfig: options.runtimeConfig
 				};
 				return JSON.stringify(data, null, 2);

package/dist/typescript.cjs

@@ -50,7 +50,7 @@ function findRenameLocations(context, findRenameLocations$1) {
 
 //#endregion
 //#region ../shared/src/index.ts
-function* forEachTouchNode(ts, sourceFile, position) {
+function* forEachTouchingNode(ts, sourceFile, position) {
 	yield* binaryVisit(ts, sourceFile, sourceFile, position);
 }
 function* binaryVisit(ts, sourceFile, node, position) {
@@ -63,10 +63,8 @@ function* binaryVisit(ts, sourceFile, node, position) {
 	while (left <= right) {
 		const mid = Math.floor((left + right) / 2);
 		const node$1 = nodes[mid];
-		const start = node$1.getStart(sourceFile);
-		const end = node$1.getEnd();
-		if (position < start) right = mid - 1;
-		else if (position > end) left = mid + 1;
+		if (position > node$1.getEnd()) left = mid + 1;
+		else if (position < node$1.getStart(sourceFile)) right = mid - 1;
 		else {
 			yield node$1;
 			yield* binaryVisit(ts, sourceFile, node$1, position);
@@ -74,6 +72,9 @@ function* binaryVisit(ts, sourceFile, node, position) {
 		}
 	}
 }
+function isTextSpanEqual(node, textSpan, sourceFile) {
+	return textSpan.start + textSpan.length === node.getEnd() && textSpan.start === node.getStart(sourceFile);
+}
 
 //#endregion
 //#region src/typescript/features/getDefinitionAndBoundSpan.ts
@@ -82,7 +83,6 @@ const fetchFunctions = new Set([
 	"useFetch",
 	"useLazyFetch"
 ]);
-const nonApiRE = /^(?!\/api\/)/;
 function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
 	const { ts, info, data } = context;
 	return (...args) => {
@@ -92,27 +92,37 @@ function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
 			const sourceFile = program$1.getSourceFile(args[0]);
 			if (!sourceFile) return;
 			const checker = program$1.getTypeChecker();
-			for (const node of forEachTouchNode(ts, sourceFile, args[1])) {
+			for (const node of forEachTouchingNode(ts, sourceFile, args[1])) {
 				if (!ts.isCallExpression(node) || !ts.isIdentifier(node.expression) || !fetchFunctions.has(node.expression.text) || !node.arguments.length) continue;
 				const firstArg = node.arguments[0];
 				const start = firstArg.getStart(sourceFile);
 				const end = firstArg.getEnd();
 				if (args[1] < start || args[1] > end) continue;
 				const resolvedSignature = checker.getResolvedSignature(node);
-				if (!resolvedSignature) break;
+				if (!resolvedSignature) continue;
 				const typeArguments = checker.getTypeArgumentsForResolvedSignature(resolvedSignature);
-				const routeType = typeArguments?.[2];
-				const methodtype = typeArguments?.[3];
-				if (!routeType?.isStringLiteral() || !methodtype?.isStringLiteral()) break;
-				const route = routeType.value.replace(nonApiRE, "/routes");
-				const method = methodtype.value;
-				const path = (0, pathe.join)(data.serverDir, `${route}.${method}.ts`);
+				let routeType;
+				let methodType;
+				if (node.expression.text === "$fetch") {
+					routeType = typeArguments?.[1];
+					const symbol = typeArguments?.[2].getProperty("method");
+					methodType = symbol ? checker.getTypeOfSymbol(symbol) : void 0;
+				} else {
+					routeType = typeArguments?.[2];
+					methodType = typeArguments?.[3];
+				}
+				if (!routeType?.isStringLiteral()) continue;
+				const paths = [];
+				for (const type of methodType?.isUnion() ? methodType.types : [methodType]) if (type?.isStringLiteral()) {
+					const path = data.nitroRoutes[`${routeType.value}+${type.value}`];
+					if (path !== void 0) paths.push(path);
+				}
 				return {
 					textSpan: {
 						start,
 						length: end - start
 					},
-					definitions: [{
+					definitions: paths.map((path) => ({
 						fileName: path,
 						textSpan: {
 							start: 0,
@@ -122,15 +132,13 @@ function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
 						name: path,
 						containerKind: ts.ScriptElementKind.unknown,
 						containerName: ""
-					}]
+					}))
 				};
 			}
-			return;
 		}
 		if (!result?.definitions?.length) return result;
 		const program = info.languageService.getProgram();
 		const definitions = new Set(result.definitions);
-		const skippedDefinitions = [];
 		for (const definition of result.definitions) {
 			const sourceFile = program.getSourceFile(definition.fileName);
 			if (!sourceFile) continue;
@@ -138,10 +146,9 @@ function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
 			if (data.runtimeConfig && definition.fileName.endsWith("runtime-config.d.ts")) result$1 = visitRuntimeConfig(context, sourceFile, definition);
 			if (result$1?.length) {
 				for (const definition$1 of result$1) definitions.add(definition$1);
-				skippedDefinitions.push(definition);
+				definitions.delete(definition);
 			}
 		}
-		for (const definition of skippedDefinitions) definitions.delete(definition);
 		return {
 			definitions: [...definitions],
 			textSpan: result.textSpan
@@ -152,17 +159,14 @@ function visitRuntimeConfig(context, sourceFile, definition) {
 	const { ts } = context;
 	let definitions = [];
 	const path = [];
-	for (const node of forEachTouchNode(ts, sourceFile, definition.textSpan.start)) {
+	for (const node of forEachTouchingNode(ts, sourceFile, definition.textSpan.start)) {
 		let key;
 		if (ts.isInterfaceDeclaration(node) && ts.isIdentifier(node.name)) key = node.name.text;
 		else if (ts.isPropertySignature(node) && ts.isIdentifier(node.name)) {
 			key = node.name.text;
-			const { textSpan } = definition;
-			const start = node.name.getStart(sourceFile);
-			const end = node.name.getEnd();
-			if (start === textSpan.start && end - start === textSpan.length) {
+			if (isTextSpanEqual(node.name, definition.textSpan, sourceFile)) {
 				path.push(key);
-				definitions = [...proxyRuntimeConfig(context, definition, path)];
+				definitions = [...forwardRuntimeConfig(context, definition, path)];
 				break;
 			}
 		}
@@ -170,7 +174,7 @@ function visitRuntimeConfig(context, sourceFile, definition) {
 	}
 	return definitions;
 }
-function* proxyRuntimeConfig(context, definition, path) {
+function* forwardRuntimeConfig(context, definition, path) {
 	const { ts, info, data } = context;
 	switch (path[0]) {
 		case "SharedRuntimeConfig":
@@ -249,14 +253,13 @@ function getEditsForFileRename(context, getEditsForFileRename$1) {
 		const result = getEditsForFileRename$1(...args);
 		if (!result?.length) return result;
 		const program = info.languageService.getProgram();
-		const changes = [];
 		const references = {};
 		for (const change of result) {
 			const { fileName, textChanges } = change;
 			if (data.components && fileName.endsWith("components.d.ts")) {
 				const sourceFile = program.getSourceFile(fileName);
 				if (!sourceFile) continue;
-				for (const { span } of textChanges) for (const node of forEachTouchNode(ts, sourceFile, span.start)) {
+				for (const { span } of textChanges) for (const node of forEachTouchingNode(ts, sourceFile, span.start)) {
 					if (!ts.isPropertySignature(node) && !ts.isVariableDeclaration(node)) continue;
 					const position = node.name.getStart(sourceFile);
 					const res = info.languageService.getReferencesAtPosition(fileName, position)?.filter((entry) => !entry.fileName.startsWith(data.buildDir));
@@ -268,13 +271,14 @@ function getEditsForFileRename(context, getEditsForFileRename$1) {
 					break;
 				}
 			}
-			if (!fileName.startsWith(data.buildDir)) changes.push(change);
 		}
 		if (Object.keys(references).length) server.write("components:rename", {
 			fileName: args[1],
 			references
 		});
-		return changes;
+		return result.filter((change) => {
+			return !change.fileName.startsWith(data.buildDir);
+		});
 	};
 }
 
@@ -283,22 +287,11 @@ function getEditsForFileRename(context, getEditsForFileRename$1) {
 const plugin = (module$1) => {
 	const { typescript: ts } = module$1;
 	return { create(info) {
-		const currentDirectory = info.languageServiceHost.getCurrentDirectory();
-		const path = (0, pathe.join)(currentDirectory, "dxup/data.json");
-		const data = {
-			buildDir: currentDirectory,
-			configFiles: [],
-			components: true,
-			nitroRoutes: true,
-			runtimeConfig: true,
-			...JSON.parse(ts.sys.readFile(path) ?? "{}")
-		};
-		const server = createEventServer(info);
 		const context = {
 			ts,
 			info,
-			data,
-			server
+			data: createData(ts, info),
+			server: createEventServer(info)
 		};
 		setTimeout(() => {
 			context.language = (info.project.__vue__ ?? info.project["program"]?.__vue__)?.language;
@@ -315,6 +308,27 @@ const plugin = (module$1) => {
 	} };
 };
 var typescript_default = plugin;
+function createData(ts, info) {
+	const initialValue = {
+		buildDir: "",
+		configFiles: [],
+		components: true,
+		nitroRoutes: {},
+		runtimeConfig: true
+	};
+	const path = (0, pathe.join)(info.languageServiceHost.getCurrentDirectory(), "dxup/data.json");
+	const data = {};
+	update();
+	ts.sys.watchFile?.(path, update);
+	return data;
+	function update() {
+		const text = ts.sys.readFile(path);
+		Object.assign(data, {
+			...initialValue,
+			...text ? JSON.parse(text) : {}
+		});
+	}
+}
 
 //#endregion
 module.exports = typescript_default;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@dxup/nuxt",
   "type": "module",
-  "version": "0.0.5",
-  "description": "TypeScript plugins for Nuxt",
+  "version": "0.1.1",
+  "description": "TypeScript plugin for Nuxt",
   "author": "KazariEX",
   "license": "MIT",
   "repository": "KazariEX/dxup",
@@ -16,18 +16,18 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "^4.1.2",
+    "@nuxt/kit": "^4.1.3",
     "chokidar": "^4.0.3",
     "pathe": "2.0.3",
-    "@dxup/unimport": "^0.0.1"
+    "@dxup/unimport": "^0.1.0"
   },
   "devDependencies": {
     "@dxup/shared": "",
     "@volar/language-core": "^2.4.23",
     "@volar/typescript": "^2.4.23",
-    "@vue/language-core": "^3.0.8",
-    "nuxt": "^4.1.2",
-    "typescript": "^5.9.2"
+    "@vue/language-core": "^3.1.1",
+    "nuxt": "^4.1.3",
+    "typescript": "^5.9.3"
   },
   "scripts": {
     "build": "tsdown",