fast-json-stringify 5.0.3 → 5.0.6

package/index.js

@@ -55,7 +55,7 @@ function resolveRef (location, ref) {
   }
 
   const schemaId = ref.slice(0, hashIndex) || location.schemaId
-  const jsonPointer = ref.slice(hashIndex)
+  const jsonPointer = ref.slice(hashIndex) || '#'
 
   const schemaRef = schemaId + jsonPointer
 
@@ -489,6 +489,11 @@ function mergeAllOfSchema (location, schema, mergedSchema) {
     }
   }
   delete mergedSchema.allOf
+
+  mergedSchema.$id = `merged_${randomUUID()}`
+  ajvInstance.addSchema(mergedSchema)
+  location.schemaId = mergedSchema.$id
+  location.jsonPointer = '#'
 }
 
 function buildInnerObject (location) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-json-stringify",
-  "version": "5.0.3",
+  "version": "5.0.6",
   "description": "Stringify your JSON at max speed",
   "main": "index.js",
   "types": "index.d.ts",
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/fastify/fast-json-stringify#readme",
   "devDependencies": {
-    "@sinclair/typebox": "^0.23.3",
+    "@sinclair/typebox": "^0.24.9",
     "benchmark": "^2.1.4",
     "cli-select": "^1.1.2",
     "compile-json-stringify": "^0.1.2",

package/test/issue-479.test.js

@@ -0,0 +1,57 @@
+'use strict'
+
+const { test } = require('tap')
+const build = require('..')
+
+test('should validate anyOf after allOf merge', (t) => {
+  t.plan(1)
+
+  const schema = {
+    $id: 'schema',
+    type: 'object',
+    allOf: [
+      {
+        $id: 'base',
+        type: 'object',
+        properties: {
+          name: {
+            type: 'string'
+          }
+        },
+        required: [
+          'name'
+        ]
+      },
+      {
+        $id: 'inner_schema',
+        type: 'object',
+        properties: {
+          union: {
+            $id: '#id',
+            anyOf: [
+              {
+
+                $id: 'guid',
+                type: 'string'
+              },
+              {
+
+                $id: 'email',
+                type: 'string'
+              }
+            ]
+          }
+        },
+        required: [
+          'union'
+        ]
+      }
+    ]
+  }
+
+  const stringify = build(schema)
+
+  t.equal(
+    stringify({ name: 'foo', union: 'a8f1cc50-5530-5c62-9109-5ba9589a6ae1' }),
+    '{"name":"foo","union":"a8f1cc50-5530-5c62-9109-5ba9589a6ae1"}')
+})

package/test/ref.test.js

@@ -1891,3 +1891,65 @@ test('input schema is not mutated', (t) => {
   t.equal(output, '{"obj":"test"}')
   t.same(schema, clonedSchema)
 })
+
+test('anyOf inside allOf', (t) => {
+  t.plan(1)
+
+  const schema = {
+    anyOf: [
+      {
+        type: 'object',
+        allOf: [
+          {
+            properties: {
+              a: {
+                anyOf: [
+                  { const: 'A1' },
+                  { const: 'A2' }
+                ]
+              }
+            }
+          },
+          {
+            properties: {
+              b: { const: 'B' }
+            }
+          }
+        ]
+      }
+    ]
+  }
+
+  const object = { a: 'A1', b: 'B' }
+  const stringify = build(schema)
+  const output = stringify(object)
+
+  t.equal(output, JSON.stringify(object))
+})
+
+test('should resolve absolute $refs', (t) => {
+  t.plan(1)
+
+  const externalSchema = {
+    FooSchema: {
+      $id: 'FooSchema',
+      type: 'object',
+      properties: {
+        type: {
+          anyOf: [
+            { type: 'string', const: 'bar' },
+            { type: 'string', const: 'baz' }
+          ]
+        }
+      }
+    }
+  }
+
+  const schema = { $ref: 'FooSchema' }
+
+  const object = { type: 'bar' }
+  const stringify = build(schema, { schema: externalSchema })
+  const output = stringify(object)
+
+  t.equal(output, JSON.stringify(object))
+})