fast-json-stringify 3.0.1 → 3.0.2

package/index.js

@@ -7,6 +7,7 @@ const ajvFormats = require('ajv-formats')
 const merge = require('deepmerge')
 const clone = require('rfdc')({ proto: true })
 const fjsCloned = Symbol('fast-json-stringify.cloned')
+const { randomUUID } = require('crypto')
 
 const validate = require('./schema-validator')
 let stringSimilarity = null
@@ -43,11 +44,17 @@ function mergeLocation (source, dest) {
 
 const arrayItemsReferenceSerializersMap = new Map()
 const objectReferenceSerializersMap = new Map()
+let ajvInstance = null
 
 function build (schema, options) {
   arrayItemsReferenceSerializersMap.clear()
   objectReferenceSerializersMap.clear()
+
   options = options || {}
+
+  ajvInstance = new Ajv({ ...options.ajv, strictSchema: false })
+  ajvFormats(ajvInstance)
+
   isValidSchema(schema)
   if (options.schema) {
     // eslint-disable-next-line
@@ -72,41 +79,6 @@ function build (schema, options) {
 
   code += `
     ${asFunctions}
-
-    
-    /**
-     * Used by schemas that are dependant on calling 'ajv.validate' during runtime,
-     * it stores the value of the '$id' property of the schema (if it has it) inside
-     * a cache which is used to figure out if the schema was compiled into a validator
-     * by ajv on a previous call, if it was then the '$id' string will be used to 
-     * invoke 'ajv.validate', this allows:
-     * 
-     * 1. Schemas that depend on ajv.validate calls to leverage ajv caching system.
-     * 2. To avoid errors, since directly invoking 'ajv.validate' with the same 
-     * schema (that contains an '$id' property) twice will throw an error.
-     */
-    const $validateWithAjv = (function() {
-      const cache = new Set()
-
-      return function (schema, target) {
-        const id = schema.$id
-        
-        if (!id) {
-          return ajv.validate(schema, target)
-        }
-
-        const cached = cache.has(id)
-
-        if (cached) {
-          return ajv.validate(id, target)
-        } else {
-          cache.add(id)
-          return ajv.validate(schema, target)
-        }
-      }
-    })()
-
-
     function parseInteger(int) { return Math.${intParseFunctionName}(int) }
     `
 
@@ -163,18 +135,17 @@ function build (schema, options) {
     ;
      return ${main}
   `
-
-  const ajvInstance = new Ajv(options.ajv)
-  ajvFormats(ajvInstance)
   const dependencies = [ajvInstance]
   const dependenciesName = ['ajv']
+  ajvInstance = null
+
   dependenciesName.push(code)
 
   if (options.debugMode) {
-    dependenciesName.toString = function () {
-      return dependenciesName.join('\n')
+    return {
+      code: dependenciesName.join('\n'),
+      ajv: dependencies[0]
     }
-    return dependenciesName
   }
 
   arrayItemsReferenceSerializersMap.clear()
@@ -874,8 +845,11 @@ function addIfThenElse (location, name) {
   let merged = merge(copy, then)
   let mergedLocation = mergeLocation(location, { schema: merged })
 
+  const schemaKey = i.$id || randomUUID()
+  ajvInstance.addSchema(i, schemaKey)
+
   code += `
-    valid = $validateWithAjv(${JSON.stringify(i)}, obj)
+    valid = ajv.validate(${JSON.stringify(schemaKey)}, obj)
     if (valid) {
   `
   if (merged.if && merged.then) {
@@ -1224,8 +1198,12 @@ function nested (laterCode, name, key, location, subKey, isArray) {
           // with the actual schema
           // 2. `nested`, through `buildCode`, replaces any reference in object properties with the actual schema
           // (see https://github.com/fastify/fast-json-stringify/blob/6da3b3e8ac24b1ca5578223adedb4083b7adf8db/index.js#L631)
+
+          const schemaKey = location.schema.$id || randomUUID()
+          ajvInstance.addSchema(location.schema, schemaKey)
+
           code += `
-            ${index === 0 ? 'if' : 'else if'}($validateWithAjv(${JSON.stringify(location.schema)}, ${testValue}))
+            ${index === 0 ? 'if' : 'else if'}(ajv.validate(${JSON.stringify(schemaKey)}, ${testValue}))
               ${nestedResult.code}
           `
           laterCode = nestedResult.laterCode
@@ -1241,8 +1219,12 @@ function nested (laterCode, name, key, location, subKey, isArray) {
           const testSerializer = getTestSerializer(location.schema.format)
           const testValue = testSerializer !== undefined ? `${testSerializer}(obj${accessor}, true)` : `obj${accessor}`
           // see comment on anyOf about dereferencing the schema before calling ajv.validate
+
+          const schemaKey = location.schema.$id || randomUUID()
+          ajvInstance.addSchema(location.schema, schemaKey)
+
           code += `
-            ${index === 0 ? 'if' : 'else if'}($validateWithAjv(${JSON.stringify(location.schema)}, ${testValue}))
+            ${index === 0 ? 'if' : 'else if'}(ajv.validate(${JSON.stringify(schemaKey)}, ${testValue}))
               ${nestedResult.code}
           `
           laterCode = nestedResult.laterCode
@@ -1352,17 +1334,8 @@ function isEmpty (schema) {
 
 module.exports = build
 
-module.exports.restore = function (debugModeStr, options = {}) {
-  const dependencies = [debugModeStr]
-  const args = []
-  if (debugModeStr.startsWith('ajv')) {
-    dependencies.unshift('ajv')
-    const ajvInstance = new Ajv(options.ajv)
-    ajvFormats(ajvInstance)
-    args.push(ajvInstance)
-  }
-
+module.exports.restore = function ({ code, ajv }) {
   // eslint-disable-next-line
-  return (Function.apply(null, ['ajv', debugModeStr])
-    .apply(null, args))
+  return (Function.apply(null, ['ajv', code])
+    .apply(null, [ajv]))
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-json-stringify",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Stringify your JSON at max speed",
   "main": "index.js",
   "types": "index.d.ts",

package/test/debug-mode.test.js

@@ -2,6 +2,7 @@
 
 const test = require('tap').test
 const fjs = require('..')
+const Ajv = require('ajv').default
 
 function build (opts) {
   return fjs({
@@ -17,32 +18,40 @@ function build (opts) {
 }
 
 test('activate debug mode', t => {
-  t.plan(2)
+  t.plan(3)
   const debugMode = build({ debugMode: true })
-  t.type(debugMode, Array)
-  t.match(debugMode.toString.toString(), 'join', 'to string override')
+
+  t.type(debugMode, 'object')
+  t.ok(debugMode.ajv instanceof Ajv)
+  t.type(debugMode.code, 'string')
 })
 
 test('activate debug mode truthy', t => {
-  t.plan(2)
+  t.plan(3)
+
   const debugMode = build({ debugMode: 'yes' })
-  t.type(debugMode, Array)
-  t.match(debugMode.toString.toString(), 'join', 'to string override')
+
+  t.type(debugMode, 'object')
+  t.type(debugMode.code, 'string')
+  t.ok(debugMode.ajv instanceof Ajv)
 })
 
 test('to string auto-consistent', t => {
-  t.plan(2)
+  t.plan(4)
   const debugMode = build({ debugMode: 1 })
-  t.type(debugMode, Array)
 
-  const str = debugMode.toString()
-  const compiled = fjs.restore(str)
+  t.type(debugMode, 'object')
+  t.type(debugMode.code, 'string')
+  t.ok(debugMode.ajv instanceof Ajv)
+
+  const compiled = fjs.restore(debugMode)
   const tobe = JSON.stringify({ firstName: 'Foo' })
   t.same(compiled({ firstName: 'Foo', surname: 'bar' }), tobe, 'surname evicted')
 })
 
 test('to string auto-consistent with ajv', t => {
-  t.plan(2)
+  t.plan(4)
+
   const debugMode = fjs({
     title: 'object with multiple types field',
     type: 'object',
@@ -56,16 +65,19 @@ test('to string auto-consistent with ajv', t => {
       }
     }
   }, { debugMode: 1 })
-  t.type(debugMode, Array)
 
-  const str = debugMode.toString()
-  const compiled = fjs.restore(str)
+  t.type(debugMode, 'object')
+  t.type(debugMode.code, 'string')
+  t.ok(debugMode.ajv instanceof Ajv)
+
+  const compiled = fjs.restore(debugMode)
   const tobe = JSON.stringify({ str: 'Foo' })
   t.same(compiled({ str: 'Foo', void: 'me' }), tobe)
 })
 
 test('to string auto-consistent with ajv-formats', t => {
   t.plan(3)
+
   const debugMode = fjs({
     title: 'object with multiple types field and format keyword',
     type: 'object',
@@ -80,11 +92,10 @@ test('to string auto-consistent with ajv-formats', t => {
       }
     }
   }, { debugMode: 1 })
-  t.type(debugMode, Array)
 
-  const str = debugMode.toString()
+  t.type(debugMode, 'object')
 
-  const compiled = fjs.restore(str)
+  const compiled = fjs.restore(debugMode)
   const tobe = JSON.stringify({ str: 'foo@bar.com' })
   t.same(compiled({ str: 'foo@bar.com' }), tobe)
   t.same(compiled({ str: 'foo' }), JSON.stringify({ str: null }), 'invalid format is ignored')