autosnippet 1.1.16 → 1.1.17

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/init.js

@@ -5,31 +5,29 @@ 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');
-	}
-
-	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(path.dirname(mainSpecFile));
 
 	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 +36,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/package.json

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