Made schema constructors more readable.

iwoplaza · Dec 18, 2024 · 0c75545 · 0c75545
1 parent 91b2fd4
commit 0c75545
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 18 deletions.
diff --git a/packages/typed-binary/src/structure/array.ts b/packages/typed-binary/src/structure/array.ts
@@ -1,6 +1,6 @@
 import { ValidationError } from '../error.ts';
-import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import { Measurer } from '../io/measurer.ts';
+import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import type { ParseUnwrapped } from '../utilityTypes.ts';
 import {
   type AnySchema,
@@ -82,7 +82,9 @@ export class ArraySchema<TElement extends AnySchema> extends Schema<
   }
 }
 
-export const arrayOf = <TSchema extends AnySchema>(
+export function arrayOf<TSchema extends AnySchema>(
   elementSchema: TSchema,
   length: number,
-) => new ArraySchema(elementSchema, length);
+) {
+  return new ArraySchema(elementSchema, length);
+}
diff --git a/packages/typed-binary/src/structure/baseTypes.ts b/packages/typed-binary/src/structure/baseTypes.ts
@@ -1,5 +1,5 @@
-import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import { Measurer } from '../io/measurer.ts';
+import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import { MaxValue, Schema } from './types.ts';
 
 ////

diff --git a/packages/typed-binary/src/structure/chars.ts b/packages/typed-binary/src/structure/chars.ts
@@ -1,6 +1,6 @@
 import { ValidationError } from '../error.ts';
-import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import { Measurer } from '../io/measurer.ts';
+import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import { Schema } from './types.ts';
 
 export class CharsSchema extends Schema<string> {
@@ -35,4 +35,6 @@ export class CharsSchema extends Schema<string> {
   }
 }
 
-export const chars = <T extends number>(length: T) => new CharsSchema(length);
+export function chars<T extends number>(length: T) {
+  return new CharsSchema(length);
+}
diff --git a/packages/typed-binary/src/structure/concat.ts b/packages/typed-binary/src/structure/concat.ts
@@ -1,6 +1,6 @@
+import type { MergeRecordUnion } from '../utilityTypes.ts';
 import { type AnyObjectSchema, ObjectSchema } from './object.ts';
 import type { PropertiesOf } from './types.ts';
-import type { MergeRecordUnion } from '../utilityTypes.ts';
 
 type Concat<Objs extends AnyObjectSchema[]> = ObjectSchema<
   MergeRecordUnion<PropertiesOf<Objs[number]>>

diff --git a/packages/typed-binary/src/structure/dynamicArray.ts b/packages/typed-binary/src/structure/dynamicArray.ts
@@ -1,5 +1,5 @@
-import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import { Measurer } from '../io/measurer.ts';
+import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import type { ParseUnwrapped } from '../utilityTypes.ts';
 import {
   type AnySchema,

diff --git a/packages/typed-binary/src/structure/keyed.ts b/packages/typed-binary/src/structure/keyed.ts
@@ -1,6 +1,6 @@
 import { UnresolvedReferenceError } from '../error.ts';
-import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import { Measurer } from '../io/measurer.ts';
+import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import type { ParseUnwrapped, Parsed } from '../utilityTypes.ts';
 import {
   type AnySchema,

diff --git a/packages/typed-binary/src/structure/object.ts b/packages/typed-binary/src/structure/object.ts
@@ -1,5 +1,5 @@
-import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import { Measurer } from '../io/measurer.ts';
+import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import type { ParseUnwrappedRecord, Parsed } from '../utilityTypes.ts';
 import {
   type AnySchema,

diff --git a/packages/typed-binary/src/structure/optional.ts b/packages/typed-binary/src/structure/optional.ts
@@ -1,5 +1,5 @@
-import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import { Measurer } from '../io/measurer.ts';
+import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import type { ParseUnwrapped } from '../utilityTypes.ts';
 import {
   type AnySchema,

diff --git a/packages/typed-binary/src/structure/tuple.ts b/packages/typed-binary/src/structure/tuple.ts
@@ -1,6 +1,6 @@
 import { ValidationError } from '../error.ts';
-import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import { Measurer } from '../io/measurer.ts';
+import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import type { Parsed } from '../utilityTypes.ts';
 import {
   type AnySchema,
@@ -88,6 +88,8 @@ export class TupleSchema<
   }
 }
 
-export const tupleOf = <TSchema extends [AnySchema, ...AnySchema[]]>(
+export function tupleOf<TSchema extends [AnySchema, ...AnySchema[]]>(
   schemas: TSchema,
-) => new TupleSchema(schemas);
+) {
+  return new TupleSchema(schemas);
+}
diff --git a/packages/typed-binary/src/structure/typedArray.ts b/packages/typed-binary/src/structure/typedArray.ts
@@ -1,5 +1,5 @@
-import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import { Measurer } from '../io/measurer.ts';
+import type { IMeasurer, ISerialInput, ISerialOutput } from '../io/types.ts';
 import type { Parsed } from '../utilityTypes.ts';
 import { type MaxValue, Schema } from './types.ts';
 

diff --git a/packages/typed-binary/src/test/unwrap.test.ts b/packages/typed-binary/src/test/unwrap.test.ts
@@ -2,11 +2,11 @@ import { describe, expectTypeOf, it } from 'vitest';
 
 // Importing from the public API
 import type {
-  Unwrap,
-  ISchema,
   IKeyedSchema,
-  UnwrapRecord,
+  ISchema,
+  Unwrap,
   UnwrapArray,
+  UnwrapRecord,
 } from '../index.ts';
 
 describe('Unwrap<T>', () => {