fast-json-stringify 2.2.6 → 2.2.10

package/.github/stale.yml

@@ -0,0 +1,21 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 15
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - "discussion"
+  - "feature request"
+  - "bug"
+  - "help wanted"
+  - "plugin suggestion"
+  - "good first issue"
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

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

@@ -916,7 +916,6 @@ function buildObject (location, code, name) {
       var addComma = false
   `
 
-  var laterCode = ''
   var r
   if (schema.if && schema.then) {
     code += `
@@ -927,20 +926,18 @@ function buildObject (location, code, name) {
     r = buildInnerObject(location, name)
   }
 
-  laterCode = r.laterCode
-
   // Removes the comma if is the last element of the string (in case there are not properties)
   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) {
@@ -991,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
@@ -1003,12 +1008,9 @@ function buildArray (location, code, name) {
     json += ']'
     return json
   }
+  ${result.laterCode}
   `
 
-  laterCode = result.laterCode
-
-  code += laterCode
-
   return code
 }
 
@@ -1137,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})
       `
@@ -1157,7 +1159,7 @@ function nested (laterCode, name, key, location, subKey, isArray) {
           // 2. `nested`, through `buildCode`, replaces any reference in object properties with the actual schema
           // (see https://github.com/fastify/fast-json-stringify/blob/6da3b3e8ac24b1ca5578223adedb4083b7adf8db/index.js#L631)
           code += `
-            ${index === 0 ? 'if' : 'else if'}(ajv.validate(${require('util').inspect(location.schema, { depth: null, maxArrayLength: null })}, obj${accessor}))
+            ${index === 0 ? 'if' : 'else if'}(ajv.validate(${JSON.stringify(location.schema)}, obj${accessor}))
               ${nestedResult.code}
           `
           laterCode = nestedResult.laterCode
@@ -1199,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') {
@@ -1246,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.6",
+  "version": "2.2.10",
   "description": "Stringify your JSON at max speed",
   "main": "index.js",
   "types": "index.d.ts",
@@ -33,13 +33,12 @@
     "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",
     "proxyquire": "^2.1.3",
     "semver": "^7.1.0",
-    "standard": "^14.0.0",
+    "standard": "^16.0.1",
     "tap": "^14.0.0",
     "typescript": "^4.0.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/anyof.test.js

@@ -197,6 +197,36 @@ test('null value in schema', (t) => {
   build(schema)
 })
 
+test('symbol value in schema', (t) => {
+  t.plan(4)
+
+  const ObjectKind = Symbol('LiteralKind')
+  const UnionKind = Symbol('UnionKind')
+  const LiteralKind = Symbol('LiteralKind')
+
+  const schema = {
+    kind: ObjectKind,
+    type: 'object',
+    properties: {
+      value: {
+        kind: UnionKind,
+        anyOf: [
+          { kind: LiteralKind, type: 'string', enum: ['foo'] },
+          { kind: LiteralKind, type: 'string', enum: ['bar'] },
+          { kind: LiteralKind, type: 'string', enum: ['baz'] }
+        ]
+      }
+    },
+    required: ['value']
+  }
+
+  const stringify = build(schema)
+  t.is(stringify({ value: 'foo' }), '{"value":"foo"}')
+  t.is(stringify({ value: 'bar' }), '{"value":"bar"}')
+  t.is(stringify({ value: 'baz' }), '{"value":"baz"}')
+  t.is(stringify({ value: 'qux' }), '{"value":null}')
+})
+
 test('anyOf and $ref together', (t) => {
   t.plan(2)
 

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.'))
+})