@dxup/nuxt 0.2.0 → 0.2.1

package/README.md

@@ -6,14 +6,6 @@
 
 This is a TypeScript plugin that improves Nuxt DX.
 
-## Features
-
-- Update references when renaming auto imported component files
-- Go to definition for dynamic imports with glob patterns
-- Go to definition for nitro routes in data fetching methods
-- Go to definition for runtime config
-- [@dxup/unimport](/packages/unimport)
-
 ## Installation
 
 ```bash
@@ -31,3 +23,47 @@ export default defineNuxtConfig({
   ],
 });
 ```
+
+## Features
+
+### components
+
+Update references when renaming auto imported component files.
+
+### importGlob
+
+Go to definition for dynamic imports with glob patterns.
+
+```ts
+import(`~/assets/${name}.webp`);
+//     ^^^^^^^^^^^^^^^^^^^^^^^
+import.meta.glob("~/assets/*.webp");
+//               ^^^^^^^^^^^^^^^^^
+```
+
+### nitroRoutes
+
+Go to definition for nitro routes in data fetching methods.
+
+```ts
+useFetch("/api/foo");
+//       ^^^^^^^^^^
+// Also `$fetch` and `useLazyFetch`.
+```
+
+It will fallback to resolve the URL from your `public` directory when no nitro routes match.
+
+### runtimeConfig
+
+Go to definition for runtime config.
+
+```vue
+<template>
+  {{ $config.public.domain }}
+  <!--              ^^^^^^ -->
+</template>
+```
+
+### unimport
+
+Please refer to the [@dxup/unimport](/packages/unimport) package for more details.

package/dist/module.js

@@ -88,14 +88,12 @@ var module_default = defineNuxtModule({
 			write: true,
 			getContents({ nuxt: nuxt$1 }) {
 				const nitro = useNitro();
-				const nitroRoutes = options.features?.nitroRoutes && Object.fromEntries(nitro.scannedHandlers.filter((item) => item.route).map((item) => [`${item.route}+${item.method ?? "get"}`, item.handler]));
 				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)],
-					components: options.features?.components,
-					importGlob: options.features?.importGlob,
-					nitroRoutes,
-					runtimeConfig: options.features?.runtimeConfig
+					nitroRoutes: Object.fromEntries(nitro.scannedHandlers.filter((item) => item.route).map((item) => [`${item.route}+${item.method ?? "get"}`, item.handler])),
+					features: options.features
 				};
 				return JSON.stringify(data, null, 2);
 			}

package/dist/typescript.cjs

@@ -74,8 +74,8 @@ function* binaryVisit(ts, sourceFile, node, position) {
 		}
 	}
 }
-function isTextSpanEqual(node, textSpan, sourceFile) {
-	return textSpan.start + textSpan.length === node.getEnd() && textSpan.start === node.getStart(sourceFile);
+function isTextSpanWithin(node, textSpan, sourceFile) {
+	return textSpan.start + textSpan.length <= node.getEnd() && textSpan.start >= node.getStart(sourceFile);
 }
 
 //#endregion
@@ -96,8 +96,8 @@ function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
 			const checker = program$1.getTypeChecker();
 			let res;
 			for (const node of forEachTouchingNode(ts, sourceFile, args[1])) {
-				if (data.importGlob) res ??= visitImportGlob(ts, info, sourceFile, node, args[1]);
-				if (data.nitroRoutes) res ??= visitNitroRoutes(ts, checker, sourceFile, node, args[1], data.nitroRoutes);
+				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 (res) return res;
 		}
@@ -108,7 +108,7 @@ function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
 			const sourceFile = program.getSourceFile(definition.fileName);
 			if (!sourceFile) continue;
 			let result$1 = [];
-			if (data.runtimeConfig && definition.fileName.endsWith("runtime-config.d.ts")) result$1 = visitRuntimeConfig(context, sourceFile, definition);
+			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);
 				definitions.delete(definition);
@@ -159,8 +159,8 @@ function visitImportGlob(ts, info, sourceFile, node, position) {
 		}))
 	};
 }
-function visitNitroRoutes(ts, checker, sourceFile, node, position, nitroRoutes) {
-	if (!ts.isCallExpression(node) || !ts.isIdentifier(node.expression) || !fetchFunctions.has(node.expression.text) || !node.arguments.length) return;
+function visitNitroRoutes(ts, data, checker, sourceFile, node, position) {
+	if (!ts.isCallExpression(node) || !ts.isIdentifier(node.expression) || !fetchFunctions.has(node.expression.text) || !node.arguments.length || !ts.isStringLiteralLike(node.arguments[0])) return;
 	const firstArg = node.arguments[0];
 	const start = firstArg.getStart(sourceFile);
 	const end = firstArg.getEnd();
@@ -178,11 +178,16 @@ function visitNitroRoutes(ts, checker, sourceFile, node, position, nitroRoutes)
 		routeType = typeArguments?.[2];
 		methodType = typeArguments?.[3];
 	}
-	if (!routeType?.isStringLiteral()) return;
 	const paths = [];
-	for (const type of methodType?.isUnion() ? methodType.types : [methodType]) if (type?.isStringLiteral()) {
-		const path = nitroRoutes[`${routeType.value}+${type.value}`];
-		if (path !== void 0) paths.push(path);
+	if (routeType?.isStringLiteral()) {
+		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);
+		}
+	}
+	if (!paths.length && firstArg.text.startsWith("/")) {
+		const fallback = (0, pathe.join)(data.publicDir, firstArg.text);
+		if (ts.sys.fileExists(fallback)) paths.push(fallback);
 	}
 	return {
 		textSpan: {
@@ -211,7 +216,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;
-			if (isTextSpanEqual(node.name, definition.textSpan, sourceFile)) {
+			if (isTextSpanWithin(node.name, definition.textSpan, sourceFile)) {
 				path.push(key);
 				definitions = [...forwardRuntimeConfig(context, definition, path)];
 				break;
@@ -303,7 +308,7 @@ function getEditsForFileRename(context, getEditsForFileRename$1) {
 		const references = {};
 		for (const change of result) {
 			const { fileName, textChanges } = change;
-			if (data.components && fileName.endsWith("components.d.ts")) {
+			if (data.features.components && fileName.endsWith("components.d.ts")) {
 				const sourceFile = program.getSourceFile(fileName);
 				if (!sourceFile) continue;
 				for (const { span } of textChanges) for (const node of forEachTouchingNode(ts, sourceFile, span.start)) {
@@ -358,11 +363,15 @@ var typescript_default = plugin;
 function createData(ts, info) {
 	const initialValue = {
 		buildDir: "",
+		publicDir: "",
 		configFiles: [],
-		components: true,
-		importGlob: true,
 		nitroRoutes: {},
-		runtimeConfig: true
+		features: {
+			components: true,
+			importGlob: true,
+			nitroRoutes: true,
+			runtimeConfig: true
+		}
 	};
 	const path = (0, pathe.join)(info.languageServiceHost.getCurrentDirectory(), "dxup/data.json");
 	const data = {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dxup/nuxt",
   "type": "module",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "TypeScript plugin for Nuxt",
   "author": "KazariEX",
   "license": "MIT",
@@ -16,18 +16,18 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "^4.1.3",
+    "@nuxt/kit": "^4.2.0",
     "chokidar": "^4.0.3",
-    "pathe": "2.0.3",
+    "pathe": "^2.0.3",
     "tinyglobby": "^0.2.15",
-    "@dxup/unimport": "^0.1.0"
+    "@dxup/unimport": "^0.1.1"
   },
   "devDependencies": {
     "@dxup/shared": "",
     "@volar/language-core": "^2.4.23",
     "@volar/typescript": "^2.4.23",
-    "@vue/language-core": "^3.1.1",
-    "nuxt": "^4.1.3",
+    "@vue/language-core": "^3.1.3",
+    "nuxt": "^4.2.0",
     "typescript": "^5.9.3"
   },
   "scripts": {