@speedkit/cli 2.47.0 → 2.47.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.47.1](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.47.0...v2.47.1) (2024-07-24)
+
+
+### Bug Fixes
+
+* **diff-service:** resolve escaped spaces issue for macos ([1cf2d57](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/1cf2d577ab4ba15f3bd53394d95b2fa53e28fcd5))
+
 # [2.47.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.46.0...v2.47.0) (2024-07-24)
 
 

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @speedkit/cli
 $ sk COMMAND
 running command...
 $ sk (--version)
-@speedkit/cli/2.47.0 linux-x64 node-v20.15.1
+@speedkit/cli/2.47.1 linux-x64 node-v20.15.1
 $ sk --help [COMMAND]
 USAGE
   $ sk COMMAND

package/dist/helpers/normalize.d.ts

@@ -39,3 +39,9 @@ export declare function transformNoValueParameters(url: URL, manipulatedUrl: URL
  * @returns The normalized URL.
  */
 export declare function normalize(urlString: string, withParameterSorting: boolean): string;
+/**
+ * Remove backslashes before spaces from given string.
+ *
+ * @param string_
+ */
+export declare function unescapeSpaces(string_: string): string;

package/dist/helpers/normalize.js

@@ -4,6 +4,7 @@ exports.sortParameters = sortParameters;
 exports.convertNotEncodedParameters = convertNotEncodedParameters;
 exports.transformNoValueParameters = transformNoValueParameters;
 exports.normalize = normalize;
+exports.unescapeSpaces = unescapeSpaces;
 const node_url_1 = require("node:url");
 /**
  * Sorts all urls params manually.
@@ -113,3 +114,11 @@ function normalize(urlString, withParameterSorting) {
     transformNoValueParameters(new node_url_1.URL(urlString), url);
     return url.toString();
 }
+/**
+ * Remove backslashes before spaces from given string.
+ *
+ * @param string_
+ */
+function unescapeSpaces(string_) {
+    return string_.replaceAll("\\ ", " ");
+}

package/dist/models/os.d.ts

@@ -0,0 +1 @@
+export declare const DEFAULT_INTELLIJ_IDEA_PATH_MACOS = "/Applications/IntelliJ IDEA.app/Contents/MacOS";

package/dist/models/os.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_INTELLIJ_IDEA_PATH_MACOS = void 0;
+exports.DEFAULT_INTELLIJ_IDEA_PATH_MACOS = "/Applications/IntelliJ IDEA.app/Contents/MacOS";

package/dist/services/diff/diff-service.js

@@ -6,6 +6,8 @@ const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const promises_1 = tslib_1.__importStar(require("node:fs/promises"));
 const node_child_process_1 = require("node:child_process");
 const file_helper_1 = require("../../helpers/file-helper");
+const normalize_1 = require("../../helpers/normalize");
+const os_1 = require("../../models/os");
 class DiffService {
     cli;
     diffExecutablePath;
@@ -113,10 +115,11 @@ class DiffService {
             }
             return false;
         }
-        const isWindows = process.platform.startsWith("win");
         let ideaCommandAvailable;
         try {
-            (0, node_child_process_1.execSync)(`idea diff "${localPath}" "${remotePath}"`);
+            (0, node_child_process_1.execSync)(`idea diff "${localPath}" "${remotePath}"`, {
+                stdio: ["pipe", "ignore", "pipe"], // prevent output of "/bin/sh: idea: command not found"
+            });
             ideaCommandAvailable = true;
         }
         catch {
@@ -124,17 +127,20 @@ class DiffService {
         }
         try {
             if (!ideaCommandAvailable) {
+                const isWindows = process.platform.startsWith("win");
                 if (isWindows) {
                     (0, node_child_process_1.execSync)(`"%IDEA_INITIAL_DIRECTORY%\\idea" diff ${localPath} ${remotePath}`, { stdio: "pipe" });
                 }
                 else {
-                    (0, node_child_process_1.execSync)(`"$IDEA_INITIAL_DIRECTORY/idea" diff ${localPath} ${remotePath}`, { stdio: "pipe" });
+                    const ideaInitialDirectory = (0, normalize_1.unescapeSpaces)(process.env.IDEA_INITIAL_DIRECTORY ||
+                        os_1.DEFAULT_INTELLIJ_IDEA_PATH_MACOS);
+                    (0, node_child_process_1.execSync)(`"${ideaInitialDirectory}/idea" diff ${localPath} ${remotePath}`, { stdio: "pipe" });
                 }
             }
             return false;
         }
         catch (error) {
-            this.cli.writeError(`Error executing diff command: ${error.message}`);
+            this.cli.writeError(`Error executing diff command: ${error.message} (diff/diff-service)`);
             return false;
         }
     }

package/dist/services/diff-service.js

@@ -6,6 +6,8 @@ const fs = tslib_1.__importStar(require("node:fs/promises"));
 const node_child_process_1 = require("node:child_process");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const file_helper_1 = require("../helpers/file-helper");
+const normalize_1 = require("../helpers/normalize");
+const os_1 = require("../models/os");
 /**
  * @deprecated
  */
@@ -86,10 +88,11 @@ class DiffService {
         else if (hide) {
             return true;
         }
-        const isWindows = process.platform.startsWith("win");
         let ideaCommandAvailable;
         try {
-            (0, node_child_process_1.execSync)(`idea diff "${filePath1}" "${filePath2}"`, { stdio: "pipe" });
+            (0, node_child_process_1.execSync)(`idea diff "${filePath1}" "${filePath2}"`, {
+                stdio: ["pipe", "ignore", "pipe"], // prevent output of "/bin/sh: idea: command not found"
+            });
             ideaCommandAvailable = true;
         }
         catch {
@@ -97,16 +100,19 @@ class DiffService {
         }
         try {
             if (!ideaCommandAvailable) {
+                const isWindows = process.platform.startsWith("win");
                 if (isWindows) {
                     (0, node_child_process_1.execSync)(`"%IDEA_INITIAL_DIRECTORY%\\idea" diff ${filePath1} ${filePath2}`, { stdio: "pipe" });
                 }
                 else {
-                    (0, node_child_process_1.execSync)(`"$IDEA_INITIAL_DIRECTORY/idea" diff ${filePath1} ${filePath2}`, { stdio: "pipe" });
+                    const ideaInitialDirectory = (0, normalize_1.unescapeSpaces)(process.env.IDEA_INITIAL_DIRECTORY ||
+                        os_1.DEFAULT_INTELLIJ_IDEA_PATH_MACOS);
+                    (0, node_child_process_1.execSync)(`"${ideaInitialDirectory}/idea" diff ${filePath1} ${filePath2}`, { stdio: "pipe" });
                 }
             }
         }
         catch (error) {
-            this.cli.writeError(`Error executing diff command: ${error.message}`);
+            this.cli.writeError(`Error executing diff command: ${error.message} (services/diff-service)`);
             this.cli.exit(1);
         }
         return true;

package/oclif.manifest.json

@@ -712,5 +712,5 @@
       ]
     }
   },
-  "version": "2.47.0"
+  "version": "2.47.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@speedkit/cli",
   "description": "Speed Kit CLI",
-  "version": "2.47.0",
+  "version": "2.47.1",
   "author": {
     "name": "Baqend.com",
     "email": "info@baqend.com"