flowstride 1.0.17 → 1.0.19

package/dist/parser/lexer.js

@@ -331,6 +331,10 @@ class Lexer {
                     "img",
                     "burger",
                     "hamburger",
+                    "table",
+                    "tr",
+                    "th",
+                    "td",
                 ].includes(lowerIdent)) {
                     tokens.push({
                         type: TokenType.ELEMENT,

package/dist/parser/parser.js

@@ -319,11 +319,27 @@ class Parser {
                     extTarget !== "reqHeader") {
                     throw new Error(`Syntax Error on line ${extTargetToken.line}: Invalid keyword '${extTarget}'. Flowstride uses strict camelCase. Did you mean 'reqHeader'?`);
                 }
-                if (!["resBody", "resHeader", "cookie"].includes(extTarget)) {
-                    throw new Error(`Line ${extTargetToken.line}: Expected 'resBody', 'resHeader', or 'cookie' after extract`);
+                if (![
+                    "resBody",
+                    "resHeader",
+                    "cookie",
+                    "text",
+                    "value",
+                    "attribute",
+                ].includes(extTarget)) {
+                    throw new Error(`Line ${extTargetToken.line}: Expected 'resBody', 'resHeader', 'cookie', 'text', 'value', or 'attribute' after extract`);
                 }
                 payload.target = extTarget;
-                payload.jsonPath = this.consume(lexer_1.TokenType.STRING, "JSONPath or Key expected").value;
+                if (["resBody", "resHeader", "cookie"].includes(extTarget)) {
+                    payload.jsonPath = this.consume(lexer_1.TokenType.STRING, "JSONPath or Key expected").value;
+                }
+                else {
+                    this.consumeOptionalElement(payload);
+                    payload.selector = this.parseSmartSelectorPayload();
+                    if (extTarget === "attribute") {
+                        payload.attribute = this.consume(lexer_1.TokenType.STRING, "Attribute name expected").value;
+                    }
+                }
                 const asToken = this.advance();
                 if (asToken.value.toLowerCase() !== "as") {
                     throw new Error(`Line ${asToken.line}: Expected 'as' after extraction target`);

package/dist/runner/flow_worker.js

@@ -353,7 +353,6 @@ class FlowWorker extends events_1.EventEmitter {
         this.isAborted = true;
     }
     async runBatch(filesToProcess) {
-        // this.config.headless = true;
         const isCliHeadless = process.argv.includes("--headless");
         if (isCliHeadless) {
             this.config.headless = true;
@@ -722,14 +721,35 @@ class FlowWorker extends events_1.EventEmitter {
         }
         switch (action) {
             case "extract":
-                this.processExtractions([
-                    {
-                        target: payload.target,
-                        jsonPath: payload.jsonPath,
-                        variableName: payload.variableName,
-                        isGlobal: payload.isGlobal,
-                    },
-                ]);
+                if (["resBody", "resHeader", "cookie"].includes(payload.target)) {
+                    this.processExtractions([
+                        {
+                            target: payload.target,
+                            jsonPath: payload.jsonPath,
+                            variableName: payload.variableName,
+                            isGlobal: payload.isGlobal,
+                        },
+                    ]);
+                }
+                else {
+                    let extractedString = "";
+                    if (payload.target === "text") {
+                        extractedString = await this.web.extractText(payload.selector, payload.elementType);
+                    }
+                    else if (payload.target === "value") {
+                        extractedString = await this.web.extractValue(payload.selector, payload.elementType);
+                    }
+                    else if (payload.target === "attribute") {
+                        const val = await this.web.getAttribute(payload.selector, payload.attribute, payload.elementType);
+                        extractedString = val || "";
+                    }
+                    if (payload.isGlobal) {
+                        FlowWorker.globalVariables[payload.variableName] = extractedString;
+                    }
+                    else {
+                        this.localVariables[payload.variableName] = extractedString;
+                    }
+                }
                 break;
             case "getOtp":
                 if (!this.isSilent) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowstride",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "An opensource flowfirst test automation framework",
   "workspaces": [
     "packages/flowstride_report"