@dxup/nuxt 0.1.0 → 0.1.1

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

@@ -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) => {
@@ -99,19 +99,30 @@ function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
 				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, methodType] = (node.expression.text === "$fetch" ? typeArguments?.[2] && checker.getTypeArguments(typeArguments?.[2]) : typeArguments?.slice(2)) ?? [];
-				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,
@@ -121,10 +132,9 @@ function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
 						name: path,
 						containerKind: ts.ScriptElementKind.unknown,
 						containerName: ""
-					}]
+					}))
 				};
 			}
-			return;
 		}
 		if (!result?.definitions?.length) return result;
 		const program = info.languageService.getProgram();
@@ -154,10 +164,7 @@ function visitRuntimeConfig(context, sourceFile, definition) {
 		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 = [...forwardRuntimeConfig(context, definition, path)];
 				break;
@@ -280,19 +287,10 @@ 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 context = {
 			ts,
 			info,
-			data: {
-				buildDir: currentDirectory,
-				configFiles: [],
-				components: true,
-				nitroRoutes: true,
-				runtimeConfig: true,
-				...JSON.parse(ts.sys.readFile(path) ?? "{}")
-			},
+			data: createData(ts, info),
 			server: createEventServer(info)
 		};
 		setTimeout(() => {
@@ -310,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,7 +1,7 @@
 {
   "name": "@dxup/nuxt",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "TypeScript plugin for Nuxt",
   "author": "KazariEX",
   "license": "MIT",