@sasjs/cli 3.0.1 → 3.1.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.
- package/build/commands/add/addCredential.d.ts +6 -2
- package/build/commands/add/addCredential.js +79 -47
- package/build/commands/add/addTarget.js +32 -20
- package/build/commands/add/internal/input.d.ts +7 -0
- package/build/commands/add/internal/input.js +53 -8
- package/build/commands/add/spec/addTarget.spec.js +78 -0
- package/build/commands/build/build.js +11 -11
- package/build/commands/build/internal/config.d.ts +1 -1
- package/build/commands/build/internal/config.js +5 -6
- package/build/commands/compile/compile.js +4 -4
- package/build/commands/compile/compileCommand.js +2 -1
- package/build/commands/compile/compileSingleFile.d.ts +1 -1
- package/build/commands/compile/compileSingleFile.js +6 -7
- package/build/commands/compile/internal/compareFolders.js +1 -2
- package/build/commands/compile/internal/compileJobFile.js +1 -1
- package/build/commands/compile/internal/compileServiceFile.js +32 -16
- package/build/commands/compile/internal/compileTestFile.d.ts +0 -2
- package/build/commands/compile/internal/compileTestFile.js +11 -15
- package/build/commands/compile/internal/getAllJobFolders.js +1 -1
- package/build/commands/compile/internal/getAllServiceFolders.js +1 -1
- package/build/commands/compile/internal/loadDependencies.d.ts +2 -3
- package/build/commands/compile/internal/loadDependencies.js +43 -230
- package/build/commands/compile/internal/spec/compileTestFile.spec.js +8 -8
- package/build/commands/compile/spec/compile.spec.js +30 -0
- package/build/commands/compile/spec/compileJobFile.spec.js +3 -3
- package/build/commands/compile/spec/compileServiceFile.spec.js +3 -3
- package/build/commands/compile/spec/loadDependencies.spec.js +37 -37
- package/build/commands/create/spec/reactAppFiles.js +5 -5
- package/build/commands/deploy/deploy.js +1 -1
- package/build/commands/deploy/spec/cbd.spec.js +19 -3
- package/build/commands/docs/generateDocs.js +4 -5
- package/build/commands/docs/internal/getFileInputs.d.ts +1 -1
- package/build/commands/docs/internal/getFileInputs.js +2 -2
- package/build/commands/docs/internal/getFileOutputs.d.ts +1 -1
- package/build/commands/docs/internal/getFileOutputs.js +2 -2
- package/build/commands/docs/internal/getFoldersForDocs.d.ts +1 -1
- package/build/commands/docs/internal/getFoldersForDocs.js +1 -1
- package/build/commands/job/internal/execute/viya.js +0 -6
- package/build/commands/job/internal/utils.js +6 -8
- package/build/commands/request/request.js +2 -2
- package/build/commands/run/run.js +1 -1
- package/build/commands/servicepack/deploy.js +1 -1
- package/build/commands/shared/fetchLogFileContent.js +6 -8
- package/build/commands/testing/test.js +1 -1
- package/build/commands/web/internal/getTags.d.ts +2 -1
- package/build/commands/web/internal/getTags.js +10 -12
- package/build/commands/web/internal/getWebServiceContent.js +1 -2
- package/build/commands/web/internal/sasjsout.d.ts +1 -1
- package/build/commands/web/internal/sasjsout.js +1 -1
- package/build/commands/web/internal/spec/updateLinkTag.spec.d.ts +4 -0
- package/build/commands/web/internal/spec/updateLinkTag.spec.js +32 -0
- package/build/commands/web/internal/updateAllTags.js +33 -8
- package/build/commands/web/internal/updateLinkTag.d.ts +4 -0
- package/build/commands/web/internal/updateLinkTag.js +24 -0
- package/build/commands/web/web.js +12 -13
- package/build/utils/auth.d.ts +10 -4
- package/build/utils/auth.js +17 -15
- package/build/utils/config.d.ts +2 -3
- package/build/utils/config.js +14 -16
- package/build/utils/file.d.ts +0 -6
- package/build/utils/file.js +1 -43
- package/build/utils/setConstants.js +1 -1
- package/build/utils/spec/utils.spec.js +31 -5
- package/build/utils/utils.d.ts +0 -2
- package/build/utils/utils.js +2 -21
- package/package.json +8 -14
- package/CHANGELOG.md +0 -30
- package/build/commands/compile/internal/config.d.ts +0 -25
- package/build/commands/compile/internal/config.js +0 -259
- package/build/commands/compile/spec/getDependencyPaths.spec.d.ts +0 -1
- package/build/commands/compile/spec/getDependencyPaths.spec.js +0 -263
- package/build/commands/compile/spec/getProgramDependencies.spec.d.ts +0 -1
- package/build/commands/compile/spec/getProgramDependencies.spec.js +0 -403
- package/build/commands/shared/dependencies.d.ts +0 -12
- package/build/commands/shared/dependencies.js +0 -332
- package/build/commands/web/internal/updateLinkHref.d.ts +0 -4
- package/build/commands/web/internal/updateLinkHref.js +0 -18
- package/build/utils/spec/utils.spec.server.d.ts +0 -1
- package/build/utils/spec/utils.spec.server.js +0 -72
package/build/utils/file.js
CHANGED
|
@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
39
39
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
40
|
};
|
|
41
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
|
-
exports.sasFileRegExp = exports.saveToDefaultLocation = exports.getRelativePath = exports.getBrief = exports.
|
|
42
|
+
exports.sasFileRegExp = exports.saveToDefaultLocation = exports.getRelativePath = exports.getBrief = exports.sanitizeFileName = exports.isShellScript = exports.isCsvFile = exports.isJsonFile = exports.isSasFile = exports.unifyFilePath = exports.createFolderStructure = void 0;
|
|
43
43
|
var path_1 = __importDefault(require("path"));
|
|
44
44
|
var utils_1 = require("@sasjs/utils");
|
|
45
45
|
var config_1 = require("./config");
|
|
@@ -129,48 +129,6 @@ var sanitizeFileName = function (fileName) {
|
|
|
129
129
|
return fileName.replace(/[^a-z0-9]/gi, '_');
|
|
130
130
|
};
|
|
131
131
|
exports.sanitizeFileName = sanitizeFileName;
|
|
132
|
-
/**
|
|
133
|
-
* Gets a list of @li items from the supplied file content with the specified header.
|
|
134
|
-
* @param {string} listHeader - the header of the section to look for - e.g. <h4> SAS Macros </h4>.
|
|
135
|
-
* @param {string} fileContent - the text content of the file.
|
|
136
|
-
*/
|
|
137
|
-
function getList(listHeader, fileContent) {
|
|
138
|
-
var _a;
|
|
139
|
-
var fileHeader;
|
|
140
|
-
try {
|
|
141
|
-
var hasFileHeader = fileContent.split('/**')[0] !== fileContent;
|
|
142
|
-
if (!hasFileHeader)
|
|
143
|
-
return [];
|
|
144
|
-
fileHeader = fileContent.split('/**')[1].split('**/')[0];
|
|
145
|
-
}
|
|
146
|
-
catch (e) {
|
|
147
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('File header parse error.\nPlease make sure your file header is in the correct format.');
|
|
148
|
-
}
|
|
149
|
-
var list = [];
|
|
150
|
-
var lines = fileHeader.split('\n').map(function (s) { return (s ? s.trim() : s); });
|
|
151
|
-
var startIndex = null;
|
|
152
|
-
var endIndex = null;
|
|
153
|
-
for (var i = 0; i < lines.length; i++) {
|
|
154
|
-
if (new RegExp(listHeader, 'i').test(lines[i])) {
|
|
155
|
-
startIndex = i + 1;
|
|
156
|
-
break;
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
|
-
for (var i = startIndex; i < lines.length; i++) {
|
|
160
|
-
if (!lines[i]) {
|
|
161
|
-
endIndex = i;
|
|
162
|
-
break;
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
for (var i = startIndex; i < endIndex; i++) {
|
|
166
|
-
list.push(lines[i]);
|
|
167
|
-
}
|
|
168
|
-
return list
|
|
169
|
-
.filter(function (l) { return l.startsWith('@li'); })
|
|
170
|
-
.map(function (d) { return d.replace(/\@li/g, ''); })
|
|
171
|
-
.map(function (d) { return d.trim(); });
|
|
172
|
-
}
|
|
173
|
-
exports.getList = getList;
|
|
174
132
|
function getBrief(fileContent) {
|
|
175
133
|
var fileHeader;
|
|
176
134
|
try {
|
|
@@ -43,7 +43,7 @@ exports.setConstants = exports.contextName = void 0;
|
|
|
43
43
|
var path_1 = __importDefault(require("path"));
|
|
44
44
|
var get_installed_path_1 = require("get-installed-path");
|
|
45
45
|
var config_1 = require("./config");
|
|
46
|
-
var utils_1 = require("
|
|
46
|
+
var utils_1 = require("@sasjs/utils");
|
|
47
47
|
exports.contextName = 'sasjs cli compute context';
|
|
48
48
|
var setConstants = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
49
49
|
var _a, configuration, isLocal, buildOutputFolder, buildResultsFolder, homeDir, getMacroCoreGlobalPath, buildSourceFolder, buildSourceDbFolder, buildDestinationFolder, buildDestinationServicesFolder, buildDestinationTestFolder, buildDestinationJobsFolder, buildDestinationDbFolder, buildDestinationDocsFolder, macroCorePath, _b, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError;
|
|
@@ -235,11 +235,11 @@ describe('utils', function () {
|
|
|
235
235
|
describe('chunk', function () {
|
|
236
236
|
it('should return an array with only one element that is equal to text itself if text size is less than max length', function () {
|
|
237
237
|
var txt = '0B0pFTOzHXyRuikRydwnd8uQdwvITllwNOX20vQLsT0JgkXa1W';
|
|
238
|
-
expect(
|
|
238
|
+
expect(utils_2.chunk(txt)[0]).toBe(txt);
|
|
239
239
|
});
|
|
240
240
|
it('should return an array with 3 elements', function () {
|
|
241
241
|
var txt = 'SGmqg3pnHCJn0iPQC4Rd9AnFS3k5V7dDc81GlF6lCCurmsEJq7VS\nig42yjxerV7OAjE1HIOgJZXqID30\nkaVJsCwWrtFEIL8mQepjp4zLGeCaWk7ymu9BqolSnqA3udaiWuHcm6m80E36mWYWU0lITAgdp1QzVwIczpopXRaUWtJamiPnHyflksdNEXkboKlAT5RuR795ShUOc6KajQZ1qH2ZGJPV2DxjEqtXA9uvNbpisOVY6MpRdEzWNgdDsXlfuXkrBk5RqA7PkdtjBtNHA7JtEklTnYKrOdge03qFXKjh';
|
|
242
|
-
expect(
|
|
242
|
+
expect(utils_2.chunk(txt)).toBeArrayOfSize(3);
|
|
243
243
|
});
|
|
244
244
|
});
|
|
245
245
|
describe('arrToObj', function () {
|
|
@@ -307,18 +307,18 @@ describe('utils', function () {
|
|
|
307
307
|
var relativePath = './my-path/xyz';
|
|
308
308
|
var pathRelativeTo = '/home/abc';
|
|
309
309
|
var expectedAbsolutePath = ['', 'home', 'abc', 'my-path', 'xyz'].join(path_1.default.sep);
|
|
310
|
-
expect(
|
|
310
|
+
expect(utils_2.getAbsolutePath(relativePath, pathRelativeTo)).toEqual(expectedAbsolutePath);
|
|
311
311
|
});
|
|
312
312
|
it('should convert tilde from absolute path', function () {
|
|
313
313
|
var relativePath = '~/my-path/xyz';
|
|
314
314
|
var expectedAbsolutePath = homedir + ['', 'my-path', 'xyz'].join(path_1.default.sep);
|
|
315
|
-
expect(
|
|
315
|
+
expect(utils_2.getAbsolutePath(relativePath, '')).toEqual(expectedAbsolutePath);
|
|
316
316
|
});
|
|
317
317
|
it('should return same path if path is absolute', function () {
|
|
318
318
|
var absolutePath = '/my-path/xyz';
|
|
319
319
|
var pathRelativeTo = '/home/abc';
|
|
320
320
|
var expectedAbsolutePath = ['', 'my-path', 'xyz'].join(path_1.default.sep);
|
|
321
|
-
expect(
|
|
321
|
+
expect(utils_2.getAbsolutePath(absolutePath, pathRelativeTo)).toEqual(expectedAbsolutePath);
|
|
322
322
|
});
|
|
323
323
|
});
|
|
324
324
|
describe('loadEnvVariables', function () {
|
|
@@ -359,4 +359,30 @@ describe('utils', function () {
|
|
|
359
359
|
});
|
|
360
360
|
}); });
|
|
361
361
|
});
|
|
362
|
+
describe('createReactApp', function () {
|
|
363
|
+
it('should create React app', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
364
|
+
var reactFolder, reactFolderPath, sasjsFolderPath;
|
|
365
|
+
return __generator(this, function (_a) {
|
|
366
|
+
switch (_a.label) {
|
|
367
|
+
case 0:
|
|
368
|
+
reactFolder = 'react-seed-app';
|
|
369
|
+
reactFolderPath = path_1.default.join(__dirname, reactFolder);
|
|
370
|
+
sasjsFolderPath = path_1.default.join(reactFolderPath, 'sasjs');
|
|
371
|
+
return [4 /*yield*/, utils_2.createFolder(reactFolderPath)];
|
|
372
|
+
case 1:
|
|
373
|
+
_a.sent();
|
|
374
|
+
return [4 /*yield*/, expect(utils_1.createReactApp(reactFolderPath)).toResolve()];
|
|
375
|
+
case 2:
|
|
376
|
+
_a.sent();
|
|
377
|
+
return [4 /*yield*/, expect(utils_2.folderExists(sasjsFolderPath)).resolves.toEqual(true)];
|
|
378
|
+
case 3:
|
|
379
|
+
_a.sent();
|
|
380
|
+
return [4 /*yield*/, utils_2.deleteFolder(reactFolderPath)];
|
|
381
|
+
case 4:
|
|
382
|
+
_a.sent();
|
|
383
|
+
return [2 /*return*/];
|
|
384
|
+
}
|
|
385
|
+
});
|
|
386
|
+
}); }, 600000);
|
|
387
|
+
});
|
|
362
388
|
});
|
package/build/utils/utils.d.ts
CHANGED
|
@@ -18,7 +18,6 @@ export declare function setupDoxygen(folderPath: string): Promise<void>;
|
|
|
18
18
|
export declare function removeComments(text: string): string;
|
|
19
19
|
export declare function getUniqServicesObj(services: string[]): any;
|
|
20
20
|
export declare function executeShellScript(filePath: string, logFilePath: string): Promise<unknown>;
|
|
21
|
-
export declare function chunk(text: string, maxLength?: number): string[];
|
|
22
21
|
/**
|
|
23
22
|
* Extracts plain text job log from fetched json log
|
|
24
23
|
* @param {object} logJson
|
|
@@ -33,7 +32,6 @@ export declare const millisecondsToDdHhMmSs: (milliseconds: number) => string;
|
|
|
33
32
|
export declare function checkNodeVersion(): void;
|
|
34
33
|
export declare function getAdapterInstance(target: Target): SASjs;
|
|
35
34
|
export declare function displaySasjsRunnerError(username: string): void;
|
|
36
|
-
export declare const getAbsolutePath: (providedPath: string, relativePath: string) => string;
|
|
37
35
|
export declare const loadEnvVariables: (fileName: string) => Promise<void>;
|
|
38
36
|
export declare function prefixAppLoc(appLoc?: string, path?: string): string | null;
|
|
39
37
|
export declare const isWindows: () => boolean;
|
package/build/utils/utils.js
CHANGED
|
@@ -82,10 +82,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
82
82
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
83
83
|
};
|
|
84
84
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
85
|
-
exports.terminateProcess = exports.isWindows = exports.prefixAppLoc = exports.loadEnvVariables = exports.
|
|
85
|
+
exports.terminateProcess = exports.isWindows = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
|
|
86
86
|
var shelljs_1 = __importDefault(require("shelljs"));
|
|
87
87
|
var path_1 = __importDefault(require("path"));
|
|
88
|
-
var os_1 = __importDefault(require("os"));
|
|
89
88
|
var ora_1 = __importDefault(require("ora"));
|
|
90
89
|
var utils_1 = require("@sasjs/utils");
|
|
91
90
|
var node_1 = __importDefault(require("@sasjs/adapter/node"));
|
|
@@ -187,11 +186,7 @@ function createApp(folderPath, repoUrl, installDependencies) {
|
|
|
187
186
|
if (installDependencies === void 0) { installDependencies = true; }
|
|
188
187
|
var spinner = ora_1.default("Creating SASjs project in " + folderPath + ".");
|
|
189
188
|
spinner.start();
|
|
190
|
-
var gitBranch = repoUrl.includes('template_sasonly')
|
|
191
|
-
? 'master'
|
|
192
|
-
: repoUrl.includes('template_jobs')
|
|
193
|
-
? 'master'
|
|
194
|
-
: 'main';
|
|
189
|
+
var gitBranch = repoUrl.includes('template_sasonly') ? 'master' : 'main';
|
|
195
190
|
shelljs_1.default.exec("cd \"" + folderPath + "\" && git clone --depth 1 -b " + gitBranch + " " + repoUrl + " .", { silent: true });
|
|
196
191
|
shelljs_1.default.rm('-rf', path_1.default.join(folderPath, '.git'));
|
|
197
192
|
spinner.stop();
|
|
@@ -438,14 +433,6 @@ function executeShellScript(filePath, logFilePath) {
|
|
|
438
433
|
});
|
|
439
434
|
}
|
|
440
435
|
exports.executeShellScript = executeShellScript;
|
|
441
|
-
function chunk(text, maxLength) {
|
|
442
|
-
if (maxLength === void 0) { maxLength = 220; }
|
|
443
|
-
if (text.length <= maxLength) {
|
|
444
|
-
return [text];
|
|
445
|
-
}
|
|
446
|
-
return (text.match(new RegExp('.{1,' + maxLength + '}', 'g')) || []).filter(function (m) { return !!m; });
|
|
447
|
-
}
|
|
448
|
-
exports.chunk = chunk;
|
|
449
436
|
/**
|
|
450
437
|
* Extracts plain text job log from fetched json log
|
|
451
438
|
* @param {object} logJson
|
|
@@ -526,12 +513,6 @@ function displaySasjsRunnerError(username) {
|
|
|
526
513
|
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Please deploy the SASjs runner by running the code below and try again:\n" + sasjsRunnerCode);
|
|
527
514
|
}
|
|
528
515
|
exports.displaySasjsRunnerError = displaySasjsRunnerError;
|
|
529
|
-
var getAbsolutePath = function (providedPath, relativePath) {
|
|
530
|
-
return path_1.default.isAbsolute(providedPath) || /^~/.exec(providedPath)
|
|
531
|
-
? path_1.default.normalize(providedPath.replace(/^~/, os_1.default.homedir()))
|
|
532
|
-
: path_1.default.join(relativePath, providedPath);
|
|
533
|
-
};
|
|
534
|
-
exports.getAbsolutePath = getAbsolutePath;
|
|
535
516
|
var loadEnvVariables = function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
|
|
536
517
|
var envFileExistsInCurrentPath, envFileExistsInParentPath, envFilePath;
|
|
537
518
|
return __generator(this, function (_a) {
|
package/package.json
CHANGED
|
@@ -19,7 +19,8 @@
|
|
|
19
19
|
"test:mocked": "jest --silent --runInBand --config=jest.config.js --coverage",
|
|
20
20
|
"semantic-release": "semantic-release -d",
|
|
21
21
|
"lint:fix": "npx prettier --write \"{src,test}/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
|
|
22
|
-
"lint": "npx prettier --check \"{src,test}/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\""
|
|
22
|
+
"lint": "npx prettier --check \"{src,test}/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
|
|
23
|
+
"prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true"
|
|
23
24
|
},
|
|
24
25
|
"release": {
|
|
25
26
|
"branches": [
|
|
@@ -47,16 +48,11 @@
|
|
|
47
48
|
"publishConfig": {
|
|
48
49
|
"access": "public"
|
|
49
50
|
},
|
|
50
|
-
"config": {
|
|
51
|
-
"ghooks": {
|
|
52
|
-
"commit-msg": "validate-commit-msg"
|
|
53
|
-
}
|
|
54
|
-
},
|
|
55
51
|
"dependencies": {
|
|
56
|
-
"@sasjs/adapter": "3.
|
|
57
|
-
"@sasjs/core": "2.
|
|
52
|
+
"@sasjs/adapter": "3.3.0",
|
|
53
|
+
"@sasjs/core": "2.54.1",
|
|
58
54
|
"@sasjs/lint": "1.11.2",
|
|
59
|
-
"@sasjs/utils": "2.
|
|
55
|
+
"@sasjs/utils": "2.34.1",
|
|
60
56
|
"chalk": "4.1.2",
|
|
61
57
|
"csv-stringify": "5.6.5",
|
|
62
58
|
"dotenv": "10.0.0",
|
|
@@ -90,9 +86,8 @@
|
|
|
90
86
|
"@types/xml": "1.0.6",
|
|
91
87
|
"babel-jest": "27.2.4",
|
|
92
88
|
"copyfiles": "2.4.1",
|
|
93
|
-
"ghooks": "2.0.4",
|
|
94
89
|
"jest": "27.2.4",
|
|
95
|
-
"jest-cli": "27.
|
|
90
|
+
"jest-cli": "27.3.1",
|
|
96
91
|
"jest-extended": "1.1.0",
|
|
97
92
|
"nodemon": "2.0.13",
|
|
98
93
|
"semantic-release": "17.4.7",
|
|
@@ -100,8 +95,7 @@
|
|
|
100
95
|
"ts-node": "10.2.1",
|
|
101
96
|
"tslib": "2.3.1",
|
|
102
97
|
"typescript": "4.3.5",
|
|
103
|
-
"util": "0.12.4"
|
|
104
|
-
"validate-commit-msg": "1.1.3"
|
|
98
|
+
"util": "0.12.4"
|
|
105
99
|
},
|
|
106
|
-
"version": "3.0
|
|
100
|
+
"version": "3.1.0"
|
|
107
101
|
}
|
package/CHANGELOG.md
DELETED
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
# Change Log
|
|
2
|
-
|
|
3
|
-
Since March 7th, 2020, the changelog is managed by github releases. See [https://github.com/sasjs/cli/releases](https://github.com/sasjs/cli/releases).
|
|
4
|
-
|
|
5
|
-
## Changes Prior to March 7th 2020
|
|
6
|
-
|
|
7
|
-
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
8
|
-
|
|
9
|
-
<a name="1.0.4"></a>
|
|
10
|
-
## [1.0.4](https://gitlab.com/macropeople/sasjs-cli/compare/v1.0.3...v1.0.4) (2020-03-07)
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
### Bug Fixes
|
|
14
|
-
|
|
15
|
-
* redo comment stripping logic ([84a1a91](https://gitlab.com/macropeople/sasjs-cli/commit/84a1a91))
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
<a name="1.0.3"></a>
|
|
20
|
-
## [1.0.3](https://gitlab.com/macropeople/sasjs-cli/compare/v1.0.2...v1.0.3) (2020-03-07)
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
<a name="1.0.2"></a>
|
|
25
|
-
## [1.0.2](https://gitlab.com/macropeople/sasjs-cli/compare/v1.0.1...v1.0.2) (2020-03-07)
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
<a name="1.0.1"></a>
|
|
30
|
-
## 1.0.1 (2020-03-07)
|
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
import { Target } from '@sasjs/utils/types';
|
|
2
|
-
export declare const getServiceInit: (target: Target) => Promise<{
|
|
3
|
-
content: string;
|
|
4
|
-
filePath: string;
|
|
5
|
-
}>;
|
|
6
|
-
export declare const getServiceTerm: (target: Target) => Promise<{
|
|
7
|
-
content: string;
|
|
8
|
-
filePath: string;
|
|
9
|
-
}>;
|
|
10
|
-
export declare const getJobInit: (target: Target) => Promise<{
|
|
11
|
-
content: string;
|
|
12
|
-
filePath: string;
|
|
13
|
-
}>;
|
|
14
|
-
export declare const getJobTerm: (target: Target) => Promise<{
|
|
15
|
-
content: string;
|
|
16
|
-
filePath: string;
|
|
17
|
-
}>;
|
|
18
|
-
export declare const getTestInit: (target: Target) => Promise<{
|
|
19
|
-
content: string;
|
|
20
|
-
filePath: string;
|
|
21
|
-
}>;
|
|
22
|
-
export declare const getTestTerm: (target: Target) => Promise<{
|
|
23
|
-
content: string;
|
|
24
|
-
filePath: string;
|
|
25
|
-
}>;
|
|
@@ -1,259 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
-
function step(op) {
|
|
16
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (_) try {
|
|
18
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
-
switch (op[0]) {
|
|
21
|
-
case 0: case 1: t = op; break;
|
|
22
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
-
default:
|
|
26
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
-
if (t[2]) _.ops.pop();
|
|
31
|
-
_.trys.pop(); continue;
|
|
32
|
-
}
|
|
33
|
-
op = body.call(thisArg, _);
|
|
34
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
-
}
|
|
37
|
-
};
|
|
38
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.getTestTerm = exports.getTestInit = exports.getJobTerm = exports.getJobInit = exports.getServiceTerm = exports.getServiceInit = void 0;
|
|
40
|
-
var utils_1 = require("@sasjs/utils");
|
|
41
|
-
var config_1 = require("../../../utils/config");
|
|
42
|
-
var utils_2 = require("../../../utils/utils");
|
|
43
|
-
// TODO: REFACTOR
|
|
44
|
-
var getServiceInit = function (target) { return __awaiter(void 0, void 0, void 0, function () {
|
|
45
|
-
var buildSourceFolder, serviceInitContent, filePath, configuration;
|
|
46
|
-
var _a, _b;
|
|
47
|
-
return __generator(this, function (_c) {
|
|
48
|
-
switch (_c.label) {
|
|
49
|
-
case 0:
|
|
50
|
-
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
51
|
-
serviceInitContent = '', filePath = '';
|
|
52
|
-
if (!((_a = target === null || target === void 0 ? void 0 : target.serviceConfig) === null || _a === void 0 ? void 0 : _a.initProgram)) return [3 /*break*/, 2];
|
|
53
|
-
filePath = utils_2.getAbsolutePath(target.serviceConfig.initProgram, buildSourceFolder);
|
|
54
|
-
return [4 /*yield*/, utils_1.readFile(filePath)];
|
|
55
|
-
case 1:
|
|
56
|
-
serviceInitContent = _c.sent();
|
|
57
|
-
return [3 /*break*/, 5];
|
|
58
|
-
case 2: return [4 /*yield*/, config_1.getLocalOrGlobalConfig()];
|
|
59
|
-
case 3:
|
|
60
|
-
configuration = (_c.sent()).configuration;
|
|
61
|
-
if (!((_b = configuration === null || configuration === void 0 ? void 0 : configuration.serviceConfig) === null || _b === void 0 ? void 0 : _b.initProgram)) return [3 /*break*/, 5];
|
|
62
|
-
filePath = utils_2.getAbsolutePath(configuration.serviceConfig.initProgram, buildSourceFolder);
|
|
63
|
-
return [4 /*yield*/, utils_1.readFile(filePath)];
|
|
64
|
-
case 4:
|
|
65
|
-
serviceInitContent = _c.sent();
|
|
66
|
-
_c.label = 5;
|
|
67
|
-
case 5: return [2 /*return*/, serviceInitContent
|
|
68
|
-
? {
|
|
69
|
-
content: "\n* ServiceInit start;\n" + serviceInitContent + "\n* ServiceInit end;",
|
|
70
|
-
filePath: filePath
|
|
71
|
-
}
|
|
72
|
-
: {
|
|
73
|
-
content: '',
|
|
74
|
-
filePath: ''
|
|
75
|
-
}];
|
|
76
|
-
}
|
|
77
|
-
});
|
|
78
|
-
}); };
|
|
79
|
-
exports.getServiceInit = getServiceInit;
|
|
80
|
-
var getServiceTerm = function (target) { return __awaiter(void 0, void 0, void 0, function () {
|
|
81
|
-
var buildSourceFolder, serviceTermContent, filePath, configuration;
|
|
82
|
-
var _a, _b;
|
|
83
|
-
return __generator(this, function (_c) {
|
|
84
|
-
switch (_c.label) {
|
|
85
|
-
case 0:
|
|
86
|
-
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
87
|
-
serviceTermContent = '', filePath = '';
|
|
88
|
-
if (!((_a = target === null || target === void 0 ? void 0 : target.serviceConfig) === null || _a === void 0 ? void 0 : _a.termProgram)) return [3 /*break*/, 2];
|
|
89
|
-
filePath = utils_2.getAbsolutePath(target.serviceConfig.termProgram, buildSourceFolder);
|
|
90
|
-
return [4 /*yield*/, utils_1.readFile(filePath)];
|
|
91
|
-
case 1:
|
|
92
|
-
serviceTermContent = _c.sent();
|
|
93
|
-
return [3 /*break*/, 5];
|
|
94
|
-
case 2: return [4 /*yield*/, config_1.getLocalOrGlobalConfig()];
|
|
95
|
-
case 3:
|
|
96
|
-
configuration = (_c.sent()).configuration;
|
|
97
|
-
if (!((_b = configuration === null || configuration === void 0 ? void 0 : configuration.serviceConfig) === null || _b === void 0 ? void 0 : _b.termProgram)) return [3 /*break*/, 5];
|
|
98
|
-
filePath = utils_2.getAbsolutePath(configuration.serviceConfig.termProgram, buildSourceFolder);
|
|
99
|
-
return [4 /*yield*/, utils_1.readFile(filePath)];
|
|
100
|
-
case 4:
|
|
101
|
-
serviceTermContent = _c.sent();
|
|
102
|
-
_c.label = 5;
|
|
103
|
-
case 5: return [2 /*return*/, serviceTermContent
|
|
104
|
-
? {
|
|
105
|
-
content: "\n* ServiceTerm start;\n" + serviceTermContent + "\n* ServiceTerm end;",
|
|
106
|
-
filePath: filePath
|
|
107
|
-
}
|
|
108
|
-
: {
|
|
109
|
-
content: '',
|
|
110
|
-
filePath: ''
|
|
111
|
-
}];
|
|
112
|
-
}
|
|
113
|
-
});
|
|
114
|
-
}); };
|
|
115
|
-
exports.getServiceTerm = getServiceTerm;
|
|
116
|
-
var getJobInit = function (target) { return __awaiter(void 0, void 0, void 0, function () {
|
|
117
|
-
var buildSourceFolder, jobInitContent, filePath, configuration;
|
|
118
|
-
var _a, _b;
|
|
119
|
-
return __generator(this, function (_c) {
|
|
120
|
-
switch (_c.label) {
|
|
121
|
-
case 0:
|
|
122
|
-
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
123
|
-
jobInitContent = '', filePath = '';
|
|
124
|
-
if (!((_a = target === null || target === void 0 ? void 0 : target.jobConfig) === null || _a === void 0 ? void 0 : _a.initProgram)) return [3 /*break*/, 2];
|
|
125
|
-
filePath = utils_2.getAbsolutePath(target.jobConfig.initProgram, buildSourceFolder);
|
|
126
|
-
return [4 /*yield*/, utils_1.readFile(filePath)];
|
|
127
|
-
case 1:
|
|
128
|
-
jobInitContent = _c.sent();
|
|
129
|
-
return [3 /*break*/, 5];
|
|
130
|
-
case 2: return [4 /*yield*/, config_1.getLocalOrGlobalConfig()];
|
|
131
|
-
case 3:
|
|
132
|
-
configuration = (_c.sent()).configuration;
|
|
133
|
-
if (!((_b = configuration === null || configuration === void 0 ? void 0 : configuration.jobConfig) === null || _b === void 0 ? void 0 : _b.initProgram)) return [3 /*break*/, 5];
|
|
134
|
-
filePath = utils_2.getAbsolutePath(configuration.jobConfig.initProgram, buildSourceFolder);
|
|
135
|
-
return [4 /*yield*/, utils_1.readFile(filePath)];
|
|
136
|
-
case 4:
|
|
137
|
-
jobInitContent = _c.sent();
|
|
138
|
-
_c.label = 5;
|
|
139
|
-
case 5: return [2 /*return*/, jobInitContent
|
|
140
|
-
? {
|
|
141
|
-
content: "\n* JobInit start;\n" + jobInitContent + "\n* JobInit end;",
|
|
142
|
-
filePath: filePath
|
|
143
|
-
}
|
|
144
|
-
: {
|
|
145
|
-
content: '',
|
|
146
|
-
filePath: ''
|
|
147
|
-
}];
|
|
148
|
-
}
|
|
149
|
-
});
|
|
150
|
-
}); };
|
|
151
|
-
exports.getJobInit = getJobInit;
|
|
152
|
-
var getJobTerm = function (target) { return __awaiter(void 0, void 0, void 0, function () {
|
|
153
|
-
var buildSourceFolder, jobTermContent, filePath, configuration;
|
|
154
|
-
var _a, _b;
|
|
155
|
-
return __generator(this, function (_c) {
|
|
156
|
-
switch (_c.label) {
|
|
157
|
-
case 0:
|
|
158
|
-
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
159
|
-
jobTermContent = '', filePath = '';
|
|
160
|
-
if (!((_a = target === null || target === void 0 ? void 0 : target.jobConfig) === null || _a === void 0 ? void 0 : _a.termProgram)) return [3 /*break*/, 2];
|
|
161
|
-
filePath = utils_2.getAbsolutePath(target.jobConfig.termProgram, buildSourceFolder);
|
|
162
|
-
return [4 /*yield*/, utils_1.readFile(filePath)];
|
|
163
|
-
case 1:
|
|
164
|
-
jobTermContent = _c.sent();
|
|
165
|
-
return [3 /*break*/, 5];
|
|
166
|
-
case 2: return [4 /*yield*/, config_1.getLocalOrGlobalConfig()];
|
|
167
|
-
case 3:
|
|
168
|
-
configuration = (_c.sent()).configuration;
|
|
169
|
-
if (!((_b = configuration === null || configuration === void 0 ? void 0 : configuration.jobConfig) === null || _b === void 0 ? void 0 : _b.termProgram)) return [3 /*break*/, 5];
|
|
170
|
-
filePath = utils_2.getAbsolutePath(configuration.jobConfig.termProgram, buildSourceFolder);
|
|
171
|
-
return [4 /*yield*/, utils_1.readFile(filePath)];
|
|
172
|
-
case 4:
|
|
173
|
-
jobTermContent = _c.sent();
|
|
174
|
-
_c.label = 5;
|
|
175
|
-
case 5: return [2 /*return*/, jobTermContent
|
|
176
|
-
? {
|
|
177
|
-
content: "\n* JobTerm start;\n" + jobTermContent + "\n* JobTerm end;",
|
|
178
|
-
filePath: filePath
|
|
179
|
-
}
|
|
180
|
-
: {
|
|
181
|
-
content: '',
|
|
182
|
-
filePath: ''
|
|
183
|
-
}];
|
|
184
|
-
}
|
|
185
|
-
});
|
|
186
|
-
}); };
|
|
187
|
-
exports.getJobTerm = getJobTerm;
|
|
188
|
-
var getTestInit = function (target) { return __awaiter(void 0, void 0, void 0, function () {
|
|
189
|
-
var buildSourceFolder, testInitContent, filePath, configuration;
|
|
190
|
-
var _a, _b;
|
|
191
|
-
return __generator(this, function (_c) {
|
|
192
|
-
switch (_c.label) {
|
|
193
|
-
case 0:
|
|
194
|
-
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
195
|
-
testInitContent = '', filePath = '';
|
|
196
|
-
if (!((_a = target === null || target === void 0 ? void 0 : target.testConfig) === null || _a === void 0 ? void 0 : _a.initProgram)) return [3 /*break*/, 2];
|
|
197
|
-
filePath = utils_2.getAbsolutePath(target.testConfig.initProgram, buildSourceFolder);
|
|
198
|
-
return [4 /*yield*/, utils_1.readFile(filePath)];
|
|
199
|
-
case 1:
|
|
200
|
-
testInitContent = _c.sent();
|
|
201
|
-
return [3 /*break*/, 5];
|
|
202
|
-
case 2: return [4 /*yield*/, config_1.getLocalOrGlobalConfig()];
|
|
203
|
-
case 3:
|
|
204
|
-
configuration = (_c.sent()).configuration;
|
|
205
|
-
if (!((_b = configuration === null || configuration === void 0 ? void 0 : configuration.testConfig) === null || _b === void 0 ? void 0 : _b.initProgram)) return [3 /*break*/, 5];
|
|
206
|
-
filePath = utils_2.getAbsolutePath(configuration.testConfig.initProgram, buildSourceFolder);
|
|
207
|
-
return [4 /*yield*/, utils_1.readFile(filePath)];
|
|
208
|
-
case 4:
|
|
209
|
-
testInitContent = _c.sent();
|
|
210
|
-
_c.label = 5;
|
|
211
|
-
case 5: return [2 /*return*/, testInitContent
|
|
212
|
-
? {
|
|
213
|
-
content: "\n* TestInit start;\n" + testInitContent + "\n* TestInit end;",
|
|
214
|
-
filePath: filePath
|
|
215
|
-
}
|
|
216
|
-
: {
|
|
217
|
-
content: '',
|
|
218
|
-
filePath: ''
|
|
219
|
-
}];
|
|
220
|
-
}
|
|
221
|
-
});
|
|
222
|
-
}); };
|
|
223
|
-
exports.getTestInit = getTestInit;
|
|
224
|
-
var getTestTerm = function (target) { return __awaiter(void 0, void 0, void 0, function () {
|
|
225
|
-
var buildSourceFolder, testTermContent, filePath, configuration;
|
|
226
|
-
var _a, _b;
|
|
227
|
-
return __generator(this, function (_c) {
|
|
228
|
-
switch (_c.label) {
|
|
229
|
-
case 0:
|
|
230
|
-
buildSourceFolder = process.sasjsConstants.buildSourceFolder;
|
|
231
|
-
testTermContent = '', filePath = '';
|
|
232
|
-
if (!((_a = target === null || target === void 0 ? void 0 : target.testConfig) === null || _a === void 0 ? void 0 : _a.termProgram)) return [3 /*break*/, 2];
|
|
233
|
-
filePath = utils_2.getAbsolutePath(target.testConfig.termProgram, buildSourceFolder);
|
|
234
|
-
return [4 /*yield*/, utils_1.readFile(filePath)];
|
|
235
|
-
case 1:
|
|
236
|
-
testTermContent = _c.sent();
|
|
237
|
-
return [3 /*break*/, 5];
|
|
238
|
-
case 2: return [4 /*yield*/, config_1.getLocalOrGlobalConfig()];
|
|
239
|
-
case 3:
|
|
240
|
-
configuration = (_c.sent()).configuration;
|
|
241
|
-
if (!((_b = configuration === null || configuration === void 0 ? void 0 : configuration.testConfig) === null || _b === void 0 ? void 0 : _b.termProgram)) return [3 /*break*/, 5];
|
|
242
|
-
filePath = utils_2.getAbsolutePath(configuration.testConfig.termProgram, buildSourceFolder);
|
|
243
|
-
return [4 /*yield*/, utils_1.readFile(filePath)];
|
|
244
|
-
case 4:
|
|
245
|
-
testTermContent = _c.sent();
|
|
246
|
-
_c.label = 5;
|
|
247
|
-
case 5: return [2 /*return*/, testTermContent
|
|
248
|
-
? {
|
|
249
|
-
content: "\n* TestTerm start;\n" + testTermContent + "\n* TestTerm end;",
|
|
250
|
-
filePath: filePath
|
|
251
|
-
}
|
|
252
|
-
: {
|
|
253
|
-
content: '',
|
|
254
|
-
filePath: ''
|
|
255
|
-
}];
|
|
256
|
-
}
|
|
257
|
-
});
|
|
258
|
-
}); };
|
|
259
|
-
exports.getTestTerm = getTestTerm;
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|