iztro - npm Package Compare versions

Comparing version 1.3.5 to 2.0.0

CHANGELOG.md

@@ -1,2 +0,2 @@
-# 紫微斗数 @sylarlong/astro
+# 紫微斗数
 
@@ -10,2 +10,14 @@ [文档地址｜Docuemnt](http://docs.iztro.com)
 
+## v2.0.0
+
+- 🪄 功能（feature）
+
+  🇨🇳
+
+  - 分离日期转换组件 #80
+
+  🇺🇸
+
+  - split `calendar` component #80
+
 ## v1.3.5
@@ -12,0 +24,0 @@

lib/astro/astro.d.ts

@@ -36,3 +36,3 @@ import { Language } from '../data/types';
  */
-export declare const getZodiacBySolarDate: (solarDateStr: string, language?: Language) => unknown;
+export declare const getZodiacBySolarDate: (solarDateStr: string, language?: Language) => string;
 /**
@@ -57,3 +57,3 @@ * 通过农历年份获取十二生肖
  */
-export declare const getSignBySolarDate: (solarDateStr: string, language?: Language) => unknown;
+export declare const getSignBySolarDate: (solarDateStr: string, language?: Language) => string;
 /**
@@ -69,3 +69,3 @@ * 通过农历获取星座
  */
-export declare const getSignByLunarDate: (lunarDateStr: string, isLeapMonth?: boolean, language?: Language) => unknown;
+export declare const getSignByLunarDate: (lunarDateStr: string, isLeapMonth?: boolean, language?: Language) => string;
 /**
@@ -72,0 +72,0 @@ * 通过阳历获取命宫主星

lib/astro/astro.js

@@ -7,4 +7,3 @@ "use strict";
 exports.getMajorStarByLunarDate = exports.getMajorStarBySolarDate = exports.getSignByLunarDate = exports.getSignBySolarDate = exports.getZodiacByLunarYear = exports.getZodiacBySolarDate = exports.astrolabeByLunarDate = exports.astrolabeBySolarDate = void 0;
-var __1 = require("..");
-var calendar_1 = require("../calendar");
+var lunar_lite_1 = require("lunar-lite");
 var data_1 = require("../data");
@@ -31,3 +30,3 @@ var i18n_1 = require("../i18n");
     var palaces = [];
-    var yearly = (0, calendar_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
     var earthlyBranchOfYear = (0, i18n_1.kot)(yearly[1], 'Earthly');
@@ -67,13 +66,13 @@ var _a = (0, palace_1.getSoulAndBody)(solarDateStr, timeIndex, fixLeap), bodyIndex = _a.bodyIndex, soulIndex = _a.soulIndex, heavenlyStemOfSoul = _a.heavenlyStemOfSoul, earthlyBranchOfSoul = _a.earthlyBranchOfSoul;
     var earthlyBranchOfBodyPalace = (0, i18n_1.t)(data_1.EARTHLY_BRANCHES[(0, utils_1.fixIndex)(bodyIndex + 2)]);
-    var chineseDate = (0, calendar_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex);
-    var lunarDate = (0, calendar_1.solar2lunar)(solarDateStr);
+    var chineseDate = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex);
+    var lunarDate = (0, lunar_lite_1.solar2lunar)(solarDateStr);
     var result = new FunctionalAstrolabe_1.default({
         solarDate: solarDateStr,
         lunarDate: lunarDate.toString(true),
-        chineseDate: chineseDate.toString(),
+        chineseDate: (0, utils_1.translateChineseDate)(chineseDate),
         rawDates: { lunarDate: lunarDate, chineseDate: chineseDate },
         time: (0, i18n_1.t)(data_1.CHINESE_TIME[timeIndex]),
         timeRange: data_1.TIME_RANGE[timeIndex],
-        sign: (0, calendar_1.getSign)(solarDateStr),
-        zodiac: (0, calendar_1.getZodiac)(yearly[1]),
+        sign: (0, exports.getSignBySolarDate)(solarDateStr, language),
+        zodiac: (0, exports.getZodiacBySolarDate)(solarDateStr, language),
         earthlyBranchOfSoulPalace: (0, i18n_1.t)(earthlyBranchOfSoulPalace),
@@ -103,3 +102,3 @@ earthlyBranchOfBodyPalace: earthlyBranchOfBodyPalace,
     if (fixLeap === void 0) { fixLeap = true; }
-    var solarDate = (0, calendar_1.lunar2solar)(lunarDateStr, isLeapMonth);
+    var solarDate = (0, lunar_lite_1.lunar2solar)(lunarDateStr, isLeapMonth);
     return (0, exports.astrolabeBySolarDate)(solarDate.toString(), timeIndex, gender, fixLeap, language);
@@ -119,5 +118,5 @@ };
     language && (0, i18n_1.setLanguage)(language);
-    var lunarYear = (0, calendar_1.solar2lunar)(solarDateStr).lunarYear;
-    var yearly = (0, calendar_1.heavenlyStemAndEarthlyBranchOfYear)(lunarYear);
-    return (0, i18n_1.t)(__1.calendar.getZodiac(yearly[1]));
+    var lunarYear = (0, lunar_lite_1.solar2lunar)(solarDateStr).lunarYear;
+    var yearly = (0, lunar_lite_1.heavenlyStemAndEarthlyBranchOfYear)(lunarYear);
+    return (0, i18n_1.t)((0, i18n_1.kot)((0, lunar_lite_1.getZodiac)(yearly[1])));
 };
@@ -136,4 +135,4 @@ exports.getZodiacBySolarDate = getZodiacBySolarDate;
     language && (0, i18n_1.setLanguage)(language);
-    var yearly = (0, calendar_1.heavenlyStemAndEarthlyBranchOfYear)(year);
-    return (0, i18n_1.t)(__1.calendar.getZodiac(yearly[1]));
+    var yearly = (0, lunar_lite_1.heavenlyStemAndEarthlyBranchOfYear)(year);
+    return (0, i18n_1.t)((0, i18n_1.kot)((0, lunar_lite_1.getZodiac)(yearly[1])));
 };
@@ -152,3 +151,3 @@ exports.getZodiacByLunarYear = getZodiacByLunarYear;
     language && (0, i18n_1.setLanguage)(language);
-    return (0, i18n_1.t)((0, calendar_1.getSign)(solarDateStr));
+    return (0, i18n_1.t)((0, i18n_1.kot)((0, lunar_lite_1.getSign)(solarDateStr)));
 };
@@ -168,4 +167,4 @@ exports.getSignBySolarDate = getSignBySolarDate;
     language && (0, i18n_1.setLanguage)(language);
-    var solarDate = (0, calendar_1.lunar2solar)(lunarDateStr, isLeapMonth);
-    return (0, i18n_1.t)((0, calendar_1.getSign)(solarDate.toString()));
+    var solarDate = (0, lunar_lite_1.lunar2solar)(lunarDateStr, isLeapMonth);
+    return (0, exports.getSignBySolarDate)(solarDate.toString(), language);
 };
@@ -215,5 +214,5 @@ exports.getSignByLunarDate = getSignByLunarDate;
     if (fixLeap === void 0) { fixLeap = true; }
-    var solarDate = (0, calendar_1.lunar2solar)(lunarDateStr, isLeapMonth);
+    var solarDate = (0, lunar_lite_1.lunar2solar)(lunarDateStr, isLeapMonth);
     return (0, exports.getMajorStarBySolarDate)(solarDate.toString(), timeIndex, fixLeap, language);
 };
 exports.getMajorStarByLunarDate = getMajorStarByLunarDate;

lib/astro/FunctionalAstrolabe.d.ts

@@ -94,4 +94,4 @@ import { Astrolabe, Horoscope } from '../data/types';
     rawDates: {
-        lunarDate: import("../data/types").LunarDate;
-        chineseDate: import("../data/types").HeavenlyStemAndEarthlyBranchDate;
+        lunarDate: import("lunar-lite/lib/types").LunarDate;
+        chineseDate: import("lunar-lite/lib/types").HeavenlyStemAndEarthlyBranchDate;
     };
@@ -98,0 +98,0 @@ time: string;

lib/astro/FunctionalAstrolabe.js

@@ -16,3 +16,3 @@ "use strict";
 var dayjs_1 = __importDefault(require("dayjs"));
-var calendar_1 = require("../calendar");
+var lunar_lite_1 = require("lunar-lite");
 var data_1 = require("../data");
@@ -39,6 +39,6 @@ var i18n_1 = require("../i18n");
     if (targetDate === void 0) { targetDate = new Date(); }
-    var _birthday = (0, calendar_1.solar2lunar)($.solarDate);
-    var _date = (0, calendar_1.solar2lunar)(targetDate);
+    var _birthday = (0, lunar_lite_1.solar2lunar)($.solarDate);
+    var _date = (0, lunar_lite_1.solar2lunar)(targetDate);
     var convertTimeIndex = (0, utils_1.timeToIndex)((0, dayjs_1.default)(targetDate).hour());
-    var _a = (0, calendar_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(targetDate.toString(), timeIndex || convertTimeIndex), yearly = _a.yearly, monthly = _a.monthly, daily = _a.daily, hourly = _a.hourly;
+    var _a = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(targetDate.toString(), timeIndex || convertTimeIndex), yearly = _a.yearly, monthly = _a.monthly, daily = _a.daily, hourly = _a.hourly;
     // 虚岁
@@ -97,3 +97,3 @@ var nominalAge = _date.lunarYear - _birthday.lunarYear;
     var scope = {
-        solarDate: (0, calendar_1.normalizeSolarDateStr)(targetDate).join('-'),
+        solarDate: (0, lunar_lite_1.normalizeDateStr)(targetDate).slice(0, 3).join('-'),
         lunarDate: _date.toString(true),
@@ -103,4 +103,4 @@ decadal: {
             name: (0, i18n_1.t)('decadal'),
-            heavenlyStem: heavenlyStemOfDecade,
-            earthlyBranch: earthlyBranchOfDecade,
+            heavenlyStem: (0, i18n_1.t)((0, i18n_1.kot)(heavenlyStemOfDecade, 'Heavnly')),
+            earthlyBranch: (0, i18n_1.t)((0, i18n_1.kot)(earthlyBranchOfDecade, 'Earthly')),
             palaceNames: (0, palace_1.getPalaceNames)(decadalIndex),
@@ -118,4 +118,4 @@ mutagen: (0, utils_1.getMutagensByHeavenlyStem)(heavenlyStemOfDecade),
             name: (0, i18n_1.t)('yearly'),
-            heavenlyStem: yearly[0],
-            earthlyBranch: yearly[1],
+            heavenlyStem: (0, i18n_1.t)((0, i18n_1.kot)(yearly[0], 'Heavenly')),
+            earthlyBranch: (0, i18n_1.t)((0, i18n_1.kot)(yearly[1], 'Earthly')),
             palaceNames: (0, palace_1.getPalaceNames)(yearlyIndex),
@@ -129,4 +129,4 @@ mutagen: (0, utils_1.getMutagensByHeavenlyStem)(yearly[0]),
             name: (0, i18n_1.t)('monthly'),
-            heavenlyStem: monthly[0],
-            earthlyBranch: monthly[1],
+            heavenlyStem: (0, i18n_1.t)((0, i18n_1.kot)(monthly[0], 'Heavenly')),
+            earthlyBranch: (0, i18n_1.t)((0, i18n_1.kot)(monthly[1], 'Earthly')),
             palaceNames: (0, palace_1.getPalaceNames)(monthlyIndex),
@@ -138,4 +138,4 @@ mutagen: (0, utils_1.getMutagensByHeavenlyStem)(monthly[0]),
             name: (0, i18n_1.t)('daily'),
-            heavenlyStem: daily[0],
-            earthlyBranch: daily[1],
+            heavenlyStem: (0, i18n_1.t)((0, i18n_1.kot)(daily[0], 'Heavenly')),
+            earthlyBranch: (0, i18n_1.t)((0, i18n_1.kot)(daily[1], 'Earthly')),
             palaceNames: (0, palace_1.getPalaceNames)(dailyIndex),
@@ -147,4 +147,4 @@ mutagen: (0, utils_1.getMutagensByHeavenlyStem)(daily[0]),
             name: (0, i18n_1.t)('hourly'),
-            heavenlyStem: hourly[0],
-            earthlyBranch: hourly[1],
+            heavenlyStem: (0, i18n_1.t)((0, i18n_1.kot)(hourly[0], 'Heavenly')),
+            earthlyBranch: (0, i18n_1.t)((0, i18n_1.kot)(hourly[1], 'Earthly')),
             palaceNames: (0, palace_1.getPalaceNames)(hourlyIndex),
@@ -151,0 +151,0 @@ mutagen: (0, utils_1.getMutagensByHeavenlyStem)(hourly[0]),

lib/astro/palace.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHoroscope = exports.getPalaceNames = exports.getFiveElementsClass = exports.getSoulAndBody = void 0;
-var calendar_1 = require("../calendar");
+var lunar_lite_1 = require("lunar-lite");
 var data_1 = require("../data");
@@ -26,3 +26,3 @@ var i18n_1 = require("../i18n");
 var getSoulAndBody = function (solarDate, timeIndex, fixLeap) {
-    var _a = (0, calendar_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDate, timeIndex), yearly = _a.yearly, hourly = _a.hourly;
+    var _a = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDate, timeIndex), yearly = _a.yearly, hourly = _a.hourly;
     var earthlyBranchOfTime = (0, i18n_1.kot)(hourly[1], 'Earthly');
@@ -142,3 +142,3 @@ var heavenlyStemOfYear = (0, i18n_1.kot)(yearly[0], 'Heavenly');
     var genderKey = (0, i18n_1.kot)(gender);
-    var yearly = (0, calendar_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
     var heavenlyStem = (0, i18n_1.kot)(yearly[0], 'Heavenly');
@@ -145,0 +145,0 @@ var earthlyBranch = (0, i18n_1.kot)(yearly[1], 'Earthly');

lib/data/types/astro.d.ts

 import { IFunctionalPalace } from '../../astro/FunctionalPalace';
 import { EarthlyBranchName, FiveElementsClassName, HeavenlyStemName, PalaceName, StarName } from '../../i18n';
 import FunctionalStar from '../../star/FunctionalStar';
-import { HeavenlyStemAndEarthlyBranchDate, LunarDate } from './calendar';
+import { HeavenlyStemAndEarthlyBranchDate, LunarDate } from 'lunar-lite/lib/types';
 /**
@@ -6,0 +6,0 @@ * 运限对象

lib/data/types/index.d.ts

 export * from './general';
-export * from './calendar';
 export * from './star';
 export * from './astro';
 export * from './palace';

lib/data/types/index.js

@@ -18,5 +18,4 @@ "use strict";
 __exportStar(require("./general"), exports);
-__exportStar(require("./calendar"), exports);
 __exportStar(require("./star"), exports);
 __exportStar(require("./astro"), exports);
 __exportStar(require("./palace"), exports);

lib/index.d.ts

 export * as data from './data';
 export * as star from './star';
 export * as util from './utils';
-export * as calendar from './calendar';
 export * as astro from './astro';

lib/index.js

@@ -26,7 +26,6 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.astro = exports.calendar = exports.util = exports.star = exports.data = void 0;
+exports.astro = exports.util = exports.star = exports.data = void 0;
 exports.data = __importStar(require("./data"));
 exports.star = __importStar(require("./star"));
 exports.util = __importStar(require("./utils"));
-exports.calendar = __importStar(require("./calendar"));
 exports.astro = __importStar(require("./astro"));

lib/star/adjectiveStar.js

@@ -7,4 +7,4 @@ "use strict";
 exports.getAdjectiveStar = void 0;
+var lunar_lite_1 = require("lunar-lite");
 var _1 = require(".");
-var calendar_1 = require("../calendar");
 var i18n_1 = require("../i18n");
@@ -23,3 +23,3 @@ var FunctionalStar_1 = __importDefault(require("./FunctionalStar"));
     var stars = (0, _1.initStars)();
-    var yearly = (0, calendar_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
     var yearlyIndex = (0, location_1.getYearlyStarIndex)(solarDateStr, timeIndex, fixLeap);
@@ -26,0 +26,0 @@ var monthlyIndex = (0, location_1.getMonthlyStarIndex)(solarDateStr, timeIndex, fixLeap);

lib/star/decorativeStar.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getYearly12 = exports.getJiangqian12StartIndex = exports.getBoShi12 = exports.getchangsheng12 = exports.getChangesheng12StartIndex = void 0;
+var lunar_lite_1 = require("lunar-lite");
 var astro_1 = require("../astro");
-var calendar_1 = require("../calendar");
 var data_1 = require("../data");
@@ -63,3 +63,3 @@ var i18n_1 = require("../i18n");
     var genderKey = (0, i18n_1.kot)(gender);
-    var yearly = (0, calendar_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0).yearly;
     var earthlyBranchNameOfYear = yearly[1];
@@ -111,3 +111,3 @@ var earthlyBranchOfYear = (0, i18n_1.kot)(earthlyBranchNameOfYear, 'Earthly');
     var genderKey = (0, i18n_1.kot)(gender);
-    var yearly = (0, calendar_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0).yearly;
     var heavenlyStemNameOfYear = yearly[0], earthlyBranchNameOfYear = yearly[1];
@@ -188,3 +188,3 @@ var earthlyBranchOfYear = (0, i18n_1.kot)(earthlyBranchNameOfYear, 'Earthly');
     var suiqian12 = [];
-    var yearly = (0, calendar_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0).yearly;
     var ts12shen = [
@@ -191,0 +191,0 @@ 'suijian',

lib/star/location.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getChangQuIndexByHeavenlyStem = exports.getMonthlyStarIndex = exports.getNianjieIndex = exports.getYearlyStarIndex = exports.getGuGuaIndex = exports.getHuagaiXianchiIndex = exports.getLuanXiIndex = exports.getHuoLingIndex = exports.getKongJieIndex = exports.getTimelyStarIndex = exports.getDailyStarIndex = exports.getChangQuIndex = exports.getZuoYouIndex = exports.getKuiYueIndex = exports.getLuYangTuoMaIndex = exports.getStartIndex = void 0;
+var lunar_lite_1 = require("lunar-lite");
 var astro_1 = require("../astro");
-var calendar_1 = require("../calendar");
 var data_1 = require("../data");
@@ -29,3 +29,3 @@ var i18n_1 = require("../i18n");
     var _a = (0, astro_1.getSoulAndBody)(solarDateStr, timeIndex, fixLeap), heavenlyStemOfSoul = _a.heavenlyStemOfSoul, earthlyBranchOfSoul = _a.earthlyBranchOfSoul;
-    var _b = (0, calendar_1.solar2lunar)(solarDateStr), lunarYear = _b.lunarYear, lunarMonth = _b.lunarMonth, lunarDay = _b.lunarDay;
+    var _b = (0, lunar_lite_1.solar2lunar)(solarDateStr), lunarYear = _b.lunarYear, lunarMonth = _b.lunarMonth, lunarDay = _b.lunarDay;
     var fiveElements = (0, i18n_1.kot)((0, astro_1.getFiveElementsClass)(heavenlyStemOfSoul, earthlyBranchOfSoul));
@@ -36,3 +36,3 @@ var remainder = -1; // 余数
     // 获取当月最大天数
-    var maxDays = (0, calendar_1.getTotalDaysOfLunarMonth)(lunarYear, lunarMonth);
+    var maxDays = (0, lunar_lite_1.getTotalDaysOfLunarMonth)(lunarYear, lunarMonth);
     // 如果timeIndex等于12说明是晚子时，需要加一天
@@ -267,3 +267,3 @@ var _day = timeIndex === 12 ? lunarDay + 1 : lunarDay;
 var getDailyStarIndex = function (solarDateStr, timeIndex) {
-    var _a = (0, calendar_1.solar2lunar)(solarDateStr), lunarMonth = _a.lunarMonth, lunarDay = _a.lunarDay;
+    var _a = (0, lunar_lite_1.solar2lunar)(solarDateStr), lunarMonth = _a.lunarMonth, lunarDay = _a.lunarDay;
     var _b = (0, exports.getZuoYouIndex)(lunarMonth), zuoIndex = _b.zuoIndex, youIndex = _b.youIndex;
@@ -531,3 +531,3 @@ var _c = (0, exports.getChangQuIndex)(timeIndex), changIndex = _c.changIndex, quIndex = _c.quIndex;
 var getYearlyStarIndex = function (solarDate, timeIndex, fixLeap) {
-    var yearly = (0, calendar_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDate, timeIndex).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDate, timeIndex).yearly;
     var _a = (0, astro_1.getSoulAndBody)(solarDate, timeIndex, fixLeap), soulIndex = _a.soulIndex, bodyIndex = _a.bodyIndex;
@@ -534,0 +534,0 @@ var heavenlyStem = (0, i18n_1.kot)(yearly[0], 'Heavenly');

lib/star/majorStar.js

@@ -7,4 +7,4 @@ "use strict";
 exports.getMajorStar = void 0;
+var lunar_lite_1 = require("lunar-lite");
 var _1 = require(".");
-var calendar_1 = require("../calendar");
 var i18n_1 = require("../i18n");
@@ -32,3 +32,3 @@ var utils_1 = require("../utils");
     var _a = (0, location_1.getStartIndex)(solarDateStr, timeIndex, fixLeap), ziweiIndex = _a.ziweiIndex, tianfuIndex = _a.tianfuIndex;
-    var yearly = (0, calendar_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
     var stars = (0, _1.initStars)();
@@ -35,0 +35,0 @@ var ziweiGroup = [

lib/star/minorStar.js

@@ -7,4 +7,4 @@ "use strict";
 exports.getMinorStar = void 0;
+var lunar_lite_1 = require("lunar-lite");
 var _1 = require(".");
-var calendar_1 = require("../calendar");
 var i18n_1 = require("../i18n");
@@ -24,3 +24,3 @@ var utils_1 = require("../utils");
     var stars = (0, _1.initStars)();
-    var yearly = (0, calendar_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
     var monthIndex = (0, utils_1.fixLunarMonthIndex)(solarDateStr, timeIndex, fixLeap);
@@ -27,0 +27,0 @@ // 此处获取到的是索引，下标是从0开始的，所以需要加1

lib/utils/index.d.ts

 import { Brightness, EarthlyBranchName, HeavenlyStemName, Mutagen, StarName } from '../i18n';
 import FunctionalStar from '../star/FunctionalStar';
+import { HeavenlyStemAndEarthlyBranchDate } from 'lunar-lite/lib/types';
 /**
@@ -41,3 +42,3 @@ * 用于处理索引，将索引锁定在 0~max 范围内
  */
-export declare const fixLunarDate: (solarDateStr: string, timeIndex: number) => import("../data/types").LunarDate;
+export declare const fixLunarDate: (solarDateStr: string, timeIndex: number) => import("lunar-lite/lib/types").LunarDate;
 /**
@@ -57,2 +58,9 @@ * 调整农历月份的索引
 export declare const fixLunarMonthIndex: (solarDateStr: string, timeIndex: number, fixLeap?: boolean) => number;
+/**
+ * 获取农历日期【天】的索引，晚子时将加一天，所以如果是晚子时下标不需要减一
+ *
+ * @param lunarDay 农历日期【天】
+ * @param timeIndex 时辰索引
+ * @returns {number} 农历日期【天】
+ */
 export declare const fixLunarDayIndex: (lunarDay: number, timeIndex: number) => number;
@@ -84,1 +92,8 @@ /**
 export declare const getAgeIndex: (earthlyBranchName: EarthlyBranchName) => number;
+/**
+ * 返回翻译后的干支纪年字符串
+ *
+ * @param chineseDate 干支纪年日期对象
+ * @returns 干支纪年字符串
+ */
+export declare const translateChineseDate: (chineseDate: HeavenlyStemAndEarthlyBranchDate) => string;

lib/utils/index.js

@@ -6,4 +6,4 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAgeIndex = exports.timeToIndex = exports.mergeStars = exports.fixLunarDayIndex = exports.fixLunarMonthIndex = exports.fixLunarDate = exports.fixEarthlyBranchIndex = exports.getMutagensByHeavenlyStem = exports.getMutagen = exports.getBrightness = exports.earthlyBranchIndexToPalaceIndex = exports.fixIndex = void 0;
-var calendar_1 = require("../calendar");
+exports.translateChineseDate = exports.getAgeIndex = exports.timeToIndex = exports.mergeStars = exports.fixLunarDayIndex = exports.fixLunarMonthIndex = exports.fixLunarDate = exports.fixEarthlyBranchIndex = exports.getMutagensByHeavenlyStem = exports.getMutagen = exports.getBrightness = exports.earthlyBranchIndexToPalaceIndex = exports.fixIndex = void 0;
+var lunar_lite_1 = require("lunar-lite");
 var data_1 = require("../data");
@@ -86,5 +86,5 @@ var star_1 = require("../star");
 var fixLunarDate = function (solarDateStr, timeIndex) {
-    var lunarDate = (0, calendar_1.solar2lunar)(solarDateStr);
+    var lunarDate = (0, lunar_lite_1.solar2lunar)(solarDateStr);
     // 获取当月的天数
-    var totalDaysOfLunarMonth = (0, calendar_1.getTotalDaysOfLunarMonth)(lunarDate.lunarYear, lunarDate.lunarMonth);
+    var totalDaysOfLunarMonth = (0, lunar_lite_1.getTotalDaysOfLunarMonth)(lunarDate.lunarYear, lunarDate.lunarMonth);
     if (timeIndex >= 12 && lunarDate.lunarDay >= totalDaysOfLunarMonth) {
@@ -94,3 +94,3 @@ // 假如是晚子时并且日期是农历月的最后一天时，月份需要加1
         dt.add(1, 'day');
-        lunarDate = (0, calendar_1.solar2lunar)(new Date(dt.format()));
+        lunarDate = (0, lunar_lite_1.solar2lunar)(new Date(dt.format()));
     }
@@ -121,2 +121,9 @@ return lunarDate;
 exports.fixLunarMonthIndex = fixLunarMonthIndex;
+/**
+ * 获取农历日期【天】的索引，晚子时将加一天，所以如果是晚子时下标不需要减一
+ *
+ * @param lunarDay 农历日期【天】
+ * @param timeIndex 时辰索引
+ * @returns {number} 农历日期【天】
+ */
 var fixLunarDayIndex = function (lunarDay, timeIndex) { return (timeIndex >= 12 ? lunarDay : lunarDay - 1); };
@@ -190,1 +197,22 @@ exports.fixLunarDayIndex = fixLunarDayIndex;
 exports.getAgeIndex = getAgeIndex;
+/**
+ * 返回翻译后的干支纪年字符串
+ *
+ * @param chineseDate 干支纪年日期对象
+ * @returns 干支纪年字符串
+ */
+var translateChineseDate = function (chineseDate) {
+    var yearly = chineseDate.yearly, monthly = chineseDate.monthly, daily = chineseDate.daily, hourly = chineseDate.hourly;
+    if (yearly.some(function (item) { return (0, i18n_1.t)((0, i18n_1.kot)(item)).length > 1; }) ||
+        monthly.some(function (item) { return (0, i18n_1.t)((0, i18n_1.kot)(item)).length > 1; }) ||
+        daily.some(function (item) { return (0, i18n_1.t)((0, i18n_1.kot)(item)).length > 1; }) ||
+        hourly.some(function (item) { return (0, i18n_1.t)((0, i18n_1.kot)(item)).length > 1; })) {
+        return "".concat(yearly.map(function (item) { return (0, i18n_1.t)((0, i18n_1.kot)(item)); }).join(' '), " - ").concat(monthly.map(function (item) { return (0, i18n_1.t)((0, i18n_1.kot)(item)); }).join(' '), " - ").concat(daily
+            .map(function (item) { return (0, i18n_1.t)((0, i18n_1.kot)(item)); })
+            .join(' '), " - ").concat(hourly.map(function (item) { return (0, i18n_1.t)((0, i18n_1.kot)(item)); }).join(' '));
+    }
+    return "".concat(yearly.map(function (item) { return (0, i18n_1.t)((0, i18n_1.kot)(item)); }).join(''), " ").concat(monthly.map(function (item) { return (0, i18n_1.t)((0, i18n_1.kot)(item)); }).join(''), " ").concat(daily
+        .map(function (item) { return (0, i18n_1.t)((0, i18n_1.kot)(item)); })
+        .join(''), " ").concat(hourly.map(function (item) { return (0, i18n_1.t)((0, i18n_1.kot)(item)); }).join(''));
+};
+exports.translateChineseDate = translateChineseDate;

package.json

 {
   "name": "iztro",
-  "version": "1.3.5",
+  "version": "2.0.0",
   "description": "轻量级紫微斗数星盘生成库。可以通过出生年月日获取到紫微斗数星盘信息、生肖、星座等信息。A lightweight kit to astrolabe generator of The Purple Star Astrology (Zi Wei Dou Shu). The Purple Star Astrology(Zi Wei Dou Shu) is a Chinese ancient astrology. You're able to get your horoscope and personality from the astrolabe",
@@ -62,4 +62,5 @@ "main": "lib/index.js",
     "dayjs": "^1.11.10",
-    "i18next": "^23.5.1"
+    "i18next": "^23.5.1",
+    "lunar-lite": "^0.0.2"
   }
 }

README-en_US.md

@@ -18,3 +18,3 @@ <div align="center">
 [![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/SylarLong/iztro)](https://www.npmjs.com/package/iztro) 
-[![npm bundle size](https://img.shields.io/bundlephobia/min/%40sylarlong%2Fastro)](https://www.npmjs.com/package/iztro) 
+[![npm bundle size](https://img.shields.io/bundlephobia/min/iztro)](https://www.npmjs.com/package/iztro) 
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FSylarLong%2Fiztro.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FSylarLong%2Fiztro?ref=badge_shield) 
@@ -21,0 +21,0 @@ [![Socket Badge](https://socket.dev/api/badge/npm/package/iztro)](https://socket.dev/npm/package/iztro)

README-zh_TW.md

@@ -18,3 +18,3 @@ <div align="center">
 [![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/SylarLong/iztro)](https://www.npmjs.com/package/iztro) 
-[![npm bundle size](https://img.shields.io/bundlephobia/min/%40sylarlong%2Fastro)](https://www.npmjs.com/package/iztro) 
+[![npm bundle size](https://img.shields.io/bundlephobia/min/iztro)](https://www.npmjs.com/package/iztro) 
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FSylarLong%2Fiztro.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FSylarLong%2Fiztro?ref=badge_shield) 
@@ -21,0 +21,0 @@ [![Socket Badge](https://socket.dev/api/badge/npm/package/iztro)](https://socket.dev/npm/package/iztro)

README.md

@@ -19,3 +19,3 @@ <div align="center">
 [![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/SylarLong/iztro)](https://www.npmjs.com/package/iztro) 
-[![npm bundle size](https://img.shields.io/bundlephobia/min/%40sylarlong%2Fastro)](https://www.npmjs.com/package/iztro) 
+[![npm bundle size](https://img.shields.io/bundlephobia/min/iztro)](https://www.npmjs.com/package/iztro) 
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FSylarLong%2Fiztro.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FSylarLong%2Fiztro?ref=badge_shield) 
@@ -22,0 +22,0 @@ [![Socket Badge](https://socket.dev/api/badge/npm/package/iztro)](https://socket.dev/npm/package/iztro)

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

463910

increased by0.65%

Lines of code

12167

increased by0.31%

Worsened metrics

Dependency count

3

increased by50%

Dependency changes

• + Addedlunar-lite@^0.0.2

• + Addedlunar-lite@0.0.2(transitive)