@speedkit/cli 3.31.0 → 3.31.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.31.2](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v3.31.1...v3.31.2) (2026-03-10)
+
+
+### Bug Fixes
+
+* **diff:** return updatedFile instead of originalFile after diff ([4894d1b](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/4894d1bc93387665add4d85af35b93650a911103))
+
+## [3.31.1](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v3.31.0...v3.31.1) (2026-03-09)
+
+
+### Bug Fixes
+
+* order of parameters for diffs ([d70e4fe](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/d70e4fe5ddf67b1a08670fe61dd5edb1c0e87f66))
+
 # [3.31.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v3.30.0...v3.31.0) (2026-03-03)
 
 

package/README.md

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

package/dist/commands/generate-pop-config.js

@@ -136,8 +136,9 @@ class GeneratePopConfig extends core_1.Command {
         // new DiffService(cliService);
         const popPrewarmingCode = await this.createPopPrewarmingCode(config);
         const remoteConfig = await configService.getRemoteModule(moduleName);
-        const result = await diffService.diffContent(moduleName, popPrewarmingCode, remoteConfig);
-        const content = result.changedOrigins;
+        const result = await diffService.diffContent(moduleName, remoteConfig, // remoteContent
+        popPrewarmingCode);
+        const content = result.updatedFile;
         const isEqual = result.diff;
         if (isEqual) {
             cliService.write(`created config is the same as the deployed one`);

package/dist/services/deploy/handler/customer-config-handler.js

@@ -43,8 +43,8 @@ class CustomerConfigHandler {
             return;
         }
         // todo: add changedThrowable, let the handler catch and decide what to do with it
-        const { changedOrigins } = await this.diffService.diffContent(file.name, JSON.stringify(config.origins, null, 4), JSON.stringify(installResource.origins, null, 4));
-        const origins = JSON.parse(changedOrigins);
+        const { updatedFile } = await this.diffService.diffContent(file.name, JSON.stringify(config.origins, null, 4), JSON.stringify(installResource.origins, null, 4));
+        const origins = JSON.parse(updatedFile);
         file.updateOrigins(origins);
         if (!(await this.cli.confirm("Update origins?", true))) {
             file.skipFile();

package/dist/services/deploy/handler/install-resource-handler.js

@@ -94,8 +94,10 @@ class InstallResourceHandler {
             await this.confirm(file, true);
             return;
         }
-        const { changedOrigins, diff } = await this.diffService.diffContent(file.name, file.getContent(), installResource[file.remoteKey]);
-        file.setContent(changedOrigins);
+        const { updatedFile, diff } = await this.diffService.diffContent(file.name, // fileName
+        installResource[file.remoteKey], // remote file content
+        file.getContent());
+        file.setContent(updatedFile);
         if (diff) {
             this.cli.writeWarning(`skipped ${file.name} (identical with remote)`);
             file.skipFile();

package/dist/services/deploy/handler/module-handler.js

@@ -32,8 +32,8 @@ class ModuleHandler {
                 await this.confirm(file, true);
                 continue;
             }
-            const { changedOrigins, diff } = await this.diffService.diffContent(file.name, file.getContent(), remote);
-            file.setContent(changedOrigins);
+            const { updatedFile, diff } = await this.diffService.diffContent(file.name, remote, file.getContent());
+            file.setContent(updatedFile);
             if (diff) {
                 this.cli.writeWarning(`skipped ${file.name} (identical with remote)`);
                 file.skipFile();

package/dist/services/deploy/handler/server-config-handler.js

@@ -27,8 +27,8 @@ class ServerConfigHandler {
         const remoteConfig = JSON.parse(remote);
         // @ts-expect-error revision is unknown
         file.config.revision.version = remoteConfig.revision.version;
-        const { changedOrigins, diff } = await this.diffService.diffContent(file.name, file.getContent(), remote);
-        file.setContent(changedOrigins);
+        const { updatedFile, diff } = await this.diffService.diffContent(file.name, remote, file.getContent());
+        file.setContent(updatedFile);
         if (diff) {
             this.cli.writeWarning(`skipped ${file.name} (identical with remote)`);
             file.skipFile();

package/dist/services/diff/diff-service.d.ts

@@ -6,8 +6,8 @@ export declare class DiffService {
     private tempPath;
     constructor(cli: CliService, diffExecutablePath?: string, diffExecutableTemplate?: string);
     diff(localPath: string, fileName: string, temporaryContent: string): Promise<boolean>;
-    diffContent(fileName: string, localContent: string, remoteContent: string): Promise<{
-        changedOrigins: string;
+    diffContent(fileName: string, firstContent: string, secondContent: string, diffSuffix?: string[]): Promise<{
+        updatedFile: string;
         diff: boolean;
     }>;
     /**
@@ -26,9 +26,9 @@ export declare class DiffService {
      *
      * check if content of two files are equal
      *
-     * @param localPath
-     * @param remotePath
+     * @param firstPath
+     * @param secondPath
      * @param skipDiffExecution
      */
-    executeDiff(localPath: string, remotePath: string, skipDiffExecution?: boolean): Promise<boolean>;
+    executeDiff(firstPath: string, secondPath: string, skipDiffExecution?: boolean): Promise<boolean>;
 }

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

@@ -22,12 +22,14 @@ class DiffService {
         const temporaryFilePath = await this.writeContentToTemporalFile(fileName, temporaryContent);
         return await this.executeDiff(temporaryFilePath, localPath);
     }
-    async diffContent(fileName, localContent, remoteContent) {
-        const temporaryLocalFilePath = await this.writeContentToTemporalFile(`${fileName}-local`, localContent);
-        const temporaryRemoteFilePath = await this.writeContentToTemporalFile(`${fileName}-remote`, remoteContent);
-        const diff = await this.executeDiff(temporaryLocalFilePath, temporaryRemoteFilePath);
-        const changedFile = await (0, promises_1.readFile)(temporaryLocalFilePath, "utf-8");
-        return { changedOrigins: changedFile, diff };
+    async diffContent(fileName, firstContent, secondContent, diffSuffix = ["remote", "local"]) {
+        const temporaryFirstFilePath = await this.writeContentToTemporalFile(`${fileName}-${diffSuffix[0]}`, firstContent);
+        const temporarySecondFilePath = await this.writeContentToTemporalFile(`${fileName}-${diffSuffix[1]}`, secondContent);
+        const diff = await this.executeDiff(temporaryFirstFilePath, temporarySecondFilePath);
+        // return changes made in diffView
+        // eg adding changes from remote to safe locally
+        const changedFile = await (0, promises_1.readFile)(temporarySecondFilePath, "utf-8");
+        return { updatedFile: changedFile, diff };
     }
     /**
      * Returns a temporal directory path.
@@ -66,15 +68,15 @@ class DiffService {
      *
      * check if content of two files are equal
      *
-     * @param localPath
-     * @param remotePath
+     * @param firstPath
+     * @param secondPath
      * @param skipDiffExecution
      */
-    async executeDiff(localPath, remotePath, skipDiffExecution = false) {
-        let localContent;
-        let remoteContent;
+    async executeDiff(firstPath, secondPath, skipDiffExecution = false) {
+        let firstContent;
+        let secondContent;
         try {
-            localContent = await promises_1.default.readFile(localPath, {
+            firstContent = await promises_1.default.readFile(firstPath, {
                 encoding: "utf8",
                 flag: "r",
             });
@@ -83,17 +85,17 @@ class DiffService {
             return false;
         }
         try {
-            remoteContent = await promises_1.default.readFile(remotePath, {
+            secondContent = await promises_1.default.readFile(secondPath, {
                 encoding: "utf8",
                 flag: "r",
             });
         }
         catch (error) {
-            this.cli.writeError(`Error reading remote file ${remoteContent}: ${error.message}`);
+            this.cli.writeError(`Error reading remote file ${secondContent}: ${error.message}`);
             return false;
         }
         // Returning if no difference
-        if (this.isContentEqual(localContent, remoteContent)) {
+        if (this.isContentEqual(firstContent, secondContent)) {
             return true;
         }
         if (skipDiffExecution) {
@@ -106,8 +108,8 @@ class DiffService {
             try {
                 const command = this.diffExecutableTemplate
                     .replace("$exec", this.diffExecutablePath)
-                    .replace("$file1", localPath)
-                    .replace("$file2", remotePath);
+                    .replace("$file1", firstPath)
+                    .replace("$file2", secondPath);
                 (0, node_child_process_1.execSync)(command, { stdio: "pipe" });
             }
             catch (error) {
@@ -117,7 +119,7 @@ class DiffService {
         }
         let ideaCommandAvailable;
         try {
-            (0, node_child_process_1.execSync)(`idea diff "${localPath}" "${remotePath}"`, {
+            (0, node_child_process_1.execSync)(`idea diff "${firstPath}" "${secondPath}"`, {
                 stdio: ["pipe", "ignore", "pipe"], // prevent output of "/bin/sh: idea: command not found"
             });
             ideaCommandAvailable = true;
@@ -129,12 +131,12 @@ class DiffService {
             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" });
+                    (0, node_child_process_1.execSync)(`"%IDEA_INITIAL_DIRECTORY%\\idea" diff ${firstPath} ${secondPath}`, { stdio: "pipe" });
                 }
                 else {
                     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" });
+                    (0, node_child_process_1.execSync)(`"${ideaInitialDirectory}/idea" diff ${firstPath} ${secondPath}`, { stdio: "pipe" });
                 }
             }
             return false;

package/dist/services/onboarding/dashboard/diff-against-current-page.js

@@ -44,7 +44,7 @@ class DiffAgainstCurrentPage {
         this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
         const remoteFilePath = await this.diffService.writeContentToTemporalFile(`remote-${variant}.html`, originHtml);
         const localFilePath = await this.diffService.writeContentToTemporalFile("current.html", currentHtml);
-        return await this.diffService.executeDiff(localFilePath, remoteFilePath);
+        return await this.diffService.executeDiff(remoteFilePath, localFilePath);
     }
 }
 exports.DiffAgainstCurrentPage = DiffAgainstCurrentPage;

package/dist/services/onboarding/dashboard/request-diff-service.d.ts

@@ -7,7 +7,6 @@ export declare class RequestDiffService {
     constructor(diffService: DiffService, documentHandlerRuntime: DocumentHandlerServer);
     postDiff(requestOrigin: string, url: string, parametersString: string, autoCheck?: boolean): Promise<BaqendResponse>;
     private diffLocal;
-    private doOriginVsContentDiff;
     private fetchHtml;
     private createUrlsForDiff;
     private createBaqendResponse;

package/dist/services/onboarding/dashboard/request-diff-service.js

@@ -63,12 +63,6 @@ class RequestDiffService {
         const pureFilePath = await this.diffService.writeContentToTemporalFile("pure", transformedHtmlWithoutParameter);
         return await this.diffService.executeDiff(parametersFilePath, pureFilePath);
     }
-    async doOriginVsContentDiff(url, content) {
-        const html = await this.fetchHtml(url);
-        const origin = await this.diffService.writeContentToTemporalFile("origin", html);
-        const local = await this.diffService.writeContentToTemporalFile("content", content);
-        return await this.diffService.executeDiff(local, origin);
-    }
     async fetchHtml(url) {
         const agent = new node_https_1.Agent({
             rejectUnauthorized: false,

package/oclif.manifest.json

@@ -731,5 +731,5 @@
       ]
     }
   },
-  "version": "3.31.0"
+  "version": "3.31.2"
 }

package/package.json

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