@empiricalrun/test-gen 0.38.10 → 0.38.13

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @empiricalrun/test-gen
 
+## 0.38.13
+
+### Patch Changes
+
+- babf00a: fix: updated check for instance element
+
+## 0.38.12
+
+### Patch Changes
+
+- 3739ba6: fix: userContext not getting imported in case of edit test
+- 368a859: fix: skill wasn't used in case task didn't contain next action details
+- 3d0185e: fix: reduce payload for fix ts error call
+
+## 0.38.11
+
+### Patch Changes
+
+- fb4c866: fix: parent and child elements getting highlighted
+
 ## 0.38.10
 
 ### Patch Changes

package/browser-injected-scripts/annotate-elements.js

@@ -103,8 +103,8 @@ function annotateClickableElements(options = {}) {
   }
 
   // Check if an element is clickable
-  function isElementClickable(element) {
-    // if (!(element instanceof Element)) return false;
+  function isElementClickable(element, windowToAnnotate) {
+    if (!(element instanceof windowToAnnotate.Element)) return false;
 
     const tagName = element.tagName.toLowerCase();
     let isClickable = false;
@@ -157,10 +157,27 @@ function annotateClickableElements(options = {}) {
       isClickable = true;
     }
 
+    // Tag-specific clickability
+    const focusableTags = [
+      "a",
+      "button",
+      "input",
+      "select",
+      "textarea",
+      "object",
+      "embed",
+      "label",
+      "details",
+    ];
+
     // Check for onclick attribute or listener
     if (
-      element.hasAttribute("onclick") ||
-      typeof element.onclick === "function"
+      (element.hasAttribute("onclick") ||
+      typeof element.onclick === "function") 
+      // check for parent element having same on click
+      && element.parentNode.onclick !== element.onclick
+      // parent element should not be a focusable tag like button
+      && focusableTags.indexOf(element.parentNode.tagName.toLowerCase()) === -1
     ) {
       isClickable = true;
     }
@@ -210,18 +227,7 @@ function annotateClickableElements(options = {}) {
       }
     }
 
-    // Tag-specific clickability
-    const focusableTags = [
-      "a",
-      "button",
-      "input",
-      "select",
-      "textarea",
-      "object",
-      "embed",
-      "label",
-      "details",
-    ];
+    
     if (focusableTags.includes(tagName)) {
       switch (tagName) {
         case "a":
@@ -374,7 +380,7 @@ function annotateClickableElements(options = {}) {
   
     // Filter for clickable elements
     const clickableElements = Array.from(windowToAnnotate.document.querySelectorAll("*")).filter((el) => {
-      const isClickable = isElementClickable(el);
+      const isClickable = isElementClickable(el, windowToAnnotate);
       const isClickNotBlocked = isElementClickNotBlocked(el, windowToAnnotate);
       return isClickable && isClickNotBlocked;
     });  

package/dist/actions/skill.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skill.d.ts","sourceRoot":"","sources":["../../src/actions/skill.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAGrD,eAAO,MAAM,WAAW,gBAAgB,CAAC;AAEzC,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,cAAM,cAAc;IACN,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,KAAK,EAAE;IAEnC,kBAAkB;IAIlB,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE;CAG7B;AAED,eAAO,MAAM,cAAc,gBAAyB,CAAC;AAErD,eAAO,MAAM,oBAAoB,EAAE,yBA8GlC,CAAC"}
+{"version":3,"file":"skill.d.ts","sourceRoot":"","sources":["../../src/actions/skill.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAGrD,eAAO,MAAM,WAAW,gBAAgB,CAAC;AAEzC,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,cAAM,cAAc;IACN,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,KAAK,EAAE;IAEnC,kBAAkB;IAIlB,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE;CAG7B;AAED,eAAO,MAAM,cAAc,gBAAyB,CAAC;AAErD,eAAO,MAAM,oBAAoB,EAAE,yBAmHlC,CAAC"}

package/dist/actions/skill.js

@@ -27,7 +27,7 @@ const skillActionGenerator = (page, options) => {
     const availableSkills = exports.testCaseSkills.getAvailableSkills();
     return {
         execute: async ({ args, trace }) => {
-            const skill = args.skill;
+            const { skill, action } = args;
             const [skillDetails] = availableSkills.filter((skillDetails) => skillDetails.testStep === skill);
             if (!skillDetails) {
                 throw new Error(`No skill found for skill: ${skill}`);
@@ -39,7 +39,7 @@ const skillActionGenerator = (page, options) => {
             const skillFile = await promises_1.default.readFile(skillFilePath, "utf-8");
             const imports = Object.keys(module);
             const code = await (0, use_skill_1.generateSkillUsageCode)({
-                task: skillDetails.testStep,
+                task: action,
                 sampleUsageMethod: skillDetails.usageExample,
                 scopeVariablesMapStr: JSON.stringify(options.stateVariables || {}, null, 2),
                 pageVariableName: (0, utils_1.getPageVarName)(),
@@ -97,7 +97,11 @@ const skillActionGenerator = (page, options) => {
                     properties: {
                         reason: {
                             type: "string",
-                            description: "explain how this action will help to complete the task. the reason should align with the task provided",
+                            description: "Explain how this action will help to complete the task. The reason should align with the task provided",
+                        },
+                        action: {
+                            type: "string",
+                            description: "Explain the action for which this skill needs to be used. Mention all details about the action so that it could be used by the skill",
                         },
                         skill: {
                             type: "string",
@@ -107,7 +111,7 @@ const skillActionGenerator = (page, options) => {
                                 .join(", ")}`,
                         },
                     },
-                    required: ["reason", "skill"],
+                    required: ["reason", "action", "skill"],
                 },
             },
         },

package/dist/agent/browsing/utils.js

@@ -79,12 +79,12 @@ async function prepareFileForUpdateScenario(genConfig, trace) {
     });
     await fs_extra_1.default.writeFile(createTestFilePath, (0, web_1.addNewImport)(await fs_extra_1.default.readFile(createTestFilePath, "utf-8"), ["createTest"], "@empiricalrun/test-gen"));
     updateFileSpan?.end();
-    const { codePrompt, pomPrompt } = await (0, context_1.contextForGeneration)(createTestFilePath);
+    const { pomPrompt, nonSpecFilePrompt } = await (0, context_1.contextForGeneration)(createTestFilePath);
     await (0, fix_ts_errors_1.validateAndFixTypescriptErrors)({
         trace,
         file: createTestFilePath,
-        testCode: codePrompt,
         pomCode: pomPrompt,
+        nonSpecFileCode: nonSpecFilePrompt,
         testCase: testCase,
         options: genConfig.options,
     });
@@ -196,7 +196,7 @@ async function injectPwLocatorGenerator(page) {
                         });
                     }
                     catch (e) {
-                        console.warn("Error injecting script in iframe:", e);
+                        console.warn("Error injecting script in iframe.");
                     }
                 };
                 const iframes = document.getElementsByTagName("iframe");
@@ -235,7 +235,7 @@ async function injectPwLocatorGenerator(page) {
                     });
                 }
                 catch (e) {
-                    console.warn("Error injecting script in iframe:", e);
+                    console.warn("Error injecting script in iframe:");
                 }
             };
             const iframes = document.getElementsByTagName("iframe");
@@ -254,7 +254,7 @@ async function injectPwLocatorGenerator(page) {
         });
     }
     catch (e) {
-        console.warn("Error injecting script in iframe:", e);
+        console.warn("Error injecting script in iframe:");
     }
 }
 exports.injectPwLocatorGenerator = injectPwLocatorGenerator;

package/dist/agent/codegen/fix-ts-errors.d.ts

@@ -1,12 +1,12 @@
 import { TraceClient } from "@empiricalrun/llm";
 import { CustomLogger } from "../../bin/logger";
 import { TestCase, TestGenConfigOptions } from "../../types";
-export declare function validateAndFixTypescriptErrors({ trace, logger, file, testCode, pomCode, testCase, options, }: {
+export declare function validateAndFixTypescriptErrors({ trace, logger, file, pomCode, nonSpecFileCode, testCase, options, }: {
     trace?: TraceClient;
     logger?: CustomLogger;
     file: string;
-    testCode: string;
     pomCode: string;
+    nonSpecFileCode: string;
     testCase: TestCase;
     options?: TestGenConfigOptions;
 }): Promise<void>;

package/dist/agent/codegen/fix-ts-errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fix-ts-errors.d.ts","sourceRoot":"","sources":["../../../src/agent/codegen/fix-ts-errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAQhD,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAE7D,wBAAsB,8BAA8B,CAAC,EACnD,KAAK,EACL,MAA2B,EAC3B,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,OAAO,GACR,EAAE;IACD,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,CAAC,EAAE,oBAAoB,CAAC;CAChC,iBAoEA"}
+{"version":3,"file":"fix-ts-errors.d.ts","sourceRoot":"","sources":["../../../src/agent/codegen/fix-ts-errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAQhD,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAE7D,wBAAsB,8BAA8B,CAAC,EACnD,KAAK,EACL,MAA2B,EAC3B,IAAI,EACJ,OAAO,EACP,eAAe,EACf,QAAQ,EACR,OAAO,GACR,EAAE;IACD,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,CAAC,EAAE,oBAAoB,CAAC;CAChC,iBAwEA"}

package/dist/agent/codegen/fix-ts-errors.js

@@ -9,7 +9,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const logger_1 = require("../../bin/logger");
 const web_1 = require("../../bin/utils/platform/web");
 const constants_1 = require("../../constants");
-async function validateAndFixTypescriptErrors({ trace, logger = new logger_1.CustomLogger(), file, testCode, pomCode, testCase, options, }) {
+async function validateAndFixTypescriptErrors({ trace, logger = new logger_1.CustomLogger(), file, pomCode, nonSpecFileCode, testCase, options, }) {
     const validateTypesSpan = trace?.span({ name: "detect-type-errors-in-file" });
     logger.log("Validating types...");
     let errors = (0, web_1.validateTypescript)(file);
@@ -35,13 +35,13 @@ async function validateAndFixTypescriptErrors({ trace, logger = new logger_1.Cus
         errors.forEach((e) => console.warn(e));
         const promptSpan = trace?.span({ name: "fix-type-errors-prompt" });
         const instruction = await (0, llm_1.getPrompt)("fix-file-errors-ts", {
-            testFiles: testCode || "",
             pageFiles: pomCode || "",
+            fixtureFiles: nonSpecFileCode || "",
             scenarioFile: file,
             errors: errors,
             fileContent: fileContent,
-            scenaioName: testCase.name,
-        });
+            scenarioName: testCase.name,
+        }, 10);
         promptSpan?.end({ output: { instruction } });
         const llm = new llm_1.LLM({
             trace,

package/dist/agent/codegen/run.js

@@ -48,7 +48,7 @@ async function generateTest(testCase, file, options, trace) {
         fs_extra_1.default.createFileSync(file);
     }
     const context = await (0, context_1.contextForGeneration)(file);
-    const { codePrompt, pomPrompt, testFileContent } = context;
+    const { codePrompt, pomPrompt, nonSpecFilePrompt, testFileContent } = context;
     const { testBlock } = (0, web_1.getTypescriptTestBlock)({
         scenarioName: testCase?.name,
         content: testFileContent,
@@ -96,8 +96,8 @@ async function generateTest(testCase, file, options, trace) {
         trace,
         logger,
         file,
-        testCode: codePrompt,
         pomCode: pomPrompt,
+        nonSpecFileCode: nonSpecFilePrompt,
         testCase: testCase,
         options,
     });

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

@@ -16,7 +16,7 @@ const constants_1 = require("../../constants");
 const session_1 = require("../../session");
 const fix_ts_errors_1 = require("./fix-ts-errors");
 const utils_1 = require("./utils");
-async function applyFileChanges({ validateTypes = true, trace, testCase, fileChanges, logger, testGenOptions, pomPrompt, codePrompt, }) {
+async function applyFileChanges({ validateTypes = true, trace, testCase, fileChanges, logger, testGenOptions, pomPrompt, nonSpecFilePrompt, }) {
     await Promise.allSettled(fileChanges.map(async (fileChange) => {
         if (!fileChange.filePath) {
             return;
@@ -92,8 +92,8 @@ async function applyFileChanges({ validateTypes = true, trace, testCase, fileCha
                 trace,
                 logger,
                 file: fileChange.filePath,
-                testCode: codePrompt,
                 pomCode: pomPrompt,
+                nonSpecFileCode: nonSpecFilePrompt,
                 testCase: testCase,
                 options: testGenOptions,
             });
@@ -149,7 +149,7 @@ exports.getUpdateTestCodeCompletion = getUpdateTestCodeCompletion;
 async function updateTest(testCase, file, options, logging = true, validate = true, trace) {
     const logger = new logger_1.CustomLogger({ useReporter: logging });
     const context = await (0, context_1.contextForGeneration)(file);
-    const { codePrompt, pomPrompt, testFileContent } = context;
+    const { codePrompt, pomPrompt, nonSpecFilePrompt, testFileContent } = context;
     const generatedTestCases = [];
     logger.logEmptyLine();
     const session = (0, session_1.getSessionDetails)();
@@ -190,7 +190,7 @@ async function updateTest(testCase, file, options, logging = true, validate = tr
         logger,
         testGenOptions: options,
         pomPrompt: pomPrompt,
-        codePrompt: codePrompt,
+        nonSpecFilePrompt: nonSpecFilePrompt,
     });
     if (trace) {
         logger.log(`Trace: ${trace?.getTraceUrl()}`);
@@ -273,7 +273,7 @@ async function appendCreateTestBlock({ testCase, file, options, trace, validateT
             content: scenarioFileContent,
         },
     ]);
-    const { codePrompt, pomPrompt } = context;
+    const { pomPrompt, nonSpecFilePrompt } = context;
     const generatedTestCases = [];
     const appendCreateTestResp = await getAppendCreateTestBlockCompletion({
         testCase,
@@ -291,7 +291,7 @@ async function appendCreateTestBlock({ testCase, file, options, trace, validateT
         logger,
         testGenOptions: options,
         pomPrompt: pomPrompt,
-        codePrompt: codePrompt,
+        nonSpecFilePrompt: nonSpecFilePrompt,
         validateTypes,
     });
     if (trace) {

package/dist/bin/utils/context.d.ts

@@ -2,6 +2,7 @@ export declare function createGitIgnoreFileFilter(): Promise<(pathname: string)
 export declare function contextForGeneration(file?: string): Promise<{
     codePrompt: string | undefined;
     pomPrompt: string | undefined;
+    nonSpecFilePrompt: string | undefined;
     testFileContent: string;
 }>;
 export declare function fetchAppKnowledge(): Promise<string>;

package/dist/bin/utils/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/bin/utils/context.ts"],"names":[],"mappings":"AAKA,wBAAsB,yBAAyB,2CAS9C;AAED,wBAAsB,oBAAoB,CAAC,IAAI,CAAC,EAAE,MAAM;;;;GAOvD;AAED,wBAAsB,iBAAiB,oBAYtC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/bin/utils/context.ts"],"names":[],"mappings":"AAQA,wBAAsB,yBAAyB,2CAS9C;AAED,wBAAsB,oBAAoB,CAAC,IAAI,CAAC,EAAE,MAAM;;;;;GAQvD;AAED,wBAAsB,iBAAiB,oBAYtC"}

package/dist/bin/utils/context.js

@@ -23,6 +23,7 @@ async function contextForGeneration(file) {
     return {
         codePrompt: await (0, fs_1.generatePromptFromDirectory)("./tests", filter),
         pomPrompt: await (0, fs_1.generatePromptFromDirectory)("./pages", filter),
+        nonSpecFilePrompt: await (0, fs_1.generatePromptFromNonSpecFiles)("./tests", filter),
         testFileContent: file ? await fs_extra_1.default.readFile(file, "utf-8") : "",
     };
 }

package/dist/bin/utils/fs/index.d.ts

@@ -2,4 +2,5 @@ import { FileContent } from "../../../types";
 export declare function readFilesInDirectory(dir: string | undefined, filterFunc: (file: string) => boolean): Promise<FileContent[]>;
 export declare function convertFileContentsToString(files?: FileContent[]): string;
 export declare function generatePromptFromDirectory(dir: string | undefined, filterFunc: (file: string) => boolean): Promise<string | undefined>;
+export declare function generatePromptFromNonSpecFiles(dir: string | undefined, filterFunc: (file: string) => boolean): Promise<string | undefined>;
 //# sourceMappingURL=index.d.ts.map

package/dist/bin/utils/fs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/bin/utils/fs/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,wBAAsB,oBAAoB,CACxC,GAAG,oBAAa,EAChB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,0BAgBtC;AAED,wBAAgB,2BAA2B,CAAC,KAAK,GAAE,WAAW,EAAO,UAQpE;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,oBAAK,EACR,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,+BAStC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/bin/utils/fs/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,wBAAsB,oBAAoB,CACxC,GAAG,oBAAa,EAChB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,0BAgBtC;AAED,wBAAgB,2BAA2B,CAAC,KAAK,GAAE,WAAW,EAAO,UAQpE;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,oBAAK,EACR,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,+BAStC;AAED,wBAAsB,8BAA8B,CAClD,GAAG,oBAAa,EAChB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,+BAgBtC"}

package/dist/bin/utils/fs/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.generatePromptFromDirectory = exports.convertFileContentsToString = exports.readFilesInDirectory = void 0;
+exports.generatePromptFromNonSpecFiles = exports.generatePromptFromDirectory = exports.convertFileContentsToString = exports.readFilesInDirectory = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 async function readFilesInDirectory(dir = "", filterFunc) {
@@ -44,3 +44,20 @@ async function generatePromptFromDirectory(dir = "", filterFunc) {
     }
 }
 exports.generatePromptFromDirectory = generatePromptFromDirectory;
+async function generatePromptFromNonSpecFiles(dir = "", filterFunc) {
+    try {
+        let nonSpecFiles = [];
+        const files = await readFilesInDirectory(dir, filterFunc);
+        for (const file of files) {
+            if (!file.filePath.endsWith(".spec.ts")) {
+                nonSpecFiles.push(file);
+            }
+        }
+        const prompt = convertFileContentsToString(nonSpecFiles);
+        return prompt;
+    }
+    catch (error) {
+        console.error("Error reading directory:", error);
+    }
+}
+exports.generatePromptFromNonSpecFiles = generatePromptFromNonSpecFiles;

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,OAAO,EAGL,IAAI,EAEJ,UAAU,EAEX,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,eAAO,MAAM,gCAAgC,eAC/B,UAAU,KACrB,MAgBF,CAAC;AAEF;;;;;;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;IAC3B,SAAS,EAAE,MAAM,CAAC;CACnB,CA2CA;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,+BAoBvE;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;AAEF,eAAO,MAAM,iCAAiC,cACjC,MAAM,EAAE,gBACL,MAAM,sBAyBrB,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,EAC1C,YAAY,EACZ,QAAQ,EACR,MAAM,GACP,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,iBAsDA;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EAAE,iBA2BzB;AAED,wBAAgB,aAAa,CAAC,EAC5B,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;CACpB,WAYA;AAED,wBAAgB,mBAAmB,CAAC,EAClC,QAAQ,EACR,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,UAOA;AAED,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CA4B5E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/bin/utils/platform/web/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAGL,IAAI,EAEJ,UAAU,EAEX,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,eAAO,MAAM,gCAAgC,eAC/B,UAAU,KACrB,MAgBF,CAAC;AAEF;;;;;;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;IAC3B,SAAS,EAAE,MAAM,CAAC;CACnB,CA2CA;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,+BAoBvE;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;AAEF,eAAO,MAAM,iCAAiC,cACjC,MAAM,EAAE,gBACL,MAAM,sBAyBrB,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,EAC1C,YAAY,EACZ,QAAQ,EACR,MAAM,GACP,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,iBA8CA;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EAAE,iBA2BzB;AAED,wBAAgB,aAAa,CAAC,EAC5B,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;CACpB,WAYA;AAED,wBAAgB,mBAAmB,CAAC,EAClC,QAAQ,EACR,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,UAOA;AAED,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CA4B5E"}

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

@@ -404,29 +404,25 @@ async function addUserContextFixture({ scenarioName, filePath, suites, }) {
         return;
     }
     const fileContent = await fs_extra_1.default.readFile(filePath, "utf-8");
-    const { testNode, testAlias } = getTypescriptTestBlock({
+    const { testNode } = getTypescriptTestBlock({
         scenarioName,
         content: fileContent,
         suites,
     });
     const currentBlock = testNode?.getText();
-    const testCallExpression = testNode?.getFirstDescendantByKind(ts_morph_1.SyntaxKind.CallExpression);
-    if (testCallExpression?.getExpression().getText() === testAlias) {
-        const arrowFunction = testCallExpression.getFirstDescendantByKind(ts_morph_1.SyntaxKind.ArrowFunction);
-        if (arrowFunction) {
-            const param = arrowFunction.getParameters()[0]; // Get the first parameter
-            const destructuringParam = param?.getFirstDescendantByKind(ts_morph_1.SyntaxKind.ObjectBindingPattern);
-            if (destructuringParam) {
-                const elements = destructuringParam.getElements();
-                const userContextExists = elements.some((e) => e.getText().includes("userContext"));
-                console.log("userContextExists", userContextExists);
-                if (!userContextExists) {
-                    const updatedImport = destructuringParam
-                        .getText()
-                        .replace("}", ", userContext }");
-                    destructuringParam.replaceWithText(updatedImport);
-                    await fs_extra_1.default.writeFile(filePath, fileContent.replace(currentBlock, testNode.getText()), "utf-8");
-                }
+    const arrowFunction = testNode?.getFirstDescendantByKind(ts_morph_1.SyntaxKind.ArrowFunction);
+    if (arrowFunction) {
+        const param = arrowFunction.getParameters()[0]; // Get the first parameter
+        const destructuringParam = param?.getFirstDescendantByKind(ts_morph_1.SyntaxKind.ObjectBindingPattern);
+        if (destructuringParam) {
+            const elements = destructuringParam.getElements();
+            const userContextExists = elements.some((e) => e.getText().includes("userContext"));
+            if (!userContextExists) {
+                const updatedImport = destructuringParam
+                    .getText()
+                    .replace("}", ", userContext }");
+                destructuringParam.replaceWithText(updatedImport);
+                await fs_extra_1.default.writeFile(filePath, fileContent.replace(currentBlock, testNode.getText()), "utf-8");
             }
         }
     }

package/dist/browser-injected-scripts/annotate-elements.js

@@ -103,8 +103,8 @@ function annotateClickableElements(options = {}) {
   }
 
   // Check if an element is clickable
-  function isElementClickable(element) {
-    // if (!(element instanceof Element)) return false;
+  function isElementClickable(element, windowToAnnotate) {
+    if (!(element instanceof windowToAnnotate.Element)) return false;
 
     const tagName = element.tagName.toLowerCase();
     let isClickable = false;
@@ -157,10 +157,27 @@ function annotateClickableElements(options = {}) {
       isClickable = true;
     }
 
+    // Tag-specific clickability
+    const focusableTags = [
+      "a",
+      "button",
+      "input",
+      "select",
+      "textarea",
+      "object",
+      "embed",
+      "label",
+      "details",
+    ];
+
     // Check for onclick attribute or listener
     if (
-      element.hasAttribute("onclick") ||
-      typeof element.onclick === "function"
+      (element.hasAttribute("onclick") ||
+      typeof element.onclick === "function") 
+      // check for parent element having same on click
+      && element.parentNode.onclick !== element.onclick
+      // parent element should not be a focusable tag like button
+      && focusableTags.indexOf(element.parentNode.tagName.toLowerCase()) === -1
     ) {
       isClickable = true;
     }
@@ -210,18 +227,7 @@ function annotateClickableElements(options = {}) {
       }
     }
 
-    // Tag-specific clickability
-    const focusableTags = [
-      "a",
-      "button",
-      "input",
-      "select",
-      "textarea",
-      "object",
-      "embed",
-      "label",
-      "details",
-    ];
+    
     if (focusableTags.includes(tagName)) {
       switch (tagName) {
         case "a":
@@ -374,7 +380,7 @@ function annotateClickableElements(options = {}) {
   
     // Filter for clickable elements
     const clickableElements = Array.from(windowToAnnotate.document.querySelectorAll("*")).filter((el) => {
-      const isClickable = isElementClickable(el);
+      const isClickable = isElementClickable(el, windowToAnnotate);
       const isClickNotBlocked = isElementClickNotBlocked(el, windowToAnnotate);
       return isClickable && isClickNotBlocked;
     });  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/test-gen",
-  "version": "0.38.10",
+  "version": "0.38.13",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -55,12 +55,12 @@
     "remove-markdown": "^0.5.5",
     "sanitize-html": "^2.13.0",
     "slugify": "^1.6.6",
-    "ts-morph": "^23.0.0",
+    "ts-morph": "^24.0.0",
     "tsx": "^4.16.2",
     "typescript": "^5.3.3",
+    "@empiricalrun/llm": "^0.9.25",
     "@empiricalrun/r2-uploader": "^0.3.6",
-    "@empiricalrun/reporter": "^0.21.3",
-    "@empiricalrun/llm": "^0.9.25"
+    "@empiricalrun/reporter": "^0.21.3"
   },
   "devDependencies": {
     "@types/detect-port": "^1.3.5",