From 8fe1ed5199db901f601fcb246343449bc2151ad9 Mon Sep 17 00:00:00 2001 From: Chris van Marle Date: Thu, 4 Feb 2021 13:44:17 +0000 Subject: [PATCH] feat(jq): BREAKING CHANGE: allow json array as input --- src/command.js | 2 +- src/options.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/command.js b/src/command.js index adbf2753..7c797fce 100644 --- a/src/command.js +++ b/src/command.js @@ -12,7 +12,7 @@ const JQ_PATH = process.env.JQ_PATH || path.join(__dirname, '..', 'bin', 'jq') export const FILTER_UNDEFINED_ERROR = 'node-jq: invalid filter argument supplied: "undefined"' export const INPUT_JSON_UNDEFINED_ERROR = - 'node-jq: invalid json object argument supplied: "undefined"' + 'node-jq: invalid json argument supplied: "undefined"' export const INPUT_STRING_ERROR = 'node-jq: invalid json string argument supplied' diff --git a/src/options.js b/src/options.js index 94f8ea90..3f76a15d 100644 --- a/src/options.js +++ b/src/options.js @@ -48,7 +48,10 @@ export const preSpawnSchema = Joi.object({ otherwise: path }).label('path') }, - json: (schema) => Joi.object().allow('', null).required().label('json object'), + json: (schema) => Joi.alternatives().try( + Joi.array(), + Joi.object().allow('', null).required().label('json object') + ).required(), string: (schema) => Joi.string().required().label('json string') }) })