Improve border consistency

Author: jacobp100

src/__tests__/border.js

@@ -56,20 +56,6 @@ it('transforms border shorthand missing color', () => {
   })
 })
 
-it('transforms border shorthand missing style', () => {
-  expect(transformCss([['border', '2px #f00']])).toEqual({
-    borderTopWidth: 2,
-    borderRightWidth: 2,
-    borderBottomWidth: 2,
-    borderLeftWidth: 2,
-    borderTopColor: '#f00',
-    borderRightColor: '#f00',
-    borderBottomColor: '#f00',
-    borderLeftColor: '#f00',
-    borderStyle: 'solid',
-  })
-})
-
 it('transforms border shorthand missing width', () => {
   expect(transformCss([['border', '#f00 dashed']])).toEqual({
     borderTopWidth: 1,
@@ -98,34 +84,6 @@ it('transforms border shorthand missing color & width', () => {
   })
 })
 
-it('transforms border shorthand missing style & width', () => {
-  expect(transformCss([['border', '#f00']])).toEqual({
-    borderTopWidth: 1,
-    borderRightWidth: 1,
-    borderBottomWidth: 1,
-    borderLeftWidth: 1,
-    borderTopColor: '#f00',
-    borderRightColor: '#f00',
-    borderBottomColor: '#f00',
-    borderLeftColor: '#f00',
-    borderStyle: 'solid',
-  })
-})
-
-it('transforms border shorthand missing color & style', () => {
-  expect(transformCss([['border', '2px']])).toEqual({
-    borderTopWidth: 2,
-    borderRightWidth: 2,
-    borderBottomWidth: 2,
-    borderLeftWidth: 2,
-    borderTopColor: 'black',
-    borderRightColor: 'black',
-    borderBottomColor: 'black',
-    borderLeftColor: 'black',
-    borderStyle: 'solid',
-  })
-})
-
 it('transforms border for unsupported units', () => {
   expect(transformCss([['border', '3em solid black']])).toEqual({
     borderTopWidth: '3em',
@@ -140,6 +98,18 @@ it('transforms border for unsupported units', () => {
   })
 })
 
+it('does not transform border shorthand missing style', () => {
+  expect(() => transformCss([['border', '2px #f00']])).toThrow()
+})
+
+it('does not transform border shorthand missing style & width', () => {
+  expect(() => transformCss([['border', '#f00']])).toThrow()
+})
+
+it('does not transforms border shorthand missing color & style', () => {
+  expect(() => transformCss([['border', '2px']])).toThrow()
+})
+
 it('does not transform border with percentage width', () => {
   expect(() => transformCss([['border', '3% solid black']])).toThrow()
 })

src/__tests__/borderRight.js

@@ -66,7 +66,7 @@ describe.each([
       borderStyle: 'dashed',
     })
 
-    expect(transformCss([['border', value]])).toEqual({
+    expect(transformCss([['border', `${value} solid`]])).toEqual({
       borderTopWidth: value,
       borderRightWidth: value,
       borderBottomWidth: value,

src/__tests__/units.js

@@ -11,16 +11,25 @@ const BORDER_STYLE = regExpToken(/^(solid|dashed|dotted)$/)
 
 const defaultBorderWidth = 1
 const defaultBorderColor = 'black'
-const defaultBorderStyle = 'solid'
 
-const baseParse = (tokenStream, allowBorderStyle) => {
+export default tokenStream => {
   let borderWidth
   let borderColor
   let borderStyle
 
   if (tokenStream.matches(NONE)) {
     tokenStream.expectEmpty()
-    return { borderWidth: 0, borderColor: 'black', borderStyle: 'solid' }
+    return {
+      borderTopWidth: 0,
+      borderRightWidth: 0,
+      borderBottomWidth: 0,
+      borderLeftWidth: 0,
+      borderTopColor: 'black',
+      borderRightColor: 'black',
+      borderBottomColor: 'black',
+      borderLeftColor: 'black',
+      borderStyle: 'solid',
+    }
   }
 
   let partsParsed = 0
@@ -48,22 +57,11 @@ const baseParse = (tokenStream, allowBorderStyle) => {
   if (borderWidth === undefined) borderWidth = defaultBorderWidth
   if (borderColor === undefined) borderColor = defaultBorderColor
   if (borderStyle === undefined) {
-    borderStyle = defaultBorderStyle
-  } else if (!allowBorderStyle) {
     throw new Error(
-      'Setting a border style on a single border side is not supported'
+      'You must define a border style in the border shorthand (e.g. solid)'
     )
   }
 
-  return { borderWidth, borderColor, borderStyle }
-}
-
-export default tokenStream => {
-  // eslint-disable-next-line prefer-const
-  let { borderWidth, borderColor, borderStyle } = baseParse(tokenStream, true)
-
-  if (borderStyle === undefined) borderStyle = defaultBorderStyle
-
   return {
     borderTopWidth: borderWidth,
     borderRightWidth: borderWidth,
@@ -76,23 +74,3 @@ export default tokenStream => {
     borderStyle,
   }
 }
-
-export const borderTop = tokenStream => {
-  const { borderWidth, borderColor } = baseParse(tokenStream, false)
-  return { borderTopWidth: borderWidth, borderTopColor: borderColor }
-}
-
-export const borderRight = tokenStream => {
-  const { borderWidth, borderColor } = baseParse(tokenStream, false)
-  return { borderRightWidth: borderWidth, borderRightColor: borderColor }
-}
-
-export const borderBottom = tokenStream => {
-  const { borderWidth, borderColor } = baseParse(tokenStream, false)
-  return { borderBottomWidth: borderWidth, borderBottomColor: borderColor }
-}
-
-export const borderLeft = tokenStream => {
-  const { borderWidth, borderColor } = baseParse(tokenStream, false)
-  return { borderLeftWidth: borderWidth, borderLeftColor: borderColor }
-}