fix(types): use new utility types

Author: djMax

src/dependencies.ts

@@ -9,8 +9,8 @@ function sortByKey(deps: Record<string, string>) {
 
 export function dependencies({ features }: { features: string[] }) {
   const deps = {
-    '@openapi-typescript-infra/coconfig': '^4.1.0',
-    '@openapi-typescript-infra/service': '^2.7.1',
+    '@openapi-typescript-infra/coconfig': '^4.2.0',
+    '@openapi-typescript-infra/service': '^2.7.3',
   } as Record<string, string>;
   if (features.includes('db')) {
     Object.assign(deps, {

templates/all/src/index.ts.hbs

@@ -7,12 +7,12 @@ import { Kysely, PostgresDialect } from 'kysely';
 import type { DB } from './generated/database';
 {{else}}
 {{/inArray}}
-import type { {{properCase name}}Locals, {{properCase name}}Service, {{properCase name}}ConfigSchema } from './types';
+import type { {{properCase name}}, {{properCase name}}ConfigSchema } from './types';
 
 type Config = {{properCase name}}ConfigSchema;
 
-export function service(): {{properCase name}}Service {
-  const base = useService<{{properCase name}}Locals>();
+export function service(): {{properCase name}}['Service'] {
+  const base = useService<{{properCase name}}['ServiceLocals']>();
   return {
     ...base,
     async start(app) {

templates/all/src/types/service.ts.hbs

@@ -6,6 +6,7 @@ import type {
   Service,
   ServiceExpress,
   ServiceLocals,
+  ServiceTypes,
 } from '@openapi-typescript-infra/service';
 
 {{#inArray features 'db'}}
@@ -19,16 +20,9 @@ export interface {{properCase name}}Locals extends ServiceLocals {
 {{/inArray}}
 }
 
-export type {{properCase name}}RequestLocals = RequestLocals;
+export interface {{properCase name}}RequestLocals extends RequestLocals {}
 
-export type {{properCase name}}Request = RequestWithApp<{{properCase name}}Locals>;
-
-export type {{properCase name}}Service = Service<
-  {{properCase name}}Locals,
-  {{properCase name}}RequestLocals
->;
-
-export type {{properCase name}}App = ServiceExpress<{{properCase name}}Locals>;
+export interface {{properCase name}} extends ServiceTypes<{{properCase name}}Locals, {{properCase name}}RequestLocals> {}
 
 export type {{properCase name}}Api = operationHandlers<
   {{properCase name}}Locals,