@gadmin2n/cli 0.0.118 → 0.0.119

package/actions/new.action.js

@@ -17,7 +17,6 @@ const inquirer = require("inquirer");
 const path_1 = require("path");
 const util_1 = require("util");
 const commands_1 = require("../commands");
-const defaults_1 = require("../lib/configuration/defaults");
 const package_managers_1 = require("../lib/package-managers");
 const questions_1 = require("../lib/questions/questions");
 const git_runner_1 = require("../lib/runners/git.runner");
@@ -84,13 +83,13 @@ class NewAction extends abstract_action_1.AbstractAction {
             if (!isDryRunEnabled) {
                 if (!shouldSkipGit) {
                     yield initializeGitRepository(projectDirectory);
-                    yield createGitIgnoreFile(projectDirectory);
                 }
                 const inputPackageManager = (options.find((option) => option.name === 'package-manager')
                     .value || 'yarn').toLowerCase();
                 // 收集仍未填写、需要在引导中提示用户处理的环境变量
                 const viteAgentId = getOptionByName(options, 'vite-agent-id') || '';
                 const taihuToken = getOptionByName(options, 'taihu-app-token') || '';
+                const taihuOdcToken = getOptionByName(options, 'taihu-odc-app-token') || '';
                 const databaseUrl = getOptionByName(options, 'database-url') || '';
                 const missingEnv = [];
                 if (!viteAgentId) {
@@ -103,8 +102,15 @@ class NewAction extends abstract_action_1.AbstractAction {
                 if (!taihuToken) {
                     missingEnv.push({
                         var: 'TAIHU_APP_TOKEN',
-                        file: 'server/.env',
-                        desc: '太湖应用 ID — 替换 TAIHU_APP_TOKEN= 后的 token',
+                        file: 'server/.env.local',
+                        desc: '太湖应用 Token',
+                    });
+                }
+                if (!taihuOdcToken) {
+                    missingEnv.push({
+                        var: 'TAIHU_ODC_APP_TOKEN',
+                        file: 'server/.env.local',
+                        desc: '太湖合作伙伴版应用 Token',
                     });
                 }
                 if (!databaseUrl) {
@@ -201,7 +207,8 @@ const askForMissingInformation = (inputs, options) => __awaiter(void 0, void 0,
     replaceInputMissingInformation(options, { template: commands_1.Template.GameAngle });
     // 收集环境配置(支持空字符串跳过)
     yield promptIfMissing(options, 'vite-agent-id', 'VITE_AGENT_ID (knot Agent ID, leave blank to skip):');
-    yield promptIfMissing(options, 'taihu-app-token', 'TAIHU_APP_TOKEN (太湖应用 ID, leave blank to skip):');
+    yield promptIfMissing(options, 'taihu-app-token', 'TAIHU_APP_TOKEN (太湖应用 Token, leave blank to skip):');
+    yield promptIfMissing(options, 'taihu-odc-app-token', 'TAIHU_ODC_APP_TOKEN (太湖合作伙伴版应用 Token, leave blank to skip):');
     yield promptIfMissing(options, 'database-url', 'DATABASE_URL (postgresql://user:pwd@host:port/db?schema=public, leave blank to skip):');
 });
 /**
@@ -232,6 +239,7 @@ const mapSchematicOptions = (options) => {
             option.value !== 'package-manager' &&
             option.name !== 'vite-agent-id' &&
             option.name !== 'taihu-app-token' &&
+            option.name !== 'taihu-odc-app-token' &&
             option.name !== 'database-url') {
             schematicOptions.push(new schematics_1.SchematicOption(option.name, option.value));
         }
@@ -254,14 +262,16 @@ const parseDbNameFromUrl = (url) => {
 };
 /**
  * 在项目生成完毕后,把用户提供的环境配置写入对应文件。
- *  - VITE_AGENT_ID  → web/.env.local       (始终创建,含注释模板)
- *  - DATABASE_URL   → server/.env.local    (始终创建,含注释模板)
- *  - TAIHU_APP_TOKEN→ server/.env          (仅当用户提供时才正则替换)
- *  - dev/postgres/init.sql                 (仅当用户提供 database-url 时才替换 CREATE DATABASE 行)
+ *  - VITE_AGENT_ID       → web/.env.local       (始终创建,含注释模板)
+ *  - DATABASE_URL        → server/.env.local    (始终创建,含注释模板)
+ *  - TAIHU_APP_TOKEN     → server/.env.local    (始终创建,含注释模板)
+ *  - TAIHU_ODC_APP_TOKEN → server/.env.local    (始终创建,含注释模板)
+ *  - dev/postgres/init.sql                      (仅当用户提供 database-url 时才替换 CREATE DATABASE 行)
  */
 const applyEnvConfig = (projectDirectory, options) => __awaiter(void 0, void 0, void 0, function* () {
     const viteAgentId = getOptionByName(options, 'vite-agent-id') || '';
     const taihuToken = getOptionByName(options, 'taihu-app-token') || '';
+    const taihuOdcToken = getOptionByName(options, 'taihu-odc-app-token') || '';
     const databaseUrl = getOptionByName(options, 'database-url') || '';
     const writeFile = (0, util_1.promisify)(fs.writeFile);
     const readFile = (0, util_1.promisify)(fs.readFile);
@@ -275,26 +285,25 @@ const applyEnvConfig = (projectDirectory, options) => __awaiter(void 0, void 0,
     if (fs.existsSync((0, path_1.join)(process.cwd(), projectDirectory, 'web'))) {
         yield writeFile(webEnvLocal, webContent);
     }
-    // (2) server/.env.local
+    // (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 serverContent = [
         '# Local overrides for server/.env (do not commit)',
         '# PostgreSQL: postgresql://user:password@ip:port/db_name?schema=public',
         databaseUrl ? `DATABASE_URL=${databaseUrl}` : '# DATABASE_URL=',
+        '',
+        '# 太湖应用 Token',
+        taihuToken ? `TAIHU_APP_TOKEN=${taihuToken}` : '# TAIHU_APP_TOKEN=',
+        '',
+        '# 太湖合作伙伴版应用 Token',
+        taihuOdcToken
+            ? `TAIHU_ODC_APP_TOKEN=${taihuOdcToken}`
+            : '# TAIHU_ODC_APP_TOKEN=',
     ].join('\n') + '\n';
     if (fs.existsSync((0, path_1.join)(process.cwd(), projectDirectory, 'server'))) {
         yield writeFile(serverEnvLocal, serverContent);
     }
-    // (3) server/.env — sed 替换 TAIHU_APP_TOKEN=token 那行的 token
-    if (taihuToken) {
-        const serverEnv = (0, path_1.join)(process.cwd(), projectDirectory, 'server', '.env');
-        if (fs.existsSync(serverEnv)) {
-            const original = yield readFile(serverEnv, 'utf8');
-            const replaced = original.replace(/^TAIHU_APP_TOKEN=.*$/m, `TAIHU_APP_TOKEN=${taihuToken}`);
-            yield writeFile(serverEnv, replaced);
-        }
-    }
-    // (4) dev/postgres/init.sql — 同步替换 CREATE DATABASE 行的 db 名
+    // (3) dev/postgres/init.sql — 同步替换 CREATE DATABASE 行的 db 名
     // 仅当用户提供 database-url 且能解析出 db 名时才替换;若跳过则保持模板原样,
     // 由最终引导提示用户自行修改。
     if (databaseUrl) {
@@ -358,21 +367,6 @@ const initializeGitRepository = (dir) => __awaiter(void 0, void 0, void 0, funct
         console.error(chalk.red(ui_1.MESSAGES.GIT_INITIALIZATION_ERROR));
     });
 });
-/**
- * Write a file `.gitignore` in the root of the newly created project.
- * `.gitignore` available in `@gadmin2/schematics` cannot be published to
- * NPM (needs to be investigated).
- *
- * @param dir Relative path to the project.
- * @param content (optional) Content written in the `.gitignore`.
- *
- * @return Resolves when succeeds, or rejects with any error from `fn.writeFile`.
- */
-const createGitIgnoreFile = (dir, content) => {
-    const fileContent = content || defaults_1.defaultGitIgnore;
-    const filePath = (0, path_1.join)(process.cwd(), dir, '.gitignore');
-    return (0, util_1.promisify)(fs.writeFile)(filePath, fileContent);
-};
 const printCollective = () => {
     const dim = print('dim');
     const yellow = print('yellow');

package/commands/new.command.js

@@ -26,7 +26,8 @@ class NewCommand extends abstract_command_1.AbstractCommand {
             .option('-c, --collection [collectionName]', 'Schematics collection to use', schematics_1.Collection.GADMIN_GENERATOR)
             .option('--strict', 'Enables strict mode in TypeScript.', false)
             .option('--vite-agent-id [id]', 'Set VITE_AGENT_ID (knot Agent ID), written to web/.env.local')
-            .option('--taihu-app-token [token]', 'Set TAIHU_APP_TOKEN, replaced into server/.env')
+            .option('--taihu-app-token [token]', 'Set TAIHU_APP_TOKEN (太湖应用 Token), written to server/.env.local')
+            .option('--taihu-odc-app-token [token]', 'Set TAIHU_ODC_APP_TOKEN (太湖合作伙伴版应用 Token), written to server/.env.local')
             .option('--database-url [url]', 'Set DATABASE_URL (PostgreSQL connection string), written to server/.env.local')
             .action((name, command) => __awaiter(this, void 0, void 0, function* () {
             const options = [];
@@ -47,6 +48,7 @@ class NewCommand extends abstract_command_1.AbstractCommand {
             options.push({ name: 'ui-framework', value: 'antd' });
             options.push({ name: 'vite-agent-id', value: command.viteAgentId });
             options.push({ name: 'taihu-app-token', value: command.taihuAppToken });
+            options.push({ name: 'taihu-odc-app-token', value: command.taihuOdcAppToken });
             options.push({ name: 'database-url', value: command.databaseUrl });
             const inputs = [];
             inputs.push({ name: 'name', value: name });

package/lib/configuration/defaults.d.ts

@@ -1,4 +1,3 @@
 import { Configuration } from './configuration';
 export declare const defaultConfiguration: Required<Configuration>;
 export declare const defaultOutDir = "dist";
-export declare const defaultGitIgnore = "# compiled output\ndist/\nnode_modules/\n\n# Logs\nlogs/\n*.log\nnpm-debug.log*\npnpm-debug.log*\nyarn-debug.log*\nyarn-error.log*\nlerna-debug.log*\n\n# OS\n.DS_Store\n\n# Tests\ncoverage\n.nyc_output\n\n# IDEs and editors\n.idea\n.project\n.classpath\n.c9/\n*.launch\n.settings/\n*.sublime-workspace\n\n# IDE - VSCode\n.vscode/*\n!.vscode/settings.json\n!.vscode/tasks.json\n!.vscode/launch.json\n!.vscode/extensions.json";

package/lib/configuration/defaults.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultGitIgnore = exports.defaultOutDir = exports.defaultConfiguration = void 0;
+exports.defaultOutDir = exports.defaultConfiguration = void 0;
 const schematics_1 = require("../schematics");
 exports.defaultConfiguration = {
     language: 'ts',
@@ -19,38 +19,3 @@ exports.defaultConfiguration = {
     generateOptions: {},
 };
 exports.defaultOutDir = 'dist';
-exports.defaultGitIgnore = `# compiled output
-dist/
-node_modules/
-
-# Logs
-logs/
-*.log
-npm-debug.log*
-pnpm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# OS
-.DS_Store
-
-# Tests
-coverage
-.nyc_output
-
-# IDEs and editors
-.idea
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# IDE - VSCode
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.118",
+  "version": "0.0.119",
   "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.92",
+    "@gadmin2n/schematics": "^0.0.93",
     "abc": "^0.6.1",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",