@unicom-cloud/utils 0.1.15 → 0.1.17

package/lunar/lib/Solar.js

@@ -1,17 +1,13 @@
-import { HolidayUtil as H } from "./HolidayUtil.js";
-import { Lunar as x } from "./Lunar.js";
+import { HolidayUtil as L } from "./HolidayUtil.js";
+import { Lunar as H } from "./Lunar.js";
 import { LunarUtil as u } from "./LunarUtil.js";
-import { SolarMonth as p } from "./SolarMonth.js";
+import { SolarMonth as k } from "./SolarMonth.js";
 import { SolarUtil as o } from "./SolarUtil.js";
 import { SolarWeek as W } from "./SolarWeek.js";
 class a {
-  static J2000 = 2451545;
-  _year;
-  _month;
-  _day;
-  _hour;
-  _minute;
-  _second;
+  static {
+    this.J2000 = 2451545;
+  }
   static fromYmd(t, e, i) {
     return a.fromYmdHms(t, e, i, 0, 0, 0);
   }
@@ -41,8 +37,8 @@ class a {
     i -= h, i *= 60;
     let f = Math.floor(i);
     i -= f, i *= 60;
-    let _ = Math.round(i);
-    return _ > 59 && (_ -= 60, f++), f > 59 && (f -= 60, h++), h > 23 && (h -= 24, m += 1), a.fromYmdHms(n, s, m, h, f, _);
+    let l = Math.round(i);
+    return l > 59 && (l -= 60, f++), f > 59 && (f -= 60, h++), h > 23 && (h -= 24, m += 1), a.fromYmdHms(n, s, m, h, f, l);
   }
   static fromBaZi(t, e, i, r, n = 2, s = 1900) {
     n = n == 1 ? 1 : 2;
@@ -52,21 +48,21 @@ class a {
       return m;
     let f = u.getJiaZiIndex(t) - 57;
     f < 0 && (f += 60), f++, h *= 2;
-    const _ = u.index(r.substring(1), u.ZHI, -1) * 2;
-    let c = [_];
-    _ == 0 && n == 2 && (c = [0, 23]);
-    const E = s - 1, I = (/* @__PURE__ */ new Date()).getFullYear();
-    for (; f <= I; ) {
-      if (f >= E) {
-        const d = x.fromYmd(f, 1, 1), L = d.getJieQiList();
-        let g = d.getJieQiTable()[L[4 + h]];
+    const l = u.index(r.substring(1), u.ZHI, -1) * 2;
+    let d = [l];
+    l == 0 && n == 2 && (d = [0, 23]);
+    const x = s - 1, E = (/* @__PURE__ */ new Date()).getFullYear();
+    for (; f <= E; ) {
+      if (f >= x) {
+        const y = H.fromYmd(f, 1, 1), I = y.getJieQiList();
+        let g = y.getJieQiTable()[I[4 + h]];
         if (g.getYear() >= s) {
-          let l = u.getJiaZiIndex(i) - u.getJiaZiIndex(
+          let _ = u.getJiaZiIndex(i) - u.getJiaZiIndex(
             g.getLunar().getDayInGanZhiExact2()
           );
-          l < 0 && (l += 60), l > 0 && (g = g.next(l)), c.forEach((M) => {
+          _ < 0 && (_ += 60), _ > 0 && (g = g.next(_)), d.forEach((M) => {
             let Y = 0, w = 0;
-            l == 0 && M === g.getHour() && (Y = g.getMinute(), w = g.getSecond());
+            _ == 0 && M === g.getHour() && (Y = g.getMinute(), w = g.getSecond());
             const D = a.fromYmdHms(
               g.getYear(),
               g.getMonth(),
@@ -74,8 +70,8 @@ class a {
               M,
               Y,
               w
-            ), y = D.getLunar(), k = n === 2 ? y.getDayInGanZhiExact2() : y.getDayInGanZhiExact();
-            y.getYearInGanZhiExact() === t && y.getMonthInGanZhiExact() === e && k === i && y.getTimeInGanZhi() === r && m.push(D);
+            ), c = D.getLunar(), p = n === 2 ? c.getDayInGanZhiExact2() : c.getDayInGanZhiExact();
+            c.getYearInGanZhiExact() === t && c.getMonthInGanZhiExact() === e && p === i && c.getTimeInGanZhi() === r && m.push(D);
           });
         }
       }
@@ -149,27 +145,6 @@ class a {
     const e = this._month * 100 + this._day;
     return e >= 321 && e <= 419 ? t = 0 : e >= 420 && e <= 520 ? t = 1 : e >= 521 && e <= 621 ? t = 2 : e >= 622 && e <= 722 ? t = 3 : e >= 723 && e <= 822 ? t = 4 : e >= 823 && e <= 922 ? t = 5 : e >= 923 && e <= 1023 ? t = 6 : e >= 1024 && e <= 1122 ? t = 7 : e >= 1123 && e <= 1221 ? t = 8 : e >= 1222 || e <= 119 ? t = 9 : e <= 218 && (t = 10), o.XINGZUO[t];
   }
-  /**
-   * 获取薪资比例(感谢 https://gitee.com/smr1987)
-   * @returns 1 | 2 | 3 薪资比例
-   */
-  getSalaryRate() {
-    if (this._month === 1 && this._day === 1 || this._month === 5 && this._day === 1 || this._month === 10 && this._day >= 1 && this._day <= 3)
-      return 3;
-    const t = this.getLunar();
-    if (t.getMonth() === 1 && t.getDay() >= 1 && t.getDay() <= 3 || t.getMonth() === 5 && t.getDay() === 5 || t.getMonth() === 8 && t.getDay() === 15 || t.getJieQi() === "清明")
-      return 3;
-    const e = H.getHoliday(this._year, this._month, this._day);
-    if (e) {
-      if (!e.isWork())
-        return 2;
-    } else {
-      const i = this.getWeek();
-      if (i === 6 || i === 0)
-        return 2;
-    }
-    return 1;
-  }
   toYmd() {
     let t = this._year + "";
     for (; t.length < 4; )
@@ -202,7 +177,7 @@ class a {
     return e === 1582 && i === 10 ? r > 4 && r < 15 && (r += 10) : i === 2 && r > 28 && (o.isLeapYear(e) || (r = 28)), a.fromYmdHms(e, i, r, this._hour, this._minute, this._second);
   }
   nextMonth(t) {
-    const e = p.fromYm(this._year, this._month).next(t), i = e.getYear(), r = e.getMonth();
+    const e = k.fromYm(this._year, this._month).next(t), i = e.getYear(), r = e.getMonth();
     let n = this._day;
     if (i === 1582 && r === 10)
       n > 4 && n < 15 && (n += 10);
@@ -242,7 +217,7 @@ class a {
         for (; r > 0; ) {
           i = i.next(n);
           let s = !0;
-          const m = H.getHoliday(
+          const m = L.getHoliday(
             i.getYear(),
             i.getMonth(),
             i.getDay()
@@ -275,7 +250,7 @@ class a {
     );
   }
   getLunar() {
-    return x.fromSolar(this);
+    return H.fromSolar(this);
   }
   getJulianDay() {
     let t = this._year, e = this._month;

package/lunar/lib/SolarHalfYear.js

@@ -1,7 +1,5 @@
 import { SolarMonth as o } from "./SolarMonth.js";
 class r {
-  _year;
-  _month;
   static fromYm(t, e) {
     return new r(t, e);
   }

package/lunar/lib/SolarMonth.js

@@ -1,9 +1,7 @@
 import { Solar as h } from "./Solar.js";
-import { SolarUtil as n } from "./SolarUtil.js";
-import { SolarWeek as i } from "./SolarWeek.js";
+import { SolarUtil as i } from "./SolarUtil.js";
+import { SolarWeek as n } from "./SolarWeek.js";
 class o {
-  _year;
-  _month;
   static fromYm(t, r) {
     return new o(t, r);
   }
@@ -27,14 +25,14 @@ class o {
   getDays() {
     const t = [], r = h.fromYmd(this._year, this._month, 1);
     t.push(r);
-    const e = n.getDaysOfMonth(this._year, this._month);
+    const e = i.getDaysOfMonth(this._year, this._month);
     for (let s = 1; s < e; s++)
       t.push(r.next(s));
     return t;
   }
   getWeeks(t) {
     const r = [];
-    let e = i.fromYmd(this._year, this._month, 1, t);
+    let e = n.fromYmd(this._year, this._month, 1, t);
     for (; ; ) {
       r.push(e), e = e.next(1, !1);
       const s = e.getFirstDay();

package/lunar/lib/SolarSeason.js

@@ -1,7 +1,5 @@
 import { SolarMonth as h } from "./SolarMonth.js";
 class r {
-  _year;
-  _month;
   static fromYm(t, e) {
     return new r(t, e);
   }