iztro - npm Package Compare versions

Comparing version 2.3.2 to 2.4.0

CHANGELOG.md

@@ -10,2 +10,14 @@ # 紫微斗数
 
+## v2.4.0
+
+- ✨ 改进（enhancement）
+
+  🇨🇳
+
+  - 增加年分界点全局配置 #182
+
+  🇺🇸
+
+  - add yearly divider configuration #182
+
 ## v2.3.2
@@ -12,0 +24,0 @@

lib/astro/astro.d.ts

@@ -30,6 +30,7 @@ import { Config, Language, Plugin } from '../data/types';
  */
-export declare const config: ({ mutagens, brightness }: Config) => void;
+export declare const config: ({ mutagens, brightness, yearDivide }: Config) => void;
 export declare const getConfig: () => {
     mutagens: Partial<Record<"jiaHeavenly" | "yiHeavenly" | "bingHeavenly" | "dingHeavenly" | "wuHeavenly" | "jiHeavenly" | "gengHeavenly" | "xinHeavenly" | "renHeavenly" | "guiHeavenly", ("lianzhenMaj" | "pojunMaj" | "wuquMaj" | "taiyangMaj" | "tianjiMaj" | "tianliangMaj" | "ziweiMaj" | "taiyinMaj" | "tiantongMaj" | "wenchangMin" | "jumenMaj" | "tanlangMaj" | "youbiMin" | "wenquMin" | "zuofuMin" | "huoxingMin" | "tianxiangMaj" | "lucunMin" | "si" | "bing" | "tianfuMaj" | "qishaMaj" | "tianmaMin" | "qingyangMin" | "tuoluoMin" | "lingxingMin" | "tiankuiMin" | "tianyueMin" | "dikongMin" | "dijieMin" | "tiankong" | "tianxing" | "tianyao" | "jieshen" | "yinsha" | "tianxi" | "tianguan" | "tianfu" | "tianku" | "tianxu" | "longchi" | "fengge" | "hongluan" | "guchen" | "guasu" | "feilian" | "posui" | "taifu" | "fenggao" | "tianwu" | "tianyue" | "santai" | "bazuo" | "engguang" | "tiangui" | "tiancai" | "tianshou" | "jiekong" | "xunzhong" | "xunkong" | "kongwang" | "jielu" | "yuede" | "tianshang" | "tianshi" | "tianchu" | "changsheng" | "muyu" | "guandai" | "linguan" | "diwang" | "shuai" | "mu" | "jue" | "tai" | "yang" | "boshi" | "lishi" | "qinglong" | "xiaohao" | "jiangjun" | "zhoushu" | "faylian" | "xishen" | "bingfu" | "dahao" | "fubing" | "guanfu" | "suijian" | "huiqi" | "sangmen" | "guansuo" | "gwanfu" | "longde" | "baihu" | "tiande" | "diaoke" | "jiangxing" | "panan" | "suiyi" | "xiishen" | "huagai" | "jiesha" | "zhaisha" | "tiansha" | "zhibei" | "xianchi" | "yuesha" | "wangshen" | "yunkui" | "yunyue" | "yunchang" | "yunqu" | "yunluan" | "yunxi" | "yunlu" | "yunyang" | "yuntuo" | "yunma" | "liukui" | "liuyue" | "liuchang" | "liuqu" | "liuluan" | "liuxi" | "liulu" | "liuyang" | "liutuo" | "liuma" | "nianjie")[]>>;
     brightness: Partial<Record<"lianzhenMaj" | "pojunMaj" | "wuquMaj" | "taiyangMaj" | "tianjiMaj" | "tianliangMaj" | "ziweiMaj" | "taiyinMaj" | "tiantongMaj" | "wenchangMin" | "jumenMaj" | "tanlangMaj" | "youbiMin" | "wenquMin" | "zuofuMin" | "huoxingMin" | "tianxiangMaj" | "lucunMin" | "si" | "bing" | "tianfuMaj" | "qishaMaj" | "tianmaMin" | "qingyangMin" | "tuoluoMin" | "lingxingMin" | "tiankuiMin" | "tianyueMin" | "dikongMin" | "dijieMin" | "tiankong" | "tianxing" | "tianyao" | "jieshen" | "yinsha" | "tianxi" | "tianguan" | "tianfu" | "tianku" | "tianxu" | "longchi" | "fengge" | "hongluan" | "guchen" | "guasu" | "feilian" | "posui" | "taifu" | "fenggao" | "tianwu" | "tianyue" | "santai" | "bazuo" | "engguang" | "tiangui" | "tiancai" | "tianshou" | "jiekong" | "xunzhong" | "xunkong" | "kongwang" | "jielu" | "yuede" | "tianshang" | "tianshi" | "tianchu" | "changsheng" | "muyu" | "guandai" | "linguan" | "diwang" | "shuai" | "mu" | "jue" | "tai" | "yang" | "boshi" | "lishi" | "qinglong" | "xiaohao" | "jiangjun" | "zhoushu" | "faylian" | "xishen" | "bingfu" | "dahao" | "fubing" | "guanfu" | "suijian" | "huiqi" | "sangmen" | "guansuo" | "gwanfu" | "longde" | "baihu" | "tiande" | "diaoke" | "jiangxing" | "panan" | "suiyi" | "xiishen" | "huagai" | "jiesha" | "zhaisha" | "tiansha" | "zhibei" | "xianchi" | "yuesha" | "wangshen" | "yunkui" | "yunyue" | "yunchang" | "yunqu" | "yunluan" | "yunxi" | "yunlu" | "yunyang" | "yuntuo" | "yunma" | "liukui" | "liuyue" | "liuchang" | "liuqu" | "liuluan" | "liuxi" | "liulu" | "liuyang" | "liutuo" | "liuma" | "nianjie", ("li" | "wang" | "de" | "miao" | "ping" | "xian" | "bu")[]>>;
+    yearDivide: "exact" | "normal";
 };
@@ -36,0 +37,0 @@ /**

lib/astro/astro.js

@@ -19,2 +19,11 @@ "use strict";
 /**
+ * 年分界点参数，默认为立春分界。
+ *
+ * @version v2.4.0
+ *
+ * normal：正月初一分界
+ * exact：立春分界
+ */
+var _yearDivide = 'exact';
+/**
  * 批量加载插件
@@ -52,3 +61,3 @@ *
 var config = function (_a) {
-    var mutagens = _a.mutagens, brightness = _a.brightness;
+    var mutagens = _a.mutagens, brightness = _a.brightness, yearDivide = _a.yearDivide;
     if (mutagens) {
@@ -68,5 +77,12 @@ Object.entries(mutagens).forEach(function (_a) {
     }
+    if (yearDivide) {
+        _yearDivide = yearDivide;
+    }
 };
 exports.config = config;
-var getConfig = function () { return ({ mutagens: _mutagens, brightness: _brightness }); };
+var getConfig = function () { return ({
+    mutagens: _mutagens,
+    brightness: _brightness,
+    yearDivide: _yearDivide,
+}); };
 exports.getConfig = getConfig;
@@ -104,3 +120,5 @@ /**
     var palaces = [];
-    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex, {
+        year: (0, exports.getConfig)().yearDivide,
+    }).yearly;
     var earthlyBranchOfYear = (0, i18n_1.kot)(yearly[1], 'Earthly');
@@ -141,3 +159,5 @@ var heavenlyStemOfYear = (0, i18n_1.kot)(yearly[0], 'Heavenly');
     var earthlyBranchOfBodyPalace = (0, i18n_1.t)(data_1.EARTHLY_BRANCHES[(0, utils_1.fixIndex)(bodyIndex + 2)]);
-    var chineseDate = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex);
+    var chineseDate = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex, {
+        year: (0, exports.getConfig)().yearDivide,
+    });
     var lunarDate = (0, lunar_lite_1.solar2lunar)(solarDateStr);
@@ -214,3 +234,5 @@ var result = new FunctionalAstrolabe_1.default({
     language && (0, i18n_1.setLanguage)(language);
-    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0, {
+        year: (0, exports.getConfig)().yearDivide,
+    }).yearly;
     return (0, i18n_1.t)((0, i18n_1.kot)((0, lunar_lite_1.getZodiac)(yearly[1])));
@@ -217,0 +239,0 @@ };

lib/astro/FunctionalAstrolabe.js

@@ -41,3 +41,6 @@ "use strict";
     var convertTimeIndex = (0, utils_1.timeToIndex)((0, dayjs_1.default)(targetDate).hour());
-    var _a = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(targetDate, timeIndex || convertTimeIndex), yearly = _a.yearly, monthly = _a.monthly, daily = _a.daily, hourly = _a.hourly;
+    var _a = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(targetDate, timeIndex || convertTimeIndex, {
+        // 运限是以立春为界
+        year: 'exact',
+    }), yearly = _a.yearly, monthly = _a.monthly, daily = _a.daily, hourly = _a.hourly;
     // 虚岁
@@ -44,0 +47,0 @@ var nominalAge = _date.lunarYear - _birthday.lunarYear;

lib/astro/palace.js

@@ -8,2 +8,3 @@ "use strict";
 var utils_1 = require("../utils");
+var astro_1 = require("./astro");
 /**
@@ -27,3 +28,5 @@ * 获取命宫以及身宫数据
 var getSoulAndBody = function (solarDate, timeIndex, fixLeap) {
-    var _a = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDate, timeIndex), yearly = _a.yearly, hourly = _a.hourly;
+    var _a = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDate, timeIndex, {
+        year: (0, astro_1.getConfig)().yearDivide,
+    }), yearly = _a.yearly, hourly = _a.hourly;
     var earthlyBranchOfTime = (0, i18n_1.kot)(hourly[1], 'Earthly');
@@ -143,3 +146,6 @@ var heavenlyStemOfYear = (0, i18n_1.kot)(yearly[0], 'Heavenly');
     var genderKey = (0, i18n_1.kot)(gender);
-    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex, {
+        // 运限是以立春为界
+        year: 'exact',
+    }).yearly;
     var heavenlyStem = (0, i18n_1.kot)(yearly[0], 'Heavenly');
@@ -146,0 +152,0 @@ var earthlyBranch = (0, i18n_1.kot)(yearly[1], 'Earthly');

lib/data/types/astro.d.ts

@@ -165,2 +165,3 @@ import { IFunctionalPalace } from '../../astro/FunctionalPalace';
     brightness?: ConfigBrightness;
+    yearDivide?: 'normal' | 'exact';
 };

lib/star/adjectiveStar.js

@@ -12,2 +12,3 @@ "use strict";
 var location_1 = require("./location");
+var astro_1 = require("../astro");
 /**
@@ -23,3 +24,5 @@ * 安杂耀
     var stars = (0, _1.initStars)();
-    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex, {
+        year: (0, astro_1.getConfig)().yearDivide,
+    }).yearly;
     var yearlyIndex = (0, location_1.getYearlyStarIndex)(solarDateStr, timeIndex, fixLeap);
@@ -26,0 +29,0 @@ var monthlyIndex = (0, location_1.getMonthlyStarIndex)(solarDateStr, timeIndex, fixLeap);

lib/star/decorativeStar.js

@@ -63,3 +63,5 @@ "use strict";
     var genderKey = (0, i18n_1.kot)(gender);
-    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0, {
+        year: (0, astro_1.getConfig)().yearDivide,
+    }).yearly;
     var earthlyBranchNameOfYear = yearly[1];
@@ -111,3 +113,5 @@ var earthlyBranchOfYear = (0, i18n_1.kot)(earthlyBranchNameOfYear, 'Earthly');
     var genderKey = (0, i18n_1.kot)(gender);
-    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0, {
+        year: (0, astro_1.getConfig)().yearDivide,
+    }).yearly;
     var heavenlyStemNameOfYear = yearly[0], earthlyBranchNameOfYear = yearly[1];
@@ -188,3 +192,6 @@ var earthlyBranchOfYear = (0, i18n_1.kot)(earthlyBranchNameOfYear, 'Earthly');
     var suiqian12 = [];
-    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, 0, {
+        // 流年神煞应该用立春为界
+        year: 'exact',
+    }).yearly;
     var ts12shen = [
@@ -191,0 +198,0 @@ 'suijian',

lib/star/location.js

@@ -528,3 +528,6 @@ "use strict";
 var getYearlyStarIndex = function (solarDate, timeIndex, fixLeap) {
-    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDate, timeIndex).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDate, timeIndex, {
+        // 流耀应该用立春为界
+        year: 'exact',
+    }).yearly;
     var _a = (0, astro_1.getSoulAndBody)(solarDate, timeIndex, fixLeap), soulIndex = _a.soulIndex, bodyIndex = _a.bodyIndex;
@@ -531,0 +534,0 @@ var heavenlyStem = (0, i18n_1.kot)(yearly[0], 'Heavenly');

lib/star/majorStar.js

@@ -13,2 +13,3 @@ "use strict";
 var location_1 = require("./location");
+var astro_1 = require("../astro");
 /**
@@ -32,3 +33,5 @@ * 安主星，寅宫下标为0，若下标对应的数组为空数组则表示没有星耀
     var _a = (0, location_1.getStartIndex)(solarDateStr, timeIndex, fixLeap), ziweiIndex = _a.ziweiIndex, tianfuIndex = _a.tianfuIndex;
-    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex, {
+        year: (0, astro_1.getConfig)().yearDivide,
+    }).yearly;
     var stars = (0, _1.initStars)();
@@ -35,0 +38,0 @@ var ziweiGroup = [

lib/star/minorStar.js

@@ -13,2 +13,3 @@ "use strict";
 var location_1 = require("./location");
+var astro_1 = require("../astro");
 /**
@@ -24,3 +25,5 @@ * 安14辅星，寅宫下标为0，若下标对应的数组为空数组则表示没有星耀
     var stars = (0, _1.initStars)();
-    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex).yearly;
+    var yearly = (0, lunar_lite_1.getHeavenlyStemAndEarthlyBranchBySolarDate)(solarDateStr, timeIndex, {
+        year: (0, astro_1.getConfig)().yearDivide,
+    }).yearly;
     var monthIndex = (0, utils_1.fixLunarMonthIndex)(solarDateStr, timeIndex, fixLeap);
@@ -27,0 +30,0 @@ // 此处获取到的是索引，下标是从0开始的，所以需要加1

package.json

 {
   "name": "iztro",
-  "version": "2.3.2",
+  "version": "2.4.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",
@@ -74,4 +74,4 @@ "main": "lib/index.js",
     "i18next": "^23.5.1",
-    "lunar-lite": "^0.1.2"
+    "lunar-lite": "^0.2.0"
   }
 }

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

2044999

increased by0.22%

Lines of code

14398

increased by0.38%

Dependency changes

• + Addedlunar-lite@0.2.3(transitive)

• - Removedlunar-lite@0.1.2(transitive)

• Updatedlunar-lite@^0.2.0