@dxup/nuxt 0.0.2 → 0.0.4

package/README.md

@@ -8,8 +8,10 @@ This is a collection of TypeScript and Vue plugins that improves Nuxt DX.
 
 ## Features
 
-- Go to definition for nitro routes on data fetching methods
+- 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 runtime config
+- [@dxup/unimport](/packages/unimport)
 
 ## Installation
 

package/dist/module.d.ts

@@ -1,13 +1,10 @@
 import * as _nuxt_schema0 from "@nuxt/schema";
 
-//#region src/typescript/index.d.ts
-interface Options {
+//#region src/module/index.d.ts
+interface ModuleOptions {
+  components?: boolean;
   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,8 +1,67 @@
-import { defineNuxtModule } from "@nuxt/kit";
+import { addTemplate, defineNuxtModule } from "@nuxt/kit";
+import { Buffer } from "node:buffer";
+import EventEmitter from "node:events";
+import { mkdir, open, readFile, writeFile } from "node:fs/promises";
+import { watch } from "chokidar";
+import { dirname, join } from "pathe";
 
 //#region package.json
 var name = "@dxup/nuxt";
 
+//#endregion
+//#region src/event/client.ts
+const responseRE = /^```json \{(?<key>.*)\}\n(?<value>[\s\S]*?)\n```$/;
+async function createEventClient(nuxt) {
+	const path = join(nuxt.options.buildDir, "dxup/events.md");
+	await mkdir(dirname(path), { recursive: true });
+	await writeFile(path, "");
+	const fd = await open(path, "r");
+	const watcher = watch(path, { ignoreInitial: true });
+	nuxt.hook("close", async () => {
+		await fd.close();
+		await watcher.close();
+	});
+	const client = new EventEmitter();
+	let offset = 0;
+	watcher.on("change", async (path$1, stats) => {
+		if (!stats || stats.size <= offset) return;
+		const pos = offset;
+		offset = stats.size;
+		const buffer = Buffer.alloc(offset - pos);
+		await fd.read(buffer, 0, buffer.length, pos);
+		const match = buffer.toString("utf-8").trim().match(responseRE);
+		if (match) {
+			const { key, value } = match.groups;
+			client.emit(key, JSON.parse(value));
+		}
+	});
+	return client;
+}
+
+//#endregion
+//#region src/module/events.ts
+const uppercaseRE = /[A-Z]/;
+async function onComponentsRename(nuxt, { fileName, references }) {
+	const component = Object.values(nuxt.apps).flatMap((app) => app.components).find((c) => c.filePath === fileName);
+	if (!component) return;
+	const tasks = Object.entries(references).map(async ([fileName$1, references$1]) => {
+		const code = await readFile(fileName$1, "utf-8");
+		const chunks = [];
+		let offset = 0;
+		for (const { textSpan, lazy } of references$1) {
+			const start = textSpan.start;
+			const end = start + textSpan.length;
+			const oldName = code.slice(start, end);
+			const newName = uppercaseRE.test(oldName) ? lazy ? "Lazy" + component.pascalName : component.pascalName : lazy ? "lazy-" + component.kebabName : component.kebabName;
+			chunks.push(code.slice(offset, start), newName);
+			offset = end;
+		}
+		chunks.push(code.slice(offset));
+		await writeFile(fileName$1, chunks.join(""));
+	});
+	await Promise.all(tasks);
+}
+
 //#endregion
 //#region src/module/index.ts
 var module_default = defineNuxtModule({
@@ -11,27 +70,36 @@ var module_default = defineNuxtModule({
 		configKey: "dxup"
 	},
 	defaults: {
+		components: true,
 		nitroRoutes: true,
 		runtimeConfig: true,
 		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" });
+		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,
+					configFiles: [...nuxt.options._nuxtConfigFiles, ...nuxt.options._layers.map((layer) => layer._configFile).filter(Boolean)],
+					components: options.components,
+					nitroRoutes: options.nitroRoutes,
+					runtimeConfig: options.runtimeConfig
+				};
+				return JSON.stringify(data, null, 2);
+			}
+		});
+		(await createEventClient(nuxt)).on("components:rename", (data) => onComponentsRename(nuxt, data));
 	}
 });
 function append(plugins, target, ...keys) {

package/dist/src-BfXMgjZD.cjs

@@ -0,0 +1,31 @@
+
+//#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/typescript.cjs

@@ -21,20 +21,51 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-const require_ast = require('./ast-BfhxgPs7.cjs');
-let node_path = require("node:path");
-node_path = __toESM(node_path);
+const require_src = require('./src-BfXMgjZD.cjs');
+let pathe = require("pathe");
+pathe = __toESM(pathe);
+let node_fs_promises = require("node:fs/promises");
+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();
+	}
+	return { write };
+}
+
+//#endregion
 //#region src/typescript/index.ts
 const plugin = (module$1) => {
 	const { typescript: ts } = module$1;
 	return { create(info) {
-		const options = {
+		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,
-			...info.config.options
+			...JSON.parse(ts.sys.readFile(path) ?? "{}")
+		};
+		const server = createEventServer(info);
+		const context = {
+			ts,
+			info,
+			data,
+			server
 		};
-		for (const [key, method] of [["getDefinitionAndBoundSpan", getDefinitionAndBoundSpan.bind(null, ts, info, options)]]) {
+		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);
 		}
@@ -42,9 +73,18 @@ const plugin = (module$1) => {
 	} };
 };
 var typescript_default = plugin;
-function getDefinitionAndBoundSpan(ts, info, options, getDefinitionAndBoundSpan$1) {
-	return (fileName, position) => {
-		const result = getDefinitionAndBoundSpan$1(fileName, position);
+function findRenameLocations(context, findRenameLocations$1) {
+	const { data } = context;
+	return (...args) => {
+		return findRenameLocations$1(...args)?.filter((edit) => {
+			return !edit.fileName.startsWith(data.buildDir);
+		});
+	};
+}
+function getDefinitionAndBoundSpan(context, getDefinitionAndBoundSpan$1) {
+	const { info, data } = context;
+	return (...args) => {
+		const result = getDefinitionAndBoundSpan$1(...args);
 		if (!result?.definitions?.length) return result;
 		const program = info.languageService.getProgram();
 		const definitions = new Set(result.definitions);
@@ -53,8 +93,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,9 +107,10 @@ 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)) {
+	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);
@@ -87,10 +128,11 @@ 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) => {
+	require_src.walkNodes(ts, sourceFile, (node, next) => {
 		let key;
 		if (ts.isInterfaceDeclaration(node) && ts.isIdentifier(node.name)) key = node.name.text;
 		else if (ts.isPropertySignature(node) && ts.isIdentifier(node.name)) {
@@ -100,7 +142,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 +152,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,44 +163,104 @@ 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
+				};
+			}
 		}
 	}
 }
+function getEditsForFileRename(context, getEditsForFileRename$1) {
+	const { ts, info, data, server } = context;
+	return (...args) => {
+		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;
+				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);
+					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
+						});
+					}
+				}
+			}
+			if (!fileName.startsWith(data.buildDir)) changes.push(change);
+		}
+		if (Object.keys(references).length) server.write("components:rename", {
+			fileName: args[1],
+			references
+		});
+		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
 module.exports = typescript_default;

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_src = require('../src-BfXMgjZD.cjs');
 
 //#region src/vue/nitro-routes.ts
 const functionNames = new Set([
@@ -14,7 +14,7 @@ const plugin = ({ modules: { typescript: ts } }) => {
 			const { scriptSetup } = sfc;
 			if (!scriptSetup) return;
 			const codes = [];
-			for (const node of require_ast.forEachNode(scriptSetup.ast)) if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && functionNames.has(node.expression.text) && node.arguments.length && ts.isStringLiteralLike(node.arguments[0])) {
+			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),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dxup/nuxt",
   "type": "module",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "TypeScript and Vue plugins for Nuxt",
   "author": "KazariEX",
   "license": "MIT",
@@ -18,9 +18,14 @@
   ],
   "dependencies": {
     "@nuxt/kit": "^4.1.2",
+    "chokidar": "^4.0.3",
+    "pathe": "2.0.3",
     "@dxup/unimport": "^0.0.1"
   },
   "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"
@@ -28,6 +33,6 @@
   "scripts": {
     "build": "tsdown",
     "dev": "tsdown -w --sourcemap",
-    "release": "bumpp"
+    "release": "node ../../scripts/release.ts"
   }
 }

package/dist/ast-BfhxgPs7.cjs

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