fast-json-stringify 5.15.0 → 5.16.0

package/index.js

@@ -349,7 +349,8 @@ function buildInnerObject (context, location) {
 
   for (const key of requiredProperties) {
     if (!propertiesKeys.includes(key)) {
-      code += `if (obj['${key}'] === undefined) throw new Error('"${key}" is required!')\n`
+      const sanitizedKey = JSON.stringify(key)
+      code += `if (obj[${sanitizedKey}] === undefined) throw new Error('${sanitizedKey.replace(/'/g, '\\\'')} is required!')\n`
     }
   }
 
@@ -387,7 +388,7 @@ function buildInnerObject (context, location) {
       `
     } else if (isRequired) {
       code += ` else {
-        throw new Error('${sanitizedKey} is required!')
+        throw new Error('${sanitizedKey.replace(/'/g, '\\\'')} is required!')
       }
       `
     } else {

package/lib/standalone.js

@@ -3,19 +3,22 @@
 function buildStandaloneCode (contextFunc, context, serializer, validator) {
   let ajvDependencyCode = ''
   if (context.validatorSchemasIds.size > 0) {
+    ajvDependencyCode += 'const Validator = require(\'fast-json-stringify/lib/validator\')\n'
     ajvDependencyCode += `const validatorState = ${JSON.stringify(validator.getState())}\n`
     ajvDependencyCode += 'const validator = Validator.restoreFromState(validatorState)\n'
   } else {
     ajvDependencyCode += 'const validator = null\n'
   }
 
+  // Don't need to keep external schemas once compiled
+  // validatorState will hold external schemas if it needs them
+  const { schema, ...serializerState } = serializer.getState()
+
   return `
   'use strict'
-  const { dependencies } = require('fast-json-stringify/lib/standalone')
-
-  const { Serializer, Validator } = dependencies
 
-  const serializerState = ${JSON.stringify(serializer.getState())}
+  const Serializer = require('fast-json-stringify/lib/serializer')
+  const serializerState = ${JSON.stringify(serializerState)}
   const serializer = Serializer.restoreFromState(serializerState)
 
   ${ajvDependencyCode}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-json-stringify",
-  "version": "5.15.0",
+  "version": "5.16.0",
   "description": "Stringify your JSON at max speed",
   "main": "index.js",
   "type": "commonjs",

package/test/sanitize7.test.js

@@ -0,0 +1,68 @@
+'use strict'
+
+const test = require('tap').test
+const build = require('..')
+
+test('required property containing single quote, contains property', (t) => {
+  t.plan(1)
+
+  const stringify = build({
+    type: 'object',
+    properties: {
+      '\'': { type: 'string' }
+    },
+    required: [
+      '\''
+    ]
+  })
+
+  t.throws(() => stringify({}), new Error('"\'" is required!'))
+})
+
+test('required property containing double quote, contains property', (t) => {
+  t.plan(1)
+
+  const stringify = build({
+    type: 'object',
+    properties: {
+      '"': { type: 'string' }
+    },
+    required: [
+      '"'
+    ]
+  })
+
+  t.throws(() => stringify({}), new Error('""" is required!'))
+})
+
+test('required property containing single quote, does not contain property', (t) => {
+  t.plan(1)
+
+  const stringify = build({
+    type: 'object',
+    properties: {
+      a: { type: 'string' }
+    },
+    required: [
+      '\''
+    ]
+  })
+
+  t.throws(() => stringify({}), new Error('"\'" is required!'))
+})
+
+test('required property containing double quote, does not contain property', (t) => {
+  t.plan(1)
+
+  const stringify = build({
+    type: 'object',
+    properties: {
+      a: { type: 'string' }
+    },
+    required: [
+      '"'
+    ]
+  })
+
+  t.throws(() => stringify({}), new Error('""" is required!'))
+})

package/test/standalone-mode.test.js

@@ -26,14 +26,14 @@ test('activate standalone mode', async (t) => {
   t.type(code, 'string')
   t.equal(code.indexOf('ajv'), -1)
 
-  const destionation = path.resolve(tmpDir, 'standalone.js')
+  const destination = path.resolve(tmpDir, 'standalone.js')
 
   t.teardown(async () => {
-    await fs.promises.rm(destionation, { force: true })
+    await fs.promises.rm(destination, { force: true })
   })
 
-  await fs.promises.writeFile(destionation, code)
-  const standalone = require(destionation)
+  await fs.promises.writeFile(destination, code)
+  const standalone = require(destination)
   t.same(standalone({ firstName: 'Foo', surname: 'bar' }), JSON.stringify({ firstName: 'Foo' }), 'surname evicted')
 })
 
@@ -89,14 +89,14 @@ test('test ajv schema', async (t) => {
   t.type(code, 'string')
   t.equal(code.indexOf('ajv') > 0, true)
 
-  const destionation = path.resolve(tmpDir, 'standalone2.js')
+  const destination = path.resolve(tmpDir, 'standalone2.js')
 
   t.teardown(async () => {
-    await fs.promises.rm(destionation, { force: true })
+    await fs.promises.rm(destination, { force: true })
   })
 
-  await fs.promises.writeFile(destionation, code)
-  const standalone = require(destionation)
+  await fs.promises.writeFile(destination, code)
+  const standalone = require(destination)
   t.same(standalone({
     kind: 'foobar',
     foo: 'FOO',
@@ -119,3 +119,98 @@ test('test ajv schema', async (t) => {
     }]
   }))
 })
+
+test('no need to keep external schemas once compiled', async (t) => {
+  t.plan(1)
+  const externalSchema = {
+    first: {
+      definitions: {
+        id1: {
+          type: 'object',
+          properties: {
+            id1: {
+              type: 'integer'
+            }
+          }
+        }
+      }
+    }
+  }
+  const code = fjs({
+    $ref: 'first#/definitions/id1'
+  }, {
+    mode: 'standalone',
+    schema: externalSchema
+  })
+
+  const destination = path.resolve(tmpDir, 'standalone3.js')
+
+  t.teardown(async () => {
+    await fs.promises.rm(destination, { force: true })
+  })
+
+  await fs.promises.writeFile(destination, code)
+  const standalone = require(destination)
+
+  t.same(standalone({ id1: 5 }), JSON.stringify({ id1: 5 }), 'serialization works with external schemas')
+})
+
+test('no need to keep external schemas once compiled - with oneOf validator', async (t) => {
+  t.plan(2)
+
+  const externalSchema = {
+    ext: {
+      definitions: {
+        oBaz: {
+          type: 'object',
+          properties: {
+            baz: { type: 'number' }
+          },
+          required: ['baz']
+        },
+        oBar: {
+          type: 'object',
+          properties: {
+            bar: { type: 'string' }
+          },
+          required: ['bar']
+        },
+        other: {
+          type: 'string',
+          const: 'other'
+        }
+      }
+    }
+  }
+
+  const schema = {
+    title: 'object with oneOf property value containing refs to external schema',
+    type: 'object',
+    properties: {
+      oneOfSchema: {
+        oneOf: [
+          { $ref: 'ext#/definitions/oBaz' },
+          { $ref: 'ext#/definitions/oBar' }
+        ]
+      }
+    },
+    required: ['oneOfSchema']
+  }
+
+  const code = fjs(schema, {
+    mode: 'standalone',
+    schema: externalSchema
+  })
+
+  const destination = path.resolve(tmpDir, 'standalone-oneOf-ref.js')
+
+  t.teardown(async () => {
+    await fs.promises.rm(destination, { force: true })
+  })
+
+  await fs.promises.writeFile(destination, code)
+  const stringify = require(destination)
+
+  t.equal(stringify({ oneOfSchema: { baz: 5 } }), '{"oneOfSchema":{"baz":5}}')
+  t.equal(stringify({ oneOfSchema: { bar: 'foo' } }), '{"oneOfSchema":{"bar":"foo"}}')
+})