@kimesh/kit 0.2.31 → 0.2.32-nightly.20260129013552

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { Hookable } from "hookable";
 import { Ignore } from "ignore";
-import * as vite0 from "vite";
+import * as vite3 from "vite";
 import { Plugin, Plugin as VitePlugin, PluginOption, PluginOption as VitePluginOption, ResolvedConfig, UserConfig, ViteDevServer } from "vite";
 import { KimeshLayerConfig, LayerAutoImportConfig, LayerComponentConfig, LayerComposableConfig, LayerRouteConfig, ResolvedLayer, ResolvedLayer as ResolvedLayer$1, generateLayerAliases, mergeLayerConfigs, prepareLayers, resolveLayers } from "@kimesh/layers";
 import { AutoImportConfig, ImportPreset, LayerAutoImportSource as ImportSource, buildImportRegistry, generateDts, kimeshAutoImport, scanExports } from "@kimesh/auto-import";
@@ -158,7 +158,7 @@ interface KimeshHooks {
   /** Called to extend Vite config before it's resolved */
   'vite:extend': (ctx: {
     kimesh: Kimesh;
-    config: vite0.UserConfig;
+    config: vite3.UserConfig;
   }) => HookResult;
   /** Called after Vite config is resolved */
   'vite:configResolved': (config: ResolvedConfig, kimesh: Kimesh) => HookResult;
@@ -523,7 +523,7 @@ interface KimeshPluginDefinition {
    * Setup function that returns Vite plugin(s)
    * @param kimesh - Kimesh context
    */
-  setup: (kimesh: Kimesh) => vite0.PluginOption | vite0.PluginOption[];
+  setup: (kimesh: Kimesh) => vite3.PluginOption | vite3.PluginOption[];
 }
 interface KimeshPlugin {
   /** Plugin definition */
@@ -531,7 +531,7 @@ interface KimeshPlugin {
   /** Plugin name */
   name: string;
   /** Get Vite plugins */
-  getPlugins: (kimesh: Kimesh) => vite0.PluginOption[];
+  getPlugins: (kimesh: Kimesh) => vite3.PluginOption[];
 }
 //#endregion
 //#region src/types/config.d.ts
@@ -1635,10 +1635,13 @@ declare function addBuildPlugin(plugin: Plugin | Plugin[], options?: AddVitePlug
 /**
  * Add an alias
  *
+ * Note: '@' and '~' aliases are context-aware and handled by layerAliasPlugin
+ * for files within layers. For module/package internal use, they work as expected.
+ *
  * @example
  * ```ts
  * addAlias("#my-module", "/path/to/module");
- * addAlias("@/components", "./src/components");
+ * addAlias("@", "./src"); // For module internal use
  * ```
  */
 declare function addAlias(find: string | RegExp, replacement: string): void;
@@ -2415,7 +2418,7 @@ interface KimeshPluginOptions {
   /**
    * Additional Vite plugins added programmatically.
    */
-  additionalPlugins?: vite0.PluginOption[];
+  additionalPlugins?: vite3.PluginOption[];
 }
 //#endregion
 export { type AddRuntimePluginOptions, type AutoImportConfig, type AutoImportOptions, type ComponentsConfig, DEFAULT_ALIASES, DEFAULT_IGNORE_PATTERNS, type DebugConfig, type DiscoveredPlugin, type EnvOptions, type ErrorContext, type FormattedError, type GeneratePluginsTemplateOptions, type HMRContext, type HMRWatcherOptions, type HookResult, INTERNAL_ALIASES, type IgnoreOptions, type ImportPreset, type ImportSource, type InternalAliasConfig, type Kimesh, type KimeshAlias, type KimeshAppContext, type KimeshComponent, type KimeshComponentsDir, type KimeshConfig, type KimeshHooks, type KimeshImport, type KimeshImportPreset, type KimeshImportsDir, type KimeshLayerConfig, type KimeshModule, type KimeshModuleDefaults, type KimeshModuleDefinition, type KimeshModuleInput, type KimeshModuleMeta, type KimeshModuleOptions, type KimeshOptions, type KimeshPlugin, type KimeshPluginDefinition, KimeshPluginOptions, type KimeshRegistries, type KimeshResolver, type KimeshRoute, type KimeshRouteMiddleware, type KimeshRuntimeHooks, type KimeshRuntimePlugin, type KimeshRuntimePluginDefinition, type KimeshRuntimePluginEntry, type KimeshRuntimePluginMeta, type KimeshRuntimePluginResult, type KimeshTemplate, type KimeshTypeTemplate, type KimeshViteConfig, type KimeshVitePluginEntry, type LayerAutoImportConfig, type LayerComponentConfig, type LayerComposableConfig, type LayerRouteConfig, type LayersConfig, type LoadConfigOptions, type PrepareOptions, type PrepareResult, type ResolvedLayer, type ResolvedTemplate, type RouteRule, type RuntimeConfig, type RuntimeConfigPublic, type ScanPluginsOptions, type VitePlugin, type VitePluginOption, 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/dist/index.mjs

@@ -599,10 +599,13 @@ function addBuildPlugin(plugin, options) {
 /**
 * Add an alias
 *
+* Note: '@' and '~' aliases are context-aware and handled by layerAliasPlugin
+* for files within layers. For module/package internal use, they work as expected.
+*
 * @example
 * ```ts
 * addAlias("#my-module", "/path/to/module");
-* addAlias("@/components", "./src/components");
+* addAlias("@", "./src"); // For module internal use
 * ```
 */
 function addAlias(find, replacement) {
@@ -2661,9 +2664,17 @@ function stripVirtualPrefixes(filePath) {
 * @param layers - Array of resolved layers
 * @returns The layer the file belongs to, or null if not in any layer
 */
+/**
+* Strip query string from file path
+* e.g., "file.vue?vue&type=script" -> "file.vue"
+*/
+function stripQueryString(filePath) {
+	const queryIndex = filePath.indexOf("?");
+	return queryIndex >= 0 ? filePath.slice(0, queryIndex) : filePath;
+}
 function findLayerForFile(filePath, layers) {
 	if (!filePath || layers.length === 0) return null;
-	const strippedPath = stripVirtualPrefixes(filePath);
+	const strippedPath = stripQueryString(stripVirtualPrefixes(filePath));
 	const normalizedFilePath = normalize(strippedPath);
 	const realFilePath = normalize(getRealPath(strippedPath));
 	const sortedLayers = [...layers].sort((a, b) => b.path.length - a.path.length);
@@ -2749,16 +2760,38 @@ const ALIAS_IMPORT_RE = /from\s+['"]([~@]\/[^'"]+)['"]/g;
 * to handle all cases.
 */
 function layerAliasPlugin(options) {
-	const { getLayers, debug = false } = options;
+	const { getLayers, getModuleRootAliases, debug = false } = options;
 	/**
 	* Resolve an alias import given the importer path
 	*/
 	function resolveAliasImport(id, importer) {
 		const layers = getLayers();
 		if (layers.length === 0) return null;
-		const targetLayer = findLayerForFile(importer, layers) || layers.find((l) => l.isApp) || layers[0];
-		if (!targetLayer) return null;
-		return resolveLayerAlias(id, targetLayer);
+		const importerLayer = findLayerForFile(importer, layers);
+		if (importerLayer) return resolveLayerAlias(id, importerLayer);
+		if (getModuleRootAliases) {
+			const moduleAliases = getModuleRootAliases();
+			const aliasKey = id.startsWith("@/") ? "@" : id.startsWith("~/") ? "~" : null;
+			if (aliasKey && moduleAliases[aliasKey]) {
+				const relativePath = id.slice(2);
+				const resolved = join$1(moduleAliases[aliasKey], relativePath);
+				if (existsSync(resolved)) return resolved;
+				for (const ext of [
+					".ts",
+					".js",
+					".vue",
+					".tsx",
+					".jsx",
+					".mjs",
+					".mts"
+				]) {
+					const withExt = resolved + ext;
+					if (existsSync(withExt)) return withExt;
+				}
+				return resolved;
+			}
+		}
+		return null;
 	}
 	return {
 		name: "kimesh:layer-alias",
@@ -3221,7 +3254,8 @@ function kimeshPlugin(options = {}) {
 		root: "",
 		generatedDir: "",
 		kimesh: null,
-		hasPlugins: false
+		hasPlugins: false,
+		moduleRootAliases: {}
 	};
 	const layersConfig = {
 		enabled: options.layers?.enabled ?? config.layers?.enabled ?? "all",
@@ -3327,7 +3361,12 @@ function kimeshPlugin(options = {}) {
 			const kimeshPackageAliases = buildKimeshPackageAliases(configRoot, debug);
 			if (packagesLocation?.type === "workspace-packages") kimeshPackagesPath = packagesLocation.path;
 			const moduleAliases = {};
-			for (const alias of state.kimesh._registries.aliases) if (typeof alias.find === "string") moduleAliases[alias.find] = alias.replacement;
+			for (const alias of state.kimesh._registries.aliases) if (typeof alias.find === "string") {
+				if (alias.find === "@" || alias.find === "~") continue;
+				moduleAliases[alias.find] = alias.replacement;
+			}
+			state.moduleRootAliases = {};
+			for (const alias of state.kimesh._registries.aliases) if (typeof alias.find === "string" && (alias.find === "@" || alias.find === "~")) state.moduleRootAliases[alias.find] = alias.replacement;
 			const appVuePath = resolve$1(resolvedDirs.srcDir, "app.vue");
 			const internalAliases = {
 				"#kimesh/routes": join$1(resolvedDirs.buildDir, "routes.gen.ts"),
@@ -3566,6 +3605,7 @@ function kimeshPlugin(options = {}) {
 	const internalPlugins = [
 		layerAliasPlugin({
 			getLayers: () => state.resolvedLayers,
+			getModuleRootAliases: () => state.moduleRootAliases,
 			debug
 		}),
 		mainPlugin,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kimesh/kit",
-  "version": "0.2.31",
+  "version": "0.2.32-nightly.20260129013552",
   "description": "Build-time engine for Kimesh framework",
   "repository": {
     "type": "git",
@@ -27,9 +27,9 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@kimesh/auto-import": "0.2.31",
-    "@kimesh/layers": "0.2.31",
-    "@kimesh/router-generator": "0.2.31",
+    "@kimesh/auto-import": "workspace:*",
+    "@kimesh/layers": "workspace:*",
+    "@kimesh/router-generator": "workspace:*",
     "@vitejs/plugin-vue": "^6.0.3",
     "c12": "^3.3.3",
     "consola": "^3.4.2",