Update standard (#183)

Author: SerayaEryn

index.js

@@ -74,8 +74,8 @@ function build (schema, options) {
     `
   }
 
-  if (schema['$ref']) {
-    schema = refFinder(schema['$ref'], schema, options.schema)
+  if (schema.$ref) {
+    schema = refFinder(schema.$ref, schema, options.schema)
   }
 
   if (schema.type === undefined) {
@@ -309,8 +309,8 @@ function addPatternProperties (schema, externalSchema, fullSchema) {
         if (properties[keys[i]]) continue
   `
   Object.keys(pp).forEach((regex, index) => {
-    if (pp[regex]['$ref']) {
-      pp[regex] = refFinder(pp[regex]['$ref'], fullSchema, externalSchema, fullSchema)
+    if (pp[regex].$ref) {
+      pp[regex] = refFinder(pp[regex].$ref, fullSchema, externalSchema, fullSchema)
     }
     var type = pp[regex].type
     code += `
@@ -385,8 +385,8 @@ function additionalProperty (schema, externalSchema, fullSchema) {
         }
     `
   }
-  if (ap['$ref']) {
-    ap = refFinder(ap['$ref'], fullSchema, externalSchema)
+  if (ap.$ref) {
+    ap = refFinder(ap.$ref, fullSchema, externalSchema)
   }
 
   var type = ap.type
@@ -486,8 +486,8 @@ function refFinder (ref, schema, externalSchema) {
   if (ref[0]) {
     schema = externalSchema[ref[0]]
 
-    if (schema['$ref']) {
-      return refFinder(schema['$ref'], schema, externalSchema)
+    if (schema.$ref) {
+      return refFinder(schema.$ref, schema, externalSchema)
     }
   }
 
@@ -532,8 +532,8 @@ function sanitizeKey (key) {
 
 function buildCode (schema, code, laterCode, name, externalSchema, fullSchema) {
   Object.keys(schema.properties || {}).forEach((key, i, a) => {
-    if (schema.properties[key]['$ref']) {
-      schema.properties[key] = refFinder(schema.properties[key]['$ref'], fullSchema, externalSchema)
+    if (schema.properties[key].$ref) {
+      schema.properties[key] = refFinder(schema.properties[key].$ref, fullSchema, externalSchema)
     }
 
     // Using obj['key'] !== undefined instead of obj.hasOwnProperty(prop) for perf reasons,
@@ -783,8 +783,8 @@ function buildArray (schema, code, name, externalSchema, fullSchema) {
   `
   var laterCode = ''
 
-  if (schema.items['$ref']) {
-    schema.items = refFinder(schema.items['$ref'], fullSchema, externalSchema)
+  if (schema.items.$ref) {
+    schema.items = refFinder(schema.items.$ref, fullSchema, externalSchema)
   }
 
   var result = { code: '', laterCode: '' }

package.json

@@ -37,7 +37,7 @@
     "long": "^4.0.0",
     "pre-commit": "^1.2.2",
     "proxyquire": "^2.1.0",
-    "standard": "^13.0.1",
+    "standard": "^14.0.0",
     "tap": "^12.6.5",
     "tap-mocha-reporter": "^3.0.9",
     "typescript": "^3.0.0",

test/integer.test.js

@@ -5,7 +5,7 @@ const validator = require('is-my-json-valid')
 const proxyquire = require('proxyquire')
 const build = proxyquire('..', { long: null })
 
-test(`render an integer as JSON`, (t) => {
+test('render an integer as JSON', (t) => {
   t.plan(2)
 
   const schema = {
@@ -21,7 +21,7 @@ test(`render an integer as JSON`, (t) => {
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
-test(`render an object with an integer as JSON`, (t) => {
+test('render an object with an integer as JSON', (t) => {
   t.plan(2)
 
   const schema = {
@@ -44,7 +44,7 @@ test(`render an object with an integer as JSON`, (t) => {
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
-test(`render an array with an integer as JSON`, (t) => {
+test('render an array with an integer as JSON', (t) => {
   t.plan(2)
 
   const schema = {
@@ -63,7 +63,7 @@ test(`render an array with an integer as JSON`, (t) => {
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
-test(`render an object with an additionalProperty of type integer as JSON`, (t) => {
+test('render an object with an additionalProperty of type integer as JSON', (t) => {
   t.plan(2)
 
   const schema = {

test/long.test.js

@@ -5,7 +5,7 @@ const validator = require('is-my-json-valid')
 const Long = require('long')
 const build = require('..')
 
-test(`render a long as JSON`, (t) => {
+test('render a long as JSON', (t) => {
   t.plan(2)
 
   const schema = {
@@ -21,7 +21,7 @@ test(`render a long as JSON`, (t) => {
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
-test(`render an object with long as JSON`, (t) => {
+test('render an object with long as JSON', (t) => {
   t.plan(2)
 
   const schema = {
@@ -44,7 +44,7 @@ test(`render an object with long as JSON`, (t) => {
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
-test(`render an array with long as JSON`, (t) => {
+test('render an array with long as JSON', (t) => {
   t.plan(2)
 
   const schema = {
@@ -63,7 +63,7 @@ test(`render an array with long as JSON`, (t) => {
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
-test(`render an object with a long additionalProperty as JSON`, (t) => {
+test('render an object with a long additionalProperty as JSON', (t) => {
   t.plan(2)
 
   const schema = {

test/sanitize.test.js

@@ -17,7 +17,7 @@ const stringify = build({
       description: 'Age in years"',
       type: 'integer'
     },
-    [(() => `phra'&& process.exit(1) ||'phra`)()]: {},
+    [(() => "phra'&& process.exit(1) ||'phra")()]: {},
     now: {
       type: 'string'
     },

test/surrogate.test.js

@@ -4,7 +4,7 @@ const test = require('tap').test
 const validator = require('is-my-json-valid')
 const build = require('..')
 
-test(`render a string with surrogate pairs as JSON:test 1`, (t) => {
+test('render a string with surrogate pairs as JSON:test 1', (t) => {
   t.plan(2)
 
   const schema = {
@@ -20,7 +20,7 @@ test(`render a string with surrogate pairs as JSON:test 1`, (t) => {
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
-test(`render a string with surrogate pairs as JSON: test 2`, (t) => {
+test('render a string with surrogate pairs as JSON: test 2', (t) => {
   t.plan(2)
 
   const schema = {
@@ -36,7 +36,7 @@ test(`render a string with surrogate pairs as JSON: test 2`, (t) => {
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
-test(`render a string with Unpaired surrogate code as JSON`, (t) => {
+test('render a string with Unpaired surrogate code as JSON', (t) => {
   t.plan(2)
 
   const schema = {
@@ -51,7 +51,7 @@ test(`render a string with Unpaired surrogate code as JSON`, (t) => {
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
-test(`render a string with lone surrogate code as JSON`, (t) => {
+test('render a string with lone surrogate code as JSON', (t) => {
   t.plan(2)
 
   const schema = {