@sasjs/cli 3.25.0 → 3.27.0

package/build/commands/init/init.d.ts

@@ -1 +1,7 @@
 export declare function init(): Promise<void>;
+/**
+ * Creates a SASjs configuration file.
+ * Its name will be of the form 'sasjsconfig.json'
+ * @param {string} parentFolderName- the name of the project folder.
+ */
+export declare const createConfigFile: (parentFolderName: string) => Promise<void>;

package/build/commands/init/init.js

@@ -39,11 +39,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = void 0;
+exports.createConfigFile = exports.init = void 0;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("../../utils/utils");
 var utils_2 = require("@sasjs/utils");
-var createConfigFile_1 = require("../shared/createConfigFile");
 var createLintConfigFile_1 = require("../shared/createLintConfigFile");
 function init() {
     var _a;
@@ -63,7 +62,7 @@ function init() {
                     return [4 /*yield*/, (0, utils_1.setupDoxygen)(parentFolderName)];
                 case 3:
                     _b.sent();
-                    return [4 /*yield*/, (0, createConfigFile_1.createConfigFile)(parentFolderName)];
+                    return [4 /*yield*/, (0, exports.createConfigFile)(parentFolderName)];
                 case 4:
                     _b.sent();
                     lintConfigPath = path_1.default.join(process.projectDir, parentFolderName, '.sasjslint');
@@ -80,3 +79,35 @@ function init() {
     });
 }
 exports.init = init;
+/**
+ * Creates a SASjs configuration file.
+ * Its name will be of the form 'sasjsconfig.json'
+ * @param {string} parentFolderName- the name of the project folder.
+ */
+var createConfigFile = function (parentFolderName) { return __awaiter(void 0, void 0, void 0, function () {
+    var config, configDestinationPath;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                config = {
+                    $schema: 'https://cli.sasjs.io/sasjsconfig-schema.json',
+                    macroFolders: ['sasjs/macros'],
+                    defaultTarget: 'mytarget',
+                    targets: [
+                        {
+                            name: 'mytarget',
+                            serverType: 'SASJS',
+                            serverUrl: ' ',
+                            appLoc: '/Public/apps/myapp'
+                        }
+                    ]
+                };
+                configDestinationPath = path_1.default.join(process.projectDir, parentFolderName, 'sasjs', 'sasjsconfig.json');
+                return [4 /*yield*/, (0, utils_2.createFile)(configDestinationPath, JSON.stringify(config, null, 2))];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.createConfigFile = createConfigFile;

package/build/commands/init/spec/init.spec.js

@@ -148,8 +148,8 @@ var verifyInit = function () { return __awaiter(void 0, void 0, void 0, function
                 return [4 /*yield*/, (0, utils_1.readFile)(gitIgnoreFilePath)];
             case 2:
                 gitIgnoreContent = _a.sent();
-                expect(gitIgnoreContent.match(/^sasjsbuild\//gm).length).toEqual(1);
-                expect(gitIgnoreContent.match(/^node_modules\//gm).length).toEqual(1);
+                expect(gitIgnoreContent.match(/^sasjsbuild/gm).length).toEqual(1);
+                expect(gitIgnoreContent.match(/^node_modules/gm).length).toEqual(1);
                 return [2 /*return*/];
         }
     });

package/build/commands/shared/deployToSasViyaWithServicePack.js

@@ -42,7 +42,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployToSasViyaWithServicePack = void 0;
 var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var utils_1 = require("@sasjs/utils");
-var js_base64_1 = require("js-base64");
 var utils_2 = require("../../utils");
 function deployToSasViyaWithServicePack(jsonFilePath, target, isLocal, isForced) {
     if (isForced === void 0) { isForced = false; }
@@ -91,7 +90,7 @@ var populateCodeInServicePack = function (json) {
     var _a;
     return (_a = json === null || json === void 0 ? void 0 : json.members) === null || _a === void 0 ? void 0 : _a.forEach(function (member) {
         if (member.type === utils_1.MemberType.file)
-            member.code = (0, js_base64_1.decode)(member.code);
+            member.code = Buffer.from(member.code, 'base64');
         if (member.type === utils_1.MemberType.folder)
             populateCodeInServicePack(member);
     });

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

@@ -1,4 +1,5 @@
 import { JSDOM } from 'jsdom';
+export declare const getSasjsTags: (parsedHtml: JSDOM) => Element[];
 export declare const getScriptTags: (parsedHtml: JSDOM) => HTMLScriptElement[];
 export declare const getStyleInPageTags: (parsedHtml: JSDOM) => HTMLStyleElement[];
 export declare const getStyleTags: (parsedHtml: JSDOM) => HTMLLinkElement[];

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

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSourceTags = exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getStyleInPageTags = exports.getScriptTags = void 0;
+exports.getSourceTags = exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getStyleInPageTags = exports.getScriptTags = exports.getSasjsTags = void 0;
+var getSasjsTags = function (parsedHtml) {
+    return Array.from(parsedHtml.window.document.getElementsByTagName('sasjs'));
+};
+exports.getSasjsTags = getSasjsTags;
 var getScriptTags = function (parsedHtml) {
     return Array.from(parsedHtml.window.document.getElementsByTagName('script'));
 };

package/build/commands/web/internal/spec/updateSasjstag.spec.d.ts

@@ -0,0 +1,4 @@
+/**
+ * @jest-environment jsdom
+ */
+export {};

package/build/commands/web/internal/spec/updateSasjstag.spec.js

@@ -0,0 +1,61 @@
+"use strict";
+/**
+ * @jest-environment jsdom
+ */
+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 });
+var utils_1 = require("@sasjs/utils");
+var updateSasjsTag_1 = require("../updateSasjsTag");
+describe('updateSasjsTag', function () {
+    it("should update links in js script", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var target, tag;
+        return __generator(this, function (_a) {
+            target = {
+                serverType: utils_1.ServerType.Sasjs,
+                appLoc: '/public/app/test'
+            };
+            tag = document.createElement('sasjs');
+            tag.setAttribute('appLoc', 'need/to/update');
+            tag.setAttribute('serverType', 'sas');
+            (0, updateSasjsTag_1.updateSasjsTag)(tag, target);
+            expect(tag.getAttribute('appLoc')).toEqual('/public/app/test');
+            expect(tag.getAttribute('serverType')).toEqual(utils_1.ServerType.Sasjs);
+            return [2 /*return*/];
+        });
+    }); });
+});

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

@@ -1,5 +1,5 @@
 import { JSDOM } from 'jsdom';
-import { ServerType } from '@sasjs/utils';
+import { ServerType, Target } from '@sasjs/utils';
 import { AssetPathMap } from './createAssetServices';
 interface paramsType {
     webSourcePathFull: string;
@@ -12,5 +12,5 @@ interface paramsType {
  * Also updates contents to update included asset references
  * @param {JSDOM} parsedHtml- DOMWindow for index.html
  */
-export declare const updateAllTags: (parsedHtml: JSDOM, { webSourcePathFull, destinationPath, serverType, assetPathMap }: paramsType) => Promise<void>;
+export declare const updateAllTags: (parsedHtml: JSDOM, target: Target, { webSourcePathFull, destinationPath, serverType, assetPathMap }: paramsType) => Promise<void>;
 export {};

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

@@ -67,19 +67,24 @@ var getTags_1 = require("./getTags");
 var updateScriptTag_1 = require("./updateScriptTag");
 var updateLinkTag_1 = require("./updateLinkTag");
 var updateStyleTag_1 = require("./updateStyleTag");
+var updateSasjsTag_1 = require("./updateSasjsTag");
 /**
  * Updates HTML Tags with correct link.
  * Also updates contents to update included asset references
  * @param {JSDOM} parsedHtml- DOMWindow for index.html
  */
-var updateAllTags = function (parsedHtml, _a) {
+var updateAllTags = function (parsedHtml, target, _a) {
     var webSourcePathFull = _a.webSourcePathFull, destinationPath = _a.destinationPath, serverType = _a.serverType, assetPathMap = _a.assetPathMap;
     return __awaiter(void 0, void 0, void 0, function () {
-        var assetsNotFound, scriptTags, styleExternalTags, styleInPageTags, styleTags, faviconTags, imgTags, sourceTags, srcTags, notFoundErrors;
+        var assetsNotFound, sasjsTags, scriptTags, styleExternalTags, styleInPageTags, styleTags, faviconTags, imgTags, sourceTags, srcTags, notFoundErrors;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     assetsNotFound = [];
+                    sasjsTags = (0, getTags_1.getSasjsTags)(parsedHtml);
+                    if (sasjsTags.length) {
+                        (0, updateSasjsTag_1.updateSasjsTag)(sasjsTags[0], target);
+                    }
                     scriptTags = (0, getTags_1.getScriptTags)(parsedHtml);
                     return [4 /*yield*/, (0, utils_1.asyncForEach)(scriptTags, function (tag) { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {

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

@@ -0,0 +1,5 @@
+import { Target } from '@sasjs/utils';
+/**
+ * Updates sasjs adapter's config in index.html if present.
+ */
+export declare const updateSasjsTag: (tag: Element, target: Target) => void;

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateSasjsTag = void 0;
+/**
+ * Updates sasjs adapter's config in index.html if present.
+ */
+var updateSasjsTag = function (tag, target) {
+    tag.setAttribute('appLoc', target.appLoc);
+    tag.setAttribute('serverType', target.serverType);
+};
+exports.updateSasjsTag = updateSasjsTag;

package/build/commands/web/web.js

@@ -98,7 +98,7 @@ function createWebAppServices(target) {
                     return [4 /*yield*/, (0, utils_1.readFile)(indexHtmlPath).then(function (content) { return new jsdom_1.default.JSDOM(content); })];
                 case 8:
                     indexHtml = _e.sent();
-                    return [4 /*yield*/, (0, updateAllTags_1.updateAllTags)(indexHtml, {
+                    return [4 /*yield*/, (0, updateAllTags_1.updateAllTags)(indexHtml, target, {
                             webSourcePathFull: webSourcePathFull,
                             destinationPath: destinationPath,
                             serverType: target.serverType,

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

@@ -182,7 +182,7 @@ describe('utils', function () {
                         return [4 /*yield*/, (0, utils_2.readFile)(gitFilePath)];
                     case 3:
                         gitIgnoreContent = _a.sent();
-                        expect(gitIgnoreContent.includes('sasjsbuild/')).toEqual(true);
+                        expect(gitIgnoreContent.includes('sasjsbuild')).toEqual(true);
                         return [4 /*yield*/, (0, utils_2.deleteFile)(gitFilePath)];
                     case 4:
                         _a.sent();
@@ -202,7 +202,7 @@ describe('utils', function () {
                         return [4 /*yield*/, expect((0, utils_1.setupGitIgnore)(folderPath)).toResolve()];
                     case 2:
                         _a.sent();
-                        regExp = new RegExp("^node_modules/\nsasjsbuild/\n", 'gm');
+                        regExp = new RegExp("^node_modules/\nsasjsbuild\n", 'gm');
                         return [4 /*yield*/, (0, utils_2.readFile)(gitFilePath)];
                     case 3:
                         gitIgnoreContent = _a.sent();
@@ -221,7 +221,7 @@ describe('utils', function () {
                         return [4 /*yield*/, expect((0, utils_1.setupGitIgnore)(folderPath)).toResolve()];
                     case 2:
                         _a.sent();
-                        regExp = new RegExp("^sasjsbuild/", 'gm');
+                        regExp = new RegExp("^sasjsbuild", 'gm');
                         expect(gitIgnoreContent.match(regExp)).toBeTruthy();
                         expect(gitIgnoreContent.match(regExp).length).toEqual(1);
                         return [4 /*yield*/, (0, utils_2.deleteFile)(gitFilePath)];

package/build/utils/utils.js

@@ -295,7 +295,7 @@ function setupNpmProject(folderName) {
                     var _a, _b, _c;
                     return __generator(this, function (_d) {
                         switch (_d.label) {
-                            case 0: return [4 /*yield*/, inExistingProject(folderPath)];
+                            case 0: return [4 /*yield*/, inExistingProject(folderName)];
                             case 1:
                                 isExistingProject = _d.sent();
                                 if (!isExistingProject) {
@@ -322,7 +322,7 @@ exports.setupNpmProject = setupNpmProject;
 function setupGitIgnore(folderName) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var gitIgnoreFilePath, gitIgnoreExists, gitIgnoreContent, newgitIgnoreContent, regExpSasjsBuild, regExpSasjsResults, regExpNodeModules;
+        var gitIgnoreFilePath, gitIgnoreExists, gitIgnoreContent, newgitIgnoreContent, regExpSasjsBuild, regExpSasjsResults, regExpNodeModules, regExpEnv;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -335,18 +335,27 @@ function setupGitIgnore(folderName) {
                 case 2:
                     gitIgnoreContent = _c.sent();
                     newgitIgnoreContent = gitIgnoreContent;
-                    regExpSasjsBuild = new RegExp("^sasjsbuild/", 'gm');
-                    newgitIgnoreContent = newgitIgnoreContent.match(regExpSasjsBuild)
-                        ? newgitIgnoreContent
-                        : "".concat(newgitIgnoreContent ? newgitIgnoreContent + '\n' : '', "sasjsbuild/\n");
-                    regExpSasjsResults = new RegExp("^sasjsresults/", 'gm');
-                    newgitIgnoreContent = newgitIgnoreContent.match(regExpSasjsResults)
-                        ? newgitIgnoreContent
-                        : "".concat(newgitIgnoreContent ? newgitIgnoreContent + '\n' : '', "sasjsresults/\n");
-                    regExpNodeModules = new RegExp("^node_modules/", 'gm');
-                    newgitIgnoreContent = newgitIgnoreContent.match(regExpNodeModules)
-                        ? newgitIgnoreContent
-                        : "".concat(newgitIgnoreContent + '\n', "node_modules/\n");
+                    regExpSasjsBuild = new RegExp("^sasjsbuild", 'gm');
+                    regExpSasjsResults = new RegExp("^sasjsresults", 'gm');
+                    regExpNodeModules = new RegExp("^node_modules", 'gm');
+                    regExpEnv = new RegExp("^.env*", 'gm');
+                    if (newgitIgnoreContent) {
+                        if (!regExpSasjsBuild.test(newgitIgnoreContent)) {
+                            newgitIgnoreContent += '\nsasjsbuild';
+                        }
+                        if (!regExpSasjsResults.test(newgitIgnoreContent)) {
+                            newgitIgnoreContent += '\nsasjsresults';
+                        }
+                        if (!regExpNodeModules.test(newgitIgnoreContent)) {
+                            newgitIgnoreContent += '\nnode_modules';
+                        }
+                        if (!regExpEnv.test(newgitIgnoreContent)) {
+                            newgitIgnoreContent += '\n.env*';
+                        }
+                    }
+                    else {
+                        newgitIgnoreContent = 'node_modules\nsasjsbuild\nsasjsresults\n.env*\n';
+                    }
                     if (!(gitIgnoreContent !== newgitIgnoreContent)) return [3 /*break*/, 4];
                     return [4 /*yield*/, (0, utils_1.createFile)(gitIgnoreFilePath, newgitIgnoreContent)];
                 case 3:
@@ -354,7 +363,7 @@ function setupGitIgnore(folderName) {
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success('Existing .gitignore has been updated.');
                     _c.label = 4;
                 case 4: return [3 /*break*/, 7];
-                case 5: return [4 /*yield*/, (0, utils_1.createFile)(gitIgnoreFilePath, 'node_modules/\nsasjsbuild/\nsasjsresults/\n.env*\n')];
+                case 5: return [4 /*yield*/, (0, utils_1.createFile)(gitIgnoreFilePath, 'node_modules\nsasjsbuild\nsasjsresults\n.env*\n')];
                 case 6:
                     _c.sent();
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.success('.gitignore file has been created.');

package/package.json

@@ -52,7 +52,7 @@
   "dependencies": {
     "@sasjs/adapter": "4.1.0",
     "@sasjs/core": "4.45.4",
-    "@sasjs/lint": "2.1.3",
+    "@sasjs/lint": "2.2.0",
     "@sasjs/utils": "2.52.0",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
@@ -101,5 +101,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.25.0"
+  "version": "3.27.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)