@kimesh/kit 0.2.31 → 0.2.32

package/dist/index.d.mts

@@ -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;

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",
   "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": "0.2.32",
+    "@kimesh/layers": "0.2.32",
+    "@kimesh/router-generator": "0.2.32",
     "@vitejs/plugin-vue": "^6.0.3",
     "c12": "^3.3.3",
     "consola": "^3.4.2",