Update BDD Markdown to v.6

feature-runner/lib/websocket.ts

@@ -2,6 +2,7 @@ import WebSocket from 'ws'
 import { ulid } from '../../util/ulid.js'
 
 export type WebSocketClient = {
+	id: string
 	connect: () => Promise<any>
 	close: () => void
 	send: (message: Record<string, unknown>) => Promise<void>
@@ -20,8 +21,9 @@ export const createWebsocketClient = ({
 }): WebSocketClient => {
 	if (clients[id] === undefined) {
 		const client = new WebSocket(url)
-		const messages: Record<string, unknown> = {}
+		const messages: Record<string, unknown> = {} as const
 		clients[id] = {
+			id,
 			connect: async () =>
 				new Promise<void>((resolve, reject) =>
 					client
@@ -33,7 +35,7 @@ export const createWebsocketClient = ({
 						})
 						.on('message', async (msg) => {
 							const message = JSON.parse(msg.toString())
-							debug?.(msg.toString())
+							debug?.('<< ' + msg.toString())
 							messages[ulid()] = message
 						}),
 				),
@@ -44,8 +46,10 @@ export const createWebsocketClient = ({
 			messages,
 			send: async (message) =>
 				new Promise<void>((resolve, reject) => {
-					client.send(JSON.stringify(message), (error) => {
+					const strMessage = JSON.stringify(message)
+					client.send(strMessage, (error) => {
 						if (error) return reject(error)
+						debug?.('>> ' + strMessage)
 						resolve()
 					})
 				}),

feature-runner/run-features.ts

@@ -91,30 +91,30 @@ const runner = await runFolder({
 		onDebug: (info, ...args) =>
 			console.error(
 				ts(),
-				chalk.magenta.dim(info.context.keyword),
-				chalk.magenta(info.context.title),
+				chalk.magenta.dim(info.step.keyword),
+				chalk.magenta(info.step.title),
 				...args.map((arg) => chalk.cyan(print(arg))),
 			),
 		onError: (info, ...args) =>
 			console.error(
 				ts(),
-				chalk.magenta.dim(info.context.keyword),
-				chalk.magenta(info.context.title),
-				...args.map((arg) => chalk.red(print(arg))),
+				chalk.magenta.dim(info.step.keyword),
+				chalk.magenta(info.step.title),
+				...args.map((arg) => chalk.cyan(print(arg))),
 			),
 		onInfo: (info, ...args) =>
 			console.error(
 				ts(),
-				chalk.magenta.dim(info.context.keyword),
-				chalk.magenta(info.context.title),
-				...args.map((arg) => chalk.green(print(arg))),
+				chalk.magenta.dim(info.step.keyword),
+				chalk.magenta(info.step.title),
+				...args.map((arg) => chalk.cyan(print(arg))),
 			),
 		onProgress: (info, ...args) =>
 			console.error(
 				ts(),
-				chalk.magenta.dim(info.context.keyword),
-				chalk.magenta(info.context.title),
-				...args.map((arg) => chalk.yellow(print(arg))),
+				chalk.magenta.dim(info.step.keyword),
+				chalk.magenta(info.step.title),
+				...args.map((arg) => chalk.cyan(print(arg))),
 			),
 	},
 })

feature-runner/steps/config.ts

@@ -1,9 +1,6 @@
 import {
-	matchGroups,
-	noMatch,
-	type StepRunResult,
 	type StepRunner,
-	type StepRunnerArgs,
+	regExpMatchedStep,
 } from '@nordicsemiconductor/bdd-markdown'
 import { Type } from '@sinclair/typebox'
 import { hashSHA1 } from '../../util/hashSHA1.js'
@@ -18,34 +15,24 @@ const createConfigStepRunners = ({
 }: {
 	configWriter: ReturnType<typeof putSettings>
 }): StepRunner<Record<string, any>>[] => {
-	const setupDeviceShadowFetchingConfiguration = async ({
-		step,
-		log: {
-			step: { progress },
-		},
-	}: StepRunnerArgs<Record<string, any>>): Promise<StepRunResult> => {
-		const match = matchGroups(
-			Type.Object({
+	const setupDeviceShadowFetchingConfiguration = regExpMatchedStep(
+		{
+			regExp:
+				/^device shadow fetching config for model `(?<model>[^`]+)` is `(?<interval>[^`]+)`$/,
+			schema: Type.Object({
 				model: Type.String(),
 				interval: Type.Integer(),
 			}),
-			{
+			converters: {
 				interval: (s) => parseInt(s, 10),
 			},
-		)(
-			/^device shadow fetching config for model `(?<model>[^`]+)` is `(?<interval>[^`]+)`$/,
-			step.title,
-		)
-
-		if (match === null) return noMatch
-
-		// ssm path must be letter, number, .(dot), -(dash), or _(underscore)
-		const model = hashSHA1(match.model)
-		const interval = match.interval
-
-		progress(`Set fetching interval for ${model} as ${interval} seconds`)
-		await configWriter({ property: model, value: `${interval}` })
-	}
+		},
+		async ({ match: { model, interval }, log: { progress } }) => {
+			const modelHash = hashSHA1(model)
+			progress(`Set fetching interval for ${modelHash} as ${interval} seconds`)
+			await configWriter({ property: modelHash, value: `${interval}` })
+		},
+	)
 
 	return [setupDeviceShadowFetchingConfiguration]
 }