@empiricalrun/test-gen 0.30.4 → 0.31.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @empiricalrun/test-gen
 
+## 0.31.1
+
+### Patch Changes
+
+- Updated dependencies [f317919]
+  - @empiricalrun/r2-uploader@0.3.2
+
+## 0.31.0
+
+### Minor Changes
+
+- fd3af1f: feat: add support for test file marked serial
+
+### Patch Changes
+
+- 6521cb0: fix: add support for method declaration
+
 ## 0.30.4
 
 ### Patch Changes

package/dist/agent/browsing/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/agent/browsing/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAYvD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAK5C,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,MAAM,CAKhD;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,UAIvD;AAsDD;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,aAAa,GACvB,OAAO,CAAC,MAAM,CAAC,CA2CjB;AAyBD,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,iBAiBxD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,QA6BjD;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAM1E;AAWD;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,oBAAoB,GACrC,OAAO,CAAC,MAAM,CAAC,CA8CjB;AAED,wBAAsB,sBAAsB,CAAC,EAC3C,YAAiB,EACjB,IAAS,EACT,eAAoB,EACpB,gBAAqB,EACrB,UAAyC,GAC1C,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,8EASA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/agent/browsing/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAavD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAK5C,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,MAAM,CAKhD;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,UAIvD;AA0DD;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,aAAa,GACvB,OAAO,CAAC,MAAM,CAAC,CA2CjB;AAyBD,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,iBAiBxD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,QA6BjD;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAM1E;AAWD;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,oBAAoB,GACrC,OAAO,CAAC,MAAM,CAAC,CA8CjB;AAED,wBAAsB,sBAAsB,CAAC,EAC3C,YAAiB,EACjB,IAAS,EACT,eAAoB,EACpB,gBAAqB,EACrB,UAAyC,GAC1C,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,8EASA"}

package/dist/agent/browsing/utils.js

@@ -60,9 +60,12 @@ async function prepareFileForUpdateScenario(genConfig) {
         content: testFileContent,
     });
     const parentDescribe = (0, web_1.findFirstSerialDescribeBlock)(testNode);
+    const isFileMarkedSerial = await (0, web_1.hasTopLevelDescribeConfigureWithSerialMode)(specPath);
     // add test.only / describe.only to the spec file so that only that block is executed
-    const updatedTestFileContent = newContentsWithTestOnly(testFileContent, testBlock, testBlock, parentDescribe?.getText() || "");
-    await fs_extra_1.default.writeFile(specPath, updatedTestFileContent);
+    if (!isFileMarkedSerial) {
+        const updatedTestFileContent = newContentsWithTestOnly(testFileContent, testBlock, testBlock, parentDescribe?.getText() || "");
+        await fs_extra_1.default.writeFile(specPath, updatedTestFileContent);
+    }
 }
 /**
  * Function to prepare test file for master agent to run

package/dist/agent/codegen/update-flow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-flow.d.ts","sourceRoot":"","sources":["../../../src/agent/codegen/update-flow.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAmB3B,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAI7D,KAAK,eAAe,GAAG,QAAQ,GAAG;IAChC,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAkHF,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,oBAAoB,GAAG,SAAS,EACzC,OAAO,GAAE,OAAc,EACvB,QAAQ,GAAE,OAAc,GACvB,OAAO,CAAC,eAAe,EAAE,CAAC,CAuF5B;AAED,wBAAsB,qBAAqB,CAAC,EAC1C,QAAQ,EACR,IAAI,EACJ,OAAO,EACP,KAAK,EACL,aAAoB,GACrB,EAAE;IACD,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,oBAAoB,CAAC;IAC/B,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAiE7B"}
+{"version":3,"file":"update-flow.d.ts","sourceRoot":"","sources":["../../../src/agent/codegen/update-flow.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAoB3B,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAI7D,KAAK,eAAe,GAAG,QAAQ,GAAG;IAChC,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAqIF,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,oBAAoB,GAAG,SAAS,EACzC,OAAO,GAAE,OAAc,EACvB,QAAQ,GAAE,OAAc,GACvB,OAAO,CAAC,eAAe,EAAE,CAAC,CAuF5B;AAED,wBAAsB,qBAAqB,CAAC,EAC1C,QAAQ,EACR,IAAI,EACJ,OAAO,EACP,KAAK,EACL,aAAoB,GACrB,EAAE;IACD,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,oBAAoB,CAAC;IAC/B,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAwE7B"}

package/dist/agent/codegen/update-flow.js

@@ -10,6 +10,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const ts_morph_1 = require("ts-morph");
 const logger_1 = require("../../bin/logger");
 const context_1 = require("../../bin/utils/context");
+const fs_1 = require("../../bin/utils/fs");
 const web_1 = require("../../bin/utils/platform/web");
 const constants_1 = require("../../constants");
 const session_1 = require("../../session");
@@ -48,16 +49,33 @@ async function applyFileChanges({ validateTypes = true, trace, testCase, fileCha
             const project = new ts_morph_1.Project();
             const sourceFile = project.createSourceFile("updated-code.ts", fileChange.newCode);
             const functions = sourceFile.getFunctions();
-            // if there is a single method update in the file
+            const checkForMethodSrc = project.createSourceFile("check-method.ts", `class A {
+            ${fileChange.newCode}
+          }`);
+            const methods = checkForMethodSrc.getDescendantsOfKind(ts_morph_1.SyntaxKind.MethodDeclaration);
+            const originalSource = project.createSourceFile("current-code.ts", contents);
+            // if there is a single function update in the file
             if (functions.length === 1 &&
                 functions[0]?.getText() === fileChange.newCode) {
                 const updatedCodeFuncNames = functions.map((f) => f.getName());
                 const funcName = updatedCodeFuncNames[0];
-                const originalSource = project.createSourceFile("current-code.ts", contents);
                 const matchingNodes = originalSource
                     .getDescendantsOfKind(ts_morph_1.SyntaxKind.FunctionDeclaration)
                     .filter((node) => node.getName() === funcName);
-                contents = contents.replace(matchingNodes[0].getText(), functions[0]?.getText());
+                matchingNodes[0]?.replaceWithText(functions[0]?.getText());
+                contents = originalSource.getFullText();
+            }
+            else if (
+            // if there is a update in method of a class in the file
+            methods.length === 1 &&
+                methods[0]?.getText() === fileChange.newCode) {
+                const method = methods[0];
+                const funcName = method?.getName();
+                const matchingNodes = originalSource
+                    .getDescendantsOfKind(ts_morph_1.SyntaxKind.MethodDeclaration)
+                    .filter((node) => node.getName() === funcName);
+                matchingNodes[0]?.replaceWithText(method?.getText());
+                contents = originalSource.getFullText();
             }
             else {
                 // since we dont know what is getting updated,
@@ -171,6 +189,13 @@ async function appendCreateTestBlock({ testCase, file, options, trace, validateT
     const logger = new logger_1.CustomLogger({ useReporter: false });
     logger.log("Appending create test block");
     const context = await (0, context_1.contextForGeneration)(file);
+    const scenarioFileContent = await fs_extra_1.default.readFile(file, "utf-8");
+    const testCodePrompt = (0, fs_1.convertFileContentsToString)([
+        {
+            filePath: file,
+            content: scenarioFileContent,
+        },
+    ]);
     const { codePrompt, pomPrompt } = context;
     const generatedTestCases = [];
     // TODO: move this to a common place
@@ -191,7 +216,7 @@ async function appendCreateTestBlock({ testCase, file, options, trace, validateT
         name: "append-create-test-block-prompt",
     });
     const instruction = await (0, llm_1.getPrompt)(promptName, {
-        testFiles: codePrompt,
+        testFiles: testCodePrompt,
         pageFiles: pomPrompt,
         scenarioName: testCase.name,
         scenarioSteps: testCase.steps.join("\n"),

package/dist/bin/index.js

@@ -63,12 +63,14 @@ async function runAgent(testGenConfig) {
         sessionId: testGenConfig.options?.metadata.testSessionId,
         generationId: testGenConfig.options?.metadata.generationId,
     });
+    let testGenFailed = false;
     try {
         // download the build if it exists
         await (0, test_build_1.downloadBuild)(testGenConfig.build || {});
         await runAgent(testGenConfig);
     }
     catch (e) {
+        testGenFailed = true;
         logger.error("Failed to run agent for the scenario", e);
     }
     // TODO: move these reporters to a better lifecycle
@@ -76,5 +78,10 @@ async function runAgent(testGenConfig) {
     await (0, llm_1.flushAllTraces)();
     await (0, logger_1.waitForLogsToFlush)();
     await (0, session_1.endSession)();
-    process.exit(0);
+    if (testGenFailed) {
+        process.exit(1);
+    }
+    else {
+        process.exit(0);
+    }
 })();

package/dist/bin/utils/platform/web/index.d.ts

@@ -14,6 +14,7 @@ export declare function getTypescriptTestBlock({ scenarioName, suites, content,
     testBlock: string | undefined;
     testNode: Node | undefined;
 };
+export declare function hasTopLevelDescribeConfigureWithSerialMode(filePath: string): Promise<boolean>;
 /**
  * Function to find the first 'describe' block configured with 'serial: true'
  *

package/dist/bin/utils/platform/web/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/bin/utils/platform/web/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,IAAI,EAIL,MAAM,UAAU,CAAC;AAGlB;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,YAAY,EACZ,MAAM,EACN,OAAO,GACR,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG;IACF,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,QAAQ,EAAE,IAAI,GAAG,SAAS,CAAC;CAC5B,CAuCA;AAwBD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,GAAG,SAAS,GACrB,IAAI,GAAG,SAAS,CA4BlB;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAG5E;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CA8C7D;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,mCAWjB;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,iBAShD;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,iBAQhD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,UAE5E;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,iBAMpD;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,UAcpD;AAED,wBAAsB,iCAAiC,CAAC,QAAQ,EAAE,MAAM,+BAmBvE;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,UA0CtB;AAED,eAAO,MAAM,6BAA6B;qBAKvB,MAAM;iBACV,MAAM;YACX,MAAM,EAAE;YA2DjB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/bin/utils/platform/web/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,IAAI,EAIL,MAAM,UAAU,CAAC;AAGlB;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,YAAY,EACZ,MAAM,EACN,OAAO,GACR,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG;IACF,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,QAAQ,EAAE,IAAI,GAAG,SAAS,CAAC;CAC5B,CAuCA;AAwBD,wBAAsB,0CAA0C,CAC9D,QAAQ,EAAE,MAAM,oBA+BjB;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,GAAG,SAAS,GACrB,IAAI,GAAG,SAAS,CA4BlB;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAG5E;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CA8C7D;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,mCAWjB;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,iBAShD;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,iBAQhD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,UAE5E;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,iBAMpD;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,UAcpD;AAED,wBAAsB,iCAAiC,CAAC,QAAQ,EAAE,MAAM,+BAmBvE;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,UA0CtB;AAED,eAAO,MAAM,6BAA6B;qBAKvB,MAAM;iBACV,MAAM;YACX,MAAM,EAAE;YA2DjB,CAAC"}

package/dist/bin/utils/platform/web/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectCodeSnippetBySuiteChain = exports.replaceCreateTestWithNewCode = exports.getPageVariableNameFromCreateTest = exports.getFixtureImportPath = exports.removeTestOnly = exports.addNewImport = exports.formatCode = exports.lintErrors = exports.stripAndPrependImports = exports.validateTypescript = exports.appendToTestBlock = exports.findFirstSerialDescribeBlock = exports.getTypescriptTestBlock = void 0;
+exports.injectCodeSnippetBySuiteChain = exports.replaceCreateTestWithNewCode = exports.getPageVariableNameFromCreateTest = exports.getFixtureImportPath = exports.removeTestOnly = exports.addNewImport = exports.formatCode = exports.lintErrors = exports.stripAndPrependImports = exports.validateTypescript = exports.appendToTestBlock = exports.findFirstSerialDescribeBlock = exports.hasTopLevelDescribeConfigureWithSerialMode = exports.getTypescriptTestBlock = void 0;
 const eslint_1 = require("eslint");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_isequal_1 = __importDefault(require("lodash.isequal"));
@@ -73,6 +73,34 @@ function getParentDescribeNames(node) {
     }
     return names.reverse(); // Reverse to get from outermost to innermost
 }
+async function hasTopLevelDescribeConfigureWithSerialMode(filePath) {
+    const project = new ts_morph_1.Project();
+    const content = await fs_extra_1.default.readFile(filePath, "utf-8");
+    const sourceFile = project.createSourceFile("test.ts", content);
+    const statements = sourceFile.getStatements();
+    for (const statement of statements) {
+        // Check if the statement is an expression statement
+        if (statement.getKind() === ts_morph_1.SyntaxKind.ExpressionStatement) {
+            const expression = statement.getFirstChildByKind(ts_morph_1.SyntaxKind.CallExpression);
+            if (expression) {
+                const expressionText = expression.getExpression().getText();
+                // Check if it's `test.describe.configure`
+                if (expressionText === "test.describe.configure") {
+                    // Check if arguments exist and if the first argument is an object literal with mode serial
+                    const args = expression.getArguments();
+                    const firstArgText = args[0]?.getText();
+                    if (firstArgText &&
+                        firstArgText.includes("serial") &&
+                        firstArgText.includes("mode")) {
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+    return false;
+}
+exports.hasTopLevelDescribeConfigureWithSerialMode = hasTopLevelDescribeConfigureWithSerialMode;
 /**
  * Function to find the first 'describe' block configured with 'serial: true'
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/test-gen",
-  "version": "0.30.4",
+  "version": "0.31.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -45,7 +45,7 @@
     "tsx": "^4.16.2",
     "typescript": "^5.3.3",
     "@empiricalrun/llm": "^0.9.2",
-    "@empiricalrun/r2-uploader": "^0.3.1",
+    "@empiricalrun/r2-uploader": "^0.3.2",
     "@empiricalrun/reporter": "^0.20.0"
   },
   "devDependencies": {