@mastra/temporal 0.1.16-alpha.1 → 0.1.16-alpha.2

package/dist/worker.js

@@ -146,6 +146,70 @@ function collectInlineCreateSteps(node, seenNames, statements, onStep) {
     return false;
   });
 }
+function getReturnedCreateStepCall(node) {
+  if (!node) {
+    return null;
+  }
+  if (t3.isArrowFunctionExpression(node) && !t3.isBlockStatement(node.body)) {
+    return t3.isCallExpression(node.body) && isIdentifierNamed(node.body.callee, "createStep") ? node.body : null;
+  }
+  if (!t3.isFunctionDeclaration(node) && !t3.isFunctionExpression(node) && !t3.isArrowFunctionExpression(node)) {
+    return null;
+  }
+  if (!t3.isBlockStatement(node.body)) {
+    return null;
+  }
+  for (const statement of node.body.body) {
+    if (t3.isReturnStatement(statement) && t3.isCallExpression(statement.argument) && isIdentifierNamed(statement.argument.callee, "createStep")) {
+      return statement.argument;
+    }
+  }
+  return null;
+}
+function collectCreateStepFactoryBindings(program3) {
+  const factories = /* @__PURE__ */ new Map();
+  for (const statement of program3.body) {
+    const declaration = t3.isExportNamedDeclaration(statement) ? statement.declaration : statement;
+    if (t3.isFunctionDeclaration(declaration) && declaration.id) {
+      const createStepCall = getReturnedCreateStepCall(declaration);
+      if (createStepCall) {
+        factories.set(declaration.id.name, createStepCall);
+      }
+      continue;
+    }
+    if (!t3.isVariableDeclaration(declaration)) {
+      continue;
+    }
+    for (const declarator of declaration.declarations) {
+      if (!t3.isIdentifier(declarator.id) || !declarator.init) {
+        continue;
+      }
+      const createStepCall = getReturnedCreateStepCall(declarator.init);
+      if (createStepCall) {
+        factories.set(declarator.id.name, createStepCall);
+      }
+    }
+  }
+  return factories;
+}
+function getCreateStepCallFromExpression(node, factoryBindings) {
+  if (!node) {
+    return null;
+  }
+  if (t3.isCallExpression(node)) {
+    if (isIdentifierNamed(node.callee, "createStep")) {
+      return node;
+    }
+    if (t3.isIdentifier(node.callee)) {
+      return factoryBindings.get(node.callee.name) ?? null;
+    }
+  }
+  const returnedCreateStepCall = getReturnedCreateStepCall(node);
+  if (returnedCreateStepCall) {
+    return returnedCreateStepCall;
+  }
+  return null;
+}
 function getCreateStepId(node) {
   if (!node || !isCreateStepCall(node)) {
     return null;
@@ -470,6 +534,7 @@ async function buildTemporalActivitiesModule(entryFile, outputDirectory, outputF
           const seenNames = /* @__PURE__ */ new Set();
           const strippedNames = /* @__PURE__ */ new Set();
           const workflowBindingNames = collectWorkflowBindingNames(ast);
+          const stepFactoryBindings = collectCreateStepFactoryBindings(ast.program);
           const sourceFilePath = id;
           const hasMastraBinding = hasLocalMastraBinding(ast);
           let helperInserted = false;
@@ -535,11 +600,23 @@ async function buildTemporalActivitiesModule(entryFile, outputDirectory, outputF
                   declarations.push(createPreservedDeclaration(declaration, strippedNames));
                   continue;
                 }
-                if (isCreateStepCall(declaration.init)) {
-                  seenNames.add(declaration.id.name);
-                  addActivityBinding(declaration.id.name, declaration.init);
-                  statements.push(createExportedStepStatement(declaration.id.name, declaration.init));
-                  continue;
+                const createStepCall = getCreateStepCallFromExpression(declaration.init, stepFactoryBindings);
+                if (createStepCall) {
+                  const isFactoryCall = t3.isCallExpression(declaration.init) && t3.isIdentifier(declaration.init.callee) && stepFactoryBindings.has(declaration.init.callee.name);
+                  if (isFactoryCall) {
+                    seenNames.add(declaration.id.name);
+                    addActivityBinding(declaration.id.name, createStepCall);
+                    statements.push(
+                      t3.exportNamedDeclaration(t3.variableDeclaration(statement.kind, [t3.cloneNode(declaration, true)]))
+                    );
+                    continue;
+                  }
+                  if (isCreateStepCall(declaration.init)) {
+                    seenNames.add(declaration.id.name);
+                    addActivityBinding(declaration.id.name, createStepCall);
+                    statements.push(createExportedStepStatement(declaration.id.name, createStepCall));
+                    continue;
+                  }
                 }
                 if (hasCreateWorkflowCall(declaration.init)) {
                   workflowBindingNames.add(declaration.id.name);
@@ -576,11 +653,21 @@ async function buildTemporalActivitiesModule(entryFile, outputDirectory, outputF
                   exportedDeclarations.push(createPreservedDeclaration(declaration, strippedNames));
                   continue;
                 }
-                if (isCreateStepCall(declaration.init)) {
-                  seenNames.add(declaration.id.name);
-                  addActivityBinding(declaration.id.name, declaration.init);
-                  statements.push(createExportedStepStatement(declaration.id.name, declaration.init));
-                  continue;
+                const createStepCall = getCreateStepCallFromExpression(declaration.init, stepFactoryBindings);
+                if (createStepCall) {
+                  const isFactoryCall = t3.isCallExpression(declaration.init) && t3.isIdentifier(declaration.init.callee) && stepFactoryBindings.has(declaration.init.callee.name);
+                  if (isFactoryCall) {
+                    seenNames.add(declaration.id.name);
+                    addActivityBinding(declaration.id.name, createStepCall);
+                    exportedDeclarations.push(createPreservedDeclaration(declaration, strippedNames));
+                    continue;
+                  }
+                  if (isCreateStepCall(declaration.init)) {
+                    seenNames.add(declaration.id.name);
+                    addActivityBinding(declaration.id.name, createStepCall);
+                    statements.push(createExportedStepStatement(declaration.id.name, createStepCall));
+                    continue;
+                  }
                 }
                 if (hasCreateWorkflowCall(declaration.init)) {
                   workflowBindingNames.add(declaration.id.name);
@@ -623,6 +710,11 @@ async function buildTemporalActivitiesModule(entryFile, outputDirectory, outputF
               continue;
             }
             if (t3.isExportNamedDeclaration(statement)) {
+              if (t3.isFunctionDeclaration(statement.declaration) || t3.isClassDeclaration(statement.declaration) || t3.isTSTypeAliasDeclaration(statement.declaration) || t3.isTSInterfaceDeclaration(statement.declaration) || t3.isTSEnumDeclaration(statement.declaration)) {
+                ensureHelperInserted();
+                statements.push(statement);
+                continue;
+              }
               if (statement.declaration == null && statement.source == null) {
                 const retainedSpecifiers = statement.specifiers.filter(
                   (specifier) => t3.isExportSpecifier(specifier) && t3.isIdentifier(specifier.local) && specifier.local.name !== "mastra" && !workflowBindingNames.has(specifier.local.name) && !seenNames.has(specifier.local.name)
@@ -747,6 +839,13 @@ function parseWorkflowChain(node) {
 }
 function collectStepBindings(program3) {
   const stepBindings = /* @__PURE__ */ new Map();
+  const stepFactoryBindings = collectCreateStepFactoryBindings(program3);
+  for (const [factoryName, createStepCall] of stepFactoryBindings) {
+    const stepId = getCreateStepId(createStepCall);
+    if (stepId) {
+      stepBindings.set(factoryName, stepId);
+    }
+  }
   for (const statement of program3.body) {
     if (!t3.isVariableDeclaration(statement) && !(t3.isExportNamedDeclaration(statement) && t3.isVariableDeclaration(statement.declaration))) {
       continue;
@@ -756,7 +855,8 @@ function collectStepBindings(program3) {
       if (!t3.isIdentifier(declaration.id) || !declaration.init) {
         continue;
       }
-      const stepId = getCreateStepId(declaration.init);
+      const createStepCall = getCreateStepCallFromExpression(declaration.init, stepFactoryBindings);
+      const stepId = getCreateStepId(createStepCall);
       if (stepId) {
         stepBindings.set(declaration.id.name, stepId);
       }
@@ -796,6 +896,9 @@ function getWorkflowStepName(node, stepBindings) {
   if (t3.isStringLiteral(node)) {
     return node.value;
   }
+  if (t3.isCallExpression(node) && t3.isIdentifier(node.callee)) {
+    return stepBindings.get(node.callee.name) ?? getCreateStepId(node);
+  }
   return getCreateStepId(node);
 }
 function rewriteChainMethod(method, filePath, workflowName, stepBindings, workflowBindings) {