@sasjs/cli 4.10.0 → 4.11.0
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.
|
@@ -108,9 +108,9 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
|
|
|
108
108
|
.startComputeJob(jobPath, null, { contextName: contextName }, authConfig, waitForJob || !!logFile, pollOptions, true, macroVars === null || macroVars === void 0 ? void 0 : macroVars.macroVars)
|
|
109
109
|
.catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
|
|
110
110
|
var logData;
|
|
111
|
-
var _a;
|
|
112
|
-
return __generator(this, function (
|
|
113
|
-
switch (
|
|
111
|
+
var _a, _b;
|
|
112
|
+
return __generator(this, function (_c) {
|
|
113
|
+
switch (_c.label) {
|
|
114
114
|
case 0:
|
|
115
115
|
if (!(err instanceof node_1.NoSessionStateError)) return [3 /*break*/, 4];
|
|
116
116
|
if (!(err === null || err === void 0 ? void 0 : err.logUrl)) return [3 /*break*/, 3];
|
|
@@ -118,26 +118,26 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
|
|
|
118
118
|
// save log
|
|
119
119
|
];
|
|
120
120
|
case 1:
|
|
121
|
-
logData =
|
|
121
|
+
logData = _c.sent();
|
|
122
122
|
// save log
|
|
123
123
|
return [4 /*yield*/, (0, utils_3.saveLog)(logData, logFile, jobPath)];
|
|
124
124
|
case 2:
|
|
125
125
|
// save log
|
|
126
|
-
|
|
127
|
-
|
|
126
|
+
_c.sent();
|
|
127
|
+
_c.label = 3;
|
|
128
128
|
case 3:
|
|
129
129
|
(0, displayResult_1.displayError)(err);
|
|
130
130
|
// terminate process with status code 2
|
|
131
131
|
(0, utils_2.terminateProcess)(2);
|
|
132
|
-
|
|
132
|
+
_c.label = 4;
|
|
133
133
|
case 4:
|
|
134
134
|
if (!(err === null || err === void 0 ? void 0 : err.log)) return [3 /*break*/, 6];
|
|
135
135
|
return [4 /*yield*/, (0, utils_3.saveLog)(err.log, logFile, jobPath)
|
|
136
136
|
// handle use case when job wasn't found
|
|
137
137
|
];
|
|
138
138
|
case 5:
|
|
139
|
-
|
|
140
|
-
|
|
139
|
+
_c.sent();
|
|
140
|
+
_c.label = 6;
|
|
141
141
|
case 6:
|
|
142
142
|
// handle use case when job wasn't found
|
|
143
143
|
if ((err === null || err === void 0 ? void 0 : err.name) === 'NotFoundError') {
|
|
@@ -145,8 +145,8 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
|
|
|
145
145
|
}
|
|
146
146
|
// get additional information about error if it is present
|
|
147
147
|
result =
|
|
148
|
-
typeof err === 'object' &&
|
|
149
|
-
? JSON.stringify({ state: (
|
|
148
|
+
typeof err === 'object' && err.job && ((_a = err.job) === null || _a === void 0 ? void 0 : _a.state)
|
|
149
|
+
? JSON.stringify({ state: (_b = err.job) === null || _b === void 0 ? void 0 : _b.state })
|
|
150
150
|
: "".concat(err);
|
|
151
151
|
if (err.job) {
|
|
152
152
|
return [2 /*return*/, err.job];
|
|
@@ -85,6 +85,7 @@ var sasJsModules = __importStar(require("../../../utils/createSASjsInstance"));
|
|
|
85
85
|
var testResponses_1 = require("./mockedAdapter/testResponses");
|
|
86
86
|
var fileModule = __importStar(require("@sasjs/utils/file"));
|
|
87
87
|
var utilsModule = __importStar(require("@sasjs/utils/utils"));
|
|
88
|
+
var readAndValidateInputModule = __importStar(require("@sasjs/utils/input/readAndValidateInput"));
|
|
88
89
|
var configUtils = __importStar(require("../../../utils/config"));
|
|
89
90
|
var chalk_1 = __importDefault(require("chalk"));
|
|
90
91
|
var mocks_1 = require("../../context/spec/mocks");
|
|
@@ -784,4 +785,7 @@ var setupMocksForSASJS = function () {
|
|
|
784
785
|
}); }
|
|
785
786
|
};
|
|
786
787
|
});
|
|
788
|
+
jest
|
|
789
|
+
.spyOn(readAndValidateInputModule, 'getString')
|
|
790
|
+
.mockImplementation(function () { return Promise.resolve('mocked input'); });
|
|
787
791
|
};
|
package/package.json
CHANGED
|
@@ -51,16 +51,16 @@
|
|
|
51
51
|
"access": "public"
|
|
52
52
|
},
|
|
53
53
|
"dependencies": {
|
|
54
|
-
"@sasjs/adapter": "4.
|
|
54
|
+
"@sasjs/adapter": "4.10.0",
|
|
55
55
|
"@sasjs/core": "4.46.3",
|
|
56
56
|
"@sasjs/lint": "2.3.1",
|
|
57
57
|
"@sasjs/utils": "3.4.0",
|
|
58
|
-
"adm-zip": "0.5.
|
|
58
|
+
"adm-zip": "0.5.10",
|
|
59
59
|
"chalk": "4.1.2",
|
|
60
60
|
"dotenv": "16.0.3",
|
|
61
61
|
"esm": "3.2.25",
|
|
62
62
|
"find": "0.3.0",
|
|
63
|
-
"js-base64": "3.7.
|
|
63
|
+
"js-base64": "3.7.5",
|
|
64
64
|
"jsdom": "22.1.0",
|
|
65
65
|
"jwt-decode": "3.1.2",
|
|
66
66
|
"lodash.groupby": "4.6.0",
|
|
@@ -96,7 +96,7 @@
|
|
|
96
96
|
"jest-cli": "29.4.3",
|
|
97
97
|
"jest-environment-jsdom": "29.4.3",
|
|
98
98
|
"jest-extended": "3.2.4",
|
|
99
|
-
"nodemon": "
|
|
99
|
+
"nodemon": "3.0.1",
|
|
100
100
|
"prettier": "2.6.2",
|
|
101
101
|
"ts-jest": "29.0.5",
|
|
102
102
|
"ts-node": "10.4.0",
|
|
@@ -104,5 +104,5 @@
|
|
|
104
104
|
"typescript": "4.9.5",
|
|
105
105
|
"util": "0.12.4"
|
|
106
106
|
},
|
|
107
|
-
"version": "4.
|
|
107
|
+
"version": "4.11.0"
|
|
108
108
|
}
|