fast-json-stringify 2.7.5 → 2.7.9

package/.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v2.3.4
 
       - name: Use Node.js
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.4.0
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -38,6 +38,6 @@ jobs:
     needs: test
     runs-on: ubuntu-latest
     steps:
-      - uses: fastify/github-action-merge-dependabot@v2.0.0
+      - uses: fastify/github-action-merge-dependabot@v2.4.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

package/README.md

@@ -342,7 +342,7 @@ const stringify = fastJson({
           savedId: { type: 'string' }
         },
         // without "required" validation any object will match
-        required: ['saveId']
+        required: ['savedId']
       },
       {
         type: 'object',

package/index.d.ts

@@ -64,6 +64,7 @@ declare namespace build {
 
   export interface StringSchema extends BaseSchema {
     type: "string";
+    format?: string;
   }
 
   export interface IntegerSchema extends BaseSchema {

package/index.js

@@ -72,21 +72,7 @@ function build (schema, options) {
   `
 
   code += `
-    ${$pad2Zeros.toString()}
-    ${$asAny.toString()}
-    ${$asString.toString()}
-    ${$asStringNullable.toString()}
-    ${$asStringSmall.toString()}
-    ${$asDatetime.toString()}
-    ${$asDate.toString()}
-    ${$asTime.toString()}
-    ${$asNumber.toString()}
-    ${$asNumberNullable.toString()}
-    ${$asInteger.toString()}
-    ${$asIntegerNullable.toString()}
-    ${$asNull.toString()}
-    ${$asBoolean.toString()}
-    ${$asBooleanNullable.toString()}
+    ${asFunctions}
 
     var isLong = ${isLong ? isLong.toString() : false}
 
@@ -116,19 +102,19 @@ function build (schema, options) {
       code = buildObject(location, code, main)
       break
     case 'string':
-      main = schema.nullable ? $asStringNullable.name : getStringSerializer(schema.format)
+      main = schema.nullable ? '$asStringNullable' : getStringSerializer(schema.format)
       break
     case 'integer':
-      main = schema.nullable ? $asIntegerNullable.name : $asInteger.name
+      main = schema.nullable ? '$asIntegerNullable' : '$asInteger'
       break
     case 'number':
-      main = schema.nullable ? $asNumberNullable.name : $asNumber.name
+      main = schema.nullable ? '$asNumberNullable' : '$asNumber'
       break
     case 'boolean':
-      main = schema.nullable ? $asBooleanNullable.name : $asBoolean.name
+      main = schema.nullable ? '$asBooleanNullable' : '$asBoolean'
       break
     case 'null':
-      main = $asNull.name
+      main = '$asNull'
       break
     case 'array':
       main = '$main'
@@ -233,6 +219,7 @@ function getTestSerializer (format) {
   return stringSerializerMap[format]
 }
 
+const asFunctions = `
 function $pad2Zeros (num) {
   const s = '00' + num
   return s[s.length - 2] + s[s.length - 1]
@@ -254,9 +241,8 @@ function $asInteger (i) {
   } else if (Number.isInteger(i)) {
     return $asNumber(i)
   } else {
-    // if the output is NaN the type is coerced to int 0
     /* eslint no-undef: "off" */
-    return $asNumber(parseInteger(i) || 0)
+    return $asNumber(parseInteger(i))
   }
 }
 
@@ -373,7 +359,7 @@ function $asStringSmall (str) {
       surrogateFound = true
     }
     if (point === 34 || point === 92) {
-      result += str.slice(last, i) + '\\'
+      result += str.slice(last, i) + '\\\\'
       last = i
       found = true
     }
@@ -386,6 +372,7 @@ function $asStringSmall (str) {
   }
   return ((point < 32) || (surrogateFound === true)) ? JSON.stringify(str) : '"' + result + '"'
 }
+`
 
 function addPatternProperties (location) {
   const schema = location.schema
@@ -929,7 +916,7 @@ function buildObject (location, code, name) {
   if (schema.nullable) {
     code += `
       if(input === null) {
-        return '${$asNull()}';
+        return 'null';
       }
   `
   }
@@ -968,7 +955,7 @@ function buildArray (location, code, name, key = null) {
   if (schema.nullable) {
     code += `
       if(obj === null) {
-        return '${$asNull()}';
+        return 'null';
       }
     `
   }
@@ -1036,9 +1023,11 @@ function buildArray (location, code, name, key = null) {
 
   code += `
     var l = obj.length
-    var w = l - 1
+
     for (var i = 0; i < l; i++) {
-      if (i > 0) {
+      var jsonLastChar = json[json.length - 1]
+
+      if (i > 0 && jsonLastChar !== '[' && jsonLastChar !== ',') {
         json += ','
       }
       ${result.code}
@@ -1227,9 +1216,12 @@ function nested (laterCode, name, key, location, subKey, isArray) {
           `
           laterCode = nestedResult.laterCode
         })
-        code += `
-          else json+= null
-        `
+
+        if (!isArray) {
+          code += `
+            else json+= null
+          `
+        }
       } else if (isEmpty(schema)) {
         code += `
           json += JSON.stringify(obj${accessor})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-json-stringify",
-  "version": "2.7.5",
+  "version": "2.7.9",
   "description": "Stringify your JSON at max speed",
   "main": "index.js",
   "types": "index.d.ts",
@@ -41,7 +41,8 @@
     "semver": "^7.1.0",
     "standard": "^16.0.1",
     "tap": "^15.0.0",
-    "typescript": "^4.0.2"
+    "typescript": "^4.0.2",
+    "webpack": "^5.40.0"
   },
   "dependencies": {
     "ajv": "^6.11.0",

package/test/date.test.js

@@ -76,7 +76,7 @@ test('verify padding for rendered date in a string when format is date', (t) =>
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
-test('render a date in a string when format is time as HH:mm:ss', (t) => {
+test('render a date in a string when format is time as kk:mm:ss', (t) => {
   t.plan(3)
 
   const schema = {

package/test/integer.test.js

@@ -6,6 +6,7 @@ const semver = require('semver')
 const validator = require('is-my-json-valid')
 const proxyquire = require('proxyquire')
 const build = proxyquire('..', { long: null })
+const ROUNDING_TYPES = ['ceil', 'floor', 'round']
 
 test('render an integer as JSON', (t) => {
   t.plan(2)
@@ -40,6 +41,10 @@ test('render a float as an integer', (t) => {
   const cases = [
     { input: Math.PI, output: '3' },
     { input: 5.0, output: '5' },
+    { input: null, output: '0' },
+    { input: 0, output: '0' },
+    { input: 0.0, output: '0' },
+    { input: 42, output: '42' },
     { input: 1.99999, output: '1' },
     { input: -45.05, output: '-45' },
     { input: 0.95, output: '1', rounding: 'ceil' },
@@ -138,7 +143,7 @@ if (semver.gt(process.versions.node, '10.3.0')) {
   t.end()
 }
 
-test('should round interger object parameter ', t => {
+test('should round integer object parameter', t => {
   t.plan(2)
 
   const schema = { type: 'object', properties: { magic: { type: 'integer' } } }
@@ -149,3 +154,29 @@ test('should round interger object parameter ', t => {
   t.equal(output, '{"magic":5}')
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
+
+test('should not stringify a property if it does not exist', t => {
+  t.plan(2)
+
+  const schema = { title: 'Example Schema', type: 'object', properties: { age: { type: 'integer' } } }
+  const validate = validator(schema)
+  const stringify = build(schema)
+  const output = stringify({})
+
+  t.equal(output, '{}')
+  t.ok(validate(JSON.parse(output)), 'valid schema')
+})
+
+ROUNDING_TYPES.forEach((rounding) => {
+  test(`should not stringify a property if it does not exist (rounding: ${rounding})`, t => {
+    t.plan(2)
+
+    const schema = { type: 'object', properties: { magic: { type: 'integer' } } }
+    const validate = validator(schema)
+    const stringify = build(schema, { rounding })
+    const output = stringify({})
+
+    t.equal(output, '{}')
+    t.ok(validate(JSON.parse(output)), 'valid schema')
+  })
+})

package/test/oneof.test.js

@@ -401,3 +401,105 @@ test('oneOf object with field of type string with format or null', (t) => {
     prop: toStringify
   }), `{"prop":"${toStringify.toISOString()}"}`)
 })
+
+test('one array item match oneOf types', (t) => {
+  t.plan(1)
+
+  const schema = {
+    type: 'object',
+    additionalProperties: false,
+    required: ['data'],
+    properties: {
+      data: {
+        type: 'array',
+        minItems: 1,
+        items: {
+          oneOf: [
+            {
+              type: 'string'
+            },
+            {
+              type: 'number'
+            }
+          ]
+        }
+      }
+    }
+  }
+
+  const stringify = build(schema)
+
+  const responseWithMappedType = stringify({
+    data: [false, 'foo']
+  })
+
+  t.equal('{"data":["foo"]}', responseWithMappedType)
+})
+
+test('some array items match oneOf types', (t) => {
+  t.plan(1)
+
+  const schema = {
+    type: 'object',
+    additionalProperties: false,
+    required: ['data'],
+    properties: {
+      data: {
+        type: 'array',
+        minItems: 1,
+        items: {
+          oneOf: [
+            {
+              type: 'string'
+            },
+            {
+              type: 'number'
+            }
+          ]
+        }
+      }
+    }
+  }
+
+  const stringify = build(schema)
+
+  const responseWithMappedTypes = stringify({
+    data: [false, 'foo', true, 5]
+  })
+
+  t.equal('{"data":["foo",5]}', responseWithMappedTypes)
+})
+
+test('all array items does not match oneOf types', (t) => {
+  t.plan(1)
+
+  const schema = {
+    type: 'object',
+    additionalProperties: false,
+    required: ['data'],
+    properties: {
+      data: {
+        type: 'array',
+        minItems: 1,
+        items: {
+          oneOf: [
+            {
+              type: 'string'
+            },
+            {
+              type: 'number'
+            }
+          ]
+        }
+      }
+    }
+  }
+
+  const stringify = build(schema)
+
+  const emptyResponse = stringify({
+    data: [null, false, true, undefined, [], {}]
+  })
+
+  t.equal('{"data":[]}', emptyResponse)
+})

package/test/types/test.ts

@@ -135,3 +135,11 @@ const schema11: Schema = {
 }
 
 build(schema11)({ something: 'a string', somethingElse: 42 })
+
+// String schema with format
+const schema12: Schema = {
+  type: 'string',
+  format: 'date-time'
+}
+
+build(schema12)(new Date())

package/test/webpack.test.js

@@ -0,0 +1,50 @@
+'use strict'
+
+const test = require('tap').test
+const webpack = require('webpack')
+const path = require('path')
+
+test('the library should work with webpack', async (t) => {
+  t.plan(1)
+  const targetdir = path.resolve(__dirname, '..', '.cache')
+  const targetname = path.join(targetdir, 'webpacktest.js')
+  const wopts = {
+    entry: path.resolve(__dirname, '..', 'index.js'),
+    mode: 'production',
+    target: 'node',
+    output: {
+      path: targetdir,
+      filename: 'webpacktest.js',
+      library: {
+        name: 'fastJsonStringify',
+        type: 'umd'
+      }
+    }
+  }
+  await new Promise((resolve, reject) => {
+    webpack(wopts, (err, stats) => {
+      if (err) { reject(err) } else { resolve(stats) };
+    })
+  })
+  const build = require(targetname)
+  const stringify = build({
+    title: 'webpack should not rename code to be executed',
+    type: 'object',
+    properties: {
+      foo: {
+        type: 'string'
+      },
+      bar: {
+        type: 'boolean'
+      }
+    },
+    patternProperties: {
+      foo: {
+        type: 'number'
+      }
+    }
+  })
+
+  const obj = { foo: '42', bar: true }
+  t.equal(stringify(obj), '{"foo":"42","bar":true}')
+})