@orrery/core 0.3.0 → 0.4.0

package/dist/constants.js

@@ -4,20 +4,28 @@ import {
   BRANCH_CLASHES,
   BRANCH_COMBINES_6,
   BRANCH_ELEMENT,
+  BRANCH_GWIMUN,
   BRANCH_HARMS,
   BRANCH_PUNISHMENTS,
   BRANCH_SELF_PUNISHMENTS,
+  BRANCH_WONJIN,
   BRIGHTNESS_TABLE,
   CHANGSHENG_START,
+  CHEONDUK_MAP,
+  CHEONUL_MAP,
   DIRECTIONAL_COMPOSES,
   DIRECTIONAL_COMPOSE_ELEMENTS,
   DI_ZHI,
+  DOHWA_MAP,
   EARTH,
   EARTH_KR,
   ELEMENT_HANJA,
+  GEUMYEO_MAP,
   GOEGANG_PILLARS,
+  GONGMANG_TABLE,
   HALF_COMPOSES,
   HGANJI,
+  HONGYEOM_PILLARS,
   HUO_XING_START,
   JIJANGGAN,
   KUI_YUE_TABLE,
@@ -27,6 +35,7 @@ import {
   MAIN_STAR_NAMES,
   METEORS_12,
   METEOR_LOOKUP,
+  MUNCHANG_MAP,
   NAYIN_TABLE,
   PALACE_NAMES,
   PILLAR_NAMES,
@@ -44,12 +53,13 @@ import {
   TIAN_MA_TABLE,
   TRIPLE_COMPOSES,
   TRIPLE_COMPOSE_ELEMENTS,
+  WOLDUK_MAP,
   WU_HU_DUN_GAN,
   WU_XING_JU_MAP,
   YANGGAN,
   YANGIN_MAP,
   ZIWEI_SERIES_OFFSETS
-} from "./chunk-VJDUZB5T.js";
+} from "./chunk-EXYPMSUR.js";
 import "./chunk-JSBRDJBE.js";
 export {
   BAEKHO_PILLARS,
@@ -57,20 +67,28 @@ export {
   BRANCH_CLASHES,
   BRANCH_COMBINES_6,
   BRANCH_ELEMENT,
+  BRANCH_GWIMUN,
   BRANCH_HARMS,
   BRANCH_PUNISHMENTS,
   BRANCH_SELF_PUNISHMENTS,
+  BRANCH_WONJIN,
   BRIGHTNESS_TABLE,
   CHANGSHENG_START,
+  CHEONDUK_MAP,
+  CHEONUL_MAP,
   DIRECTIONAL_COMPOSES,
   DIRECTIONAL_COMPOSE_ELEMENTS,
   DI_ZHI,
+  DOHWA_MAP,
   EARTH,
   EARTH_KR,
   ELEMENT_HANJA,
+  GEUMYEO_MAP,
   GOEGANG_PILLARS,
+  GONGMANG_TABLE,
   HALF_COMPOSES,
   HGANJI,
+  HONGYEOM_PILLARS,
   HUO_XING_START,
   JIJANGGAN,
   KUI_YUE_TABLE,
@@ -80,6 +98,7 @@ export {
   MAIN_STAR_NAMES,
   METEORS_12,
   METEOR_LOOKUP,
+  MUNCHANG_MAP,
   NAYIN_TABLE,
   PALACE_NAMES,
   PILLAR_NAMES,
@@ -97,6 +116,7 @@ export {
   TIAN_MA_TABLE,
   TRIPLE_COMPOSES,
   TRIPLE_COMPOSE_ELEMENTS,
+  WOLDUK_MAP,
   WU_HU_DUN_GAN,
   WU_XING_JU_MAP,
   YANGGAN,

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { calculateSaju } from './saju.js';
 export { calculateLiunian, createChart, getDaxianList } from './ziwei.js';
 export { ASPECT_SYMBOLS, HOUSE_SYSTEMS, PLANET_KO, PLANET_SYMBOLS, ROMAN, ZODIAC_KO, ZODIAC_SIGNS, ZODIAC_SYMBOLS, calculateNatal, formatDegree, isKoreanDaylightTime, lonToSign, normalizeDeg } from './natal.js';
-export { analyzeAllRelations, analyzePillarRelations, calcPillarIndices, calcSolarTerms, checkDirectionalCompose, checkTripleCompose, findTransits, getBranchRelation, getDaewoon, getFourPillars, getHiddenStems, getJeonggi, getRelation, getSpecialSals, getStemRelation, getTwelveMeteor, getTwelveSpirit, toHangul } from './pillars.js';
-export { BRANCH_ELEMENT, DI_ZHI, EARTH, EARTH_KR, ELEMENT_HANJA, HGANJI, JIJANGGAN, LUCKY_STAR_NAMES, MAIN_STAR_NAMES, METEORS_12, METEOR_LOOKUP, PALACE_NAMES, PILLAR_NAMES, RELATIONS, SHA_STAR_NAMES, SKY, SKY_KR, SPIRITS_12, STEM_INFO, TIAN_GAN, YANGGAN } from './constants.js';
+export { analyzeAllRelations, analyzePillarRelations, calcPillarIndices, calcSolarTerms, calculateInjongbeop, calculateJwabeop, checkDirectionalCompose, checkTripleCompose, findTransits, getBranchRelation, getDaewoon, getFourPillars, getGongmang, getHiddenStems, getJeonggi, getRelation, getSpecialSals, getStemRelation, getTwelveMeteor, getTwelveSpirit, getYearGanzi, toHangul } from './pillars.js';
+export { BRANCH_ELEMENT, DI_ZHI, EARTH, EARTH_KR, ELEMENT_HANJA, GONGMANG_TABLE, HGANJI, JIJANGGAN, LUCKY_STAR_NAMES, MAIN_STAR_NAMES, METEORS_12, METEOR_LOOKUP, PALACE_NAMES, PILLAR_NAMES, RELATIONS, SHA_STAR_NAMES, SKY, SKY_KR, SPIRITS_12, STEM_INFO, TIAN_GAN, YANGGAN } from './constants.js';
 export { City, KOREAN_CITIES, SEOUL, WORLD_CITIES, filterCities, formatCityName } from './cities.js';
-export { AllRelations, AspectType, BirthInput, DaewoonItem, Element, Gender, LiuNianInfo, LiuYueInfo, Meteor, NatalAngles, NatalAspect, NatalChart, NatalHouse, PairRelation, Pillar, PillarDetail, PlanetId, PlanetPosition, Relation, RelationResult, SajuResult, SpecialSals, Spirit, StemInfo, TransitItem, WuXingJu, YinYang, ZiweiChart, ZiweiPalace, ZiweiStar, ZodiacSign } from './types.js';
+export { AllRelations, AspectType, BirthInput, DaewoonItem, Element, Gender, Gongmang, InjongEntry, JasiMethod, JwaEntry, LiuNianInfo, LiuYueInfo, Meteor, NatalAngles, NatalAspect, NatalChart, NatalHouse, PairRelation, Pillar, PillarDetail, PlanetId, PlanetPosition, Relation, RelationResult, SajuResult, SpecialSals, Spirit, StemInfo, TransitItem, WuXingJu, YinYang, ZiweiChart, ZiweiPalace, ZiweiStar, ZodiacSign } from './types.js';

package/dist/index.js

@@ -1,11 +1,11 @@
 import {
   calculateSaju
-} from "./chunk-ETDERV6C.js";
+} from "./chunk-6PLRETU5.js";
 import {
   calculateLiunian,
   createChart,
   getDaxianList
-} from "./chunk-CISACDIA.js";
+} from "./chunk-APL4STY7.js";
 import {
   ASPECT_SYMBOLS,
   HOUSE_SYSTEMS,
@@ -19,7 +19,7 @@ import {
   formatDegree,
   lonToSign,
   normalizeDeg
-} from "./chunk-6BKZDAMP.js";
+} from "./chunk-NSFWX6RO.js";
 import {
   isKoreanDaylightTime
 } from "./chunk-TW4ADZCX.js";
@@ -28,12 +28,15 @@ import {
   analyzePillarRelations,
   calcPillarIndices,
   calcSolarTerms,
+  calculateInjongbeop,
+  calculateJwabeop,
   checkDirectionalCompose,
   checkTripleCompose,
   findTransits,
   getBranchRelation,
   getDaewoon,
   getFourPillars,
+  getGongmang,
   getHiddenStems,
   getJeonggi,
   getRelation,
@@ -41,14 +44,16 @@ import {
   getStemRelation,
   getTwelveMeteor,
   getTwelveSpirit,
+  getYearGanzi,
   toHangul
-} from "./chunk-DGSIRAXF.js";
+} from "./chunk-JLKMDX3R.js";
 import {
   BRANCH_ELEMENT,
   DI_ZHI,
   EARTH,
   EARTH_KR,
   ELEMENT_HANJA,
+  GONGMANG_TABLE,
   HGANJI,
   JIJANGGAN,
   LUCKY_STAR_NAMES,
@@ -65,14 +70,14 @@ import {
   STEM_INFO,
   TIAN_GAN,
   YANGGAN
-} from "./chunk-VJDUZB5T.js";
+} from "./chunk-EXYPMSUR.js";
 import {
   KOREAN_CITIES,
   SEOUL,
   WORLD_CITIES,
   filterCities,
   formatCityName
-} from "./chunk-OCPJGMZC.js";
+} from "./chunk-WOQT7EBV.js";
 import "./chunk-JSBRDJBE.js";
 export {
   ASPECT_SYMBOLS,
@@ -81,6 +86,7 @@ export {
   EARTH,
   EARTH_KR,
   ELEMENT_HANJA,
+  GONGMANG_TABLE,
   HGANJI,
   HOUSE_SYSTEMS,
   JIJANGGAN,
@@ -111,6 +117,8 @@ export {
   analyzePillarRelations,
   calcPillarIndices,
   calcSolarTerms,
+  calculateInjongbeop,
+  calculateJwabeop,
   calculateLiunian,
   calculateNatal,
   calculateSaju,
@@ -125,6 +133,7 @@ export {
   getDaewoon,
   getDaxianList,
   getFourPillars,
+  getGongmang,
   getHiddenStems,
   getJeonggi,
   getRelation,
@@ -132,6 +141,7 @@ export {
   getStemRelation,
   getTwelveMeteor,
   getTwelveSpirit,
+  getYearGanzi,
   isKoreanDaylightTime,
   lonToSign,
   normalizeDeg,

package/dist/natal.js

@@ -11,7 +11,7 @@ import {
   formatDegree,
   lonToSign,
   normalizeDeg
-} from "./chunk-6BKZDAMP.js";
+} from "./chunk-NSFWX6RO.js";
 import {
   isKoreanDaylightTime
 } from "./chunk-TW4ADZCX.js";

package/dist/pillars.d.ts

@@ -1,11 +1,11 @@
-import { AllRelations, PairRelation, RelationResult, TransitItem, Relation, SpecialSals } from './types.js';
+import { AllRelations, PairRelation, JasiMethod, InjongEntry, JwaEntry, RelationResult, TransitItem, Relation, SpecialSals } from './types.js';
 
 /**
  * 그레고리력 → 60갑자 인덱스 [연주, 월주, 일주, 시주]
  *
  * @returns [so24(60년 배수), so24year, so24month, so24day, so24hour]
  */
-declare function calcPillarIndices(year: number, month: number, day: number, hour: number, min: number): [number, number, number, number, number];
+declare function calcPillarIndices(year: number, month: number, day: number, hour: number, min: number, jasiMethod?: JasiMethod): [number, number, number, number, number];
 /**
  * 절기 시간 구하기 - 입기, 중기, 출기 날짜/시각
  */
@@ -30,9 +30,9 @@ declare function calcSolarTerms(year: number, month: number, day: number, hour:
     outgiMin: number;
 };
 /** 4주를 60갑자 문자열로 반환 [년주, 월주, 일주, 시주] */
-declare function getFourPillars(year: number, month: number, day: number, hour: number, minute: number): [string, string, string, string];
+declare function getFourPillars(year: number, month: number, day: number, hour: number, minute: number, jasiMethod?: JasiMethod): [string, string, string, string];
 /** 대운 10개 계산 */
-declare function getDaewoon(isMale: boolean, year: number, month: number, day: number, hour: number, minute: number): Array<{
+declare function getDaewoon(isMale: boolean, year: number, month: number, day: number, hour: number, minute: number, jasiMethod?: JasiMethod): Array<{
     ganzi: string;
     startDate: Date;
 }>;
@@ -48,6 +48,10 @@ declare function toHangul(hanja: string): string;
 declare function getTwelveMeteor(stem: string, branch: string): string;
 /** 12신살 계산 (년지 기준) */
 declare function getTwelveSpirit(yearBranch: string, targetBranch: string): string;
+/** 좌법 계산: 각 주 지장간 → 일지에서의 운성 */
+declare function calculateJwabeop(dayStem: string, branches: string[], dayBranch: string): JwaEntry[][];
+/** 인종법 계산: 일지 지장간에 없는 십성 카테고리의 양간 인종 */
+declare function calculateInjongbeop(dayStem: string, dayBranch: string): InjongEntry[];
 /** 천간 관계 */
 declare function getStemRelation(stem1: string, stem2: string): RelationResult[];
 /** 지지 관계 */
@@ -60,8 +64,12 @@ declare function checkTripleCompose(branches: string[]): RelationResult[];
 declare function checkDirectionalCompose(branches: string[]): RelationResult[];
 /** 모든 주 관계 분석 */
 declare function analyzeAllRelations(pillars: string[]): AllRelations;
-declare function getSpecialSals(dayStem: string, dayPillar: string, branches: string[]): SpecialSals;
+declare function getSpecialSals(stems: string[], branches: string[], dayPillar: string): SpecialSals;
+/** 연도 → 년주 간지 (60갑자 주기) */
+declare function getYearGanzi(year: number): string;
+/** 일주(간지) 기준 공망 지지 2개 반환 */
+declare function getGongmang(dayGanzi: string): [string, string];
 /** N개월간의 일운/월운과 사주의 관계를 찾음 */
 declare function findTransits(natalPillars: string[], months?: number, backward?: boolean): TransitItem[];
 
-export { analyzeAllRelations, analyzePillarRelations, calcPillarIndices, calcSolarTerms, checkDirectionalCompose, checkTripleCompose, findTransits, getBranchRelation, getDaewoon, getFourPillars, getHiddenStems, getJeonggi, getRelation, getSpecialSals, getStemRelation, getTwelveMeteor, getTwelveSpirit, toHangul };
+export { analyzeAllRelations, analyzePillarRelations, calcPillarIndices, calcSolarTerms, calculateInjongbeop, calculateJwabeop, checkDirectionalCompose, checkTripleCompose, findTransits, getBranchRelation, getDaewoon, getFourPillars, getGongmang, getHiddenStems, getJeonggi, getRelation, getSpecialSals, getStemRelation, getTwelveMeteor, getTwelveSpirit, getYearGanzi, toHangul };

package/dist/pillars.js

@@ -3,12 +3,15 @@ import {
   analyzePillarRelations,
   calcPillarIndices,
   calcSolarTerms,
+  calculateInjongbeop,
+  calculateJwabeop,
   checkDirectionalCompose,
   checkTripleCompose,
   findTransits,
   getBranchRelation,
   getDaewoon,
   getFourPillars,
+  getGongmang,
   getHiddenStems,
   getJeonggi,
   getRelation,
@@ -16,21 +19,25 @@ import {
   getStemRelation,
   getTwelveMeteor,
   getTwelveSpirit,
+  getYearGanzi,
   toHangul
-} from "./chunk-DGSIRAXF.js";
-import "./chunk-VJDUZB5T.js";
+} from "./chunk-JLKMDX3R.js";
+import "./chunk-EXYPMSUR.js";
 import "./chunk-JSBRDJBE.js";
 export {
   analyzeAllRelations,
   analyzePillarRelations,
   calcPillarIndices,
   calcSolarTerms,
+  calculateInjongbeop,
+  calculateJwabeop,
   checkDirectionalCompose,
   checkTripleCompose,
   findTransits,
   getBranchRelation,
   getDaewoon,
   getFourPillars,
+  getGongmang,
   getHiddenStems,
   getJeonggi,
   getRelation,
@@ -38,5 +45,6 @@ export {
   getStemRelation,
   getTwelveMeteor,
   getTwelveSpirit,
+  getYearGanzi,
   toHangul
 };

package/dist/saju.js

@@ -1,9 +1,9 @@
 import {
   calculateSaju
-} from "./chunk-ETDERV6C.js";
+} from "./chunk-6PLRETU5.js";
 import "./chunk-TW4ADZCX.js";
-import "./chunk-DGSIRAXF.js";
-import "./chunk-VJDUZB5T.js";
+import "./chunk-JLKMDX3R.js";
+import "./chunk-EXYPMSUR.js";
 import "./chunk-JSBRDJBE.js";
 export {
   calculateSaju

package/dist/types.d.ts

@@ -4,6 +4,8 @@ type Element = 'tree' | 'fire' | 'earth' | 'metal' | 'water';
 type YinYang = '+' | '-';
 /** 성별 */
 type Gender = 'M' | 'F';
+/** 자시법 (子時法) — 23:00~01:00 구간 일주 처리 방식 */
+type JasiMethod = 'split' | 'unified';
 /** 생년월일시 입력 */
 interface BirthInput {
     year: number;
@@ -14,6 +16,8 @@ interface BirthInput {
     gender: Gender;
     /** 시간 모름 여부 */
     unknownTime?: boolean;
+    /** 자시법 (기본값: 'unified' 통자시) */
+    jasiMethod?: JasiMethod;
     /** 위도 (기본값: 37.5194 서울) */
     latitude?: number;
     /** 경도 (기본값: 127.0992 서울) */
@@ -75,6 +79,8 @@ interface DaewoonItem {
     unseong: string;
     /** 12신살 (연지 기준) */
     sinsal: string;
+    /** 공망 여부 */
+    isGongmang: boolean;
 }
 /** 관계 분석 결과 */
 interface RelationResult {
@@ -97,6 +103,32 @@ interface SpecialSals {
     yangin: number[];
     baekho: boolean;
     goegang: boolean;
+    dohwa: number[];
+    cheonul: number[];
+    cheonduk: number[];
+    wolduk: number[];
+    munchang: number[];
+    hongyeom: boolean;
+    geumyeo: number[];
+}
+/** 공망 정보 */
+interface Gongmang {
+    /** 공망 지지 2개 */
+    branches: [string, string];
+    /** 공망에 든 주의 인덱스 (0=시, 1=일, 2=월, 3=년) */
+    pillarIndices: number[];
+}
+/** 좌법 항목 (지장간 → 일지 운성) */
+interface JwaEntry {
+    stem: string;
+    sipsin: string;
+    unseong: string;
+}
+/** 인종법 항목 (일지에 없는 십성 카테고리) */
+interface InjongEntry {
+    category: string;
+    yangStem: string;
+    unseong: string;
 }
 /** 트랜짓 항목 */
 interface TransitItem {
@@ -120,6 +152,12 @@ interface SajuResult {
     relations: AllRelations;
     /** 신살 */
     specialSals: SpecialSals;
+    /** 공망 */
+    gongmang: Gongmang;
+    /** 좌법 (각 주 지장간 → 일지 운성) — 4주×N지장간 */
+    jwabeop: JwaEntry[][];
+    /** 인종법 (일지에 없는 십성 카테고리 인종) */
+    injongbeop: InjongEntry[];
 }
 /** 오행국 */
 interface WuXingJu {
@@ -185,7 +223,7 @@ interface LiuNianInfo {
 /** 12궁 별자리 */
 type ZodiacSign = 'Aries' | 'Taurus' | 'Gemini' | 'Cancer' | 'Leo' | 'Virgo' | 'Libra' | 'Scorpio' | 'Sagittarius' | 'Capricorn' | 'Aquarius' | 'Pisces';
 /** 행성 ID */
-type PlanetId = 'Sun' | 'Moon' | 'Mercury' | 'Venus' | 'Mars' | 'Jupiter' | 'Saturn' | 'Uranus' | 'Neptune' | 'Pluto' | 'Chiron' | 'NorthNode' | 'SouthNode';
+type PlanetId = 'Sun' | 'Moon' | 'Mercury' | 'Venus' | 'Mars' | 'Jupiter' | 'Saturn' | 'Uranus' | 'Neptune' | 'Pluto' | 'Chiron' | 'NorthNode' | 'SouthNode' | 'Fortuna';
 /** 행성 위치 */
 interface PlanetPosition {
     id: PlanetId;
@@ -195,7 +233,8 @@ interface PlanetPosition {
     sign: ZodiacSign;
     degreeInSign: number;
     isRetrograde: boolean;
-    house: number;
+    /** 하우스 번호 (시간 모름이면 undefined) */
+    house?: number;
 }
 /** 하우스 cusp */
 interface NatalHouse {
@@ -242,8 +281,9 @@ interface NatalChart {
     input: BirthInput;
     planets: PlanetPosition[];
     houses: NatalHouse[];
-    angles: NatalAngles;
+    /** 앵글 (시간 모름이면 null) */
+    angles: NatalAngles | null;
     aspects: NatalAspect[];
 }
 
-export type { AllRelations, AspectType, BirthInput, DaewoonItem, Element, Gender, LiuNianInfo, LiuYueInfo, Meteor, NatalAngles, NatalAspect, NatalChart, NatalHouse, PairRelation, Pillar, PillarDetail, PlanetId, PlanetPosition, Relation, RelationResult, SajuResult, SpecialSals, Spirit, StemInfo, TransitItem, WuXingJu, YinYang, ZiweiChart, ZiweiPalace, ZiweiStar, ZodiacSign };
+export type { AllRelations, AspectType, BirthInput, DaewoonItem, Element, Gender, Gongmang, InjongEntry, JasiMethod, JwaEntry, LiuNianInfo, LiuYueInfo, Meteor, NatalAngles, NatalAspect, NatalChart, NatalHouse, PairRelation, Pillar, PillarDetail, PlanetId, PlanetPosition, Relation, RelationResult, SajuResult, SpecialSals, Spirit, StemInfo, TransitItem, WuXingJu, YinYang, ZiweiChart, ZiweiPalace, ZiweiStar, ZodiacSign };

package/dist/ziwei.js

@@ -2,9 +2,9 @@ import {
   calculateLiunian,
   createChart,
   getDaxianList
-} from "./chunk-CISACDIA.js";
+} from "./chunk-APL4STY7.js";
 import "./chunk-TW4ADZCX.js";
-import "./chunk-VJDUZB5T.js";
+import "./chunk-EXYPMSUR.js";
 import "./chunk-JSBRDJBE.js";
 export {
   calculateLiunian,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orrery/core",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "license": "AGPL-3.0-only",
   "type": "module",
   "keywords": [