@sasjs/cli 3.0.3 → 3.3.0

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

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateLinkTag = void 0;
+var updateLinkTag = function (linkTag, assetPathMap, tagType) {
+    if (tagType === void 0) { tagType = 'link'; }
+    var linkSourcePath = tagType === 'link'
+        ? linkTag.getAttribute('href')
+        : linkTag.getAttribute('src');
+    if (!linkSourcePath)
+        return;
+    var isUrl = linkSourcePath.startsWith('http') || linkSourcePath.startsWith('//');
+    if (isUrl)
+        return;
+    var assetPath = assetPathMap.find(function (entry) {
+        return entry.source === linkSourcePath || "./" + entry.source === linkSourcePath;
+    });
+    if (!(assetPath === null || assetPath === void 0 ? void 0 : assetPath.target)) {
+        throw new Error("Unable to find file: " + linkSourcePath);
+    }
+    tagType === 'link'
+        ? linkTag.setAttribute('href', assetPath.target)
+        : linkTag.setAttribute('src', assetPath.target);
+};
+exports.updateLinkTag = updateLinkTag;

package/build/utils/auth.d.ts

@@ -1,6 +1,6 @@
-import { SasAuthResponse, Target } from '@sasjs/utils';
+import { ServerType, Target } from '@sasjs/utils';
 import SASjs from '@sasjs/adapter/node';
-export declare function getAuthUrl(serverUrl: string, clientId: string): string;
+export declare const getAuthUrl: (serverType: ServerType, serverUrl: string, clientId: string) => string;
 export declare function getAuthCode(authUrl: string): Promise<string>;
 /**
  * Checks if the Access Token is expired or is expiring in 1 hour.  A default Access Token
@@ -18,5 +18,11 @@ export declare function isAccessTokenExpiring(token: string): boolean;
  * @param {string} token- token string that will be evaluated
  */
 export declare function isRefreshTokenExpiring(token?: string): boolean;
-export declare function refreshTokens(sasjsInstance: SASjs, clientId: string, clientSecret: string, refreshToken: string): Promise<SasAuthResponse>;
-export declare function getNewAccessToken(sasjsInstance: SASjs, clientId: string, clientSecret: string, target: Target): Promise<SasAuthResponse>;
+export declare function refreshTokens(sasjsInstance: SASjs, clientId: string, clientSecret: string, refreshToken: string): Promise<{
+    access_token: string;
+    refresh_token: string;
+}>;
+export declare function getNewAccessToken(sasjsInstance: SASjs, clientId: string, clientSecret: string, target: Target): Promise<{
+    access_token: string;
+    refresh_token: string;
+}>;

package/build/utils/auth.js

@@ -42,9 +42,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNewAccessToken = exports.refreshTokens = exports.isRefreshTokenExpiring = exports.isAccessTokenExpiring = exports.getAuthCode = exports.getAuthUrl = void 0;
 var utils_1 = require("@sasjs/utils");
 var jwt_decode_1 = __importDefault(require("jwt-decode"));
-function getAuthUrl(serverUrl, clientId) {
-    return serverUrl + "/SASLogon/oauth/authorize?client_id=" + clientId + "&response_type=code";
-}
+var getAuthUrl = function (serverType, serverUrl, clientId) {
+    return serverType === utils_1.ServerType.Sasjs
+        ? serverUrl + "/#/SASjsLogon?client_id=" + clientId + "&response_type=code"
+        : serverUrl + "/SASLogon/oauth/authorize?client_id=" + clientId + "&response_type=code";
+};
 exports.getAuthUrl = getAuthUrl;
 function getAuthCode(authUrl) {
     return __awaiter(this, void 0, void 0, function () {
@@ -100,13 +102,13 @@ function isRefreshTokenExpiring(token) {
 exports.isRefreshTokenExpiring = isRefreshTokenExpiring;
 function refreshTokens(sasjsInstance, clientId, clientSecret, refreshToken) {
     return __awaiter(this, void 0, void 0, function () {
-        var authResponse;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var _a, access_token, refresh_token;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0: return [4 /*yield*/, sasjsInstance.refreshTokens(clientId, clientSecret, refreshToken)];
                 case 1:
-                    authResponse = _a.sent();
-                    return [2 /*return*/, authResponse];
+                    _a = _b.sent(), access_token = _a.access_token, refresh_token = _a.refresh_token;
+                    return [2 /*return*/, { access_token: access_token, refresh_token: refresh_token }];
             }
         });
     });
@@ -114,18 +116,18 @@ function refreshTokens(sasjsInstance, clientId, clientSecret, refreshToken) {
 exports.refreshTokens = refreshTokens;
 function getNewAccessToken(sasjsInstance, clientId, clientSecret, target) {
     return __awaiter(this, void 0, void 0, function () {
-        var authUrl, authCode, authResponse;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var authUrl, authCode, _a, access_token, refresh_token;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    authUrl = getAuthUrl(target.serverUrl, clientId);
+                    authUrl = exports.getAuthUrl(target.serverType, target.serverUrl, clientId);
                     return [4 /*yield*/, getAuthCode(authUrl)];
                 case 1:
-                    authCode = _a.sent();
+                    authCode = _b.sent();
                     return [4 /*yield*/, sasjsInstance.getAccessToken(clientId, clientSecret, authCode)];
                 case 2:
-                    authResponse = _a.sent();
-                    return [2 /*return*/, authResponse];
+                    _a = _b.sent(), access_token = _a.access_token, refresh_token = _a.refresh_token;
+                    return [2 /*return*/, { access_token: access_token, refresh_token: refresh_token }];
             }
         });
     });

package/build/utils/config.d.ts

@@ -51,7 +51,7 @@ export declare function getMacroFolders(target?: Target): Promise<string[]>;
  * @param {Target} target- the target to check stream configuration for.
  */
 export declare function getStreamConfig(target?: Target): Promise<StreamConfig>;
-export declare function getMacroCorePath(): string;
+export declare const getMacroCorePath: () => string;
 /**
  * Sanitizes app location string.
  * @param {string} appLoc - app location

package/build/utils/config.js

@@ -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/utils.js

@@ -186,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();

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,14 +48,9 @@
   "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.34.1",
     "chalk": "4.1.2",
@@ -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.3"
+  "version": "3.3.0"
 }

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

@@ -1,4 +0,0 @@
-export declare const updateLinkHref: (linkTag: HTMLLinkElement, assetPathMap: {
-    source: string;
-    target: string;
-}[]) => void;

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

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateLinkHref = void 0;
-var updateLinkHref = function (linkTag, assetPathMap) {
-    var linkSourcePath = linkTag.getAttribute('href') || '';
-    var isUrl = linkSourcePath.startsWith('http') || linkSourcePath.startsWith('//');
-    if (!isUrl) {
-        var assetPath = assetPathMap.find(function (entry) {
-            return entry.source === linkSourcePath ||
-                "./" + entry.source === linkSourcePath;
-        });
-        if (!(assetPath === null || assetPath === void 0 ? void 0 : assetPath.target)) {
-            throw new Error("Unable to find file: " + linkSourcePath);
-        }
-        linkTag.setAttribute('href', assetPath.target);
-    }
-};
-exports.updateLinkHref = updateLinkHref;