feat: publish xstyled utilities as a separated package

gregberge · gregberge · commit cc08d0f2dd60 · 2019-08-11T15:46:57.000+02:00
diff --git a/packages/core/src/index.js b/packages/core/src/index.js
@@ -1,4 +1,3 @@
 export * from './createBox'
 export * from './propGetters'
 export * from './transform'
-export * from './util'
diff --git a/packages/core/src/util.js b/packages/core/src/util.js
diff --git a/packages/emotion/package.json b/packages/emotion/package.json
@@ -28,6 +28,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.4.4",
-    "@xstyled/core": "^1.9.1"
+    "@xstyled/core": "^1.9.1",
+    "@xstyled/util": "^1.9.1"
   }
 }
diff --git a/packages/emotion/src/cx.js b/packages/emotion/src/cx.js
@@ -1,4 +1,4 @@
-import { cascade, flatten } from '@xstyled/core'
+import { cascade, flatten } from '@xstyled/util'
 import { css } from './css'
 
 export function cx(styles) {
diff --git a/packages/styled-components/package.json b/packages/styled-components/package.json
@@ -26,6 +26,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.4.4",
-    "@xstyled/core": "^1.9.1"
+    "@xstyled/core": "^1.9.1",
+    "@xstyled/util": "^1.9.1"
   }
 }
diff --git a/packages/styled-components/src/css.js b/packages/styled-components/src/css.js
@@ -1,6 +1,7 @@
 /* eslint-disable no-continue, no-loop-func, no-cond-assign */
 import { css as scCss } from 'styled-components'
-import { transform, flattenStrings } from '@xstyled/core'
+import { flattenStrings } from '@xstyled/util'
+import { transform } from '@xstyled/core'
 
 export function css(...rawArgs) {
   const scCssArgs = scCss(...rawArgs)
diff --git a/packages/system/package.json b/packages/system/package.json
@@ -23,6 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@babel/runtime": "^7.4.4"
+    "@babel/runtime": "^7.4.4",
+    "@xstyled/util": "^1.9.1"
   }
 }
diff --git a/packages/system/src/media.js b/packages/system/src/media.js
@@ -1,4 +1,4 @@
-import { is, getThemeValue } from './util'
+import { is, getThemeValue } from '@xstyled/util'
 import { px } from './unit'
 
 const DEFAULT_BREAKPOINTS = {
diff --git a/packages/system/src/style.js b/packages/system/src/style.js
@@ -1,5 +1,4 @@
 /* eslint-disable no-continue, no-underscore-dangle, no-restricted-syntax, guard-for-in, no-multi-assign */
-import { getBreakpoints, getBreakpointMin, mediaMinWidth } from './media'
 import {
   is,
   num,
@@ -10,7 +9,8 @@ import {
   identity,
   merge,
   assign,
-} from './util'
+} from '@xstyled/util'
+import { getBreakpoints, getBreakpointMin, mediaMinWidth } from './media'
 
 const cacheSupported =
   typeof Map !== 'undefined' && typeof WeakMap !== 'undefined'
diff --git a/packages/system/src/styles/borders.js b/packages/system/src/styles/borders.js
@@ -1,5 +1,5 @@
+import { num } from '@xstyled/util'
 import { style, themeGetter, compose } from '../style'
-import { num } from '../util'
 import { px } from '../unit'
 import { getColor, getRadius, getPx } from './basics'
 
diff --git a/packages/system/src/styles/space.js b/packages/system/src/styles/space.js
@@ -1,5 +1,5 @@
+import { is, string, negative, getThemeValue } from '@xstyled/util'
 import { style, themeGetter, compose } from '../style'
-import { is, string, negative, getThemeValue } from '../util'
 import { getPx } from './basics'
 
 function toNegative(value) {
diff --git a/packages/system/src/styles/xgrids.js b/packages/system/src/styles/xgrids.js
@@ -1,5 +1,5 @@
+import { obj } from '@xstyled/util'
 import { createStyleGenerator, reduceBreakpoints, compose } from '../style'
-import { obj } from '../util'
 import { getPercent } from './basics'
 
 export const row = createStyleGenerator(
diff --git a/packages/system/src/systemComponent.js b/packages/system/src/systemComponent.js
@@ -1,4 +1,4 @@
-import { omit } from './util'
+import { omit } from '@xstyled/util'
 import { system as allSystem } from './styles/index'
 
 export const createSystemComponent = (
diff --git a/packages/system/src/th.js b/packages/system/src/th.js
@@ -1,4 +1,4 @@
-import { is, warn, getThemeValue } from './util'
+import { is, warn, getThemeValue } from '@xstyled/util'
 import {
   getColor,
   getPx,
diff --git a/packages/system/src/transformers.js b/packages/system/src/transformers.js
@@ -1,4 +1,4 @@
-import { num } from './util'
+import { num } from '@xstyled/util'
 import { remPx, rpx } from './unit'
 
 export const rpxTransformers = {
diff --git a/packages/system/src/unit.js b/packages/system/src/unit.js
@@ -1,4 +1,4 @@
-import { num, string } from './util'
+import { num, string } from '@xstyled/util'
 
 const round = value => Math.round(value * 10 ** 4) / 10 ** 4
 
diff --git a/packages/system/src/unit.test.js b/packages/system/src/unit.test.js
@@ -1,6 +1,6 @@
 import { unit, px, rpx, percent, remPx } from './unit'
 
-describe('util', () => {
+describe('unit', () => {
   describe('#unit', () => {
     it('adds a unit if it is a number', () => {
       const em = unit('em')
diff --git a/packages/system/src/variant.js b/packages/system/src/variant.js
@@ -1,4 +1,4 @@
-import { getThemeValue, merge, warn, is, assign } from './util'
+import { getThemeValue, merge, warn, is, assign } from '@xstyled/util'
 
 export const variant = ({
   key = null,
diff --git a/packages/util/.npmignore b/packages/util/.npmignore
@@ -0,0 +1,3 @@
+/*
+!/dist/**/*.js
+*.test.js
diff --git a/packages/util/LICENSE b/packages/util/LICENSE
@@ -0,0 +1,7 @@
+Copyright 2019 Smooth Code
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/packages/util/README.md b/packages/util/README.md
@@ -0,0 +1,5 @@
+# @xstyled/util
+
+xstyled core utilities. Kind of specific lodash for xstyled.
+
+See [xstyled documentation](https://www.smooth-code.com/open-source/xstyled/)
diff --git a/packages/util/package.json b/packages/util/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@xstyled/util",
+  "description": "xstyled utilities",
+  "version": "1.9.1",
+  "sideEffects": false,
+  "main": "dist/xstyled-util.cjs.js",
+  "module": "dist/xstyled-util.es.js",
+  "author": "Greg Bergé <berge.greg@gmail.com>",
+  "license": "MIT",
+  "scripts": {
+    "build": "rollup -c",
+    "prebuild": "shx rm -rf dist",
+    "prepublishOnly": "yarn build"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.4.4"
+  }
+}
diff --git a/packages/util/rollup.config.js b/packages/util/rollup.config.js
@@ -0,0 +1,8 @@
+import { getRollupConfig } from '../../config/rollup'
+import pkg from './package.json'
+
+export default getRollupConfig({
+  pwd: __dirname,
+  buildName: 'xstyled-util',
+  pkg,
+})
diff --git a/packages/util/src/index.js b/packages/util/src/index.js
@@ -54,10 +54,11 @@ export const warn = (condition, message) => {
   }
 }
 
-export const cascade = (fn, ...args) => {
-  if (!func(fn)) return fn
-  const next = fn(...args)
-  return cascade(next, ...args)
+export function cascade(value, arg) {
+  if (typeof value === 'function') {
+    return cascade(value(arg), arg)
+  }
+  return value
 }
 
 export const getThemeValue = (props, path, initial = props.theme) =>
@@ -73,3 +74,35 @@ export function omit(object, values) {
   }
   return result
 }
+
+/* eslint-disable no-continue, no-loop-func, no-cond-assign */
+export function flattenStrings(array) {
+  return array.reduce((flattenedArray, value) => {
+    const lastIndex = flattenedArray.length - 1
+    const last = flattenedArray[lastIndex]
+    if (typeof last === 'string' && typeof value === 'string') {
+      flattenedArray[lastIndex] = last + value
+    } else {
+      flattenedArray.push(value)
+    }
+    return flattenedArray
+  }, [])
+}
+
+function flattenDown(array, result) {
+  for (let i = 0; i < array.length; i++) {
+    const value = array[i]
+
+    if (Array.isArray(value)) {
+      flattenDown(value, result)
+    } else {
+      result.push(value)
+    }
+  }
+
+  return result
+}
+
+export function flatten(array) {
+  return flattenDown(array, [])
+}
diff --git a/packages/util/src/index.test.js b/packages/util/src/index.test.js
@@ -12,7 +12,7 @@ import {
   cascade,
   getThemeValue,
   omit,
-} from './util'
+} from '.'
 
 describe('util', () => {
   describe('#is', () => {

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`},`
`29`	`29`	`"dependencies": {`
`30`	`30`	`"@babel/runtime": "^7.4.4",`
`31`		`- "@xstyled/core": "^1.9.1"`
	`31`	`+ "@xstyled/core": "^1.9.1",`
	`32`	`+ "@xstyled/util": "^1.9.1"`
`32`	`33`	`}`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { cascade, flatten } from '@xstyled/core'`
	`1`	`+import { cascade, flatten } from '@xstyled/util'`
`2`	`2`	`import { css } from './css'`
`3`	`3`
`4`	`4`	`export function cx(styles) {`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`},`
`27`	`27`	`"dependencies": {`
`28`	`28`	`"@babel/runtime": "^7.4.4",`
`29`		`- "@xstyled/core": "^1.9.1"`
	`29`	`+ "@xstyled/core": "^1.9.1",`
	`30`	`+ "@xstyled/util": "^1.9.1"`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`"access": "public"`
`24`	`24`	`},`
`25`	`25`	`"dependencies": {`
`26`		`- "@babel/runtime": "^7.4.4"`
	`26`	`+ "@babel/runtime": "^7.4.4",`
	`27`	`+ "@xstyled/util": "^1.9.1"`
`27`	`28`	`}`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { is, getThemeValue } from './util'`
	`1`	`+import { is, getThemeValue } from '@xstyled/util'`
`2`	`2`	`import { px } from './unit'`
`3`	`3`
`4`	`4`	`const DEFAULT_BREAKPOINTS = {`