bin/cli/base.js

@@ -18,7 +18,7 @@ class Base extends Command {
         }
 
         let config
-        yaml.loadAll(fs.readFileSync(configFile, 'utf-8'), (doc) => {
+        yaml.safeLoadAll(fs.readFileSync(configFile, 'utf-8'), (doc) => {
             const valid = validate(doc)
 
             if (!valid) {

bin/cli/commands/list.js

@@ -1,6 +1,5 @@
 const clc = require('cli-color')
 const { Line } = require('clui')
-const { expandPath } = require('../../../src/shared')
 const Base = require('../base')
 
 class ListCommand extends Base {
@@ -32,7 +31,9 @@ class ListCommand extends Base {
                 .padding(2)
                 .column(VERB, 20, [clc.yellow])
                 .column(ALIAS, 30, [clc.yellow])
-                .column(expandPath(ENDPOINT, PATH))
+                .column(
+                    ENDPOINT.replace(/\/$/, '') + '/' + PATH.replace(/^\//, '')
+                )
                 .output()
         )
 

package.json

@@ -17,19 +17,19 @@
     "dependencies": {
         "@oclif/command": "1.8.0",
         "@oclif/config": "1.17.0",
-        "@oclif/plugin-help": "3.2.1",
+        "@oclif/plugin-help": "3.2.0",
         "@oclif/plugin-warn-if-update-available": "1.7.0",
-        "ajv": "7.0.3",
+        "ajv": "7.0.0-beta.6",
         "beau-std": "0.9.4",
-        "better-ajv-errors": "0.7.0",
+        "better-ajv-errors": "0.6.7",
         "cli-color": "2.0.0",
         "clui": "0.3.6",
         "color-json": "2.0.1",
         "deepmerge": "4.2.2",
         "dotenv": "8.2.0",
-        "globby": "11.0.2",
+        "globby": "11.0.1",
         "is-plain-object": "5.0.0",
-        "js-yaml": "4.0.0",
+        "js-yaml": "3.14.0",
         "prompts": "2.4.0",
         "request": "2.88.2",
         "request-promise-native": "1.0.9",
@@ -40,7 +40,7 @@
         "jest": "26.6.3",
         "jest-watch-typeahead": "0.6.1",
         "strip-ansi": "6.0.0",
-        "np": "7.2.0"
+        "np": "7.0.0"
     },
     "oclif": {
         "commands": "./bin/cli/commands",

src/__tests__/beau.spec.js

@@ -11,7 +11,7 @@ describe(`Beau's config Loader.`, () => {
     it('should load the config', () => {
         moduleVersion.mockReturnValue(1)
 
-        const doc = yaml.load(`
+        const doc = yaml.safeLoad(`
             version: 1
             endpoint: 'http://example.com'
 
@@ -27,7 +27,7 @@ describe(`Beau's config Loader.`, () => {
     it(`should load the request list using the configuration`, () => {
         moduleVersion.mockReturnValue(1)
 
-        const doc = yaml.load(`
+        const doc = yaml.safeLoad(`
             version: 1
             endpoint: 'http://example.com'
 

src/__tests__/config.spec.js

@@ -6,7 +6,7 @@ requireg.resolving = false
 
 describe('Config', () => {
     it('should load valid config keys', () => {
-        const doc = yaml.load(`
+        const doc = yaml.safeLoad(`
             version: 1
             endpoint: http://martianwabbit.com
             shouldntBeAdded: true
@@ -19,7 +19,7 @@ describe('Config', () => {
     })
 
     it('should load requests', () => {
-        const doc = yaml.load(`
+        const doc = yaml.safeLoad(`
             endpoint: http://example.com
 
             GET /profile: get-profile
@@ -36,7 +36,7 @@ describe('Config', () => {
     })
 
     it('should set up defaults for all requests', () => {
-        const doc = yaml.load(`
+        const doc = yaml.safeLoad(`
             version: 1
             endpoint: 'http://example.com'
 
@@ -60,7 +60,7 @@ describe('Config', () => {
     })
 
     it('should load multiple hosts', () => {
-        const doc = yaml.load(`
+        const doc = yaml.safeLoad(`
           version: 1
           endpoint: http://example.org
 
@@ -105,7 +105,7 @@ describe('Config', () => {
     })
 
     it('should namespace all aliases within an host', () => {
-        const doc = yaml.load(`
+        const doc = yaml.safeLoad(`
             hosts:
               - host: test1
                 endpoint: http://example.com
@@ -122,7 +122,7 @@ describe('Config', () => {
     })
 
     it(`should throw if host doesn't have a host key`, () => {
-        const doc = yaml.load(`
+        const doc = yaml.safeLoad(`
             hosts:
               - endpoint: http://example.com
                 GET /posts: posts
@@ -136,7 +136,7 @@ describe('Config', () => {
     })
 
     it(`should merge host settings with global settings`, () => {
-        const doc = yaml.load(`
+        const doc = yaml.safeLoad(`
             defaults:
               headers:
                 hello: 1
@@ -159,7 +159,7 @@ describe('Config', () => {
     })
 
     it(`should allow different settings for the same request`, () => {
-        const doc = yaml.load(`
+        const doc = yaml.safeLoad(`
       host: https://example.com
       GET /1:
         - alias: req1