@sasjs/cli 4.0.4 → 4.0.6
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/build/cli.js +2 -5
- package/build/commands/add/spec/addCommand.spec.js +7 -0
- package/build/commands/build/build.d.ts +1 -1
- package/build/commands/build/build.js +9 -14
- package/build/commands/build/internal/config.js +14 -21
- package/build/commands/build/spec/buildCommand.spec.js +8 -1
- package/build/commands/build/spec/compileBuildCommand.spec.js +8 -1
- package/build/commands/compile/compile.js +22 -24
- package/build/commands/compile/internal/compileTestFile.d.ts +1 -1
- package/build/commands/compile/internal/compileTestFile.js +16 -24
- package/build/commands/compile/internal/getAllFolders.d.ts +1 -1
- package/build/commands/compile/internal/getAllFolders.js +28 -40
- package/build/commands/compile/internal/getServerType.js +6 -12
- package/build/commands/compile/internal/loadDependencies.d.ts +1 -1
- package/build/commands/compile/internal/loadDependencies.js +6 -7
- package/build/commands/compile/internal/spec/getAllFolders.spec.js +1 -1
- package/build/commands/compile/spec/compile.spec.js +43 -29
- package/build/commands/compile/spec/compileCommand.spec.js +11 -3
- package/build/commands/compile/spec/loadDependencies.spec.js +11 -6
- package/build/commands/context/spec/contextCommand.spec.js +8 -0
- package/build/commands/deploy/internal/getDeployScripts.js +4 -15
- package/build/commands/deploy/spec/cbd.spec.js +26 -22
- package/build/commands/deploy/spec/compileBuildDeployCommand.spec.js +9 -2
- package/build/commands/deploy/spec/deployCommand.spec.js +7 -0
- package/build/commands/docs/docsCommand.js +4 -9
- package/build/commands/docs/spec/docsCommand.spec.js +4 -0
- package/build/commands/flow/spec/flowCommand.spec.js +7 -11
- package/build/commands/folder/spec/folderCommand.spec.js +7 -0
- package/build/commands/fs/spec/fsCommand.spec.js +19 -22
- package/build/commands/job/spec/jobCommand.spec.js +6 -0
- package/build/commands/request/spec/requestCommand.spec.js +7 -11
- package/build/commands/run/spec/runCommand.spec.js +7 -11
- package/build/commands/servicepack/spec/servicepackCommand.spec.js +7 -11
- package/build/commands/testing/spec/testCommand.spec.js +7 -11
- package/build/commands/web/spec/web.spec.js +12 -7
- package/build/commands/web/spec/webCommand.spec.js +8 -1
- package/build/types/command/targetCommand.js +25 -5
- package/build/utils/config.js +60 -74
- package/build/utils/setConstants.d.ts +2 -3
- package/build/utils/setConstants.js +55 -77
- package/build/utils/spec/setConstants.spec.js +1 -1
- package/build/utils/test.js +32 -17
- package/package.json +1 -1
|
@@ -91,6 +91,7 @@ var utils_2 = require("../../../utils");
|
|
|
91
91
|
var FSModule = __importStar(require("@sasjs/utils/fs"));
|
|
92
92
|
var FileModule = __importStar(require("@sasjs/utils/file"));
|
|
93
93
|
var configUtils = __importStar(require("../../../utils/config"));
|
|
94
|
+
var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
|
|
94
95
|
var executeCodeModule = __importStar(require("../internal/executeCode"));
|
|
95
96
|
var defaultArgs = ['node', 'sasjs', 'fs'];
|
|
96
97
|
var target = new utils_1.Target({
|
|
@@ -102,10 +103,11 @@ describe('FSCommand', function () {
|
|
|
102
103
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
103
104
|
return __generator(this, function (_a) {
|
|
104
105
|
switch (_a.label) {
|
|
105
|
-
case 0:
|
|
106
|
+
case 0:
|
|
107
|
+
process.projectDir = __dirname;
|
|
108
|
+
return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
106
109
|
case 1:
|
|
107
110
|
_a.sent();
|
|
108
|
-
process.projectDir = __dirname;
|
|
109
111
|
return [2 /*return*/];
|
|
110
112
|
}
|
|
111
113
|
});
|
|
@@ -126,11 +128,7 @@ describe('FSCommand', function () {
|
|
|
126
128
|
jest
|
|
127
129
|
.spyOn(FileModule, 'createFile')
|
|
128
130
|
.mockImplementation(function () { return Promise.resolve(); });
|
|
129
|
-
|
|
130
|
-
.spyOn(configUtils, 'findTargetInConfiguration')
|
|
131
|
-
.mockImplementation(function () {
|
|
132
|
-
return Promise.resolve({ target: target, isLocal: true });
|
|
133
|
-
});
|
|
131
|
+
setupMocks();
|
|
134
132
|
return [4 /*yield*/, executeCommandWrapper([
|
|
135
133
|
'compile',
|
|
136
134
|
'localFolder',
|
|
@@ -152,11 +150,7 @@ describe('FSCommand', function () {
|
|
|
152
150
|
jest
|
|
153
151
|
.spyOn(FileModule, 'createFile')
|
|
154
152
|
.mockImplementation(function () { return Promise.reject(); });
|
|
155
|
-
|
|
156
|
-
.spyOn(configUtils, 'findTargetInConfiguration')
|
|
157
|
-
.mockImplementation(function () {
|
|
158
|
-
return Promise.resolve({ target: target, isLocal: true });
|
|
159
|
-
});
|
|
153
|
+
setupMocks();
|
|
160
154
|
return [4 /*yield*/, executeCommandWrapper(['compile', 'localFolder'])];
|
|
161
155
|
case 1:
|
|
162
156
|
returnCode = _a.sent();
|
|
@@ -172,11 +166,7 @@ describe('FSCommand', function () {
|
|
|
172
166
|
process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
|
|
173
167
|
jest.spyOn(process.logger, 'error');
|
|
174
168
|
jest.spyOn(process.logger, 'info');
|
|
175
|
-
|
|
176
|
-
.spyOn(configUtils, 'findTargetInConfiguration')
|
|
177
|
-
.mockImplementation(function () {
|
|
178
|
-
return Promise.resolve({ target: target, isLocal: true });
|
|
179
|
-
});
|
|
169
|
+
setupMocks();
|
|
180
170
|
jest
|
|
181
171
|
.spyOn(FSModule, 'generateCompileProgram')
|
|
182
172
|
.mockImplementation(function () { return Promise.resolve(''); });
|
|
@@ -235,11 +225,7 @@ describe('FSCommand', function () {
|
|
|
235
225
|
jest
|
|
236
226
|
.spyOn(FileModule, 'createFile')
|
|
237
227
|
.mockImplementation(function () { return Promise.resolve(); });
|
|
238
|
-
|
|
239
|
-
.spyOn(configUtils, 'findTargetInConfiguration')
|
|
240
|
-
.mockImplementation(function () {
|
|
241
|
-
return Promise.resolve({ target: target, isLocal: true });
|
|
242
|
-
});
|
|
228
|
+
setupMocks();
|
|
243
229
|
jest
|
|
244
230
|
.spyOn(FSModule, 'generateProgramToGetRemoteHash')
|
|
245
231
|
.mockImplementation(function () { return Promise.resolve(''); });
|
|
@@ -355,6 +341,17 @@ describe('FSCommand', function () {
|
|
|
355
341
|
}); });
|
|
356
342
|
});
|
|
357
343
|
});
|
|
344
|
+
var setupMocks = function () {
|
|
345
|
+
jest
|
|
346
|
+
.spyOn(configUtils, 'findTargetInConfiguration')
|
|
347
|
+
.mockImplementation(function () { return Promise.resolve({ target: target, isLocal: true }); });
|
|
348
|
+
jest
|
|
349
|
+
.spyOn(configUtils, 'getLocalConfig')
|
|
350
|
+
.mockImplementation(function () { return Promise.resolve({}); });
|
|
351
|
+
jest
|
|
352
|
+
.spyOn(setConstantsUtils, 'setConstants')
|
|
353
|
+
.mockImplementation(function () { return Promise.resolve(); });
|
|
354
|
+
};
|
|
358
355
|
var executeCommandWrapper = function (additionalParams) { return __awaiter(void 0, void 0, void 0, function () {
|
|
359
356
|
var args, command;
|
|
360
357
|
return __generator(this, function (_a) {
|
|
@@ -491,6 +491,9 @@ var setupMocksForViya = function () {
|
|
|
491
491
|
.mockImplementation(function () {
|
|
492
492
|
return Promise.resolve({ target: targetViya, isLocal: true });
|
|
493
493
|
});
|
|
494
|
+
jest
|
|
495
|
+
.spyOn(configUtils, 'getLocalConfig')
|
|
496
|
+
.mockImplementation(function () { return Promise.resolve({}); });
|
|
494
497
|
jest
|
|
495
498
|
.spyOn(configUtils, 'getSASjsAndAuthConfig')
|
|
496
499
|
.mockImplementation(function (target) {
|
|
@@ -517,6 +520,9 @@ var setupMocksForSAS9 = function () {
|
|
|
517
520
|
.mockImplementation(function () {
|
|
518
521
|
return Promise.resolve({ target: target9, isLocal: true });
|
|
519
522
|
});
|
|
523
|
+
jest
|
|
524
|
+
.spyOn(configUtils, 'getLocalConfig')
|
|
525
|
+
.mockImplementation(function () { return Promise.resolve({}); });
|
|
520
526
|
process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
|
|
521
527
|
jest.spyOn(process.logger, 'error');
|
|
522
528
|
};
|
|
@@ -88,8 +88,8 @@ var requestModule = __importStar(require("../request"));
|
|
|
88
88
|
var requestCommand_1 = require("../requestCommand");
|
|
89
89
|
var utils_1 = require("@sasjs/utils");
|
|
90
90
|
var configUtils = __importStar(require("../../../utils/config"));
|
|
91
|
+
var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
|
|
91
92
|
var command_1 = require("../../../types/command");
|
|
92
|
-
var utils_2 = require("../../../utils");
|
|
93
93
|
var defaultArgs = ['node', 'sasjs'];
|
|
94
94
|
var target = new utils_1.Target({
|
|
95
95
|
name: 'test',
|
|
@@ -103,16 +103,6 @@ var configFilePath = 'path/to/config.json';
|
|
|
103
103
|
var outputPath = './output.txt';
|
|
104
104
|
var logPath = './log.txt';
|
|
105
105
|
describe('RequestCommand', function () {
|
|
106
|
-
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
107
|
-
return __generator(this, function (_a) {
|
|
108
|
-
switch (_a.label) {
|
|
109
|
-
case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
110
|
-
case 1:
|
|
111
|
-
_a.sent();
|
|
112
|
-
return [2 /*return*/];
|
|
113
|
-
}
|
|
114
|
-
});
|
|
115
|
-
}); });
|
|
116
106
|
beforeEach(function () {
|
|
117
107
|
setupMocks();
|
|
118
108
|
});
|
|
@@ -294,6 +284,12 @@ var setupMocks = function () {
|
|
|
294
284
|
jest
|
|
295
285
|
.spyOn(configUtils, 'findTargetInConfiguration')
|
|
296
286
|
.mockImplementation(function () { return Promise.resolve({ target: target, isLocal: true }); });
|
|
287
|
+
jest
|
|
288
|
+
.spyOn(configUtils, 'getLocalConfig')
|
|
289
|
+
.mockImplementation(function () { return Promise.resolve({}); });
|
|
290
|
+
jest
|
|
291
|
+
.spyOn(setConstantsUtils, 'setConstants')
|
|
292
|
+
.mockImplementation(function () { return Promise.resolve(); });
|
|
297
293
|
process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
|
|
298
294
|
jest.spyOn(process.logger, 'error');
|
|
299
295
|
};
|
|
@@ -88,8 +88,8 @@ var runModule = __importStar(require("../run"));
|
|
|
88
88
|
var runCommand_1 = require("../runCommand");
|
|
89
89
|
var utils_1 = require("@sasjs/utils");
|
|
90
90
|
var configUtils = __importStar(require("../../../utils/config"));
|
|
91
|
+
var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
|
|
91
92
|
var command_1 = require("../../../types/command");
|
|
92
|
-
var utils_2 = require("../../../utils");
|
|
93
93
|
var defaultArgs = ['node', 'sasjs', 'run'];
|
|
94
94
|
var target = new utils_1.Target({
|
|
95
95
|
name: 'test',
|
|
@@ -101,16 +101,6 @@ var sourceFilePath = 'path/to/source.json';
|
|
|
101
101
|
var sasFilePath = 'path/to/soure.sas';
|
|
102
102
|
var logFilePath = 'path/to/log.log';
|
|
103
103
|
describe('RunCommand', function () {
|
|
104
|
-
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
105
|
-
return __generator(this, function (_a) {
|
|
106
|
-
switch (_a.label) {
|
|
107
|
-
case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
108
|
-
case 1:
|
|
109
|
-
_a.sent();
|
|
110
|
-
return [2 /*return*/];
|
|
111
|
-
}
|
|
112
|
-
});
|
|
113
|
-
}); });
|
|
114
104
|
beforeEach(function () {
|
|
115
105
|
setupMocks();
|
|
116
106
|
});
|
|
@@ -211,6 +201,12 @@ var setupMocks = function () {
|
|
|
211
201
|
jest
|
|
212
202
|
.spyOn(configUtils, 'findTargetInConfiguration')
|
|
213
203
|
.mockImplementation(function () { return Promise.resolve({ target: target, isLocal: true }); });
|
|
204
|
+
jest
|
|
205
|
+
.spyOn(configUtils, 'getLocalConfig')
|
|
206
|
+
.mockImplementation(function () { return Promise.resolve({}); });
|
|
207
|
+
jest
|
|
208
|
+
.spyOn(setConstantsUtils, 'setConstants')
|
|
209
|
+
.mockImplementation(function () { return Promise.resolve(); });
|
|
214
210
|
process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
|
|
215
211
|
jest.spyOn(process.logger, 'error');
|
|
216
212
|
};
|
|
@@ -88,8 +88,8 @@ var deployModule = __importStar(require("../deploy"));
|
|
|
88
88
|
var servicePackCommand_1 = require("../servicePackCommand");
|
|
89
89
|
var utils_1 = require("@sasjs/utils");
|
|
90
90
|
var configUtils = __importStar(require("../../../utils/config"));
|
|
91
|
+
var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
|
|
91
92
|
var command_1 = require("../../../types/command");
|
|
92
|
-
var utils_2 = require("../../../utils");
|
|
93
93
|
var defaultArgs = ['node', 'sasjs', 'servicepack', 'deploy'];
|
|
94
94
|
var target = new utils_1.Target({
|
|
95
95
|
name: 'test',
|
|
@@ -99,16 +99,6 @@ var target = new utils_1.Target({
|
|
|
99
99
|
});
|
|
100
100
|
var source = 'path/to/json';
|
|
101
101
|
describe('ServicePackCommand', function () {
|
|
102
|
-
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
103
|
-
return __generator(this, function (_a) {
|
|
104
|
-
switch (_a.label) {
|
|
105
|
-
case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
106
|
-
case 1:
|
|
107
|
-
_a.sent();
|
|
108
|
-
return [2 /*return*/];
|
|
109
|
-
}
|
|
110
|
-
});
|
|
111
|
-
}); });
|
|
112
102
|
beforeEach(function () {
|
|
113
103
|
setupMocks();
|
|
114
104
|
});
|
|
@@ -191,6 +181,12 @@ var setupMocks = function () {
|
|
|
191
181
|
jest
|
|
192
182
|
.spyOn(configUtils, 'findTargetInConfiguration')
|
|
193
183
|
.mockImplementation(function () { return Promise.resolve({ target: target, isLocal: true }); });
|
|
184
|
+
jest
|
|
185
|
+
.spyOn(configUtils, 'getLocalConfig')
|
|
186
|
+
.mockImplementation(function () { return Promise.resolve({}); });
|
|
187
|
+
jest
|
|
188
|
+
.spyOn(setConstantsUtils, 'setConstants')
|
|
189
|
+
.mockImplementation(function () { return Promise.resolve(); });
|
|
194
190
|
process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
|
|
195
191
|
jest.spyOn(process.logger, 'error');
|
|
196
192
|
};
|
|
@@ -88,8 +88,8 @@ var testModule = __importStar(require("../test"));
|
|
|
88
88
|
var testCommand_1 = require("../testCommand");
|
|
89
89
|
var utils_1 = require("@sasjs/utils");
|
|
90
90
|
var configUtils = __importStar(require("../../../utils/config"));
|
|
91
|
+
var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
|
|
91
92
|
var command_1 = require("../../../types/command");
|
|
92
|
-
var utils_2 = require("../../../utils");
|
|
93
93
|
var defaultArgs = ['node', 'sasjs'];
|
|
94
94
|
var target = new utils_1.Target({
|
|
95
95
|
name: 'testTarget',
|
|
@@ -98,16 +98,6 @@ var target = new utils_1.Target({
|
|
|
98
98
|
contextName: 'test context'
|
|
99
99
|
});
|
|
100
100
|
describe('TestCommand', function () {
|
|
101
|
-
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
102
|
-
return __generator(this, function (_a) {
|
|
103
|
-
switch (_a.label) {
|
|
104
|
-
case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
105
|
-
case 1:
|
|
106
|
-
_a.sent();
|
|
107
|
-
return [2 /*return*/];
|
|
108
|
-
}
|
|
109
|
-
});
|
|
110
|
-
}); });
|
|
111
101
|
beforeEach(function () {
|
|
112
102
|
setupMocks();
|
|
113
103
|
});
|
|
@@ -235,6 +225,12 @@ var setupMocks = function () {
|
|
|
235
225
|
jest
|
|
236
226
|
.spyOn(configUtils, 'findTargetInConfiguration')
|
|
237
227
|
.mockImplementation(function () { return Promise.resolve({ target: target, isLocal: true }); });
|
|
228
|
+
jest
|
|
229
|
+
.spyOn(configUtils, 'getLocalConfig')
|
|
230
|
+
.mockImplementation(function () { return Promise.resolve({}); });
|
|
231
|
+
jest
|
|
232
|
+
.spyOn(setConstantsUtils, 'setConstants')
|
|
233
|
+
.mockImplementation(function () { return Promise.resolve(); });
|
|
238
234
|
process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
|
|
239
235
|
jest.spyOn(process.logger, 'error');
|
|
240
236
|
};
|
|
@@ -117,27 +117,32 @@ var streamConfig = {
|
|
|
117
117
|
describe('sasjs web', function () {
|
|
118
118
|
var appName;
|
|
119
119
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
120
|
-
|
|
121
|
-
|
|
120
|
+
var _a;
|
|
121
|
+
return __generator(this, function (_b) {
|
|
122
|
+
switch (_b.label) {
|
|
122
123
|
case 0:
|
|
123
124
|
appName = "cli-test-web-minimal-".concat((0, utils_1.generateTimestamp)());
|
|
124
125
|
return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, appName)];
|
|
125
126
|
case 1:
|
|
126
|
-
|
|
127
|
+
_b.sent();
|
|
127
128
|
return [4 /*yield*/, (0, test_1.updateConfig)({
|
|
128
129
|
streamConfig: __assign(__assign({}, streamConfig), { streamServiceName: undefined })
|
|
129
130
|
})];
|
|
130
131
|
case 2:
|
|
131
|
-
|
|
132
|
+
_b.sent();
|
|
132
133
|
return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(__dirname, appName, streamConfig.webSourcePath, 'testing.js.map'), '')];
|
|
133
134
|
case 3:
|
|
134
|
-
|
|
135
|
+
_b.sent();
|
|
135
136
|
return [4 /*yield*/, (0, test_1.updateTarget)({ streamConfig: undefined }, 'viya')];
|
|
136
137
|
case 4:
|
|
137
|
-
|
|
138
|
+
_b.sent();
|
|
138
139
|
return [4 /*yield*/, (0, test_1.updateTarget)({ serverUrl: undefined, streamConfig: undefined }, 'sas9')];
|
|
139
140
|
case 5:
|
|
140
|
-
|
|
141
|
+
_b.sent();
|
|
142
|
+
_a = process;
|
|
143
|
+
return [4 /*yield*/, (0, utils_2.getLocalConfig)()];
|
|
144
|
+
case 6:
|
|
145
|
+
_a.sasjsConfig = _b.sent();
|
|
141
146
|
return [2 /*return*/];
|
|
142
147
|
}
|
|
143
148
|
});
|
|
@@ -88,6 +88,7 @@ var webModule = __importStar(require("../web"));
|
|
|
88
88
|
var webCommand_1 = require("../webCommand");
|
|
89
89
|
var utils_1 = require("@sasjs/utils");
|
|
90
90
|
var configUtils = __importStar(require("../../../utils/config"));
|
|
91
|
+
var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
|
|
91
92
|
var command_1 = require("../../../types/command");
|
|
92
93
|
var utils_2 = require("../../../utils");
|
|
93
94
|
describe('WebCommand', function () {
|
|
@@ -101,7 +102,7 @@ describe('WebCommand', function () {
|
|
|
101
102
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
102
103
|
return __generator(this, function (_a) {
|
|
103
104
|
switch (_a.label) {
|
|
104
|
-
case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
105
|
+
case 0: return [4 /*yield*/, (0, utils_2.setConstants)(false)];
|
|
105
106
|
case 1:
|
|
106
107
|
_a.sent();
|
|
107
108
|
return [2 /*return*/];
|
|
@@ -118,6 +119,12 @@ describe('WebCommand', function () {
|
|
|
118
119
|
jest
|
|
119
120
|
.spyOn(configUtils, 'findTargetInConfiguration')
|
|
120
121
|
.mockImplementation(function () { return Promise.resolve({ target: target, isLocal: true }); });
|
|
122
|
+
jest
|
|
123
|
+
.spyOn(configUtils, 'getLocalConfig')
|
|
124
|
+
.mockImplementation(function () { return Promise.resolve({}); });
|
|
125
|
+
jest
|
|
126
|
+
.spyOn(setConstantsUtils, 'setConstants')
|
|
127
|
+
.mockImplementation(function () { return Promise.resolve(); });
|
|
121
128
|
process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
|
|
122
129
|
jest.spyOn(process.logger, 'success');
|
|
123
130
|
jest.spyOn(process.logger, 'error');
|
|
@@ -95,11 +95,31 @@ var TargetCommand = /** @class */ (function (_super) {
|
|
|
95
95
|
case 1:
|
|
96
96
|
_a.sent();
|
|
97
97
|
return [4 /*yield*/, (0, utils_1.findTargetInConfiguration)(targetName)
|
|
98
|
-
.then(function (res) {
|
|
99
|
-
|
|
100
|
-
(
|
|
101
|
-
|
|
102
|
-
|
|
98
|
+
.then(function (res) { return __awaiter(_this, void 0, void 0, function () {
|
|
99
|
+
var configuration, _a;
|
|
100
|
+
return __generator(this, function (_b) {
|
|
101
|
+
switch (_b.label) {
|
|
102
|
+
case 0:
|
|
103
|
+
this._targetInfo = res;
|
|
104
|
+
if (!res.isLocal) return [3 /*break*/, 2];
|
|
105
|
+
return [4 /*yield*/, (0, utils_1.getLocalConfig)()];
|
|
106
|
+
case 1:
|
|
107
|
+
_a = _b.sent();
|
|
108
|
+
return [3 /*break*/, 4];
|
|
109
|
+
case 2: return [4 /*yield*/, (0, utils_1.getGlobalRcFile)()];
|
|
110
|
+
case 3:
|
|
111
|
+
_a = _b.sent();
|
|
112
|
+
_b.label = 4;
|
|
113
|
+
case 4:
|
|
114
|
+
configuration = _a;
|
|
115
|
+
return [4 /*yield*/, (0, utils_1.setConstants)(res.isLocal, res.target, configuration)];
|
|
116
|
+
case 5:
|
|
117
|
+
_b.sent();
|
|
118
|
+
process.sasjsConfig = configuration;
|
|
119
|
+
return [2 /*return*/, res];
|
|
120
|
+
}
|
|
121
|
+
});
|
|
122
|
+
}); })
|
|
103
123
|
.catch(function (err) {
|
|
104
124
|
var _a;
|
|
105
125
|
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error reading target from configuration: ', err);
|
package/build/utils/config.js
CHANGED
|
@@ -652,52 +652,42 @@ exports.getFolders = getFolders;
|
|
|
652
652
|
*/
|
|
653
653
|
function getProgramFolders(target) {
|
|
654
654
|
return __awaiter(this, void 0, void 0, function () {
|
|
655
|
-
var programFolders,
|
|
655
|
+
var programFolders, configuration, buildSourceFolder, programFoldersWithAbsolutePath;
|
|
656
656
|
return __generator(this, function (_a) {
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
programFolders = programFolders.concat(localConfig.programFolders);
|
|
665
|
-
}
|
|
666
|
-
if (target === null || target === void 0 ? void 0 : target.programFolders) {
|
|
667
|
-
programFolders = programFolders.concat(target.programFolders);
|
|
668
|
-
}
|
|
669
|
-
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
670
|
-
programFolders = programFolders.map(function (programFolder) {
|
|
671
|
-
return (0, utils_1.getAbsolutePath)(programFolder, buildSourceFolder);
|
|
672
|
-
});
|
|
673
|
-
return [2 /*return*/, __spreadArray([], __read(new Set(programFolders)), false)];
|
|
657
|
+
programFolders = [];
|
|
658
|
+
configuration = process.sasjsConfig;
|
|
659
|
+
if (configuration === null || configuration === void 0 ? void 0 : configuration.programFolders) {
|
|
660
|
+
programFolders.push.apply(programFolders, __spreadArray([], __read(configuration.programFolders), false));
|
|
661
|
+
}
|
|
662
|
+
if (target === null || target === void 0 ? void 0 : target.programFolders) {
|
|
663
|
+
programFolders.push.apply(programFolders, __spreadArray([], __read(target.programFolders), false));
|
|
674
664
|
}
|
|
665
|
+
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
666
|
+
programFoldersWithAbsolutePath = programFolders.map(function (programFolder) {
|
|
667
|
+
return (0, utils_1.getAbsolutePath)(programFolder, buildSourceFolder);
|
|
668
|
+
});
|
|
669
|
+
return [2 /*return*/, __spreadArray([], __read(new Set(programFoldersWithAbsolutePath)), false)];
|
|
675
670
|
});
|
|
676
671
|
});
|
|
677
672
|
}
|
|
678
673
|
exports.getProgramFolders = getProgramFolders;
|
|
679
674
|
function getBinaryFolders(target) {
|
|
680
675
|
return __awaiter(this, void 0, void 0, function () {
|
|
681
|
-
var binaryFolders,
|
|
676
|
+
var binaryFolders, configuration, buildSourceFolder, binaryFoldersWithAbsolutePath;
|
|
682
677
|
return __generator(this, function (_a) {
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
binaryFolders = binaryFolders.concat(localConfig.binaryFolders);
|
|
691
|
-
}
|
|
692
|
-
if (target === null || target === void 0 ? void 0 : target.binaryFolders) {
|
|
693
|
-
binaryFolders = binaryFolders.concat(target.binaryFolders);
|
|
694
|
-
}
|
|
695
|
-
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
696
|
-
binaryFolders = binaryFolders.map(function (binaryFolder) {
|
|
697
|
-
return (0, utils_1.getAbsolutePath)(binaryFolder, buildSourceFolder);
|
|
698
|
-
});
|
|
699
|
-
return [2 /*return*/, __spreadArray([], __read(new Set(binaryFolders)), false)];
|
|
678
|
+
binaryFolders = [];
|
|
679
|
+
configuration = process.sasjsConfig;
|
|
680
|
+
if (configuration === null || configuration === void 0 ? void 0 : configuration.binaryFolders) {
|
|
681
|
+
binaryFolders.push.apply(binaryFolders, __spreadArray([], __read(configuration.binaryFolders), false));
|
|
682
|
+
}
|
|
683
|
+
if (target === null || target === void 0 ? void 0 : target.binaryFolders) {
|
|
684
|
+
binaryFolders.push.apply(binaryFolders, __spreadArray([], __read(target.binaryFolders), false));
|
|
700
685
|
}
|
|
686
|
+
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
687
|
+
binaryFoldersWithAbsolutePath = binaryFolders.map(function (binaryFolder) {
|
|
688
|
+
return (0, utils_1.getAbsolutePath)(binaryFolder, buildSourceFolder);
|
|
689
|
+
});
|
|
690
|
+
return [2 /*return*/, __spreadArray([], __read(new Set(binaryFoldersWithAbsolutePath)), false)];
|
|
701
691
|
});
|
|
702
692
|
});
|
|
703
693
|
}
|
|
@@ -709,25 +699,20 @@ exports.getBinaryFolders = getBinaryFolders;
|
|
|
709
699
|
*/
|
|
710
700
|
function getMacroFolders(target) {
|
|
711
701
|
return __awaiter(this, void 0, void 0, function () {
|
|
712
|
-
var macroFolders,
|
|
702
|
+
var configuration, macroFolders, buildSourceFolder, macroFoldersWithAbsolutePath;
|
|
713
703
|
return __generator(this, function (_a) {
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
case 1:
|
|
719
|
-
localConfig = (_a.sent()).configuration;
|
|
720
|
-
if (target === null || target === void 0 ? void 0 : target.macroFolders)
|
|
721
|
-
macroFolders = target.macroFolders;
|
|
722
|
-
if (localConfig === null || localConfig === void 0 ? void 0 : localConfig.macroFolders) {
|
|
723
|
-
macroFolders = localConfig.macroFolders.concat(macroFolders);
|
|
724
|
-
}
|
|
725
|
-
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
726
|
-
macroFolders = macroFolders.map(function (macroFolder) {
|
|
727
|
-
return (0, utils_1.getAbsolutePath)(macroFolder, buildSourceFolder);
|
|
728
|
-
});
|
|
729
|
-
return [2 /*return*/, __spreadArray([], __read(new Set(macroFolders)), false)];
|
|
704
|
+
configuration = process.sasjsConfig;
|
|
705
|
+
macroFolders = [];
|
|
706
|
+
if (configuration === null || configuration === void 0 ? void 0 : configuration.macroFolders) {
|
|
707
|
+
macroFolders.push.apply(macroFolders, __spreadArray([], __read(configuration.macroFolders), false));
|
|
730
708
|
}
|
|
709
|
+
if (target === null || target === void 0 ? void 0 : target.macroFolders)
|
|
710
|
+
macroFolders.push.apply(macroFolders, __spreadArray([], __read(target.macroFolders), false));
|
|
711
|
+
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
712
|
+
macroFoldersWithAbsolutePath = macroFolders.map(function (macroFolder) {
|
|
713
|
+
return (0, utils_1.getAbsolutePath)(macroFolder, buildSourceFolder);
|
|
714
|
+
});
|
|
715
|
+
return [2 /*return*/, __spreadArray([], __read(new Set(macroFoldersWithAbsolutePath)), false)];
|
|
731
716
|
});
|
|
732
717
|
});
|
|
733
718
|
}
|
|
@@ -739,14 +724,10 @@ exports.getMacroFolders = getMacroFolders;
|
|
|
739
724
|
*/
|
|
740
725
|
function getStreamConfig(target) {
|
|
741
726
|
return __awaiter(this, void 0, void 0, function () {
|
|
742
|
-
var
|
|
727
|
+
var configuration;
|
|
743
728
|
return __generator(this, function (_a) {
|
|
744
|
-
|
|
745
|
-
|
|
746
|
-
case 1:
|
|
747
|
-
localConfig = _a.sent();
|
|
748
|
-
return [2 /*return*/, __assign(__assign({ streamServiceName: 'clickme' }, localConfig === null || localConfig === void 0 ? void 0 : localConfig.streamConfig), target === null || target === void 0 ? void 0 : target.streamConfig)];
|
|
749
|
-
}
|
|
729
|
+
configuration = process.sasjsConfig;
|
|
730
|
+
return [2 /*return*/, __assign(__assign({ streamServiceName: 'clickme' }, configuration === null || configuration === void 0 ? void 0 : configuration.streamConfig), target === null || target === void 0 ? void 0 : target.streamConfig)];
|
|
750
731
|
});
|
|
751
732
|
});
|
|
752
733
|
}
|
|
@@ -898,26 +879,31 @@ function getAuthConfig(target) {
|
|
|
898
879
|
}
|
|
899
880
|
exports.getAuthConfig = getAuthConfig;
|
|
900
881
|
var saveTokens = function (targetName, client, secret, access_token, refresh_token) { return __awaiter(void 0, void 0, void 0, function () {
|
|
901
|
-
var
|
|
902
|
-
var _a, _b, _c
|
|
903
|
-
return __generator(this, function (
|
|
904
|
-
switch (
|
|
905
|
-
case 0: return [4 /*yield*/, getLocalConfig()
|
|
882
|
+
var isLocalTarget, envFileContent, envFilePath, globalConfig, target, targetJson;
|
|
883
|
+
var _a, _b, _c;
|
|
884
|
+
return __generator(this, function (_d) {
|
|
885
|
+
switch (_d.label) {
|
|
886
|
+
case 0: return [4 /*yield*/, getLocalConfig()
|
|
887
|
+
.then(function (localConfig) { var _a; return (_a = localConfig.targets) === null || _a === void 0 ? void 0 : _a.some(function (t) { return t.name === targetName; }); })
|
|
888
|
+
.catch(function () {
|
|
889
|
+
var _a;
|
|
890
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.info('Local sasjsconfig.json file could not be found! Now finding target in global .sasjsrc file');
|
|
891
|
+
return false;
|
|
892
|
+
})];
|
|
906
893
|
case 1:
|
|
907
|
-
|
|
908
|
-
isLocalTarget = (_a = localConfig.targets) === null || _a === void 0 ? void 0 : _a.some(function (t) { return t.name === targetName; });
|
|
894
|
+
isLocalTarget = _d.sent();
|
|
909
895
|
if (!isLocalTarget) return [3 /*break*/, 3];
|
|
910
896
|
envFileContent = "CLIENT=".concat(client, "\nSECRET=").concat(secret, "\nACCESS_TOKEN=").concat(access_token, "\nREFRESH_TOKEN=").concat(refresh_token, "\n");
|
|
911
897
|
envFilePath = path_1.default.join(process.projectDir, ".env.".concat(targetName));
|
|
912
898
|
return [4 /*yield*/, (0, utils_1.createFile)(envFilePath, envFileContent)];
|
|
913
899
|
case 2:
|
|
914
|
-
|
|
915
|
-
(
|
|
900
|
+
_d.sent();
|
|
901
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Environment file saved at ".concat(envFilePath));
|
|
916
902
|
return [3 /*break*/, 6];
|
|
917
903
|
case 3: return [4 /*yield*/, getGlobalRcFile()];
|
|
918
904
|
case 4:
|
|
919
|
-
globalConfig =
|
|
920
|
-
target = (
|
|
905
|
+
globalConfig = _d.sent();
|
|
906
|
+
target = (_b = globalConfig.targets) === null || _b === void 0 ? void 0 : _b.find(function (t) { return t.name === targetName; });
|
|
921
907
|
if (!target) {
|
|
922
908
|
throw new Error(ERROR_MESSAGE(targetName).NOT_FOUND_TARGET_NAME);
|
|
923
909
|
}
|
|
@@ -925,9 +911,9 @@ var saveTokens = function (targetName, client, secret, access_token, refresh_tok
|
|
|
925
911
|
targetJson.authConfig = { client: client, secret: secret, access_token: access_token, refresh_token: refresh_token };
|
|
926
912
|
return [4 /*yield*/, saveToGlobalConfig(new utils_1.Target(targetJson), globalConfig.defaultTarget === targetName)];
|
|
927
913
|
case 5:
|
|
928
|
-
|
|
929
|
-
(
|
|
930
|
-
|
|
914
|
+
_d.sent();
|
|
915
|
+
(_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Target saved to global .sasjsrc file at ~/.sasjsrc.");
|
|
916
|
+
_d.label = 6;
|
|
931
917
|
case 6: return [2 /*return*/];
|
|
932
918
|
}
|
|
933
919
|
});
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Target } from '@sasjs/utils';
|
|
1
|
+
import { Configuration, Target } from '@sasjs/utils';
|
|
2
2
|
export declare const contextName = "sasjs cli compute context";
|
|
3
|
-
export declare const setConstants: () => Promise<void>;
|
|
4
|
-
export declare const updateSasjsConstants: (target: Target, isLocal: boolean) => void;
|
|
3
|
+
export declare const setConstants: (isLocal?: boolean, target?: Target, configuration?: Configuration) => Promise<void>;
|