fast-json-stringify 6.0.1 → 6.1.0

package/.github/workflows/ci.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
      - main
-     - master
      - next
      - 'v*'
     paths-ignore:
@@ -15,8 +14,14 @@ on:
       - 'docs/**'
       - '*.md'
 
+permissions:
+  contents: read
+
 jobs:
   test:
+    permissions:
+      contents: write
+      pull-requests: write
     uses: fastify/workflows/.github/workflows/plugins-ci.yml@v5
     with:
       license-check: true

package/LICENSE

@@ -1,6 +1,9 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2016-2018 Matteo Collina
+Copyright (c) 2016-present Matteo Collina
+Copyright (c) 2016-present The Fastify team
+
+The Fastify team members are listed at https://github.com/fastify/fastify#team.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,11 +1,10 @@
 # fast-json-stringify
 
-[![CI](https://github.com/fastify/fast-json-stringify/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/fastify/fast-json-stringify/actions/workflows/ci.yml)
+[![CI](https://github.com/fastify/fast-json-stringify/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/fastify/fast-json-stringify/actions/workflows/ci.yml)
 [![NPM version](https://img.shields.io/npm/v/fast-json-stringify.svg?style=flat)](https://www.npmjs.com/package/fast-json-stringify)
 [![neostandard javascript style](https://img.shields.io/badge/code_style-neostandard-brightgreen?style=flat)](https://github.com/neostandard/neostandard)
 [![NPM downloads](https://img.shields.io/npm/dm/fast-json-stringify.svg?style=flat)](https://www.npmjs.com/package/fast-json-stringify)
 
-
 __fast-json-stringify__ is significantly faster than `JSON.stringify()` for small payloads.
 Its performance advantage shrinks as your payload grows.
 It pairs well with [__flatstr__](https://www.npmjs.com/package/flatstr), which triggers a V8 optimization that improves performance when eventually converting the string to a `Buffer`.
@@ -18,37 +17,43 @@ fast-json-stringify requires a [JSON Schema Draft 7](https://json-schema.org/spe
 ##### Benchmarks
 
 - Machine: `EX41S-SSD, Intel Core i7, 4Ghz, 64GB RAM, 4C/8T, SSD`.
-- Node.js `v18.12.1`
+- Node.js `v22.14.0`
 
 ```
-FJS creation x 4,129 ops/sec ±0.82% (92 runs sampled)
-CJS creation x 184,196 ops/sec ±0.12% (97 runs sampled)
-AJV Serialize creation x 61,130,591 ops/sec ±0.40% (92 runs sampled)
-JSON.stringify array x 5,057 ops/sec ±0.10% (100 runs sampled)
-fast-json-stringify array default x 6,243 ops/sec ±0.14% (98 runs sampled)
-fast-json-stringify array json-stringify x 6,261 ops/sec ±0.30% (99 runs sampled)
-compile-json-stringify array x 6,842 ops/sec ±0.18% (96 runs sampled)
-AJV Serialize array x 6,964 ops/sec ±0.11% (95 runs sampled)
-JSON.stringify large array x 248 ops/sec ±0.07% (90 runs sampled)
-fast-json-stringify large array default x 99.96 ops/sec ±0.22% (74 runs sampled)
-fast-json-stringify large array json-stringify x 248 ops/sec ±0.07% (90 runs sampled)
-compile-json-stringify large array x 317 ops/sec ±0.09% (89 runs sampled)
-AJV Serialize large array x 111 ops/sec ±0.07% (33 runs sampled)
-JSON.stringify long string x 16,002 ops/sec ±0.09% (98 runs sampled)
-fast-json-stringify long string x 15,979 ops/sec ±0.09% (96 runs sampled)
-compile-json-stringify long string x 15,952 ops/sec ±0.31% (97 runs sampled)
-AJV Serialize long string x 21,416 ops/sec ±0.08% (98 runs sampled)
-JSON.stringify short string x 12,944,272 ops/sec ±0.09% (96 runs sampled)
-fast-json-stringify short string x 30,585,790 ops/sec ±0.27% (97 runs sampled)
-compile-json-stringify short string x 30,656,406 ops/sec ±0.12% (96 runs sampled)
-AJV Serialize short string x 30,406,785 ops/sec ±0.37% (96 runs sampled)
-JSON.stringify obj x 3,153,043 ops/sec ±0.33% (99 runs sampled)
-fast-json-stringify obj x 6,866,434 ops/sec ±0.11% (100 runs sampled)
-compile-json-stringify obj x 15,886,723 ops/sec ±0.15% (98 runs sampled)
-AJV Serialize obj x 8,969,043 ops/sec ±0.36% (97 runs sampled)
-JSON stringify date x 1,126,547 ops/sec ±0.09% (97 runs sampled)
-fast-json-stringify date format x 1,836,188 ops/sec ±0.12% (99 runs sampled)
-compile-json-stringify date format x 1,125,735 ops/sec ±0.19% (98 runs sampled)
+FJS creation x 9,696 ops/sec ±0.77% (94 runs sampled)
+CJS creation x 197,267 ops/sec ±0.22% (95 runs sampled)
+AJV Serialize creation x 48,302,927 ops/sec ±2.09% (90 runs sampled)
+json-accelerator creation x 668,430 ops/sec ±0.43% (95 runs sampled)
+JSON.stringify array x 7,924 ops/sec ±0.11% (98 runs sampled)
+fast-json-stringify array default x 7,183 ops/sec ±0.09% (97 runs sampled)
+json-accelerator array x 5,762 ops/sec ±0.27% (99 runs sampled)
+fast-json-stringify array json-stringify x 7,171 ops/sec ±0.17% (97 runs sampled)
+compile-json-stringify array x 6,889 ops/sec ±0.41% (96 runs sampled)
+AJV Serialize array x 6,945 ops/sec ±0.17% (98 runs sampled)
+JSON.stringify large array x 331 ops/sec ±0.17% (93 runs sampled)
+fast-json-stringify large array default x 208 ops/sec ±0.21% (91 runs sampled)
+fast-json-stringify large array json-stringify x 330 ops/sec ±0.17% (93 runs sampled)
+compile-json-stringify large array x 318 ops/sec ±0.11% (90 runs sampled)
+AJV Serialize large array x 114 ops/sec ±0.27% (74 runs sampled)
+JSON.stringify long string x 13,452 ops/sec ±0.15% (99 runs sampled)
+fast-json-stringify long string x 13,454 ops/sec ±0.10% (99 runs sampled)
+json-accelerator long string x 13,439 ops/sec ±0.09% (98 runs sampled)
+compile-json-stringify long string x 13,380 ops/sec ±0.12% (100 runs sampled)
+AJV Serialize long string x 21,932 ops/sec ±0.06% (99 runs sampled)
+JSON.stringify short string x 12,114,052 ops/sec ±0.59% (97 runs sampled)
+fast-json-stringify short string x 29,408,175 ops/sec ±1.12% (91 runs sampled)
+json-accelerator short string x 29,431,694 ops/sec ±1.05% (93 runs sampled)
+compile-json-stringify short string x 24,740,338 ops/sec ±1.02% (91 runs sampled)
+AJV Serialize short string x 17,841,869 ops/sec ±0.90% (91 runs sampled)
+JSON.stringify obj x 4,577,494 ops/sec ±0.25% (94 runs sampled)
+fast-json-stringify obj x 7,291,157 ops/sec ±0.40% (97 runs sampled)
+json-accelerator obj x 6,473,194 ops/sec ±0.31% (99 runs sampled)
+compile-json-stringify obj x 14,724,935 ops/sec ±0.50% (96 runs sampled)
+AJV Serialize obj x 8,782,944 ops/sec ±0.45% (93 runs sampled)
+JSON stringify date x 803,522 ops/sec ±0.47% (98 runs sampled)
+fast-json-stringify date format x 1,117,776 ops/sec ±0.69% (95 runs sampled)
+json-accelerate date format x 1,122,419 ops/sec ±0.20% (97 runs sampled)
+compile-json-stringify date format x 803,214 ops/sec ±0.23% (97 runs sampled)
 ```
 
 #### Table of contents:

package/benchmark/bench-cmp-branch.js

@@ -8,7 +8,7 @@ const simpleGit = require('simple-git')
 const git = simpleGit(process.cwd())
 
 const COMMAND = 'npm run bench'
-const DEFAULT_BRANCH = 'master'
+const DEFAULT_BRANCH = 'main'
 const PERCENT_THRESHOLD = 5
 const greyColor = '\x1b[30m'
 const redColor = '\x1b[31m'

package/benchmark/bench-cmp-lib.js

@@ -118,6 +118,12 @@ const ajvSerialize = ajv.compileSerializer(schemaAJVJTD)
 const ajvSerializeArray = ajv.compileSerializer(arraySchemaAJVJTD)
 const ajvSerializeString = ajv.compileSerializer({ type: 'string' })
 
+const { createAccelerator } = require('json-accelerator')
+const accelStringify = createAccelerator(schema)
+const accelArray = createAccelerator(arraySchema)
+const accelDate = FJS(dateFormatSchema)
+const accelString = FJS({ type: 'string' })
+
 const getRandomString = (length) => {
   if (!Number.isInteger(length)) {
     throw new Error('Expected integer length')
@@ -170,6 +176,9 @@ suite.add('CJS creation', function () {
 suite.add('AJV Serialize creation', function () {
   ajv.compileSerializer(schemaAJVJTD)
 })
+suite.add('json-accelerator creation', function () {
+  createAccelerator(schema)
+})
 
 suite.add('JSON.stringify array', function () {
   JSON.stringify(multiArray)
@@ -179,6 +188,10 @@ suite.add('fast-json-stringify array default', function () {
   stringifyArrayDefault(multiArray)
 })
 
+suite.add('json-accelerator array', function () {
+  accelArray(multiArray)
+})
+
 suite.add('fast-json-stringify array json-stringify', function () {
   stringifyArrayJSONStringify(multiArray)
 })
@@ -219,6 +232,10 @@ suite.add('fast-json-stringify long string', function () {
   stringifyString(str)
 })
 
+suite.add('json-accelerator long string', function () {
+  stringifyString(str)
+})
+
 suite.add('compile-json-stringify long string', function () {
   CJSStringifyString(str)
 })
@@ -235,6 +252,10 @@ suite.add('fast-json-stringify short string', function () {
   stringifyString('hello world')
 })
 
+suite.add('json-accelerator short string', function () {
+  accelString('hello world')
+})
+
 suite.add('compile-json-stringify short string', function () {
   CJSStringifyString('hello world')
 })
@@ -251,6 +272,10 @@ suite.add('fast-json-stringify obj', function () {
   stringify(obj)
 })
 
+suite.add('json-accelerator obj', function () {
+  accelStringify(obj)
+})
+
 suite.add('compile-json-stringify obj', function () {
   CJSStringify(obj)
 })
@@ -267,6 +292,10 @@ suite.add('fast-json-stringify date format', function () {
   stringifyDate(date)
 })
 
+suite.add('json-accelerate date format', function () {
+  accelDate(date)
+})
+
 suite.add('compile-json-stringify date format', function () {
   CJSStringifyDate(date)
 })

package/index.js

@@ -15,6 +15,21 @@ const SINGLE_TICK = /'/g
 let largeArraySize = 2e4
 let largeArrayMechanism = 'default'
 
+const serializerFns = `
+const {
+  asString,
+  asNumber,
+  asBoolean,
+  asDateTime,
+  asDate,
+  asTime,
+  asUnsafeString
+} = serializer
+
+const asInteger = serializer.asInteger.bind(serializer)
+
+`
+
 const validRoundingMethods = [
   'floor',
   'ceil',
@@ -141,6 +156,7 @@ function build (schema, options) {
   const code = buildValue(context, location, 'input')
 
   let contextFunctionCode = `
+    ${serializerFns}
     const JSON_STR_BEGIN_OBJECT = '{'
     const JSON_STR_END_OBJECT = '}'
     const JSON_STR_BEGIN_ARRAY = '['
@@ -292,7 +308,7 @@ function buildExtraObjectPropertiesSerializer (context, location, addComma) {
       code += `
         if (/${propertyKey.replace(/\\*\//g, '\\/')}/.test(key)) {
           ${addComma}
-          json += serializer.asString(key) + JSON_STR_COLONS
+          json += asString(key) + JSON_STR_COLONS
           ${buildValue(context, propertyLocation, 'value')}
           continue
         }
@@ -307,13 +323,13 @@ function buildExtraObjectPropertiesSerializer (context, location, addComma) {
     if (additionalPropertiesSchema === true) {
       code += `
         ${addComma}
-        json += serializer.asString(key) + JSON_STR_COLONS + JSON.stringify(value)
+        json += asString(key) + JSON_STR_COLONS + JSON.stringify(value)
       `
     } else {
       const propertyLocation = location.getPropertyLocation('additionalProperties')
       code += `
         ${addComma}
-        json += serializer.asString(key) + JSON_STR_COLONS
+        json += asString(key) + JSON_STR_COLONS
         ${buildValue(context, propertyLocation, 'value')}
       `
     }
@@ -565,7 +581,7 @@ function buildArray (context, location) {
       const tmpRes = buildValue(context, itemsLocation.getPropertyLocation(i), 'value')
       functionCode += `
         if (${i} < arrayLength) {
-          if (${buildArrayTypeCondition(item.type, `[${i}]`)}) {
+          if (${buildArrayTypeCondition(item.type, 'value')}) {
             ${tmpRes}
             if (${i} < arrayEnd) {
               json += JSON_STR_COMMA
@@ -580,16 +596,18 @@ function buildArray (context, location) {
     if (schema.additionalItems) {
       functionCode += `
         for (let i = ${itemsSchema.length}; i < arrayLength; i++) {
-          json += JSON.stringify(obj[i])
+          value = obj[i]
+          json += JSON.stringify(value)
           if (i < arrayEnd) {
             json += JSON_STR_COMMA
           }
         }`
     }
   } else {
-    const code = buildValue(context, itemsLocation, 'obj[i]')
+    const code = buildValue(context, itemsLocation, 'value')
     functionCode += `
       for (let i = 0; i < arrayLength; i++) {
+        value = obj[i]
         ${code}
         if (i < arrayEnd) {
           json += JSON_STR_COMMA
@@ -729,13 +747,13 @@ function buildSingleTypeSerializer (context, location, input) {
       return 'json += JSON_STR_NULL'
     case 'string': {
       if (schema.format === 'date-time') {
-        return `json += serializer.asDateTime(${input})`
+        return `json += asDateTime(${input})`
       } else if (schema.format === 'date') {
-        return `json += serializer.asDate(${input})`
+        return `json += asDate(${input})`
       } else if (schema.format === 'time') {
-        return `json += serializer.asTime(${input})`
+        return `json += asTime(${input})`
       } else if (schema.format === 'unsafe') {
-        return `json += serializer.asUnsafeString(${input})`
+        return `json += asUnsafeString(${input})`
       } else {
         return `
         if (typeof ${input} !== 'string') {
@@ -744,22 +762,22 @@ function buildSingleTypeSerializer (context, location, input) {
           } else if (${input} instanceof Date) {
             json += JSON_STR_QUOTE + ${input}.toISOString() + JSON_STR_QUOTE
           } else if (${input} instanceof RegExp) {
-            json += serializer.asString(${input}.source)
+            json += asString(${input}.source)
           } else {
-            json += serializer.asString(${input}.toString())
+            json += asString(${input}.toString())
           }
         } else {
-          json += serializer.asString(${input})
+          json += asString(${input})
         }
         `
       }
     }
     case 'integer':
-      return `json += serializer.asInteger(${input})`
+      return `json += asInteger(${input})`
     case 'number':
-      return `json += serializer.asNumber(${input})`
+      return `json += asNumber(${input})`
     case 'boolean':
-      return `json += serializer.asBoolean(${input})`
+      return `json += asBoolean(${input})`
     case 'object': {
       const funcName = buildObject(context, location)
       return `json += ${funcName}(${input})`

package/lib/serializer.js

@@ -1,8 +1,5 @@
 'use strict'
 
-// eslint-disable-next-line
-const STR_ESCAPE = /[\u0000-\u001f\u0022\u005c\ud800-\udfff]/
-
 module.exports = class Serializer {
   constructor (options) {
     switch (options && options.rounding) {
@@ -92,7 +89,9 @@ module.exports = class Serializer {
 
   asString (str) {
     const len = str.length
-    if (len < 42) {
+    if (len === 0) {
+      return '""'
+    } else if (len < 42) {
       // magically escape strings for json
       // relying on their charCodeAt
       // everything below 32 needs JSON.stringify()
@@ -117,7 +116,7 @@ module.exports = class Serializer {
         }
       }
       return (last === -1 && ('"' + str + '"')) || ('"' + result + str.slice(last) + '"')
-    } else if (len < 5000 && STR_ESCAPE.test(str) === false) {
+    } else if (len < 5000 && str.isWellFormed()) {
       // Only use the regular expression for shorter input. The overhead is otherwise too much.
       return '"' + str + '"'
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-json-stringify",
-  "version": "6.0.1",
+  "version": "6.1.0",
   "description": "Stringify your JSON at max speed",
   "main": "index.js",
   "type": "commonjs",
@@ -16,10 +16,6 @@
     "test:unit": "c8 node --test",
     "test": "npm run test:unit && npm run test:typescript"
   },
-  "precommit": [
-    "lint",
-    "test"
-  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fastify/fast-json-stringify.git"
@@ -66,7 +62,6 @@
     }
   ],
   "devDependencies": {
-    "@fastify/pre-commit": "^2.1.0",
     "@sinclair/typebox": "^0.34.3",
     "benchmark": "^2.1.4",
     "c8": "^10.1.2",
@@ -75,9 +70,10 @@
     "eslint": "^9.17.0",
     "fast-json-stringify": ".",
     "is-my-json-valid": "^2.20.6",
+    "json-accelerator": "^0.0.2",
     "neostandard": "^0.12.0",
     "simple-git": "^3.23.0",
-    "tsd": "^0.31.0",
+    "tsd": "^0.32.0",
     "webpack": "^5.90.3"
   },
   "dependencies": {
@@ -85,7 +81,7 @@
     "ajv": "^8.12.0",
     "ajv-formats": "^3.0.1",
     "fast-uri": "^3.0.0",
-    "json-schema-ref-resolver": "^2.0.0",
+    "json-schema-ref-resolver": "^3.0.0",
     "rfdc": "^1.2.0"
   },
   "runkitExampleFilename": "./examples/example.js"

package/test/json-schema-test-suite/README.md

@@ -5,6 +5,6 @@ It contains a set of JSON objects that implementors of JSON Schema validation li
 
 # How to add another test case?
 
-1. Navigate to [JSON-Schema-Test-Suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite/tree/master/tests)
+1. Navigate to [JSON-Schema-Test-Suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite/tree/main/tests)
 2. Choose a draft `draft4`, `draft6` or `draft7`
 3. Copy & paste the `test-case.json` to the project and add a test like in the `draft4.test.js`

package/.github/workflows/benchmark.yml

@@ -1,85 +0,0 @@
-name: Benchmark PR
-
-on:
-  pull_request_target:
-    types: [labeled]
-
-jobs:
-  benchmark:
-    if: ${{ github.event.label.name == 'benchmark' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    outputs:
-      PR-BENCH: ${{ steps.benchmark-pr.outputs.BENCH_RESULT }}
-      MASTER-BENCH: ${{ steps.benchmark-master.outputs.BENCH_RESULT }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-          ref: ${{github.event.pull_request.head.sha}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-
-      - name: Install
-        run: |
-          npm install --ignore-scripts
-
-      - name: Run benchmark
-        id: benchmark-pr
-        run: |
-          npm run --silent bench > ./bench-result
-          content=$(cat ./bench-result)
-          content="${content//'%'/'%25'}"
-          content="${content//$'\n'/'%0A'}"
-          content="${content//$'\r'/'%0D'}"
-          echo "::set-output name=BENCH_RESULT::$content"
-
-      # master benchmark
-      - uses: actions/checkout@v4
-        with:
-          ref: 'master'
-
-      - name: Install
-        run: |
-          npm install --ignore-scripts
-
-      - name: Run benchmark
-        id: benchmark-master
-        run: |
-          npm run --silent bench > ./bench-result
-          content=$(cat ./bench-result)
-          content="${content//'%'/'%25'}"
-          content="${content//$'\n'/'%0A'}"
-          content="${content//$'\r'/'%0D'}"
-          echo "::set-output name=BENCH_RESULT::$content"
-
-  output-benchmark:
-    if: "always()"
-    needs: [benchmark]
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Comment PR
-        uses: thollander/actions-comment-pull-request@v3
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          message: |
-            **PR**:
-            ```
-            ${{ needs.benchmark.outputs.PR-BENCH }}
-            ```
-            **MASTER**:
-            ```
-            ${{ needs.benchmark.outputs.MASTER-BENCH }}
-            ```
-
-      - uses: actions-ecosystem/action-remove-labels@v1
-        with:
-          labels: |
-            benchmark
-          github_token: ${{ secrets.GITHUB_TOKEN }}