@gadmin2n/cli 0.0.187 → 0.0.189

package/actions/new.action.js

@@ -30,6 +30,7 @@ const types_1 = require("../lib/template-merge/types");
 const executable_paths_1 = require("../lib/executable-paths");
 class NewAction extends abstract_action_1.AbstractAction {
     handle(inputs, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const directoryOption = options.find((option) => option.name === 'directory');
             const dryRunOption = options.find((option) => option.name === 'dry-run');
@@ -77,7 +78,7 @@ class NewAction extends abstract_action_1.AbstractAction {
                 try {
                     (0, executable_paths_1.ensureExecutableBits)(projectAbsDir);
                 }
-                catch (_a) {
+                catch (_b) {
                     // best-effort, never fatal
                 }
                 // npm strips .gitignore when packing, so the template ships it as
@@ -104,8 +105,14 @@ class NewAction extends abstract_action_1.AbstractAction {
                 console.info();
             }
             if (!isDryRunEnabled) {
-                const inputPackageManager = (options.find((option) => option.name === 'package-manager')
-                    .value || 'yarn').toLowerCase();
+                // 未显式指定包管理器时（通常是 --skip-install 场景），按模板自带的
+                // lock 文件推断，保证打印的指引命令与实际项目一致；兜底 pnpm。
+                let pmOption = options.find((option) => option.name === 'package-manager').value;
+                if (!pmOption) {
+                    const detected = (_a = (yield package_managers_1.PackageManagerFactory.findByLockFile((0, path_1.join)(projectAbsDir, 'server')))) !== null && _a !== void 0 ? _a : (yield package_managers_1.PackageManagerFactory.findByLockFile((0, path_1.join)(projectAbsDir, 'web')));
+                    pmOption = detected ? detected.name.toLowerCase() : 'pnpm';
+                }
+                const inputPackageManager = pmOption.toLowerCase();
                 // 收集仍未填写、需要在引导中提示用户处理的环境变量
                 const viteAgentId = getOptionByName(options, 'vite-agent-id') || '';
                 const taihuToken = getOptionByName(options, 'taihu-app-token') || '';
@@ -356,7 +363,19 @@ const installPackages = (options, dryRunMode, installDirectory) => __awaiter(voi
     if (inputPackageManager !== undefined) {
         try {
             packageManager = package_managers_1.PackageManagerFactory.create(inputPackageManager);
+            // 显式指定的包管理器与模板自带的 lock 文件冲突时：警告，并在安装
+            // 成功后删除陈旧 lock，避免项目里多个 lock 并存导致后续
+            // update / add 命令按错误的 lock 探测包管理器。
+            const staleLocks = findConflictingLockFiles(installDirectory, inputPackageManager);
+            if (staleLocks.length > 0) {
+                console.info(chalk.yellow(`[WARN] --package-manager ${inputPackageManager} conflicts with ` +
+                    `${staleLocks.join(', ')} in ${installDirectory}; ` +
+                    `stale lock file(s) will be removed after install.`));
+            }
             yield packageManager.install(installDirectory, inputPackageManager);
+            for (const lock of staleLocks) {
+                fs.unlinkSync((0, path_1.join)(installDirectory, lock));
+            }
         }
         catch (error) {
             if (error && error.message) {
@@ -365,21 +384,43 @@ const installPackages = (options, dryRunMode, installDirectory) => __awaiter(voi
         }
     }
     else {
-        packageManager = yield selectPackageManager();
+        packageManager = yield selectPackageManager(installDirectory);
         yield packageManager.install(installDirectory, packageManager.name.toLowerCase());
         options.find((option) => option.name === 'package-manager').value = packageManager.name.toLowerCase();
     }
 });
-const selectPackageManager = () => __awaiter(void 0, void 0, void 0, function* () {
+const MANAGER_LOCK_FILES = {
+    yarn: 'yarn.lock',
+    pnpm: 'pnpm-lock.yaml',
+    npm: 'package-lock.json',
+};
+/** 返回 dir 下与指定包管理器不一致的 lock 文件名列表（可能为空）。 */
+const findConflictingLockFiles = (dir, manager) => {
+    const normalized = manager.toLowerCase();
+    return Object.entries(MANAGER_LOCK_FILES)
+        .filter(([m, file]) => m !== normalized && fs.existsSync((0, path_1.join)(dir, file)))
+        .map(([, file]) => file);
+};
+const selectPackageManager = (installDirectory) => __awaiter(void 0, void 0, void 0, function* () {
+    // 模板自带的 lock 文件即包管理器的权威声明（如 server/yarn.lock），
+    // 探测到就直接使用，不再询问；没有 lock 文件时才回退到交互选择。
+    if (installDirectory) {
+        const detected = yield package_managers_1.PackageManagerFactory.findByLockFile(installDirectory);
+        if (detected) {
+            console.info(chalk.gray(`Using ${detected.name.toLowerCase()} (detected from lock file).`));
+            return detected;
+        }
+    }
     const answers = yield askForPackageManager();
     return package_managers_1.PackageManagerFactory.create(answers['package-manager']);
 });
 const askForPackageManager = () => __awaiter(void 0, void 0, void 0, function* () {
+    // pnpm 放首位作为默认选项，用户仍可改选 yarn / npm
     const questions = [
         (0, questions_1.generateSelect)('package-manager')(ui_1.MESSAGES.PACKAGE_MANAGER_QUESTION)([
+            package_managers_1.PackageManager.PNPM,
             package_managers_1.PackageManager.YARN,
             package_managers_1.PackageManager.NPM,
-            package_managers_1.PackageManager.PNPM,
         ]),
     ];
     const prompt = inquirer.createPromptModule();

package/lib/package-managers/package-manager.factory.d.ts

@@ -3,4 +3,10 @@ import { PackageManager } from './package-manager';
 export declare class PackageManagerFactory {
     static create(name: PackageManager | string): AbstractPackageManager;
     static find(): Promise<AbstractPackageManager>;
+    /**
+     * Detect the package manager from lock files in `dir`.
+     * Returns null when the directory has no lock file (or is unreadable),
+     * so callers can distinguish "no signal" from a genuine npm project.
+     */
+    static findByLockFile(dir: string): Promise<AbstractPackageManager | null>;
 }

package/lib/package-managers/package-manager.factory.js

@@ -29,11 +29,22 @@ class PackageManagerFactory {
         }
     }
     static find() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const found = yield this.findByLockFile(process.cwd());
+            return found !== null && found !== void 0 ? found : this.create(package_manager_1.PackageManager.NPM);
+        });
+    }
+    /**
+     * Detect the package manager from lock files in `dir`.
+     * Returns null when the directory has no lock file (or is unreadable),
+     * so callers can distinguish "no signal" from a genuine npm project.
+     */
+    static findByLockFile(dir) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => {
-                (0, fs_1.readdir)(process.cwd(), (error, files) => {
+                (0, fs_1.readdir)(dir, (error, files) => {
                     if (error) {
-                        resolve(this.create(package_manager_1.PackageManager.NPM));
+                        resolve(null);
                     }
                     else {
                         if (files.findIndex((filename) => filename === 'yarn.lock') > -1) {
@@ -42,9 +53,13 @@ class PackageManagerFactory {
                         else if (files.findIndex((filename) => filename === 'pnpm-lock.yaml') > -1) {
                             resolve(this.create(package_manager_1.PackageManager.PNPM));
                         }
-                        else {
+                        else if (files.findIndex((filename) => filename === 'package-lock.json') >
+                            -1) {
                             resolve(this.create(package_manager_1.PackageManager.NPM));
                         }
+                        else {
+                            resolve(null);
+                        }
                     }
                 });
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.187",
+  "version": "0.0.189",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -47,7 +47,7 @@
     "@angular-devkit/core": "13.3.2",
     "@angular-devkit/schematics": "13.3.2",
     "@angular-devkit/schematics-cli": "13.3.2",
-    "@gadmin2n/schematics": "^0.0.152",
+    "@gadmin2n/schematics": "^0.0.154",
     "abc": "^0.6.1",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",