@xfilecom/xframe 0.1.16 → 0.1.18

package/bin/xframe.js

@@ -38,10 +38,22 @@ Options:
   --front-core <spec>     @xfilecom/front-core (default: ^0.2.1)
   --no-install            스캐폴드만 하고 yarn/npm install 생략
 
+MySQL (shared/config/api/application.yml 의 database.*)
+  --skip-db-prompt        TTY여도 DB 질문 생략 → 아래 기본값 또는 플래그만 반영
+  --db-host <h>           기본 127.0.0.1
+  --db-port <n>           기본 3306
+  --db-user <u>           기본 root
+  --db-password <p>       기본 빈 문자열 (빈 값: --db-password "")
+  --db-name <n>           기본 app
+  --db-pull               install 성공 후 yarn/npm run db:pull 실행 (MySQL 도달 가능할 때)
+
+TTY + --skip-db-prompt 없음 → 위 항목을 순서대로 물어봅니다 (Enter = 기본값).
+  마지막에 db:pull 여부를 [y/N] 로 묻습니다 (--db-pull 이 있으면 질문 생략하고 실행).
+
 Examples:
   npx @xfilecom/xframe@latest my-app
-  npx @xfilecom/xframe my-app --backend-core file:../../../packages/backend-core \\
-    --front-core file:../../../packages/front-core`);
+  npx @xfilecom/xframe my-app --db-host 127.0.0.1 --db-user app --db-password secret --db-name mydb --db-pull
+  npx @xfilecom/xframe my-app --skip-db-prompt --no-install`);
 }
 
 function parseArgs(argv) {
@@ -50,6 +62,20 @@ function parseArgs(argv) {
   let backendCore = '^1.0.0';
   let frontCore = '^0.2.1';
   let skipInstall = false;
+  let skipDbPrompt = false;
+  let dbPull = false;
+  /** @type {{ host?: string, port?: number, user?: string, password?: string, name?: string }} */
+  const dbFromCli = {};
+
+  function takeStringFlag(name, i) {
+    const v = rest[i + 1];
+    if (v === undefined) {
+      console.error(`xframe: ${name} requires a value`);
+      process.exit(1);
+    }
+    i += 1;
+    return { val: v, nextI: i };
+  }
 
   for (let i = 0; i < rest.length; i += 1) {
     const a = rest[i];
@@ -61,24 +87,58 @@ function parseArgs(argv) {
       skipInstall = true;
       continue;
     }
+    if (a === '--skip-db-prompt') {
+      skipDbPrompt = true;
+      continue;
+    }
+    if (a === '--db-pull') {
+      dbPull = true;
+      continue;
+    }
     if (a === '--backend-core') {
-      const v = rest[i + 1];
-      if (!v || v.startsWith('-')) {
-        console.error('xframe: --backend-core requires a value');
-        process.exit(1);
-      }
-      backendCore = v;
-      i += 1;
+      const { val, nextI } = takeStringFlag('--backend-core', i);
+      backendCore = val;
+      i = nextI;
       continue;
     }
     if (a === '--front-core') {
-      const v = rest[i + 1];
-      if (!v || v.startsWith('-')) {
-        console.error('xframe: --front-core requires a value');
+      const { val, nextI } = takeStringFlag('--front-core', i);
+      frontCore = val;
+      i = nextI;
+      continue;
+    }
+    if (a === '--db-host') {
+      const { val, nextI } = takeStringFlag('--db-host', i);
+      dbFromCli.host = val;
+      i = nextI;
+      continue;
+    }
+    if (a === '--db-port') {
+      const { val, nextI } = takeStringFlag('--db-port', i);
+      dbFromCli.port = parseInt(val, 10);
+      if (!Number.isFinite(dbFromCli.port)) {
+        console.error('xframe: --db-port must be a number');
         process.exit(1);
       }
-      frontCore = v;
-      i += 1;
+      i = nextI;
+      continue;
+    }
+    if (a === '--db-user') {
+      const { val, nextI } = takeStringFlag('--db-user', i);
+      dbFromCli.user = val;
+      i = nextI;
+      continue;
+    }
+    if (a === '--db-password') {
+      const { val, nextI } = takeStringFlag('--db-password', i);
+      dbFromCli.password = val;
+      i = nextI;
+      continue;
+    }
+    if (a === '--db-name') {
+      const { val, nextI } = takeStringFlag('--db-name', i);
+      dbFromCli.name = val;
+      i = nextI;
       continue;
     }
     if (a.startsWith('-')) {
@@ -93,7 +153,126 @@ function parseArgs(argv) {
     projectDir = a;
   }
 
-  return { projectDir, backendCore, frontCore, skipInstall };
+  return {
+    projectDir,
+    backendCore,
+    frontCore,
+    skipInstall,
+    skipDbPrompt,
+    dbPull,
+    dbFromCli,
+  };
+}
+
+/** YAML 단일 인용 내용 이스케이프 */
+function yamlSingleQuotedEscape(s) {
+  return String(s).replace(/'/g, "''");
+}
+
+/** 식별자형이면 따옴표 없이, 아니면 작은따옴표 */
+function yamlScalar(v) {
+  const s = String(v);
+  if (/^[A-Za-z0-9_.@-]+$/.test(s)) return s;
+  return `'${yamlSingleQuotedEscape(s)}'`;
+}
+
+/**
+ * 최상위 `database:` 블록만 수정 (같은 들여쓰기의 `server.port` 등과 구분).
+ *
+ * @param {string} targetRoot
+ * @param {{ host: string, port: number, user: string, password: string, name: string }} db
+ */
+function patchApplicationYmlDatabase(targetRoot, db) {
+  const p = path.join(targetRoot, 'shared', 'config', 'api', 'application.yml');
+  if (!fs.existsSync(p)) {
+    console.warn('xframe: application.yml not found, skip DB patch');
+    return;
+  }
+  const portN = Number.isFinite(Number(db.port)) ? Number(db.port) : 3306;
+  const pwd = `'${yamlSingleQuotedEscape(db.password)}'`;
+  const lines = fs.readFileSync(p, 'utf8').split('\n');
+  let i = 0;
+  while (i < lines.length) {
+    if (lines[i] === 'database:') {
+      i += 1;
+      while (i < lines.length) {
+        const line = lines[i];
+        // 루트 database 직계만 (들여쓰기 2칸 + 키). 4칸 이상은 core.database 등 하위 블록.
+        if (line === '' || /^  [A-Za-z_#]/.test(line)) {
+          if (/^  host:/.test(line)) lines[i] = `  host: ${yamlScalar(db.host)}`;
+          else if (/^  port:/.test(line)) lines[i] = `  port: ${portN}`;
+          else if (/^  user:/.test(line)) lines[i] = `  user: ${yamlScalar(db.user)}`;
+          else if (/^  password:/.test(line)) lines[i] = `  password: ${pwd}`;
+          else if (/^  name:/.test(line)) lines[i] = `  name: ${yamlScalar(db.name)}`;
+          i += 1;
+          continue;
+        }
+        break;
+      }
+      break;
+    }
+    i += 1;
+  }
+  fs.writeFileSync(p, lines.join('\n'), 'utf8');
+}
+
+const DB_DEFAULTS = {
+  host: '127.0.0.1',
+  port: 3306,
+  user: 'root',
+  password: '',
+  name: 'app',
+};
+
+/**
+ * @param {{ host?: string, port?: number, user?: string, password?: string, name?: string }} fromCli
+ * @param {boolean} skipDbPrompt
+ * @param {boolean} wantDbPullFlag
+ * @returns {Promise<{ db: typeof DB_DEFAULTS, runDbPull: boolean }>}
+ */
+async function collectDatabaseConfig(fromCli, skipDbPrompt, wantDbPullFlag) {
+  let db = { ...DB_DEFAULTS, ...fromCli };
+  const interactive = process.stdin.isTTY && process.stdout.isTTY && !skipDbPrompt;
+  const readline = require('node:readline/promises');
+  const rl = interactive ? readline.createInterface({ input: process.stdin, output: process.stdout }) : null;
+
+  try {
+    if (interactive && rl) {
+      console.log('\nxframe: MySQL 연결 정보 (Enter = 괄호 안 기본값)\n');
+      const ask = async (label, key, def) => {
+        if (fromCli[key] !== undefined) return;
+        const hint = def === '' ? '(비워두기)' : def;
+        const line = (await rl.question(`${label} [${hint}]: `)).trim();
+        if (line !== '') {
+          if (key === 'port') {
+            const n = parseInt(line, 10);
+            if (Number.isFinite(n)) db[key] = n;
+          } else {
+            db[key] = line;
+          }
+        }
+      };
+      await ask('Host', 'host', DB_DEFAULTS.host);
+      await ask('Port', 'port', String(DB_DEFAULTS.port));
+      await ask('User', 'user', DB_DEFAULTS.user);
+      await ask('Password', 'password', DB_DEFAULTS.password);
+      await ask('Database name', 'name', DB_DEFAULTS.name);
+    } else {
+      db = { ...DB_DEFAULTS, ...fromCli };
+    }
+
+    let runDbPull = wantDbPullFlag;
+    if (interactive && rl && !wantDbPullFlag) {
+      const a = (await rl.question('\n지금 yarn/npm db:pull (스키마 역추출) 을 실행할까요? [y/N] '))
+        .trim()
+        .toLowerCase();
+      runDbPull = a === 'y' || a === 'yes';
+    }
+
+    return { db, runDbPull };
+  } finally {
+    if (rl) await rl.close();
+  }
 }
 
 /** yarn 우선, 없거나 실패 시 npm (부모 셸 PATH 그대로 — shell:true 쓰면 sh라 yarn/nvm PATH가 빠지는 경우가 많음) */
@@ -137,6 +316,27 @@ function installDependencies(cwd) {
   return false;
 }
 
+function executeDbPull(cwd) {
+  console.log('\nxframe: db:pull 실행 (drizzle-kit introspect)…');
+  const opts = { cwd, stdio: 'inherit', env: process.env };
+  const y = spawnSync('yarn', ['run', 'db:pull'], opts);
+  if (y.status === 0) {
+    console.log('xframe: db:pull 완료.');
+    return true;
+  }
+  if (y.error && y.error.code === 'ENOENT') {
+    console.log('xframe: yarn 없음 → npm run db:pull 시도');
+  }
+  const n = spawnSync('npm', ['run', 'db:pull'], opts);
+  if (n.status === 0) {
+    console.log('xframe: db:pull 완료.');
+    return true;
+  }
+  console.error('xframe: db:pull 실패. 프로젝트 루트에서 수동으로 yarn db:pull / npm run db:pull 하세요.');
+  console.error('xframe: (비밀번호가 비어 있으면 drizzle-kit 이 거절할 수 있습니다. application.yml database.password 를 확인하세요.)');
+  return false;
+}
+
 /** 모노레포 템플릿 tsconfig 의 @xfilecom/front-core 경로 → 생성 앱의 node_modules 기준 */
 const TEMPLATE_FRONT_CORE_TS_PATH = '../../../../front-core/src/index.ts';
 const SCAFFOLD_FRONT_CORE_TS_PATH = '../../node_modules/@xfilecom/front-core';
@@ -207,8 +407,16 @@ function readCliVersion() {
   }
 }
 
-function main() {
-  const { projectDir, backendCore, frontCore, skipInstall } = parseArgs(process.argv);
+async function main() {
+  const {
+    projectDir,
+    backendCore,
+    frontCore,
+    skipInstall,
+    skipDbPrompt,
+    dbPull: dbPullFlag,
+    dbFromCli,
+  } = parseArgs(process.argv);
 
   if (!projectDir) {
     console.error('xframe: missing <project-directory>\n');
@@ -248,6 +456,10 @@ function main() {
 
   fs.cpSync(templateRoot, targetRoot, { recursive: true });
 
+  const { db, runDbPull: shouldDbPull } = await collectDatabaseConfig(dbFromCli, skipDbPrompt, dbPullFlag);
+  patchApplicationYmlDatabase(targetRoot, db);
+  console.log(`xframe: wrote database.* → ${path.join('shared', 'config', 'api', 'application.yml')}`);
+
   const vars = {
     PACKAGE_NAME: packageName,
     SERVICE_LABEL: `${packageName}-api`,
@@ -276,13 +488,22 @@ Included:
   • shared/       — config/api·web, schema, sql, endpoint
   • .cursor/rules — @xfilecom/backend-core / front-core 사용 가이드 (.mdc)`);
 
+  let installOk = true;
   if (!skipInstall) {
-    const ok = installDependencies(targetRoot);
-    if (!ok) {
+    installOk = installDependencies(targetRoot);
+    if (!installOk) {
       process.exit(1);
     }
   }
 
+  if (shouldDbPull) {
+    if (skipInstall) {
+      console.warn('xframe: --no-install 이라 db:pull 을 건너뜁니다 (먼저 install 후 수동 실행).');
+    } else {
+      executeDbPull(targetRoot);
+    }
+  }
+
   const rel = path.relative(process.cwd(), targetRoot) || '.';
   console.log(`
 Next:
@@ -292,4 +513,7 @@ Next:
   (설치 생략: npx @xfilecom/xframe <dir> --no-install)`);
 }
 
-main();
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfilecom/xframe",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Scaffold full-stack app: Nest + @xfilecom/backend-core, Vite/React + @xfilecom/front-core",
   "license": "UNLICENSED",
   "bin": {

package/template/shared/config/api/application.yml

@@ -17,9 +17,9 @@ http:
 database:
   host: 127.0.0.1
   port: 3306
-  user: xfilecom
-  password: milk1209
-  name: usdt-market-place
+  user: root
+  password: ''
+  name: app
   ssl: false
   connectionLimit: 10