Merge pull request #243 from apiaryio/core-app-prepare

Bundles Gavel to UMD module

Author: artem-zakharchenko

.gitignore

@@ -8,5 +8,6 @@ cov.*
 .nyc_output
 
 # List specific to .gitignore
+build
 node_modules
 .idea/

.npmignore

@@ -10,6 +10,7 @@ cov.*
 # List specific to .npmignore
 .travis.yml
 .npmignore
+lib
 docs/
 img/
 test/

.travis.yml

@@ -14,6 +14,7 @@ install:
   - 'npm install --no-save'
 script:
   - 'npm run ci:lint'
+  - 'npm run ci:build'
   - 'npm run ci:test'
 after_success:
   - 'npm run ci:release'

appveyor.yml

@@ -1,14 +1,15 @@
 environment:
-  nodejs_version: "10"
+  nodejs_version: '10'
 cache:
-  - "node_modules"
+  - 'node_modules'
 install:
   - ps: Install-Product node 10
-  - "npm -g install npm@6"
+  - 'npm -g install npm@6'
   - "set PATH=%APPDATA%\\npm;%PATH%"
-  - "npm install"
+  - 'npm install'
 build: off
 test_script:
-  - "node --version"
-  - "npm --version"
-  - "npm test"
+  - 'node --version'
+  - 'npm --version'
+  - 'npm run build'
+  - 'npm test'

lib/units/normalize/normalizeHeaders.js

@@ -20,13 +20,13 @@ const normalizeHeaders = (headers) => {
   }
 
   return Object.keys(headers).reduce(
-    (normalizedHeaders, name) => ({
-      ...normalizedHeaders,
-      [name.toLowerCase()]:
-        typeof headers[name] === 'string'
-          ? normalizeStringValue(headers[name])
-          : headers[name]
-    }),
+    (normalizedHeaders, name) =>
+      Object.assign({}, normalizedHeaders, {
+        [name.toLowerCase()]:
+          typeof headers[name] === 'string'
+            ? normalizeStringValue(headers[name])
+            : headers[name]
+      }),
     {}
   );
 };

lib/units/validateBody.js

@@ -1,10 +1,10 @@
-const jph = require('json-parse-helpfulerror');
 const mediaTyper = require('media-typer');
 const contentTypeUtils = require('content-type');
 
+const { isValidField } = require('./isValid');
 const { TextDiff, JsonExample, JsonSchema } = require('../validators');
 const isset = require('../utils/isset');
-const { isValidField } = require('./isValid');
+const parseJson = require('../utils/parseJson');
 
 function isPlainText(mediaType) {
   return mediaType.type === 'text' && mediaType.subtype === 'plain';
@@ -69,7 +69,7 @@ function getBodyType(body, contentType, httpMessageOrigin) {
   const hasJsonContentType = isJsonContentType(contentType);
 
   try {
-    jph.parse(body);
+    parseJson(body);
     const bodyMediaType = parseContentType(
       hasJsonContentType ? contentType : 'application/json'
     );
@@ -101,7 +101,7 @@ function getBodySchemaType(bodySchema) {
   }
 
   try {
-    jph.parse(bodySchema);
+    parseJson(bodySchema);
     return [null, jsonSchemaType];
   } catch (error) {
     // Gavel must throw when given malformed JSON Schema.

lib/utils/evolve.js

@@ -38,7 +38,9 @@ const evolve = (schema, { strict = false } = {}) => (data) => {
         : value;
     /* eslint-enable no-nested-ternary */
 
-    return isArray ? acc.concat(nextValue) : { ...acc, [key]: nextValue };
+    return isArray
+      ? acc.concat(nextValue)
+      : Object.assign({}, acc, { [key]: nextValue });
   };
 
   const nextData = Object.keys(data).reduce(reducer, result);

lib/utils/parseJson.js

@@ -0,0 +1,11 @@
+const { parse } = require('jju/lib/parse');
+
+const parseJson = (json, revivew) => {
+  try {
+    return parse(json, revivew);
+  } catch (error) {
+    throw error;
+  }
+};
+
+module.exports = parseJson;