ylyx-cli 1.0.15 → 1.0.16

package/lib/template.js

@@ -1,174 +1,174 @@
-const fs = require('fs-extra');
-const path = require('path');
-const { getTemplatesDir, log } = require('./utils');
-
-/**
- * 获取所有模板列表
- */
-function listTemplates(shouldPrint = true) {
-	const templatesDir = getTemplatesDir();
-
-	if (!fs.existsSync(templatesDir)) {
-		if (shouldPrint) {
-			log.warn(`模板目录不存在: ${templatesDir}`);
-			log.info('请先创建 templates 目录并添加模板');
-		}
-		return [];
-	}
-
-	const items = fs.readdirSync(templatesDir, { withFileTypes: true });
-	const templates = items
-		.filter((item) => item.isDirectory())
-		.map((item) => {
-			const templatePath = path.join(templatesDir, item.name);
-			const configPath = path.join(templatePath, 'template.json');
-
-			let config = {};
-			if (fs.existsSync(configPath)) {
-				try {
-					config = fs.readJsonSync(configPath);
-				} catch (e) {
-					// 忽略配置读取错误
-				}
-			}
-
-			return {
-				name: item.name,
-				path: templatePath,
-				config,
-			};
-		});
-
-	if (shouldPrint) {
-		if (templates.length === 0) {
-			log.warn('暂无可用模板');
-			return [];
-		}
-
-		console.log('\n可用模板列表：\n');
-		templates.forEach((template, index) => {
-			const desc = template.config.description || '无描述';
-			const version = template.config.version || '1.0.0';
-			console.log(`  ${index + 1}. ${template.name} (v${version})`);
-			console.log(`     ${desc}\n`);
-		});
-	}
-
-	return templates;
-}
-
-/**
- * 获取模板信息
- */
-function getTemplateInfo(templateName) {
-	const templatesDir = getTemplatesDir();
-	const templatePath = path.join(templatesDir, templateName);
-
-	if (!fs.existsSync(templatePath)) {
-		log.error(`模板不存在: ${templateName}`);
-		return null;
-	}
-
-	const configPath = path.join(templatePath, 'template.json');
-	let config = {};
-
-	if (fs.existsSync(configPath)) {
-		try {
-			config = fs.readJsonSync(configPath);
-		} catch (e) {
-			log.error(`读取模板配置失败: ${e.message}`);
-			return null;
-		}
-	} else {
-		log.warn('模板配置文件不存在');
-	}
-
-	console.log(`\n模板信息: ${templateName}\n`);
-	console.log(`  名称: ${config.name || templateName}`);
-	console.log(`  版本: ${config.version || '1.0.0'}`);
-	console.log(`  描述: ${config.description || '无描述'}`);
-
-	if (config.variables && Object.keys(config.variables).length > 0) {
-		console.log(`\n  变量:`);
-		Object.entries(config.variables).forEach(([key, value]) => {
-			const type = value.type || 'string';
-			const desc = value.message || value.description || '';
-			const defaultValue = value.default !== undefined ? ` (默认: ${value.default})` : '';
-			console.log(`    - ${key} (${type})${defaultValue}: ${desc}`);
-		});
-	}
-
-	console.log('');
-	return config;
-}
-
-/**
- * 获取模板配置
- */
-function getTemplateConfig(templateName) {
-	const templatesDir = getTemplatesDir();
-	const templatePath = path.join(templatesDir, templateName);
-
-	if (!fs.existsSync(templatePath)) {
-		// 如果本地不存在，尝试检查是否是远程模板格式
-		// 格式: owner/repo 或完整的 Git URL
-		if (templateName.includes('/') || templateName.includes('://') || templateName.includes('@')) {
-			throw new Error(`模板不存在: ${templateName}\n提示: 使用 'ylyx install ${templateName}' 安装远程模板`);
-		}
-		throw new Error(`模板不存在: ${templateName}`);
-	}
-
-	const configPath = path.join(templatePath, 'template.json');
-	let config = {};
-
-	if (fs.existsSync(configPath)) {
-		try {
-			config = fs.readJsonSync(configPath);
-		} catch (e) {
-			throw new Error(`读取模板配置失败: ${e.message}`);
-		}
-	}
-
-	return {
-		...config,
-		path: templatePath,
-	};
-}
-
-/**
- * 添加模板（复制模板目录）
- */
-function addTemplate(templateName, sourcePath) {
-	const templatesDir = getTemplatesDir();
-	const targetPath = path.join(templatesDir, templateName);
-
-	// 确保模板目录存在
-	fs.ensureDirSync(templatesDir);
-
-	// 检查源路径是否存在
-	if (!fs.existsSync(sourcePath)) {
-		log.error(`源路径不存在: ${sourcePath}`);
-		return;
-	}
-
-	// 检查目标路径是否已存在
-	if (fs.existsSync(targetPath)) {
-		log.warn(`模板已存在: ${templateName}`);
-		log.info('如需更新，请先删除现有模板');
-		return;
-	}
-
-	try {
-		fs.copySync(sourcePath, targetPath);
-		log.success(`模板添加成功: ${templateName}`);
-	} catch (e) {
-		log.error(`添加模板失败: ${e.message}`);
-	}
-}
-
-module.exports = {
-	listTemplates,
-	getTemplateInfo,
-	getTemplateConfig,
-	addTemplate,
-};
+const fs = require('fs-extra');
+const path = require('path');
+const { getTemplatesDir, log } = require('./utils');
+
+/**
+ * 获取所有模板列表
+ */
+function listTemplates(shouldPrint = true) {
+	const templatesDir = getTemplatesDir();
+
+	if (!fs.existsSync(templatesDir)) {
+		if (shouldPrint) {
+			log.warn(`模板目录不存在: ${templatesDir}`);
+			log.info('请先创建 templates 目录并添加模板');
+		}
+		return [];
+	}
+
+	const items = fs.readdirSync(templatesDir, { withFileTypes: true });
+	const templates = items
+		.filter((item) => item.isDirectory())
+		.map((item) => {
+			const templatePath = path.join(templatesDir, item.name);
+			const configPath = path.join(templatePath, 'template.json');
+
+			let config = {};
+			if (fs.existsSync(configPath)) {
+				try {
+					config = fs.readJsonSync(configPath);
+				} catch (e) {
+					// 忽略配置读取错误
+				}
+			}
+
+			return {
+				name: item.name,
+				path: templatePath,
+				config,
+			};
+		});
+
+	if (shouldPrint) {
+		if (templates.length === 0) {
+			log.warn('暂无可用模板');
+			return [];
+		}
+
+		console.log('\n可用模板列表：\n');
+		templates.forEach((template, index) => {
+			const desc = template.config.description || '无描述';
+			const version = template.config.version || '1.0.0';
+			console.log(`  ${index + 1}. ${template.name} (v${version})`);
+			console.log(`     ${desc}\n`);
+		});
+	}
+
+	return templates;
+}
+
+/**
+ * 获取模板信息
+ */
+function getTemplateInfo(templateName) {
+	const templatesDir = getTemplatesDir();
+	const templatePath = path.join(templatesDir, templateName);
+
+	if (!fs.existsSync(templatePath)) {
+		log.error(`模板不存在: ${templateName}`);
+		return null;
+	}
+
+	const configPath = path.join(templatePath, 'template.json');
+	let config = {};
+
+	if (fs.existsSync(configPath)) {
+		try {
+			config = fs.readJsonSync(configPath);
+		} catch (e) {
+			log.error(`读取模板配置失败: ${e.message}`);
+			return null;
+		}
+	} else {
+		log.warn('模板配置文件不存在');
+	}
+
+	console.log(`\n模板信息: ${templateName}\n`);
+	console.log(`  名称: ${config.name || templateName}`);
+	console.log(`  版本: ${config.version || '1.0.0'}`);
+	console.log(`  描述: ${config.description || '无描述'}`);
+
+	if (config.variables && Object.keys(config.variables).length > 0) {
+		console.log(`\n  变量:`);
+		Object.entries(config.variables).forEach(([key, value]) => {
+			const type = value.type || 'string';
+			const desc = value.message || value.description || '';
+			const defaultValue = value.default !== undefined ? ` (默认: ${value.default})` : '';
+			console.log(`    - ${key} (${type})${defaultValue}: ${desc}`);
+		});
+	}
+
+	console.log('');
+	return config;
+}
+
+/**
+ * 获取模板配置
+ */
+function getTemplateConfig(templateName) {
+	const templatesDir = getTemplatesDir();
+	const templatePath = path.join(templatesDir, templateName);
+
+	if (!fs.existsSync(templatePath)) {
+		// 如果本地不存在，尝试检查是否是远程模板格式
+		// 格式: owner/repo 或完整的 Git URL
+		if (templateName.includes('/') || templateName.includes('://') || templateName.includes('@')) {
+			throw new Error(`模板不存在: ${templateName}\n提示: 使用 'ylyx install ${templateName}' 安装远程模板`);
+		}
+		throw new Error(`模板不存在: ${templateName}`);
+	}
+
+	const configPath = path.join(templatePath, 'template.json');
+	let config = {};
+
+	if (fs.existsSync(configPath)) {
+		try {
+			config = fs.readJsonSync(configPath);
+		} catch (e) {
+			throw new Error(`读取模板配置失败: ${e.message}`);
+		}
+	}
+
+	return {
+		...config,
+		path: templatePath,
+	};
+}
+
+/**
+ * 添加模板（复制模板目录）
+ */
+function addTemplate(templateName, sourcePath) {
+	const templatesDir = getTemplatesDir();
+	const targetPath = path.join(templatesDir, templateName);
+
+	// 确保模板目录存在
+	fs.ensureDirSync(templatesDir);
+
+	// 检查源路径是否存在
+	if (!fs.existsSync(sourcePath)) {
+		log.error(`源路径不存在: ${sourcePath}`);
+		return;
+	}
+
+	// 检查目标路径是否已存在
+	if (fs.existsSync(targetPath)) {
+		log.warn(`模板已存在: ${templateName}`);
+		log.info('如需更新，请先删除现有模板');
+		return;
+	}
+
+	try {
+		fs.copySync(sourcePath, targetPath);
+		log.success(`模板添加成功: ${templateName}`);
+	} catch (e) {
+		log.error(`添加模板失败: ${e.message}`);
+	}
+}
+
+module.exports = {
+	listTemplates,
+	getTemplateInfo,
+	getTemplateConfig,
+	addTemplate,
+};

package/lib/utils.js

@@ -1,148 +1,148 @@
-const path = require('path');
-const fs = require('fs-extra');
-const chalk = require('chalk');
-
-/**
- * 转换为驼峰命名
- */
-function camelCase(str) {
-	return str
-		.replace(/(?:^\w|[A-Z]|\b\w)/g, (word, index) => {
-			return index === 0 ? word.toLowerCase() : word.toUpperCase();
-		})
-		.replace(/\s+/g, '');
-}
-
-/**
- * 转换为帕斯卡命名
- */
-function pascalCase(str) {
-	return str
-		.replace(/(?:^\w|[A-Z]|\b\w)/g, (word) => {
-			return word.toUpperCase();
-		})
-		.replace(/\s+/g, '');
-}
-
-/**
- * 转换为短横线命名
- */
-function kebabCase(str) {
-	return str
-		.replace(/([a-z])([A-Z])/g, '$1-$2')
-		.replace(/[\s_]+/g, '-')
-		.toLowerCase();
-}
-
-/**
- * 转换为下划线命名
- */
-function snakeCase(str) {
-	return str
-		.replace(/([a-z])([A-Z])/g, '$1_$2')
-		.replace(/[\s-]+/g, '_')
-		.toLowerCase();
-}
-
-/**
- * 获取模板目录路径
- */
-function getTemplatesDir() {
-	const configPath = path.join(process.cwd(), '.ylyxrc.json');
-	if (fs.existsSync(configPath)) {
-		const config = fs.readJsonSync(configPath);
-		if (config.templatesDir) {
-			return path.resolve(process.cwd(), config.templatesDir);
-		}
-	}
-
-	// 默认使用项目内的 templates 目录
-	return path.join(__dirname, '../templates');
-}
-
-/**
- * 获取输出目录
- */
-function getOutputDir(customOutputDir) {
-	if (customOutputDir) {
-		return path.resolve(process.cwd(), customOutputDir);
-	}
-
-	const configPath = path.join(process.cwd(), '.ylyxrc.json');
-	if (fs.existsSync(configPath)) {
-		const config = fs.readJsonSync(configPath);
-		if (config.outputDir) {
-			return path.resolve(process.cwd(), config.outputDir);
-		}
-	}
-
-	return process.cwd();
-}
-
-/**
- * 读取当前项目目录下的 .ylyxrc.json（安全：不存在返回 {}，JSON 错误抛出）
- */
-function readProjectConfig() {
-	const configPath = path.join(process.cwd(), '.ylyxrc.json');
-	if (!fs.existsSync(configPath)) return {};
-	try {
-		return fs.readJsonSync(configPath);
-	} catch (e) {
-		throw new Error(`读取 .ylyxrc.json 失败，请确认它是有效 JSON：${e.message}`);
-	}
-}
-
-/**
- * 注册 Handlebars 辅助函数
- */
-function registerHandlebarsHelpers(handlebars) {
-	handlebars.registerHelper('camelCase', (str) => {
-		return camelCase(str);
-	});
-
-	handlebars.registerHelper('pascalCase', (str) => {
-		return pascalCase(str);
-	});
-
-	handlebars.registerHelper('kebabCase', (str) => {
-		return kebabCase(str);
-	});
-
-	handlebars.registerHelper('snakeCase', (str) => {
-		return snakeCase(str);
-	});
-
-	handlebars.registerHelper('upperCase', (str) => {
-		return String(str).toUpperCase();
-	});
-
-	handlebars.registerHelper('lowerCase', (str) => {
-		return String(str).toLowerCase();
-	});
-
-	handlebars.registerHelper('eq', (a, b) => {
-		return a === b;
-	});
-}
-
-/**
- * 日志输出
- */
-const log = {
-	success: (msg) => console.log(chalk.green('✓'), msg),
-	error: (msg) => console.error(chalk.red('✗'), msg),
-	info: (msg) => console.log(chalk.blue('ℹ'), msg),
-	warn: (msg) => console.log(chalk.yellow('⚠'), msg),
-};
-
-module.exports = {
-	camelCase,
-	pascalCase,
-	kebabCase,
-	snakeCase,
-	getTemplatesDir,
-	getOutputDir,
-	readProjectConfig,
-	registerHandlebarsHelpers,
-	log,
-};
+const path = require('path');
+const fs = require('fs-extra');
+const chalk = require('chalk');
+
+/**
+ * 转换为驼峰命名
+ */
+function camelCase(str) {
+	return str
+		.replace(/(?:^\w|[A-Z]|\b\w)/g, (word, index) => {
+			return index === 0 ? word.toLowerCase() : word.toUpperCase();
+		})
+		.replace(/\s+/g, '');
+}
+
+/**
+ * 转换为帕斯卡命名
+ */
+function pascalCase(str) {
+	return str
+		.replace(/(?:^\w|[A-Z]|\b\w)/g, (word) => {
+			return word.toUpperCase();
+		})
+		.replace(/\s+/g, '');
+}
+
+/**
+ * 转换为短横线命名
+ */
+function kebabCase(str) {
+	return str
+		.replace(/([a-z])([A-Z])/g, '$1-$2')
+		.replace(/[\s_]+/g, '-')
+		.toLowerCase();
+}
+
+/**
+ * 转换为下划线命名
+ */
+function snakeCase(str) {
+	return str
+		.replace(/([a-z])([A-Z])/g, '$1_$2')
+		.replace(/[\s-]+/g, '_')
+		.toLowerCase();
+}
+
+/**
+ * 获取模板目录路径
+ */
+function getTemplatesDir() {
+	const configPath = path.join(process.cwd(), '.ylyxrc.json');
+	if (fs.existsSync(configPath)) {
+		const config = fs.readJsonSync(configPath);
+		if (config.templatesDir) {
+			return path.resolve(process.cwd(), config.templatesDir);
+		}
+	}
+
+	// 默认使用项目内的 templates 目录
+	return path.join(__dirname, '../templates');
+}
+
+/**
+ * 获取输出目录
+ */
+function getOutputDir(customOutputDir) {
+	if (customOutputDir) {
+		return path.resolve(process.cwd(), customOutputDir);
+	}
+
+	const configPath = path.join(process.cwd(), '.ylyxrc.json');
+	if (fs.existsSync(configPath)) {
+		const config = fs.readJsonSync(configPath);
+		if (config.outputDir) {
+			return path.resolve(process.cwd(), config.outputDir);
+		}
+	}
+
+	return process.cwd();
+}
+
+/**
+ * 读取当前项目目录下的 .ylyxrc.json（安全：不存在返回 {}，JSON 错误抛出）
+ */
+function readProjectConfig() {
+	const configPath = path.join(process.cwd(), '.ylyxrc.json');
+	if (!fs.existsSync(configPath)) return {};
+	try {
+		return fs.readJsonSync(configPath);
+	} catch (e) {
+		throw new Error(`读取 .ylyxrc.json 失败，请确认它是有效 JSON：${e.message}`);
+	}
+}
+
+/**
+ * 注册 Handlebars 辅助函数
+ */
+function registerHandlebarsHelpers(handlebars) {
+	handlebars.registerHelper('camelCase', (str) => {
+		return camelCase(str);
+	});
+
+	handlebars.registerHelper('pascalCase', (str) => {
+		return pascalCase(str);
+	});
+
+	handlebars.registerHelper('kebabCase', (str) => {
+		return kebabCase(str);
+	});
+
+	handlebars.registerHelper('snakeCase', (str) => {
+		return snakeCase(str);
+	});
+
+	handlebars.registerHelper('upperCase', (str) => {
+		return String(str).toUpperCase();
+	});
+
+	handlebars.registerHelper('lowerCase', (str) => {
+		return String(str).toLowerCase();
+	});
+
+	handlebars.registerHelper('eq', (a, b) => {
+		return a === b;
+	});
+}
+
+/**
+ * 日志输出
+ */
+const log = {
+	success: (msg) => console.log(chalk.green('✓'), msg),
+	error: (msg) => console.error(chalk.red('✗'), msg),
+	info: (msg) => console.log(chalk.blue('ℹ'), msg),
+	warn: (msg) => console.log(chalk.yellow('⚠'), msg),
+};
+
+module.exports = {
+	camelCase,
+	pascalCase,
+	kebabCase,
+	snakeCase,
+	getTemplatesDir,
+	getOutputDir,
+	readProjectConfig,
+	registerHandlebarsHelpers,
+	log,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ylyx-cli",
-    "version": "1.0.15",
+    "version": "1.0.16",
     "description": "公司内部代码生成模板脚手架工具，支持快速生成项目初始结构和代码模板",
     "main": "lib/index.js",
     "bin": {
@@ -44,16 +44,16 @@
     },
     "dependencies": {
         "archiver": "^5.3.2",
-        "commander": "^11.1.0",
-        "inquirer": "^8.2.6",
         "chalk": "^4.1.2",
+        "commander": "^11.1.0",
         "fs-extra": "^11.2.0",
-        "handlebars": "^4.7.8",
         "glob": "^10.3.10",
+        "handlebars": "^4.7.8",
+        "inquirer": "^8.2.6",
         "ora": "^5.4.1",
         "ssh2-sftp-client": "^9.0.4"
     },
     "devDependencies": {
         "@types/node": "^20.10.0"
     }
-}
+}