Skip to content

Commit

Permalink
Clean-up
Browse files Browse the repository at this point in the history
  • Loading branch information
iwoplaza committed Dec 18, 2024
1 parent 0c75545 commit 90daa4f
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 19 deletions.
6 changes: 3 additions & 3 deletions packages/typed-binary/src/structure/concat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ type Concat<Objs extends AnyObjectSchema[]> = ObjectSchema<
MergeRecordUnion<PropertiesOf<Objs[number]>>
>;

export const concat = <Objs extends AnyObjectSchema[]>(
export function concat<Objs extends AnyObjectSchema[]>(
objs: Objs,
): Concat<Objs> => {
): Concat<Objs> {
return new ObjectSchema(
Object.fromEntries(
objs.flatMap(({ properties }) => Object.entries(properties)),
) as unknown as Concat<Objs>['properties'],
);
};
}
6 changes: 4 additions & 2 deletions packages/typed-binary/src/structure/dynamicArray.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ export class DynamicArraySchema<TElement extends AnySchema> extends Schema<
}
}

export const dynamicArrayOf = <TSchema extends AnySchema>(
export function dynamicArrayOf<TSchema extends AnySchema>(
elementSchema: TSchema,
) => new DynamicArraySchema(elementSchema);
) {
return new DynamicArraySchema(elementSchema);
}
6 changes: 4 additions & 2 deletions packages/typed-binary/src/structure/keyed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,9 @@ export class KeyedSchema<
}
}

export const keyed = <K extends string, P extends ISchema<unknown>>(
export function keyed<K extends string, P extends ISchema<unknown>>(
key: K,
inner: (ref: ISchema<Ref<K>>) => P,
) => new KeyedSchema(key, inner);
) {
return new KeyedSchema(key, inner);
}
18 changes: 8 additions & 10 deletions packages/typed-binary/src/structure/object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -303,22 +303,20 @@ export class GenericObjectSchema<
}
}

export const generic = <
export function generic<
P extends Record<string, AnySchema>,
S extends {
[Key in keyof S]: AnySchemaWithProperties;
},
>(
properties: P,
subTypeMap: S,
) => new GenericObjectSchema(SubTypeKey.STRING, properties, subTypeMap);
>(properties: P, subTypeMap: S) {
return new GenericObjectSchema(SubTypeKey.STRING, properties, subTypeMap);
}

export const genericEnum = <
export function genericEnum<
P extends Record<string, AnySchema>,
S extends {
[Key in keyof S]: AnySchemaWithProperties;
},
>(
properties: P,
subTypeMap: S,
) => new GenericObjectSchema(SubTypeKey.ENUM, properties, subTypeMap);
>(properties: P, subTypeMap: S) {
return new GenericObjectSchema(SubTypeKey.ENUM, properties, subTypeMap);
}
5 changes: 3 additions & 2 deletions packages/typed-binary/src/structure/optional.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,6 @@ export class OptionalSchema<TInner extends AnySchema> extends Schema<
}
}

export const optional = <TSchema extends AnySchema>(innerType: TSchema) =>
new OptionalSchema(innerType);
export function optional<TSchema extends AnySchema>(innerType: TSchema) {
return new OptionalSchema(innerType);
}

0 comments on commit 90daa4f

Please sign in to comment.