@sasjs/cli 3.0.2 → 3.2.0

package/build/commands/add/addCredential.d.ts

@@ -1,4 +1,4 @@
-import { SasAuthResponse, Target, HttpsAgentOptions } from '@sasjs/utils/types';
+import { Target, HttpsAgentOptions } from '@sasjs/utils/types';
 import { TargetScope } from '../../types/targetScope';
 /**
  * Creates a .env file for the specified target.
@@ -10,6 +10,10 @@ import { TargetScope } from '../../types/targetScope';
  */
 export declare const addCredential: (target: Target, insecure: boolean, targetScope: TargetScope) => Promise<Target>;
 export declare const validateTargetName: (targetName: string) => string;
-export declare const getTokens: (target: Target, client: string, secret: string, httpsAgentOptions?: HttpsAgentOptions | undefined) => Promise<SasAuthResponse>;
+export declare const getTokens: (target: Target, client: string, secret: string, httpsAgentOptions?: HttpsAgentOptions | undefined) => Promise<{
+    access_token: string;
+    refresh_token: string;
+}>;
 export declare const createEnvFileForViya: (targetName: string, client: string, secret: string, accessToken: string, refreshToken: string) => Promise<void>;
 export declare const createEnvFileForSas9: (targetName: string, userName: string, password: string) => Promise<void>;
+export declare const createEnvFileForSasjs: (targetName: string, client: string, accessToken: string, refreshToken: string) => Promise<void>;

package/build/commands/add/addCredential.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEnvFileForSas9 = exports.createEnvFileForViya = exports.getTokens = exports.validateTargetName = exports.addCredential = void 0;
+exports.createEnvFileForSasjs = exports.createEnvFileForSas9 = exports.createEnvFileForViya = exports.getTokens = exports.validateTargetName = exports.addCredential = void 0;
 var path_1 = __importDefault(require("path"));
 var logger_1 = require("@sasjs/utils/logger");
 var types_1 = require("@sasjs/utils/types");
@@ -69,66 +69,81 @@ var saveConfig_1 = require("./internal/saveConfig");
  * @param {boolean} insecure- boolean to use insecure connection, default is false. lf true the server will not reject any connection which is not authorized with the list of supplied CAs
  */
 var addCredential = function (target, insecure, targetScope) { return __awaiter(void 0, void 0, void 0, function () {
-    var httpsAgentOptions, serverUrl, filePath, _a, client, secret, _b, access_token, refresh_token, filePath, _c, userName, password, filePath;
-    var _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var httpsAgentOptions, serverUrl, filePath_1, _a, _b, client, secret, _c, access_token, refresh_token, _d, userName, password, client, _e, access_token, refresh_token, filePath;
+    var _f, _g, _h;
+    return __generator(this, function (_j) {
+        switch (_j.label) {
             case 0:
                 httpsAgentOptions = insecure
                     ? __assign(__assign({}, target.httpsAgentOptions), { allowInsecureRequests: true, rejectUnauthorized: false }) : target.httpsAgentOptions;
                 if (insecure)
-                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.warn('Executing with insecure connection.');
+                    (_f = process.logger) === null || _f === void 0 ? void 0 : _f.warn('Executing with insecure connection.');
                 if (!!target.serverUrl) return [3 /*break*/, 3];
                 return [4 /*yield*/, input_1.getAndValidateServerUrl(target)];
             case 1:
-                serverUrl = _h.sent();
+                serverUrl = _j.sent();
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { serverUrl: serverUrl }));
                 return [4 /*yield*/, saveConfig_1.saveConfig(targetScope, target, false, false)];
             case 2:
-                filePath = _h.sent();
-                (_e = process.logger) === null || _e === void 0 ? void 0 : _e.info("Target configuration has been saved to " + filePath + " .");
-                _h.label = 3;
+                filePath_1 = _j.sent();
+                (_g = process.logger) === null || _g === void 0 ? void 0 : _g.info("Target configuration has been saved to " + filePath_1 + " .");
+                _j.label = 3;
             case 3:
-                if (!(target.serverType === types_1.ServerType.SasViya)) return [3 /*break*/, 10];
-                return [4 /*yield*/, input_1.getCredentialsInputForViya(target.name)];
-            case 4:
-                _a = _h.sent(), client = _a.client, secret = _a.secret;
-                return [4 /*yield*/, exports.getTokens(target, client, secret, httpsAgentOptions)];
+                _a = target.serverType;
+                switch (_a) {
+                    case types_1.ServerType.SasViya: return [3 /*break*/, 4];
+                    case types_1.ServerType.Sas9: return [3 /*break*/, 10];
+                    case types_1.ServerType.Sasjs: return [3 /*break*/, 15];
+                }
+                return [3 /*break*/, 21];
+            case 4: return [4 /*yield*/, input_1.getCredentialsInputForViya(target.name)];
             case 5:
-                _b = _h.sent(), access_token = _b.access_token, refresh_token = _b.refresh_token;
-                if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 7];
-                return [4 /*yield*/, exports.createEnvFileForViya(target.name, client, secret, access_token, refresh_token)];
+                _b = _j.sent(), client = _b.client, secret = _b.secret;
+                return [4 /*yield*/, exports.getTokens(target, client, secret, httpsAgentOptions)];
             case 6:
-                _h.sent();
-                return [3 /*break*/, 8];
+                _c = _j.sent(), access_token = _c.access_token, refresh_token = _c.refresh_token;
+                if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 8];
+                return [4 /*yield*/, exports.createEnvFileForViya(target.name, client, secret, access_token, refresh_token)];
             case 7:
+                _j.sent();
+                return [3 /*break*/, 9];
+            case 8:
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfig: { client: client, secret: secret, access_token: access_token, refresh_token: refresh_token } }));
-                _h.label = 8;
-            case 8: return [4 /*yield*/, saveConfig_1.saveConfig(targetScope, target, false, false)];
-            case 9:
-                filePath = _h.sent();
-                (_f = process.logger) === null || _f === void 0 ? void 0 : _f.info("Target configuration has been saved to " + filePath + " .");
-                return [3 /*break*/, 17];
-            case 10:
-                if (!(target.serverType === types_1.ServerType.Sas9)) return [3 /*break*/, 16];
-                return [4 /*yield*/, input_1.getCredentialsInputSas9(target, targetScope)];
+                _j.label = 9;
+            case 9: return [3 /*break*/, 22];
+            case 10: return [4 /*yield*/, input_1.getCredentialsInputSas9(target, targetScope)];
             case 11:
-                _c = _h.sent(), userName = _c.userName, password = _c.password;
+                _d = _j.sent(), userName = _d.userName, password = _d.password;
                 if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 13];
                 return [4 /*yield*/, exports.createEnvFileForSas9(target.name, userName, password)];
             case 12:
-                _h.sent();
+                _j.sent();
                 return [3 /*break*/, 14];
             case 13:
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfigSas9: { userName: userName, password: password } }));
-                _h.label = 14;
-            case 14: return [4 /*yield*/, saveConfig_1.saveConfig(targetScope, target, false, false)];
-            case 15:
-                filePath = _h.sent();
-                (_g = process.logger) === null || _g === void 0 ? void 0 : _g.info("Target configuration has been saved to " + filePath + " .");
-                return [3 /*break*/, 17];
-            case 16: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA and SAS9.');
-            case 17: return [2 /*return*/, target];
+                _j.label = 14;
+            case 14: return [3 /*break*/, 22];
+            case 15: return [4 /*yield*/, input_1.getCredentialsInputSasjs(target)];
+            case 16:
+                client = (_j.sent()).client;
+                return [4 /*yield*/, exports.getTokens(target, client, '', httpsAgentOptions)];
+            case 17:
+                _e = _j.sent(), access_token = _e.access_token, refresh_token = _e.refresh_token;
+                if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 19];
+                return [4 /*yield*/, exports.createEnvFileForSasjs(target.name, client, access_token, refresh_token)];
+            case 18:
+                _j.sent();
+                return [3 /*break*/, 20];
+            case 19:
+                target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfig: { client: client, secret: '', access_token: access_token, refresh_token: refresh_token } }));
+                _j.label = 20;
+            case 20: return [3 /*break*/, 22];
+            case 21: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
+            case 22: return [4 /*yield*/, saveConfig_1.saveConfig(targetScope, target, false, false)];
+            case 23:
+                filePath = _j.sent();
+                (_h = process.logger) === null || _h === void 0 ? void 0 : _h.info("Target configuration has been saved to " + filePath + " .");
+                return [2 /*return*/, target];
         }
     });
 }); };
@@ -146,25 +161,25 @@ var validateTargetName = function (targetName) {
 };
 exports.validateTargetName = validateTargetName;
 var getTokens = function (target, client, secret, httpsAgentOptions) { return __awaiter(void 0, void 0, void 0, function () {
-    var adapter, authResponse;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var adapter, _a, access_token, refresh_token;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 adapter = new node_1.default({
                     serverUrl: target.serverUrl,
                     serverType: target.serverType,
                     httpsAgentOptions: httpsAgentOptions,
-                    debug: ((_a = process.logger) === null || _a === void 0 ? void 0 : _a.logLevel) === logger_1.LogLevel.Debug
+                    debug: ((_b = process.logger) === null || _b === void 0 ? void 0 : _b.logLevel) === logger_1.LogLevel.Debug
                 });
                 return [4 /*yield*/, auth_1.getNewAccessToken(adapter, client, secret, target).catch(function (e) {
                         var _a;
-                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred while validating your credentials: " + e + "\nPlease check your Client ID and Client Secret and try again.\n");
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred while validating your credentials: " + e + "\nPlease check your Client ID " + (target.serverType === types_1.ServerType.Sasjs ? '' : 'and Client Secret ') + "and try again.\n");
                         throw e;
                     })];
             case 1:
-                authResponse = _b.sent();
-                return [2 /*return*/, authResponse];
+                _a = _c.sent(), access_token = _a.access_token, refresh_token = _a.refresh_token;
+                return [2 /*return*/, { access_token: access_token, refresh_token: refresh_token }];
         }
     });
 }); };
@@ -203,3 +218,20 @@ var createEnvFileForSas9 = function (targetName, userName, password) { return __
     });
 }); };
 exports.createEnvFileForSas9 = createEnvFileForSas9;
+var createEnvFileForSasjs = function (targetName, client, accessToken, refreshToken) { return __awaiter(void 0, void 0, void 0, function () {
+    var envFileContent, envFilePath;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                envFileContent = "CLIENT=" + client + "\nACCESS_TOKEN=" + accessToken + "\nREFRESH_TOKEN=" + refreshToken + "\n";
+                envFilePath = path_1.default.join(process.projectDir, ".env." + targetName);
+                return [4 /*yield*/, utils_1.createFile(envFilePath, envFileContent)];
+            case 1:
+                _b.sent();
+                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Environment file saved at " + envFilePath);
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.createEnvFileForSasjs = createEnvFileForSasjs;

package/build/commands/add/addTarget.js

@@ -60,26 +60,32 @@ var addCredential_1 = require("./addCredential");
 function addTarget(insecure) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
-        var _d, scope, serverType, name, appLoc, serverUrl, existingTarget, saveWithDefaultValues, targetJson, target, filePath, _e, serverName, repositoryName, userName, password, _f, contextName, updatedTarget, isDefault;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        var _d, scope, serverType, name, appLoc, serverUrl, existingTarget, saveWithDefaultValues, targetJson, target, filePath, _e, _f, serverName, repositoryName, userName, password, _g, contextName, updatedViyaTarget, updatedSasjsTarget, isDefault;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
                 case 0:
                     if (insecure)
                         (_a = process.logger) === null || _a === void 0 ? void 0 : _a.warn('Executing with insecure connection.');
                     return [4 /*yield*/, input_1.getCommonFields()];
                 case 1:
-                    _d = _g.sent(), scope = _d.scope, serverType = _d.serverType, name = _d.name, appLoc = _d.appLoc, serverUrl = _d.serverUrl, existingTarget = _d.existingTarget;
+                    _d = _h.sent(), scope = _d.scope, serverType = _d.serverType, name = _d.name, appLoc = _d.appLoc, serverUrl = _d.serverUrl, existingTarget = _d.existingTarget;
                     saveWithDefaultValues = !existingTarget;
                     targetJson = __assign(__assign({}, existingTarget), { name: name, serverType: serverType, serverUrl: serverUrl, appLoc: appLoc });
                     target = new types_1.Target(targetJson);
                     return [4 /*yield*/, saveConfig_1.saveConfig(scope, target, false, saveWithDefaultValues)];
                 case 2:
-                    filePath = _g.sent();
+                    filePath = _h.sent();
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Target configuration has been saved to " + filePath + " .");
-                    if (!(serverType === types_1.ServerType.Sas9)) return [3 /*break*/, 4];
-                    return [4 /*yield*/, input_1.getAndValidateSas9Fields(target, scope)];
-                case 3:
-                    _e = _g.sent(), serverName = _e.serverName, repositoryName = _e.repositoryName, userName = _e.userName, password = _e.password;
+                    _e = serverType;
+                    switch (_e) {
+                        case types_1.ServerType.Sas9: return [3 /*break*/, 3];
+                        case types_1.ServerType.SasViya: return [3 /*break*/, 5];
+                        case types_1.ServerType.Sasjs: return [3 /*break*/, 7];
+                    }
+                    return [3 /*break*/, 9];
+                case 3: return [4 /*yield*/, input_1.getAndValidateSas9Fields(target, scope)];
+                case 4:
+                    _f = _h.sent(), serverName = _f.serverName, repositoryName = _f.repositoryName, userName = _f.userName, password = _f.password;
                     targetJson = __assign(__assign({}, targetJson), { serverName: serverName, repositoryName: repositoryName });
                     if (scope === targetScope_1.TargetScope.Local) {
                         addCredential_1.createEnvFileForSas9(name, userName, password);
@@ -87,10 +93,10 @@ function addTarget(insecure) {
                     else {
                         targetJson = __assign(__assign({}, targetJson), { authConfigSas9: { userName: userName, password: password } });
                     }
-                    return [3 /*break*/, 6];
-                case 4: return [4 /*yield*/, input_1.getAndValidateSasViyaFields(target, scope, serverUrl, insecure, addCredential_1.addCredential)];
-                case 5:
-                    _f = _g.sent(), contextName = _f.contextName, updatedTarget = _f.target;
+                    return [3 /*break*/, 10];
+                case 5: return [4 /*yield*/, input_1.getAndValidateSasViyaFields(target, scope, serverUrl, insecure, addCredential_1.addCredential)];
+                case 6:
+                    _g = _h.sent(), contextName = _g.contextName, updatedViyaTarget = _g.target;
                     targetJson = {
                         contextName: contextName,
                         deployConfig: {
@@ -98,14 +104,20 @@ function addTarget(insecure) {
                             deployScripts: []
                         }
                     };
-                    targetJson = __assign(__assign({}, updatedTarget.toJson(false)), targetJson);
-                    _g.label = 6;
-                case 6: return [4 /*yield*/, input_1.getIsDefault()];
-                case 7:
-                    isDefault = _g.sent();
-                    return [4 /*yield*/, saveConfig_1.saveConfig(scope, new types_1.Target(targetJson), isDefault, saveWithDefaultValues)];
+                    targetJson = __assign(__assign({}, updatedViyaTarget.toJson(false)), targetJson);
+                    return [3 /*break*/, 10];
+                case 7: return [4 /*yield*/, input_1.getAndValidateSasjsFields(target, scope, insecure, addCredential_1.addCredential)];
                 case 8:
-                    filePath = _g.sent();
+                    updatedSasjsTarget = (_h.sent()).target;
+                    targetJson = updatedSasjsTarget.toJson(false);
+                    return [3 /*break*/, 10];
+                case 9: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
+                case 10: return [4 /*yield*/, input_1.getIsDefault()];
+                case 11:
+                    isDefault = _h.sent();
+                    return [4 /*yield*/, saveConfig_1.saveConfig(scope, new types_1.Target(targetJson), isDefault, saveWithDefaultValues)];
+                case 12:
+                    filePath = _h.sent();
                     (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Target configuration has been saved to " + filePath);
                     return [2 /*return*/, true];
             }

package/build/commands/add/internal/input.d.ts

@@ -9,14 +9,21 @@ export declare function getAndValidateSas9Fields(target: Target, scope: TargetSc
     userName: string;
     password: string;
 }>;
+export declare const shouldAuthenticate: () => Promise<boolean>;
 export declare function getAndValidateSasViyaFields(target: Target, scope: TargetScope, serverUrl: string, insecure: boolean, authenticateCallback: (target: Target, insecure: boolean, targetScope: TargetScope) => Promise<Target>): Promise<{
     contextName: string;
     target: Target;
 }>;
+export declare function getAndValidateSasjsFields(target: Target, scope: TargetScope, insecure: boolean, authenticateCallback: (target: Target, insecure: boolean, targetScope: TargetScope) => Promise<Target>): Promise<{
+    target: Target;
+}>;
 export declare const getCredentialsInputForViya: (targetName: string) => Promise<{
     client: string;
     secret: string;
 }>;
+export declare const getCredentialsInputSasjs: (target: Target) => Promise<{
+    client: string;
+}>;
 export declare const getCredentialsInputSas9: (target: Target, scope: TargetScope) => Promise<{
     userName: string;
     password: string;

package/build/commands/add/internal/input.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIsDefault = exports.getDefaultValues = exports.getCredentialsInputSas9 = exports.getCredentialsInputForViya = exports.getAndValidateSasViyaFields = exports.getAndValidateSas9Fields = exports.getAndValidateServerUrl = exports.getCommonFields = void 0;
+exports.getIsDefault = exports.getDefaultValues = exports.getCredentialsInputSas9 = exports.getCredentialsInputSasjs = exports.getCredentialsInputForViya = exports.getAndValidateSasjsFields = exports.getAndValidateSasViyaFields = exports.shouldAuthenticate = exports.getAndValidateSas9Fields = exports.getAndValidateServerUrl = exports.getCommonFields = void 0;
 var input_1 = require("@sasjs/utils/input");
 var types_1 = require("@sasjs/utils/types");
 var logger_1 = require("@sasjs/utils/logger");
@@ -134,11 +134,20 @@ function getAndValidateServerType() {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, input_1.getChoice('Please pick a server type: ', 'Please choose either option 1 or 2.', [
                         { title: '1. SAS Viya', value: 1 },
-                        { title: '2. SAS 9', value: 2 }
+                        { title: '2. SAS 9', value: 2 },
+                        { title: '3. SAS JS', value: 3 }
                     ])];
                 case 1:
                     serverType = _a.sent();
-                    return [2 /*return*/, serverType === 1 ? types_1.ServerType.SasViya : types_1.ServerType.Sas9];
+                    switch (serverType) {
+                        case 1:
+                            return [2 /*return*/, types_1.ServerType.SasViya];
+                        case 2:
+                            return [2 /*return*/, types_1.ServerType.Sas9];
+                        default:
+                            return [2 /*return*/, types_1.ServerType.Sasjs];
+                    }
+                    return [2 /*return*/];
             }
         });
     });
@@ -177,7 +186,11 @@ function getAndValidateTargetName(serverType) {
                             return [2 /*return*/, true];
                         });
                     }); };
-                    defaultName = serverType === types_1.ServerType.SasViya ? 'viya' : 'sas9';
+                    defaultName = serverType === types_1.ServerType.SasViya
+                        ? 'viya'
+                        : serverType === types_1.ServerType.Sas9
+                            ? 'sas9'
+                            : 'server';
                     return [4 /*yield*/, input_1.getString('Please enter a target name: ', validator, defaultName)];
                 case 1:
                     targetName = _a.sent();
@@ -237,18 +250,21 @@ function getAndValidateSas9Fields(target, scope) {
     });
 }
 exports.getAndValidateSas9Fields = getAndValidateSas9Fields;
+var shouldAuthenticate = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+    return [2 /*return*/, input_1.getConfirmation('Would you like to authenticate against this target?', true)];
+}); }); };
+exports.shouldAuthenticate = shouldAuthenticate;
 function getAndValidateSasViyaFields(target, scope, serverUrl, insecure, authenticateCallback) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var contextName, shouldAuthenticate, httpsAgentOptions, sasjs, contexts, contextNumberErrorMessage, contextNumber;
+        var contextName, httpsAgentOptions, sasjs, contexts, contextNumberErrorMessage, contextNumber;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     contextName = 'SAS Job Execution compute context';
-                    return [4 /*yield*/, input_1.getConfirmation('Would you like to authenticate against this target?', true)];
+                    return [4 /*yield*/, exports.shouldAuthenticate()];
                 case 1:
-                    shouldAuthenticate = _b.sent();
-                    if (!shouldAuthenticate) return [3 /*break*/, 8];
+                    if (!_b.sent()) return [3 /*break*/, 8];
                     return [4 /*yield*/, authenticateCallback(target, insecure, scope)];
                 case 2:
                     target = _b.sent();
@@ -293,6 +309,23 @@ function getAndValidateSasViyaFields(target, scope, serverUrl, insecure, authent
     });
 }
 exports.getAndValidateSasViyaFields = getAndValidateSasViyaFields;
+function getAndValidateSasjsFields(target, scope, insecure, authenticateCallback) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, exports.shouldAuthenticate()];
+                case 1:
+                    if (!_a.sent()) return [3 /*break*/, 3];
+                    return [4 /*yield*/, authenticateCallback(target, insecure, scope)];
+                case 2:
+                    target = _a.sent();
+                    _a.label = 3;
+                case 3: return [2 /*return*/, { target: target }];
+            }
+        });
+    });
+}
+exports.getAndValidateSasjsFields = getAndValidateSasjsFields;
 function getAndValidateAppLoc(targetName, target) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
@@ -326,6 +359,18 @@ var getCredentialsInputForViya = function (targetName) { return __awaiter(void 0
     });
 }); };
 exports.getCredentialsInputForViya = getCredentialsInputForViya;
+var getCredentialsInputSasjs = function (target) { return __awaiter(void 0, void 0, void 0, function () {
+    var client;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, input_1.getString('Please enter your Client ID: ', function (v) { return !!v || 'Client ID is required.'; }, exports.getDefaultValues(target.name).client)];
+            case 1:
+                client = _a.sent();
+                return [2 /*return*/, { client: client }];
+        }
+    });
+}); };
+exports.getCredentialsInputSasjs = getCredentialsInputSasjs;
 var getCredentialsInputSas9 = function (target, scope) { return __awaiter(void 0, void 0, void 0, function () {
     var targetName, name, result, userName, password;
     var _a, _b, _c, _d;

package/build/commands/add/spec/addTarget.spec.js

@@ -81,6 +81,7 @@ describe('addTarget', function () {
     var appName = "cli-tests-add-" + utils_1.generateTimestamp();
     var viyaTargetName = "test-viya-" + utils_1.generateTimestamp();
     var sas9TargetName = "test-sas9-" + utils_1.generateTimestamp();
+    var sasjsTargetName = "test-server-" + utils_1.generateTimestamp();
     var globalTestTarget;
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -164,6 +165,42 @@ describe('addTarget', function () {
             }
         });
     }); });
+    it('should create a SASJS target in the local sasjsconfig.json file', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var commonFields;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    commonFields = {
+                        scope: targetScope_1.TargetScope.Local,
+                        serverType: utils_1.ServerType.Sasjs,
+                        name: sasjsTargetName,
+                        appLoc: '/Public/app',
+                        serverUrl: process.env.SASJS_SERVER_URL || '',
+                        existingTarget: {}
+                    };
+                    jest
+                        .spyOn(inputModule, 'getCommonFields')
+                        .mockImplementation(function () { return Promise.resolve(commonFields); });
+                    jest
+                        .spyOn(inputModule, 'getIsDefault')
+                        .mockImplementation(function () { return Promise.resolve(false); });
+                    jest
+                        .spyOn(inputModule, 'getAndValidateSasjsFields')
+                        .mockImplementation(function () {
+                        return Promise.resolve({
+                            target: new utils_1.Target(commonFields)
+                        });
+                    });
+                    return [4 /*yield*/, expect(addTarget_1.addTarget(false)).resolves.toEqual(true)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, verifyTarget(commonFields, true)];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('should create a SAS9 target in the local sasjsconfig.json file', function () { return __awaiter(void 0, void 0, void 0, function () {
         var commonFields;
         return __generator(this, function (_a) {
@@ -322,6 +359,47 @@ describe('addTarget', function () {
             }
         });
     }); });
+    it('should update a SASJS target in the local sasjsconfig.json file', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var buildSourceFolder, config, targetJson, commonFields;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    buildSourceFolder = process.sasjsConstants.buildSourceFolder;
+                    return [4 /*yield*/, config_1.getConfiguration(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
+                case 1:
+                    config = _a.sent();
+                    targetJson = (config.targets || []).find(function (t) { return t.name === 'server'; });
+                    commonFields = {
+                        scope: targetScope_1.TargetScope.Local,
+                        serverType: utils_1.ServerType.Sasjs,
+                        name: 'server',
+                        appLoc: '/Public/app/new/location/2',
+                        serverUrl: process.env.SASJS_SERVER_URL || '',
+                        existingTarget: targetJson
+                    };
+                    jest
+                        .spyOn(inputModule, 'getCommonFields')
+                        .mockImplementation(function () { return Promise.resolve(commonFields); });
+                    jest
+                        .spyOn(inputModule, 'getIsDefault')
+                        .mockImplementation(function () { return Promise.resolve(false); });
+                    jest
+                        .spyOn(inputModule, 'getAndValidateSasjsFields')
+                        .mockImplementation(function () {
+                        return Promise.resolve({
+                            target: new utils_1.Target(__assign(__assign({}, targetJson), commonFields))
+                        });
+                    });
+                    return [4 /*yield*/, expect(addTarget_1.addTarget(false)).resolves.toEqual(true)];
+                case 2:
+                    _a.sent();
+                    return [4 /*yield*/, verifyTarget(commonFields, true)];
+                case 3:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('should update a target in the global .sasjsrc file', function () { return __awaiter(void 0, void 0, void 0, function () {
         var commonFields;
         return __generator(this, function (_a) {

package/build/commands/build/build.js

@@ -92,8 +92,6 @@ var config_1 = require("../../utils/config");
 var compile_1 = require("../compile/compile");
 var config_2 = require("./internal/config");
 var getLaunchPageCode_1 = require("./internal/getLaunchPageCode");
-var dependencies_1 = require("../shared/dependencies");
-var compileTestFile_1 = require("../compile/internal/compileTestFile");
 function build(target) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -132,7 +130,7 @@ function createFinalSasFiles(target) {
 function createFinalSasFile(target, streamConfig) {
     var _a, _b, _c, _d, _e, _f;
     return __awaiter(this, void 0, void 0, function () {
-        var streamWeb, buildConfig, serverType, name, macroFolders, buildOutputFileName, buildDestinationFolder, finalSasFileContent, finalFilePath, finalFilePathJSON, buildInfo, buildInit, buildTerm, dependencyFilePaths, dependenciesContent, _g, folderContent, folderContentJSON;
+        var streamWeb, buildConfig, serverType, name, macroFolders, buildOutputFileName, buildDestinationFolder, finalSasFileContent, finalFilePath, finalFilePathJSON, buildInfo, buildInit, buildTerm, macroCorePath, dependencyFilePaths, dependenciesContent, _g, folderContent, folderContentJSON;
         return __generator(this, function (_h) {
             switch (_h.label) {
                 case 0:
@@ -156,7 +154,8 @@ function createFinalSasFile(target, streamConfig) {
                     return [4 /*yield*/, config_2.getBuildTerm(target)];
                 case 4:
                     buildTerm = _h.sent();
-                    return [4 /*yield*/, dependencies_1.getDependencyPaths(buildTerm + "\n" + buildInit, macroFolders)];
+                    macroCorePath = config_1.getMacroCorePath();
+                    return [4 /*yield*/, utils_1.getDependencyPaths(buildTerm + "\n" + buildInit, macroFolders, macroCorePath)];
                 case 5:
                     dependencyFilePaths = _h.sent();
                     return [4 /*yield*/, getDependencies(dependencyFilePaths)];
@@ -189,7 +188,7 @@ function createFinalSasFile(target, streamConfig) {
 }
 function getBuildInfo(target, streamWeb) {
     return __awaiter(this, void 0, void 0, function () {
-        var buildConfig, serverType, appLoc, macroFolders, createWebServiceScript, dependencyFilePaths, createFileScript, dependencyFilePathsForCreateFile, gsubScript, dependencyFilePathsForGsubScript, dependenciesContent, buildVars;
+        var buildConfig, serverType, appLoc, macroFolders, createWebServiceScript, macroCorePath, dependencyFilePaths, createFileScript, dependencyFilePathsForCreateFile, gsubScript, dependencyFilePathsForGsubScript, dependenciesContent, buildVars;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -201,8 +200,9 @@ function getBuildInfo(target, streamWeb) {
                     return [4 /*yield*/, getCreateWebServiceScript(serverType)];
                 case 2:
                     createWebServiceScript = _a.sent();
+                    macroCorePath = config_1.getMacroCorePath();
                     buildConfig += createWebServiceScript + "\n";
-                    return [4 /*yield*/, dependencies_1.getDependencyPaths(buildConfig, macroFolders)];
+                    return [4 /*yield*/, utils_1.getDependencyPaths(buildConfig, macroFolders, macroCorePath)];
                 case 3:
                     dependencyFilePaths = _a.sent();
                     if (!(target.serverType === utils_1.ServerType.SasViya && streamWeb)) return [3 /*break*/, 8];
@@ -210,7 +210,7 @@ function getBuildInfo(target, streamWeb) {
                 case 4:
                     createFileScript = _a.sent();
                     buildConfig += createFileScript + "\n";
-                    return [4 /*yield*/, dependencies_1.getDependencyPaths(createFileScript, macroFolders)
+                    return [4 /*yield*/, utils_1.getDependencyPaths(createFileScript, macroFolders, macroCorePath)
                         // The gsubScript is used to perform the replacement of the appLoc within
                         // the deployed index.html file.  This only happens when deploying using the
                         // SAS Program (build.sas) approach.
@@ -221,7 +221,7 @@ function getBuildInfo(target, streamWeb) {
                 case 6:
                     gsubScript = _a.sent();
                     buildConfig += gsubScript + "\n";
-                    return [4 /*yield*/, dependencies_1.getDependencyPaths(gsubScript, macroFolders)];
+                    return [4 /*yield*/, utils_1.getDependencyPaths(gsubScript, macroFolders, macroCorePath)];
                 case 7:
                     dependencyFilePathsForGsubScript = _a.sent();
                     dependencyFilePaths = __spreadArray([], __read(new Set(__spreadArray(__spreadArray(__spreadArray([], __read(dependencyFilePaths)), __read(dependencyFilePathsForCreateFile)), __read(dependencyFilePathsForGsubScript)))));
@@ -482,7 +482,7 @@ function getServiceText(serviceFileName, fileContent, serverType, testPath) {
         }
     });
     return "%let service=" + serviceName + ";\nfilename sascode temp lrecl=32767;\ndata _null_;\nfile sascode;\n" + content + "\n\nrun;\n" + (serverType !== utils_1.ServerType.Sasjs
-        ? getWebServiceScriptInvocation(serverType, compileTestFile_1.isTestFile(serviceFileName) && testPath ? "" + testPath : '')
+        ? getWebServiceScriptInvocation(serverType, utils_1.isTestFile(serviceFileName) && testPath ? "" + testPath : '')
         : '') + "\nfilename sascode clear;\n";
 }
 function getFileText(fileName, fileContent, serverType) {
@@ -494,7 +494,7 @@ function getFileText(fileName, fileContent, serverType) {
 }
 function getWebFileContent(filecontent, type) {
     var parsedContent = '';
-    var chunkedLines = utils_2.chunk(filecontent);
+    var chunkedLines = utils_1.chunk(filecontent);
     if (chunkedLines.length === 1) {
         parsedContent = " put '" + chunkedLines[0].split("'").join("''") + "';\n";
     }
@@ -548,7 +548,7 @@ var convertVarsToSasFormat = function (vars) {
     try {
         for (var entries_1 = __values(entries), entries_1_1 = entries_1.next(); !entries_1_1.done; entries_1_1 = entries_1.next()) {
             var _b = __read(entries_1_1.value, 2), name_1 = _b[0], value = _b[1];
-            var chunks = utils_2.chunk(value);
+            var chunks = utils_1.chunk(value);
             var chunkedString = chunks.join('%trim(\n)');
             varsContent += "%let " + name_1 + "=" + chunkedString + ";\n";
         }

package/build/commands/build/internal/config.d.ts

@@ -1,3 +1,3 @@
-import { Target } from '@sasjs/utils/types';
+import { Target } from '@sasjs/utils';
 export declare const getBuildInit: (target: Target) => Promise<string>;
 export declare const getBuildTerm: (target: Target) => Promise<string>;