Skip to content

fix (schema): Model types #230

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

fix (schema): Model types #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e4d45a
fix (schema): Model types
patroza Feb 1, 2022
d57f57f
Fix withDefaults - Arbitrary
patroza Feb 1, 2022
0cab0b2
Fix inference
patroza Feb 1, 2022
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
117 changes: 89 additions & 28 deletions packages/schema/src/_api/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,34 @@ import * as Encoder from "../Encoder"
import * as Guard from "../Guard"
import * as Parser from "../Parser"
import * as S from "./schemed"

export type SchemaForModel<M, Self extends MO.SchemaAny> = MO.Schema<
import type { SchemaDefaultSchema } from "./withDefaults"

interface SchemaModel<
ParserInput,
ParserError extends MO.AnyError,
ParsedShape,
ConstructorInput,
ConstructorError extends MO.AnyError,
Encoded,
Api
> extends SchemaDefaultSchema<
ParserInput,
MO.NamedE<string, ParserError>,
ParsedShape,
ConstructorInput,
MO.NamedE<string, ConstructorError>,
Encoded,
Api & MO.ApiSelfType<ParsedShape>
> {}

export type SchemaForModel<M, Self extends MO.SchemaAny> = SchemaModel<
MO.ParserInputOf<Self>,
MO.ParserErrorOf<Self>,
M,
MO.ConstructorInputOf<Self>,
MO.ConstructorErrorOf<Self>,
MO.EncodedOf<Self>,
MO.ApiOf<Self> & MO.ApiSelfType<M>
MO.ApiOf<Self>
>

export type ParserFor<Self extends MO.SchemaAny> = Parser.Parser<
Expand Down Expand Up @@ -45,37 +64,79 @@ export type ModelFor<M, Self extends MO.SchemaAny> = M extends MO.ParsedShapeOf<
? SchemaForModel<M, Self>
: SchemaForModel<MO.ParsedShapeOf<Self>, Self>

export interface Model<M, Self extends MO.SchemaAny>
extends S.Schemed<Self>,
MO.Schema<
MO.ParserInputOf<Self>,
MO.NamedE<string, MO.ParserErrorOf<Self>>,
M,
MO.ConstructorInputOf<Self>,
MO.NamedE<string, MO.ConstructorErrorOf<Self>>,
MO.EncodedOf<Self>,
MO.ApiOf<Self>
> {
[S.schemaField]: Self

readonly Parser: ParserFor<SchemaForModel<M, Self>>

readonly Constructor: ConstructorFor<SchemaForModel<M, Self>>

readonly Encoder: EncoderFor<SchemaForModel<M, Self>>

readonly Guard: GuardFor<SchemaForModel<M, Self>>

readonly Arbitrary: ArbitraryFor<SchemaForModel<M, Self>>
}
export interface ModelInfer<M, Self extends MO.SchemaAny>
extends Model<
MO.ParserInputOf<Self>,
MO.ParserErrorOf<Self>,
M,
MO.ConstructorInputOf<Self>,
MO.ConstructorErrorOf<Self>,
MO.EncodedOf<Self>,
MO.ApiOf<Self>
> {}

export interface Model<
ParserInput,
ParserError extends MO.AnyError,
ParsedShape,
ConstructorInput,
ConstructorError extends MO.AnyError,
Encoded,
Api
> extends S.Schemed<
SchemaModel<
ParserInput,
ParserError,
ParsedShape,
ConstructorInput,
ConstructorError,
Encoded,
Api
>
>,
SchemaModel<
ParserInput,
ParserError,
ParsedShape,
ConstructorInput,
ConstructorError,
Encoded,
Api
> {}

export const NameSym = Symbol()

/**
* @inject genericName
*/
export function Model<M>(__name?: string) {
return <Self extends MO.SchemaAny>(self: Self): Model<M, Self> => {
return <
ParserInput,
ParserError extends MO.AnyError,
ParsedShape,
ConstructorInput,
ConstructorError extends MO.AnyError,
Encoded,
Api
>(
self: MO.Schema<
ParserInput,
ParserError,
ParsedShape,
ConstructorInput,
ConstructorError,
Encoded,
Api
>
): Model<
ParserInput,
ParserError,
ParsedShape,
ConstructorInput,
ConstructorError,
Encoded,
Api
> => {
const schemed = S.Schemed(named(__name ?? "Model(Anonymous)")(self))
const schema = S.schema(schemed)

Expand Down Expand Up @@ -125,7 +186,7 @@ export function Model<M>(__name?: string) {
}
}

export function stable<T, A extends MO.SchemaAny>(constructor: Model<T, A>) {
export function stable<T, A extends MO.SchemaAny>(constructor: ModelInfer<T, A>) {
const schema = named(constructor[NameSym] ?? "Model(Anonymous)")(
S.schema(constructor)
)
Expand Down
2 changes: 1 addition & 1 deletion packages/schema/src/_api/withDefaults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export interface SchemaDefaultSchema<

readonly Guard: Guard.Guard<ParsedShape>

readonly Arbitrary: Arbitrary.Arbitrary<ParsedShape>
readonly Arbitrary: Arbitrary.Gen<ParsedShape>

readonly annotate: <Meta>(
identifier: Annotation<Meta>,
Expand Down