fast-json-stringify 5.9.1 → 5.9.2

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)
 }
@@ -680,7 +681,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 +749,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.9.2",
   "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',