Skip to content
This repository has been archived by the owner on Feb 17, 2021. It is now read-only.

Commit

Permalink
refactor(make-breakpoints): remove safe-make-breakpoints
Browse files Browse the repository at this point in the history
rename safe-make-breakpoints with make-breakpoints

BREAKING CHANGE: make breakpoints function no longer
returns the Maybe type. The associative array is returned
  • Loading branch information
mg901 committed Jan 23, 2019
1 parent cad3295 commit ef3d8ea
Show file tree
Hide file tree
Showing 25 changed files with 24 additions and 25 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { basePropProcess } from '../../src/safe-make-breakpoints/base-prop-process';
import { basePropProcess } from '../../src/make-breakpoints/base-prop-process';

describe('basePropProcess', () => {
it('breakpoint object with a base key containing an array of numbers', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createBreakpoints } from '../../src/safe-make-breakpoints/create-breakpoints';
import { createBreakpoints } from '../../src/make-breakpoints/create-breakpoints';
import { userConfig } from '../../src/models/user-config';

describe('createBreakpoints', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { userConfig } from '../../src/models/user-config';
import { safeMakeBreakpoints } from '../../src/safe-make-breakpoints';
import { makeBreakpoints } from '../../src/make-breakpoints';

describe('make breakpoints', () => {
describe('safeMakeBreakpoints', () => {
describe('makeBreakpoints', () => {
it('create a list of breakpoint values if the user config is valid', () => {
expect(safeMakeBreakpoints(userConfig).getOr()).toEqual({
expect(makeBreakpoints(userConfig)).toEqual({
default: {
base: [16, 32],
lineHeight: 1.5,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { inheritProps } from '../../src/safe-make-breakpoints/inherit-props';
import { inheritProps } from '../../src/make-breakpoints/inherit-props';

describe('inheritProps', () => {
it('inherits all missing key values', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBreaksMap } from '../../src/safe-make-breakpoints/make-breaks-map';
import { makeBreaksMap } from '../../src/make-breakpoints/make-breaks-map';
import { breakpoints } from '../../src/models/breakpoints';

describe('makeBreaksMap', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBreakpointsProcess } from '../../src/safe-make-breakpoints/make-breakpoints-process';
import { makeBreakpointsProcess } from '../../src/make-breakpoints/make-breakpoints-process';
import { userConfig } from '../../src/models/user-config';
import { breakpointsMap } from '../../src/models/breakpoints';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeDefaultBreak } from '../../src/safe-make-breakpoints/make-default-break';
import { makeDefaultBreak } from '../../src/make-breakpoints/make-default-break';
import { userConfig } from '../../src/models/user-config';

describe('makeDefaultBreak', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeNamedBreaks } from '../../src/safe-make-breakpoints/make-named-breaks';
import { makeNamedBreaks } from '../../src/make-breakpoints/make-named-breaks';
import { userConfig } from '../../src/models/user-config';

describe('makeNamedBreaks', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
makeFontSizeFromLiteral,
calcRatio,
calcRatioProcess,
} from '../../src/safe-make-breakpoints/ratio-prop-utils';
} from '../../src/make-breakpoints/ratio-prop-utils';

const ratioLiteral = '45px at 6';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { renameProp } from '../../src/safe-make-breakpoints/rename-prop';
import { renameProp } from '../../src/make-breakpoints/rename-prop';

describe('renameProp', () => {
it('return object with ranamed prop', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
calcRoot,
setPropRoot,
} from '../../src/safe-make-breakpoints/root-prop-utils';
} from '../../src/make-breakpoints/root-prop-utils';

describe('calcRoot', () => {
it('calculated root', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { toPxBreakValue } from '../../src/safe-make-breakpoints/to-px-break-value';
import { toPxBreakValue } from '../../src/make-breakpoints/to-px-break-value';

describe('toPxBreakValue', () => {
it('returns the breakpoints value converted from em to px', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @flow

export { modularScale } from './calculators/modular-scale';
export { safeMakeBreakpoints } from './safe-make-breakpoints';
export { makeBreakpoints } from './make-breakpoints';
export * as constants from './constants';
export { camelize } from './convertors/camelize';
export { normalizeString } from './convertors/normalize-string';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// @flow
import * as R from 'ramda';
import { Just, Nothing } from 'igogo';

import memoizeone from 'memoize-one';
import { makeBreakpointsProcess } from './make-breakpoints-process';
import { validateUserConfig } from '../validate-user-config';
Expand All @@ -11,11 +10,11 @@ const memoizedMakeBreakpoints: (UserConfig) => BreakpointsMap = memoizeone(
makeBreakpointsProcess,
);

export const safeMakeBreakpoints: (UserConfig) => * = R.ifElse(
validateUserConfig,
R.compose(
Just,
memoizedMakeBreakpoints,
),
Nothing,
);
/* eslint-disable consistent-return */
export const makeBreakpoints: (UserConfig) => * = (config) => {
if (validateUserConfig(config)) {
return memoizedMakeBreakpoints(config);
}
};

/* eslint-enable */

0 comments on commit ef3d8ea

Please sign in to comment.