@prantlf/jsonlint 14.0.3 → 15.0.0

package/lib/jsonlint.js

@@ -103,6 +103,10 @@ const unescapeMap = {
   '/': '/'
 }
 
+const ownsProperty = Object.prototype.hasOwnProperty
+
+const emptyObject = {}
+
 function parseInternal (input, options) {
   if (typeof input !== 'string' || !(input instanceof String)) {
     input = String(input)
@@ -112,6 +116,8 @@ function parseInternal (input, options) {
   const ignoreBOM = options.ignoreBOM
   const ignoreComments = options.ignoreComments || options.mode === 'cjson' || json5
   const ignoreTrailingCommas = options.ignoreTrailingCommas || json5
+  const ignoreProtoKey = options.ignoreProtoKey
+  const ignorePrototypeKeys = options.ignorePrototypeKeys
   const allowSingleQuotedStrings = options.allowSingleQuotedStrings || json5
   const allowDuplicateObjectKeys = options.allowDuplicateObjectKeys
   const reviver = options.reviver
@@ -176,7 +182,7 @@ function parseInternal (input, options) {
     let message
     if (position < inputLength) {
       const token = JSON.stringify(input[position])
-      message = 'Unexpected token ' + token
+      message = `Unexpected token ${token}`
     } else {
       message = 'Unexpected end of input'
     }
@@ -220,87 +226,84 @@ function parseInternal (input, options) {
 
   function parseGeneric () {
     if (position < inputLength) {
-      startToken && startToken()
+      startToken?.()
       const char = input[position++]
       if (char === '"' || (char === '\'' && allowSingleQuotedStrings)) {
         const string = parseString(char)
-        endToken && endToken('literal', string)
+        endToken?.('literal', string)
         return string
-      } else if (char === '{') {
-        endToken && endToken('symbol', '{')
+      }if (char === '{') {
+        endToken?.('symbol', '{')
         return parseObject()
-      } else if (char === '[') {
-        endToken && endToken('symbol', '[')
+      }if (char === '[') {
+        endToken?.('symbol', '[')
         return parseArray()
-      } else if (char === '-' || char === '.' || isDecDigit(char) ||
+      }if (char === '-' || char === '.' || isDecDigit(char) ||
                  (json5 && (char === '+' || char === 'I' || char === 'N'))) {
         const number = parseNumber()
-        endToken && endToken('literal', number)
+        endToken?.('literal', number)
         return number
-      } else if (char === 'n') {
+      }if (char === 'n') {
         parseKeyword('null')
-        endToken && endToken('literal', null)
+        endToken?.('literal', null)
         return null
-      } else if (char === 't') {
+      }if (char === 't') {
         parseKeyword('true')
-        endToken && endToken('literal', true)
+        endToken?.('literal', true)
         return true
-      } else if (char === 'f') {
+      }if (char === 'f') {
         parseKeyword('false')
-        endToken && endToken('literal', false)
+        endToken?.('literal', false)
         return false
-      } else {
+      }
         --position
-        endToken && endToken()
+        endToken?.()
         return undefined
-      }
     }
   }
 
   function parseKey () {
     let result
     if (position < inputLength) {
-      startToken && startToken()
+      startToken?.()
       const char = input[position++]
       if (char === '"' || (char === '\'' && allowSingleQuotedStrings)) {
         const string = parseString(char)
-        endToken && endToken('literal', string)
+        endToken?.('literal', string)
         return string
-      } else if (char === '{') {
-        endToken && endToken('symbol', '{')
+      }if (char === '{') {
+        endToken?.('symbol', '{')
         return parseObject()
-      } else if (char === '[') {
-        endToken && endToken('symbol', '[')
+      }if (char === '[') {
+        endToken?.('symbol', '[')
         return parseArray()
-      } else if (char === '.' || isDecDigit(char)) {
+      }if (char === '.' || isDecDigit(char)) {
         const number = parseNumber(true)
-        endToken && endToken('literal', number)
+        endToken?.('literal', number)
         return number
-      } else if ((json5 && Uni.isIdentifierStart(char)) ||
+      }if ((json5 && Uni.isIdentifierStart(char)) ||
                  (char === '\\' && input[position] === 'u')) {
         const rollback = position - 1
         result = parseIdentifier()
         if (result === undefined) {
           position = rollback
-          endToken && endToken()
+          endToken?.()
           return undefined
-        } else {
-          endToken && endToken('literal', result)
-          return result
         }
-      } else {
+          endToken?.('literal', result)
+          return result
+      }
         --position
-        endToken && endToken()
+        endToken?.()
         return undefined
-      }
     }
   }
 
   function skipBOM () {
     if (isBOM(input)) {
-      startToken && startToken()
+      startToken?.()
       ++position
-      endToken && endToken('bom')
+      endToken?.('bom')
     }
   }
 
@@ -336,7 +339,7 @@ function parseInternal (input, options) {
           ++position
         }
         skipComment(input[position++] === '*')
-        endToken && endToken('comment')
+        endToken?.('comment')
       } else {
         --position
         break
@@ -382,40 +385,40 @@ function parseInternal (input, options) {
   }
 
   function parseObject () {
-    const result = {}
-    const emptyObject = {}
+    let result = {}
     let isNotEmpty = false
 
     while (position < inputLength) {
       skipWhiteSpace()
       const key = parseKey()
-      if (allowDuplicateObjectKeys === false && result[key]) {
-        fail('Duplicate key: "' + key + '"')
+      if (allowDuplicateObjectKeys === false && ownsProperty.call(result, key)) {
+        fail(`Duplicate key: "${key}"`)
       }
       skipWhiteSpace()
-      startToken && startToken()
+      startToken?.()
       let char = input[position++]
-      endToken && endToken('symbol', char)
+      endToken?.('symbol', char)
       if (char === '}' && key === undefined) {
         if (!ignoreTrailingCommas && isNotEmpty) {
           --position
           fail('Trailing comma in object')
         }
         return result
-      } else if (char === ':' && key !== undefined) {
+      }if (char === ':' && key !== undefined) {
         skipWhiteSpace()
-        tokenPath && tokenPath.push(key)
+        tokenPath?.push(key)
         let value = parseGeneric()
-        tokenPath && tokenPath.pop()
+        tokenPath?.pop()
 
-        if (value === undefined) fail('No value found for key "' + key + '"')
+        if (value === undefined) fail(`No value found for key "${key}"`)
         if (typeof key !== 'string') {
           if (!json5 || typeof key !== 'number') {
-            fail('Wrong key type: "' + key + '"')
+            fail(`Wrong key type: "${key}"`)
           }
         }
 
-        if (key in emptyObject || emptyObject[key] != null) {
+        if ((ignorePrototypeKeys && (key in emptyObject || emptyObject[key] != null)) ||
+            (ignoreProtoKey && key === '__proto__')) {
           // silently ignore it
         } else {
           if (reviver) {
@@ -423,16 +426,19 @@ function parseInternal (input, options) {
           }
           if (value !== undefined) {
             isNotEmpty = true
-            result[key] = value
+            if (key === '__proto__') {
+              result = Object.assign(JSON.parse(`{"__proto__":${JSON.stringify(value)}}`), result)
+            } else {
+              result[key] = value
+            }
           }
         }
 
         skipWhiteSpace()
-        startToken && startToken()
+        startToken?.()
         char = input[position++]
-        endToken && endToken('symbol', char)
+        endToken?.('symbol', char)
         if (char === ',') {
-          continue
         } else if (char === '}') {
           return result
         } else {
@@ -451,13 +457,13 @@ function parseInternal (input, options) {
     const result = []
     while (position < inputLength) {
       skipWhiteSpace()
-      tokenPath && tokenPath.push(result.length)
+      tokenPath?.push(result.length)
       let item = parseGeneric()
-      tokenPath && tokenPath.pop()
+      tokenPath?.pop()
       skipWhiteSpace()
-      startToken && startToken()
+      startToken?.()
       const char = input[position++]
-      endToken && endToken('symbol', char)
+      endToken?.('symbol', char)
       if (item !== undefined) {
         if (reviver) {
           item = reviver(String(result.length), item)
@@ -498,18 +504,18 @@ function parseInternal (input, options) {
       let result
 
       if (isOctal) {
-        result = parseInt(string.replace(/^0o?/, ''), 8)
+        result = Number.parseInt(string.replace(/^0o?/, ''), 8)
       } else {
         result = Number(string)
       }
 
       if (Number.isNaN(result)) {
         --position
-        fail('Bad numeric literal - "' + input.substr(start, position - start + 1) + '"')
+        fail(`Bad numeric literal - "${input.substr(start, position - start + 1)}"`)
       } else if (!json5 && !string.match(/^-?(0|[1-9][0-9]*)(\.[0-9]+)?(e[+-]?[0-9]+)?$/i)) {
         // additional restrictions imposed by json
         --position
-        fail('Non-json numeric literal - "' + input.substr(start, position - start + 1) + '"')
+        fail(`Non-json numeric literal - "${input.substr(start, position - start + 1)}"`)
       } else {
         return result
       }
@@ -523,7 +529,7 @@ function parseInternal (input, options) {
 
     if (char === 'N' && json5) {
       parseKeyword('NaN')
-      return NaN
+      return Number.NaN
     }
 
     if (char === 'I' && json5) {
@@ -608,7 +614,7 @@ function parseInternal (input, options) {
           isHexDigit(input[position + 3]) &&
           isHexDigit(input[position + 4])) {
         // UnicodeEscapeSequence
-        char = String.fromCharCode(parseInt(input.substr(position + 1, 4), 16))
+        char = String.fromCharCode(Number.parseInt(input.substr(position + 1, 4), 16))
         position += 5
       }
 
@@ -639,7 +645,7 @@ function parseInternal (input, options) {
       let char = input[position++]
       if (char === endChar) {
         return result
-      } else if (char === '\\') {
+      }if (char === '\\') {
         if (position >= inputLength) {
           fail()
         }
@@ -662,7 +668,7 @@ function parseInternal (input, options) {
             }
             position++
           }
-          result += String.fromCharCode(parseInt(input.substr(position - count, count), 16))
+          result += String.fromCharCode(Number.parseInt(input.substr(position - count, count), 16))
         } else if (json5 && isOctDigit(char)) {
           let digits
           if (char < '4' && isOctDigit(input[position]) && isOctDigit(input[position + 1])) {
@@ -675,7 +681,7 @@ function parseInternal (input, options) {
             digits = 1
           }
           position += digits - 1
-          result += String.fromCharCode(parseInt(input.substr(position - digits, digits), 8))
+          result += String.fromCharCode(Number.parseInt(input.substr(position - digits, digits), 8))
         } else if (json5) {
           // \X -> x
           result += char
@@ -710,9 +716,8 @@ function parseInternal (input, options) {
         returnValue = reviver('', returnValue)
       }
       return tokenize ? tokens : returnValue
-    } else {
-      fail()
     }
+      fail()
   } else {
     if (position) {
       fail('No data, only a whitespace')
@@ -759,9 +764,9 @@ function pathToPointer (tokens) {
   if (tokens.length === 0) {
     return ''
   }
-  return '/' + tokens
+  return `/${tokens
     .map(escapePointerToken)
-    .join('/')
+    .join('/')}`
 }
 
 function unescapePointerToken (token) {
@@ -825,7 +830,7 @@ function upcomingInput (input, offset) {
 function getPositionContext (input, offset) {
   const past = pastInput(input, offset)
   const upcoming = upcomingInput(input, offset)
-  const pointer = new Array(past.length + 1).join('-') + '^'
+  const pointer = `${new Array(past.length + 1).join('-')}^`
   return {
     excerpt: past + upcoming,
     pointer
@@ -889,13 +894,13 @@ function getLocationOnSpiderMonkey (input, reason) {
 function getTexts (reason, input, offset, line, column) {
   const position = getPositionContext(input, offset)
   const excerpt = position.excerpt
-  let message, pointer
+  let message
+  let pointer
   if (typeof line === 'number') {
     pointer = position.pointer
-    message = 'Parse error on line ' + line + ', column ' +
-      column + ':\n' + excerpt + '\n' + pointer + '\n' + reason
+    message = `Parse error on line ${line}, column ${column}:\n${excerpt}\n${pointer}\n${reason}`
   } else {
-    message = 'Parse error in JSON input:\n' + excerpt + '\n' + reason
+    message = `Parse error in JSON input:\n${excerpt}\n${reason}`
   }
   return {
     message,
@@ -909,7 +914,9 @@ function improveNativeError (input, error) {
   const location = getLocationOnV8(input, reason) ||
     checkUnexpectedEndOnV8(input, reason) ||
     getLocationOnSpiderMonkey(input, reason)
-  let offset, line, column
+  let offset
+  let line
+  let column
   if (location) {
     offset = location.offset
     line = location.line
@@ -955,13 +962,14 @@ const oldNode = typeof process !== 'undefined' && process.version.startsWith('v4
 function needsCustomParser (options) {
   return options.ignoreBOM || options.ignoreComments || options.ignoreTrailingCommas ||
   options.allowSingleQuotedStrings || options.allowDuplicateObjectKeys === false ||
-  options.mode === 'cjson' || options.mode === 'json5' || isSafari || oldNode
+  options.ignoreProtoKey || options.ignorePrototypeKeys || options.mode === 'cjson' ||
+  options.mode === 'json5' || isSafari || oldNode
 }
 
 function getReviver (options) {
   if (typeof options === 'function') {
     return options
-  } else if (options) {
+  }if (options) {
     return options.reviver
   }
 }

package/lib/printer.js

@@ -22,11 +22,11 @@
   }
 
   function print (tokens, options) {
-    if (!(tokens && tokens.length)) {
+    if (!(tokens?.length)) {
       throw new Error('JSON tokens missing.')
     }
     // Whitespace and comments are available only as raw token content.
-    if (!(tokens[0] && tokens[0].raw)) {
+    if (!(tokens[0]?.raw)) {
       throw new Error('JSON tokens lack raw values.')
     }
 
@@ -50,14 +50,20 @@
     const trimTrailingCommas = options.trimTrailingCommas
 
     let outputString = ''
-    let foundLineBreak, addedLineBreak, needsLineBreak
-    let addedSpace, needsSpace
+    let foundLineBreak
+    let addedLineBreak
+    let needsLineBreak
+    let addedSpace
+    let needsSpace
     let indentLevel = 0
     const scopes = []
     let scopeType
     let isValue
     const tokenCount = tokens.length
-    let tokenIndex, token, tokenType, tokenContent
+    let tokenIndex
+    let token
+    let tokenType
+    let tokenContent
 
     function peekAtNextToken () {
       let nextTokenIndex = tokenIndex
@@ -80,7 +86,8 @@
       addIndent = noop
     }
 
-    let addLineBreak, addDelayedSpaceOrLineBreak
+    let addLineBreak
+    let addDelayedSpaceOrLineBreak
     if (prettyPrint) {
       addLineBreak = function () {
         outputString += '\n'
@@ -100,7 +107,8 @@
       addLineBreak = addDelayedSpaceOrLineBreak = noop
     }
 
-    let addStandaloneComment, tryAddingInlineComment
+    let addStandaloneComment
+    let tryAddingInlineComment
     if (pruneComments) {
       addStandaloneComment = tryAddingInlineComment = noop
     } else {
@@ -198,7 +206,7 @@
         if (enforceDoubleQuotes && tokenContent[0] !== '"') {
           outputString += JSON.stringify(tokenValue)
         } else if (enforceSingleQuotes && tokenContent[0] !== '\'') {
-          outputString += '\'' + tokenValue.replace(/'/g, '\\\'') + '\''
+          outputString += `\'${tokenValue.replace(/'/g, '\\\'')}\'`
         } else {
           outputString += tokenContent
         }

package/lib/sorter.js

@@ -6,22 +6,39 @@
   'use strict'
 
   // from http://stackoverflow.com/questions/1359761/sorting-a-json-object-in-javascript
-  const hasOwnProperty = Object.prototype.hasOwnProperty
-  function sortObject (o) {
+  const ownsProperty = Object.prototype.hasOwnProperty
+  function sortObject (o, { ignoreCase, locale, caseFirst, numeric } = {}) {
     if (Array.isArray(o)) {
       return o.map(sortObject)
-    } else if (Object.prototype.toString.call(o) !== '[object Object]') {
+    }if (Object.prototype.toString.call(o) !== '[object Object]') {
       return o
     }
     const sorted = {}
     let key
     const a = []
     for (key in o) {
-      if (hasOwnProperty.call(o, key)) {
+      if (ownsProperty.call(o, key)) {
         a.push(key)
       }
     }
-    a.sort()
+    if (locale || caseFirst || numeric) {
+      if (locale === 'default') {
+        locale = undefined
+      }
+      const sortOptions = { caseFirst, numeric }
+      if (ignoreCase) {
+        sortOptions.sensitivity = 'accent'
+      }
+      a.sort((l, r) => l.localeCompare(r, locale, sortOptions))
+    } else if (ignoreCase) {
+      a.sort((l, r) => {
+        l = l.toLowerCase()
+        r = r.toLowerCase()
+        return l < r ? -1 : l > r ? 1 : 0
+      })
+    } else {
+      a.sort()
+    }
     for (key = 0; key < a.length; key++) {
       sorted[a[key]] = sortObject(o[a[key]])
     }

package/lib/validator.js

@@ -63,7 +63,7 @@
   function errorToProblem (error, input, tokens) {
     const dataPath = error.dataPath
     const schemaPath = error.schemaPath
-    const reason = (dataPath || '/') + ' ' + error.message + '; see ' + schemaPath
+    const reason = `${dataPath || '/'} ${error.message}; see ${schemaPath}`
     const problem = {
       reason,
       dataPath,
@@ -167,7 +167,9 @@
       ignoreComments: options.ignoreComments,
       ignoreTrailingCommas: options.ignoreTrailingCommas,
       allowSingleQuotedStrings: options.allowSingleQuotedStrings,
-      allowDuplicateObjectKeys: options.allowDuplicateObjectKeys
+      allowDuplicateObjectKeys: options.allowDuplicateObjectKeys,
+      ignoreProtoKey: options.ignoreProtoKey,
+      ignorePrototypeKeys: options.ignorePrototypeKeys
     }
     const validate = compileSchema(ajv, schema, parseOptions)
     return function (data, input, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prantlf/jsonlint",
-  "version": "14.0.3",
+  "version": "15.0.0",
   "description": "JSON/CJSON/JSON5 parser, syntax and schema validator and pretty-printer.",
   "author": "Ferdinand Prantl <prantlf@gmail.com> (http://prantl.tk)",
   "contributors": [
@@ -43,7 +43,8 @@
     "compile:jsonlint": "cat-j src/prefix.js.txt src/unicode.js src/custom-parser.js src/pointer.js src/native-parser.js src/configurable-parser.js src/suffix.js.txt > lib/jsonlint.js",
     "minify": "esbuild --minify --sourcemap --outfile=web/jsonlint.min.js lib/jsonlint.js && esbuild --minify --sourcemap --outfile=web/validator.min.js lib/validator.js && esbuild --minify --sourcemap --outfile=web/formatter.min.js lib/formatter.js && esbuild --minify --sourcemap --outfile=web/sorter.min.js lib/sorter.js && esbuild --minify --sourcemap --outfile=web/printer.min.js lib/printer.js",
     "compile:tests": "tsc --moduleResolution node --module es2022 test/types.test.ts && mv-j test/types.test.js test/types.test.mjs",
-    "test": "denolint && c8 node test/types.test.mjs && c8 --no-clean node test/parse1 && c8 --no-clean node test/parse1 --native-parser && c8 --no-clean node test/parse2 && c8 --no-clean node test/parse3 && c8 --no-clean node test/parse4 && c8 --no-clean node test/parse5 && c8 --no-clean node test/portable && c8 --no-clean node test/tokenize && c8 --no-clean node test/print && c8 --no-clean node lib/cli package.json test/recursive && c8 --no-clean node lib/cli -sq test/passes/hasOwnProperty.json && c8 --no-clean node lib/cli -s -e json-schema-draft-04 -V test/passes/schema-04.json test/passes/data-04.json && c8 --no-clean node lib/cli -s -e json-schema-draft-07 -V test/passes/schema-07.json test/passes/data-07.json && c8 --no-clean node lib/cli -C test/passes/comments.txt && c8 --no-clean node lib/cli -pS test/passes/strings.txt && c8 --no-clean node lib/cli -M json5 test/passes/json5.text && c8 --no-clean node lib/cli -v && c8 --no-clean node lib/cli -h && c8 --no-clean node lib/cli -Pc test/fails/10.json || c8 --no-clean node lib/cli -f test/.jsonrc.yml 'test/**/*.json' '!**/fails' && c8 report -r text -r lcov",
+    "lint": "biome lint *.mjs lib src test/*.js",
+    "test": "biome lint *.mjs lib src test/*.js && c8 node test/types.test.mjs && c8 --no-clean node test/parse1 && c8 --no-clean node test/parse1 --native-parser && c8 --no-clean node test/parse2 && c8 --no-clean node test/parse3 && c8 --no-clean node test/parse4 && c8 --no-clean node test/parse5 && c8 --no-clean node test/portable && c8 --no-clean node test/tokenize && c8 --no-clean node test/print && c8 --no-clean node lib/cli package.json test/recursive && c8 --no-clean node lib/cli -sq test/passes/hasOwnProperty.json && c8 --no-clean node lib/cli -s -e json-schema-draft-04 -V test/passes/schema-04.json test/passes/data-04.json && c8 --no-clean node lib/cli -s -e json-schema-draft-07 -V test/passes/schema-07.json test/passes/data-07.json && c8 --no-clean node lib/cli -C test/passes/comments.txt && c8 --no-clean node lib/cli -pS test/passes/strings.txt && c8 --no-clean node lib/cli -M json5 test/passes/json5.text && c8 --no-clean node lib/cli -v && c8 --no-clean node lib/cli -h && c8 --no-clean node lib/cli -Pc test/fails/10.json || c8 --no-clean node lib/cli -f test/.jsonrc.yml 'test/**/*.json' '!**/fails' && c8 report -r text -r lcov",
     "start": "http-server -c 5",
     "web": "npm run web:sync && npm run web:deploy",
     "web:clone": "test ! -d ../jsonlint-pages && git clone --single-branch --branch gh-pages `git remote get-url origin` ../jsonlint-pages",
@@ -54,48 +55,31 @@
   "c8": {
     "reporter": []
   },
-  "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"
-    ]
-  },
   "dependencies": {
-    "ajv": "8.12.0",
+    "ajv": "8.17.1",
     "ajv-draft-04": "1.0.0",
-    "cosmiconfig": "8.1.3",
-    "diff": "5.1.0",
-    "fast-glob": "3.2.12"
+    "cosmiconfig": "9.0.0",
+    "diff": "5.2.0",
+    "fast-glob": "3.3.2"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "24.1.0",
-    "@rollup/plugin-json": "6.0.0",
-    "@rollup/plugin-node-resolve": "15.0.2",
-    "@semantic-release/changelog": "6.0.3",
-    "@semantic-release/git": "10.0.1",
-    "@types/node": "18.16.1",
+    "@biomejs/biome": "^1.8.3",
+    "@rollup/plugin-commonjs": "26.0.1",
+    "@rollup/plugin-json": "6.1.0",
+    "@rollup/plugin-node-resolve": "15.2.3",
+    "@types/node": "22.1.0",
     "@unixcompat/cat.js": "2.0.0",
     "@unixcompat/mv.js": "2.0.0",
-    "c8": "7.13.0",
-    "denolint": "2.0.9",
-    "esbuild": "0.17.18",
+    "c8": "10.1.2",
+    "esbuild": "0.23.0",
     "http-server": "14.1.1",
     "js-yaml": "4.1.0",
-    "rollup": "3.21.0",
-    "rollup-plugin-swc-minify": "1.0.6",
+    "rollup": "4.20.0",
+    "rollup-plugin-swc-minify": "1.1.2",
     "tehanu": "1.0.1",
-    "tehanu-repo-coco": "1.0.0",
-    "tehanu-teru": "1.0.0",
-    "typescript": "5.0.4"
+    "tehanu-repo-coco": "1.0.1",
+    "tehanu-teru": "1.0.1",
+    "typescript": "5.5.4"
   },
   "keywords": [
     "json",
@@ -103,4 +87,4 @@
     "lint",
     "jsonlint"
   ]
-}
+}