@unicom-cloud/utils 0.1.15 → 0.1.16

package/lunar/lib/SolarUtil.js

@@ -1,252 +1,264 @@
 import { Solar as c } from "./Solar.js";
 class t {
-  static WEEK = [
-    "{w.sun}",
-    "{w.mon}",
-    "{w.tues}",
-    "{w.wed}",
-    "{w.thur}",
-    "{w.fri}",
-    "{w.sat}"
-  ];
-  static DAYS_OF_MONTH = [
-    31,
-    28,
-    31,
-    30,
-    31,
-    30,
-    31,
-    31,
-    30,
-    31,
-    30,
-    31
-  ];
-  static XINGZUO = [
-    "{xz.aries}",
-    "{xz.taurus}",
-    "{xz.gemini}",
-    "{xz.cancer}",
-    "{xz.leo}",
-    "{xz.virgo}",
-    "{xz.libra}",
-    "{xz.scorpio}",
-    "{xz.sagittarius}",
-    "{xz.capricornus}",
-    "{xz.aquarius}",
-    "{xz.pisces}"
-  ];
-  static FESTIVAL = {
-    "1-1": "{jr.yuanDan}",
-    "2-14": "{jr.qingRen}",
-    "3-8": "{jr.fuNv}",
-    "3-12": "{jr.zhiShu}",
-    "3-15": "{jr.xiaoFei}",
-    "4-1": "{jr.yuRen}",
-    "5-1": "{jr.wuYi}",
-    "5-4": "{jr.qingNian}",
-    "6-1": "{jr.erTong}",
-    "7-1": "{jr.jianDang}",
-    "8-1": "{jr.jianJun}",
-    "9-10": "{jr.jiaoShi}",
-    "10-1": "{jr.guoQing}",
-    "10-31": "{jr.wanShengYe}",
-    "11-1": "{jr.wanSheng}",
-    "12-24": "{jr.pingAn}",
-    "12-25": "{jr.shengDan}"
-  };
-  static OTHER_FESTIVAL = {
-    "1-8": ["周恩来逝世纪念日"],
-    "1-10": ["中国人民警察节"],
-    "1-14": ["日记情人节"],
-    "1-21": ["列宁逝世纪念日"],
-    "1-26": ["国际海关日"],
-    "1-27": ["国际大屠杀纪念日"],
-    "2-2": ["世界湿地日"],
-    "2-4": ["世界抗癌日"],
-    "2-7": ["京汉铁路罢工纪念日"],
-    "2-10": ["国际气象节"],
-    "2-19": ["邓小平逝世纪念日"],
-    "2-20": ["世界社会公正日"],
-    "2-21": ["国际母语日"],
-    "2-24": ["第三世界青年日"],
-    "3-1": ["国际海豹日"],
-    "3-3": ["世界野生动植物日", "全国爱耳日"],
-    "3-5": ["周恩来诞辰纪念日", "中国青年志愿者服务日"],
-    "3-6": ["世界青光眼日"],
-    "3-7": ["女生节"],
-    "3-12": ["孙中山逝世纪念日"],
-    "3-14": ["马克思逝世纪念日", "白色情人节"],
-    "3-17": ["国际航海日"],
-    "3-18": ["全国科技人才活动日", "全国爱肝日"],
-    "3-20": ["国际幸福日"],
-    "3-21": ["世界森林日", "世界睡眠日", "国际消除种族歧视日"],
-    "3-22": ["世界水日"],
-    "3-23": ["世界气象日"],
-    "3-24": ["世界防治结核病日"],
-    "3-29": ["中国黄花岗七十二烈士殉难纪念日"],
-    "4-2": ["国际儿童图书日", "世界自闭症日"],
-    "4-4": ["国际地雷行动日"],
-    "4-7": ["世界卫生日"],
-    "4-8": ["国际珍稀动物保护日"],
-    "4-12": ["世界航天日"],
-    "4-14": ["黑色情人节"],
-    "4-15": ["全民国家安全教育日"],
-    "4-22": ["世界地球日", "列宁诞辰纪念日"],
-    "4-23": ["世界读书日"],
-    "4-24": ["中国航天日"],
-    "4-25": ["儿童预防接种宣传日"],
-    "4-26": ["世界知识产权日", "全国疟疾日"],
-    "4-28": ["世界安全生产与健康日"],
-    "4-30": ["全国交通安全反思日"],
-    "5-2": ["世界金枪鱼日"],
-    "5-3": ["世界新闻自由日"],
-    "5-5": ["马克思诞辰纪念日"],
-    "5-8": ["世界红十字日"],
-    "5-11": ["世界肥胖日"],
-    "5-12": ["全国防灾减灾日", "护士节"],
-    "5-14": ["玫瑰情人节"],
-    "5-15": ["国际家庭日"],
-    "5-19": ["中国旅游日"],
-    "5-20": ["网络情人节"],
-    "5-22": ["国际生物多样性日"],
-    "5-25": ["525心理健康节"],
-    "5-27": ["上海解放日"],
-    "5-29": ["国际维和人员日"],
-    "5-30": ["中国五卅运动纪念日"],
-    "5-31": ["世界无烟日"],
-    "6-3": ["世界自行车日"],
-    "6-5": ["世界环境日"],
-    "6-6": ["全国爱眼日"],
-    "6-8": ["世界海洋日"],
-    "6-11": ["中国人口日"],
-    "6-14": ["世界献血日", "亲亲情人节"],
-    "6-17": ["世界防治荒漠化与干旱日"],
-    "6-20": ["世界难民日"],
-    "6-21": ["国际瑜伽日"],
-    "6-25": ["全国土地日"],
-    "6-26": ["国际禁毒日", "联合国宪章日"],
-    "7-1": ["香港回归纪念日"],
-    "7-6": ["国际接吻日", "朱德逝世纪念日"],
-    "7-7": ["七七事变纪念日"],
-    "7-11": ["世界人口日", "中国航海日"],
-    "7-14": ["银色情人节"],
-    "7-18": ["曼德拉国际日"],
-    "7-30": ["国际友谊日"],
-    "8-3": ["男人节"],
-    "8-5": ["恩格斯逝世纪念日"],
-    "8-6": ["国际电影节"],
-    "8-8": ["全民健身日"],
-    "8-9": ["国际土著人日"],
-    "8-12": ["国际青年节"],
-    "8-14": ["绿色情人节"],
-    "8-19": ["世界人道主义日", "中国医师节"],
-    "8-22": ["邓小平诞辰纪念日"],
-    "8-29": ["全国测绘法宣传日"],
-    "9-3": ["中国抗日战争胜利纪念日"],
-    "9-5": ["中华慈善日"],
-    "9-8": ["世界扫盲日"],
-    "9-9": ["毛泽东逝世纪念日", "全国拒绝酒驾日"],
-    "9-14": ["世界清洁地球日", "相片情人节"],
-    "9-15": ["国际民主日"],
-    "9-16": ["国际臭氧层保护日"],
-    "9-17": ["世界骑行日"],
-    "9-18": ["九一八事变纪念日"],
-    "9-20": ["全国爱牙日"],
-    "9-21": ["国际和平日"],
-    "9-27": ["世界旅游日"],
-    "9-30": ["中国烈士纪念日"],
-    "10-1": ["国际老年人日"],
-    "10-2": ["国际非暴力日"],
-    "10-4": ["世界动物日"],
-    "10-11": ["国际女童日"],
-    "10-10": ["辛亥革命纪念日"],
-    "10-13": ["国际减轻自然灾害日", "中国少年先锋队诞辰日"],
-    "10-14": ["葡萄酒情人节"],
-    "10-16": ["世界粮食日"],
-    "10-17": ["全国扶贫日"],
-    "10-20": ["世界统计日"],
-    "10-24": ["世界发展信息日", "程序员节"],
-    "10-25": ["抗美援朝纪念日"],
-    "11-5": ["世界海啸日"],
-    "11-8": ["记者节"],
-    "11-9": ["全国消防日"],
-    "11-11": ["光棍节"],
-    "11-12": ["孙中山诞辰纪念日"],
-    "11-14": ["电影情人节"],
-    "11-16": ["国际宽容日"],
-    "11-17": ["国际大学生节"],
-    "11-19": ["世界厕所日"],
-    "11-28": ["恩格斯诞辰纪念日"],
-    "11-29": ["国际声援巴勒斯坦人民日"],
-    "12-1": ["世界艾滋病日"],
-    "12-2": ["全国交通安全日"],
-    "12-3": ["世界残疾人日"],
-    "12-4": ["全国法制宣传日"],
-    "12-5": ["世界弱能人士日", "国际志愿人员日"],
-    "12-7": ["国际民航日"],
-    "12-9": ["世界足球日", "国际反腐败日"],
-    "12-10": ["世界人权日"],
-    "12-11": ["国际山岳日"],
-    "12-12": ["西安事变纪念日"],
-    "12-13": ["国家公祭日"],
-    "12-14": ["拥抱情人节"],
-    "12-18": ["国际移徙者日"],
-    "12-26": ["毛泽东诞辰纪念日"]
-  };
-  static WEEK_FESTIVAL = {
-    "3-0-1": "全国中小学生安全教育日",
-    "5-2-0": "母亲节",
-    "5-3-0": "全国助残日",
-    "6-3-0": "父亲节",
-    "9-3-6": "全民国防教育日",
-    "10-1-1": "世界住房日",
-    "11-4-4": "感恩节"
-  };
+  static {
+    this.WEEK = [
+      "{w.sun}",
+      "{w.mon}",
+      "{w.tues}",
+      "{w.wed}",
+      "{w.thur}",
+      "{w.fri}",
+      "{w.sat}"
+    ];
+  }
+  static {
+    this.DAYS_OF_MONTH = [
+      31,
+      28,
+      31,
+      30,
+      31,
+      30,
+      31,
+      31,
+      30,
+      31,
+      30,
+      31
+    ];
+  }
+  static {
+    this.XINGZUO = [
+      "{xz.aries}",
+      "{xz.taurus}",
+      "{xz.gemini}",
+      "{xz.cancer}",
+      "{xz.leo}",
+      "{xz.virgo}",
+      "{xz.libra}",
+      "{xz.scorpio}",
+      "{xz.sagittarius}",
+      "{xz.capricornus}",
+      "{xz.aquarius}",
+      "{xz.pisces}"
+    ];
+  }
+  static {
+    this.FESTIVAL = {
+      "1-1": "{jr.yuanDan}",
+      "2-14": "{jr.qingRen}",
+      "3-8": "{jr.fuNv}",
+      "3-12": "{jr.zhiShu}",
+      "3-15": "{jr.xiaoFei}",
+      "4-1": "{jr.yuRen}",
+      "5-1": "{jr.wuYi}",
+      "5-4": "{jr.qingNian}",
+      "6-1": "{jr.erTong}",
+      "7-1": "{jr.jianDang}",
+      "8-1": "{jr.jianJun}",
+      "9-10": "{jr.jiaoShi}",
+      "10-1": "{jr.guoQing}",
+      "10-31": "{jr.wanShengYe}",
+      "11-1": "{jr.wanSheng}",
+      "12-24": "{jr.pingAn}",
+      "12-25": "{jr.shengDan}"
+    };
+  }
+  static {
+    this.OTHER_FESTIVAL = {
+      "1-8": ["周恩来逝世纪念日"],
+      "1-10": ["中国人民警察节"],
+      "1-14": ["日记情人节"],
+      "1-21": ["列宁逝世纪念日"],
+      "1-26": ["国际海关日"],
+      "1-27": ["国际大屠杀纪念日"],
+      "2-2": ["世界湿地日"],
+      "2-4": ["世界抗癌日"],
+      "2-7": ["京汉铁路罢工纪念日"],
+      "2-10": ["国际气象节"],
+      "2-19": ["邓小平逝世纪念日"],
+      "2-20": ["世界社会公正日"],
+      "2-21": ["国际母语日"],
+      "2-24": ["第三世界青年日"],
+      "3-1": ["国际海豹日"],
+      "3-3": ["世界野生动植物日", "全国爱耳日"],
+      "3-5": ["周恩来诞辰纪念日", "中国青年志愿者服务日"],
+      "3-6": ["世界青光眼日"],
+      "3-7": ["女生节"],
+      "3-12": ["孙中山逝世纪念日"],
+      "3-14": ["马克思逝世纪念日", "白色情人节"],
+      "3-17": ["国际航海日"],
+      "3-18": ["全国科技人才活动日", "全国爱肝日"],
+      "3-20": ["国际幸福日"],
+      "3-21": ["世界森林日", "世界睡眠日", "国际消除种族歧视日"],
+      "3-22": ["世界水日"],
+      "3-23": ["世界气象日"],
+      "3-24": ["世界防治结核病日"],
+      "3-29": ["中国黄花岗七十二烈士殉难纪念日"],
+      "4-2": ["国际儿童图书日", "世界自闭症日"],
+      "4-4": ["国际地雷行动日"],
+      "4-7": ["世界卫生日"],
+      "4-8": ["国际珍稀动物保护日"],
+      "4-12": ["世界航天日"],
+      "4-14": ["黑色情人节"],
+      "4-15": ["全民国家安全教育日"],
+      "4-22": ["世界地球日", "列宁诞辰纪念日"],
+      "4-23": ["世界读书日"],
+      "4-24": ["中国航天日"],
+      "4-25": ["儿童预防接种宣传日"],
+      "4-26": ["世界知识产权日", "全国疟疾日"],
+      "4-28": ["世界安全生产与健康日"],
+      "4-30": ["全国交通安全反思日"],
+      "5-2": ["世界金枪鱼日"],
+      "5-3": ["世界新闻自由日"],
+      "5-5": ["马克思诞辰纪念日"],
+      "5-8": ["世界红十字日"],
+      "5-11": ["世界肥胖日"],
+      "5-12": ["全国防灾减灾日", "护士节"],
+      "5-14": ["玫瑰情人节"],
+      "5-15": ["国际家庭日"],
+      "5-19": ["中国旅游日"],
+      "5-20": ["网络情人节"],
+      "5-22": ["国际生物多样性日"],
+      "5-25": ["525心理健康节"],
+      "5-27": ["上海解放日"],
+      "5-29": ["国际维和人员日"],
+      "5-30": ["中国五卅运动纪念日"],
+      "5-31": ["世界无烟日"],
+      "6-3": ["世界自行车日"],
+      "6-5": ["世界环境日"],
+      "6-6": ["全国爱眼日"],
+      "6-8": ["世界海洋日"],
+      "6-11": ["中国人口日"],
+      "6-14": ["世界献血日", "亲亲情人节"],
+      "6-17": ["世界防治荒漠化与干旱日"],
+      "6-20": ["世界难民日"],
+      "6-21": ["国际瑜伽日"],
+      "6-25": ["全国土地日"],
+      "6-26": ["国际禁毒日", "联合国宪章日"],
+      "7-1": ["香港回归纪念日"],
+      "7-6": ["国际接吻日", "朱德逝世纪念日"],
+      "7-7": ["七七事变纪念日"],
+      "7-11": ["世界人口日", "中国航海日"],
+      "7-14": ["银色情人节"],
+      "7-18": ["曼德拉国际日"],
+      "7-30": ["国际友谊日"],
+      "8-3": ["男人节"],
+      "8-5": ["恩格斯逝世纪念日"],
+      "8-6": ["国际电影节"],
+      "8-8": ["全民健身日"],
+      "8-9": ["国际土著人日"],
+      "8-12": ["国际青年节"],
+      "8-14": ["绿色情人节"],
+      "8-19": ["世界人道主义日", "中国医师节"],
+      "8-22": ["邓小平诞辰纪念日"],
+      "8-29": ["全国测绘法宣传日"],
+      "9-3": ["中国抗日战争胜利纪念日"],
+      "9-5": ["中华慈善日"],
+      "9-8": ["世界扫盲日"],
+      "9-9": ["毛泽东逝世纪念日", "全国拒绝酒驾日"],
+      "9-14": ["世界清洁地球日", "相片情人节"],
+      "9-15": ["国际民主日"],
+      "9-16": ["国际臭氧层保护日"],
+      "9-17": ["世界骑行日"],
+      "9-18": ["九一八事变纪念日"],
+      "9-20": ["全国爱牙日"],
+      "9-21": ["国际和平日"],
+      "9-27": ["世界旅游日"],
+      "9-30": ["中国烈士纪念日"],
+      "10-1": ["国际老年人日"],
+      "10-2": ["国际非暴力日"],
+      "10-4": ["世界动物日"],
+      "10-11": ["国际女童日"],
+      "10-10": ["辛亥革命纪念日"],
+      "10-13": ["国际减轻自然灾害日", "中国少年先锋队诞辰日"],
+      "10-14": ["葡萄酒情人节"],
+      "10-16": ["世界粮食日"],
+      "10-17": ["全国扶贫日"],
+      "10-20": ["世界统计日"],
+      "10-24": ["世界发展信息日", "程序员节"],
+      "10-25": ["抗美援朝纪念日"],
+      "11-5": ["世界海啸日"],
+      "11-8": ["记者节"],
+      "11-9": ["全国消防日"],
+      "11-11": ["光棍节"],
+      "11-12": ["孙中山诞辰纪念日"],
+      "11-14": ["电影情人节"],
+      "11-16": ["国际宽容日"],
+      "11-17": ["国际大学生节"],
+      "11-19": ["世界厕所日"],
+      "11-28": ["恩格斯诞辰纪念日"],
+      "11-29": ["国际声援巴勒斯坦人民日"],
+      "12-1": ["世界艾滋病日"],
+      "12-2": ["全国交通安全日"],
+      "12-3": ["世界残疾人日"],
+      "12-4": ["全国法制宣传日"],
+      "12-5": ["世界弱能人士日", "国际志愿人员日"],
+      "12-7": ["国际民航日"],
+      "12-9": ["世界足球日", "国际反腐败日"],
+      "12-10": ["世界人权日"],
+      "12-11": ["国际山岳日"],
+      "12-12": ["西安事变纪念日"],
+      "12-13": ["国家公祭日"],
+      "12-14": ["拥抱情人节"],
+      "12-18": ["国际移徙者日"],
+      "12-26": ["毛泽东诞辰纪念日"]
+    };
+  }
+  static {
+    this.WEEK_FESTIVAL = {
+      "3-0-1": "全国中小学生安全教育日",
+      "5-2-0": "母亲节",
+      "5-3-0": "全国助残日",
+      "6-3-0": "父亲节",
+      "9-3-6": "全民国防教育日",
+      "10-1-1": "世界住房日",
+      "11-4-4": "感恩节"
+    };
+  }
   static isLeapYear(e) {
     return e < 1600 ? e % 4 === 0 : e % 4 === 0 && e % 100 !== 0 || e % 400 === 0;
   }
   static getDaysOfMonth(e, n) {
     if (e === 1582 && n === 10)
       return 21;
-    const s = n - 1;
-    let r = t.DAYS_OF_MONTH[s];
-    return s === 1 && t.isLeapYear(e) && r++, r;
+    const r = n - 1;
+    let s = t.DAYS_OF_MONTH[r];
+    return r === 1 && t.isLeapYear(e) && s++, s;
   }
   static getDaysOfYear(e) {
     return e === 1582 ? 355 : t.isLeapYear(e) ? 366 : 365;
   }
-  static getDaysInYear(e, n, s) {
-    let r = 0;
+  static getDaysInYear(e, n, r) {
+    let s = 0;
     for (let g = 1; g < n; g++)
-      r += t.getDaysOfMonth(e, g);
-    let f = s;
-    if (e === 1582 && n === 10 && s >= 15) {
-      if (s >= 15)
+      s += t.getDaysOfMonth(e, g);
+    let f = r;
+    if (e === 1582 && n === 10 && r >= 15) {
+      if (r >= 15)
         f -= 10;
-      else if (s > 4)
-        throw new Error(`wrong solar year ${e} month ${n} day ${s}`);
+      else if (r > 4)
+        throw new Error(`wrong solar year ${e} month ${n} day ${r}`);
     }
-    return r += f, r;
+    return s += f, s;
   }
-  static getWeeksOfMonth(e, n, s) {
+  static getWeeksOfMonth(e, n, r) {
     return Math.ceil(
-      (t.getDaysOfMonth(e, n) + c.fromYmd(e, n, 1).getWeek() - s) / 7
+      (t.getDaysOfMonth(e, n) + c.fromYmd(e, n, 1).getWeek() - r) / 7
     );
   }
-  static getDaysBetween(e, n, s, r, f, g) {
+  static getDaysBetween(e, n, r, s, f, g) {
     let u, i, a;
-    if (e == r)
-      u = t.getDaysInYear(r, f, g) - t.getDaysInYear(e, n, s);
-    else if (e > r) {
-      for (i = t.getDaysOfYear(r) - t.getDaysInYear(r, f, g), a = r + 1; a < e; a++)
+    if (e == s)
+      u = t.getDaysInYear(s, f, g) - t.getDaysInYear(e, n, r);
+    else if (e > s) {
+      for (i = t.getDaysOfYear(s) - t.getDaysInYear(s, f, g), a = s + 1; a < e; a++)
         i += t.getDaysOfYear(a);
-      i += t.getDaysInYear(e, n, s), u = -i;
+      i += t.getDaysInYear(e, n, r), u = -i;
     } else {
-      for (i = t.getDaysOfYear(e) - t.getDaysInYear(e, n, s), a = e + 1; a < r; a++)
+      for (i = t.getDaysOfYear(e) - t.getDaysInYear(e, n, r), a = e + 1; a < s; a++)
         i += t.getDaysOfYear(a);
-      i += t.getDaysInYear(r, f, g), u = i;
+      i += t.getDaysInYear(s, f, g), u = i;
     }
     return u;
   }

package/lunar/lib/SolarWeek.js

@@ -1,10 +1,6 @@
 import { Solar as o } from "./Solar.js";
-import { SolarUtil as y } from "./SolarUtil.js";
+import { SolarUtil as f } from "./SolarUtil.js";
 class h {
-  _year;
-  _month;
-  _day;
-  _start;
   static fromYmd(t, s, e, r) {
     return new h(t, s, e, r);
   }
@@ -38,7 +34,7 @@ class h {
   getIndexInYear() {
     let t = o.fromYmd(this._year, 1, 1).getWeek() - this._start;
     return t < 0 && (t += 7), Math.ceil(
-      (y.getDaysInYear(this._year, this._month, this._day) + t) / 7
+      (f.getDaysInYear(this._year, this._month, this._day) + t) / 7
     );
   }
   next(t, s) {
@@ -47,7 +43,7 @@ class h {
       return h.fromYmd(this._year, this._month, this._day, e);
     let r = o.fromYmd(this._year, this._month, this._day);
     if (s) {
-      let g = t, n = h.fromYmd(this._year, this._month, this._day, e), f = this._month;
+      let g = t, n = h.fromYmd(this._year, this._month, this._day, e), y = this._month;
       const m = g > 0;
       for (; g !== 0; ) {
         r = r.next(m ? 7 : -7), n = h.fromYmd(
@@ -57,7 +53,7 @@ class h {
           e
         );
         let a = n.getMonth();
-        if (f !== a) {
+        if (y !== a) {
           const d = n.getIndex();
           if (m)
             if (d === 1) {
@@ -75,7 +71,7 @@ class h {
                 r.getDay(),
                 e
               );
-          else if (y.getWeeksOfMonth(
+          else if (f.getWeeksOfMonth(
             n.getYear(),
             n.getMonth(),
             e
@@ -91,14 +87,14 @@ class h {
             r = o.fromYmd(
               n.getYear(),
               n.getMonth(),
-              y.getDaysOfMonth(n.getYear(), n.getMonth())
+              f.getDaysOfMonth(n.getYear(), n.getMonth())
             ), n = h.fromYmd(
               r.getYear(),
               r.getMonth(),
               r.getDay(),
               e
             );
-          f = a;
+          y = a;
         }
         g -= m ? 1 : -1;
       }

package/lunar/lib/SolarYear.js

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

package/package.json

@@ -1 +1 @@
-{"name":"@unicom-cloud/utils","version":"0.1.15","dependencies":{},"peerDependencies":{"lodash":"^4.17.21"},"main":"./index.js","type":"module","types":"types/index.d.ts","publishConfig":{"registry":"https://registry.npmjs.org/","access":"public"}}
+{"name":"@unicom-cloud/utils","version":"0.1.16","dependencies":{},"peerDependencies":{"lodash":"^4.17.21"},"main":"./index.js","type":"module","types":"types/index.d.ts","publishConfig":{"registry":"https://registry.npmjs.org/","access":"public"}}