Extract inline actors (#422)

statelyai · Jan 3, 2024 · 9cef236 · 9cef236
1 parent 55fd20a
commit 9cef236
Show file tree

Hide file tree

Showing 12 changed files with 299 additions and 56 deletions.
diff --git a/apps/extension/server/src/getReferences.ts b/apps/extension/server/src/getReferences.ts
@@ -1,5 +1,5 @@
 import {
-  forEachAction,
+  forEachEntity,
   getRangeFromSourceLocation,
 } from '@xstate/tools-shared';
 import { TextDocumentIdentifier } from 'vscode-languageserver';
@@ -25,8 +25,11 @@ export const getReferences = (
       const config = cursorHover.machine.toConfig();
       if (!config) return [];
 
-      // Actions don't matter here so we stub them out
-      forEachAction(config, () => {
+      // Actions and actors don't matter here so we stub them out
+      forEachEntity(config, (entity) => {
+        if (entity && 'src' in entity) {
+          return { src: 'anonymous' };
+        }
         return { type: 'anonymous' };
       });
 
@@ -66,8 +69,11 @@ export const getReferences = (
       const config = cursorHover.machine.toConfig();
       if (!config) return [];
 
-      // Actions don't matter here so we stub them out
-      forEachAction(config, () => {
+      // Actions and actors don't matter here so we stub them out
+      forEachEntity(config, (entity) => {
+        if (entity && 'src' in entity) {
+          return { src: 'anonymous' };
+        }
         return { type: 'anonymous' };
       });
 

diff --git a/packages/machine-extractor/src/__tests__/invoke.test.ts b/packages/machine-extractor/src/__tests__/invoke.test.ts
@@ -35,4 +35,56 @@ describe('Invoke', () => {
 
     expect(invokes).toHaveLength(1);
   });
+
+  it('Should extract inline actors correctly', () => {
+    const result = extractMachinesFromFile(`
+      createMachine({
+        invoke: [
+          {src: 'string source'},
+          {src: () => {
+            console.log('inline function')
+          }},
+          {src: () => () => {
+            console.log('callback actor')
+          }},
+          {src: fromPromise(() => {
+            return fetch('https://example.com/...').then((data) => data.json());
+          })},
+          {src: identifierActor},
+        ]
+      })
+    `);
+    const invoke = result!.machines[0]!.toConfig()?.invoke;
+
+    expect(invoke).toMatchInlineSnapshot(`
+      [
+        {
+          "kind": "named",
+          "src": "string source",
+        },
+        {
+          "kind": "inline",
+          "src": "() => {
+                  console.log('inline function')
+                }",
+        },
+        {
+          "kind": "inline",
+          "src": "() => () => {
+                  console.log('callback actor')
+                }",
+        },
+        {
+          "kind": "inline",
+          "src": "fromPromise(() => {
+                  return fetch('https://example.com/...').then((data) => data.json());
+                })",
+        },
+        {
+          "kind": "inline",
+          "src": "identifierActor",
+        },
+      ]
+    `);
+  });
 });
diff --git a/packages/machine-extractor/src/__tests__/transitions.test.ts b/packages/machine-extractor/src/__tests__/transitions.test.ts
@@ -43,6 +43,7 @@ describe('Internal transitions', () => {
         "states": {
           "a": {
             "invoke": {
+              "kind": "named",
               "onDone": {
                 "internal": false,
               },

diff --git a/packages/machine-extractor/src/extractAction.ts b/packages/machine-extractor/src/extractAction.ts
@@ -270,9 +270,9 @@ export function extractSendToAction(
 // Todo: support namespace imports and aliased specifiers
 // import * as actions from 'xstate'; actions.sendTo
 // import {sendTo as x} from 'xstate'
-export const getActionCreatorName = (actionNode: ActionNode) =>
-  t.isCallExpression(actionNode.node) && t.isIdentifier(actionNode.node.callee)
-    ? actionNode.node.callee.name
+export const getCallExpressionName = (node: t.Node) =>
+  t.isCallExpression(node) && t.isIdentifier(node.callee)
+    ? node.callee.name
     : undefined;
 
 export const getObjectPropertyKey = (

diff --git a/packages/machine-extractor/src/toMachineConfig.ts b/packages/machine-extractor/src/toMachineConfig.ts
@@ -1,4 +1,5 @@
 import * as t from '@babel/types';
+import { getNameOfDeclaration } from 'typescript';
 import { MaybeArrayOfActions } from './actions';
 import { CondNode } from './conds';
 import {
@@ -8,6 +9,8 @@ import {
   extractRaiseAction,
   extractSendToAction,
   extractStopAction,
+  getCallExpressionName,
+  getObjectPropertyKey,
 } from './extractAction';
 import { TMachineCallExpression } from './machineCallExpression';
 import { StateNodeReturn } from './stateNode';
@@ -133,11 +136,27 @@ const parseStateNode = (
         return;
       }
       // For now, we'll treat "anonymous" as if this is an inline expression
-      let src: string | undefined =
-        invoke.src.declarationType === 'named' ? invoke.src.value : undefined;
+      let invokeDef:
+        | { src: string; kind: ExtractorInvokeNodeConfig['kind'] }
+        | undefined = (() => {
+        if (invoke.src.declarationType === 'named') {
+          return {
+            src: invoke.src.value,
+            kind: 'named',
+          };
+        }
+        return {
+          src: opts!.fileContent.slice(
+            invoke.src.node.start!,
+            invoke.src.node.end!,
+          ),
+          kind: 'inline',
+        };
+      })();
 
       const toPush: ExtractorInvokeNodeConfig = {
-        src: src || (() => () => {}),
+        src: invokeDef.src,
+        kind: invokeDef.kind,
       };
 
       if (invoke.id) {

diff --git a/packages/machine-extractor/src/types.ts b/packages/machine-extractor/src/types.ts
@@ -14,12 +14,13 @@ export type ExtractrorTransitionNodeConfig = {
 };
 
 export type ExtractorInvokeNodeConfig = {
-  src?: string | Function;
+  src: string;
   id?: string;
   autoForward?: boolean;
   forward?: boolean;
   onDone?: MaybeArray<ExtractrorTransitionNodeConfig>;
   onError?: MaybeArray<ExtractrorTransitionNodeConfig>;
+  kind: 'inline' | 'named';
 };
 
 export type ExtractorStateNodeConfig = {

diff --git a/packages/shared/forEachEntity/package.json b/packages/shared/forEachEntity/package.json
@@ -0,0 +1,4 @@
+{
+  "main": "dist/xstate-tools-shared-forEachEntity.cjs.js",
+  "module": "dist/xstate-tools-shared-forEachEntity.esm.js"
+}
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -13,14 +13,14 @@
       "import": "./dist/xstate-tools-shared.cjs.mjs",
       "default": "./dist/xstate-tools-shared.cjs.js"
     },
-    "./forEachAction": {
+    "./forEachEntity": {
       "types": {
-        "import": "./forEachAction/dist/xstate-tools-shared-forEachAction.cjs.mjs",
-        "default": "./forEachAction/dist/xstate-tools-shared-forEachAction.cjs.js"
+        "import": "./forEachEntity/dist/xstate-tools-shared-forEachEntity.cjs.mjs",
+        "default": "./forEachEntity/dist/xstate-tools-shared-forEachEntity.cjs.js"
       },
-      "module": "./forEachAction/dist/xstate-tools-shared-forEachAction.esm.js",
-      "import": "./forEachAction/dist/xstate-tools-shared-forEachAction.cjs.mjs",
-      "default": "./forEachAction/dist/xstate-tools-shared-forEachAction.cjs.js"
+      "module": "./forEachEntity/dist/xstate-tools-shared-forEachEntity.esm.js",
+      "import": "./forEachEntity/dist/xstate-tools-shared-forEachEntity.cjs.mjs",
+      "default": "./forEachEntity/dist/xstate-tools-shared-forEachEntity.cjs.js"
     },
     "./package.json": "./package.json"
   },
@@ -48,7 +48,7 @@
   "preconstruct": {
     "entrypoints": [
       "./index.ts",
-      "./forEachAction.ts"
+      "./forEachEntity.ts"
     ]
   }
 }