Merge pull request #7 from netlify/raees/yaml-parser

Add support for YAML config

Author: RaeesBhatti

common.js

@@ -9,7 +9,76 @@ function parseURL(url) {
   return URLclass.parse(url)
 }
 
-module.exports = {
+function splatForwardRule(path, obj, dest) {
+  return (
+    path.match(/\/\*$/) &&
+    dest == null &&
+    obj.status &&
+    obj.status >= 200 &&
+    obj.status < 300 &&
+    obj.force
+  )
+}
+
+function isPlainObj(o) {
+  return typeof o == 'object' && o.constructor == Object
+}
+
+function fetch(obj, options) {
+  for (const i in options) {
+    if (obj.hasOwnProperty(options[i])) {
+      return obj[options[i]]
+    }
+  }
+  return null
+}
+
+function redirectMatch(obj) {
+  const origin = fetch(obj, ['from', 'origin'])
+  const redirect =
+    origin && origin.match(exp.FULL_URL_MATCHER)
+      ? exp.parseFullOrigin(origin)
+      : { path: origin }
+  if (redirect == null || (redirect.path == null && redirect.host == null)) {
+    return null
+  }
+
+  const dest = fetch(obj, ['to', 'destination'])
+  if (splatForwardRule(redirect.path, obj, dest)) {
+    redirect.to = redirect.path.replace(/\/\*$/, '/:splat')
+  } else {
+    redirect.to = dest
+  }
+
+  if (redirect.to == null) {
+    return null
+  }
+
+  redirect.params = fetch(obj, ['query', 'params', 'parameters'])
+  redirect.status = fetch(obj, ['status'])
+  redirect.force = fetch(obj, ['force'])
+  redirect.conditions = fetch(obj, ['conditions'])
+  redirect.headers = fetch(obj, ['headers'])
+  redirect.signed = fetch(obj, ['sign', 'signing', 'signed'])
+
+  Object.keys(redirect).forEach(key => {
+    if (redirect[key] === null) {
+      delete redirect[key]
+    }
+  })
+
+  if (redirect.headers && !isPlainObj(redirect.headers)) {
+    return null
+  }
+
+  return redirect
+}
+
+const exp = {
+  splatForwardRule,
+  isPlainObj,
+  redirectMatch,
+
   FULL_URL_MATCHER: /^(https?):\/\/(.+)$/,
   FORWARD_STATUS_MATCHER: /^2\d\d!?$/,
 
@@ -37,3 +106,5 @@ module.exports = {
     }
   },
 }
+
+module.exports = exp

index.js

@@ -1,5 +1,7 @@
 const lineParser = require('./line-parser')
 const tomlParser = require('./toml-parser')
+const yamlParser = require('./yaml-parser')
 
 exports.parseRedirectsFormat = lineParser.parse
 exports.parseTomlFormat = tomlParser.parse
+exports.parseYamlFormat = yamlParser.parse

package-lock.json

@@ -17,7 +17,8 @@
     "@iarna/toml": "^2.2.3",
     "husky": "^2.2.0",
     "lint-staged": "^8.1.6",
-    "prettier": "^1.17.0"
+    "prettier": "^1.17.0",
+    "yamljs": "^0.3.0"
   },
   "devDependencies": {
     "auto-changelog": "^1.13.0",

package.json

@@ -1,71 +1,11 @@
 const TOML = require('@iarna/toml')
 const Result = require('./result')
-const common = require('./common')
-
-function splatForwardRule(path, obj, dest) {
-  return (
-    path.match(/\/\*$/) &&
-    dest == null &&
-    obj.status &&
-    obj.status >= 200 &&
-    obj.status < 300 &&
-    obj.force
-  )
-}
-
-function isPlainObj(o) {
-  return typeof o == 'object' && o.constructor == Object
-}
-
-function fetch(obj, options) {
-  for (const i in options) {
-    if (obj.hasOwnProperty(options[i])) {
-      return obj[options[i]]
-    }
-  }
-  return null
-}
-
-function redirectMatch(obj) {
-  const origin = fetch(obj, ['from', 'origin'])
-  const redirect =
-    origin && origin.match(common.FULL_URL_MATCHER)
-      ? common.parseFullOrigin(origin)
-      : { path: origin }
-  if (redirect == null || (redirect.path == null && redirect.host == null)) {
-    return null
-  }
-
-  const dest = fetch(obj, ['to', 'destination'])
-  if (splatForwardRule(redirect.path, obj, dest)) {
-    redirect.to = redirect.path.replace(/\/\*$/, '/:splat')
-  } else {
-    redirect.to = dest
-  }
-
-  if (redirect.to == null) {
-    return null
-  }
-
-  redirect.params = fetch(obj, ['query', 'params', 'parameters'])
-  redirect.status = fetch(obj, ['status'])
-  redirect.force = fetch(obj, ['force'])
-  redirect.conditions = fetch(obj, ['conditions'])
-  redirect.headers = fetch(obj, ['headers'])
-  redirect.signed = fetch(obj, ['sign', 'signing', 'signed'])
-
-  Object.keys(redirect).forEach(key => {
-    if (redirect[key] === null) {
-      delete redirect[key]
-    }
-  })
-
-  if (redirect.headers && !isPlainObj(redirect.headers)) {
-    return null
-  }
-
-  return redirect
-}
+const {
+  isPlainObj,
+  redirectMatch,
+  isInvalidSource,
+  isProxy,
+} = require('./common')
 
 function parse(source) {
   const result = new Result()
@@ -87,14 +27,14 @@ function parse(source) {
       return
     }
 
-    if (common.isInvalidSource(redirect)) {
+    if (isInvalidSource(redirect)) {
       result.addError(idx, JSON.stringify(obj), {
         reason: 'Invalid /.netlify path in redirect source',
       })
       return
     }
 
-    if (common.isProxy(redirect)) {
+    if (isProxy(redirect)) {
       redirect.proxy = true
     }