From 7e8a7bd87cd6cf4446367b69f6c19ff1641b07b6 Mon Sep 17 00:00:00 2001 From: Chase Adams Date: Thu, 23 Jan 2025 09:23:30 -0700 Subject: [PATCH 1/4] fix: export types for downstream typing --- packages/zero-client/src/mod.ts | 3 +++ packages/zero-schema/src/builder/table-builder.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/zero-client/src/mod.ts b/packages/zero-client/src/mod.ts index 3e2c78d156..d6a35d6fb8 100644 --- a/packages/zero-client/src/mod.ts +++ b/packages/zero-client/src/mod.ts @@ -93,6 +93,9 @@ export { number, string, table, + type TableBuilderWithColumns, + type TableBuilder, + type ColumnBuilder, } from '../../zero-schema/src/builder/table-builder.js'; export type { AssetPermissions as CompiledAssetPermissions, diff --git a/packages/zero-schema/src/builder/table-builder.ts b/packages/zero-schema/src/builder/table-builder.ts index 02554f1d67..becef4a006 100644 --- a/packages/zero-schema/src/builder/table-builder.ts +++ b/packages/zero-schema/src/builder/table-builder.ts @@ -112,7 +112,7 @@ export class TableBuilderWithColumns { } } -class ColumnBuilder> { +export class ColumnBuilder> { readonly #schema: TShape; constructor(schema: TShape) { this.#schema = schema; From 6d649b99f2b6e5748abe60dce751173ee15986fc Mon Sep 17 00:00:00 2001 From: Chase Adams Date: Thu, 23 Jan 2025 09:29:07 -0700 Subject: [PATCH 2/4] fix: revert unnecessary exports --- packages/zero-client/src/mod.ts | 2 -- packages/zero-schema/src/builder/table-builder.ts | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/zero-client/src/mod.ts b/packages/zero-client/src/mod.ts index d6a35d6fb8..3f031f8f93 100644 --- a/packages/zero-client/src/mod.ts +++ b/packages/zero-client/src/mod.ts @@ -94,8 +94,6 @@ export { string, table, type TableBuilderWithColumns, - type TableBuilder, - type ColumnBuilder, } from '../../zero-schema/src/builder/table-builder.js'; export type { AssetPermissions as CompiledAssetPermissions, diff --git a/packages/zero-schema/src/builder/table-builder.ts b/packages/zero-schema/src/builder/table-builder.ts index becef4a006..02554f1d67 100644 --- a/packages/zero-schema/src/builder/table-builder.ts +++ b/packages/zero-schema/src/builder/table-builder.ts @@ -112,7 +112,7 @@ export class TableBuilderWithColumns { } } -export class ColumnBuilder> { +class ColumnBuilder> { readonly #schema: TShape; constructor(schema: TShape) { this.#schema = schema; From 6671f1a3c74604c89d4288e57902f42ec877161f Mon Sep 17 00:00:00 2001 From: Chase Adams Date: Thu, 23 Jan 2025 09:36:14 -0700 Subject: [PATCH 3/4] fix: add back column builder --- packages/zero-client/src/mod.ts | 1 + packages/zero-schema/src/builder/table-builder.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/zero-client/src/mod.ts b/packages/zero-client/src/mod.ts index 3f031f8f93..5128f84bbb 100644 --- a/packages/zero-client/src/mod.ts +++ b/packages/zero-client/src/mod.ts @@ -94,6 +94,7 @@ export { string, table, type TableBuilderWithColumns, + type ColumnBuilder, } from '../../zero-schema/src/builder/table-builder.js'; export type { AssetPermissions as CompiledAssetPermissions, diff --git a/packages/zero-schema/src/builder/table-builder.ts b/packages/zero-schema/src/builder/table-builder.ts index 02554f1d67..becef4a006 100644 --- a/packages/zero-schema/src/builder/table-builder.ts +++ b/packages/zero-schema/src/builder/table-builder.ts @@ -112,7 +112,7 @@ export class TableBuilderWithColumns { } } -class ColumnBuilder> { +export class ColumnBuilder> { readonly #schema: TShape; constructor(schema: TShape) { this.#schema = schema; From 364760e124b5963fc3849b53900ee3fc22e3484a Mon Sep 17 00:00:00 2001 From: Chase Adams Date: Fri, 24 Jan 2025 08:45:01 -0700 Subject: [PATCH 4/4] fix: change to only export type --- packages/zero-schema/src/builder/table-builder.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/zero-schema/src/builder/table-builder.ts b/packages/zero-schema/src/builder/table-builder.ts index becef4a006..780ddd189b 100644 --- a/packages/zero-schema/src/builder/table-builder.ts +++ b/packages/zero-schema/src/builder/table-builder.ts @@ -112,7 +112,7 @@ export class TableBuilderWithColumns { } } -export class ColumnBuilder> { +class ColumnBuilder> { readonly #schema: TShape; constructor(schema: TShape) { this.#schema = schema; @@ -129,3 +129,5 @@ export class ColumnBuilder> { return this.#schema; } } + +export type {ColumnBuilder};