@dev-blinq/cucumber_client 1.0.1444-dev → 1.0.1444-stage

package/bin/client/code_gen/page_reflection.js

@@ -170,7 +170,7 @@ export class CodePage {
                 this.generateModel(fileContentNew);
             }
             catch (e) {
-                logger.info("failed to format the code");
+                logger.error("failed to format the code");
                 logger.debug(e);
             }
             if (!existsSync(this.sourceFileName)) {
@@ -288,6 +288,11 @@ export class CodePage {
             codePart.name = node.id.name;
         }
     }
+    findKey(funcString, key) {
+        const sourceRegex = new RegExp(`${key}:\\s*(.*)`);
+        const match = funcString.match(sourceRegex);
+        return match ? match[1] : null;
+    }
     collectAllTemplates() {
         const templates = [];
         if (this.cucumberCalls.length > 0) {
@@ -300,10 +305,12 @@ export class CodePage {
                 const stepType = cucumberCall["stepType"];
                 let firstFind = true;
                 const stepPaths = [];
+                let source = null;
                 for (let j = 0; j < this.methods.length; j++) {
                     const method = this.methods[j];
                     if (method.name === methodName) {
                         if (firstFind) {
+                            source = this.findKey(method.codePart, "source");
                             foundMethod = true;
                             const paramsObj = (method.node?.params ?? []);
                             if (paramsObj && paramsObj.length > 0) {
@@ -315,7 +322,7 @@ export class CodePage {
                     }
                 }
                 if (foundMethod) {
-                    templates.push({ pattern, methodName, params, stepType, paths: stepPaths });
+                    templates.push({ pattern, methodName, params, stepType, paths: stepPaths, source });
                 }
             }
         }
@@ -363,6 +370,39 @@ export class CodePage {
             return result;
         }
     }
+    addInfraCommandUtil(methodName, description, stepVariables, stepCodeLines, renamedText, previousText, parametersMap, protectStep = false, source = null, codePath = "") {
+        let code = "\n";
+        code += "/**\n";
+        code += ` * ${description}\n`;
+        const tags = [];
+        if (protectStep)
+            tags.push("@protect");
+        if (source)
+            tags.push(`@${source}`);
+        if (tags.length > 0)
+            code += ` * ${tags.join(" ")}\n`;
+        if (codePath !== null)
+            code += ` * @path=${escapeForComment(codePath)}\n`;
+        const matches = previousText.match(/"[^"]*"/g);
+        const countInMethodName = matches ? matches.length : 0;
+        code += " */\n";
+        code += `async function ${methodName} (${new Array(countInMethodName)
+            .fill(0)
+            .map((v, index) => `param${index}`)
+            .join(", ")}){\n`;
+        code += `// source: ${source}\n`;
+        code += `// implemented_at: ${new Date().toISOString()}\n`;
+        stepCodeLines.forEach((line) => (code += `  ${line}\n`));
+        if (renamedText === "verify_page_title" || renamedText === "verify_page_url") {
+            const parameters = stepVariables.map((v) => parametersMap[v.text.replace(/[<>]/g, "")]);
+            code += `await ${renamedText}(${parameters.map((v) => (isNaN(Number(v)) ? `"${v}"` : Number(v))).join(", ")});\n`;
+        }
+        else {
+            code += `await ${renamedText}(${stepVariables.map((v) => (isNaN(Number(v.text)) ? `"${v.text}"` : Number(v.text))).join(", ")});\n`;
+        }
+        code += "}\n";
+        return this._injectMethod(methodName, code);
+    }
     addInfraCommand(methodName, description, stepVarables, stepCodeLines, protectStep = false, source = null, codePath = "") {
         let code = "\n";
         code += "/**\n";
@@ -528,12 +568,13 @@ export class CodePage {
             for (let j = i - 1; j >= 0; j--) {
                 const nextElement = elements[keys[j]];
                 if (this._isSimilarElement(currentElement, nextElement)) {
-                    mergedElements[currentElement.element_key] = currentElement;
-                    replacedKeys[nextElement.element_key] = currentElement.element_key;
+                    // mergedElements[currentElement.element_key!] = currentElement;
+                    // replacedKeys[nextElement.element_key!] = currentElement.element_key!;
                     foundMatch = true;
-                    keys.splice(j, 1);
-                    i--;
-                    j++;
+                    break;
+                    // keys.splice(j, 1);
+                    // i--;
+                    // j++;
                 }
             }
             if (!foundMatch) {
@@ -543,7 +584,7 @@ export class CodePage {
         if (Object.keys(replacedKeys).length === 0)
             return;
         for (const key in replacedKeys) {
-            const regexp = new RegExp(`elements\$begin:math:display$\\\\s*["']${key}["']\\\\s*\\$end:math:display$`, "g");
+            const regexp = new RegExp(`elements\\[\\s*["']${key}["']\\s*\\]`, "g");
             this.fileContent = this.fileContent.replace(regexp, () => `elements["${replacedKeys[key]}"]`);
         }
         this.insertElements(mergedElements);
@@ -620,7 +661,7 @@ export class CodePage {
         let locatorsMetadataFileName = this.sourceFileName.replace(".mjs", ".json");
         const config = getAiConfig();
         if (config && config.locatorsMetadataDir) {
-            locatorsMetadataFileName = path.join(config.locatorsMetadataDir, path.basename(locatorsMetadataFileName));
+            locatorsMetadataFileName = locatorsMetadataFileName.replace(path.join("features", "step_definitions"), path.join(config.locatorsMetadataDir));
             if (!existsSync(path.dirname(locatorsMetadataFileName))) {
                 mkdirSync(path.dirname(locatorsMetadataFileName), { recursive: true });
             }
@@ -632,7 +673,7 @@ export class CodePage {
             }
         }
         catch {
-            logger.info("failed to read locators metadata file", locatorsMetadataFileName);
+            logger.error("failed to read locators metadata file", locatorsMetadataFileName);
         }
         const keys = Object.keys(locatorsMetadata);
         keys.forEach((key) => {
@@ -642,7 +683,7 @@ export class CodePage {
             writeFileSync(locatorsMetadataFileName, JSON.stringify(metadata, null, 2), "utf8");
         }
         catch {
-            logger.info("failed to write locators metadata file", locatorsMetadataFileName);
+            logger.error("failed to write locators metadata file", locatorsMetadataFileName);
         }
     }
     _getVariableStartEnd(variableName) {