mockaton 5.0.3 → 6.1.0

package/README.md

@@ -48,10 +48,9 @@ interface Config {
   host?: string, // defaults to 'localhost'
   port?: number // defaults to 0, which means auto-assigned
   delay?: number // defaults to 1200 (ms)
-  onReady?: (dashboardUrl: string) => void // defaults to openInBrowser. pass a noop to prevent opening the dashboard
+  onReady?: (dashboardUrl: string) => void // defaults to trying to open macOS default browser. pass a noop to prevent opening the dashboard
   cookies?: object
   proxyFallback?: string // e.g. http://localhost:9999 Target for relaying routes without mocks
-  allowedExt?: RegExp // /\.(md|json|txt|js)$/ Just for excluding temporary editor files (e.g. JetBrains appends a ~)
   extraHeaders?: []
 }
 ```
@@ -118,8 +117,6 @@ The delay is globally configurable via `Config.delay = 1200` (milliseconds).
 
 The **file extension** can be anything, but `.md` is reserved for documentation.
 
-The `Config.allowedExt` regex defaults to: `/\.(md|json|txt|js)$/`
-
 
 ### Dynamic Parameters
 Anything within square brackets. For example:
@@ -149,18 +146,20 @@ permitted](https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file)
 but since that’s part of the query string, it’s ignored anyway.
 
 
-
 ### Default (index-like) route
-For the default route of a directory, omit the mock filename name
-(<b>just use the extension</b>). For example, the following files will be
-routed to `api/foo` because comments and the query string are ignored.
+**Option A.** Place it outside the directory:
+```
+api/foo/
+api/foo.GET.200.json
+```
+
+**Option B.** Omit the filename:
 ```text
 api/foo/.GET.200.json
-api/foo/?bar=[bar].GET.200.json
-api/foo/(my comment).GET.200.json
 ```
 
 
+
 ## `Config.cookies`
 The selected cookie is sent in every response in the `Set-Cookie` header.
 
@@ -197,15 +196,6 @@ Config.extraHeaders = [
 ]
 ```
 
-## Documenting Contracts (.md)
-This is handy for documenting request payload parameters. The
-dashboard prints the Markdown document as plain text (I know, I know).
-
-```text
-api/foo/[user-id].POST.md
-api/foo/[user-id].POST.201.json
-```
-
 ---
 
 ## API

package/Tests.js

@@ -354,7 +354,6 @@ async function testInvalidFilenamesAreIgnored() {
 		const consoleErrorSpy = t.mock.method(console, 'error')
 		consoleErrorSpy.mock.mockImplementation(() => {}) // so they don’t render in the test report
 
-		// An extension is needed for testing because of `Config.allowedExt`
 		write('api/_INVALID_FILENAME_CONVENTION_.json', '')
 		write('api/bad-filename.GET._INVALID_STATUS_.json', '')
 		write('api/bad-filename._INVALID_METHOD_.200.json', '')

package/index.d.ts

@@ -9,7 +9,6 @@ interface Config {
 	onReady?: (address: string) => void
 	cookies?: object
 	proxyFallback?: string
-	allowedExt?: RegExp
 	extraHeaders?: [string, string][] 
 }
 

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "A deterministic server-side for developing and testing frontend clients",
 	"type": "module",
-	"version": "5.0.3",
+	"version": "6.1.0",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"license": "MIT",

package/sample-mocks/api/user.GET.200.json

@@ -0,0 +1 @@
+"This mock is for /api/user"

package/src/Config.js

@@ -12,7 +12,6 @@ export const Config = {
 	cookies: {}, // defaults to the first kv
 	onReady: openInBrowser,
 	proxyFallback: '', // e.g. http://localhost:9999
-	allowedExt: /\.(md|json|txt|js)$/, // Just for excluding temporary editor files (e.g. JetBrains appends a ~)
 	extraHeaders: []
 }
 
@@ -27,7 +26,6 @@ export function setup(options) {
 		cookies: is(Object),
 		onReady: is(Function),
 		proxyFallback: optional(URL.canParse),
-		allowedExt: is(RegExp),
 		extraHeaders: Array.isArray
 	})
 }

package/src/Dashboard.css

@@ -107,6 +107,10 @@ menu {
 	top: 0;
 	width: 50%;
 	margin-left: 16px;
+	
+	h2 {
+		padding-top: 20px;
+	}
 
 	pre {
 		tab-size: 2;
@@ -119,10 +123,6 @@ menu {
 			background: var(--colorLightGrey);
 			font-family: monospace;
 		}
-
-		&.Documentation {
-			margin-bottom: 12px;
-		}
 	}
 }
 

package/src/Dashboard.js

@@ -19,7 +19,6 @@ const Strings = {
 const CSS = {
 	DelayToggler: 'DelayToggler',
 	InternalServerErrorToggler: 'InternalServerErrorToggler',
-	Documentation: 'Documentation',
 	MockSelector: 'MockSelector',
 	PayloadViewer: 'PayloadViewer',
 	PreviewLink: 'PreviewLink',
@@ -30,7 +29,6 @@ const CSS = {
 }
 
 const r = createElement
-const refDocumentation = useRef()
 const refPayloadViewer = useRef()
 const refPayloadFile = useRef()
 
@@ -64,7 +62,6 @@ function DevPanel(brokersByMethod, cookies, comments) {
 				r('table', null, Object.entries(brokersByMethod).map(([method, brokers]) =>
 					r(SectionByMethod, { method, brokers }))),
 				r('div', { className: CSS.PayloadViewer },
-					r('pre', { ref: refDocumentation, className: CSS.Documentation }),
 					r('h2', { ref: refPayloadFile }, Strings.mock),
 					r('pre', { ref: refPayloadViewer }, Strings.click_link_to_preview)))))
 }
@@ -134,14 +131,14 @@ function SectionByMethod({ method, brokers }) {
 				.filter(([, broker]) => broker.mocks.length > 1) // Excludes Markdown only routes (>1 because of the autogen500)
 				.map(([urlMask, broker]) =>
 					r('tr', null,
-						r('td', null, r(PreviewLink, { method, urlMask, documentation: broker.documentation })),
+						r('td', null, r(PreviewLink, { method, urlMask })),
 						r('td', null, r(MockSelector, { broker })),
 						r('td', null, r(DelayToggler, { broker })),
 						r('td', null, r(InternalServerErrorToggler, { broker }))
 					))))
 }
 
-function PreviewLink({ method, urlMask, documentation }) {
+function PreviewLink({ method, urlMask }) {
 	return (
 		r('a', {
 			className: CSS.PreviewLink,
@@ -150,13 +147,6 @@ function PreviewLink({ method, urlMask, documentation }) {
 			async onClick(event) {
 				event.preventDefault()
 				try {
-					if (documentation) {
-						const r = await fetch(documentation)
-						refDocumentation.current.innerText = await r.text()
-					}
-					else
-						refDocumentation.current.innerText = ''
-
 					const spinner = setTimeout(() => refPayloadViewer.current.innerText = Strings.fetching, 180)
 					const res = await fetch(this.href, {
 						method: this.getAttribute('data-method')

package/src/MockBroker.js

@@ -5,19 +5,15 @@ import { isDirectory } from './utils/fs.js'
 import { DEFAULT_500_COMMENT } from './ApiConstants.js'
 
 
-// MockBroker is a state for a particular route. It knows the available
-// mock files that can be served for the route, the currently selected
-// file, and its delay. Also, knows if the route has documentation (md)
+// MockBroker is a state for a particular route. It knows the available mock files
+// that can be served for the route, the currently selected file, and its delay.
 export class MockBroker {
 	#route
 
 	constructor(file) {
 		this.#route = new Route(file)
 		this.method = this.#route.method
-
-		this.documentation = '' // .md
-
-		this.mocks = [] // *.json,txt,js
+		this.mocks = []
 		this.currentMock = {
 			file: '',
 			delay: 0
@@ -27,13 +23,9 @@ export class MockBroker {
 	}
 
 	register(file) {
-		if (file.endsWith('.md'))
-			this.documentation = file
-		else {
-			if (!this.mocks.length)
-				this.currentMock.file = file // The first mock file option for a particular route becomes the default
-			this.mocks.push(file)
-		}
+		if (!this.mocks.length)
+			this.currentMock.file = file // The first mock file option for a particular route becomes the default
+		this.mocks.push(file)
 	}
 
 	urlMaskMatches(url) { return this.#route.urlMaskMatches(url) }
@@ -77,7 +69,7 @@ export class MockBroker {
 	}
 
 	#registerTemp500() {
-		const { urlMask, method } = Route.parseFilename(this.mocks[0] || this.documentation)
+		const { urlMask, method } = Route.parseFilename(this.mocks[0])
 		let mask = urlMask
 		if (isDirectory(join(Config.mocksDir, urlMask)))
 			mask = urlMask + '/'

package/src/MockDispatcher.js

@@ -7,16 +7,10 @@ import { Config } from './Config.js'
 import { mimeFor } from './utils/mime.js'
 import * as mockBrokerCollection from './mockBrokersCollection.js'
 import { JsonBodyParserError } from './utils/http-request.js'
-import { sendInternalServerError, sendNotFound, sendFile, sendBadRequest } from './utils/http-response.js'
+import { sendInternalServerError, sendNotFound, sendBadRequest } from './utils/http-response.js'
 
 
 export async function dispatchMock(req, response) {
-	/* Serve Documentation */
-	if (req.method === 'GET' && req.url.endsWith('.md')) {
-		sendFile(response, join(Config.mocksDir, decodeURIComponent(req.url)))
-		return
-	}
-
 	const broker = mockBrokerCollection.getBrokerForUrl(req.method, req.url)
 	if (!broker) {
 		if (Config.proxyFallback)

package/src/Route.js

@@ -44,43 +44,22 @@ export class Route {
 
 	static parseFilename(file) {
 		const tokens = file.replace(Route.reComments, '').split('.')
-		return file.endsWith('.md') 
-			? parseDocumentation(tokens) 
-			: parseMock(tokens)
-	}
-}
-
-function parseDocumentation(tokens) { // TESTME
-	if (tokens.length < 3)
-		return { error: 'Invalid Documentation Filename Convention' }
-
-	const method = tokens.at(-2)
-	if (!httpMethods.includes(method))
-		return { error: `Unrecognized HTTP Method: "${method}"` }
-
-	return {
-		urlMask: '/' + removeTrailingSlash(tokens.at(-3)),
-		method,
-		status: 200
-	}
-}
-
-function parseMock(tokens) {
-	if (tokens.length < 4)
-		return { error: 'Invalid Filename Convention' }
-
-	const status = Number(tokens.at(-2))
-	if (!responseStatusIsValid(status))
-		return { error: `Invalid HTTP Response Status: "${status}"` }
-
-	const method = tokens.at(-3)
-	if (!httpMethods.includes(method))
-		return { error: `Unrecognized HTTP Method: "${method}"` }
-
-	return {
-		urlMask: '/' + removeTrailingSlash(tokens.at(-4)),
-		method,
-		status
+		if (tokens.length < 4)
+			return { error: 'Invalid Filename Convention' }
+
+		const status = Number(tokens.at(-2))
+		if (!responseStatusIsValid(status))
+			return { error: `Invalid HTTP Response Status: "${status}"` }
+
+		const method = tokens.at(-3)
+		if (!httpMethods.includes(method))
+			return { error: `Unrecognized HTTP Method: "${method}"` }
+
+		return {
+			urlMask: '/' + removeTrailingSlash(tokens.at(-4)),
+			method,
+			status
+		}
 	}
 }
 

package/src/mockBrokersCollection.js

@@ -5,6 +5,7 @@ import { Route } from './Route.js'
 import { Config } from './Config.js'
 import { cookie } from './cookie.js'
 import { isFile } from './utils/fs.js'
+import { mimeFor } from './utils/mime.js'
 import { MockBroker } from './MockBroker.js'
 
 
@@ -25,7 +26,7 @@ export function init() {
 	cookie.init(Config.cookies)
 
 	const files = readDir(Config.mocksDir, { recursive: true })
-		.filter(f => Config.allowedExt.test(f) && isFile(join(Config.mocksDir, f)))
+		.filter(f => isFile(join(Config.mocksDir, f)) && mimeFor(f))
 		.sort()
 
 	for (const file of files) {

package/src/utils/mime.js

@@ -1,9 +1,28 @@
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
+// m = {}; 
+// for (const row of tbody.children)
+//   m[row.children[0].querySelector('code').innerText] = row.children[2].querySelector('code').innerText
+
 const mimes = {
-	aac: 'audio/acc',
+	'3g2': 'video/3gpp2',
+	'3gp': 'video/3gpp',
+	'7z': 'application/x-7z-compressed',
+	aac: 'audio/aac',
+	abw: 'application/x-abiword',
 	apng: 'image/apng',
+	arc: 'application/x-freearc',
+	avi: 'video/x-msvideo',
 	avif: 'image/avif',
+	azw: 'application/vnd.amazon.ebook',
+	bin: 'application/octet-stream',
+	bmp: 'image/bmp',
+	bz2: 'application/x-bzip2',
+	bz: 'application/x-bzip',
+	cda: 'application/x-cdf',
+	cjs: 'text/javascript',
+	csh: 'application/x-csh',
 	css: 'text/css',
+	csv: 'text/csv',
 	doc: 'application/msword',
 	docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
 	eot: 'application/vnd.ms-fontobject',
@@ -14,34 +33,59 @@ const mimes = {
 	html: 'text/html',
 	ico: 'image/vnd.microsoft.icon',
 	ics: 'text/calendar',
+	jar: 'application/java-archive',
 	jpeg: 'image/jpeg',
 	jpg: 'image/jpeg',
-	js: 'application/javascript',
+	js: 'text/javascript',
 	json: 'application/json',
 	jsonld: 'application/ld+json',
-	md: 'text/markdown',
+	mid: 'audio/midi',
 	mjs: 'text/javascript',
 	mp3: 'audio/mpeg',
 	mp4: 'video/mp4',
-	oft: 'font/otf',
+	mpeg: 'video/mpeg',
+	mpkg: 'application/vnd.apple.installer+xml',
+	odp: 'application/vnd.oasis.opendocument.presentation',
+	ods: 'application/vnd.oasis.opendocument.spreadsheet',
+	odt: 'application/vnd.oasis.opendocument.text',
+	oga: 'audio/ogg',
+	ogv: 'video/ogg',
+	ogx: 'application/ogg',
+	opus: 'audio/ogg',
+	otf: 'font/otf',
 	pdf: 'application/pdf',
+	php: 'application/x-httpd-php',
 	png: 'image/png',
+	ppt: 'application/vnd.ms-powerpoint',
+	pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+	rar: 'application/vnd.rar',
+	rtf: 'application/rtf',
+	sh: 'application/x-sh',
+	svg: 'image/svg+xml',
+	tar: 'application/x-tar',
+	tif: 'image/tiff',
+	ts: 'video/mp2t',
 	ttf: 'font/ttf',
-	txt: 'plain/text',
+	txt: 'text/plain',
+	vsd: 'application/vnd.visio',
 	wav: 'audio/wav',
 	weba: 'audio/webm',
 	webm: 'video/webm',
 	webp: 'image/webp',
 	woff2: 'font/woff2',
 	woff: 'font/woff',
+	xhtml: 'application/xhtml+xml',
+	xls: 'application/vnd.ms-excel',
+	xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
 	xml: 'application/xml',
+	xul: 'application/vnd.mozilla.xul+xml',
 	zip: 'application/zip'
 }
 
 export function mimeFor(filename) {
-	const ext = filename.replace(/.*\./, '')
+	const ext = filename.replace(/.*\./, '').toLowerCase()
 	const mime = mimes[ext] || ''
 	if (!mime)
-		console.error(`Missing MIME for ${filename}`)
+		console.info(`Missing MIME for ${filename}`)
 	return mime
-}
+}

package/sample-mocks/api/user/.GET.200.json

@@ -1 +0,0 @@
-"This is an index-like route (i.e. /api/user). This file has no name, only the extension convention is needed for the index path."

package/sample-mocks/api/user/edit-name.PATCH.md

@@ -1,9 +0,0 @@
-# Request Body
-
-```json
-{ 
-  "new_name": "John"
-}
-```
-
-This is just documentation. In this example, for the request body payload.