Adds support for weekStartsOn and prettier config

.eslintrc.json

@@ -1,5 +1,9 @@
 {
-	"extends": "eslint:recommended",
+	"extends": [
+		"eslint:recommended",
+		"plugin:prettier/recommended",
+		"prettier"
+	],
 	"env": {
 		"commonjs": true,
 		"es6": true,
@@ -8,9 +12,7 @@
 	"parserOptions": {
 		"ecmaVersion": 2018
 	},
-	"ignorePatterns": [
-		"node_modules"
-	],
+	"ignorePatterns": ["node_modules"],
 	"rules": {
 		"no-unused-vars": "off"
 	}

.gitignore

@@ -10,3 +10,5 @@ pnpm-debug.log
 /shrinkwrap.yaml
 
 /parser.js
+
+.vscode

.prettierignore

@@ -0,0 +1,4 @@
+node_modules
+parser.js
+grammar.js
+.github/workflows

.prettierrc.js

@@ -0,0 +1,9 @@
+module.exports = {
+	useTabs: true,
+	tabWidth: 4,
+	singleQuote: true,
+	semi: false,
+	bracketSpacing: false,
+	arrowParens: 'avoid',
+	trailingComma: 'none'
+}

date-fns.js

@@ -2,8 +2,12 @@
 
 const lex = require('./lex')
 
-const createParse = (dateFns) => {
-	const parseHumanRelativeTime = (str, now = new Date()) => {
+const createParse = dateFns => {
+	const parseHumanRelativeTime = (
+		str,
+		now = new Date(),
+		opts = {weekStartsOn: 0}
+	) => {
 		const instructions = lex(str)
 		let res = now
 		for (const [cmd, ...args] of instructions) {
@@ -15,7 +19,7 @@ const createParse = (dateFns) => {
 				throw err
 			}
 
-			res = dateFns[cmd](res, ...args)
+			res = dateFns[cmd](res, ...args, opts)
 		}
 		return res
 	}

grammar.js

@@ -267,7 +267,7 @@
 				`$$ = [['startOfWeek'], ['addWeeks', 1], ['setDay', $2]]`
 			], [
 				'LAST month',
-				`$$ = [['startOfMonth'], ['subMonths', 1], ['setMonth', $2]]`
+				`$$ = [['startOfMonth'], ['subDays', 1], ['startOfMonth']]`
 			], [
 				'LAST day_of_week',
 				`$$ = [['startOfWeek'], ['subWeeks', 1], ['setDay', $2]]`

index.js

@@ -31,10 +31,11 @@ const cmds = new Map([
 	['setYear', (dt, y) => dt.set({year: y})],
 
 	['startOfWeek', dt => dt.startOf('week')],
+	['startOfMonth', dt => dt.startOf('month')],
 	['endOfWeek', dt => dt.endOf('week')]
 ])
 
-const createParse = (DateTime) => {
+const createParse = DateTime => {
 	const parseHumanRelativeTime = (str, now = DateTime.local()) => {
 		const instructions = lex(str)
 		let res = now

package.json

@@ -26,20 +26,24 @@
 		"node": ">=16"
 	},
 	"peerDependencies": {
-		"date-fns": "^2.7.0",
-		"luxon": "^2.3.0"
+		"date-fns": "2.7.0",
+		"luxon": "2.3.0"
 	},
 	"devDependencies": {
-		"date-fns": "^2.7.0",
-		"date-fns-tz": "^1.0.8",
-		"eslint": "^8.6.0",
-		"luxon": "^2.3.0",
-		"syntax-cli": "^0.1.12"
+		"date-fns": "2.28.0",
+		"date-fns-tz": "1.3.3",
+		"eslint": "8.13.0",
+		"eslint-config-prettier": "8.5.0",
+		"eslint-plugin-prettier": "4.0.0",
+		"luxon": "2.3.1",
+		"prettier": "2.6.2",
+		"syntax-cli": "0.1.25"
 	},
 	"scripts": {
 		"lint": "eslint --ignore-path .gitignore .",
 		"build": "syntax-cli -g grammar.js -m CLR1 -o parser.js",
 		"test": "node test.js",
+		"prettier": "prettier --check .",
 		"prepublishOnly": "npm run lint && npm run build && npm test"
 	}
 }

readme.md

@@ -16,19 +16,19 @@ const parseHumanRelativeTime = require('parse-human-relative-time')(DateTime)
 const tz = 'Europe/Berlin'
 const dt = DateTime.fromISO('2019-03-31T01:59+01:00').setZone(tz)
 
-parseHumanRelativeTime('in 2 minutes', dt)
-.toISO({suppressSeconds: true, suppressMilliseconds: true})
+parseHumanRelativeTime('in 2 minutes', dt).toISO({
+	suppressSeconds: true,
+	suppressMilliseconds: true
+})
 // 2019-03-31T03:01+02:00
 ```
 
-
 ## Installation
 
 ```shell
 npm install parse-human-relative-time
 ```
 
-
 ## Usage
 
 When using `luxon`, note that [it currently always follows ISO weekdays (`0` = Monday) instead of the locale](https://github.com/moment/luxon/issues/373).
@@ -37,7 +37,9 @@ When using `luxon`, note that [it currently always follows ISO weekdays (`0` = M
 
 ```js
 const dateFns = require('date-fns')
-const parseHumanRelative = require('parse-human-relative-time/date-fns')(dateFns)
+const parseHumanRelative = require('parse-human-relative-time/date-fns')(
+	dateFns
+)
 const {format} = require('date-fns-tz')
 
 // Europe/Berlin switched to DST at 31st of March at 2am.
@@ -47,7 +49,18 @@ const timeZone = 'Europe/Berlin'
 const withDST = parseHumanRelative('in 2 minutes', withoutDST)
 format(withDST, 'HH:mm zz', {timeZone})
 // 03:01 GMT+2
-````
+```
+
+#### weekStartsOn
+
+For date-fns we have an extra parameter for weekStartsOn, e.g.:
+
+````js
+parseHumanRelative('last week', new Date(), { weekStartsOn = 1})
+// would return last monday
+```
+
+Default is 0 = Sunday.
 
 ### Lexing into instructions
 
@@ -58,7 +71,7 @@ lexHumanRelativeTime('next tuesday 5pm')
 ```
 
 ```js
-[
+;[
 	// next tuesday
 	['startOfWeek'],
 	['addWeeks', 1],
@@ -72,20 +85,19 @@ lexHumanRelativeTime('next tuesday 5pm')
 ]
 ```
 
-
 ## Why yet another package?
 
 **Other packages don't handle time zones correctly**, because they
 
-- mess up timezones (e.g. [`parse-messy-time`](https://github.com/substack/parse-messy-time)),
-- parse to relative milliseconds, in some [DST](https://en.wikipedia.org/wiki/Daylight_saving_time) cases (e.g. [`parse-relative-time`](https://github.com/fczbkk/parse-relative-time) & [`timestring`](https://github.com/mike182uk/timestring)),
-- require or even monkey-patch a specific date/time library (e.g. [`relative-time-parser`](https://github.com/cmaurer/relative.time.parser)).
+-   mess up timezones (e.g. [`parse-messy-time`](https://github.com/substack/parse-messy-time)),
+-   parse to relative milliseconds, in some [DST](https://en.wikipedia.org/wiki/Daylight_saving_time) cases (e.g. [`parse-relative-time`](https://github.com/fczbkk/parse-relative-time) & [`timestring`](https://github.com/mike182uk/timestring)),
+-   require or even monkey-patch a specific date/time library (e.g. [`relative-time-parser`](https://github.com/cmaurer/relative.time.parser)).
 
 Some actually do it right, but don't support a lot of expressions, e.g. [`relative-time-expression`](https://github.com/Frezc/relative-time-expression).
 
-This package **parses** a human relative time string (e.g. `next Tuesday 2pm`) **into a set of manipulation *instructions* and applies them to a `Date`** using [Luxon](https://moment.github.io/luxon/) or [`date-fns`](https://date-fns.org). It therefore separates parsing and manipulation, letting the date/time lib handle the complex topic of time zones.
-
+This package **parses** a human relative time string (e.g. `next Tuesday 2pm`) **into a set of manipulation _instructions_ and applies them to a `Date`** using [Luxon](https://moment.github.io/luxon/) or [`date-fns`](https://date-fns.org). It therefore separates parsing and manipulation, letting the date/time lib handle the complex topic of time zones.
 
 ## Contributing
 
 If you have a question or need support using `parse-human-relative-time`, please double-check your code and setup first. If you think you have found a bug or want to propose a feature, refer to [the issues page](https://github.com/derhuerst/parse-human-relative-time/issues).
+````