@sasjs/cli 3.0.2 → 3.2.0

package/build/utils/config.js

@@ -633,7 +633,7 @@ function getProgramFolders(target) {
                     }
                     buildSourceFolder = process.sasjsConstants.buildSourceFolder;
                     programFolders = programFolders.map(function (programFolder) {
-                        return utils_2.getAbsolutePath(programFolder, buildSourceFolder);
+                        return utils_1.getAbsolutePath(programFolder, buildSourceFolder);
                     });
                     return [2 /*return*/, __spreadArray([], __read(new Set(programFolders)))];
             }
@@ -664,7 +664,7 @@ function getMacroFolders(target) {
                     }
                     buildSourceFolder = process.sasjsConstants.buildSourceFolder;
                     macroFolders = macroFolders.map(function (macroFolder) {
-                        return utils_2.getAbsolutePath(macroFolder, buildSourceFolder);
+                        return utils_1.getAbsolutePath(macroFolder, buildSourceFolder);
                     });
                     return [2 /*return*/, __spreadArray([], __read(new Set(macroFolders)))];
             }
@@ -691,10 +691,7 @@ function getStreamConfig(target) {
     });
 }
 exports.getStreamConfig = getStreamConfig;
-function getMacroCorePath() {
-    var macroCorePath = process.sasjsConstants.macroCorePath;
-    return macroCorePath;
-}
+var getMacroCorePath = function () { return process.sasjsConstants.macroCorePath; };
 exports.getMacroCorePath = getMacroCorePath;
 /**
  * Sanitizes app location string.
@@ -761,7 +758,7 @@ exports.getProjectRoot = getProjectRoot;
 function getAuthConfig(target) {
     var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function () {
-        var access_token, refresh_token, client, secret, authConfig, sasjs;
+        var access_token, refresh_token, client, secret, sasjs, tokens;
         return __generator(this, function (_e) {
             switch (_e.label) {
                 case 0:
@@ -811,18 +808,19 @@ function getAuthConfig(target) {
                         httpsAgentOptions: target.httpsAgentOptions,
                         serverType: target.serverType
                     });
+                    tokens = void 0;
                     if (!auth_1.isRefreshTokenExpiring(refresh_token)) return [3 /*break*/, 4];
                     return [4 /*yield*/, auth_1.getNewAccessToken(sasjs, client, secret, target)];
                 case 3:
-                    authConfig = _e.sent();
+                    tokens = _e.sent();
                     return [3 /*break*/, 6];
                 case 4: return [4 /*yield*/, auth_1.refreshTokens(sasjs, client, secret, refresh_token)];
                 case 5:
-                    authConfig = _e.sent();
+                    tokens = _e.sent();
                     _e.label = 6;
                 case 6:
-                    access_token = (authConfig === null || authConfig === void 0 ? void 0 : authConfig.access_token) || access_token;
-                    refresh_token = (authConfig === null || authConfig === void 0 ? void 0 : authConfig.refresh_token) || refresh_token;
+                    access_token = (tokens === null || tokens === void 0 ? void 0 : tokens.access_token) || access_token;
+                    refresh_token = (tokens === null || tokens === void 0 ? void 0 : tokens.refresh_token) || refresh_token;
                     _e.label = 7;
                 case 7: return [2 /*return*/, {
                         access_token: access_token,
@@ -852,7 +850,7 @@ exports.getAuthConfig = getAuthConfig;
 function getAccessToken(target, checkIfExpiring) {
     if (checkIfExpiring === void 0) { checkIfExpiring = true; }
     return __awaiter(this, void 0, void 0, function () {
-        var accessToken, sasjs, client, secret, refreshToken, authConfig;
+        var accessToken, sasjs, client, secret, refreshToken, tokens;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -907,18 +905,18 @@ function getAccessToken(target, checkIfExpiring) {
                             (refreshToken.trim() === 'null' || refreshToken.trim() === 'undefined')
                             ? undefined
                             : refreshToken;
-                    authConfig = void 0;
+                    tokens = void 0;
                     if (!auth_1.isRefreshTokenExpiring(refreshToken)) return [3 /*break*/, 4];
                     return [4 /*yield*/, auth_1.getNewAccessToken(sasjs, client, secret, target)];
                 case 3:
-                    authConfig = _a.sent();
+                    tokens = _a.sent();
                     return [3 /*break*/, 6];
                 case 4: return [4 /*yield*/, auth_1.refreshTokens(sasjs, client, secret, refreshToken)];
                 case 5:
-                    authConfig = _a.sent();
+                    tokens = _a.sent();
                     _a.label = 6;
                 case 6:
-                    accessToken = authConfig === null || authConfig === void 0 ? void 0 : authConfig.access_token;
+                    accessToken = tokens === null || tokens === void 0 ? void 0 : tokens.access_token;
                     _a.label = 7;
                 case 7: return [2 /*return*/, accessToken];
             }

package/build/utils/file.d.ts

@@ -4,12 +4,6 @@ export function isSasFile(filePath: any): boolean;
 export function isJsonFile(filePath: any): boolean;
 export function isCsvFile(filePath: any): boolean;
 export function isShellScript(filePath: any): boolean;
-/**
- * Gets a list of @li items from the supplied file content with the specified header.
- * @param {string} listHeader - the header of the section to look for - e.g. <h4> SAS Macros </h4>.
- * @param {string} fileContent - the text content of the file.
- */
-export function getList(listHeader: string, fileContent: string): any[];
 export function getBrief(fileContent: any): any;
 export function getRelativePath(from: any, to: any): any[];
 export function saveToDefaultLocation(filePath: any, data: any): Promise<{

package/build/utils/file.js

@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sasFileRegExp = exports.saveToDefaultLocation = exports.getRelativePath = exports.getBrief = exports.getList = exports.sanitizeFileName = exports.isShellScript = exports.isCsvFile = exports.isJsonFile = exports.isSasFile = exports.unifyFilePath = exports.createFolderStructure = void 0;
+exports.sasFileRegExp = exports.saveToDefaultLocation = exports.getRelativePath = exports.getBrief = exports.sanitizeFileName = exports.isShellScript = exports.isCsvFile = exports.isJsonFile = exports.isSasFile = exports.unifyFilePath = exports.createFolderStructure = void 0;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var config_1 = require("./config");
@@ -129,48 +129,6 @@ var sanitizeFileName = function (fileName) {
     return fileName.replace(/[^a-z0-9]/gi, '_');
 };
 exports.sanitizeFileName = sanitizeFileName;
-/**
- * Gets a list of @li items from the supplied file content with the specified header.
- * @param {string} listHeader - the header of the section to look for - e.g. <h4> SAS Macros </h4>.
- * @param {string} fileContent - the text content of the file.
- */
-function getList(listHeader, fileContent) {
-    var _a;
-    var fileHeader;
-    try {
-        var hasFileHeader = fileContent.split('/**')[0] !== fileContent;
-        if (!hasFileHeader)
-            return [];
-        fileHeader = fileContent.split('/**')[1].split('**/')[0];
-    }
-    catch (e) {
-        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('File header parse error.\nPlease make sure your file header is in the correct format.');
-    }
-    var list = [];
-    var lines = fileHeader.split('\n').map(function (s) { return (s ? s.trim() : s); });
-    var startIndex = null;
-    var endIndex = null;
-    for (var i = 0; i < lines.length; i++) {
-        if (new RegExp(listHeader, 'i').test(lines[i])) {
-            startIndex = i + 1;
-            break;
-        }
-    }
-    for (var i = startIndex; i < lines.length; i++) {
-        if (!lines[i]) {
-            endIndex = i;
-            break;
-        }
-    }
-    for (var i = startIndex; i < endIndex; i++) {
-        list.push(lines[i]);
-    }
-    return list
-        .filter(function (l) { return l.startsWith('@li'); })
-        .map(function (d) { return d.replace(/\@li/g, ''); })
-        .map(function (d) { return d.trim(); });
-}
-exports.getList = getList;
 function getBrief(fileContent) {
     var fileHeader;
     try {

package/build/utils/setConstants.js

@@ -43,7 +43,7 @@ exports.setConstants = exports.contextName = void 0;
 var path_1 = __importDefault(require("path"));
 var get_installed_path_1 = require("get-installed-path");
 var config_1 = require("./config");
-var utils_1 = require("./utils");
+var utils_1 = require("@sasjs/utils");
 exports.contextName = 'sasjs cli compute context';
 var setConstants = function () { return __awaiter(void 0, void 0, void 0, function () {
     var _a, configuration, isLocal, buildOutputFolder, buildResultsFolder, homeDir, getMacroCoreGlobalPath, buildSourceFolder, buildSourceDbFolder, buildDestinationFolder, buildDestinationServicesFolder, buildDestinationTestFolder, buildDestinationJobsFolder, buildDestinationDbFolder, buildDestinationDocsFolder, macroCorePath, _b, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError;

package/build/utils/spec/utils.spec.js

@@ -235,11 +235,11 @@ describe('utils', function () {
     describe('chunk', function () {
         it('should return an array with only one element that is equal to text itself if text size is less than max length', function () {
             var txt = '0B0pFTOzHXyRuikRydwnd8uQdwvITllwNOX20vQLsT0JgkXa1W';
-            expect(utils_1.chunk(txt)[0]).toBe(txt);
+            expect(utils_2.chunk(txt)[0]).toBe(txt);
         });
         it('should return an array with 3 elements', function () {
             var txt = 'SGmqg3pnHCJn0iPQC4Rd9AnFS3k5V7dDc81GlF6lCCurmsEJq7VS\nig42yjxerV7OAjE1HIOgJZXqID30\nkaVJsCwWrtFEIL8mQepjp4zLGeCaWk7ymu9BqolSnqA3udaiWuHcm6m80E36mWYWU0lITAgdp1QzVwIczpopXRaUWtJamiPnHyflksdNEXkboKlAT5RuR795ShUOc6KajQZ1qH2ZGJPV2DxjEqtXA9uvNbpisOVY6MpRdEzWNgdDsXlfuXkrBk5RqA7PkdtjBtNHA7JtEklTnYKrOdge03qFXKjh';
-            expect(utils_1.chunk(txt)).toBeArrayOfSize(3);
+            expect(utils_2.chunk(txt)).toBeArrayOfSize(3);
         });
     });
     describe('arrToObj', function () {
@@ -307,18 +307,18 @@ describe('utils', function () {
             var relativePath = './my-path/xyz';
             var pathRelativeTo = '/home/abc';
             var expectedAbsolutePath = ['', 'home', 'abc', 'my-path', 'xyz'].join(path_1.default.sep);
-            expect(utils_1.getAbsolutePath(relativePath, pathRelativeTo)).toEqual(expectedAbsolutePath);
+            expect(utils_2.getAbsolutePath(relativePath, pathRelativeTo)).toEqual(expectedAbsolutePath);
         });
         it('should convert tilde from absolute path', function () {
             var relativePath = '~/my-path/xyz';
             var expectedAbsolutePath = homedir + ['', 'my-path', 'xyz'].join(path_1.default.sep);
-            expect(utils_1.getAbsolutePath(relativePath, '')).toEqual(expectedAbsolutePath);
+            expect(utils_2.getAbsolutePath(relativePath, '')).toEqual(expectedAbsolutePath);
         });
         it('should return same path if path is absolute', function () {
             var absolutePath = '/my-path/xyz';
             var pathRelativeTo = '/home/abc';
             var expectedAbsolutePath = ['', 'my-path', 'xyz'].join(path_1.default.sep);
-            expect(utils_1.getAbsolutePath(absolutePath, pathRelativeTo)).toEqual(expectedAbsolutePath);
+            expect(utils_2.getAbsolutePath(absolutePath, pathRelativeTo)).toEqual(expectedAbsolutePath);
         });
     });
     describe('loadEnvVariables', function () {
@@ -359,4 +359,30 @@ describe('utils', function () {
             });
         }); });
     });
+    describe('createReactApp', function () {
+        it('should create React app', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var reactFolder, reactFolderPath, sasjsFolderPath;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        reactFolder = 'react-seed-app';
+                        reactFolderPath = path_1.default.join(__dirname, reactFolder);
+                        sasjsFolderPath = path_1.default.join(reactFolderPath, 'sasjs');
+                        return [4 /*yield*/, utils_2.createFolder(reactFolderPath)];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, expect(utils_1.createReactApp(reactFolderPath)).toResolve()];
+                    case 2:
+                        _a.sent();
+                        return [4 /*yield*/, expect(utils_2.folderExists(sasjsFolderPath)).resolves.toEqual(true)];
+                    case 3:
+                        _a.sent();
+                        return [4 /*yield*/, utils_2.deleteFolder(reactFolderPath)];
+                    case 4:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        }); }, 600000);
+    });
 });

package/build/utils/utils.d.ts

@@ -18,7 +18,6 @@ export declare function setupDoxygen(folderPath: string): Promise<void>;
 export declare function removeComments(text: string): string;
 export declare function getUniqServicesObj(services: string[]): any;
 export declare function executeShellScript(filePath: string, logFilePath: string): Promise<unknown>;
-export declare function chunk(text: string, maxLength?: number): string[];
 /**
  * Extracts plain text job log from fetched json log
  * @param {object} logJson
@@ -33,7 +32,6 @@ export declare const millisecondsToDdHhMmSs: (milliseconds: number) => string;
 export declare function checkNodeVersion(): void;
 export declare function getAdapterInstance(target: Target): SASjs;
 export declare function displaySasjsRunnerError(username: string): void;
-export declare const getAbsolutePath: (providedPath: string, relativePath: string) => string;
 export declare const loadEnvVariables: (fileName: string) => Promise<void>;
 export declare function prefixAppLoc(appLoc?: string, path?: string): string | null;
 export declare const isWindows: () => boolean;

package/build/utils/utils.js

@@ -82,10 +82,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.terminateProcess = exports.isWindows = exports.prefixAppLoc = exports.loadEnvVariables = exports.getAbsolutePath = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.chunk = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
+exports.terminateProcess = exports.isWindows = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
 var shelljs_1 = __importDefault(require("shelljs"));
 var path_1 = __importDefault(require("path"));
-var os_1 = __importDefault(require("os"));
 var ora_1 = __importDefault(require("ora"));
 var utils_1 = require("@sasjs/utils");
 var node_1 = __importDefault(require("@sasjs/adapter/node"));
@@ -187,11 +186,7 @@ function createApp(folderPath, repoUrl, installDependencies) {
     if (installDependencies === void 0) { installDependencies = true; }
     var spinner = ora_1.default("Creating SASjs project in " + folderPath + ".");
     spinner.start();
-    var gitBranch = repoUrl.includes('template_sasonly')
-        ? 'master'
-        : repoUrl.includes('template_jobs')
-            ? 'master'
-            : 'main';
+    var gitBranch = repoUrl.includes('template_sasonly') ? 'master' : 'main';
     shelljs_1.default.exec("cd \"" + folderPath + "\" && git clone --depth 1 -b " + gitBranch + " " + repoUrl + " .", { silent: true });
     shelljs_1.default.rm('-rf', path_1.default.join(folderPath, '.git'));
     spinner.stop();
@@ -438,14 +433,6 @@ function executeShellScript(filePath, logFilePath) {
     });
 }
 exports.executeShellScript = executeShellScript;
-function chunk(text, maxLength) {
-    if (maxLength === void 0) { maxLength = 220; }
-    if (text.length <= maxLength) {
-        return [text];
-    }
-    return (text.match(new RegExp('.{1,' + maxLength + '}', 'g')) || []).filter(function (m) { return !!m; });
-}
-exports.chunk = chunk;
 /**
  * Extracts plain text job log from fetched json log
  * @param {object} logJson
@@ -526,12 +513,6 @@ function displaySasjsRunnerError(username) {
     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Please deploy the SASjs runner by running the code below and try again:\n" + sasjsRunnerCode);
 }
 exports.displaySasjsRunnerError = displaySasjsRunnerError;
-var getAbsolutePath = function (providedPath, relativePath) {
-    return path_1.default.isAbsolute(providedPath) || /^~/.exec(providedPath)
-        ? path_1.default.normalize(providedPath.replace(/^~/, os_1.default.homedir()))
-        : path_1.default.join(relativePath, providedPath);
-};
-exports.getAbsolutePath = getAbsolutePath;
 var loadEnvVariables = function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
     var envFileExistsInCurrentPath, envFileExistsInParentPath, envFilePath;
     return __generator(this, function (_a) {

package/package.json

@@ -19,7 +19,8 @@
     "test:mocked": "jest --silent --runInBand --config=jest.config.js --coverage",
     "semantic-release": "semantic-release -d",
     "lint:fix": "npx prettier --write \"{src,test}/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
-    "lint": "npx prettier --check \"{src,test}/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\""
+    "lint": "npx prettier --check \"{src,test}/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
+    "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true"
   },
   "release": {
     "branches": [
@@ -47,16 +48,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "config": {
-    "ghooks": {
-      "commit-msg": "validate-commit-msg"
-    }
-  },
   "dependencies": {
-    "@sasjs/adapter": "3.0.0",
-    "@sasjs/core": "2.45.2",
+    "@sasjs/adapter": "3.3.0",
+    "@sasjs/core": "2.54.1",
     "@sasjs/lint": "1.11.2",
-    "@sasjs/utils": "2.33.1",
+    "@sasjs/utils": "2.34.1",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
     "dotenv": "10.0.0",
@@ -90,9 +86,8 @@
     "@types/xml": "1.0.6",
     "babel-jest": "27.2.4",
     "copyfiles": "2.4.1",
-    "ghooks": "2.0.4",
     "jest": "27.2.4",
-    "jest-cli": "27.2.4",
+    "jest-cli": "27.3.1",
     "jest-extended": "1.1.0",
     "nodemon": "2.0.13",
     "semantic-release": "17.4.7",
@@ -100,8 +95,7 @@
     "ts-node": "10.2.1",
     "tslib": "2.3.1",
     "typescript": "4.3.5",
-    "util": "0.12.4",
-    "validate-commit-msg": "1.1.3"
+    "util": "0.12.4"
   },
-  "version": "3.0.2"
+  "version": "3.2.0"
 }

package/CHANGELOG.md

@@ -1,30 +0,0 @@
-# Change Log
-
-Since March 7th, 2020, the changelog is managed by github releases.  See [https://github.com/sasjs/cli/releases](https://github.com/sasjs/cli/releases).
-
-## Changes Prior to March 7th 2020
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
-<a name="1.0.4"></a>
-## [1.0.4](https://gitlab.com/macropeople/sasjs-cli/compare/v1.0.3...v1.0.4) (2020-03-07)
-
-
-### Bug Fixes
-
-* redo comment stripping logic ([84a1a91](https://gitlab.com/macropeople/sasjs-cli/commit/84a1a91))
-
-
-
-<a name="1.0.3"></a>
-## [1.0.3](https://gitlab.com/macropeople/sasjs-cli/compare/v1.0.2...v1.0.3) (2020-03-07)
-
-
-
-<a name="1.0.2"></a>
-## [1.0.2](https://gitlab.com/macropeople/sasjs-cli/compare/v1.0.1...v1.0.2) (2020-03-07)
-
-
-
-<a name="1.0.1"></a>
-## 1.0.1 (2020-03-07)

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

@@ -1,25 +0,0 @@
-import { Target } from '@sasjs/utils/types';
-export declare const getServiceInit: (target: Target) => Promise<{
-    content: string;
-    filePath: string;
-}>;
-export declare const getServiceTerm: (target: Target) => Promise<{
-    content: string;
-    filePath: string;
-}>;
-export declare const getJobInit: (target: Target) => Promise<{
-    content: string;
-    filePath: string;
-}>;
-export declare const getJobTerm: (target: Target) => Promise<{
-    content: string;
-    filePath: string;
-}>;
-export declare const getTestInit: (target: Target) => Promise<{
-    content: string;
-    filePath: string;
-}>;
-export declare const getTestTerm: (target: Target) => Promise<{
-    content: string;
-    filePath: string;
-}>;