fast-json-stringify 1.15.0 → 1.15.4

package/bench.js

@@ -4,19 +4,36 @@ const benchmark = require('benchmark')
 const suite = new benchmark.Suite()
 
 const schema = {
-  'title': 'Example Schema',
-  'type': 'object',
-  'properties': {
-    'firstName': {
-      'type': 'string'
+  title: 'Example Schema',
+  type: 'object',
+  properties: {
+    firstName: {
+      type: 'string'
     },
-    'lastName': {
-      'type': ['string', 'null']
+    lastName: {
+      type: ['string', 'null']
     },
-    'age': {
-      'description': 'Age in years',
-      'type': 'integer',
-      'minimum': 0
+    age: {
+      description: 'Age in years',
+      type: 'integer',
+      minimum: 0
+    }
+  }
+}
+const schemaCJS = {
+  title: 'Example Schema',
+  type: 'object',
+  properties: {
+    firstName: {
+      type: 'string'
+    },
+    lastName: {
+      type: ['string', 'null']
+    },
+    age: {
+      description: 'Age in years',
+      type: 'number',
+      minimum: 0
     }
   }
 }
@@ -27,6 +44,12 @@ const arraySchema = {
   items: schema
 }
 
+const arraySchemaCJS = {
+  title: 'array schema',
+  type: 'array',
+  items: schemaCJS
+}
+
 const obj = {
   firstName: 'Matteo',
   lastName: 'Collina',
@@ -35,6 +58,16 @@ 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)
+const CJSStringifyString = CJS({ type: 'string' })
+
 const FJS = require('.')
 const stringify = FJS(schema)
 const stringifyUgly = FJS(schema, { uglify: true })
@@ -60,6 +93,12 @@ 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)
+})
 
 suite.add('JSON.stringify array', function () {
   JSON.stringify(multiArray)
@@ -73,6 +112,14 @@ suite.add('fast-json-stringify-uglified array', function () {
   stringifyArrayUgly(multiArray)
 })
 
+suite.add('json-strify array', function () {
+  JSTRArray(multiArray)
+})
+
+suite.add('compile-json-stringify array', function () {
+  CJSStringifyArray(multiArray)
+})
+
 suite.add('JSON.stringify long string', function () {
   JSON.stringify(str)
 })
@@ -85,6 +132,14 @@ suite.add('fast-json-stringify-uglified long string', function () {
   stringifyStringUgly(str)
 })
 
+suite.add('json-strify long string', function () {
+  JSTRInstance(str)
+})
+
+suite.add('compile-json-stringify long string', function () {
+  CJSStringifyString(str)
+})
+
 suite.add('JSON.stringify short string', function () {
   JSON.stringify('hello world')
 })
@@ -97,6 +152,14 @@ suite.add('fast-json-stringify-uglified short string', function () {
   stringifyStringUgly('hello world')
 })
 
+suite.add('json-strify short string', function () {
+  JSTRInstance('hello world')
+})
+
+suite.add('compile-json-stringify short string', function () {
+  CJSStringifyString('hello world')
+})
+
 suite.add('JSON.stringify obj', function () {
   JSON.stringify(obj)
 })
@@ -109,6 +172,14 @@ suite.add('fast-json-stringify-uglified obj', function () {
   stringifyUgly(obj)
 })
 
+suite.add('json-strify obj', function () {
+  JSTRStringify(obj)
+})
+
+suite.add('compile-json-stringify obj', function () {
+  CJSStringify(obj)
+})
+
 suite.on('cycle', cycle)
 
 suite.run()

package/build-schema-validator.js

@@ -11,7 +11,7 @@ const ajv = new Ajv({
 
 const validate = ajv.compile(require('ajv/lib/refs/json-schema-draft-07.json'))
 
-let moduleCode = `// This file is autogenerated by ${path.basename(__filename)}, do not edit
+const moduleCode = `// This file is autogenerated by ${path.basename(__filename)}, do not edit
 
 function nop () { return true }
 

package/example.js

@@ -46,7 +46,7 @@ const stringify = fastJson({
     '.*foo$': {
       type: 'string'
     },
-    'test': {
+    test: {
       type: 'number'
     }
   },

package/index.js

@@ -1,7 +1,10 @@
 'use strict'
 
+/* eslint no-prototype-builtins: 0 */
+
 var Ajv = require('ajv')
 var merge = require('deepmerge')
+var util = require('util')
 var validate = require('./schema-validator')
 
 var uglify = null
@@ -37,7 +40,7 @@ function build (schema, options) {
   options = options || {}
   isValidSchema(schema)
   if (options.schema) {
-    for (let key of Object.keys(options.schema)) {
+    for (const key of Object.keys(options.schema)) {
       isValidSchema(options.schema[key], key)
     }
   }
@@ -71,6 +74,10 @@ function build (schema, options) {
     `
   }
 
+  if (schema['$ref']) {
+    schema = refFinder(schema['$ref'], schema, options.schema)
+  }
+
   if (schema.type === undefined) {
     schema.type = inferTypeByKeyword(schema)
   }
@@ -181,6 +188,7 @@ function inferTypeByKeyword (schema) {
 }
 
 function hasAnyOf (schema) {
+  if (!schema) { return false }
   if ('anyOf' in schema) { return true }
 
   var objectKeys = Object.keys(schema)
@@ -306,7 +314,7 @@ function addPatternProperties (schema, externalSchema, fullSchema) {
     }
     var type = pp[regex].type
     code += `
-        if (/${regex}/.test(keys[i])) {
+        if (/${regex.replace(/\\*\//g, '\\/')}/.test(keys[i])) {
     `
     if (type === 'object') {
       code += buildObject(pp[regex], '', 'buildObjectPP' + index, externalSchema, fullSchema)
@@ -477,25 +485,51 @@ function refFinder (ref, schema, externalSchema) {
   // If external file
   if (ref[0]) {
     schema = externalSchema[ref[0]]
+
+    if (schema['$ref']) {
+      return refFinder(schema['$ref'], schema, externalSchema)
+    }
   }
 
   var code = 'return schema'
   // If it has a path
   if (ref[1]) {
     // ref[1] could contain a JSON pointer - ex: /definitions/num
-    // or plan name fragment id without suffix # - ex: customId
+    // or plain name fragment id without suffix # - ex: customId
     var walk = ref[1].split('/')
     if (walk.length === 1) {
-      return idFinder(schema, `#${ref[1]}`)
+      var targetId = `#${ref[1]}`
+      var dereferenced = idFinder(schema, targetId)
+      if (dereferenced === undefined && !ref[0]) {
+        for (var key of Object.keys(externalSchema)) {
+          dereferenced = idFinder(externalSchema[key], targetId)
+          if (dereferenced !== undefined) break
+        }
+      }
+      return dereferenced
     } else {
       for (var i = 1; i < walk.length; i++) {
-        code += `['${walk[i]}']`
+        code += `['${sanitizeKey(walk[i])}']`
       }
     }
   }
   return (new Function('schema', code))(schema)
 }
 
+function sanitizeKey (key) {
+  const rep = key.replace(/(\\*)'/g, function (match, p1) {
+    var base = ''
+    if (p1.length % 2 === 1) {
+      base = p1.slice(2)
+    } else {
+      base = p1
+    }
+    var rep = base + '\\\''
+    return rep
+  })
+  return rep
+}
+
 function buildCode (schema, code, laterCode, name, externalSchema, fullSchema) {
   Object.keys(schema.properties || {}).forEach((key, i, a) => {
     if (schema.properties[key]['$ref']) {
@@ -507,12 +541,14 @@ function buildCode (schema, code, laterCode, name, externalSchema, fullSchema) {
 
     var type = schema.properties[key].type
     var nullable = schema.properties[key].nullable
+    var sanitized = sanitizeKey(key)
+    var asString = sanitizeKey($asString(key).replace(/\\/g, '\\\\'))
 
     if (nullable) {
       code += `
-        if (obj['${key}'] === null) {
+        if (obj['${sanitized}'] === null) {
           ${addComma}
-          json += '${$asString(key)}:null'
+          json += '${asString}:null'
           var rendered = true
         } else {
       `
@@ -520,10 +556,10 @@ function buildCode (schema, code, laterCode, name, externalSchema, fullSchema) {
 
     if (type === 'number') {
       code += `
-          var t = Number(obj['${key}'])
+          var t = Number(obj['${sanitized}'])
           if (!isNaN(t)) {
             ${addComma}
-            json += '${$asString(key)}:' + t
+            json += '${asString}:' + t
       `
     } else if (type === 'integer') {
       code += `
@@ -531,25 +567,25 @@ function buildCode (schema, code, laterCode, name, externalSchema, fullSchema) {
       `
       if (isLong) {
         code += `
-            if (isLong(obj['${key}'])) {
+            if (isLong(obj['${sanitized}'])) {
               ${addComma}
-              json += '${$asString(key)}:' + obj['${key}'].toString()
+              json += '${asString}:' + obj['${sanitized}'].toString()
               rendered = true
             } else {
-              var t = Number(obj['${key}'])
+              var t = Number(obj['${sanitized}'])
               if (!isNaN(t)) {
                 ${addComma}
-                json += '${$asString(key)}:' + t
+                json += '${asString}:' + t
                 rendered = true
               }
             }
         `
       } else {
         code += `
-            var t = Number(obj['${key}'])
+            var t = Number(obj['${sanitized}'])
             if (!isNaN(t)) {
               ${addComma}
-              json += '${$asString(key)}:' + t
+              json += '${asString}:' + t
               rendered = true
             }
         `
@@ -559,9 +595,9 @@ function buildCode (schema, code, laterCode, name, externalSchema, fullSchema) {
       `
     } else {
       code += `
-        if (obj['${key}'] !== undefined) {
+        if (obj['${sanitized}'] !== undefined) {
           ${addComma}
-          json += '${$asString(key)}:'
+          json += '${asString}:'
         `
 
       var result = nested(laterCode, name, key, schema.properties[key], externalSchema, fullSchema)
@@ -574,12 +610,12 @@ function buildCode (schema, code, laterCode, name, externalSchema, fullSchema) {
       code += `
       } else {
         ${addComma}
-        json += '${$asString(key)}:${JSON.stringify(defaultValue).replace(/'/g, '\'')}'
+        json += '${asString}:${sanitizeKey(JSON.stringify(defaultValue).replace(/\\/g, '\\\\'))}'
       `
     } else if (schema.required && schema.required.indexOf(key) !== -1) {
       code += `
       } else {
-        throw new Error('${key} is required!')
+        throw new Error('${sanitized} is required!')
       `
     }
 
@@ -642,7 +678,7 @@ function addIfThenElse (schema, name, externalSchema, fullSchema) {
   var merged = merge(copy, then)
 
   code += `
-    valid = ajv.validate(${require('util').inspect(i, { depth: null })}, obj)
+    valid = ajv.validate(${util.inspect(i, { depth: null })}, obj)
     if (valid) {
   `
   if (merged.if && merged.then) {
@@ -840,6 +876,8 @@ function nested (laterCode, name, key, schema, externalSchema, fullSchema, subKe
   var code = ''
   var funcName
 
+  subKey = subKey || ''
+
   if (schema.type === undefined) {
     var inferedType = inferTypeByKeyword(schema)
     if (inferedType) {
@@ -850,7 +888,7 @@ function nested (laterCode, name, key, schema, externalSchema, fullSchema, subKe
   var type = schema.type
   var nullable = schema.nullable === true
 
-  var accessor = key.indexOf('[') === 0 ? key : `['${key}']`
+  var accessor = key.indexOf('[') === 0 ? sanitizeKey(key) : `['${sanitizeKey(key)}']`
   switch (type) {
     case 'null':
       code += `
@@ -886,7 +924,7 @@ function nested (laterCode, name, key, schema, externalSchema, fullSchema, subKe
     case undefined:
       if ('anyOf' in schema) {
         schema.anyOf.forEach((s, index) => {
-          var nestedResult = nested(laterCode, name, key, s, externalSchema, fullSchema, subKey !== undefined ? subKey : 'i' + index)
+          var nestedResult = nested(laterCode, name, key, s, externalSchema, fullSchema, subKey !== '' ? subKey : 'i' + index)
           code += `
             ${index === 0 ? 'if' : 'else if'}(ajv.validate(${require('util').inspect(s, { depth: null })}, obj${accessor}))
               ${nestedResult.code}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-json-stringify",
-  "version": "1.15.0",
+  "version": "1.15.4",
   "description": "Stringify your JSON at max speed",
   "main": "index.js",
   "types": "index.d.ts",
@@ -37,19 +37,26 @@
     "long": "^4.0.0",
     "pre-commit": "^1.2.2",
     "proxyquire": "^2.1.0",
-    "standard": "^12.0.1",
-    "tap": "^12.5.1",
+    "standard": "^13.0.1",
+    "tap": "^12.6.5",
     "tap-mocha-reporter": "^3.0.9",
     "typescript": "^3.0.0",
-    "uglify-es": "^3.3.9"
+    "uglify-es": "^3.3.9",
+    "compile-json-stringify": "^0.1.2",
+    "json-strify": "^0.1.7"
   },
   "dependencies": {
     "ajv": "^6.8.1",
-    "deepmerge": "^3.0.0"
+    "deepmerge": "^4.0.0"
   },
   "standard": {
     "ignore": [
       "schema-validator.js"
     ]
+  },
+  "greenkeeper": {
+    "ignore": [
+      "tap"
+    ]
   }
 }

package/test/additionalProperties.test.js

@@ -18,7 +18,7 @@ test('additionalProperties', (t) => {
     }
   })
 
-  let obj = { str: 'test', foo: 42, ofoo: true, foof: 'string', objfoo: { a: true } }
+  const obj = { str: 'test', foo: 42, ofoo: true, foof: 'string', objfoo: { a: true } }
   t.equal('{"foo":"42","ofoo":"true","foof":"string","objfoo":"[object Object]","str":"test"}', stringify(obj))
 })
 
@@ -177,7 +177,7 @@ test('nested additionalProperties', (t) => {
     }
   })
 
-  let obj = [{ ap: { value: 'string' } }]
+  const obj = [{ ap: { value: 'string' } }]
   t.equal('[{"ap":{"value":"string"}}]', stringify(obj))
 })
 
@@ -214,7 +214,7 @@ test('very nested additionalProperties', (t) => {
     }
   })
 
-  let obj = [{ ap: { nested: { moarNested: { finally: { value: 'str' } } } } }]
+  const obj = [{ ap: { nested: { moarNested: { finally: { value: 'str' } } } } }]
   t.equal('[{"ap":{"nested":{"moarNested":{"finally":{"value":"str"}}}}}]', stringify(obj))
 })
 
@@ -231,7 +231,7 @@ test('nested additionalProperties set to true', (t) => {
     }
   })
 
-  let obj = { ap: { value: 'string', someNumber: 42 } }
+  const obj = { ap: { value: 'string', someNumber: 42 } }
   t.equal('{"ap":{"value":"string","someNumber":42}}', stringify(obj))
 })
 
@@ -248,6 +248,6 @@ test('field passed to fastSafeStringify as undefined should be removed', (t) =>
     }
   })
 
-  let obj = { ap: { value: 'string', someNumber: undefined } }
+  const obj = { ap: { value: 'string', someNumber: undefined } }
   t.equal('{"ap":{"value":"string"}}', stringify(obj))
 })

package/test/anyof.test.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const test = require('tap').test
+const { test } = require('tap')
 const build = require('..')
 
 test('object with multiple types field', (t) => {
@@ -231,3 +231,20 @@ test('object with field with type union of multiple objects', (t) => {
     t.fail()
   }
 })
+
+test('null value in schema', (t) => {
+  t.plan(0)
+
+  const schema = {
+    title: 'schema with null child',
+    type: 'string',
+    nullable: true,
+    enum: [null]
+  }
+
+  try {
+    build(schema)
+  } catch (e) {
+    t.fail()
+  }
+})

package/test/array.test.js

@@ -23,13 +23,13 @@ function buildTest (schema, toStringify) {
 }
 
 buildTest({
-  'title': 'string array',
-  'type': 'object',
-  'properties': {
-    'ids': {
-      'type': 'array',
-      'items': {
-        'type': 'string'
+  title: 'string array',
+  type: 'object',
+  properties: {
+    ids: {
+      type: 'array',
+      items: {
+        type: 'string'
       }
     }
   }
@@ -38,13 +38,13 @@ buildTest({
 })
 
 buildTest({
-  'title': 'number array',
-  'type': 'object',
-  'properties': {
-    'ids': {
-      'type': 'array',
-      'items': {
-        'type': 'number'
+  title: 'number array',
+  type: 'object',
+  properties: {
+    ids: {
+      type: 'array',
+      items: {
+        type: 'number'
       }
     }
   }
@@ -53,39 +53,39 @@ buildTest({
 })
 
 buildTest({
-  'title': 'mixed array',
-  'type': 'object',
-  'properties': {
-    'ids': {
-      'type': 'array',
-      'items': [
+  title: 'mixed array',
+  type: 'object',
+  properties: {
+    ids: {
+      type: 'array',
+      items: [
         {
-          'type': 'null'
+          type: 'null'
         },
         {
-          'type': 'string'
+          type: 'string'
         },
         {
-          'type': 'integer'
+          type: 'integer'
         },
         {
-          'type': 'number'
+          type: 'number'
         },
         {
-          'type': 'boolean'
+          type: 'boolean'
         },
         {
-          'type': 'object',
-          'properties': {
-            'a': {
-              'type': 'string'
+          type: 'object',
+          properties: {
+            a: {
+              type: 'string'
             }
           }
         },
         {
-          'type': 'array',
-          'items': {
-            'type': 'string'
+          type: 'array',
+          items: {
+            type: 'string'
           }
         }
       ]
@@ -96,12 +96,12 @@ buildTest({
 })
 
 buildTest({
-  'title': 'repeated types',
-  'type': 'object',
-  'properties': {
-    'ids': {
-      'type': 'array',
-      'items': [
+  title: 'repeated types',
+  type: 'object',
+  properties: {
+    ids: {
+      type: 'array',
+      items: [
         {
           type: 'number'
         },
@@ -114,25 +114,25 @@ buildTest({
 }, { ids: [1, 2] })
 
 buildTest({
-  'title': 'pattern properties array',
-  'type': 'object',
-  'properties': {
-    'args': {
-      'type': 'array',
-      'items': [
+  title: 'pattern properties array',
+  type: 'object',
+  properties: {
+    args: {
+      type: 'array',
+      items: [
         {
-          'type': 'object',
-          'patternProperties': {
+          type: 'object',
+          patternProperties: {
             '.*': {
-              'type': 'string'
+              type: 'string'
             }
           }
         },
         {
-          'type': 'object',
-          'patternProperties': {
+          type: 'object',
+          patternProperties: {
             '.*': {
-              'type': 'number'
+              type: 'number'
             }
           }
         }
@@ -144,16 +144,16 @@ buildTest({
 test('invalid items throw', (t) => {
   t.plan(1)
   const schema = {
-    'type': 'object',
-    'properties': {
-      'args': {
-        'type': 'array',
-        'items': [
+    type: 'object',
+    properties: {
+      args: {
+        type: 'array',
+        items: [
           {
-            'type': 'object',
-            'patternProperties': {
+            type: 'object',
+            patternProperties: {
               '.*': {
-                'type': 'string'
+                type: 'string'
               }
             }
           }