fast-json-stringify 2.2.4 → 2.2.9

package/.github/workflows/ci.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 13.x]
+        node-version: [10.x, 12.x, 13.x, 14.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}

package/bench.js

@@ -58,11 +58,6 @@ const obj = {
 
 const multiArray = []
 
-const JSTR = require('json-strify')
-const JSTRStringify = JSTR(schemaCJS)
-const JSTRArray = JSTR(arraySchemaCJS)
-const JSTRInstance = JSTR()
-
 const CJS = require('compile-json-stringify')
 const CJSStringify = CJS(schemaCJS)
 const CJSStringifyArray = CJS(arraySchemaCJS)
@@ -90,9 +85,6 @@ for (i = 0; i < 1000; i++) {
 suite.add('FJS creation', function () {
   FJS(schema)
 })
-suite.add('JSTR creation', function () {
-  JSTR(schemaCJS)
-})
 suite.add('CJS creation', function () {
   CJS(schemaCJS)
 })
@@ -105,10 +97,6 @@ suite.add('fast-json-stringify array', function () {
   stringifyArray(multiArray)
 })
 
-suite.add('json-strify array', function () {
-  JSTRArray(multiArray)
-})
-
 suite.add('compile-json-stringify array', function () {
   CJSStringifyArray(multiArray)
 })
@@ -121,10 +109,6 @@ suite.add('fast-json-stringify long string', function () {
   stringifyString(str)
 })
 
-suite.add('json-strify long string', function () {
-  JSTRInstance(str)
-})
-
 suite.add('compile-json-stringify long string', function () {
   CJSStringifyString(str)
 })
@@ -137,10 +121,6 @@ suite.add('fast-json-stringify short string', function () {
   stringifyString('hello world')
 })
 
-suite.add('json-strify short string', function () {
-  JSTRInstance('hello world')
-})
-
 suite.add('compile-json-stringify short string', function () {
   CJSStringifyString('hello world')
 })
@@ -153,10 +133,6 @@ suite.add('fast-json-stringify obj', function () {
   stringify(obj)
 })
 
-suite.add('json-strify obj', function () {
-  JSTRStringify(obj)
-})
-
 suite.add('compile-json-stringify obj', function () {
   CJSStringify(obj)
 })

package/index.js

@@ -405,14 +405,12 @@ function addPatternProperties (location) {
         if (/${regex.replace(/\\*\//g, '\\/')}/.test(keys[i])) {
     `
     if (type === 'object') {
-      code += buildObject(ppLocation, '', 'buildObjectPP' + index)
-      code += `
+      code += `${buildObject(ppLocation, '', 'buildObjectPP' + index)}
           ${addComma}
           json += $asString(keys[i]) + ':' + buildObjectPP${index}(obj[keys[i]])
       `
     } else if (type === 'array') {
-      code += buildArray(ppLocation, '', 'buildArrayPP' + index)
-      code += `
+      code += `${buildArray(ppLocation, '', 'buildArrayPP' + index)}
           ${addComma}
           json += $asString(keys[i]) + ':' + buildArrayPP${index}(obj[keys[i]])
       `
@@ -483,14 +481,12 @@ function additionalProperty (location) {
   var format = ap.format
   var stringSerializer = getStringSerializer(format)
   if (type === 'object') {
-    code += buildObject(apLocation, '', 'buildObjectAP')
-    code += `
+    code += `${buildObject(apLocation, '', 'buildObjectAP')}
         ${addComma}
         json += $asString(keys[i]) + ':' + buildObjectAP(obj[keys[i]])
     `
   } else if (type === 'array') {
-    code += buildArray(apLocation, '', 'buildArrayAP')
-    code += `
+    code += `${buildArray(apLocation, '', 'buildArrayAP')}
         ${addComma}
         json += $asString(keys[i]) + ':' + buildArrayAP(obj[keys[i]])
     `
@@ -759,14 +755,14 @@ function buildCode (location, code, laterCode, name) {
 
     var defaultValue = schema.properties[key].default
     if (defaultValue !== undefined) {
-      required = filterRequired(schema.required, key)
+      required = filterRequired(required, key)
       code += `
       } else {
         ${addComma}
         json += ${asString} + ':' + ${JSON.stringify(JSON.stringify(defaultValue))}
       `
-    } else if (schema.required && schema.required.indexOf(key) !== -1) {
-      required = filterRequired(schema.required, key)
+    } else if (required && required.indexOf(key) !== -1) {
+      required = filterRequired(required, key)
       code += `
       } else {
         throw new Error('${sanitized} is required!')
@@ -792,8 +788,7 @@ function buildCode (location, code, laterCode, name) {
       }
       code += `${JSON.stringify(required[i])}`
     }
-    code += ']'
-    code += `
+    code += `]
       for (var i = 0; i < required.length; i++) {
         if (obj[required[i]] === undefined) throw new Error('"' + required[i] + '" is required!')
       }
@@ -921,7 +916,6 @@ function buildObject (location, code, name) {
       var addComma = false
   `
 
-  var laterCode = ''
   var r
   if (schema.if && schema.then) {
     code += `
@@ -932,21 +926,18 @@ function buildObject (location, code, name) {
     r = buildInnerObject(location, name)
   }
 
-  code += r.code
-  laterCode = r.laterCode
-
   // Removes the comma if is the last element of the string (in case there are not properties)
-  code += `
+  code += `${r.code}
       json += '}'
       return json
     }
+    ${r.laterCode}
   `
 
-  code += laterCode
   return code
 }
 
-function buildArray (location, code, name) {
+function buildArray (location, code, name, key = null) {
   var schema = location.schema
   code += `
     function ${name} (obj) {
@@ -997,6 +988,14 @@ function buildArray (location, code, name) {
     result = nested(laterCode, name, '[i]', mergeLocation(location, { schema: schema.items }), undefined, true)
   }
 
+  if (key) {
+    code += `
+    if(!Array.isArray(obj)) {
+      throw new TypeError(\`Property '${key}' should be of type array, received '$\{obj}' instead.\`)
+    }
+    `
+  }
+
   code += `
     var l = obj.length
     var w = l - 1
@@ -1006,18 +1005,12 @@ function buildArray (location, code, name) {
       }
       ${result.code}
     }
+    json += ']'
+    return json
+  }
+  ${result.laterCode}
   `
 
-  laterCode = result.laterCode
-
-  code += `
-      json += ']'
-      return json
-    }
-  `
-
-  code += laterCode
-
   return code
 }
 
@@ -1146,7 +1139,7 @@ function nested (laterCode, name, key, location, subKey, isArray) {
       break
     case 'array':
       funcName = asFuncName('$arr' + name + key + subKey) // eslint-disable-line
-      laterCode = buildArray(location, laterCode, funcName)
+      laterCode = buildArray(location, laterCode, funcName, key)
       code += `
         json += ${funcName}(obj${accessor})
       `
@@ -1208,7 +1201,7 @@ function nested (laterCode, name, key, location, subKey, isArray) {
 
           if (type === 'string') {
             code += `
-              ${index === 0 ? 'if' : 'else if'}(obj${accessor} === null || typeof obj${accessor} === "${type}" || obj${accessor} instanceof Date || typeof obj${accessor}.toISOString === "function" || obj${accessor} instanceof RegExp)
+              ${index === 0 ? 'if' : 'else if'}(obj${accessor} === null || typeof obj${accessor} === "${type}" || obj${accessor} instanceof Date || typeof obj${accessor}.toISOString === "function" || obj${accessor} instanceof RegExp || (typeof obj${accessor} === "object" && Object.hasOwnProperty.call(obj${accessor}, "toString")))
                 ${nestedResult.code}
             `
           } else if (type === 'null') {
@@ -1255,7 +1248,9 @@ function nested (laterCode, name, key, location, subKey, isArray) {
 
 function isEmpty (schema) {
   for (var key in schema) {
-    if (schema.hasOwnProperty(key)) return false
+    if (schema.hasOwnProperty(key) && schema[key] !== undefined) {
+      return false
+    }
   }
   return true
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-json-stringify",
-  "version": "2.2.4",
+  "version": "2.2.9",
   "description": "Stringify your JSON at max speed",
   "main": "index.js",
   "types": "index.d.ts",
@@ -33,7 +33,6 @@
     "benchmark": "^2.1.4",
     "compile-json-stringify": "^0.1.2",
     "is-my-json-valid": "^2.20.0",
-    "json-strify": "^0.1.7",
     "long": "^4.0.0",
     "moment": "^2.24.0",
     "pre-commit": "^1.2.2",

package/test/any.test.js

@@ -33,6 +33,23 @@ test('object with nested random property', (t) => {
   }), '{"id":1,"name":["first","last"]}')
 })
 
+// reference: https://github.com/fastify/fast-json-stringify/issues/259
+test('object with empty schema with $id: undefined set', (t) => {
+  t.plan(1)
+
+  const schema = {
+    title: 'empty schema to allow any object with $id: undefined set',
+    type: 'object',
+    properties: {
+      name: { $id: undefined }
+    }
+  }
+  const stringify = build(schema)
+  t.is(stringify({
+    name: 'string'
+  }), '{"name":"string"}')
+})
+
 test('array with random items', (t) => {
   t.plan(1)
 

package/test/defaults.test.js

@@ -337,3 +337,40 @@ buildTest({
 }, {
   level1: { level2: { level3: { level4: { } } } }
 })
+
+buildTest({
+  type: 'object',
+  properties: {
+    name: {
+      type: 'string',
+      default: 'foo'
+    },
+    dev: {
+      type: 'boolean',
+      default: false
+    }
+  },
+  required: [
+    'name', 'dev'
+  ]
+}, {}, { name: 'foo', dev: false })
+
+buildTest({
+  type: 'object',
+  properties: {
+    name: {
+      type: 'string',
+      default: 'foo'
+    },
+    dev: {
+      type: 'boolean'
+    },
+    job: {
+      type: 'string',
+      default: 'awesome'
+    }
+  },
+  required: [
+    'name', 'dev'
+  ]
+}, { dev: true }, { name: 'foo', dev: true, job: 'awesome' })

package/test/typesArray.test.js

@@ -365,3 +365,73 @@ test('string type array can handle dates', (t) => {
   })
   t.is(value, '{"date":"2018-04-20T07:52:31.017Z","dateObject":"2018-04-21T07:52:31.017Z"}')
 })
+
+test('object that is simultaneously a string and a json', (t) => {
+  t.plan(2)
+  const schema = {
+    type: 'object',
+    properties: {
+      simultaneously: {
+        type: ['string', 'object'],
+        properties: {
+          foo: { type: 'string' }
+        }
+      }
+    }
+  }
+
+  const likeObjectId = {
+    toString () { return 'hello' }
+  }
+
+  const stringify = build(schema)
+  const valueStr = stringify({ simultaneously: likeObjectId })
+  t.is(valueStr, '{"simultaneously":"hello"}')
+
+  const valueObj = stringify({ simultaneously: { foo: likeObjectId } })
+  t.is(valueObj, '{"simultaneously":{"foo":"hello"}}')
+})
+
+test('object that is simultaneously a string and a json switched', (t) => {
+  t.plan(2)
+  const schema = {
+    type: 'object',
+    properties: {
+      simultaneously: {
+        type: ['object', 'string'],
+        properties: {
+          foo: { type: 'string' }
+        }
+      }
+    }
+  }
+
+  const likeObjectId = {
+    toString () { return 'hello' }
+  }
+
+  const stringify = build(schema)
+  const valueStr = stringify({ simultaneously: likeObjectId })
+  t.is(valueStr, '{"simultaneously":{}}')
+
+  const valueObj = stringify({ simultaneously: { foo: likeObjectId } })
+  t.is(valueObj, '{"simultaneously":{"foo":"hello"}}')
+})
+
+test('should throw an error when type is array and object is null', (t) => {
+  t.plan(1)
+  const schema = {
+    type: 'object',
+    properties: {
+      arr: {
+        type: 'array',
+        items: {
+          type: 'number'
+        }
+      }
+    }
+  }
+
+  const stringify = build(schema)
+  t.throws(() => stringify({ arr: null }), new TypeError('Property \'arr\' should be of type array, received \'null\' instead.'))
+})