fast-json-stringify 5.6.1 → 5.7.0

package/README.md

@@ -689,8 +689,7 @@ console.log(stringify({ firstName: 'Foo', surname: 'bar' })) // '{"firstName":"F
 ### Standalone Mode
 
 The standalone mode is used to compile the code that can be directly run by `node`
-itself. You need to install `ajv`, `fast-uri` and `ajv-formats` for
-the standalone code to work.
+itself. You need to have `fast-json-stringify` installed for the standalone code to work.
 
 ```js
 const fs = require('fs')

package/index.js

@@ -170,18 +170,15 @@ function build (schema, options) {
     }
   }
 
+  /* eslint no-new-func: "off" */
+  const contextFunc = new Function('validator', 'serializer', contextFunctionCode)
+
   if (options.mode === 'standalone') {
-    // lazy load
-    const isValidatorUsed = context.validatorSchemasIds.size > 0
     const buildStandaloneCode = require('./lib/standalone')
-    return buildStandaloneCode(options, validator, isValidatorUsed, contextFunctionCode)
+    return buildStandaloneCode(contextFunc, context, serializer, validator)
   }
 
-  /* eslint no-new-func: "off" */
-  const contextFunc = new Function('validator', 'serializer', contextFunctionCode)
-  const stringifyFunc = contextFunc(validator, serializer)
-
-  return stringifyFunc
+  return contextFunc(validator, serializer)
 }
 
 const objectKeywords = [
@@ -571,12 +568,8 @@ function buildArray (context, location) {
     `
   }
 
-  if (largeArrayMechanism !== 'default') {
-    if (largeArrayMechanism === 'json-stringify') {
-      functionCode += `if (arrayLength && arrayLength >= ${largeArraySize}) return JSON.stringify(obj)\n`
-    } else {
-      throw new Error(`Unsupported large array mechanism ${largeArrayMechanism}`)
-    }
+  if (largeArrayMechanism === 'json-stringify') {
+    functionCode += `if (arrayLength && arrayLength >= ${largeArraySize}) return JSON.stringify(obj)\n`
   }
 
   functionCode += `
@@ -663,8 +656,6 @@ function buildArrayTypeCondition (type, accessor) {
           return buildArrayTypeCondition(subType, accessor)
         })
         condition = `(${conditions.join(' || ')})`
-      } else {
-        throw new Error(`${type} unsupported`)
       }
   }
   return condition

package/lib/serializer.js

@@ -20,6 +20,7 @@ module.exports = class Serializer {
         this.parseInteger = Math.trunc
         break
     }
+    this._options = options
   }
 
   asInteger (i) {
@@ -27,7 +28,7 @@ module.exports = class Serializer {
       if (i === Infinity || i === -Infinity) {
         throw new Error(`The value "${i}" cannot be converted to an integer.`)
       }
-      if ((i | 0) === i) {
+      if (Number.isInteger(i)) {
         return '' + i
       }
       if (Number.isNaN(i)) {
@@ -54,7 +55,7 @@ module.exports = class Serializer {
     if (Number.isNaN(num)) {
       throw new Error(`The value "${i}" cannot be converted to a number.`)
     } else if (!Number.isFinite(num)) {
-      return null
+      return 'null'
     } else {
       return '' + num
     }
@@ -156,4 +157,12 @@ module.exports = class Serializer {
     }
     return ((point < 32) || (surrogateFound === true)) ? JSON.stringify(str) : '"' + result + '"'
   }
+
+  getState () {
+    return this._options
+  }
+
+  static restoreFromState (state) {
+    return new Serializer(state)
+  }
 }

package/lib/standalone.js

@@ -1,42 +1,31 @@
-const fs = require('fs')
-const path = require('path')
-
-function buildStandaloneCode (options, validator, isValidatorUsed, contextFunctionCode) {
-  const serializerCode = fs.readFileSync(path.join(__dirname, 'serializer.js')).toString()
-  let buildAjvCode = ''
-  let ajvSchemasCode = ''
-
-  if (isValidatorUsed) {
-    let defaultAjvSchema = ''
-    // we need to export the custom json schema
-    const defaultMeta = validator.ajv.defaultMeta()
-    if (typeof defaultMeta === 'string') {
-      defaultAjvSchema = defaultMeta
-    } else {
-      defaultAjvSchema = defaultMeta.$id || defaultMeta.id
-    }
-
-    ajvSchemasCode += `const validator = new Validator(${JSON.stringify(options.ajv || {})})\n`
-    for (const [id, schema] of Object.entries(validator.ajv.schemas)) {
-      // should skip ajv default schema
-      if (id === defaultAjvSchema) continue
-      ajvSchemasCode += `validator.ajv.addSchema(${JSON.stringify(schema.schema)}, "${id}")\n`
-    }
-    buildAjvCode = fs.readFileSync(path.join(__dirname, 'validator.js')).toString()
-    buildAjvCode = buildAjvCode.replace("'use strict'", '').replace('module.exports = SchemaValidator', '')
+'use strict'
+
+function buildStandaloneCode (contextFunc, context, serializer, validator) {
+  let ajvDependencyCode = ''
+  if (context.validatorSchemasIds.size > 0) {
+    ajvDependencyCode += `const validatorState = ${JSON.stringify(validator.getState())}\n`
+    ajvDependencyCode += 'const validator = Validator.restoreFromState(validatorState)\n'
+  } else {
+    ajvDependencyCode += 'const validator = null\n'
   }
 
-  const serializerOptions = options && options.rounding ? JSON.stringify({ options: options.rounding }) : ''
   return `
   'use strict'
-  ${serializerCode.replace("'use strict'", '').replace('module.exports = ', '')}
-  ${buildAjvCode}
-  const serializer = new Serializer(${serializerOptions})
-  ${ajvSchemasCode}
+  const { dependencies } = require('fast-json-stringify/lib/standalone')
+
+  const { Serializer, Validator } = dependencies
+
+  const serializerState = ${JSON.stringify(serializer.getState())}
+  const serializer = Serializer.restoreFromState(serializerState)
 
-  ${contextFunctionCode.replace('return main', '')}
+  ${ajvDependencyCode}
 
-  module.exports = main`
+  module.exports = ${contextFunc.toString()}(validator, serializer)`
 }
 
 module.exports = buildStandaloneCode
+
+module.exports.dependencies = {
+  Serializer: require('./serializer'),
+  Validator: require('./validator')
+}

package/lib/validator.js

@@ -25,6 +25,9 @@ class Validator {
         return date instanceof Date
       }
     })
+
+    this._ajvSchemas = {}
+    this._ajvOptions = ajvOptions || {}
   }
 
   addSchema (schema, schemaName) {
@@ -40,6 +43,7 @@ class Validator {
       const ajvSchema = clone(schema)
       this.convertSchemaToAjvFormat(ajvSchema)
       this.ajv.addSchema(ajvSchema, schemaKey)
+      this._ajvSchemas[schemaKey] = schema
     }
   }
 
@@ -70,6 +74,21 @@ class Validator {
       }
     }
   }
+
+  getState () {
+    return {
+      ajvOptions: this._ajvOptions,
+      ajvSchemas: this._ajvSchemas
+    }
+  }
+
+  static restoreFromState (state) {
+    const validator = new Validator(state.ajvOptions)
+    for (const [id, ajvSchema] of Object.entries(state.ajvSchemas)) {
+      validator.ajv.addSchema(ajvSchema, id)
+    }
+    return validator
+  }
 }
 
 module.exports = Validator

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-json-stringify",
-  "version": "5.6.1",
+  "version": "5.7.0",
   "description": "Stringify your JSON at max speed",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -34,7 +34,7 @@
   "homepage": "https://github.com/fastify/fast-json-stringify#readme",
   "devDependencies": {
     "@fastify/pre-commit": "^2.0.2",
-    "@sinclair/typebox": "^0.25.2",
+    "@sinclair/typebox": "^0.26.5",
     "benchmark": "^2.1.4",
     "cli-select": "^1.1.2",
     "compile-json-stringify": "^0.1.2",
@@ -42,8 +42,9 @@
     "simple-git": "^3.7.1",
     "standard": "^17.0.0",
     "tap": "^16.0.1",
-    "tsd": "^0.25.0",
-    "webpack": "^5.40.0"
+    "tsd": "^0.28.0",
+    "webpack": "^5.40.0",
+    "fast-json-stringify": "."
   },
   "dependencies": {
     "@fastify/deepmerge": "^1.0.0",

package/test/integer.test.js

@@ -35,6 +35,18 @@ test('render a float as an integer', (t) => {
   }
 })
 
+test('throws on NaN', (t) => {
+  t.plan(1)
+
+  const schema = {
+    title: 'integer',
+    type: 'integer'
+  }
+
+  const stringify = build(schema)
+  t.throws(() => stringify(NaN), new Error('The value "NaN" cannot be converted to an integer.'))
+})
+
 test('render a float as an integer', (t) => {
   const cases = [
     { input: Math.PI, output: '3' },
@@ -45,6 +57,7 @@ test('render a float as an integer', (t) => {
     { input: 42, output: '42' },
     { input: 1.99999, output: '1' },
     { input: -45.05, output: '-45' },
+    { input: 3333333333333333, output: '3333333333333333' },
     { input: Math.PI, output: '3', rounding: 'trunc' },
     { input: 5.0, output: '5', rounding: 'trunc' },
     { input: null, output: '0', rounding: 'trunc' },

package/test/ref.test.js

@@ -2078,3 +2078,42 @@ test('should throw an Error if two non-identical schemas with same id are provid
 
   t.throws(() => build(schema), new Error('There is already another schema with id inner_schema'))
 })
+
+test('ref internal - throw if schema has definition twice with different shape', (t) => {
+  t.plan(1)
+
+  const schema = {
+    $id: 'test',
+    title: 'object with $ref',
+    definitions: {
+      def: {
+        $id: '#uri',
+        type: 'object',
+        properties: {
+          str: {
+            type: 'string'
+          }
+        },
+        required: ['str']
+      },
+      def2: {
+        $id: '#uri',
+        type: 'object',
+        properties: {
+          num: {
+            type: 'number'
+          }
+        },
+        required: ['num']
+      }
+    },
+    type: 'object',
+    properties: {
+      obj: {
+        $ref: '#uri'
+      }
+    }
+  }
+
+  t.throws(() => build(schema), Error('There is already another schema with id test##uri'))
+})