@sasjs/utils 2.45.1 → 2.46.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/compileTree/compileTree.js +3 -1
- package/compileTree/compileTree.js.map +1 -1
- package/package.json +1 -1
- package/sasjsCli/loadDependenciesFile.js +24 -4
- package/sasjsCli/loadDependenciesFile.js.map +1 -1
- package/types/sasJsFileType.d.ts +2 -1
- package/types/sasJsFileType.js +1 -0
- package/types/sasJsFileType.js.map +1 -1
|
@@ -112,8 +112,10 @@ var CompileTree = /** @class */ (function () {
|
|
|
112
112
|
}());
|
|
113
113
|
exports.CompileTree = CompileTree;
|
|
114
114
|
// Removes header from SAS file
|
|
115
|
+
// If string begins with a multiline comment, remove the comment
|
|
116
|
+
// Ignore any preceding white space or line breaks
|
|
115
117
|
var removeHeader = function (content) {
|
|
116
|
-
return content.replace(new RegExp("
|
|
118
|
+
return content.replace(new RegExp("^\\s*\\/(\\*){1,2}([\\s\\S]*?)(\\*){1,2}\\/"), '');
|
|
117
119
|
};
|
|
118
120
|
exports.removeHeader = removeHeader;
|
|
119
121
|
//# sourceMappingURL=compileTree.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileTree.js","sourceRoot":"","sources":["../../src/compileTree/compileTree.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,yBAA0C;AAC1C,wCAA4E;AAa5E;IAIE,qBAAY,QAAgB,EAAE,IAAe;QAAf,qBAAA,EAAA,SAAe;QAC3C,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAA;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;IACnB,CAAC;IAGD,sBAAI,6BAAI;QADR,sBAAsB;aACtB;YACE,OAAO,IAAI,CAAC,KAAK,CAAA;QACnB,CAAC;;;OAAA;IAED,oBAAoB;IACb,6BAAO,GAAd,UAAe,QAAgB;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/C,CAAC;IAED,YAAY;IACL,6BAAO,GAAd,UAAe,IAAU;QACvB,IAAI,CAAC,YAAY,GAAG,IAAA,kBAAO,EACzB,IAAA,8BAAmB,EAAC,IAAI,CAAC,OAAO,EAAE,2BAAgB,CAAC,KAAK,CAAC,EACzD,IAAI,CAAC,OAAO,CACb,CAAA;QACD,IAAI,CAAC,OAAO,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAEzC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAA;QAElD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,kCAAkC;IACrB,8BAAQ,GAArB;;;;4BACE,qBAAM,IAAA,cAAU,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAA;;wBAArE,SAAqE,CAAA;;;;;KACtE;IAED,wCAAwC;IACxC,yDAAyD;IAC5C,mCAAa,GAA1B,UAA2B,OAAe;;;;;;;wBAClC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;wBAElC,IAAI,IAAI;4BAAE,sBAAO,IAAI,CAAC,OAAO,EAAA;wBAEtB,KAAA,IAAI,CAAC,OAAO,CAAA;;wBACR,qBAAM,IAAA,YAAQ,EAAC,OAAO,EAAE,SAAS,CAAC,EAAA;4BAD7C,sBAAO,SAAA,IAAI,IACT,UAAO,GAAE,SAAkC;gCAC3C,eAAY,GAAE,EAAE;gCAChB,WAAQ,GAAE,OAAO;qCACjB,CAAC,OAAO,EAAA;;;;KACX;IAED,uCAAuC;IAC/B,iCAAW,GAAnB,UAAoB,QAAgB;QAClC,OAAO,QAAQ,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACtE,CAAC;IACH,kBAAC;AAAD,CAAC,AAvDD,IAuDC;AAvDY,kCAAW;AAyDxB,+BAA+B;
|
|
1
|
+
{"version":3,"file":"compileTree.js","sourceRoot":"","sources":["../../src/compileTree/compileTree.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,yBAA0C;AAC1C,wCAA4E;AAa5E;IAIE,qBAAY,QAAgB,EAAE,IAAe;QAAf,qBAAA,EAAA,SAAe;QAC3C,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAA;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;IACnB,CAAC;IAGD,sBAAI,6BAAI;QADR,sBAAsB;aACtB;YACE,OAAO,IAAI,CAAC,KAAK,CAAA;QACnB,CAAC;;;OAAA;IAED,oBAAoB;IACb,6BAAO,GAAd,UAAe,QAAgB;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/C,CAAC;IAED,YAAY;IACL,6BAAO,GAAd,UAAe,IAAU;QACvB,IAAI,CAAC,YAAY,GAAG,IAAA,kBAAO,EACzB,IAAA,8BAAmB,EAAC,IAAI,CAAC,OAAO,EAAE,2BAAgB,CAAC,KAAK,CAAC,EACzD,IAAI,CAAC,OAAO,CACb,CAAA;QACD,IAAI,CAAC,OAAO,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAEzC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAA;QAElD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,kCAAkC;IACrB,8BAAQ,GAArB;;;;4BACE,qBAAM,IAAA,cAAU,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAA;;wBAArE,SAAqE,CAAA;;;;;KACtE;IAED,wCAAwC;IACxC,yDAAyD;IAC5C,mCAAa,GAA1B,UAA2B,OAAe;;;;;;;wBAClC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;wBAElC,IAAI,IAAI;4BAAE,sBAAO,IAAI,CAAC,OAAO,EAAA;wBAEtB,KAAA,IAAI,CAAC,OAAO,CAAA;;wBACR,qBAAM,IAAA,YAAQ,EAAC,OAAO,EAAE,SAAS,CAAC,EAAA;4BAD7C,sBAAO,SAAA,IAAI,IACT,UAAO,GAAE,SAAkC;gCAC3C,eAAY,GAAE,EAAE;gCAChB,WAAQ,GAAE,OAAO;qCACjB,CAAC,OAAO,EAAA;;;;KACX;IAED,uCAAuC;IAC/B,iCAAW,GAAnB,UAAoB,QAAgB;QAClC,OAAO,QAAQ,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACtE,CAAC;IACH,kBAAC;AAAD,CAAC,AAvDD,IAuDC;AAvDY,kCAAW;AAyDxB,+BAA+B;AAC/B,gEAAgE;AAChE,kDAAkD;AAC3C,IAAM,YAAY,GAAG,UAAC,OAAe;IAC1C,OAAA,OAAO,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,6CAA6C,CAAC,EAAE,EAAE,CAAC;AAA9E,CAA8E,CAAA;AADnE,QAAA,YAAY,gBACuD"}
|
package/package.json
CHANGED
|
@@ -63,6 +63,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
63
63
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
64
64
|
exports.getAllDependencies = exports.loadDependenciesFile = void 0;
|
|
65
65
|
var file_1 = require("../file");
|
|
66
|
+
var types_1 = require("../types");
|
|
66
67
|
var utils_1 = require("../utils");
|
|
67
68
|
var _1 = require("./");
|
|
68
69
|
var loadDependenciesFile = function (_a) {
|
|
@@ -80,7 +81,9 @@ var loadDependenciesFile = function (_a) {
|
|
|
80
81
|
})];
|
|
81
82
|
case 1:
|
|
82
83
|
_b = _c.sent(), init = _b.init, initPath = _b.initPath, term = _b.term, termPath = _b.termPath, startUpVars = _b.startUpVars, initLeaf = _b.initLeaf, termLeaf = _b.termLeaf;
|
|
83
|
-
|
|
84
|
+
if (type !== types_1.SASJsFileType.file) {
|
|
85
|
+
fileContent = "\n* ".concat(type, " start;\n").concat(fileContent, "\n* ").concat(type, " end;");
|
|
86
|
+
}
|
|
84
87
|
return [4 /*yield*/, (0, _1.getDependencyPaths)("".concat(fileContent, "\n").concat(init, "\n").concat(term), macroFolders, macroCorePath, compileTree)];
|
|
85
88
|
case 2:
|
|
86
89
|
fileDependencyPaths = _c.sent();
|
|
@@ -103,11 +106,28 @@ var loadDependenciesFile = function (_a) {
|
|
|
103
106
|
return [4 /*yield*/, (0, _1.getDependencies)(filePath, fileContent, binaryFolders, _1.DependencyType.Binary, compileTree)];
|
|
104
107
|
case 8:
|
|
105
108
|
binariesDeps = _c.sent();
|
|
106
|
-
return [4 /*yield*/, (0, exports.getAllDependencies)(allDependencyPaths, compileTree)
|
|
109
|
+
return [4 /*yield*/, (0, exports.getAllDependencies)(allDependencyPaths, compileTree)
|
|
110
|
+
// There is no need to add any wrapping comments for file content if SASJsFileType===File
|
|
111
|
+
];
|
|
107
112
|
case 9:
|
|
108
113
|
dependenciesContent = _c.sent();
|
|
109
|
-
|
|
110
|
-
|
|
114
|
+
// There is no need to add any wrapping comments for file content if SASJsFileType===File
|
|
115
|
+
if (type === types_1.SASJsFileType.file) {
|
|
116
|
+
fileContent = [
|
|
117
|
+
initProgramDependencies,
|
|
118
|
+
termProgramDependencies,
|
|
119
|
+
dependenciesContent,
|
|
120
|
+
programDependencies,
|
|
121
|
+
binariesDeps,
|
|
122
|
+
fileContent
|
|
123
|
+
]
|
|
124
|
+
.filter(function (content) { return content.length; })
|
|
125
|
+
.join('\n');
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
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);
|
|
129
|
+
fileContent = "* ".concat(type, " Variables start;\n").concat(startUpVars, "\n* ").concat(type, " Variables end;\n").concat(fileContent);
|
|
130
|
+
}
|
|
111
131
|
return [2 /*return*/, fileContent];
|
|
112
132
|
}
|
|
113
133
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadDependenciesFile.js","sourceRoot":"","sources":["../../src/sasjsCli/loadDependenciesFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gCAAkC;
|
|
1
|
+
{"version":3,"file":"loadDependenciesFile.js","sourceRoot":"","sources":["../../src/sasjsCli/loadDependenciesFile.ts"],"names":[],"mappings":"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"}
|
package/types/sasJsFileType.d.ts
CHANGED
package/types/sasJsFileType.js
CHANGED
|
@@ -6,5 +6,6 @@ var SASJsFileType;
|
|
|
6
6
|
SASJsFileType["service"] = "Service";
|
|
7
7
|
SASJsFileType["job"] = "Job";
|
|
8
8
|
SASJsFileType["test"] = "Test";
|
|
9
|
+
SASJsFileType["file"] = "File"; // Should be used when file content is not considered as Service, Job or Test and is used as raw content
|
|
9
10
|
})(SASJsFileType = exports.SASJsFileType || (exports.SASJsFileType = {}));
|
|
10
11
|
//# sourceMappingURL=sasJsFileType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sasJsFileType.js","sourceRoot":"","sources":["../../src/types/sasJsFileType.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"sasJsFileType.js","sourceRoot":"","sources":["../../src/types/sasJsFileType.ts"],"names":[],"mappings":";;;AAAA,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,4BAAW,CAAA;IACX,8BAAa,CAAA;IACb,8BAAa,CAAA,CAAC,wGAAwG;AACxH,CAAC,EALW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAKxB"}
|