@sasjs/cli 3.23.5 → 3.23.7

package/build/commands/fs/fsCommand.js

@@ -108,7 +108,6 @@ var utils_1 = require("../../utils");
 var path_1 = __importDefault(require("path"));
 var utils_2 = require("@sasjs/utils");
 var executeCode_1 = require("./internal/executeCode");
-var extractHashArray_1 = require("./internal/extractHashArray");
 var FsSubCommand;
 (function (FsSubCommand) {
     FsSubCommand["Compile"] = "compile";
@@ -120,7 +119,7 @@ var description = 'Handles operations around file system synchronisation';
 var parseOptions = {
     output: { type: 'string', alias: 'o' }
 };
-var compileCommandSyntax = 'fs <subCommand> <localFolder> [options]';
+var compileCommandSyntax = 'fs <subCommand> <local> [options]';
 var compileCommandUsage = 'sasjs fs compile <localFolder> [options]';
 var compileCommandDescription = 'Compiles a SAS program with the contents of a local directory';
 var compileCommandExamples = [
@@ -319,16 +318,18 @@ var FSCommand = /** @class */ (function (_super) {
                                     case 6:
                                         _v.sent();
                                         (_d = process.logger) === null || _d === void 0 ? void 0 : _d.info('extracting hashes from log');
-                                        remoteHashes = (0, extractHashArray_1.extractHashArray)(log);
+                                        remoteHashes = (0, utils_2.extractHashArray)(log);
                                         return [4 /*yield*/, createHashFile(JSON.stringify(remoteHashes, null, 2), path_1.default.join(outputFolder, 'hashesBeforeSync.json'))];
                                     case 7:
                                         _v.sent();
                                         (_e = process.logger) === null || _e === void 0 ? void 0 : _e.info('creating the hash of local folder');
-                                        return [4 /*yield*/, (0, utils_2.getHash)(obj.local)];
+                                        return [4 /*yield*/, (0, utils_2.getHash)((0, utils_2.getAbsolutePath)(obj.local, process.projectDir))];
                                     case 8:
                                         localHash = _v.sent();
                                         remoteHashMap_1 = remoteHashes.reduce(function (map, item) {
-                                            var relativePath = (0, utils_2.getRelativePath)(obj.remote, item.FILE_PATH);
+                                            var from = obj.remote.replace(/\//g, path_1.default.sep);
+                                            var to = item.FILE_PATH.replace(/\//g, path_1.default.sep);
+                                            var relativePath = (0, utils_2.getRelativePath)(from, to);
                                             map[relativePath] = item.FILE_HASH;
                                             return map;
                                         }, {});
@@ -355,12 +356,14 @@ var FSCommand = /** @class */ (function (_super) {
                                         return [4 /*yield*/, (0, utils_1.saveLog)(syncLog, path_1.default.join(outputFolder, 'sync.log'), '', false)];
                                     case 13:
                                         _v.sent();
-                                        syncedHash = (0, extractHashArray_1.extractHashArray)(syncLog);
+                                        syncedHash = (0, utils_2.extractHashArray)(syncLog);
                                         return [4 /*yield*/, createHashFile(JSON.stringify(syncedHash, null, 2), path_1.default.join(outputFolder, 'hashesAfterSync.json'))];
                                     case 14:
                                         _v.sent();
                                         syncedHashMap = syncedHash.reduce(function (map, item) {
-                                            var relativePath = (0, utils_2.getRelativePath)(obj.remote, item.FILE_PATH);
+                                            var from = obj.remote.replace(/\//g, path_1.default.sep);
+                                            var to = item.FILE_PATH.replace(/\//g, path_1.default.sep);
+                                            var relativePath = (0, utils_2.getRelativePath)(from, to);
                                             map[relativePath] = item.FILE_HASH;
                                             return map;
                                         }, {});

package/build/commands/fs/spec/fsCommand.spec.js

@@ -88,7 +88,6 @@ var FSModule = __importStar(require("@sasjs/utils/fs"));
 var FileModule = __importStar(require("@sasjs/utils/file"));
 var configUtils = __importStar(require("../../../utils/config"));
 var executeCodeModule = __importStar(require("../internal/executeCode"));
-var extractHashArrayModule = __importStar(require("../internal/extractHashArray"));
 var defaultArgs = ['node', 'sasjs', 'fs'];
 var target = new utils_1.Target({
     name: 'test',
@@ -197,17 +196,13 @@ describe('FSCommand', function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        jest
-                            .spyOn(extractHashArrayModule, 'extractHashArray')
-                            .mockImplementationOnce(function () { return [
+                        jest.spyOn(FSModule, 'extractHashArray').mockImplementationOnce(function () { return [
                             {
                                 FILE_PATH: 'mocked-file',
                                 FILE_HASH: 'hashOfMockedFile'
                             }
                         ]; });
-                        jest
-                            .spyOn(extractHashArrayModule, 'extractHashArray')
-                            .mockImplementationOnce(function () { return [
+                        jest.spyOn(FSModule, 'extractHashArray').mockImplementationOnce(function () { return [
                             {
                                 FILE_PATH: 'synced-file',
                                 FILE_HASH: 'hashOfSyncedFile'
@@ -239,9 +234,7 @@ describe('FSCommand', function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        jest
-                            .spyOn(extractHashArrayModule, 'extractHashArray')
-                            .mockImplementation(function () { return [
+                        jest.spyOn(FSModule, 'extractHashArray').mockImplementation(function () { return [
                             {
                                 FILE_PATH: 'mocked-file',
                                 FILE_HASH: 'hashOfMockedFile'

package/package.json

@@ -53,7 +53,7 @@
     "@sasjs/adapter": "4.1.0",
     "@sasjs/core": "4.45.4",
     "@sasjs/lint": "2.0.1",
-    "@sasjs/utils": "2.51.2",
+    "@sasjs/utils": "2.51.5",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
@@ -101,5 +101,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.23.5"
+  "version": "3.23.7"
 }

package/build/commands/fs/internal/extractHashArray.d.ts

@@ -1 +0,0 @@
-export declare const extractHashArray: (log: string) => any;

package/build/commands/fs/internal/extractHashArray.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractHashArray = void 0;
-var utils_1 = require("../../../utils");
-var extractHashArray = function (log) {
-    if (log.includes('>>weboutBEGIN<<')) {
-        try {
-            var webout = log
-                .split(/>>weboutBEGIN<<\n/)[1]
-                .split(/>>weboutEND<<\n/)[0];
-            var jsonWebout = JSON.parse(webout);
-            return jsonWebout.hashes;
-        }
-        catch (err) {
-            (0, utils_1.displayError)(err, 'An error occurred while extracting hashes array from webout.');
-            throw new Error('An error occurred while extracting hashes array from webout.');
-        }
-    }
-};
-exports.extractHashArray = extractHashArray;

package/build/commands/fs/spec/extractHashArray.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/build/commands/fs/spec/extractHashArray.spec.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var extractHashArray_1 = require("../internal/extractHashArray");
-var log = "\n>>weboutBEGIN<<\n{\n  \"hashes\": [{\n    \"FILE_HASH\": \"someCharacters\",\n    \"FILE_PATH\": \"path/to/folder/file\"\n  }]\n}\n>>weboutEND<<\n";
-var logWithInvalidJsonInWebout = "\n>>weboutBEGIN<<\n{\n  \"invalid Json\"\n}\n>>weboutEND<<\n";
-describe('extractHashArray', function () {
-    it('should extract hashed array from webout', function () {
-        var hashes = (0, extractHashArray_1.extractHashArray)(log);
-        expect(hashes).toBeArrayOfSize(1);
-    });
-    it('should throw error when log does not contain webout', function () {
-        expect(function () { return (0, extractHashArray_1.extractHashArray)(logWithInvalidJsonInWebout); }).toThrow('An error occurred while extracting hashes array from webout.');
-    });
-});