@sasjs/lint 2.4.1 → 2.4.3

package/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwB;AACxB,yCAAsB;AACtB,0CAAuB;AACvB,0CAAuB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB;AACxB,yCAAsB;AACtB,0CAAuB;AACvB,0CAAuB"}

package/lint/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lint/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lint/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA0B;AAC1B,6CAA0B;AAC1B,+CAA4B;AAC5B,gDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lint/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,6CAA0B;AAC1B,+CAA4B;AAC5B,gDAA6B"}

package/lint/lintFile.d.ts

@@ -5,4 +5,4 @@ import { Diagnostic, LintConfig } from '../types';
  * @param {LintConfig} configuration - an optional configuration. When not passed in, this is read from the .sasjslint file.
  * @returns {Promise<Diagnostic[]>} array of diagnostic objects, each containing a warning, line number and column number.
  */
-export declare const lintFile: (filePath: string, configuration?: LintConfig | undefined) => Promise<Diagnostic[]>;
+export declare const lintFile: (filePath: string, configuration?: LintConfig) => Promise<Diagnostic[]>;

package/lint/lintFile.js

@@ -8,89 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lintFile = void 0;
-var file_1 = require("@sasjs/utils/file");
-var utils_1 = require("../utils");
-var shared_1 = require("./shared");
+const file_1 = require("@sasjs/utils/file");
+const utils_1 = require("../utils");
+const shared_1 = require("./shared");
 /**
  * Analyses and produces a set of diagnostics for the file at the given path.
  * @param {string} filePath - the path to the file to be linted.
  * @param {LintConfig} configuration - an optional configuration. When not passed in, this is read from the .sasjslint file.
  * @returns {Promise<Diagnostic[]>} array of diagnostic objects, each containing a warning, line number and column number.
  */
-var lintFile = function (filePath, configuration) { return __awaiter(void 0, void 0, void 0, function () {
-    var config, _a, text, fileDiagnostics, textDiagnostics;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4 /*yield*/, utils_1.isIgnored(filePath, configuration)];
-            case 1:
-                if (_b.sent())
-                    return [2 /*return*/, []];
-                _a = configuration;
-                if (_a) return [3 /*break*/, 3];
-                return [4 /*yield*/, utils_1.getLintConfig()];
-            case 2:
-                _a = (_b.sent());
-                _b.label = 3;
-            case 3:
-                config = _a;
-                return [4 /*yield*/, file_1.readFile(filePath)];
-            case 4:
-                text = _b.sent();
-                fileDiagnostics = shared_1.processFile(filePath, config);
-                textDiagnostics = shared_1.processText(text, config);
-                return [2 /*return*/, __spreadArray(__spreadArray([], __read(fileDiagnostics)), __read(textDiagnostics))];
-        }
-    });
-}); };
+const lintFile = (filePath, configuration) => __awaiter(void 0, void 0, void 0, function* () {
+    if (yield (0, utils_1.isIgnored)(filePath, configuration))
+        return [];
+    const config = configuration || (yield (0, utils_1.getLintConfig)());
+    const text = yield (0, file_1.readFile)(filePath);
+    const fileDiagnostics = (0, shared_1.processFile)(filePath, config);
+    const textDiagnostics = (0, shared_1.processText)(text, config);
+    return [...fileDiagnostics, ...textDiagnostics];
+});
 exports.lintFile = lintFile;
 //# sourceMappingURL=lintFile.js.map

package/lint/lintFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"lintFile.js","sourceRoot":"","sources":["../../src/lint/lintFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA4C;AAE5C,kCAAmD;AACnD,mCAAmD;AAEnD;;;;;GAKG;AACI,IAAM,QAAQ,GAAG,UACtB,QAAgB,EAChB,aAA0B;;;;oBAEtB,qBAAM,iBAAS,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAA;;gBAA5C,IAAI,SAAwC;oBAAE,sBAAO,EAAE,EAAA;gBAExC,KAAA,aAAa,CAAA;wBAAb,wBAAa;gBAAK,qBAAM,qBAAa,EAAE,EAAA;;gBAAtB,KAAA,CAAC,SAAqB,CAAC,CAAA;;;gBAAjD,MAAM,KAA2C;gBAC1C,qBAAM,eAAQ,CAAC,QAAQ,CAAC,EAAA;;gBAA/B,IAAI,GAAG,SAAwB;gBAE/B,eAAe,GAAG,oBAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;gBAC/C,eAAe,GAAG,oBAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBAEjD,6DAAW,eAAe,WAAK,eAAe,IAAC;;;KAChD,CAAA;AAbY,QAAA,QAAQ,YAapB"}
+{"version":3,"file":"lintFile.js","sourceRoot":"","sources":["../../src/lint/lintFile.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA4C;AAE5C,oCAAmD;AACnD,qCAAmD;AAEnD;;;;;GAKG;AACI,MAAM,QAAQ,GAAG,CACtB,QAAgB,EAChB,aAA0B,EACH,EAAE;IACzB,IAAI,MAAM,IAAA,iBAAS,EAAC,QAAQ,EAAE,aAAa,CAAC;QAAE,OAAO,EAAE,CAAA;IAEvD,MAAM,MAAM,GAAG,aAAa,IAAI,CAAC,MAAM,IAAA,qBAAa,GAAE,CAAC,CAAA;IACvD,MAAM,IAAI,GAAG,MAAM,IAAA,eAAQ,EAAC,QAAQ,CAAC,CAAA;IAErC,MAAM,eAAe,GAAG,IAAA,oBAAW,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACrD,MAAM,eAAe,GAAG,IAAA,oBAAW,EAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAEjD,OAAO,CAAC,GAAG,eAAe,EAAE,GAAG,eAAe,CAAC,CAAA;AACjD,CAAC,CAAA,CAAA;AAbY,QAAA,QAAQ,YAapB"}

package/lint/lintFolder.d.ts

@@ -5,4 +5,4 @@ import { Diagnostic, LintConfig } from '../types';
  * @param {LintConfig} configuration - an optional configuration. When not passed in, this is read from the .sasjslint file.
  * @returns {Promise<Map<string, Diagnostic[]>>} Resolves with a map with array of diagnostic objects, each containing a warning, line number and column number, and grouped by file path.
  */
-export declare const lintFolder: (folderPath: string, configuration?: LintConfig | undefined) => Promise<Map<string, Diagnostic[]>>;
+export declare const lintFolder: (folderPath: string, configuration?: LintConfig) => Promise<Map<string, Diagnostic[]>>;

package/lint/lintFolder.js

@@ -8,64 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.lintFolder = void 0;
-var file_1 = require("@sasjs/utils/file");
-var path_1 = __importDefault(require("path"));
-var utils_1 = require("../utils");
-var lintFile_1 = require("./lintFile");
-var excludeFolders = [
+const file_1 = require("@sasjs/utils/file");
+const path_1 = __importDefault(require("path"));
+const utils_1 = require("../utils");
+const lintFile_1 = require("./lintFile");
+const excludeFolders = [
     '.git',
     '.github',
     '.vscode',
@@ -79,66 +31,23 @@ var excludeFolders = [
  * @param {LintConfig} configuration - an optional configuration. When not passed in, this is read from the .sasjslint file.
  * @returns {Promise<Map<string, Diagnostic[]>>} Resolves with a map with array of diagnostic objects, each containing a warning, line number and column number, and grouped by file path.
  */
-var lintFolder = function (folderPath, configuration) { return __awaiter(void 0, void 0, void 0, function () {
-    var config, _a, diagnostics, fileNames, subFolders;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                _a = configuration;
-                if (_a) return [3 /*break*/, 2];
-                return [4 /*yield*/, utils_1.getLintConfig()];
-            case 1:
-                _a = (_b.sent());
-                _b.label = 2;
-            case 2:
-                config = _a;
-                diagnostics = new Map();
-                return [4 /*yield*/, utils_1.isIgnored(folderPath, config)];
-            case 3:
-                if (_b.sent())
-                    return [2 /*return*/, diagnostics];
-                return [4 /*yield*/, utils_1.listSasFiles(folderPath)];
-            case 4:
-                fileNames = _b.sent();
-                return [4 /*yield*/, utils_1.asyncForEach(fileNames, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
-                        var filePath, _a, _b, _c;
-                        return __generator(this, function (_d) {
-                            switch (_d.label) {
-                                case 0:
-                                    filePath = path_1.default.join(folderPath, fileName);
-                                    _b = (_a = diagnostics).set;
-                                    _c = [filePath];
-                                    return [4 /*yield*/, lintFile_1.lintFile(filePath, config)];
-                                case 1:
-                                    _b.apply(_a, _c.concat([_d.sent()]));
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })];
-            case 5:
-                _b.sent();
-                return [4 /*yield*/, file_1.listSubFoldersInFolder(folderPath)];
-            case 6:
-                subFolders = (_b.sent()).filter(function (f) { return !excludeFolders.includes(f); });
-                return [4 /*yield*/, utils_1.asyncForEach(subFolders, function (subFolder) { return __awaiter(void 0, void 0, void 0, function () {
-                        var subFolderPath, subFolderDiagnostics;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    subFolderPath = path_1.default.join(folderPath, subFolder);
-                                    return [4 /*yield*/, exports.lintFolder(subFolderPath, config)];
-                                case 1:
-                                    subFolderDiagnostics = _a.sent();
-                                    diagnostics = new Map(__spreadArray(__spreadArray([], __read(diagnostics)), __read(subFolderDiagnostics)));
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })];
-            case 7:
-                _b.sent();
-                return [2 /*return*/, diagnostics];
-        }
-    });
-}); };
+const lintFolder = (folderPath, configuration) => __awaiter(void 0, void 0, void 0, function* () {
+    const config = configuration || (yield (0, utils_1.getLintConfig)());
+    let diagnostics = new Map();
+    if (yield (0, utils_1.isIgnored)(folderPath, config))
+        return diagnostics;
+    const fileNames = yield (0, utils_1.listSasFiles)(folderPath);
+    yield (0, utils_1.asyncForEach)(fileNames, (fileName) => __awaiter(void 0, void 0, void 0, function* () {
+        const filePath = path_1.default.join(folderPath, fileName);
+        diagnostics.set(filePath, yield (0, lintFile_1.lintFile)(filePath, config));
+    }));
+    const subFolders = (yield (0, file_1.listSubFoldersInFolder)(folderPath)).filter((f) => !excludeFolders.includes(f));
+    yield (0, utils_1.asyncForEach)(subFolders, (subFolder) => __awaiter(void 0, void 0, void 0, function* () {
+        const subFolderPath = path_1.default.join(folderPath, subFolder);
+        const subFolderDiagnostics = yield (0, exports.lintFolder)(subFolderPath, config);
+        diagnostics = new Map([...diagnostics, ...subFolderDiagnostics]);
+    }));
+    return diagnostics;
+});
 exports.lintFolder = lintFolder;
 //# sourceMappingURL=lintFolder.js.map

package/lint/lintFolder.js.map

@@ -1 +1 @@
-{"version":3,"file":"lintFolder.js","sourceRoot":"","sources":["../../src/lint/lintFolder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA0D;AAC1D,8CAAuB;AAEvB,kCAA+E;AAC/E,uCAAqC;AAErC,IAAM,cAAc,GAAG;IACrB,MAAM;IACN,SAAS;IACT,SAAS;IACT,cAAc;IACd,YAAY;IACZ,cAAc;CACf,CAAA;AAED;;;;;GAKG;AACI,IAAM,UAAU,GAAG,UACxB,UAAkB,EAClB,aAA0B;;;;;gBAEX,KAAA,aAAa,CAAA;wBAAb,wBAAa;gBAAK,qBAAM,qBAAa,EAAE,EAAA;;gBAAtB,KAAA,CAAC,SAAqB,CAAC,CAAA;;;gBAAjD,MAAM,KAA2C;gBACnD,WAAW,GAA8B,IAAI,GAAG,EAAwB,CAAA;gBAExE,qBAAM,iBAAS,CAAC,UAAU,EAAE,MAAM,CAAC,EAAA;;gBAAvC,IAAI,SAAmC;oBAAE,sBAAO,WAAW,EAAA;gBAEzC,qBAAM,oBAAY,CAAC,UAAU,CAAC,EAAA;;gBAA1C,SAAS,GAAG,SAA8B;gBAChD,qBAAM,oBAAY,CAAC,SAAS,EAAE,UAAO,QAAQ;;;;;oCACrC,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;oCAChD,KAAA,CAAA,KAAA,WAAW,CAAA,CAAC,GAAG,CAAA;0CAAC,QAAQ;oCAAE,qBAAM,mBAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAA;;oCAA1D,wBAA0B,SAAgC,GAAC,CAAA;;;;yBAC5D,CAAC,EAAA;;gBAHF,SAGE,CAAA;gBAEkB,qBAAM,6BAAsB,CAAC,UAAU,CAAC,EAAA;;gBAAtD,UAAU,GAAG,CAAC,SAAwC,CAAC,CAAC,MAAM,CAClE,UAAC,CAAS,IAAK,OAAA,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,EAA3B,CAA2B,CAC3C;gBAED,qBAAM,oBAAY,CAAC,UAAU,EAAE,UAAO,SAAS;;;;;oCACvC,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;oCACzB,qBAAM,kBAAU,CAAC,aAAa,EAAE,MAAM,CAAC,EAAA;;oCAA9D,oBAAoB,GAAG,SAAuC;oCACpE,WAAW,GAAG,IAAI,GAAG,wCAAK,WAAW,WAAK,oBAAoB,GAAE,CAAA;;;;yBACjE,CAAC,EAAA;;gBAJF,SAIE,CAAA;gBAEF,sBAAO,WAAW,EAAA;;;KACnB,CAAA;AA1BY,QAAA,UAAU,cA0BtB"}
+{"version":3,"file":"lintFolder.js","sourceRoot":"","sources":["../../src/lint/lintFolder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAA0D;AAC1D,gDAAuB;AAEvB,oCAA+E;AAC/E,yCAAqC;AAErC,MAAM,cAAc,GAAG;IACrB,MAAM;IACN,SAAS;IACT,SAAS;IACT,cAAc;IACd,YAAY;IACZ,cAAc;CACf,CAAA;AAED;;;;;GAKG;AACI,MAAM,UAAU,GAAG,CACxB,UAAkB,EAClB,aAA0B,EAC1B,EAAE;IACF,MAAM,MAAM,GAAG,aAAa,IAAI,CAAC,MAAM,IAAA,qBAAa,GAAE,CAAC,CAAA;IACvD,IAAI,WAAW,GAA8B,IAAI,GAAG,EAAwB,CAAA;IAE5E,IAAI,MAAM,IAAA,iBAAS,EAAC,UAAU,EAAE,MAAM,CAAC;QAAE,OAAO,WAAW,CAAA;IAE3D,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAY,EAAC,UAAU,CAAC,CAAA;IAChD,MAAM,IAAA,oBAAY,EAAC,SAAS,EAAE,CAAO,QAAQ,EAAE,EAAE;QAC/C,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAChD,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,IAAA,mBAAQ,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;IAC7D,CAAC,CAAA,CAAC,CAAA;IAEF,MAAM,UAAU,GAAG,CAAC,MAAM,IAAA,6BAAsB,EAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAClE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAC3C,CAAA;IAED,MAAM,IAAA,oBAAY,EAAC,UAAU,EAAE,CAAO,SAAS,EAAE,EAAE;QACjD,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;QACtD,MAAM,oBAAoB,GAAG,MAAM,IAAA,kBAAU,EAAC,aAAa,EAAE,MAAM,CAAC,CAAA;QACpE,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,oBAAoB,CAAC,CAAC,CAAA;IAClE,CAAC,CAAA,CAAC,CAAA;IAEF,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA,CAAA;AA1BY,QAAA,UAAU,cA0BtB"}

package/lint/lintProject.js

@@ -8,56 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.lintProject = void 0;
-var getProjectRoot_1 = require("../utils/getProjectRoot");
-var lintFolder_1 = require("./lintFolder");
+const getProjectRoot_1 = require("../utils/getProjectRoot");
+const lintFolder_1 = require("./lintFolder");
 /**
  * Analyses and produces a set of diagnostics for the current project.
  * @returns {Promise<Map<string, Diagnostic[]>>} Resolves with a map with array of diagnostic objects, each containing a warning, line number and column number, and grouped by file path.
  */
-var lintProject = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var projectRoot;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, getProjectRoot_1.getProjectRoot()];
-            case 1:
-                projectRoot = (_a.sent()) || process.currentDir;
-                if (!projectRoot) {
-                    throw new Error('SASjs Project Root was not found.');
-                }
-                console.info("Linting all .sas files under " + projectRoot);
-                return [4 /*yield*/, lintFolder_1.lintFolder(projectRoot)];
-            case 2: return [2 /*return*/, _a.sent()];
-        }
-    });
-}); };
+const lintProject = () => __awaiter(void 0, void 0, void 0, function* () {
+    const projectRoot = (yield (0, getProjectRoot_1.getProjectRoot)()) || process.currentDir;
+    if (!projectRoot) {
+        throw new Error('SASjs Project Root was not found.');
+    }
+    console.info(`Linting all .sas files under ${projectRoot}`);
+    return yield (0, lintFolder_1.lintFolder)(projectRoot);
+});
 exports.lintProject = lintProject;
 //# sourceMappingURL=lintProject.js.map

package/lint/lintProject.js.map

@@ -1 +1 @@
-{"version":3,"file":"lintProject.js","sourceRoot":"","sources":["../../src/lint/lintProject.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAAwD;AACxD,2CAAyC;AAEzC;;;GAGG;AACI,IAAM,WAAW,GAAG;;;;oBACJ,qBAAM,+BAAc,EAAE,EAAA;;gBAArC,WAAW,GAAG,CAAC,SAAsB,CAAC,IAAI,OAAO,CAAC,UAAU;gBAClE,IAAI,CAAC,WAAW,EAAE;oBAChB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;iBACrD;gBAED,OAAO,CAAC,IAAI,CAAC,kCAAgC,WAAa,CAAC,CAAA;gBAEpD,qBAAM,uBAAU,CAAC,WAAW,CAAC,EAAA;oBAApC,sBAAO,SAA6B,EAAA;;;KACrC,CAAA;AATY,QAAA,WAAW,eASvB"}
+{"version":3,"file":"lintProject.js","sourceRoot":"","sources":["../../src/lint/lintProject.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4DAAwD;AACxD,6CAAyC;AAEzC;;;GAGG;AACI,MAAM,WAAW,GAAG,GAAS,EAAE;IACpC,MAAM,WAAW,GAAG,CAAC,MAAM,IAAA,+BAAc,GAAE,CAAC,IAAI,OAAO,CAAC,UAAU,CAAA;IAClE,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;KACrD;IAED,OAAO,CAAC,IAAI,CAAC,gCAAgC,WAAW,EAAE,CAAC,CAAA;IAE3D,OAAO,MAAM,IAAA,uBAAU,EAAC,WAAW,CAAC,CAAA;AACtC,CAAC,CAAA,CAAA;AATY,QAAA,WAAW,eASvB"}

package/lint/lintText.js

@@ -8,52 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.lintText = void 0;
-var getLintConfig_1 = require("../utils/getLintConfig");
-var shared_1 = require("./shared");
+const getLintConfig_1 = require("../utils/getLintConfig");
+const shared_1 = require("./shared");
 /**
  * Analyses and produces a set of diagnostics for the given text content.
  * @param {string} text - the text content to be linted.
  * @returns {Diagnostic[]} array of diagnostic objects, each containing a warning, line number and column number.
  */
-var lintText = function (text) { return __awaiter(void 0, void 0, void 0, function () {
-    var config;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, getLintConfig_1.getLintConfig()];
-            case 1:
-                config = _a.sent();
-                return [2 /*return*/, shared_1.processText(text, config)];
-        }
-    });
-}); };
+const lintText = (text) => __awaiter(void 0, void 0, void 0, function* () {
+    const config = yield (0, getLintConfig_1.getLintConfig)();
+    return (0, shared_1.processText)(text, config);
+});
 exports.lintText = lintText;
 //# sourceMappingURL=lintText.js.map

package/lint/lintText.js.map

@@ -1 +1 @@
-{"version":3,"file":"lintText.js","sourceRoot":"","sources":["../../src/lint/lintText.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAsD;AACtD,mCAAsC;AAEtC;;;;GAIG;AACI,IAAM,QAAQ,GAAG,UAAO,IAAY;;;;oBAC1B,qBAAM,6BAAa,EAAE,EAAA;;gBAA9B,MAAM,GAAG,SAAqB;gBACpC,sBAAO,oBAAW,CAAC,IAAI,EAAE,MAAM,CAAC,EAAA;;;KACjC,CAAA;AAHY,QAAA,QAAQ,YAGpB"}
+{"version":3,"file":"lintText.js","sourceRoot":"","sources":["../../src/lint/lintText.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAAsD;AACtD,qCAAsC;AAEtC;;;;GAIG;AACI,MAAM,QAAQ,GAAG,CAAO,IAAY,EAAE,EAAE;IAC7C,MAAM,MAAM,GAAG,MAAM,IAAA,6BAAa,GAAE,CAAA;IACpC,OAAO,IAAA,oBAAW,EAAC,IAAI,EAAE,MAAM,CAAC,CAAA;AAClC,CAAC,CAAA,CAAA;AAHY,QAAA,QAAQ,YAGpB"}

package/lint/shared.js

@@ -1,62 +1,41 @@
 "use strict";
-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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processLine = exports.processFile = exports.processText = void 0;
-var utils_1 = require("../utils");
-var utils_2 = require("../utils");
-var processText = function (text, config) {
-    var lines = utils_1.splitText(text, config);
-    var headerLinesCount = utils_1.getHeaderLinesCount(text, config);
-    var dataSections = utils_2.getDataSectionsDetail(text, config);
-    var diagnostics = [];
-    diagnostics.push.apply(diagnostics, __spreadArray([], __read(processContent(config, text))));
-    lines.forEach(function (line, index) {
-        var isHeaderLine = index + 1 <= headerLinesCount;
-        var isDataLine = utils_2.checkIsDataLine(dataSections, index);
-        diagnostics.push.apply(diagnostics, __spreadArray([], __read(exports.processLine(config, line, index + 1, { isHeaderLine: isHeaderLine, isDataLine: isDataLine }))));
+const utils_1 = require("../utils");
+const utils_2 = require("../utils");
+const processText = (text, config) => {
+    const lines = (0, utils_1.splitText)(text, config);
+    const headerLinesCount = (0, utils_1.getHeaderLinesCount)(text, config);
+    const dataSections = (0, utils_2.getDataSectionsDetail)(text, config);
+    const diagnostics = [];
+    diagnostics.push(...processContent(config, text));
+    lines.forEach((line, index) => {
+        const isHeaderLine = index + 1 <= headerLinesCount;
+        const isDataLine = (0, utils_2.checkIsDataLine)(dataSections, index);
+        diagnostics.push(...(0, exports.processLine)(config, line, index + 1, { isHeaderLine, isDataLine }));
     });
     return diagnostics;
 };
 exports.processText = processText;
-var processFile = function (filePath, config) {
-    var diagnostics = [];
-    config.pathLintRules.forEach(function (rule) {
-        diagnostics.push.apply(diagnostics, __spreadArray([], __read(rule.test(filePath, config))));
+const processFile = (filePath, config) => {
+    const diagnostics = [];
+    config.pathLintRules.forEach((rule) => {
+        diagnostics.push(...rule.test(filePath, config));
     });
     return diagnostics;
 };
 exports.processFile = processFile;
-var processContent = function (config, content) {
-    var diagnostics = [];
-    config.fileLintRules.forEach(function (rule) {
-        diagnostics.push.apply(diagnostics, __spreadArray([], __read(rule.test(content, config))));
+const processContent = (config, content) => {
+    const diagnostics = [];
+    config.fileLintRules.forEach((rule) => {
+        diagnostics.push(...rule.test(content, config));
     });
     return diagnostics;
 };
-var processLine = function (config, line, lineNumber, options) {
-    var diagnostics = [];
-    config.lineLintRules.forEach(function (rule) {
-        diagnostics.push.apply(diagnostics, __spreadArray([], __read(rule.test(line, lineNumber, config, options))));
+const processLine = (config, line, lineNumber, options) => {
+    const diagnostics = [];
+    config.lineLintRules.forEach((rule) => {
+        diagnostics.push(...rule.test(line, lineNumber, config, options));
     });
     return diagnostics;
 };

package/lint/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/lint/shared.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AACA,kCAAyD;AACzD,kCAAiE;AAE1D,IAAM,WAAW,GAAG,UAAC,IAAY,EAAE,MAAkB;IAC1D,IAAM,KAAK,GAAG,iBAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACrC,IAAM,gBAAgB,GAAG,2BAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC1D,IAAM,YAAY,GAAG,6BAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACxD,IAAM,WAAW,GAAiB,EAAE,CAAA;IACpC,WAAW,CAAC,IAAI,OAAhB,WAAW,2BAAS,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,IAAC;IACjD,KAAK,CAAC,OAAO,CAAC,UAAC,IAAI,EAAE,KAAK;QACxB,IAAM,YAAY,GAAG,KAAK,GAAG,CAAC,IAAI,gBAAgB,CAAA;QAClD,IAAM,UAAU,GAAG,uBAAe,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;QACvD,WAAW,CAAC,IAAI,OAAhB,WAAW,2BACN,mBAAW,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,EAAE,YAAY,cAAA,EAAE,UAAU,YAAA,EAAE,CAAC,IACtE;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAfY,QAAA,WAAW,eAevB;AAEM,IAAM,WAAW,GAAG,UACzB,QAAgB,EAChB,MAAkB;IAElB,IAAM,WAAW,GAAiB,EAAE,CAAA;IACpC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,UAAC,IAAI;QAChC,WAAW,CAAC,IAAI,OAAhB,WAAW,2BAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAC;IAClD,CAAC,CAAC,CAAA;IAEF,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAVY,QAAA,WAAW,eAUvB;AAED,IAAM,cAAc,GAAG,UAAC,MAAkB,EAAE,OAAe;IACzD,IAAM,WAAW,GAAiB,EAAE,CAAA;IACpC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,UAAC,IAAI;QAChC,WAAW,CAAC,IAAI,OAAhB,WAAW,2BAAS,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,IAAC;IACjD,CAAC,CAAC,CAAA;IAEF,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAEM,IAAM,WAAW,GAAG,UACzB,MAAkB,EAClB,IAAY,EACZ,UAAkB,EAClB,OAA4B;IAE5B,IAAM,WAAW,GAAiB,EAAE,CAAA;IACpC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,UAAC,IAAI;QAChC,WAAW,CAAC,IAAI,OAAhB,WAAW,2BAAS,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,IAAC;IACnE,CAAC,CAAC,CAAA;IAEF,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAZY,QAAA,WAAW,eAYvB"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/lint/shared.ts"],"names":[],"mappings":";;;AACA,oCAAyD;AACzD,oCAAiE;AAE1D,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,MAAkB,EAAE,EAAE;IAC9D,MAAM,KAAK,GAAG,IAAA,iBAAS,EAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACrC,MAAM,gBAAgB,GAAG,IAAA,2BAAmB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC1D,MAAM,YAAY,GAAG,IAAA,6BAAqB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACxD,MAAM,WAAW,GAAiB,EAAE,CAAA;IACpC,WAAW,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;IACjD,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAC5B,MAAM,YAAY,GAAG,KAAK,GAAG,CAAC,IAAI,gBAAgB,CAAA;QAClD,MAAM,UAAU,GAAG,IAAA,uBAAe,EAAC,YAAY,EAAE,KAAK,CAAC,CAAA;QACvD,WAAW,CAAC,IAAI,CACd,GAAG,IAAA,mBAAW,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CACtE,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAfY,QAAA,WAAW,eAevB;AAEM,MAAM,WAAW,GAAG,CACzB,QAAgB,EAChB,MAAkB,EACJ,EAAE;IAChB,MAAM,WAAW,GAAiB,EAAE,CAAA;IACpC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACpC,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;IAClD,CAAC,CAAC,CAAA;IAEF,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAVY,QAAA,WAAW,eAUvB;AAED,MAAM,cAAc,GAAG,CAAC,MAAkB,EAAE,OAAe,EAAgB,EAAE;IAC3E,MAAM,WAAW,GAAiB,EAAE,CAAA;IACpC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACpC,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;IACjD,CAAC,CAAC,CAAA;IAEF,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAEM,MAAM,WAAW,GAAG,CACzB,MAAkB,EAClB,IAAY,EACZ,UAAkB,EAClB,OAA4B,EACd,EAAE;IAChB,MAAM,WAAW,GAAiB,EAAE,CAAA;IACpC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACpC,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACnE,CAAC,CAAC,CAAA;IAEF,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAZY,QAAA,WAAW,eAYvB"}