fix: Use ramda named exports (compatibility w/ ramda v0.25) (#98)

mdimovska · ognen · commit ab359ad96b73 · 2018-02-05T13:51:44.000+01:00
* Fix ramda imports (v0.25 does not support default imports)

* Change ramda imports (use R. everywhere)
diff --git a/packages/config/src/layer.js b/packages/config/src/layer.js
@@ -1,4 +1,4 @@
-import { pickBy, reverse } from 'ramda'
+import * as R from 'ramda'
 import deepMerge from './utils/merge'
 import deepFreeze from './utils/freeze'
 
@@ -22,7 +22,7 @@ export default class Layer {
     // and overridden with values from the more important profiles
     let activeProfiles = profiles
     if (profiles) {
-      activeProfiles = reverse(profiles)
+      activeProfiles = R.reverse(profiles)
     }
 
     // create a sequence of layers, starting from the current one, up to the root, in reverse order (root comes first)
@@ -43,7 +43,7 @@ export default class Layer {
       Object.entries(layer.configuration).forEach(
         ([feature, configOfLayer]) => {
           // values from (default) profile
-          const defaultProfileForLayer = pickBy(
+          const defaultProfileForLayer = R.pickBy(
             (val, key) => key !== 'profiles',
             configOfLayer
           )
diff --git a/packages/config/src/utils/merge.js b/packages/config/src/utils/merge.js
@@ -1,7 +1,7 @@
-import { is, mergeWith } from 'ramda'
+import * as R from 'ramda'
 
 export default function deepMerge(a = {}, b = {}) {
-  return is(Array, b) && !is(Object, b[0])
+  return R.is(Array, b) && !R.is(Object, b[0])
     ? b
-    : is(Object, a) && is(Object, b) ? mergeWith(deepMerge, a, b) : b
+    : R.is(Object, a) && R.is(Object, b) ? R.mergeWith(deepMerge, a, b) : b
 }
diff --git a/packages/core/src/action.js b/packages/core/src/action.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import { kindOf } from './data'
 
 export const actionMetaProperty = '@@girders-elements/_actionMeta'
diff --git a/packages/core/src/data/element.js b/packages/core/src/data/element.js
@@ -1,7 +1,7 @@
 /* @flow */
 'use strict'
 
-import { all, curry } from 'ramda'
+import * as R from 'ramda'
 import invariant from 'invariant'
 import {
   List,
@@ -21,7 +21,7 @@ import type { ElementRef, ElementRefCanonical } from './types'
  * @param element the element
  * @returns {*}
  */
-export const isOfKind = curry(function isOfKind(
+export const isOfKind = R.curry(function isOfKind(
   kind: ElementRef,
   element: ?KeyedIterable
 ): boolean {
@@ -45,7 +45,7 @@ export function isElementRef(obj: any): boolean {
   const isString = o => typeof o === 'string'
 
   if (isString(obj)) return true
-  if (Array.isArray(obj) && (all(isString)(obj) || obj.length === 0))
+  if (Array.isArray(obj) && (R.all(isString)(obj) || obj.length === 0))
     return true
   if (obj instanceof List && (obj.every(isString) || obj.isEmpty())) return true
 
@@ -59,7 +59,7 @@ export function isElementRef(obj: any): boolean {
  * @param element tne element
  * @returns {*}
  */
-export const isExactlyOfKind = curry(function isExactlyOfKind(
+export const isExactlyOfKind = R.curry(function isExactlyOfKind(
   kind: ElementRef,
   element: ?KeyedIterable
 ): boolean {
diff --git a/packages/core/src/data/index.js b/packages/core/src/data/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import * as element from './element'
 export * from './element'
 
diff --git a/packages/core/src/effect/impl.js b/packages/core/src/effect/impl.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 
 import * as actions from '../action'
 import { types as actionTypes } from './actions'
diff --git a/packages/core/src/effect/index.js b/packages/core/src/effect/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import invariant from 'invariant'
 
 import { chainRegistries, ActionRegistry } from '../registry'
diff --git a/packages/core/src/engine/__tests__/engine.js b/packages/core/src/engine/__tests__/engine.js
@@ -2,7 +2,7 @@
 
 import { mount } from 'enzyme'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import React from 'react'
 
 import * as Subsystem from '../../subsystem'
diff --git a/packages/core/src/engine/impl.js b/packages/core/src/engine/impl.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import I from 'immutable'
 import React from 'react'
 import PropTypes from 'prop-types'
diff --git a/packages/core/src/enhance/impl.js b/packages/core/src/enhance/impl.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import I from 'immutable'
 import * as zip from '../zip'
 
diff --git a/packages/core/src/enhance/index.js b/packages/core/src/enhance/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import { List } from 'immutable'
 import invariant from 'invariant'
 
diff --git a/packages/core/src/enrich/impl.js b/packages/core/src/enrich/impl.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import { memoize } from '../impl/util'
 import * as data from '../data'
 import * as zip from '../zip'
diff --git a/packages/core/src/enrich/index.js b/packages/core/src/enrich/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import invariant from 'invariant'
 
 import { isElementRef } from '../data'
diff --git a/packages/core/src/impl/cursor.js b/packages/core/src/impl/cursor.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import { List, Seq } from 'immutable'
 import Cursor from 'immutable/contrib/cursor'
 
diff --git a/packages/core/src/kernel.js b/packages/core/src/kernel.js
@@ -2,7 +2,7 @@
 
 import I from 'immutable'
 import Cursor from 'immutable/contrib/cursor'
-import R from 'ramda'
+import * as R from 'ramda'
 
 import * as zip from './zip'
 import * as actions from './action'
diff --git a/packages/core/src/read/__tests__/http.js b/packages/core/src/read/__tests__/http.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import * as http from '../http'
 
 describe('http', () => {
diff --git a/packages/core/src/read/http.js b/packages/core/src/read/http.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import { fromJS } from 'immutable'
 
 export function execute(url, options) {
diff --git a/packages/core/src/read/impl.js b/packages/core/src/read/impl.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import invariant from 'invariant'
 import { fromJS } from 'immutable'
 
diff --git a/packages/core/src/read/index.js b/packages/core/src/read/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import invariant from 'invariant'
 
 // required subsystems
diff --git a/packages/core/src/registry/PatternRegistry.js b/packages/core/src/registry/PatternRegistry.js
@@ -2,7 +2,7 @@
 
 import AbstractRegistry from './AbstractRegistry'
 import { List, is, Iterable } from 'immutable'
-import R from 'ramda'
+import * as R from 'ramda'
 
 export default class PatternRegistry extends AbstractRegistry {
   constructor() {
diff --git a/packages/core/src/registry/RegistryChain.js b/packages/core/src/registry/RegistryChain.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 
 import AbstractRegistry from './AbstractRegistry'
 import Registry from './Registry'
diff --git a/packages/core/src/subsystem.js b/packages/core/src/subsystem.js
@@ -1,7 +1,7 @@
 'use strict'
 
 import invariant from 'invariant'
-import R from 'ramda'
+import * as R from 'ramda'
 import uuid from 'uuid'
 
 // what is a subsystem
diff --git a/packages/core/src/transform/impl.js b/packages/core/src/transform/impl.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import { kindOf } from '../data/element'
 import { memoize } from '../impl/util'
 
diff --git a/packages/core/src/transform/index.js b/packages/core/src/transform/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import invariant from 'invariant'
 
 import { isElementRef } from '../data'
diff --git a/packages/core/src/ui/ElementView.js b/packages/core/src/ui/ElementView.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import I from 'immutable'
 import React from 'react'
 import PropTypes from 'prop-types'
diff --git a/packages/core/src/ui/index.js b/packages/core/src/ui/index.js
@@ -1,8 +1,6 @@
 'use strict'
 
-'use strict'
-
-import R from 'ramda'
+import * as R from 'ramda'
 import { Iterable } from 'immutable'
 import React from 'react'
 
diff --git a/packages/core/src/update/impl.js b/packages/core/src/update/impl.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 
 import invariant from 'invariant'
 import { warning } from '../impl/log'
diff --git a/packages/core/src/update/index.js b/packages/core/src/update/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import R from 'ramda'
+import * as R from 'ramda'
 import invariant from 'invariant'
 import deprecated from '../impl/deprecated'
 
diff --git a/packages/core/src/zip/edit.js b/packages/core/src/zip/edit.js
@@ -1,10 +1,10 @@
 'use strict'
 
-import { curry } from 'ramda'
+import * as R from 'ramda'
 import { isOfKind } from '../data'
 import { postWalk } from '../zip'
 
-export const editCond = curry((patterns, zipper) =>
+export const editCond = R.curry((patterns, zipper) =>
   postWalk(el => {
     patterns.forEach(pattern => {
       const pred = pattern[0]
diff --git a/packages/core/src/zip/elementZipper.js b/packages/core/src/zip/elementZipper.js
@@ -2,19 +2,19 @@
 
 import { makeZipper } from '../vendor/zippa'
 import { Iterable, List, Map } from 'immutable'
-import { curry } from 'ramda'
+import * as R from 'ramda'
 import {
   isOfKind,
   asList,
   childPositions as childPositionsFromElement,
 } from '../data'
 
-const childPositions = curry((defaultChildPositions, el) => {
+const childPositions = R.curry((defaultChildPositions, el) => {
   const fromEl = childPositionsFromElement(el)
   return !fromEl.isEmpty() ? fromEl : asList(defaultChildPositions)
 })
 
-const isBranch = curry((defaultChildPositions, element) => {
+const isBranch = R.curry((defaultChildPositions, element) => {
   if (isOfKind('@@girders-elements/child-collection', element)) {
     const children = element.get('children')
     return children && children.count() > 0
@@ -29,7 +29,7 @@ const isBranch = curry((defaultChildPositions, element) => {
   return positions.some(pos => element.get(pos))
 })
 
-const getChildren = curry((defaultChildPositions, element) => {
+const getChildren = R.curry((defaultChildPositions, element) => {
   if (isOfKind('@@girders-elements/child-collection', element)) {
     return element.get('children').toArray()
   }
@@ -55,7 +55,7 @@ const makeChildCollection = (p, children) =>
     children: asList(children),
   })
 
-const makeNode = curry((defaultChildPositions, element, children) => {
+const makeNode = R.curry((defaultChildPositions, element, children) => {
   if (isOfKind('@@girders-elements/child-collection', element)) {
     return element.set('children', List(children))
   }
diff --git a/packages/core/src/zip/reduce.js b/packages/core/src/zip/reduce.js
@@ -1,16 +1,16 @@
 'use strict'
 
-import { curry } from 'ramda'
+import * as R from 'ramda'
 import { onPre, onPost, visit } from '../vendor/zippa'
 
 const reduceVisitor = fn => (item, state) => ({ state: fn(state, item) })
 
-export const reduce = curry(
+export const reduce = R.curry(
   (fn, initialAcc, zipper) =>
     visit([onPost(reduceVisitor(fn))], initialAcc, zipper).state
 )
 
-export const reducePre = curry(
+export const reducePre = R.curry(
   (fn, initialAcc, zipper) =>
     visit([onPre(reduceVisitor(fn))], initialAcc, zipper).state
 )
