Skip to content

Commit ed931da

Browse files
ymc9ymc9
authored
fix(orm): reimplement typescript type display simplification (#405)
* fix(orm): reimplement typescript type display simplification * update
1 parent 769473c commit ed931da

File tree

19 files changed

+314
-321
lines changed

19 files changed

+314
-321
lines changed

‎packages/clients/tanstack-query/src/react.ts‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -145,108 +145,108 @@ export type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Sc
145145
Schema,
146146
Model,
147147
{
148-
useFindUnique<T extends FindUniqueArgs<Schema, Model, true>>(
148+
useFindUnique<T extends FindUniqueArgs<Schema, Model>>(
149149
args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
150150
options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
151151
): ModelQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
152152

153-
useSuspenseFindUnique<T extends FindUniqueArgs<Schema, Model, true>>(
153+
useSuspenseFindUnique<T extends FindUniqueArgs<Schema, Model>>(
154154
args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
155155
options?: ModelSuspenseQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
156156
): ModelSuspenseQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
157157

158-
useFindFirst<T extends FindFirstArgs<Schema, Model, true>>(
158+
useFindFirst<T extends FindFirstArgs<Schema, Model>>(
159159
args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
160160
options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
161161
): ModelQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
162162

163-
useSuspenseFindFirst<T extends FindFirstArgs<Schema, Model, true>>(
163+
useSuspenseFindFirst<T extends FindFirstArgs<Schema, Model>>(
164164
args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
165165
options?: ModelSuspenseQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
166166
): ModelSuspenseQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
167167

168-
useFindMany<T extends FindManyArgs<Schema, Model, true>>(
168+
useFindMany<T extends FindManyArgs<Schema, Model>>(
169169
args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
170170
options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
171171
): ModelQueryResult<SimplifiedModelResult<Schema, Model, T>[]>;
172172

173-
useSuspenseFindMany<T extends FindManyArgs<Schema, Model, true>>(
173+
useSuspenseFindMany<T extends FindManyArgs<Schema, Model>>(
174174
args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
175175
options?: ModelSuspenseQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
176176
): ModelSuspenseQueryResult<SimplifiedModelResult<Schema, Model, T>[]>;
177177

178-
useInfiniteFindMany<T extends FindManyArgs<Schema, Model, true>>(
178+
useInfiniteFindMany<T extends FindManyArgs<Schema, Model>>(
179179
args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
180180
options?: ModelInfiniteQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
181181
): ModelInfiniteQueryResult<InfiniteData<SimplifiedModelResult<Schema, Model, T>[]>>;
182182

183-
useSuspenseInfiniteFindMany<T extends FindManyArgs<Schema, Model, true>>(
183+
useSuspenseInfiniteFindMany<T extends FindManyArgs<Schema, Model>>(
184184
args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
185185
options?: ModelSuspenseInfiniteQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
186186
): ModelSuspenseInfiniteQueryResult<InfiniteData<SimplifiedModelResult<Schema, Model, T>[]>>;
187187

188-
useCreate<T extends CreateArgs<Schema, Model, true>>(
188+
useCreate<T extends CreateArgs<Schema, Model>>(
189189
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
190190
): ModelMutationModelResult<Schema, Model, T>;
191191

192-
useCreateMany<T extends CreateManyArgs<Schema, Model, true>>(
192+
useCreateMany<T extends CreateManyArgs<Schema, Model>>(
193193
options?: ModelMutationOptions<BatchResult, T>,
194194
): ModelMutationResult<BatchResult, T>;
195195

196-
useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model, true>>(
196+
useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(
197197
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>[], T>,
198198
): ModelMutationModelResult<Schema, Model, T, true>;
199199

200-
useUpdate<T extends UpdateArgs<Schema, Model, true>>(
200+
useUpdate<T extends UpdateArgs<Schema, Model>>(
201201
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
202202
): ModelMutationModelResult<Schema, Model, T>;
203203

204-
useUpdateMany<T extends UpdateManyArgs<Schema, Model, true>>(
204+
useUpdateMany<T extends UpdateManyArgs<Schema, Model>>(
205205
options?: ModelMutationOptions<BatchResult, T>,
206206
): ModelMutationResult<BatchResult, T>;
207207

208-
useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model, true>>(
208+
useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(
209209
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>[], T>,
210210
): ModelMutationModelResult<Schema, Model, T, true>;
211211

212-
useUpsert<T extends UpsertArgs<Schema, Model, true>>(
212+
useUpsert<T extends UpsertArgs<Schema, Model>>(
213213
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
214214
): ModelMutationModelResult<Schema, Model, T>;
215215

216-
useDelete<T extends DeleteArgs<Schema, Model, true>>(
216+
useDelete<T extends DeleteArgs<Schema, Model>>(
217217
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
218218
): ModelMutationModelResult<Schema, Model, T>;
219219

220-
useDeleteMany<T extends DeleteManyArgs<Schema, Model, true>>(
220+
useDeleteMany<T extends DeleteManyArgs<Schema, Model>>(
221221
options?: ModelMutationOptions<BatchResult, T>,
222222
): ModelMutationResult<BatchResult, T>;
223223

224-
useCount<T extends CountArgs<Schema, Model, true>>(
224+
useCount<T extends CountArgs<Schema, Model>>(
225225
args?: Subset<T, CountArgs<Schema, Model>>,
226226
options?: ModelQueryOptions<CountResult<Schema, Model, T>>,
227227
): ModelQueryResult<CountResult<Schema, Model, T>>;
228228

229-
useSuspenseCount<T extends CountArgs<Schema, Model, true>>(
229+
useSuspenseCount<T extends CountArgs<Schema, Model>>(
230230
args?: Subset<T, CountArgs<Schema, Model>>,
231231
options?: ModelSuspenseQueryOptions<CountResult<Schema, Model, T>>,
232232
): ModelSuspenseQueryResult<CountResult<Schema, Model, T>>;
233233

234-
useAggregate<T extends AggregateArgs<Schema, Model, true>>(
234+
useAggregate<T extends AggregateArgs<Schema, Model>>(
235235
args: Subset<T, AggregateArgs<Schema, Model>>,
236236
options?: ModelQueryOptions<AggregateResult<Schema, Model, T>>,
237237
): ModelQueryResult<AggregateResult<Schema, Model, T>>;
238238

239-
useSuspenseAggregate<T extends AggregateArgs<Schema, Model, true>>(
239+
useSuspenseAggregate<T extends AggregateArgs<Schema, Model>>(
240240
args: Subset<T, AggregateArgs<Schema, Model>>,
241241
options?: ModelSuspenseQueryOptions<AggregateResult<Schema, Model, T>>,
242242
): ModelSuspenseQueryResult<AggregateResult<Schema, Model, T>>;
243243

244-
useGroupBy<T extends GroupByArgs<Schema, Model, true>>(
244+
useGroupBy<T extends GroupByArgs<Schema, Model>>(
245245
args: Subset<T, GroupByArgs<Schema, Model>>,
246246
options?: ModelQueryOptions<GroupByResult<Schema, Model, T>>,
247247
): ModelQueryResult<GroupByResult<Schema, Model, T>>;
248248

249-
useSuspenseGroupBy<T extends GroupByArgs<Schema, Model, true>>(
249+
useSuspenseGroupBy<T extends GroupByArgs<Schema, Model>>(
250250
args: Subset<T, GroupByArgs<Schema, Model>>,
251251
options?: ModelSuspenseQueryOptions<GroupByResult<Schema, Model, T>>,
252252
): ModelSuspenseQueryResult<GroupByResult<Schema, Model, T>>;

‎packages/clients/tanstack-query/src/svelte.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -138,73 +138,73 @@ export type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Sc
138138
Schema,
139139
Model,
140140
{
141-
useFindUnique<T extends FindUniqueArgs<Schema, Model, true>>(
141+
useFindUnique<T extends FindUniqueArgs<Schema, Model>>(
142142
args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
143143
options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
144144
): ModelQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
145145

146-
useFindFirst<T extends FindFirstArgs<Schema, Model, true>>(
146+
useFindFirst<T extends FindFirstArgs<Schema, Model>>(
147147
args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
148148
options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
149149
): ModelQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
150150

151-
useFindMany<T extends FindManyArgs<Schema, Model, true>>(
151+
useFindMany<T extends FindManyArgs<Schema, Model>>(
152152
args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
153153
options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
154154
): ModelQueryResult<SimplifiedModelResult<Schema, Model, T>[]>;
155155

156-
useInfiniteFindMany<T extends FindManyArgs<Schema, Model, true>>(
156+
useInfiniteFindMany<T extends FindManyArgs<Schema, Model>>(
157157
args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
158158
options?: ModelInfiniteQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
159159
): ModelInfiniteQueryResult<InfiniteData<SimplifiedModelResult<Schema, Model, T>[]>>;
160160

161-
useCreate<T extends CreateArgs<Schema, Model, true>>(
161+
useCreate<T extends CreateArgs<Schema, Model>>(
162162
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
163163
): ModelMutationModelResult<Schema, Model, T>;
164164

165-
useCreateMany<T extends CreateManyArgs<Schema, Model, true>>(
165+
useCreateMany<T extends CreateManyArgs<Schema, Model>>(
166166
options?: ModelMutationOptions<BatchResult, T>,
167167
): ModelMutationResult<BatchResult, T>;
168168

169-
useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model, true>>(
169+
useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(
170170
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>[], T>,
171171
): ModelMutationModelResult<Schema, Model, T, true>;
172172

173-
useUpdate<T extends UpdateArgs<Schema, Model, true>>(
173+
useUpdate<T extends UpdateArgs<Schema, Model>>(
174174
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
175175
): ModelMutationModelResult<Schema, Model, T>;
176176

177-
useUpdateMany<T extends UpdateManyArgs<Schema, Model, true>>(
177+
useUpdateMany<T extends UpdateManyArgs<Schema, Model>>(
178178
options?: ModelMutationOptions<BatchResult, T>,
179179
): ModelMutationResult<BatchResult, T>;
180180

181-
useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model, true>>(
181+
useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(
182182
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>[], T>,
183183
): ModelMutationModelResult<Schema, Model, T, true>;
184184

185-
useUpsert<T extends UpsertArgs<Schema, Model, true>>(
185+
useUpsert<T extends UpsertArgs<Schema, Model>>(
186186
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
187187
): ModelMutationModelResult<Schema, Model, T>;
188188

189-
useDelete<T extends DeleteArgs<Schema, Model, true>>(
189+
useDelete<T extends DeleteArgs<Schema, Model>>(
190190
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
191191
): ModelMutationModelResult<Schema, Model, T>;
192192

193-
useDeleteMany<T extends DeleteManyArgs<Schema, Model, true>>(
193+
useDeleteMany<T extends DeleteManyArgs<Schema, Model>>(
194194
options?: ModelMutationOptions<BatchResult, T>,
195195
): ModelMutationResult<BatchResult, T>;
196196

197-
useCount<T extends CountArgs<Schema, Model, true>>(
197+
useCount<T extends CountArgs<Schema, Model>>(
198198
args?: Subset<T, CountArgs<Schema, Model>>,
199199
options?: ModelQueryOptions<CountResult<Schema, Model, T>>,
200200
): ModelQueryResult<CountResult<Schema, Model, T>>;
201201

202-
useAggregate<T extends AggregateArgs<Schema, Model, true>>(
202+
useAggregate<T extends AggregateArgs<Schema, Model>>(
203203
args: Subset<T, AggregateArgs<Schema, Model>>,
204204
options?: ModelQueryOptions<AggregateResult<Schema, Model, T>>,
205205
): ModelQueryResult<AggregateResult<Schema, Model, T>>;
206206

207-
useGroupBy<T extends GroupByArgs<Schema, Model, true>>(
207+
useGroupBy<T extends GroupByArgs<Schema, Model>>(
208208
args: Subset<T, GroupByArgs<Schema, Model>>,
209209
options?: ModelQueryOptions<GroupByResult<Schema, Model, T>>,
210210
): ModelQueryResult<GroupByResult<Schema, Model, T>>;

‎packages/clients/tanstack-query/src/vue.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -122,73 +122,73 @@ export type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Sc
122122
Schema,
123123
Model,
124124
{
125-
useFindUnique<T extends FindUniqueArgs<Schema, Model, true>>(
125+
useFindUnique<T extends FindUniqueArgs<Schema, Model>>(
126126
args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
127127
options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
128128
): ModelQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
129129

130-
useFindFirst<T extends FindFirstArgs<Schema, Model, true>>(
130+
useFindFirst<T extends FindFirstArgs<Schema, Model>>(
131131
args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
132132
options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
133133
): ModelQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
134134

135-
useFindMany<T extends FindManyArgs<Schema, Model, true>>(
135+
useFindMany<T extends FindManyArgs<Schema, Model>>(
136136
args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
137137
options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
138138
): ModelQueryResult<SimplifiedModelResult<Schema, Model, T>[]>;
139139

140-
useInfiniteFindMany<T extends FindManyArgs<Schema, Model, true>>(
140+
useInfiniteFindMany<T extends FindManyArgs<Schema, Model>>(
141141
args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
142142
options?: ModelInfiniteQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
143143
): ModelInfiniteQueryResult<InfiniteData<SimplifiedModelResult<Schema, Model, T>[]>>;
144144

145-
useCreate<T extends CreateArgs<Schema, Model, true>>(
145+
useCreate<T extends CreateArgs<Schema, Model>>(
146146
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
147147
): ModelMutationModelResult<Schema, Model, T>;
148148

149-
useCreateMany<T extends CreateManyArgs<Schema, Model, true>>(
149+
useCreateMany<T extends CreateManyArgs<Schema, Model>>(
150150
options?: ModelMutationOptions<BatchResult, T>,
151151
): ModelMutationResult<BatchResult, T>;
152152

153-
useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model, true>>(
153+
useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(
154154
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>[], T>,
155155
): ModelMutationModelResult<Schema, Model, T, true>;
156156

157-
useUpdate<T extends UpdateArgs<Schema, Model, true>>(
157+
useUpdate<T extends UpdateArgs<Schema, Model>>(
158158
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
159159
): ModelMutationModelResult<Schema, Model, T>;
160160

161-
useUpdateMany<T extends UpdateManyArgs<Schema, Model, true>>(
161+
useUpdateMany<T extends UpdateManyArgs<Schema, Model>>(
162162
options?: ModelMutationOptions<BatchResult, T>,
163163
): ModelMutationResult<BatchResult, T>;
164164

165-
useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model, true>>(
165+
useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(
166166
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>[], T>,
167167
): ModelMutationModelResult<Schema, Model, T, true>;
168168

169-
useUpsert<T extends UpsertArgs<Schema, Model, true>>(
169+
useUpsert<T extends UpsertArgs<Schema, Model>>(
170170
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
171171
): ModelMutationModelResult<Schema, Model, T>;
172172

173-
useDelete<T extends DeleteArgs<Schema, Model, true>>(
173+
useDelete<T extends DeleteArgs<Schema, Model>>(
174174
options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
175175
): ModelMutationModelResult<Schema, Model, T>;
176176

177-
useDeleteMany<T extends DeleteManyArgs<Schema, Model, true>>(
177+
useDeleteMany<T extends DeleteManyArgs<Schema, Model>>(
178178
options?: ModelMutationOptions<BatchResult, T>,
179179
): ModelMutationResult<BatchResult, T>;
180180

181-
useCount<T extends CountArgs<Schema, Model, true>>(
181+
useCount<T extends CountArgs<Schema, Model>>(
182182
args?: Subset<T, CountArgs<Schema, Model>>,
183183
options?: ModelQueryOptions<CountResult<Schema, Model, T>>,
184184
): ModelQueryResult<CountResult<Schema, Model, T>>;
185185

186-
useAggregate<T extends AggregateArgs<Schema, Model, true>>(
186+
useAggregate<T extends AggregateArgs<Schema, Model>>(
187187
args: Subset<T, AggregateArgs<Schema, Model>>,
188188
options?: ModelQueryOptions<AggregateResult<Schema, Model, T>>,
189189
): ModelQueryResult<AggregateResult<Schema, Model, T>>;
190190

191-
useGroupBy<T extends GroupByArgs<Schema, Model, true>>(
191+
useGroupBy<T extends GroupByArgs<Schema, Model>>(
192192
args: Subset<T, GroupByArgs<Schema, Model>>,
193193
options?: ModelQueryOptions<GroupByResult<Schema, Model, T>>,
194194
): ModelQueryResult<GroupByResult<Schema, Model, T>>;

‎packages/clients/tanstack-query/test/schemas/basic/schema-lite.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* eslint-disable */
77

88
import { type SchemaDef, ExpressionUtils } from "@zenstackhq/orm/schema";
9-
export const schema = {
9+
const _schema = {
1010
provider: {
1111
type: "sqlite"
1212
},
@@ -169,4 +169,8 @@ export const schema = {
169169
authType: "User",
170170
plugins: {}
171171
} as const satisfies SchemaDef;
172-
export type SchemaType = typeof schema;
172+
type Schema = typeof _schema & {
173+
__brand?: "schema";
174+
};
175+
export const schema: Schema = _schema;
176+
export type SchemaType = Schema;

0 commit comments

Comments
 (0)