@screenbook/cli 1.6.1 → 1.7.0

package/dist/index.mjs

@@ -3042,25 +3042,26 @@ function parseVueRouterConfig(filePath, preloadedContent) {
 		throw new Error(`Failed to parse routes file "${absolutePath}": ${message}`);
 	}
 	const routes = [];
+	const importMap = buildImportMap(ast.program.body, routesFileDir);
 	for (const node of ast.program.body) {
 		if (node.type === "ExportNamedDeclaration" && node.declaration?.type === "VariableDeclaration") {
 			for (const decl of node.declaration.declarations) if (decl.id.type === "Identifier" && decl.id.name === "routes" && decl.init?.type === "ArrayExpression") {
-				const parsed = parseRoutesArray(decl.init, routesFileDir, warnings);
+				const parsed = parseRoutesArray(decl.init, routesFileDir, warnings, importMap);
 				routes.push(...parsed);
 			}
 		}
 		if (node.type === "VariableDeclaration") {
 			for (const decl of node.declarations) if (decl.id.type === "Identifier" && decl.id.name === "routes" && decl.init?.type === "ArrayExpression") {
-				const parsed = parseRoutesArray(decl.init, routesFileDir, warnings);
+				const parsed = parseRoutesArray(decl.init, routesFileDir, warnings, importMap);
 				routes.push(...parsed);
 			}
 		}
 		if (node.type === "ExportDefaultDeclaration" && node.declaration.type === "ArrayExpression") {
-			const parsed = parseRoutesArray(node.declaration, routesFileDir, warnings);
+			const parsed = parseRoutesArray(node.declaration, routesFileDir, warnings, importMap);
 			routes.push(...parsed);
 		}
 		if (node.type === "ExportDefaultDeclaration" && node.declaration.type === "TSSatisfiesExpression" && node.declaration.expression.type === "ArrayExpression") {
-			const parsed = parseRoutesArray(node.declaration.expression, routesFileDir, warnings);
+			const parsed = parseRoutesArray(node.declaration.expression, routesFileDir, warnings, importMap);
 			routes.push(...parsed);
 		}
 	}
@@ -3071,9 +3072,25 @@ function parseVueRouterConfig(filePath, preloadedContent) {
 	};
 }
 /**
+* Build a map of imported identifiers to their file paths
+*/
+function buildImportMap(body, baseDir) {
+	const importMap = /* @__PURE__ */ new Map();
+	for (const node of body) {
+		if (node.type !== "ImportDeclaration") continue;
+		const source = node.source.value;
+		if (typeof source !== "string") continue;
+		const resolvedPath = resolveImportPath(source, baseDir);
+		if (!resolvedPath) continue;
+		for (const specifier of node.specifiers) if (specifier.type === "ImportDefaultSpecifier") importMap.set(specifier.local.name, resolvedPath);
+		else if (specifier.type === "ImportSpecifier") importMap.set(specifier.local.name, resolvedPath);
+	}
+	return importMap;
+}
+/**
 * Parse an array expression containing route objects
 */
-function parseRoutesArray(arrayNode, baseDir, warnings) {
+function parseRoutesArray(arrayNode, baseDir, warnings, importMap) {
 	const routes = [];
 	for (const element of arrayNode.elements) {
 		if (!element) continue;
@@ -3083,7 +3100,7 @@ function parseRoutesArray(arrayNode, baseDir, warnings) {
 			continue;
 		}
 		if (element.type === "ObjectExpression") {
-			const route = parseRouteObject(element, baseDir, warnings);
+			const route = parseRouteObject(element, baseDir, warnings, importMap);
 			if (route) routes.push(route);
 		}
 	}
@@ -3092,14 +3109,18 @@ function parseRoutesArray(arrayNode, baseDir, warnings) {
 /**
 * Parse a single route object expression
 */
-function parseRouteObject(objectNode, baseDir, warnings) {
-	const route = { path: "" };
+function parseRouteObject(objectNode, baseDir, warnings, importMap) {
+	const route = {};
+	let hasPath = false;
 	for (const prop of objectNode.properties) {
 		if (prop.type !== "ObjectProperty") continue;
 		if (prop.key.type !== "Identifier") continue;
 		switch (prop.key.name) {
 			case "path":
-				if (prop.value.type === "StringLiteral") route.path = prop.value.value;
+				if (prop.value.type === "StringLiteral") {
+					route.path = prop.value.value;
+					hasPath = true;
+				}
 				break;
 			case "name":
 				if (prop.value.type === "StringLiteral") route.name = prop.value.value;
@@ -3108,21 +3129,21 @@ function parseRouteObject(objectNode, baseDir, warnings) {
 				if (prop.value.type === "StringLiteral") route.redirect = prop.value.value;
 				break;
 			case "component":
-				route.component = extractComponentPath(prop.value, baseDir);
+				route.component = extractComponentPath(prop.value, baseDir, importMap);
 				break;
 			case "children":
-				if (prop.value.type === "ArrayExpression") route.children = parseRoutesArray(prop.value, baseDir, warnings);
+				if (prop.value.type === "ArrayExpression") route.children = parseRoutesArray(prop.value, baseDir, warnings, importMap);
 				break;
 		}
 	}
-	if (!route.path) return null;
+	if (!hasPath) return null;
 	return route;
 }
 /**
 * Extract component path from various component definitions
 */
-function extractComponentPath(node, baseDir) {
-	if (node.type === "Identifier") return;
+function extractComponentPath(node, baseDir, importMap) {
+	if (node.type === "Identifier") return importMap.get(node.name);
 	if (node.type === "ArrowFunctionExpression") {
 		const body = node.body;
 		if (body.type === "CallExpression" && body.callee.type === "Import") {