nadesiko3 3.2.41 → 3.2.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,8 +1,8 @@
1
1
  // なでしこバージョン
2
2
  const nakoVersion = {
3
- version: '3.2.41',
3
+ version: '3.2.42',
4
4
  major: 3,
5
5
  minor: 2,
6
- patch: 41
6
+ patch: 42
7
7
  }
8
8
  module.exports = nakoVersion
@@ -89,14 +89,15 @@ const PluginSystem = {
89
89
  if (s.match(/^\d+\:\d+(\:\d+)?$/)) {
90
90
  const t = new Date()
91
91
  const a = (s + ':0').split(':')
92
- return new Date(`${t.getFullYear()}-${t.getMonth()+1}-${t.getDate()} ${a[0]}:${a[1]}:${a[2]}`)
92
+ return new Date(
93
+ t.getFullYear(), t.getMonth(), t.getDate(),
94
+ a[0], a[1], a[2])
93
95
  }
94
96
  // replace splitter to '/'
95
97
  s = s.replace(/[\-\s\:]/g, '/')
96
98
  s += '/0/0/0' // 日付だけのときのために時間分を足す
97
99
  const a = s.split('/')
98
- const dateStr = `${a[0]}-${a[1]}-${a[2]} ${z2(a[3])}:${z2(a[4])}:${z2(a[5])}`
99
- return new Date(dateStr)
100
+ return new Date(a[0], a[1]-1, a[2], a[3], a[4],a[5])
100
101
  }
101
102
  // 『継続表示』のための一時変数(『表示』実行で初期化)
102
103
  sys.__printPool = ''
@@ -560,7 +560,11 @@ describe('plugin_system_test', () => {
560
560
  cmp('「00:00:01」に「-1時間」を日時加算。それを表示', '23:00:01')
561
561
  cmp('「2017/03/06 00:00:01」に「-2分」を日時加算。それを表示', '2017/03/05 23:58:01')
562
562
  cmp('「00:00:01」に「-2分」を日時加算。それを表示', '23:58:01')
563
+ cmp('「2022/02/16 00:00:02」に「-2秒」を日時加算。それを表示', '2022/02/16 00:00:00')
564
+ cmp('「2022/02/16 00:02:00」に「-2分」を日時加算。それを表示', '2022/02/16 00:00:00')
565
+ cmp('「2022/02/16 02:00:00」に「-2時間」を日時加算。それを表示', '2022/02/16 00:00:00')
563
566
  cmp('「2017/03/06 00:00:01」に「-3秒」を日時加算。それを表示', '2017/03/05 23:59:58')
567
+ cmp('「2022/02/16」に「-1日」を日時加算。それを表示', '2022/02/15')
564
568
  cmp('「00:00:01」に「-3秒」を日時加算。それを表示', '23:59:58')
565
569
  cmp('「2017/03/06 00:00:01」に「+0001/02/03」を日付加算。それを表示', '2018/05/09 00:00:01')
566
570
  cmp('「2017/03/06」に「+0001/02/03」を日付加算。それを表示', '2018/05/09')