@prantlf/jsonlint 10.2.0 → 11.0.0

package/lib/printer.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
-  // eslint-disable-next-line no-unused-expressions
+  // eslint-disable-next-line no-unused-expressions, multiline-ternary
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports)
-  // eslint-disable-next-line no-undef
+  // eslint-disable-next-line no-undef, multiline-ternary
     : typeof define === 'function' && define.amd ? define('jsonlint-printer', ['exports'], factory)
     // eslint-disable-next-line no-undef
       : (global = global || self, factory(global.jsonlintPrinter = {}))
@@ -15,9 +15,9 @@
   }
 
   function concatenateTokens (tokens) {
-    var outputString = ''
-    var tokenCount = tokens.length
-    var tokenIndex
+    let outputString = ''
+    const tokenCount = tokens.length
+    let tokenIndex
     for (tokenIndex = 0; tokenIndex < tokenCount; ++tokenIndex) {
       outputString += tokens[tokenIndex].raw
     }
@@ -39,32 +39,32 @@
       return concatenateTokens(tokens)
     }
 
-    var indentString = options.indent
+    let indentString = options.indent
     if (typeof indentString === 'number') {
       indentString = new Array(indentString + 1).join(' ')
     }
     // Setting the indent to an empty string enables pretty-printing too.
     // It will just insert line breaks without any indentation.
-    var prettyPrint = indentString !== undefined
-    var pruneComments = options.pruneComments
-    var stripObjectKeys = options.stripObjectKeys
-    var enforceDoubleQuotes = options.enforceDoubleQuotes
-    var enforceSingleQuotes = options.enforceSingleQuotes
-    var trimTrailingCommas = options.trimTrailingCommas
+    const prettyPrint = indentString !== undefined
+    const pruneComments = options.pruneComments
+    const stripObjectKeys = options.stripObjectKeys
+    const enforceDoubleQuotes = options.enforceDoubleQuotes
+    const enforceSingleQuotes = options.enforceSingleQuotes
+    const trimTrailingCommas = options.trimTrailingCommas
 
-    var outputString = ''
-    var foundLineBreak, addedLineBreak, needsLineBreak
-    var addedSpace, needsSpace
-    var indentLevel = 0
-    var scopes = []
-    var scopeType
-    var isValue
-    var tokenCount = tokens.length
-    var tokenIndex, token, tokenType, tokenContent
+    let outputString = ''
+    let foundLineBreak, addedLineBreak, needsLineBreak
+    let addedSpace, needsSpace
+    let indentLevel = 0
+    const scopes = []
+    let scopeType
+    let isValue
+    const tokenCount = tokens.length
+    let tokenIndex, token, tokenType, tokenContent
 
     function peekAtNextToken () {
-      var nextTokenIndex = tokenIndex
-      var nextToken
+      let nextTokenIndex = tokenIndex
+      let nextToken
       do {
         nextToken = tokens[++nextTokenIndex]
       } while (nextToken && (nextToken.type === 'whitespace' ||
@@ -72,10 +72,10 @@
       return nextToken
     }
 
-    var addIndent
+    let addIndent
     if (prettyPrint && indentString) {
       addIndent = function () {
-        for (var i = 0; i < indentLevel; ++i) {
+        for (let i = 0; i < indentLevel; ++i) {
           outputString += indentString
         }
       }
@@ -83,7 +83,7 @@
       addIndent = noop
     }
 
-    var addLineBreak, addDelayedSpaceOrLineBreak
+    let addLineBreak, addDelayedSpaceOrLineBreak
     if (prettyPrint) {
       addLineBreak = function () {
         outputString += '\n'
@@ -103,7 +103,7 @@
       addLineBreak = addDelayedSpaceOrLineBreak = noop
     }
 
-    var addStandaloneComment, tryAddingInlineComment
+    let addStandaloneComment, tryAddingInlineComment
     if (pruneComments) {
       addStandaloneComment = tryAddingInlineComment = noop
     } else {
@@ -130,10 +130,10 @@
           addedSpace = false
 
           // Start with the character after the just processed one.
-          var tryTokenIndex = tokenIndex + 1
+          let tryTokenIndex = tokenIndex + 1
 
           function skipWhitespace () {
-            var token = tokens[tryTokenIndex]
+            let token = tokens[tryTokenIndex]
             if (token && token.type === 'whitespace') {
               foundLineBreak = token.raw.indexOf('\n') >= 0
               token = tokens[++tryTokenIndex]
@@ -141,7 +141,7 @@
             return token
           }
 
-          var token = skipWhitespace()
+          const token = skipWhitespace()
           // If line break followed the previous token, leave the comment
           // to be handled by the next usual token processing.
           if (!foundLineBreak && token && token.type === 'comment') {
@@ -193,7 +193,7 @@
 
     function addLiteral () {
       addDelayedSpaceOrLineBreak()
-      var tokenValue = token.value
+      const tokenValue = token.value
       if (stripObjectKeys && scopeType === '{' && !isValue &&
           isIdentifierName(tokenValue)) {
         outputString += tokenValue
@@ -234,7 +234,7 @@
 
     function addComma () {
       if (trimTrailingCommas) {
-        var nextToken = peekAtNextToken()
+        const nextToken = peekAtNextToken()
         if (nextToken && nextToken.type === 'symbol') {
           return tryAddingInlineComment()
         }

package/lib/schema-drafts.js

@@ -1,7 +1,10 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
-  typeof define === 'function' && define.amd ? define('jsonlintSchemaDrafts', ['exports'], factory) :
-  (global = global || self, factory(global.jsonlintSchemaDrafts = {}));
+  // eslint-disable-next-line no-unused-expressions, multiline-ternary
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports)
+  // eslint-disable-next-line no-undef, multiline-ternary
+    : typeof define === 'function' && define.amd ? define('jsonlintSchemaDrafts', ['exports'], factory)
+    // eslint-disable-next-line no-undef
+      : (global = global || self, factory(global.jsonlintSchemaDrafts = {}));
 }(this, function (exports) { 'use strict';
 
 exports["json-schema-draft-04"] = {

package/lib/sorter.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
-  // eslint-disable-next-line no-unused-expressions
+  // eslint-disable-next-line no-unused-expressions, multiline-ternary
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports)
-  // eslint-disable-next-line no-undef
+  // eslint-disable-next-line no-undef, multiline-ternary
     : typeof define === 'function' && define.amd ? define('jsonlint-sorter', ['exports'], factory)
     // eslint-disable-next-line no-undef
       : (global = global || self, factory(global.jsonlintSorter = {}))
@@ -9,16 +9,16 @@
   'use strict'
 
   // from http://stackoverflow.com/questions/1359761/sorting-a-json-object-in-javascript
-  var hasOwnProperty = Object.prototype.hasOwnProperty
+  const hasOwnProperty = Object.prototype.hasOwnProperty
   function sortObject (o) {
     if (Array.isArray(o)) {
       return o.map(sortObject)
     } else if (Object.prototype.toString.call(o) !== '[object Object]') {
       return o
     }
-    var sorted = {}
-    var key
-    var a = []
+    const sorted = {}
+    let key
+    const a = []
     for (key in o) {
       if (hasOwnProperty.call(o, key)) {
         a.push(key)

package/lib/validator.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
   if (typeof exports === 'object' && typeof module !== 'undefined') {
-    var jsonlint = require('./jsonlint')
-    var Ajv = require('ajv')
+    const jsonlint = require('./jsonlint')
+    const Ajv = require('ajv')
     // eslint-disable-next-line no-inner-declarations
     function requireSchemaDraft (environment) {
       return require('ajv/lib/refs/' + environment + '.json')
@@ -20,7 +20,7 @@
   } else {
     // eslint-disable-next-line no-undef
     global = global || self
-    var requireSchemaDraft = function (environment) {
+    const requireSchemaDraft = function (environment) {
       return global.jsonlintSchemaDrafts[environment]
     }
     factory(global.jsonlintValidator = {}, global.Ajv, global.jsonlint, requireSchemaDraft)
@@ -29,24 +29,24 @@
   'use strict'
 
   function addErrorLocation (problem, input, tokens, dataPath) {
-    var token = tokens.find(function (token) {
+    const token = tokens.find(function (token) {
       return dataPath === jsonlint.pathToPointer(token.path)
     })
     if (token) {
-      var location = token.location.start
-      var offset = location.offset
-      var line = location.line
-      var column = location.column
-      var texts = jsonlint.getErrorTexts(problem.reason, input, offset, line, column)
+      const location = token.location.start
+      const offset = location.offset
+      const line = location.line
+      const column = location.column
+      const texts = jsonlint.getErrorTexts(problem.reason, input, offset, line, column)
       problem.message = texts.message
       problem.excerpt = texts.excerpt
       if (texts.pointer) {
         problem.pointer = texts.pointer
         problem.location = {
           start: {
-            column: column,
-            line: line,
-            offset: offset
+            column,
+            line,
+            offset
           }
         }
       }
@@ -55,13 +55,13 @@
   }
 
   function errorToProblem (error, input, tokens) {
-    var dataPath = error.dataPath
-    var schemaPath = error.schemaPath
-    var reason = (dataPath || '/') + ' ' + error.message + '; see ' + schemaPath
-    var problem = {
-      reason: reason,
-      dataPath: dataPath,
-      schemaPath: schemaPath
+    const dataPath = error.dataPath
+    const schemaPath = error.schemaPath
+    const reason = (dataPath || '/') + ' ' + error.message + '; see ' + schemaPath
+    const problem = {
+      reason,
+      dataPath,
+      schemaPath
     }
     if (!addErrorLocation(problem, input, tokens, dataPath)) {
       problem.message = reason
@@ -80,7 +80,7 @@
       tokenLocations: true,
       tokenPaths: true
     })
-    var tokens = jsonlint.tokenize(input, options)
+    const tokens = jsonlint.tokenize(input, options)
     // var problems = errors.map(function (error) {
     //   return errorToProblem(error, input, tokens)
     // })
@@ -89,15 +89,15 @@
     //     return problem.message
     //   })
     //   .join('\n')
-    var problem = errorToProblem(errors[0], input, tokens)
-    var error = new SyntaxError(problem.message)
+    const problem = errorToProblem(errors[0], input, tokens)
+    const error = new SyntaxError(problem.message)
     Object.assign(error, problem)
     return error
   }
 
   function createAjv (environment) {
-    var ajvOptions = { jsonPointers: true }
-    var ajv
+    const ajvOptions = { jsonPointers: true }
+    let ajv
     if (!environment) {
       ajvOptions.schemaId = 'auto'
       ajv = new Ajv(ajvOptions)
@@ -120,7 +120,7 @@
   }
 
   function compileSchema (ajv, schema, parseOptions) {
-    var parsed
+    let parsed
     try {
       parsed = jsonlint.parse(schema, parseOptions)
     } catch (error) {
@@ -130,8 +130,8 @@
     try {
       return ajv.compile(parsed)
     } catch (originalError) {
-      var errors = ajv.errors
-      var betterError = errors
+      const errors = ajv.errors
+      const betterError = errors
         ? createError(errors, parsed, schema, parseOptions)
         : originalError
       betterError.message = 'Compiling the JSON schema failed.\n' + betterError.message
@@ -140,20 +140,20 @@
   }
 
   function compile (schema, environment) {
-    var options = {}
+    let options = {}
     if (typeof environment === 'object' && !(environment instanceof String)) {
       options = environment
       environment = options.environment
     }
-    var ajv = createAjv(environment)
-    var parseOptions = {
+    const ajv = createAjv(environment)
+    const parseOptions = {
       mode: options.mode,
       ignoreComments: options.ignoreComments,
       ignoreTrailingCommas: options.ignoreTrailingCommas,
       allowSingleQuotedStrings: options.allowSingleQuotedStrings,
       allowDuplicateObjectKeys: options.allowDuplicateObjectKeys
     }
-    var validate = compileSchema(ajv, schema, parseOptions)
+    const validate = compileSchema(ajv, schema, parseOptions)
     return function (data, input, options) {
       if (typeof data === 'string' || data instanceof String) {
         options = input

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@prantlf/jsonlint",
-  "version": "10.2.0",
-  "description": "JSON parser, syntax and schema validator and pretty-printer.",
+  "version": "11.0.0",
+  "description": "JSON/CJSON/JSON5 parser, syntax and schema validator and pretty-printer.",
   "author": "Ferdinand Prantl <prantlf@gmail.com> (http://prantl.tk)",
   "contributors": [
     "Greg Inman <ginman@itriagehealth.com>",
@@ -29,16 +29,20 @@
   "bin": {
     "jsonlint": "lib/cli.js"
   },
+  "files": [
+    "lib",
+    "web"
+  ],
   "engines": {
-    "node": ">= 6"
+    "node": ">= 12"
   },
   "scripts": {
     "prepare": "npm run lint && npm run build",
     "lint": "npm run lint:js && npm run lint:ts",
-    "lint:js": "standard --fix -v",
-    "lint:ts": "tslint --fix -t stylish lib/*.ts test/*.ts",
+    "lint:js": "eslint --fix lib scripts src test",
+    "lint:ts": "eslint -c .tslintrc.yml --fix lib/*.ts test/*.ts",
     "build": "npm run compile && npm run compile:tests",
-    "compile": "node scripts/bundle-jsonlint && uglifyjs -o web/jsonlint.min.js --source-map \"filename='jsonlint.js',url='jsonlint.min.js.map',includeSources=true\" lib/jsonlint.js && uglifyjs -o web/validator.min.js --source-map \"filename='validator.js',url='validator.min.js.map',includeSources=true\" lib/validator.js && uglifyjs -o web/formatter.min.js --source-map \"filename='formatter.js',url='formatter.min.js.map',includeSources=true\" lib/formatter.js && uglifyjs -o web/sorter.min.js --source-map \"filename='sorter.js',url='sorter.min.js.map',includeSources=true\" lib/sorter.js && uglifyjs -o web/printer.min.js --source-map \"filename='printer.js',url='printer.min.js.map',includeSources=true\" lib/printer.js && node scripts/bundle-schema-drafts && uglifyjs -o web/schema-drafts.min.js --source-map \"filename='schema-drafts.js',url='schema-drafts.min.js.map',includeSources=true\" lib/schema-drafts.js && uglifyjs -o web/ajv.min.js --source-map \"filename='ajv.js',url='ajv.min.js.map',includeSources=true\" node_modules/ajv/dist/ajv.bundle.js",
+    "compile": "node scripts/bundle-jsonlint && terser -o web/jsonlint.min.js --source-map \"filename='jsonlint.js',url='jsonlint.min.js.map',includeSources=true\" lib/jsonlint.js && terser -o web/validator.min.js --source-map \"filename='validator.js',url='validator.min.js.map',includeSources=true\" lib/validator.js && terser -o web/formatter.min.js --source-map \"filename='formatter.js',url='formatter.min.js.map',includeSources=true\" lib/formatter.js && terser -o web/sorter.min.js --source-map \"filename='sorter.js',url='sorter.min.js.map',includeSources=true\" lib/sorter.js && terser -o web/printer.min.js --source-map \"filename='printer.js',url='printer.min.js.map',includeSources=true\" lib/printer.js && node scripts/bundle-schema-drafts && terser -o web/schema-drafts.min.js --source-map \"filename='schema-drafts.js',url='schema-drafts.min.js.map',includeSources=true\" lib/schema-drafts.js && terser -o web/ajv.min.js --source-map \"filename='ajv.js',url='ajv.min.js.map',includeSources=true\" node_modules/ajv/dist/ajv.bundle.js",
     "compile:tests": "tsc --lib es6 test/typings.test.ts",
     "test": "nyc --silent node test/typings.test.js && nyc --silent --no-clean node test/parse1 && nyc --silent --no-clean node test/parse1 --native-parser && nyc --silent --no-clean node test/parse2 && nyc --silent --no-clean node test/parse3 && nyc --silent --no-clean node test/parse4 && nyc --silent --no-clean node test/parse5 && nyc --silent --no-clean node test/portable && nyc --silent --no-clean node test/tokenize && nyc --silent --no-clean node test/print && nyc --silent --no-clean node lib/cli package.json test/recursive && nyc --silent --no-clean node lib/cli -sq test/passes/hasOwnProperty.json && nyc --silent --no-clean node lib/cli -s -e json-schema-draft-04 -V test/passes/3.schema.json test/passes/3.json && nyc --silent --no-clean node lib/cli -C test/passes/comments.txt && nyc --silent --no-clean node lib/cli -pS test/passes/strings.txt && nyc --silent --no-clean node lib/cli -M json5 test/passes/json5.text && nyc --silent --no-clean node lib/cli -v && nyc --silent --no-clean node lib/cli -h && nyc --silent --no-clean node lib/cli -Pc test/fails/10.json || nyc report",
     "start": "http-server -c 5",
@@ -48,6 +52,12 @@
     "web:sync": "cp web/*.min.* ../jsonlint-pages/ && cp web/jsonlint.html ../jsonlint-pages/index.html",
     "web:deploy": "cd ../jsonlint-pages && git commit -a -m 'Deploy site updates' && git push origin gh-pages"
   },
+  "nyc": {
+    "reporter": [
+      "lcov",
+      "text"
+    ]
+  },
   "standard": {
     "ignore": [
       "benchmarks/jison",
@@ -66,19 +76,23 @@
     "jsonlint"
   ],
   "dependencies": {
-    "ajv": "6.10.2",
-    "commander": "4.0.1"
+    "ajv": "6.12.6",
+    "commander": "9.2.0"
   },
   "devDependencies": {
-    "@types/node": "13.1.1",
-    "http-server": "0.12.0",
-    "js-yaml": "3.13.1",
-    "nyc": "15.0.0",
-    "standard": "14.3.1",
+    "@types/node": "17.0.30",
+    "@typescript-eslint/eslint-plugin": "5.21.0",
+    "@typescript-eslint/parser": "5.21.0",
+    "eslint": "8.14.0",
+    "eslint-config-standard": "17.0.0",
+    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-n": "15.2.0",
+    "eslint-plugin-promise": "6.0.0",
+    "http-server": "14.1.0",
+    "js-yaml": "4.1.0",
+    "nyc": "15.1.0",
+    "terser": "5.13.1",
     "test": "0.6.0",
-    "tslint": "5.20.1",
-    "tslint-config-standard": "9.0.0",
-    "typescript": "3.7.4",
-    "uglify-js": "3.7.3"
+    "typescript": "4.6.4"
   }
 }