Merge pull request #14 from mcollina/fast-escape

Correctly escape as for the spec.

Author: delvedor

README.md

@@ -1,20 +1,20 @@
 # fast-json-stringify  [![Build Status](https://travis-ci.org/mcollina/fast-json-stringify.svg)](https://travis-ci.org/mcollina/fast-json-stringify)
 
-__fast-json-stringify__ is x1-5 times faster than `JSON.stringify()`.
+__fast-json-stringify__ is x1-4 times faster than `JSON.stringify()`.
 It is particularly suited if you are sending small JSON payloads, the
 advantages reduces on large payloads.
 
 Benchmarks:
 
 ```
-JSON.stringify array x 3,500 ops/sec ±0.91% (85 runs sampled)
-fast-json-stringify array x 4,456 ops/sec ±1.68% (87 runs sampled)
-JSON.stringify long string x 13,395 ops/sec ±0.88% (91 runs sampled)
-fast-json-stringify long string x 95,488 ops/sec ±1.04% (90 runs sampled)
-JSON.stringify short string x 5,059,316 ops/sec ±0.86% (92 runs sampled)
-fast-json-stringify short string x 12,219,967 ops/sec ±1.16% (91 runs sampled)
-JSON.stringify obj x 1,763,980 ops/sec ±1.30% (88 runs sampled)
-fast-json-stringify obj x 5,085,148 ops/sec ±1.56% (89 runs sampled)
+JSON.stringify array x 3,679 ops/sec ±1.01% (85 runs sampled)
+fast-json-stringify array x 4,618 ops/sec ±1.64% (87 runs sampled)
+JSON.stringify long string x 13,303 ops/sec ±1.01% (89 runs sampled)
+fast-json-stringify long string x 13,489 ops/sec ±0.88% (90 runs sampled)
+JSON.stringify short string x 4,974,749 ops/sec ±1.14% (86 runs sampled)
+fast-json-stringify short string x 11,030,700 ops/sec ±0.82% (89 runs sampled)
+JSON.stringify obj x 1,774,593 ops/sec ±1.07% (90 runs sampled)
+fast-json-stringify obj x 4,976,369 ops/sec ±1.00% (89 runs sampled)
 ```
 
 #### Table of contents:

index.js

@@ -15,8 +15,6 @@ function build (schema, options) {
   `
   code += `
     ${$asString.toString()}
-    ${$asStringSmall.toString()}
-    ${$asStringLong.toString()}
     ${$asNumber.toString()}
     ${$asNull.toString()}
     ${$asBoolean.toString()}
@@ -86,47 +84,7 @@ function $asString (str) {
     str = str.toString()
   }
 
-  if (str.length < 42) {
-    return $asStringSmall(str)
-  } else {
-    return $asStringLong(str)
-  }
-}
-
-function $asStringLong (str) {
-  var result = ''
-  var l = str.length
-  var i
-
-  for (;(i = str.indexOf('"')) >= 0 && i < l;) {
-    result += str.slice(0, i) + '\\"'
-    str = str.slice(i + 1)
-    l = str.length
-  }
-
-  if (l > 0) {
-    result += str
-  }
-
-  return '"' + result + '"'
-}
-
-function $asStringSmall (str) {
-  var result = ''
-  var last = 0
-  var l = str.length
-  for (var i = 0; i < l; i++) {
-    if (str[i] === '"') {
-      result += str.slice(last, i) + '\\"'
-      last = i + 1
-    }
-  }
-  if (last === 0) {
-    result = str
-  } else {
-    result += str.slice(last)
-  }
-  return '"' + result + '"'
+  return JSON.stringify(str)
 }
 
 function $asRegExp (reg) {
@@ -306,12 +264,13 @@ function buildObject (schema, code, name, externalSchema) {
 
     code += result.code
     laterCode = result.laterCode
-
+    /* eslint-disable no-useless-escape */
     if (i < a.length - 1) {
       code += `
         json += \',\'
       `
     }
+    /* eslint-enable no-useless-escape */
 
     if (schema.required && schema.required.indexOf(key) !== -1) {
       code += `
@@ -398,14 +357,14 @@ function nested (laterCode, name, key, schema, externalSchema) {
       `
       break
     case 'object':
-      funcName = (name + key).replace(/[-.\[\]]/g, '')
+      funcName = (name + key).replace(/[-.\[\]]/g, '') // eslint-disable-line
       laterCode = buildObject(schema, laterCode, funcName, externalSchema)
       code += `
         json += ${funcName}(obj${key})
       `
       break
     case 'array':
-      funcName = (name + key).replace(/[-.\[\]]/g, '')
+      funcName = (name + key).replace(/[-.\[\]]/g, '') // eslint-disable-line
       laterCode = buildArray(schema, laterCode, funcName, externalSchema)
       code += `
         json += ${funcName}(obj${key})

test/basic.test.js

@@ -50,6 +50,11 @@ buildTest({
   type: 'string'
 }, 'hello world')
 
+buildTest({
+  title: 'string',
+  type: 'string'
+}, 'hello\nworld')
+
 buildTest({
   title: 'string with quotes',
   type: 'string'