@ripast/vue 0.3.0 → 0.5.0

package/dist/index.d.mts

@@ -24,7 +24,7 @@ interface ListComponentsOptions {
   /** Emit warnings to this sink (default: process.stderr). Pass () => {} to silence. */
   warn?: (msg: string) => void;
 }
-declare function listComponents(cwd: string, opts?: ListComponentsOptions): VueComponent[];
+export declare function listComponents(cwd: string, opts?: ListComponentsOptions): VueComponent[];
 interface PropSig {
   name: string;
   type?: string;
@@ -40,8 +40,8 @@ interface ParsedComponentShape {
   setup: boolean;
   propsResolution: PropsResolution;
 }
-declare function parseComponent(absPath: string): ParsedComponentShape;
-declare function parseComponentSource(absPath: string, source: string): ParsedComponentShape;
+export declare function parseComponent(absPath: string): ParsedComponentShape;
+export declare function parseComponentSource(absPath: string, source: string): ParsedComponentShape;
 type UsageForm = 'tag-pascal' | 'tag-kebab' | 'resolveComponent' | 'dynamic-is-literal' | 'dynamic-is-binding';
 interface ComponentUsage {
   name: string;
@@ -57,7 +57,7 @@ interface FindUsagesOptions {
   cwd?: string;
   glob?: string | string[];
 }
-declare function findComponentUsages(names: string[], opts?: FindUsagesOptions): ComponentUsage[];
-declare function findComponentUsage(name: string, opts?: FindUsagesOptions): ComponentUsage[];
+export declare function findComponentUsages(names: string[], opts?: FindUsagesOptions): ComponentUsage[];
+export declare function findComponentUsage(name: string, opts?: FindUsagesOptions): ComponentUsage[];
 declare const adapter: FrameworkAdapter;
-export { type ComponentKind, type ComponentUsage, type ListComponentsOptions, type ParsedComponentShape, type PropSig, type UsageForm, type VueComponent, adapter as default, findComponentUsage, findComponentUsages, listComponents, parseComponent, parseComponentSource };
+export { type ComponentKind, type ComponentUsage, type ListComponentsOptions, type ParsedComponentShape, type PropSig, type UsageForm, type VueComponent, adapter as default };

package/dist/index.mjs

@@ -3,14 +3,13 @@ import { basename, dirname, join, relative, resolve } from "node:path";
 import { extractTemplateExpressions, hyphenateVueName, isInsideAutoImportScope, parseSourceFile, parseVueTemplateAst, posToLineCol, rewriteTemplateReferences, rgFiles, rgFilesMany, scan } from "@ripast/core/adapter";
 import { URI } from "vscode-uri";
 import process from "node:process";
+import ts from "@typescript/typescript6";
 import { FileType, createLanguage, createLanguageService, createUriMap } from "@volar/language-service";
 import { createLanguageServiceHost, resolveFileLanguageId } from "@volar/typescript";
 import { createParsedCommandLine, createVueLanguagePlugin, getAllExtensions } from "@vue/language-core";
 import { createVueLanguageServicePlugins } from "@vue/language-service";
-import ts from "typescript";
 import { create } from "volar-service-typescript";
 import { TextDocument } from "vscode-languageserver-textdocument";
-import { spawnSync } from "node:child_process";
 function stringifyArg(arg) {
 	if (arg instanceof Error) return arg.message;
 	if (typeof arg === "string") return arg;
@@ -149,7 +148,8 @@ function createVueServiceInternal(tsconfigPath, cwd) {
 		},
 		...createLanguageServiceHost(ts, ts.sys, language, fileToUri, projectHost)
 	} };
-	const service = createLanguageService(language, [...create(ts), ...createVueLanguageServicePlugins(ts)], env, project);
+	const plugins = [...create(ts), ...createVueLanguageServicePlugins(ts)];
+	const service = createLanguageService(language, plugins, env, project);
 	return {
 		service,
 		fileToUri,
@@ -201,27 +201,17 @@ function hasVueFilesContaining(cwd, pattern) {
 	return listVueFilesContaining(cwd, pattern).length > 0;
 }
 function listVueFiles(cwd) {
-	return rgVueFiles(cwd, ["--files"]);
+	return rgFiles("", {
+		cwd,
+		glob: "*.vue",
+		listAll: true
+	});
 }
 function listVueFilesContaining(cwd, pattern) {
-	return rgVueFiles(cwd, [
-		"--files-with-matches",
-		"--fixed-strings",
-		pattern
-	]);
-}
-function rgVueFiles(cwd, args) {
-	return spawnSync("rg", [
-		...args,
-		"--hidden",
-		"--no-messages",
-		"-g",
-		"*.vue",
-		"."
-	], {
+	return rgFiles(pattern, {
 		cwd,
-		encoding: "utf8"
-	}).stdout.split("\n").filter(Boolean).map((path) => resolve(cwd, path));
+		glob: "*.vue"
+	});
 }
 async function applyVueRename(tsconfigPath, cwd, from, to, sites) {
 	const vue = createVueService(tsconfigPath, cwd);
@@ -300,7 +290,7 @@ async function vueRegressions(tsconfigPath, cwd, pendingChanges) {
 		const baselinePairs = await withFilteredConsoleWarn(() => Promise.all(vueFiles.map(async (file) => [file, await collectDiagKeys(vue, file)])));
 		const baseline = new Map(baselinePairs);
 		for (const c of pendingChanges) vue.setSnapshot(c.path, c.after);
-		const checkSet = [...new Set([...vueFiles, ...pendingChanges.filter((c) => c.path.endsWith(".vue")).map((c) => c.path)])];
+		const checkSet = [.../* @__PURE__ */ new Set([...vueFiles, ...pendingChanges.filter((c) => c.path.endsWith(".vue")).map((c) => c.path)])];
 		const postPairs = await withFilteredConsoleWarn(() => Promise.all(checkSet.map(async (file) => [file, await getDiags(vue, file)])));
 		const out = [];
 		for (const [file, post] of postPairs) {
@@ -734,7 +724,8 @@ function collectFromSfc(abs, source, cwd, alias, out) {
 		if (node.type !== NODE_ELEMENT$1) return;
 		const canonical = alias.byTag.get(node.tag);
 		if (canonical) {
-			const { line, col } = posToLineCol(source, node.loc.start.offset + 1);
+			const offset = node.loc.start.offset + 1;
+			const { line, col } = posToLineCol(source, offset);
 			out.push({
 				name: canonical,
 				file: abs,
@@ -821,7 +812,8 @@ function collectFromScript(abs, source, cwd, alias, out) {
 		const arg = node.arguments?.[0];
 		if (arg?.type !== "Literal" || typeof arg.value !== "string") return;
 		if (!alias.byString.has(arg.value)) return;
-		const { line, col } = posToLineCol(source, (arg.start ?? 0) + scriptOffset);
+		const offset = (arg.start ?? 0) + scriptOffset;
+		const { line, col } = posToLineCol(source, offset);
 		out.push({
 			name: arg.value,
 			file: abs,
@@ -1010,7 +1002,7 @@ function stripModuleExt(path) {
 }
 const MANIFEST_PATH = ".nuxt/components.d.ts";
 const MANIFEST_ENTRY_RE = /^\s*(?:export\s+const\s+)?([A-Z]\w*)\s*:\s*(?:LazyComponent<\s*)?typeof\s+import\(\s*["']([^"']+)["']\s*\)\s*\[\s*["']default["']\s*\]/gm;
-const COMPONENT_DIR_NAMES = new Set(["components"]);
+const COMPONENT_DIR_NAMES = /* @__PURE__ */ new Set(["components"]);
 const DEFAULT_VUE_GLOB = ["*.vue"];
 function listComponents(cwd, opts = {}) {
 	const source = opts.source ?? "auto";
@@ -1392,7 +1384,7 @@ const doctor = {
 		return out;
 	}
 };
-const VUE_BUILTINS = new Set([
+const VUE_BUILTINS = /* @__PURE__ */ new Set([
 	"Transition",
 	"TransitionGroup",
 	"KeepAlive",
@@ -1403,7 +1395,7 @@ const VUE_BUILTINS = new Set([
 	"Template",
 	"ClientOnly"
 ]);
-const NUXT_BUILTINS = new Set([
+const NUXT_BUILTINS = /* @__PURE__ */ new Set([
 	"NuxtPage",
 	"NuxtLink",
 	"NuxtLayout",
@@ -1432,26 +1424,59 @@ const NUXT_BUILTINS = new Set([
 ]);
 const PASCAL = /^[A-Z][A-Z0-9a-z]*$/;
 const NODE_ELEMENT = 1;
-function extractTemplateBlock(source) {
-	const openStart = source.indexOf("<template");
-	if (openStart === -1) return void 0;
-	const contentStart = source.indexOf(">", openStart);
-	if (contentStart === -1) return void 0;
-	const start = contentStart + 1;
-	const end = source.indexOf("</template>", start);
-	if (end === -1) return void 0;
-	return {
-		content: source.slice(start, end),
-		start
-	};
+function listAppRoots(cwd) {
+	const roots = [];
+	const parent = join(cwd, "apps");
+	if (!existsSync(parent)) return roots;
+	for (const name of readdirSync(parent)) {
+		const abs = join(parent, name);
+		try {
+			if (statSync(abs).isDirectory() && existsSync(join(abs, ".nuxt", "components.d.ts"))) roots.push(abs);
+		} catch {}
+	}
+	return roots;
 }
-function findPhantomComponents(cwd) {
-	const files = rgFilesMany(["*.vue"], { cwd });
-	const known = new Set([...VUE_BUILTINS, ...NUXT_BUILTINS]);
-	for (const c of listComponents(cwd, { source: "auto" })) {
+function scopeForFile(abs, roots, cwd) {
+	let best = cwd;
+	let bestLen = -1;
+	for (const root of roots) if ((abs === root || abs.startsWith(`${root}/`)) && root.length > bestLen) {
+		best = root;
+		bestLen = root.length;
+	}
+	return best;
+}
+function buildKnownSet(root) {
+	const known = /* @__PURE__ */ new Set([...VUE_BUILTINS, ...NUXT_BUILTINS]);
+	for (const c of listComponents(root, {
+		source: "auto",
+		warn: () => {}
+	})) {
+		known.add(c.name);
+		for (const alias of c.aliases ?? []) known.add(alias);
+	}
+	return known;
+}
+function buildUnionKnownSet(roots, cwd) {
+	const known = /* @__PURE__ */ new Set([...VUE_BUILTINS, ...NUXT_BUILTINS]);
+	const sources = roots.length ? roots : [cwd];
+	for (const root of sources) for (const c of listComponents(root, {
+		source: "auto",
+		warn: () => {}
+	})) {
 		known.add(c.name);
 		for (const alias of c.aliases ?? []) known.add(alias);
 	}
+	return known;
+}
+function findPhantomComponents(cwd) {
+	const files = rgFiles("", {
+		cwd,
+		glob: ["*.vue"],
+		listAll: true
+	});
+	const appRoots = listAppRoots(cwd);
+	const knownByRoot = /* @__PURE__ */ new Map();
+	if (appRoots.length) knownByRoot.set(cwd, buildUnionKnownSet(appRoots, cwd));
 	const out = [];
 	for (const abs of files) {
 		let source;
@@ -1460,11 +1485,14 @@ function findPhantomComponents(cwd) {
 		} catch {
 			continue;
 		}
-		const template = extractTemplateBlock(source);
-		if (!template) continue;
-		const templateStart = template.start;
-		const ast = parseVueTemplateAst(template.content);
+		const ast = parseVueTemplateAst(source);
 		if (!ast) continue;
+		const root = scopeForFile(abs, appRoots, cwd);
+		let known = knownByRoot.get(root);
+		if (!known) {
+			known = buildKnownSet(root);
+			knownByRoot.set(root, known);
+		}
 		const localImports = collectLocalImports(source);
 		const seen = /* @__PURE__ */ new Set();
 		walkTpl(ast, (node) => {
@@ -1477,7 +1505,7 @@ function findPhantomComponents(cwd) {
 			const key = `${abs}::${tag}::${node.loc?.start?.offset ?? 0}`;
 			if (seen.has(key)) return;
 			seen.add(key);
-			const offset = templateStart + (node.loc?.start?.offset ?? 0);
+			const offset = node.loc?.start?.offset ?? 0;
 			const { line, col } = posToLineCol(source, offset);
 			out.push({
 				check: "phantom-component",
@@ -1486,7 +1514,8 @@ function findPhantomComponents(cwd) {
 				message: `<${tag}> is not a known component (auto-import scope, local import, or built-in)`,
 				detail: {
 					name: tag,
-					col
+					col,
+					scope: relative(cwd, root) || "."
 				}
 			});
 		});
@@ -1627,7 +1656,8 @@ function findStaleNuxtConfigRefs(cwd) {
 		if (importsMatch) for (const lit of importsMatch[1].matchAll(/['"`]([^'"`]+)['"`]/g)) {
 			const value = lit[1];
 			if (!value.startsWith(".") && !value.startsWith("/")) continue;
-			if (existsSync(resolve(root, value.replace(/\/\*\*.*$/, "").replace(/\/\*.*$/, "")))) continue;
+			const dirPath = resolve(root, value.replace(/\/\*\*.*$/, "").replace(/\/\*.*$/, ""));
+			if (existsSync(dirPath)) continue;
 			out.push({
 				check: "stale-nuxt-config-ref",
 				file: rel,
@@ -1642,7 +1672,8 @@ function findStaleNuxtConfigRefs(cwd) {
 		for (const m of source.matchAll(COMPONENT_PATH_RE)) {
 			const value = m[1];
 			if (!value.startsWith(".") && !value.startsWith("/")) continue;
-			if (existsSync(resolve(root, value.replace(/\/\*\*.*$/, "").replace(/\/\*.*$/, "")))) continue;
+			const dirPath = resolve(root, value.replace(/\/\*\*.*$/, "").replace(/\/\*.*$/, ""));
+			if (existsSync(dirPath)) continue;
 			out.push({
 				check: "stale-nuxt-config-ref",
 				file: rel,
@@ -1835,7 +1866,7 @@ function rewriteResolveComponentSites(cwd, oldName, newName, changes, oldAbs, ne
 	return out;
 }
 function addExplicitComponentImports(cwd, oldName, newName, newAbs, changes, oldAbs) {
-	const tokens = new Set([
+	const tokens = /* @__PURE__ */ new Set([
 		oldName,
 		newName,
 		hyphenateVueName(oldName),
@@ -1874,7 +1905,7 @@ function escapeRe(s) {
 function rewriteIsAttributeSites(cwd, oldName, newName, changes, oldAbs, newAbs, warnings) {
 	const oldKebab = hyphenateVueName(oldName);
 	const newKebab = hyphenateVueName(newName);
-	const candidates = new Set([...rgFiles(oldName, {
+	const candidates = /* @__PURE__ */ new Set([...rgFiles(oldName, {
 		cwd,
 		glob: "*.vue"
 	}), ...rgFiles(oldKebab, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ripast/vue",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Vue (and Nuxt) framework adapter for ripast. Provides Volar/Vue Language Service-backed rename, move, and template rewriting for .vue SFCs.",
   "author": {
     "name": "Harlan Wilton",
@@ -28,34 +28,34 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
+      "types": "./dist/index.d.mts",
       "import": "./dist/index.mjs"
     }
   },
   "main": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "types": "./dist/index.d.mts",
   "files": [
     "dist"
   ],
   "engines": {
-    "node": ">=20.11"
+    "node": ">=22.13"
   },
   "peerDependencies": {
-    "typescript": ">=5.4",
-    "@ripast/core": "0.3.0"
+    "@ripast/core": "0.5.0"
   },
   "dependencies": {
+    "@typescript/typescript6": "^6.0.2",
     "@volar/language-service": "^2.4.28",
     "@volar/typescript": "^2.4.28",
-    "@vue/language-core": "^3.2.8",
-    "@vue/language-service": "^3.2.8",
+    "@vue/language-core": "^3.3.12",
+    "@vue/language-service": "^3.3.12",
     "volar-service-typescript": "^0.0.71",
-    "vscode-languageserver-protocol": "3.17.5",
-    "vscode-languageserver-textdocument": "^1.0.12",
-    "vscode-uri": "^3.1.0"
+    "vscode-languageserver-protocol": "3.18.4",
+    "vscode-languageserver-textdocument": "^1.0.15",
+    "vscode-uri": "^3.2.0"
   },
   "devDependencies": {
-    "@ripast/core": "0.3.0"
+    "@ripast/core": "0.5.0"
   },
   "scripts": {
     "build": "obuild",