@kimesh/kit 0.2.11 → 0.2.12

package/dist/index.d.mts

@@ -118,65 +118,65 @@ interface KimeshRouteMiddleware {
 type HookResult = void | Promise<void>;
 interface KimeshHooks {
   /** Called after config is loaded, before layers */
-  "config:loaded": (config: KimeshConfig) => HookResult;
+  'config:loaded': (config: KimeshConfig) => HookResult;
   /** Called after layers are resolved */
-  "layers:resolved": (layers: ResolvedLayer$1[]) => HookResult;
+  'layers:resolved': (layers: ResolvedLayer$1[]) => HookResult;
   /** Called to extend layer configuration */
-  "layers:extend": (layers: ResolvedLayer$1[]) => HookResult;
+  'layers:extend': (layers: ResolvedLayer$1[]) => HookResult;
   /** Called when Kimesh is fully initialized and ready */
   ready: (kimesh: Kimesh) => HookResult;
   /** Called before modules are processed */
-  "modules:before": (kimesh: Kimesh) => HookResult;
+  'modules:before': (kimesh: Kimesh) => HookResult;
   /** Called after all modules are processed */
-  "modules:done": (kimesh: Kimesh) => HookResult;
+  'modules:done': (kimesh: Kimesh) => HookResult;
   /** Called before build starts */
-  "build:before": (kimesh: Kimesh) => HookResult;
+  'build:before': (kimesh: Kimesh) => HookResult;
   /** Called after build completes */
-  "build:done": (kimesh: Kimesh) => HookResult;
+  'build:done': (kimesh: Kimesh) => HookResult;
   /** Called on build error */
-  "build:error": (error: Error, kimesh: Kimesh) => HookResult;
+  'build:error': (error: Error, kimesh: Kimesh) => HookResult;
   /** Called to extend Vite config before it's resolved */
-  "vite:extend": (ctx: {
+  'vite:extend': (ctx: {
     kimesh: Kimesh;
     config: vite3.UserConfig;
   }) => HookResult;
   /** Called after Vite config is resolved */
-  "vite:configResolved": (config: ResolvedConfig, kimesh: Kimesh) => HookResult;
+  'vite:configResolved': (config: ResolvedConfig, kimesh: Kimesh) => HookResult;
   /** Called when Vite dev server is created */
-  "vite:serverCreated": (server: ViteDevServer, kimesh: Kimesh) => HookResult;
+  'vite:serverCreated': (server: ViteDevServer, kimesh: Kimesh) => HookResult;
   /** Called to add import sources/presets */
-  "imports:sources": (sources: Array<{
+  'imports:sources': (sources: Array<{
     from: string;
     imports: string[];
   }>, kimesh: Kimesh) => HookResult;
   /** Called to extend imports */
-  "imports:extend": (imports: KimeshImport[], kimesh: Kimesh) => HookResult;
+  'imports:extend': (imports: KimeshImport[], kimesh: Kimesh) => HookResult;
   /** Called to add import directories */
-  "imports:dirs": (dirs: KimeshImportsDir[], kimesh: Kimesh) => HookResult;
+  'imports:dirs': (dirs: KimeshImportsDir[], kimesh: Kimesh) => HookResult;
   /** Called to add component directories */
-  "components:dirs": (dirs: KimeshComponentsDir[], kimesh: Kimesh) => HookResult;
+  'components:dirs': (dirs: KimeshComponentsDir[], kimesh: Kimesh) => HookResult;
   /** Called to extend components */
-  "components:extend": (components: KimeshComponent[], kimesh: Kimesh) => HookResult;
+  'components:extend': (components: KimeshComponent[], kimesh: Kimesh) => HookResult;
   /** Called to add component resolvers */
-  "components:resolvers": (resolvers: ComponentResolver[], kimesh: Kimesh) => HookResult;
+  'components:resolvers': (resolvers: ComponentResolver[], kimesh: Kimesh) => HookResult;
   /** Called after routes are generated */
-  "routes:extend": (routes: KimeshRoute[], kimesh: Kimesh) => HookResult;
+  'routes:extend': (routes: KimeshRoute[], kimesh: Kimesh) => HookResult;
   /** Called to add route middleware */
-  "routes:middleware": (middleware: KimeshRouteMiddleware[], kimesh: Kimesh) => HookResult;
+  'routes:middleware': (middleware: KimeshRouteMiddleware[], kimesh: Kimesh) => HookResult;
   /** Called when templates need generation */
-  "templates:extend": (templates: KimeshTemplate[], kimesh: Kimesh) => HookResult;
+  'templates:extend': (templates: KimeshTemplate[], kimesh: Kimesh) => HookResult;
   /** Called after templates are written */
-  "templates:done": (templates: KimeshTemplate[], kimesh: Kimesh) => HookResult;
+  'templates:done': (templates: KimeshTemplate[], kimesh: Kimesh) => HookResult;
   /** Called to extend type templates */
-  "types:extend": (typeTemplates: KimeshTypeTemplate[], kimesh: Kimesh) => HookResult;
+  'types:extend': (typeTemplates: KimeshTypeTemplate[], kimesh: Kimesh) => HookResult;
   /** Called after types are generated */
-  "types:done": (files: string[], kimesh: Kimesh) => HookResult;
+  'types:done': (files: string[], kimesh: Kimesh) => HookResult;
   /** Called on file change in watch mode */
-  "watch:change": (file: string, event: "add" | "change" | "unlink", kimesh: Kimesh) => HookResult;
+  'watch:change': (file: string, event: 'add' | 'change' | 'unlink', kimesh: Kimesh) => HookResult;
   /** Called before HMR update */
-  "hmr:before": (file: string, kimesh: Kimesh) => HookResult;
+  'hmr:before': (file: string, kimesh: Kimesh) => HookResult;
   /** Called after HMR update */
-  "hmr:after": (file: string, kimesh: Kimesh) => HookResult;
+  'hmr:after': (file: string, kimesh: Kimesh) => HookResult;
   /** Called when Kimesh is closing */
   close: (kimesh: Kimesh) => HookResult;
 }
@@ -187,7 +187,7 @@ interface KimeshHooks {
  */
 interface KimeshRuntimePluginMeta {
   name?: string;
-  enforce?: "pre" | "default" | "post";
+  enforce?: 'pre' | 'default' | 'post';
   order?: number;
   dependsOn?: string[];
   parallel?: boolean;
@@ -196,22 +196,22 @@ interface KimeshRuntimePluginMeta {
  * Runtime hooks available in Kimesh app lifecycle
  */
 interface KimeshRuntimeHooks {
-  "app:created": (app: App) => void | Promise<void>;
-  "app:beforeMount": (app: App) => void | Promise<void>;
-  "app:mounted": (app: App) => void | Promise<void>;
-  "app:error": (err: unknown) => void | Promise<void>;
-  "page:start": () => void | Promise<void>;
-  "page:finish": () => void | Promise<void>;
-  "navigate:before": (context: {
+  'app:created': (app: App) => void | Promise<void>;
+  'app:beforeMount': (app: App) => void | Promise<void>;
+  'app:mounted': (app: App) => void | Promise<void>;
+  'app:error': (err: unknown) => void | Promise<void>;
+  'page:start': () => void | Promise<void>;
+  'page:finish': () => void | Promise<void>;
+  'navigate:before': (context: {
     to: unknown;
     from: unknown;
   }) => void | false | Promise<void | false>;
-  "navigate:after": (context: {
+  'navigate:after': (context: {
     to: unknown;
     from: unknown;
     failure?: unknown;
   }) => void | Promise<void>;
-  "navigate:error": (context: {
+  'navigate:error': (context: {
     error: Error;
     to: unknown;
     from: unknown;
@@ -309,7 +309,7 @@ interface KimeshVitePluginEntry {
   /** The Vite plugin */
   plugin: Plugin;
   /** Plugin enforce order */
-  enforce?: "pre" | "post";
+  enforce?: 'pre' | 'post';
   /** Numeric order (lower = earlier) */
   order?: number;
   /** Metadata for debugging */
@@ -488,7 +488,7 @@ interface LayersConfig {
   /** Directories to scan for layers (default: ['layers']) */
   dirs?: string[];
   /** Layers to enable - 'all' | 'none' | string[] */
-  enabled?: "all" | "none" | string[];
+  enabled?: 'all' | 'none' | string[];
   /** Layers to exclude */
   excluded?: string[];
 }
@@ -527,7 +527,7 @@ interface ComponentsConfig {
 /**
  * Vite configuration options for Kimesh.
  */
-interface KimeshViteConfig extends Omit<UserConfig, "root" | "configFile"> {
+interface KimeshViteConfig extends Omit<UserConfig, 'root' | 'configFile'> {
   /**
    * Additional Vite plugins.
    * These are merged AFTER Kimesh's internal plugins.
@@ -739,7 +739,7 @@ interface BuildConfig {
    *
    * @default false
    */
-  sourcemap?: boolean | "hidden" | "inline";
+  sourcemap?: boolean | 'hidden' | 'inline';
   /**
    * Build target for esbuild/terser.
    * Specifies the JS language version to target.
@@ -756,7 +756,7 @@ interface BuildConfig {
    *
    * @default 'esbuild'
    */
-  minify?: boolean | "esbuild" | "terser";
+  minify?: boolean | 'esbuild' | 'terser';
 }
 /**
  * HTTPS configuration options for dev server.
@@ -925,7 +925,7 @@ interface TypeScriptConfig {
    *
    * @default false
    */
-  typeCheck?: boolean | "build";
+  typeCheck?: boolean | 'build';
   /**
    * Additional tsconfig compiler options to merge with generated config.
    * These options will extend the auto-generated `.kimesh/tsconfig.json`.
@@ -1343,7 +1343,7 @@ interface KimeshConfig extends KimeshModuleOptions {
   /** Router configuration */
   router?: {
     /** Routes directory relative to srcDir (default: 'routes') */routesDir?: string; /** Import mode for route components */
-    importMode?: "async" | "sync";
+    importMode?: 'async' | 'sync';
   };
   /** Extend from other layers (paths or package names) */
   extends?: Array<string | {
@@ -1503,7 +1503,7 @@ declare function defineKimeshPlugin(definition: KimeshPluginDefinition): KimeshP
 //#region src/kit/vite.d.ts
 interface AddVitePluginOptions {
   /** Plugin enforce order */
-  enforce?: "pre" | "post";
+  enforce?: 'pre' | 'post';
   /** Numeric order (lower = earlier) */
   order?: number;
   /** Add to beginning of plugins array */
@@ -2228,11 +2228,11 @@ interface HMRContext {
   /** File that changed */
   file: string;
   /** Type of change */
-  type: "add" | "change" | "unlink";
+  type: 'add' | 'change' | 'unlink';
   /** Layer this file belongs to (if any) */
   layer?: ResolvedLayer$1;
   /** Category of the file */
-  category: "route" | "component" | "composable" | "config" | "other";
+  category: 'route' | 'component' | 'composable' | 'config' | 'other';
 }
 /**
  * Create HMR watcher for Kimesh layers
@@ -2279,7 +2279,7 @@ declare function formatWarning(message: string, context?: ErrorContext): string;
 /**
  * Format a conflict warning
  */
-declare function formatConflictWarning(type: "route" | "import" | "component", name: string, sources: Array<{
+declare function formatConflictWarning(type: 'route' | 'import' | 'component', name: string, sources: Array<{
   layer: string;
   path: string;
 }>, winner: string): string;
@@ -2300,7 +2300,7 @@ interface KimeshPluginOptions {
   config?: KimeshConfig;
   /** Layer configuration (from CLI) */
   layers?: {
-    /** Enabled layers */enabled?: "all" | "none" | string[]; /** Excluded layers */
+    /** Enabled layers */enabled?: 'all' | 'none' | string[]; /** Excluded layers */
     excluded?: string[];
   };
   /** Enable debug logging */

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { createHooks } from "hookable";
 import { snakeCase } from "scule";
 import { klona } from "klona/json";
 import destr from "destr";
-import { pathToFileURL } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import consola from "consola";
 import { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
 import { dirname, isAbsolute, join, resolve } from "node:path";
@@ -1246,6 +1246,7 @@ function defineKmConfig(config) {
 *
 * Utilities for resolving and processing path aliases.
 */
+const __kitDir = dirname(dirname(fileURLToPath(import.meta.url)));
 /**
 * Resolve an alias path template to an actual path
 *
@@ -1330,6 +1331,38 @@ function isDebugEnabled(debug, option) {
 	if (debug === true) return true;
 	return !!debug[option];
 }
+/**
+* Resolve the actual directory path of an npm package.
+* Handles different package manager setups (npm hoists, pnpm isolates, workspace links).
+*
+* @param packageName - The npm package name (e.g., "@kimesh/router-runtime")
+* @param _fromDir - Deprecated, no longer used. Resolution is done from @kimesh/kit's location.
+* @returns The absolute path to the package directory, or null if not found
+*
+* @example
+* ```ts
+* const pkgDir = resolvePackageDir("@kimesh/router-runtime", "/path/to/project");
+* // Returns: "/path/to/project/node_modules/.pnpm/@kimesh+router-runtime@0.2.11/node_modules/@kimesh/router-runtime"
+* // or: "/path/to/monorepo/packages/router-runtime" (for workspace links)
+* ```
+*/
+function resolvePackageDir(packageName, _fromDir) {
+	try {
+		const resolvedPath = resolveModulePath(packageName, { from: __kitDir });
+		const pkgNameParts = packageName.split("/");
+		const pkgPattern = pkgNameParts.length === 2 ? `node_modules/${pkgNameParts[0]}/${pkgNameParts[1]}` : `node_modules/${packageName}`;
+		const patternIndex = resolvedPath.indexOf(pkgPattern);
+		if (patternIndex !== -1) return resolvedPath.slice(0, patternIndex + pkgPattern.length);
+		let currentDir = dirname(resolvedPath);
+		for (let i = 0; i < 5; i++) {
+			if ((currentDir.split("/").pop() || "") === pkgNameParts[pkgNameParts.length - 1]) return currentDir;
+			currentDir = dirname(currentDir);
+		}
+		return dirname(dirname(resolvedPath));
+	} catch {
+		return null;
+	}
+}
 
 //#endregion
 //#region src/kit/ignore-utils.ts
@@ -1662,7 +1695,7 @@ function debugTable(title, data) {
 * @returns TSConfig JSON object
 */
 function generateTsConfig(options) {
-	const { rootDir, srcDir, buildDir, aliases, layerAliases = {}, moduleAliases = {}, internalAliases = {}, include = ["../src/**/*", "./**/*"] } = options;
+	const { rootDir, buildDir, aliases, layerAliases = {}, moduleAliases = {}, internalAliases = {}, include = ["../src/**/*", "./**/*"] } = options;
 	const allAliases = {
 		...aliases,
 		...layerAliases,
@@ -1683,8 +1716,16 @@ function generateTsConfig(options) {
 		"@kimesh/head",
 		"@kimesh/query"
 	]) {
-		paths[pkg] = [`../node_modules/${pkg}`];
-		paths[`${pkg}/*`] = [`../node_modules/${pkg}/*`];
+		const pkgDir = resolvePackageDir(pkg, rootDir);
+		if (pkgDir) {
+			const relativePkgPath = relative(buildDir, pkgDir);
+			const normalizedPath = relativePkgPath.startsWith("..") ? relativePkgPath : "./" + relativePkgPath;
+			paths[pkg] = [normalizedPath];
+			paths[`${pkg}/*`] = [`${normalizedPath}/*`];
+		} else {
+			paths[pkg] = [`../node_modules/${pkg}`];
+			paths[`${pkg}/*`] = [`../node_modules/${pkg}/*`];
+		}
 	}
 	return {
 		compilerOptions: {
@@ -2644,7 +2685,7 @@ function extractModuleNames$1(modules) {
 * Generate modules.ts that imports all configured modules
 * AND references their augment.d.ts files for type declarations
 */
-function generateModulesTypeDeclaration(modules, buildDir) {
+function generateModulesTypeDeclaration(modules, buildDir, rootDir) {
 	const moduleNames = extractModuleNames$1(modules);
 	if (moduleNames.length === 0) return;
 	const imports = moduleNames.map((name) => `import "${name}";`).join("\n");
@@ -2655,7 +2696,14 @@ function generateModulesTypeDeclaration(modules, buildDir) {
  * DO NOT EDIT - This file is regenerated when modules change.
  */
 
-${moduleNames.map((name) => `/// <reference path="../node_modules/${name}/augment.d.ts" />`).join("\n")}
+${moduleNames.map((name) => {
+		const pkgDir = resolvePackageDir(name, rootDir);
+		if (pkgDir) {
+			const relativePath = relative(buildDir, pkgDir);
+			return `/// <reference path="${relativePath.startsWith("..") ? relativePath : "./" + relativePath}/augment.d.ts" />`;
+		}
+		return `/// <reference path="../node_modules/${name}/augment.d.ts" />`;
+	}).join("\n")}
 
 ${imports}
 `;
@@ -2823,7 +2871,7 @@ export default createMiddlewarePlugin({
 			} catch (error) {
 				if (debug) consola.warn(`[Kimesh] Middleware scanning failed:`, error);
 			}
-			generateModulesTypeDeclaration(config.modules, state.generatedDir);
+			generateModulesTypeDeclaration(config.modules, state.generatedDir, configRoot);
 			await writeTemplates(state.kimesh);
 			const userAliases = buildAliases(config, resolvedDirs.srcDir, configRoot);
 			const kimeshPackageAliases = buildKimeshPackageAliases(configRoot, debug);
@@ -3316,7 +3364,14 @@ export default []
  * DO NOT EDIT - This file is regenerated when modules change.
  */
 
-${moduleNames.map((name) => `/// <reference path="../node_modules/${name}/augment.d.ts" />`).join("\n")}
+${moduleNames.map((name) => {
+			const pkgDir = resolvePackageDir(name, root);
+			if (pkgDir) {
+				const relativePath = relative(buildDir, pkgDir);
+				return `/// <reference path="${relativePath.startsWith("..") ? relativePath : "./" + relativePath}/augment.d.ts" />`;
+			}
+			return `/// <reference path="../node_modules/${name}/augment.d.ts" />`;
+		}).join("\n")}
 
 ${imports}
 `, "utf-8");

package/package.json

@@ -1,24 +1,24 @@
 {
   "name": "@kimesh/kit",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "Build-time engine for Kimesh framework",
-  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/kimeshjs/kimesh.git"
   },
+  "files": [
+    "dist",
+    "types.d.ts"
+  ],
+  "type": "module",
+  "main": "./dist/index.mjs",
+  "types": "./types.d.ts",
   "exports": {
     ".": {
       "types": "./types.d.ts",
       "import": "./dist/index.mjs"
     }
   },
-  "main": "./dist/index.mjs",
-  "types": "./types.d.ts",
-  "files": [
-    "dist",
-    "types.d.ts"
-  ],
   "scripts": {
     "build": "tsdown",
     "dev": "tsdown --watch",
@@ -26,14 +26,10 @@
     "test": "vitest run",
     "test:watch": "vitest"
   },
-  "peerDependencies": {
-    "vite": "^8.0.0-beta.8",
-    "vue": "^3.5.0"
-  },
   "dependencies": {
-    "@kimesh/auto-import": "0.2.11",
-    "@kimesh/layers": "0.2.11",
-    "@kimesh/router-generator": "0.2.11",
+    "@kimesh/auto-import": "0.2.12",
+    "@kimesh/layers": "0.2.12",
+    "@kimesh/router-generator": "0.2.12",
     "@vitejs/plugin-vue": "^6.0.3",
     "c12": "^3.3.3",
     "consola": "^3.4.2",
@@ -55,5 +51,9 @@
     "unplugin-vue-components": "^31.0.0",
     "vite": "^8.0.0-beta.8",
     "vue": "^3.5.26"
+  },
+  "peerDependencies": {
+    "vite": "^8.0.0-beta.8",
+    "vue": "^3.5.0"
   }
 }

package/types.d.ts

@@ -5,14 +5,14 @@
  * Similar to Nuxt's types.d.ts, this allows using defineKmConfig without imports.
  */
 
-import type { KimeshConfig } from "./dist/index.mjs";
+import type { KimeshConfig } from './dist/index.mjs'
 
-export * from "./dist/index.mjs";
+export * from './dist/index.mjs'
 
 /**
  * Function type for defineKmConfig
  */
-type DefineKmConfig = (config: KimeshConfig) => KimeshConfig;
+type DefineKmConfig = (config: KimeshConfig) => KimeshConfig
 
 declare global {
   /**
@@ -29,5 +29,5 @@ declare global {
    * })
    * ```
    */
-  const defineKmConfig: DefineKmConfig;
+  const defineKmConfig: DefineKmConfig
 }