Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -278,15 +278,15 @@ declare class DateFormatter {
#private;
}
declare namespace DateFormatter {
export { DateFormatter as default, DateFormatter, dateFormat, getWeekOfYear, getDayName, standardMasks, standardMaskNames, i18n, I18n, DateFn };
export { DateFormatter as default, DateFormatter, dateformat, getWeekOfYear, getDayName, standardMasks, standardMaskNames, i18n, I18n, DateFn };
}
/**
* @param {string | number | Date} [date=new Date()]
* @param {string} [mask='default']
* @param {boolean} [utc=false]
* @param {boolean} [gmt=true]
*/
declare function dateFormat(date?: string | number | Date, mask?: string, utc?: boolean, gmt?: boolean): string;
declare function dateformat(date?: string | number | Date, mask?: string, utc?: boolean, gmt?: boolean): string;
/**
* Get the ISO 8601 week number for a given date.
*
Expand Down
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ class DateFormatter {
* @param {boolean} [utc=false]
* @param {boolean} [gmt=true]
*/
function dateFormat (date, mask, utc, gmt) {
function dateformat (date, mask, utc, gmt) {
if (typeof date === 'string' || typeof date === 'number') {
date = new Date(date)
}
Expand Down Expand Up @@ -889,7 +889,7 @@ function dateFormat (date, mask, utc, gmt) {
module.exports = DateFormatter
module.exports.default = DateFormatter
module.exports.DateFormatter = DateFormatter
module.exports.dateFormat = dateFormat
module.exports.dateformat = dateformat
module.exports.getWeekOfYear = getWeekOfYear
module.exports.getDayName = getDayName
module.exports.standardMasks = standardMasks
Expand Down
4 changes: 2 additions & 2 deletions test/dateformat/test_dayofweek.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

const { describe, it } = require('node:test')

const { dateFormat } = require('./../../index.js')
const { dateformat } = require('./../../index.js')

describe('dayOfWeek', function () {
it('should correctly format the timezone part', function (t) {
const start = 10 // the 10 of March 2013 is a Sunday
for (let dow = 1; dow <= 7; dow++) {
const date = new Date('2013-03-' + (start + dow))
const N = dateFormat(date, 'N')
const N = dateformat(date, 'N')
t.assert.strictEqual(N, String(dow))
}
})
Expand Down
6 changes: 3 additions & 3 deletions test/dateformat/test_formats.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { describe, it } = require('node:test')
const { dateFormat, standardMasks: masks } = require('../../index.js')
const { dateformat, standardMasks: masks } = require('../../index.js')

const expects = {
default: 'Sat Mar 08 2014 13:19:44',
Expand Down Expand Up @@ -61,14 +61,14 @@ describe('dateformat([now], [mask])', function () {
)
expected = now.toISOString().replace(/\.000/g, '')
}
const actual = dateFormat(now, key)
const actual = dateformat(now, key)
t.assert.strictEqual(actual, expected)
})
})
it('should use `default` mask, when `mask` is empty', (t) => {
const now = new Date(2014, 2, 8, 13, 19, 44)
const expected = expects['default']
const actual = dateFormat(now)
const actual = dateformat(now)

t.assert.strictEqual(actual, expected)
})
Expand Down
6 changes: 3 additions & 3 deletions test/dateformat/test_isoutcdatetime.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const { describe, it } = require('node:test')

const { dateFormat } = require('./../../index.js')
const { dateformat } = require('./../../index.js')

describe('isoUtcDateTime', function () {
it('should correctly format the timezone part', (t) => {
const actual = dateFormat('2014-06-02T13:23:21-08:00', 'isoUtcDateTime')
const actual = dateformat('2014-06-02T13:23:21-08:00', 'isoUtcDateTime')
t.assert.strictEqual(actual, '2014-06-02T21:23:21Z')
const epochTime = dateFormat(0, 'isoUtcDateTime')
const epochTime = dateformat(0, 'isoUtcDateTime')
t.assert.strictEqual(epochTime, '1970-01-01T00:00:00Z')
})
})
10 changes: 5 additions & 5 deletions test/dateformat/test_mask-d.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
const { describe, it } = require('node:test')
const { dateFormat } = require('./../../index.js')
const { dateformat } = require('./../../index.js')

describe("Mask: 'd'", function () {
it("should format '1993-03-12' as '12'", (t) => {
const date = new Date('1993-03-12')
const d = dateFormat(date, 'd')
const d = dateformat(date, 'd')
t.assert.strictEqual(d, '12')
})

it("should format '2020-11-1' as '1'", (t) => {
const date = new Date('2020-11-1')
const d = dateFormat(date, 'd')
const d = dateformat(date, 'd')
t.assert.strictEqual(d, '1')
})

it("should format '1830-01-20' as '20'", (t) => {
const date = new Date('1830-01-20')
const d = dateFormat(date, 'd')
const d = dateformat(date, 'd')
t.assert.strictEqual(d, '20')
})

it("should not format '1830-01-06' as '06'", (t) => {
const date = new Date('1830-01-20')
const d = dateFormat(date, 'd')
const d = dateformat(date, 'd')
t.assert.notStrictEqual(d, '06')
})
})
10 changes: 5 additions & 5 deletions test/dateformat/test_mask-dd.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
const { describe, it } = require('node:test')
const { dateFormat } = require('./../../index.js')
const { dateformat } = require('./../../index.js')

describe("Mask: 'dd'", function () {
it("should format '2003-9-11' as '11'", (t) => {
const date = new Date('2003-9-11')
const d = dateFormat(date, 'dd')
const d = dateformat(date, 'dd')
t.assert.strictEqual(d, '11')
})

it("should format '1992-02-2' as '02'", (t) => {
const date = new Date('1992-02-2')
const d = dateFormat(date, 'dd')
const d = dateformat(date, 'dd')
t.assert.strictEqual(d, '02')
})

it("should format '1032-12-07' as '07'", (t) => {
const date = new Date('1032-12-07')
const d = dateFormat(date, 'dd')
const d = dateformat(date, 'dd')
t.assert.strictEqual(d, '07')
})

it("should not format '2077-10-06' as '6'", (t) => {
const date = new Date('2077-10-06')
const d = dateFormat(date, 'dd')
const d = dateformat(date, 'dd')
t.assert.notStrictEqual(d, '6')
})
})
8 changes: 4 additions & 4 deletions test/dateformat/test_mask-ddd.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
const { describe, it } = require('node:test')
const { dateFormat } = require('./../../index.js')
const { dateformat } = require('./../../index.js')

describe("Mask: 'ddd'", function () {
it("should format '2023-01-07' as 'Sat'", (t) => {
const date = new Date('2023-01-07')
const d = dateFormat(date, 'ddd')
const d = dateformat(date, 'ddd')
t.assert.strictEqual(d, 'Sat')
})

it("should format '1873-12-17' as 'Wed'", (t) => {
const date = new Date('1873-12-17')
const d = dateFormat(date, 'ddd')
const d = dateformat(date, 'ddd')
t.assert.strictEqual(d, 'Wed')
})

it("should format '2112-10-25' as 'Tue'", (t) => {
const date = new Date('2112-10-25')
const d = dateFormat(date, 'ddd')
const d = dateformat(date, 'ddd')
t.assert.strictEqual(d, 'Tue')
})
})
8 changes: 4 additions & 4 deletions test/dateformat/test_mask-dddd.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
const { describe, it } = require('node:test')
const { dateFormat } = require('./../../index.js')
const { dateformat } = require('./../../index.js')

describe("Mask: 'dddd'", function () {
it("should format '1934-11-13' as 'Tuesday'", (t) => {
const date = new Date('1934-11-13')
const d = dateFormat(date, 'dddd')
const d = dateformat(date, 'dddd')
t.assert.strictEqual(d, 'Tuesday')
})

it("should format '1834-01-2' as 'Thursday'", (t) => {
const date = new Date('1834-01-2')
const d = dateFormat(date, 'dddd')
const d = dateformat(date, 'dddd')
t.assert.strictEqual(d, 'Thursday')
})

it("should format '2077-7-22' as 'Thursday'", (t) => {
const date = new Date('2077-7-22')
const d = dateFormat(date, 'dddd')
const d = dateformat(date, 'dddd')
t.assert.strictEqual(d, 'Thursday')
})
})
10 changes: 5 additions & 5 deletions test/dateformat/test_mask-h.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
const { describe, it } = require('node:test')
const { dateFormat } = require('./../../index.js')
const { dateformat } = require('./../../index.js')

describe("Mask: 'h'", function () {
it("should format '2020-10-22T22:10:59.736' as '10'", (t) => {
const date = new Date('2020-10-22T22:10:59.736')
const d = dateFormat(date, 'h')
const d = dateformat(date, 'h')
t.assert.strictEqual(d, '10')
})

it("should format '2020-10-13T13:30:41.278' as '1'", (t) => {
const date = new Date('2020-10-13T13:30:41.278')
const d = dateFormat(date, 'h')
const d = dateformat(date, 'h')
t.assert.strictEqual(d, '1')
})

it("should format '1993-02-19T03:18:18.711' as '3'", (t) => {
const d = dateFormat('1993-02-19T03:18:18.711', 'h')
const d = dateformat('1993-02-19T03:18:18.711', 'h')
t.assert.strictEqual(d, '3')
})

it("should format '2134-01-25T02:20:42.816' as '2'", (t) => {
const d = dateFormat('2134-01-25T02:20:42.816', 'h')
const d = dateformat('2134-01-25T02:20:42.816', 'h')
t.assert.strictEqual(d, '2')
})
})
10 changes: 5 additions & 5 deletions test/dateformat/test_mask-h_.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
const { describe, it } = require('node:test')
const { dateFormat } = require('./../../index.js')
const { dateformat } = require('./../../index.js')

describe("Mask: 'H'", function () {
it("should format '1883-03-22T07:35:26.419' as '7'", (t) => {
const date = new Date('1883-03-22T07:35:26.419')
const d = dateFormat(date, 'H')
const d = dateformat(date, 'H')
t.assert.strictEqual(d, '7')
})

it("should format '2012-11-07T14:39:48.988' as '14'", (t) => {
const date = new Date('2012-11-07T14:39:48.988')
const d = dateFormat(date, 'H')
const d = dateformat(date, 'H')
t.assert.strictEqual(d, '14')
})

it("should format '1882-01-16T19:37:45.965' as '19'", (t) => {
const d = dateFormat('1882-01-16T19:37:45.965', 'H')
const d = dateformat('1882-01-16T19:37:45.965', 'H')
t.assert.strictEqual(d, '19')
})

it("should format '2020-08-29T11:20:47.128' as '11'", (t) => {
const d = dateFormat('2020-08-29T11:20:47.128', 'H')
const d = dateformat('2020-08-29T11:20:47.128', 'H')
t.assert.strictEqual(d, '11')
})
})
10 changes: 5 additions & 5 deletions test/dateformat/test_mask-h_h_.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
const { describe, it } = require('node:test')
const { dateFormat } = require('./../../index.js')
const { dateformat } = require('./../../index.js')

describe("Mask: 'HH'", function () {
it("should format '1872-02-01T15:55:16.524' as '15'", (t) => {
const date = new Date('1872-02-01T15:55:16.524')
const d = dateFormat(date, 'HH')
const d = dateformat(date, 'HH')
t.assert.strictEqual(d, '15')
})

it("should format '2020-10-08T14:32:24.438' as '14'", (t) => {
const date = new Date('2020-10-08T14:32:24.438')
const d = dateFormat(date, 'HH')
const d = dateformat(date, 'HH')
t.assert.strictEqual(d, '14')
})

it("should format '2077-12-24T04:20:55.795' as '04'", (t) => {
const d = dateFormat('2077-12-24T04:20:55.795', 'HH')
const d = dateformat('2077-12-24T04:20:55.795', 'HH')
t.assert.strictEqual(d, '04')
})

it("should format '1782-02-11T01:09:41.403' as '01'", (t) => {
const d = dateFormat('1782-02-11T01:09:41.403', 'HH')
const d = dateformat('1782-02-11T01:09:41.403', 'HH')
t.assert.strictEqual(d, '01')
})
})
10 changes: 5 additions & 5 deletions test/dateformat/test_mask-hh.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
const { describe, it } = require('node:test')
const { dateFormat } = require('./../../index.js')
const { dateformat } = require('./../../index.js')

describe("Mask: 'hh'", function () {
it("should format '1987-02-11T11:03:16.637' as '11'", (t) => {
const date = new Date('1987-02-11T11:03:16.637')
const d = dateFormat(date, 'hh')
const d = dateformat(date, 'hh')
t.assert.strictEqual(d, '11')
})

it("should format '2014-09-28T04:29:52.509' as '04'", (t) => {
const date = new Date('2020-09-28T04:29:52.509')
const d = dateFormat(date, 'hh')
const d = dateformat(date, 'hh')
t.assert.strictEqual(d, '04')
})

it("should format '2001-08-02T19:14:19.263' as '07'", (t) => {
const d = dateFormat('2001-08-02T19:14:19.263', 'hh')
const d = dateformat('2001-08-02T19:14:19.263', 'hh')
t.assert.strictEqual(d, '07')
})

it("should format '1872-01-22T19:26:01.744' as '07'", (t) => {
const d = dateFormat('1872-01-22T19:26:01.744', 'hh')
const d = dateformat('1872-01-22T19:26:01.744', 'hh')
t.assert.strictEqual(d, '07')
})
})
10 changes: 5 additions & 5 deletions test/dateformat/test_mask-l.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
const { describe, it } = require('node:test')
const { dateFormat } = require('./../../index.js')
const { dateformat } = require('./../../index.js')

describe("Mask: 'l'", function () {
it("should format '2020-10-10T08:48:02.436' as '436'", (t) => {
const date = new Date('2020-10-10T08:48:02.436')
const d = dateFormat(date, 'l')
const d = dateformat(date, 'l')
t.assert.strictEqual(d, '436')
})

it("should format '1993-02-16T14:22:12.654' as '654'", (t) => {
const date = new Date('1993-02-16T14:22:12.654')
const d = dateFormat(date, 'l')
const d = dateformat(date, 'l')
t.assert.strictEqual(d, '654')
})

it("should format '2076-01-03T18:23:30.064' as '064'", (t) => {
const d = dateFormat('2076-01-03T18:23:30.064', 'l')
const d = dateformat('2076-01-03T18:23:30.064', 'l')
t.assert.strictEqual(d, '064')
})

it("should format '2002-12-25T19:35:55.655' as '655'", (t) => {
const d = dateFormat('2002-12-25T19:35:55.655', 'l')
const d = dateformat('2002-12-25T19:35:55.655', 'l')
t.assert.strictEqual(d, '655')
})
})
Loading
Loading