@sasjs/cli 2.38.7 → 3.0.1

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

@@ -91,7 +91,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = __importDefault(require("path"));
-var executeModule = __importStar(require("../execute"));
+var viyaExecuteModule = __importStar(require("../internal/execute/viya"));
 var jobCommand_1 = require("../jobCommand");
 var utils_1 = require("@sasjs/utils");
 var configUtils = __importStar(require("../../../utils/config"));
@@ -128,7 +128,7 @@ describe('JobCommand', function () {
                 case 0: return [4 /*yield*/, executeCommandWrapper([jobPath])];
                 case 1:
                     _b.sent();
-                    (_a = expect(executeModule.execute)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({ jobPath: jobPath }))));
+                    (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({ jobPath: jobPath }))));
                     return [2 /*return*/];
             }
         });
@@ -140,7 +140,7 @@ describe('JobCommand', function () {
                 case 0: return [4 /*yield*/, executeCommandWrapper([jobPath, '--log', log])];
                 case 1:
                     _b.sent();
-                    (_a = expect(executeModule.execute)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
+                    (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
                         jobPath: jobPath,
                         waitForJob: true,
                         logFile: path_1.default.join(projectFolder, log)
@@ -156,7 +156,7 @@ describe('JobCommand', function () {
                 case 0: return [4 /*yield*/, executeCommandWrapper([jobPath, '--log'])];
                 case 1:
                     _b.sent();
-                    (_a = expect(executeModule.execute)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
+                    (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
                         jobPath: jobPath,
                         waitForJob: true,
                         logFile: path_1.default.join(process.projectDir, jobFileName + ".log")
@@ -172,7 +172,7 @@ describe('JobCommand', function () {
                 case 0: return [4 /*yield*/, executeCommandWrapper([jobPath, '--returnStatusOnly'])];
                 case 1:
                     _b.sent();
-                    (_a = expect(executeModule.execute)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
+                    (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
                         jobPath: jobPath,
                         waitForJob: true,
                         returnStatusOnly: true
@@ -204,7 +204,7 @@ describe('JobCommand', function () {
                     ])];
                 case 1:
                     _b.sent();
-                    (_a = expect(executeModule.execute)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
+                    (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
                         jobPath: jobPath,
                         waitForJob: true,
                         output: output,
@@ -242,7 +242,7 @@ describe('JobCommand', function () {
                     ])];
                 case 1:
                     _b.sent();
-                    (_a = expect(executeModule.execute)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
+                    (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
                         jobPath: jobPath,
                         waitForJob: true,
                         output: output,
@@ -314,7 +314,7 @@ describe('JobCommand', function () {
             switch (_a.label) {
                 case 0:
                     jest
-                        .spyOn(executeModule, 'execute')
+                        .spyOn(viyaExecuteModule, 'executeJobViya')
                         .mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
                     return [4 /*yield*/, executeCommandWrapper([jobPath])];
                 case 1:
@@ -328,10 +328,10 @@ describe('JobCommand', function () {
 });
 var setupMocks = function () {
     jest.resetAllMocks();
-    jest.mock('../execute');
+    jest.mock('../internal/execute');
     jest.mock('../../../utils/config');
     jest
-        .spyOn(executeModule, 'execute')
+        .spyOn(viyaExecuteModule, 'executeJobViya')
         .mockImplementation(function () { return Promise.resolve(); });
     jest
         .spyOn(configUtils, 'findTargetInConfiguration')

package/build/commands/request/request.js

@@ -102,7 +102,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                     }
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType,
                         contextName: target.contextName,

package/build/commands/run/run.js

@@ -139,7 +139,7 @@ function executeOnSasViya(filePath, isTempFile, target, linesToExecute) {
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Sending " + path_1.default.basename(filePath) + " to SAS server for execution.");
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType,
                         debug: true,
@@ -225,7 +225,7 @@ function executeOnSas9(filePath, isTempFile, target, linesToExecute) {
                     password = utils_1.decodeFromBase64(password);
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType,
                         debug: true

package/build/commands/servicepack/spec/servicepack.spec.server.js

@@ -61,7 +61,6 @@ describe('sasjs servicepack', function () {
                         name: targetName,
                         serverType: utils_1.ServerType.SasViya,
                         serverUrl: process.env.VIYA_SERVER_URL,
-                        allowInsecureRequests: false,
                         appLoc: "/Public/app/cli-tests/" + targetName,
                         contextName: utils_2.contextName,
                         authConfig: {

package/build/commands/shared/dependencies.js

@@ -73,15 +73,12 @@ function getDependencyPaths(fileContent, macroFolders) {
     var _a;
     if (macroFolders === void 0) { macroFolders = []; }
     return __awaiter(this, void 0, void 0, function () {
-        var sourcePaths, _b, dependenciesHeader, dependencies, dependencyPaths, foundDependencies, notFoundDependencies, errorMessage;
+        var sourcePaths, dependenciesHeader, dependencies, dependencyPaths, foundDependencies, notFoundDependencies, errorMessage;
         var _this = this;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    _b = [__spreadArray([], __read(macroFolders))];
-                    return [4 /*yield*/, config_1.getMacroCorePath()];
-                case 1:
-                    sourcePaths = __spreadArray.apply(void 0, _b.concat([[_c.sent()]]));
+                    sourcePaths = __spreadArray(__spreadArray([], __read(macroFolders)), [config_1.getMacroCorePath()]);
                     dependenciesHeader = fileContent.includes('<h4> SAS Macros </h4>')
                         ? '<h4> SAS Macros </h4>'
                         : '<h4> Dependencies </h4>';
@@ -134,8 +131,8 @@ function getDependencyPaths(fileContent, macroFolders) {
                                 }
                             });
                         }); })];
-                case 2:
-                    _c.sent();
+                case 1:
+                    _b.sent();
                     notFoundDependencies = utils_2.diff(dependencies, foundDependencies);
                     if (notFoundDependencies.length) {
                         errorMessage = 'Unable to locate dependencies: ' + notFoundDependencies.join(', ');

package/build/commands/shared/deployToSasViyaWithServicePack.js

@@ -67,7 +67,7 @@ function deployToSasViyaWithServicePack(jsonFilePath, target, isLocal, isForced)
                         throw new Error("Deployment failed. Request is not authenticated.\nPlease add the following variables to your .env" + (isLocal ? "." + target.name : '') + " file:\nCLIENT, SECRET, ACCESS_TOKEN, REFRESH_TOKEN");
                     }
                     sasjs = new node_1.default({
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType,
                         serverUrl: target.serverUrl,

package/build/commands/testing/test.js

@@ -144,7 +144,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                         flow.push(testFlow.testTearDown);
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType,
                         debug: true,

package/build/commands/web/internal/createAssetServices.d.ts

@@ -0,0 +1,5 @@
+import { StreamConfig, Target } from '@sasjs/utils';
+export declare const createAssetServices: (target: Target, destinationPath: string, streamConfig: StreamConfig) => Promise<{
+    source: string;
+    target: string;
+}[]>;

package/build/commands/web/internal/createAssetServices.js

@@ -0,0 +1,219 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAssetServices = void 0;
+var path_1 = __importDefault(require("path"));
+var utils_1 = require("@sasjs/utils");
+var lodash_uniqby_1 = __importDefault(require("lodash.uniqby"));
+var getWebServiceContent_1 = require("./getWebServiceContent");
+var createAssetServices = function (target, destinationPath, streamConfig) { return __awaiter(void 0, void 0, void 0, function () {
+    var webSourcePath, streamWebFolder, assetPaths, assetPathMap;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                webSourcePath = streamConfig.webSourcePath, streamWebFolder = streamConfig.streamWebFolder, assetPaths = streamConfig.assetPaths;
+                assetPathMap = [];
+                return [4 /*yield*/, utils_1.asyncForEach(__spreadArray([path_1.default.join(process.projectDir, webSourcePath)], __read((assetPaths !== null && assetPaths !== void 0 ? assetPaths : []))), function (assetPath) { return __awaiter(void 0, void 0, void 0, function () {
+                        var fullAssetPath, assetPathExists, assetPathMapNested;
+                        var _a;
+                        return __generator(this, function (_b) {
+                            switch (_b.label) {
+                                case 0:
+                                    fullAssetPath = path_1.default.isAbsolute(assetPath)
+                                        ? assetPath
+                                        : path_1.default.isAbsolute(webSourcePath)
+                                            ? path_1.default.join(webSourcePath, assetPath)
+                                            : path_1.default.join(process.projectDir, webSourcePath, assetPath);
+                                    return [4 /*yield*/, utils_1.folderExists(fullAssetPath)];
+                                case 1:
+                                    assetPathExists = _b.sent();
+                                    if (!assetPathExists) {
+                                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.warn("Assets path '" + fullAssetPath + "' present in 'streamConfig' doesn't exist.");
+                                        return [2 /*return*/];
+                                    }
+                                    return [4 /*yield*/, createAssetsServicesNested(target, streamWebFolder, fullAssetPath, destinationPath)];
+                                case 2:
+                                    assetPathMapNested = _b.sent();
+                                    assetPathMap.push.apply(assetPathMap, __spreadArray([], __read(assetPathMapNested)));
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })];
+            case 1:
+                _a.sent();
+                return [2 /*return*/, lodash_uniqby_1.default(assetPathMap, 'source')];
+        }
+    });
+}); };
+exports.createAssetServices = createAssetServices;
+var createAssetsServicesNested = function (target, streamWebFolder, fullAssetPath, destinationPath) { return __awaiter(void 0, void 0, void 0, function () {
+    var assetPathMap, filePaths, folderNames;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                assetPathMap = [];
+                return [4 /*yield*/, utils_1.listFilesInFolder(fullAssetPath)];
+            case 1:
+                filePaths = _a.sent();
+                return [4 /*yield*/, utils_1.asyncForEach(filePaths, function (filePath) { return __awaiter(void 0, void 0, void 0, function () {
+                        var fullFileName, fileName, fileExtension, sourcePath, assetServiceUrl, fileName_1, assetServiceUrl;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    fullFileName = path_1.default.basename(filePath);
+                                    fileName = fullFileName.substring(0, fullFileName.lastIndexOf('.'));
+                                    fileExtension = path_1.default
+                                        .basename(filePath)
+                                        .substring(fullFileName.lastIndexOf('.') + 1, fullFileName.length);
+                                    if (!(fileName && fileExtension)) return [3 /*break*/, 4];
+                                    sourcePath = path_1.default.join(fullAssetPath, filePath);
+                                    if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 2];
+                                    return [4 /*yield*/, utils_1.copy(sourcePath, path_1.default.join(destinationPath, fullFileName))];
+                                case 1:
+                                    _a.sent();
+                                    assetServiceUrl = getAssetPath(target.appLoc, target.serverType, streamWebFolder, fullFileName);
+                                    assetPathMap.push({
+                                        source: fullFileName,
+                                        target: assetServiceUrl
+                                    });
+                                    return [3 /*break*/, 4];
+                                case 2: return [4 /*yield*/, generateAssetService(sourcePath, filePath, destinationPath, target.serverType)];
+                                case 3:
+                                    fileName_1 = _a.sent();
+                                    assetServiceUrl = getAssetPath(target.appLoc, target.serverType, streamWebFolder, fileName_1.replace('.sas', ''));
+                                    assetPathMap.push({
+                                        source: fullFileName,
+                                        target: assetServiceUrl
+                                    });
+                                    _a.label = 4;
+                                case 4: return [2 /*return*/];
+                            }
+                        });
+                    }); })];
+            case 2:
+                _a.sent();
+                return [4 /*yield*/, utils_1.listSubFoldersInFolder(fullAssetPath)];
+            case 3:
+                folderNames = _a.sent();
+                return [4 /*yield*/, utils_1.asyncForEach(folderNames, function (folderName) { return __awaiter(void 0, void 0, void 0, function () {
+                        var destinationPathNested, fullAssetPathNested, assetFolderMap;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    destinationPathNested = path_1.default.join(destinationPath, folderName);
+                                    fullAssetPathNested = path_1.default.join(fullAssetPath, folderName);
+                                    return [4 /*yield*/, utils_1.createFolder(destinationPathNested)];
+                                case 1:
+                                    _a.sent();
+                                    return [4 /*yield*/, createAssetsServicesNested(target, streamWebFolder + "/" + folderName, fullAssetPathNested, destinationPathNested)];
+                                case 2:
+                                    assetFolderMap = _a.sent();
+                                    assetFolderMap.forEach(function (entry) {
+                                        assetPathMap.push({
+                                            source: folderName + "/" + entry.source,
+                                            target: entry.target
+                                        });
+                                    });
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })];
+            case 4:
+                _a.sent();
+                return [2 /*return*/, assetPathMap];
+        }
+    });
+}); };
+var generateAssetService = function (sourcePath, filePath, destinationPath, serverType) { return __awaiter(void 0, void 0, void 0, function () {
+    var fileExtension, fileType, fileName, base64string, serviceContent;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                fileExtension = path_1.default.extname(filePath);
+                fileType = fileExtension.replace('.', '').toUpperCase();
+                fileName = path_1.default
+                    .basename(filePath)
+                    .replace(new RegExp(fileExtension + '$'), fileExtension.replace('.', '-'));
+                return [4 /*yield*/, utils_1.base64EncodeFile(sourcePath)];
+            case 1:
+                base64string = _a.sent();
+                return [4 /*yield*/, getWebServiceContent_1.getWebServiceContent(base64string, fileType, serverType)];
+            case 2:
+                serviceContent = _a.sent();
+                return [4 /*yield*/, utils_1.createFile(path_1.default.join(destinationPath, fileName + ".sas"), serviceContent)];
+            case 3:
+                _a.sent();
+                return [2 /*return*/, fileName + ".sas"];
+        }
+    });
+}); };
+var getAssetPath = function (appLoc, serverType, streamWebFolder, fileName) {
+    var storedProcessPath = 
+    // the appLoc is inserted dynamically by SAS
+    // using three forward slashes as a marker
+    // for SAS 9 fileName is a program, with replacement in sasjsout.ts
+    // for Viya, fileName is a FILE, with replacement in build.sas only
+    serverType === utils_1.ServerType.SasViya
+        ? "/SASJobExecution?_FILE=" + appLoc + "/services/" + streamWebFolder
+        : "/SASStoredProcess/?_PROGRAM=///" + streamWebFolder;
+    return storedProcessPath + "/" + fileName;
+};

package/build/commands/web/internal/getTags.d.ts

@@ -0,0 +1,4 @@
+import { JSDOM } from 'jsdom';
+export declare const getScriptTags: (parsedHtml: JSDOM) => HTMLScriptElement[];
+export declare const getLinkTags: (parsedHtml: JSDOM) => HTMLLinkElement[];
+export declare const getFaviconTags: (parsedHtml: JSDOM) => HTMLLinkElement[];

package/build/commands/web/internal/getTags.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFaviconTags = exports.getLinkTags = exports.getScriptTags = void 0;
+var getScriptTags = function (parsedHtml) {
+    return Array.from(parsedHtml.window.document.querySelectorAll('script'));
+};
+exports.getScriptTags = getScriptTags;
+var getLinkTags = function (parsedHtml) {
+    var linkTags = Array.from(parsedHtml.window.document.querySelectorAll('link')).filter(function (s) { return s.getAttribute('rel') === 'stylesheet'; });
+    return linkTags;
+};
+exports.getLinkTags = getLinkTags;
+var getFaviconTags = function (parsedHtml) {
+    var linkTags = Array.from(parsedHtml.window.document.querySelectorAll('link')).filter(function (s) {
+        return s.getAttribute('rel') &&
+            s.getAttribute('rel') &&
+            s.getAttribute('rel').includes('icon');
+    });
+    return linkTags;
+};
+exports.getFaviconTags = getFaviconTags;

package/build/commands/web/internal/getWebServiceContent.d.ts

@@ -0,0 +1,2 @@
+import { ServerType } from '@sasjs/utils';
+export declare const getWebServiceContent: (contentBase64: string, type: string | undefined, serverType: ServerType) => Promise<string>;

package/build/commands/web/internal/getWebServiceContent.js

@@ -0,0 +1,84 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWebServiceContent = void 0;
+var utils_1 = require("@sasjs/utils");
+var utils_2 = require("../../../utils");
+var sasjsout_1 = require("./sasjsout");
+var getWebServiceContent = function (contentBase64, type, serverType) {
+    if (type === void 0) { type = 'JS'; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var lines, typesToEncode, serviceContent;
+        return __generator(this, function (_a) {
+            lines = [contentBase64];
+            typesToEncode = {
+                JS: 'JS64',
+                CSS: 'CSS64'
+            };
+            serviceContent = sasjsout_1.sasjsout + "\nfilename sasjs temp lrecl=99999999;\ndata _null_;\nfile sasjs;\n";
+            lines.forEach(function (line) {
+                var chunkedLines = utils_2.chunk(line);
+                if (chunkedLines.length === 1) {
+                    serviceContent += "put '" + chunkedLines[0].split("'").join("''") + "';\n";
+                }
+                else {
+                    var combinedLines_1 = '';
+                    chunkedLines.forEach(function (chunkedLine, index) {
+                        var text = "put '" + chunkedLine.split("'").join("''") + "'";
+                        if (index !== chunkedLines.length - 1) {
+                            text += '@;\n';
+                        }
+                        else {
+                            text += ';\n';
+                        }
+                        combinedLines_1 += text;
+                    });
+                    serviceContent += combinedLines_1;
+                }
+            });
+            if (serverType === utils_1.ServerType.Sas9 && typesToEncode.hasOwnProperty(type)) {
+                serviceContent += "\nrun;\n%sasjsout(" + typesToEncode[type] + ")";
+            }
+            else {
+                serviceContent += "\nrun;\n%sasjsout(" + type + ")";
+            }
+            return [2 /*return*/, serviceContent];
+        });
+    });
+};
+exports.getWebServiceContent = getWebServiceContent;

package/build/commands/web/{spec/updateTagSource.spec.js → internal/spec/updateScriptTag.spec.js}

@@ -44,15 +44,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
-var web_1 = require("../web");
-var utils_2 = require("../../../utils");
-describe('updateTagSource', function () {
+var updateScriptTag_1 = require("../updateScriptTag");
+var utils_2 = require("../../../../utils");
+describe('updateScriptTag', function () {
     var destinationPath;
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    destinationPath = path_1.default.join(__dirname, "cli-test-web-updateTagSource-" + utils_1.generateTimestamp());
+                    destinationPath = path_1.default.join(__dirname, "cli-test-web-updateScriptTag-" + utils_1.generateTimestamp());
                     return [4 /*yield*/, utils_1.createFolder(destinationPath)];
                 case 1:
                     _a.sent();
@@ -80,7 +80,7 @@ describe('updateTagSource', function () {
             switch (_a.label) {
                 case 0:
                     scriptTag = document.createElement('link');
-                    sourcePath = '../testFiles';
+                    sourcePath = path_1.default.join(__dirname, 'testFiles');
                     target = { serverType: utils_1.ServerType.Sas9 };
                     assetPathMap = [];
                     script1Filename = 'script1.js';
@@ -92,7 +92,7 @@ describe('updateTagSource', function () {
                         source: script1Filename,
                         target: sasProgramScript1Path
                     });
-                    return [4 /*yield*/, web_1.updateTagSource(scriptTag, sourcePath, destinationPath, target, assetPathMap)];
+                    return [4 /*yield*/, updateScriptTag_1.updateScriptTag(scriptTag, sourcePath, destinationPath, target.serverType, assetPathMap)];
                 case 1:
                     _a.sent();
                     expect(scriptTag.getAttribute('src')).toEqual(sasProgramScript1Path);
@@ -109,7 +109,7 @@ describe('updateTagSource', function () {
                         source: script2Filename,
                         target: sasProgramScript2Path
                     });
-                    return [4 /*yield*/, web_1.updateTagSource(scriptTag, sourcePath, destinationPath, target, assetPathMap)];
+                    return [4 /*yield*/, updateScriptTag_1.updateScriptTag(scriptTag, sourcePath, destinationPath, target.serverType, assetPathMap)];
                 case 3:
                     _a.sent();
                     expect(scriptTag.getAttribute('src')).toEqual(sasProgramScript2Path);

package/build/commands/web/internal/updateAllTags.d.ts

@@ -0,0 +1,13 @@
+import { JSDOM } from 'jsdom';
+import { ServerType } from '@sasjs/utils';
+interface paramsType {
+    webSourcePathFull: string;
+    destinationPath: string;
+    serverType: ServerType;
+    assetPathMap: {
+        source: string;
+        target: string;
+    }[];
+}
+export declare const updateAllTags: (parsedHtml: JSDOM, { webSourcePathFull, destinationPath, serverType, assetPathMap }: paramsType) => Promise<void>;
+export {};