@empiricalrun/test-gen 0.22.9 → 0.22.11

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @empiricalrun/test-gen
 
+## 0.22.11
+
+### Patch Changes
+
+- 6771494: fix: handle dollar sign in generated code
+
+## 0.22.10
+
+### Patch Changes
+
+- 5c43cd8: feat: support master agent to edit tests inside a describe block
+
 ## 0.22.9
 
 ### 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;AAUvD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,MAAM,CAKhD;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,UAIvD;AAED,wBAAsB,2BAA2B,CAAC,SAAS,EAAE,aAAa,iBAuCzE;AAiBD,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,iBASxD;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,QA4BnD;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAM1E;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,oBAAoB,GACrC,OAAO,CAAC,MAAM,CAAC,CAkDjB;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;AAUvD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,MAAM,CAKhD;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,UAIvD;AAED,wBAAsB,2BAA2B,CAAC,SAAS,EAAE,aAAa,iBA+CzE;AAwCD,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,iBASxD;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,QA4BnD;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAM1E;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,oBAAoB,GACrC,OAAO,CAAC,MAAM,CAAC,CAkDjB;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

@@ -33,14 +33,14 @@ async function prepareFileForBrowsingAgent(genConfig) {
     }
     if (name && steps && steps.length) {
         const existingContents = await fs_extra_1.default.readFile(specPath, "utf-8");
-        const testBlock = (0, web_1.getTypescriptTestBlock)(name, existingContents);
+        const { testBlock, parentDescribe } = (0, web_1.getTypescriptTestBlock)(name, existingContents);
         const mergedSteps = prepareBrowsingAgentTask(steps);
         let newContents = existingContents;
         if (testBlock) {
             logger.log("appending to existing test block");
             // test scenario is already present
-            const updateTestBlock = (0, web_1.appendToTestBlock)(testBlock, createTestGenBlock(mergedSteps)).replace("test(", "test.only("); // mark the test as test.only
-            newContents = existingContents.replace(testBlock, updateTestBlock);
+            const updatedTestBlock = (0, web_1.appendToTestBlock)(testBlock, createTestGenBlock(mergedSteps));
+            newContents = newContentsWithTestOnly(existingContents, testBlock, updatedTestBlock, parentDescribe);
         }
         else {
             logger.log("creating new test block");
@@ -52,6 +52,18 @@ async function prepareFileForBrowsingAgent(genConfig) {
     }
 }
 exports.prepareFileForBrowsingAgent = prepareFileForBrowsingAgent;
+function newContentsWithTestOnly(existingContents, originalTestBlock, updatedTestBlock, parentDescribeBlock) {
+    if (!parentDescribeBlock) {
+        const testMarkedAsOnly = updatedTestBlock.replace("test(", "test.only(");
+        return existingContents.replace(originalTestBlock, testMarkedAsOnly);
+    }
+    else {
+        const updatedDescribeBlock = parentDescribeBlock.replace(originalTestBlock, updatedTestBlock);
+        // TODO: this should only happen when the describe block has "serial" execution
+        const describeMarkedAsOnly = updatedDescribeBlock.replace("test.describe(", "test.describe.only(");
+        return existingContents.replace(parentDescribeBlock, describeMarkedAsOnly);
+    }
+}
 function createTestBlockForCreateTest(name, steps) {
     return `
 test.only("${name}", async ({page}) => {

package/dist/agent/codegen/run.js

@@ -70,7 +70,7 @@ async function generateTest(testCase, file, options) {
     const [prependContent, strippedContent] = await (0, web_1.stripAndPrependImports)(response, testCase?.name);
     let updatedContent = prependContent + contents + `\n\n${strippedContent}`;
     if (isUpdate) {
-        const testBlock = (0, web_1.getTypescriptTestBlock)(testCase?.name, contents);
+        const { testBlock } = (0, web_1.getTypescriptTestBlock)(testCase?.name, contents);
         contents = contents.replace(testBlock, `\n\n${strippedContent}`);
         updatedContent = prependContent + contents;
     }

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

@@ -1,4 +1,7 @@
-export declare function getTypescriptTestBlock(scenarioName: string, content: string): string | undefined;
+export declare function getTypescriptTestBlock(scenarioName: string, content: string): {
+    testBlock: string | undefined;
+    parentDescribe: string | undefined;
+};
 export declare function appendToTestBlock(testBlock: string, content: string): string;
 export declare function validateTypescript(filePath: string): string[];
 export declare function stripAndPrependImports(content: string, testName: string): Promise<(string | undefined)[]>;
@@ -7,4 +10,5 @@ export declare function formatCode(filePath: string): Promise<void>;
 export declare function addNewImport(contents: string, modules: string[], pkg: string): string;
 export declare function removeTestOnly(filePath: string): Promise<void>;
 export declare function getFixtureImportPath(filePath: string): string;
+export declare function replaceCreateTestWithNewCode(filePath: string, contents: string, generatedCode: string): string;
 //# sourceMappingURL=index.d.ts.map

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":"AAMA,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,SAAS,CAYpB;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAG5E;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAwD7D;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,mCAOjB;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,iBAIpD;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,UAcpD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/bin/utils/platform/web/index.ts"],"names":[],"mappings":"AAMA,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;;;EAwB3E;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAG5E;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAwD7D;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,mCAUjB;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,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,UAsBtB"}

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.getFixtureImportPath = exports.removeTestOnly = exports.addNewImport = exports.formatCode = exports.lintErrors = exports.stripAndPrependImports = exports.validateTypescript = exports.appendToTestBlock = exports.getTypescriptTestBlock = void 0;
+exports.replaceCreateTestWithNewCode = exports.getFixtureImportPath = exports.removeTestOnly = exports.addNewImport = exports.formatCode = exports.lintErrors = exports.stripAndPrependImports = exports.validateTypescript = exports.appendToTestBlock = exports.getTypescriptTestBlock = void 0;
 const eslint_1 = require("eslint");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const prettier_1 = __importDefault(require("prettier"));
@@ -12,10 +12,17 @@ const typescript_1 = __importDefault(require("typescript"));
 function getTypescriptTestBlock(scenarioName, content) {
     const project = new ts_morph_1.Project();
     const sourceFile = project.createSourceFile("test.ts", content);
-    const testFunction = sourceFile.getFirstDescendant((node) => !!(node.isKind(ts_morph_1.SyntaxKind.CallExpression) &&
+    const testFunctionNode = sourceFile.getFirstDescendant((node) => !!(node.isKind(ts_morph_1.SyntaxKind.CallExpression) &&
         node.getExpression().getText() === "test" &&
         node.getArguments()[0]?.getText().includes(scenarioName)));
-    return testFunction?.getText();
+    // TODO: support files that have 2 describe blocks with the same test name in them
+    const describeBlockNode = sourceFile.getFirstDescendant((node) => !!(node.isKind(ts_morph_1.SyntaxKind.CallExpression) &&
+        node.getExpression().getText() === "test.describe" &&
+        node.getText().includes(scenarioName)));
+    return {
+        testBlock: testFunctionNode?.getText(),
+        parentDescribe: describeBlockNode?.getText(),
+    };
 }
 exports.getTypescriptTestBlock = getTypescriptTestBlock;
 function appendToTestBlock(testBlock, content) {
@@ -77,7 +84,7 @@ exports.validateTypescript = validateTypescript;
 async function stripAndPrependImports(content, testName) {
     const importRegexp = /import\s+\{[^}]*\}\s+from\s+["'][^"']+["'];?/g;
     const imports = content.match(importRegexp);
-    const strippedContent = getTypescriptTestBlock(testName, content);
+    const { testBlock: strippedContent } = getTypescriptTestBlock(testName, content);
     const prependContent = (imports?.join("\n") || "") + "\n\n";
     return [prependContent, strippedContent];
 }
@@ -109,7 +116,9 @@ function addNewImport(contents, modules, pkg) {
 exports.addNewImport = addNewImport;
 async function removeTestOnly(filePath) {
     const contents = await fs_extra_1.default.readFile(filePath, "utf8");
-    const updatedContent = contents.replace(/test\.only/, "test");
+    const updatedContent = contents
+        .replace("test.only(", "test(")
+        .replace("test.describe.only(", "test.describe(");
     return fs_extra_1.default.writeFile(filePath, updatedContent);
 }
 exports.removeTestOnly = removeTestOnly;
@@ -129,3 +138,18 @@ function getFixtureImportPath(filePath) {
     return fixturesPath;
 }
 exports.getFixtureImportPath = getFixtureImportPath;
+function replaceCreateTestWithNewCode(filePath, contents, generatedCode) {
+    const project = new ts_morph_1.Project();
+    const sourceFile = project.createSourceFile("test.ts", contents);
+    const createTestNode = sourceFile.getFirstDescendant((node) => !!(node.isKind(ts_morph_1.SyntaxKind.CallExpression) &&
+        node.getExpression().getText() === "createTest"));
+    const updatedTestFile = contents.replace(createTestNode?.getText(), function () {
+        // str.replace treats characters like $ differently
+        // Using a function helps us avoid special handling
+        // https://stackoverflow.com/a/28103073
+        return "\n" + generatedCode;
+    });
+    const importStatement = `import { test, expect } from "${getFixtureImportPath(filePath)}";`;
+    return importStatement + "\n" + updatedTestFile;
+}
+exports.replaceCreateTestWithNewCode = replaceCreateTestWithNewCode;

package/dist/file/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/file/server.ts"],"names":[],"mappings":"AAMA,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,IAAI,CAAa;gBACb,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IAGtC,WAAW,CAAC,QAAQ,EAAE,MAAM;IAGtB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;CAkC1C;AAED,wBAAsB,gBAAgB,kBAAK"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/file/server.ts"],"names":[],"mappings":"AASA,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,IAAI,CAAa;gBACb,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IAGtC,WAAW,CAAC,QAAQ,EAAE,MAAM;IAGtB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;CA8B1C;AAED,wBAAsB,gBAAgB,kBAAK"}

package/dist/file/server.js

@@ -26,9 +26,8 @@ class FileService {
                 const testFilePath = path_1.default.resolve(process.cwd(), this.filePath);
                 if (testFilePath) {
                     const testFile = fs_1.default.readFileSync(testFilePath, "utf-8");
-                    const updatedTestFile = testFile.replace(/await createTest\([\s\S]*?\);\n/, "\n" + generatedCode);
-                    const importStatement = `import { test, expect } from "${(0, web_1.getFixtureImportPath)(testFilePath)}";`;
-                    fs_1.default.writeFileSync(testFilePath, importStatement + "\n" + updatedTestFile, "utf-8");
+                    const newContents = (0, web_1.replaceCreateTestWithNewCode)(testFilePath, testFile, generatedCode);
+                    fs_1.default.writeFileSync(testFilePath, newContents, "utf-8");
                     await (0, web_1.lintErrors)(testFilePath);
                     return res.send({ success: true });
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/test-gen",
-  "version": "0.22.9",
+  "version": "0.22.11",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"