fix: loosen validation such that valid feeds don't fail

Author: digitalsadhu

lib/feed-schema.js

@@ -2,39 +2,23 @@
 
 const Joi = require('joi');
 
-module.exports = Joi.array()
-    .label('feeds')
-    .items([
-        Joi.object()
-            .keys({
-                entry: Joi.boolean().required(),
-                id: Joi.alternatives()
-                    .try(Joi.number(), Joi.string())
-                    .required(),
-                file: Joi.string().required(),
-                source: Joi.string().required(),
-                deps: Joi.object().required(),
-                expose: Joi.any().optional(),
-                order: Joi.any().optional(),
-                index: Joi.any().optional(),
-                indexDeps: Joi.any().optional(),
-            })
-            .label('feed')
-            .required(),
-        Joi.object()
-            .keys({
-                id: Joi.alternatives()
-                    .try(Joi.number(), Joi.string())
-                    .required(),
-                file: Joi.string().required(),
-                source: Joi.string().required(),
-                deps: Joi.object().required(),
-                expose: Joi.any().optional(),
-                order: Joi.any().optional(),
-                index: Joi.any().optional(),
-                indexDeps: Joi.any().optional(),
-            })
-            .label('feed')
-            .optional(),
-    ])
+module.exports = Joi.object()
+    .keys({
+        entry: Joi.boolean().label('entry'),
+        id: Joi.alternatives()
+            .try(Joi.number(), Joi.string())
+            .required()
+            .label('id'),
+        file: Joi.string()
+            .required()
+            .label('file'),
+        source: Joi.string()
+            .required()
+            .label('source'),
+        deps: Joi.object()
+            .required()
+            .label('deps'),
+    })
+    .unknown()
+    .label('feed item')
     .required();

lib/reader.js

@@ -10,6 +10,8 @@ const { directory } = require('tempy');
 const Joi = require('joi');
 const feedSchema = require('./feed-schema');
 const uglify = require('uglify-es');
+const Boom = require('boom');
+const assert = require('assert');
 
 /**
  * Unpacks given feeds into directory structure before
@@ -20,13 +22,25 @@ const uglify = require('uglify-es');
  * @returns {Promise<string>} - promise resolves to a javascript bundle
  */
 module.exports = async (feeds, options) => {
-    Joi.assert(
-        feeds,
-        Joi.array()
-            .items(feedSchema)
-            .required(),
-        `Expected argument 'feeds' to be an array of feeds.`
+    assert(
+        Array.isArray(feeds),
+        `Expected argument 'feeds' to be an array (of feed arrays).`
     );
+    assert(
+        feeds.length > 0,
+        `Expected argument 'feeds' (array) to be contain at least 1 feed (array).`
+    );
+    assert(
+        feeds[0].length > 0,
+        'Expected at least 1 feed (array) to have more than one entry (object).'
+    );
+    [].concat(...feeds).forEach(feedItem => {
+        const { error } = Joi.validate(feedItem, feedSchema);
+        if (error)
+            throw Boom.boomify(error, {
+                message: `Expected every item in argument 'feeds' (array) to be a valid feed (object).`,
+            });
+    });
 
     const opts = { sourceMaps: false, minify: false, ...options };
 

package-lock.json

@@ -27,6 +27,7 @@
   "license": "MIT",
   "dependencies": {
     "asset-pipe-common": "^1.0.0-beta.6",
+    "boom": "^7.1.1",
     "browserify": "^15.2.0",
     "fs-extra": "^5.0.0",
     "joi": "^13.1.1",

package.json

@@ -58949,63 +58949,19 @@ exports[`should dedupe 1`] = `
 "
 `;
 
-exports[`should error if any feed content keys are missing 1`] = `
-"Expected argument 'feeds' to be an array of feeds. [
-  {}
-]
-
-[1] \\"feeds\\" must be an array"
-`;
+exports[`should error if any feed content keys are missing 1`] = `"Expected at least 1 feed (array) to have more than one entry (object)."`;
 
-exports[`should error if any feed content keys are missing 2`] = `
-"Expected argument 'feeds' to be an array of feeds. [
-  {
-    \\"file\\": \\"asd\\",
-    \\"deps\\": {},
-    \\"id\\": \\"a\\",
-    \\"entry\\": true
-  }
-]
-
-[1] \\"feeds\\" must be an array"
-`;
+exports[`should error if any feed content keys are missing 2`] = `"Expected at least 1 feed (array) to have more than one entry (object)."`;
 
-exports[`should error if feed content does not contain at least 1 entrypoint 1`] = `
-"Expected argument 'feeds' to be an array of feeds. [
-  {
-    \\"id\\": \\"a\\",
-    \\"file\\": \\"asdas.js\\",
-    \\"source\\": \\"spy(1234);\\",
-    \\"deps\\": {}
-  }
-]
-
-[1] \\"feeds\\" must be an array"
-`;
+exports[`should error if feed content does not contain at least 1 entrypoint 1`] = `"Expected at least 1 feed (array) to have more than one entry (object)."`;
 
-exports[`should error if feed content is non object 1`] = `
-"Expected argument 'feeds' to be an array of feeds. [
-  \\"s1df3s1f2d3s1d2f3s.json\\"
-]
-
-[1] \\"feeds\\" must be an array"
-`;
+exports[`should error if feed content is non object 1`] = `"Expected every item in argument 'feeds' (array) to be a valid feed (object).: \\"feed item\\" must be an object"`;
 
-exports[`should error if no feed content 1`] = `"Expected argument 'feeds' to be an array of feeds. \\"value\\" is required"`;
+exports[`should error if no feed content 1`] = `"Expected argument 'feeds' to be an array (of feed arrays)."`;
 
-exports[`should error if no feed content 2`] = `
-"Expected argument 'feeds' to be an array of feeds. []
-
-[1] \\"value\\" does not contain [feeds]"
-`;
+exports[`should error if no feed content 2`] = `"Expected argument 'feeds' (array) to be contain at least 1 feed (array)."`;
 
-exports[`should error if no feed content 3`] = `
-"Expected argument 'feeds' to be an array of feeds. [
-  []
-]
-
-[1] \\"feeds\\" does not contain [feed]"
-`;
+exports[`should error if no feed content 3`] = `"Expected at least 1 feed (array) to have more than one entry (object)."`;
 
 exports[`should handle node_modules dependencies 1`] = `
 "(function e(t, n, r) {