Merge pull request #4 from cto-af/update

update linewrap version, use new defaults

README.md

@@ -52,14 +52,17 @@ Options:
                                  indent? Default: false
   --isNewline <regex>            a regular expression to replace newlines in the
                                  input.  Empty to leave newlines in place.
+                                 Default: "[^\\S\\r\\n\\v\\f\\x85\\u2028\
+                                 \u2029]*[\\r\\n\\v\\f\\x85\\u2028\\u2029]+\\s*"
   -l,--locale <iso location>     locale for grapheme segmentation.  Has very
                                  little effect at the moment
   --newline <string>             how to separate the lines of output Default:
                                  "\n"
   --newlineReplacement <string>  when isNewline matches, replace with this
                                  string Default: " "
   -o,--outFile <file>            output to a file instead of stdout
-  --outdentFirst                 Do not indent the first output line
+  --outdentFirst                 Do not indent the first output line Default:
+                                 false
   --overflow <style>             what to do with words that are longer than
                                  width. (choices: "visible", "clip",
                                  "anywhere") Default: "visible"
@@ -68,7 +71,8 @@ Options:
                                  be specified multiple times. Default: []
   -v,--verbose                   turn on super-verbose information.  Not useful
                                  for anything but debugging underlying libraries
-  -w,--width <columns>           maximum line length Default: "80"
+  -w,--width <columns>           maximum line length Default: "(your terminal
+                                 width or 80)"
 ```
 
 ## Examples

bin/linewrap.js

@@ -23,7 +23,7 @@ const config = {
     },
     ellipsis: {
       type: 'string',
-      default: '\u{2026}',
+      default: LineWrap.DEFAULT_OPTIONS.ellipsis,
       argumentName: 'string',
       description: 'What string to use when a word is longer than the max width, and in overflow mode "clip"',
     },
@@ -41,7 +41,7 @@ const config = {
     html: {type: 'boolean', description: 'escape output for HTML'},
     hyphen: {
       type: 'string',
-      default: '-',
+      default: LineWrap.DEFAULT_OPTIONS.hyphen,
       argumentName: 'string',
       description: 'What string to use when a word is longer than the max width, and in overflow mode "any"',
     },
@@ -54,23 +54,26 @@ const config = {
     },
     indentChar: {
       type: 'string',
-      default: ' ',
+      default: LineWrap.DEFAULT_OPTIONS.indentChar,
       argumentName: 'string',
       description: 'if indent is a number, that many indentChars will be inserted before each line',
     },
     indentEmpty: {
       type: 'boolean',
-      default: false,
+      default: LineWrap.DEFAULT_OPTIONS.indentEmpty,
       description: 'if the input string is empty, should we still indent?',
     },
     isNewline: {
       type: 'string',
+      default: LineWrap.DEFAULT_OPTIONS.isNewline.source,
       argumentName: 'regex',
       description: 'a regular expression to replace newlines in the input.  Empty to leave newlines in place.',
     },
     locale: {
       short: 'l',
       type: 'string',
+      // This would make the tests depend on current locale:
+      // default: LineWrap.DEFAULT_OPTIONS.locale,
       argumentName: 'iso location',
       description: 'locale for grapheme segmentation.  Has very little effect at the moment',
     },
@@ -83,11 +86,12 @@ const config = {
     newlineReplacement: {
       type: 'string',
       argumentName: 'string',
-      default: ' ',
+      default: LineWrap.DEFAULT_OPTIONS.newlineReplacement,
       description: 'when isNewline matches, replace with this string',
     },
     outdentFirst: {
       type: 'boolean',
+      default: !LineWrap.DEFAULT_OPTIONS.indentFirst,
       description: 'Do not indent the first output line',
     },
     outFile: {

package.json

@@ -26,12 +26,12 @@
   "license": "MIT",
   "repository": "cto-af/linewrap-cli",
   "dependencies": {
-    "@cto.af/linewrap": "1.0.2",
+    "@cto.af/linewrap": "1.0.3",
     "minus-h": "1.1.1"
   },
   "devDependencies": {
     "@cto.af/eslint-config": "1.1.2",
-    "@types/node": "20.2.5",
+    "@types/node": "20.3.0",
     "c8": "7.14.0",
     "eslint": "8.42.0",
     "mocha": "10.2.0"

test/bin.test.js

@@ -49,14 +49,17 @@ const HELP = [
   '                                 indent? Default: false',
   '  --isNewline <regex>            a regular expression to replace newlines in the',
   '                                 input.  Empty to leave newlines in place.',
+  '                                 Default: "[^\\\\S\\\\r\\\\n\\\\v\\\\f\\\\x85\\\\u2028\\',
+  '                                 \\u2029]*[\\\\r\\\\n\\\\v\\\\f\\\\x85\\\\u2028\\\\u2029]+\\\\s*"',
   '  -l,--locale <iso location>     locale for grapheme segmentation.  Has very',
   '                                 little effect at the moment',
   '  --newline <string>             how to separate the lines of output Default:',
   '                                 "\\n"',
   '  --newlineReplacement <string>  when isNewline matches, replace with this',
   '                                 string Default: " "',
   '  -o,--outFile <file>            output to a file instead of stdout',
-  '  --outdentFirst                 Do not indent the first output line',
+  '  --outdentFirst                 Do not indent the first output line Default:',
+  '                                 false',
   '  --overflow <style>             what to do with words that are longer than',
   '                                 width. (choices: "visible", "clip",',
   '                                 "anywhere") Default: "visible"',