create-pardx-scaffold 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-pardx-scaffold",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Scaffold a new project from PardxAI monorepo (git-tracked files)",
   "license": "MIT",
   "bin": "./cli.js",

package/template/scripts/export-scaffold-for-create.js

@@ -59,6 +59,13 @@ function main() {
     copied++;
   }
 
+  // 确保脚手架模板根目录包含 .gitignore
+  const gitignoreSrc = path.join(REPO_ROOT, '.gitignore');
+  const gitignoreDest = path.join(TEMPLATE_ROOT, '.gitignore');
+  if (fs.existsSync(gitignoreSrc)) {
+    fs.copyFileSync(gitignoreSrc, gitignoreDest);
+  }
+
   console.log('export-scaffold: copied', copied, 'files to packages/create-pardx-scaffold/template/');
 }
 

package/template/scripts/init-project.js

@@ -38,15 +38,17 @@ const rl = readline.createInterface({
 const question = (query) => new Promise((resolve) => rl.question(query, resolve));
 
 // Project configuration
+// 注意：API 端口在 apps/api/config.local.yaml 的 app.port 配置；Web 端口由 Next.js 自动配置，此处不配置
 const config = {
   projectName: '',
   projectDescription: '',
   authorName: '',
   authorEmail: '',
   databaseUrl: '',
+  readDatabaseUrl: '',
   redisUrl: '',
-  apiPort: '',
-  webPort: '',
+  rabbitmqUrl: '',
+  baseHost: '127.0.0.1',
 };
 
 async function main() {
@@ -81,26 +83,31 @@ async function main() {
 
     log.header('\n📦 Configuration');
 
-    config.apiPort = await question(
-      `${colors.cyan}API port${colors.reset} [3100]: `
-    );
-    config.apiPort = config.apiPort.trim() || '3100';
-
-    config.webPort = await question(
-      `${colors.cyan}Web port${colors.reset} [3000]: `
-    );
-    config.webPort = config.webPort.trim() || '3000';
-
     config.databaseUrl = await question(
       `${colors.cyan}Database URL${colors.reset} [postgresql://user:password@localhost:5432/dbname]: `
     );
     config.databaseUrl = config.databaseUrl.trim() || 'postgresql://user:password@localhost:5432/dbname';
 
+    config.readDatabaseUrl = await question(
+      `${colors.cyan}Read Database URL${colors.reset} [same as Database URL]: `
+    );
+    config.readDatabaseUrl = config.readDatabaseUrl.trim() || config.databaseUrl;
+
     config.redisUrl = await question(
       `${colors.cyan}Redis URL${colors.reset} [redis://localhost:6379]: `
     );
     config.redisUrl = config.redisUrl.trim() || 'redis://localhost:6379';
 
+    config.rabbitmqUrl = await question(
+      `${colors.cyan}RabbitMQ URL${colors.reset} [amqp://localhost:5672]: `
+    );
+    config.rabbitmqUrl = config.rabbitmqUrl.trim() || 'amqp://localhost:5672';
+
+    config.baseHost = await question(
+      `${colors.cyan}Base Host${colors.reset} [127.0.0.1]: `
+    );
+    config.baseHost = config.baseHost.trim() || '127.0.0.1';
+
     rl.close();
 
     // Display configuration summary
@@ -108,10 +115,11 @@ async function main() {
     console.log(`  Project Name:    ${colors.green}${config.projectName}${colors.reset}`);
     console.log(`  Description:     ${config.projectDescription}`);
     console.log(`  Author:          ${config.authorName} <${config.authorEmail}>`);
-    console.log(`  API Port:        ${config.apiPort}`);
-    console.log(`  Web Port:        ${config.webPort}`);
+    console.log(`  Base Host:       ${config.baseHost}`);
     console.log(`  Database:        ${config.databaseUrl}`);
+    console.log(`  Read DB:         ${config.readDatabaseUrl}`);
     console.log(`  Redis:           ${config.redisUrl}`);
+    console.log(`  RabbitMQ:        ${config.rabbitmqUrl}`);
 
     // Apply configuration
     log.header('\n🔧 Applying Configuration');
@@ -158,27 +166,9 @@ async function applyConfiguration() {
   });
   log.success('API package.json updated');
 
-  // Create .env files
-  log.info('Creating environment files...');
-  createEnvFile(
-    path.join(rootDir, 'apps/web/.env.local'),
-    {
-      NEXT_PUBLIC_API_BASE_URL: `http://localhost:${config.apiPort}/api`,
-    }
-  );
-  createEnvFile(
-    path.join(rootDir, 'apps/api/.env'),
-    {
-      NODE_ENV: 'development',
-      PORT: config.apiPort,
-      HOST: '0.0.0.0',
-      DATABASE_URL: config.databaseUrl,
-      REDIS_URL: config.redisUrl,
-      JWT_SECRET: generateRandomSecret(),
-      JWT_EXPIRES_IN: '7d',
-      CORS_ORIGIN: `http://localhost:${config.webPort}`,
-    }
-  );
+  // Create .env files from .env.example
+  log.info('Creating environment files from .env.example...');
+  createEnvFromExample(rootDir, config);
   log.success('Environment files created');
 
   // Update README
@@ -198,11 +188,117 @@ function updatePackageJson(filePath, updates) {
   fs.writeFileSync(filePath, JSON.stringify(packageJson, null, 2) + '\n');
 }
 
+/**
+ * 解析 .env.example 文件，提取 KEY=VALUE 行（含注释、空行）
+ */
+function parseEnvExample(content) {
+  const lines = [];
+  const vars = new Map();
+  for (const line of content.split(/\n/)) {
+    const trimmed = line.trimEnd();
+    if (!trimmed || trimmed.startsWith('#')) {
+      lines.push({ type: 'raw', value: trimmed });
+    } else {
+      const match = trimmed.match(/^([A-Za-z_][A-Za-z0-9_]*)=(.*)$/);
+      if (match) {
+        const key = match[1];
+        let value = match[2];
+        if (value.startsWith('"') && value.endsWith('"')) {
+          value = value.slice(1, -1);
+        }
+        lines.push({ type: 'var', key, raw: trimmed });
+        vars.set(key, value);
+      } else {
+        lines.push({ type: 'raw', value: trimmed });
+      }
+    }
+  }
+  return { lines, vars };
+}
+
+/**
+ * 根据 apps/api/.env.example 和 apps/web/.env.example 生成 .env 文件
+ */
+function createEnvFromExample(rootDir, config) {
+  const apiExamplePath = path.join(rootDir, 'apps/api/.env.example');
+  const webExamplePath = path.join(rootDir, 'apps/web/.env.example');
+
+  // 变量替换映射（apps/api），参考 apps/api/.env.example
+  // API 端口由 apps/api/config.local.yaml 的 app.port 配置，此处不覆盖 API_BASE_URL / INTERNAL_API_BASE_URL
+  const apiReplacements = {
+    BASE_HOST: config.baseHost,
+    DATABASE_URL: config.databaseUrl,
+    READ_DATABASE_URL: config.readDatabaseUrl,
+    REDIS_URL: config.redisUrl,
+    RABBITMQ_URL: config.rabbitmqUrl,
+  };
+
+  if (fs.existsSync(apiExamplePath)) {
+    const content = fs.readFileSync(apiExamplePath, 'utf8');
+    const { lines, vars } = parseEnvExample(content);
+    const outLines = [];
+    for (const item of lines) {
+      if (item.type === 'raw') {
+        outLines.push(item.value);
+      } else {
+        let val = apiReplacements[item.key];
+        if (val === undefined && item.key === 'RABBITMQ_EVENTS_URL') {
+          const orig = vars.get(item.key) || '';
+          val = orig.replace(/\$\{BASE_HOST\}/g, config.baseHost);
+        } else if (val === undefined) {
+          val = null;
+        }
+        const final = val !== null && val !== undefined ? `${item.key}=${val}` : item.raw;
+        outLines.push(final);
+      }
+    }
+    const apiEnvPath = path.join(rootDir, 'apps/api/.env');
+    fs.writeFileSync(apiEnvPath, outLines.join('\n') + '\n');
+
+    // 追加 JWT_SECRET（若 .env.example 中无）
+    const apiEnvContent = fs.readFileSync(apiEnvPath, 'utf8');
+    if (!/^JWT_SECRET=/m.test(apiEnvContent)) {
+      fs.appendFileSync(apiEnvPath, `\n# JWT\nJWT_SECRET=${generateRandomSecret()}\nJWT_EXPIRES_IN=7d\n`);
+    }
+  } else {
+    createEnvFile(path.join(rootDir, 'apps/api/.env'), {
+      NODE_ENV: 'development',
+      DATABASE_URL: config.databaseUrl,
+      REDIS_URL: config.redisUrl,
+      RABBITMQ_URL: config.rabbitmqUrl,
+      JWT_SECRET: generateRandomSecret(),
+    });
+  }
+
+  // apps/web：NEXT_PUBLIC_API_BASE_URL 等由 .env.example 提供，Next.js 端口自动配置，此处不覆盖
+  const webReplacements = {};
+
+  if (fs.existsSync(webExamplePath)) {
+    const content = fs.readFileSync(webExamplePath, 'utf8');
+    const { lines } = parseEnvExample(content);
+    const outLines = [];
+    for (const item of lines) {
+      if (item.type === 'raw') {
+        outLines.push(item.value);
+      } else {
+        const val = webReplacements[item.key] ?? null;
+        const final = val !== null ? `${item.key}=${val}` : item.raw;
+        outLines.push(final);
+      }
+    }
+    fs.writeFileSync(
+      path.join(rootDir, 'apps/web/.env.local'),
+      outLines.join('\n') + '\n'
+    );
+  } else {
+    createEnvFile(path.join(rootDir, 'apps/web/.env.local'), {});
+  }
+}
+
 function createEnvFile(filePath, variables) {
   const content = Object.entries(variables)
     .map(([key, value]) => `${key}=${value}`)
     .join('\n') + '\n';
-
   fs.writeFileSync(filePath, content);
 }
 
@@ -213,9 +309,9 @@ function updateReadme(filePath) {
   }
 
   let content = fs.readFileSync(filePath, 'utf8');
-  content = content.replace(/# PardxAI Monorepo Scaffold/, `# ${config.projectName}`);
+  content = content.replace(/# PardxAI Monorepo Scaffold[^\n]*/, `# ${config.projectName}`);
   content = content.replace(
-    /A production-ready monorepo scaffold based on PardxAI architecture\./,
+    /A comprehensive production-ready monorepo scaffold with complete implementations\./,
     config.projectDescription
   );
   fs.writeFileSync(filePath, content);