Skip to content

Commit 11ace4a

Browse files
ci: apply automated fixes
1 parent 9f883a5 commit 11ace4a

7 files changed

Lines changed: 41 additions & 37 deletions

File tree

packages/db/src/query/builder/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,9 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
502502
callback: (refs: RefsForContext<TContext>) => TSelectValue,
503503
): QueryBuilder<WithResult<TContext, ResultTypeFromSelectValue<TSelectValue>>>
504504
select(
505-
callback: (refs: RefsForContext<TContext>) => SelectObject | ScalarSelectValue,
505+
callback: (
506+
refs: RefsForContext<TContext>,
507+
) => SelectObject | ScalarSelectValue,
506508
) {
507509
const aliases = this._getCurrentAliases()
508510
const refProxy = createRefProxy(aliases) as RefsForContext<TContext>

packages/db/src/query/live-query-collection.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ export function liveQueryCollectionOptions<
7575
TResult extends object = RootQueryResult<TContext>,
7676
>(
7777
config: LiveQueryCollectionConfig<TContext, TResult> & {
78-
query:
79-
| RootQueryFn<TQuery>
80-
| RootQueryBuilder<TQuery>
78+
query: RootQueryFn<TQuery> | RootQueryBuilder<TQuery>
8179
},
8280
): CollectionConfigForContext<TContext, TResult> & {
8381
utils: LiveQueryCollectionUtils
@@ -146,9 +144,7 @@ export function createLiveQueryCollection<
146144
TUtils extends UtilsRecord = {},
147145
>(
148146
config: LiveQueryCollectionConfig<TContext, RootQueryResult<TContext>> & {
149-
query:
150-
| RootQueryFn<TQuery>
151-
| RootQueryBuilder<TQuery>
147+
query: RootQueryFn<TQuery> | RootQueryBuilder<TQuery>
152148
utils?: TUtils
153149
},
154150
): CollectionForContext<TContext, RootQueryResult<TContext>> & {
@@ -163,8 +159,9 @@ export function createLiveQueryCollection<
163159
>(
164160
configOrQuery:
165161
| (LiveQueryCollectionConfig<TContext, TResult> & { utils?: TUtils })
166-
| ((q: InitialQueryBuilder) => QueryBuilder<TContext> &
167-
RootObjectResultConstraint<TContext>),
162+
| ((
163+
q: InitialQueryBuilder,
164+
) => QueryBuilder<TContext> & RootObjectResultConstraint<TContext>),
168165
): CollectionForContext<TContext, TResult> & {
169166
utils: LiveQueryCollectionUtils & TUtils
170167
} {

packages/db/src/query/live/types.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,9 @@ export interface LiveQueryCollectionConfig<
7070
* Query builder function that defines the live query
7171
*/
7272
query:
73-
| ((q: InitialQueryBuilder) => QueryBuilder<TContext> &
74-
RootObjectResultConstraint<TContext>)
73+
| ((
74+
q: InitialQueryBuilder,
75+
) => QueryBuilder<TContext> & RootObjectResultConstraint<TContext>)
7576
| (QueryBuilder<TContext> & RootObjectResultConstraint<TContext>)
7677

7778
/**

packages/db/src/query/live/utils.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,11 @@ export function buildQueryFromConfig<TContext extends Context>(config: {
200200
? buildQuery<TContext>(config.query)
201201
: getQueryIR(config.query)
202202

203-
if (config.requireObjectResult && query.select && !isNestedSelectObject(query.select)) {
203+
if (
204+
config.requireObjectResult &&
205+
query.select &&
206+
!isNestedSelectObject(query.select)
207+
) {
204208
throw new UnsupportedRootScalarSelectError()
205209
}
206210

packages/db/src/query/query-once.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ export interface QueryOnceConfig<TContext extends Context> {
2020
* Query builder function that defines the query
2121
*/
2222
query:
23-
| ((q: InitialQueryBuilder) => QueryBuilder<TContext> &
24-
RootObjectResultConstraint<TContext>)
23+
| ((
24+
q: InitialQueryBuilder,
25+
) => QueryBuilder<TContext> & RootObjectResultConstraint<TContext>)
2526
| (QueryBuilder<TContext> & RootObjectResultConstraint<TContext>)
2627
// Future: timeout, signal, etc.
2728
}
@@ -81,18 +82,17 @@ export function queryOnce<
8182
*/
8283
export function queryOnce<TQuery extends QueryBuilder<any>>(
8384
config: QueryOnceConfig<ExtractContext<TQuery>> & {
84-
query:
85-
| RootQueryFn<TQuery>
86-
| RootQueryBuilder<TQuery>
85+
query: RootQueryFn<TQuery> | RootQueryBuilder<TQuery>
8786
},
8887
): Promise<InferResultType<ExtractContext<TQuery>>>
8988

9089
// Implementation
9190
export async function queryOnce<TContext extends Context>(
9291
configOrQuery:
9392
| QueryOnceConfig<TContext>
94-
| ((q: InitialQueryBuilder) => QueryBuilder<TContext> &
95-
RootObjectResultConstraint<TContext>),
93+
| ((
94+
q: InitialQueryBuilder,
95+
) => QueryBuilder<TContext> & RootObjectResultConstraint<TContext>),
9696
): Promise<InferResultType<TContext>> {
9797
// Normalize input
9898
const config: QueryOnceConfig<TContext> =

packages/db/tests/query/includes.test-d.ts

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -382,31 +382,29 @@ describe(`includes subquery types`, () => {
382382
createLiveQueryCollection((q) =>
383383
q.from({ m: messages }).select(({ m }) => ({
384384
id: m.id,
385-
content:
386-
concat(
387-
// @ts-expect-error - concat(toArray(...)) requires a scalar child select
388-
toArray(
389-
q
390-
.from({ c: chunks })
391-
.where(({ c }) => eq(c.messageId, m.id))
392-
.select(({ c }) => ({
393-
text: c.text,
394-
})),
395-
),
385+
content: concat(
386+
// @ts-expect-error - concat(toArray(...)) requires a scalar child select
387+
toArray(
388+
q
389+
.from({ c: chunks })
390+
.where(({ c }) => eq(c.messageId, m.id))
391+
.select(({ c }) => ({
392+
text: c.text,
393+
})),
396394
),
395+
),
397396
})),
398397
)
399398

400399
createLiveQueryCollection((q) =>
401400
q.from({ m: messages }).select(({ m }) => ({
402401
id: m.id,
403-
content:
404-
concat(
405-
// @ts-expect-error - concat(toArray(...)) requires the child query result to be scalar
406-
toArray(
407-
q.from({ c: chunks }).where(({ c }) => eq(c.messageId, m.id)),
408-
),
402+
content: concat(
403+
// @ts-expect-error - concat(toArray(...)) requires the child query result to be scalar
404+
toArray(
405+
q.from({ c: chunks }).where(({ c }) => eq(c.messageId, m.id)),
409406
),
407+
),
410408
})),
411409
)
412410
})

packages/db/tests/query/select-spread.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@ describe(`select spreads (runtime)`, () => {
116116

117117
const results = Array.from(collection.values())
118118
expect(results).toHaveLength(2)
119-
expect(results.map((row) => stripVirtualProps(row))).toEqual(initialMessages)
119+
expect(results.map((row) => stripVirtualProps(row))).toEqual(
120+
initialMessages,
121+
)
120122
expect(stripVirtualProps(collection.get(1))).toEqual(initialMessages[0])
121123
})
122124

0 commit comments

Comments
 (0)