saju8z 1.0.0 → 1.2.0

package/bin/saju8z.js

@@ -0,0 +1,160 @@
+#!/usr/bin/env node
+import process from "node:process";
+import { createInterface } from "node:readline";
+import { calculateSajuChart, formatSajuChart, UserInputError } from "../dist/index.js";
+
+const HELP_TEXT = `사용법: saju8z
+        saju8z --date YYYY-MM-DD [--time HH:mm] [--gmt ±HH:mm] [옵션]
+        saju8z --dt YYYYMMDD[HHmm] [--gmt ±HH:mm] [옵션]
+
+인자 없이 실행하면 날짜와 시각을 차례로 입력받습니다.
+  날짜 예: 1998-03-05 / 시각 예: 11:00 (24시간제, 모르면 비워두고 Enter)
+  대화형 입력은 양력·현재 GMT 시차·text 출력을 사용합니다.
+
+옵션으로 실행할 때 필수 입력 (둘 중 하나):
+  --dt         생년월일 8자리 (YYYYMMDD) 또는 생년월일시 12자리 (YYYYMMDDHHmm)
+  --date       생년월일 (YYYY-MM-DD)
+  --time       출생 시각 (선택, HH:mm, 00:00~23:59). 생략하면 삼주만 계산
+  --date 또는 --dt는 필수이며, --dt와 --date·--time은 혼용할 수 없습니다.
+  시간이 없으면 입력 날짜 기준으로 삼주를 계산하고 GMT 환산·-30분 보정은 생략합니다.
+
+옵션:
+  --gmt        고정 GMT 시차 (기본: 실행 환경의 현재 시차, -12:00~+14:00)
+  --calendar   solar (기본) 또는 lunar (한국 음력)
+  --leap       음력 윤달 지정 (--calendar lunar와 함께 사용)
+  --format     text (기본 만세력 텍스트), json 또는 prompt (AI 전달용)
+  --help, -h   도움말
+
+예제:
+  saju8z
+  saju8z --dt 19980305
+  saju8z --dt 199803051100
+  saju8z --date 2000-02-29 --time 00:10
+  saju8z --date 2000-02-29 --time 00:10 --gmt +09:00
+  saju8z --date 2000-02-29 --time 00:10 --gmt=-05:00 --format json
+  saju8z --date 2000-02-29 --time 00:10 --format prompt
+  saju8z --date 2017-05-01 --time 12:00 --gmt +09:00 --calendar lunar --leap
+`;
+
+function getCurrentGmtOffset() {
+  const minutes = -new Date().getTimezoneOffset();
+  const sign = minutes < 0 ? "-" : "+";
+  const absolute = Math.abs(minutes);
+  const hours = String(Math.floor(absolute / 60)).padStart(2, "0");
+  const remainder = String(absolute % 60).padStart(2, "0");
+  return `${sign}${hours}:${remainder}`;
+}
+
+async function readInteractiveArguments() {
+  const reader = createInterface({
+    input: process.stdin,
+    output: process.stderr,
+    terminal: Boolean(process.stdin.isTTY && process.stderr.isTTY),
+    crlfDelay: Infinity
+  });
+  const answers = reader[Symbol.asyncIterator]();
+  /** @param {string} prompt */
+  async function ask(prompt) {
+    process.stderr.write(prompt);
+    const answer = await answers.next();
+    if (answer.done) {
+      throw new UserInputError("입력이 종료되었습니다. --date 또는 --dt를 사용하세요.");
+    }
+    return answer.value.trim();
+  }
+
+  try {
+    process.stderr.write("생년월일과 출생 시각을 입력하세요. 양력·현재 GMT 시차로 계산합니다.\n");
+    const date = await ask("생년월일 (YYYY-MM-DD, 예: 1998-03-05): ");
+    const time = await ask("출생 시각 (HH:mm, 예: 11:00 / 시간을 모르면 비워두고 Enter): ");
+    return time ? ["--date", date, "--time", time] : ["--date", date];
+  } finally {
+    reader.close();
+  }
+}
+
+const VALUE_OPTIONS = new Set(["--dt", "--date", "--time", "--gmt", "--calendar", "--format"]);
+
+/** @param {string[]} args */
+function parseOptions(args) {
+  /** @type {Map<string, string>} */
+  const values = new Map();
+  let leapMonth = false;
+  for (let index = 0; index < args.length; index++) {
+    const argument = args[index];
+    const separator = argument.indexOf("=");
+    const option = separator < 0 ? argument : argument.slice(0, separator);
+    if (option === "--leap" && separator < 0) {
+      if (leapMonth) throw new UserInputError("중복된 옵션입니다: --leap");
+      leapMonth = true;
+      continue;
+    }
+    if (!VALUE_OPTIONS.has(option)) throw new UserInputError(`지원하지 않는 옵션입니다: ${option}`);
+    if (values.has(option)) throw new UserInputError(`중복된 옵션입니다: ${option}`);
+    const value = separator < 0 ? args[++index] : argument.slice(separator + 1);
+    if (!value || value.startsWith("--")) throw new UserInputError(`${option} 값을 입력하세요.`);
+    values.set(option, value);
+  }
+  return { values, leapMonth };
+}
+
+/** @param {Map<string, string>} values */
+function resolveDateTime(values) {
+  const dt = values.get("--dt");
+  if (dt !== undefined) {
+    if (values.has("--date") || values.has("--time")) {
+      throw new UserInputError("--dt는 --date 또는 --time과 함께 사용할 수 없습니다.");
+    }
+    if (![8, 12].includes(dt.length) || !/^\d+$/.test(dt)) {
+      throw new UserInputError(
+        "--dt는 YYYYMMDD 형식의 8자리 또는 YYYYMMDDHHmm 형식의 12자리 숫자여야 합니다."
+      );
+    }
+    return {
+      date: `${dt.slice(0, 4)}-${dt.slice(4, 6)}-${dt.slice(6, 8)}`,
+      ...(dt.length === 12 ? { time: `${dt.slice(8, 10)}:${dt.slice(10, 12)}` } : {})
+    };
+  }
+  const date = values.get("--date");
+  const time = values.get("--time");
+  if (!date) {
+    throw new UserInputError("--date 또는 --dt를 입력하세요.");
+  }
+  return { date, ...(time === undefined ? {} : { time }) };
+}
+
+/** @param {string[]} args */
+function parseArguments(args) {
+  const { values, leapMonth } = parseOptions(args);
+  const { date, time } = resolveDateTime(values);
+  const gmt = values.get("--gmt") ?? getCurrentGmtOffset();
+  const calendar = values.get("--calendar") ?? "solar";
+  if (calendar !== "solar" && calendar !== "lunar")
+    throw new UserInputError("달력은 solar 또는 lunar여야 합니다.");
+  const format = values.get("--format") ?? "text";
+  if (format !== "text" && format !== "json" && format !== "prompt")
+    throw new UserInputError("출력 형식은 text, json 또는 prompt이어야 합니다.");
+  return {
+    input: { date, ...(time === undefined ? {} : { time }), gmt, calendar, leapMonth },
+    format
+  };
+}
+
+try {
+  const args = process.argv.slice(2);
+  const showHelp = args.length === 1 && (args[0] === "--help" || args[0] === "-h");
+  if (showHelp) {
+    process.stdout.write(HELP_TEXT);
+  } else {
+    const inputArgs = args.length === 0 ? await readInteractiveArguments() : args;
+    const { input, format } = parseArguments(inputArgs);
+    const result = calculateSajuChart(input);
+    const leadingNewline = format === "text" ? "\n" : "";
+    process.stdout.write(`${leadingNewline}${formatSajuChart(result, format)}\n`);
+  }
+} catch (error) {
+  process.stderr.write(
+    `saju8z: ${error instanceof Error ? error.message : "계산에 실패했습니다."}\n도움말: saju8z --help\n`
+  );
+  process.exitCode = 1;
+}

package/dist/core.cjs

@@ -37,7 +37,9 @@ __export(core_exports, {
   addMinutes: () => addMinutes,
   applySolarTimeCorrection: () => applySolarTimeCorrection,
   branchIndex: () => branchIndex,
+  calculateDateTenGods: () => calculateDateTenGods,
   calculateDayPillar: () => calculateDayPillar,
+  calculateDayPillarFromDate: () => calculateDayPillarFromDate,
   calculateFourPillars: () => calculateFourPillars,
   calculateHourBranch: () => calculateHourBranch,
   calculateHourPillar: () => calculateHourPillar,
@@ -45,10 +47,12 @@ __export(core_exports, {
   calculateTenGod: () => calculateTenGod,
   calculateTenGods: () => calculateTenGods,
   calculateYearPillar: () => calculateYearPillar,
+  compareLocalDate: () => compareLocalDate,
   compareLocalDateTime: () => compareLocalDateTime,
   daysInMonth: () => daysInMonth,
   formatLocalDateTime: () => formatLocalDateTime,
   formatPillar: () => formatPillar,
+  getMonthBranchBySolarDate: () => getMonthBranchBySolarDate,
   getMonthBranchBySolarTerm: () => getMonthBranchBySolarTerm,
   getSolarTermDateTime: () => getSolarTermDateTime,
   hasLunarLeapMonth: () => hasLunarLeapMonth,
@@ -58,6 +62,7 @@ __export(core_exports, {
   lunarMonthDays: () => lunarMonthDays,
   lunarToSolar: () => lunarToSolar,
   monthBranchesInOrder: () => monthBranchesInOrder,
+  monthPillarFromBranch: () => monthPillarFromBranch,
   pillarFromIndex: () => pillarFromIndex,
   positiveModulo: () => positiveModulo,
   sexagenaryIndexOfPillar: () => sexagenaryIndexOfPillar,
@@ -74,7 +79,7 @@ var SUPPORTED_START_YEAR = 1900;
 var SUPPORTED_END_YEAR = 2100;
 
 // src/config/saju8z.ts
-var SAJU8Z_VERSION = "1.0.0";
+var SAJU8Z_VERSION = "1.2.0";
 var SAJU8Z_CALCULATION_PROFILE = "saju8z-fixed-gmt-kst-minus30-v1";
 var SAJU8Z_CORRECTION_MINUTES = -30;
 
@@ -116,18 +121,112 @@ var EARTHLY_BRANCHES = [
   "\uD574"
 ];
 var BRANCH_INFO = {
-  \uC790: { name: "\uC790", element: "\u6C34", mainHiddenStem: "\uACC4", hiddenStems: [{ stem: "\uACC4", role: "main" }] },
-  \uCD95: { name: "\uCD95", element: "\u571F", mainHiddenStem: "\uAE30", hiddenStems: [{ stem: "\uAE30", role: "main" }, { stem: "\uC2E0", role: "middle" }, { stem: "\uACC4", role: "initial" }] },
-  \uC778: { name: "\uC778", element: "\u6728", mainHiddenStem: "\uAC11", hiddenStems: [{ stem: "\uAC11", role: "main" }, { stem: "\uBCD1", role: "middle" }, { stem: "\uBB34", role: "initial" }] },
-  \uBB18: { name: "\uBB18", element: "\u6728", mainHiddenStem: "\uC744", hiddenStems: [{ stem: "\uC744", role: "main" }] },
-  \uC9C4: { name: "\uC9C4", element: "\u571F", mainHiddenStem: "\uBB34", hiddenStems: [{ stem: "\uBB34", role: "main" }, { stem: "\uC744", role: "middle" }, { stem: "\uACC4", role: "initial" }] },
-  \uC0AC: { name: "\uC0AC", element: "\u706B", mainHiddenStem: "\uBCD1", hiddenStems: [{ stem: "\uBCD1", role: "main" }, { stem: "\uACBD", role: "middle" }, { stem: "\uBB34", role: "initial" }] },
-  \uC624: { name: "\uC624", element: "\u706B", mainHiddenStem: "\uC815", hiddenStems: [{ stem: "\uC815", role: "main" }, { stem: "\uAE30", role: "middle" }] },
-  \uBBF8: { name: "\uBBF8", element: "\u571F", mainHiddenStem: "\uAE30", hiddenStems: [{ stem: "\uAE30", role: "main" }, { stem: "\uC815", role: "middle" }, { stem: "\uC744", role: "initial" }] },
-  \uC2E0: { name: "\uC2E0", element: "\u91D1", mainHiddenStem: "\uACBD", hiddenStems: [{ stem: "\uACBD", role: "main" }, { stem: "\uC784", role: "middle" }, { stem: "\uBB34", role: "initial" }] },
-  \uC720: { name: "\uC720", element: "\u91D1", mainHiddenStem: "\uC2E0", hiddenStems: [{ stem: "\uC2E0", role: "main" }] },
-  \uC220: { name: "\uC220", element: "\u571F", mainHiddenStem: "\uBB34", hiddenStems: [{ stem: "\uBB34", role: "main" }, { stem: "\uC2E0", role: "middle" }, { stem: "\uC815", role: "initial" }] },
-  \uD574: { name: "\uD574", element: "\u6C34", mainHiddenStem: "\uC784", hiddenStems: [{ stem: "\uC784", role: "main" }, { stem: "\uAC11", role: "middle" }] }
+  \uC790: {
+    name: "\uC790",
+    element: "\u6C34",
+    mainHiddenStem: "\uACC4",
+    hiddenStems: [{ stem: "\uACC4", role: "main" }]
+  },
+  \uCD95: {
+    name: "\uCD95",
+    element: "\u571F",
+    mainHiddenStem: "\uAE30",
+    hiddenStems: [
+      { stem: "\uAE30", role: "main" },
+      { stem: "\uC2E0", role: "middle" },
+      { stem: "\uACC4", role: "initial" }
+    ]
+  },
+  \uC778: {
+    name: "\uC778",
+    element: "\u6728",
+    mainHiddenStem: "\uAC11",
+    hiddenStems: [
+      { stem: "\uAC11", role: "main" },
+      { stem: "\uBCD1", role: "middle" },
+      { stem: "\uBB34", role: "initial" }
+    ]
+  },
+  \uBB18: {
+    name: "\uBB18",
+    element: "\u6728",
+    mainHiddenStem: "\uC744",
+    hiddenStems: [{ stem: "\uC744", role: "main" }]
+  },
+  \uC9C4: {
+    name: "\uC9C4",
+    element: "\u571F",
+    mainHiddenStem: "\uBB34",
+    hiddenStems: [
+      { stem: "\uBB34", role: "main" },
+      { stem: "\uC744", role: "middle" },
+      { stem: "\uACC4", role: "initial" }
+    ]
+  },
+  \uC0AC: {
+    name: "\uC0AC",
+    element: "\u706B",
+    mainHiddenStem: "\uBCD1",
+    hiddenStems: [
+      { stem: "\uBCD1", role: "main" },
+      { stem: "\uACBD", role: "middle" },
+      { stem: "\uBB34", role: "initial" }
+    ]
+  },
+  \uC624: {
+    name: "\uC624",
+    element: "\u706B",
+    mainHiddenStem: "\uC815",
+    hiddenStems: [
+      { stem: "\uC815", role: "main" },
+      { stem: "\uAE30", role: "middle" }
+    ]
+  },
+  \uBBF8: {
+    name: "\uBBF8",
+    element: "\u571F",
+    mainHiddenStem: "\uAE30",
+    hiddenStems: [
+      { stem: "\uAE30", role: "main" },
+      { stem: "\uC815", role: "middle" },
+      { stem: "\uC744", role: "initial" }
+    ]
+  },
+  \uC2E0: {
+    name: "\uC2E0",
+    element: "\u91D1",
+    mainHiddenStem: "\uACBD",
+    hiddenStems: [
+      { stem: "\uACBD", role: "main" },
+      { stem: "\uC784", role: "middle" },
+      { stem: "\uBB34", role: "initial" }
+    ]
+  },
+  \uC720: {
+    name: "\uC720",
+    element: "\u91D1",
+    mainHiddenStem: "\uC2E0",
+    hiddenStems: [{ stem: "\uC2E0", role: "main" }]
+  },
+  \uC220: {
+    name: "\uC220",
+    element: "\u571F",
+    mainHiddenStem: "\uBB34",
+    hiddenStems: [
+      { stem: "\uBB34", role: "main" },
+      { stem: "\uC2E0", role: "middle" },
+      { stem: "\uC815", role: "initial" }
+    ]
+  },
+  \uD574: {
+    name: "\uD574",
+    element: "\u6C34",
+    mainHiddenStem: "\uC784",
+    hiddenStems: [
+      { stem: "\uC784", role: "main" },
+      { stem: "\uAC11", role: "middle" }
+    ]
+  }
 };
 function branchIndex(branch) {
   return EARTHLY_BRANCHES.indexOf(branch);
@@ -206,6 +305,8 @@ function stemAt(index) {
 }
 
 // src/calendar/dateMath.ts
+var MINUTES_PER_HOUR = 60;
+var MINUTES_PER_DAY = 24 * MINUTES_PER_HOUR;
 function isLeapYear(year) {
   return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
 }
@@ -216,11 +317,14 @@ function daysInMonth(year, month) {
 function isValidDate(year, month, day) {
   return month >= 1 && month <= 12 && day >= 1 && day <= daysInMonth(year, month);
 }
-function compareLocalDateTime(a, b) {
+function compareLocalDate(left, right) {
+  return left.year - right.year || left.month - right.month || left.day - right.day;
+}
+function compareLocalDateTime(left, right) {
   const keys = ["year", "month", "day", "hour", "minute"];
   for (const key of keys) {
-    const diff = a[key] - b[key];
-    if (diff !== 0) return diff;
+    const difference = left[key] - right[key];
+    if (difference !== 0) return difference;
   }
   return 0;
 }
@@ -228,9 +332,9 @@ function addMinutes(dateTime, minutes) {
   let year = dateTime.year;
   let month = dateTime.month;
   let day = dateTime.day;
-  let totalMinutes = dateTime.hour * 60 + dateTime.minute + minutes;
+  let totalMinutes = dateTime.hour * MINUTES_PER_HOUR + dateTime.minute + minutes;
   while (totalMinutes < 0) {
-    totalMinutes += 1440;
+    totalMinutes += MINUTES_PER_DAY;
     day -= 1;
     if (day < 1) {
       month -= 1;
@@ -241,8 +345,8 @@ function addMinutes(dateTime, minutes) {
       day = daysInMonth(year, month);
     }
   }
-  while (totalMinutes >= 1440) {
-    totalMinutes -= 1440;
+  while (totalMinutes >= MINUTES_PER_DAY) {
+    totalMinutes -= MINUTES_PER_DAY;
     day += 1;
     if (day > daysInMonth(year, month)) {
       day = 1;
@@ -257,18 +361,21 @@ function addMinutes(dateTime, minutes) {
     year,
     month,
     day,
-    hour: Math.floor(totalMinutes / 60),
-    minute: totalMinutes % 60
+    hour: Math.floor(totalMinutes / MINUTES_PER_HOUR),
+    minute: totalMinutes % MINUTES_PER_HOUR
   };
 }
 function julianDayNumber(year, month, day) {
-  const a = Math.floor((14 - month) / 12);
-  const y = year + 4800 - a;
-  const m = month + 12 * a - 3;
-  return day + Math.floor((153 * m + 2) / 5) + 365 * y + Math.floor(y / 4) - Math.floor(y / 100) + Math.floor(y / 400) - 32045;
+  const yearAdjustment = Math.floor((14 - month) / 12);
+  const adjustedYear = year + 4800 - yearAdjustment;
+  const adjustedMonth = month + 12 * yearAdjustment - 3;
+  return day + Math.floor((153 * adjustedMonth + 2) / 5) + 365 * adjustedYear + Math.floor(adjustedYear / 4) - Math.floor(adjustedYear / 100) + Math.floor(adjustedYear / 400) - 32045;
 }
 function formatLocalDateTime(dateTime) {
-  return `${dateTime.year.toString().padStart(4, "0")}-${dateTime.month.toString().padStart(2, "0")}-${dateTime.day.toString().padStart(2, "0")}T${dateTime.hour.toString().padStart(2, "0")}:${dateTime.minute.toString().padStart(2, "0")}`;
+  const pad = (value) => value.toString().padStart(2, "0");
+  const date = `${dateTime.year.toString().padStart(4, "0")}-${pad(dateTime.month)}-${pad(dateTime.day)}`;
+  const time = `${pad(dateTime.hour)}:${pad(dateTime.minute)}`;
+  return `${date}T${time}`;
 }
 
 // node_modules/korean-lunar-calendar/dist/korean-lunar-calendar.mjs
@@ -1672,16 +1779,16 @@ function lunarMonthDays(year, month, leap) {
     return 29;
   }
 }
-var leapYears = /* @__PURE__ */ new Map();
+var leapMonthByYear = /* @__PURE__ */ new Map();
 function hasLunarLeapMonth(year) {
   if (!Number.isInteger(year) || year < 1900 || year > 2050) return false;
-  const known = leapYears.get(year);
-  if (known !== void 0) return known;
+  const cached = leapMonthByYear.get(year);
+  if (cached !== void 0) return cached;
   const calendar = createCalendar();
   const hasLeap = Array.from({ length: 12 }, (_, index) => index + 1).some(
     (month) => calendar.setLunarDate(year, month, 1, true) && calendar.getLunarCalendar().intercalation === true
   );
-  leapYears.set(year, hasLeap);
+  leapMonthByYear.set(year, hasLeap);
   return hasLeap;
 }
 
@@ -1705,14 +1812,17 @@ var SOLAR_TERM_RULES = [
   { key: "daeseol", month: 12, day: 7, hour: 5, minute: 0, monthBranch: "\uC790" },
   { key: "sohan", month: 1, day: 6, hour: 5, minute: 0, monthBranch: "\uCD95" }
 ];
+function solarTermDateTime(year, rule) {
+  return { year, month: rule.month, day: rule.day, hour: rule.hour, minute: rule.minute };
+}
 function getSolarTermDateTime(year, key) {
   const rule = SOLAR_TERM_RULES.find((item) => item.key === key);
   if (!rule) throw new Error(`\uC9C0\uC6D0\uD558\uC9C0 \uC54A\uB294 \uC808\uAE30\uC785\uB2C8\uB2E4: ${key}`);
-  return { year, month: rule.month, day: rule.day, hour: rule.hour, minute: rule.minute };
+  return solarTermDateTime(year, rule);
 }
 function getMonthBranchBySolarTerm(dateTime) {
   const candidates = SOLAR_TERM_RULES.map((rule) => ({
-    startsAt: { year: dateTime.year, month: rule.month, day: rule.day, hour: rule.hour, minute: rule.minute },
+    startsAt: solarTermDateTime(dateTime.year, rule),
     branch: rule.monthBranch
   })).sort((a, b) => compareLocalDateTime(a.startsAt, b.startsAt));
   let selected = "\uCD95";
@@ -1721,11 +1831,23 @@ function getMonthBranchBySolarTerm(dateTime) {
   }
   return selected;
 }
+function getMonthBranchBySolarDate(date) {
+  const rules = [...SOLAR_TERM_RULES].sort((left, right) => left.month - right.month);
+  let selected = "\uCD95";
+  for (const rule of rules) {
+    if (compareLocalDate(date, solarTermDateTime(date.year, rule)) >= 0)
+      selected = rule.monthBranch;
+  }
+  return selected;
+}
 
 // src/saju/calculateDayPillar.ts
 var JDN_TO_SEXAGENARY_OFFSET = 49;
 function calculateDayPillar(dateTime) {
-  const jdn = julianDayNumber(dateTime.year, dateTime.month, dateTime.day);
+  return calculateDayPillarFromDate(dateTime);
+}
+function calculateDayPillarFromDate(date) {
+  const jdn = julianDayNumber(date.year, date.month, date.day);
   return pillarFromIndex(positiveModulo(jdn + JDN_TO_SEXAGENARY_OFFSET, 60));
 }
 
@@ -1778,6 +1900,9 @@ var IN_MONTH_START_STEM_BY_YEAR_STEM = {
 };
 function calculateMonthPillar(dateTime, yearStem) {
   const branch = getMonthBranchBySolarTerm(dateTime);
+  return monthPillarFromBranch(branch, yearStem);
+}
+function monthPillarFromBranch(branch, yearStem) {
   const offsetFromIn = positiveModulo(branchIndex(branch) - branchIndex("\uC778"), 12);
   const stem = stemAt(IN_MONTH_START_STEM_BY_YEAR_STEM[yearStem] + offsetFromIn);
   return { stem, branch };
@@ -1831,14 +1956,20 @@ function calculateTenGod(dayStem, targetStem) {
 
 // src/saju/calculateTenGods.ts
 function calculateTenGods(fourPillars) {
+  const dayStem = fourPillars.day.stem;
+  return {
+    ...calculateDateTenGods(fourPillars),
+    hourStem: calculateTenGod(dayStem, fourPillars.hour.stem),
+    hourBranch: calculateTenGod(dayStem, BRANCH_INFO[fourPillars.hour.branch].mainHiddenStem)
+  };
+}
+function calculateDateTenGods(fourPillars) {
   const dayStem = fourPillars.day.stem;
   return {
     yearStem: calculateTenGod(dayStem, fourPillars.year.stem),
     yearBranch: calculateTenGod(dayStem, BRANCH_INFO[fourPillars.year.branch].mainHiddenStem),
     monthStem: calculateTenGod(dayStem, fourPillars.month.stem),
     monthBranch: calculateTenGod(dayStem, BRANCH_INFO[fourPillars.month.branch].mainHiddenStem),
-    dayBranch: calculateTenGod(dayStem, BRANCH_INFO[fourPillars.day.branch].mainHiddenStem),
-    hourStem: calculateTenGod(dayStem, fourPillars.hour.stem),
-    hourBranch: calculateTenGod(dayStem, BRANCH_INFO[fourPillars.hour.branch].mainHiddenStem)
+    dayBranch: calculateTenGod(dayStem, BRANCH_INFO[fourPillars.day.branch].mainHiddenStem)
   };
 }