fast-json-stringify 3.1.0 → 3.2.0

package/.github/workflows/benchmark.yml

@@ -21,13 +21,13 @@ jobs:
       matrix:
         node-version: [12, 14, 16]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           persist-credentials: false
           ref: ${{github.event.pull_request.head.sha}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -46,7 +46,7 @@ jobs:
           echo "::set-output name=BENCH_RESULT${{matrix.node-version}}::$content"
 
       # main benchmark
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: 'master'
 

package/.github/workflows/ci.yml

@@ -19,10 +19,10 @@ jobs:
         os: [macos-latest, ubuntu-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 

package/index.d.ts

@@ -1,6 +1,10 @@
 import { Options as AjvOptions } from "ajv"
 declare namespace build {
   interface BaseSchema {
+    /**
+     * Schema id
+     */
+    $id?: string
     /**
      * Schema title
      */

package/index.js

@@ -52,11 +52,14 @@ function mergeLocation (source, dest) {
 
 const arrayItemsReferenceSerializersMap = new Map()
 const objectReferenceSerializersMap = new Map()
+const schemaReferenceMap = new Map()
+
 let ajvInstance = null
 
 function build (schema, options) {
   arrayItemsReferenceSerializersMap.clear()
   objectReferenceSerializersMap.clear()
+  schemaReferenceMap.clear()
 
   options = options || {}
 
@@ -174,6 +177,7 @@ function build (schema, options) {
 
   arrayItemsReferenceSerializersMap.clear()
   objectReferenceSerializersMap.clear()
+  schemaReferenceMap.clear()
 
   return (Function.apply(null, dependenciesName).apply(null, dependencies))
 }
@@ -605,15 +609,25 @@ function refFinder (ref, location) {
     return {
       schema: externalSchema[ref],
       root: externalSchema[ref],
-      externalSchema: externalSchema
+      externalSchema
     }
   }
 
   // Split file from walk
   ref = ref.split('#')
 
-  // If external file
-  if (ref[0]) {
+  // Check schemaReferenceMap for $id entry
+  if (ref[0] && schemaReferenceMap.has(ref[0])) {
+    schema = schemaReferenceMap.get(ref[0])
+    root = schemaReferenceMap.get(ref[0])
+    if (schema.$ref) {
+      return refFinder(schema.$ref, {
+        schema,
+        root,
+        externalSchema
+      })
+    }
+  } else if (ref[0]) { // If external file
     schema = externalSchema[ref[0]]
     root = externalSchema[ref[0]]
 
@@ -623,9 +637,9 @@ function refFinder (ref, location) {
 
     if (schema.$ref) {
       return refFinder(schema.$ref, {
-        schema: schema,
-        root: root,
-        externalSchema: externalSchema
+        schema,
+        root,
+        externalSchema
       })
     }
   }
@@ -652,8 +666,8 @@ function refFinder (ref, location) {
 
       return {
         schema: dereferenced,
-        root: root,
-        externalSchema: externalSchema
+        root,
+        externalSchema
       }
     } else {
       // eslint-disable-next-line
@@ -674,16 +688,16 @@ function refFinder (ref, location) {
 
   if (result.$ref) {
     return refFinder(result.$ref, {
-      schema: schema,
-      root: root,
-      externalSchema: externalSchema
+      schema,
+      root,
+      externalSchema
     })
   }
 
   return {
     schema: result,
-    root: root,
-    externalSchema: externalSchema
+    root,
+    externalSchema
   }
 
   function findBadKey (obj, keys) {
@@ -814,7 +828,7 @@ function buildCode (location, code, laterCode, name) {
     laterCode = builtCode.laterCode
   }
 
-  return { code: code, laterCode: laterCode }
+  return { code, laterCode }
 }
 
 function filterRequired (required, key) {
@@ -838,7 +852,7 @@ function buildCodeWithAllOfs (location, code, laterCode, name) {
     laterCode = builtCode.laterCode
   }
 
-  return { code: code, laterCode: laterCode }
+  return { code, laterCode }
 }
 
 function buildInnerObject (location, name) {
@@ -909,7 +923,7 @@ function addIfThenElse (location, name) {
   code += `
       }
     `
-  return { code: code, laterCode: laterCode }
+  return { code, laterCode }
 }
 
 function toJSON (variableName) {
@@ -921,7 +935,9 @@ function toJSON (variableName) {
 
 function buildObject (location, code, name) {
   const schema = location.schema
-
+  if (schema.$id !== undefined) {
+    schemaReferenceMap.set(schema.$id, schema)
+  }
   code += `
     function ${name} (input) {
   `
@@ -971,6 +987,9 @@ function buildObject (location, code, name) {
 
 function buildArray (location, code, name, key = null) {
   let schema = location.schema
+  if (schema.$id !== undefined) {
+    schemaReferenceMap.set(schema.$id, schema)
+  }
   code += `
     function ${name} (obj) {
   `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-json-stringify",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Stringify your JSON at max speed",
   "main": "index.js",
   "types": "index.d.ts",
@@ -38,7 +38,7 @@
     "pre-commit": "^1.2.2",
     "proxyquire": "^2.1.3",
     "semver": "^7.1.0",
-    "standard": "^16.0.1",
+    "standard": "^17.0.0",
     "tap": "^16.0.1",
     "typescript": "^4.0.2",
     "webpack": "^5.40.0"

package/test/if-then-else.test.js

@@ -261,13 +261,13 @@ t.test('if-then-else', t => {
   const tests = [
     {
       name: 'foobar',
-      schema: schema,
+      schema,
       input: fooBarInput,
       expected: foobarOutput
     },
     {
       name: 'greeting',
-      schema: schema,
+      schema,
       input: greetingInput,
       expected: greetingOutput
     },

package/test/nullable.test.js

@@ -9,11 +9,11 @@ const nullable = true
 const complexObject = {
   type: 'object',
   properties: {
-    nullableString: { type: 'string', nullable: nullable },
-    nullableNumber: { type: 'number', nullable: nullable },
-    nullableInteger: { type: 'integer', nullable: nullable },
-    nullableBoolean: { type: 'boolean', nullable: nullable },
-    nullableNull: { type: 'null', nullable: nullable },
+    nullableString: { type: 'string', nullable },
+    nullableNumber: { type: 'number', nullable },
+    nullableInteger: { type: 'integer', nullable },
+    nullableBoolean: { type: 'boolean', nullable },
+    nullableNull: { type: 'null', nullable },
     nullableArray: {
       type: 'array',
       nullable: true,
@@ -25,11 +25,11 @@ const complexObject = {
       nullable: false,
       additionalProperties: true,
       properties: {
-        nullableString: { type: 'string', nullable: nullable },
-        nullableNumber: { type: 'number', nullable: nullable },
-        nullableInteger: { type: 'integer', nullable: nullable },
-        nullableBoolean: { type: 'boolean', nullable: nullable },
-        nullableNull: { type: 'null', nullable: nullable },
+        nullableString: { type: 'string', nullable },
+        nullableNumber: { type: 'number', nullable },
+        nullableInteger: { type: 'integer', nullable },
+        nullableBoolean: { type: 'boolean', nullable },
+        nullableNull: { type: 'null', nullable },
         nullableArray: {
           type: 'array',
           nullable: true,
@@ -86,11 +86,11 @@ const complexExpectedResult = {
 }
 
 const testSet = {
-  nullableString: [{ type: 'string', nullable: nullable }, null, null],
-  nullableNumber: [{ type: 'number', nullable: nullable }, null, null],
-  nullableInteger: [{ type: 'integer', nullable: nullable }, null, null],
-  nullableBoolean: [{ type: 'boolean', nullable: nullable }, null, null],
-  nullableNull: [{ type: 'null', nullable: nullable }, null, null],
+  nullableString: [{ type: 'string', nullable }, null, null],
+  nullableNumber: [{ type: 'number', nullable }, null, null],
+  nullableInteger: [{ type: 'integer', nullable }, null, null],
+  nullableBoolean: [{ type: 'boolean', nullable }, null, null],
+  nullableNull: [{ type: 'null', nullable }, null, null],
   nullableArray: [{
     type: 'array',
     nullable: true,

package/test/recursion.test.js

@@ -178,3 +178,68 @@ test('can stringify recursive references in object types (issue #365)', t => {
   const value = stringify(data)
   t.equal(value, '{"category":{"parent":{"parent":{"parent":{"parent":{}}}}}}')
 })
+
+test('can stringify recursive inline $id references (issue #410)', t => {
+  t.plan(1)
+  const schema = {
+    $id: 'Node',
+    type: 'object',
+    properties: {
+      id: {
+        type: 'string'
+      },
+      nodes: {
+        type: 'array',
+        items: {
+          $ref: 'Node'
+        }
+      }
+    },
+    required: [
+      'id',
+      'nodes'
+    ]
+  }
+
+  const stringify = build(schema)
+  const data = {
+    id: '0',
+    nodes: [
+      {
+        id: '1',
+        nodes: [{
+          id: '2',
+          nodes: [
+            { id: '3', nodes: [] },
+            { id: '4', nodes: [] },
+            { id: '5', nodes: [] }
+          ]
+        }]
+      },
+      {
+        id: '6',
+        nodes: [{
+          id: '7',
+          nodes: [
+            { id: '8', nodes: [] },
+            { id: '9', nodes: [] },
+            { id: '10', nodes: [] }
+          ]
+        }]
+      },
+      {
+        id: '11',
+        nodes: [{
+          id: '12',
+          nodes: [
+            { id: '13', nodes: [] },
+            { id: '14', nodes: [] },
+            { id: '15', nodes: [] }
+          ]
+        }]
+      }
+    ]
+  }
+  const value = stringify(data)
+  t.equal(value, '{"id":"0","nodes":[{"id":"1","nodes":[{"id":"2","nodes":[{"id":"3","nodes":[]},{"id":"4","nodes":[]},{"id":"5","nodes":[]}]}]},{"id":"6","nodes":[{"id":"7","nodes":[{"id":"8","nodes":[]},{"id":"9","nodes":[]},{"id":"10","nodes":[]}]}]},{"id":"11","nodes":[{"id":"12","nodes":[{"id":"13","nodes":[]},{"id":"14","nodes":[]},{"id":"15","nodes":[]}]}]}]}')
+})