Merge pull request #56 from bitgopatmcl/consistent-file-names

chore: fix inconsistent file names in io-ts-http
BitGo · Apr 29, 2022 · 94b374d · 94b374d
2 parents 4d21e38 + 41ddf80
commit 94b374d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 39 deletions.
diff --git a/packages/io-ts-http/src/array-from-non-empty-delimited-string.ts b/packages/io-ts-http/src/array-from-non-empty-delimited-string.ts
diff --git a/packages/io-ts-http/src/index.ts b/packages/io-ts-http/src/index.ts
@@ -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';
diff --git a/packages/io-ts-http/src/query-params.ts → packages/io-ts-http/src/queryParams.ts b/packages/io-ts-http/src/query-params.ts → packages/io-ts-http/src/queryParams.ts
@@ -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',

diff --git a/packages/io-ts-http/test/query-param.test.ts → packages/io-ts-http/test/queryParams.test.ts b/packages/io-ts-http/test/query-param.test.ts → packages/io-ts-http/test/queryParams.test.ts
@@ -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', () => {