fast-json-stringify 6.2.0 → 6.3.0

package/README.md

@@ -79,7 +79,6 @@ compile-json-stringify date format x 803,214 ops/sec ±0.23% (97 runs sampled)
 
 
 <a name="example"></a>
-Try it out on RunKit: <a href="https://runkit.com/npm/fast-json-stringify">https://runkit.com/npm/fast-json-stringify</a>
 ## Example
 
 ```js
@@ -347,9 +346,9 @@ const stringify = fastJson({
   properties: {
     'undecidedType': {
       'anyOf': [{
-	type: 'string'
+        type: 'string'
       }, {
-	type: 'boolean'
+        type: 'boolean'
       }]
     }
   }
@@ -645,8 +644,8 @@ const stringify = fastJson({
   type: 'object',
   properties: {
     'code': {
-	    type: 'string',
-	    format 'unsafe'
+      type: 'string',
+      format: 'unsafe'
     }
   }
 })

package/benchmark/bench-cmp-lib.js

@@ -84,13 +84,13 @@ const arraySchemaAJVJTD = {
 const dateFormatSchema = {
   description: 'Date of birth',
   type: 'string',
-  format: 'date'
+  format: 'datetime'
 }
 
 const dateFormatSchemaCJS = {
   description: 'Date of birth',
   type: 'string',
-  format: 'date'
+  format: 'datetime'
 }
 
 const obj = {
@@ -310,9 +310,9 @@ suite.add('compile-json-stringify date format', function () {
 
 suite.run().then(() => {
   for (const task of suite.tasks) {
-    const hz = task.result.hz // ops/sec
-    const rme = task.result.rme // relative margin of error (%)
-    const samples = task.result.samples.length
+    const hz = task.result.throughput.mean // ops/sec
+    const rme = task.result.latency.rme // relative margin of error (%)
+    const samples = task.result.latency.df + 1 // degrees of freedom + 1 = sample count
 
     const formattedHz = hz.toLocaleString('en-US', { maximumFractionDigits: 0 })
     const formattedRme = rme.toFixed(2)

package/benchmark/bench-thread.js

@@ -21,9 +21,9 @@ bench.add(benchmark.name, () => {
   stringify(benchmark.input)
 }).run().then(() => {
   const task = bench.tasks[0]
-  const hz = task.result.hz // ops/sec
-  const rme = task.result.rme // relative margin of error (%)
-  const samples = task.result.samples.length
+  const hz = task.result.throughput.mean // ops/sec
+  const rme = task.result.latency.rme // relative margin of error (%)
+  const samples = task.result.latency.df + 1 // degrees of freedom + 1 = sample count
 
   const formattedHz = hz.toLocaleString('en-US', { maximumFractionDigits: 0 })
   const formattedRme = rme.toFixed(2)

package/index.js

@@ -304,14 +304,14 @@ function buildExtraObjectPropertiesSerializer (context, location, addComma, objV
   const propertiesKeys = Object.keys(schema.properties || {})
 
   let code = `
-    const propertiesKeys = ${JSON.stringify(propertiesKeys)}
-    for (const [key, value] of Object.entries(${objVar})) {
+    for (const key of Object.keys(${objVar})) {
       if (
-        propertiesKeys.includes(key) ||
-        value === undefined ||
-        typeof value === 'function' ||
-        typeof value === 'symbol'
+        ${propertiesKeys.length > 0 ? propertiesKeys.map(k => `key === ${JSON.stringify(k)}`).join(' || ') + ' ||' : ''}
+        ${objVar}[key] === undefined ||
+        typeof ${objVar}[key] === 'function' ||
+        typeof ${objVar}[key] === 'symbol'
       ) continue
+      const value = ${objVar}[key]
   `
 
   const patternPropertiesLocation = location.getPropertyLocation('patternProperties')
@@ -385,45 +385,99 @@ function buildInnerObject (context, location, objVar) {
 
   const localUid = context.uid++
   let addComma = ''
-  const needsRuntimeComma = propertiesKeys.length > 1 || schema.patternProperties || (schema.additionalProperties !== undefined && schema.additionalProperties !== false)
 
-  if (needsRuntimeComma) {
-    code += `let addComma_${localUid} = false\n`
-    addComma = `!addComma_${localUid} && (addComma_${localUid} = true) || (json += JSON_STR_COMMA)`
-  }
+  if (requiredProperties.length > 0) {
+    // If we have required properties, we know that at least one property will be serialized.
+    // We can avoid the runtime check for the comma.
 
-  for (const key of propertiesKeys) {
-    let propertyLocation = propertiesLocation.getPropertyLocation(key)
-    if (propertyLocation.schema.$ref) {
-      propertyLocation = resolveRef(context, propertyLocation)
-    }
+    // The first property is required, so we don't need a comma.
+    // For the subsequent properties, we can blindly add a comma.
 
-    const sanitizedKey = JSON.stringify(key)
-    const value = `value_${key.replace(/[^a-zA-Z0-9]/g, '_')}_${context.uid++}`
-    const defaultValue = propertyLocation.schema.default
-    const isRequired = requiredProperties.includes(key)
+    for (let i = 0; i < propertiesKeys.length; i++) {
+      const key = propertiesKeys[i]
+      const propertyLocation = propertiesLocation.getPropertyLocation(key)
 
-    code += `
+      let resolvedLocation = propertyLocation
+      if (propertyLocation.schema.$ref) {
+        resolvedLocation = resolveRef(context, propertyLocation)
+      }
+
+      const sanitizedKey = JSON.stringify(key)
+      const value = `value_${key.replace(/[^a-zA-Z0-9]/g, '_')}_${context.uid++}`
+      const defaultValue = resolvedLocation.schema.default
+      const isRequired = requiredProperties.includes(key)
+
+      // i === 0 means it's the first property, and it IS required (due to sort). No comma.
+      // i > 0 means it follows a required property (or a sequence starting with one). Unconditional comma.
+      const currentAddComma = i === 0 ? '' : 'json += JSON_STR_COMMA'
+
+      code += `
       const ${value} = ${objVar}[${sanitizedKey}]
       if (${value} !== undefined) {
-        ${addComma}
+        ${currentAddComma}
         json += ${JSON.stringify(sanitizedKey + ':')}
-        ${buildValue(context, propertyLocation, `${value}`)}
+        ${buildValue(context, resolvedLocation, `${value}`)}
       }`
 
-    if (defaultValue !== undefined) {
-      code += ` else {
-        ${addComma}
+      if (defaultValue !== undefined) {
+        code += ` else {
+        ${currentAddComma}
         json += ${JSON.stringify(sanitizedKey + ':' + JSON.stringify(defaultValue))}
       }
       `
-    } else if (isRequired) {
-      code += ` else {
+      } else if (isRequired) {
+        code += ` else {
         throw new Error('${sanitizedKey.replace(/'/g, '\\\'')} is required!')
       }
       `
-    } else {
-      code += '\n'
+      } else {
+        code += '\n'
+      }
+    }
+
+    addComma = 'json += JSON_STR_COMMA'
+  } else {
+    const needsRuntimeComma = propertiesKeys.length > 1 || schema.patternProperties || (schema.additionalProperties !== undefined && schema.additionalProperties !== false)
+
+    if (needsRuntimeComma) {
+      code += `let addComma_${localUid} = false\n`
+      addComma = `!addComma_${localUid} && (addComma_${localUid} = true) || (json += JSON_STR_COMMA)`
+    }
+
+    for (const key of propertiesKeys) {
+      let propertyLocation = propertiesLocation.getPropertyLocation(key)
+      if (propertyLocation.schema.$ref) {
+        propertyLocation = resolveRef(context, propertyLocation)
+      }
+
+      const sanitizedKey = JSON.stringify(key)
+      const value = `value_${key.replace(/[^a-zA-Z0-9]/g, '_')}_${context.uid++}`
+      const defaultValue = propertyLocation.schema.default
+      const isRequired = requiredProperties.includes(key) // Should be false here but good to keep
+
+      code += `
+          const ${value} = ${objVar}[${sanitizedKey}]
+          if (${value} !== undefined) {
+            ${addComma}
+            json += ${JSON.stringify(sanitizedKey + ':')}
+            ${buildValue(context, propertyLocation, `${value}`)}
+          }`
+
+      if (defaultValue !== undefined) {
+        code += ` else {
+            ${addComma}
+            json += ${JSON.stringify(sanitizedKey + ':' + JSON.stringify(defaultValue))}
+          }
+          `
+      } else if (isRequired) {
+        // Should not happen if requiredProperties.length === 0 but safety
+        code += ` else {
+            throw new Error('${sanitizedKey.replace(/'/g, '\\\'')} is required!')
+          }
+          `
+      } else {
+        code += '\n'
+      }
     }
   }
 
@@ -611,10 +665,15 @@ function buildArray (context, location, input) {
 
     if (Array.isArray(itemsSchema)) {
       for (let i = 0, itemsSchemaLength = itemsSchema.length; i < itemsSchemaLength; i++) {
-        const item = itemsSchema[i]
+        let item = itemsSchema[i]
+        let itemLocation = itemsLocation.getPropertyLocation(i)
+        if (itemLocation.schema.$ref) {
+          itemLocation = resolveRef(context, itemLocation)
+          item = itemLocation.schema
+        }
         const value = `value_${i}`
         functionCode += `const ${value} = obj[${i}]`
-        const tmpRes = buildValue(context, itemsLocation.getPropertyLocation(i), value)
+        const tmpRes = buildValue(context, itemLocation, value)
         functionCode += `
         if (${i} < arrayLength) {
           if (${buildArrayTypeCondition(item.type, value)}) {
@@ -641,12 +700,14 @@ function buildArray (context, location, input) {
     } else {
       const code = buildValue(context, itemsLocation, 'value')
       functionCode += `
-      for (let i = 0; i < arrayLength; i++) {
-        if (i) {
+      if (arrayLength > 0) {
+        const value = obj[0]
+        ${code}
+        for (let i = 1; i < arrayLength; i++) {
           json += JSON_STR_COMMA
+          const value = obj[i]
+          ${code}
         }
-        const value = obj[i]
-        ${code}
       }`
     }
 
@@ -691,10 +752,15 @@ function buildArray (context, location, input) {
     const localUid = context.uid++
     inlinedCode += `let addComma_${localUid} = false\n`
     for (let i = 0, itemsSchemaLength = itemsSchema.length; i < itemsSchemaLength; i++) {
-      const item = itemsSchema[i]
+      let item = itemsSchema[i]
+      let itemLocation = itemsLocation.getPropertyLocation(i)
+      if (itemLocation.schema.$ref) {
+        itemLocation = resolveRef(context, itemLocation)
+        item = itemLocation.schema
+      }
       const value = `value_${i}_${context.uid++}`
       inlinedCode += `const ${value} = ${objVar}[${i}]`
-      const tmpRes = buildValue(context, itemsLocation.getPropertyLocation(i), value)
+      const tmpRes = buildValue(context, itemLocation, value)
       inlinedCode += `
         if (${i} < arrayLength_${objVar}) {
           if (${buildArrayTypeCondition(item.type, value)}) {
@@ -717,12 +783,14 @@ function buildArray (context, location, input) {
   } else {
     const code = buildValue(context, itemsLocation, 'value')
     inlinedCode += `
-      for (let i = 0; i < arrayLength_${objVar}; i++) {
-        if (i) {
+      if (arrayLength_${objVar} > 0) {
+        const value = ${objVar}[0]
+        ${code}
+        for (let i = 1; i < arrayLength_${objVar}; i++) {
           json += JSON_STR_COMMA
+          const value = ${objVar}[i]
+          ${code}
         }
-        const value = ${objVar}[i]
-        ${code}
       }`
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-json-stringify",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "description": "Stringify your JSON at max speed",
   "main": "index.js",
   "type": "commonjs",
@@ -62,19 +62,20 @@
     }
   ],
   "devDependencies": {
-    "@sinclair/typebox": "^0.34.3",
-    "c8": "^10.1.2",
+    "@sinclair/typebox": "^0.34.48",
+    "c8": "^10.1.3",
     "cli-select": "^1.1.2",
     "compile-json-stringify": "^0.1.2",
-    "eslint": "^9.17.0",
+    "eslint": "^9.39.2",
     "fast-json-stringify": ".",
     "is-my-json-valid": "^2.20.6",
-    "json-accelerator": "^0.0.2",
-    "neostandard": "^0.12.0",
-    "simple-git": "^3.23.0",
-    "tinybench": "^5.0.1",
-    "tsd": "^0.32.0",
-    "webpack": "^5.90.3"
+    "json-accelerator": "^0.1.7",
+    "neostandard": "^0.12.2",
+    "simple-git": "^3.30.0",
+    "tinybench": "^6.0.0",
+    "tsd": "^0.33.0",
+    "typescript": "^5.9.3",
+    "webpack": "^5.104.1"
   },
   "dependencies": {
     "@fastify/merge-json-schemas": "^0.2.0",

package/test/array.test.js

@@ -61,6 +61,34 @@ buildTest({
   dates: [new Date(1), new Date(2)]
 })
 
+buildTest({
+  title: 'dates tuple $ref',
+  definitions: {
+    dateTime: {
+      type: 'string',
+      format: 'date-time'
+    }
+  },
+  type: 'object',
+  properties: {
+    dates: {
+      type: 'array',
+      minItems: 2,
+      maxItems: 2,
+      items: [
+        {
+          $ref: '#/definitions/dateTime'
+        },
+        {
+          $ref: '#/definitions/dateTime'
+        }
+      ]
+    }
+  }
+}, {
+  dates: [new Date(1), new Date(2)]
+})
+
 buildTest({
   title: 'string array',
   type: 'object',