@farris/cli 2.1.7 → 2.2.0-beta.1

package/lib/commands/generate/api.js

@@ -1,188 +0,0 @@
-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 请求客户端封装
- */
-export interface RequestOptions extends RequestInit {
-  params?: Record<string, any>;
-}
-
-export async function request<T = any>(url: string, options: RequestOptions = {}): Promise<T> {
-  const { params, ...customConfig } = options;
-
-  let requestUrl = url;
-  if (params && Object.keys(params).length > 0) {
-    const searchParams = new URLSearchParams();
-    Object.entries(params).forEach(([key, val]) => {
-      if (val !== undefined && val !== null) {
-        searchParams.append(key, String(val));
-      }
-    });
-    requestUrl += (url.includes('?') ? '&' : '?') + searchParams.toString();
-  }
-
-  const headers = {
-    'Content-Type': 'application/json',
-    ...(customConfig.headers || {})
-  };
-
-  const response = await fetch(requestUrl, {
-    ...customConfig,
-    headers
-  });
-
-  if (!response.ok) {
-    const errorText = await response.text().catch(() => response.statusText);
-    throw new Error(\`HTTP Error \${response.status}: \${errorText}\`);
-  }
-
-  return response.json();
-}
-`;
-            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 {
-  id: string | number;
-  [key: string]: any;
-}
-
-export interface ${pascalName}Params {
-  [key: string]: any;
-}
-
-export interface ${pascalName}Response {
-  data: ${pascalName}Item[];
-  total?: number;
-}
-
-/**
- * 获取 ${pascalName} 数据
- */
-export async function get${pascalName}List(params?: ${pascalName}Params): Promise<${pascalName}Response> {
-  return request<${pascalName}Response>(${JSON.stringify(endpoint)}, {
-    method: ${JSON.stringify(method.toUpperCase())},
-    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
-        });
-    }
-}
-//# sourceMappingURL=api.js.map

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

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

package/lib/commands/generate/common.js

@@ -1,101 +0,0 @@
-import { existsSync, readdirSync, statSync, readFileSync } from 'node:fs';
-import { resolve, join, dirname } from 'node:path';
-import { fail } from '../../common/output.js';
-import { ExitCode } from '../../common/constant.js';
-export function toKebabCase(str) {
-    return str
-        .replace(/([a-z])([A-Z])/g, '$1-$2')
-        .replace(/[\s_]+/g, '-')
-        .toLowerCase()
-        .replace(/^-+|-+$/g, '');
-}
-/**
- * 生成器名称必须可安全地映射为文件名和 TypeScript 标识符。
- * 先校验原始输入，避免 toKebabCase 保留路径分隔符后造成目录穿越。
- */
-export function normalizeGeneratorName(value) {
-    const raw = typeof value === 'string' ? value.trim() : '';
-    if (!raw) {
-        return { valid: false, error: '名称不能为空' };
-    }
-    if (!/^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$/.test(raw)) {
-        return {
-            valid: false,
-            error: '名称仅支持字母、数字和短横线，且不能以短横线开头或结尾'
-        };
-    }
-    return { valid: true, name: toKebabCase(raw) };
-}
-export function toPascalCase(str) {
-    const kebab = toKebabCase(str);
-    return kebab
-        .split('-')
-        .filter(Boolean)
-        .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
-        .join('');
-}
-export function toCamelCase(str) {
-    const pascal = toPascalCase(str);
-    return pascal.charAt(0).toLowerCase() + pascal.slice(1);
-}
-export function toReadableTitle(str) {
-    const kebab = toKebabCase(str);
-    return kebab
-        .split('-')
-        .filter(Boolean)
-        .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-        .join(' ');
-}
-/**
- * 向上查找当前所在应用目录
- */
-export function findAppContext(startDir = process.cwd()) {
-    let current = resolve(startDir);
-    while (true) {
-        const pkgPath = join(current, 'package.json');
-        const srcPath = join(current, 'src');
-        if (existsSync(pkgPath) && existsSync(srcPath) && statSync(srcPath).isDirectory()) {
-            try {
-                const pkgContent = JSON.parse(readFileSync(pkgPath, 'utf-8'));
-                // 排除根 workspace 的 package.json (根一般有 pnpm-workspace.yaml 且无 src)
-                return {
-                    appRoot: current,
-                    srcDir: srcPath,
-                    pkgJsonPath: pkgPath,
-                    pkgJson: pkgContent
-                };
-            }
-            catch {
-                // 继续查找
-            }
-        }
-        const parent = dirname(current);
-        if (parent === current) {
-            break;
-        }
-        current = parent;
-    }
-    // 检查是否在 workspace 根目录执行
-    const wsYaml = join(startDir, 'pnpm-workspace.yaml');
-    if (existsSync(wsYaml)) {
-        const packagesDir = join(startDir, 'packages');
-        if (existsSync(packagesDir)) {
-            const apps = readdirSync(packagesDir).filter((d) => statSync(join(packagesDir, d)).isDirectory());
-            if (apps.length === 1) {
-                const singleAppDir = join(packagesDir, apps[0]);
-                return findAppContext(singleAppDir);
-            }
-            fail({
-                command: 'generate',
-                error: `当前处于 Workspace 根目录，存在多个应用 (${apps.join(', ')})。请先进入具体应用目录 (如 cd packages/${apps[0]}) 后再执行 generate 命令。`,
-                exitCode: ExitCode.GENERAL_ERROR
-            });
-        }
-    }
-    fail({
-        command: 'generate',
-        error: '未找到合法的前端应用工程目录 (必须包含 package.json 与 src/ 目录)',
-        exitCode: ExitCode.GENERAL_ERROR
-    });
-}
-//# sourceMappingURL=common.js.map

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

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

package/lib/commands/generate/component.js

@@ -1,164 +0,0 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { resolve, 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 generateComponent(rawName, options = {}) {
-    const isJson = !!options.json;
-    setJsonMode(isJson);
-    if (!rawName) {
-        fail({
-            command: 'generate.component',
-            error: '必须指定组件名称: farris-cli generate component <name>',
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const normalizedName = normalizeGeneratorName(rawName);
-    if (!normalizedName.valid) {
-        fail({
-            command: 'generate.component',
-            error: `非法的组件名称: ${normalizedName.error}`,
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const name = normalizedName.name;
-    const pascalName = toPascalCase(name);
-    const camelName = toCamelCase(name);
-    const withProps = !!options.withProps;
-    const style = options.style || 'none';
-    const appContext = findAppContext(options.cwd || process.cwd());
-    const compDir = join(appContext.srcDir, 'components', name);
-    const filesPlanned = [
-        join(compDir, 'index.ts'),
-        join(compDir, `${name}.component.tsx`)
-    ];
-    if (withProps) {
-        filesPlanned.push(join(compDir, `${name}.props.ts`));
-    }
-    if (style === 'css') {
-        filesPlanned.push(join(compDir, `${name}.css`));
-    }
-    else if (style === 'scss') {
-        filesPlanned.push(join(compDir, `${name}.scss`));
-    }
-    const conflicts = filesPlanned.filter((f) => existsSync(f));
-    if (conflicts.length > 0) {
-        fail({
-            command: 'generate.component',
-            error: `组件文件已存在，为保护已有代码已阻断生成: ${conflicts.map((c) => resolve(c)).join(', ')}`,
-            exitCode: ExitCode.TARGET_CONFLICT,
-            extra: { conflicts }
-        });
-    }
-    const transaction = new Transaction();
-    const spinner = createSpinner(`正在生成组件: ${name}...`);
-    spinner.start();
-    try {
-        mkdirSync(compDir, { recursive: true });
-        transaction.recordCreatedDir(compDir);
-        const filesCreated = [];
-        const filesModified = [];
-        // 1. 生成样式文件（若启用）
-        let styleImport = '';
-        if (style === 'css') {
-            const cssPath = join(compDir, `${name}.css`);
-            transaction.prepareWrite(cssPath);
-            writeFileSync(cssPath, `.f-${name} {\n  /* 组件自定义样式 */\n}\n`, 'utf-8');
-            filesCreated.push(cssPath);
-            styleImport = `import './${name}.css';\n`;
-        }
-        else if (style === 'scss') {
-            const scssPath = join(compDir, `${name}.scss`);
-            transaction.prepareWrite(scssPath);
-            writeFileSync(scssPath, `.f-${name} {\n  /* 组件自定义 SCSS 样式 */\n}\n`, 'utf-8');
-            filesCreated.push(scssPath);
-            styleImport = `import './${name}.scss';\n`;
-            // 幂等确保应用 package.json devDependencies 包含 sass catalog
-            const pkgPath = appContext.pkgJsonPath;
-            const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
-            if (!pkg.devDependencies) {
-                pkg.devDependencies = {};
-            }
-            if (!pkg.devDependencies.sass) {
-                transaction.prepareWrite(pkgPath);
-                pkg.devDependencies.sass = 'catalog:';
-                writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf-8');
-                filesModified.push(pkgPath);
-            }
-        }
-        // 2. 生成 props 文件（若启用）
-        if (withProps) {
-            const propsPath = join(compDir, `${name}.props.ts`);
-            transaction.prepareWrite(propsPath);
-            const propsContent = `import type { ExtractPropTypes } from 'vue';
-
-export const ${camelName}Props = {
-  // 定义组件 Props
-};
-
-export type ${pascalName}Props = ExtractPropTypes<typeof ${camelName}Props>;
-`;
-            writeFileSync(propsPath, propsContent, 'utf-8');
-            filesCreated.push(propsPath);
-        }
-        // 3. 生成 component.tsx
-        const componentPath = join(compDir, `${name}.component.tsx`);
-        transaction.prepareWrite(componentPath);
-        let componentContent = `import { defineComponent } from 'vue';\n`;
-        if (withProps) {
-            componentContent += `import { ${camelName}Props } from './${name}.props';\n`;
-        }
-        if (styleImport) {
-            componentContent += styleImport;
-        }
-        componentContent += `\nexport default defineComponent({\n  name: '${pascalName}',\n`;
-        if (withProps) {
-            componentContent += `  props: ${camelName}Props,\n`;
-        }
-        componentContent += `  setup(${withProps ? 'props, { slots }' : '_, { slots }'}) {\n    return () => (\n      <div class="f-${name}">\n        {slots.default ? slots.default() : '${pascalName}'}\n      </div>\n    );\n  }\n});\n`;
-        writeFileSync(componentPath, componentContent, 'utf-8');
-        filesCreated.push(componentPath);
-        // 4. 生成 index.ts
-        const indexPath = join(compDir, 'index.ts');
-        transaction.prepareWrite(indexPath);
-        let indexContent = `import ${pascalName} from './${name}.component';\n\n`;
-        if (withProps) {
-            indexContent += `export { ${camelName}Props, type ${pascalName}Props } from './${name}.props';\n`;
-        }
-        indexContent += `export { ${pascalName} };\nexport default ${pascalName};\n`;
-        writeFileSync(indexPath, indexContent, 'utf-8');
-        filesCreated.push(indexPath);
-        transaction.commit();
-        spinner.succeed(`组件 ${name} 生成成功！`);
-        if (isJson) {
-            sendJson({
-                command: 'generate.component',
-                ok: true,
-                componentName: name,
-                pascalName,
-                compDir,
-                withProps,
-                style,
-                filesCreated,
-                filesModified
-            });
-            return;
-        }
-        logInfo(`\n✨ 已成功生成组件: src/components/${name}/`);
-        filesCreated.forEach((f) => logInfo(`  + ${f}`));
-        if (filesModified.length > 0) {
-            filesModified.forEach((f) => logInfo(`  ~ ${f} (更新依赖)`));
-        }
-    }
-    catch (err) {
-        spinner.fail('生成组件失败，正在回滚...');
-        transaction.rollback();
-        fail({
-            command: 'generate.component',
-            error: `生成组件失败: ${err.message}`,
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-}
-//# sourceMappingURL=component.js.map

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

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