mockaton 12.5.0 → 12.5.1

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "HTTP Mock Server",
 	"type": "module",
-	"version": "12.5.0",
+	"version": "12.5.1",
 	"exports": {
 		".": {
 			"import": "./index.js",

package/src/client/Filename.js

@@ -44,13 +44,17 @@ export function parseFilename(file) {
 	}
 }
 
-function removeTrailingSlash(url = '') {
+export function removeTrailingSlash(url = '') {
 	return url
 		.replace(/\/$/, '')
 		.replace('/?', '?')
 		.replace('/#', '#')
 }
 
+export function removeQueryStringAndFragment(url = '') {
+	return new URL(url, 'http://_').pathname
+}
+
 function responseStatusIsValid(status) {
 	return Number.isInteger(status)
 		&& status >= 100

package/src/server/MockBroker.js

@@ -1,5 +1,5 @@
 import { DEFAULT_MOCK_COMMENT } from '../client/ApiConstants.js'
-import { parseFilename, includesComment, extractComments } from '../client/Filename.js'
+import { parseFilename, includesComment, extractComments, removeQueryStringAndFragment } from '../client/Filename.js'
 
 
 /**
@@ -105,15 +105,11 @@ class UrlMatcher {
 
 	#buildUrlRegex(file) {
 		let { urlMask } = parseFilename(file)
-		urlMask = this.#removeQueryStringAndFragment(urlMask)
+		urlMask = removeQueryStringAndFragment(urlMask)
 		urlMask = this.#disregardVariables(urlMask)
 		return new RegExp('^' + urlMask + '/*$')
 	}
 
-	#removeQueryStringAndFragment(str) {
-		return str.replace(/[?#].*/, '')
-	}
-
 	#disregardVariables(str) { // Stars out all parts that are in square brackets
 		return str.replace(/\[.*?]/g, '[^/]+')
 	}
@@ -127,7 +123,7 @@ class UrlMatcher {
 	// slashes. For instance, for routing api/foo/[id]?qs…
 	urlMaskMatches = (url) => {
 		let u = decodeURIComponent(url)
-		u = this.#removeQueryStringAndFragment(u)
+		u = removeQueryStringAndFragment(u)
 		u += '/'
 		return this.#urlRegex.test(u)
 	}

package/src/server/utils/UrlParsers.js

@@ -1,6 +1,7 @@
 import { relative } from 'node:path'
 import { config } from '../config.js'
-import { parseFilename } from '../../client/Filename.js'
+import { decode } from './HttpIncomingMessage.js'
+import { parseFilename, removeTrailingSlash, removeQueryStringAndFragment } from '../../client/Filename.js'
 
 
 export function parseQueryParams(url) {
@@ -11,14 +12,16 @@ export function parseSplats(url, filename) {
 	const { urlMask } = parseFilename(relative(config.mocksDir, filename))
 
 	const splats = []
-	const pattern = urlMask
+	const pattern = removeQueryStringAndFragment(decode(urlMask))
 		.replace(/\[(.+?)]/g, (_, name) => {
 			splats.push(name)
 			return '([^/]+)'
 		})
-		.replace(/\//g, '\\/')
 
-	const match = url.match(new RegExp(`^${pattern}$`))
+	let u = removeQueryStringAndFragment(url)
+	u = removeTrailingSlash(u)
+
+	const match = u.match(new RegExp(`^${pattern}$`))
 	if (!match)
 		return {}
 

package/src/server/utils/UrlParsers.test.js

@@ -1,4 +1,4 @@
-import { test } from 'node:test'
+import { test, describe } from 'node:test'
 import { deepEqual, equal } from 'node:assert/strict'
 import { parseSplats, parseQueryParams } from './UrlParsers.js'
 import { config } from '../config.js'
@@ -9,14 +9,46 @@ test('parseQueryParams', () => {
 })
 
 
-test('parseSplats', () => {
-	const p = parseSplats(
-		'/api/company/123/user/456',
-		`${config.mocksDir}/api/company/[companyId]/user/[userId](comments).GET.200.js`
-	)
-	deepEqual(p, {
-		companyId: '123',
-		userId: '456',
+describe('parseSplats', () => {
+	test('one splat', () => {
+		const splats = parseSplats(
+			'/api/company/123',
+			`${config.mocksDir}/api/company/[companyId].GET.200.js`
+		)
+		deepEqual(splats, {
+			companyId: '123'
+		})
+	})
+
+	test('one splat with trailing slash', () => {
+		const splats = parseSplats(
+			'/api/company/123/',
+			`${config.mocksDir}/api/company/[companyId].GET.200.js`
+		)
+		deepEqual(splats, {
+			companyId: '123'
+		})
+	})
+
+	test('two splats and comment', () => {
+		const splats = parseSplats(
+			'/api/company/123/user/456',
+			`${config.mocksDir}/api/company/[companyId]/user/[userId](comments).GET.200.js`
+		)
+		deepEqual(splats, {
+			companyId: '123',
+			userId: '456',
+		})
+	})
+
+	test('ignores query string', () => {
+		const splats = parseSplats(
+			'/api/company/123?foo=456',
+			`${config.mocksDir}/api/company/[companyId]?foo=[fooId].GET.200.js`
+		)
+		deepEqual(splats, {
+			companyId: '123'
+		})
 	})
 })