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

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @mastra/temporal
 
+## 0.1.16-alpha.2
+
+### Patch Changes
+
+- Fixed Temporal bundles to detect steps created by factory functions while preserving the factory code in generated activity modules. ([#17999](https://github.com/mastra-ai/mastra/pull/17999))
+
+- Updated dependencies [[`339c57c`](https://github.com/mastra-ai/mastra/commit/339c57c5b2c6dbe75a125e138228e0556528976f), [`1dd4117`](https://github.com/mastra-ai/mastra/commit/1dd4117dcbd8e031ede9f0489436bfbc6f0315b8), [`2b11d1f`](https://github.com/mastra-ai/mastra/commit/2b11d1f6ac7024c5dd2b2dd12a48a956ac9d63bd), [`49af8df`](https://github.com/mastra-ai/mastra/commit/49af8df589c4ff71a5015a4553b377b32704b691), [`30ce559`](https://github.com/mastra-ai/mastra/commit/30ce55902ecf819b8ab8697398dd68b108228063), [`c241b92`](https://github.com/mastra-ai/mastra/commit/c241b929dc8c8d6a7b7219c99ed13ac1f3124a77), [`7d6ff70`](https://github.com/mastra-ai/mastra/commit/7d6ff708727297a0526ca0e26e93eeb5bbaaa187)]:
+  - @mastra/core@1.44.0-alpha.2
+  - @mastra/deployer@1.44.0-alpha.2
+
+## 0.1.16-alpha.1
+
+### Patch Changes
+
+- Updated dependencies [[`b7dff0a`](https://github.com/mastra-ai/mastra/commit/b7dff0a3d1022eb6868f48dc40a2b1febd5c277f), [`02087e1`](https://github.com/mastra-ai/mastra/commit/02087e1fbc54aa07f3071f7a200df1bf5be601a8), [`ab975d4`](https://github.com/mastra-ai/mastra/commit/ab975d4dd9488752f05bda7afa03166d207e3e2a)]:
+  - @mastra/core@1.44.0-alpha.1
+  - @mastra/deployer@1.44.0-alpha.1
+
 ## 0.1.16-alpha.0
 
 ### Patch Changes

package/dist/transforms/activities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"activities.d.ts","sourceRoot":"","sources":["../../src/transforms/activities.ts"],"names":[],"mappings":"AAsBA,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mCAAmC;IAClD,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,uBAAuB,EAAE,CAAC;CAC7C;AAED,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,uBAAuB,EAAE,CAkE/G;AA6HD,wBAAsB,6BAA6B,CACjD,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,mCAAmC,CAAC,CA0T9C"}
+{"version":3,"file":"activities.d.ts","sourceRoot":"","sources":["../../src/transforms/activities.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mCAAmC;IAClD,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,uBAAuB,EAAE,CAAC;CAC7C;AAED,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,uBAAuB,EAAE,CAmE/G;AA6HD,wBAAsB,6BAA6B,CACjD,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,mCAAmC,CAAC,CAuW9C"}

package/dist/transforms/shared.d.ts

@@ -16,6 +16,9 @@ export declare function hasCreateWorkflowCall(node: t.Node): boolean;
 export declare function getStepNameFromCall(node: t.CallExpression): string | null;
 export declare function createExportedStepStatement(name: string, initializer: t.Expression): t.ExportNamedDeclaration;
 export declare function collectInlineCreateSteps(node: t.Node, seenNames: Set<string>, statements: t.Statement[], onStep?: (exportName: string, call: t.CallExpression) => void): void;
+export declare function getReturnedCreateStepCall(node: t.Node | null | undefined): t.CallExpression | null;
+export declare function collectCreateStepFactoryBindings(program: t.Program): Map<string, t.CallExpression>;
+export declare function getCreateStepCallFromExpression(node: t.Node | null | undefined, factoryBindings: Map<string, t.CallExpression>): t.CallExpression | null;
 export declare function getCreateStepId(node: t.Node | null | undefined): string | null;
 export declare function shouldCountIdentifierAsReference(parent: t.Node | null, key: string | null): boolean;
 export declare function collectRuntimeReferencedIdentifiers(node: t.Node): Set<string>;

package/dist/transforms/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/transforms/shared.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,eAAO,MAAM,aAAa,8JAShB,CAAC;AACX,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,CAUzE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAErE;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE9D;AAED,eAAO,MAAM,uBAAuB,aAA2D,CAAC;AAEhG,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,CAAC,CAAC,iBAAiB,GAAG,GAAG,CAAC,MAAM,CAAC,CAgBhF;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO,CAW5E;AAED,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,CAAC,CAAC,kBAAkB,GAAG,OAAO,CAYtF;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,cAAc,CAE3E;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,cAAc,CAEvE;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,YAAY,GAAG,MAAM,GAAG,IAAI,CAchG;AAED,wBAAgB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,IAAI,GAAG,SAAS,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,KAAK,KAAK,GAAG,IAAI,GAAG,IAAI,CA2BnG;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,OAAO,CAW3D;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,cAAc,GAAG,MAAM,GAAG,IAAI,CAUzE;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,sBAAsB,CAI7G;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,CAAC,CAAC,IAAI,EACZ,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,EACtB,UAAU,EAAE,CAAC,CAAC,SAAS,EAAE,EACzB,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,cAAc,KAAK,IAAI,GAC5D,IAAI,CAgBN;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAwB9E;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CA+DnG;AAED,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAsC7E;AAED,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,CAAC,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,SAAS,EAAE,CA4IpF"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/transforms/shared.ts"],"names":[],"mappings":"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"}

package/dist/transforms/workflows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflows.d.ts","sourceRoot":"","sources":["../../src/transforms/workflows.ts"],"names":[],"mappings":"AAsYA,MAAM,WAAW,4BAA4B;CAE5C;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,iCAAiC;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,sBAAsB,EAAE,CAAC;CACrC;AAiUD;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAwCjC"}
+{"version":3,"file":"workflows.d.ts","sourceRoot":"","sources":["../../src/transforms/workflows.ts"],"names":[],"mappings":"AAqZA,MAAM,WAAW,4BAA4B;CAE5C;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,iCAAiC;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,sBAAsB,EAAE,CAAC;CACrC;AAiUD;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAwCjC"}

package/dist/worker.cjs

@@ -172,6 +172,70 @@ function collectInlineCreateSteps(node, seenNames, statements, onStep) {
     return false;
   });
 }
+function getReturnedCreateStepCall(node) {
+  if (!node) {
+    return null;
+  }
+  if (t3__namespace.isArrowFunctionExpression(node) && !t3__namespace.isBlockStatement(node.body)) {
+    return t3__namespace.isCallExpression(node.body) && isIdentifierNamed(node.body.callee, "createStep") ? node.body : null;
+  }
+  if (!t3__namespace.isFunctionDeclaration(node) && !t3__namespace.isFunctionExpression(node) && !t3__namespace.isArrowFunctionExpression(node)) {
+    return null;
+  }
+  if (!t3__namespace.isBlockStatement(node.body)) {
+    return null;
+  }
+  for (const statement of node.body.body) {
+    if (t3__namespace.isReturnStatement(statement) && t3__namespace.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__namespace.isExportNamedDeclaration(statement) ? statement.declaration : statement;
+    if (t3__namespace.isFunctionDeclaration(declaration) && declaration.id) {
+      const createStepCall = getReturnedCreateStepCall(declaration);
+      if (createStepCall) {
+        factories.set(declaration.id.name, createStepCall);
+      }
+      continue;
+    }
+    if (!t3__namespace.isVariableDeclaration(declaration)) {
+      continue;
+    }
+    for (const declarator of declaration.declarations) {
+      if (!t3__namespace.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__namespace.isCallExpression(node)) {
+    if (isIdentifierNamed(node.callee, "createStep")) {
+      return node;
+    }
+    if (t3__namespace.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;
@@ -496,6 +560,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;
@@ -561,11 +626,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__namespace.isCallExpression(declaration.init) && t3__namespace.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__namespace.exportNamedDeclaration(t3__namespace.variableDeclaration(statement.kind, [t3__namespace.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);
@@ -602,11 +679,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__namespace.isCallExpression(declaration.init) && t3__namespace.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);
@@ -649,6 +736,11 @@ async function buildTemporalActivitiesModule(entryFile, outputDirectory, outputF
               continue;
             }
             if (t3__namespace.isExportNamedDeclaration(statement)) {
+              if (t3__namespace.isFunctionDeclaration(statement.declaration) || t3__namespace.isClassDeclaration(statement.declaration) || t3__namespace.isTSTypeAliasDeclaration(statement.declaration) || t3__namespace.isTSInterfaceDeclaration(statement.declaration) || t3__namespace.isTSEnumDeclaration(statement.declaration)) {
+                ensureHelperInserted();
+                statements.push(statement);
+                continue;
+              }
               if (statement.declaration == null && statement.source == null) {
                 const retainedSpecifiers = statement.specifiers.filter(
                   (specifier) => t3__namespace.isExportSpecifier(specifier) && t3__namespace.isIdentifier(specifier.local) && specifier.local.name !== "mastra" && !workflowBindingNames.has(specifier.local.name) && !seenNames.has(specifier.local.name)
@@ -773,6 +865,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__namespace.isVariableDeclaration(statement) && !(t3__namespace.isExportNamedDeclaration(statement) && t3__namespace.isVariableDeclaration(statement.declaration))) {
       continue;
@@ -782,7 +881,8 @@ function collectStepBindings(program3) {
       if (!t3__namespace.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);
       }
@@ -822,6 +922,9 @@ function getWorkflowStepName(node, stepBindings) {
   if (t3__namespace.isStringLiteral(node)) {
     return node.value;
   }
+  if (t3__namespace.isCallExpression(node) && t3__namespace.isIdentifier(node.callee)) {
+    return stepBindings.get(node.callee.name) ?? getCreateStepId(node);
+  }
   return getCreateStepId(node);
 }
 function rewriteChainMethod(method, filePath, workflowName, stepBindings, workflowBindings) {