Skip to content

Commit

Permalink
rework types
Browse files Browse the repository at this point in the history
  • Loading branch information
@wesselvdv
wesselvdv committed Oct 4, 2023
1 parent d262f40 commit cdda675
Show file tree
Hide file tree
Showing 12 changed files with 5,969 additions and 5,877 deletions.
1 change: 0 additions & 1 deletion .direnv/flake-inputs/v3my1jzicdrbzp8z1kij37h906a0zzbg-source
View file

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ grafast/dataplan-pg/__tests__/**/*.mermaid.png
/WHAT_ARE_YOU_DOING.md
contrib
/env
.direnv
.vscode
177 changes: 83 additions & 94 deletions grafast/dataplan-pg/src/codecs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,12 @@ import {
import type { PgExecutor } from "./executor.js";
import { inspect } from "./inspect.js";
import type {
AnyPgCodec,
PgCodec,
PgCodecAttributes,
PgCodecAttributesRecord,
PgCodecExtensions,
PgCodecFromPostgres,
PgCodecPolymorphism,
PgDecode,
PgEncode,
Expand All @@ -59,10 +63,22 @@ export type PgCodecAttributeVia = string | PgCodecAttributeViaExplicit;
/** @deprecated Use DataplanPg.PgCodecAttributeExtensions instead */
export type PgCodecAttributeExtensions = DataplanPg.PgCodecAttributeExtensions;

export type PgCodecAttributeName<U> = U extends PgCodecAttribute<
infer TName,
any,
any
>
? TName
: never;

export interface AnyPgCodecAttribute extends PgCodecAttribute {}

export interface PgCodecAttribute<
TCodec extends PgCodec = PgCodec,
TName extends string = string,
TCodec extends PgCodec = AnyPgCodec,
TNotNull extends boolean = boolean,
> {
name: TName;
/**
* How to translate to/from PG and how to cast.
*/
Expand Down Expand Up @@ -129,14 +145,6 @@ export interface PgCodecAttribute<
extensions?: Partial<PgCodecAttributeExtensions>;
}

export type PgCodecAttributes<
TCodecMap extends {
[attributeName in string]: PgCodecAttribute;
} = {
[attributeName in string]: PgCodecAttribute;
},
> = TCodecMap;

/**
* Returns a PgCodec for the given builtin Postgres scalar type, optionally
* pass the following config:
Expand All @@ -160,12 +168,12 @@ function t<TFromJavaScript = any, TFromPostgres = string>(): <
options?: Cast<TFromJavaScript, TFromPostgres>,
) => PgCodec<
TName,
undefined,
never,
TFromPostgres,
TFromJavaScript,
undefined,
undefined,
undefined
never,
never,
never
> {
return (oid, type, options = {}) => {
const { castFromPg, listCastFromPg, fromPg, toPg, isBinary } = options;
Expand All @@ -174,7 +182,6 @@ function t<TFromJavaScript = any, TFromPostgres = string>(): <
sqlType: sql.identifier(...type.split(".")),
fromPg: fromPg ?? (identity as any),
toPg: toPg ?? (identity as any),
attributes: undefined,
extensions: { oid: oid },
castFromPg,
listCastFromPg,
Expand Down Expand Up @@ -318,11 +325,11 @@ function recordStringToTuple(value: string): Array<string | null> {
return tuple;
}

function realAttributeDefs<TAttributes extends PgCodecAttributes>(
attributes: TAttributes,
): Array<[string, TAttributes[keyof TAttributes]]> {
function realAttributeDefs<TAttributes extends ReadonlyArray<PgCodecAttribute>>(
attributes: PgCodecAttributesRecord<TAttributes>,
): Array<[PgCodecAttributeName<TAttributes[number]>, TAttributes[number]]> {
const attributeDefs = Object.entries(attributes) as Array<
[string, TAttributes extends infer U ? U[keyof U] : never]
[PgCodecAttributeName<TAttributes[number]>, TAttributes[number]]
>;
return attributeDefs.filter(
([_attributeName, spec]) => !spec.expression && !spec.via,
Expand All @@ -336,8 +343,10 @@ function realAttributeDefs<TAttributes extends PgCodecAttributes>(
*
* @see {@link https://www.postgresql.org/docs/current/rowtypes.html#id-1.5.7.24.6}
*/
function makeRecordToSQLRawValue<TAttributes extends PgCodecAttributes>(
attributes: TAttributes,
function makeRecordToSQLRawValue<
TAttributes extends ReadonlyArray<PgCodecAttribute>,
>(
attributes: PgCodecAttributesRecord<TAttributes>,
): PgEncode<ObjectFromPgCodecAttributes<TAttributes>> {
const attributeDefs = realAttributeDefs(attributes);
return (value) => {
Expand All @@ -350,19 +359,22 @@ function makeRecordToSQLRawValue<TAttributes extends PgCodecAttributes>(
};
}

export type ObjectFromPgCodecAttributes<TAttributes extends PgCodecAttributes> =
{
[attributeName in keyof TAttributes]: TAttributes[attributeName] extends PgCodecAttribute<
infer UCodec,
infer UNonNull
>
? UCodec extends PgCodec<any, any, any, infer UFromJs, any, any, any>
? UNonNull extends true
? Exclude<UFromJs, null | undefined>
: UFromJs | null
: never
: never;
};
export type ObjectFromPgCodecAttributes<
TAttributes extends
ReadonlyArray<AnyPgCodecAttribute> = ReadonlyArray<AnyPgCodecAttribute>,
> = {
[TCodecAttribute in TAttributes[number] as PgCodecAttributeName<TCodecAttribute>]: TCodecAttribute extends PgCodecAttribute<
any,
infer UCodec,
infer UNonNull
>
? UCodec extends PgCodec<any, any, any, infer UFromJs, any, any, any>
? UNonNull extends true
? Exclude<UFromJs, null | undefined>
: UFromJs | null
: never
: never;
};

/**
* Takes a list of attributes and returns a mapping function that takes a
Expand All @@ -371,8 +383,10 @@ export type ObjectFromPgCodecAttributes<TAttributes extends PgCodecAttributes> =
*
* @see {@link https://www.postgresql.org/docs/current/rowtypes.html#id-1.5.7.24.6}
*/
function makeSQLValueToRecord<TAttributes extends PgCodecAttributes>(
attributes: TAttributes,
function makeSQLValueToRecord<
TAttributes extends ReadonlyArray<PgCodecAttribute>,
>(
attributes: PgCodecAttributesRecord<TAttributes>,
): (value: string) => ObjectFromPgCodecAttributes<TAttributes> {
const attributeDefs = realAttributeDefs(attributes);
const attributeCount = attributeDefs.length;
Expand All @@ -390,7 +404,7 @@ function makeSQLValueToRecord<TAttributes extends PgCodecAttributes>(

export type PgRecordTypeCodecSpec<
TName extends string,
TAttributes extends PgCodecAttributes,
TAttributes extends PgCodecAttributesRecord<ReadonlyArray<AnyPgCodecAttribute>>,
> = {
name: TName;
executor: PgExecutor;
Expand All @@ -413,18 +427,18 @@ export type PgRecordTypeCodecSpec<
* isAnonymous - if true, this represents an "anonymous" type, typically the return value of a function or something like that. If this is true, then name and identifier are ignored.
*/
export function recordCodec<
const TName extends string,
const TAttributes extends PgCodecAttributes,
TName extends string,
TAttributes extends PgCodecAttributesRecord<ReadonlyArray<AnyPgCodecAttribute>>,
>(
config: PgRecordTypeCodecSpec<TName, TAttributes>,
): PgCodec<
TName,
TAttributes,
string,
ObjectFromPgCodecAttributes<TAttributes>,
undefined,
undefined,
undefined
never,
never,
never
> {
const {
name,
Expand Down Expand Up @@ -504,14 +518,14 @@ type CodecWithListCodec<
`${TCodec extends PgCodec<infer UName, any, any, any, any, any, any>
? UName
: never}[]`,
undefined,
never,
string,
TCodec extends PgCodec<any, any, any, infer UFromJs, undefined, any, any>
TCodec extends PgCodec<any, any, any, infer UFromJs, never, any, any>
? UFromJs[]
: any[],
TCodec,
undefined,
undefined
never,
never
>;
};

Expand All @@ -528,9 +542,7 @@ type CodecWithListCodec<
* @param typeDelim - the delimeter used to separate entries in this list when Postgres stringifies it
* @param identifier - a pg-sql2 fragment that represents the name of this type
*/
export function listOfCodec<
TInnerCodec extends PgCodec<string, any, any, any, undefined, any, any>,
>(
export function listOfCodec<TInnerCodec extends AnyPgCodec = AnyPgCodec>(
listedCodec: TInnerCodec,
config?: {
description?: string;
Expand All @@ -542,14 +554,14 @@ export function listOfCodec<
`${TInnerCodec extends PgCodec<infer UName, any, any, any, any, any, any>
? UName
: never}[]`,
undefined, // Array has no attributes
never, // Array has no attributes
string,
TInnerCodec extends PgCodec<any, any, any, infer UFromJs, undefined, any, any>
TInnerCodec extends PgCodec<any, any, any, infer UFromJs, never, any, any>
? UFromJs[]
: any[],
TInnerCodec,
undefined,
undefined
never,
never
> {
const innerCodec: CodecWithListCodec<TInnerCodec> = listedCodec;

Expand All @@ -568,22 +580,14 @@ export function listOfCodec<
`${TInnerCodec extends PgCodec<infer UName, any, any, any, any, any, any>
? UName
: never}[]`,
undefined, // Array has no attributes
never, // Array has no attributes
string,
TInnerCodec extends PgCodec<
any,
any,
any,
infer UFromJs,
undefined,
any,
any
>
TInnerCodec extends PgCodec<any, any, any, infer UFromJs, never, any, any>
? UFromJs[]
: any[],
TInnerCodec,
undefined,
undefined
never,
never
> = {
name: `${
innerCodec.name as TInnerCodec extends PgCodec<
Expand Down Expand Up @@ -661,7 +665,7 @@ exportAs("@dataplan/pg", listOfCodec, "listOfCodec");
*/
export function domainOfCodec<
TName extends string,
TInnerCodec extends PgCodec<any, any, any, any, any, any>,
TInnerCodec extends AnyPgCodec,
>(
innerCodec: TInnerCodec,
name: TName,
Expand All @@ -673,13 +677,15 @@ export function domainOfCodec<
} = {},
): PgCodec<
TName,
TInnerCodec extends PgCodec<any, infer U, any, any, any, any> ? U : any,
TInnerCodec extends PgCodec<any, any, infer U, any, any, any> ? U : any,
undefined,
TInnerCodec,
undefined
PgCodecAttributes<TInnerCodec>,
PgCodecFromPostgres<TInnerCodec>,
any,
AnyPgCodec, // <-- weird types
TInnerCodec, // <-- weird types
any
> {
const { description, extensions, notNull } = config;

return {
// Generally same as underlying type:
...innerCodec,
Expand All @@ -689,7 +695,7 @@ export function domainOfCodec<
sqlType: identifier,
description,
extensions,
domainOfCodec: innerCodec.arrayOfCodec ? undefined : innerCodec,
...(innerCodec.arrayOfCodec ? {} : { domainOfCodec: innerCodec }),
notNull: Boolean(notNull),
};
}
Expand All @@ -701,7 +707,7 @@ exportAs("@dataplan/pg", domainOfCodec, "domainOfCodec");
* @internal
*/
function escapeRangeValue<
TInnerCodec extends PgCodec<any, undefined, any, any, undefined, any, any>,
TInnerCodec extends PgCodec<any, never, any, any, never, any, any>,
>(value: null | any, innerCodec: TInnerCodec): string {
if (value == null) {
return "";
Expand All @@ -727,15 +733,7 @@ interface PgRange<T> {
*/
export function rangeOfCodec<
TName extends string,
TInnerCodec extends PgCodec<
any,
undefined,
any,
any,
undefined,
any,
undefined
>,
TInnerCodec extends PgCodec<any, never, any, any, never, any, never>,
>(
innerCodec: TInnerCodec,
name: TName,
Expand All @@ -744,15 +742,7 @@ export function rangeOfCodec<
description?: string;
extensions?: Partial<PgCodecExtensions>;
} = {},
): PgCodec<
TName,
undefined,
string,
PgRange<unknown>,
undefined,
undefined,
TInnerCodec
> {
): PgCodec<TName, never, string, PgRange<unknown>, never, never, TInnerCodec> {
const { description, extensions } = config;
const needsCast = innerCodec.castFromPg;

Expand Down Expand Up @@ -1169,17 +1159,16 @@ export function getCodecByPgCatalogTypeName(pgCatalogTypeName: string) {
return null;
}

export function getInnerCodec<
TCodec extends PgCodec<any, any, any, any, any, any>,
>(
export function getInnerCodec<TCodec extends PgCodec>(
codec: TCodec,
): TCodec extends PgCodec<
any,
any,
any,
infer UArray,
infer UDomain,
infer URange
infer URange,
any
>
? Exclude<UDomain | UArray | URange, undefined>
: TCodec {
Expand Down
Loading

0 comments on commit cdda675

Please sign in to comment.