fix(types): clean up some app types

Author: djMax

package.json

@@ -53,7 +53,7 @@
     "@commitlint/cli": "^17.8.0",
     "@commitlint/config-conventional": "^17.8.0",
     "@openapi-typescript-infra/coconfig": "^4.2.1",
-    "@openapi-typescript-infra/service": "^3.0.2",
+    "@openapi-typescript-infra/service": "^3.0.3",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/commit-analyzer": "^11.0.0",
     "@semantic-release/exec": "^6.0.3",

src/index.ts

@@ -16,6 +16,8 @@ import type {
   ServiceExpress,
   ServiceLocals,
   ServiceStartOptions,
+  AnyServiceLocals,
+  ConfigurationSchema,
 } from '@openapi-typescript-infra/service';
 
 let app: ServiceExpress | undefined;
@@ -47,7 +49,7 @@ async function getRootDirectory(cwd: string, root?: string) {
 }
 
 async function readOptions<
-  SLocals extends ServiceLocals = ServiceLocals,
+  SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>,
   RLocals extends RequestLocals = RequestLocals,
 >(
   cwd: string,
@@ -110,20 +112,23 @@ class RequestTestingHelpers {
   }
 }
 
-export interface ServiceUnderTest<SLocals extends ServiceLocals = ServiceLocals>
-  extends ServiceExpress<SLocals> {
+export interface ServiceUnderTest<
+  SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>,
+> extends ServiceExpress<SLocals> {
   test: RequestTestingHelpers;
 }
 
-export function getExistingApp<SLocals extends ServiceLocals = ServiceLocals>() {
+export function getExistingApp<
+  SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>,
+>() {
   if (!app) {
     throw new Error('getExistingApp requires a running app, and there is not one available.');
   }
   return app as ServiceUnderTest<SLocals>;
 }
 
 export async function getReusableApp<
-  SLocals extends ServiceLocals = ServiceLocals,
+  SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>,
   RLocals extends RequestLocals = RequestLocals,
 >(
   initialOptions?:

yarn.lock

@@ -669,7 +669,7 @@ __metadata:
     "@commitlint/cli": ^17.8.0
     "@commitlint/config-conventional": ^17.8.0
     "@openapi-typescript-infra/coconfig": ^4.2.1
-    "@openapi-typescript-infra/service": ^3.0.2
+    "@openapi-typescript-infra/service": ^3.0.3
     "@semantic-release/changelog": ^6.0.3
     "@semantic-release/commit-analyzer": ^11.0.0
     "@semantic-release/exec": ^6.0.3
@@ -700,9 +700,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openapi-typescript-infra/service@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@openapi-typescript-infra/service@npm:3.0.2"
+"@openapi-typescript-infra/service@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "@openapi-typescript-infra/service@npm:3.0.3"
   dependencies:
     "@godaddy/terminus": ^4.12.1
     "@opentelemetry/api": ^1.6.0
@@ -740,7 +740,7 @@ __metadata:
     read-pkg-up: ^7.0.1
   bin:
     start-service: build/bin/start-service.js
-  checksum: 1a622c790a8c4dcaba609ff92dab602b1372acab7c54a1547f4ecc43e4444fa9cd86f1d157ca46b3dd10efaca0767478f76b53d692554e94932fd7442bc1b04b
+  checksum: bb4a6ca2a33326815a021916cfd19598fe36322888eb735cf8fd3071fc36652330943a7d41ddca376dd7f6b6f6ff02772ccfc49dc8622f51b4596e4e6abe2dae
   languageName: node
   linkType: hard