fast-json-stringify 5.9.1 → 5.10.0

package/README.md

@@ -590,6 +590,8 @@ Otherwise, instead of raising an error, null values will be coerced as follows:
 - `number` -> `0`
 - `string` -> `""`
 - `boolean` -> `false`
+- `object` -> `{}`
+- `array` -> `[]`
 
 <a name="largearrays"></a>
 #### Large Arrays

package/index.js

@@ -4,7 +4,6 @@
 
 const merge = require('@fastify/deepmerge')()
 const clone = require('rfdc')({ proto: true })
-const { randomUUID } = require('crypto')
 const { RefResolver } = require('json-schema-ref-resolver')
 
 const validate = require('./lib/schema-validator')
@@ -31,6 +30,8 @@ const validLargeArrayMechanisms = [
 
 const addComma = '!addComma && (addComma = true) || (json += \',\')'
 
+let schemaIdCounter = 0
+
 function isValidSchema (schema, name) {
   if (!validate(schema)) {
     if (name) {
@@ -86,7 +87,7 @@ function build (schema, options) {
     options,
     wrapObjects: true,
     refResolver: new RefResolver(),
-    rootSchemaId: schema.$id || randomUUID(),
+    rootSchemaId: schema.$id || `__fjs_root_${schemaIdCounter++}`,
     validatorSchemasIds: new Set()
   }
 
@@ -500,7 +501,7 @@ function mergeAllOfSchema (context, location, schema, mergedSchema) {
   }
   delete mergedSchema.allOf
 
-  mergedSchema.$id = `merged_${randomUUID()}`
+  mergedSchema.$id = `__fjs_merged_${schemaIdCounter++}`
   context.refResolver.addSchema(mergedSchema)
   location.addMergedSchema(mergedSchema, mergedSchema.$id)
 }
@@ -559,10 +560,13 @@ function buildObject (context, location) {
   let functionCode = `
   `
 
+  const nullable = schema.nullable === true
   functionCode += `
     // ${schemaRef}
     function ${functionName} (input) {
       const obj = ${toJSON('input')}
+      ${!nullable ? 'if (obj === null) return \'{}\'' : ''}
+
       ${buildInnerObject(context, location)}
     }
   `
@@ -600,7 +604,9 @@ function buildArray (context, location) {
       // ${schemaRef}
   `
 
+  const nullable = schema.nullable === true
   functionCode += `
+    ${!nullable ? 'if (obj === null) return \'[]\'' : ''}
     if (!Array.isArray(obj)) {
       throw new TypeError(\`The value of '${schemaRef}' does not match schema definition.\`)
     }
@@ -680,7 +686,15 @@ function buildArrayTypeCondition (type, accessor) {
       condition = `obj${accessor} === null`
       break
     case 'string':
-      condition = `typeof obj${accessor} === 'string'`
+      condition = `typeof obj${accessor} === 'string' ||
+      obj${accessor} === null ||
+      obj${accessor} instanceof Date ||
+      obj${accessor} instanceof RegExp ||
+      (
+        typeof obj${accessor} === "object" &&
+        typeof obj${accessor}.toString === "function" &&
+        obj${accessor}.toString !== Object.prototype.toString
+      )`
       break
     case 'integer':
       condition = `Number.isInteger(obj${accessor})`
@@ -740,8 +754,7 @@ function buildMultiTypeSerializer (context, location, input) {
             (
               typeof ${input} === "object" &&
               typeof ${input}.toString === "function" &&
-              ${input}.toString !== Object.prototype.toString &&
-              !(${input} instanceof Date)
+              ${input}.toString !== Object.prototype.toString
             )
           )
             ${nestedResult}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-json-stringify",
-  "version": "5.9.1",
+  "version": "5.10.0",
   "description": "Stringify your JSON at max speed",
   "main": "index.js",
   "type": "commonjs",
@@ -16,7 +16,10 @@
     "test:unit": "tap",
     "test": "npm run test:unit && npm run test:typescript"
   },
-  "precommit": ["lint", "test"],
+  "precommit": [
+    "lint",
+    "test"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fastify/fast-json-stringify.git"
@@ -35,7 +38,7 @@
   "homepage": "https://github.com/fastify/fast-json-stringify#readme",
   "devDependencies": {
     "@fastify/pre-commit": "^2.0.2",
-    "@sinclair/typebox": "^0.31.1",
+    "@sinclair/typebox": "^0.32.3",
     "benchmark": "^2.1.4",
     "cli-select": "^1.1.2",
     "compile-json-stringify": "^0.1.2",

package/test/array.test.js

@@ -31,12 +31,36 @@ function buildTest (schema, toStringify, options) {
     const stringify = build(schema, options)
     const output = stringify(toStringify)
 
-    t.same(JSON.parse(output), toStringify)
+    t.same(JSON.parse(output), JSON.parse(JSON.stringify(toStringify)))
     t.equal(output, JSON.stringify(toStringify))
     t.ok(validate(JSON.parse(output)), 'valid schema')
   })
 }
 
+buildTest({
+  title: 'dates tuple',
+  type: 'object',
+  properties: {
+    dates: {
+      type: 'array',
+      minItems: 2,
+      maxItems: 2,
+      items: [
+        {
+          type: 'string',
+          format: 'date-time'
+        },
+        {
+          type: 'string',
+          format: 'date-time'
+        }
+      ]
+    }
+  }
+}, {
+  dates: [new Date(1), new Date(2)]
+})
+
 buildTest({
   title: 'string array',
   type: 'object',

package/test/toJSON.test.js

@@ -127,7 +127,7 @@ test('not fail on null sub-object declared nullable', (t) => {
   t.equal('{"product":null}', stringify(object))
 })
 
-test('throw an error on non nullable null sub-object', (t) => {
+test('on non nullable null sub-object it should coerce to {}', (t) => {
   t.plan(1)
 
   const stringify = build({
@@ -148,10 +148,12 @@ test('throw an error on non nullable null sub-object', (t) => {
   const object = {
     product: null
   }
-  t.throws(() => { stringify(object) })
+
+  const result = stringify(object)
+  t.equal(result, JSON.stringify({ product: {} }))
 })
 
-test('throw an error on non nullable null object', (t) => {
+test('on non nullable null object it should coerce to {}', (t) => {
   t.plan(1)
 
   const stringify = build({
@@ -170,5 +172,32 @@ test('throw an error on non nullable null object', (t) => {
       }
     }
   })
-  t.throws(() => { stringify(null) })
+
+  const result = stringify(null)
+  t.equal(result, '{}')
+})
+
+test('on non-nullable null object it should skip rendering, skipping required fields checks', (t) => {
+  t.plan(1)
+
+  const stringify = build({
+    title: 'simple object',
+    nullable: false,
+    type: 'object',
+    properties: {
+      product: {
+        nullable: false,
+        type: 'object',
+        properties: {
+          name: {
+            type: 'string'
+          }
+        }
+      }
+    },
+    required: ['product']
+  })
+
+  const result = stringify(null)
+  t.equal(result, '{}')
 })

package/test/typesArray.test.js

@@ -467,7 +467,7 @@ test('class instance that is simultaneously a string and a json', (t) => {
   t.equal(valueObj, '{"simultaneously":{"foo":"hello"}}')
 })
 
-test('should throw an error when type is array and object is null', (t) => {
+test('should not throw an error when type is array and object is null, it should instead coerce to []', (t) => {
   t.plan(1)
   const schema = {
     type: 'object',
@@ -482,7 +482,8 @@ test('should throw an error when type is array and object is null', (t) => {
   }
 
   const stringify = build(schema)
-  t.throws(() => stringify({ arr: null }), new TypeError('The value of \'#/properties/arr\' does not match schema definition.'))
+  const result = stringify({ arr: null })
+  t.equal(result, JSON.stringify({ arr: [] }))
 })
 
 test('should throw an error when type is array and object is not an array', (t) => {