@loadmill/executer 0.1.88 → 0.1.89
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { HeaderExtractor, CheerioExtractor, JsonPathExtractor, ExpressionExtractor } from '@loadmill/core/dist/parameters/extractors';
|
|
1
|
+
import { HeaderExtractor, CheerioExtractor, JsonPathExtractor, ExpressionExtractor, XPathExtractor } from '@loadmill/core/dist/parameters/extractors';
|
|
2
2
|
import { Parameters } from '@loadmill/core/dist/parameters';
|
|
3
3
|
import { Extraction } from '@loadmill/core/dist/request';
|
|
4
4
|
import { WSExtractionData } from '@loadmill/core/dist/parameters/extractors/ws-extractor';
|
|
@@ -8,6 +8,7 @@ export declare class ExtractionCombiner {
|
|
|
8
8
|
private wsExtractionData;
|
|
9
9
|
headerExtractor: HeaderExtractor;
|
|
10
10
|
cheerioExtractor: CheerioExtractor;
|
|
11
|
+
xmlExtractor: XPathExtractor;
|
|
11
12
|
jsonPathExtractor: JsonPathExtractor;
|
|
12
13
|
ednPathExtractor: JsonPathExtractor;
|
|
13
14
|
expressionExtractor: ExpressionExtractor;
|
|
@@ -75,6 +75,12 @@ var ExtractionCombiner = /** @class */ (function () {
|
|
|
75
75
|
writable: true,
|
|
76
76
|
value: void 0
|
|
77
77
|
});
|
|
78
|
+
Object.defineProperty(this, "xmlExtractor", {
|
|
79
|
+
enumerable: true,
|
|
80
|
+
configurable: true,
|
|
81
|
+
writable: true,
|
|
82
|
+
value: void 0
|
|
83
|
+
});
|
|
78
84
|
Object.defineProperty(this, "jsonPathExtractor", {
|
|
79
85
|
enumerable: true,
|
|
80
86
|
configurable: true,
|
|
@@ -102,7 +108,7 @@ var ExtractionCombiner = /** @class */ (function () {
|
|
|
102
108
|
writable: true,
|
|
103
109
|
value: function (extraction) {
|
|
104
110
|
return __awaiter(this, void 0, void 0, function () {
|
|
105
|
-
var query, extractor, header, jQuery, jsonPath, edn, regex, ws, converted;
|
|
111
|
+
var query, extractor, header, jQuery, xPath, jsonPath, edn, regex, ws, converted;
|
|
106
112
|
var _this = this;
|
|
107
113
|
return __generator(this, function (_a) {
|
|
108
114
|
if (typeof extraction === 'string') {
|
|
@@ -110,7 +116,7 @@ var ExtractionCombiner = /** @class */ (function () {
|
|
|
110
116
|
extractor = this.expressionExtractor;
|
|
111
117
|
}
|
|
112
118
|
else {
|
|
113
|
-
header = extraction.header, jQuery = extraction.jQuery, jsonPath = extraction.jsonPath, edn = extraction.edn, regex = extraction.regex, ws = extraction.ws;
|
|
119
|
+
header = extraction.header, jQuery = extraction.jQuery, xPath = extraction.xPath, jsonPath = extraction.jsonPath, edn = extraction.edn, regex = extraction.regex, ws = extraction.ws;
|
|
114
120
|
if (header != null) {
|
|
115
121
|
query = header;
|
|
116
122
|
extractor = this.headerExtractor;
|
|
@@ -125,6 +131,13 @@ var ExtractionCombiner = /** @class */ (function () {
|
|
|
125
131
|
: [jQuery.query, '0', jQuery.attr || ''];
|
|
126
132
|
extractor = this.cheerioExtractor;
|
|
127
133
|
}
|
|
134
|
+
else if (xPath != null) {
|
|
135
|
+
if (!this.xmlExtractor) {
|
|
136
|
+
this.xmlExtractor = new extractors_1.XPathExtractor(this.res.text, this.contextParameters);
|
|
137
|
+
}
|
|
138
|
+
query = xPath;
|
|
139
|
+
extractor = this.xmlExtractor;
|
|
140
|
+
}
|
|
128
141
|
else if (jsonPath != null) {
|
|
129
142
|
if (!this.jsonPathExtractor) {
|
|
130
143
|
this.jsonPathExtractor = new extractors_1.JsonPathExtractor(this.res.text, this.contextParameters);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extraction-combiner.js","sourceRoot":"","sources":["../src/extraction-combiner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"extraction-combiner.js","sourceRoot":"","sources":["../src/extraction-combiner.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loadmill/executer",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.89",
|
|
4
4
|
"description": "Loadmill executer library",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"ts-watch": "rimraf dist && tsc -w -p tsconfig.json",
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
},
|
|
15
15
|
"license": "Apache-2.0",
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@loadmill/core": "0.3.
|
|
18
|
-
"@loadmill/universal": "0.3.
|
|
17
|
+
"@loadmill/core": "0.3.88",
|
|
18
|
+
"@loadmill/universal": "0.3.83",
|
|
19
19
|
"@types/estree": "^0.0.50",
|
|
20
20
|
"acorn": "^8.4.1",
|
|
21
21
|
"agentkeepalive": "^4.1.3",
|