@kimesh/kit 0.2.8 → 0.2.9

package/dist/index.mjs

@@ -15,7 +15,7 @@ import pc from "picocolors";
 import { defu } from "defu";
 import { loadEnv, mergeConfig } from "vite";
 import vue from "@vitejs/plugin-vue";
-import { kimeshRouterGenerator } from "@kimesh/router-generator";
+import { collectLayerRoutes, createScanner, createTreeBuilder, generateMiddlewareRegistry, generateMiddlewareTypes, generateRouteTypes, generateRoutes, kimeshRouterGenerator, mergeRoutes, scanLayerMiddleware } from "@kimesh/router-generator";
 import { generateLayerAliases, generateLayerAliases as generateLayerAliases$1, mergeLayerConfigs, prepareLayers, prepareLayers as prepareLayers$1, resolveLayers } from "@kimesh/layers";
 import { buildImportRegistry, generateDts, kimeshAutoImport, kimeshAutoImport as kimeshAutoImport$1, scanExports } from "@kimesh/auto-import";
 import { loadConfig as loadConfig$1 } from "c12";
@@ -1103,15 +1103,23 @@ function addPluginsTemplate(kimesh, discoveredPlugins) {
 * Each entry maps an internal alias (#kimesh/...) to the actual internal
 * package subpath export (@kimesh/...) that should be resolved and re-exported.
 */
-const INTERNAL_ALIASES = [{
-	alias: "#kimesh/head/plugin",
-	packageSpecifier: "@kimesh/head/plugin",
-	filename: "head-plugin.mjs"
-}, {
-	alias: "#kimesh/router-runtime/default-app",
-	packageSpecifier: "@kimesh/router-runtime/default-app",
-	filename: "router-runtime-default-app.mjs"
-}];
+const INTERNAL_ALIASES = [
+	{
+		alias: "#kimesh/head/plugin",
+		packageSpecifier: "@kimesh/head/plugin",
+		filename: "head-plugin.mjs"
+	},
+	{
+		alias: "#kimesh/router-runtime/default-app",
+		packageSpecifier: "@kimesh/router-runtime/default-app",
+		filename: "router-runtime-default-app.mjs"
+	},
+	{
+		alias: "#kimesh/middleware/plugin",
+		packageSpecifier: "@kimesh/router-runtime/middleware/plugin",
+		filename: "middleware-plugin.mjs"
+	}
+];
 /**
 * Resolve a package specifier to an absolute file path.
 * This uses exsolve/createRequire to find the package from @kimesh/kit's location.
@@ -1651,7 +1659,7 @@ function debugTable(title, data) {
 * @returns TSConfig JSON object
 */
 function generateTsConfig(options) {
-	const { rootDir, srcDir, buildDir, aliases, layerAliases = {}, moduleAliases = {}, internalAliases = {}, include = ["../src/**/*", "./**/*"], exclude = ["../node_modules"] } = options;
+	const { rootDir, srcDir, buildDir, aliases, layerAliases = {}, moduleAliases = {}, internalAliases = {}, include = ["../src/**/*", "./**/*"] } = options;
 	const allAliases = {
 		...aliases,
 		...layerAliases,
@@ -1665,6 +1673,16 @@ function generateTsConfig(options) {
 		paths[alias] = [normalizedPath];
 		paths[`${alias}/*`] = [`${normalizedPath}/*`];
 	}
+	for (const pkg of [
+		"@kimesh/router-runtime",
+		"@kimesh/kit",
+		"@kimesh/cli",
+		"@kimesh/head",
+		"@kimesh/query"
+	]) {
+		paths[pkg] = [`../node_modules/${pkg}`];
+		paths[`${pkg}/*`] = [`../node_modules/${pkg}/*`];
+	}
 	return {
 		compilerOptions: {
 			target: "ESNext",
@@ -1681,8 +1699,7 @@ function generateTsConfig(options) {
 			baseUrl: ".",
 			paths
 		},
-		include,
-		exclude
+		include
 	};
 }
 /**
@@ -1696,6 +1713,8 @@ function writeTsConfig(options) {
 	const tsconfig = generateTsConfig(options);
 	writeFileSync(join$1(buildDir, "tsconfig.json"), JSON.stringify(tsconfig, null, 2), "utf-8");
 	writeFileSync(join$1(buildDir, "kimesh.d.ts"), generateKimeshDts(), "utf-8");
+	writeFileSync(join$1(buildDir, "plugins.d.ts"), generatePluginsDts(), "utf-8");
+	writeFileSync(join$1(buildDir, "route-query.d.ts"), generateRouteQueryDts(), "utf-8");
 }
 /**
 * Generate kimesh.d.ts content with global type declarations
@@ -1736,6 +1755,45 @@ declare global {
 }
 `;
 }
+/**
+* Generate plugins.d.ts for #kimesh/plugins module
+*/
+function generatePluginsDts() {
+	return `/* eslint-disable */
+/* prettier-ignore */
+
+/**
+ * Type declarations for #kimesh/plugins virtual module
+ * DO NOT EDIT - This file is auto-generated by Kimesh.
+ */
+
+/// <reference types="@kimesh/router-runtime" />
+
+declare module '#kimesh/plugins' {
+  import type { KimeshRuntimePlugin } from '@kimesh/router-runtime'
+  export const plugins: KimeshRuntimePlugin[]
+}
+`;
+}
+/**
+* Generate route-query.d.ts for ?route query imports
+*/
+function generateRouteQueryDts() {
+	return `/* eslint-disable */
+/* prettier-ignore */
+
+/**
+ * Type declarations for ?route query imports (Vite virtual modules)
+ * DO NOT EDIT - This file is auto-generated by Kimesh.
+ */
+
+declare module '*?route' {
+  import type { RouteDefinition } from '@kimesh/router-runtime'
+  const routeDef: RouteDefinition | undefined
+  export default routeDef
+}
+`;
+}
 
 //#endregion
 //#region src/kit/phase2-utils.ts
@@ -2460,6 +2518,10 @@ const SUBPATH_EXPORT_MAP = {
 		pkg: "router-runtime",
 		file: "dist/default-app.mjs"
 	},
+	"@kimesh/router-runtime/middleware/plugin": {
+		pkg: "router-runtime",
+		file: "dist/middleware/plugin.mjs"
+	},
 	"kimesh/head/plugin": {
 		pkg: "head",
 		file: "dist/plugin.mjs"
@@ -2467,6 +2529,10 @@ const SUBPATH_EXPORT_MAP = {
 	"kimesh/router-runtime/default-app": {
 		pkg: "router-runtime",
 		file: "dist/default-app.mjs"
+	},
+	"kimesh/router-runtime/middleware/plugin": {
+		pkg: "router-runtime",
+		file: "dist/middleware/plugin.mjs"
 	}
 };
 /**
@@ -2699,6 +2765,41 @@ function kimeshPlugin(options = {}) {
 					consola.info(`[Kimesh] Found ${state.kimesh._registries.runtimePlugins.length} module-registered plugins`);
 				}
 			}
+			const middlewareDir = join$1(resolvedDirs.srcDir, "middleware");
+			let hasMiddleware = false;
+			try {
+				const middlewareResult = await scanLayerMiddleware([{
+					layerName: "app",
+					layerPath: configRoot,
+					middlewareDir,
+					priority: 0
+				}, ...state.resolvedLayers.filter((l) => !l.isApp).map((layer) => ({
+					layerName: layer.name,
+					layerPath: layer.path,
+					middlewareDir: join$1(layer.path, "src", "middleware"),
+					priority: layer.priority
+				}))], { orderStrategy: "alphabetical" });
+				hasMiddleware = middlewareResult.middleware.length > 0;
+				if (hasMiddleware) {
+					const registryCode = generateMiddlewareRegistry(middlewareResult);
+					const registryPath = join$1(resolvedDirs.buildDir, "middleware.gen.ts");
+					if (!existsSync(resolvedDirs.buildDir)) mkdirSync(resolvedDirs.buildDir, { recursive: true });
+					writeFileSync(registryPath, registryCode, "utf-8");
+					const typesCode = generateMiddlewareTypes(middlewareResult);
+					writeFileSync(join$1(resolvedDirs.buildDir, "middleware.d.ts"), typesCode, "utf-8");
+					if (debug) consola.info(`[Kimesh] Middleware: ${middlewareResult.globalMiddleware.length} global, ${middlewareResult.namedMiddleware.length} named`);
+					const middlewarePluginSrc = "#kimesh/middleware/plugin";
+					if (!state.kimesh._registries.runtimePlugins.some((p) => p.src === middlewarePluginSrc)) {
+						state.kimesh._registries.runtimePlugins.push({
+							src: middlewarePluginSrc,
+							name: "middleware"
+						});
+						if (debug) consola.info(`[Kimesh] Auto-registered middleware plugin`);
+					}
+				}
+			} catch (error) {
+				if (debug) consola.warn(`[Kimesh] Middleware scanning failed:`, error);
+			}
 			generateModulesTypeDeclaration(config.modules, state.generatedDir);
 			await writeTemplates(state.kimesh);
 			const userAliases = buildAliases(config, resolvedDirs.srcDir, configRoot);
@@ -2711,7 +2812,8 @@ function kimeshPlugin(options = {}) {
 				"#kimesh/routes": join$1(resolvedDirs.buildDir, "routes.gen.ts"),
 				"#kimesh/app": existsSync(appVuePath) ? appVuePath : "@kimesh/router-runtime/default-app",
 				"#kimesh/context": join$1(resolvedDirs.srcDir, "app.context.ts"),
-				"#kimesh/plugins": join$1(resolvedDirs.buildDir, "plugins.mjs")
+				"#kimesh/plugins": join$1(resolvedDirs.buildDir, "plugins.mjs"),
+				"#kimesh/middleware": join$1(resolvedDirs.buildDir, "middleware.gen.ts")
 			};
 			writeTsConfig({
 				rootDir: configRoot,
@@ -2762,6 +2864,7 @@ function kimeshPlugin(options = {}) {
 					"#kimesh/app": existsSync(appVuePath) ? appVuePath : "@kimesh/router-runtime/default-app",
 					"#kimesh/context": join$1(resolvedDirs.srcDir, "app.context.ts"),
 					"#kimesh/plugins": join$1(resolvedDirs.buildDir, "plugins.mjs"),
+					"#kimesh/middleware": join$1(resolvedDirs.buildDir, "middleware.gen.ts"),
 					...userAliases,
 					...layerAliases,
 					...moduleAliases
@@ -3105,24 +3208,58 @@ async function prepare(options = {}) {
 	});
 	generatedFiles.push("tsconfig.json");
 	if (verbose) consola.success(`[Kimesh] Generated .kimesh/tsconfig.json`);
-	const routesStubPath = join$1(buildDir, "routes.gen.ts");
-	if (!existsSync(routesStubPath)) {
-		writeFileSync(routesStubPath, `/**
- * Kimesh Routes - Auto-generated
- *
- * This file is a stub generated by 'km prepare'.
- * It will be populated with actual routes when running 'km dev' or 'km build'.
- *
- * DO NOT EDIT - This file is regenerated automatically.
- */
-
-import type { RouteRecordRaw } from 'vue-router'
-
-export const routes: RouteRecordRaw[] = []
-`, "utf-8");
+	const routesDir = join$1(srcDir, "routes");
+	if (existsSync(routesDir)) try {
+		const layerRouteConfigs = resolvedLayers.filter((layer) => !layer.isApp).map((layer) => {
+			const routesFolder = layer.config.routes?.folder || "routes";
+			return {
+				layerName: layer.name,
+				routesDir: join$1(layer.path, "src", routesFolder),
+				layerPath: layer.path,
+				basePath: layer.config.routes?.basePath,
+				priority: layer.priority
+			};
+		}).filter((cfg) => existsSync(cfg.routesDir));
+		const scannerConfig = {
+			srcDir: "src",
+			routesDir: "routes",
+			generatedDir: ".kimesh",
+			extensions: [".vue"],
+			importMode: "async",
+			routesDirPath: routesDir,
+			generatedDirPath: buildDir,
+			root
+		};
+		const parsedRoutes = await createScanner(scannerConfig).scan();
+		let routes = createTreeBuilder(scannerConfig).build(parsedRoutes);
+		if (layerRouteConfigs.length > 0) {
+			const layerResult = await collectLayerRoutes(layerRouteConfigs.map((l) => ({
+				layer: l.layerName,
+				routesDir: l.routesDir,
+				basePath: l.basePath,
+				priority: l.priority
+			})), scannerConfig);
+			if (verbose) consola.info(`[Kimesh] Collected ${layerResult.routes.length} routes from ${layerRouteConfigs.length} layers`);
+			routes = mergeRoutes(routes, layerResult.routes, scannerConfig);
+		}
+		const routesCode = generateRoutes(routes, scannerConfig);
+		writeFileSync(join$1(buildDir, "routes.gen.ts"), routesCode, "utf-8");
 		generatedFiles.push("routes.gen.ts");
-		if (verbose) consola.success(`[Kimesh] Generated .kimesh/routes.gen.ts (stub)`);
+		const typesCode = generateRouteTypes(routes);
+		writeFileSync(join$1(buildDir, "typed-routes.d.ts"), typesCode, "utf-8");
+		generatedFiles.push("typed-routes.d.ts");
+		for (const layer of layerRouteConfigs) {
+			const layerKimeshDir = join$1(layer.layerPath, ".kimesh");
+			if (!existsSync(layerKimeshDir)) mkdirSync(layerKimeshDir, { recursive: true });
+			writeFileSync(join$1(layerKimeshDir, "typed-routes.d.ts"), typesCode, "utf-8");
+			if (verbose) consola.success(`[Kimesh] Generated ${layer.layerName}/.kimesh/typed-routes.d.ts`);
+		}
+		if (verbose) consola.success(`[Kimesh] Generated .kimesh/routes.gen.ts and typed-routes.d.ts (${routes.length} routes)`);
+	} catch (error) {
+		if (verbose) consola.warn(`[Kimesh] Route scanning failed: ${error}`);
+		generateRoutesStub(buildDir, generatedFiles, verbose);
 	}
+	else generateRoutesStub(buildDir, generatedFiles, verbose);
 	const pluginsStubPath = join$1(buildDir, "plugins.mjs");
 	if (!existsSync(pluginsStubPath)) {
 		writeFileSync(pluginsStubPath, `/**
@@ -3201,6 +3338,21 @@ declare global {
   // Vue Router imports
   const useRoute: typeof import('vue-router')['useRoute']
   const useRouter: typeof import('vue-router')['useRouter']
+
+  // Kimesh Router Runtime imports
+  const createFileRoute: typeof import('@kimesh/router-runtime')['createFileRoute']
+  const defineRoute: typeof import('@kimesh/router-runtime')['defineRoute']
+  const defineContext: typeof import('@kimesh/router-runtime')['defineContext']
+  const useKimeshContext: typeof import('@kimesh/router-runtime')['useKimeshContext']
+  const useNavigate: typeof import('@kimesh/router-runtime')['useNavigate']
+  const useParams: typeof import('@kimesh/router-runtime')['useParams']
+  const useReactiveParams: typeof import('@kimesh/router-runtime')['useReactiveParams']
+  const useSearch: typeof import('@kimesh/router-runtime')['useSearch']
+  const useRuntimeConfig: typeof import('@kimesh/router-runtime')['useRuntimeConfig']
+  const navigateTo: typeof import('@kimesh/router-runtime')['navigateTo']
+  const abortNavigation: typeof import('@kimesh/router-runtime')['abortNavigation']
+  function defineKimeshMiddleware(middleware: import('@kimesh/router-runtime').RouteMiddleware): import('@kimesh/router-runtime').RouteMiddleware
+  function defineKimeshMiddleware(definition: import('@kimesh/router-runtime').MiddlewareDefinition): import('@kimesh/router-runtime').RouteMiddleware
 }
 `, "utf-8");
 		generatedFiles.push("auto-imports.d.ts");
@@ -3246,6 +3398,29 @@ function extractModuleNames(modules) {
 	else if (Array.isArray(mod) && typeof mod[0] === "string") names.push(mod[0]);
 	return names;
 }
+/**
+* Generate stub routes.gen.ts when route scanning is not available
+*/
+function generateRoutesStub(buildDir, generatedFiles, verbose) {
+	const routesStubPath = join$1(buildDir, "routes.gen.ts");
+	if (!existsSync(routesStubPath)) {
+		writeFileSync(routesStubPath, `/**
+ * Kimesh Routes - Auto-generated
+ *
+ * This file is a stub generated by 'km prepare'.
+ * It will be populated with actual routes when running 'km dev' or 'km build'.
+ *
+ * DO NOT EDIT - This file is regenerated automatically.
+ */
+
+import type { RouteRecordRaw } from 'vue-router'
+
+export const routes: RouteRecordRaw[] = []
+`, "utf-8");
+		generatedFiles.push("routes.gen.ts");
+		if (verbose) consola.success(`[Kimesh] Generated .kimesh/routes.gen.ts (stub)`);
+	}
+}
 
 //#endregion
 export { DEFAULT_ALIASES, DEFAULT_IGNORE_PATTERNS, INTERNAL_ALIASES, addAlias, addBuildPlugin, addComponent, addComponentResolver, addComponentsDir, addImports, addImportsDir, addImportsPreset, addInternalAliasTemplates, addPluginsTemplate, addRuntimePlugin, addTemplate, addTypeTemplate, addVitePlugin, applyEnv, buildAliases, buildImportRegistry, buildInternalAliasMap, createDebugLogger, createDefaultRuntimeConfig, createHMRWatcher, createIgnoreFilter, createIgnoreMatcher, createKimesh, createResolver, createTimer, debug, debugTable, defineKimeshModule, defineKimeshPlugin, defineKmConfig, envToKey, executeModule, executeModules, filterIgnored, findMatchingRules, formatConflictWarning, formatError, formatTiming, formatWarning, generateDts, generateInternalAliasTemplate, generateLayerAliases, generatePluginsTemplate, generateRouteRulesManifest, getIgnorePatterns, getRedirectInfo, getRouteRule, getRuntimePlugins, hasPlugins, hasRuntimePlugin, isDebug, isDebugEnabled, keyToEnv, kimeshAutoImport, kimeshPlugin, loadConfig, matchRoutePattern, mergeLayerConfigs, mergeRouteRules, normalizeDebugConfig, normalizeModuleInput, prepare, prepareLayers, removeRuntimePlugin, resolveAlias, resolveAliasPath, resolveLayers, resolvePathFromBuild, resolvePathFromRoot, scanExports, scanPluginsDir, setDebugConfig, shouldIgnore, toTsConfigPaths, toViteAliases, tryUseKimesh, updateTemplates, useKimesh, writeTemplates };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kimesh/kit",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Build-time engine for Kimesh framework",
   "type": "module",
   "repository": {
@@ -31,9 +31,9 @@
     "vue": "^3.5.0"
   },
   "dependencies": {
-    "@kimesh/auto-import": "0.2.8",
-    "@kimesh/layers": "0.2.8",
-    "@kimesh/router-generator": "0.2.8",
+    "@kimesh/auto-import": "0.2.9",
+    "@kimesh/layers": "0.2.9",
+    "@kimesh/router-generator": "0.2.9",
     "@vitejs/plugin-vue": "^6.0.3",
     "c12": "^3.3.3",
     "consola": "^3.4.2",