@dxup/nuxt 0.0.5 → 0.1.0

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/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) {
@@ -92,7 +92,7 @@ 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);
@@ -101,11 +101,10 @@ function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
 				const resolvedSignature = checker.getResolvedSignature(node);
 				if (!resolvedSignature) break;
 				const typeArguments = checker.getTypeArgumentsForResolvedSignature(resolvedSignature);
-				const routeType = typeArguments?.[2];
-				const methodtype = typeArguments?.[3];
-				if (!routeType?.isStringLiteral() || !methodtype?.isStringLiteral()) break;
+				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 method = methodType.value;
 				const path = (0, pathe.join)(data.serverDir, `${route}.${method}.ts`);
 				return {
 					textSpan: {
@@ -130,7 +129,6 @@ function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
 		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 +136,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,7 +149,7 @@ 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)) {
@@ -162,7 +159,7 @@ function visitRuntimeConfig(context, sourceFile, definition) {
 			const end = node.name.getEnd();
 			if (start === textSpan.start && end - start === textSpan.length) {
 				path.push(key);
-				definitions = [...proxyRuntimeConfig(context, definition, path)];
+				definitions = [...forwardRuntimeConfig(context, definition, path)];
 				break;
 			}
 		}
@@ -170,7 +167,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 +246,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 +264,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);
+		});
 	};
 }
 
@@ -285,20 +282,18 @@ const plugin = (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: {
+				buildDir: currentDirectory,
+				configFiles: [],
+				components: true,
+				nitroRoutes: true,
+				runtimeConfig: true,
+				...JSON.parse(ts.sys.readFile(path) ?? "{}")
+			},
+			server: createEventServer(info)
 		};
 		setTimeout(() => {
 			context.language = (info.project.__vue__ ?? info.project["program"]?.__vue__)?.language;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@dxup/nuxt",
   "type": "module",
-  "version": "0.0.5",
-  "description": "TypeScript plugins for Nuxt",
+  "version": "0.1.0",
+  "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",