@sasjs/cli 3.6.6 → 3.7.5

package/CHANGELOG.md

@@ -0,0 +1,30 @@
+# Change Log
+
+Since March 7th, 2020, the changelog is managed by github releases.  See [https://github.com/sasjs/cli/releases](https://github.com/sasjs/cli/releases).
+
+## Changes Prior to March 7th 2020
+
+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.
+
+<a name="1.0.4"></a>
+## [1.0.4](https://gitlab.com/macropeople/sasjs-cli/compare/v1.0.3...v1.0.4) (2020-03-07)
+
+
+### Bug Fixes
+
+* redo comment stripping logic ([84a1a91](https://gitlab.com/macropeople/sasjs-cli/commit/84a1a91))
+
+
+
+<a name="1.0.3"></a>
+## [1.0.3](https://gitlab.com/macropeople/sasjs-cli/compare/v1.0.2...v1.0.3) (2020-03-07)
+
+
+
+<a name="1.0.2"></a>
+## [1.0.2](https://gitlab.com/macropeople/sasjs-cli/compare/v1.0.1...v1.0.2) (2020-03-07)
+
+
+
+<a name="1.0.1"></a>
+## 1.0.1 (2020-03-07)

package/README.md

@@ -1,4 +1,5 @@
 # SASjs CLI
+
 [![npm package][npm-image]][npm-url]
 [![Github Workflow][githubworkflow-image]][githubworkflow-url]
 [![npm](https://img.shields.io/npm/dt/@sasjs/cli)]()
@@ -9,15 +10,14 @@
 [![GitHub issues](https://img.shields.io/github/issues-raw/sasjs/cli)](https://github.com/sasjs/cli/issues)
 [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/sasjs/cli)
 
-
-[npm-image]:https://img.shields.io/npm/v/@sasjs/cli.svg
-[npm-url]:http://npmjs.org/package/@sasjs/cli
-[githubworkflow-image]:https://github.com/sasjs/cli/actions/workflows/run-tests.yml/badge.svg
-[githubworkflow-url]:https://github.com/sasjs/cli/blob/main/.github/workflows/run-tests.yml
+[npm-image]: https://img.shields.io/npm/v/@sasjs/cli.svg
+[npm-url]: http://npmjs.org/package/@sasjs/cli
+[githubworkflow-image]: https://github.com/sasjs/cli/actions/workflows/run-tests.yml/badge.svg
+[githubworkflow-url]: https://github.com/sasjs/cli/blob/main/.github/workflows/run-tests.yml
 
 `@sasjs/cli` is a Command-Line Interface to assist with creating, building, and deploying Data Science projects and HTML5 Web Applications on the SAS platform (both SAS 9 and Viya). Features include:
 
-- Scaffold a new SAS App in seconds  (`sasjs create myApp -t jobs`)
+- Scaffold a new SAS App in seconds (`sasjs create myApp -t jobs`)
 - Compile / Build SAS Jobs, Services & Macros _locally_ and deploy / execute _remotely_, in isolation from other developers (`sasjs cbd`)
 - No dependency on the server filesystem
 - Trigger Viya Jobs & Flows (`sasjs job execute` / `sasjs flow execute`)
@@ -40,19 +40,18 @@ A quick demonstration of using it to compile, build and deploy a set of SAS Viya
 ```
 
 You can also use the tool without deploying through NPX as follows:
+
 ```
 npx @sasjs/cli <command>
 ```
 
 ## Documentation
 
-
-Additional documentation can be found on the [SASjs CLI documentation](https://cli.sasjs.io)  site.
-
+Additional documentation can be found on the [SASjs CLI documentation](https://cli.sasjs.io) site.
 
 ## Notes
 
-Running `npm i -g @sasjs/cli@latest` does not always upgrade properly.  This is due to a known bug in npm, which is fixed in npm 7.
+Running `npm i -g @sasjs/cli@latest` does not always upgrade properly. This is due to a known bug in npm, which is fixed in npm 7.
 
 If you are running NPM in version 6 or below, you can try running `npm update -g @sasjs/cli` instead, or - the sledgehammer approach - delete the files from the NPM folder and then do a fresh install.
 
@@ -62,7 +61,6 @@ If you find this library useful, please leave a star and help us grow our star g
 
 ![](https://starchart.cc/sasjs/cli.svg)
 
-
 ## Contributors ✨
 
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

package/build/commands/build/build.js

@@ -294,23 +294,21 @@ function getCreateFileScript(serverType) {
         });
     });
 }
-function getWebServiceScriptInvocation(serverType, filePath, isSASFile, encoded) {
-    if (filePath === void 0) { filePath = ''; }
+function getWebServiceScriptInvocation(serverType, isSASFile, encoded) {
     if (isSASFile === void 0) { isSASFile = true; }
     if (encoded === void 0) { encoded = false; }
-    var loc = filePath === '' ? 'services' : 'tests';
     var encodedParam = encoded ? ', intype=BASE64' : '';
     switch (serverType) {
         case utils_1.ServerType.SasViya:
             return isSASFile
-                ? "%mv_createwebservice(path=&appLoc/".concat(loc, "/&path, name=&service, code=sascode ,replace=yes)")
-                : "%mv_createfile(path=&appLoc/".concat(loc, "/&path, name=&filename, inref=filecode").concat(encodedParam, ")");
+                ? "%mv_createwebservice(path=&appLoc/&path, name=&service, code=sascode ,replace=yes)"
+                : "%mv_createfile(path=&appLoc/&path, name=&filename, inref=filecode".concat(encodedParam, ")");
         case utils_1.ServerType.Sas9:
-            return "%mm_createwebservice(path=&appLoc/".concat(loc, "/&path, name=&service, code=sascode ,replace=yes)");
+            return "%mm_createwebservice(path=&appLoc/&path, name=&service, code=sascode ,replace=yes)";
         case utils_1.ServerType.Sasjs:
             return isSASFile
-                ? "%mv_createwebservice(path=&appLoc/".concat(loc, "/&path, name=&service, code=sascode ,replace=yes)")
-                : "%mv_createfile(path=&appLoc/".concat(loc, "/&path, name=&filename, inref=filecode").concat(encodedParam, ")");
+                ? "%mv_createwebservice(path=&appLoc/&path, name=&service, code=sascode ,replace=yes)"
+                : "%mv_createfile(path=&appLoc/&path, name=&filename, inref=filecode".concat(encodedParam, ")");
         default:
             throw new error_1.ServerTypeError();
     }
@@ -340,7 +338,7 @@ function getFolderContent(serverType) {
                             var _a, content, contentJSON;
                             return __generator(this, function (_b) {
                                 switch (_b.label) {
-                                    case 0: return [4 /*yield*/, getContentFor(path_1.default.join(buildDestinationFolder, subFolder), path_1.default.join(buildDestinationFolder, subFolder), serverType)];
+                                    case 0: return [4 /*yield*/, getContentFor(buildDestinationFolder, path_1.default.join(buildDestinationFolder, subFolder), serverType)];
                                     case 1:
                                         _a = _b.sent(), content = _a.content, contentJSON = _a.contentJSON;
                                         folderContent += "\n".concat(content);
@@ -383,28 +381,19 @@ function getDependencies(filePaths) {
         });
     });
 }
-function getContentFor(rootDirectory, folderPath, serverType, testPath) {
-    if (testPath === void 0) { testPath = undefined; }
+function getContentFor(rootDirectory, folderPath, serverType) {
     return __awaiter(this, void 0, void 0, function () {
-        var folderName, isRootDir, content, contentJSON, files, subFolders;
+        var folderName, content, contentJSON, files, subFolders;
         var _this = this;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     folderName = path_1.default.basename(folderPath);
-                    if (!testPath && folderName === 'tests') {
-                        testPath = '';
-                    }
-                    isRootDir = folderPath === rootDirectory;
-                    content = "\n%let path=".concat(isRootDir
-                        ? ''
-                        : testPath !== undefined
-                            ? testPath
-                            : folderPath
-                                .replace(rootDirectory, '')
-                                .substr(1)
-                                .split(path_1.default.sep)
-                                .join('/'), ";\n");
+                    content = "\n%let path=".concat(folderPath
+                        .replace(rootDirectory, '')
+                        .substr(1)
+                        .split(path_1.default.sep)
+                        .join('/'), ";\n");
                     contentJSON = {
                         name: folderName,
                         type: 'folder',
@@ -423,7 +412,7 @@ function getContentFor(rootDirectory, folderPath, serverType, testPath) {
                                         return [4 /*yield*/, (0, utils_1.readFile)(filePath)];
                                     case 1:
                                         fileContent = _a.sent();
-                                        transformedContent = getServiceText(file, fileContent, serverType, testPath);
+                                        transformedContent = getServiceText(file, fileContent, serverType);
                                         content += "\n".concat(transformedContent, "\n");
                                         contentJSON.members.push({
                                             name: file.replace(/.sas$/, ''),
@@ -455,11 +444,7 @@ function getContentFor(rootDirectory, folderPath, serverType, testPath) {
                             var _a, childContent, childContentJSON;
                             return __generator(this, function (_b) {
                                 switch (_b.label) {
-                                    case 0: return [4 /*yield*/, getContentFor(rootDirectory, path_1.default.join(folderPath, subFolder), serverType, testPath !== undefined
-                                            ? testPath === ''
-                                                ? subFolder
-                                                : "".concat(testPath, "/").concat(subFolder)
-                                            : undefined)];
+                                    case 0: return [4 /*yield*/, getContentFor(rootDirectory, path_1.default.join(folderPath, subFolder), serverType)];
                                     case 1:
                                         _a = _b.sent(), childContent = _a.content, childContentJSON = _a.contentJSON;
                                         contentJSON.members.push(childContentJSON);
@@ -475,7 +460,7 @@ function getContentFor(rootDirectory, folderPath, serverType, testPath) {
         });
     });
 }
-function getServiceText(serviceFileName, fileContent, serverType, testPath) {
+function getServiceText(serviceFileName, fileContent, serverType) {
     var serviceName = serviceFileName.replace(/.sas$/, '');
     var sourceCodeLines = getLines((0, utils_2.removeComments)(fileContent));
     var content = "";
@@ -486,14 +471,14 @@ function getServiceText(serviceFileName, fileContent, serverType, testPath) {
         }
     });
     return "%let service=".concat(serviceName, ";\nfilename sascode temp lrecl=32767;\ndata _null_;\nfile sascode;\n").concat(content, "\n\nrun;\n").concat(serverType !== utils_1.ServerType.Sasjs
-        ? getWebServiceScriptInvocation(serverType, (0, utils_1.isTestFile)(serviceFileName) && testPath ? "".concat(testPath) : '')
+        ? getWebServiceScriptInvocation(serverType)
         : '', "\nfilename sascode clear;\n");
 }
 function getFileText(fileName, fileContent, serverType) {
     var fileExtension = path_1.default.extname(fileName).substring(1).toUpperCase();
     var _a = getWebFileContent(fileContent, fileExtension), content = _a.content, maxLineLength = _a.maxLineLength;
     return "%let filename=".concat(fileName, ";\nfilename filecode temp lrecl=").concat(maxLineLength, ";\ndata _null_;\nfile filecode;\n").concat(content, "\n\nrun;\n").concat(serverType !== utils_1.ServerType.Sasjs
-        ? getWebServiceScriptInvocation(serverType, undefined, false, true)
+        ? getWebServiceScriptInvocation(serverType, false, true)
         : '', "\nfilename filecode clear;\n");
 }
 function getWebFileContent(filecontent, type) {

package/build/commands/deploy/deploy.js

@@ -90,7 +90,7 @@ function deploy(target, isLocal, sasjs) {
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
                     logFilePath = buildDestinationFolder;
                     if (!(target.serverType === utils_2.ServerType.Sasjs)) return [3 /*break*/, 5];
-                    return [4 /*yield*/, deployToSasjs(target, isLocal, sasjs)];
+                    return [4 /*yield*/, deployToSasjs(target, sasjs)];
                 case 4:
                     _k.sent();
                     return [3 /*break*/, 7];
@@ -323,38 +323,47 @@ function deployToSas9(deployScriptName, target, linesToExecute, logFolder, strea
 /**
  * Deploys app to `SASJS` server.
  * @param {Target} target- the target having deploy configuration.
- * @param {boolean} isLocal- flag indicating if specified target is
- * from local sasjsconfig or global sasjsconfig file.
  * @param {object} sasjs - optional configuration object of SAS adapter.
  */
-function deployToSasjs(target, isLocal, sasjs) {
+function deployToSasjs(target, sasjs) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var buildDestinationFolder, finalFilePathJSON, jsonContent, payload, authConfig, result;
-        var _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var buildDestinationFolder, finalFilePathJSON, jsonContent, payload, authConfig, e_2, result;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
                     finalFilePathJSON = path_1.default.join(buildDestinationFolder, "".concat(target.name, ".json"));
                     return [4 /*yield*/, (0, utils_2.readFile)(finalFilePathJSON)];
                 case 1:
-                    jsonContent = _d.sent();
+                    jsonContent = _c.sent();
                     payload = JSON.parse(jsonContent);
-                    if (!!sasjs) return [3 /*break*/, 3];
-                    ;
-                    return [4 /*yield*/, getSASjsAndAuthConfig(target, isLocal)];
+                    if (!!sasjs) return [3 /*break*/, 5];
+                    sasjs = new node_1.default({
+                        serverUrl: target.serverUrl,
+                        appLoc: target.appLoc,
+                        serverType: target.serverType,
+                        httpsAgentOptions: target.httpsAgentOptions,
+                        debug: true
+                    });
+                    _c.label = 2;
                 case 2:
-                    (_c = _d.sent(), sasjs = _c.sasjs, authConfig = _c.authConfig);
-                    _d.label = 3;
-                case 3: return [4 /*yield*/, sasjs
+                    _c.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
+                case 3:
+                    authConfig = _c.sent();
+                    return [3 /*break*/, 5];
+                case 4:
+                    e_2 = _c.sent();
+                    return [3 /*break*/, 5];
+                case 5: return [4 /*yield*/, sasjs
                         .deployToSASjs(payload, undefined, authConfig)
                         .catch(function (err) {
                         var _a;
                         (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(err);
                     })];
-                case 4:
-                    result = _d.sent();
+                case 6:
+                    result = _c.sent();
                     if ((result === null || result === void 0 ? void 0 : result.status) === 'failure') {
                         (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(result.message);
                         if (result.example) {

package/build/commands/job/internal/execute/sasjs.d.ts

@@ -5,4 +5,5 @@ export declare function executeJobSasjs(sasjs: SASjs, jobPath: string, logFile:
     log?: string | undefined;
     logPath?: string | undefined;
     error?: {} | undefined;
+    _webout?: string | undefined;
 } | undefined>;