@gadmin2n/cli 0.0.122 → 0.0.124

package/actions/new.action.js

@@ -36,13 +36,23 @@ class NewAction extends abstract_action_1.AbstractAction {
             const isDryRunEnabled = dryRunOption && dryRunOption.value;
             yield askForMissingInformation(inputs, options);
             console.info();
+            // 在调用 schematics 之前先解析项目目录
+            const projectDirectory = getProjectDirectory(getApplicationNameInput(inputs), directoryOption);
+            // 统一解析为绝对路径，确保 --directory /absolute/path 可以正常工作
+            const projectAbsDir = (0, path_1.isAbsolute)(projectDirectory)
+                ? projectDirectory
+                : (0, path_1.join)(process.cwd(), projectDirectory);
+            // Angular DevKit schematics 引擎始终把 --directory 当作相对于 cwd 的路径处理。
+            // 若用户传入绝对路径，需转换为相对路径再传给引擎，否则会被重复拼接 cwd。
+            if ((directoryOption === null || directoryOption === void 0 ? void 0 : directoryOption.value) && (0, path_1.isAbsolute)(directoryOption.value)) {
+                directoryOption.value = (0, path_1.relative)(process.cwd(), directoryOption.value);
+            }
             yield generateApplicationFiles(inputs, options).catch(exports.exit);
             const shouldSkipInstall = options.some((option) => option.name === 'skip-install' && option.value === true);
             const shouldSkipGit = options.some((option) => option.name === 'skip-git' && option.value === true);
-            const projectDirectory = getProjectDirectory(getApplicationNameInput(inputs), directoryOption);
             // 落盘用户提供的环境配置(dry-run 模式跳过,因为目录可能未实际生成)
             if (!isDryRunEnabled) {
-                yield applyEnvConfig(projectDirectory, options).catch((err) => {
+                yield applyEnvConfig(projectAbsDir, options).catch((err) => {
                     console.error(chalk.yellow(`[warn] Failed to apply env config: ${err && err.message ? err.message : err}`));
                 });
                 // Pin the 3-way merge base at project init time. Recording the exact
@@ -51,7 +61,6 @@ class NewAction extends abstract_action_1.AbstractAction {
                 // bootstrap-then-rerun dance. Failure is non-fatal: if meta can't be
                 // written here, `gadmin2 update` still has its bootstrap fallback.
                 try {
-                    const projectAbsDir = (0, path_1.join)(process.cwd(), projectDirectory);
                     const schematicsVersion = (0, schematics_root_1.getSchematicsVersion)();
                     (0, base_store_1.writeMeta)(projectAbsDir, {
                         schematicsVersion,
@@ -66,7 +75,7 @@ class NewAction extends abstract_action_1.AbstractAction {
                 // generated files, so executable scripts (compose-ctl.sh, etc.) come
                 // out as 0644. Re-apply +x for known entry points.
                 try {
-                    (0, executable_paths_1.ensureExecutableBits)((0, path_1.join)(process.cwd(), projectDirectory));
+                    (0, executable_paths_1.ensureExecutableBits)(projectAbsDir);
                 }
                 catch (_a) {
                     // best-effort, never fatal
@@ -74,15 +83,15 @@ class NewAction extends abstract_action_1.AbstractAction {
             }
             if (!shouldSkipInstall) {
                 console.info('Begin to install server dependence ...');
-                yield installPackages(options, isDryRunEnabled, (0, path_1.join)(projectDirectory, 'server'));
+                yield installPackages(options, isDryRunEnabled, (0, path_1.join)(projectAbsDir, 'server'));
                 console.info();
                 console.info('Begin to install web dependence ...');
-                yield installPackages(options, isDryRunEnabled, (0, path_1.join)(projectDirectory, 'web'));
+                yield installPackages(options, isDryRunEnabled, (0, path_1.join)(projectAbsDir, 'web'));
                 console.info();
             }
             if (!isDryRunEnabled) {
                 if (!shouldSkipGit) {
-                    yield initializeGitRepository(projectDirectory);
+                    yield initializeGitRepository(projectAbsDir);
                 }
                 const inputPackageManager = (options.find((option) => option.name === 'package-manager')
                     .value || 'yarn').toLowerCase();
@@ -276,17 +285,17 @@ const applyEnvConfig = (projectDirectory, options) => __awaiter(void 0, void 0,
     const writeFile = (0, util_1.promisify)(fs.writeFile);
     const readFile = (0, util_1.promisify)(fs.readFile);
     // (1) web/.env.local
-    const webEnvLocal = (0, path_1.join)(process.cwd(), projectDirectory, 'web', '.env.local');
+    const webEnvLocal = (0, path_1.join)(projectDirectory, 'web', '.env.local');
     const webContent = [
         '# Local overrides for web/.env (do not commit)',
         '# knot Agent ID — see https://knot.woa.com',
         viteAgentId ? `VITE_AGENT_ID=${viteAgentId}` : '# VITE_AGENT_ID=',
     ].join('\n') + '\n';
-    if (fs.existsSync((0, path_1.join)(process.cwd(), projectDirectory, 'web'))) {
+    if (fs.existsSync((0, path_1.join)(projectDirectory, 'web'))) {
         yield writeFile(webEnvLocal, webContent);
     }
     // (2) server/.env.local — DATABASE_URL / TAIHU_APP_TOKEN / TAIHU_ODC_APP_TOKEN
-    const serverEnvLocal = (0, path_1.join)(process.cwd(), projectDirectory, 'server', '.env.local');
+    const serverEnvLocal = (0, path_1.join)(projectDirectory, 'server', '.env.local');
     const serverContent = [
         '# Local overrides for server/.env (do not commit)',
         '# PostgreSQL: postgresql://user:password@ip:port/db_name?schema=public',
@@ -300,7 +309,7 @@ const applyEnvConfig = (projectDirectory, options) => __awaiter(void 0, void 0,
             ? `TAIHU_ODC_APP_TOKEN=${taihuOdcToken}`
             : '# TAIHU_ODC_APP_TOKEN=',
     ].join('\n') + '\n';
-    if (fs.existsSync((0, path_1.join)(process.cwd(), projectDirectory, 'server'))) {
+    if (fs.existsSync((0, path_1.join)(projectDirectory, 'server'))) {
         yield writeFile(serverEnvLocal, serverContent);
     }
     // (3) dev/postgres/init.sql — 同步替换 CREATE DATABASE 行的 db 名
@@ -309,7 +318,7 @@ const applyEnvConfig = (projectDirectory, options) => __awaiter(void 0, void 0,
     if (databaseUrl) {
         const parsedDbName = parseDbNameFromUrl(databaseUrl);
         if (parsedDbName && parsedDbName !== 'gadmin_demo') {
-            const initSql = (0, path_1.join)(process.cwd(), projectDirectory, 'dev', 'postgres', 'init.sql');
+            const initSql = (0, path_1.join)(projectDirectory, 'dev', 'postgres', 'init.sql');
             if (fs.existsSync(initSql)) {
                 const original = yield readFile(initSql, 'utf8');
                 const replaced = original.replace(/^CREATE DATABASE gadmin_demo;$/m, `CREATE DATABASE ${parsedDbName};`);
@@ -363,7 +372,7 @@ const askForPackageManager = () => __awaiter(void 0, void 0, void 0, function* (
 });
 const initializeGitRepository = (dir) => __awaiter(void 0, void 0, void 0, function* () {
     const runner = new git_runner_1.GitRunner();
-    yield runner.run('init', true, (0, path_1.join)(process.cwd(), dir)).catch(() => {
+    yield runner.run('init', true, dir).catch(() => {
         console.error(chalk.red(ui_1.MESSAGES.GIT_INITIALIZATION_ERROR));
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.122",
+  "version": "0.0.124",
   "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.96",
+    "@gadmin2n/schematics": "^0.0.97",
     "abc": "^0.6.1",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",