Merge pull request #127 from tjsr/develop/esh-config-types

Use types from ESH library.

package.json

@@ -10,7 +10,7 @@
   "scripts": {
     "clean": "npx rimraf dist build",
     "clean:all": "npm run clean && npx rimraf build coverage dist node_modules",
-    "test": "vitest --run && npm run lint",
+    "test": "tsc && vitest --run && npm run lint",
     "start:frontend": "cross-env GENERATE_SOURCEMAP=true PORT=3008 vite dev",
     "start:dev": "nodemon index.ts && cross-env PORT=3008 vite dev",
     "start:prod": "node index.js",

src/types.ts

@@ -1,4 +1,4 @@
-import { ExpressServerConfig } from './types/expressConfig.js';
+import { ExpressServerConfig } from '@tjsr/express-server-helper';
 import { uuid5 } from '@tjsr/user-session-middleware';
 
 export type UserId = uuid5;

src/types/expressConfig.ts

@@ -1,5 +1,4 @@
-import { UserSessionOptions } from '@tjsr/user-session-middleware';
-import cookieParser from 'cookie-parser';
+import { ExpressServerConfig } from '@tjsr/express-server-helper';
 
 export type Plugins =
   | 'morgan'
@@ -11,21 +10,6 @@ export type Plugins =
   | 'urlEncoded'
   | 'json';
 
-export type PluginKeys = {
-  [_key in Plugins]?: boolean | unknown;
-};
-
-export interface ExpressServerConfig extends PluginKeys {
-  cookieParserOptions?: cookieParser.CookieParseOptions;
-  cookieParserSecret?: string | string[];
-  exposeHeaders: string | undefined;
-  json: boolean;
-  sessionOptions: Partial<UserSessionOptions>;
-  // sessionStore?: session.Store;
-  trustProxy: boolean;
-  urlEncoded: boolean;
-}
-
 export const EXPRESS_DEFAULT_OPTIONS: ExpressServerConfig = {
   // TODO: express-session no longer needs cookie parser, so if the app isn't using cookies, eg we're
   // going to store all user data in a session, we don't need to use cookie-parser.