mockaton 12.6.1 → 12.7.0

package/package.json

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

package/src/client/app-store.js

@@ -252,26 +252,24 @@ function togglePreference(param, nextVal) {
  * @param {string[]} paths - sorted
  */
 export function dittoSplitPaths(paths) {
-	const result = [['', paths[0]]]
-	const pathsInParts = paths.map(p => p.split('/').filter(Boolean))
-
-	for (let i = 1; i < paths.length; i++) {
-		const prev = pathsInParts[i - 1]
-		const curr = pathsInParts[i]
+	const pParts = paths.map(p => p.split('/').filter(Boolean))
+	return paths.map((p, i) => {
+		if (i === 0)
+			return ['', p]
 
+		const prev = pParts[i - 1]
+		const curr = pParts[i]
 		const min = Math.min(curr.length, prev.length)
 		let j = 0
 		while (j < min && curr[j] === prev[j])
 			j++
 
 		if (!j) // no common dirs
-			result.push(['', paths[i]])
-		else {
-			const ditto = '/' + curr.slice(0, j).join('/') + '/'
-			result.push([ditto, paths[i].slice(ditto.length)])
-		}
-	}
-	return result
+			return ['', p]
+
+		const ditto = '/' + curr.slice(0, j).join('/') + '/'
+		return [ditto, p.slice(ditto.length)]
+	})
 }
 
 

package/src/client/app.js

@@ -481,13 +481,38 @@ function DelayToggler({ checked, commit, optClassName }) {
 function ClickDragToggler({ checked, commit, className, title, body }) {
 	function onPointerEnter(event) {
 		if (event.buttons === 1)
-			onPointerDown.call(this)
+			onPointerDown.call(this, event)
 	}
-	function onPointerDown() {
+
+	function onPointerDown(event) {
+		if (event.altKey) {
+			onExclusiveClick.call(this)
+			return
+		}
 		this.checked = !this.checked
 		this.focus()
 		commit(this.checked)
 	}
+
+	function onExclusiveClick() {
+		const selector = selectorForColumnOf(this)
+		if (!selector)
+			return
+
+		// Uncheck all other in the column. 
+		for (const elem of leftSideRef.elem.querySelectorAll(selector))
+			if (elem !== this && elem.checked && !elem.disabled) {
+				elem.checked = false
+				elem.dispatchEvent(new Event('change'))
+			}
+
+		if (!this.checked) {
+			this.checked = true
+			this.dispatchEvent(new Event('change'))
+		}
+		this.focus()
+	}
+
 	function onClick(event) {
 		if (event.pointerType === 'mouse')
 			event.preventDefault()
@@ -667,18 +692,24 @@ function initRealTimeUpdates() {
 	}
 }
 
+function selectorForColumnOf(elem) {
+	return columnSelectors().find(s => elem?.matches(s))
+}
 
-function initKeyboardNavigation() {
-	const columnSelectors = [
+function columnSelectors() {
+	return [
 		`.${CSS.TableRow} .${CSS.ProxyToggler} input`,
 		`.${CSS.TableRow} .${CSS.DelayToggler} input`,
 		`.${CSS.TableRow} .${CSS.StatusCodeToggler} input`,
 		`.${CSS.TableRow} .${CSS.PreviewLink}`,
 		// No .MockSelector because down/up arrows have native behavior on them
 	]
+}
 
+
+function initKeyboardNavigation() {
 	const rowSelectors = [
-		...columnSelectors,
+		...columnSelectors(),
 		`.${CSS.TableRow} .${CSS.MockSelector}:enabled`,
 	]
 
@@ -687,7 +718,7 @@ function initKeyboardNavigation() {
 			case 'ArrowDown':
 			case 'ArrowUp': {
 				const pivot = document.activeElement
-				const sel = columnSelectors.find(s => pivot?.matches(s))
+				const sel = selectorForColumnOf(pivot)
 				if (sel) {
 					const offset = key === 'ArrowDown' ? +1 : -1
 					const siblings = leftSideRef.elem.querySelectorAll(sel)

package/src/server/cli.test.js

@@ -5,34 +5,35 @@ import { describe, test } from 'node:test'
 
 import pkgJSON from '../../package.json' with { type: 'json' }
 
-const CLI_PATH = join(import.meta.dirname, 'cli.js')
-const cli = args => spawnSync(CLI_PATH, args, { encoding: 'utf8' })
+const cli = (...args) => spawnSync(join(import.meta.dirname, 'cli.js'), args, {
+	encoding: 'utf8'
+})
 
 describe('CLI', () => {
 	test('--invalid-flag', () => {
-		const { stderr, status } = cli(['--invalid-flag'])
+		const { stderr, status } = cli('--invalid-flag')
 		equal(stderr.trim(), `Unknown option '--invalid-flag'`)
 		equal(status, 1)
 	})
 
 	test('invalid config file', () => {
-		const { stderr, status } = cli(['--config', 'non-existing-file.js'])
+		const { stderr, status } = cli('--config', 'non-existing-file.js')
 		equal(stderr.trim(), `Invalid config file: non-existing-file.js`)
 		equal(status, 1)
 	})
 
 	test('-v outputs version from package.json', () => {
-		const { stdout, status } = cli(['-v'])
+		const { stdout, status } = cli('-v')
 		equal(stdout.trim(), pkgJSON.version)
 		equal(status, 0)
 	})
 
 	test('-h outputs usage message', () => {
-		const { stdout, status } = cli(['-h'])
+		const { stdout, status } = cli('-h')
 		equal(stdout.split('\n')[0], 'Usage: mockaton [options]')
 		equal(status, 0)
 	})
-	
+
 	// Mockaton.test.js tests the remaining cli branch
 })
 

package/src/server/utils/mime.js

@@ -1,3 +1,4 @@
+import { MIMEType } from 'node:util'
 import { config } from '../config.js'
 import { EXT_UNKNOWN_MIME, EXT_EMPTY } from '../../client/ApiConstants.js'
 
@@ -146,12 +147,8 @@ export function extFor(mime) {
 		: EXT_EMPTY
 }
 function findExt(rawMime) {
-	const m = parseMime(rawMime)
+	const m = new MIMEType(rawMime).essence
 	const extraMimeToExt = mapMimeToExt(config.extraMimes)
 	return extraMimeToExt[m] || mimeToExt[m] || EXT_UNKNOWN_MIME
 }
 
-export function parseMime(mime) {
-	return mime.split(';')[0].toLowerCase()
-	// RFC 9110 §8.3.1
-}

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

@@ -1,15 +1,8 @@
 import { test } from 'node:test'
 import { equal } from 'node:assert/strict'
-import { parseMime, extFor, mimeFor } from './mime.js'
+import { extFor, mimeFor } from './mime.js'
 
 
-test('parseMime', () => [
-	'text/html',
-	'TEXT/html',
-	'text/html; charset=utf-8'
-].map(input =>
-	equal(parseMime(input), 'text/html')))
-
 test('extFor', () => [
 	'text/html',
 	'Text/html',