@dxup/nuxt 0.0.4 → 0.0.5

package/README.md

@@ -4,12 +4,12 @@
 [![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 and Vue plugins that improves Nuxt DX.
+This is a collection of TypeScript plugins that improves Nuxt DX.
 
 ## Features
 
 - Update references when renaming auto imported component files
-- Go to definition for nitro routes in data fetching methods within Vue files
+- Go to definition for nitro routes in data fetching methods
 - Go to definition for runtime config
 - [@dxup/unimport](/packages/unimport)
 

package/dist/module.js

@@ -77,20 +77,18 @@ var module_default = defineNuxtModule({
 	},
 	async setup(options, nuxt) {
 		const pluginsTs = [{ name: "@dxup/nuxt" }];
-		const pluginsVue = [];
-		if (options.nitroRoutes) pluginsVue.push("@dxup/nuxt/vue/nitro-routes");
 		if (options.unimport) pluginsTs.unshift({ name: "@dxup/unimport" });
 		append(pluginsTs, nuxt.options, "typescript", "tsConfig", "compilerOptions");
 		append(pluginsTs, nuxt.options.nitro, "typescript", "tsConfig", "compilerOptions");
 		append(pluginsTs, nuxt.options, "typescript", "sharedTsConfig", "compilerOptions");
 		append(pluginsTs, nuxt.options, "typescript", "nodeTsConfig", "compilerOptions");
-		append(pluginsVue, nuxt.options, "typescript", "tsConfig", "vueCompilerOptions");
 		addTemplate({
 			filename: "dxup/data.json",
 			write: true,
 			getContents() {
 				const data = {
 					buildDir: nuxt.options.buildDir,
+					serverDir: nuxt.options.serverDir,
 					configFiles: [...nuxt.options._nuxtConfigFiles, ...nuxt.options._layers.map((layer) => layer._configFile).filter(Boolean)],
 					components: options.components,
 					nitroRoutes: options.nitroRoutes,

package/dist/typescript.cjs

@@ -21,7 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-const require_src = require('./src-BfXMgjZD.cjs');
 let pathe = require("pathe");
 pathe = __toESM(pathe);
 let node_fs_promises = require("node:fs/promises");
@@ -30,49 +29,16 @@ node_fs_promises = __toESM(node_fs_promises);
 //#region src/event/server.ts
 function createEventServer(info) {
 	const path = (0, pathe.join)(info.project.getCurrentDirectory(), "dxup/events.md");
-	function write(key, data) {
-		return (0, node_fs_promises.appendFile)(path, `\`\`\`json {${key}}\n${JSON.stringify(data, null, 2)}\n\`\`\`\n`).catch();
+	async function write(key, data) {
+		try {
+			await (0, node_fs_promises.appendFile)(path, `\`\`\`json {${key}}\n${JSON.stringify(data, null, 2)}\n\`\`\`\n`);
+		} catch {}
 	}
 	return { write };
 }
 
 //#endregion
-//#region src/typescript/index.ts
-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
-		};
-		setTimeout(() => {
-			context.language = (info.project.__vue__ ?? info.project["program"]?.__vue__)?.language;
-		}, 500);
-		for (const [key, method] of [
-			["findRenameLocations", findRenameLocations.bind(null, context)],
-			["getDefinitionAndBoundSpan", getDefinitionAndBoundSpan.bind(null, context)],
-			["getEditsForFileRename", getEditsForFileRename.bind(null, context)]
-		]) {
-			const original = info.languageService[key];
-			info.languageService[key] = method(original);
-		}
-		return info.languageService;
-	} };
-};
-var typescript_default = plugin;
+//#region src/typescript/features/findRenameLocations.ts
 function findRenameLocations(context, findRenameLocations$1) {
 	const { data } = context;
 	return (...args) => {
@@ -81,10 +47,86 @@ function findRenameLocations(context, findRenameLocations$1) {
 		});
 	};
 }
+
+//#endregion
+//#region ../shared/src/index.ts
+function* forEachTouchNode(ts, sourceFile, position) {
+	yield* binaryVisit(ts, sourceFile, sourceFile, position);
+}
+function* binaryVisit(ts, sourceFile, node, position) {
+	const nodes = [];
+	ts.forEachChild(node, (child) => {
+		nodes.push(child);
+	});
+	let left = 0;
+	let right = nodes.length - 1;
+	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;
+		else {
+			yield node$1;
+			yield* binaryVisit(ts, sourceFile, node$1, position);
+			return;
+		}
+	}
+}
+
+//#endregion
+//#region src/typescript/features/getDefinitionAndBoundSpan.ts
+const fetchFunctions = new Set([
+	"$fetch",
+	"useFetch",
+	"useLazyFetch"
+]);
+const nonApiRE = /^(?!\/api\/)/;
 function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
-	const { info, data } = context;
+	const { ts, info, data } = context;
 	return (...args) => {
 		const result = getDefinitionAndBoundSpan$1(...args);
+		if (!result && data.nitroRoutes) {
+			const program$1 = info.languageService.getProgram();
+			const sourceFile = program$1.getSourceFile(args[0]);
+			if (!sourceFile) return;
+			const checker = program$1.getTypeChecker();
+			for (const node of forEachTouchNode(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;
+				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`);
+				return {
+					textSpan: {
+						start,
+						length: end - start
+					},
+					definitions: [{
+						fileName: path,
+						textSpan: {
+							start: 0,
+							length: 0
+						},
+						kind: ts.ScriptElementKind.scriptElement,
+						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);
@@ -93,8 +135,7 @@ function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
 			const sourceFile = program.getSourceFile(definition.fileName);
 			if (!sourceFile) continue;
 			let result$1 = [];
-			if (data.nitroRoutes && definition.fileName.endsWith("nitro-routes.d.ts")) result$1 = visitNitroRoutes(context, sourceFile, definition, getDefinitionAndBoundSpan$1);
-			else if (data.runtimeConfig && definition.fileName.endsWith("runtime-config.d.ts")) result$1 = visitRuntimeConfig(context, sourceFile, definition);
+			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);
@@ -107,32 +148,11 @@ function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
 		};
 	};
 }
-function visitNitroRoutes(context, sourceFile, definition, getDefinitionAndBoundSpan$1) {
-	const { ts } = context;
-	const definitions = [];
-	for (const node of require_src.forEachNode(ts, sourceFile)) {
-		if (!ts.isPropertySignature(node) || !node.type || !ts.isTypeLiteralNode(node.type)) continue;
-		const { textSpan } = definition;
-		const start = node.name.getStart(sourceFile);
-		const end = node.name.getEnd();
-		if (start !== textSpan.start || end - start !== textSpan.length) continue;
-		for (const member of node.type.members) {
-			if (!ts.isPropertySignature(member)) continue;
-			const pos = (((((member.type?.typeArguments?.[0])?.typeArguments?.[0])?.typeArguments?.[0])?.typeArguments?.[0])?.qualifier)?.getStart(sourceFile);
-			if (pos !== void 0) {
-				const res = getDefinitionAndBoundSpan$1(definition.fileName, pos);
-				if (res?.definitions?.length) definitions.push(...res.definitions);
-			}
-		}
-		break;
-	}
-	return definitions;
-}
 function visitRuntimeConfig(context, sourceFile, definition) {
 	const { ts } = context;
 	let definitions = [];
 	const path = [];
-	require_src.walkNodes(ts, sourceFile, (node, next) => {
+	for (const node of forEachTouchNode(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)) {
@@ -143,13 +163,11 @@ function visitRuntimeConfig(context, sourceFile, definition) {
 			if (start === textSpan.start && end - start === textSpan.length) {
 				path.push(key);
 				definitions = [...proxyRuntimeConfig(context, definition, path)];
-				return;
+				break;
 			}
 		}
 		if (key !== void 0) path.push(key);
-		next();
-		if (key !== void 0) path.pop();
-	});
+	}
 	return definitions;
 }
 function* proxyRuntimeConfig(context, definition, path) {
@@ -207,6 +225,24 @@ function* proxyRuntimeConfig(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) {
 	const { ts, info, data, server } = context;
 	return (...args) => {
@@ -220,24 +256,16 @@ function getEditsForFileRename(context, getEditsForFileRename$1) {
 			if (data.components && fileName.endsWith("components.d.ts")) {
 				const sourceFile = program.getSourceFile(fileName);
 				if (!sourceFile) continue;
-				const nodes = [];
-				if (fileName.endsWith("types/components.d.ts")) {
-					for (const node of require_src.forEachNode(ts, sourceFile)) if (ts.isPropertySignature(node)) nodes.push(node);
-				} else for (const node of require_src.forEachNode(ts, sourceFile)) if (ts.isVariableDeclaration(node)) nodes.push(node);
-				for (const node of nodes) {
-					const start = node.getStart(sourceFile);
-					const end = node.getEnd();
-					if (textChanges.every(({ span }) => span.start < start || span.start + span.length > end)) continue;
-					const symbols = info.languageService.findReferences(fileName, start);
+				for (const { span } of textChanges) for (const node of forEachTouchNode(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));
 					const lazy = node.type && ts.isTypeReferenceNode(node.type) && ts.isIdentifier(node.type.typeName) && node.type.typeName.text === "LazyComponent";
-					for (const reference of symbols?.flatMap(({ references: references$1 }) => references$1) ?? []) {
-						if (reference.isDefinition) continue;
-						const { fileName: fileName$1, textSpan } = reference;
-						(references[fileName$1] ??= []).push({
-							textSpan: toSourceSpan(context.language, fileName$1, textSpan) ?? textSpan,
-							lazy: lazy || void 0
-						});
-					}
+					for (const { fileName: fileName$1, textSpan } of res ?? []) (references[fileName$1] ??= []).push({
+						textSpan: toSourceSpan(context.language, fileName$1, textSpan) ?? textSpan,
+						lazy: lazy || void 0
+					});
+					break;
 				}
 			}
 			if (!fileName.startsWith(data.buildDir)) changes.push(change);
@@ -249,18 +277,44 @@ function getEditsForFileRename(context, getEditsForFileRename$1) {
 		return changes;
 	};
 }
-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/index.ts
+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
+		};
+		setTimeout(() => {
+			context.language = (info.project.__vue__ ?? info.project["program"]?.__vue__)?.language;
+		}, 500);
+		for (const [key, method] of [
+			["findRenameLocations", findRenameLocations.bind(null, context)],
+			["getDefinitionAndBoundSpan", getDefinitionAndBoundSpan.bind(null, context)],
+			["getEditsForFileRename", getEditsForFileRename.bind(null, context)]
+		]) {
+			const original = info.languageService[key];
+			info.languageService[key] = method(original);
+		}
+		return info.languageService;
+	} };
+};
+var typescript_default = plugin;
 
 //#endregion
 module.exports = typescript_default;

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@dxup/nuxt",
   "type": "module",
-  "version": "0.0.4",
-  "description": "TypeScript and Vue plugins for Nuxt",
+  "version": "0.0.5",
+  "description": "TypeScript plugins for Nuxt",
   "author": "KazariEX",
   "license": "MIT",
   "repository": "KazariEX/dxup",
   "exports": {
     ".": "./dist/module.js",
-    "./vue/nitro-routes": "./dist/vue/nitro-routes.cjs",
     "./package.json": "./package.json"
   },
   "main": "./dist/typescript.cjs",

package/dist/src-BfXMgjZD.cjs

@@ -1,31 +0,0 @@
-
-//#region ../shared/src/index.ts
-function* forEachNode(ts, node) {
-	yield node;
-	const children = [];
-	ts.forEachChild(node, (child) => {
-		children.push(child);
-	});
-	for (const child of children) yield* forEachNode(ts, child);
-}
-function walkNodes(ts, node, callback) {
-	callback(node, () => {
-		ts.forEachChild(node, (child) => {
-			walkNodes(ts, child, callback);
-		});
-	});
-}
-
-//#endregion
-Object.defineProperty(exports, 'forEachNode', {
-  enumerable: true,
-  get: function () {
-    return forEachNode;
-  }
-});
-Object.defineProperty(exports, 'walkNodes', {
-  enumerable: true,
-  get: function () {
-    return walkNodes;
-  }
-});

package/dist/vue/nitro-routes.cjs

@@ -1,33 +0,0 @@
-const require_src = require('../src-BfXMgjZD.cjs');
-
-//#region src/vue/nitro-routes.ts
-const functionNames = new Set([
-	"$fetch",
-	"useFetch",
-	"useLazyFetch"
-]);
-const plugin = ({ modules: { typescript: ts } }) => {
-	return {
-		version: 2.2,
-		resolveEmbeddedCode(fileName, sfc, embeddedFile) {
-			if (!embeddedFile.id.startsWith("script_")) return;
-			const { scriptSetup } = sfc;
-			if (!scriptSetup) return;
-			const codes = [];
-			for (const node of require_src.forEachNode(ts, scriptSetup.ast)) if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && functionNames.has(node.expression.text) && node.arguments.length && ts.isStringLiteralLike(node.arguments[0])) {
-				const arg = node.arguments[0];
-				codes.push(`/** @type {__VLS_InternalApi[`, [
-					arg.getText(scriptSetup.ast),
-					sfc.scriptSetup.name,
-					arg.getStart(scriptSetup.ast),
-					{ navigation: true }
-				], `]} */;\n`);
-			}
-			if (codes.length) embeddedFile.content.push(`import type { InternalApi as __VLS_InternalApi } from 'nitropack/types';\n`, ...codes);
-		}
-	};
-};
-var nitro_routes_default = plugin;
-
-//#endregion
-module.exports = nitro_routes_default;

package/dist/vue/nitro-routes.d.cts

@@ -1,5 +0,0 @@
-import { VueLanguagePlugin } from "@vue/language-core";
-
-//#region src/vue/nitro-routes.d.ts
-declare const plugin: VueLanguagePlugin;
-export = plugin;