lunar-lite
Advanced tools
Comparing version 0.1.2 to 0.2.0
@@ -1,2 +0,2 @@ | ||
import { HeavenlyStemAndEarthlyBranchDate } from "./types"; | ||
import { HeavenlyStemAndEarthlyBranchDate, Options } from "./types"; | ||
/** | ||
@@ -10,3 +10,3 @@ * 通过农历获取生辰干支 | ||
*/ | ||
export declare const getHeavenlyStemAndEarthlyBranchByLunarDate: (dateStr: string, timeIndex: number, isLeap?: boolean) => HeavenlyStemAndEarthlyBranchDate; | ||
export declare const getHeavenlyStemAndEarthlyBranchByLunarDate: (dateStr: string, timeIndex: number, isLeap?: boolean, options?: Options) => HeavenlyStemAndEarthlyBranchDate; | ||
/** | ||
@@ -19,2 +19,2 @@ * 将阳历转化为干支纪年 | ||
*/ | ||
export declare const getHeavenlyStemAndEarthlyBranchBySolarDate: (dateStr: string | Date, timeIndex: number) => HeavenlyStemAndEarthlyBranchDate; | ||
export declare const getHeavenlyStemAndEarthlyBranchBySolarDate: (dateStr: string | Date, timeIndex: number, options?: Options) => HeavenlyStemAndEarthlyBranchDate; |
@@ -14,5 +14,6 @@ "use strict"; | ||
*/ | ||
var getHeavenlyStemAndEarthlyBranchByLunarDate = function (dateStr, timeIndex, isLeap) { | ||
var getHeavenlyStemAndEarthlyBranchByLunarDate = function (dateStr, timeIndex, isLeap, options) { | ||
if (options === void 0) { options = { year: 'normal' }; } | ||
var solarDate = (0, convertor_1.lunar2solar)(dateStr, isLeap); | ||
return (0, exports.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDate.toString(), timeIndex); | ||
return (0, exports.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDate.toString(), timeIndex, options); | ||
}; | ||
@@ -27,9 +28,12 @@ exports.getHeavenlyStemAndEarthlyBranchByLunarDate = getHeavenlyStemAndEarthlyBranchByLunarDate; | ||
*/ | ||
var getHeavenlyStemAndEarthlyBranchBySolarDate = function (dateStr, timeIndex) { | ||
var getHeavenlyStemAndEarthlyBranchBySolarDate = function (dateStr, timeIndex, options) { | ||
if (options === void 0) { options = { year: 'exact' }; } | ||
var _a = (0, convertor_1.normalizeDateStr)(dateStr), year = _a[0], month = _a[1], date = _a[2]; | ||
var solar = lunar_typescript_1.Solar.fromYmdHms(year, month, date, Math.max(timeIndex * 2 - 1, 0), 30, 0); | ||
var lunar = solar.getLunar(); | ||
var yearlyGan = (options === null || options === void 0 ? void 0 : options.year) === 'normal' ? lunar.getYearGan() : lunar.getYearGanByLiChun(); | ||
var yearlyZhi = (options === null || options === void 0 ? void 0 : options.year) === 'normal' ? lunar.getYearZhi() : lunar.getYearZhiByLiChun(); | ||
var yearly = [ | ||
lunar.getYearGanByLiChun(), | ||
lunar.getYearZhiByLiChun(), | ||
yearlyGan, | ||
yearlyZhi, | ||
]; | ||
@@ -36,0 +40,0 @@ var monthly = [ |
@@ -93,1 +93,5 @@ import { EARTHLY_BRANCHES, HEAVENLY_STEMS } from "./constants"; | ||
}; | ||
export type Options = { | ||
/** exact:立春分界,normal:除夕分界 */ | ||
year: 'exact' | 'normal'; | ||
}; |
{ | ||
"name": "lunar-lite", | ||
"version": "0.1.2", | ||
"version": "0.2.0", | ||
"description": "精简版的农历和阳历日期转换库。", | ||
@@ -5,0 +5,0 @@ "main": "lib/index.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
25863
597