hafas-rest-api - npm Package Compare versions

Comparing version 2.1.2 to 2.1.3

lib/parse.js

 'use strict'
 
-const parseMessyTime = require('parse-messy-time')
+const {DateTime} = require('luxon')
+const parseHumanRelativeTime = require('parse-human-relative-time')(DateTime)
 
 const isNumber = /^\d+$/
-const parseWhen = (key, val) => {
+const parseWhen = (tz = null) => (key, val) => {
 	if (isNumber.test(val)) return new Date(val * 1000)
-	return parseMessyTime(val)
+
+	const dt = DateTime.fromMillis(Date.now(), {zone: tz})
+	return parseHumanRelativeTime(val, dt).toJSDate()
 }
@@ -10,0 +13,0 @@

package.json

 {
 	"name": "hafas-rest-api",
 	"description": "Expose a HAFAS client via an HTTP REST API.",
-	"version": "2.1.2",
+	"version": "2.1.3",
 	"main": "index.js",
@@ -39,5 +39,6 @@ "files": [
 		"hsts": "^2.1.0",
+		"luxon": "^1.21.1",
 		"markdown-it": "^9.0.1",
 		"nocache": "^2.0.0",
-		"parse-messy-time": "^2.1.0",
+		"parse-human-relative-time": "^2.0.2",
 		"pino": "^5.11.3",
@@ -44,0 +45,0 @@ "shorthash": "0.0.2",

routes/arrivals.js

@@ -19,13 +19,13 @@ 'use strict'
 
-const parsers = {
-	when: parseWhen,
-	direction: parseStop,
-	duration: parseInteger,
-	linesOfStops: parseBoolean,
-	remarks: parseBoolean,
-	includeRelatedStations: parseBoolean,
-	language: parseString
-}
+const createRoute = (hafas, config) => {
+	const parsers = {
+		when: parseWhen(hafas.profile.timezone),
+		direction: parseStop,
+		duration: parseInteger,
+		linesOfStops: parseBoolean,
+		remarks: parseBoolean,
+		includeRelatedStations: parseBoolean,
+		language: parseString
+	}
 
-const createRoute = (hafas, config) => {
 	const arrivals = (req, res, next) => {
@@ -32,0 +32,0 @@ const id = parseStop('id', req.params.id)

routes/departures.js

@@ -19,13 +19,13 @@ 'use strict'
 
-const parsers = {
-	when: parseWhen,
-	direction: parseStop,
-	duration: parseInteger,
-	linesOfStops: parseBoolean,
-	remarks: parseBoolean,
-	includeRelatedStations: parseBoolean,
-	language: parseString
-}
+const createRoute = (hafas, config) => {
+	const parsers = {
+		when: parseWhen(hafas.profile.timezone),
+		direction: parseStop,
+		duration: parseInteger,
+		linesOfStops: parseBoolean,
+		remarks: parseBoolean,
+		includeRelatedStations: parseBoolean,
+		language: parseString
+	}
 
-const createRoute = (hafas, config) => {
 	const departures = (req, res, next) => {
@@ -32,0 +32,0 @@ const id = parseStop('id', req.params.id)

routes/journeys.js

@@ -20,22 +20,22 @@ 'use strict'
 
-const parsers = {
-	departure: parseWhen,
-	arrival: parseWhen,
-	earlierThan: parseString,
-	laterThan: parseString,
+const createRoute = (hafas, config) => {
+	const parsers = {
+		departure: parseWhen(hafas.profile.timezone),
+		arrival: parseWhen(hafas.profile.timezone),
+		earlierThan: parseString,
+		laterThan: parseString,
 
-	results: parseInteger,
-	stopovers: parseBoolean,
-	transfers: parseInteger,
-	transferTime: parseNumber,
-	accessibility: parseString,
-	bike: parseBoolean,
-	tickets: parseBoolean,
-	polylines: parseBoolean,
-	remarks: parseBoolean,
-	startWithWalking: parseBoolean,
-	language: parseString
-}
+		results: parseInteger,
+		stopovers: parseBoolean,
+		transfers: parseInteger,
+		transferTime: parseNumber,
+		accessibility: parseString,
+		bike: parseBoolean,
+		tickets: parseBoolean,
+		polylines: parseBoolean,
+		remarks: parseBoolean,
+		startWithWalking: parseBoolean,
+		language: parseString
+	}
 
-const createRoute = (hafas, config) => {
 	const journeys = (req, res, next) => {
@@ -42,0 +42,0 @@ const from = parseLocation(req.query, 'from')

No alert changes

Improved metrics

Total package byte prevSize

21692

increased by1.5%

Lines of code

630

increased by0.32%

Worsened metrics

Dependency count

12

increased by9.09%

Dependency changes

• + Addedluxon@^1.21.1

• + Addedparse-human-relative-time@^2.0.2

• + Added@babel/runtime@7.24.7(transitive)

• + Addeddate-fns@2.30.0(transitive)

• + Addedluxon@1.28.1(transitive)

• + Addedparse-human-relative-time@2.0.3(transitive)

• + Addedregenerator-runtime@0.14.1(transitive)

• - Removedparse-messy-time@^2.1.0

• - Removedparse-messy-time@2.1.0(transitive)