@sasjs/cli 3.20.0 → 3.20.1

package/build/commands/compile/spec/compile.spec.js

@@ -243,7 +243,8 @@ describe('sasjs compile', function () {
                     newTarget = new utils_1.Target(__assign(__assign({}, target.toJson()), { serviceConfig: {
                             serviceFolders: ['../services']
                         } }));
-                    errorMessage = 'The following files were listed under SAS Programs but could not be found:\n' +
+                    errorMessage = "Unable to load dependencies for: ".concat(path_1.default.join(__dirname, 'services/example.sas'), "\n") +
+                        'The following files were listed under SAS Includes but could not be found:\n' +
                         "1. 'doesnotexist.sas' with fileRef 'SOMEREF'\n" +
                         'Please check that they exist in the folder(s) listed in the `programFolders` array in your sasjsconfig.json file.\n' +
                         'Program Folders:\n' +

package/build/commands/fs/fsCommand.js

@@ -86,23 +86,23 @@ var FsSubCommand;
 var syntax = 'fs <subCommand> [options]';
 var usage = 'Usage: sasjs fs <subCommand> [options]';
 // TODO: update
-var description = 'generate a SAS program that contains the contents of a local directory';
+var description = 'Handles operations around file system synchronisation';
 var compileCommandSyntax = 'fs <subCommand> <localFolder> [options]';
 var compileCommandUsage = 'Usage: sasjs fs compile <localFolder> [options]';
-var compileCommandDescription = 'generate a SAS program that contains the contents of a local directory';
+var compileCommandDescription = 'Compiles a SAS program with the contents of a local directory';
 var compileCommandExamples = [
     {
-        command: 'sasjs fs compile <path/of/folder> <path/of/outputProgram>',
-        description: 'generate a SAS program that contains the contents of a local directory'
+        command: 'sasjs fs compile <path/of/folder> --output <path/of/outputProgram>',
+        description: 'Compiles a SAS program with the contents of a local directory'
     }
 ];
 var syncCommandSyntax = 'fs <subCommand> <localFolder> <remoteFolder>';
 var syncCommandUsage = 'Usage: sasjs fs sync <localFolder> <remoteFolder>';
-var syncCommandDescription = 'generate a SAS program that will synchronize the remote folder with local';
+var syncCommandDescription = 'Synchronise the remote SAS file system with the local project folder according to the target `syncDirectories` array';
 var syncCommandExamples = [
     {
         command: 'sasjs fs sync <path/of/folder> <path/of/remote/folder>',
-        description: 'generate a SAS program that will synchronize the remote folder with local'
+        description: 'Synchronise the remote SAS file system with the local project folder according to the target `syncDirectories` array'
     }
 ];
 var parseOptions = {

package/build/commands/help/help.js

@@ -246,6 +246,20 @@ function printHelpText() {
                         "[2spaces]command example: sasjs folder move /Public/sourceFolder /Public/targetFolder --target targetName"
                     ]
                 },
+                {
+                    name: 'fs',
+                    title: 'fs <command>',
+                    description: [
+                        "Handles operations around file system synchronisation.",
+                        "* ".concat(chalk_1.default.cyanBright('sync'), " - Synchronise the remote SAS file system with the local project folder according to the target 'syncDirectories' array."),
+                        "[2spaces]command example: sasjs fs sync /Public/localFolder /Public/remoteFolder",
+                        "",
+                        "* ".concat(chalk_1.default.cyanBright('compile'), " - Compiles a SAS program with the contents of a local directory."),
+                        "[2spaces]command example: sasjs fs compile /Public/folder --output ./outputProgram",
+                        "",
+                        "[2spaces]NOTE: If output flag (-o or --output) is not provided, output will be stored in './fs-compile/{timestamp}' directory relative to working directory."
+                    ]
+                },
                 {
                     name: 'job',
                     title: 'job <command>',

package/build/commands/job/jobCommand.js

@@ -233,9 +233,15 @@ var JobCommand = /** @class */ (function (_super) {
                             ? this.parsed.output
                             : undefined;
                         source = this.parsed.source;
-                        return [4 /*yield*/, (0, utils_2.getSASjsAndAuthConfig)(target)];
+                        return [4 /*yield*/, (0, utils_2.getSASjsAndAuthConfig)(target).catch(function (err) {
+                                var _a;
+                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. Error fetching auth config: ', err);
+                                return { sasjs: (0, utils_2.getSASjs)(target), authConfigSas9: undefined };
+                            })];
                     case 1:
                         _b = _c.sent(), sasjs = _b.sasjs, authConfigSas9 = _b.authConfigSas9;
+                        if (!authConfigSas9)
+                            return [2 /*return*/, command_1.ReturnCode.InternalError];
                         userName = authConfigSas9.userName;
                         password = (0, utils_1.decodeFromBase64)(authConfigSas9.password);
                         return [4 /*yield*/, (0, execute_1.executeJobSas9)(sasjs, { userName: userName, password: password }, jobPath, log, output, source)
@@ -255,11 +261,11 @@ var JobCommand = /** @class */ (function (_super) {
         });
     };
     JobCommand.prototype.executeJobViya = function (target) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
-            var jobPath, log, wait, output, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog, _e, sasjs, authConfig, returnCode;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
+            var jobPath, log, wait, output, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog, _d, sasjs, authConfig, returnCode;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         jobPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.jobPath);
                         log = (0, getLogFilePath_1.getLogFilePath)(this.parsed.log, jobPath);
@@ -279,13 +285,15 @@ var JobCommand = /** @class */ (function (_super) {
                         if (ignoreWarnings && !returnStatusOnly) {
                             (_c = process.logger) === null || _c === void 0 ? void 0 : _c.warn("Using the 'ignoreWarnings' flag without 'returnStatusOnly' flag will not affect the sasjs job execute command.");
                         }
-                        return [4 /*yield*/, (0, utils_2.getSASjsAndAuthConfig)(target)];
+                        return [4 /*yield*/, (0, utils_2.getSASjsAndAuthConfig)(target).catch(function (err) {
+                                var _a;
+                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. Error fetching auth config: ', err);
+                                return { sasjs: (0, utils_2.getSASjs)(target), authConfig: undefined };
+                            })];
                     case 1:
-                        _e = _f.sent(), sasjs = _e.sasjs, authConfig = _e.authConfig;
-                        if (!authConfig) {
-                            (_d = process.logger) === null || _d === void 0 ? void 0 : _d.error('Unable to execute job. Error fetching auth config.');
+                        _d = _e.sent(), sasjs = _d.sasjs, authConfig = _d.authConfig;
+                        if (!authConfig)
                             return [2 /*return*/, command_1.ReturnCode.InternalError];
-                        }
                         return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, authConfig, jobPath, target, wait, output, log, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog)
                                 .then(function () {
                                 return command_1.ReturnCode.Success;
@@ -296,7 +304,7 @@ var JobCommand = /** @class */ (function (_super) {
                                 return command_1.ReturnCode.InternalError;
                             })];
                     case 2:
-                        returnCode = _f.sent();
+                        returnCode = _e.sent();
                         return [2 /*return*/, returnCode];
                 }
             });

package/build/commands/job/spec/jobCommand.spec.js

@@ -289,7 +289,7 @@ describe('JobCommand', function () {
                 switch (_a.label) {
                     case 0:
                         jest
-                            .spyOn(configUtils, 'getAuthConfig')
+                            .spyOn(configUtils, 'getSASjsAndAuthConfig')
                             .mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
                         return [4 /*yield*/, executeCommandWrapper([jobPath])];
                     case 1:
@@ -488,8 +488,13 @@ var setupMocksForViya = function () {
         return Promise.resolve({ target: targetViya, isLocal: true });
     });
     jest
-        .spyOn(configUtils, 'getAuthConfig')
-        .mockImplementation(function () { return Promise.resolve(authConfig); });
+        .spyOn(configUtils, 'getSASjsAndAuthConfig')
+        .mockImplementation(function (target) {
+        return Promise.resolve({
+            sasjs: configUtils.getSASjs(target),
+            authConfig: authConfig
+        });
+    });
     process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
     jest.spyOn(process.logger, 'error');
 };

package/package.json

@@ -8,6 +8,7 @@
   "scripts": {
     "nodeVersionMessage": "echo \u001b[33m make sure you are running node lts version \u001b[0m",
     "checkNodeVersion": "node -e \"console.log('\u001b[36m', 'Checking your Node.js version...'); if (!process.versions || !process.versions.node) { console.log('\u001b[31m', 'Error determining Node.js version. Exiting...') } if (parseInt(process.versions.node) < 14) { console.log('\u001b[31m', '❌ You must be running at least Node.js 14 to install SASjs CLI.\\nYour current version is ' + process.versions.node + '.\\nPlease install a more recent version and try again.'); process.exit(1); } else { console.log('\u001b[32m', '✅ Node.js version check passed. Continuing...'); } console.log('\u001b[0m', '');\"",
+    "start:ci": "npm run build && npm run set:permissions",
     "start": "nodemon --watch \"src/**/*\" --exec \"npm run build && npm run set:permissions\"",
     "set:permissions": "node -e \"require('fs').chmodSync('build/index.js', '755')\"",
     "build": "rimraf build && tsc -p . && npm run copy:files",
@@ -21,7 +22,7 @@
     "preinstall": "npm run nodeVersionMessage",
     "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true"
   },
-  "testServerTypes": "viya,sas9,sasjs",
+  "testServerTypes": "sasjs,sas9",
   "release": {
     "branches": [
       "main"
@@ -50,8 +51,8 @@
   },
   "dependencies": {
     "@sasjs/adapter": "4.0.1",
-    "@sasjs/core": "4.43.0",
-    "@sasjs/lint": "1.12.0",
+    "@sasjs/core": "4.43.1",
+    "@sasjs/lint": "1.13.0",
     "@sasjs/utils": "2.49.2",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
@@ -78,7 +79,7 @@
     "@types/adm-zip": "0.5.0",
     "@types/find": "0.2.1",
     "@types/jest": "27.0.2",
-    "@types/jsdom": "16.2.13",
+    "@types/jsdom": "16.2.15",
     "@types/lodash.groupby": "4.6.6",
     "@types/lodash.uniqby": "4.7.6",
     "@types/node": "17.0.8",
@@ -98,5 +99,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.20.0"
+  "version": "3.20.1"
 }