Skip to content

chore: fix inconsistent file names in io-ts-http #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2022
Merged

chore: fix inconsistent file names in io-ts-http #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions packages/io-ts-http/src/array-from-non-empty-delimited-string.ts
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions packages/io-ts-http/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Codecs for (de)serializing HTTP requests from both the client and server side
*/

export * from './array-from-non-empty-delimited-string';
export * from './combinators';
export * from './httpResponse';
export * from './httpRequest';
export * from './httpRoute';
export * from './query-params';
export * from './queryParams';
34 changes: 31 additions & 3 deletions packages/io-ts-http/src/query-params.ts → packages/io-ts-http/src/queryParams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,39 @@
import { pipe } from 'fp-ts/function';
import * as E from 'fp-ts/Either';
import { NonEmptyArray } from 'fp-ts/NonEmptyArray';
import * as t from 'io-ts';
import { nonEmptyArray } from 'io-ts-types';

import { arrayFromNonEmptyCommaDelimitedString } from './array-from-non-empty-delimited-string';
import { nonEmptyArray, NonEmptyString } from 'io-ts-types';

export type { NonEmptyArray } from 'fp-ts/NonEmptyArray';

function arrayFromNonEmptyDelimitedString(
delimiter: string,
delimiterName: string,
): <C extends t.Type<any, string>>(
codec: C,
codecName?: string,
) => t.Type<NonEmptyArray<t.TypeOf<C>>, string> {
return <C extends t.Type<any, string>>(codec: C, codecName: string = codec.name) => {
const neaCodec = nonEmptyArray(codec);
return new t.Type<NonEmptyArray<t.TypeOf<C>>, string>(
`ArrayFromNonEmpty${delimiterName}DelimitedString(${codecName})`,
neaCodec.is,
(input, context) =>
pipe(
NonEmptyString.validate(input, context),
E.map((s) => s.split(delimiter)),
E.chain((arr) => neaCodec.validate(arr, context)),
),
(a) => a.map(codec.encode).join(delimiter),
);
};
}

const arrayFromNonEmptyCommaDelimitedString = arrayFromNonEmptyDelimitedString(
',',
'Comma',
);

const emptyArrayFromUndefined = <C>() =>
new t.Type(
'EmptyArrayFromUndefined',
Expand Down
2 changes: 1 addition & 1 deletion packages/io-ts-http/test/query-param.test.ts → packages/io-ts-http/test/queryParams.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as E from 'fp-ts/Either';
import * as t from 'io-ts';
import { PathReporter } from 'io-ts/lib/PathReporter';

import { arrayFromQueryParam, nonEmptyArrayFromQueryParam } from '../src/query-params';
import { arrayFromQueryParam, nonEmptyArrayFromQueryParam } from '../src/queryParams';
import { NumberFromString } from 'io-ts-types';

describe('nonEmptyArrayFromQueryParam combinations', () => {
Expand Down