specmatic 2.9.0 → 2.9.1
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.
- package/dist/bin/command.line.js +30 -20
- package/package.json +3 -2
- package/src/bin/__tests__/command.line.ts +15 -4
- package/src/bin/command.line.ts +15 -21
package/dist/bin/command.line.js
CHANGED
|
@@ -6,13 +6,33 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports["default"] = void 0;
|
|
7
7
|
var _logger = _interopRequireDefault(require("../common/logger"));
|
|
8
8
|
var _runner = require("../common/runner");
|
|
9
|
+
var _yargs = _interopRequireDefault(require("yargs/yargs"));
|
|
10
|
+
var _helpers = require("yargs/helpers");
|
|
11
|
+
var _excluded = ["_", "$0"];
|
|
9
12
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
13
|
+
function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
|
|
14
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
15
|
+
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
16
|
+
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
17
|
+
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
18
|
+
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
19
|
+
function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
|
|
20
|
+
function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
|
|
10
21
|
var callSpecmaticCli = function callSpecmaticCli(args) {
|
|
11
22
|
args = args || process.argv;
|
|
12
|
-
var
|
|
13
|
-
var
|
|
14
|
-
|
|
15
|
-
|
|
23
|
+
var argv = (0, _yargs["default"])((0, _helpers.hideBin)(args)).parseSync();
|
|
24
|
+
var _ = argv._,
|
|
25
|
+
$0 = argv.$0,
|
|
26
|
+
namedArgs = _objectWithoutProperties(argv, _excluded);
|
|
27
|
+
var fn = getJarFunction(_);
|
|
28
|
+
var command = (_.join(' ') + ' ' + Object.entries(namedArgs).map(function (_ref) {
|
|
29
|
+
var _ref2 = _slicedToArray(_ref, 2),
|
|
30
|
+
key = _ref2[0],
|
|
31
|
+
value = _ref2[1];
|
|
32
|
+
return "--".concat(key, "=\"").concat(String(value), "\"");
|
|
33
|
+
}).join(' ')).trim();
|
|
34
|
+
_logger["default"].info("CLI: Running with args \"".concat(command, "\""));
|
|
35
|
+
fn(command, function (err) {
|
|
16
36
|
if (err) {
|
|
17
37
|
_logger["default"].info('CLI: Finished with non zero exit code: ', err.code);
|
|
18
38
|
process.exitCode = err.code;
|
|
@@ -24,12 +44,14 @@ var callSpecmaticCli = function callSpecmaticCli(args) {
|
|
|
24
44
|
console.log("".concat(message));
|
|
25
45
|
});
|
|
26
46
|
};
|
|
27
|
-
function getJarFunction(
|
|
28
|
-
if (
|
|
29
|
-
switch (
|
|
47
|
+
function getJarFunction(operation) {
|
|
48
|
+
if (operation.length > 0) {
|
|
49
|
+
switch (String(operation[0])) {
|
|
30
50
|
case 'kafka':
|
|
51
|
+
operation.splice(0, 1);
|
|
31
52
|
return _runner.callKafka;
|
|
32
53
|
case 'graphql':
|
|
54
|
+
operation.splice(0, 1);
|
|
33
55
|
return _runner.callGraphQl;
|
|
34
56
|
default:
|
|
35
57
|
return _runner.callCore;
|
|
@@ -37,17 +59,5 @@ function getJarFunction(args) {
|
|
|
37
59
|
}
|
|
38
60
|
return _runner.callCore;
|
|
39
61
|
}
|
|
40
|
-
function extractArgsForJar(args) {
|
|
41
|
-
if (args.length >= 3) {
|
|
42
|
-
switch (args[2]) {
|
|
43
|
-
case 'kafka':
|
|
44
|
-
case 'graphql':
|
|
45
|
-
return args.slice(3).join(' ');
|
|
46
|
-
default:
|
|
47
|
-
return args.slice(2).join(' ');
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
return args.slice(2).join(' ');
|
|
51
|
-
}
|
|
52
62
|
var _default = exports["default"] = callSpecmaticCli;
|
|
53
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_logger","_interopRequireDefault","require","_runner","_yargs","_helpers","_excluded","e","__esModule","_slicedToArray","r","_arrayWithHoles","_iterableToArrayLimit","_unsupportedIterableToArray","_nonIterableRest","TypeError","a","_arrayLikeToArray","t","toString","call","slice","constructor","name","Array","from","test","length","n","l","Symbol","iterator","i","u","f","o","next","Object","done","push","value","isArray","_objectWithoutProperties","_objectWithoutPropertiesLoose","getOwnPropertySymbols","indexOf","propertyIsEnumerable","hasOwnProperty","callSpecmaticCli","args","process","argv","yargs","hideBin","parseSync","_","$0","namedArgs","fn","getJarFunction","command","join","entries","map","_ref","_ref2","key","concat","String","trim","logger","info","err","code","exitCode","message","console","log","operation","splice","callKafka","callGraphQl","callCore","_default","exports"],"sources":["../../src/bin/command.line.ts"],"sourcesContent":["import logger from '../common/logger'\nimport { callKafka, callCore, callGraphQl } from '../common/runner'\nimport yargs from 'yargs/yargs';\nimport { hideBin } from 'yargs/helpers';\n\nconst callSpecmaticCli = (args?: string[]) => {\n    args = args || process.argv\n    const argv = yargs(hideBin(args)).parseSync();\n    const { _, $0, ...namedArgs } = argv;\n    const fn = getJarFunction(_);\n    const command = (_.join(' ') + ' ' + Object.entries(namedArgs).map(([key, value]) => `--${key}=\"${String(value)}\"`).join(' ')).trim();\n\n    logger.info(`CLI: Running with args \"${command}\"`);\n    fn(\n        command,\n        (err?: any) => {\n            if (err) {\n                logger.info('CLI: Finished with non zero exit code: ', err.code)\n                process.exitCode = err.code\n            } else {\n                logger.info('CLI: Finished')\n                process.exitCode = 0\n            }\n        },\n        message => {\n            console.log(`${message}`)\n        }\n    );\n}\n\nfunction getJarFunction(operation: any[]) {\n    if(operation.length > 0) {\n        switch (String(operation[0])) {\n            case 'kafka':\n                operation.splice(0,1);\n                return callKafka\n            case 'graphql':\n                operation.splice(0,1);\n                return callGraphQl\n            default:\n                return callCore\n        }\n    }\n    return callCore\n}\n\nexport default callSpecmaticCli\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "specmatic",
|
|
3
|
-
"version": "2.9.
|
|
3
|
+
"version": "2.9.1",
|
|
4
4
|
"specmaticVersion": "2.9.0",
|
|
5
5
|
"description": "Node wrapper for Specmatic",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -51,7 +51,8 @@
|
|
|
51
51
|
"fast-xml-parser": "^4.5.0",
|
|
52
52
|
"terminate": "^2.8.0",
|
|
53
53
|
"tree-kill": "^1.2.2",
|
|
54
|
-
"winston": "^3.14.2"
|
|
54
|
+
"winston": "^3.14.2",
|
|
55
|
+
"yargs": "^17.7.2"
|
|
55
56
|
},
|
|
56
57
|
"devDependencies": {
|
|
57
58
|
"@babel/cli": "^7.25.6",
|
|
@@ -25,7 +25,7 @@ test('pass all wrapper arguments to the jar', async () => {
|
|
|
25
25
|
callSpecmaticCli(testArgs);
|
|
26
26
|
const specmaticJarPath = path.resolve(__dirname, '..', '..', '..', specmaticCoreJarName);
|
|
27
27
|
expect(spawn.mock.calls[0][1][1]).toBe(`"${path.resolve(specmaticJarPath)}"`);
|
|
28
|
-
expect(spawn.mock.calls[0][1][2]).toBe(
|
|
28
|
+
expect(spawn.mock.calls[0][1][2]).toBe("stub *.specmatic --data=\"src/mocks\" --host=\"localhost\" --port=\"8000\"");
|
|
29
29
|
});
|
|
30
30
|
|
|
31
31
|
test('pass kafka related calls to the kafka jar', async () => {
|
|
@@ -36,7 +36,7 @@ test('pass kafka related calls to the kafka jar', async () => {
|
|
|
36
36
|
callSpecmaticCli(testArgs);
|
|
37
37
|
const specmaticKafkaJarPath = path.resolve(__dirname, '..', '..', '..', '..', 'specmatic-beta', 'kafka', specmaticKafkaJarName);
|
|
38
38
|
expect(spawn.mock.calls[0][1][1]).toBe(`"${path.resolve(specmaticKafkaJarPath)}"`);
|
|
39
|
-
expect(spawn.mock.calls[0][1][2]).toBe(
|
|
39
|
+
expect(spawn.mock.calls[0][1][2]).toBe("--host=\"localhost\" --port=\"8000\"");
|
|
40
40
|
});
|
|
41
41
|
|
|
42
42
|
|
|
@@ -48,5 +48,16 @@ test('pass graphql related calls to the graphql jar', async () => {
|
|
|
48
48
|
callSpecmaticCli(testArgs);
|
|
49
49
|
const specmaticGraphQlJarPath = path.resolve(__dirname, '..', '..', '..', '..', 'specmatic-beta', 'graphql', specmaticGraphQlJarName);
|
|
50
50
|
expect(spawn.mock.calls[0][1][1]).toBe(`"${path.resolve(specmaticGraphQlJarPath)}"`);
|
|
51
|
-
expect(spawn.mock.calls[0][1][2]).toBe(
|
|
52
|
-
})
|
|
51
|
+
expect(spawn.mock.calls[0][1][2]).toBe("--host=\"localhost\" --port=\"8000\"");
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
test('pass filter arguments to the jar', async () => {
|
|
55
|
+
spawn.mockReturnValue(javaProcessMock);
|
|
56
|
+
|
|
57
|
+
jest.spyOn(fs, 'existsSync').mockReturnValue(true);
|
|
58
|
+
const testArgs = ['node', 'index.js', 'test', '*.specmatic', '--testBaseURL', 'http://localhost:9000', '--filter="PATH=\'/todos/add\' || STATUS=\'404\'"'];
|
|
59
|
+
callSpecmaticCli(testArgs);
|
|
60
|
+
const specmaticJarPath = path.resolve(__dirname, '..', '..', '..', specmaticCoreJarName);
|
|
61
|
+
expect(spawn.mock.calls[0][1][1]).toBe(`"${path.resolve(specmaticJarPath)}"`);
|
|
62
|
+
expect(spawn.mock.calls[0][1][2]).toBe("test *.specmatic --testBaseURL=\"http://localhost:9000\" --filter=\"PATH='/todos/add' || STATUS='404'\"");
|
|
63
|
+
});
|
package/src/bin/command.line.ts
CHANGED
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
import logger from '../common/logger'
|
|
2
2
|
import { callKafka, callCore, callGraphQl } from '../common/runner'
|
|
3
|
+
import yargs from 'yargs/yargs';
|
|
4
|
+
import { hideBin } from 'yargs/helpers';
|
|
3
5
|
|
|
4
6
|
const callSpecmaticCli = (args?: string[]) => {
|
|
5
7
|
args = args || process.argv
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
8
|
+
const argv = yargs(hideBin(args)).parseSync();
|
|
9
|
+
const { _, $0, ...namedArgs } = argv;
|
|
10
|
+
const fn = getJarFunction(_);
|
|
11
|
+
const command = (_.join(' ') + ' ' + Object.entries(namedArgs).map(([key, value]) => `--${key}="${String(value)}"`).join(' ')).trim();
|
|
12
|
+
|
|
13
|
+
logger.info(`CLI: Running with args "${command}"`);
|
|
9
14
|
fn(
|
|
10
|
-
|
|
15
|
+
command,
|
|
11
16
|
(err?: any) => {
|
|
12
17
|
if (err) {
|
|
13
18
|
logger.info('CLI: Finished with non zero exit code: ', err.code)
|
|
@@ -20,15 +25,17 @@ const callSpecmaticCli = (args?: string[]) => {
|
|
|
20
25
|
message => {
|
|
21
26
|
console.log(`${message}`)
|
|
22
27
|
}
|
|
23
|
-
)
|
|
28
|
+
);
|
|
24
29
|
}
|
|
25
30
|
|
|
26
|
-
function getJarFunction(
|
|
27
|
-
if(
|
|
28
|
-
switch (
|
|
31
|
+
function getJarFunction(operation: any[]) {
|
|
32
|
+
if(operation.length > 0) {
|
|
33
|
+
switch (String(operation[0])) {
|
|
29
34
|
case 'kafka':
|
|
35
|
+
operation.splice(0,1);
|
|
30
36
|
return callKafka
|
|
31
37
|
case 'graphql':
|
|
38
|
+
operation.splice(0,1);
|
|
32
39
|
return callGraphQl
|
|
33
40
|
default:
|
|
34
41
|
return callCore
|
|
@@ -37,17 +44,4 @@ function getJarFunction(args: string[]) {
|
|
|
37
44
|
return callCore
|
|
38
45
|
}
|
|
39
46
|
|
|
40
|
-
function extractArgsForJar(args: string[]) {
|
|
41
|
-
if(args.length >= 3) {
|
|
42
|
-
switch (args[2]) {
|
|
43
|
-
case 'kafka':
|
|
44
|
-
case 'graphql':
|
|
45
|
-
return args.slice(3).join(' ')
|
|
46
|
-
default:
|
|
47
|
-
return args.slice(2).join(' ')
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
return args.slice(2).join(' ')
|
|
51
|
-
}
|
|
52
|
-
|
|
53
47
|
export default callSpecmaticCli
|