JS: Require curly braces in switch cases

versatica · Dec 15, 2023 · c276707 · c276707
1 parent bc55f22
commit c276707
Show file tree

Hide file tree

Showing 11 changed files with 353 additions and 1 deletion.
diff --git a/node/.eslintrc.js b/node/.eslintrc.js
@@ -45,6 +45,16 @@ const eslintConfig =
 		'computed-property-spacing' : 2,
 		'constructor-super'         : 2,
 		'curly'                     : [ 2, 'all' ],
+		// Unfortunatelly `curly` does not apply to blocks in `switch` cases so
+		// this is needed.
+		// NOTE: We disable this rule since it's producing false positives:
+		// link
+		// 'no-restricted-syntax'      : [ 2,
+		// 	{
+		// 		'selector' : 'SwitchCase:has(*.consequent[type!="BlockStatement"])',
+		// 		'message'  : 'Switch cases without blocks are disallowed'
+		// 	}
+		// ],
 		'func-call-spacing'         : 2,
 		'generator-star-spacing'    : 2,
 		'guard-for-in'              : 2,

diff --git a/node/src/Channel.ts b/node/src/Channel.ts
@@ -164,10 +164,13 @@ export class Channel extends EnhancedEventEmitter
 						}
 
 						default:
+						{
 							// eslint-disable-next-line no-console
 							console.warn(
 								`worker[pid:${pid}] unexpected data: %s`,
-								payload.toString('utf8', 1));
+								payload.toString('utf8', 1)
+							);
+						}
 					}
 				}
 				catch (error)
@@ -432,11 +435,16 @@ export class Channel extends EnhancedEventEmitter
 			switch (response.error()!)
 			{
 				case 'TypeError':
+				{
 					sent.reject(new TypeError(response.reason()!));
+
 					break;
+				}
 
 				default:
+				{
 					sent.reject(new Error(response.reason()!));
+				}
 			}
 		}
 		else
@@ -470,24 +478,36 @@ export class Channel extends EnhancedEventEmitter
 		{
 			// 'D' (a debug log).
 			case 'D':
+			{
 				logger.debug(`[pid:${pid}] ${logData.slice(1)}`);
+
 				break;
+			}
 
 			// 'W' (a warn log).
 			case 'W':
+			{
 				logger.warn(`[pid:${pid}] ${logData.slice(1)}`);
+
 				break;
+			}
 
 			// 'E' (a error log).
 			case 'E':
+			{
 				logger.error(`[pid:${pid}] ${logData.slice(1)}`);
+
 				break;
+			}
 
 			// 'X' (a dump log).
 			case 'X':
+			{
 				// eslint-disable-next-line no-console
 				console.log(logData.slice(1));
+
 				break;
+			}
 		}
 	}
 }
diff --git a/node/src/Consumer.ts b/node/src/Consumer.ts
@@ -999,17 +999,34 @@ function consumerTraceEventTypeToFbs(eventType: ConsumerTraceEventType)
 	switch (eventType)
 	{
 		case 'keyframe':
+		{
 			return FbsConsumer.TraceEventType.KEYFRAME;
+		}
+
 		case 'fir':
+		{
 			return FbsConsumer.TraceEventType.FIR;
+		}
+
 		case 'nack':
+		{
 			return FbsConsumer.TraceEventType.NACK;
+		}
+
 		case 'pli':
+		{
 			return FbsConsumer.TraceEventType.PLI;
+		}
+
 		case 'rtp':
+		{
 			return FbsConsumer.TraceEventType.RTP;
+		}
+
 		default:
+		{
 			throw new TypeError(`invalid ConsumerTraceEventType: ${eventType}`);
+		}
 	}
 }
 
@@ -1019,17 +1036,34 @@ function consumerTraceEventTypeFromFbs(traceType: FbsConsumer.TraceEventType)
 	switch (traceType)
 	{
 		case FbsConsumer.TraceEventType.KEYFRAME:
+		{
 			return 'keyframe';
+		}
+
 		case FbsConsumer.TraceEventType.FIR:
+		{
 			return 'fir';
+		}
+
 		case FbsConsumer.TraceEventType.NACK:
+		{
 			return 'nack';
+		}
+
 		case FbsConsumer.TraceEventType.PLI:
+		{
 			return 'pli';
+		}
+
 		case FbsConsumer.TraceEventType.RTP:
+		{
 			return 'rtp';
+		}
+
 		default:
+		{
 			throw new TypeError(`invalid FbsConsumer.TraceEventType: ${traceType}`);
+		}
 	}
 }
 

diff --git a/node/src/DataConsumer.ts b/node/src/DataConsumer.ts
@@ -762,11 +762,19 @@ export function dataConsumerTypeToFbs(type: DataConsumerType): FbsDataProducer.T
 	switch (type)
 	{
 		case 'sctp':
+		{
 			return FbsDataProducer.Type.SCTP;
+		}
+
 		case 'direct':
+		{
 			return FbsDataProducer.Type.DIRECT;
+		}
+
 		default:
+		{
 			throw new TypeError('invalid DataConsumerType: ${type}');
+		}
 	}
 }
 
@@ -775,9 +783,14 @@ export function dataConsumerTypeFromFbs(type: FbsDataProducer.Type): DataConsume
 	switch (type)
 	{
 		case FbsDataProducer.Type.SCTP:
+		{
 			return 'sctp';
+		}
+
 		case FbsDataProducer.Type.DIRECT:
+		{
 			return 'direct';
+		}
 	}
 }
 

diff --git a/node/src/DataProducer.ts b/node/src/DataProducer.ts
@@ -475,11 +475,19 @@ export function dataProducerTypeToFbs(type: DataProducerType): FbsDataProducer.T
 	switch (type)
 	{
 		case 'sctp':
+		{
 			return FbsDataProducer.Type.SCTP;
+		}
+
 		case 'direct':
+		{
 			return FbsDataProducer.Type.DIRECT;
+		}
+
 		default:
+		{
 			throw new TypeError('invalid DataConsumerType: ${type}');
+		}
 	}
 }
 
@@ -488,9 +496,14 @@ export function dataProducerTypeFromFbs(type: FbsDataProducer.Type): DataProduce
 	switch (type)
 	{
 		case FbsDataProducer.Type.SCTP:
+		{
 			return 'sctp';
+		}
+
 		case FbsDataProducer.Type.DIRECT:
+		{
 			return 'direct';
+		}
 	}
 }
 

diff --git a/node/src/Producer.ts b/node/src/Producer.ts
@@ -630,13 +630,24 @@ export function producerTypeFromFbs(type: FbsRtpParameters.Type): ProducerType
 	switch (type)
 	{
 		case FbsRtpParameters.Type.SIMPLE:
+		{
 			return 'simple';
+		}
+
 		case FbsRtpParameters.Type.SIMULCAST:
+		{
 			return 'simulcast';
+		}
+
 		case FbsRtpParameters.Type.SVC:
+		{
 			return 'svc';
+		}
+
 		default:
+		{
 			throw new TypeError(`invalid FbsRtpParameters.Type: ${type}`);
+		}
 	}
 }
 
@@ -645,13 +656,19 @@ export function producerTypeToFbs(type: ProducerType): FbsRtpParameters.Type
 	switch (type)
 	{
 		case 'simple':
+		{
 			return FbsRtpParameters.Type.SIMPLE;
+		}
 
 		case 'simulcast':
+		{
 			return FbsRtpParameters.Type.SIMULCAST;
+		}
 
 		case 'svc':
+		{
 			return FbsRtpParameters.Type.SVC;
+		}
 	}
 }
 
@@ -661,17 +678,34 @@ function producerTraceEventTypeToFbs(eventType: ProducerTraceEventType)
 	switch (eventType)
 	{
 		case 'keyframe':
+		{
 			return FbsProducer.TraceEventType.KEYFRAME;
+		}
+
 		case 'fir':
+		{
 			return FbsProducer.TraceEventType.FIR;
+		}
+
 		case 'nack':
+		{
 			return FbsProducer.TraceEventType.NACK;
+		}
+
 		case 'pli':
+		{
 			return FbsProducer.TraceEventType.PLI;
+		}
+
 		case 'rtp':
+		{
 			return FbsProducer.TraceEventType.RTP;
+		}
+
 		default:
+		{
 			throw new TypeError(`invalid ProducerTraceEventType: ${eventType}`);
+		}
 	}
 }
 
@@ -681,15 +715,29 @@ function producerTraceEventTypeFromFbs(eventType: FbsProducer.TraceEventType)
 	switch (eventType)
 	{
 		case FbsProducer.TraceEventType.KEYFRAME:
+		{
 			return 'keyframe';
+		}
+
 		case FbsProducer.TraceEventType.FIR:
+		{
 			return 'fir';
+		}
+
 		case FbsProducer.TraceEventType.NACK:
+		{
 			return 'nack';
+		}
+
 		case FbsProducer.TraceEventType.PLI:
+		{
 			return 'pli';
+		}
+
 		case FbsProducer.TraceEventType.RTP:
+		{
 			return 'rtp';
+		}
 	}
 }