@dxup/nuxt 0.0.2 → 0.0.3

package/README.md

@@ -8,8 +8,9 @@ This is a collection of TypeScript and Vue plugins that improves Nuxt DX.
 
 ## Features
 
-- Go to definition for nitro routes on data fetching methods
+- Go to definition for nitro routes in data fetching methods within Vue files
 - Go to definition for runtime config
+- [@dxup/unimport](/packages/unimport)
 
 ## Installation
 

package/dist/{ast-BfhxgPs7.cjs → ast-DJW3KREB.cjs}

@@ -9,14 +9,11 @@ function* forEachNode(node) {
 	for (const child of children) yield* forEachNode(child);
 }
 function walkNodes(node, callback) {
-	function next() {
-		const children = [];
+	callback(node, () => {
 		node.forEachChild((child) => {
-			children.push(child);
+			walkNodes(child, callback);
 		});
-		for (const child of children) walkNodes(child, callback);
-	}
-	callback(node, next);
+	});
 }
 
 //#endregion

package/dist/module.d.ts

@@ -1,13 +1,9 @@
 import * as _nuxt_schema0 from "@nuxt/schema";
 
-//#region src/typescript/index.d.ts
-interface Options {
+//#region src/module/index.d.ts
+interface ModuleOptions {
   nitroRoutes?: boolean;
   runtimeConfig?: boolean;
-}
-//#endregion
-//#region src/module/index.d.ts
-interface ModuleOptions extends Options {
   unimport?: boolean;
 }
 declare const _default: _nuxt_schema0.NuxtModule<ModuleOptions, ModuleOptions, false>;

package/dist/module.js

@@ -1,4 +1,4 @@
-import { defineNuxtModule } from "@nuxt/kit";
+import { addTemplate, defineNuxtModule } from "@nuxt/kit";
 
 //#region package.json
 var name = "@dxup/nuxt";
@@ -16,15 +16,8 @@ var module_default = defineNuxtModule({
 		unimport: true
 	},
 	async setup(options, nuxt) {
-		const pluginsTs = [];
+		const pluginsTs = [{ name: "@dxup/nuxt" }];
 		const pluginsVue = [];
-		pluginsTs.push({
-			name: "@dxup/nuxt",
-			options: {
-				nitroRoutes: options.nitroRoutes,
-				runtimeConfig: options.runtimeConfig
-			}
-		});
 		if (options.nitroRoutes) pluginsVue.push("@dxup/nuxt/vue/nitro-routes");
 		if (options.unimport) pluginsTs.push({ name: "@dxup/unimport" });
 		append(pluginsTs, nuxt.options, "typescript", "tsConfig", "compilerOptions");
@@ -32,6 +25,18 @@ var module_default = defineNuxtModule({
 		append(pluginsTs, nuxt.options, "typescript", "sharedTsConfig", "compilerOptions");
 		append(pluginsTs, nuxt.options, "typescript", "nodeTsConfig", "compilerOptions");
 		append(pluginsVue, nuxt.options, "typescript", "tsConfig", "vueCompilerOptions");
+		addTemplate({
+			filename: "dxup.json",
+			write: true,
+			getContents() {
+				const data = {
+					nitroRoutes: options.nitroRoutes,
+					runtimeConfig: options.runtimeConfig,
+					configFiles: [...nuxt.options._nuxtConfigFiles, ...nuxt.options._layers.map((layer) => layer._configFile).filter(Boolean)]
+				};
+				return JSON.stringify(data, null, 2);
+			}
+		});
 	}
 });
 function append(plugins, target, ...keys) {

package/dist/typescript.cjs

@@ -21,7 +21,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-const require_ast = require('./ast-BfhxgPs7.cjs');
+const require_ast = require('./ast-DJW3KREB.cjs');
 let node_path = require("node:path");
 node_path = __toESM(node_path);
 
@@ -29,12 +29,19 @@ node_path = __toESM(node_path);
 const plugin = (module$1) => {
 	const { typescript: ts } = module$1;
 	return { create(info) {
-		const options = {
+		const path = (0, node_path.join)(info.languageServiceHost.getCurrentDirectory(), "dxup.json");
+		const data = {
 			nitroRoutes: true,
 			runtimeConfig: true,
-			...info.config.options
+			configFiles: [],
+			...JSON.parse(ts.sys.readFile(path) ?? "{}")
 		};
-		for (const [key, method] of [["getDefinitionAndBoundSpan", getDefinitionAndBoundSpan.bind(null, ts, info, options)]]) {
+		const context = {
+			ts,
+			info,
+			data
+		};
+		for (const [key, method] of [["getDefinitionAndBoundSpan", getDefinitionAndBoundSpan.bind(null, context)]]) {
 			const original = info.languageService[key];
 			info.languageService[key] = method(original);
 		}
@@ -42,7 +49,8 @@ const plugin = (module$1) => {
 	} };
 };
 var typescript_default = plugin;
-function getDefinitionAndBoundSpan(ts, info, options, getDefinitionAndBoundSpan$1) {
+function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
+	const { info, data } = context;
 	return (fileName, position) => {
 		const result = getDefinitionAndBoundSpan$1(fileName, position);
 		if (!result?.definitions?.length) return result;
@@ -53,8 +61,8 @@ function getDefinitionAndBoundSpan(ts, info, options, getDefinitionAndBoundSpan$
 			const sourceFile = program.getSourceFile(definition.fileName);
 			if (!sourceFile) continue;
 			let result$1 = [];
-			if (options.nitroRoutes && definition.fileName.endsWith("nitro-routes.d.ts")) result$1 = visitNitroRoutes(ts, sourceFile, definition, getDefinitionAndBoundSpan$1);
-			else if (options.runtimeConfig && definition.fileName.endsWith("runtime-config.d.ts")) result$1 = visitRuntimeConfig(ts, info, sourceFile, definition);
+			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 (result$1?.length) {
 				for (const definition$1 of result$1) definitions.add(definition$1);
 				skippedDefinitions.push(definition);
@@ -67,7 +75,8 @@ function getDefinitionAndBoundSpan(ts, info, options, getDefinitionAndBoundSpan$
 		};
 	};
 }
-function visitNitroRoutes(ts, sourceFile, definition, getDefinitionAndBoundSpan$1) {
+function visitNitroRoutes(context, sourceFile, definition, getDefinitionAndBoundSpan$1) {
+	const { ts } = context;
 	const definitions = [];
 	for (const node of require_ast.forEachNode(sourceFile)) {
 		if (!ts.isPropertySignature(node) || !node.type || !ts.isTypeLiteralNode(node.type)) continue;
@@ -87,7 +96,8 @@ function visitNitroRoutes(ts, sourceFile, definition, getDefinitionAndBoundSpan$
 	}
 	return definitions;
 }
-function visitRuntimeConfig(ts, info, sourceFile, definition) {
+function visitRuntimeConfig(context, sourceFile, definition) {
+	const { ts } = context;
 	let definitions = [];
 	const path = [];
 	require_ast.walkNodes(sourceFile, (node, next) => {
@@ -100,7 +110,7 @@ function visitRuntimeConfig(ts, info, sourceFile, definition) {
 			const end = node.name.getEnd();
 			if (start === textSpan.start && end - start === textSpan.length) {
 				path.push(key);
-				definitions = [...proxyRuntimeConfig(ts, info, definition, path)];
+				definitions = [...proxyRuntimeConfig(context, definition, path)];
 				return;
 			}
 		}
@@ -110,7 +120,8 @@ function visitRuntimeConfig(ts, info, sourceFile, definition) {
 	});
 	return definitions;
 }
-function* proxyRuntimeConfig(ts, info, definition, path) {
+function* proxyRuntimeConfig(context, definition, path) {
+	const { ts, info, data } = context;
 	switch (path[0]) {
 		case "SharedRuntimeConfig":
 			path.shift();
@@ -120,41 +131,47 @@ function* proxyRuntimeConfig(ts, info, definition, path) {
 			break;
 		default: return;
 	}
-	const configName = (0, node_path.join)((0, node_path.dirname)(info.project.getProjectName()), "tsconfig.node.json");
-	const nodeProject = info.project.projectService.findProject(configName);
+	const configFile = data.configFiles[0];
+	if (configFile === void 0) return;
+	const { configFileName } = info.project.projectService.openClientFile(configFile);
+	if (configFileName === void 0) return;
+	const nodeProject = info.project.projectService.findProject(configFileName);
 	if (!nodeProject) return;
 	const nodeProgram = nodeProject.getLanguageService().getProgram();
 	if (!nodeProgram) return;
-	const nuxtConfigName = nodeProgram.getRootFileNames().find((name) => name.endsWith("nuxt.config.ts"));
-	if (!nuxtConfigName) return;
-	const sourceFile = nodeProgram.getSourceFile(nuxtConfigName);
-	if (!sourceFile) return;
 	const checker = nodeProgram.getTypeChecker();
-	for (const node of sourceFile.statements) if (ts.isExportAssignment(node) && ts.isCallExpression(node.expression) && node.expression.arguments.length) {
-		const arg = node.expression.arguments[0];
-		let currentSymbol;
-		let currentType = checker.getTypeAtLocation(arg);
-		for (const key of ["runtimeConfig", ...path]) {
-			const symbol = currentType.getProperties().find((s) => s.name === key);
-			if (!symbol) return;
-			currentSymbol = symbol;
-			currentType = checker.getTypeOfSymbol(symbol);
-		}
-		for (const decl of currentSymbol.declarations ?? []) {
-			const sourceFile$1 = decl.getSourceFile();
-			const contextSpan = {
-				start: decl.getStart(sourceFile$1),
-				length: decl.getWidth(sourceFile$1)
-			};
-			yield {
-				...definition,
-				contextSpan,
-				fileName: sourceFile$1.fileName,
-				textSpan: ts.isPropertyAssignment(decl) ? {
+	for (const configFile$1 of data.configFiles) {
+		const sourceFile = nodeProgram.getSourceFile(configFile$1);
+		if (!sourceFile) continue;
+		outer: for (const node of sourceFile.statements) {
+			if (!ts.isExportAssignment(node) || !ts.isCallExpression(node.expression) || !node.expression.arguments.length) continue;
+			const arg = node.expression.arguments[0];
+			let currentSymbol;
+			let currentType = checker.getTypeAtLocation(arg);
+			for (const key of ["runtimeConfig", ...path]) {
+				const symbol = currentType.getProperties().find((s) => s.name === key);
+				if (!symbol) break outer;
+				currentSymbol = symbol;
+				currentType = checker.getTypeOfSymbol(symbol);
+			}
+			for (const decl of currentSymbol?.declarations ?? []) {
+				const sourceFile$1 = decl.getSourceFile();
+				const contextSpan = {
+					start: decl.getStart(sourceFile$1),
+					length: decl.getWidth(sourceFile$1)
+				};
+				let textSpan = contextSpan;
+				if (ts.isPropertyAssignment(decl) || ts.isPropertySignature(decl)) textSpan = {
 					start: decl.name.getStart(sourceFile$1),
 					length: decl.name.getWidth(sourceFile$1)
-				} : contextSpan
-			};
+				};
+				yield {
+					...definition,
+					fileName: sourceFile$1.fileName,
+					textSpan,
+					contextSpan
+				};
+			}
 		}
 	}
 }

package/dist/typescript.d.cts

@@ -1,10 +1,5 @@
 import ts from "typescript";
 
 //#region src/typescript/index.d.ts
-interface Options {
-  nitroRoutes?: boolean;
-  runtimeConfig?: boolean;
-}
 declare const plugin: ts.server.PluginModuleFactory;
-//#endregion
-export { Options, plugin as default };
+export = plugin;

package/dist/vue/nitro-routes.cjs

@@ -1,4 +1,4 @@
-const require_ast = require('../ast-BfhxgPs7.cjs');
+const require_ast = require('../ast-DJW3KREB.cjs');
 
 //#region src/vue/nitro-routes.ts
 const functionNames = new Set([

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dxup/nuxt",
   "type": "module",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "TypeScript and Vue plugins for Nuxt",
   "author": "KazariEX",
   "license": "MIT",