@sasjs/utils 2.36.0 → 2.37.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/auth/auth.js +2 -2
- package/auth/auth.js.map +1 -1
- package/compileTree/compileTree.d.ts +20 -0
- package/compileTree/compileTree.js +119 -0
- package/compileTree/compileTree.js.map +1 -0
- package/compileTree/index.d.ts +1 -0
- package/compileTree/index.js +14 -0
- package/compileTree/index.js.map +1 -0
- package/error/serverTypeError.js +10 -6
- package/error/serverTypeError.js.map +1 -1
- package/file/csvFile.js +14 -10
- package/file/csvFile.js.map +1 -1
- package/file/file.d.ts +1 -1
- package/file/file.js +19 -15
- package/file/file.js.map +1 -1
- package/formatter/number.js +1 -1
- package/formatter/number.js.map +1 -1
- package/index.d.ts +1 -0
- package/index.js +1 -0
- package/index.js.map +1 -1
- package/input/readAndValidateInput.js +7 -7
- package/input/readAndValidateInput.js.map +1 -1
- package/logger/logger.js +21 -17
- package/logger/logger.js.map +1 -1
- package/package.json +6 -6
- package/sasjsCli/getDependencies.d.ts +20 -1
- package/sasjsCli/getDependencies.js +77 -49
- package/sasjsCli/getDependencies.js.map +1 -1
- package/sasjsCli/getDependencyPaths.d.ts +2 -1
- package/sasjsCli/getDependencyPaths.js +46 -33
- package/sasjsCli/getDependencyPaths.js.map +1 -1
- package/sasjsCli/getInitTerm.d.ts +4 -2
- package/sasjsCli/getInitTerm.js +23 -18
- package/sasjsCli/getInitTerm.js.map +1 -1
- package/sasjsCli/loadDependenciesFile.d.ts +5 -2
- package/sasjsCli/loadDependenciesFile.js +38 -23
- package/sasjsCli/loadDependenciesFile.js.map +1 -1
- package/sasjsCli/prioritiseDependencyOverrides.js +10 -6
- package/sasjsCli/prioritiseDependencyOverrides.js.map +1 -1
- package/time/timestamp.js +6 -6
- package/time/timestamp.js.map +1 -1
- package/types/httpsAgentOptions.d.ts +1 -1
- package/types/target.js +19 -19
- package/types/target.js.map +1 -1
- package/types/targetValidators.js +2 -2
- package/types/targetValidators.js.map +1 -1
- package/utils/diff.js +9 -5
- package/utils/diff.js.map +1 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Configuration, SASJsFileType, Target } from '../types';
|
|
2
|
+
import { CompileTree } from '../compileTree';
|
|
2
3
|
export declare enum ProgramType {
|
|
3
4
|
Init = "init",
|
|
4
5
|
Term = "term"
|
|
@@ -8,15 +9,16 @@ interface getInitTermParams {
|
|
|
8
9
|
target?: Target;
|
|
9
10
|
fileType: SASJsFileType;
|
|
10
11
|
buildSourceFolder: string;
|
|
12
|
+
compileTree?: CompileTree;
|
|
11
13
|
}
|
|
12
|
-
export declare const getInitTerm: ({ configuration, target, fileType, buildSourceFolder }: getInitTermParams) => Promise<{
|
|
14
|
+
export declare const getInitTerm: ({ configuration, target, fileType, buildSourceFolder, compileTree }: getInitTermParams) => Promise<{
|
|
13
15
|
init: string;
|
|
14
16
|
initPath: string;
|
|
15
17
|
term: string;
|
|
16
18
|
termPath: string;
|
|
17
19
|
startUpVars: string;
|
|
18
20
|
}>;
|
|
19
|
-
export declare const getProgram: ({ target, configuration, buildSourceFolder, fileType }: getInitTermParams, programType: ProgramType) => Promise<{
|
|
21
|
+
export declare const getProgram: ({ target, configuration, buildSourceFolder, fileType }: getInitTermParams, programType: ProgramType, compileTree?: CompileTree | undefined) => Promise<{
|
|
20
22
|
content: string;
|
|
21
23
|
filePath: string;
|
|
22
24
|
}>;
|
package/sasjsCli/getInitTerm.js
CHANGED
|
@@ -85,25 +85,25 @@ var ProgramType;
|
|
|
85
85
|
ProgramType["Term"] = "term";
|
|
86
86
|
})(ProgramType = exports.ProgramType || (exports.ProgramType = {}));
|
|
87
87
|
var getInitTerm = function (_a) {
|
|
88
|
-
var configuration = _a.configuration, target = _a.target, fileType = _a.fileType, buildSourceFolder = _a.buildSourceFolder;
|
|
88
|
+
var configuration = _a.configuration, target = _a.target, fileType = _a.fileType, buildSourceFolder = _a.buildSourceFolder, compileTree = _a.compileTree;
|
|
89
89
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
90
90
|
var _b, init, initPath, _c, term, termPath, startUpVars;
|
|
91
91
|
return __generator(this, function (_d) {
|
|
92
92
|
switch (_d.label) {
|
|
93
|
-
case 0: return [4 /*yield*/, exports.getProgram({
|
|
93
|
+
case 0: return [4 /*yield*/, (0, exports.getProgram)({
|
|
94
94
|
target: target,
|
|
95
95
|
configuration: configuration,
|
|
96
96
|
buildSourceFolder: buildSourceFolder,
|
|
97
97
|
fileType: fileType
|
|
98
|
-
}, ProgramType.Init)];
|
|
98
|
+
}, ProgramType.Init, compileTree)];
|
|
99
99
|
case 1:
|
|
100
100
|
_b = _d.sent(), init = _b.content, initPath = _b.filePath;
|
|
101
|
-
return [4 /*yield*/, exports.getProgram({
|
|
101
|
+
return [4 /*yield*/, (0, exports.getProgram)({
|
|
102
102
|
target: target,
|
|
103
103
|
configuration: configuration,
|
|
104
104
|
buildSourceFolder: buildSourceFolder,
|
|
105
105
|
fileType: fileType
|
|
106
|
-
}, ProgramType.Term)];
|
|
106
|
+
}, ProgramType.Term, compileTree)];
|
|
107
107
|
case 2:
|
|
108
108
|
_c = _d.sent(), term = _c.content, termPath = _c.filePath;
|
|
109
109
|
startUpVars = getVars(fileType, target, configuration);
|
|
@@ -141,9 +141,9 @@ var convertVarsToSasFormat = function (vars) {
|
|
|
141
141
|
try {
|
|
142
142
|
for (var entries_1 = __values(entries), entries_1_1 = entries_1.next(); !entries_1_1.done; entries_1_1 = entries_1.next()) {
|
|
143
143
|
var _b = __read(entries_1_1.value, 2), name_1 = _b[0], value = _b[1];
|
|
144
|
-
var chunks = utils_1.chunk(value);
|
|
144
|
+
var chunks = (0, utils_1.chunk)(value);
|
|
145
145
|
var chunkedString = chunks.join('%trim(\n)');
|
|
146
|
-
varsContent += "%let "
|
|
146
|
+
varsContent += "%let ".concat(name_1, "=").concat(chunkedString, ";\n");
|
|
147
147
|
}
|
|
148
148
|
}
|
|
149
149
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
@@ -155,7 +155,7 @@ var convertVarsToSasFormat = function (vars) {
|
|
|
155
155
|
}
|
|
156
156
|
return varsContent;
|
|
157
157
|
};
|
|
158
|
-
var getProgram = function (_a, programType) {
|
|
158
|
+
var getProgram = function (_a, programType, compileTree) {
|
|
159
159
|
var target = _a.target, configuration = _a.configuration, buildSourceFolder = _a.buildSourceFolder, fileType = _a.fileType;
|
|
160
160
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
161
161
|
var programContent, filePath, program, targetConfig, rootConfig, content;
|
|
@@ -182,18 +182,23 @@ var getProgram = function (_a, programType) {
|
|
|
182
182
|
}
|
|
183
183
|
program =
|
|
184
184
|
(targetConfig &&
|
|
185
|
-
targetConfig[programType
|
|
185
|
+
targetConfig["".concat(programType, "Program")]) ||
|
|
186
186
|
(rootConfig &&
|
|
187
|
-
rootConfig[programType
|
|
188
|
-
if (!program) return [3 /*break*/,
|
|
189
|
-
filePath = file_1.getAbsolutePath(program, buildSourceFolder);
|
|
190
|
-
return [
|
|
187
|
+
rootConfig["".concat(programType, "Program")]);
|
|
188
|
+
if (!program) return [3 /*break*/, 4];
|
|
189
|
+
filePath = (0, file_1.getAbsolutePath)(program, buildSourceFolder);
|
|
190
|
+
if (!(compileTree && Object.keys(compileTree).length)) return [3 /*break*/, 2];
|
|
191
|
+
return [4 /*yield*/, compileTree.getDepContent(filePath)];
|
|
191
192
|
case 1:
|
|
192
193
|
programContent = _b.sent();
|
|
193
|
-
|
|
194
|
-
case 2:
|
|
194
|
+
return [3 /*break*/, 4];
|
|
195
|
+
case 2: return [4 /*yield*/, (0, file_1.readFile)(filePath)];
|
|
196
|
+
case 3:
|
|
197
|
+
programContent = _b.sent();
|
|
198
|
+
_b.label = 4;
|
|
199
|
+
case 4:
|
|
195
200
|
content = programContent
|
|
196
|
-
? "\n* "
|
|
201
|
+
? "\n* ".concat(fileType).concat((0, formatter_1.capitalizeFirstChar)(programType), " start;\n").concat(programContent, "\n* ").concat(fileType).concat((0, formatter_1.capitalizeFirstChar)(programType), " end;")
|
|
197
202
|
: '';
|
|
198
203
|
return [2 /*return*/, {
|
|
199
204
|
content: content,
|
|
@@ -208,11 +213,11 @@ var mockGetProgram = function (module, fakeInit, fakeTerm) {
|
|
|
208
213
|
jest.spyOn(module, 'getProgram').mockImplementation(function (params, programType) {
|
|
209
214
|
return programType === ProgramType.Init
|
|
210
215
|
? Promise.resolve({
|
|
211
|
-
content: "\n* "
|
|
216
|
+
content: "\n* ".concat(params.fileType, "Init start;\n").concat(fakeInit, "\n* ").concat(params.fileType, "Init end;"),
|
|
212
217
|
filePath: ''
|
|
213
218
|
})
|
|
214
219
|
: Promise.resolve({
|
|
215
|
-
content: "\n* "
|
|
220
|
+
content: "\n* ".concat(params.fileType, "Term start;\n").concat(fakeTerm, "\n* ").concat(params.fileType, "Term end;"),
|
|
216
221
|
filePath: ''
|
|
217
222
|
});
|
|
218
223
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInitTerm.js","sourceRoot":"","sources":["../../src/sasjsCli/getInitTerm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gCAAmD;AACnD,kCAOiB;AACjB,kCAAgC;AAChC,0CAAkD;
|
|
1
|
+
{"version":3,"file":"getInitTerm.js","sourceRoot":"","sources":["../../src/sasjsCli/getInitTerm.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Configuration, SASJsFileType, Target } from '../types';
|
|
2
|
-
|
|
2
|
+
import { CompileTree } from '../compileTree';
|
|
3
|
+
interface LoadDependenciesParams {
|
|
3
4
|
filePath?: string;
|
|
4
5
|
fileContent: string;
|
|
5
6
|
configuration?: Configuration;
|
|
@@ -10,6 +11,8 @@ interface loadDependenciesParams {
|
|
|
10
11
|
buildSourceFolder: string;
|
|
11
12
|
binaryFolders: string[];
|
|
12
13
|
macroCorePath: string;
|
|
14
|
+
compileTree: CompileTree;
|
|
13
15
|
}
|
|
14
|
-
export declare const loadDependenciesFile: ({ filePath, fileContent, configuration, target, type, programFolders, macroFolders, buildSourceFolder, macroCorePath, binaryFolders }:
|
|
16
|
+
export declare const loadDependenciesFile: ({ filePath, fileContent, configuration, target, type, programFolders, macroFolders, buildSourceFolder, macroCorePath, binaryFolders, compileTree }: LoadDependenciesParams) => Promise<string>;
|
|
17
|
+
export declare const getAllDependencies: (filePaths: string[], compileTree?: CompileTree | undefined) => Promise<string>;
|
|
15
18
|
export {};
|
|
@@ -51,77 +51,91 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
51
51
|
}
|
|
52
52
|
return ar;
|
|
53
53
|
};
|
|
54
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
55
|
-
for (var i = 0,
|
|
56
|
-
|
|
57
|
-
|
|
54
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
55
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
56
|
+
if (ar || !(i in from)) {
|
|
57
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
58
|
+
ar[i] = from[i];
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
58
62
|
};
|
|
59
63
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
60
|
-
exports.loadDependenciesFile = void 0;
|
|
64
|
+
exports.getAllDependencies = exports.loadDependenciesFile = void 0;
|
|
61
65
|
var file_1 = require("../file");
|
|
62
66
|
var utils_1 = require("../utils");
|
|
63
67
|
var _1 = require("./");
|
|
64
68
|
var loadDependenciesFile = function (_a) {
|
|
65
|
-
var filePath = _a.filePath, fileContent = _a.fileContent, configuration = _a.configuration, target = _a.target, type = _a.type, programFolders = _a.programFolders, macroFolders = _a.macroFolders, buildSourceFolder = _a.buildSourceFolder, macroCorePath = _a.macroCorePath, binaryFolders = _a.binaryFolders;
|
|
69
|
+
var filePath = _a.filePath, fileContent = _a.fileContent, configuration = _a.configuration, target = _a.target, type = _a.type, programFolders = _a.programFolders, macroFolders = _a.macroFolders, buildSourceFolder = _a.buildSourceFolder, macroCorePath = _a.macroCorePath, binaryFolders = _a.binaryFolders, compileTree = _a.compileTree;
|
|
66
70
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
67
71
|
var _b, init, initPath, term, termPath, startUpVars, fileDependencyPaths, initDependencyPaths, termDependencyPaths, allDependencyPaths, initProgramDependencies, termProgramDependencies, programDependencies, binariesDeps, dependenciesContent;
|
|
68
72
|
return __generator(this, function (_c) {
|
|
69
73
|
switch (_c.label) {
|
|
70
|
-
case 0: return [4 /*yield*/, _1.getInitTerm({
|
|
74
|
+
case 0: return [4 /*yield*/, (0, _1.getInitTerm)({
|
|
71
75
|
configuration: configuration,
|
|
72
76
|
target: target,
|
|
73
77
|
fileType: type,
|
|
74
|
-
buildSourceFolder: buildSourceFolder
|
|
78
|
+
buildSourceFolder: buildSourceFolder,
|
|
79
|
+
compileTree: compileTree
|
|
75
80
|
})];
|
|
76
81
|
case 1:
|
|
77
82
|
_b = _c.sent(), init = _b.init, initPath = _b.initPath, term = _b.term, termPath = _b.termPath, startUpVars = _b.startUpVars;
|
|
78
|
-
fileContent = "\n* "
|
|
79
|
-
return [4 /*yield*/, _1.getDependencyPaths(fileContent
|
|
83
|
+
fileContent = "\n* ".concat(type, " start;\n").concat(fileContent, "\n* ").concat(type, " end;");
|
|
84
|
+
return [4 /*yield*/, (0, _1.getDependencyPaths)("".concat(fileContent, "\n").concat(init, "\n").concat(term), macroFolders, macroCorePath, compileTree)];
|
|
80
85
|
case 2:
|
|
81
86
|
fileDependencyPaths = _c.sent();
|
|
82
|
-
return [4 /*yield*/, _1.getDependencyPaths(init, macroFolders, macroCorePath)];
|
|
87
|
+
return [4 /*yield*/, (0, _1.getDependencyPaths)(init, macroFolders, macroCorePath, compileTree)];
|
|
83
88
|
case 3:
|
|
84
89
|
initDependencyPaths = _c.sent();
|
|
85
|
-
return [4 /*yield*/, _1.getDependencyPaths(term, macroFolders, macroCorePath)];
|
|
90
|
+
return [4 /*yield*/, (0, _1.getDependencyPaths)(term, macroFolders, macroCorePath, compileTree)];
|
|
86
91
|
case 4:
|
|
87
92
|
termDependencyPaths = _c.sent();
|
|
88
|
-
allDependencyPaths = __spreadArray(__spreadArray(__spreadArray([], __read(initDependencyPaths)), __read(fileDependencyPaths)), __read(termDependencyPaths));
|
|
89
|
-
return [4 /*yield*/, _1.getDependencies(initPath, init, programFolders, _1.DependencyType.Include)];
|
|
93
|
+
allDependencyPaths = __spreadArray(__spreadArray(__spreadArray([], __read(initDependencyPaths), false), __read(fileDependencyPaths), false), __read(termDependencyPaths), false);
|
|
94
|
+
return [4 /*yield*/, (0, _1.getDependencies)(initPath, init, programFolders, _1.DependencyType.Include, compileTree)];
|
|
90
95
|
case 5:
|
|
91
96
|
initProgramDependencies = _c.sent();
|
|
92
|
-
return [4 /*yield*/, _1.getDependencies(termPath, term, programFolders, _1.DependencyType.Include)];
|
|
97
|
+
return [4 /*yield*/, (0, _1.getDependencies)(termPath, term, programFolders, _1.DependencyType.Include, compileTree)];
|
|
93
98
|
case 6:
|
|
94
99
|
termProgramDependencies = _c.sent();
|
|
95
|
-
return [4 /*yield*/, _1.getDependencies(filePath, fileContent, programFolders, _1.DependencyType.Include)];
|
|
100
|
+
return [4 /*yield*/, (0, _1.getDependencies)(filePath, fileContent, programFolders, _1.DependencyType.Include, compileTree)];
|
|
96
101
|
case 7:
|
|
97
102
|
programDependencies = _c.sent();
|
|
98
|
-
return [4 /*yield*/, _1.getDependencies(filePath, fileContent, binaryFolders, _1.DependencyType.Binary)];
|
|
103
|
+
return [4 /*yield*/, (0, _1.getDependencies)(filePath, fileContent, binaryFolders, _1.DependencyType.Binary, compileTree)];
|
|
99
104
|
case 8:
|
|
100
105
|
binariesDeps = _c.sent();
|
|
101
|
-
return [4 /*yield*/, getAllDependencies(allDependencyPaths)];
|
|
106
|
+
return [4 /*yield*/, (0, exports.getAllDependencies)(allDependencyPaths, compileTree)];
|
|
102
107
|
case 9:
|
|
103
108
|
dependenciesContent = _c.sent();
|
|
104
|
-
fileContent = "* SAS Macros start;\n"
|
|
105
|
-
fileContent = "* "
|
|
109
|
+
fileContent = "* SAS Macros start;\n".concat(initProgramDependencies, "\n").concat(termProgramDependencies, "\n").concat(dependenciesContent, "\n* SAS Macros end;\n* SAS Includes start;\n").concat(programDependencies, "\n* SAS Includes end;\n* Binary Files start;\n").concat(binariesDeps, "\n* Binary Files end;\n\n ").concat(init).concat(fileContent).concat(term);
|
|
110
|
+
fileContent = "* ".concat(type, " Variables start;\n").concat(startUpVars, "\n* ").concat(type, " Variables end;\n").concat(fileContent);
|
|
106
111
|
return [2 /*return*/, fileContent];
|
|
107
112
|
}
|
|
108
113
|
});
|
|
109
114
|
});
|
|
110
115
|
};
|
|
111
116
|
exports.loadDependenciesFile = loadDependenciesFile;
|
|
112
|
-
var getAllDependencies = function (filePaths) { return __awaiter(void 0, void 0, void 0, function () {
|
|
117
|
+
var getAllDependencies = function (filePaths, compileTree) { return __awaiter(void 0, void 0, void 0, function () {
|
|
113
118
|
var dependenciesContent;
|
|
114
119
|
return __generator(this, function (_a) {
|
|
115
120
|
switch (_a.label) {
|
|
116
121
|
case 0:
|
|
117
122
|
dependenciesContent = [];
|
|
118
|
-
return [4 /*yield*/, utils_1.asyncForEach(__spreadArray([], __read(new Set(filePaths))), function (filePath) { return __awaiter(void 0, void 0, void 0, function () {
|
|
123
|
+
return [4 /*yield*/, (0, utils_1.asyncForEach)(__spreadArray([], __read(new Set(filePaths)), false), function (filePath) { return __awaiter(void 0, void 0, void 0, function () {
|
|
119
124
|
var depFileContent;
|
|
120
125
|
return __generator(this, function (_a) {
|
|
121
126
|
switch (_a.label) {
|
|
122
|
-
case 0:
|
|
127
|
+
case 0:
|
|
128
|
+
depFileContent = '';
|
|
129
|
+
if (!(compileTree && Object.keys(compileTree).length)) return [3 /*break*/, 2];
|
|
130
|
+
return [4 /*yield*/, compileTree.getDepContent(filePath)];
|
|
123
131
|
case 1:
|
|
124
132
|
depFileContent = _a.sent();
|
|
133
|
+
return [3 /*break*/, 4];
|
|
134
|
+
case 2: return [4 /*yield*/, (0, file_1.readFile)(filePath)];
|
|
135
|
+
case 3:
|
|
136
|
+
depFileContent = _a.sent();
|
|
137
|
+
_a.label = 4;
|
|
138
|
+
case 4:
|
|
125
139
|
dependenciesContent.push(depFileContent);
|
|
126
140
|
return [2 /*return*/];
|
|
127
141
|
}
|
|
@@ -133,4 +147,5 @@ var getAllDependencies = function (filePaths) { return __awaiter(void 0, void 0,
|
|
|
133
147
|
}
|
|
134
148
|
});
|
|
135
149
|
}); };
|
|
150
|
+
exports.getAllDependencies = getAllDependencies;
|
|
136
151
|
//# sourceMappingURL=loadDependenciesFile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadDependenciesFile.js","sourceRoot":"","sources":["../../src/sasjsCli/loadDependenciesFile.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loadDependenciesFile.js","sourceRoot":"","sources":["../../src/sasjsCli/loadDependenciesFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,10 +15,14 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
15
15
|
}
|
|
16
16
|
return ar;
|
|
17
17
|
};
|
|
18
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
19
|
-
for (var i = 0,
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
19
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
20
|
+
if (ar || !(i in from)) {
|
|
21
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
22
|
+
ar[i] = from[i];
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
22
26
|
};
|
|
23
27
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
24
28
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
@@ -29,10 +33,10 @@ var path_1 = __importDefault(require("path"));
|
|
|
29
33
|
var prioritiseDependencyOverrides = function (dependencyNames, dependencyPaths, macroPaths, pathSeparator) {
|
|
30
34
|
if (macroPaths === void 0) { macroPaths = []; }
|
|
31
35
|
if (pathSeparator === void 0) { pathSeparator = path_1.default.sep; }
|
|
32
|
-
dependencyPaths = __spreadArray([], __read(new Set(dependencyPaths)));
|
|
36
|
+
dependencyPaths = __spreadArray([], __read(new Set(dependencyPaths)), false);
|
|
33
37
|
dependencyNames.forEach(function (depFileName) {
|
|
34
38
|
var paths = dependencyPaths.filter(function (p) {
|
|
35
|
-
return p.includes(""
|
|
39
|
+
return p.includes("".concat(pathSeparator).concat(depFileName));
|
|
36
40
|
});
|
|
37
41
|
var overriddenDependencyPaths = paths.filter(function (p) { return !p.includes('node_modules'); });
|
|
38
42
|
if (macroPaths.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prioritiseDependencyOverrides.js","sourceRoot":"","sources":["../../src/sasjsCli/prioritiseDependencyOverrides.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prioritiseDependencyOverrides.js","sourceRoot":"","sources":["../../src/sasjsCli/prioritiseDependencyOverrides.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AAEhB,IAAM,6BAA6B,GAAG,UAC3C,eAAyB,EACzB,eAAyB,EACzB,UAAyB,EACzB,aAAwB;IADxB,2BAAA,EAAA,eAAyB;IACzB,8BAAA,EAAA,gBAAgB,cAAI,CAAC,GAAG;IAExB,eAAe,4BAAO,IAAI,GAAG,CAAC,eAAe,CAAC,SAAC,CAAA;IAC/C,eAAe,CAAC,OAAO,CAAC,UAAC,WAAW;QAClC,IAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,UAAC,CAAC;YACrC,OAAA,CAAC,CAAC,QAAQ,CAAC,UAAG,aAAa,SAAG,WAAW,CAAE,CAAC;QAA5C,CAA4C,CAC7C,CAAA;QAED,IAAI,yBAAyB,GAAG,KAAK,CAAC,MAAM,CAC1C,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAA3B,CAA2B,CACnC,CAAA;QACD,IAAI,UAAU,CAAC,MAAM,EAAE;YACrB,IAAM,iBAAiB,GAAG,yBAAyB,CAAC,MAAM,CAAC,UAAC,CAAC;gBAC3D,IAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,UAAC,EAAE,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAd,CAAc,CAAC,CAAA;gBACzD,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA;YACjC,CAAC,CAAC,CAAA;YACF,IAAI,iBAAiB,CAAC,MAAM;gBAC1B,yBAAyB,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAA;SACrD;QAED,IACE,yBAAyB,CAAC,MAAM;YAChC,yBAAyB,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,EAChD;YACA,IAAM,eAAa,GAAG,KAAK,CAAC,MAAM,CAChC,UAAC,EAAE,IAAK,OAAA,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,EAAzC,CAAyC,CAClD,CAAA;YACD,eAAe,GAAG,eAAe,CAAC,MAAM,CACtC,UAAC,EAAE,IAAK,OAAA,eAAa,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,EAA7B,CAA6B,CACtC,CAAA;SACF;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,eAAe,CAAA;AACxB,CAAC,CAAA;AAtCY,QAAA,6BAA6B,iCAsCzC"}
|
package/time/timestamp.js
CHANGED
|
@@ -7,14 +7,14 @@ var timestampToYYYYMMDDHHMMSS = function (timestamp) {
|
|
|
7
7
|
var date = new Date(timestamp);
|
|
8
8
|
return ([
|
|
9
9
|
date.getFullYear(),
|
|
10
|
-
formatter_1.padWithNumber(date.getMonth() + 1),
|
|
11
|
-
formatter_1.padWithNumber(date.getDate())
|
|
10
|
+
(0, formatter_1.padWithNumber)(date.getMonth() + 1),
|
|
11
|
+
(0, formatter_1.padWithNumber)(date.getDate())
|
|
12
12
|
].join('/') +
|
|
13
13
|
' ' +
|
|
14
14
|
[
|
|
15
|
-
formatter_1.padWithNumber(date.getHours()),
|
|
16
|
-
formatter_1.padWithNumber(date.getMinutes()),
|
|
17
|
-
formatter_1.padWithNumber(date.getSeconds())
|
|
15
|
+
(0, formatter_1.padWithNumber)(date.getHours()),
|
|
16
|
+
(0, formatter_1.padWithNumber)(date.getMinutes()),
|
|
17
|
+
(0, formatter_1.padWithNumber)(date.getSeconds())
|
|
18
18
|
].join(':'));
|
|
19
19
|
};
|
|
20
20
|
exports.timestampToYYYYMMDDHHMMSS = timestampToYYYYMMDDHHMMSS;
|
|
@@ -29,7 +29,7 @@ function generateTimestamp(sep, sepIndex) {
|
|
|
29
29
|
date.getUTCMinutes(),
|
|
30
30
|
date.getUTCSeconds()
|
|
31
31
|
];
|
|
32
|
-
timestamp = timestamp.map(function (item) { return formatter_1.padWithNumber(item); });
|
|
32
|
+
timestamp = timestamp.map(function (item) { return (0, formatter_1.padWithNumber)(item); });
|
|
33
33
|
if (sepIndex && sep && sepIndex < timestamp.length && sepIndex >= 0) {
|
|
34
34
|
timestamp.splice(sepIndex, 0, sep);
|
|
35
35
|
}
|
package/time/timestamp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timestamp.js","sourceRoot":"","sources":["../../src/time/timestamp.ts"],"names":[],"mappings":";;;AAAA,0CAA4C;AAErC,IAAM,yBAAyB,GAAG,UAAC,SAA8B;IAA9B,0BAAA,EAAA,YAAoB,IAAI,CAAC,GAAG,EAAE;IACtE,IAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAA;IAEhC,OAAO,CACL;QACE,IAAI,CAAC,WAAW,EAAE;QAClB,yBAAa,
|
|
1
|
+
{"version":3,"file":"timestamp.js","sourceRoot":"","sources":["../../src/time/timestamp.ts"],"names":[],"mappings":";;;AAAA,0CAA4C;AAErC,IAAM,yBAAyB,GAAG,UAAC,SAA8B;IAA9B,0BAAA,EAAA,YAAoB,IAAI,CAAC,GAAG,EAAE;IACtE,IAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAA;IAEhC,OAAO,CACL;QACE,IAAI,CAAC,WAAW,EAAE;QAClB,IAAA,yBAAa,EAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClC,IAAA,yBAAa,EAAC,IAAI,CAAC,OAAO,EAAE,CAAC;KAC9B,CAAC,IAAI,CAAC,GAAG,CAAC;QACX,GAAG;QACH;YACE,IAAA,yBAAa,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC9B,IAAA,yBAAa,EAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChC,IAAA,yBAAa,EAAC,IAAI,CAAC,UAAU,EAAE,CAAC;SACjC,CAAC,IAAI,CAAC,GAAG,CAAC,CACZ,CAAA;AACH,CAAC,CAAA;AAhBY,QAAA,yBAAyB,6BAgBrC;AAED,SAAgB,iBAAiB,CAAC,GAAQ,EAAE,QAAiB;IAA3B,oBAAA,EAAA,QAAQ;IACxC,IAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;IAEvB,IAAI,SAAS,GAAiC;QAC5C,IAAI,CAAC,cAAc,EAAE;QACrB,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC;QACtB,IAAI,CAAC,UAAU,EAAE;QACjB,IAAI,CAAC,WAAW,EAAE;QAClB,IAAI,CAAC,aAAa,EAAE;QACpB,IAAI,CAAC,aAAa,EAAE;KACrB,CAAA;IAED,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,IAAA,yBAAa,EAAC,IAAc,CAAC,EAA7B,CAA6B,CAAC,CAAA;IAElE,IAAI,QAAQ,IAAI,GAAG,IAAI,QAAQ,GAAG,SAAS,CAAC,MAAM,IAAI,QAAQ,IAAI,CAAC,EAAE;QACnE,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;KACnC;IAED,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IAE/C,OAAO,SAAS,CAAA;AAClB,CAAC;AArBD,8CAqBC"}
|
package/types/target.js
CHANGED
|
@@ -13,40 +13,40 @@ var Target = /** @class */ (function () {
|
|
|
13
13
|
if (!json) {
|
|
14
14
|
throw new Error('Invalid target: Input JSON is null or undefined.');
|
|
15
15
|
}
|
|
16
|
-
this._name = targetValidators_1.validateTargetName(json.name);
|
|
17
|
-
this._serverUrl = targetValidators_1.validateServerUrl(json.serverUrl);
|
|
18
|
-
this._serverType = targetValidators_1.validateServerType(json.serverType);
|
|
19
|
-
this._httpsAgentOptions = targetValidators_1.validateHttpsAgentOptions(json.httpsAgentOptions);
|
|
20
|
-
this._appLoc = targetValidators_1.validateAppLoc(json.appLoc);
|
|
21
|
-
this._contextName = targetValidators_1.validateContextName(json.contextName, this._serverType);
|
|
22
|
-
this._serverName = targetValidators_1.validateServerName(json.serverName, this._serverType);
|
|
23
|
-
this._repositoryName = targetValidators_1.validateRepositoryName(json.repositoryName, this._serverType);
|
|
16
|
+
this._name = (0, targetValidators_1.validateTargetName)(json.name);
|
|
17
|
+
this._serverUrl = (0, targetValidators_1.validateServerUrl)(json.serverUrl);
|
|
18
|
+
this._serverType = (0, targetValidators_1.validateServerType)(json.serverType);
|
|
19
|
+
this._httpsAgentOptions = (0, targetValidators_1.validateHttpsAgentOptions)(json.httpsAgentOptions);
|
|
20
|
+
this._appLoc = (0, targetValidators_1.validateAppLoc)(json.appLoc);
|
|
21
|
+
this._contextName = (0, targetValidators_1.validateContextName)(json.contextName, this._serverType);
|
|
22
|
+
this._serverName = (0, targetValidators_1.validateServerName)(json.serverName, this._serverType);
|
|
23
|
+
this._repositoryName = (0, targetValidators_1.validateRepositoryName)(json.repositoryName, this._serverType);
|
|
24
24
|
if (json.docConfig) {
|
|
25
|
-
this._docConfig = targetValidators_1.validateDocConfig(json.docConfig);
|
|
25
|
+
this._docConfig = (0, targetValidators_1.validateDocConfig)(json.docConfig);
|
|
26
26
|
}
|
|
27
27
|
if (json.authConfig) {
|
|
28
|
-
this._authConfig = targetValidators_1.validateAuthConfig(json.authConfig);
|
|
28
|
+
this._authConfig = (0, targetValidators_1.validateAuthConfig)(json.authConfig);
|
|
29
29
|
}
|
|
30
30
|
if (json.authConfigSas9) {
|
|
31
|
-
this._authConfigSas9 = targetValidators_1.validateAuthConfigSas9(json.authConfigSas9);
|
|
31
|
+
this._authConfigSas9 = (0, targetValidators_1.validateAuthConfigSas9)(json.authConfigSas9);
|
|
32
32
|
}
|
|
33
33
|
if (json.buildConfig) {
|
|
34
|
-
this._buildConfig = targetValidators_1.validateBuildConfig(json.buildConfig, this._name);
|
|
34
|
+
this._buildConfig = (0, targetValidators_1.validateBuildConfig)(json.buildConfig, this._name);
|
|
35
35
|
}
|
|
36
36
|
if (json.deployConfig) {
|
|
37
|
-
this._deployConfig = targetValidators_1.validateDeployConfig(json.deployConfig);
|
|
37
|
+
this._deployConfig = (0, targetValidators_1.validateDeployConfig)(json.deployConfig);
|
|
38
38
|
}
|
|
39
39
|
if (json.serviceConfig) {
|
|
40
|
-
this._serviceConfig = targetValidators_1.validateServiceConfig(json.serviceConfig);
|
|
40
|
+
this._serviceConfig = (0, targetValidators_1.validateServiceConfig)(json.serviceConfig);
|
|
41
41
|
}
|
|
42
42
|
if (json.jobConfig) {
|
|
43
|
-
this._jobConfig = targetValidators_1.validateJobConfig(json.jobConfig);
|
|
43
|
+
this._jobConfig = (0, targetValidators_1.validateJobConfig)(json.jobConfig);
|
|
44
44
|
}
|
|
45
45
|
if (json.streamConfig) {
|
|
46
|
-
this._streamConfig = targetValidators_1.validateStreamConfig(json.streamConfig);
|
|
46
|
+
this._streamConfig = (0, targetValidators_1.validateStreamConfig)(json.streamConfig);
|
|
47
47
|
}
|
|
48
48
|
if (json.testConfig) {
|
|
49
|
-
this._testConfig = targetValidators_1.validateTestConfig(json.testConfig);
|
|
49
|
+
this._testConfig = (0, targetValidators_1.validateTestConfig)(json.testConfig);
|
|
50
50
|
}
|
|
51
51
|
if (json.macroFolders && json.macroFolders.length) {
|
|
52
52
|
this._macroFolders = json.macroFolders;
|
|
@@ -59,7 +59,7 @@ var Target = /** @class */ (function () {
|
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
catch (e) {
|
|
62
|
-
throw new Error("Error parsing target: "
|
|
62
|
+
throw new Error("Error parsing target: ".concat(e.message));
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
Object.defineProperty(Target.prototype, "name", {
|
|
@@ -228,7 +228,7 @@ var Target = /** @class */ (function () {
|
|
|
228
228
|
json.buildConfig = {
|
|
229
229
|
initProgram: '',
|
|
230
230
|
termProgram: '',
|
|
231
|
-
buildOutputFileName: this.name
|
|
231
|
+
buildOutputFileName: "".concat(this.name, ".sas"),
|
|
232
232
|
buildOutputFolder: 'sasjsbuild',
|
|
233
233
|
buildResultsFolder: 'sasjsresults',
|
|
234
234
|
macroVars: {}
|
package/types/target.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target.js","sourceRoot":"","sources":["../../src/types/target.ts"],"names":[],"mappings":";;;AAWA,2CAAyC;AAEzC,uDAkB2B;AA0B3B;IAqGE,gBAAY,IAAS;QAvFb,gBAAW,GAAG,uBAAU,CAAC,OAAO,CAAA;QAuDhC,kBAAa,GAAa,EAAE,CAAA;QAK5B,oBAAe,GAAa,EAAE,CAAA;QAK9B,mBAAc,GAAa,EAAE,CAAA;QAuBnC,IAAI;YACF,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;aACpE;YAED,IAAI,CAAC,KAAK,GAAG,qCAAkB,
|
|
1
|
+
{"version":3,"file":"target.js","sourceRoot":"","sources":["../../src/types/target.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ var validateServerType = function (serverType) {
|
|
|
16
16
|
if (!(serverType === _1.ServerType.Sas9 ||
|
|
17
17
|
serverType === _1.ServerType.SasViya ||
|
|
18
18
|
serverType === _1.ServerType.Sasjs)) {
|
|
19
|
-
throw new Error("Invalid server type: Supported values for `serverType` are "
|
|
19
|
+
throw new Error("Invalid server type: Supported values for `serverType` are ".concat(_1.ServerType.SasViya, ", ").concat(_1.ServerType.Sas9, " and ").concat(_1.ServerType.Sasjs, "."));
|
|
20
20
|
}
|
|
21
21
|
return serverType;
|
|
22
22
|
};
|
|
@@ -135,7 +135,7 @@ var validateBuildConfig = function (buildConfig, defaultName) {
|
|
|
135
135
|
buildConfig.buildOutputFolder = 'sasjsbuild';
|
|
136
136
|
}
|
|
137
137
|
if (!buildConfig.buildOutputFileName) {
|
|
138
|
-
buildConfig.buildOutputFileName = defaultName
|
|
138
|
+
buildConfig.buildOutputFileName = "".concat(defaultName, ".sas");
|
|
139
139
|
}
|
|
140
140
|
if (!buildConfig.initProgram) {
|
|
141
141
|
buildConfig.initProgram = '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"targetValidators.js","sourceRoot":"","sources":["../../src/types/targetValidators.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAChC,sBAAiD;AAajD,IAAM,oBAAoB,GAAG,mCAAmC,CAAA;AAChE,IAAM,mBAAmB,GAAG,QAAQ,CAAA;AACpC,IAAM,uBAAuB,GAAG,YAAY,CAAA;AAErC,IAAM,kBAAkB,GAAG,UAAC,UAAe;IAChD,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CACb,gEAAgE,CACjE,CAAA;KACF;IAED,IACE,CAAC,CACC,UAAU,KAAK,aAAU,CAAC,IAAI;QAC9B,UAAU,KAAK,aAAU,CAAC,OAAO;QACjC,UAAU,KAAK,aAAU,CAAC,KAAK,CAChC,EACD;QACA,MAAM,IAAI,KAAK,CACb,
|
|
1
|
+
{"version":3,"file":"targetValidators.js","sourceRoot":"","sources":["../../src/types/targetValidators.ts"],"names":[],"mappings":"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"}
|
package/utils/diff.js
CHANGED
|
@@ -15,10 +15,14 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
15
15
|
}
|
|
16
16
|
return ar;
|
|
17
17
|
};
|
|
18
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
19
|
-
for (var i = 0,
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
19
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
20
|
+
if (ar || !(i in from)) {
|
|
21
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
22
|
+
ar[i] = from[i];
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
22
26
|
};
|
|
23
27
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
28
|
exports.diff = void 0;
|
|
@@ -33,7 +37,7 @@ function diff(a, b) {
|
|
|
33
37
|
? !JSON.stringify(a).includes(JSON.stringify(item))
|
|
34
38
|
: !a.includes(item);
|
|
35
39
|
});
|
|
36
|
-
return __spreadArray(__spreadArray([], __read(notInA)), __read(notInB));
|
|
40
|
+
return __spreadArray(__spreadArray([], __read(notInA), false), __read(notInB), false);
|
|
37
41
|
}
|
|
38
42
|
exports.diff = diff;
|
|
39
43
|
//# sourceMappingURL=diff.js.map
|
package/utils/diff.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/utils/diff.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/utils/diff.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAgB,IAAI,CAAC,CAAQ,EAAE,CAAQ;IACrC,IAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,UAAC,IAAI;QAC3B,OAAA,OAAO,IAAI,KAAK,QAAQ;YACtB,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IAFrB,CAEqB,CACtB,CAAA;IACD,IAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,UAAC,IAAI;QAC3B,OAAA,OAAO,IAAI,KAAK,QAAQ;YACtB,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IAFrB,CAEqB,CACtB,CAAA;IAED,8CAAW,MAAM,kBAAK,MAAM,UAAC;AAC/B,CAAC;AAbD,oBAaC"}
|