@weapp-vite/web 1.3.36 → 1.4.0

package/dist/plugin/register.mjs

@@ -1,44 +1,40 @@
-import { appendInlineQuery, resolveRuntimePolyfillPath, toRelativeImport, toViteFsImport } from "./path.mjs";
+import { STYLE_QUERY, TEMPLATE_QUERY } from "./constants.mjs";
+import { appendQuery, resolveRuntimePolyfillPath, toRelativeImport, toViteFsImport } from "./path.mjs";
 import { parse } from "@babel/parser";
 import _babelTraverse from "@babel/traverse";
 import * as t from "@babel/types";
 import MagicString from "magic-string";
 
 //#region src/plugin/register.ts
-const traverseCandidate = (() => {
-	const mod = _babelTraverse;
+function resolveBabelTraverse(mod) {
 	if (typeof mod === "function") return mod;
 	if (mod?.default && typeof mod.default === "function") return mod.default;
 	if (mod?.traverse && typeof mod.traverse === "function") return mod.traverse;
-})();
-if (typeof traverseCandidate !== "function") throw new TypeError("[@weapp-vite/web] Failed to resolve @babel/traverse export.");
-const traverse = traverseCandidate;
-function mapRegisterIdentifier(kind) {
-	if (kind === "page") return "Page";
-	if (kind === "component") return "Component";
-	if (kind === "app") return "App";
-	return "";
+	throw new TypeError("[@weapp-vite/web] Failed to resolve @babel/traverse export.");
 }
-function getRegisterName(kind) {
-	if (kind === "page") return "registerPage";
-	if (kind === "component") return "registerComponent";
-	if (kind === "app") return "registerApp";
+const traverse = resolveBabelTraverse(_babelTraverse);
+function getRegisterName(kind, callee) {
+	if (kind === "page" && (callee === "Page" || callee === "Component")) return "registerPage";
+	if (kind === "component" && callee === "Component") return "registerComponent";
+	if (kind === "app" && callee === "App") return "registerApp";
 }
-function overwriteCall(path, meta, registerName, templateIdent, styleIdent, s) {
-	const node = path.node;
-	const callee = node.callee;
-	if (!t.isIdentifier(callee)) return;
-	const insertPosition = node.end - 1;
+function createRegisterMetaCode(meta, templateIdent, styleIdent, includeKind = false) {
 	const metaParts = [`id: ${JSON.stringify(meta.id)}`];
+	if (includeKind) metaParts.push(`kind: ${JSON.stringify(meta.kind)}`);
 	if (templateIdent) metaParts.push(`template: ${templateIdent}`);
 	if (styleIdent) metaParts.push(`style: ${styleIdent}`);
-	const metaCode = `{ ${metaParts.join(", ")} }`;
-	s.overwrite(callee.start, callee.end, registerName);
+	if (meta.navigationBar) metaParts.push(`navigationBar: ${JSON.stringify(meta.navigationBar)}`);
+	return `{ ${metaParts.join(", ")} }`;
+}
+function overwriteCall(path, meta, registerName, templateIdent, styleIdent, s, includeKind = false) {
+	const node = path.node;
+	const identifier = node.callee;
+	const insertPosition = node.end - 1;
+	const metaCode = createRegisterMetaCode(meta, templateIdent, styleIdent, includeKind);
+	s.overwrite(identifier.start, identifier.end, registerName);
 	s.appendLeft(insertPosition, `, ${metaCode}`);
 }
-function transformScriptModule({ code, cleanId, meta, enableHmr }) {
-	const registerName = getRegisterName(meta.kind);
-	if (!registerName) return null;
+function transformScriptModule({ code, cleanId, meta, enableHmr, runtimeModuleId, hmrAcceptCode }) {
 	let ast;
 	try {
 		ast = parse(code, {
@@ -51,27 +47,43 @@ function transformScriptModule({ code, cleanId, meta, enableHmr }) {
 		return null;
 	}
 	const s = new MagicString(code);
-	let transformed = false;
+	const wevuDefineComponentNames = /* @__PURE__ */ new Set();
+	for (const statement of ast.program.body) {
+		if (!t.isImportDeclaration(statement) || statement.source.value !== "wevu") continue;
+		for (const specifier of statement.specifiers) if (t.isImportSpecifier(specifier) && t.isIdentifier(specifier.imported, { name: "defineComponent" })) wevuDefineComponentNames.add(specifier.local.name);
+	}
 	const imports = [];
-	const runtimePolyfillId = toViteFsImport(resolveRuntimePolyfillPath());
+	const runtimePolyfillId = runtimeModuleId ?? toViteFsImport(resolveRuntimePolyfillPath());
 	const templateIdent = meta.templatePath ? "__weapp_template__" : void 0;
 	const styleIdent = meta.stylePath ? "__weapp_style__" : void 0;
-	if (meta.templatePath && templateIdent) imports.push(`import ${templateIdent} from '${toRelativeImport(cleanId, meta.templatePath)}'`);
-	if (meta.stylePath && styleIdent) imports.push(`import ${styleIdent} from '${appendInlineQuery(toRelativeImport(cleanId, meta.stylePath))}'`);
+	if (meta.templatePath && templateIdent) imports.push(`import ${templateIdent} from '${appendQuery(toRelativeImport(cleanId, meta.templatePath), TEMPLATE_QUERY)}'`);
+	if (meta.stylePath && styleIdent) {
+		const styleQuery = meta.stylePath.endsWith(".wxss") ? STYLE_QUERY : "inline";
+		imports.push(`import ${styleIdent} from '${appendQuery(toRelativeImport(cleanId, meta.stylePath), styleQuery)}'`);
+	}
 	const registerImports = /* @__PURE__ */ new Set();
 	traverse(ast, { CallExpression(path) {
 		if (!t.isIdentifier(path.node.callee)) return;
-		if (path.node.callee.name === mapRegisterIdentifier(meta.kind)) {
+		const name = path.node.callee.name;
+		if (wevuDefineComponentNames.has(name) && meta.kind !== "app") {
+			registerImports.add("registerWebWevuComponent");
+			overwriteCall(path, meta, "registerWebWevuComponent", templateIdent, styleIdent, s, true);
+			return;
+		}
+		const registerName = getRegisterName(meta.kind, name);
+		if (registerName) {
 			registerImports.add(registerName);
 			overwriteCall(path, meta, registerName, templateIdent, styleIdent, s);
-			transformed = true;
 		}
 	} });
-	if (!transformed) return null;
-	if (registerImports.size > 0) imports.unshift(`import { ${Array.from(registerImports).join(", ")} } from '${runtimePolyfillId}'`);
-	const prefix = `${imports.join("\n")}\n`;
+	registerImports.add("installWebModuleRegistration");
+	imports.unshift(`import { ${Array.from(registerImports).join(", ")} } from '${runtimePolyfillId}'`);
+	const moduleMetaCode = createRegisterMetaCode(meta, templateIdent, styleIdent, true);
+	const restoreIdent = "__weapp_web_restore_registration__";
+	const prefix = `${imports.join("\n")}\nconst ${restoreIdent} = installWebModuleRegistration(${moduleMetaCode})\n`;
 	s.prepend(prefix);
-	if (enableHmr) s.append(`\nif (import.meta.hot) { import.meta.hot.accept() }\n`);
+	s.append(`\n${restoreIdent}()\n`);
+	if (enableHmr && hmrAcceptCode) s.append(`\n${hmrAcceptCode}\n`);
 	return {
 		code: s.toString(),
 		map: s.generateMap({ hires: true })
@@ -79,5 +91,5 @@ function transformScriptModule({ code, cleanId, meta, enableHmr }) {
 }
 
 //#endregion
-export { transformScriptModule };
+export { resolveBabelTraverse, transformScriptModule };
 //# sourceMappingURL=register.mjs.map

package/dist/plugin/register.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"register.mjs","names":[],"sources":["../../src/plugin/register.ts"],"sourcesContent":["import type { NodePath } from '@babel/traverse'\nimport type { CallExpression } from '@babel/types'\nimport type { SourceMap } from 'magic-string'\n\nimport type { ModuleMeta } from './types'\nimport { parse } from '@babel/parser'\nimport _babelTraverse from '@babel/traverse'\nimport * as t from '@babel/types'\n\nimport MagicString from 'magic-string'\nimport { appendInlineQuery, resolveRuntimePolyfillPath, toRelativeImport, toViteFsImport } from './path'\n\ntype TraverseFunction = typeof _babelTraverse extends (...args: any[]) => any\n  ? typeof _babelTraverse\n  : typeof _babelTraverse extends { default: infer D }\n    ? D\n    : typeof _babelTraverse\n\nconst traverseCandidate: any = (() => {\n  const mod: any = _babelTraverse\n  if (typeof mod === 'function') {\n    return mod\n  }\n  if (mod?.default && typeof mod.default === 'function') {\n    return mod.default\n  }\n  if (mod?.traverse && typeof mod.traverse === 'function') {\n    return mod.traverse\n  }\n  return undefined\n})()\n\nif (typeof traverseCandidate !== 'function') {\n  throw new TypeError('[@weapp-vite/web] Failed to resolve @babel/traverse export.')\n}\n\nconst traverse: TraverseFunction = traverseCandidate\n\nfunction mapRegisterIdentifier(kind: ModuleMeta['kind']) {\n  if (kind === 'page') {\n    return 'Page'\n  }\n  if (kind === 'component') {\n    return 'Component'\n  }\n  if (kind === 'app') {\n    return 'App'\n  }\n  return ''\n}\n\nfunction getRegisterName(kind: ModuleMeta['kind']) {\n  if (kind === 'page') {\n    return 'registerPage'\n  }\n  if (kind === 'component') {\n    return 'registerComponent'\n  }\n  if (kind === 'app') {\n    return 'registerApp'\n  }\n  return undefined\n}\n\nfunction overwriteCall(\n  path: NodePath<CallExpression>,\n  meta: ModuleMeta,\n  registerName: string,\n  templateIdent: string | undefined,\n  styleIdent: string | undefined,\n  s: MagicString,\n) {\n  const node = path.node\n  const callee = node.callee\n  if (!t.isIdentifier(callee)) {\n    return\n  }\n  const end = node.end!\n  const insertPosition = end - 1\n  const metaParts: string[] = [`id: ${JSON.stringify(meta.id)}`]\n  if (templateIdent) {\n    metaParts.push(`template: ${templateIdent}`)\n  }\n  if (styleIdent) {\n    metaParts.push(`style: ${styleIdent}`)\n  }\n  const metaCode = `{ ${metaParts.join(', ')} }`\n  s.overwrite(callee.start!, callee.end!, registerName)\n  s.appendLeft(insertPosition, `, ${metaCode}`)\n}\n\ninterface TransformScriptModuleOptions {\n  code: string\n  cleanId: string\n  meta: ModuleMeta\n  enableHmr: boolean\n}\n\nexport function transformScriptModule({\n  code,\n  cleanId,\n  meta,\n  enableHmr,\n}: TransformScriptModuleOptions): null | { code: string, map: SourceMap } {\n  const registerName = getRegisterName(meta.kind)\n  if (!registerName) {\n    return null\n  }\n\n  let ast: ReturnType<typeof parse> | undefined\n  try {\n    ast = parse(code, {\n      sourceType: 'module',\n      plugins: ['typescript', 'jsx'],\n      errorRecovery: true,\n      ranges: true,\n    })\n  }\n  catch {\n    return null\n  }\n\n  const s = new MagicString(code)\n  let transformed = false\n\n  const imports: string[] = []\n  const runtimePolyfillId = toViteFsImport(resolveRuntimePolyfillPath())\n  const templateIdent = meta.templatePath ? '__weapp_template__' : undefined\n  const styleIdent = meta.stylePath ? '__weapp_style__' : undefined\n\n  if (meta.templatePath && templateIdent) {\n    imports.push(`import ${templateIdent} from '${toRelativeImport(cleanId, meta.templatePath)}'`)\n  }\n\n  if (meta.stylePath && styleIdent) {\n    imports.push(`import ${styleIdent} from '${appendInlineQuery(toRelativeImport(cleanId, meta.stylePath))}'`)\n  }\n\n  const registerImports = new Set<string>()\n\n  traverse(ast, {\n    CallExpression(path: NodePath<CallExpression>) {\n      if (!t.isIdentifier(path.node.callee)) {\n        return\n      }\n      const name = path.node.callee.name\n      if (name === mapRegisterIdentifier(meta.kind)) {\n        registerImports.add(registerName)\n        overwriteCall(path, meta, registerName, templateIdent, styleIdent, s)\n        transformed = true\n      }\n    },\n  })\n\n  if (!transformed) {\n    return null\n  }\n\n  if (registerImports.size > 0) {\n    imports.unshift(`import { ${Array.from(registerImports).join(', ')} } from '${runtimePolyfillId}'`)\n  }\n\n  const prefix = `${imports.join('\\n')}\\n`\n  s.prepend(prefix)\n\n  if (enableHmr) {\n    s.append(`\\nif (import.meta.hot) { import.meta.hot.accept() }\\n`)\n  }\n\n  return {\n    code: s.toString(),\n    map: s.generateMap({\n      hires: true,\n    }),\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"register.mjs","names":[],"sources":["../../src/plugin/register.ts"],"sourcesContent":["import type { NodePath } from '@babel/traverse'\nimport type { CallExpression } from '@babel/types'\nimport type { SourceMap } from 'magic-string'\n\nimport type { ModuleMeta } from './types'\nimport { parse } from '@babel/parser'\nimport _babelTraverse from '@babel/traverse'\nimport * as t from '@babel/types'\n\nimport MagicString from 'magic-string'\nimport { STYLE_QUERY, TEMPLATE_QUERY } from './constants'\nimport { appendQuery, resolveRuntimePolyfillPath, toRelativeImport, toViteFsImport } from './path'\n\ntype TraverseFunction = typeof _babelTraverse extends (...args: any[]) => any\n  ? typeof _babelTraverse\n  : typeof _babelTraverse extends { default: infer D }\n    ? D\n    : typeof _babelTraverse\n\nexport function resolveBabelTraverse(mod: any): TraverseFunction {\n  if (typeof mod === 'function') {\n    return mod\n  }\n  if (mod?.default && typeof mod.default === 'function') {\n    return mod.default\n  }\n  if (mod?.traverse && typeof mod.traverse === 'function') {\n    return mod.traverse\n  }\n  throw new TypeError('[@weapp-vite/web] Failed to resolve @babel/traverse export.')\n}\n\nconst traverse = resolveBabelTraverse(_babelTraverse)\n\nfunction getRegisterName(kind: ModuleMeta['kind'], callee: string) {\n  if (kind === 'page' && (callee === 'Page' || callee === 'Component')) {\n    return 'registerPage'\n  }\n  if (kind === 'component' && callee === 'Component') {\n    return 'registerComponent'\n  }\n  if (kind === 'app' && callee === 'App') {\n    return 'registerApp'\n  }\n  return undefined\n}\n\nfunction createRegisterMetaCode(\n  meta: ModuleMeta,\n  templateIdent: string | undefined,\n  styleIdent: string | undefined,\n  includeKind = false,\n) {\n  const metaParts: string[] = [`id: ${JSON.stringify(meta.id)}`]\n  if (includeKind) {\n    metaParts.push(`kind: ${JSON.stringify(meta.kind)}`)\n  }\n  if (templateIdent) {\n    metaParts.push(`template: ${templateIdent}`)\n  }\n  if (styleIdent) {\n    metaParts.push(`style: ${styleIdent}`)\n  }\n  if (meta.navigationBar) {\n    metaParts.push(`navigationBar: ${JSON.stringify(meta.navigationBar)}`)\n  }\n  return `{ ${metaParts.join(', ')} }`\n}\n\nfunction overwriteCall(\n  path: NodePath<CallExpression>,\n  meta: ModuleMeta,\n  registerName: string,\n  templateIdent: string | undefined,\n  styleIdent: string | undefined,\n  s: MagicString,\n  includeKind = false,\n) {\n  const node = path.node\n  const callee = node.callee\n  const identifier = callee as t.Identifier\n  const end = node.end!\n  const insertPosition = end - 1\n  const metaCode = createRegisterMetaCode(meta, templateIdent, styleIdent, includeKind)\n  s.overwrite(identifier.start!, identifier.end!, registerName)\n  s.appendLeft(insertPosition, `, ${metaCode}`)\n}\n\ninterface TransformScriptModuleOptions {\n  code: string\n  cleanId: string\n  meta: ModuleMeta\n  enableHmr: boolean\n  runtimeModuleId?: string\n  hmrAcceptCode?: string\n}\n\nexport function transformScriptModule({\n  code,\n  cleanId,\n  meta,\n  enableHmr,\n  runtimeModuleId,\n  hmrAcceptCode,\n}: TransformScriptModuleOptions): null | { code: string, map: SourceMap } {\n  let ast: ReturnType<typeof parse> | undefined\n  try {\n    ast = parse(code, {\n      sourceType: 'module',\n      plugins: ['typescript', 'jsx'],\n      errorRecovery: true,\n      ranges: true,\n    })\n  }\n  catch {\n    return null\n  }\n\n  const s = new MagicString(code)\n  const wevuDefineComponentNames = new Set<string>()\n  for (const statement of ast.program.body) {\n    if (!t.isImportDeclaration(statement) || statement.source.value !== 'wevu') {\n      continue\n    }\n    for (const specifier of statement.specifiers) {\n      if (t.isImportSpecifier(specifier)\n        && t.isIdentifier(specifier.imported, { name: 'defineComponent' })) {\n        wevuDefineComponentNames.add(specifier.local.name)\n      }\n    }\n  }\n\n  const imports: string[] = []\n  const runtimePolyfillId = runtimeModuleId ?? toViteFsImport(resolveRuntimePolyfillPath())\n  const templateIdent = meta.templatePath ? '__weapp_template__' : undefined\n  const styleIdent = meta.stylePath ? '__weapp_style__' : undefined\n\n  if (meta.templatePath && templateIdent) {\n    imports.push(`import ${templateIdent} from '${appendQuery(toRelativeImport(cleanId, meta.templatePath), TEMPLATE_QUERY)}'`)\n  }\n\n  if (meta.stylePath && styleIdent) {\n    const styleQuery = meta.stylePath.endsWith('.wxss') ? STYLE_QUERY : 'inline'\n    imports.push(`import ${styleIdent} from '${appendQuery(toRelativeImport(cleanId, meta.stylePath), styleQuery)}'`)\n  }\n\n  const registerImports = new Set<string>()\n\n  traverse(ast, {\n    CallExpression(path: NodePath<CallExpression>) {\n      if (!t.isIdentifier(path.node.callee)) {\n        return\n      }\n      const name = path.node.callee.name\n      if (wevuDefineComponentNames.has(name) && meta.kind !== 'app') {\n        registerImports.add('registerWebWevuComponent')\n        overwriteCall(path, meta, 'registerWebWevuComponent', templateIdent, styleIdent, s, true)\n        return\n      }\n      const registerName = getRegisterName(meta.kind, name)\n      if (registerName) {\n        registerImports.add(registerName)\n        overwriteCall(path, meta, registerName, templateIdent, styleIdent, s)\n      }\n    },\n  })\n\n  registerImports.add('installWebModuleRegistration')\n  imports.unshift(`import { ${Array.from(registerImports).join(', ')} } from '${runtimePolyfillId}'`)\n\n  const moduleMetaCode = createRegisterMetaCode(meta, templateIdent, styleIdent, true)\n  const restoreIdent = '__weapp_web_restore_registration__'\n  const prefix = `${imports.join('\\n')}\\nconst ${restoreIdent} = installWebModuleRegistration(${moduleMetaCode})\\n`\n  s.prepend(prefix)\n\n  s.append(`\\n${restoreIdent}()\\n`)\n\n  if (enableHmr && hmrAcceptCode) {\n    s.append(`\\n${hmrAcceptCode}\\n`)\n  }\n\n  return {\n    code: s.toString(),\n    map: s.generateMap({\n      hires: true,\n    }),\n  }\n}\n"],"mappings":"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"}

package/dist/plugin/scan.mjs

@@ -1,77 +1,135 @@
-import { normalizePath, toPosixId } from "./path.mjs";
+import { SCRIPT_EXTS } from "./constants.mjs";
+import { isInsideDir, normalizePath, toPosixId } from "./path.mjs";
 import { slugify } from "../shared/slugify.mjs";
+import { normalizeWebTabBarConfig } from "../shared/tabBar.mjs";
 import { isRecord, readJsonFile, resolveJsonPath, resolveScriptFile, resolveStyleFile, resolveTemplateFile } from "./files.mjs";
 import { mergeNavigationConfig, pickNavigationConfig } from "./navigation.mjs";
 import { collectComponentTagsFromConfig, collectComponentTagsFromJson, mergeComponentTags } from "./scanConfig.mjs";
+import { compileScannedSfc, discoverWebPageIds } from "./scanSfc.mjs";
+import { readdir } from "node:fs/promises";
 import process from "node:process";
 import { dirname, extname, join, posix, relative, resolve } from "pathe";
 
 //#region src/plugin/scan.ts
-async function scanProject({ srcRoot, warn, state }) {
+function getStableWebComponentId(script, srcRoot) {
+	const normalized = script.replace(/\\/g, "/");
+	const nodeModulesIndex = normalized.lastIndexOf("/node_modules/");
+	const extension = extname(script);
+	if (nodeModulesIndex >= 0) return `__external__/${normalized.slice(nodeModulesIndex + 14).slice(0, -extension.length)}`;
+	return toPosixId(relative(srcRoot, script).slice(0, -extension.length));
+}
+function resolveComponentBase(raw, importerDir, srcRoot) {
+	if (!raw) return;
+	if (raw.startsWith(".")) return resolve(importerDir, raw);
+	if (raw.startsWith("/")) return resolve(srcRoot, raw.slice(1));
+}
+async function scanProject({ srcRoot, warn, state, resolveId, resolveAutoImportTag, resolveAppConfig, uniApp }) {
 	state.moduleMeta.clear();
 	state.pageNavigationMap.clear();
 	state.templateComponentMap.clear();
 	state.templatePathSet.clear();
 	state.componentTagMap.clear();
-	state.componentIdMap.clear();
+	state.sfcResults.clear();
 	let appNavigationDefaults = {};
 	let appComponentTags = {};
+	let appTabBar;
 	const pages = /* @__PURE__ */ new Map();
 	const components = /* @__PURE__ */ new Map();
+	const layouts = /* @__PURE__ */ new Map();
+	async function walk(current, files) {
+		const entries = await readdir(current, { withFileTypes: true });
+		for (const entry of entries) {
+			const pathname = join(current, entry.name);
+			if (entry.isDirectory()) await walk(pathname, files);
+			else files.push(pathname);
+		}
+	}
 	const reportWarning = (message) => {
 		if (warn) {
 			warn(message);
 			return;
 		}
-		if (typeof process !== "undefined" && typeof process.emitWarning === "function") process.emitWarning(message);
+		process.emitWarning(message);
 	};
 	const appScript = await resolveScriptFile(join(srcRoot, "app"));
-	if (appScript) state.moduleMeta.set(normalizePath(appScript), {
-		kind: "app",
-		id: "app",
-		scriptPath: appScript,
-		stylePath: await resolveStyleFile(appScript)
-	});
+	if (appScript) {
+		const appMeta = {
+			kind: "app",
+			id: "app",
+			scriptPath: appScript,
+			stylePath: await resolveStyleFile(appScript),
+			sourceType: appScript.endsWith(".vue") ? "vue-sfc" : "native"
+		};
+		state.moduleMeta.set(normalizePath(appScript), appMeta);
+	}
 	const resolveComponentScript = async (raw, importerDir) => {
 		const base = resolveComponentBase(raw, importerDir, srcRoot);
-		if (!base) return;
-		return resolveScriptFile(base);
+		if (base) {
+			const resolved = await resolveScriptFile(base);
+			return resolved ? normalizePath(resolved) : void 0;
+		}
+		const importer = join(importerDir, "__weapp_web_using_components__.ts");
+		const resolved = await resolveId?.(raw, importer);
+		const script = resolved ? await resolveScriptFile(resolved) : void 0;
+		return script ? normalizePath(script) : void 0;
 	};
-	const getComponentId = (script) => {
-		const cached = state.componentIdMap.get(script);
-		if (cached) return cached;
-		const componentIdPosix = toPosixId(relative(srcRoot, script).replace(new RegExp(`${extname(script)}$`), ""));
-		state.componentIdMap.set(script, componentIdPosix);
-		return componentIdPosix;
+	const getStableComponentId = (script) => {
+		return getStableWebComponentId(script, srcRoot);
 	};
 	const getComponentTag = (script) => {
 		const cached = state.componentTagMap.get(script);
 		if (cached) return cached;
-		const tag = slugify(getComponentId(script), "wv-component");
+		const tag = slugify(getStableComponentId(script), "wv-component");
 		state.componentTagMap.set(script, tag);
 		return tag;
 	};
 	const collectComponent = async (componentId, importerDir) => {
-		const base = resolveComponentBase(componentId, importerDir, srcRoot);
-		const script = base ? await resolveScriptFile(base) : void 0;
-		if (!script || components.has(script)) return;
-		const componentIdPosix = toPosixId(relative(srcRoot, script).replace(new RegExp(`${extname(script)}$`), ""));
+		const script = await resolveComponentScript(componentId, importerDir);
+		if (!script) return;
+		const existing = components.get(script);
+		if (existing) {
+			existing.importId ??= resolveComponentBase(componentId, importerDir, srcRoot) ? void 0 : componentId;
+			return;
+		}
+		const componentIdPosix = getStableComponentId(script);
+		const importId = resolveComponentBase(componentId, importerDir, srcRoot) ? isInsideDir(script, srcRoot) ? void 0 : componentIdPosix : componentId;
 		const template = await resolveTemplateFile(script);
 		const style = await resolveStyleFile(script);
 		if (template) state.templatePathSet.add(normalizePath(template));
-		state.moduleMeta.set(normalizePath(script), {
+		const componentMeta = {
 			kind: "component",
 			id: componentIdPosix,
 			scriptPath: script,
 			templatePath: template,
-			stylePath: style
-		});
+			stylePath: style,
+			sourceType: script.endsWith(".vue") ? "vue-sfc" : "native"
+		};
+		state.moduleMeta.set(normalizePath(script), componentMeta);
 		components.set(script, {
 			script,
-			id: componentIdPosix
+			id: componentIdPosix,
+			importId
 		});
-		const componentTags = await collectComponentTagsFromJson({
-			jsonBasePath: `${script.replace(new RegExp(`${extname(script)}$`), "")}.json`,
+		const componentJsonBasePath = `${script.replace(new RegExp(`${extname(script)}$`), "")}.json`;
+		const sfcConfig = script.endsWith(".vue") ? (await compileScannedSfc({
+			filename: script,
+			meta: componentMeta,
+			srcRoot,
+			state,
+			resolveId,
+			resolveAutoImportTag,
+			uniApp
+		})).config : void 0;
+		const componentTags = sfcConfig ? await collectComponentTagsFromConfig({
+			json: sfcConfig,
+			importerDir: dirname(script),
+			jsonPath: script,
+			warn: reportWarning,
+			resolveComponentScript,
+			getComponentTag,
+			collectComponent
+		}) : await collectComponentTagsFromJson({
+			jsonBasePath: componentJsonBasePath,
 			importerDir: dirname(script),
 			warn: reportWarning,
 			collectFromConfig: (json, nextImporterDir, jsonPath, nextWarn) => collectComponentTagsFromConfig({
@@ -84,6 +142,7 @@ async function scanProject({ srcRoot, warn, state }) {
 				collectComponent
 			})
 		});
+		componentMeta.componentTags = mergeComponentTags(appComponentTags, componentTags);
 		if (!template) return;
 		const mergedTags = mergeComponentTags(appComponentTags, componentTags);
 		if (Object.keys(mergedTags).length > 0) {
@@ -92,41 +151,6 @@ async function scanProject({ srcRoot, warn, state }) {
 		}
 		state.templateComponentMap.delete(normalizePath(template));
 	};
-	const appJsonPath = await resolveJsonPath(join(srcRoot, "app.json"));
-	if (appJsonPath) {
-		const appJson = await readJsonFile(appJsonPath);
-		if (appJson) appComponentTags = await collectComponentTagsFromConfig({
-			json: appJson,
-			importerDir: srcRoot,
-			jsonPath: appJsonPath,
-			warn: reportWarning,
-			resolveComponentScript,
-			getComponentTag,
-			collectComponent,
-			onResolved: (tags) => {
-				appComponentTags = tags;
-			}
-		});
-		if (appJson?.pages && Array.isArray(appJson.pages)) {
-			for (const page of appJson.pages) if (typeof page === "string") await collectPage(page);
-		}
-		if (appJson?.subPackages && Array.isArray(appJson.subPackages)) for (const pkg of appJson.subPackages) {
-			if (!pkg || typeof pkg !== "object" || !Array.isArray(pkg.pages)) continue;
-			const root = typeof pkg.root === "string" ? pkg.root : "";
-			for (const page of pkg.pages) {
-				if (typeof page !== "string") continue;
-				await collectPage(posix.join(root, page));
-			}
-		}
-		appNavigationDefaults = pickNavigationConfig(isRecord(appJson?.window) ? appJson.window : void 0);
-	}
-	state.appNavigationDefaults = appNavigationDefaults;
-	state.appComponentTags = appComponentTags;
-	state.scanResult = {
-		app: appScript,
-		pages: Array.from(pages.values()),
-		components: Array.from(components.values())
-	};
 	async function collectPage(pageId) {
 		const base = join(srcRoot, pageId);
 		const script = await resolveScriptFile(base);
@@ -134,62 +158,150 @@ async function scanProject({ srcRoot, warn, state }) {
 		const template = await resolveTemplateFile(base);
 		if (template) state.templatePathSet.add(normalizePath(template));
 		const style = await resolveStyleFile(base);
-		const pageJsonBasePath = join(srcRoot, `${pageId}.json`);
-		const pageJsonPath = await resolveJsonPath(pageJsonBasePath);
+		const pageJsonPath = await resolveJsonPath(join(srcRoot, `${pageId}.json`));
 		const pageJson = pageJsonPath ? await readJsonFile(pageJsonPath) : void 0;
-		state.moduleMeta.set(normalizePath(script), {
+		const pageMeta = {
 			kind: "page",
 			id: toPosixId(pageId),
 			scriptPath: script,
 			templatePath: template,
-			stylePath: style
-		});
+			stylePath: style,
+			sourceType: script.endsWith(".vue") ? "vue-sfc" : "native"
+		};
+		const sfcConfig = script.endsWith(".vue") ? (await compileScannedSfc({
+			filename: script,
+			meta: pageMeta,
+			srcRoot,
+			state,
+			resolveId,
+			resolveAutoImportTag,
+			uniApp
+		})).config : void 0;
+		const resolvedNavigationConfig = mergeNavigationConfig(appNavigationDefaults, sfcConfig ? pickNavigationConfig(sfcConfig) : pageJson ? pickNavigationConfig(pageJson) : {});
+		pageMeta.navigationBar = Object.keys(resolvedNavigationConfig).length > 0 ? resolvedNavigationConfig : void 0;
+		state.moduleMeta.set(normalizePath(script), pageMeta);
 		pages.set(script, {
 			script,
 			id: toPosixId(pageId)
 		});
-		const pageComponentTags = pageJson && pageJsonPath ? await collectComponentTagsFromConfig({
-			json: pageJson,
+		const pageComponentTags = sfcConfig ? await collectComponentTagsFromConfig({
+			json: sfcConfig,
 			importerDir: dirname(script),
-			jsonPath: pageJsonPath,
+			jsonPath: script,
 			warn: reportWarning,
 			resolveComponentScript,
 			getComponentTag,
 			collectComponent
-		}) : await collectComponentTagsFromJson({
-			jsonBasePath: pageJsonBasePath,
+		}) : pageJson && pageJsonPath ? await collectComponentTagsFromConfig({
+			json: pageJson,
 			importerDir: dirname(script),
+			jsonPath: pageJsonPath,
 			warn: reportWarning,
-			collectFromConfig: (json, importerDir, jsonPath, nextWarn) => collectComponentTagsFromConfig({
-				json,
-				importerDir,
-				jsonPath,
-				warn: nextWarn,
-				resolveComponentScript,
-				getComponentTag,
-				collectComponent
-			})
-		});
+			resolveComponentScript,
+			getComponentTag,
+			collectComponent
+		}) : {};
 		if (template) {
 			const mergedTags = mergeComponentTags(appComponentTags, pageComponentTags);
 			if (Object.keys(mergedTags).length > 0) state.templateComponentMap.set(normalizePath(template), mergedTags);
 			else state.templateComponentMap.delete(normalizePath(template));
 		}
+		pageMeta.componentTags = mergeComponentTags(appComponentTags, pageComponentTags);
 		if (!template) return;
-		if (pageJson) {
-			state.pageNavigationMap.set(normalizePath(template), mergeNavigationConfig(appNavigationDefaults, pickNavigationConfig(pageJson)));
+		state.pageNavigationMap.set(normalizePath(template), resolvedNavigationConfig);
+	}
+	async function collectLayouts() {
+		const layoutsRoot = join(srcRoot, "layouts");
+		const files = [];
+		try {
+			await walk(layoutsRoot, files);
+		} catch {
 			return;
 		}
-		state.pageNavigationMap.set(normalizePath(template), { ...appNavigationDefaults });
+		for (const filename of files.sort()) {
+			const script = SCRIPT_EXTS.includes(extname(filename)) ? filename : void 0;
+			if (!script) continue;
+			const segments = relative(layoutsRoot, script).replace(/\\/g, "/").split("/");
+			segments.pop();
+			if (segments[segments.length - 1] === "index") segments.pop();
+			const name = segments.join("/");
+			if (!name) continue;
+			const id = `layouts/${name}`;
+			const template = await resolveTemplateFile(script);
+			const style = await resolveStyleFile(script);
+			const tag = slugify(id, "wv-component");
+			state.moduleMeta.set(normalizePath(script), {
+				kind: "component",
+				id,
+				scriptPath: script,
+				templatePath: template,
+				stylePath: style,
+				sourceType: "native"
+			});
+			layouts.set(script, {
+				script,
+				id,
+				name,
+				tag,
+				template,
+				style
+			});
+			if (template) state.templatePathSet.add(normalizePath(template));
+		}
 	}
-}
-function resolveComponentBase(raw, importerDir, srcRoot) {
-	if (!raw) return;
-	if (raw.startsWith(".")) return resolve(importerDir, raw);
-	if (raw.startsWith("/")) return resolve(srcRoot, raw.slice(1));
-	return resolve(srcRoot, raw);
+	const appJsonPath = await resolveJsonPath(join(srcRoot, "app.json"));
+	let appJson = appJsonPath ? await (resolveAppConfig ? resolveAppConfig(appJsonPath) : readJsonFile(appJsonPath)) : void 0;
+	if (appScript?.endsWith(".vue")) appJson = {
+		...(await compileScannedSfc({
+			filename: appScript,
+			meta: state.moduleMeta.get(normalizePath(appScript)),
+			srcRoot,
+			state,
+			resolveId,
+			resolveAutoImportTag,
+			uniApp
+		})).config ?? {},
+		...appJson ?? {}
+	};
+	if (appJson) {
+		appComponentTags = await collectComponentTagsFromConfig({
+			json: appJson,
+			importerDir: srcRoot,
+			jsonPath: appJsonPath ?? appScript,
+			warn: reportWarning,
+			resolveComponentScript,
+			getComponentTag,
+			collectComponent,
+			onResolved: (tags) => {
+				appComponentTags = tags;
+			}
+		});
+		appNavigationDefaults = pickNavigationConfig(isRecord(appJson?.window) ? appJson.window : void 0);
+		const configuredPages = Array.isArray(appJson.pages) ? appJson.pages.filter((page) => typeof page === "string") : [];
+		for (const page of configuredPages.length > 0 ? configuredPages : await discoverWebPageIds(srcRoot)) await collectPage(page);
+		const subPackages = Array.isArray(appJson.subPackages) ? appJson.subPackages : Array.isArray(appJson.subpackages) ? appJson.subpackages : [];
+		if (subPackages.length > 0) for (const pkg of subPackages) {
+			if (!pkg || typeof pkg !== "object" || !Array.isArray(pkg.pages)) continue;
+			const root = typeof pkg.root === "string" ? pkg.root : "";
+			for (const page of pkg.pages) {
+				if (typeof page !== "string") continue;
+				await collectPage(posix.join(root, page));
+			}
+		}
+		appTabBar = normalizeWebTabBarConfig(appJson?.tabBar);
+	} else for (const page of await discoverWebPageIds(srcRoot)) await collectPage(page);
+	await collectLayouts();
+	state.appNavigationDefaults = appNavigationDefaults;
+	state.appComponentTags = appComponentTags;
+	state.scanResult = {
+		app: appScript,
+		pages: Array.from(pages.values()),
+		components: Array.from(components.values()),
+		layouts: Array.from(layouts.values()),
+		tabBar: appTabBar
+	};
 }
 
 //#endregion
-export { scanProject };
+export { getStableWebComponentId, scanProject };
 //# sourceMappingURL=scan.mjs.map