json-sort-cli 3.0.11 → 3.1.0

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.0](https://github.com/codsen/codsen/compare/json-sort-cli@3.0.12...json-sort-cli@3.1.0) (2023-04-16)
+
+### Features
+
+- `-l` or `--lineEnding` flag to override the default - the EOL format found in file (or LF) ([1788a77](https://github.com/codsen/codsen/commit/1788a7701629713a1b9ad9b992ad01aa7d456068))
+
 ## 3.0.7 (2023-01-06)
 
 ### Bug Fixes

package/cli.js

@@ -12,7 +12,7 @@ import pReduce from "p-reduce";
 import pFilter from "p-filter";
 import { globby } from "globby";
 import { createRequire } from "module";
-import { isPlainObject } from "codsen-utils";
+import { isPlainObject, resolveEolSetting } from "codsen-utils";
 import updateNotifier from "update-notifier";
 import { traverse } from "ast-monkey-traverse";
 import sortPackageJson, { sortOrder } from "sort-package-json";
@@ -66,7 +66,7 @@ const cli = meow(
   Options
     -n, --nodemodules      Don't ignore any node_modules folders
     -t, --tabs             Use tabs for JSON file indentation
-    -i, --indentationCount How many spaces or tabs to use (default = 2 spaces or 1 tab)
+    -i, --indentationCount How many spaces/tabs to use (default: 2 for spaces or 1 for tabs)
     -s, --silent           Does not show the result per-file, only totals in the end
     -h, --help             Shows this help
     -v, --version          Shows the current version
@@ -74,6 +74,8 @@ const cli = meow(
     -d, --dry              Only list all the files about to be processed
     -p, --pack             Exclude all package.json files
     -c, --ci               Only exits with non-zero code if files COULD BE sorted
+    -l, --lineEnding       Set to "cr", "crlf" or "lf" to override the default
+                           (which is either EOL format used in the file, or Mac LF)
 
   Example
     Call anywhere using glob patterns. If you put them as string, this library
@@ -131,6 +133,10 @@ const cli = meow(
         type: "number",
         alias: "i",
       },
+      lineEnding: {
+        type: "string",
+        alias: "l",
+      },
     },
   }
 );
@@ -194,6 +200,7 @@ function readSortAndWriteOverFile(oneOfPaths) {
             spaces: cli.flags.tabs
               ? "\t".repeat(indentationCount)
               : indentationCount,
+            EOL: resolveEolSetting(filesContent, cli.flags.lineEnding),
           }
         );
       } else {
@@ -258,6 +265,7 @@ function readSortAndWriteOverFile(oneOfPaths) {
               spaces: cli.flags.tabs
                 ? "\t".repeat(indentationCount)
                 : indentationCount,
+              EOL: resolveEolSetting(filesContent, cli.flags.lineEnding),
             }
           )
           .then(() => {
@@ -265,7 +273,7 @@ function readSortAndWriteOverFile(oneOfPaths) {
               log(
                 `${chalk.grey(
                   prefix
-                )}${oneOfPaths} - ${`\u001b[${32}m${`OK`}\u001b[${39}m`}`
+                )}${oneOfPaths} - ${`\u001b[${32}m${"OK"}\u001b[${39}m`}`
               );
             }
             return true;
@@ -274,7 +282,7 @@ function readSortAndWriteOverFile(oneOfPaths) {
     })
     .catch((err) => {
       console.log(
-        `${oneOfPaths} - ${`\u001b[${31}m${`BAD`}\u001b[${39}m`} - ${err}`
+        `${oneOfPaths} - ${`\u001b[${31}m${"BAD"}\u001b[${39}m`} - ${err}`
       );
     });
 }
@@ -318,8 +326,8 @@ globby(input, { dot: true })
   .then((paths) =>
     pReduce(
       paths,
-      (concattedTotal, singleDirOrFilePath) =>
-        concattedTotal.concat(
+      (concatTotal, singleDirOrFilePath) =>
+        concatTotal.concat(
           isDirectory(singleDirOrFilePath).then((bool) =>
             bool
               ? globby(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-sort-cli",
-  "version": "3.0.11",
+  "version": "3.1.0",
   "description": "Command line app to deep sort JSON files, retains package.json special key order",
   "keywords": [
     "app",
@@ -67,11 +67,11 @@
     }
   },
   "dependencies": {
-    "ast-monkey-traverse": "^4.0.7",
+    "ast-monkey-traverse": "^4.0.9",
     "chalk": "^5.2.0",
-    "codsen-utils": "^1.3.0",
+    "codsen-utils": "^1.4.0",
     "fs-extra": "^11.1.1",
-    "globby": "^13.1.3",
+    "globby": "^13.1.4",
     "is-d": "^1.0.0",
     "meow": "^11.0.0",
     "p-filter": "^3.0.0",