@dxup/nuxt 0.2.2 → 0.3.1

package/README.md

@@ -11,21 +11,23 @@ This is a TypeScript plugin that improves Nuxt DX.
 
 ## Installation
 
-```bash
-pnpm i -D @dxup/nuxt
-```
+*No installation is required if you are using Nuxt 4.2 or above.*
 
 ## Usage
 
-Add the following to your `nuxt.config.ts`:
+1. Have `@dxup/unimport` installed as a dependency if you haven't enabled the `shamefullyHoist` option with pnpm workspace.
 
-```ts
-export default defineNuxtConfig({
-  modules: [
-    "@dxup/nuxt",
-  ],
-});
-```
+2. Add the following to your `nuxt.config.ts`:
+
+   ```ts
+   export default defineNuxtConfig({
+     experimental: {
+       typescriptPlugin: true,
+     },
+   });
+   ```
+
+3. Run `nuxt prepare` and restart the tsserver.
 
 ## Features
 
@@ -71,6 +73,27 @@ Go to definition for runtime config.
 </template>
 ```
 
-### 5. unimport
+### 5. typedPages
+
+Go to definition for typed pages.
+
+```vue
+<template>
+  <nuxt-link :to="{ name: `about` }"/>
+  <!--                    ^^^^^^^ -->
+</template>
+```
+
+It can be triggered on the `name` property of an object literal constrained by the `RouteLocationRaw` type.
+
+### 6. unimport
+
+Find references for SFC on `<template>`.
+
+```vue
+....<template>
+<!-- ^^^^^^^^ -->
+</template>
+```
 
 Please refer to the [@dxup/unimport](/packages/unimport) package for more details.

package/dist/module.d.mts

@@ -23,13 +23,32 @@ interface ModuleOptions {
      * @default true
      */
     runtimeConfig?: boolean;
+    /**
+     * Whether to enable Go to Definition for typed pages.
+     * @default true
+     */
+    typedPages?: boolean;
     /**
      * Whether to enable enhanced navigation for auto imported APIs.
      * @default true
      */
-    unimport?: boolean;
+    unimport?: boolean | {
+      /**
+       * Whether to enable Find References for SFC on `<template>`.
+       */
+      componentReferences: boolean;
+    };
   };
 }
-declare const _default: _nuxt_schema0.NuxtModule<ModuleOptions, ModuleOptions, false>;
+declare const _default: _nuxt_schema0.NuxtModule<ModuleOptions, {
+  features: {
+    components: true;
+    importGlob: true;
+    nitroRoutes: true;
+    runtimeConfig: true;
+    typedPages: true;
+    unimport: true;
+  };
+}, true>;
 //#endregion
 export { ModuleOptions, _default as default };

package/dist/module.mjs

@@ -64,7 +64,7 @@ async function onComponentsRename(nuxt, { fileName, references }) {
 
 //#endregion
 //#region src/module/index.ts
-var module_default = defineNuxtModule({
+var module_default = defineNuxtModule().with({
 	meta: {
 		name,
 		configKey: "dxup"
@@ -74,6 +74,7 @@ var module_default = defineNuxtModule({
 		importGlob: true,
 		nitroRoutes: true,
 		runtimeConfig: true,
+		typedPages: true,
 		unimport: true
 	} },
 	async setup(options, nuxt) {
@@ -86,14 +87,21 @@ var module_default = defineNuxtModule({
 		addTemplate({
 			filename: "dxup/data.json",
 			write: true,
-			getContents({ nuxt: nuxt$1 }) {
-				const nitro = useNitro();
+			getContents({ nuxt: nuxt$1, app }) {
+				const nitroRoutes = useNitro().scannedHandlers.reduce((acc, item) => {
+					if (item.route && item.method) (acc[item.route] ??= {})[item.method] = item.handler;
+					return acc;
+				}, {});
 				const data = {
 					buildDir: nuxt$1.options.buildDir,
 					publicDir: nuxt$1.options.dir.public,
 					configFiles: [...nuxt$1.options._nuxtConfigFiles, ...nuxt$1.options._layers.map((layer) => layer._configFile).filter(Boolean)],
-					nitroRoutes: Object.fromEntries(nitro.scannedHandlers.filter((item) => item.route).map((item) => [`${item.route}+${item.method ?? "get"}`, item.handler])),
-					features: options.features
+					nitroRoutes,
+					typedPages: Object.fromEntries(app.pages?.map((page) => [page.name, page.file]) ?? []),
+					features: {
+						...options.features,
+						unimport: { componentReferences: typeof options.features.unimport === "object" ? options.features.unimport.componentReferences : options.features.unimport }
+					}
 				};
 				return JSON.stringify(data, null, 2);
 			}

package/dist/typescript.cjs

@@ -1,3 +1,20 @@
+//#region rolldown:runtime
+var __defProp = Object.defineProperty;
+var __export = (all, symbols) => {
+	let target = {};
+	for (var name in all) {
+		__defProp(target, name, {
+			get: all[name],
+			enumerable: true
+		});
+	}
+	if (symbols) {
+		__defProp(target, Symbol.toStringTag, { value: "Module" });
+	}
+	return target;
+};
+
+//#endregion
 let node_fs_promises = require("node:fs/promises");
 let pathe = require("pathe");
 let tinyglobby = require("tinyglobby");
@@ -20,11 +37,14 @@ const initialValue = {
 	publicDir: "",
 	configFiles: [],
 	nitroRoutes: {},
+	typedPages: {},
 	features: {
 		components: true,
 		importGlob: true,
 		nitroRoutes: true,
-		runtimeConfig: true
+		runtimeConfig: true,
+		typedPages: true,
+		unimport: { componentReferences: true }
 	}
 };
 const callbacks = {};
@@ -46,12 +66,94 @@ function createData(ts, info) {
 	return data;
 }
 
+//#endregion
+//#region src/typescript/utils.ts
+function createModuleDefinition(ts, path) {
+	return {
+		fileName: path,
+		textSpan: {
+			start: 0,
+			length: 0
+		},
+		kind: ts.ScriptElementKind.moduleElement,
+		name: `"${path}"`,
+		containerKind: ts.ScriptElementKind.unknown,
+		containerName: ""
+	};
+}
+function isVueVirtualCode(code) {
+	return code?.languageId === "vue";
+}
+function toSourceSpan(language, fileName, textSpan) {
+	const sourceScript = language?.scripts.get(fileName);
+	if (!sourceScript?.generated) return;
+	const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
+	if (!serviceScript) return;
+	const map = language.maps.get(serviceScript.code, sourceScript);
+	const leadingOffset = sourceScript.snapshot.getLength();
+	for (const [start, end] of map.toSourceRange(textSpan.start - leadingOffset, textSpan.start + textSpan.length - leadingOffset, false)) return {
+		start,
+		length: end - start
+	};
+}
+function withVirtualOffset(language, sourceScript, position, method) {
+	const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
+	if (!serviceScript) return;
+	const map = language.maps.get(serviceScript.code, sourceScript);
+	const leadingOffset = sourceScript.snapshot.getLength();
+	const offset = 1145141919810;
+	const mapping = {
+		sourceOffsets: [offset],
+		generatedOffsets: [position - leadingOffset],
+		lengths: [0],
+		data: {
+			completion: true,
+			navigation: true,
+			semantic: true,
+			verification: true
+		}
+	};
+	const original = map.toGeneratedLocation;
+	map.toGeneratedLocation = function* (sourceOffset, ...args) {
+		if (sourceOffset === offset) yield [mapping.generatedOffsets[0], mapping];
+		yield* original.call(this, sourceOffset, ...args);
+	};
+	try {
+		return method(offset);
+	} finally {
+		map.toGeneratedLocation = original;
+	}
+}
+
+//#endregion
+//#region src/typescript/features/findReferences.ts
+var findReferences_exports = /* @__PURE__ */ __export({ postprocess: () => postprocess$1 });
+function postprocess$1(context, language, findReferences) {
+	const { ts, info } = context;
+	return (...args) => {
+		const result = findReferences(...args);
+		if (!result?.length) {
+			const sourceScript = language.scripts.get(args[0]);
+			const root = sourceScript?.generated?.root;
+			if (!isVueVirtualCode(root)) return;
+			const start = (root.sfc.template?.start ?? Infinity) + 1;
+			if (args[1] < start || args[1] > start + 8) return;
+			const sourceFile = info.languageService.getProgram().getSourceFile(args[0]);
+			if (!sourceFile) return;
+			for (const statement of sourceFile.statements) if (ts.isExportAssignment(statement)) return withVirtualOffset(language, sourceScript, statement.getChildAt(1).getStart(sourceFile), (position) => findReferences(args[0], position));
+			return;
+		}
+		return result;
+	};
+}
+
 //#endregion
 //#region src/typescript/features/findRenameLocations.ts
-function findRenameLocations(context, findRenameLocations$1) {
+var findRenameLocations_exports = /* @__PURE__ */ __export({ preprocess: () => preprocess$2 });
+function preprocess$2(context, findRenameLocations) {
 	const { data } = context;
 	return (...args) => {
-		return findRenameLocations$1(...args)?.filter((edit) => {
+		return findRenameLocations(...args)?.filter((edit) => {
 			return !edit.fileName.startsWith(data.buildDir);
 		});
 	};
@@ -87,26 +189,58 @@ function isTextSpanWithin(node, textSpan, sourceFile) {
 
 //#endregion
 //#region src/typescript/features/getDefinitionAndBoundSpan.ts
+var getDefinitionAndBoundSpan_exports = /* @__PURE__ */ __export({
+	postprocess: () => postprocess,
+	preprocess: () => preprocess$1
+});
 const fetchFunctions = new Set([
 	"$fetch",
 	"useFetch",
 	"useLazyFetch"
 ]);
-function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
+function postprocess(context, language, getDefinitionAndBoundSpan) {
+	const { ts } = context;
+	return (...args) => {
+		const result = getDefinitionAndBoundSpan(...args);
+		if (!result?.definitions?.length) {
+			const root = language.scripts.get(args[0])?.generated?.root;
+			if (!isVueVirtualCode(root)) return result;
+			const textSpan = {
+				start: (root.sfc.template?.start ?? Infinity) + 1,
+				length: 8
+			};
+			if (args[1] >= textSpan.start && args[1] <= textSpan.start + textSpan.length) return {
+				textSpan,
+				definitions: [{
+					fileName: args[0],
+					textSpan,
+					kind: ts.ScriptElementKind.memberVariableElement,
+					name: "default",
+					containerKind: ts.ScriptElementKind.unknown,
+					containerName: args[0]
+				}]
+			};
+			return result;
+		}
+		return result;
+	};
+}
+function preprocess$1(context, getDefinitionAndBoundSpan) {
 	const { ts, info, data } = context;
 	return (...args) => {
-		const result = getDefinitionAndBoundSpan$1(...args);
+		const result = getDefinitionAndBoundSpan(...args);
 		if (!result) {
 			const program$1 = info.languageService.getProgram();
 			const sourceFile = program$1.getSourceFile(args[0]);
 			if (!sourceFile) return;
 			const checker = program$1.getTypeChecker();
-			let res;
+			let result$1;
 			for (const node of forEachTouchingNode(ts, sourceFile, args[1])) {
-				if (data.features.importGlob) res ??= visitImportGlob(ts, info, sourceFile, node, args[1]);
-				if (data.features.nitroRoutes) res ??= visitNitroRoutes(ts, data, checker, sourceFile, node, args[1]);
+				if (data.features.importGlob) result$1 ??= visitImportGlob(ts, info, sourceFile, node, args[1]);
+				if (data.features.nitroRoutes) result$1 ??= visitNitroRoutes(ts, data, checker, sourceFile, node, args[1]);
+				if (data.features.typedPages) result$1 ??= visitTypedPages(ts, data, checker, sourceFile, node, args[1]);
 			}
-			if (res) return res;
+			if (result$1) return result$1;
 		}
 		if (!result?.definitions?.length) return result;
 		const program = info.languageService.getProgram();
@@ -114,7 +248,7 @@ function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
 		for (const definition of result.definitions) {
 			const sourceFile = program.getSourceFile(definition.fileName);
 			if (!sourceFile) continue;
-			let result$1 = [];
+			let result$1;
 			if (data.features.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);
@@ -153,17 +287,7 @@ function visitImportGlob(ts, info, sourceFile, node, position) {
 			start,
 			length: end - start
 		},
-		definitions: fileNames.map((fileName) => ({
-			fileName,
-			textSpan: {
-				start: 0,
-				length: 0
-			},
-			kind: ts.ScriptElementKind.unknown,
-			name: fileName,
-			containerKind: ts.ScriptElementKind.unknown,
-			containerName: ""
-		}))
+		definitions: fileNames.map((fileName) => createModuleDefinition(ts, fileName))
 	};
 }
 function visitNitroRoutes(ts, data, checker, sourceFile, node, position) {
@@ -187,8 +311,11 @@ function visitNitroRoutes(ts, data, checker, sourceFile, node, position) {
 	}
 	const paths = [];
 	if (routeType?.isStringLiteral()) {
-		for (const type of methodType?.isUnion() ? methodType.types : [methodType]) if (type?.isStringLiteral()) {
-			const path = data.nitroRoutes[`${routeType.value}+${type.value}`];
+		const alternatives = data.nitroRoutes[routeType.value] ?? {};
+		const methods = [];
+		for (const type of methodType?.isUnion() ? methodType.types : [methodType]) if (type?.isStringLiteral()) methods.push(type.value);
+		for (const method of methods.length ? methods : Object.keys(alternatives)) {
+			const path = alternatives[method];
 			if (path !== void 0) paths.push(path);
 		}
 	}
@@ -201,17 +328,23 @@ function visitNitroRoutes(ts, data, checker, sourceFile, node, position) {
 			start,
 			length: end - start
 		},
-		definitions: paths.map((path) => ({
-			fileName: path,
-			textSpan: {
-				start: 0,
-				length: 0
-			},
-			kind: ts.ScriptElementKind.scriptElement,
-			name: path,
-			containerKind: ts.ScriptElementKind.unknown,
-			containerName: ""
-		}))
+		definitions: paths.map((path) => createModuleDefinition(ts, path))
+	};
+}
+function visitTypedPages(ts, data, checker, sourceFile, node, position) {
+	if (!ts.isPropertyAssignment(node) || !ts.isIdentifier(node.name) || node.name.text !== "name" || !ts.isStringLiteralLike(node.initializer)) return;
+	const start = node.initializer.getStart(sourceFile);
+	const end = node.initializer.getEnd();
+	if (position < start || position > end) return;
+	if (checker.getContextualType(node.parent)?.getNonNullableType().aliasSymbol?.name !== "RouteLocationRaw") return;
+	const path = data.typedPages[node.initializer.text];
+	if (path === void 0) return;
+	return {
+		textSpan: {
+			start,
+			length: end - start
+		},
+		definitions: [createModuleDefinition(ts, path)]
 	};
 }
 function visitRuntimeConfig(context, sourceFile, definition) {
@@ -289,27 +422,13 @@ function* forwardRuntimeConfig(context, definition, path) {
 	}
 }
 
-//#endregion
-//#region src/typescript/utils.ts
-function toSourceSpan(language, fileName, textSpan) {
-	const sourceScript = language?.scripts.get(fileName);
-	if (!sourceScript?.generated) return;
-	const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
-	if (!serviceScript) return;
-	const map = language.maps.get(serviceScript.code, sourceScript);
-	const leadingOffset = sourceScript.snapshot.getLength();
-	for (const [start, end] of map.toSourceRange(textSpan.start - leadingOffset, textSpan.start + textSpan.length - leadingOffset, false)) return {
-		start,
-		length: end - start
-	};
-}
-
 //#endregion
 //#region src/typescript/features/getEditsForFileRename.ts
-function getEditsForFileRename(context, getEditsForFileRename$1) {
+var getEditsForFileRename_exports = /* @__PURE__ */ __export({ preprocess: () => preprocess });
+function preprocess(context, getEditsForFileRename) {
 	const { ts, info, data, server } = context;
 	return (...args) => {
-		const result = getEditsForFileRename$1(...args);
+		const result = getEditsForFileRename(...args);
 		if (!result?.length) return result;
 		const program = info.languageService.getProgram();
 		const references = {};
@@ -346,22 +465,38 @@ function getEditsForFileRename(context, getEditsForFileRename$1) {
 const plugin = (module$1) => {
 	const { typescript: ts } = module$1;
 	return { create(info) {
+		const data = createData(ts, info);
 		const context = {
 			ts,
 			info,
-			data: createData(ts, info),
+			data,
 			server: createEventServer(info)
 		};
-		setTimeout(() => {
-			context.language = (info.project.__vue__ ?? info.project["program"]?.__vue__)?.language;
-		}, 500);
+		queueMicrotask(() => {
+			context.language = info.project.__vue__?.language;
+			if (!context.language || !data.features.unimport.componentReferences) return;
+			const languageService = info.project.getLanguageService();
+			const methods = {};
+			for (const [key, method] of [["findReferences", findReferences_exports], ["getDefinitionAndBoundSpan", getDefinitionAndBoundSpan_exports]]) {
+				const original = languageService[key];
+				methods[key] = method.postprocess(context, context.language, original);
+			}
+			info.project["languageService"] = new Proxy(languageService, {
+				get(target, p, receiver) {
+					return methods[p] ?? Reflect.get(target, p, receiver);
+				},
+				set(...args) {
+					return Reflect.set(...args);
+				}
+			});
+		});
 		for (const [key, method] of [
-			["findRenameLocations", findRenameLocations],
-			["getDefinitionAndBoundSpan", getDefinitionAndBoundSpan],
-			["getEditsForFileRename", getEditsForFileRename]
+			["findRenameLocations", findRenameLocations_exports],
+			["getDefinitionAndBoundSpan", getDefinitionAndBoundSpan_exports],
+			["getEditsForFileRename", getEditsForFileRename_exports]
 		]) {
 			const original = info.languageService[key];
-			info.languageService[key] = method(context, original);
+			info.languageService[key] = method.preprocess(context, original);
 		}
 		return info.languageService;
 	} };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dxup/nuxt",
   "type": "module",
-  "version": "0.2.2",
+  "version": "0.3.1",
   "description": "TypeScript plugin for Nuxt",
   "author": "KazariEX",
   "license": "MIT",
@@ -16,18 +16,18 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "^4.2.1",
-    "chokidar": "^4.0.3",
+    "@nuxt/kit": "^4.2.2",
+    "chokidar": "^5.0.0",
     "pathe": "^2.0.3",
     "tinyglobby": "^0.2.15",
     "@dxup/unimport": "^0.1.2"
   },
   "devDependencies": {
     "@dxup/shared": "",
-    "@volar/language-core": "^2.4.23",
-    "@volar/typescript": "^2.4.23",
-    "@vue/language-core": "^3.1.3",
-    "nuxt": "^4.2.1",
+    "@volar/language-core": "^2.4.26",
+    "@volar/typescript": "^2.4.26",
+    "@vue/language-core": "^3.1.8",
+    "nuxt": "^4.2.2",
     "typescript": "^5.9.3"
   },
   "scripts": {