refactor: Object.prototype.hasOwnProperty.call -> Object.hasOwn

sverweij · Oct 5, 2024 · d0a4fa5 · d0a4fa5
1 parent 3fe36bc
commit d0a4fa5
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 52 deletions.
diff --git a/dist/cli/normalize.mjs b/dist/cli/normalize.mjs
diff --git a/dist/parse/scxml/index.mjs b/dist/parse/scxml/index.mjs
diff --git a/dist/render/dot/index.mjs b/dist/render/dot/index.mjs
diff --git a/dist/render/smcat/index.mjs b/dist/render/smcat/index.mjs
diff --git a/dist/state-machine-model.mjs b/dist/state-machine-model.mjs
diff --git a/docs/index.html b/docs/index.html
@@ -37,7 +37,7 @@
   <meta name="google-site-verification" content="K0j5zueKp7lYKMR7WihmcTJbLpHxBOpaXZEI_s0nHTw" />
   <link rel="canonical" href="https://state-machine-cat.js.org">
   <script nonce="known-inline-script">let LOG = false;</script>
-  <script src="smcat-online-interpreter.min.js" type="module" defer integrity="sha512-LzV4WdQWscs9/euUna1KrfMGbrC9/7qaQzosyb+1mY0xpyzCJd7v6X+cq2IlMnd3wSKspbGDTScrkkFxWSZXVg=="></script>
+  <script src="smcat-online-interpreter.min.js" type="module" defer integrity="sha512-jW00R6aQpO/8HlgIBHby+zWnUNKDEBCKgZmQDMy7sWZAnnQ+0+OKOQs5Besk+eRZh+MO9AaM1Rd1nMm3j0SiqQ=="></script>
   <script defer src="https://code.getmdl.io/1.3.0/material.min.js" async></script>
   <script async src="https://www.googletagmanager.com/gtag/js?id=G-DCPVBY7NNV"></script>
   <script nonce="known-inline-script">

diff --git a/docs/inpage.html b/docs/inpage.html
@@ -23,7 +23,7 @@
       src="state-machine-cat-inpage.min.js"
       type="module"
       defer
-      integrity="sha512-8B26LbBRLk2NRwfL3RmG2iZ6KIVMQUyHyK4fedzMLuHfubc01DjK5VC4k0ms+jVoP6exjqHpdeu8zYeM/T0j0Q=="
+      integrity="sha512-YYgQmVg4m0xE8e7kXnumFlKAXEnr3pKqygJA9EF5Qqs1bwFY4s7tBTwUg29Hh5+wAhyf6fok2kBpFhc8w55GBg=="
     ></script>
     <style>
       body { font-family: sans-serif; margin: 0 auto; max-width: 799px;

diff --git a/docs/smcat-online-interpreter.min.js b/docs/smcat-online-interpreter.min.js
diff --git a/docs/smcat-online-interpreter.min.js.map b/docs/smcat-online-interpreter.min.js.map
diff --git a/docs/state-machine-cat-inpage.min.js b/docs/state-machine-cat-inpage.min.js
diff --git a/docs/state-machine-cat-inpage.min.js.map b/docs/state-machine-cat-inpage.min.js.map
diff --git a/src/cli/normalize.mts b/src/cli/normalize.mts
@@ -137,7 +137,7 @@ function determineParameter(
   pOptions: ILooseCLIRenderOptions,
   pParameter: string,
 ): string {
-  return Object.prototype.hasOwnProperty.call(pOptions, pParameter)
+  return Object.hasOwn(pOptions, pParameter)
     ? // @ts-expect-error tsc complains we can't index pOptions with a thing of type string - however: we can
       pOptions[pParameter]
     : // @ts-expect-error tsc complains we can't index pOptions with a thing of type string - however: we can

diff --git a/src/parse/scxml/index.mjs b/src/parse/scxml/index.mjs
@@ -178,9 +178,7 @@ function reduceTransition(pState) {
  */
 function extractTransitions(pStates) {
   return pStates
-    .filter((pState) =>
-      Object.prototype.hasOwnProperty.call(pState, "transition"),
-    )
+    .filter((pState) => Object.hasOwn(pState, "transition"))
     .reduce((pAllTransitions, pThisState) => {
       const lTransitionAsArray = castArray(pThisState.transition);
       return pAllTransitions.concat(

diff --git a/src/render/dot/index.mjs b/src/render/dot/index.mjs
@@ -13,7 +13,7 @@ import utl from "./utl.mjs";
  */
 function addExternalSelfTransitions(pStateMachineModel) {
   return (pState) => {
-    if (Object.prototype.hasOwnProperty.call(pState, "statemachine")) {
+    if (Object.hasOwn(pState, "statemachine")) {
       pState.nestedExternalSelfTransitions = pStateMachineModel
         .findExternalSelfTransitions(pState.name)
         .map((pTransition) => pTransition.name);

diff --git a/src/render/smcat/index.mts b/src/render/smcat/index.mts
@@ -50,11 +50,11 @@ function flattenActions(pState: IExtendedState): IFlattenedActionsState {
 /* eslint complexity:0 */
 function flagExtendedStateAttributes(pState: IExtendedState): IExtendedState {
   if (
-    Object.prototype.hasOwnProperty.call(pState, "label") ||
-    Object.prototype.hasOwnProperty.call(pState, "typeExplicitlySet") ||
-    Object.prototype.hasOwnProperty.call(pState, "color") ||
-    Object.prototype.hasOwnProperty.call(pState, "active") ||
-    Object.prototype.hasOwnProperty.call(pState, "class")
+    Object.hasOwn(pState, "label") ||
+    Object.hasOwn(pState, "typeExplicitlySet") ||
+    Object.hasOwn(pState, "color") ||
+    Object.hasOwn(pState, "active") ||
+    Object.hasOwn(pState, "class")
   ) {
     // note & fixme: mutating a parameter here
     pState.hasExtendedAttributes = true;
@@ -83,9 +83,9 @@ function flagExtendedTransitionAttributes(
   pTransition: IExtendedTransition,
 ): IExtendedTransition {
   if (
-    Object.prototype.hasOwnProperty.call(pTransition, "type") ||
-    Object.prototype.hasOwnProperty.call(pTransition, "color") ||
-    Object.prototype.hasOwnProperty.call(pTransition, "class")
+    Object.hasOwn(pTransition, "type") ||
+    Object.hasOwn(pTransition, "color") ||
+    Object.hasOwn(pTransition, "class")
   ) {
     pTransition.hasExtendedAttributes = true;
   }

diff --git a/src/state-machine-model.mts b/src/state-machine-model.mts
@@ -12,7 +12,9 @@ function flattenStates(pStates: IState[], pHasParent = false): any[] {
   pStates
     .filter((pState) => Boolean(pState.statemachine))
     .forEach((pState) => {
-      if (Object.prototype.hasOwnProperty.call(pState.statemachine, "states")) {
+      // @ts-expect-error ts2345 - typescript doesn't detect that one line above we
+      // ensure pState.statemachine is not undefined
+      if (Object.hasOwn(pState.statemachine, "states")) {
         lReturnValue = lReturnValue.concat(
           // @ts-expect-error TS doesn't detect that after the call in the filter
           // the .statemachine is guaranteed to exist
@@ -35,12 +37,12 @@ function flattenTransitions(pStateMachine: IStateMachine): ITransition[] {
   /** @type {import("../types/state-machine-cat").ITransition[]} */
   let lTransitions: ITransition[] = [];
 
-  if (Object.prototype.hasOwnProperty.call(pStateMachine, "transitions")) {
+  if (Object.hasOwn(pStateMachine, "transitions")) {
     // @ts-expect-error TS doesn't detect that after the call in the if the
     // .transitions is guaranteed to exist
     lTransitions = pStateMachine.transitions;
   }
-  if (Object.prototype.hasOwnProperty.call(pStateMachine, "states")) {
+  if (Object.hasOwn(pStateMachine, "states")) {
     pStateMachine.states
       .filter((pState) => Boolean(pState.statemachine))
       .forEach((pState) => {

diff --git a/test/parse/smcat-parser.spec.mts b/test/parse/smcat-parser.spec.mts
@@ -30,10 +30,7 @@ const syntaxErrors = requireJSON("./20-no-transitions-errors.json")
 
 describe("#parse() - happy day ASTs -", () => {
   programASTPairs.forEach((pPair) => {
-    if (
-      Object.prototype.hasOwnProperty.call(pPair, "pending") &&
-      pPair.pending
-    ) {
+    if (Object.hasOwn(pPair, "pending") && pPair.pending) {
       /* eslint  mocha/no-skipped-tests: off */
       xit(pPair.title);
     } else {

diff --git a/test/render/smcat.spec.mts b/test/render/smcat.spec.mts
@@ -16,10 +16,7 @@ const programASTPairs = requireJSON("../parse/00-no-transitions.json")
 
 describe("#parse(convert) - happy day ASTs - ", () => {
   programASTPairs.forEach((pPair) => {
-    if (
-      Object.prototype.hasOwnProperty.call(pPair, "pending") &&
-      pPair.pending
-    ) {
+    if (Object.hasOwn(pPair, "pending") && pPair.pending) {
       /* eslint mocha/no-skipped-tests: off */
       xit(pPair.title);
     } else {