refactor: addresses small linting issues

sverweij · Nov 23, 2024 · e72bc97 · e72bc97
1 parent 2ca5551
commit e72bc97
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 34 deletions.
diff --git a/dist/cli/actions.mjs b/dist/cli/actions.mjs
diff --git a/dist/cli/normalize.mjs b/dist/cli/normalize.mjs
diff --git a/dist/parse/smcat/smcat-parser.mjs b/dist/parse/smcat/smcat-parser.mjs
diff --git a/dist/render/dot/index.mjs b/dist/render/dot/index.mjs
diff --git a/dist/render/smcat.mjs b/dist/render/smcat.mjs
diff --git a/src/cli/actions.mts b/src/cli/actions.mts
@@ -73,7 +73,7 @@ export function transform(pOptions: ICLIRenderOptions) {
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function formatError(pError: any): string {
-  if (Boolean(pError.location)) {
+  if (pError.location) {
     return `\n  syntax error on line ${pError.location.start.line}, column ${pError.location.start.column}:\n  ${pError.message}\n\n`;
   }
   return pError.message;

diff --git a/src/cli/attributes-parser.mjs b/src/cli/attributes-parser.mjs
@@ -1,4 +1,4 @@
-// @generated by Peggy 4.1.1.
+// @generated by Peggy 4.2.0.
 //
 // https://peggyjs.org/
 

diff --git a/src/cli/normalize.mts b/src/cli/normalize.mts
@@ -92,7 +92,7 @@ function determineOutputTo(
   pInputFrom: string,
   pOutputType: OutputType,
 ): string {
-  return pOutputTo ? pOutputTo : deriveOutputFromInput(pInputFrom, pOutputType);
+  return pOutputTo ?? deriveOutputFromInput(pInputFrom, pOutputType);
 }
 
 function determineInputType(
@@ -148,7 +148,7 @@ function determineDotAttributes(
   pOptions: ILooseCLIRenderOptions,
   pDotAttributes: keyof ILooseCLIRenderOptions,
 ): dotAttributesType {
-  return Boolean(pOptions?.[pDotAttributes]) &&
+  return pOptions?.[pDotAttributes] &&
     typeof pOptions[pDotAttributes] === "string"
     ? (parseAttributes(pOptions[pDotAttributes]) as dotAttributesType)
     : [];

diff --git a/src/parse/parser-helpers.mts b/src/parse/parser-helpers.mts
@@ -89,9 +89,8 @@ function extractUndeclaredStates(
   pStateMachine: IStateMachine,
   pKnownStateNames: string[],
 ): IState[] {
-  pKnownStateNames = pKnownStateNames
-    ? pKnownStateNames
-    : getAlreadyDeclaredStates(pStateMachine);
+  pKnownStateNames =
+    pKnownStateNames ?? getAlreadyDeclaredStates(pStateMachine);
 
   pStateMachine.states = pStateMachine?.states ?? [];
   const lTransitions = pStateMachine?.transitions ?? [];
@@ -199,7 +198,7 @@ function parseTransitionExpression(pString: string): {
 
   // @ts-expect-error match has no fallback because lTransitionExpressionRe will match
   // any string (every part is optional)
-  const lMatchResult: RegExpMatchArray = pString.match(lTransitionExpressionRe);
+  const lMatchResult: RegExpMatchArray = lTransitionExpressionRe.exec(pString);
   const lEventPos = 1;
   const lConditionPos = 2;
   const lActionPos = 3;
@@ -244,7 +243,7 @@ function extractAction(pActivityCandidate: string): {
   type: string;
   body: string;
 } {
-  const lMatch = pActivityCandidate.match(TRIGGER_RE);
+  const lMatch = TRIGGER_RE.exec(pActivityCandidate);
   const lTypePos = 1;
   const lBodyPos = 2;
 

diff --git a/src/parse/smcat/peg/smcat-parser.peggy b/src/parse/smcat/peg/smcat-parser.peggy
@@ -45,7 +45,7 @@ state "state"
           parserHelpers.setIf(lState, 'statemachine', statemachine);
           parserHelpers.setIfNotEmpty(lState, 'note', notes);
 
-          if (Boolean(actions)) {
+          if (actions) {
             parserHelpers.setIfNotEmpty(
                 lState,
                 'actions',

diff --git a/src/parse/smcat/smcat-parser.mjs b/src/parse/smcat/smcat-parser.mjs
@@ -1,4 +1,4 @@
-// @generated by Peggy 4.1.1.
+// @generated by Peggy 4.2.0.
 //
 // https://peggyjs.org/
 
@@ -343,7 +343,7 @@ function peg$parse(input, options) {
           parserHelpers.setIf(lState, 'statemachine', statemachine);
           parserHelpers.setIfNotEmpty(lState, 'note', notes);
 
-          if (Boolean(actions)) {
+          if (actions) {
             parserHelpers.setIfNotEmpty(
                 lState,
                 'actions',

diff --git a/src/render/dot/index.mjs b/src/render/dot/index.mjs
@@ -138,7 +138,7 @@ function nameTransition(pCounter) {
       pTransition.to
     }_${pCounter.nextAsString()}`;
 
-    if (Boolean(pTransition.note)) {
+    if (pTransition.note) {
       pTransition.noteName = `note_${pTransition.name}`;
     }
 

diff --git a/src/render/dot/state-transformers.mts b/src/render/dot/state-transformers.mts
@@ -11,7 +11,7 @@ function isOneOfTypes(pStringArray: string[]) {
 
 function setLabel(pState: IExtendedState): IExtendedState {
   const lState = structuredClone(pState);
-  lState.label = pState.label || pState.name;
+  lState.label = pState.label ?? pState.name;
   return lState;
 }
 
@@ -51,13 +51,13 @@ function flattenActions(pState: IExtendedState): IExtendedState {
     };
   }
 
-  return pState as IExtendedState;
+  return pState;
 }
 
 function flattenNote(pState: IExtendedState): IExtendedState {
   if (pState.note) {
     return {
-      ...(pState as IExtendedState),
+      ...pState,
       noteFlattened: pState.note.join(""),
     };
   }
@@ -111,11 +111,7 @@ function tipForkJoinStates(pDirection: string) {
 }
 
 function flagParallelChildren(pState: IExtendedState): IExtendedState {
-  if (
-    pState.type === "parallel" &&
-    pState.statemachine &&
-    pState.statemachine.states
-  ) {
+  if (pState.type === "parallel" && pState.statemachine?.states) {
     pState.statemachine.states = pState.statemachine.states.map(
       (pChildState: IState) =>
         isType("regular")(pChildState)

diff --git a/src/render/dot/utl.mts b/src/render/dot/utl.mts
@@ -30,7 +30,7 @@ function isCompositeSelf(
   return (
     pTransition.from === pTransition.to &&
     pStateMachineModel.findStateByName(pTransition.from).statemachine &&
-    !(pTransition.type === "internal")
+    pTransition.type !== "internal"
   );
 }
 

diff --git a/src/render/scjson/make-valid-event-names.mts b/src/render/scjson/make-valid-event-names.mts
@@ -56,7 +56,7 @@ function makeValidEventName(pCandidateEventName: string): string {
  * @returns a valid SCXML events string
  */
 export default (pCandidateEventNames?: string): string => {
-  const lCandidateEventNames = pCandidateEventNames || "";
+  const lCandidateEventNames = pCandidateEventNames ?? "";
 
   if (lCandidateEventNames.length === 0) {
     return "empty";

diff --git a/src/render/smcat.mts b/src/render/smcat.mts
@@ -6,9 +6,9 @@ import type {
   ITransition,
 } from "../../types/state-machine-cat.mjs";
 
-const NAME_QUOTABLE = /;|,|{| |\[/;
-const ACTIONS_QUOTABLE = /;|,|{/;
-const LABEL_QUOTABLE = /;|{/;
+const NAME_QUOTABLE = /[;,{[ ]/;
+const ACTIONS_QUOTABLE = /[;,{}]/;
+const LABEL_QUOTABLE = /[;{]/;
 
 const RENDERABLE_STATE_ATTRIBUTES = [
   "label",

diff --git a/test/cli/actions.spec.mts b/test/cli/actions.spec.mts
@@ -62,7 +62,7 @@ function resetOutputDirectory() {
       // if (!!pPair.input.argument){
       //     fs.unlinkSync(pPair.input.argument);
       // }
-      if (Boolean(pPair.input.options.outputTo)) {
+      if (pPair.input.options.outputTo) {
         fs.unlinkSync(pPair.input.options.outputTo);
       }
     } catch (pError) {