json-sort-cli 3.1.0 → 3.1.2

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.1](https://github.com/codsen/codsen/compare/json-sort-cli@3.1.0...json-sort-cli@3.1.1) (2023-04-18)
+
+### Bug Fixes
+
+- fix `-c` flag to correctly recognise different EOLs as per `-l` ([5af3ba1](https://github.com/codsen/codsen/commit/5af3ba16962c2dd001005780a3843ecf675389f4)), closes [#73](https://github.com/codsen/codsen/issues/73)
+
 # [3.1.0](https://github.com/codsen/codsen/compare/json-sort-cli@3.0.12...json-sort-cli@3.1.0) (2023-04-16)
 
 ### Features

package/cli.js

@@ -86,56 +86,56 @@ const cli = meow(
     flags: {
       nodemodules: {
         type: "boolean",
-        alias: "n",
+        shortFlag: "n",
         default: false,
       },
       tabs: {
         type: "boolean",
-        alias: "t",
+        shortFlag: "t",
         default: false,
       },
       silent: {
         type: "boolean",
-        alias: "s",
+        shortFlag: "s",
         default: false,
       },
       arrays: {
         type: "boolean",
-        alias: "a",
+        shortFlag: "a",
         default: false,
       },
       pack: {
         type: "boolean",
-        alias: "p",
+        shortFlag: "p",
         default: false,
       },
       dry: {
         type: "boolean",
-        alias: "d",
+        shortFlag: "d",
         default: false,
       },
       ci: {
         type: "boolean",
-        alias: "c",
+        shortFlag: "c",
         default: false,
       },
       help: {
         type: "boolean",
-        alias: "h",
+        shortFlag: "h",
         default: false,
       },
       version: {
         type: "boolean",
-        alias: "v",
+        shortFlag: "v",
         default: false,
       },
       indentationCount: {
         type: "number",
-        alias: "i",
+        shortFlag: "i",
       },
       lineEnding: {
         type: "string",
-        alias: "l",
+        shortFlag: "l",
       },
     },
   }
@@ -171,6 +171,8 @@ function readSortAndWriteOverFile(oneOfPaths) {
   return fs
     .readFile(oneOfPaths, "utf8")
     .then((filesContent) => {
+      let eolChar = resolveEolSetting(filesContent, cli.flags.lineEnding);
+
       let parsedJson;
       try {
         // try to parse JSON
@@ -200,7 +202,7 @@ function readSortAndWriteOverFile(oneOfPaths) {
             spaces: cli.flags.tabs
               ? "\t".repeat(indentationCount)
               : indentationCount,
-            EOL: resolveEolSetting(filesContent, cli.flags.lineEnding),
+            EOL: eolChar,
           }
         );
       } else {
@@ -219,6 +221,8 @@ function readSortAndWriteOverFile(oneOfPaths) {
           // we read it, now we return true if result differs after processing
 
           let stringified = JSON.stringify(
+            // The traversal below will mutate, not just traverse, -
+            // whatever you return from the callback below, gets written
             traverse(obj, (key, val) => {
               let current = val !== undefined ? val : key;
               if (isPlainObject(current)) {
@@ -230,7 +234,7 @@ function readSortAndWriteOverFile(oneOfPaths) {
                 current.length > 1 &&
                 current.every(isStr)
               ) {
-                // alphabetical sort
+                // alphabetical sort, this value gets written
                 return current.sort((a, b) => a.localeCompare(b));
               }
               return current;
@@ -238,7 +242,25 @@ function readSortAndWriteOverFile(oneOfPaths) {
             null,
             cli.flags.tabs ? "\t".repeat(indentationCount) : indentationCount
           );
-          return stringified.trimEnd() !== filesContent.trimEnd();
+
+          if (eolChar === "\r\n") {
+            // CRLF
+            stringified = stringified
+              .replaceAll(/(?<!\r)\n/g, "\r\n")
+              .replaceAll(/\r(?!\n)/g, "\n");
+          } else {
+            // LF or CR
+            stringified = stringified.replaceAll(/(?:\r?\n)|\r/g, eolChar);
+          }
+
+          return (
+            stringified
+              .replaceAll(
+                /\r\n/g,
+                resolveEolSetting(filesContent, cli.flags.lineEnding)
+              )
+              .trimEnd() !== filesContent.trimEnd()
+          );
         }
 
         // ELSE,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-sort-cli",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "Command line app to deep sort JSON files, retains package.json special key order",
   "keywords": [
     "app",
@@ -67,19 +67,19 @@
     }
   },
   "dependencies": {
-    "ast-monkey-traverse": "^4.0.9",
+    "ast-monkey-traverse": "^4.0.10",
     "chalk": "^5.2.0",
-    "codsen-utils": "^1.4.0",
+    "codsen-utils": "^1.5.0",
     "fs-extra": "^11.1.1",
     "globby": "^13.1.4",
     "is-d": "^1.0.0",
-    "meow": "^11.0.0",
+    "meow": "^12.0.1",
     "p-filter": "^3.0.0",
     "p-reduce": "^3.0.0",
     "sort-package-json": "^2.4.1",
     "update-notifier": "^6.0.2"
   },
   "devDependencies": {
-    "p-map": "^5.5.0"
+    "p-map": "^6.0.0"
   }
 }