Skip to content

Commit

Permalink
style: no more semi colons! (#706)
Browse files Browse the repository at this point in the history
* style: no more semi colons!

* style: disable semis for flowtype eslint plugin

* fix: eslint errors
  • Loading branch information
zacharygolba authored May 21, 2017
1 parent d4be531 commit 7bf2478
Show file tree
Hide file tree
Showing 428 changed files with 6,930 additions and 7,082 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
}
},
"rules": {
"semi": ["error", "never"],
"strict": 0,
"max-len": ["error", 80],
"arrow-parens": 0,
Expand Down Expand Up @@ -73,7 +74,7 @@
"jest/no-focused-tests": "error",
"jest/no-disabled-tests": "warn",
"jest/no-identical-title": "error",
"flowtype/semi": 2,
"flowtype/semi": ["error", "never"],
"flowtype/no-dupe-keys": 2,
"flowtype/boolean-style": [2, "boolean"],
"flowtype/generic-spacing": 2,
Expand Down
14 changes: 7 additions & 7 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import path from 'path';
import path from 'path'

import json from 'rollup-plugin-json';
import babel from 'rollup-plugin-babel';
import resolve from 'rollup-plugin-node-resolve';
import json from 'rollup-plugin-json'
import babel from 'rollup-plugin-babel'
import resolve from 'rollup-plugin-node-resolve'

export default {
dest: 'dist/index.js',
Expand All @@ -15,10 +15,10 @@ export default {
),
onwarn: ({ code, message }) => {
if (code === 'UNUSED_EXTERNAL_IMPORT') {
return;
return
}
// eslint-disable-next-line no-console
console.warn(message);
console.warn(message)
},
plugins: [
json(),
Expand All @@ -35,4 +35,4 @@ export default {
|| id === '\u0000babelHelpers'
),
sourceMap: true
};
}
38 changes: 19 additions & 19 deletions src/constants.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
/* @flow */

import * as os from 'os';
import { worker, isWorker } from 'cluster';
import * as os from 'os'
import { worker, isWorker } from 'cluster'

import normalizePort from './utils/normalize-port';
import normalizePort from './utils/normalize-port'

const { env: ENV } = process;
const { env: ENV } = process

function getPID(): number {
let { pid } = process;
let { pid } = process

if (isWorker && typeof worker.pid === 'number') {
pid = worker.pid;
pid = worker.pid
}

return pid;
return pid
}

export const CWD: string = process.cwd();
export const PID: number = getPID();
export const PORT: number = normalizePort(ENV.PORT);
export const NODE_ENV: string = ENV.NODE_ENV || 'development';
export const DATABASE_URL: void | ?string = ENV.DATABASE_URL;
export const LUX_CONSOLE: boolean = Boolean(ENV.LUX_CONSOLE);
export const PLATFORM: string = os.platform();
export const CIRCLECI: boolean = Boolean(ENV.CIRCLECI);
export const APPVEYOR: boolean = Boolean(ENV.APPVEYOR);
export const HAS_BODY: RegExp = /^(?:POST|PATCH)$/;
export const CWD: string = process.cwd()
export const PID: number = getPID()
export const PORT: number = normalizePort(ENV.PORT)
export const NODE_ENV: string = ENV.NODE_ENV || 'development'
export const DATABASE_URL: void | ?string = ENV.DATABASE_URL
export const LUX_CONSOLE: boolean = Boolean(ENV.LUX_CONSOLE)
export const PLATFORM: string = os.platform()
export const CIRCLECI: boolean = Boolean(ENV.CIRCLECI)
export const APPVEYOR: boolean = Boolean(ENV.APPVEYOR)
export const HAS_BODY: RegExp = /^(?:POST|PATCH)$/

export const METHODS: Set<string> = new Set([
'GET',
Expand All @@ -35,7 +35,7 @@ export const METHODS: Set<string> = new Set([
'PATCH',
'DELETE',
'OPTIONS',
]);
])

export const STATUS_CODES: Map<number, string> = (
new Map([
Expand Down Expand Up @@ -102,4 +102,4 @@ export const STATUS_CODES: Map<number, string> = (
[510, 'Not Extended'],
[511, 'Network Authentication Required'],
])
);
)
4 changes: 2 additions & 2 deletions src/errors/controller-missing-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/
class ControllerMissingError extends ReferenceError {
constructor(resource: string) {
super(`Could not resolve controller by name '${resource}'`);
super(`Could not resolve controller by name '${resource}'`)
}
}

export default ControllerMissingError;
export default ControllerMissingError
4 changes: 2 additions & 2 deletions src/errors/serializer-missing-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/
class SerializerMissingError extends ReferenceError {
constructor(resource: string) {
super(`Could not resolve serializer by name '${resource}'`);
super(`Could not resolve serializer by name '${resource}'`)
}
}

export default SerializerMissingError;
export default SerializerMissingError
10 changes: 5 additions & 5 deletions src/errors/utils/create-server-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

type ServerError<T: Error> = T & {
statusCode: number;
};
}

/**
* @private
Expand All @@ -13,16 +13,16 @@ export default function createServerError<T: Error>(
): Class<ServerError<T>> {
const Target = class extends Source {
statusCode: number;
};
}

Object.defineProperty(Target, 'name', {
value: Source.name,
});
})

Object.defineProperty(Target.prototype, 'statusCode', {
value: statusCode,
});
})

// $FlowIgnore
return Target;
return Target
}
18 changes: 9 additions & 9 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* @flow */

import * as Adapters from './packages/adapter';
import * as Testing from './packages/testing';
import * as Adapters from './packages/adapter'
import * as Testing from './packages/testing'

export { Adapters, Testing };
export { Model } from './packages/database';
export { default as Logger } from './packages/logger';
export { default as Controller } from './packages/controller';
export { default as Serializer } from './packages/serializer';
export { default as Application } from './packages/application';
export { default as luxify } from './packages/luxify';
export { Adapters, Testing }
export { Model } from './packages/database'
export { default as Logger } from './packages/logger'
export { default as Controller } from './packages/controller'
export { default as Serializer } from './packages/serializer'
export { default as Application } from './packages/application'
export { default as luxify } from './packages/luxify'
102 changes: 51 additions & 51 deletions src/packages/adapter/__tests__/headers.test.js
Original file line number Diff line number Diff line change
@@ -1,100 +1,100 @@
/* @flow */

import { MIME_TYPE } from '../../jsonapi';
import { Headers, ResponseHeaders } from '../utils/headers';
import { MIME_TYPE } from '../../jsonapi'
import { Headers, ResponseHeaders } from '../utils/headers'

describe('module "adapters/headers"', () => {
let subject;
let subject

describe('util Headers', () => {
beforeEach(() => {
subject = new Headers();
});
subject = new Headers()
})

describe('#constructor()', () => {
beforeEach(() => {
subject = new Headers({
Accept: MIME_TYPE,
'Content-Type': MIME_TYPE,
});
});
})
})

test('creates an instance of Headers', () => {
expect(subject).toMatchSnapshot();
});
expect(subject).toMatchSnapshot()
})
});

['get', 'has'].forEach(method => {
describe(`#${method}()`, () => {
const key = 'Accept';
const value = method === 'get' ? MIME_TYPE : true;
const key = 'Accept'
const value = method === 'get' ? MIME_TYPE : true

beforeEach(() => {
subject.set(key, MIME_TYPE);
});
subject.set(key, MIME_TYPE)
})

test('returns the correct value for the given key', () => {
// $FlowIgnore
expect(subject[method](key)).toBe(value);
});
expect(subject[method](key)).toBe(value)
})

test('is not case sensitive', () => {
// $FlowIgnore
expect(subject[method](key.toUpperCase())).toBe(value);
});
});
});
expect(subject[method](key.toUpperCase())).toBe(value)
})
})
})

describe('#set()', () => {
const key = 'Accept';
const value = MIME_TYPE;
const key = 'Accept'
const value = MIME_TYPE

test('sets the correct value for the given key', () => {
expect(subject.set(key, value)).toMatchSnapshot();
});
});
expect(subject.set(key, value)).toMatchSnapshot()
})
})

describe('#delete()', () => {
const key = 'Accept';
const value = MIME_TYPE;
const key = 'Accept'
const value = MIME_TYPE

beforeEach(() => {
subject.set(key, value);
});
subject.set(key, value)
})

test('deletes the entry for a given key', () => {
subject.delete(key);
expect(subject.size).toBe(0);
});
subject.delete(key)
expect(subject.size).toBe(0)
})

test('is not case sensitive', () => {
subject.delete(key.toUpperCase());
expect(subject.size).toBe(0);
});
});
});
subject.delete(key.toUpperCase())
expect(subject.size).toBe(0)
})
})
})

describe('util ResponseHeaders', () => {
const key = 'Content-Type';
const value = MIME_TYPE;
const handleChange = jest.fn();
const key = 'Content-Type'
const value = MIME_TYPE
const handleChange = jest.fn()

beforeEach(() => {
subject = new ResponseHeaders(handleChange);
});
subject = new ResponseHeaders(handleChange)
})

describe('#set()', () => {
test('calls the change handler', () => {
subject.set(key, value);
expect(handleChange).toBeCalledWith('SET', [key, value]);
});
});
subject.set(key, value)
expect(handleChange).toBeCalledWith('SET', [key, value])
})
})

describe('#delete()', () => {
test('calls the change handler', () => {
subject.delete(key);
expect(handleChange).toBeCalledWith('DELETE', [key, null]);
});
});
});
});
subject.delete(key)
expect(handleChange).toBeCalledWith('DELETE', [key, null])
})
})
})
})
Loading

0 comments on commit 7bf2478

Please sign in to comment.