@farris/cli 2.2.6 → 2.3.0

package/lib/commands/create.js

@@ -1,12 +1,16 @@
 import { existsSync, mkdirSync, readFileSync, rmSync, unlinkSync, writeFileSync } from 'node:fs';
-import { join, resolve } from 'node:path';
+import { basename, isAbsolute, join, relative, resolve } from 'node:path';
 import inquirer from 'inquirer';
-import { ExitCode, DEFAULT_CATALOG_VERSIONS, getDirname } from '../common/constant.js';
+import { DEFAULT_CATALOG_VERSIONS, ExitCode, getDirname } from '../common/constant.js';
 import { applyCatalogDeps } from '../common/apply-catalog-deps.js';
+import { checkPlannedConflicts, inspectTarget } from '../common/safety.js';
+import { collectTemplateOutputPaths, renderTemplateDir } from '../common/template-renderer.js';
+import { CreateAppError } from '../common/create-app-target.js';
 import { generateApp } from '../common/generate-app.js';
-import { fail, logInfo, sendJson, setJsonMode } from '../common/output.js';
-import { renderTemplateDir } from '../common/template-renderer.js';
-import { ALLOWED_TYPES, assertTargetDirectoryFree, CreateAppError, DEFAULT_LIB_FORMATS, resolvePackageName } from './create-app-options.js';
+import { fail, printNextSteps, printSuccess, sendJson, setJsonMode } from '../common/output.js';
+import { PROJECT_CONTAINERS, containerFor, deriveAppDir } from '../common/project-layout.js';
+import { renderCommandTable, renderProjectList } from '../common/workspace-contract.js';
+import { ALLOWED_TYPES, DEFAULT_LIB_FORMATS, resolvePackageName } from './create-app-options.js';
 export { parseCreateArgv } from './create-options.js';
 const DEFAULT_WORKSPACE = 'my-workspace';
 const DEFAULT_APP = 'app';
@@ -31,8 +35,12 @@ function assertAppName(appName) {
     if (!trimmed || trimmed === '.' || trimmed === '..') {
         throw new CreateAppError('应用名称不能为空或为 . / ..');
     }
-    if (trimmed.includes('/') || trimmed.includes('\\') || trimmed.includes('\0')) {
-        throw new CreateAppError(`应用名称必须是单段目录名: ${appName}`);
+    if (trimmed.includes('\0') || trimmed.includes('\\')) {
+        throw new CreateAppError(`应用名称必须是单段目录名或带 scope 的包名: ${appName}`);
+    }
+    // 允许 @scope/name（包名保留 scope，目录名由 deriveAppDir 推导），其余多段路径一律拒绝
+    if (trimmed.includes('/') && !/^@[^/]+\/[^/]+$/.test(trimmed)) {
+        throw new CreateAppError(`应用名称必须是单段目录名或带 scope 的包名: ${appName}`);
     }
 }
 function assertProjectType(type) {
@@ -41,36 +49,38 @@ function assertProjectType(type) {
     }
     return type;
 }
+/**
+ * create 的目标路径：允许 `.`（就地生成，见设计文档 §9.2），仍禁止逃出 cwd。
+ */
+function resolveCreateTarget(target, cwd = process.cwd()) {
+    const trimmed = (target ?? '').trim();
+    if (trimmed.includes('\0')) {
+        throw new CreateAppError('目标路径包含非法字符');
+    }
+    const resolved = resolve(cwd, trimmed);
+    const rel = relative(cwd, resolved);
+    if (rel.startsWith('..') || isAbsolute(rel)) {
+        throw new CreateAppError(`目标目录必须位于当前工作目录内: ${target}`);
+    }
+    return resolved;
+}
 function rootTemplateVariables(createApp, appRel, pkgType = 'app') {
     if (createApp && appRel) {
         const artifactDir = pkgType === 'lib' ? `${appRel}/lib` : `${appRel}/dist`;
-        const publishSteps = pkgType === 'lib'
-            ? ['    - cd dist', '    - npm publish']
-            : [
-                `    - cp ${appRel}/project.json dist/package.json`,
-                '    - cd dist',
-                '    - npm publish'
-            ];
         return {
-            rootDevScript: `pnpm --filter ./${appRel} run dev`,
-            rootBuildScript: `pnpm --filter ./${appRel} run build`,
-            rootTestScript: `pnpm --filter ./${appRel} run test`,
             ciBuildSteps: [
                 `    - pnpm --filter ./${appRel} run build`,
                 '    - mkdir -p dist',
                 `    - cp -r ${artifactDir}/. dist/`
             ].join('\n'),
-            ciPublishSteps: publishSteps.join('\n'),
-            readmeBody: `pnpm workspace with one Farris ${pkgType} in \`${appRel}\`.`
+            ciPublishSteps: ['    - cd dist', '    - npm publish'].join('\n'),
+            readmeBody: `pnpm workspace，包含一个 Farris ${pkgType}（\`${appRel}\`）。`
         };
     }
     return {
-        rootDevScript: 'pnpm --recursive --if-present run dev',
-        rootBuildScript: 'pnpm --recursive --if-present run build',
-        rootTestScript: 'pnpm --recursive --if-present run test',
         ciBuildSteps: '',
         ciPublishSteps: '    - echo "no app to publish"',
-        readmeBody: 'pnpm workspace. Add an app under `packages/`.'
+        readmeBody: `pnpm workspace，可在 \`${PROJECT_CONTAINERS.app}\` / \`${PROJECT_CONTAINERS.lib}\` 下添加工程。`
     };
 }
 export async function create(nameArg, options = {}) {
@@ -134,17 +144,45 @@ export async function create(nameArg, options = {}) {
         if (options.noApp) {
             createApp = false;
         }
-        assertTargetDirectoryFree(name);
         const cwd = process.cwd();
-        const targetPath = resolve(cwd, name);
+        const targetArg = name;
+        const targetPath = resolveCreateTarget(name, cwd);
+        const workspaceTitle = targetArg === '.' ? basename(targetPath) : targetArg;
+        const inspect = inspectTarget(targetPath);
+        if (!inspect.canCreate) {
+            throw new CreateAppError(`目标目录不能用于创建 workspace，状态: ${inspect.status}${inspect.conflicts.length > 0 ? `，冲突项: ${inspect.conflicts.join(', ')}` : ''}`, ExitCode.TARGET_CONFLICT);
+        }
         const created = !existsSync(targetPath);
         let appPackageName;
+        let appDir;
         let appRel;
         if (createApp) {
             assertAppName(appName);
             appPackageName = resolvePackageName(appName);
             assertAppName(appPackageName);
-            appRel = `packages/${appPackageName}`;
+            appDir = deriveAppDir(appPackageName);
+            if (!appDir || !/^[a-z0-9-_]+$/.test(appDir)) {
+                throw new CreateAppError(`无法从工程名 "${appPackageName}" 推导出合法的子目录名`);
+            }
+            appRel = `${containerFor(pkgType)}/${appDir}`;
+        }
+        const plannedProjects = appRel && appDir ? [{ type: pkgType, dir: appRel, name: appDir }] : [];
+        // 写入前冲突预检（设计文档 §9.1）。create 的子工程落在全新容器内，因此只需预检根模板。
+        const conflicts = checkPlannedConflicts(targetPath, collectTemplateOutputPaths(createTemplateDir()));
+        if (conflicts.length > 0 && !options.force) {
+            const shouldOverwrite = !isJson &&
+                !skipPrompt &&
+                (await inquirer.createPromptModule()([
+                    {
+                        type: 'confirm',
+                        name: 'overwrite',
+                        message: `以下 ${conflicts.length} 个文件已存在，是否覆盖？\n${conflicts.join('\n')}`,
+                        default: false
+                    }
+                ])).overwrite;
+            if (!shouldOverwrite) {
+                throw new CreateAppError(`目标目录包含将被模板写入的文件: ${conflicts.join(', ')}。请交互确认，或显式传入 --force 覆盖。`, ExitCode.TARGET_CONFLICT);
+            }
         }
         try {
             const rootRender = renderTemplateDir({
@@ -152,23 +190,38 @@ export async function create(nameArg, options = {}) {
                 targetDir: targetPath,
                 variables: {
                     ...catalogVariables(),
-                    title: name,
-                    ...rootTemplateVariables(createApp, appRel, pkgType)
+                    ...rootTemplateVariables(createApp, appRel, pkgType),
+                    appContainer: PROJECT_CONTAINERS.app,
+                    libContainer: PROJECT_CONTAINERS.lib,
+                    commandTable: renderCommandTable(),
+                    projectList: renderProjectList(plannedProjects),
+                    title: workspaceTitle
                 }
             });
             if (rootRender.unreplacedPlaceholders.length > 0) {
                 throw new Error(`根模板未替换: ${rootRender.unreplacedPlaceholders.map((p) => p.placeholder).join(', ')}`);
             }
+            // 两个容器目录必须同时存在（pnpm-workspace.yaml 的 glob 与 verifier 都要求）；
+            // 空容器放 .gitkeep 使其可见且可提交（设计文档 §4.4）。
+            for (const container of [PROJECT_CONTAINERS.app, PROJECT_CONTAINERS.lib]) {
+                const containerDir = join(targetPath, container);
+                mkdirSync(containerDir, { recursive: true });
+                if (!appRel || !appRel.startsWith(`${container}/`)) {
+                    writeFileSync(join(containerDir, '.gitkeep'), '');
+                }
+            }
             if (createApp && appRel && appPackageName) {
                 generateApp({
-                    name: join(name, appRel).replace(/\\/g, '/'),
+                    name: join(targetPath, appRel).replace(/\\/g, '/'),
                     packageName: appPackageName,
+                    title: workspaceTitle,
                     type: pkgType,
                     ...(pkgType === 'lib'
                         ? { formats: [...DEFAULT_LIB_FORMATS] }
-                        : { platform: 'web', format: 'es' }),
+                        : { platform: options.platform ?? 'web', format: options.format ?? 'es', style: options.style ?? 'css' }),
                     hints: false
                 });
+                // 根目录只保留一份 .gitlab-ci.yml
                 const appGitlab = join(targetPath, appRel, '.gitlab-ci.yml');
                 if (existsSync(appGitlab)) {
                     unlinkSync(appGitlab);
@@ -178,9 +231,6 @@ export async function create(nameArg, options = {}) {
                 applyCatalogDeps(appPkg);
                 writeFileSync(appPkgPath, JSON.stringify(appPkg, null, 2) + '\n');
             }
-            else {
-                mkdirSync(join(targetPath, 'packages'), { recursive: true });
-            }
             if (options.install) {
                 const { runPnpmInstall } = await import('./workspace/create.js');
                 const result = await runPnpmInstall(targetPath, isJson);
@@ -188,23 +238,26 @@ export async function create(nameArg, options = {}) {
                     throw new CreateAppError(result.error || 'pnpm install 失败');
                 }
             }
-            if (!isJson) {
-                logInfo(`cd ${name}`);
-                logInfo('pnpm install');
-                if (createApp) {
-                    logInfo('pnpm dev');
-                }
-            }
-            else {
+            if (isJson) {
                 sendJson({
                     command: 'create',
                     ok: true,
-                    name,
+                    name: workspaceTitle,
                     createdApp: createApp,
                     ...(createApp ? { packageName: appPackageName, appDir: appRel, type: pkgType } : {}),
                     target: targetPath
                 });
             }
+            else {
+                printSuccess(`工作空间已创建 ${targetPath}`);
+                printNextSteps({
+                    targetArg,
+                    targetDir: targetPath,
+                    cwd,
+                    installed: !!options.install,
+                    appPackageName
+                });
+            }
         }
         catch (inner) {
             if (created && existsSync(targetPath)) {

package/lib/commands/create.js.map

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

package/lib/commands/generate/common.js

@@ -1,7 +1,8 @@
-import { existsSync, readdirSync, statSync, readFileSync } from 'node:fs';
+import { existsSync, statSync, readFileSync } from 'node:fs';
 import { resolve, join, dirname } from 'node:path';
 import { fail } from '../../common/output.js';
 import { ExitCode } from '../../common/constant.js';
+import { findWorkspaceRoot, listProjects } from '../../common/project-layout.js';
 export function toKebabCase(str) {
     return str
         .replace(/([a-z])([A-Z])/g, '$1-$2')
@@ -75,19 +76,19 @@ export function findAppContext(startDir = process.cwd()) {
         }
         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);
-            }
+    // 检查是否在 workspace 根目录执行：容器名与工程清单都来自单一数据源
+    const wsRoot = findWorkspaceRoot(startDir);
+    if (wsRoot) {
+        const projects = listProjects(wsRoot);
+        if (projects.length === 1) {
+            return findAppContext(join(wsRoot, projects[0].dir));
+        }
+        if (projects.length > 1) {
             fail({
                 command: 'generate',
-                error: `当前处于 Workspace 根目录，存在多个应用 (${apps.join(', ')})。请先进入具体应用目录 (如 cd packages/${apps[0]}) 后再执行 generate 命令。`,
+                error: `当前处于 Workspace 根目录，存在多个工程 (${projects
+                    .map((project) => project.dir)
+                    .join(', ')})。请先进入具体工程目录（如 cd ${projects[0].dir}）后再执行 generate 命令。`,
                 exitCode: ExitCode.GENERAL_ERROR
             });
         }

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

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

package/lib/commands/workspace/add-app.js

@@ -1,181 +1,16 @@
-import { resolve, join, dirname } from 'node:path';
-import { existsSync, mkdirSync } from 'node:fs';
-import { ExitCode, getDirname } from '../../common/constant.js';
-import { renderTemplateDir } from '../../common/template-renderer.js';
-import { Transaction } from '../../common/transaction.js';
-import { verifyWorkspace } from '../../common/verifier.js';
-import { sendJson, logInfo, fail, setJsonMode, createSpinner } from '../../common/output.js';
-import { deriveAppDir, validatePackageName } from './create.js';
+import { addProject } from '../add-project.js';
+import { findWorkspaceRoot } from '../../common/project-layout.js';
+import { logWarn } from '../../common/output.js';
+export { findWorkspaceRoot };
 /**
- * 向上查找 Workspace 根目录
+ * [已废弃] 请改用 `farris-cli add-app`。保留本命令只为兼容既有脚本。
  */
-export function findWorkspaceRoot(startDir = process.cwd()) {
-    let current = resolve(startDir);
-    while (true) {
-        if (existsSync(join(current, 'pnpm-workspace.yaml')) && existsSync(join(current, 'package.json'))) {
-            return current;
-        }
-        const parent = dirname(current);
-        if (parent === current) {
-            break;
-        }
-        current = parent;
-    }
-    return null;
-}
 export async function addAppToWorkspace(name, options = {}) {
-    const isJson = !!options.json;
-    setJsonMode(isJson);
-    if (!name) {
-        fail({
-            command: 'workspace.add-app',
-            error: '必须指定应用名称: farris-cli workspace add-app <name>',
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    if (!validatePackageName(name)) {
-        fail({
-            command: 'workspace.add-app',
-            error: `非法的应用包名: "${name}"`,
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const wsRoot = findWorkspaceRoot(options.cwd || process.cwd());
-    if (!wsRoot) {
-        fail({
-            command: 'workspace.add-app',
-            error: '当前目录或上级目录未找到标准 pnpm workspace (缺少 pnpm-workspace.yaml)',
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const appDir = deriveAppDir(name);
-    if (!appDir || !/^[a-z0-9-_]+$/.test(appDir)) {
-        fail({
-            command: 'workspace.add-app',
-            error: `无法从应用名 "${name}" 推导出合法的子目录名`,
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const title = options.title || name;
-    const router = options.router ?? false;
-    const routerMode = options.routerMode || 'hash';
-    const format = options.format || 'es';
-    const style = options.style || 'css';
-    const appTargetDir = join(wsRoot, 'packages', appDir);
-    if (existsSync(appTargetDir)) {
-        fail({
-            command: 'workspace.add-app',
-            error: `子应用目录已存在: packages/${appDir}`,
-            exitCode: ExitCode.TARGET_CONFLICT
-        });
-    }
-    const templatesBase = resolve(getDirname(import.meta.url), '../../../templates/workspace');
-    const appTemplateDir = join(templatesBase, 'app');
-    const transaction = new Transaction();
-    const spinner = createSpinner(`正在向 Workspace 添加子应用 ${name}...`);
-    spinner.start();
-    try {
-        mkdirSync(appTargetDir, { recursive: true });
-        transaction.recordCreatedDir(appTargetDir);
-        const routerDependency = router ? ',\n    "vue-router": "catalog:"' : '';
-        const sassDevDependency = style === 'scss' ? ',\n    "sass": "catalog:"' : '';
-        let styleImport = '';
-        if (style === 'css') {
-            styleImport = "\nimport './styles/index.css';";
-        }
-        else if (style === 'scss') {
-            styleImport = "\nimport './styles/index.scss';";
-        }
-        const routerImport = router ? "\nimport router from './router';" : '';
-        const routerUse = router ? '\napp.use(router);' : '';
-        const i18nImport = '';
-        const i18nUse = '';
-        const appRouterImport = router ? "\nimport { RouterView } from 'vue-router';" : '';
-        const appTemplateBody = router
-            ? '        <RouterView />'
-            : `        <h1>${title}</h1>`;
-        const appVariables = {
-            appName: name,
-            title,
-            appDir,
-            base: '/',
-            routerMode: router ? routerMode : 'none',
-            format,
-            routerDependency,
-            sassDevDependency,
-            styleImport,
-            routerImport,
-            routerUse,
-            i18nImport,
-            i18nUse,
-            appRouterImport,
-            appTemplateBody,
-            routerHistoryFunction: routerMode === 'history' ? 'createWebHistory' : 'createWebHashHistory',
-            routerHistoryCall: routerMode === 'history'
-                ? 'createWebHistory(import.meta.env.BASE_URL)'
-                : 'createWebHashHistory()'
-        };
-        const appFilter = (relPath) => {
-            const normalized = relPath.replace(/\\/g, '/');
-            if (style === 'none' && normalized.startsWith('src/styles')) {
-                return false;
-            }
-            if (style === 'css' && (normalized === 'src/styles/index.scss' || normalized === 'src/styles/index.scss.tpl')) {
-                return false;
-            }
-            if (style === 'scss' && (normalized === 'src/styles/index.css' || normalized === 'src/styles/index.css.tpl')) {
-                return false;
-            }
-            if (!router && (normalized.startsWith('src/router') || normalized.startsWith('src/views'))) {
-                return false;
-            }
-            return true;
-        };
-        const appRender = renderTemplateDir({
-            sourceDir: appTemplateDir,
-            targetDir: appTargetDir,
-            variables: appVariables,
-            skipExisting: false,
-            filter: appFilter
-        });
-        if (appRender.unreplacedPlaceholders.length > 0) {
-            throw new Error(`子应用渲染出现未替换占位符: ${appRender.unreplacedPlaceholders.map((p) => `${p.file} (${p.placeholder})`).join(', ')}`);
-        }
-        appRender.filesCreated.forEach((f) => transaction.prepareWrite(f));
-        // 执行 verify
-        const verifyResult = verifyWorkspace(wsRoot);
-        if (!verifyResult.ok) {
-            throw new Error(`Workspace 校验失败: ${verifyResult.errors.join('; ')}`);
-        }
-        transaction.commit();
-        spinner.succeed(`子应用 ${name} 添加成功！`);
-        if (isJson) {
-            sendJson({
-                command: 'workspace.add-app',
-                ok: true,
-                workspaceRoot: wsRoot,
-                appName: name,
-                appDir,
-                title,
-                router,
-                format,
-                style,
-                filesCreated: appRender.filesCreated
-            });
-            return;
-        }
-        logInfo(`\n✨ 已在 packages/${appDir} 成功创建应用 ${name}`);
-        logInfo('\n启动该应用:');
-        logInfo(`  pnpm --filter "${name}" dev\n`);
-    }
-    catch (err) {
-        spinner.fail('添加子应用失败，正在回滚...');
-        transaction.rollback();
-        fail({
-            command: 'workspace.add-app',
-            error: `添加应用失败: ${err.message}`,
-            exitCode: ExitCode.GENERAL_ERROR
-        });
+    logWarn('`farris-cli workspace add-app` 已废弃，请改用 `farris-cli add-app`。');
+    const { router, routerMode, ...rest } = options;
+    if (router !== undefined || routerMode !== undefined) {
+        logWarn('--router / --router-mode 已废弃：新 app 模板始终包含路由，参数被忽略。');
     }
+    await addProject('app', name, rest);
 }
 //# sourceMappingURL=add-app.js.map

package/lib/commands/workspace/add-app.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-app.js","sourceRoot":"","sources":["../../../src/commands/workspace/add-app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-app.js","sourceRoot":"","sources":["../../../src/commands/workspace/add-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAQ7B;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAY,EAAE,UAAkC,EAAE;IACtF,OAAO,CAAC,8DAA8D,CAAC,CAAC;IAExE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAChD,IAAI,MAAM,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,EAAE;QAClD,OAAO,CAAC,oDAAoD,CAAC,CAAC;KACjE;IAED,MAAM,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACxC,CAAC"}