Fix controller action types for strict mode compatibility

- Remove `extends ModelController` constraints from action type
  generics, default to `any` to break self-referencing circularity
- Use conditional type for ModelFromModelController
- Add @ts-expect-error for intentionally invalid action test
- Handle nullable viteConfig in test build helper

Author: puckey

packages/server/types/index.d.ts

@@ -1924,7 +1924,7 @@ export type ActionParameter = Schema & { name: string }
  * is bound to the controller instance.
  */
 export type ModelControllerActionHandler<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > = (this: $ModelController, ctx: KoaContext, ...args: any[]) => any
 
 /**
@@ -2034,7 +2034,7 @@ export type ControllerActionOptions<
 }
 
 export type ModelControllerActionOptions<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > = BaseControllerActionOptions & {
   /** The function to be called when the action route is requested. */
   handler: ModelControllerActionHandler<$ModelController>
@@ -2068,7 +2068,7 @@ export type MemberActionParameter<$Model extends Model = Model> =
  * `handler` or a bare handler function.
  */
 export type ModelControllerAction<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > =
   | ModelControllerActionOptions<$ModelController>
   | ModelControllerActionHandler<$ModelController>
@@ -2079,15 +2079,15 @@ export type ModelControllerAction<
  * `'post'`, `'post login'`).
  */
 export type ModelControllerActions<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > = {
   [name: ControllerActionName]: ModelControllerAction<$ModelController>
   allow?: OrReadOnly<ControllerActionName[]>
   authorize?: Authorize
 }
 
 type ModelControllerMemberAction<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > =
   | (Omit<ModelControllerActionOptions<$ModelController>, 'parameters'> & {
       parameters?: {
@@ -2105,7 +2105,7 @@ type ModelControllerMemberAction<
  * parameters to receive the resolved member model.
  */
 export type ModelControllerMemberActions<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > = {
   [name: ControllerActionName]: ModelControllerMemberAction<$ModelController>
   allow?: OrReadOnly<ControllerActionName[]>
@@ -2177,7 +2177,7 @@ type ModelControllerHookKeys<
   | '*'
 }`
 type ModelControllerHook<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > = (
   ctx: KoaContext,
   result: objection.Page<ModelFromModelController<$ModelController>>
@@ -2215,7 +2215,7 @@ type HandlerFromHookKey<
   : never
 
 type ModelControllerHooks<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > = {
   [$Key in HookKeysFromController<$ModelController>]?: HandlerFromHookKey<
     $ModelController,
@@ -2271,12 +2271,12 @@ export class CollectionController<
    * The controller's collection actions with built-in CRUD
    * defaults.
    */
-  collection?: ModelControllerActions<CollectionController<$Model>>
+  collection?: ModelControllerActions
   /**
    * The controller's member actions with built-in CRUD
    * defaults.
    */
-  member?: ModelControllerMemberActions<CollectionController<$Model>>
+  member?: ModelControllerMemberActions
 
   /** Creates a query builder for this controller's model. */
   query(trx?: objection.Transaction): QueryBuilder<$Model>
@@ -2397,12 +2397,12 @@ export class ModelController<
    * The controller's collection actions. Wrap actions in
    * this object to assign them to the collection.
    */
-  collection?: ModelControllerActions<ModelController<$Model>>
+  collection?: ModelControllerActions
   /**
    * The controller's member actions. Wrap actions in this
    * object to assign them to the member.
    */
-  member?: ModelControllerMemberActions<ModelController<$Model>>
+  member?: ModelControllerMemberActions
   assets?:
     | boolean
     | {
@@ -3527,8 +3527,8 @@ type OrReadOnly<T> = Readonly<T> | T
 
 type OrPromiseOf<T> = Promise<T> | T
 
-type ModelFromModelController<$ModelController extends ModelController> =
-  InstanceType<Exclude<$ModelController['modelClass'], undefined>>
+type ModelFromModelController<$ModelController> =
+  $ModelController extends ModelController<infer $Model> ? $Model : Model
 
 type SerializeModelPropertyValue<T> = T extends (infer U)[]
   ? SerializeModelPropertyValue<U>[]

tests/server/controller.test.ts

@@ -29,7 +29,8 @@ describe('Controller action names', () => {
       override collection: ModelControllerActions<Tasks> = {
         allow: ['get'],
         // Bare action name — not prefixed with an HTTP method
-        test(ctx) {
+        // @ts-expect-error Intentionally invalid action name
+        test(ctx: any) {
           return { ok: true }
         }
       }

tests/utils/app.ts

@@ -125,7 +125,7 @@ export function createTestApp(
           })
 
         const { build } = await import('vite')
-        await build(viteConfig)
+        await build(viteConfig ?? undefined)
       })
     } else {
       // After setup() registers controllers but