@loadmill/core 0.3.144 → 0.3.145

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.
@@ -23,5 +23,13 @@ export declare const getDeclaredParametersFromStep: (step: Step) => DeclaredVari
23
23
  * Example:
24
24
  * input: `const x = 1;`
25
25
  * output: [{ name: 'x', rawValue: '1' }]
26
+ *
27
+ * @throws {Error} If the code is invalid.
26
28
  */
27
29
  export declare const getDeclaredParametersFromCode: (code?: string) => DeclaredVariable[];
30
+ /**
31
+ * Keeps the last occurrence of each variable.
32
+ *
33
+ * Prefers variables with value over variables without value.
34
+ */
35
+ export declare const removeDuplicateDeclaredParameters: (declaredParameters: DeclaredVariable[]) => DeclaredVariable[];
@@ -1,11 +1,7 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.getDeclaredParametersFromCode = exports.getDeclaredParametersFromStep = exports.getDeclaredParametersFromSteps = exports.getDeclaredParameterNamesFromSteps = void 0;
3
+ exports.removeDuplicateDeclaredParameters = exports.getDeclaredParametersFromCode = exports.getDeclaredParametersFromStep = exports.getDeclaredParametersFromSteps = exports.getDeclaredParameterNamesFromSteps = void 0;
7
4
  var ast_walker_1 = require("@loadmill/universal/dist/ast/ast-walker");
8
- var log_1 = __importDefault(require("@loadmill/universal/dist/log"));
9
5
  var type_guards_1 = require("../../step/type-guards");
10
6
  /**
11
7
  * Gets a list of steps and returns the declared parameter names in them.
@@ -15,8 +11,13 @@ var type_guards_1 = require("../../step/type-guards");
15
11
  * @returns The declared parameter names in the given steps.
16
12
  */
17
13
  var getDeclaredParameterNamesFromSteps = function (steps) {
18
- return exports.getDeclaredParametersFromSteps(steps)
19
- .map(function (dv) { return dv.name; });
14
+ try {
15
+ return exports.getDeclaredParametersFromSteps(steps)
16
+ .map(function (dv) { return dv.name; });
17
+ }
18
+ catch (e) {
19
+ return [];
20
+ }
20
21
  };
21
22
  exports.getDeclaredParameterNamesFromSteps = getDeclaredParameterNamesFromSteps;
22
23
  /**
@@ -48,16 +49,27 @@ exports.getDeclaredParametersFromStep = getDeclaredParametersFromStep;
48
49
  * Example:
49
50
  * input: `const x = 1;`
50
51
  * output: [{ name: 'x', rawValue: '1' }]
52
+ *
53
+ * @throws {Error} If the code is invalid.
51
54
  */
52
55
  var getDeclaredParametersFromCode = function (code) {
53
56
  if (code === void 0) { code = ''; }
54
- try {
55
- return new ast_walker_1.ASTWalker(code).detectDeclarations([]);
56
- }
57
- catch (e) {
58
- log_1.default.warn('Failed to get declared parameters from code', e);
59
- return [];
60
- }
57
+ return new ast_walker_1.ASTWalker(code).detectDeclarations([]);
61
58
  };
62
59
  exports.getDeclaredParametersFromCode = getDeclaredParametersFromCode;
60
+ /**
61
+ * Keeps the last occurrence of each variable.
62
+ *
63
+ * Prefers variables with value over variables without value.
64
+ */
65
+ var removeDuplicateDeclaredParameters = function (declaredParameters) {
66
+ var map = new Map();
67
+ declaredParameters.forEach(function (v) {
68
+ if (!map.has(v.name) || v.rawValue) {
69
+ map.set(v.name, v);
70
+ }
71
+ });
72
+ return Array.from(map.values());
73
+ };
74
+ exports.removeDuplicateDeclaredParameters = removeDuplicateDeclaredParameters;
63
75
  //# sourceMappingURL=declared-parameters-in-code.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"declared-parameters-in-code.js","sourceRoot":"","sources":["../../../src/parameters/declared-parameters/declared-parameters-in-code.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAoE;AAEpE,qEAA+C;AAG/C,sDAAwD;AAExD;;;;;;GAMG;AACI,IAAM,kCAAkC,GAAG,UAAC,KAAa;IAC9D,OAAO,sCAA8B,CAAC,KAAK,CAAC;SACzC,GAAG,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,IAAI,EAAP,CAAO,CAAC,CAAC;AAC1B,CAAC,CAAC;AAHW,QAAA,kCAAkC,sCAG7C;AAEF;;;;;;GAMG;AACI,IAAM,8BAA8B,GAAG,UAAC,KAAa;IAC1D,IAAM,MAAM,GAAuB,EAAE,CAAC;IACtC,KAAmB,UAAK,EAAL,eAAK,EAAL,mBAAK,EAAL,IAAK,EAAE;QAArB,IAAM,IAAI,cAAA;QACb,MAAM,CAAC,IAAI,OAAX,MAAM,EAAS,qCAA6B,CAAC,IAAI,CAAC,EAAE;KACrD;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AANW,QAAA,8BAA8B,kCAMzC;AAEK,IAAM,6BAA6B,GAAG,UAAC,IAAU;IACtD,IAAI,4BAAc,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;QAC3C,OAAO,qCAA6B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KACvD;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AALW,QAAA,6BAA6B,iCAKxC;AAEF;;;;;;GAMG;AACI,IAAM,6BAA6B,GAAG,UAAC,IAAiB;IAAjB,qBAAA,EAAA,SAAiB;IAC7D,IAAI;QACF,OAAO,IAAI,sBAAS,CAAC,IAAI,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;KACnD;IAAC,OAAO,CAAC,EAAE;QACV,aAAG,CAAC,IAAI,CAAC,6CAA6C,EAAE,CAAC,CAAC,CAAC;QAC3D,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC;AAPW,QAAA,6BAA6B,iCAOxC"}
1
+ {"version":3,"file":"declared-parameters-in-code.js","sourceRoot":"","sources":["../../../src/parameters/declared-parameters/declared-parameters-in-code.ts"],"names":[],"mappings":";;;AAAA,sEAAoE;AAIpE,sDAAwD;AAExD;;;;;;GAMG;AACI,IAAM,kCAAkC,GAAG,UAAC,KAAa;IAC9D,IAAI;QACF,OAAO,sCAA8B,CAAC,KAAK,CAAC;aACzC,GAAG,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,IAAI,EAAP,CAAO,CAAC,CAAC;KACzB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC;AAPW,QAAA,kCAAkC,sCAO7C;AAEF;;;;;;GAMG;AACI,IAAM,8BAA8B,GAAG,UAAC,KAAa;IAC1D,IAAM,MAAM,GAAuB,EAAE,CAAC;IACtC,KAAmB,UAAK,EAAL,eAAK,EAAL,mBAAK,EAAL,IAAK,EAAE;QAArB,IAAM,IAAI,cAAA;QACb,MAAM,CAAC,IAAI,OAAX,MAAM,EAAS,qCAA6B,CAAC,IAAI,CAAC,EAAE;KACrD;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AANW,QAAA,8BAA8B,kCAMzC;AAEK,IAAM,6BAA6B,GAAG,UAAC,IAAU;IACtD,IAAI,4BAAc,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;QAC3C,OAAO,qCAA6B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KACvD;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AALW,QAAA,6BAA6B,iCAKxC;AAEF;;;;;;;;GAQG;AACI,IAAM,6BAA6B,GAAG,UAAC,IAAiB;IAAjB,qBAAA,EAAA,SAAiB;IAC7D,OAAO,IAAI,sBAAS,CAAC,IAAI,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;AACpD,CAAC,CAAC;AAFW,QAAA,6BAA6B,iCAExC;AAGF;;;;GAIG;AACI,IAAM,iCAAiC,GAAG,UAAC,kBAAsC;IACtF,IAAM,GAAG,GAAG,IAAI,GAAG,EAA4B,CAAC;IAEhD,kBAAkB,CAAC,OAAO,CAAC,UAAC,CAAC;QAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;YAClC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SACpB;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;AAClC,CAAC,CAAC;AAVW,QAAA,iCAAiC,qCAU5C"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loadmill/core",
3
- "version": "0.3.144",
3
+ "version": "0.3.145",
4
4
  "description": "Loadmill core library",
5
5
  "main": "dist/",
6
6
  "scripts": {
@@ -12,7 +12,7 @@
12
12
  "unit-test-conf": "mocha --ui tdd \"test/conf/*.spec.js\"",
13
13
  "unit-test-har": "mocha --ui tdd \"test/har/*.spec.js\"",
14
14
  "unit-test-multipart": "mocha --require ts-node/register/transpile-only --ui tdd \"test/multipart-form-data/*.ts\"",
15
- "unit-test-parameters": "mocha --require ts-node/register/transpile-only --ui tdd \"test/parameters/*.spec.*\"",
15
+ "unit-test-parameters": "mocha --require ts-node/register/transpile-only --ui tdd \"test/parameters/**/*.spec.*\"",
16
16
  "unit-test-schema": "mocha --ui tdd \"test/schema/*.js\"",
17
17
  "unit-test-subset": "mocha --require ts-node/register/transpile-only --ui tdd \"test/subset/*.ts\"",
18
18
  "unit-test-xml": "mocha --require ts-node/register/transpile-only --ui tdd \"test/xml/*.ts\""
@@ -26,7 +26,7 @@
26
26
  "@aws-sdk/client-cognito-identity": "~3.58.0",
27
27
  "@aws-sdk/client-firehose": "~3.58.0",
28
28
  "@aws-sdk/types": "~3.55.0",
29
- "@loadmill/universal": "0.3.139",
29
+ "@loadmill/universal": "0.3.140",
30
30
  "@xmldom/xmldom": "^0.8.10",
31
31
  "cheerio": "^0.22.0",
32
32
  "crypto-js": "^4.1.1",