@prantlf/jsonlint 11.1.0 → 11.2.1

package/README.md

@@ -74,7 +74,7 @@ By default, `jsonlint` will either report a syntax error with details or pretty-
 
     $ jsonlint -h
 
-    Usage: jsonlint [options] [<file or directory> ...]
+    Usage: jsonlint [options] [<file, directory, pattern> ...]
 
     JSON parser, syntax and schema validator and pretty-printer.
 
@@ -95,11 +95,14 @@ By default, `jsonlint` will either report a syntax error with details or pretty-
       -V, --validate [file]        JSON schema file to use for validation
       -e, --environment [env]      which specification of JSON Schema the
                                    validation file uses
-      -q, --quiet                  do not print the parsed json to stdin
+      -l, --log-files              print only the parsed file names to stdout
+      -q, --quiet                  do not print the parsed json to stdout
+      -n, --continue               continue with other files if an error occurs
       -p, --pretty-print           prettify the input instead of stringifying
                                    the parsed object
       -P, --pretty-print-invalid   force pretty-printing even for invalid input
       -r, --trailing-newline       ensure a line break at the end of the output
+      -R, --no-trailing-newline    ensure no line break at the end of the output
       --prune-comments             omit comments from the prettified output
       --strip-object-keys          strip quotes from object keys if possible
                                    (JSON5)
@@ -111,6 +114,10 @@ By default, `jsonlint` will either report a syntax error with details or pretty-
       -v, --version                output the version number
       -h, --help                   output usage information
 
+    You can use BASH patterns for including and excluding files (only files).
+    Patterns are case-sensitive and have to use slashes as a path separators.
+    A pattern to exclude from processing starts with "!".
+
     Parsing mode can be "cjson" or "json5" to enable other flags automatically.
     If no files or directories are specified, stdin will be parsed. Environments
     for JSON schema validation are "json-schema-draft-04", "json-schema-draft-06"
@@ -324,7 +331,6 @@ Licensed under the [MIT License].
 
 [MIT License]: http://en.wikipedia.org/wiki/MIT_License
 [pure JavaScript version]: http://prantlf.github.com/jsonlint/
-[jsonlint.com]: http://jsonlint.com
 [JSON]: https://tools.ietf.org/html/rfc8259
 [JSON5]: https://spec.json5.org
 [JSON Schema]: https://json-schema.org

package/lib/cli.js

@@ -1,24 +1,23 @@
 #!/usr/bin/env node
 
-const fs = require('fs')
-const path = require('path')
-const parser = require('./jsonlint')
-const formatter = require('./formatter')
-const printer = require('./printer')
-const sorter = require('./sorter')
-const validator = require('./validator')
-const pkg = require('../package')
+const { readdirSync, readFileSync, statSync, writeFileSync } = require('fs')
+const { extname, join, normalize } = require('path')
+const { isDynamicPattern, sync } = require('fast-glob')
+const { parse, tokenize } = require('./jsonlint')
+const { format } = require('./formatter')
+const { print } = require('./printer')
+const { sortObject } = require('./sorter')
+const { compile } = require('./validator')
+const { description, version } = require('../package')
 
-function collectExtensions (extension) {
-  return extension.split(',')
-}
+const collectValues = extension => extension.split(',')
 
 const commander = require('commander')
   .name('jsonlint')
-  .usage('[options] [<file or directory> ...]')
-  .description(pkg.description)
+  .usage('[options] [<file, directory, pattern> ...]')
+  .description(description)
   .option('-s, --sort-keys', 'sort object keys (not when prettifying)')
-  .option('-E, --extensions [ext]', 'file extensions to process for directory walk', collectExtensions, ['json', 'JSON'])
+  .option('-E, --extensions [ext]', 'file extensions to process for directory walk', collectValues, ['json', 'JSON'])
   .option('-i, --in-place', 'overwrite the input files')
   .option('-t, --indent [num|char]', 'number of spaces or specific characters to use for indentation', 2)
   .option('-c, --compact', 'compact error display')
@@ -29,17 +28,24 @@ const commander = require('commander')
   .option('-D, --no-duplicate-keys', 'report duplicate object keys as an error')
   .option('-V, --validate [file]', 'JSON schema file to use for validation')
   .option('-e, --environment [env]', 'which specification of JSON Schema the validation file uses')
-  .option('-q, --quiet', 'do not print the parsed json to stdin')
+  .option('-l, --log-files', 'print only the parsed file names to stdout')
+  .option('-q, --quiet', 'do not print the parsed json to stdout')
+  .option('-n, --continue', 'continue with other files if an error occurs')
   .option('-p, --pretty-print', 'prettify the input instead of stringifying the parsed object')
   .option('-P, --pretty-print-invalid', 'force pretty-printing even for invalid input')
   .option('-r, --trailing-newline', 'ensure a line break at the end of the output')
+  .option('-R, --no-trailing-newline', 'ensure no line break at the end of the output')
   .option('--prune-comments', 'omit comments from the prettified output')
   .option('--strip-object-keys', 'strip quotes from object keys if possible (JSON5)')
   .option('--enforce-double-quotes', 'surrounds all strings with double quotes')
   .option('--enforce-single-quotes', 'surrounds all strings with single quotes (JSON5)')
   .option('--trim-trailing-commas', 'omit trailing commas from objects and arrays (JSON5)')
-  .version(pkg.version, '-v, --version')
+  .version(version, '-v, --version')
   .on('--help', () => {
+    console.log()
+    console.log('You can use BASH patterns for including and excluding files (only files).')
+    console.log('Patterns are case-sensitive and have to use slashes as a path separators.')
+    console.log('A pattern to exclude from processing starts with "!".')
     console.log()
     console.log('Parsing mode can be "cjson" or "json5" to enable other flags automatically.')
     console.log('If no files or directories are specified, stdin will be parsed. Environments')
@@ -49,8 +55,12 @@ const commander = require('commander')
   .parse(process.argv)
 
 const options = commander.opts()
+const extensions = options.extensions.map(extension => '.' + extension)
 
 function logNormalError (error, file) {
+  if (process.exitCode > 0) {
+    console.log()
+  }
   console.log('File:', file)
   console.error(error.message)
 }
@@ -60,7 +70,7 @@ function logCompactError (error, file) {
     ', col ' + error.location.start.column + ', ' + error.reason + '.')
 }
 
-function parse (source, file) {
+function processContents (source, file) {
   let parserOptions, parsed, formatted
   try {
     parserOptions = {
@@ -73,9 +83,9 @@ function parse (source, file) {
     if (options.validate) {
       let validate
       try {
-        const schema = fs.readFileSync(path.normalize(options.validate), 'utf8')
+        const schema = readFileSync(normalize(options.validate), 'utf8')
         parserOptions.environment = options.environment
-        validate = validator.compile(schema, parserOptions)
+        validate = compile(schema, parserOptions)
       } catch (error) {
         const message = 'Loading the JSON schema failed: "' +
           options.validate + '".\n' + error.message
@@ -83,13 +93,13 @@ function parse (source, file) {
       }
       parsed = validate(source, parserOptions)
     } else {
-      parsed = parser.parse(source, parserOptions)
+      parsed = parse(source, parserOptions)
     }
     if (options.prettyPrint) {
       parserOptions.rawTokens = true
-      const tokens = parser.tokenize(source, parserOptions)
+      const tokens = tokenize(source, parserOptions)
       // TODO: Support sorting tor the tokenized input too.
-      return printer.print(tokens, {
+      return print(tokens, {
         indent: options.indent,
         pruneComments: options.pruneComments,
         stripObjectKeys: options.stripObjectKeys,
@@ -99,7 +109,7 @@ function parse (source, file) {
       })
     }
     if (options.sortKeys) {
-      parsed = sorter.sortObject(parsed)
+      parsed = sortObject(parsed)
     }
     return JSON.stringify(parsed, null, options.indent)
   } catch (e) {
@@ -110,9 +120,9 @@ function parse (source, file) {
        * manual formatter because the automatic one is faster and probably more reliable.
        */
       try {
-        formatted = formatter.format(source, options.indent)
+        formatted = format(source, options.indent)
         // Re-parse so exception output gets better line numbers
-        parsed = parser.parse(formatted)
+        parsed = parse(formatted)
       } catch (e) {
         if (options.compact) {
           logCompactError(e, file)
@@ -129,67 +139,97 @@ function parse (source, file) {
         logNormalError(e, file)
       }
     }
-    process.exit(1)
+    if (options.continue) {
+      process.exitCode = 1
+    } else {
+      process.exit(1)
+    }
   }
 }
 
 function processFile (file) {
-  file = path.normalize(file)
-  let source = parse(fs.readFileSync(file, 'utf8'), file)
+  file = normalize(file)
+  if (options.logFiles) {
+    console.log(file)
+  }
+  const original = readFileSync(file, 'utf8')
+  let source = processContents(original, file)
   if (options.inPlace) {
-    if (options.trailingNewline) {
+    const lines = original.split(/\r?\n/)
+    const newLine = !lines[lines.length - 1]
+    if (options.trailingNewline === true ||
+        (options.trailingNewline !== false && newLine)) {
       source += '\n'
     }
-    fs.writeFileSync(file, source)
+    writeFileSync(file, source)
   } else {
-    if (!options.quiet) {
+    if (!(options.quiet || options.logFiles)) {
       console.log(source)
     }
   }
 }
 
-function processSources (src, checkExtension) {
-  const extensions = options.extensions.map(function (extension) {
-    return '.' + extension
-  })
-  let srcStat
+function processSource (src, checkExtension) {
   try {
-    srcStat = fs.statSync(src)
+    const srcStat = statSync(src)
     if (srcStat.isFile()) {
       if (checkExtension) {
-        const ext = path.extname(src)
+        const ext = extname(src)
         if (extensions.indexOf(ext) < 0) {
           return
         }
       }
       processFile(src)
     } else if (srcStat.isDirectory()) {
-      const sources = fs.readdirSync(src)
-      for (let i = 0; i < sources.length; i++) {
-        processSources(path.join(src, sources[i]), true)
+      const sources = readdirSync(src)
+      for (const source of sources) {
+        processSource(join(src, source), true)
       }
     }
-  } catch (err) {
-    console.log('WARN', err.message)
+  } catch ({ message }) {
+    console.log('WARN', message)
+  }
+}
+
+function processPatterns (patterns) {
+  const files = sync(patterns, { onlyFiles: true })
+  if (!files.length) {
+    console.log('no files found')
+    process.exit(1)
+  }
+  for (const file of files) {
+    try {
+      processFile(file)
+    } catch ({ message }) {
+      console.log('WARN', message)
+    }
   }
 }
 
 function main () {
-  const files = commander.args
-  let source = ''
+  const { args: files } = commander
   if (files.length) {
-    for (let i = 0; i < files.length; i++) {
-      processSources(files[i], false)
+    const dynamic = files.some(file => isDynamicPattern(file))
+    if (dynamic) {
+      processPatterns(files)
+    } else {
+      for (const file of files) {
+        processSource(file, false)
+      }
     }
   } else {
+    let source = ''
     const stdin = process.openStdin()
     stdin.setEncoding('utf8')
-    stdin.on('data', function (chunk) {
+    stdin.on('data', chunk => {
       source += chunk.toString('utf8')
     })
-    stdin.on('end', function () {
-      const parsed = parse(source, '<stdin>')
-      if (!options.quiet) {
+    stdin.on('end', () => {
+      if (options.logFiles) {
+        console.log('<stdin>')
+      }
+      const parsed = processContents(source, '<stdin>')
+      if (!(options.quiet || options.logFiles)) {
         console.log(parsed)
       }
     })

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@prantlf/jsonlint",
-  "version": "11.1.0",
+  "version": "11.2.1",
   "description": "JSON/CJSON/JSON5 parser, syntax and schema validator and pretty-printer.",
   "author": "Ferdinand Prantl <prantlf@gmail.com> (http://prantl.tk)",
   "contributors": [
+    "Ondrej Medek <xmedeko@gmail.com>",
     "Greg Inman <ginman@itriagehealth.com>",
     "Paul Vollmer <mail@paulvollmer.net> (http://paulvollmer.net)",
     "Zach Carter <zach@carter.name> (http://zaa.ch)"
@@ -58,28 +59,29 @@
       "text"
     ]
   },
-  "standard": {
-    "ignore": [
-      "benchmarks/jison",
-      "benchmarks/pegjs",
-      "jsonlint*.js",
-      "test/fails",
-      "test/passes",
-      "test/recursive",
-      "test/v8"
+  "release": {
+    "plugins": [
+      "@semantic-release/commit-analyzer",
+      "@semantic-release/release-notes-generator",
+      "@semantic-release/changelog",
+      "@semantic-release/npm",
+      [
+        "@semantic-release/github",
+        {
+          "failComment": false
+        }
+      ],
+      "@semantic-release/git"
     ]
   },
-  "keywords": [
-    "json",
-    "validation",
-    "lint",
-    "jsonlint"
-  ],
   "dependencies": {
     "ajv": "6.12.6",
-    "commander": "9.2.0"
+    "commander": "9.2.0",
+    "fast-glob": "3.2.11"
   },
   "devDependencies": {
+    "@semantic-release/changelog": "^6.0.1",
+    "@semantic-release/git": "^10.0.1",
     "@types/node": "17.0.30",
     "@typescript-eslint/eslint-plugin": "5.21.0",
     "@typescript-eslint/parser": "5.21.0",
@@ -94,5 +96,11 @@
     "terser": "5.13.1",
     "test": "0.6.0",
     "typescript": "4.6.4"
-  }
+  },
+  "keywords": [
+    "json",
+    "validation",
+    "lint",
+    "jsonlint"
+  ]
 }

package/web/jsonlint.html

@@ -79,7 +79,7 @@
 <body>
   <header>
     <h1>JSON Lint</h1>
-    <p>Enter data and optionally schema in the form below to validate them. A pure JavaScript version of the service provided at <a href="http://jsonlint.com/">jsonlint.com</a>.</p>
+    <p>Enter data and optionally schema in the form below to validate them.</p>
   </header>
   <main>
     <section>
@@ -111,7 +111,7 @@
             </div>
             <div>
               <input type="checkbox" checked id="duplicate-object-keys">
-              <label for="single-quoted-strings">Allow duplicate object keys</label>
+              <label for="duplicate-object-keys">Allow duplicate object keys</label>
             </div>
           </div>
           <div>
@@ -179,7 +179,7 @@
   </main>
   <hr>
   <footer>
-    <small>Copyright &copy; 2012-2019 Zachary Carter, Ferdinand Prantl. See the <a href="https://github.com/prantlf/jsonlint#json-lint">project pages</a> to learn about command-line validation and programmatic usage.</small>
+    <small>Copyright &copy; 2012-2022 Zachary Carter, Ferdinand Prantl. See the <a href="https://github.com/prantlf/jsonlint#json-lint">project pages</a> to learn about command-line validation and programmatic usage.</small>
     <!-- See http://tholman.com/github-corners/ -->
     <a href="http://github.com/prantlf/jsonlint" class="github-corner" title="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
   </footer>