@prantlf/jsonlint 14.0.2 → 14.1.0

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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prantlf/jsonlint",
-  "version": "14.0.2",
+  "version": "14.1.0",
   "description": "JSON/CJSON/JSON5 parser, syntax and schema validator and pretty-printer.",
   "author": "Ferdinand Prantl <prantlf@gmail.com> (http://prantl.tk)",
   "contributors": [
@@ -40,10 +40,11 @@
   },
   "scripts": {
     "build": "npm run compile:jsonlint && rollup -c && npm run minify && npm run compile:tests",
-    "compile:jsonlint": "cat.js 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",
+    "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.js 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",
+    "compile:tests": "tsc --moduleResolution node --module es2022 test/types.test.ts && mv-j test/types.test.js test/types.test.mjs",
+    "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",
@@ -52,53 +53,33 @@
     "web:deploy": "cd ../jsonlint-pages && git commit -a -m 'Deploy site updates' && git push origin gh-pages"
   },
   "c8": {
-    "reporter": [
-      "lcov",
-      "text"
-    ]
-  },
-  "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"
-    ]
+    "reporter": []
   },
   "dependencies": {
-    "ajv": "8.12.0",
+    "ajv": "8.17.1",
     "ajv-draft-04": "1.0.0",
-    "cosmiconfig": "8.1.0",
-    "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.0.1",
-    "@rollup/plugin-json": "6.0.0",
-    "@rollup/plugin-node-resolve": "15.0.1",
-    "@semantic-release/changelog": "6.0.2",
-    "@semantic-release/git": "10.0.1",
-    "@types/node": "18.14.6",
-    "@unixcompat/cat.js": "1.0.2",
-    "@unixcompat/mv.js": "1.0.1",
-    "c8": "7.13.0",
-    "denolint": "2.0.7",
-    "esbuild": "0.17.11",
+    "@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": "10.1.2",
+    "esbuild": "0.23.0",
     "http-server": "14.1.1",
     "js-yaml": "4.1.0",
-    "rollup": "3.18.0",
-    "rollup-plugin-swc-minify": "1.0.5",
+    "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": "4.9.5"
+    "tehanu-repo-coco": "1.0.1",
+    "tehanu-teru": "1.0.1",
+    "typescript": "5.5.4"
   },
   "keywords": [
     "json",
@@ -106,4 +87,4 @@
     "lint",
     "jsonlint"
   ]
-}
+}