mockaton 13.3.0 → 13.3.2

package/package.json

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

package/src/client/app-store.js

@@ -108,7 +108,6 @@ export const store = {
 	},
 
 	setProxyFallback(value) {
-		store.skipNextRender = true
 		store._request(() => api.setProxyFallback(value), () => {
 			store.proxyFallback = value
 		})
@@ -175,7 +174,7 @@ export const store = {
 				arr.push(...Object.values(brokers))
 		return arr
 	},
-	
+
 
 	previewLink(method, urlMask) {
 		store.setChosenLink(method, urlMask)

package/src/client/app.css

@@ -13,7 +13,7 @@
 	--colorText: light-dark(#000, #fff);
 
 	--colorAccent: light-dark(#0059dd, #2495ff);
-	--colorHover: light-dark(#bbe0ff, #062d59);
+	--colorHover: light-dark(#c1e2ff, #062d59);
 
 	--colorRed: light-dark(#da0f00, #f41606);
 	--colorPink: light-dark(#ed206a, #f92672);
@@ -50,6 +50,11 @@ body {
 	corner-shape: squircle;
 }
 
+label,
+button {
+	user-select: none;
+}
+
 a:focus-visible,
 input:focus-visible,
 select:focus-visible,
@@ -432,7 +437,7 @@ main {
 		}
 
 		&.canProxy {
-			margin-left: 100px;
+			margin-left: 124px;
 		}
 	}
 
@@ -449,6 +454,7 @@ main {
 
 	.FolderGroup {
 		position: relative;
+		border-radius: var(--radius);
 
 		> summary {
 			left: 0;
@@ -465,7 +471,6 @@ main {
 			text-overflow: ellipsis;
 			border-radius: var(--radius);
 
-
 			&:active {
 				cursor: grabbing;
 			}
@@ -475,13 +480,20 @@ main {
 			}
 
 			&:hover {
-				color: var(--colorText);
+				background: var(--colorHover);
 			}
 
 			.FolderName {
 				margin-left: 125px;
+				&.canProxy {
+					margin-left: 155px;
+				}
+
 				&.groupedByMethod {
 					margin-left: 79px;
+					&.canProxy {
+						margin-left: 109px;
+					}
 				}
 			}
 
@@ -503,17 +515,23 @@ main {
 			}
 		}
 
-		&[open] > summary {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 16px;
-
-			.FolderChevron {
-				transform: rotate(0deg);
+		&[open] {
+			&:has(summary:hover) {
+				background: linear-gradient(90deg, var(--colorHover), var(--colorBg));
 			}
-			.FolderName {
-				display: none;
+
+			> summary {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 16px;
+
+				.FolderChevron {
+					transform: rotate(0deg);
+				}
+				.FolderName {
+					display: none;
+				}
 			}
 		}
 	}

package/src/client/app.js

@@ -106,24 +106,25 @@ function MockList() {
 }
 
 function FolderGroups(groups) {
-	return groups.map(({ folder, children }) => {
-		if (children.length === 1)
-			return Row(children[0], 0)
-
-		return r('details', {
+	return groups.map(({ folder, children }) => children.length === 1
+		? Row(children[0], 0)
+		: r('details', {
 				className: CSS.FolderGroup,
 				open: !store.collapsedFolders.has(folder),
 				onToggle() {
-					// TODO alt+click exclusive open
 					store.setFolderCollapsed(folder, !this.open)
 				}
 			},
 			r('summary', null,
 				r('span', { className: CSS.FolderChevron }, ChevronDownIcon()),
-				r('span', { className: classNames(CSS.FolderName, store.groupByMethod && CSS.groupedByMethod) },
+				r('span', {
+						className: classNames(
+							CSS.FolderName,
+							store.groupByMethod && CSS.groupedByMethod,
+							store.canProxy && CSS.canProxy)
+					},
 					folder + '…')),
-			children.map(Row))
-	})
+			children.map(Row)))
 }
 
 /**

package/src/server/Api.js

@@ -88,6 +88,7 @@ function getState(_, response) {
 
 function reset(_, response) {
 	mockBrokersCollection.init()
+	cookie.init(config.cookies)
 	response.ok()
 	uiSyncVersion.increment()
 }

package/src/server/MockBroker.js

@@ -36,10 +36,10 @@ export class MockBroker {
 
 	unregister(file) {
 		this.mocks = this.mocks.filter(f => f !== file)
-		const isEmpty = !this.mocks.length
-		if (!isEmpty && this.file === file)
+		const brokerIsEmpty = !this.mocks.length
+		if (!brokerIsEmpty && this.file === file)
 			this.selectDefaultFile()
-		return isEmpty
+		return brokerIsEmpty
 	}
 
 	hasMock = file => this.mocks.includes(file)

package/src/server/Mockaton.test.js

@@ -7,7 +7,7 @@ import { mkdtempSync } from 'node:fs'
 import { randomUUID } from 'node:crypto'
 import { equal, deepEqual, match } from 'node:assert/strict'
 import { describe, test, before, beforeEach, after } from 'node:test'
-import { unlink, mkdir, readFile, rename, readdir, writeFile } from 'node:fs/promises'
+import { unlink, mkdir, readFile, rename, readdir, writeFile, rm } from 'node:fs/promises'
 
 import { mimeFor } from './utils/mime.js'
 import { parseFilename } from '../client/Filename.js'
@@ -26,8 +26,15 @@ const proc = spawn(join(import.meta.dirname, 'cli.js'), [
 	'--no-open'
 ])
 
-proc.stdout.on('data', data => stdout.push(data.toString()))
-proc.stderr.on('data', data => stderr.push(data.toString()))
+const DEBUG = false
+proc.stdout.on('data', data => {
+	stdout.push(data.toString())
+	DEBUG && process.stdout.write(stdout.at(-1))
+})
+proc.stderr.on('data', data => {
+	stderr.push(data.toString())
+	DEBUG && process.stderr.write(stdout.at(-1))
+})
 
 const serverAddr = await new Promise((resolve, reject) => {
 	proc.stdout.once('data', () => {
@@ -41,12 +48,14 @@ after(() => proc.kill('SIGUSR2'))
 
 
 const rmFromMocksDir = f => unlink(join(mocksDir, f))
-const listFromMocksDir = d => readdir(join(mocksDir, d))
 const readFromMocksDir = f => readFile(join(mocksDir, f), 'utf8')
 const writeInMocksDir = (f, data) => writeFile(join(mocksDir, f), data)
-const makeDirInMocks = dir => mkdir(join(mocksDir, dir), { recursive: true })
 const renameInMocksDir = (src, target) => rename(join(mocksDir, src), join(mocksDir, target))
 
+const listFromMocksDir = d => readdir(join(mocksDir, d))
+const rmDirFromMocks = d => rm(join(mocksDir, d), { recursive: true })
+const makeDirInMocks = dir => mkdir(join(mocksDir, dir), { recursive: true })
+
 
 const api = new Commander(serverAddr)
 
@@ -1120,6 +1129,16 @@ describe('Registering Mocks', () => {
 			equal(s.brokersByMethod.GET['/reg1/runtime0'].file, 'reg1/runtime0.GET.200.txt')
 		})
 	})
+
+	test('deleting a folder unregisters mocks in it', async () => {
+		const fx = new Fixture('api/bulk-delete/bar.GET.200.json')
+		await fx.write()
+		await sleep(0)
+		const nextVerPromise = resolveOnNextSyncVersion()
+		await rmDirFromMocks('api/bulk-delete')
+		await nextVerPromise
+		equal(await fx.fetchBroker(), undefined)
+	})
 })
 
 

package/src/server/mockBrokersCollection.js

@@ -1,6 +1,5 @@
 import { basename } from 'node:path'
 
-import { cookie } from './cookie.js'
 import { MockBroker } from './MockBroker.js'
 import { parseFilename } from '../client/Filename.js'
 import { listFilesRecursively } from './utils/fs.js'
@@ -28,26 +27,22 @@ export const all = () => collection
 
 export function init() {
 	collection = {}
-	cookie.init(config.cookies)
-
 	listFilesRecursively(config.mocksDir)
 		.sort()
 		.forEach(f => registerMock(f))
-
 	forEachBroker(b => b.selectDefaultFile())
 }
 
 /** @returns {boolean} registered */
 export function registerMock(file, isFromWatcher = false) {
-	if (brokerByFilename(file)?.hasMock(file)
-		|| !isFileAllowed(basename(file)))
+	if (brokerByFilename(file)?.hasMock(file) || 
+		!isFileAllowed(basename(file)))
 		return false
 
 	const { method, urlMask } = parseFilename(file)
 	collection[method] ??= {}
 
 	let broker = collection[method][urlMask]
-
 	if (!broker)
 		broker = collection[method][urlMask] = new MockBroker(file)
 	else
@@ -61,15 +56,26 @@ export function registerMock(file, isFromWatcher = false) {
 
 export function unregisterMock(file) {
 	const broker = brokerByFilename(file)
-	const methodHasNoMoreMocks = broker?.unregister(file) // TODO or it was a directory of many mocks
-	if (methodHasNoMoreMocks) {
-		const { method, urlMask } = parseFilename(file)
-		delete collection[method][urlMask]
-		if (!Object.keys(collection[method]).length)
-			delete collection[method]
+	if (broker) {
+		const brokerIsEmpty = broker.unregister(file)
+		if (brokerIsEmpty) {
+			const { method, urlMask } = parseFilename(file)
+			delete collection[method][urlMask]
+			if (!Object.keys(collection[method]).length)
+				delete collection[method]
+		}
 	}
+	else for (const f of filesInDir(file)) // maybe it was a dir
+		unregisterMock(f)
 }
 
+function filesInDir(dir) {
+	const files = []
+	forEachBroker(b => {
+		files.push(...(b.mocks.filter(m => m.startsWith(dir + '/'))))
+	})
+	return files
+}
 
 /** @returns {MockBroker | undefined} */
 export function brokerByFilename(file) {