@sasjs/cli 3.7.0 → 3.7.1

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/package.json

@@ -97,5 +97,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.7.0"
+  "version": "3.7.1"
 }