Skip to content

Commit

Permalink
style: eslint semi rule
Browse files Browse the repository at this point in the history
  • Loading branch information
JozefFlakus committed Aug 26, 2021
1 parent 3ff9640 commit d3239c4
Show file tree
Hide file tree
Showing 48 changed files with 79 additions and 78 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ module.exports = {
'@typescript-eslint/no-var-requires': 0,
'deprecation/deprecation': 'warn',
'quotes': ['error', 'single', { allowTemplateLiterals: true }],
'semi': ['error'],
'import/order': ['error', {
'groups': [
'builtin',
Expand Down
4 changes: 2 additions & 2 deletions packages/@integration/src/cqrs/effects/eventbus.effects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const generateOfferDocument$: MsgEffect = (event$, ctx) => {
map(offerId => OfferDocumentCreatedEvent.create({ offerId })),
)),
);
}
};

export const offerDocumentCreated$: MsgEffect = (event$, ctx) => {
const logger = useContext(LoggerToken)(ctx.ask);
Expand All @@ -39,4 +39,4 @@ export const offerDocumentCreated$: MsgEffect = (event$, ctx) => {
map(OfferDocumentSavedEvent.create),
)),
);
}
};
2 changes: 1 addition & 1 deletion packages/@integration/src/messaging/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const fibonacci$: MsgEffect = event$ =>
matchEvent('FIB'),
act(event => pipe(
eventValidator$(t.number)(event),
tap(event => { if (event.payload >= 45) throw new Error('Too high number!') }),
tap(event => { if (event.payload >= 45) throw new Error('Too high number!'); }),
map(event => fib(event.payload)),
map(payload => reply(event)({ type: 'FIB_RESULT', payload })),
catchError(error => of(reply(event)({ type: 'FIB_ERROR', error: { name: error.name, message: error.message } }))),
Expand Down
4 changes: 2 additions & 2 deletions packages/@integration/test/http.integration.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const useTestBedSetup = createTestBedSetup({
});

describe('API integration', () => {
const testBedSetup = useTestBedSetup()
const testBedSetup = useTestBedSetup();

afterEach(testBedSetup.cleanup);

Expand Down Expand Up @@ -249,7 +249,7 @@ describe('API integration', () => {
expect(response.statusCode).toEqual(200);
expect(response.headers['content-type']).toEqual(ContentType.IMAGE_PNG);
});
})
});

describe('CORS', () => {
test('OPTIONS "/api/v2" returns 204', async () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/+internal/testing/marbles.helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ export const Marbles = {

scheduler.flush();
},
}
};
2 changes: 1 addition & 1 deletion packages/core/src/+internal/utils/any.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ export const pipeFromArray = <T, R>(fns: Array<UnaryFunction<T, R>>): UnaryFunct
return function piped(input: T): R {
return fns.reduce((prev: any, fn: UnaryFunction<T, R>) => fn(prev), input as any);
};
}
};
2 changes: 1 addition & 1 deletion packages/core/src/+internal/utils/error.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ export const encodeError = (error: any) =>
return acc;
}, Object.create(null));

export const throwException = (error: any) => { throw error };
export const throwException = (error: any) => { throw error; };
4 changes: 2 additions & 2 deletions packages/core/src/+internal/utils/spec/string.util.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@ describe('#maskUriComponent', () => {

expect(mask('amqp://host:10000/vhost'))
.toEqual('amqp://host:10000/vhost');
})
})
});
});
2 changes: 1 addition & 1 deletion packages/core/src/+internal/utils/string.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ export const maskUriComponent = (type: 'authorization') => (uri: string): string
default:
return uri;
}
}
};
2 changes: 1 addition & 1 deletion packages/core/src/context/context.helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const unregisterRedundantToken = (token: ContextToken) => (context: Context): IO
O.chain(derivedContext => lookup(derivedContext)(token)),
O.fold(() => IO.of(context), () => deleteToken),
);
}
};

/**
* Constructs and resolves a new or derived context based on provided dependencies
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/context/context.hook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const useContext = <T>(token: ContextToken<T>) => (ask: ContextProvider)
const message = `Cannot resolve "${token.name || token._id}" context token.`;
const detail = `You've probably forgot to register the bound token in the app context.`;
const error = new ContextError(`${message} ${detail}`);
const coreError = coreErrorFactory(error.message, coreErrorOptions)
const coreError = coreErrorFactory(error.message, coreErrorOptions);

console.error(coreError.stack);

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/context/context.logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ export const logContext = (tag: string) => (context: Context): Context => {
logDependencies();

return context;
}
};
2 changes: 1 addition & 1 deletion packages/core/src/context/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export const resolve = async (context: Context): Promise<Context> => {
}

return context;
}
};

/**
* Lookup the dependency for a token in a `Context`
Expand Down
16 changes: 8 additions & 8 deletions packages/core/src/event/event.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('#event', () => {
bar: 'test',
baz: false,
},
})
});
});

test('creates event schema with array of objects payload', () => {
Expand All @@ -39,7 +39,7 @@ describe('#event', () => {
expect(foo).toEqual({
type: 'FOO',
payload: [{ bar: 'test', baz: false }],
})
});
});

test('creates event schema with tuple payload', () => {
Expand All @@ -56,7 +56,7 @@ describe('#event', () => {
expect(foo).toEqual({
type: 'FOO',
payload: ['test_1', 'test_2'],
})
});
});


Expand All @@ -68,7 +68,7 @@ describe('#event', () => {
expect(foo).toEqual({
type: 'FOO',
payload: 'test',
})
});
});

test('creates event schema with boolean payload', () => {
Expand All @@ -79,7 +79,7 @@ describe('#event', () => {
expect(foo).toEqual({
type: 'FOO',
payload: true,
})
});
});

test('creates event schema without payload', () => {
Expand All @@ -89,7 +89,7 @@ describe('#event', () => {

expect(foo).toEqual({
type: 'FOO',
})
});
});

test('creates event schema for enum type', () => {
Expand All @@ -101,7 +101,7 @@ describe('#event', () => {

expect(foo).toEqual({
type: 'FOO',
})
});
});

test('creates event schema with intersection and partial payload', () => {
Expand All @@ -121,7 +121,7 @@ describe('#event', () => {
expect(foo).toEqual({
type: 'FOO',
payload: { test_required: 'test' },
})
});
});

test('successfuly decodes event schema with object payload and metadata', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/logger/logger.interface.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IO } from 'fp-ts/lib/IO'
import { IO } from 'fp-ts/lib/IO';

export type Logger = (opts: LoggerOptions) => IO<void>;

Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/operators/act/act.operator.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ describe('#act operator', () => {
const effect$ = (event$: Observable<Event>) =>
event$.pipe(
act((event: any) => of(event).pipe(
tap(e => { if (e.payload === 2) throw new NamedError(error.name, error.message) }),
tap(e => { if (e.payload === 2) throw new NamedError(error.name, error.message); }),
)),
);

Expand All @@ -109,7 +109,7 @@ describe('#act operator', () => {
event$.pipe(
act(
(event: any) => of(event).pipe(
tap(e => { if (e.payload === 2) throw new Error('something went wrong') }),
tap(e => { if (e.payload === 2) throw new Error('something went wrong'); }),
),
(error: Error) => ({
type: 'TEST_ERROR',
Expand Down Expand Up @@ -138,7 +138,7 @@ describe('#act operator', () => {
event$.pipe(
act(
(event: any) => of(event).pipe(
tap(e => { if (e.payload === 2) throw new Error('something went wrong') }),
tap(e => { if (e.payload === 2) throw new Error('something went wrong'); }),
),
(error: Error, event: Event) => ({
type: event.type,
Expand Down Expand Up @@ -167,7 +167,7 @@ describe('#act operator', () => {
event$.pipe(
act(
(event: any) => of(event).pipe(
tap(e => { if (e.payload === 2) throw new Error('something went wrong') }),
tap(e => { if (e.payload === 2) throw new Error('something went wrong'); }),
),
() => concat(
of(event_error),
Expand Down
2 changes: 1 addition & 1 deletion packages/http/src/+internal/header.util.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ test('#getHeaderValueHead', () => {
const headers = {
'x-test-1': 'a',
'x-test-2': ['b', 'c'],
}
};
const req = createHttpRequest({ headers });

expect(getHeaderValueHead('x-test-1')(req)).toEqual('a');
Expand Down
2 changes: 1 addition & 1 deletion packages/http/src/+internal/header.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const getHeaderValueHead = (key: string): GetHeaderValue => req => {

return Array.isArray(header)
? pipe(getHead(header), toUndefined)
: header
: header;
};

export const getTestingRequestIdHeader: GetHeaderValue =
Expand Down
2 changes: 1 addition & 1 deletion packages/http/src/+internal/server.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ export const getServerAddress = (server: HttpServer): { host: string; port: numb
const port = serverAddressInfo.port;

return { host, port };
}
};
6 changes: 3 additions & 3 deletions packages/http/src/effects/http.effects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const listening$: HttpServerEffect = (event$, ctx) => {
log();
}),
);
}
};

export const error$: HttpServerEffect = (event$, ctx) => {
const logger = useContext(LoggerToken)(ctx.ask);
Expand All @@ -31,7 +31,7 @@ export const error$: HttpServerEffect = (event$, ctx) => {
log();
}),
);
}
};

export const close$: HttpServerEffect = (event$, ctx) => {
const logger = useContext(LoggerToken)(ctx.ask);
Expand All @@ -46,4 +46,4 @@ export const close$: HttpServerEffect = (event$, ctx) => {
log();
}),
);
}
};
2 changes: 1 addition & 1 deletion packages/http/src/error/http.error.effect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const errorFactory = (status: HttpStatus) => (error: Error): HttpErrorResponse =
error: isHttpError(error)
? { status, message: error.message, data: error.data, context: error.context }
: { status, message: error.message },
})
});

export const defaultError$: HttpErrorEffect = req$ =>
req$.pipe(
Expand Down
8 changes: 4 additions & 4 deletions packages/http/src/error/http.error.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ export const isHttpRequestError = (error: Error | undefined): error is HttpReque
export const unexpectedErrorWhileSendingErrorFactory = (error: Error): CoreError => {
const message = `An unexpected error ${chalk.red(`"${error.message}"`)} occured while sending an error response. Please check your error effect.`;
return coreErrorFactory(message, { printStacktrace: false });
}
};

export const unexpectedErrorWhileSendingOutputFactory = (error: Error): CoreError => {
const message = `An unexpected error ${chalk.red(`"${error.message}"`)} occured while sending a response. Please check your output effect.`;
return coreErrorFactory(message, { printStacktrace: false });
}
};

export const responseNotBoundToRequestErrorFactory = (response: HttpEffectResponse): CoreError => {
const message = `An effect returned a response: "${chalk.yellow(JSON.stringify(response))}" without bound request`;
return coreErrorFactory(message, { printStacktrace: false });
}
};

export const errorNotBoundToRequestErrorFactory = (error: Error): CoreError => {
const message = `An effect or middleware thrown an error ${chalk.red(`"${error.message}"`)} without bound request.`;
return coreErrorFactory(message, { printStacktrace: false });
}
};
6 changes: 3 additions & 3 deletions packages/http/src/router/http.router.resolver.v2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ export const resolveRouting = (
const subscribeOutput = (stream$: Observable<[HttpEffectResponse, HttpRequest]>) =>
stream$.subscribe({
next: ([res, req]) => req.response.send(res),
error: err => { throw unexpectedErrorWhileSendingOutputFactory(err) },
error: err => { throw unexpectedErrorWhileSendingOutputFactory(err); },
});

const subscribeError = (stream$: Observable<[HttpEffectResponse, HttpRequest]>) =>
stream$.subscribe({
next: ([res, req]) => req.response.send(res),
error: err => { throw unexpectedErrorWhileSendingErrorFactory(err) },
error: err => { throw unexpectedErrorWhileSendingErrorFactory(err); },
});

subscribeOutput(outputFlow$);
Expand Down Expand Up @@ -161,5 +161,5 @@ export const resolveRouting = (
resolve,
errorSubject,
outputSubject,
}
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,5 @@ describe('#queryParamsFactory', () => {

// then
expect(params).toEqual(expectedParamsObj);
})
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ export const HttpRequestMetadataStorage = createReader(() => {

const set = (key: string | undefined, metadata: HttpRequestMetadata | undefined) => {
if (key && metadata) storage.set(key, metadata);
}
};

const get = (key: string) => {
const metadata = storage.get(key);
storage.delete(key);
return metadata;
}
};

const size = () =>
storage.size;
Expand All @@ -25,5 +25,5 @@ export const HttpRequestMetadataStorage = createReader(() => {
set,
get,
size,
}
};
});
8 changes: 4 additions & 4 deletions packages/messaging/src/client/messaging.client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const messagingClient = (config: MessagingClientConfig) => {
connection.getChannel(),
{ data: msgTransformer.encode(event) },
);
}
};

const send = <O extends Event, I extends Event>(event: I): Observable<O> => {
const channel = connection.getChannel();
Expand All @@ -80,19 +80,19 @@ export const messagingClient = (config: MessagingClientConfig) => {
})();

return throwError(() => new Error(parsedError));
}
};

return defer(() => from(connection.sendMessage(channel, message)).pipe(
timeout(config.options.timeout ?? connection.config.timeout ?? DEFAULT_TIMEOUT),
map(m => msgTransformer.decode<O>(m.data)),
mergeMap(catchErrorEvent),
take(1),
));
}
};

const close = async (): Promise<void> => {
await connection.close();
}
};

// @TODO: refactor -> move to function
pipe(
Expand Down
Loading

0 comments on commit d3239c4

Please sign in to comment.