@dxup/nuxt 0.4.0 → 0.4.1

package/dist/module.d.mts

@@ -1,4 +1,4 @@
-import * as _nuxt_schema0 from "@nuxt/schema";
+import * as _$_nuxt_schema0 from "@nuxt/schema";
 
 //#region src/module/index.d.ts
 interface ModuleOptions {
@@ -46,7 +46,7 @@ interface ModuleOptions {
     unofficial?: boolean;
   };
 }
-declare const _default: _nuxt_schema0.NuxtModule<ModuleOptions, {
+declare const _default: _$_nuxt_schema0.NuxtModule<ModuleOptions, {
   features: {
     components: true;
     importGlob: true;

package/dist/module.mjs

@@ -1,13 +1,11 @@
 import { addTemplate, defineNuxtModule, useNitro } from "@nuxt/kit";
 import { Buffer } from "node:buffer";
-import EventEmitter from "node:events";
+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```$/;
@@ -23,7 +21,7 @@ async function createEventClient(nuxt) {
 	});
 	const client = new EventEmitter();
 	let offset = 0;
-	watcher.on("change", async (path$1, stats) => {
+	watcher.on("change", async (path, stats) => {
 		if (!stats || stats.size <= offset) return;
 		const pos = offset;
 		offset = stats.size;
@@ -37,18 +35,17 @@ async function createEventClient(nuxt) {
 	});
 	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 tasks = Object.entries(references).map(async ([fileName, references]) => {
+		const code = await readFile(fileName, "utf-8");
 		const chunks = [];
 		let offset = 0;
-		for (const { textSpan, lazy } of references$1) {
+		for (const { textSpan, lazy } of references) {
 			const start = textSpan.start;
 			const end = start + textSpan.length;
 			const oldName = code.slice(start, end);
@@ -57,11 +54,10 @@ async function onComponentsRename(nuxt, { fileName, references }) {
 			offset = end;
 		}
 		chunks.push(code.slice(offset));
-		await writeFile(fileName$1, chunks.join(""));
+		await writeFile(fileName, chunks.join(""));
 	});
 	await Promise.all(tasks);
 }
-
 //#endregion
 //#region src/module/index.ts
 var module_default = defineNuxtModule().with({
@@ -89,7 +85,7 @@ var module_default = defineNuxtModule().with({
 		addTemplate({
 			filename: "dxup/data.json",
 			write: true,
-			getContents({ nuxt: nuxt$1, app }) {
+			getContents({ nuxt, app }) {
 				const layouts = Object.fromEntries(Object.values(app.layouts).map((item) => [item.name, item.file]));
 				const middleware = app.middleware.reduce((acc, item) => {
 					if (!item.global) acc[item.name] = item.path;
@@ -105,9 +101,9 @@ var module_default = defineNuxtModule().with({
 					return acc;
 				}, {});
 				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)],
+					buildDir: nuxt.options.buildDir,
+					publicDir: nuxt.options.dir.public,
+					configFiles: [...nuxt.options._nuxtConfigFiles, ...nuxt.options._layers.map((layer) => layer._configFile).filter(Boolean)],
 					layouts,
 					middleware,
 					nitroRoutes,
@@ -124,6 +120,5 @@ function append(plugins, target, ...keys) {
 	for (const key of keys) target = target[key] ??= {};
 	(target.plugins ??= []).push(...plugins);
 }
-
 //#endregion
-export { module_default as default };
+export { module_default as default };

package/dist/typescript.cjs

@@ -1,24 +1,18 @@
-//#region rolldown:runtime
+//#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
-var __export = (all, symbols) => {
+var __exportAll = (all, no_symbols) => {
 	let target = {};
-	for (var name in all) {
-		__defProp(target, name, {
-			get: all[name],
-			enumerable: true
-		});
-	}
-	if (symbols) {
-		__defProp(target, Symbol.toStringTag, { value: "Module" });
-	}
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
 	return target;
 };
-
 //#endregion
 let node_fs_promises = require("node:fs/promises");
 let pathe = require("pathe");
 let tinyglobby = require("tinyglobby");
-
 //#region src/event/server.ts
 function createEventServer(info) {
 	const path = (0, pathe.join)(info.project.getCurrentDirectory(), "dxup/events.md");
@@ -29,7 +23,6 @@ function createEventServer(info) {
 	}
 	return { write };
 }
-
 //#endregion
 //#region src/typescript/data.ts
 const initialValue = {
@@ -55,20 +48,19 @@ function createData(ts, info) {
 	const path = (0, pathe.join)(info.languageServiceHost.getCurrentDirectory(), "dxup/data.json");
 	const data = {};
 	const updates = callbacks[path] ??= (ts.sys.watchFile?.(path, () => {
-		const text$1 = ts.sys.readFile(path);
-		for (const update of updates) update(text$1);
+		const text = ts.sys.readFile(path);
+		for (const update of updates) update(text);
 	}), []);
-	updates.push((text$1) => {
+	updates.push((text) => {
 		Object.assign(data, {
 			...initialValue,
-			...text$1 ? JSON.parse(text$1) : {}
+			...text ? JSON.parse(text) : {}
 		});
 	});
 	const text = ts.sys.readFile(path);
 	updates.at(-1)(text);
 	return data;
 }
-
 //#endregion
 //#region src/typescript/utils.ts
 function createModuleDefinition(ts, path) {
@@ -115,10 +107,9 @@ function withVirtualOffset(language, sourceScript, position, method) {
 		map.toGeneratedLocation = original;
 	}
 }
-
 //#endregion
 //#region src/typescript/features/findReferences.ts
-var findReferences_exports = /* @__PURE__ */ __export({ postprocess: () => postprocess$1 });
+var findReferences_exports = /* @__PURE__ */ __exportAll({ postprocess: () => postprocess$1 });
 function postprocess$1(context, language, findReferences) {
 	const { ts, info } = context;
 	return (...args) => {
@@ -137,10 +128,9 @@ function postprocess$1(context, language, findReferences) {
 		return result;
 	};
 }
-
 //#endregion
 //#region src/typescript/features/findRenameLocations.ts
-var findRenameLocations_exports = /* @__PURE__ */ __export({ preprocess: () => preprocess$2 });
+var findRenameLocations_exports = /* @__PURE__ */ __exportAll({ preprocess: () => preprocess$2 });
 function preprocess$2(context, findRenameLocations) {
 	const { data } = context;
 	return (...args) => {
@@ -149,7 +139,6 @@ function preprocess$2(context, findRenameLocations) {
 		});
 	};
 }
-
 //#endregion
 //#region ../shared/src/index.ts
 function* forEachTouchingNode(ts, sourceFile, position) {
@@ -164,12 +153,12 @@ function* binaryVisit(ts, sourceFile, node, position) {
 	let right = nodes.length - 1;
 	while (left <= right) {
 		const mid = Math.floor((left + right) / 2);
-		const node$1 = nodes[mid];
-		if (position > node$1.getEnd()) left = mid + 1;
-		else if (position < node$1.getStart(sourceFile)) right = mid - 1;
+		const node = nodes[mid];
+		if (position > node.getEnd()) left = mid + 1;
+		else if (position < node.getStart(sourceFile)) right = mid - 1;
 		else {
-			yield node$1;
-			yield* binaryVisit(ts, sourceFile, node$1, position);
+			yield node;
+			yield* binaryVisit(ts, sourceFile, node, position);
 			return;
 		}
 	}
@@ -177,10 +166,9 @@ function* binaryVisit(ts, sourceFile, node, position) {
 function isTextSpanWithin(node, textSpan, sourceFile) {
 	return textSpan.start + textSpan.length <= node.getEnd() && textSpan.start >= node.getStart(sourceFile);
 }
-
 //#endregion
 //#region src/typescript/features/getDefinitionAndBoundSpan.ts
-var getDefinitionAndBoundSpan_exports = /* @__PURE__ */ __export({
+var getDefinitionAndBoundSpan_exports = /* @__PURE__ */ __exportAll({
 	postprocess: () => postprocess,
 	preprocess: () => preprocess$1
 });
@@ -222,18 +210,18 @@ function preprocess$1(context, getDefinitionAndBoundSpan) {
 	return (...args) => {
 		const result = getDefinitionAndBoundSpan(...args);
 		if (!result) {
-			const program$1 = info.languageService.getProgram();
-			const sourceFile = program$1.getSourceFile(args[0]);
+			const program = info.languageService.getProgram();
+			const sourceFile = program.getSourceFile(args[0]);
 			if (!sourceFile) return;
-			const checker = program$1.getTypeChecker();
-			let result$1;
+			const checker = program.getTypeChecker();
+			let result;
 			for (const node of forEachTouchingNode(ts, sourceFile, args[1])) {
-				if (data.features.importGlob) result$1 ??= visitImportGlob(ts, info, sourceFile, node, args[1]);
-				if (data.features.nitroRoutes) result$1 ??= visitNitroRoutes(ts, data, checker, sourceFile, node, args[1]);
-				if (data.features.pageMeta) result$1 ??= visitPageMeta(ts, data, sourceFile, node, args[1]);
-				if (data.features.typedPages) result$1 ??= visitTypedPages(ts, data, checker, sourceFile, node, args[1]);
+				if (data.features.importGlob) result ??= visitImportGlob(ts, info, sourceFile, node, args[1]);
+				if (data.features.nitroRoutes) result ??= visitNitroRoutes(ts, data, checker, sourceFile, node, args[1]);
+				if (data.features.pageMeta) result ??= visitPageMeta(ts, data, sourceFile, node, args[1]);
+				if (data.features.typedPages) result ??= visitTypedPages(ts, data, checker, sourceFile, node, args[1]);
 			}
-			if (result$1) return result$1;
+			if (result) return result;
 		}
 		if (!result?.definitions?.length) return result;
 		const program = info.languageService.getProgram();
@@ -241,10 +229,10 @@ function preprocess$1(context, getDefinitionAndBoundSpan) {
 		for (const definition of result.definitions) {
 			const sourceFile = program.getSourceFile(definition.fileName);
 			if (!sourceFile) continue;
-			let result$1;
-			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);
+			let result;
+			if (data.features.runtimeConfig && definition.fileName.endsWith("runtime-config.d.ts")) result = visitRuntimeConfig(context, sourceFile, definition);
+			if (result?.length) {
+				for (const definition of result) definitions.add(definition);
 				definitions.delete(definition);
 			}
 		}
@@ -328,11 +316,19 @@ function visitPageMeta(ts, data, sourceFile, node, position) {
 	if (!ts.isPropertyAssignment(node) || !ts.isIdentifier(node.name) || !pageMetaKeys.has(node.name.text) || !ts.isCallExpression(node.parent.parent) || !ts.isIdentifier(node.parent.parent.expression) || node.parent.parent.expression.text !== "definePageMeta") return;
 	switch (node.name.text) {
 		case "layout": {
-			if (!ts.isStringLiteralLike(node.initializer)) return;
-			const start = node.initializer.getStart(sourceFile);
-			const end = node.initializer.getEnd();
+			let literal;
+			if (ts.isStringLiteralLike(node.initializer)) literal = node.initializer;
+			else if (ts.isObjectLiteralExpression(node.initializer)) {
+				for (const prop of node.initializer.properties) if (ts.isPropertyAssignment(prop) && ts.isIdentifier(prop.name) && prop.name.text === "name" && ts.isStringLiteralLike(prop.initializer)) {
+					literal = prop.initializer;
+					break;
+				}
+			}
+			if (!literal) return;
+			const start = literal.getStart(sourceFile);
+			const end = literal.getEnd();
 			if (position < start || position > end) return;
-			const path = data.layouts[node.initializer.text];
+			const path = data.layouts[literal.text];
 			if (path === void 0) return;
 			return {
 				textSpan: {
@@ -418,8 +414,8 @@ function* forwardRuntimeConfig(context, definition, path) {
 	const nodeProgram = nodeProject.getLanguageService().getProgram();
 	if (!nodeProgram) return;
 	const checker = nodeProgram.getTypeChecker();
-	for (const configFile$1 of data.configFiles) {
-		const sourceFile = nodeProgram.getSourceFile(configFile$1);
+	for (const configFile of data.configFiles) {
+		const sourceFile = nodeProgram.getSourceFile(configFile);
 		if (!sourceFile) continue;
 		outer: for (const node of sourceFile.statements) {
 			if (!ts.isExportAssignment(node) || !ts.isCallExpression(node.expression) || !node.expression.arguments.length) continue;
@@ -433,19 +429,19 @@ function* forwardRuntimeConfig(context, definition, path) {
 				currentType = checker.getTypeOfSymbol(symbol);
 			}
 			for (const decl of currentSymbol?.declarations ?? []) {
-				const sourceFile$1 = decl.getSourceFile();
+				const sourceFile = decl.getSourceFile();
 				const contextSpan = {
-					start: decl.getStart(sourceFile$1),
-					length: decl.getWidth(sourceFile$1)
+					start: decl.getStart(sourceFile),
+					length: decl.getWidth(sourceFile)
 				};
 				let textSpan = contextSpan;
 				if (ts.isPropertyAssignment(decl) || ts.isPropertySignature(decl)) textSpan = {
-					start: decl.name.getStart(sourceFile$1),
-					length: decl.name.getWidth(sourceFile$1)
+					start: decl.name.getStart(sourceFile),
+					length: decl.name.getWidth(sourceFile)
 				};
 				yield {
 					...definition,
-					fileName: sourceFile$1.fileName,
+					fileName: sourceFile.fileName,
 					textSpan,
 					contextSpan
 				};
@@ -453,10 +449,9 @@ function* forwardRuntimeConfig(context, definition, path) {
 		}
 	}
 }
-
 //#endregion
 //#region src/typescript/features/getEditsForFileRename.ts
-var getEditsForFileRename_exports = /* @__PURE__ */ __export({ preprocess: () => preprocess });
+var getEditsForFileRename_exports = /* @__PURE__ */ __exportAll({ preprocess: () => preprocess });
 function preprocess(context, getEditsForFileRename) {
 	const { ts, info, data, server } = context;
 	return (...args) => {
@@ -475,7 +470,7 @@ function preprocess(context, getEditsForFileRename) {
 					const position = node.name.getStart(sourceFile);
 					const res = languageService.getReferencesAtPosition(fileName, position)?.filter((entry) => !entry.fileName.startsWith(data.buildDir))?.sort((a, b) => a.textSpan.start - b.textSpan.start);
 					const lazy = node.type && ts.isTypeReferenceNode(node.type) && ts.isIdentifier(node.type.typeName) && node.type.typeName.text === "LazyComponent";
-					for (const { fileName: fileName$1, textSpan } of res ?? []) (references[fileName$1] ??= []).push({
+					for (const { fileName, textSpan } of res ?? []) (references[fileName] ??= []).push({
 						textSpan,
 						lazy: lazy || void 0
 					});
@@ -492,11 +487,10 @@ function preprocess(context, getEditsForFileRename) {
 		});
 	};
 }
-
 //#endregion
 //#region src/typescript/index.ts
-const plugin = (module$1) => {
-	const { typescript: ts } = module$1;
+const plugin = (module) => {
+	const { typescript: ts } = module;
 	return { create(info) {
 		const data = createData(ts, info);
 		const context = {
@@ -514,14 +508,9 @@ const plugin = (module$1) => {
 				const original = languageService[key];
 				methods[key] = method.postprocess(context, context.language, original);
 			}
-			info.project["languageService"] = new Proxy(languageService, {
-				get(target, p, receiver) {
-					return methods[p] ?? Reflect.get(target, p, receiver);
-				},
-				set(...args) {
-					return Reflect.set(...args);
-				}
-			});
+			info.project["languageService"] = new Proxy(languageService, { get(target, p, receiver) {
+				return methods[p] ?? Reflect.get(target, p, receiver);
+			} });
 		});
 		for (const [key, method] of [
 			["findRenameLocations", findRenameLocations_exports],
@@ -534,7 +523,5 @@ const plugin = (module$1) => {
 		return info.languageService;
 	} };
 };
-var typescript_default = plugin;
-
 //#endregion
-module.exports = typescript_default;
+module.exports = plugin;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dxup/nuxt",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "TypeScript plugin for Nuxt",
   "author": "KazariEX",
   "license": "MIT",
@@ -18,20 +18,25 @@
   "peerDependencies": {
     "typescript": "*"
   },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
+  },
   "dependencies": {
-    "@nuxt/kit": "^4.2.2",
+    "@nuxt/kit": "^4.4.2",
     "chokidar": "^5.0.0",
     "pathe": "^2.0.3",
-    "tinyglobby": "^0.2.15",
+    "tinyglobby": "^0.2.16",
     "@dxup/unimport": "^0.1.2"
   },
   "devDependencies": {
-    "@dxup/shared": "",
-    "@volar/language-core": "^2.4.27",
-    "@volar/typescript": "^2.4.27",
-    "@vue/language-core": "^3.2.1",
-    "nuxt": "^4.2.2",
-    "typescript": "^5.9.3"
+    "@volar/language-core": "^2.4.28",
+    "@volar/typescript": "^2.4.28",
+    "@vue/language-core": "^3.2.7",
+    "nuxt": "^4.4.2",
+    "typescript": "^6.0.3",
+    "@dxup/shared": "0.0.0"
   },
   "scripts": {
     "build": "tsdown",