diff --git a/package-lock.json b/package-lock.json index 8fe4c7b..cd760e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1309,9 +1309,9 @@ } }, "@gitzone/tstest": { - "version": "1.0.44", - "resolved": "https://verdaccio.lossless.one/@gitzone%2ftstest/-/tstest-1.0.44.tgz", - "integrity": "sha512-IzQ9mEboN17Vgm/ecW2GtJa8FsnxDawD0PTeWfvtFbS4KNcqOxVM/gkkO7H4f1eJuzDaMvKWlsjBt2DBRhKqSg==", + "version": "1.0.52", + "resolved": "https://verdaccio.lossless.one/@gitzone%2ftstest/-/tstest-1.0.52.tgz", + "integrity": "sha512-9n6mhGAd1MKMb4lcXstJvoG9bIl+mb+M9wdajbFe/jzv9q62P5RL9pSdyW4Yk8I7ObJmyggBvr8cLaOUsaqzAQ==", "dev": true, "requires": { "@gitzone/tsbundle": "^1.0.78", @@ -1321,7 +1321,7 @@ "@pushrocks/smartdelay": "^2.0.10", "@pushrocks/smartexpress": "^3.0.76", "@pushrocks/smartfile": "^8.0.0", - "@pushrocks/smartlog": "^2.0.36", + "@pushrocks/smartlog": "^2.0.39", "@pushrocks/smartpromise": "^3.0.6", "@pushrocks/smartshell": "^2.0.25", "@pushrocks/tapbundle": "^3.2.9", @@ -1330,22 +1330,60 @@ }, "dependencies": { "@pushrocks/smartfile": { - "version": "8.0.0", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile/-/smartfile-8.0.0.tgz", - "integrity": "sha512-A5uk7O3UZBXt0obIkQDpN9eihQwq4PVryr21xTv9Uw573mJWGfGB/xs07tdC6Qgbtlvl7i2vXl5qmKFDRky9Mg==", + "version": "8.0.5", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile/-/smartfile-8.0.5.tgz", + "integrity": "sha512-mptjn41uTOHX5j2mecLlBkdLtRX5HPgIi2x6CLMZpB2NDTitj9elUej/puvLYWuNR+uGmCVG/UgXgW5fYVq5gw==", "dev": true, "requires": { + "@pushrocks/smartfile-interfaces": "^1.0.7", "@pushrocks/smarthash": "^2.1.6", + "@pushrocks/smartjson": "^4.0.3", "@pushrocks/smartmime": "^1.0.3", "@pushrocks/smartpath": "^4.0.3", "@pushrocks/smartpromise": "^3.0.6", - "@pushrocks/smartrequest": "^1.1.47", + "@pushrocks/smartrequest": "^1.1.51", "@types/fs-extra": "^9.0.1", + "@types/glob": "^7.1.3", + "@types/js-yaml": "^3.12.5", "fs-extra": "^9.0.1", "glob": "^7.1.6", "js-yaml": "^3.14.0" } }, + "@pushrocks/smartjson": { + "version": "4.0.4", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartjson/-/smartjson-4.0.4.tgz", + "integrity": "sha512-kmjTn8qY8w0iVMfX7/0I1J3rZ12g7K+v15zNbG4rl5BOvt/uBySebG/oRijvRgVmGtV4rbYOsGOsciC+MA+tRQ==", + "dev": true, + "requires": { + "@types/buffer-json": "^2.0.0", + "@types/fast-json-stable-stringify": "^2.0.0", + "buffer-json": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "lodash.clonedeep": "^4.5.0" + } + }, + "@pushrocks/smartlog": { + "version": "2.0.39", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartlog/-/smartlog-2.0.39.tgz", + "integrity": "sha512-fHCoBLwKM+F3jN5nZH6QEcEVWtgyESN+ysT9KLxmM/wrhIibG98yLxp6kwfZZbv6aKmHWbtKEvBmv+Vd4Hfwlg==", + "dev": true, + "requires": { + "@pushrocks/isounique": "^1.0.4", + "@pushrocks/smartlog-interfaces": "^2.0.20" + } + }, + "@pushrocks/smartrequest": { + "version": "1.1.51", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrequest/-/smartrequest-1.1.51.tgz", + "integrity": "sha512-RJUvo7MEIAm+gFueJrmf8LcpVals5jp7PgOZ+ebGTvDoVwCpor0Z6nmJDOs9ykjFCIvvPhfiterQeb6hJr2uDw==", + "dev": true, + "requires": { + "@pushrocks/smartpromise": "^3.0.6", + "agentkeepalive": "^4.1.3", + "form-data": "^3.0.0" + } + }, "@types/fs-extra": { "version": "9.0.1", "resolved": "https://verdaccio.lossless.one/@types%2ffs-extra/-/fs-extra-9.0.1.tgz", @@ -1355,6 +1393,28 @@ "@types/node": "*" } }, + "agentkeepalive": { + "version": "4.1.3", + "resolved": "https://verdaccio.lossless.one/agentkeepalive/-/agentkeepalive-4.1.3.tgz", + "integrity": "sha512-wn8fw19xKZwdGPO47jivonaHRTd+nGOMP1z11sgGeQzDy2xd5FG0R67dIMcKHDE2cJ5y+YXV30XVGUBPRSY7Hg==", + "dev": true, + "requires": { + "debug": "^4.1.0", + "depd": "^1.1.2", + "humanize-ms": "^1.2.1" + } + }, + "form-data": { + "version": "3.0.0", + "resolved": "https://verdaccio.lossless.one/form-data/-/form-data-3.0.0.tgz", + "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, "fs-extra": { "version": "9.0.1", "resolved": "https://verdaccio.lossless.one/fs-extra/-/fs-extra-9.0.1.tgz", @@ -1646,6 +1706,12 @@ "js-yaml": "^3.13.1" } }, + "@pushrocks/smartfile-interfaces": { + "version": "1.0.7", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile-interfaces/-/smartfile-interfaces-1.0.7.tgz", + "integrity": "sha512-C/v9Scbx1J+ByMk3YBZrlLRYXdObty/Uz/h6kSZqsO8ghYuT9l7OVpEcyduiSVPakaMi6YnzfME3Nfs3oLj//Q==", + "dev": true + }, "@pushrocks/smarthash": { "version": "2.1.6", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarthash/-/smarthash-2.1.6.tgz", @@ -2003,16 +2069,16 @@ } }, "@pushrocks/smarttime": { - "version": "3.0.24", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.24.tgz", - "integrity": "sha512-c/n0Y3CUnVNa3TnuXZ5aRc0bWj4RX7+XSjPes1J4HidU1yBOd9UOt6l08W8aPH5jMjT9Ei2jH0GsheaTGoVEYA==", + "version": "3.0.35", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.35.tgz", + "integrity": "sha512-KBDprr2gMcw+21kD6GkJ0Y9fc/SuMijhFPDKoBmuCW9Nhn+KAnabCB8Qn8OzeUuQcoHQ3SFJ/4KioJWNxMgxaQ==", "dev": true, "requires": { - "@pushrocks/lik": "^4.0.13", + "@pushrocks/lik": "^4.0.17", "@pushrocks/smartdelay": "^2.0.10", "@pushrocks/smartpromise": "^3.0.2", "croner": "^1.1.23", - "dayjs": "^1.8.29", + "dayjs": "^1.8.35", "is-nan": "^1.3.0" } }, @@ -2171,6 +2237,12 @@ "@types/node": "*" } }, + "@types/buffer-json": { + "version": "2.0.0", + "resolved": "https://verdaccio.lossless.one/@types%2fbuffer-json/-/buffer-json-2.0.0.tgz", + "integrity": "sha512-nFKOrY93Tvv5Tobws+YbkGlPOJsn1nVpZah3BlSyQ4EniFm97KLvSr54tZ5xQp8mlf/XxbYwskNCYQB9EdrPlQ==", + "dev": true + }, "@types/chai": { "version": "4.2.11", "resolved": "https://verdaccio.lossless.one/@types%2fchai/-/chai-4.2.11.tgz", @@ -2305,6 +2377,16 @@ "@types/node": "*" } }, + "@types/glob": { + "version": "7.1.3", + "resolved": "https://verdaccio.lossless.one/@types%2fglob/-/glob-7.1.3.tgz", + "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", + "dev": true, + "requires": { + "@types/minimatch": "*", + "@types/node": "*" + } + }, "@types/helmet": { "version": "0.0.47", "resolved": "https://verdaccio.lossless.one/@types%2fhelmet/-/helmet-0.0.47.tgz", @@ -2325,6 +2407,12 @@ "@types/uglify-js": "*" } }, + "@types/js-yaml": { + "version": "3.12.5", + "resolved": "https://verdaccio.lossless.one/@types%2fjs-yaml/-/js-yaml-3.12.5.tgz", + "integrity": "sha512-JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww==", + "dev": true + }, "@types/mime": { "version": "2.0.3", "resolved": "https://verdaccio.lossless.one/@types%2fmime/-/mime-2.0.3.tgz", @@ -2343,9 +2431,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "14.6.2", - "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.6.2.tgz", - "integrity": "sha512-onlIwbaeqvZyniGPfdw/TEhKIh79pz66L1q06WUQqJLnAb6wbjvOtepLYTGHTqzdXgBYIE3ZdmqHDGsRsbBz7A==", + "version": "14.11.2", + "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.11.2.tgz", + "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==", "dev": true }, "@types/parcel-bundler": { @@ -2358,9 +2446,9 @@ } }, "@types/puppeteer": { - "version": "2.1.2", - "resolved": "https://verdaccio.lossless.one/@types%2fpuppeteer/-/puppeteer-2.1.2.tgz", - "integrity": "sha512-rNPCKZ+PuHR11au5Qu36TK63i9ppcdvREyEUd45jGc9Yj4AsoLpiCm22ebwDDRSzNc1N2+XOmaa5i6ZSW8FOMQ==", + "version": "2.1.5", + "resolved": "https://verdaccio.lossless.one/@types%2fpuppeteer/-/puppeteer-2.1.5.tgz", + "integrity": "sha512-ZZKAcX5XVEtSK+CLxz6FhofPt8y1D3yDtjGZHDFBZ4bGe8v2aaS6qBDHY4crruvpb4jsO7HKrPEx39IIqsZAUg==", "dev": true, "requires": { "@types/node": "*" @@ -3234,6 +3322,12 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "dev": true }, + "buffer-json": { + "version": "2.0.0", + "resolved": "https://verdaccio.lossless.one/buffer-json/-/buffer-json-2.0.0.tgz", + "integrity": "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==", + "dev": true + }, "buffer-xor": { "version": "1.0.3", "resolved": "https://verdaccio.lossless.one/buffer-xor/-/buffer-xor-1.0.3.tgz", @@ -3922,9 +4016,9 @@ } }, "crypto-random-string": { - "version": "3.2.0", - "resolved": "https://verdaccio.lossless.one/crypto-random-string/-/crypto-random-string-3.2.0.tgz", - "integrity": "sha512-8vPu5bsKaq2uKRy3OL7h1Oo7RayAWB8sYexLKAqvCXVib8SxgbmoF1IN4QMKjBv8uI8mp5gPPMbiRah25GMrVQ==", + "version": "3.3.0", + "resolved": "https://verdaccio.lossless.one/crypto-random-string/-/crypto-random-string-3.3.0.tgz", + "integrity": "sha512-teWAwfMb1d6brahYyKqcBEb5Yp8PJPvPOdOonXDnvaKOTmKDFNVE8E3Y2XQuzjNV/3XMwHbrX9fHWvrhRKt4Gg==", "dev": true, "requires": { "type-fest": "^0.8.1" @@ -4232,9 +4326,9 @@ } }, "dayjs": { - "version": "1.8.35", - "resolved": "https://verdaccio.lossless.one/dayjs/-/dayjs-1.8.35.tgz", - "integrity": "sha512-isAbIEenO4ilm6f8cpqvgjZCsuerDAz2Kb7ri201AiNn58aqXuaLJEnCtfIMdCvERZHNGRY5lDMTr/jdAnKSWQ==" + "version": "1.9.1", + "resolved": "https://verdaccio.lossless.one/dayjs/-/dayjs-1.9.1.tgz", + "integrity": "sha512-01NCTBg8cuMJG1OQc6PR7T66+AFYiPwgDvdJmvJBn29NGzIG+DIFxPLNjHzwz3cpFIvG+NcwIjP9hSaPVoOaDg==" }, "deasync": { "version": "0.1.20", @@ -6559,9 +6653,9 @@ "dev": true }, "ip-regex": { - "version": "4.1.0", - "resolved": "https://verdaccio.lossless.one/ip-regex/-/ip-regex-4.1.0.tgz", - "integrity": "sha512-pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA==", + "version": "4.2.0", + "resolved": "https://verdaccio.lossless.one/ip-regex/-/ip-regex-4.2.0.tgz", + "integrity": "sha512-n5cDDeTWWRwK1EBoWwRti+8nP4NbytBBY0pldmnIkq6Z55KNFmWofh4rl9dPZpj+U/nVq7gweR3ylrvMt4YZ5A==", "dev": true }, "ipaddr.js": { @@ -7610,9 +7704,9 @@ "dev": true }, "node-fetch": { - "version": "2.6.0", - "resolved": "https://verdaccio.lossless.one/node-fetch/-/node-fetch-2.6.0.tgz", - "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==", + "version": "2.6.1", + "resolved": "https://verdaccio.lossless.one/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", "dev": true }, "node-forge": { @@ -9661,12 +9755,12 @@ } }, "sitemap": { - "version": "6.2.0", - "resolved": "https://verdaccio.lossless.one/sitemap/-/sitemap-6.2.0.tgz", - "integrity": "sha512-ta9BLo/ZLUNgfGVhknA2IHWuIXfcFPxMvMCY3Xhf141rEZoW8G5nIVCDR0/zeXJCAvWk+UzqxyLBtRBH1OOq6w==", + "version": "6.3.2", + "resolved": "https://verdaccio.lossless.one/sitemap/-/sitemap-6.3.2.tgz", + "integrity": "sha512-JmOG+bYzUfqXFfvh4JZocRvjrPGJddCWuDqiCTDe8me28CGCkWHYRtTFyTnmZu4x0SoD/6KNDGd88Fc5wBYlfQ==", "dev": true, "requires": { - "@types/node": "^14.0.18", + "@types/node": "^14.11.1", "@types/sax": "^1.2.1", "arg": "^4.1.3", "sax": "^1.2.4" @@ -10246,9 +10340,9 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, "systeminformation": { - "version": "4.27.3", - "resolved": "https://verdaccio.lossless.one/systeminformation/-/systeminformation-4.27.3.tgz", - "integrity": "sha512-0Nc8AYEK818h7FI+bbe/kj7xXsMD5zOHvO9alUqQH/G4MHXu5tHQfWqC/bzWOk4JtoQPhnyLgxMYncDA2eeSBw==", + "version": "4.27.7", + "resolved": "https://verdaccio.lossless.one/systeminformation/-/systeminformation-4.27.7.tgz", + "integrity": "sha512-3ozUwGSf5jmrhGgOXlX/O6hk1KQ28XPb7d3NiPZX267QmimuDq3TuIgnkw+vICUrGJGKWPLKmXVASnuJ3w07nw==", "dev": true }, "terser": { diff --git a/package.json b/package.json index 9628d4b..5d5d9de 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,9 @@ "@gitzone/tsbuild": "^2.1.25", "@gitzone/tsbundle": "^1.0.78", "@gitzone/tsrun": "^1.2.12", - "@gitzone/tstest": "^1.0.44", + "@gitzone/tstest": "^1.0.52", "@pushrocks/tapbundle": "^3.2.9", - "@types/node": "^14.6.2", + "@types/node": "^14.11.2", "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0" }, @@ -26,7 +26,7 @@ "@pushrocks/smartdelay": "^2.0.10", "@pushrocks/smartpromise": "^3.0.2", "croner": "^1.1.23", - "dayjs": "^1.8.35", + "dayjs": "^1.9.1", "is-nan": "^1.3.0" }, "files": [ diff --git a/test/test.extendeddate.ts b/test/test.extendeddate.ts index ebd4407..adba045 100644 --- a/test/test.extendeddate.ts +++ b/test/test.extendeddate.ts @@ -21,4 +21,9 @@ tap.test('should create a European date string', async () => { expect(extendedDate.exportToEuropeanDate()).to.equal('13.02.2018'); }); +tap.test('should format a date', async () => { + const extendedDate = new smarttime.ExtendedDate(Date.now()); + console.log(extendedDate.format('YYYY-MM-DD - hh:mm')); +}) + tap.start(); diff --git a/ts/smarttime.classes.extendeddate.ts b/ts/smarttime.classes.extendeddate.ts index b2cbe5c..1e9624b 100644 --- a/ts/smarttime.classes.extendeddate.ts +++ b/ts/smarttime.classes.extendeddate.ts @@ -121,4 +121,8 @@ export class ExtendedDate extends Date { dayOfTheWeekName: daysArray[this.getDay()], }; } + + public format (formatArg: string) { + return plugins.dayjs(this.getTime()).format(formatArg); + } }