@sasjs/utils 2.36.0 → 2.36.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/auth/auth.js +2 -2
- package/auth/auth.js.map +1 -1
- 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.js +17 -13
- package/file/file.js.map +1 -1
- package/formatter/number.js +1 -1
- package/formatter/number.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.js +29 -29
- package/sasjsCli/getDependencies.js.map +1 -1
- package/sasjsCli/getDependencyPaths.js +29 -23
- package/sasjsCli/getDependencyPaths.js.map +1 -1
- package/sasjsCli/getInitTerm.js +11 -11
- package/sasjsCli/getInitTerm.js.map +1 -1
- package/sasjsCli/loadDependenciesFile.js +22 -18
- 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
|
@@ -85,10 +85,10 @@ var getDepInfo = function (depType, fileContent) {
|
|
|
85
85
|
}
|
|
86
86
|
var depInfo = {
|
|
87
87
|
name: header,
|
|
88
|
-
header: "<h4> "
|
|
89
|
-
config: (depType === DependencyType.Include
|
|
88
|
+
header: "<h4> ".concat(header, " </h4>"),
|
|
89
|
+
config: "".concat((depType === DependencyType.Include
|
|
90
90
|
? 'Program'
|
|
91
|
-
: depType).toLowerCase()
|
|
91
|
+
: depType).toLowerCase(), "Folders"),
|
|
92
92
|
type: depType
|
|
93
93
|
};
|
|
94
94
|
return depInfo;
|
|
@@ -98,9 +98,9 @@ var getDependencies = function (fileName, fileContent, folders, depType) { retur
|
|
|
98
98
|
return __generator(this, function (_a) {
|
|
99
99
|
switch (_a.label) {
|
|
100
100
|
case 0:
|
|
101
|
-
folders = utils_1.uniqArray(folders);
|
|
101
|
+
folders = (0, utils_1.uniqArray)(folders);
|
|
102
102
|
depInfo = getDepInfo(depType, fileContent);
|
|
103
|
-
deps = deconstructDependency(_1.getList(depInfo.header, fileContent), depInfo);
|
|
103
|
+
deps = deconstructDependency((0, _1.getList)(depInfo.header, fileContent), depInfo);
|
|
104
104
|
uniqDeps = [];
|
|
105
105
|
deps.forEach(function (dep) {
|
|
106
106
|
return uniqDeps.find(function (d) { return dep.fileName === d.fileName; }) || uniqDeps.push(dep);
|
|
@@ -108,17 +108,17 @@ var getDependencies = function (fileName, fileContent, folders, depType) { retur
|
|
|
108
108
|
if (!uniqDeps.length) return [3 /*break*/, 2];
|
|
109
109
|
foundDeps_1 = [];
|
|
110
110
|
foundDepsNames_1 = [];
|
|
111
|
-
return [4 /*yield*/, utils_2.asyncForEach(folders, function (folder) { return __awaiter(void 0, void 0, void 0, function () {
|
|
111
|
+
return [4 /*yield*/, (0, utils_2.asyncForEach)(folders, function (folder) { return __awaiter(void 0, void 0, void 0, function () {
|
|
112
112
|
return __generator(this, function (_a) {
|
|
113
113
|
switch (_a.label) {
|
|
114
|
-
case 0: return [4 /*yield*/, utils_2.asyncForEach(uniqDeps, function (dep) { return __awaiter(void 0, void 0, void 0, function () {
|
|
114
|
+
case 0: return [4 /*yield*/, (0, utils_2.asyncForEach)(uniqDeps, function (dep) { return __awaiter(void 0, void 0, void 0, function () {
|
|
115
115
|
var filePaths, encodedFileContent, depContent;
|
|
116
116
|
return __generator(this, function (_a) {
|
|
117
117
|
switch (_a.label) {
|
|
118
118
|
case 0:
|
|
119
119
|
filePaths = find_1.default.fileSync(dep.fileName, folder);
|
|
120
120
|
if (!filePaths.length) return [3 /*break*/, 2];
|
|
121
|
-
return [4 /*yield*/, file_1.readFile(filePaths[0], depType === DependencyType.Binary ? 'base64' : undefined)];
|
|
121
|
+
return [4 /*yield*/, (0, file_1.readFile)(filePaths[0], depType === DependencyType.Binary ? 'base64' : undefined)];
|
|
122
122
|
case 1:
|
|
123
123
|
encodedFileContent = _a.sent();
|
|
124
124
|
depContent = compileDep(depType, encodedFileContent, dep.fileRef);
|
|
@@ -139,17 +139,17 @@ var getDependencies = function (fileName, fileContent, folders, depType) { retur
|
|
|
139
139
|
_a.sent();
|
|
140
140
|
notFoundDeps = deps
|
|
141
141
|
.filter(function (dep) { return !foundDepsNames_1.includes(dep.fileName); })
|
|
142
|
-
.map(function (dep, i) { return i + 1
|
|
142
|
+
.map(function (dep, i) { return "".concat(i + 1, ". '").concat(dep.fileName, "' with fileRef '").concat(dep.fileRef, "'"); })
|
|
143
143
|
.join('\n');
|
|
144
144
|
if (notFoundDeps.length) {
|
|
145
145
|
depFolder = depInfo.config.replace(/([A-Z]+)/g, ' $1');
|
|
146
|
-
depFolder = formatter_1.capitalizeFirstChar(depFolder);
|
|
147
|
-
throw new Error("Unable to load dependencies for: "
|
|
148
|
-
|
|
149
|
-
(notFoundDeps
|
|
150
|
-
|
|
151
|
-
(depFolder
|
|
152
|
-
folders.map(function (folder) { return "- "
|
|
146
|
+
depFolder = (0, formatter_1.capitalizeFirstChar)(depFolder);
|
|
147
|
+
throw new Error("Unable to load dependencies for: ".concat(fileName || '', "\n") +
|
|
148
|
+
"The following files were listed under ".concat(depInfo.name, " but could not be found:\n") +
|
|
149
|
+
"".concat(notFoundDeps, "\n") +
|
|
150
|
+
"Please check that they exist in the folder(s) listed in the `".concat(depInfo.config, "` array in your sasjsconfig.json file.\n") +
|
|
151
|
+
"".concat(depFolder, ":\n") +
|
|
152
|
+
folders.map(function (folder) { return "- ".concat(folder); }).join('\n'));
|
|
153
153
|
}
|
|
154
154
|
return [2 /*return*/, foundDeps_1.join('\n')];
|
|
155
155
|
case 2: return [2 /*return*/, ''];
|
|
@@ -161,13 +161,13 @@ var deconstructDependency = function (deps, depInfo) {
|
|
|
161
161
|
return deps.map(function (dep) {
|
|
162
162
|
var _a = __read(dep.split(' ').filter(function (f) { return !!f; }), 2), fileName = _a[0], fileRef = _a[1];
|
|
163
163
|
if (!fileName) {
|
|
164
|
-
throw new Error(depInfo.name
|
|
164
|
+
throw new Error("".concat(depInfo.name, " entry is empty. Please specify ").concat(depInfo.name, " dependencies in the format: @li <filename> <fileref>"));
|
|
165
165
|
}
|
|
166
166
|
if (!fileRef && depInfo.type !== DependencyType.Macro) {
|
|
167
|
-
throw new Error(depInfo.name
|
|
167
|
+
throw new Error("".concat(depInfo.name, " ").concat(fileName, " is missing fileref. Please specify ").concat(depInfo.name, " dependencies in the format: @li <filename> <fileref>"));
|
|
168
168
|
}
|
|
169
169
|
if (depInfo.type !== DependencyType.Macro)
|
|
170
|
-
_1.validateFileRef(fileRef);
|
|
170
|
+
(0, _1.validateFileRef)(fileRef);
|
|
171
171
|
return { fileName: fileName, fileRef: fileRef };
|
|
172
172
|
});
|
|
173
173
|
};
|
|
@@ -175,7 +175,7 @@ var compileDep = function (depType, fileContent, fileRef) {
|
|
|
175
175
|
var output = '';
|
|
176
176
|
if (depType === DependencyType.Binary) {
|
|
177
177
|
output = [
|
|
178
|
-
"filename _sjstmp \"%sysfunc(pathname(work))/base64_"
|
|
178
|
+
"filename _sjstmp \"%sysfunc(pathname(work))/base64_".concat(fileRef, "\" recfm=n;"),
|
|
179
179
|
"data _null_;",
|
|
180
180
|
"file _sjstmp;\n"
|
|
181
181
|
].join("\n");
|
|
@@ -184,14 +184,14 @@ var compileDep = function (depType, fileContent, fileRef) {
|
|
|
184
184
|
.split('\n')
|
|
185
185
|
.filter(function (l) { return !!l; });
|
|
186
186
|
sourceLines.forEach(function (line) {
|
|
187
|
-
var chunkedLines = utils_2.chunk(line);
|
|
187
|
+
var chunkedLines = (0, utils_2.chunk)(line);
|
|
188
188
|
if (chunkedLines.length === 1) {
|
|
189
|
-
output += "put '"
|
|
189
|
+
output += "put '".concat(chunkedLines[0].split("'").join("''"), "';\n");
|
|
190
190
|
}
|
|
191
191
|
else {
|
|
192
192
|
var combinedLines_1 = '';
|
|
193
193
|
chunkedLines.forEach(function (chunkedLine, index) {
|
|
194
|
-
var text = "put '"
|
|
194
|
+
var text = "put '".concat(chunkedLine.split("'").join("''"), "'");
|
|
195
195
|
if (index !== chunkedLines.length - 1) {
|
|
196
196
|
text += '@;\n';
|
|
197
197
|
}
|
|
@@ -205,11 +205,11 @@ var compileDep = function (depType, fileContent, fileRef) {
|
|
|
205
205
|
});
|
|
206
206
|
output += "run;\n";
|
|
207
207
|
var sasCodeToDecodeBase64 = [
|
|
208
|
-
"filename "
|
|
208
|
+
"filename ".concat(fileRef, " \"%sysfunc(pathname(work))/sasjs_").concat(fileRef, "\";"),
|
|
209
209
|
"data _null_;",
|
|
210
210
|
"length filein 8 fileout 8;",
|
|
211
211
|
"filein = fopen(\"_sjstmp\",'I',4,'B');",
|
|
212
|
-
"fileout = fopen(\""
|
|
212
|
+
"fileout = fopen(\"".concat(fileRef, "\",'O',3,'B');"),
|
|
213
213
|
"char= '20'x;",
|
|
214
214
|
"do while(fread(filein)=0);",
|
|
215
215
|
"length raw $4;",
|
|
@@ -228,20 +228,20 @@ var compileDep = function (depType, fileContent, fileRef) {
|
|
|
228
228
|
output += sasCodeToDecodeBase64.join("\n");
|
|
229
229
|
}
|
|
230
230
|
else if (depType === DependencyType.Include) {
|
|
231
|
-
output = "filename "
|
|
231
|
+
output = "filename ".concat(fileRef, " temp;\ndata _null_;\nfile ").concat(fileRef, " lrecl=32767;\n");
|
|
232
232
|
var sourceLines = fileContent
|
|
233
233
|
.replace(/\r\n/g, '\n')
|
|
234
234
|
.split('\n')
|
|
235
235
|
.filter(function (l) { return !!l; });
|
|
236
236
|
sourceLines.forEach(function (line) {
|
|
237
|
-
var chunkedLines = utils_2.chunk(line);
|
|
237
|
+
var chunkedLines = (0, utils_2.chunk)(line);
|
|
238
238
|
if (chunkedLines.length === 1) {
|
|
239
|
-
output += "put '"
|
|
239
|
+
output += "put '".concat(chunkedLines[0].split("'").join("''"), "';\n");
|
|
240
240
|
}
|
|
241
241
|
else {
|
|
242
242
|
var combinedLines_2 = '';
|
|
243
243
|
chunkedLines.forEach(function (chunkedLine, index) {
|
|
244
|
-
var text = "put '"
|
|
244
|
+
var text = "put '".concat(chunkedLine.split("'").join("''"), "'");
|
|
245
245
|
if (index !== chunkedLines.length - 1) {
|
|
246
246
|
text += '@;\n';
|
|
247
247
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDependencies.js","sourceRoot":"","sources":["../../src/sasjsCli/getDependencies.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAAoC;AACpC,uBAA6C;AAC7C,kCAA8C;AAC9C,8CAAuB;AACvB,gCAAkC;AAClC,0CAAkD;AAElD,uEAAuE;AAEvE,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,qCAAmB,CAAA;IACnB,mCAAiB,CAAA;AACnB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AAcD,IAAM,UAAU,GAAG,UAAC,OAAuB,EAAE,WAAmB;IAC9D,IAAI,MAAM,GAAG,EAAE,CAAA;IAEf,QAAQ,OAAO,EAAE;QACf,KAAK,cAAc,CAAC,MAAM;YACxB,MAAM,GAAG,cAAc,CAAA;YAEvB,MAAK;QACP,KAAK,cAAc,CAAC,OAAO;YACzB,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,yBAAyB,CAAC;gBACtD,CAAC,CAAC,cAAc;gBAChB,CAAC,CAAC,cAAc,CAAA;YAElB,MAAK;QAEP;YACE,MAAK;KACR;IAED,IAAM,OAAO,GAAG;QACd,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"getDependencies.js","sourceRoot":"","sources":["../../src/sasjsCli/getDependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,10 +51,14 @@ 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
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
60
64
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
@@ -67,36 +71,36 @@ var utils_1 = require("../utils");
|
|
|
67
71
|
var _1 = require("./");
|
|
68
72
|
function getDependencyPaths(fileContent, macroFolders, macroCorePath) {
|
|
69
73
|
return __awaiter(this, void 0, void 0, function () {
|
|
70
|
-
var
|
|
74
|
+
var dependencyPaths, foundDependencies, sourcePaths, dependenciesHeader, dependencies, notFoundDependencies;
|
|
71
75
|
var _this = this;
|
|
72
76
|
return __generator(this, function (_a) {
|
|
73
77
|
switch (_a.label) {
|
|
74
78
|
case 0:
|
|
75
|
-
|
|
79
|
+
dependencyPaths = [];
|
|
80
|
+
foundDependencies = [];
|
|
81
|
+
sourcePaths = __spreadArray(__spreadArray([], __read(macroFolders), false), [macroCorePath], false);
|
|
76
82
|
dependenciesHeader = fileContent.includes('<h4> SAS Macros </h4>')
|
|
77
83
|
? '<h4> SAS Macros </h4>'
|
|
78
84
|
: '<h4> Dependencies </h4>';
|
|
79
|
-
dependencies = _1.getList(dependenciesHeader, fileContent).filter(function (d) {
|
|
85
|
+
dependencies = (0, _1.getList)(dependenciesHeader, fileContent).filter(function (d) {
|
|
80
86
|
return d.endsWith('.sas');
|
|
81
87
|
});
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
return [4 /*yield*/, utils_1.asyncForEach(sourcePaths, function (sourcePath) { return __awaiter(_this, void 0, void 0, function () {
|
|
85
|
-
var errorMessage;
|
|
88
|
+
// Search dependencies recursively starting from macroFolders and ending in macroCorePath
|
|
89
|
+
return [4 /*yield*/, (0, utils_1.asyncForEach)(sourcePaths, function (sourcePath) { return __awaiter(_this, void 0, void 0, function () {
|
|
86
90
|
var _this = this;
|
|
87
91
|
return __generator(this, function (_a) {
|
|
88
92
|
switch (_a.label) {
|
|
89
|
-
case 0: return [4 /*yield*/, file_1.folderExists(sourcePath)];
|
|
93
|
+
case 0: return [4 /*yield*/, (0, file_1.folderExists)(sourcePath)];
|
|
90
94
|
case 1:
|
|
91
95
|
if (!_a.sent()) return [3 /*break*/, 3];
|
|
92
|
-
return [4 /*yield*/, utils_1.asyncForEach(dependencies, function (dep) { return __awaiter(_this, void 0, void 0, function () {
|
|
96
|
+
return [4 /*yield*/, (0, utils_1.asyncForEach)(dependencies, function (dep) { return __awaiter(_this, void 0, void 0, function () {
|
|
93
97
|
var filePaths, fileContent_1, _a, _b, _c, _d;
|
|
94
98
|
return __generator(this, function (_e) {
|
|
95
99
|
switch (_e.label) {
|
|
96
100
|
case 0:
|
|
97
101
|
filePaths = find_1.default.fileSync(dep, sourcePath);
|
|
98
102
|
if (!filePaths.length) return [3 /*break*/, 3];
|
|
99
|
-
return [4 /*yield*/, file_1.readFile(filePaths[0])];
|
|
103
|
+
return [4 /*yield*/, (0, file_1.readFile)(filePaths[0])];
|
|
100
104
|
case 1:
|
|
101
105
|
fileContent_1 = _e.sent();
|
|
102
106
|
foundDependencies.push(dep);
|
|
@@ -105,10 +109,10 @@ function getDependencyPaths(fileContent, macroFolders, macroCorePath) {
|
|
|
105
109
|
_d = [[]];
|
|
106
110
|
return [4 /*yield*/, getDependencyPaths(fileContent_1, macroFolders, macroCorePath)];
|
|
107
111
|
case 2:
|
|
108
|
-
_b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([__read.apply(void 0, [(_e.sent())])]))]));
|
|
112
|
+
_b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([__read.apply(void 0, [(_e.sent())]), false]))]));
|
|
109
113
|
_e.label = 3;
|
|
110
114
|
case 3:
|
|
111
|
-
dependencyPaths.push.apply(dependencyPaths, __spreadArray([], __read(filePaths)));
|
|
115
|
+
dependencyPaths.push.apply(dependencyPaths, __spreadArray([], __read(filePaths), false));
|
|
112
116
|
return [2 /*return*/];
|
|
113
117
|
}
|
|
114
118
|
});
|
|
@@ -117,21 +121,23 @@ function getDependencyPaths(fileContent, macroFolders, macroCorePath) {
|
|
|
117
121
|
_a.sent();
|
|
118
122
|
return [3 /*break*/, 4];
|
|
119
123
|
case 3:
|
|
120
|
-
|
|
121
|
-
|
|
124
|
+
if (macroFolders.includes(sourcePath)) {
|
|
125
|
+
throw "Error listing dependency paths: Source path ".concat(sourcePath, " does not exist.");
|
|
126
|
+
}
|
|
127
|
+
_a.label = 4;
|
|
122
128
|
case 4: return [2 /*return*/];
|
|
123
129
|
}
|
|
124
130
|
});
|
|
125
131
|
}); })];
|
|
126
132
|
case 1:
|
|
133
|
+
// Search dependencies recursively starting from macroFolders and ending in macroCorePath
|
|
127
134
|
_a.sent();
|
|
128
|
-
notFoundDependencies = utils_1.diff(dependencies, foundDependencies);
|
|
135
|
+
notFoundDependencies = (0, utils_1.diff)(dependencies, foundDependencies);
|
|
129
136
|
if (notFoundDependencies.length) {
|
|
130
|
-
|
|
131
|
-
throw errorMessage;
|
|
137
|
+
throw 'Unable to locate dependencies: ' + notFoundDependencies.join(', ');
|
|
132
138
|
}
|
|
133
|
-
dependencyPaths = _1.prioritiseDependencyOverrides(dependencies, dependencyPaths, macroFolders);
|
|
134
|
-
return [2 /*return*/, __spreadArray([], __read(new Set(dependencyPaths)))];
|
|
139
|
+
dependencyPaths = (0, _1.prioritiseDependencyOverrides)(dependencies, dependencyPaths, macroFolders);
|
|
140
|
+
return [2 /*return*/, __spreadArray([], __read(new Set(dependencyPaths)), false)];
|
|
135
141
|
}
|
|
136
142
|
});
|
|
137
143
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDependencyPaths.js","sourceRoot":"","sources":["../../src/sasjsCli/getDependencyPaths.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getDependencyPaths.js","sourceRoot":"","sources":["../../src/sasjsCli/getDependencyPaths.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,gCAAgD;AAChD,kCAA6C;AAC7C,uBAA2D;AAE3D,SAAsB,kBAAkB,CACtC,WAAmB,EACnB,YAAsB,EACtB,aAAqB;;;;;;;oBAEjB,eAAe,GAAa,EAAE,CAAA;oBAC5B,iBAAiB,GAAa,EAAE,CAAA;oBAChC,WAAW,0CAAO,YAAY,YAAE,aAAa,SAAC,CAAA;oBAE9C,kBAAkB,GAAG,WAAW,CAAC,QAAQ,CAAC,uBAAuB,CAAC;wBACtE,CAAC,CAAC,uBAAuB;wBACzB,CAAC,CAAC,yBAAyB,CAAA;oBACvB,YAAY,GAAG,IAAA,UAAO,EAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC,MAAM,CAAC,UAAC,CAAC;wBACrE,OAAA,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAAlB,CAAkB,CACnB,CAAA;oBAED,yFAAyF;oBACzF,qBAAM,IAAA,oBAAY,EAAC,WAAW,EAAE,UAAO,UAAU;;;;4CAC3C,qBAAM,IAAA,mBAAY,EAAC,UAAU,CAAC,EAAA;;6CAA9B,SAA8B,EAA9B,wBAA8B;wCAChC,qBAAM,IAAA,oBAAY,EAAC,YAAY,EAAE,UAAO,GAAG;;;;;4DACnC,SAAS,GAAG,cAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;iEAE5C,SAAS,CAAC,MAAM,EAAhB,wBAAgB;4DACE,qBAAM,IAAA,eAAQ,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAA;;4DAA1C,gBAAc,SAA4B;4DAEhD,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;iEAC3B,CAAA,KAAA,eAAe,CAAC,IAAI,CAAA;kEAApB,eAAe;;4DACT,qBAAM,kBAAkB,CAC1B,aAAW,EACX,YAAY,EACZ,aAAa,CACd,EAAA;;4DALH,qFACK,CAAC,SAIH,CAAC,gBACH;;;4DAGH,eAAe,CAAC,IAAI,OAApB,eAAe,2BAAS,SAAS,WAAC;;;;iDACnC,CAAC,EAAA;;wCAjBF,SAiBE,CAAA;;;wCACG,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;4CAC5C,MAAM,sDAA+C,UAAU,qBAAkB,CAAA;yCAClF;;;;;6BACF,CAAC,EAAA;;oBAxBF,yFAAyF;oBACzF,SAuBE,CAAA;oBAEI,oBAAoB,GAAG,IAAA,YAAI,EAAC,YAAY,EAAE,iBAAiB,CAAC,CAAA;oBAElE,IAAI,oBAAoB,CAAC,MAAM,EAAE;wBAC/B,MAAM,iCAAiC,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;qBAC1E;oBAED,eAAe,GAAG,IAAA,gCAA6B,EAC7C,YAAY,EACZ,eAAe,EACf,YAAY,CACb,CAAA;oBAED,+CAAW,IAAI,GAAG,CAAC,eAAe,CAAC,WAAC;;;;CACrC;AAvDD,gDAuDC"}
|
package/sasjsCli/getInitTerm.js
CHANGED
|
@@ -90,7 +90,7 @@ var getInitTerm = function (_a) {
|
|
|
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,
|
|
@@ -98,7 +98,7 @@ var getInitTerm = function (_a) {
|
|
|
98
98
|
}, ProgramType.Init)];
|
|
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,
|
|
@@ -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 }; }
|
|
@@ -182,18 +182,18 @@ 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
|
|
187
|
+
rootConfig["".concat(programType, "Program")]);
|
|
188
188
|
if (!program) return [3 /*break*/, 2];
|
|
189
|
-
filePath = file_1.getAbsolutePath(program, buildSourceFolder);
|
|
190
|
-
return [4 /*yield*/, file_1.readFile(filePath)];
|
|
189
|
+
filePath = (0, file_1.getAbsolutePath)(program, buildSourceFolder);
|
|
190
|
+
return [4 /*yield*/, (0, file_1.readFile)(filePath)];
|
|
191
191
|
case 1:
|
|
192
192
|
programContent = _b.sent();
|
|
193
193
|
_b.label = 2;
|
|
194
194
|
case 2:
|
|
195
195
|
content = programContent
|
|
196
|
-
? "\n* "
|
|
196
|
+
? "\n* ".concat(fileType).concat((0, formatter_1.capitalizeFirstChar)(programType), " start;\n").concat(programContent, "\n* ").concat(fileType).concat((0, formatter_1.capitalizeFirstChar)(programType), " end;")
|
|
197
197
|
: '';
|
|
198
198
|
return [2 /*return*/, {
|
|
199
199
|
content: content,
|
|
@@ -208,11 +208,11 @@ var mockGetProgram = function (module, fakeInit, fakeTerm) {
|
|
|
208
208
|
jest.spyOn(module, 'getProgram').mockImplementation(function (params, programType) {
|
|
209
209
|
return programType === ProgramType.Init
|
|
210
210
|
? Promise.resolve({
|
|
211
|
-
content: "\n* "
|
|
211
|
+
content: "\n* ".concat(params.fileType, "Init start;\n").concat(fakeInit, "\n* ").concat(params.fileType, "Init end;"),
|
|
212
212
|
filePath: ''
|
|
213
213
|
})
|
|
214
214
|
: Promise.resolve({
|
|
215
|
-
content: "\n* "
|
|
215
|
+
content: "\n* ".concat(params.fileType, "Term start;\n").concat(fakeTerm, "\n* ").concat(params.fileType, "Term end;"),
|
|
216
216
|
filePath: ''
|
|
217
217
|
});
|
|
218
218
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInitTerm.js","sourceRoot":"","sources":["../../src/sasjsCli/getInitTerm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gCAAmD;AACnD,kCAOiB;AACjB,kCAAgC;AAChC,0CAAkD;AAElD,IAAY,WAGX;AAHD,WAAY,WAAW;IACrB,4BAAa,CAAA;IACb,4BAAa,CAAA;AACf,CAAC,EAHW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAGtB;AAOM,IAAM,WAAW,GAAG,UAAO,EAKd;QAJlB,aAAa,mBAAA,EACb,MAAM,YAAA,EACN,QAAQ,cAAA,EACR,iBAAiB,uBAAA;;;;;wBAE6B,qBAAM,kBAAU,
|
|
1
|
+
{"version":3,"file":"getInitTerm.js","sourceRoot":"","sources":["../../src/sasjsCli/getInitTerm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gCAAmD;AACnD,kCAOiB;AACjB,kCAAgC;AAChC,0CAAkD;AAElD,IAAY,WAGX;AAHD,WAAY,WAAW;IACrB,4BAAa,CAAA;IACb,4BAAa,CAAA;AACf,CAAC,EAHW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAGtB;AAOM,IAAM,WAAW,GAAG,UAAO,EAKd;QAJlB,aAAa,mBAAA,EACb,MAAM,YAAA,EACN,QAAQ,cAAA,EACR,iBAAiB,uBAAA;;;;;wBAE6B,qBAAM,IAAA,kBAAU,EAC5D;wBACE,MAAM,QAAA;wBACN,aAAa,eAAA;wBACb,iBAAiB,mBAAA;wBACjB,QAAQ,UAAA;qBACT,EACD,WAAW,CAAC,IAAI,CACjB,EAAA;;oBARK,KAAwC,SAQ7C,EARgB,IAAI,aAAA,EAAY,QAAQ,cAAA;oBAUK,qBAAM,IAAA,kBAAU,EAC5D;4BACE,MAAM,QAAA;4BACN,aAAa,eAAA;4BACb,iBAAiB,mBAAA;4BACjB,QAAQ,UAAA;yBACT,EACD,WAAW,CAAC,IAAI,CACjB,EAAA;;oBARK,KAAwC,SAQ7C,EARgB,IAAI,aAAA,EAAY,QAAQ,cAAA;oBAUnC,WAAW,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;oBAE5D,sBAAO;4BACL,IAAI,MAAA;4BACJ,QAAQ,UAAA;4BACR,IAAI,MAAA;4BACJ,QAAQ,UAAA;4BACR,WAAW,aAAA;yBACZ,EAAA;;;;CACF,CAAA;AAnCY,QAAA,WAAW,eAmCvB;AAED,IAAM,OAAO,GAAG,UACd,OAAsB,EACtB,MAAe,EACf,aAA6B;IAE7B,IAAM,eAAe,GAAG,UAAC,MAA+B;;QACtD,OAAA,OAAO,KAAK,qBAAa,CAAC,OAAO;YAC/B,CAAC,CAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,0CAAE,SAAS;YAClC,CAAC,CAAC,OAAO,KAAK,qBAAa,CAAC,GAAG;gBAC/B,CAAC,CAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,0CAAE,SAAS;gBAC9B,CAAC,CAAC,OAAO,KAAK,qBAAa,CAAC,IAAI;oBAChC,CAAC,CAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,0CAAE,SAAS;oBAC/B,CAAC,CAAC,EAAE,CAAA;KAAA,CAAA;IAER,IAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;IAE1C,IAAM,iBAAiB,GAAG,eAAe,CAAC,aAAa,CAAC,CAAA;IAExD,OAAO,sBAAsB,uBAAM,iBAAiB,GAAK,UAAU,EAAG,CAAA;AACxE,CAAC,CAAA;AACD,IAAM,sBAAsB,GAAG,UAAC,IAA+B;;IAC7D,IAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IACpC,IAAI,WAAW,GAAG,IAAI,CAAA;;QACtB,KAA4B,IAAA,YAAA,SAAA,OAAO,CAAA,gCAAA,qDAAE;YAA1B,IAAA,KAAA,4BAAa,EAAZ,MAAI,QAAA,EAAE,KAAK,QAAA;YACrB,IAAM,MAAM,GAAG,IAAA,aAAK,EAAC,KAAK,CAAC,CAAA;YAC3B,IAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC9C,WAAW,IAAI,eAAQ,MAAI,cAAI,aAAa,QAAK,CAAA;SAClD;;;;;;;;;IAED,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAEM,IAAM,UAAU,GAAG,UACxB,EAAyE,EACzE,WAAwB;QADtB,MAAM,YAAA,EAAE,aAAa,mBAAA,EAAE,iBAAiB,uBAAA,EAAE,QAAQ,cAAA;;;;;;oBAGhD,cAAc,GAAG,EAAE,EACrB,QAAQ,GAAG,EAAE,CAAA;oBAEX,OAAO,GAAuB,SAAS,CAAA;oBACvC,YAAY,GACd,SAAS,CAAA;oBACP,UAAU,GAAuD,SAAS,CAAA;oBAE9E,QAAQ,QAAQ,EAAE;wBAChB,KAAK,qBAAa,CAAC,OAAO;4BACxB,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAA;4BACpC,UAAU,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,aAAa,CAAA;4BAEzC,MAAK;wBACP,KAAK,qBAAa,CAAC,GAAG;4BACpB,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,CAAA;4BAChC,UAAU,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAA;4BAErC,MAAK;wBACP,KAAK,qBAAa,CAAC,IAAI;4BACrB,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,CAAA;4BACjC,UAAU,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,UAAU,CAAA;4BAEtC,MAAK;qBACR;oBAED,OAAO;wBACL,CAAC,YAAY;4BACV,YAAqD,CACpD,UAAG,WAAW,YAAS,CACxB,CAAC;4BACJ,CAAC,UAAU;gCACR,UAAmD,CAClD,UAAG,WAAW,YAAS,CACxB,CAAC,CAAA;yBAEF,OAAO,EAAP,wBAAO;oBACT,QAAQ,GAAG,IAAA,sBAAe,EAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;oBAErC,qBAAM,IAAA,eAAQ,EAAC,QAAQ,CAAC,EAAA;;oBAAzC,cAAc,GAAG,SAAwB,CAAA;;;oBAGrC,OAAO,GAAG,cAAc;wBAC5B,CAAC,CAAC,cAAO,QAAQ,SAAG,IAAA,+BAAmB,EACnC,WAAW,CACZ,sBAAY,cAAc,iBAAO,QAAQ,SAAG,IAAA,+BAAmB,EAC9D,WAAW,CACZ,UAAO;wBACV,CAAC,CAAC,EAAE,CAAA;oBAEN,sBAAO;4BACL,OAAO,SAAA;4BACP,QAAQ,UAAA;yBACT,EAAA;;;;CACF,CAAA;AA1DY,QAAA,UAAU,cA0DtB;AAEM,IAAM,cAAc,GAAG,UAC5B,MAEC,EACD,QAAgB,EAChB,QAAgB;IAEhB,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,kBAAkB,CAAC,UAAC,MAAM,EAAE,WAAW;QACtE,OAAA,WAAW,KAAK,WAAW,CAAC,IAAI;YAC9B,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;gBACd,OAAO,EAAE,cAAO,MAAM,CAAC,QAAQ,0BAAgB,QAAQ,iBAAO,MAAM,CAAC,QAAQ,cAAW;gBACxF,QAAQ,EAAE,EAAE;aACb,CAAC;YACJ,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;gBACd,OAAO,EAAE,cAAO,MAAM,CAAC,QAAQ,0BAAgB,QAAQ,iBAAO,MAAM,CAAC,QAAQ,cAAW;gBACxF,QAAQ,EAAE,EAAE;aACb,CAAC;IARN,CAQM,CACP,CAAA;AACH,CAAC,CAAA;AAlBY,QAAA,cAAc,kBAkB1B"}
|
|
@@ -51,10 +51,14 @@ 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
64
|
exports.loadDependenciesFile = void 0;
|
|
@@ -67,7 +71,7 @@ var loadDependenciesFile = function (_a) {
|
|
|
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,
|
|
@@ -75,34 +79,34 @@ var loadDependenciesFile = function (_a) {
|
|
|
75
79
|
})];
|
|
76
80
|
case 1:
|
|
77
81
|
_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
|
|
82
|
+
fileContent = "\n* ".concat(type, " start;\n").concat(fileContent, "\n* ").concat(type, " end;");
|
|
83
|
+
return [4 /*yield*/, (0, _1.getDependencyPaths)("".concat(fileContent, "\n").concat(init, "\n").concat(term), macroFolders, macroCorePath)];
|
|
80
84
|
case 2:
|
|
81
85
|
fileDependencyPaths = _c.sent();
|
|
82
|
-
return [4 /*yield*/, _1.getDependencyPaths(init, macroFolders, macroCorePath)];
|
|
86
|
+
return [4 /*yield*/, (0, _1.getDependencyPaths)(init, macroFolders, macroCorePath)];
|
|
83
87
|
case 3:
|
|
84
88
|
initDependencyPaths = _c.sent();
|
|
85
|
-
return [4 /*yield*/, _1.getDependencyPaths(term, macroFolders, macroCorePath)];
|
|
89
|
+
return [4 /*yield*/, (0, _1.getDependencyPaths)(term, macroFolders, macroCorePath)];
|
|
86
90
|
case 4:
|
|
87
91
|
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)];
|
|
92
|
+
allDependencyPaths = __spreadArray(__spreadArray(__spreadArray([], __read(initDependencyPaths), false), __read(fileDependencyPaths), false), __read(termDependencyPaths), false);
|
|
93
|
+
return [4 /*yield*/, (0, _1.getDependencies)(initPath, init, programFolders, _1.DependencyType.Include)];
|
|
90
94
|
case 5:
|
|
91
95
|
initProgramDependencies = _c.sent();
|
|
92
|
-
return [4 /*yield*/, _1.getDependencies(termPath, term, programFolders, _1.DependencyType.Include)];
|
|
96
|
+
return [4 /*yield*/, (0, _1.getDependencies)(termPath, term, programFolders, _1.DependencyType.Include)];
|
|
93
97
|
case 6:
|
|
94
98
|
termProgramDependencies = _c.sent();
|
|
95
|
-
return [4 /*yield*/, _1.getDependencies(filePath, fileContent, programFolders, _1.DependencyType.Include)];
|
|
99
|
+
return [4 /*yield*/, (0, _1.getDependencies)(filePath, fileContent, programFolders, _1.DependencyType.Include)];
|
|
96
100
|
case 7:
|
|
97
101
|
programDependencies = _c.sent();
|
|
98
|
-
return [4 /*yield*/, _1.getDependencies(filePath, fileContent, binaryFolders, _1.DependencyType.Binary)];
|
|
102
|
+
return [4 /*yield*/, (0, _1.getDependencies)(filePath, fileContent, binaryFolders, _1.DependencyType.Binary)];
|
|
99
103
|
case 8:
|
|
100
104
|
binariesDeps = _c.sent();
|
|
101
105
|
return [4 /*yield*/, getAllDependencies(allDependencyPaths)];
|
|
102
106
|
case 9:
|
|
103
107
|
dependenciesContent = _c.sent();
|
|
104
|
-
fileContent = "* SAS Macros start;\n"
|
|
105
|
-
fileContent = "* "
|
|
108
|
+
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);
|
|
109
|
+
fileContent = "* ".concat(type, " Variables start;\n").concat(startUpVars, "\n* ").concat(type, " Variables end;\n").concat(fileContent);
|
|
106
110
|
return [2 /*return*/, fileContent];
|
|
107
111
|
}
|
|
108
112
|
});
|
|
@@ -115,11 +119,11 @@ var getAllDependencies = function (filePaths) { return __awaiter(void 0, void 0,
|
|
|
115
119
|
switch (_a.label) {
|
|
116
120
|
case 0:
|
|
117
121
|
dependenciesContent = [];
|
|
118
|
-
return [4 /*yield*/, utils_1.asyncForEach(__spreadArray([], __read(new Set(filePaths))), function (filePath) { return __awaiter(void 0, void 0, void 0, function () {
|
|
122
|
+
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
123
|
var depFileContent;
|
|
120
124
|
return __generator(this, function (_a) {
|
|
121
125
|
switch (_a.label) {
|
|
122
|
-
case 0: return [4 /*yield*/, file_1.readFile(filePath)];
|
|
126
|
+
case 0: return [4 /*yield*/, (0, file_1.readFile)(filePath)];
|
|
123
127
|
case 1:
|
|
124
128
|
depFileContent = _a.sent();
|
|
125
129
|
dependenciesContent.push(depFileContent);
|
|
@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gCAAkC;AAElC,kCAAuC;AACvC,uBAKW;AAeJ,IAAM,oBAAoB,GAAG,UAAO,EAWlB;QAVvB,QAAQ,cAAA,EACR,WAAW,iBAAA,EACX,aAAa,mBAAA,EACb,MAAM,YAAA,EACN,IAAI,UAAA,EACJ,cAAc,oBAAA,EACd,YAAY,kBAAA,EACZ,iBAAiB,uBAAA,EACjB,aAAa,mBAAA,EACb,aAAa,mBAAA;;;;;wBAE2C,qBAAM,IAAA,cAAW,EAAC;wBACxE,aAAa,eAAA;wBACb,MAAM,QAAA;wBACN,QAAQ,EAAE,IAAI;wBACd,iBAAiB,mBAAA;qBAClB,CAAC,EAAA;;oBALI,KAAkD,SAKtD,EALM,IAAI,UAAA,EAAE,QAAQ,cAAA,EAAE,IAAI,UAAA,EAAE,QAAQ,cAAA,EAAE,WAAW,iBAAA;oBAOnD,WAAW,GAAG,cAAO,IAAI,sBAAY,WAAW,iBAAO,IAAI,UAAO,CAAA;oBAEtC,qBAAM,IAAA,qBAAkB,EAClD,UAAG,WAAW,eAAK,IAAI,eAAK,IAAI,CAAE,EAClC,YAAY,EACZ,aAAa,CACd,EAAA;;oBAJK,mBAAmB,GAAG,SAI3B;oBAE2B,qBAAM,IAAA,qBAAkB,EAClD,IAAI,EACJ,YAAY,EACZ,aAAa,CACd,EAAA;;oBAJK,mBAAmB,GAAG,SAI3B;oBAE2B,qBAAM,IAAA,qBAAkB,EAClD,IAAI,EACJ,YAAY,EACZ,aAAa,CACd,EAAA;;oBAJK,mBAAmB,GAAG,SAI3B;oBAEK,kBAAkB,wDACnB,mBAAmB,kBACnB,mBAAmB,kBACnB,mBAAmB,SACvB,CAAA;oBAE+B,qBAAM,IAAA,kBAAe,EACnD,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,iBAAc,CAAC,OAAO,CACvB,EAAA;;oBALK,uBAAuB,GAAG,SAK/B;oBAE+B,qBAAM,IAAA,kBAAe,EACnD,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,iBAAc,CAAC,OAAO,CACvB,EAAA;;oBALK,uBAAuB,GAAG,SAK/B;oBAE2B,qBAAM,IAAA,kBAAe,EAC/C,QAAQ,EACR,WAAW,EACX,cAAc,EACd,iBAAc,CAAC,OAAO,CACvB,EAAA;;oBALK,mBAAmB,GAAG,SAK3B;oBAEoB,qBAAM,IAAA,kBAAe,EACxC,QAAQ,EACR,WAAW,EACX,aAAa,EACb,iBAAc,CAAC,MAAM,CACtB,EAAA;;oBALK,YAAY,GAAG,SAKpB;oBAE2B,qBAAM,kBAAkB,CAAC,kBAAkB,CAAC,EAAA;;oBAAlE,mBAAmB,GAAG,SAA4C;oBAExE,WAAW,GAAG,+BAAwB,uBAAuB,eAAK,uBAAuB,eAAK,mBAAmB,yDAA+C,mBAAmB,2DAAiD,YAAY,wCAC9O,IAAI,SAAG,WAAW,SAAG,IAAI,CAAE,CAAA;oBAE7B,WAAW,GAAG,YAAK,IAAI,gCAAsB,WAAW,iBAAO,IAAI,8BAAoB,WAAW,CAAE,CAAA;oBAEpG,sBAAO,WAAW,EAAA;;;;CACnB,CAAA;AAjFY,QAAA,oBAAoB,wBAiFhC;AAED,IAAM,kBAAkB,GAAG,UAAO,SAAmB;;;;;gBAC/C,mBAAmB,GAAa,EAAE,CAAA;gBACtC,qBAAM,IAAA,oBAAY,2BAAK,IAAI,GAAG,CAAC,SAAS,CAAC,WAAG,UAAO,QAAQ;;;;wCAClC,qBAAM,IAAA,eAAQ,EAAC,QAAQ,CAAC,EAAA;;oCAAzC,cAAc,GAAG,SAAwB;oCAC/C,mBAAmB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;;;;yBACzC,CAAC,EAAA;;gBAHF,SAGE,CAAA;gBAEF,sBAAO,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAA;;;KACtC,CAAA"}
|
|
@@ -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"}
|