autosnippet 1.1.16 → 1.1.18

package/bin/asnip.js

@@ -176,10 +176,17 @@ commander
 commander
 	.command('i')
 	.description('add the shared Snippet to the Xcode environment')
-	.action(() => {
-		getSpecFile(function (specFile) {
-			install.addCodeSnippets(specFile);
-		});
+	.action(async () => {
+		// ✅ 使用异步版本查找配置文件
+		const specFile = await findPath.findASSpecPathAsync(CMD_PATH);
+		if (!specFile) {
+			console.error('未找到 AutoSnippet.boxspec.json 配置文件');
+			return;
+		}
+		// ✅ 先聚合子模块配置到主配置文件
+		await init.mergeSubSpecs(specFile);
+		// 然后安装 snippets
+		install.addCodeSnippets(specFile);
 	});
 
 commander

package/bin/findPath.js

@@ -440,9 +440,146 @@ async function findSubASSpecPath(filePath) {
 	return resultArray;
 }
 
+/**
+ * 向上查找项目根目录（包含 .git、Package.swift 等的目录）
+ * @param {string} filePath - 起始文件路径
+ * @returns {Promise<string|null>} 项目根目录路径，如果找不到返回 null
+ */
+async function findProjectRoot(filePath) {
+	let currentPath = path.resolve(filePath);
+	const maxLevels = 20;
+	let levelsChecked = 0;
+	
+	while (currentPath && levelsChecked < maxLevels) {
+		try {
+			const entries = await getDirectoryEntries(currentPath);
+			if (entries && isProjectRoot(currentPath, entries)) {
+				return currentPath;
+			}
+			
+			const parentPath = path.dirname(currentPath);
+			if (parentPath === currentPath) {
+				break;
+			}
+			currentPath = parentPath;
+			levelsChecked++;
+		} catch (err) {
+			if (err.code === 'ENOENT' || err.code === 'EACCES') {
+				const parentPath = path.dirname(currentPath);
+				if (parentPath === currentPath) {
+					break;
+				}
+				currentPath = parentPath;
+				levelsChecked++;
+				continue;
+			}
+			throw err;
+		}
+	}
+	
+	return null;
+}
+
+/**
+ * 从项目根目录找到模块，并返回模块名和头文件名
+ * @param {string} projectRoot - 项目根目录
+ * @param {string} specName - 模块名（target 名称）
+ * @param {string} headName - 头文件相对路径（相对于模块根目录）
+ * @returns {Promise<{moduleName: string, headerFileName: string}|null>}
+ */
+async function findModuleHeaderFromRoot(projectRoot, specName, headName) {
+	if (!projectRoot || !specName || !headName) {
+		return null;
+	}
+	
+	// 从项目根目录向下查找包含 specName 的目录（可能是模块目录）
+	// 例如：BDVideoPlayer、UI/BDVideoPlayer 等
+	const headerFileName = path.basename(headName);
+	
+	// 尝试在项目根目录下查找模块目录
+	// 1. 直接查找 specName 目录
+	const directModulePath = path.join(projectRoot, specName);
+	try {
+		const entries = await getDirectoryEntries(directModulePath);
+		if (entries) {
+			// 检查是否有 include/ModuleName/ 目录
+			const includePath = path.join(directModulePath, 'include', specName, headerFileName);
+			try {
+				await fs.promises.access(includePath);
+				return {
+					moduleName: specName,
+					headerFileName: headerFileName
+				};
+			} catch (err) {
+				// 继续查找
+			}
+		}
+	} catch (err) {
+		// 继续查找
+	}
+	
+	// 2. 递归查找包含 specName 的目录
+	const foundModule = await findModuleDirectory(projectRoot, specName, headerFileName);
+	if (foundModule) {
+		return foundModule;
+	}
+	
+	// 如果找不到，返回默认值（使用 specName 和 headerFileName）
+	return {
+		moduleName: specName,
+		headerFileName: headerFileName
+	};
+}
+
+/**
+ * 递归查找模块目录
+ */
+async function findModuleDirectory(dirPath, moduleName, headerFileName) {
+	try {
+		const entries = await getDirectoryEntries(dirPath);
+		if (!entries) {
+			return null;
+		}
+		
+		for (const entry of entries) {
+			if (entry.isDirectory()) {
+				const dirName = entry.name;
+				// 跳过隐藏目录和常见目录
+				if (dirName.startsWith('.') || dirName === 'node_modules') {
+					continue;
+				}
+				
+				const fullPath = path.join(dirPath, dirName);
+				
+				// 检查是否是模块目录（包含 include/ModuleName/ 结构）
+				const includePath = path.join(fullPath, 'include', moduleName, headerFileName);
+				try {
+					await fs.promises.access(includePath);
+					return {
+						moduleName: moduleName,
+						headerFileName: headerFileName
+					};
+				} catch (err) {
+					// 继续递归查找
+					const found = await findModuleDirectory(fullPath, moduleName, headerFileName);
+					if (found) {
+						return found;
+					}
+				}
+			}
+		}
+	} catch (err) {
+		// 忽略错误
+	}
+	
+	return null;
+}
+
 exports.findASSpecPath = findASSpecPath;
 exports.findASSpecPathAsync = findASSpecPathAsync;
 exports.findPackageSwiftPath = findPackageSwiftPath;
 exports.parsePackageSwift = parsePackageSwift;
 exports.findSubHeaderPath = findSubHeaderPath;
 exports.findSubASSpecPath = findSubASSpecPath;
+exports.findProjectRoot = findProjectRoot;
+exports.findModuleHeaderFromRoot = findModuleHeaderFromRoot;

package/bin/init.js

@@ -5,31 +5,34 @@ const path = require('path');
 const CMD_PATH = process.cwd();
 const findPath = require('./findPath.js');
 
-async function initSpec() {
-	const filePath = path.join(CMD_PATH, '/AutoSnippet.boxspec.json');
+/**
+ * 聚合子模块的 AutoSnippet.boxspec.json 到主配置文件
+ * @param {string} mainSpecFile - 主配置文件路径
+ * @returns {Promise<void>}
+ */
+async function mergeSubSpecs(mainSpecFile) {
 	let idsArray = [];
 	let specObj = {
 		list: []
 	};
 
-	try {
-		await fs.promises.access(filePath);
-	} catch (error) {
-		const content = JSON.stringify(specObj, null, 4);
-		fs.writeFileSync(filePath, content, 'utf8');
-	}
+	// ✅ 从项目根目录开始查找，而不是从主配置文件所在目录
+	// 找到项目根目录（包含 .git、Package.swift 等的目录）
+	const projectRoot = await findPath.findProjectRoot(mainSpecFile);
+	const searchRoot = projectRoot || path.dirname(mainSpecFile);
 
-	const specSlashIndex = filePath.lastIndexOf('/');
-	const specFilePath = filePath.substring(0, specSlashIndex + 1);
+	const specSlashIndex = mainSpecFile.lastIndexOf('/');
+	const specFilePath = mainSpecFile.substring(0, specSlashIndex + 1);
 
-	const array = await findPath.findSubASSpecPath(CMD_PATH);
+	// ✅ 从项目根目录向下查找子模块的 AutoSnippet.boxspec.json
+	const array = await findPath.findSubASSpecPath(searchRoot);
 
 	for (let i = 0; i < array.length; i++) {
 		const filename = array[i];
 
 		const slashIndex = filename.lastIndexOf('/');
 		let thePath = filename.substring(0, slashIndex + 1);
-		if (filename === filePath) {
+		if (filename === mainSpecFile) {
 			thePath = '';
 		} else {
 			thePath = thePath.replace(specFilePath, '');
@@ -38,36 +41,58 @@ async function initSpec() {
 		try {
 			// 读取AutoSnippet的占位配置
 			const data = fs.readFileSync(filename, 'utf8');
-            const config = JSON.parse(data);
+			const config = JSON.parse(data);
 			if (config && config.list) {
-
-                const arr = config.list.filter(function (item, index, array) {
-                    for (let i = 0; i < idsArray.length; i++) {
-                        if (item['{identifier}'] === idsArray[i]) {
-                            return false;
-                        }
-                    }
+				const arr = config.list.filter(function (item, index, array) {
+					for (let i = 0; i < idsArray.length; i++) {
+						if (item['{identifier}'] === idsArray[i]) {
+							return false;
+						}
+					}
 					idsArray.push(item['{identifier}']);
-					// ✅ SPM 模块：headName 已经是相对于模块根目录的相对路径，如果子模块与主配置不在同一目录，需要调整
+					// ✅ SPM 模块：headName 已经是相对于模块根目录的相对路径
 					// headName 保持相对于各自模块根目录的路径（不需要转换）
-					// 去掉 specHeadPath 的处理逻辑
-                    return true;
-                });
-                specObj.list = specObj.list.concat(arr);
+					return true;
+				});
+				specObj.list = specObj.list.concat(arr);
 			}
 		} catch (err) {
 			console.error(err);
 		}
 	}
 
-    try {
-        const content = JSON.stringify(specObj, null, 4);
-        if (content) {
-            fs.writeFileSync(filePath, content, 'utf8');
-        }
-    } catch (err) {
-        console.error(err);
-    }
+	try {
+		const content = JSON.stringify(specObj, null, 4);
+		if (content) {
+			fs.writeFileSync(mainSpecFile, content, 'utf8');
+		}
+	} catch (err) {
+		console.error(err);
+	}
+}
+
+async function initSpec() {
+	// ✅ 查找 Package.swift，在其同级目录创建 AutoSnippet.boxspec.json
+	let packagePath = await findPath.findPackageSwiftPath(CMD_PATH);
+	
+	// 如果找不到 Package.swift，使用当前目录
+	const configDir = packagePath ? path.dirname(packagePath) : CMD_PATH;
+	const filePath = path.join(configDir, 'AutoSnippet.boxspec.json');
+	
+	// 如果配置文件不存在，创建一个空的
+	try {
+		await fs.promises.access(filePath);
+	} catch (error) {
+		const specObj = {
+			list: []
+		};
+		const content = JSON.stringify(specObj, null, 4);
+		fs.writeFileSync(filePath, content, 'utf8');
+	}
+
+	// ✅ 聚合子模块配置到主配置文件
+	await mergeSubSpecs(filePath);
 }
 
-exports.initSpec = initSpec;
+exports.initSpec = initSpec;
+exports.mergeSubSpecs = mergeSubSpecs;

package/bin/install.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const path = require('path');
 const cache = require('./cache.js');
 const config = require('./config.js');
+const findPath = require('./findPath.js');
 // 全局路径
 const HOLDER_KEYS  	= ['{identifier}', '{title}', '{completion}', '{summary}', '{content}', '{language}'];
 
@@ -25,7 +26,10 @@ function writeSingleSnippet(snippet, template) {
 	// 如果有头文件，添加 headerVersion
 	if (snippet['{headName}']) {
 		let extPlace = Object.assign({}, snippet);
-		let header = '<' + extPlace['{specName}'] + '/' + extPlace['{headName}'] + '>';
+		// ✅ 从项目根目录找到模块，只使用模块名和头文件名
+		// 例如：<BDVideoPlayer/BDVideoCacheManager.h> 而不是 <BDVideoPlayer/UI/BDVideoPlayer/Code/BDVideoCacheManager.h>
+		const headerFileName = path.basename(extPlace['{headName}']);
+		let header = '<' + extPlace['{specName}'] + '/' + headerFileName + '>';
 		header = escapeString(header);
 
 		// swift只需要考虑工作空间是否引入
@@ -152,7 +156,9 @@ function addCodeSnippets(specFile, singleSnippet) {
 
 			if (placeVal['{headName}']) {
 				let extPlace = Object.assign({}, placeVal);
-				let header = '<' + extPlace['{specName}'] + '/' + extPlace['{headName}'] + '>';
+				// ✅ 从项目根目录找到模块，只使用模块名和头文件名
+				const headerFileName = path.basename(extPlace['{headName}']);
+				let header = '<' + extPlace['{specName}'] + '/' + headerFileName + '>';
 				header = escapeString(header);
 
 				// swift只需要考虑工作空间是否引入

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "autosnippet",
-    "version": "1.1.16",
+    "version": "1.1.18",
     "description": "A iOS module management tool.",
     "main": "index.js",
     "scripts": {