ylyx-cli 1.0.15 → 1.0.16

package/lib/interactive.js

@@ -1,87 +1,87 @@
-const inquirer = require('inquirer');
-const { generate } = require('./index');
-const { listTemplates } = require('./template');
-const { log } = require('./utils');
-
-/**
- * 交互式创建代码
- */
-async function interactiveCreate() {
-	try {
-		// 获取模板列表（不打印）
-		const templates = listTemplates(false);
-
-		if (templates.length === 0) {
-			log.error('没有可用的模板');
-			return;
-		}
-
-		// 选择模板
-		const { templateName } = await inquirer.prompt([
-			{
-				type: 'list',
-				name: 'templateName',
-				message: '请选择模板',
-				choices: templates.map((t) => ({
-					name: `${t.name} - ${t.config.description || '无描述'}`,
-					value: t.name,
-				})),
-			},
-		]);
-
-		// 获取模板配置
-		const { getTemplateConfig } = require('./template');
-		const templateConfig = getTemplateConfig(templateName);
-
-		// 收集变量
-		const variables = {};
-
-		if (templateConfig.variables) {
-			const prompts = Object.entries(templateConfig.variables).map(([key, config]) => {
-				return {
-					type: config.type || 'input',
-					name: key,
-					message: config.message || `请输入 ${key}`,
-					default: config.default,
-					when:
-						config.when !== undefined
-							? (answers) => {
-									if (typeof config.when === 'function') {
-										return config.when(answers);
-									}
-									return config.when;
-							  }
-							: undefined,
-					choices: config.choices,
-					validate: config.validate,
-				};
-			});
-
-			const answers = await inquirer.prompt(prompts);
-			Object.assign(variables, answers);
-		}
-
-		// 询问输出目录
-		const { outputDir } = await inquirer.prompt([
-			{
-				type: 'input',
-				name: 'outputDir',
-				message: '输出目录',
-				default: './',
-			},
-		]);
-
-		// 生成代码
-		await generate(templateName, {
-			outputDir,
-			variables,
-		});
-	} catch (error) {
-		log.error(`创建失败: ${error.message}`);
-		process.exit(1);
-	}
-}
-
-module.exports = {
-	interactiveCreate,
-};
+const inquirer = require('inquirer');
+const { generate } = require('./index');
+const { listTemplates } = require('./template');
+const { log } = require('./utils');
+
+/**
+ * 交互式创建代码
+ */
+async function interactiveCreate() {
+	try {
+		// 获取模板列表（不打印）
+		const templates = listTemplates(false);
+
+		if (templates.length === 0) {
+			log.error('没有可用的模板');
+			return;
+		}
+
+		// 选择模板
+		const { templateName } = await inquirer.prompt([
+			{
+				type: 'list',
+				name: 'templateName',
+				message: '请选择模板',
+				choices: templates.map((t) => ({
+					name: `${t.name} - ${t.config.description || '无描述'}`,
+					value: t.name,
+				})),
+			},
+		]);
+
+		// 获取模板配置
+		const { getTemplateConfig } = require('./template');
+		const templateConfig = getTemplateConfig(templateName);
+
+		// 收集变量
+		const variables = {};
+
+		if (templateConfig.variables) {
+			const prompts = Object.entries(templateConfig.variables).map(([key, config]) => {
+				return {
+					type: config.type || 'input',
+					name: key,
+					message: config.message || `请输入 ${key}`,
+					default: config.default,
+					when:
+						config.when !== undefined
+							? (answers) => {
+									if (typeof config.when === 'function') {
+										return config.when(answers);
+									}
+									return config.when;
+							  }
+							: undefined,
+					choices: config.choices,
+					validate: config.validate,
+				};
+			});
+
+			const answers = await inquirer.prompt(prompts);
+			Object.assign(variables, answers);
+		}
+
+		// 询问输出目录
+		const { outputDir } = await inquirer.prompt([
+			{
+				type: 'input',
+				name: 'outputDir',
+				message: '输出目录',
+				default: './',
+			},
+		]);
+
+		// 生成代码
+		await generate(templateName, {
+			outputDir,
+			variables,
+		});
+	} catch (error) {
+		log.error(`创建失败: ${error.message}`);
+		process.exit(1);
+	}
+}
+
+module.exports = {
+	interactiveCreate,
+};

package/lib/remote.js

@@ -1,179 +1,179 @@
-const fs = require('fs-extra');
-const path = require('path');
-const { execSync } = require('child_process');
-const { log } = require('./utils');
-
-/**
- * 获取模板缓存目录
- */
-function getTemplateCacheDir() {
-	const os = require('os');
-	const cacheDir = path.join(os.homedir(), '.ylyx', 'templates-cache');
-	fs.ensureDirSync(cacheDir);
-	return cacheDir;
-}
-
-/**
- * 解析 Git 仓库 URL
- * 支持格式：
- * - https://github.com/user/repo
- * - https://github.com/user/repo.git
- * - git@github.com:user/repo.git
- * - user/repo (简写，默认 GitHub)
- */
-function parseGitUrl(url) {
-	// 如果是简写格式 user/repo，转换为 GitHub URL
-	if (!url.includes('://') && !url.includes('@') && url.includes('/')) {
-		url = `https://github.com/${url}`;
-	}
-
-	// 如果不是 .git 结尾，添加 .git
-	if (!url.endsWith('.git')) {
-		url = url + '.git';
-	}
-
-	// 提取仓库信息
-	let match;
-	if (url.startsWith('https://')) {
-		match = url.match(/https:\/\/([^/]+)\/([^/]+)\/([^/]+)/);
-	} else if (url.startsWith('git@')) {
-		match = url.match(/git@([^:]+):([^/]+)\/([^/]+)/);
-	}
-
-	if (!match) {
-		throw new Error(`无法解析 Git URL: ${url}`);
-	}
-
-	const host = match[1];
-	const owner = match[2];
-	const repo = match[3].replace('.git', '');
-
-	return {
-		host,
-		owner,
-		repo,
-		url: url,
-		cacheKey: `${host}/${owner}/${repo}`,
-	};
-}
-
-/**
- * 检查 Git 是否可用
- */
-function checkGitAvailable() {
-	try {
-		execSync('git --version', { stdio: 'ignore' });
-		return true;
-	} catch (e) {
-		return false;
-	}
-}
-
-/**
- * 从 Git 仓库下载模板
- */
-async function downloadTemplateFromGit(repoUrl, branch = 'main') {
-	const gitInfo = parseGitUrl(repoUrl);
-	const cacheDir = getTemplateCacheDir();
-	const templateCachePath = path.join(cacheDir, gitInfo.cacheKey.replace(/\//g, '_'));
-
-	// 检查是否已经缓存
-	if (fs.existsSync(templateCachePath)) {
-		try {
-			// 更新缓存
-			const cwd = process.cwd();
-			try {
-				execSync('git fetch', { cwd: templateCachePath, stdio: 'ignore' });
-				execSync(`git checkout ${branch}`, { cwd: templateCachePath, stdio: 'ignore' });
-				execSync('git pull', { cwd: templateCachePath, stdio: 'ignore' });
-				log.info(`使用缓存的模板: ${gitInfo.cacheKey}`);
-				return templateCachePath;
-			} catch (e) {
-				// 如果更新失败，删除缓存重新下载
-				fs.removeSync(templateCachePath);
-			}
-		} catch (e) {
-			// 如果更新失败，删除缓存重新下载
-			fs.removeSync(templateCachePath);
-		}
-	}
-
-	// 检查 Git 是否可用
-	if (!checkGitAvailable()) {
-		throw new Error('Git 未安装或不在 PATH 中，请先安装 Git');
-	}
-
-	// 克隆仓库
-	try {
-		log.info(`正在下载模板: ${gitInfo.cacheKey}...`);
-		execSync(`git clone -b ${branch} --depth 1 ${gitInfo.url} "${templateCachePath}"`, {
-			stdio: 'pipe',
-		});
-		log.success(`模板下载成功: ${gitInfo.cacheKey}`);
-		return templateCachePath;
-	} catch (e) {
-		// 如果指定分支失败，尝试默认分支
-		if (branch !== 'main' && branch !== 'master') {
-			log.warn(`分支 ${branch} 不存在，尝试使用默认分支`);
-			if (fs.existsSync(templateCachePath)) {
-				fs.removeSync(templateCachePath);
-			}
-			try {
-				execSync(`git clone --depth 1 ${gitInfo.url} "${templateCachePath}"`, {
-					stdio: 'pipe',
-				});
-				return templateCachePath;
-			} catch (e2) {
-				throw new Error(`下载模板失败: ${e2.message}`);
-			}
-		}
-		throw new Error(`下载模板失败: ${e.message}`);
-	}
-}
-
-/**
- * 安装远程模板到本地
- */
-async function installRemoteTemplate(repoUrl, branch = 'main', templateName = null) {
-	const gitInfo = parseGitUrl(repoUrl);
-
-	// 如果没有指定模板名，使用仓库名
-	if (!templateName) {
-		templateName = gitInfo.repo;
-	}
-
-	// 下载模板
-	const downloadedPath = await downloadTemplateFromGit(repoUrl, branch);
-
-	// 检查是否有 template.json
-	const templateJsonPath = path.join(downloadedPath, 'template.json');
-	if (!fs.existsSync(templateJsonPath)) {
-		// 如果没有 template.json，检查是否有 files 目录
-		const filesDir = path.join(downloadedPath, 'files');
-		if (!fs.existsSync(filesDir)) {
-			throw new Error('模板格式不正确：缺少 template.json 或 files 目录');
-		}
-	}
-
-	// 复制到本地模板目录
-	const { getTemplatesDir } = require('./utils');
-	const templatesDir = getTemplatesDir();
-	const targetPath = path.join(templatesDir, templateName);
-
-	if (fs.existsSync(targetPath)) {
-		log.warn(`模板 ${templateName} 已存在，将被覆盖`);
-		fs.removeSync(targetPath);
-	}
-
-	fs.copySync(downloadedPath, targetPath);
-	log.success(`模板已安装: ${templateName}`);
-
-	return targetPath;
-}
-
-module.exports = {
-	downloadTemplateFromGit,
-	installRemoteTemplate,
-	parseGitUrl,
-	getTemplateCacheDir,
-};
+const fs = require('fs-extra');
+const path = require('path');
+const { execSync } = require('child_process');
+const { log } = require('./utils');
+
+/**
+ * 获取模板缓存目录
+ */
+function getTemplateCacheDir() {
+	const os = require('os');
+	const cacheDir = path.join(os.homedir(), '.ylyx', 'templates-cache');
+	fs.ensureDirSync(cacheDir);
+	return cacheDir;
+}
+
+/**
+ * 解析 Git 仓库 URL
+ * 支持格式：
+ * - https://github.com/user/repo
+ * - https://github.com/user/repo.git
+ * - git@github.com:user/repo.git
+ * - user/repo (简写，默认 GitHub)
+ */
+function parseGitUrl(url) {
+	// 如果是简写格式 user/repo，转换为 GitHub URL
+	if (!url.includes('://') && !url.includes('@') && url.includes('/')) {
+		url = `https://github.com/${url}`;
+	}
+
+	// 如果不是 .git 结尾，添加 .git
+	if (!url.endsWith('.git')) {
+		url = url + '.git';
+	}
+
+	// 提取仓库信息
+	let match;
+	if (url.startsWith('https://')) {
+		match = url.match(/https:\/\/([^/]+)\/([^/]+)\/([^/]+)/);
+	} else if (url.startsWith('git@')) {
+		match = url.match(/git@([^:]+):([^/]+)\/([^/]+)/);
+	}
+
+	if (!match) {
+		throw new Error(`无法解析 Git URL: ${url}`);
+	}
+
+	const host = match[1];
+	const owner = match[2];
+	const repo = match[3].replace('.git', '');
+
+	return {
+		host,
+		owner,
+		repo,
+		url: url,
+		cacheKey: `${host}/${owner}/${repo}`,
+	};
+}
+
+/**
+ * 检查 Git 是否可用
+ */
+function checkGitAvailable() {
+	try {
+		execSync('git --version', { stdio: 'ignore' });
+		return true;
+	} catch (e) {
+		return false;
+	}
+}
+
+/**
+ * 从 Git 仓库下载模板
+ */
+async function downloadTemplateFromGit(repoUrl, branch = 'main') {
+	const gitInfo = parseGitUrl(repoUrl);
+	const cacheDir = getTemplateCacheDir();
+	const templateCachePath = path.join(cacheDir, gitInfo.cacheKey.replace(/\//g, '_'));
+
+	// 检查是否已经缓存
+	if (fs.existsSync(templateCachePath)) {
+		try {
+			// 更新缓存
+			const cwd = process.cwd();
+			try {
+				execSync('git fetch', { cwd: templateCachePath, stdio: 'ignore' });
+				execSync(`git checkout ${branch}`, { cwd: templateCachePath, stdio: 'ignore' });
+				execSync('git pull', { cwd: templateCachePath, stdio: 'ignore' });
+				log.info(`使用缓存的模板: ${gitInfo.cacheKey}`);
+				return templateCachePath;
+			} catch (e) {
+				// 如果更新失败，删除缓存重新下载
+				fs.removeSync(templateCachePath);
+			}
+		} catch (e) {
+			// 如果更新失败，删除缓存重新下载
+			fs.removeSync(templateCachePath);
+		}
+	}
+
+	// 检查 Git 是否可用
+	if (!checkGitAvailable()) {
+		throw new Error('Git 未安装或不在 PATH 中，请先安装 Git');
+	}
+
+	// 克隆仓库
+	try {
+		log.info(`正在下载模板: ${gitInfo.cacheKey}...`);
+		execSync(`git clone -b ${branch} --depth 1 ${gitInfo.url} "${templateCachePath}"`, {
+			stdio: 'pipe',
+		});
+		log.success(`模板下载成功: ${gitInfo.cacheKey}`);
+		return templateCachePath;
+	} catch (e) {
+		// 如果指定分支失败，尝试默认分支
+		if (branch !== 'main' && branch !== 'master') {
+			log.warn(`分支 ${branch} 不存在，尝试使用默认分支`);
+			if (fs.existsSync(templateCachePath)) {
+				fs.removeSync(templateCachePath);
+			}
+			try {
+				execSync(`git clone --depth 1 ${gitInfo.url} "${templateCachePath}"`, {
+					stdio: 'pipe',
+				});
+				return templateCachePath;
+			} catch (e2) {
+				throw new Error(`下载模板失败: ${e2.message}`);
+			}
+		}
+		throw new Error(`下载模板失败: ${e.message}`);
+	}
+}
+
+/**
+ * 安装远程模板到本地
+ */
+async function installRemoteTemplate(repoUrl, branch = 'main', templateName = null) {
+	const gitInfo = parseGitUrl(repoUrl);
+
+	// 如果没有指定模板名，使用仓库名
+	if (!templateName) {
+		templateName = gitInfo.repo;
+	}
+
+	// 下载模板
+	const downloadedPath = await downloadTemplateFromGit(repoUrl, branch);
+
+	// 检查是否有 template.json
+	const templateJsonPath = path.join(downloadedPath, 'template.json');
+	if (!fs.existsSync(templateJsonPath)) {
+		// 如果没有 template.json，检查是否有 files 目录
+		const filesDir = path.join(downloadedPath, 'files');
+		if (!fs.existsSync(filesDir)) {
+			throw new Error('模板格式不正确：缺少 template.json 或 files 目录');
+		}
+	}
+
+	// 复制到本地模板目录
+	const { getTemplatesDir } = require('./utils');
+	const templatesDir = getTemplatesDir();
+	const targetPath = path.join(templatesDir, templateName);
+
+	if (fs.existsSync(targetPath)) {
+		log.warn(`模板 ${templateName} 已存在，将被覆盖`);
+		fs.removeSync(targetPath);
+	}
+
+	fs.copySync(downloadedPath, targetPath);
+	log.success(`模板已安装: ${templateName}`);
+
+	return targetPath;
+}
+
+module.exports = {
+	downloadTemplateFromGit,
+	installRemoteTemplate,
+	parseGitUrl,
+	getTemplateCacheDir,
+};