readme

Create LICENSE

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: cupcakearmy

.gitignore

@@ -1,5 +1,2 @@
 node_modules
-yarn.lock
+dist
-lib
-
-.idea

.npmignore

@@ -1,3 +0,0 @@
-*
-!lib/index.js
-!lib/index.d.ts

README.md

@@ -1,15 +1,19 @@
 # uhrwerk 🕰
+
+![package size](https://img.shields.io/bundlephobia/min/uhrwerk?style=flat)
+![downloads badge](https://img.shields.io/npm/dt/uhrwerk)
+![types badge](https://img.shields.io/npm/types/uhrwerk)
+![version badge](https://img.shields.io/npm/v/uhrwerk)
+
 Minimal time duration utility. Replacement for MomentJS Durations. If you are looking into the time component of MomentJS check out this awesome library [dayjs](https://github.com/iamkun/dayjs).
 
-📦 It's **tiny**: [1.6kB](https://bundlephobia.com/result?p=uhrwerk@1.0.0) vs moment js [231.7kb](https://bundlephobia.com/result?p=moment@latest)
+📦 It's **tiny**: [2kB](https://bundlephobia.com/package/uhrwerk@latest) vs moment js [295kB](https://bundlephobia.com/result?p=moment@latest)
 
-**Typescript typings included**
+🌈 No dependencies, types included.
 
 ## Quickstart 🚀
 
 ```typescript
-// Whatever import you prefer
-// const { Duration } = require('uhrwerk')
 import { Duration } from 'uhrwerk'
 
 const d = new Duration(10, 'days')
@@ -44,7 +48,7 @@ d.humanize()    // 'a few minutes'
 const a = new Duration(1, 'day')
 const b = new Duration(2, 'days')
 const c = new Duration(0.5, 'year')
-const d = new Duration (Date.now(), 'ms')
+const d = new Duration(Date.now(), 'ms')
 ```
 
 #### `.add(amount, interval)`
@@ -137,8 +141,8 @@ The order of the array is important. The first match will return, like in a stan
 
 ```javascript
 const humanizer = [
-	[d => d.days() > 1, d => `${d.days()} days`],
+  [(d) => d.days() > 1, (d) => `${d.days()} days`],
-	[d => d.days() > 0, d => `1 day`],
+  [(d) => d.days() > 0, (d) => `1 day`],
   [() => true, () => 'catch all, below 1 day'],
 ]
 

package.json

@@ -1,24 +1,37 @@
 {
   "name": "uhrwerk",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "time utility",
-  "main": "./lib/index.js",
+  "author": "Niccolo Borgioli",
-  "types": "./lib/index.d.ts",
+  "license": "MIT",
+  "type": "module",
   "scripts": {
-    "build": "tsc",
+    "build": "tsup src/index.ts --format cjs,esm --dts --sourcemap",
-    "test": "yarn run build && mocha",
+    "test": "pnpm run build && mocha",
-    "prepublishOnly": "npm run test"
+    "prepublishOnly": "pnpm run test"
   },
+  "main": "./dist/index.cjs",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "keywords": [
     "time",
     "interval",
-    "humand-readable",
+    "human-readable",
     "utility"
   ],
-  "author": "Niccolo Borgioli",
-  "license": "MIT",
   "devDependencies": {
-    "mocha": "6.x",
+    "@tsconfig/strictest": "^2.0.3",
-    "typescript": "3.x"
+    "mocha": "^10.3.0",
+    "tsup": "^8.0.2",
+    "typescript": "^5.3.3"
   }
 }

src/index.ts

@@ -1,5 +1,5 @@
 type Intervals =
-	'millisecond'
+  | 'millisecond'
   | 'milliseconds'
   | 'ms'
   | 'second'
@@ -34,18 +34,16 @@ export type HumanizerReturnFN = (duration: Duration) => string
 export type Humanizer = [HumanizerTestFN, HumanizerReturnFN][]
 
 const defaultHumanizer: Humanizer = [
-	[d => d.years() > 0, d => `${d.years()} years`],
+  [(d) => d.years() > 0, (d) => `${d.years()} years`],
-	[d => d.weeks() > 1, d => `${d.weeks()} weeks`],
+  [(d) => d.weeks() > 1, (d) => `${d.weeks()} weeks`],
-	[d => d.days() > 0, d => `${d.days()} days`],
+  [(d) => d.days() > 0, (d) => `${d.days()} days`],
-	[d => d.hours() > 0, d => `${d.hours()} hours`],
+  [(d) => d.hours() > 0, (d) => `${d.hours()} hours`],
-	[d => d.minutes() > 5, d => `${d.minutes()} minutes`],
+  [(d) => d.minutes() > 5, (d) => `${d.minutes()} minutes`],
-	[d => d.minutes() > 0, _ => `a few minutes`],
+  [(d) => d.minutes() > 0, (_) => `a few minutes`],
   [() => true, () => `a moment`],
 ]
 
-
 export class Duration {
-
   private duration: number
 
   constructor(amount: number, interval: Intervals) {
@@ -126,39 +124,37 @@ export class Duration {
   }
 
   public milliseconds(): number {
-		return (this.duration % Year % Day % Hour % Minute % Second) / Millisecond | 0
+    return ((((((this.duration % Year) % Day) % Hour) % Minute) % Second) / Millisecond) | 0
   }
 
   public seconds(): number {
-		return (this.duration % Year % Day % Hour % Minute) / Second | 0
+    return (((((this.duration % Year) % Day) % Hour) % Minute) / Second) | 0
   }
 
   public minutes(): number {
-		return (this.duration % Year % Day % Hour) / Minute | 0
+    return ((((this.duration % Year) % Day) % Hour) / Minute) | 0
   }
 
   public hours(): number {
-		return (this.duration % Year % Day) / Hour | 0
+    return (((this.duration % Year) % Day) / Hour) | 0
   }
 
   public days(): number {
-		return (this.duration % Year) / Day | 0
+    return ((this.duration % Year) / Day) | 0
   }
 
   public weeks(): number {
-		return (this.duration) / Week | 0
+    return (this.duration / Week) | 0
   }
 
   public years(): number {
-		return (this.duration) / Year | 0
+    return (this.duration / Year) | 0
   }
 
   public humanize(humanizer?: Humanizer): string {
     if (!humanizer) humanizer = defaultHumanizer
 
-		for (const [control, value] of humanizer)
+    for (const [control, value] of humanizer) if (control(this)) return value(this)
-			if (control(this))
-				return value(this)
 
     return ''
   }

test/main.js

@@ -1,78 +0,0 @@
-const { describe, it } = require('mocha')
-const a = require('assert')
-
-const { Duration } = require('../')
-
-describe('Duration', () => {
-
-    describe('Basics', () => {
-
-        it('as unit', () => {
-            const d = new Duration(.5, 'year')
-
-            a.strictEqual(d.asMilliseconds(), 1000 * 60 * 60 * 24 * 365.25 / 2)
-            a.strictEqual(d.asSeconds(), 60 * 60 * 24 * 365.25 / 2)
-            a.strictEqual(d.asMinutes(), 60 * 24 * 365.25 / 2)
-            a.strictEqual(d.asHours(), 24 * 365.25 / 2)
-            a.strictEqual(d.asDays(), 365.25 / 2)
-            a.strictEqual(d.asWeeks(), 365.25 / 7 / 2)
-            a.strictEqual(d.asYears(), .5)
-        })
-
-        it('add / subtract', () => {
-            const d = new Duration(1, 'day')
-            d.add(4, 'hours')
-            a.strictEqual(d.asHours(), 28)
-            d.subtract(.5, 'day')
-            a.strictEqual(d.asHours(), 16)
-        })
-
-        it('exact units', () => {
-            const d = new Duration(1, 'day')
-
-            d.add(42, 'milliseconds')
-            a.strictEqual(d.milliseconds(), 42)
-
-            d.add(5, 'seconds')
-            a.strictEqual(d.seconds(), 5)
-
-            d.add(27, 'minutes')
-            a.strictEqual(d.minutes(), 27)
-
-            d.add(8, 'hours')
-            a.strictEqual(d.hours(), 8)
-
-            d.add(3, 'days')
-            a.strictEqual(d.days(), 4)
-
-            d.add(17, 'weeks')
-            a.strictEqual(d.weeks(), 17)
-
-            d.add(2, 'years')
-            a.strictEqual(d.years(), 2)
-        })
-
-    })
-
-    describe('Humanize', () => {
-
-        it('few minutes', () => {
-            a.strictEqual(new Duration(2, 'minutes').humanize(), 'a few minutes')
-            a.strictEqual(new Duration(16, 'minutes').humanize(), '16 minutes')
-            a.strictEqual(new Duration(30, 'seconds').humanize(), 'a moment')
-        })
-
-        it('custom humanizer', () => {
-            const humanizer = [
-                [d => d.days() > 0, d => `yus for ${d.days()}`],
-                [() => true, () => 'cool'],
-            ]
-
-            const d = new Duration(5, 'minutes')
-            a.strictEqual(d.humanize(humanizer), 'cool')
-            d.add(2, 'days')
-            a.strictEqual(d.humanize(humanizer), `yus for 2`)
-        })
-    })
-
-})

test/main.mjs

@@ -0,0 +1,73 @@
+import { strictEqual } from 'assert'
+import { describe, it } from 'mocha'
+
+import { Duration } from '../dist/index.js'
+
+describe('Duration', () => {
+  describe('Basics', () => {
+    it('as unit', () => {
+      const d = new Duration(0.5, 'year')
+
+      strictEqual(d.asMilliseconds(), (1000 * 60 * 60 * 24 * 365.25) / 2)
+      strictEqual(d.asSeconds(), (60 * 60 * 24 * 365.25) / 2)
+      strictEqual(d.asMinutes(), (60 * 24 * 365.25) / 2)
+      strictEqual(d.asHours(), (24 * 365.25) / 2)
+      strictEqual(d.asDays(), 365.25 / 2)
+      strictEqual(d.asWeeks(), 365.25 / 7 / 2)
+      strictEqual(d.asYears(), 0.5)
+    })
+
+    it('add / subtract', () => {
+      const d = new Duration(1, 'day')
+      d.add(4, 'hours')
+      strictEqual(d.asHours(), 28)
+      d.subtract(0.5, 'day')
+      strictEqual(d.asHours(), 16)
+    })
+
+    it('exact units', () => {
+      const d = new Duration(1, 'day')
+
+      d.add(42, 'milliseconds')
+      strictEqual(d.milliseconds(), 42)
+
+      d.add(5, 'seconds')
+      strictEqual(d.seconds(), 5)
+
+      d.add(27, 'minutes')
+      strictEqual(d.minutes(), 27)
+
+      d.add(8, 'hours')
+      strictEqual(d.hours(), 8)
+
+      d.add(3, 'days')
+      strictEqual(d.days(), 4)
+
+      d.add(17, 'weeks')
+      strictEqual(d.weeks(), 17)
+
+      d.add(2, 'years')
+      strictEqual(d.years(), 2)
+    })
+  })
+
+  describe('Humanize', () => {
+    it('few minutes', () => {
+      strictEqual(new Duration(2, 'minutes').humanize(), 'a few minutes')
+      strictEqual(new Duration(16, 'minutes').humanize(), '16 minutes')
+      strictEqual(new Duration(30, 'seconds').humanize(), 'a moment')
+    })
+
+    it('custom humanizer', () => {
+      const humanizer = [
+        [(d) => d.days() > 0, (d) => `yus for ${d.days()}`],
+        [() => true, () => 'cool'],
+      ]
+
+      const d = new Duration(5, 'minutes')
+      strictEqual(d.humanize(humanizer), 'cool')
+      d.add(2, 'days')
+      strictEqual(d.humanize(humanizer), `yus for 2`)
+    })
+  })
+})

tsconfig.json

@@ -1,23 +1,10 @@
 {
+  "extends": "@tsconfig/strictest/tsconfig.json",
   "compilerOptions": {
-    "target": "esnext",
+    "target": "es2022",
-    "module": "commonjs",
+    "module": "es2022",
     "declaration": true,
     "outDir": "./lib",
     "rootDir": "./src",
-    "removeComments": true,
-    "strict": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "strictFunctionTypes": true,
-    "strictBindCallApply": true,
-    "strictPropertyInitialization": true,
-    "noImplicitThis": true,
-    "alwaysStrict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "esModuleInterop": true
   }
 }