ylyx-cli 1.0.15 → 1.0.16

package/lib/config.js

@@ -1,299 +1,283 @@
-const path = require('path');
-const fs = require('fs-extra');
-const { log } = require('./utils');
-
-function getConfigPath() {
-	return path.join(process.cwd(), '.ylyxrc.json');
-}
-
-function normalizeMode(mode) {
-	if (typeof mode !== 'string') return null;
-	const m = mode.trim().toLowerCase();
-	if (m === 'dev' || m === 'prod') return m;
-	return null;
-}
-
-function parseDotEnvFile(envPath) {
-	if (!fs.existsSync(envPath)) return {};
-	const content = fs.readFileSync(envPath, 'utf-8');
-	const lines = content.split(/\r?\n/);
-	const out = {};
-	for (const raw of lines) {
-		const line = raw.trim();
-		if (!line || line.startsWith('#')) continue;
-		const idx = line.indexOf('=');
-		if (idx < 0) continue;
-		const key = line.slice(0, idx).trim();
-		let value = line.slice(idx + 1).trim();
-		if (
-			(value.startsWith('"') && value.endsWith('"')) ||
-			(value.startsWith("'") && value.endsWith("'"))
-		) {
-			value = value.slice(1, -1);
-		}
-		out[key] = value;
-	}
-	return out;
-}
-
-function normalizePublicUrlToDir(publicUrl) {
-	if (!publicUrl || typeof publicUrl !== 'string') return '';
-	let v = publicUrl.trim();
-	v = v.replace(/\\/g, '/');
-	// ignore full urls
-	if (/^https?:\/\//i.test(v)) return '';
-	v = v.replace(/^\/+/, '').replace(/\/+$/, '');
-	return v;
-}
-
-function resolveProdBuildDir(config) {
-	// 1) 优先使用 .ylyxrc.json 的 buildDir（可为相对/绝对路径）
-	if (config.buildDir) {
-		return path.resolve(process.cwd(), config.buildDir);
-	}
-
-	// 2) 默认：读取 .env.production 的 VUE_APP_PUBLIC_URL，拼成 <publicUrlDir>
-	const envProdPath = path.join(process.cwd(), '.env.production');
-	const env = parseDotEnvFile(envProdPath);
-	const publicUrlDir = normalizePublicUrlToDir(env.VUE_APP_PUBLIC_URL);
-	if (publicUrlDir) {
-		return path.resolve(process.cwd(), publicUrlDir);
-	}
-	throw new Error(
-		'无法确定 prod 打包输出目录：请在 .ylyxrc.json 中配置 buildDir，或在 .env.production 中配置 VUE_APP_PUBLIC_URL'
-	);
-}
-
-function readConfigSafe(configPath) {
-	if (!fs.existsSync(configPath)) return {};
-	try {
-		return fs.readJsonSync(configPath);
-	} catch (e) {
-		throw new Error(`读取 .ylyxrc.json 失败，请确认它是有效 JSON：${e.message}`);
-	}
-}
-
-function writeIfAllowed(filePath, content, force) {
-	if (fs.existsSync(filePath) && !force) {
-		log.warn(`已存在，跳过：${path.relative(process.cwd(), filePath)}`);
-		return false;
-	}
-	fs.ensureDirSync(path.dirname(filePath));
-	fs.writeFileSync(filePath, content, 'utf-8');
-	log.success(`已写入：${path.relative(process.cwd(), filePath)}`);
-	return true;
-}
-
-function deriveDefaultVariantContent(baseContent, mode) {
-	const isDev = mode === 'dev';
-
-	let content = baseContent || '';
-	const devRe = /let\s+isDev\s*=\s*[^;]*;/;
-
-	if (devRe.test(content)) {
-		content = content.replace(devRe, `let isDev = ${isDev};`);
-	} else {
-		content = `let isDev = ${isDev};\n` + content;
-	}
-
-	// isProd 已废弃：prod 使用 isDev=false 表示
-	// 删除历史遗留的 isProd 变量与输出字段（若存在）
-	content = content.replace(/let\s+isProd\s*=\s*[^;]*;\s*\r?\n?/g, '');
-	content = content.replace(/window\.config\.IS_PROD\s*=\s*[^;]*;\s*\r?\n?/g, '');
-	// 删除对象形式的 IS_PROD 字段（例如 IS_PROD: isProd,）
-	content = content.replace(/^\s*IS_PROD\s*:\s*[^,}]*,?\s*\r?\n?/gm, '');
-
-	return content;
-}
-
-function ensureSymlinkOrCopy({ src, dest, preferSymlink }) {
-	fs.ensureDirSync(path.dirname(dest));
-	if (!fs.existsSync(src)) {
-		log.warn(`未找到源文件：${path.relative(process.cwd(), src)}`);
-		return { ok: false, method: 'missing' };
-	}
-
-	// 如果目标已存在，先删除（不管是文件还是链接）
-	if (fs.existsSync(dest)) {
-		fs.removeSync(dest);
-	}
-
-	if (preferSymlink) {
-		try {
-			// Windows/macOS/Linux 都支持；Windows 可能因为权限失败，失败后回退 copy
-			fs.ensureSymlinkSync(src, dest, 'file');
-			return { ok: true, method: 'symlink' };
-		} catch (e) {
-			log.warn(`创建 symlink 失败，将降级为 copy：${e.message}`);
-		}
-	}
-
-	try {
-		fs.copyFileSync(src, dest);
-		return { ok: true, method: 'copy' };
-	} catch (e) {
-		log.error(`写入失败：${e.message}`);
-		return { ok: false, method: 'copy_failed' };
-	}
-}
-
-/**
- * 写入/更新 .ylyxrc.json 的 mode 字段（dev|prod），并与已有配置合并
- */
-function setMode(mode, options = {}) {
-	const normalized = normalizeMode(mode);
-	if (!normalized) {
-		throw new Error(`mode 取值只能是 dev 或 prod（当前: ${mode}）`);
-	}
-
-	const configPath = getConfigPath();
-	const config = readConfigSafe(configPath);
-
-	// 可选：如果当前项目目录存在 public/default-{mode}.js，则复制到 public/default.js
-	// 注意：切换应发生在“项目目录”(process.cwd())，而不是 CLI 自身的 lib 目录(__dirname)
-	// 优先从 .ylyxrc.json 中读取 publicDir，其次使用默认 ./public
-	const configDir = path.resolve(process.cwd(), config.configDir || 'config');
-	const publicDir = path.resolve(process.cwd(), config.publicDir || 'public');
-	const defaultVariant = path.join(configDir, `default-${normalized}.js`);
-	const defaultFile =
-		normalized === 'prod'
-			? path.join(resolveProdBuildDir(config), 'default.js')
-			: path.join(publicDir, 'default.js');
-
-	// 默认策略：dev 使用 symlink（实时同步），prod 使用 copy（稳定）
-	const method = options.method || (normalized === 'dev' ? 'symlink' : 'copy');
-	const result = ensureSymlinkOrCopy({
-		src: defaultVariant,
-		dest: defaultFile,
-		preferSymlink: method === 'symlink',
-	});
-
-	if (result.ok) {
-		const label = result.method === 'symlink' ? 'symlink' : 'copy';
-		log.success(
-			`已(${label})切换 ${path.relative(process.cwd(), defaultFile)} <- ${path.relative(
-				process.cwd(),
-				defaultVariant
-			)}`
-		);
-		if (normalized === 'dev' && result.method === 'symlink') {
-			log.info('dev 模式实时同步已启用：修改 default-dev.js 会立即反映到 default.js');
-		}
-	} else if (result.method === 'missing') {
-		log.warn(`未找到 ${path.relative(process.cwd(), defaultVariant)}，请先运行 ylyx init config`);
-	}
-
-	config.mode = normalized;
-	fs.writeJsonSync(configPath, config, { spaces: 2 });
-	log.success(`已写入配置：mode=${normalized}`);
-	log.info(`配置文件：${configPath}`);
-}
-
-/**
- * init config：初始化配置目录与示例文件
- * - 写入/补齐 .ylyxrc.json（mode/publicDir/configDir）
- * - 生成 config/default-dev.js 与 config/default-prod.js（基于现有 public/default.js 派生）
- * - 若 public/default.js 不存在，则按当前 mode 生成一份
- */
-function initConfig(options = {}) {
-	const force = !!options.force;
-	const configPath = getConfigPath();
-	const existing = readConfigSafe(configPath);
-
-	const next = {
-		...existing,
-		mode: existing.mode || 'dev',
-		publicDir: existing.publicDir || './public',
-		configDir: existing.configDir || './config',
-		// npm scripts：默认对 dev 与 build:prod 增加前置脚本 pre<name>
-		// 可在 .ylyxrc.json 中改成你的项目脚本名（例如 dev=serve，prod=build）
-		preScripts: existing.preScripts || { dev: 'dev', prod: 'build:prod' },
-	};
-
-	if (options.mode) {
-		const normalized = normalizeMode(options.mode);
-		if (!normalized) throw new Error(`mode 取值只能是 dev 或 prod（当前: ${options.mode}）`);
-		next.mode = normalized;
-	}
-
-	fs.writeJsonSync(configPath, next, { spaces: 2 });
-	log.success(`已初始化配置文件：${path.relative(process.cwd(), configPath)}`);
-
-	const publicDirAbs = path.resolve(process.cwd(), next.publicDir || 'public');
-	const configDirAbs = path.resolve(process.cwd(), next.configDir || 'config');
-	fs.ensureDirSync(publicDirAbs);
-	fs.ensureDirSync(configDirAbs);
-
-	const publicDefault = path.join(publicDirAbs, 'default.js');
-	let baseContent = '';
-	if (fs.existsSync(publicDefault)) {
-		baseContent = fs.readFileSync(publicDefault, 'utf-8');
-	} else {
-		baseContent =
-			"// 自动生成的默认配置（请按项目需要补全）\n" +
-			"let isDev = true;\n" 
-	}
-
-	const devVariantPath = path.join(configDirAbs, 'default-dev.js');
-	const prodVariantPath = path.join(configDirAbs, 'default-prod.js');
-
-	writeIfAllowed(devVariantPath, deriveDefaultVariantContent(baseContent, 'dev'), force);
-	writeIfAllowed(prodVariantPath, deriveDefaultVariantContent(baseContent, 'prod'), force);
-
-	// 如果 public/default.js 不存在，则按当前 mode 生成一份
-	if (!fs.existsSync(publicDefault)) {
-		const src =
-			next.mode === 'prod'
-				? path.join(configDirAbs, 'default-prod.js')
-				: path.join(configDirAbs, 'default-dev.js');
-		if (fs.existsSync(src)) {
-			fs.copyFileSync(src, publicDefault);
-			log.success(
-				`已生成 ${path.relative(process.cwd(), publicDefault)} <- ${path.relative(process.cwd(), src)}`
-			);
-		}
-	} else {
-		log.info(`已存在：${path.relative(process.cwd(), publicDefault)}（未覆盖）`);
-	}
-
-	// 初始化 package.json 的 npm 前置脚本：pre<devScript> / pre<prodScript>
-	const packageJsonPath = path.join(process.cwd(), 'package.json');
-	if (!fs.existsSync(packageJsonPath)) {
-		log.warn('未找到 package.json，已跳过 npm 前置脚本初始化');
-		return;
-	}
-
-	let pkg = {};
-	try {
-		pkg = fs.readJsonSync(packageJsonPath);
-	} catch (e) {
-		throw new Error(`读取 package.json 失败，请确认它是有效 JSON：${e.message}`);
-	}
-
-	pkg.scripts = pkg.scripts || {};
-	const devTarget = (next.preScripts && next.preScripts.dev) || 'dev';
-	const prodTarget = (next.preScripts && next.preScripts.prod) || 'build:prod';
-
-	const desired = [
-		{ name: `pre${devTarget}`, value: 'ylyx config dev' },
-		{ name: `post${prodTarget}`, value: 'ylyx config prod && ylyx deploy' },
-	];
-
-	for (const item of desired) {
-		if (pkg.scripts[item.name] && !force) {
-			log.warn(`package.json scripts 已存在，跳过：${item.name}`);
-			continue;
-		}
-		pkg.scripts[item.name] = item.value;
-		log.success(`已写入 package.json scripts：${item.name}`);
-	}
-
-	fs.writeJsonSync(packageJsonPath, pkg, { spaces: 2 });
-	log.info(`package.json：${path.relative(process.cwd(), packageJsonPath)}`);
-}
-
-module.exports = {
-	setMode,
-	normalizeMode,
-	initConfig,
-};
+const path = require('path');
+const fs = require('fs-extra');
+const { log } = require('./utils');
+
+function getConfigPath() {
+	return path.join(process.cwd(), '.ylyxrc.json');
+}
+
+function normalizeMode(mode) {
+	if (typeof mode !== 'string') return null;
+	const m = mode.trim().toLowerCase();
+	if (m === 'dev' || m === 'prod') return m;
+	return null;
+}
+
+function parseDotEnvFile(envPath) {
+	if (!fs.existsSync(envPath)) return {};
+	const content = fs.readFileSync(envPath, 'utf-8');
+	const lines = content.split(/\r?\n/);
+	const out = {};
+	for (const raw of lines) {
+		const line = raw.trim();
+		if (!line || line.startsWith('#')) continue;
+		const idx = line.indexOf('=');
+		if (idx < 0) continue;
+		const key = line.slice(0, idx).trim();
+		let value = line.slice(idx + 1).trim();
+		if (
+			(value.startsWith('"') && value.endsWith('"')) ||
+			(value.startsWith("'") && value.endsWith("'"))
+		) {
+			value = value.slice(1, -1);
+		}
+		out[key] = value;
+	}
+	return out;
+}
+
+function normalizePublicUrlToDir(publicUrl) {
+	if (!publicUrl || typeof publicUrl !== 'string') return '';
+	let v = publicUrl.trim();
+	v = v.replace(/\\/g, '/');
+	// ignore full urls
+	if (/^https?:\/\//i.test(v)) return '';
+	v = v.replace(/^\/+/, '').replace(/\/+$/, '');
+	return v;
+}
+
+function resolveProdBuildDir(config) {
+	// 1) 优先使用 .ylyxrc.json 的 buildDir（可为相对/绝对路径）
+	if (config.buildDir) {
+		return path.resolve(process.cwd(), config.buildDir);
+	}
+
+	// 2) 默认：读取 .env.production 的 VUE_APP_PUBLIC_URL，拼成 <publicUrlDir>
+	const envProdPath = path.join(process.cwd(), '.env.production');
+	const env = parseDotEnvFile(envProdPath);
+	const publicUrlDir = normalizePublicUrlToDir(env.VUE_APP_PUBLIC_URL);
+	if (publicUrlDir) {
+		return path.resolve(process.cwd(), publicUrlDir);
+	}
+	throw new Error(
+		'无法确定 prod 打包输出目录：请在 .ylyxrc.json 中配置 buildDir，或在 .env.production 中配置 VUE_APP_PUBLIC_URL'
+	);
+}
+
+function readConfigSafe(configPath) {
+	if (!fs.existsSync(configPath)) return {};
+	try {
+		return fs.readJsonSync(configPath);
+	} catch (e) {
+		throw new Error(`读取 .ylyxrc.json 失败，请确认它是有效 JSON：${e.message}`);
+	}
+}
+
+function writeIfAllowed(filePath, content, force) {
+	if (fs.existsSync(filePath) && !force) {
+		log.warn(`已存在，跳过：${path.relative(process.cwd(), filePath)}`);
+		return false;
+	}
+	fs.ensureDirSync(path.dirname(filePath));
+	fs.writeFileSync(filePath, content, 'utf-8');
+	log.success(`已写入：${path.relative(process.cwd(), filePath)}`);
+	return true;
+}
+
+function deriveDefaultVariantContent(baseContent, mode) {
+	const isDev = mode === 'dev';
+
+	let content = baseContent || '';
+	const devRe = /let\s+isDev\s*=\s*[^;]*;/;
+
+	if (devRe.test(content)) {
+		content = content.replace(devRe, `let isDev = ${isDev};`);
+	} else {
+		content = `let isDev = ${isDev};\n` + content;
+	}
+
+	// isProd 已废弃：prod 使用 isDev=false 表示
+	// 删除历史遗留的 isProd 变量与输出字段（若存在）
+	content = content.replace(/let\s+isProd\s*=\s*[^;]*;\s*\r?\n?/g, '');
+	content = content.replace(/window\.config\.IS_PROD\s*=\s*[^;]*;\s*\r?\n?/g, '');
+	// 删除对象形式的 IS_PROD 字段（例如 IS_PROD: isProd,）
+	content = content.replace(/^\s*IS_PROD\s*:\s*[^,}]*,?\s*\r?\n?/gm, '');
+
+	return content;
+}
+
+function copyFile({ src, dest }) {
+	fs.ensureDirSync(path.dirname(dest));
+	if (!fs.existsSync(src)) {
+		log.warn(`未找到源文件：${path.relative(process.cwd(), src)}`);
+		return { ok: false, method: 'missing' };
+	}
+
+	// 如果目标已存在，先删除
+	if (fs.existsSync(dest)) {
+		fs.removeSync(dest);
+	}
+
+	try {
+		fs.copyFileSync(src, dest);
+		return { ok: true };
+	} catch (e) {
+		log.error(`写入失败：${e.message}`);
+		return { ok: false };
+	}
+}
+
+/**
+ * 写入/更新 .ylyxrc.json 的 mode 字段（dev|prod），并与已有配置合并
+ */
+function setMode(mode) {
+	const normalized = normalizeMode(mode);
+	if (!normalized) {
+		throw new Error(`mode 取值只能是 dev 或 prod（当前: ${mode}）`);
+	}
+
+	const configPath = getConfigPath();
+	const config = readConfigSafe(configPath);
+
+	// 可选：如果当前项目目录存在 public/default-{mode}.js，则复制到 public/default.js
+	// 注意：切换应发生在“项目目录”(process.cwd())，而不是 CLI 自身的 lib 目录(__dirname)
+	// 优先从 .ylyxrc.json 中读取 publicDir，其次使用默认 ./public
+	const configDir = path.resolve(process.cwd(), config.configDir || 'config');
+	const publicDir = path.resolve(process.cwd(), config.publicDir || 'public');
+	const defaultVariant = path.join(configDir, `default-${normalized}.js`);
+	const defaultFile =
+		normalized === 'prod'
+			? path.join(resolveProdBuildDir(config), 'default.js')
+			: path.join(publicDir, 'default.js');
+
+	// 将对应 variant 文件 copy 到目标路径
+	const result = copyFile({
+		src: defaultVariant,
+		dest: defaultFile,
+	});
+
+	if (result.ok) {
+		log.success(
+			`已切换 ${path.relative(process.cwd(), defaultFile)} <- ${path.relative(
+				process.cwd(),
+				defaultVariant
+			)}`
+		);
+	} else if (!result.ok && !fs.existsSync(defaultVariant)) {
+		log.warn(`未找到 ${path.relative(process.cwd(), defaultVariant)}，请先运行 ylyx init config`);
+	}
+
+	config.mode = normalized;
+	fs.writeJsonSync(configPath, config, { spaces: 2 });
+	log.success(`已写入配置：mode=${normalized}`);
+	log.info(`配置文件：${configPath}`);
+}
+
+/**
+ * init config：初始化配置目录与示例文件
+ * - 写入/补齐 .ylyxrc.json（mode/publicDir/configDir）
+ * - 生成 config/default-dev.js 与 config/default-prod.js（基于现有 public/default.js 派生）
+ * - 若 public/default.js 不存在，则按当前 mode 生成一份
+ */
+function initConfig(options = {}) {
+	const force = !!options.force;
+	const configPath = getConfigPath();
+	const existing = readConfigSafe(configPath);
+
+	const next = {
+		...existing,
+		mode: existing.mode || 'dev',
+		publicDir: existing.publicDir || './public',
+		configDir: existing.configDir || './config',
+		// npm scripts：默认对 dev 与 build:prod 增加前置脚本 pre<name>
+		// 可在 .ylyxrc.json 中改成你的项目脚本名（例如 dev=serve，prod=build）
+		preScripts: existing.preScripts || { dev: 'dev', prod: 'build:prod' },
+	};
+
+	if (options.mode) {
+		const normalized = normalizeMode(options.mode);
+		if (!normalized) throw new Error(`mode 取值只能是 dev 或 prod（当前: ${options.mode}）`);
+		next.mode = normalized;
+	}
+
+	fs.writeJsonSync(configPath, next, { spaces: 2 });
+	log.success(`已初始化配置文件：${path.relative(process.cwd(), configPath)}`);
+
+	const publicDirAbs = path.resolve(process.cwd(), next.publicDir || 'public');
+	const configDirAbs = path.resolve(process.cwd(), next.configDir || 'config');
+	fs.ensureDirSync(publicDirAbs);
+	fs.ensureDirSync(configDirAbs);
+
+	const publicDefault = path.join(publicDirAbs, 'default.js');
+	let baseContent = '';
+	if (fs.existsSync(publicDefault)) {
+		baseContent = fs.readFileSync(publicDefault, 'utf-8');
+	} else {
+		baseContent =
+			"// 自动生成的默认配置（请按项目需要补全）\n" +
+			"let isDev = true;\n" 
+	}
+
+	const devVariantPath = path.join(configDirAbs, 'default-dev.js');
+	const prodVariantPath = path.join(configDirAbs, 'default-prod.js');
+
+	writeIfAllowed(devVariantPath, deriveDefaultVariantContent(baseContent, 'dev'), force);
+	writeIfAllowed(prodVariantPath, deriveDefaultVariantContent(baseContent, 'prod'), force);
+
+	// 如果 public/default.js 不存在，则按当前 mode 生成一份
+	if (!fs.existsSync(publicDefault)) {
+		const src =
+			next.mode === 'prod'
+				? path.join(configDirAbs, 'default-prod.js')
+				: path.join(configDirAbs, 'default-dev.js');
+		if (fs.existsSync(src)) {
+			fs.copyFileSync(src, publicDefault);
+			log.success(
+				`已生成 ${path.relative(process.cwd(), publicDefault)} <- ${path.relative(process.cwd(), src)}`
+			);
+		}
+	} else {
+		log.info(`已存在：${path.relative(process.cwd(), publicDefault)}（未覆盖）`);
+	}
+
+	// 初始化 package.json 的 npm 前置脚本：pre<devScript> / pre<prodScript>
+	const packageJsonPath = path.join(process.cwd(), 'package.json');
+	if (!fs.existsSync(packageJsonPath)) {
+		log.warn('未找到 package.json，已跳过 npm 前置脚本初始化');
+		return;
+	}
+
+	let pkg = {};
+	try {
+		pkg = fs.readJsonSync(packageJsonPath);
+	} catch (e) {
+		throw new Error(`读取 package.json 失败，请确认它是有效 JSON：${e.message}`);
+	}
+
+	pkg.scripts = pkg.scripts || {};
+	const devTarget = (next.preScripts && next.preScripts.dev) || 'dev';
+	const prodTarget = (next.preScripts && next.preScripts.prod) || 'build:prod';
+
+	const desired = [
+		{ name: `pre${devTarget}`, value: 'ylyx config dev' },
+		{ name: `post${prodTarget}`, value: 'ylyx config prod && ylyx deploy' },
+	];
+
+	for (const item of desired) {
+		if (pkg.scripts[item.name] && !force) {
+			log.warn(`package.json scripts 已存在，跳过：${item.name}`);
+			continue;
+		}
+		pkg.scripts[item.name] = item.value;
+		log.success(`已写入 package.json scripts：${item.name}`);
+	}
+
+	fs.writeJsonSync(packageJsonPath, pkg, { spaces: 2 });
+	log.info(`package.json：${path.relative(process.cwd(), packageJsonPath)}`);
+}
+
+module.exports = {
+	setMode,
+	normalizeMode,
+	initConfig,
+};