@farris/cli 2.2.5 → 2.3.0

package/lib/commands/extract-i18n.js

@@ -1,75 +1,75 @@
-import { writeFileSync, mkdirSync, existsSync, readFileSync } from 'fs';
-import { join, basename, dirname, resolve } from 'path';
-import { sync } from 'glob';
-import { pathToFileURL } from 'url';
-/**
- * 抽取国际化资源到JSON文件
- */
-async function loadConfig(configPath) {
-    const defaultConfigPath = resolve(process.cwd(), 'farris.i18n.mjs');
-    const finalPath = configPath || defaultConfigPath;
-    if (!existsSync(finalPath)) {
-        throw new Error(`配置文件不存在: ${finalPath}`);
-    }
-    const fileUrl = pathToFileURL(finalPath).href;
-    const config = (await import(fileUrl)).default;
-    return config;
-}
-async function extractByType(type, config, options) {
-    console.log(`正在提取 ${type} 资源...`);
-    const outputDir = options.outDir || config.outDir;
-    const localeMap = {};
-    // Process each include pattern
-    for (const pattern of config.include) {
-        const localeFiles = sync(pattern, {
-            cwd: process.cwd(),
-            absolute: true,
-            ignore: config.exclude
-        });
-        // Process each locale file
-        localeFiles.forEach(file => {
-            const componentName = basename(dirname(dirname(dirname(dirname(file)))));
-            const localeName = basename(file, '.json');
-            const content = readFileSync(file, 'utf8');
-            if (!content) {
-                return;
-            }
-            const resources = JSON.parse(content);
-            if (!localeMap[localeName]) {
-                localeMap[localeName] = {};
-            }
-            // Add component translations under component namespace
-            Object.assign(localeMap[localeName], resources);
-        });
-    }
-    // Ensure output directory exists
-    if (!existsSync(outputDir)) {
-        mkdirSync(outputDir, { recursive: true });
-    }
-    // Write each locale to a separate file
-    Object.entries(localeMap).forEach(([locale, translations]) => {
-        const outputFile = join(outputDir, `${locale}.json`);
-        const content = config.minify
-            ? JSON.stringify(translations)
-            : JSON.stringify(translations, null, 2);
-        writeFileSync(outputFile, content);
-    });
-    console.log(`${type} 资源提取完成！`);
-}
-export async function extractI18n(options = {}) {
-    console.log('正在抽取国际化资源...');
-    try {
-        const config = await loadConfig(options.configFile);
-        // 否则提取所有配置的类型
-        for (const [type, typeConfig] of Object.entries(config.extract)) {
-            if (typeConfig) {
-                await extractByType(type, typeConfig, options);
-            }
-        }
-    }
-    catch (error) {
-        console.error(error);
-        process.exit(1);
-    }
-}
+import { writeFileSync, mkdirSync, existsSync, readFileSync } from 'fs';
+import { join, basename, dirname, resolve } from 'path';
+import { sync } from 'glob';
+import { pathToFileURL } from 'url';
+/**
+ * 抽取国际化资源到JSON文件
+ */
+async function loadConfig(configPath) {
+    const defaultConfigPath = resolve(process.cwd(), 'farris.i18n.mjs');
+    const finalPath = configPath || defaultConfigPath;
+    if (!existsSync(finalPath)) {
+        throw new Error(`配置文件不存在: ${finalPath}`);
+    }
+    const fileUrl = pathToFileURL(finalPath).href;
+    const config = (await import(fileUrl)).default;
+    return config;
+}
+async function extractByType(type, config, options) {
+    console.log(`正在提取 ${type} 资源...`);
+    const outputDir = options.outDir || config.outDir;
+    const localeMap = {};
+    // Process each include pattern
+    for (const pattern of config.include) {
+        const localeFiles = sync(pattern, {
+            cwd: process.cwd(),
+            absolute: true,
+            ignore: config.exclude
+        });
+        // Process each locale file
+        localeFiles.forEach(file => {
+            const componentName = basename(dirname(dirname(dirname(dirname(file)))));
+            const localeName = basename(file, '.json');
+            const content = readFileSync(file, 'utf8');
+            if (!content) {
+                return;
+            }
+            const resources = JSON.parse(content);
+            if (!localeMap[localeName]) {
+                localeMap[localeName] = {};
+            }
+            // Add component translations under component namespace
+            Object.assign(localeMap[localeName], resources);
+        });
+    }
+    // Ensure output directory exists
+    if (!existsSync(outputDir)) {
+        mkdirSync(outputDir, { recursive: true });
+    }
+    // Write each locale to a separate file
+    Object.entries(localeMap).forEach(([locale, translations]) => {
+        const outputFile = join(outputDir, `${locale}.json`);
+        const content = config.minify
+            ? JSON.stringify(translations)
+            : JSON.stringify(translations, null, 2);
+        writeFileSync(outputFile, content);
+    });
+    console.log(`${type} 资源提取完成！`);
+}
+export async function extractI18n(options = {}) {
+    console.log('正在抽取国际化资源...');
+    try {
+        const config = await loadConfig(options.configFile);
+        // 否则提取所有配置的类型
+        for (const [type, typeConfig] of Object.entries(config.extract)) {
+            if (typeConfig) {
+                await extractByType(type, typeConfig, options);
+            }
+        }
+    }
+    catch (error) {
+        console.error(error);
+        process.exit(1);
+    }
+}
 //# sourceMappingURL=extract-i18n.js.map

package/lib/commands/extract-i18n.js.map

@@ -1 +1 @@
-{"version":3,"file":"extract-i18n.js","sourceRoot":"","sources":["../../src/commands/extract-i18n.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extract-i18n.js","sourceRoot":"","sources":["../../src/commands/extract-i18n.ts"],"names":[],"mappings":"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"}

package/lib/commands/generate/api.js

@@ -1,73 +1,73 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { join } from 'node:path';
-import { findAppContext, normalizeGeneratorName, toPascalCase, toCamelCase } from './common.js';
-import { Transaction } from '../../common/transaction.js';
-import { sendJson, logInfo, fail, setJsonMode, createSpinner } from '../../common/output.js';
-import { ExitCode } from '../../common/constant.js';
-export async function generateApi(rawName, options = {}) {
-    const isJson = !!options.json;
-    setJsonMode(isJson);
-    if (!rawName) {
-        fail({
-            command: 'generate.api',
-            error: '必须指定 API 模块名称: farris-cli generate api <name>',
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const { endpoint } = options;
-    if (!endpoint || typeof endpoint !== 'string' || !endpoint.trim()) {
-        fail({
-            command: 'generate.api',
-            error: '必须指定真实 API endpoint (--endpoint <path>)，如: --endpoint /api/v1/orders',
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const normalizedName = normalizeGeneratorName(rawName);
-    if (!normalizedName.valid) {
-        fail({
-            command: 'generate.api',
-            error: `非法的 API 名称: ${normalizedName.error}`,
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const name = normalizedName.name;
-    const pascalName = toPascalCase(name);
-    const camelName = toCamelCase(name);
-    const method = (options.method || 'get').toLowerCase();
-    const appContext = findAppContext(options.cwd || process.cwd());
-    const apiDir = join(appContext.srcDir, 'api');
-    const targetApiFile = join(apiDir, `${name}.api.ts`);
-    const indexPath = join(apiDir, 'index.ts');
-    const httpClientPath = join(apiDir, 'http-client.ts');
-    if (existsSync(targetApiFile)) {
-        fail({
-            command: 'generate.api',
-            error: `API 文件已存在: ${targetApiFile}`,
-            exitCode: ExitCode.TARGET_CONFLICT
-        });
-    }
-    const hasHttpClient = existsSync(httpClientPath);
-    const clientPath = options.client || './http-client';
-    if (!hasHttpClient && !options.client && !options.initClient) {
-        fail({
-            command: 'generate.api',
-            error: '未发现现有 HTTP client (src/api/http-client.ts)。请使用 --init-client 初始化标准客户端，或通过 --client <path> 指定已有客户端路径。',
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const transaction = new Transaction();
-    const spinner = createSpinner(`正在生成 API: ${name}...`);
-    spinner.start();
-    try {
-        if (!existsSync(apiDir)) {
-            mkdirSync(apiDir, { recursive: true });
-            transaction.recordCreatedDir(apiDir);
-        }
-        const filesCreated = [];
-        const filesModified = [];
-        // 1. 若需要且不存在，初始化标准 http-client.ts
-        if (!hasHttpClient && options.initClient) {
-            transaction.prepareWrite(httpClientPath);
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { findAppContext, normalizeGeneratorName, toPascalCase, toCamelCase } from './common.js';
+import { Transaction } from '../../common/transaction.js';
+import { sendJson, logInfo, fail, setJsonMode, createSpinner } from '../../common/output.js';
+import { ExitCode } from '../../common/constant.js';
+export async function generateApi(rawName, options = {}) {
+    const isJson = !!options.json;
+    setJsonMode(isJson);
+    if (!rawName) {
+        fail({
+            command: 'generate.api',
+            error: '必须指定 API 模块名称: farris-cli generate api <name>',
+            exitCode: ExitCode.GENERAL_ERROR
+        });
+    }
+    const { endpoint } = options;
+    if (!endpoint || typeof endpoint !== 'string' || !endpoint.trim()) {
+        fail({
+            command: 'generate.api',
+            error: '必须指定真实 API endpoint (--endpoint <path>)，如: --endpoint /api/v1/orders',
+            exitCode: ExitCode.GENERAL_ERROR
+        });
+    }
+    const normalizedName = normalizeGeneratorName(rawName);
+    if (!normalizedName.valid) {
+        fail({
+            command: 'generate.api',
+            error: `非法的 API 名称: ${normalizedName.error}`,
+            exitCode: ExitCode.GENERAL_ERROR
+        });
+    }
+    const name = normalizedName.name;
+    const pascalName = toPascalCase(name);
+    const camelName = toCamelCase(name);
+    const method = (options.method || 'get').toLowerCase();
+    const appContext = findAppContext(options.cwd || process.cwd());
+    const apiDir = join(appContext.srcDir, 'api');
+    const targetApiFile = join(apiDir, `${name}.api.ts`);
+    const indexPath = join(apiDir, 'index.ts');
+    const httpClientPath = join(apiDir, 'http-client.ts');
+    if (existsSync(targetApiFile)) {
+        fail({
+            command: 'generate.api',
+            error: `API 文件已存在: ${targetApiFile}`,
+            exitCode: ExitCode.TARGET_CONFLICT
+        });
+    }
+    const hasHttpClient = existsSync(httpClientPath);
+    const clientPath = options.client || './http-client';
+    if (!hasHttpClient && !options.client && !options.initClient) {
+        fail({
+            command: 'generate.api',
+            error: '未发现现有 HTTP client (src/api/http-client.ts)。请使用 --init-client 初始化标准客户端，或通过 --client <path> 指定已有客户端路径。',
+            exitCode: ExitCode.GENERAL_ERROR
+        });
+    }
+    const transaction = new Transaction();
+    const spinner = createSpinner(`正在生成 API: ${name}...`);
+    spinner.start();
+    try {
+        if (!existsSync(apiDir)) {
+            mkdirSync(apiDir, { recursive: true });
+            transaction.recordCreatedDir(apiDir);
+        }
+        const filesCreated = [];
+        const filesModified = [];
+        // 1. 若需要且不存在，初始化标准 http-client.ts
+        if (!hasHttpClient && options.initClient) {
+            transaction.prepareWrite(httpClientPath);
             const clientContent = `/**
  * Farris 标准 HTTP 请求客户端封装
  */
@@ -106,12 +106,12 @@ export async function request<T = any>(url: string, options: RequestOptions = {}
 
   return response.json();
 }
-`;
-            writeFileSync(httpClientPath, clientContent, 'utf-8');
-            filesCreated.push(httpClientPath);
-        }
-        // 2. 生成 API 文件: src/api/<name>.api.ts
-        transaction.prepareWrite(targetApiFile);
+`;
+            writeFileSync(httpClientPath, clientContent, 'utf-8');
+            filesCreated.push(httpClientPath);
+        }
+        // 2. 生成 API 文件: src/api/<name>.api.ts
+        transaction.prepareWrite(targetApiFile);
         const apiFunctionContent = `import { request } from ${JSON.stringify(clientPath)};
 
 export interface ${pascalName}Item {
@@ -137,52 +137,52 @@ export async function get${pascalName}List(params?: ${pascalName}Params): Promis
     params
   });
 }
-`;
-        writeFileSync(targetApiFile, apiFunctionContent, 'utf-8');
-        filesCreated.push(targetApiFile);
-        // 3. 维护 src/api/index.ts
-        transaction.prepareWrite(indexPath);
-        let indexContent = existsSync(indexPath) ? readFileSync(indexPath, 'utf-8') : '';
-        const exportStatement = `export * from './${name}.api';\n`;
-        if (!indexContent.includes(`./${name}.api`)) {
-            indexContent += exportStatement;
-            writeFileSync(indexPath, indexContent, 'utf-8');
-            if (existsSync(indexPath)) {
-                filesModified.push(indexPath);
-            }
-            else {
-                filesCreated.push(indexPath);
-            }
-        }
-        transaction.commit();
-        spinner.succeed(`API ${name} 生成成功！`);
-        if (isJson) {
-            sendJson({
-                command: 'generate.api',
-                ok: true,
-                apiName: name,
-                endpoint,
-                method,
-                targetApiFile,
-                filesCreated,
-                filesModified
-            });
-            return;
-        }
-        logInfo(`\n✨ 已成功生成 API: src/api/${name}.api.ts`);
-        filesCreated.forEach((f) => logInfo(`  + ${f}`));
-        if (filesModified.length > 0) {
-            filesModified.forEach((f) => logInfo(`  ~ ${f} (更新导出)`));
-        }
-    }
-    catch (err) {
-        spinner.fail('生成 API 失败，正在回滚...');
-        transaction.rollback();
-        fail({
-            command: 'generate.api',
-            error: `生成 API 失败: ${err.message}`,
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-}
+`;
+        writeFileSync(targetApiFile, apiFunctionContent, 'utf-8');
+        filesCreated.push(targetApiFile);
+        // 3. 维护 src/api/index.ts
+        transaction.prepareWrite(indexPath);
+        let indexContent = existsSync(indexPath) ? readFileSync(indexPath, 'utf-8') : '';
+        const exportStatement = `export * from './${name}.api';\n`;
+        if (!indexContent.includes(`./${name}.api`)) {
+            indexContent += exportStatement;
+            writeFileSync(indexPath, indexContent, 'utf-8');
+            if (existsSync(indexPath)) {
+                filesModified.push(indexPath);
+            }
+            else {
+                filesCreated.push(indexPath);
+            }
+        }
+        transaction.commit();
+        spinner.succeed(`API ${name} 生成成功！`);
+        if (isJson) {
+            sendJson({
+                command: 'generate.api',
+                ok: true,
+                apiName: name,
+                endpoint,
+                method,
+                targetApiFile,
+                filesCreated,
+                filesModified
+            });
+            return;
+        }
+        logInfo(`\n✨ 已成功生成 API: src/api/${name}.api.ts`);
+        filesCreated.forEach((f) => logInfo(`  + ${f}`));
+        if (filesModified.length > 0) {
+            filesModified.forEach((f) => logInfo(`  ~ ${f} (更新导出)`));
+        }
+    }
+    catch (err) {
+        spinner.fail('生成 API 失败，正在回滚...');
+        transaction.rollback();
+        fail({
+            command: 'generate.api',
+            error: `生成 API 失败: ${err.message}`,
+            exitCode: ExitCode.GENERAL_ERROR
+        });
+    }
+}
 //# sourceMappingURL=api.js.map

package/lib/commands/generate/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/generate/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/generate/api.ts"],"names":[],"mappings":"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"}