fix(no-ondone-outside-compound-state): allow the use of onDone with…

…in an array of invoke blocks Fix a problem where `onDone` was incorrectly reported as invalid when used within an array of `invoke` blocks fix #18
rlaffers · Aug 4, 2023 · 10e1e0c · 10e1e0c
1 parent a3adedf
commit 10e1e0c
Show file tree

Hide file tree

Showing 4 changed files with 123 additions and 5 deletions.
diff --git a/docs/rules/no-ondone-outside-compound-state.md b/docs/rules/no-ondone-outside-compound-state.md
@@ -71,6 +71,36 @@ createMachine({
     },
   },
 })
+
+// ✅ onDone transition inside an invoke block
+createMachine({
+  states: {
+    active: {
+      invoke: {
+        src: 'fetchSomething',
+        onDone: 'idle',
+      },
+    },
+  },
+})
+
+// ✅ onDone transition inside an array of invoke blocks
+createMachine({
+  states: {
+    active: {
+      invoke: [
+        {
+          src: 'fetchSomething',
+          onDone: 'done',
+        },
+        {
+          src: 'listen',
+          onDone: 'done',
+        },
+      ],
+    },
+  },
+})
 ```
 
 ## Further Reading

diff --git a/lib/rules/no-ondone-outside-compound-state.js b/lib/rules/no-ondone-outside-compound-state.js
@@ -4,16 +4,27 @@ const getDocsUrl = require('../utils/getDocsUrl')
 const { getTypeProperty } = require('../utils/selectors')
 const { hasProperty, isWithinInvoke } = require('../utils/predicates')
 
-function isWithinAtomicStateNode(node) {
+function isWithinCompoundStateNode(node) {
   const stateNode = node.parent
   const type = getTypeProperty(stateNode)
   return (
-    !isWithinInvoke(node) &&
-    ((type != null && type.value.value === 'atomic') ||
-      (type == null && !hasProperty('initial', stateNode)))
+    hasProperty('initial', stateNode) ||
+    (type != null && type.value.value === 'compound')
   )
 }
 
+function isWithinParallelStateNode(node) {
+  const stateNode = node.parent
+  const type = getTypeProperty(stateNode)
+  return type != null && type.value.value === 'parallel'
+}
+
+function isWithinAtomicStateNode(node) {
+  const stateNode = node.parent
+  const type = getTypeProperty(stateNode)
+  return type != null && type.value.value === 'atomic'
+}
+
 function isWithinHistoryStateNode(node) {
   const stateNode = node.parent
   const type = getTypeProperty(stateNode)
@@ -44,13 +55,24 @@ module.exports = {
         'History state nodes cannot have an "onDone" transition. The "onDone" transition has effect only in compound/parallel state nodes or in service invocations.',
       onDoneOnFinalStateForbidden:
         'Final state nodes cannot have an "onDone" transition. The "onDone" transition has effect only in compound/parallel state nodes or in service invocations.',
+      onDoneUsedIncorrectly:
+        'The "onDone" transition cannot be used here. The "onDone" transition has effect only in compound/parallel state nodes or in service invocations.',
     },
   },
 
   create: function (context) {
     return {
       'CallExpression[callee.name=/^createMachine$|^Machine$/] Property[key.name="onDone"]':
         function (node) {
+          if (isWithinInvoke(node)) {
+            return
+          }
+          if (isWithinCompoundStateNode(node)) {
+            return
+          }
+          if (isWithinParallelStateNode(node)) {
+            return
+          }
           if (isWithinAtomicStateNode(node)) {
             context.report({
               node,
@@ -70,7 +92,12 @@ module.exports = {
               node,
               messageId: 'onDoneOnFinalStateForbidden',
             })
+            return
           }
+          context.report({
+            node,
+            messageId: 'onDoneUsedIncorrectly',
+          })
         },
     }
   },

diff --git a/lib/utils/predicates.js b/lib/utils/predicates.js
@@ -105,7 +105,19 @@ function isKnownActionCreatorCall(node) {
 
 function isWithinInvoke(property) {
   const parentProp = property.parent.parent
-  return parentProp.type === 'Property' && parentProp.key.name === 'invoke'
+  if (
+    parentProp &&
+    parentProp.type === 'Property' &&
+    parentProp.key.name === 'invoke'
+  ) {
+    return true
+  }
+  return (
+    parentProp.type === 'ArrayExpression' &&
+    parentProp.parent &&
+    parentProp.parent.type === 'Property' &&
+    parentProp.parent.key.name === 'invoke'
+  )
 }
 
 // list of property names which have special meaning to XState in some contexts (they are

diff --git a/tests/lib/rules/no-ondone-outside-compound-state.js b/tests/lib/rules/no-ondone-outside-compound-state.js
@@ -33,20 +33,59 @@ const tests = {
         },
       })
     `,
+    `
+      createMachine({
+        initial: 'loading',
+        states: {
+          loading: {
+            invoke: {
+              src: 'fetchData',
+              onDone: 'ready',
+            },
+          },
+        },
+      })
+    `,
+    `
+      createMachine({
+        initial: 'loading',
+        states: {
+          loading: {
+            invoke: [{
+              src: 'fetchData',
+              onDone: 'ready',
+            }],
+          },
+        },
+      })
+    `,
   ],
   invalid: [
     {
       code: `
         createMachine({
           states: {
             active: {
+              type: 'atomic',
               onDone: 'idle',
             },
           },
         })
       `,
       errors: [{ messageId: 'onDoneOnAtomicStateForbidden' }],
     },
+    {
+      code: `
+        createMachine({
+          states: {
+            active: {
+              onDone: 'idle',
+            },
+          },
+        })
+      `,
+      errors: [{ messageId: 'onDoneUsedIncorrectly' }],
+    },
     {
       code: `
         createMachine({
@@ -75,6 +114,16 @@ const tests = {
       `,
       errors: [{ messageId: 'onDoneOnHistoryStateForbidden' }],
     },
+    {
+      code: `
+        createMachine({
+          on: {
+            onDone: 'idle',
+          },
+        })
+      `,
+      errors: [{ messageId: 'onDoneUsedIncorrectly' }],
+    },
   ],
 }