Type better baseUrlFunc and discoveryFunc

Author: ricardo-devis-agullo

src/registry/middleware/base-url-handler.ts

@@ -5,10 +5,6 @@ export default function baseUrlHandler(
   res: Response,
   next: NextFunction
 ): void {
-  res.conf.baseUrlFunc =
-    res.conf.baseUrlFunc ||
-    (typeof res.conf.baseUrl === 'function' ? res.conf.baseUrl : undefined);
-
   if (res.conf.baseUrlFunc) {
     res.conf.baseUrl = res.conf.baseUrlFunc({
       host: req.headers.host,

src/registry/routes/dependencies.ts

@@ -4,7 +4,7 @@ import getAvailableDependencies from './helpers/get-available-dependencies';
 
 export default function dependencies(conf: Config) {
   return function (req: Request, res: Response): void {
-    if (conf.discovery) {
+    if (res.conf.discovery) {
       const dependencies = getAvailableDependencies(conf.dependencies).map(
         ({ core, name, version }) => {
           const dep: { name: string; core: boolean; versions?: string[] } = {

src/registry/routes/plugins.ts

@@ -3,7 +3,7 @@ import { Config } from '../../types';
 
 export default function plugins(conf: Config) {
   return (req: Request, res: Response): void => {
-    if (conf.discovery) {
+    if (res.conf.discovery) {
       const plugins = Object.entries(conf.plugins).map(
         ([pluginName, pluginFn]) => ({
           name: pluginName,

src/types.ts

@@ -116,9 +116,9 @@ export interface VM {
 export interface Config {
   beforePublish: (req: Request, res: Response, next: NextFunction) => void;
   baseUrl: string;
-  baseUrlFunc: (opts: { host?: string; secure: boolean }) => string;
+  baseUrlFunc?: (opts: { host?: string; secure: boolean }) => string;
   discovery: boolean;
-  discoveryFunc: (opts: { host?: string; secure: boolean }) => boolean;
+  discoveryFunc?: (opts: { host?: string; secure: boolean }) => boolean;
   plugins: Record<string, (...args: unknown[]) => void>;
   local: boolean;
   tempDir: string;