@antelopejs/postgres 0.2.2 → 0.2.4

package/dist/implementations/database/relation.js

@@ -3,26 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WHERE_BLOCKERS = exports.SINGLE_ROW = exports.OUTPUT_COLUMN = void 0;
+exports.OUTPUT_COLUMN = void 0;
 exports.RequireOrigin = RequireOrigin;
 exports.IndexColumns = IndexColumns;
 exports.ScanColumns = ScanColumns;
-exports.AbsorbOrder = AbsorbOrder;
-exports.RowBound = RowBound;
-exports.Render = Render;
 exports.TableRelation = TableRelation;
 exports.LoggedRelation = LoggedRelation;
 exports.ValueRelation = ValueRelation;
-exports.Nested = Nested;
-exports.Prepare = Prepare;
 exports.SetProjection = SetProjection;
 exports.SetPlainProjection = SetPlainProjection;
-exports.HasFlag = HasFlag;
 exports.CurrentValue = CurrentValue;
 const node_assert_1 = __importDefault(require("node:assert"));
-const utils_1 = require("./utils");
 const sql_1 = require("./sql");
-const fields_1 = require("./fields");
 const row_source_1 = require("./row-source");
 exports.OUTPUT_COLUMN = "value";
 function NewRelation(seed) {
@@ -57,106 +49,11 @@ function ScanColumns(relation, name) {
     }
     return IndexColumns(relation, name);
 }
-function ExternalColumns(relation, shape) {
-    return (0, row_source_1.ExternalNames)(shape).map((name) => `${relation.source.field(name).sql} AS ${(0, sql_1.QuoteIdentifier)(name)}`);
-}
-function RowColumns(relation) {
-    const origin = RequireOrigin(relation);
-    if (origin.shape.external) {
-        return ExternalColumns(relation, origin.shape);
-    }
-    const declared = (0, fields_1.DeclaredColumns)(origin.shape);
-    const columns = (0, fields_1.PhysicalOrder)(utils_1.ID_COLUMN, utils_1.INSTANCE_COLUMN, declared, utils_1.EXTRA_COLUMN);
-    return columns.map((column) => (0, sql_1.QualifiedColumn)(relation.alias, column));
-}
-function SelectList(relation) {
-    const projection = relation.projection;
-    if (!projection) {
-        return RowColumns(relation).join(", ");
-    }
-    return `${projection.sql} AS ${(0, sql_1.QuoteIdentifier)(exports.OUTPUT_COLUMN)}`;
-}
-function SelectClause(relation) {
-    const modifier = relation.distinct ? "DISTINCT " : "";
-    return `SELECT ${modifier}${SelectList(relation)}`;
-}
-function FromItem(from, alias) {
-    return `${from} AS ${(0, sql_1.QuoteIdentifier)(alias)}`;
-}
-function FromClause(relation) {
-    return `FROM ${FromItem(relation.from, relation.alias)}`;
-}
-function RenderJoin(join) {
-    return `${join.kind} ${FromItem(join.from, join.alias)} ON ${join.on}`;
-}
-function JoinClauses(relation) {
-    if (relation.joins.length === 0) {
-        return undefined;
-    }
-    return relation.joins.map(RenderJoin).join(" ");
-}
-function WhereClause(relation) {
-    if (relation.where.length === 0) {
-        return undefined;
-    }
-    return `WHERE ${relation.where.join(" AND ")}`;
-}
-function GroupByClause(relation) {
-    if (relation.groupBy.length === 0) {
-        return undefined;
-    }
-    return `GROUP BY ${relation.groupBy.map((term) => term.sql).join(", ")}`;
-}
-function OrderTerms(relation) {
-    if (relation.orderBy.length === 0) {
-        return undefined;
-    }
-    const terms = relation.orderBy.map((term) => `${term.sql} ${term.descending ? "DESC" : "ASC"}`);
-    return terms.join(", ");
-}
-function OrderByClause(relation) {
-    const terms = OrderTerms(relation);
-    return terms === undefined ? undefined : `ORDER BY ${terms}`;
-}
-const BOUND_PARAMETER = /\$\d/;
-function AbsorbOrder(relation) {
-    const terms = OrderTerms(relation);
-    (0, node_assert_1.default)(terms === undefined || !BOUND_PARAMETER.test(terms), "An order term must carry no bound parameter, since absorbing an aggregate discards it");
-    relation.orderBy = [];
-    return terms;
-}
-const ONE_ROW = "1";
-function RowBound(sql) {
-    return `((${sql})::bigint)`;
-}
-exports.SINGLE_ROW = RowBound(ONE_ROW);
-function LimitClause(relation) {
-    return relation.limit === undefined ? undefined : `LIMIT ${relation.limit}`;
-}
-function OffsetClause(relation) {
-    return relation.offset === undefined
-        ? undefined
-        : `OFFSET ${relation.offset}`;
-}
-const CLAUSES = [
-    SelectClause,
-    FromClause,
-    JoinClauses,
-    WhereClause,
-    GroupByClause,
-    OrderByClause,
-    LimitClause,
-    OffsetClause,
-];
-function Render(relation) {
-    const clauses = CLAUSES.map((build) => build(relation));
-    return clauses.filter((clause) => clause !== undefined).join(" ");
-}
 function TableSource(alias, origin, reads) {
-    if (origin.shape.external) {
-        return new row_source_1.ExternalRowSource(alias, origin.shape, reads);
+    if (origin.model.external) {
+        return new row_source_1.ExternalRowSource(alias, origin.model, reads);
     }
-    return new row_source_1.ColumnRowSource((0, row_source_1.AliasedColumns)(alias), origin.shape);
+    return new row_source_1.ColumnRowSource((0, row_source_1.AliasedColumns)(alias), origin.model);
 }
 function TableRelation(from, alias, origin, reads = "table") {
     return NewRelation({
@@ -170,7 +67,7 @@ function LoggedRelation(from, alias, row, origin) {
     return NewRelation({
         from,
         alias,
-        source: new row_source_1.ColumnRowSource((0, row_source_1.LoggedColumns)(row), origin.shape),
+        source: new row_source_1.ColumnRowSource((0, row_source_1.LoggedColumns)(row), origin.model),
         origin,
     });
 }
@@ -186,36 +83,6 @@ function ValueRelation(from, alias, type) {
         projection,
     });
 }
-function Nested(relation, context) {
-    const from = `(${Render(relation)})`;
-    const alias = context.nextAlias();
-    const projection = relation.projection;
-    const wrapped = projection
-        ? ValueRelation(from, alias, projection.type)
-        : TableRelation(from, alias, RequireOrigin(relation), "output");
-    wrapped.single = relation.single;
-    wrapped.absent = relation.absent;
-    return wrapped;
-}
-exports.WHERE_BLOCKERS = [
-    "projection",
-    "limit",
-    "offset",
-    "distinct",
-    "aggregated",
-];
-const FLAG_PREDICATES = {
-    projection: (relation) => relation.projection !== undefined,
-    limit: (relation) => relation.limit !== undefined,
-    offset: (relation) => relation.offset !== undefined,
-    distinct: (relation) => relation.distinct,
-    ordered: (relation) => relation.orderBy.length > 0,
-    aggregated: (relation) => relation.aggregated,
-};
-function Prepare(relation, blockedBy, context) {
-    const blocked = blockedBy.some((flag) => FLAG_PREDICATES[flag](relation));
-    return blocked ? Nested(relation, context) : relation;
-}
 function SetProjection(relation, value) {
     relation.projection = value;
     relation.source = new row_source_1.JsonRowSource(value);
@@ -228,9 +95,6 @@ function SetPlainProjection(relation, value, source) {
     projected.projectedFrom = source;
     return projected;
 }
-function HasFlag(relation, flags) {
-    return flags.some((flag) => FLAG_PREDICATES[flag](relation));
-}
 function CurrentValue(relation) {
     return relation.projection ?? relation.source.toJson();
 }

package/dist/implementations/database/relation.js.map

@@ -1 +1 @@
-{"version":3,"file":"relation.js","sourceRoot":"","sources":["../../../src/implementations/database/relation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"relation.js","sourceRoot":"","sources":["../../../src/implementations/database/relation.ts"],"names":[],"mappings":"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"}

package/dist/implementations/database/render.d.ts

@@ -0,0 +1,11 @@
+import type { DecodingContext } from "./context";
+import { type Relation } from "./relation";
+export declare function AbsorbOrder(relation: Relation): string | undefined;
+export declare function RowBound(sql: string): string;
+export declare const SINGLE_ROW: string;
+export declare function Render(relation: Relation): string;
+export declare function Nested(relation: Relation, context: DecodingContext): Relation;
+export type RelationFlag = "projection" | "limit" | "offset" | "distinct" | "ordered" | "aggregated";
+export declare const WHERE_BLOCKERS: readonly RelationFlag[];
+export declare function Prepare(relation: Relation, blockedBy: readonly RelationFlag[], context: DecodingContext): Relation;
+export declare function HasFlag(relation: Relation, flags: readonly RelationFlag[]): boolean;

package/dist/implementations/database/render.js

@@ -0,0 +1,147 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WHERE_BLOCKERS = exports.SINGLE_ROW = void 0;
+exports.AbsorbOrder = AbsorbOrder;
+exports.RowBound = RowBound;
+exports.Render = Render;
+exports.Nested = Nested;
+exports.Prepare = Prepare;
+exports.HasFlag = HasFlag;
+const node_assert_1 = __importDefault(require("node:assert"));
+const utils_1 = require("./utils");
+const sql_1 = require("./sql");
+const fields_1 = require("./fields");
+const row_source_1 = require("./row-source");
+const relation_1 = require("./relation");
+function ExternalColumns(relation, model) {
+    return (0, row_source_1.ExternalNames)(model).map((name) => `${relation.source.field(name).sql} AS ${(0, sql_1.QuoteIdentifier)(name)}`);
+}
+function RowColumns(relation) {
+    const origin = (0, relation_1.RequireOrigin)(relation);
+    if (origin.model.external) {
+        return ExternalColumns(relation, origin.model);
+    }
+    const declared = (0, fields_1.DeclaredColumns)(origin.model);
+    const columns = (0, fields_1.PhysicalOrder)(utils_1.ID_COLUMN, utils_1.INSTANCE_COLUMN, declared, utils_1.EXTRA_COLUMN);
+    return columns.map((column) => (0, sql_1.QualifiedColumn)(relation.alias, column));
+}
+function SelectList(relation) {
+    const projection = relation.projection;
+    if (!projection) {
+        return RowColumns(relation).join(", ");
+    }
+    return `${projection.sql} AS ${(0, sql_1.QuoteIdentifier)(relation_1.OUTPUT_COLUMN)}`;
+}
+function SelectClause(relation) {
+    const modifier = relation.distinct ? "DISTINCT " : "";
+    return `SELECT ${modifier}${SelectList(relation)}`;
+}
+function FromItem(from, alias) {
+    return `${from} AS ${(0, sql_1.QuoteIdentifier)(alias)}`;
+}
+function FromClause(relation) {
+    return `FROM ${FromItem(relation.from, relation.alias)}`;
+}
+function RenderJoin(join) {
+    return `${join.kind} ${FromItem(join.from, join.alias)} ON ${join.on}`;
+}
+function JoinClauses(relation) {
+    if (relation.joins.length === 0) {
+        return undefined;
+    }
+    return relation.joins.map(RenderJoin).join(" ");
+}
+function WhereClause(relation) {
+    if (relation.where.length === 0) {
+        return undefined;
+    }
+    return `WHERE ${relation.where.join(" AND ")}`;
+}
+function GroupByClause(relation) {
+    if (relation.groupBy.length === 0) {
+        return undefined;
+    }
+    return `GROUP BY ${relation.groupBy.map((term) => term.sql).join(", ")}`;
+}
+function OrderTerms(relation) {
+    if (relation.orderBy.length === 0) {
+        return undefined;
+    }
+    const terms = relation.orderBy.map((term) => `${term.sql} ${term.descending ? "DESC" : "ASC"}`);
+    return terms.join(", ");
+}
+function OrderByClause(relation) {
+    const terms = OrderTerms(relation);
+    return terms === undefined ? undefined : `ORDER BY ${terms}`;
+}
+const BOUND_PARAMETER = /\$\d/;
+function AbsorbOrder(relation) {
+    const terms = OrderTerms(relation);
+    (0, node_assert_1.default)(terms === undefined || !BOUND_PARAMETER.test(terms), "An order term must carry no bound parameter, since absorbing an aggregate discards it");
+    relation.orderBy = [];
+    return terms;
+}
+const ONE_ROW = "1";
+function RowBound(sql) {
+    return `((${sql})::bigint)`;
+}
+exports.SINGLE_ROW = RowBound(ONE_ROW);
+function LimitClause(relation) {
+    return relation.limit === undefined ? undefined : `LIMIT ${relation.limit}`;
+}
+function OffsetClause(relation) {
+    return relation.offset === undefined
+        ? undefined
+        : `OFFSET ${relation.offset}`;
+}
+const CLAUSES = [
+    SelectClause,
+    FromClause,
+    JoinClauses,
+    WhereClause,
+    GroupByClause,
+    OrderByClause,
+    LimitClause,
+    OffsetClause,
+];
+function Render(relation) {
+    const clauses = CLAUSES.map((build) => build(relation));
+    return clauses.filter((clause) => clause !== undefined).join(" ");
+}
+function Nested(relation, context) {
+    const from = `(${Render(relation)})`;
+    const alias = context.nextAlias();
+    const projection = relation.projection;
+    const wrapped = projection
+        ? (0, relation_1.ValueRelation)(from, alias, projection.type)
+        : (0, relation_1.TableRelation)(from, alias, (0, relation_1.RequireOrigin)(relation), "output");
+    wrapped.single = relation.single;
+    wrapped.absent = relation.absent;
+    return wrapped;
+}
+exports.WHERE_BLOCKERS = [
+    "projection",
+    "limit",
+    "offset",
+    "distinct",
+    "aggregated",
+];
+const FLAG_PREDICATES = {
+    projection: (relation) => relation.projection !== undefined,
+    limit: (relation) => relation.limit !== undefined,
+    offset: (relation) => relation.offset !== undefined,
+    distinct: (relation) => relation.distinct,
+    ordered: (relation) => relation.orderBy.length > 0,
+    aggregated: (relation) => relation.aggregated,
+};
+function Prepare(relation, blockedBy, context) {
+    const blocked = blockedBy.some((flag) => FLAG_PREDICATES[flag](relation));
+    return blocked ? Nested(relation, context) : relation;
+}
+function HasFlag(relation, flags) {
+    return flags.some((flag) => FLAG_PREDICATES[flag](relation));
+}
+//# sourceMappingURL=render.js.map

package/dist/implementations/database/render.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/implementations/database/render.ts"],"names":[],"mappings":"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"}

package/dist/implementations/database/result.d.ts

@@ -1,4 +1,4 @@
-import type { TableShape } from "./fields";
+import type { TableModel } from "./fields";
 import type { SqlType } from "./types";
 export declare function ReviveValue(value: unknown, type: SqlType): unknown;
-export declare function DecodeRow(row: Record<string, unknown>, table: TableShape): Record<string, unknown>;
+export declare function DecodeRow(row: Record<string, unknown>, table: TableModel): Record<string, unknown>;

package/dist/implementations/database/result.js

@@ -3,38 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReviveValue = ReviveValue;
 exports.DecodeRow = DecodeRow;
 const utils_1 = require("./utils");
+const guards_1 = require("./guards");
 function ReviveTimestamp(value) {
     if (value instanceof Date) {
         return value;
     }
-    const date = typeof value === "number" ? new Date(value) : new Date(String(value));
+    const date = (0, guards_1.IsNumber)(value) ? new Date(value) : new Date(String(value));
     return Number.isNaN(date.getTime()) ? value : date;
 }
-const REVIVERS = {
-    timestamp: (value) => ReviveTimestamp(value),
-    array: (value, type) => Array.isArray(value)
-        ? value.map((item) => ReviveValue(item, type.elem))
-        : value,
-    json: (value, type) => ReviveShape(value, type.shape),
-};
 function ReviveValue(value, type) {
     if (value === null || value === undefined) {
         return value;
     }
-    const reviver = REVIVERS[type.kind];
-    return reviver ? reviver(value, type) : value;
+    switch (type.kind) {
+        case "timestamp":
+            return ReviveTimestamp(value);
+        case "array":
+            return Array.isArray(value)
+                ? value.map((item) => ReviveValue(item, type.elem))
+                : value;
+        case "json":
+            return ReviveKeyTypes(value, type.keys);
+        default:
+            return value;
+    }
 }
-function ReviveShape(value, shape) {
-    if (!shape ||
-        typeof value !== "object" ||
-        value === null ||
-        Array.isArray(value)) {
+function ReviveKeyTypes(value, keyTypes) {
+    if (!keyTypes || !(0, guards_1.IsDocument)(value)) {
         return value;
     }
-    const result = {
-        ...value,
-    };
-    for (const [name, type] of Object.entries(shape)) {
+    const result = { ...value };
+    for (const [name, type] of Object.entries(keyTypes)) {
         if (Object.hasOwn(result, name)) {
             result[name] = ReviveValue(result[name], type);
         }

package/dist/implementations/database/result.js.map

@@ -1 +1 @@
-{"version":3,"file":"result.js","sourceRoot":"","sources":["../../../src/implementations/database/result.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"result.js","sourceRoot":"","sources":["../../../src/implementations/database/result.ts"],"names":[],"mappings":"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"}

package/dist/implementations/database/row-source.d.ts

@@ -1,11 +1,11 @@
-import { type TableShape } from "./fields";
+import { type TableModel } from "./fields";
 import { type Compiled } from "./sql";
-import { type SqlShape, type SqlType } from "./types";
+import { type KeyTypes, type SqlType } from "./types";
 export interface RowSource {
     field(name: string, def?: Compiled): Compiled;
     dynamicField(key: Compiled, def?: Compiled): Compiled;
     toJson(): Compiled;
-    shape(): SqlShape | undefined;
+    keyTypes(): KeyTypes | undefined;
     presence?(): string;
 }
 export interface DocumentMember extends Compiled {
@@ -18,14 +18,14 @@ export declare function LoggedColumns(row: string): ColumnAddress;
 export declare class ColumnRowSource implements RowSource {
     private readonly address;
     private readonly table;
-    constructor(address: ColumnAddress, table: TableShape);
+    constructor(address: ColumnAddress, table: TableModel);
     field(name: string, def?: Compiled): Compiled;
     private instance;
     private overflow;
     dynamicField(key: Compiled, def?: Compiled): Compiled;
     private members;
     toJson(): Compiled;
-    shape(): SqlShape;
+    keyTypes(): KeyTypes;
 }
 export declare class NullableRowSource implements RowSource {
     private readonly inner;
@@ -33,7 +33,7 @@ export declare class NullableRowSource implements RowSource {
     field(name: string, def?: Compiled): Compiled;
     dynamicField(key: Compiled, def?: Compiled): Compiled;
     toJson(): Compiled;
-    shape(): SqlShape | undefined;
+    keyTypes(): KeyTypes | undefined;
 }
 export declare class JsonRowSource implements RowSource {
     private readonly value;
@@ -42,15 +42,15 @@ export declare class JsonRowSource implements RowSource {
     dynamicField(key: Compiled, def?: Compiled): Compiled;
     private fieldType;
     toJson(): Compiled;
-    shape(): SqlShape | undefined;
+    keyTypes(): KeyTypes | undefined;
 }
-export declare function ExternalNames(shape: TableShape): string[];
+export declare function ExternalNames(model: TableModel): string[];
 export type ExternalReads = "table" | "output";
 export declare class ExternalRowSource implements RowSource {
     private readonly alias;
     private readonly table;
     private readonly reads;
-    constructor(alias: string, table: TableShape, reads: ExternalReads);
+    constructor(alias: string, table: TableModel, reads: ExternalReads);
     private column;
     private key;
     private native;
@@ -59,6 +59,6 @@ export declare class ExternalRowSource implements RowSource {
     dynamicField(key: Compiled, def?: Compiled): Compiled;
     private members;
     toJson(): Compiled;
-    shape(): SqlShape;
+    keyTypes(): KeyTypes;
     presence(): string;
 }

package/dist/implementations/database/row-source.js

@@ -13,12 +13,12 @@ const external_types_1 = require("./external-types");
 const sql_1 = require("./sql");
 const types_1 = require("./types");
 const DEFAULT_INSTANCE_SQL = (0, sql_1.QuoteLiteral)(utils_1.DEFAULT_INSTANCE_ID);
-function MemberShape(members) {
-    const shape = {};
+function MemberKeyTypes(members) {
+    const keyTypes = {};
     for (const member of members) {
-        shape[member.name] = member.type;
+        keyTypes[member.name] = member.type;
     }
-    return shape;
+    return keyTypes;
 }
 function ContainerMember(member) {
     const built = `jsonb_build_object(${(0, sql_1.QuoteLiteral)(member.name)}, ${member.sql})`;
@@ -39,7 +39,10 @@ function BuildDocument(members, overflow) {
     if (overflow) {
         parts.push(overflow);
     }
-    return { sql: `(${parts.join(" || ")})`, type: (0, types_1.JsonOf)(MemberShape(members)) };
+    return {
+        sql: `(${parts.join(" || ")})`,
+        type: (0, types_1.JsonOf)(MemberKeyTypes(members)),
+    };
 }
 function KeySubject(name) {
     return `The default for key '${name}'`;
@@ -100,8 +103,8 @@ class ColumnRowSource {
         const overflow = `COALESCE(${this.overflow()}, '{}'::jsonb)`;
         return BuildDocument(this.members(), overflow);
     }
-    shape() {
-        return MemberShape(this.members());
+    keyTypes() {
+        return MemberKeyTypes(this.members());
     }
 }
 exports.ColumnRowSource = ColumnRowSource;
@@ -125,8 +128,8 @@ class NullableRowSource {
             type: document.type,
         };
     }
-    shape() {
-        return this.inner.shape();
+    keyTypes() {
+        return this.inner.keyTypes();
     }
 }
 exports.NullableRowSource = NullableRowSource;
@@ -146,23 +149,23 @@ class JsonRowSource {
         return (0, coerce_1.WithDefault)({ sql: `(${this.toJson().sql} -> ${(0, coerce_1.Cast)(key, types_1.TEXT).sql})`, type: types_1.OPAQUE }, def);
     }
     fieldType(name) {
-        const shape = this.shape();
-        if (!shape || !Object.hasOwn(shape, name)) {
+        const keyTypes = this.keyTypes();
+        if (!keyTypes || !Object.hasOwn(keyTypes, name)) {
             return types_1.OPAQUE;
         }
-        return shape[name];
+        return keyTypes[name];
     }
     toJson() {
         return (0, coerce_1.Cast)(this.value, this.value.type.kind === "json" ? this.value.type : types_1.OPAQUE);
     }
-    shape() {
-        return (0, types_1.ShapeOf)(this.value.type);
+    keyTypes() {
+        return (0, types_1.KeyTypesOf)(this.value.type);
     }
 }
 exports.JsonRowSource = JsonRowSource;
-function ExternalNames(shape) {
-    const declared = Object.keys(shape.fields);
-    return shape.external?.key ? [utils_1.ID_COLUMN, ...declared] : declared;
+function ExternalNames(model) {
+    const declared = Object.keys(model.fields);
+    return model.external?.key ? [utils_1.ID_COLUMN, ...declared] : declared;
 }
 function JsonKeyOf(other) {
     return `((CASE WHEN pg_input_is_valid(${other}, 'jsonb') THEN ${other} END)::jsonb)`;
@@ -268,8 +271,8 @@ class ExternalRowSource {
     toJson() {
         return BuildDocument(this.members());
     }
-    shape() {
-        return MemberShape(this.members());
+    keyTypes() {
+        return MemberKeyTypes(this.members());
     }
     presence() {
         return `(${(0, sql_1.QuoteIdentifier)(this.alias)} IS DISTINCT FROM NULL)`;