proteum 2.1.9-8 → 2.2.0

package/server/services/router/response/index.ts

@@ -17,7 +17,6 @@ import ServerRequest from '@server/services/router/request';
 import { TMatchedRoute, TRoute, TAnyRoute } from '@common/router';
 import { NotFound, Forbidden, Anomaly } from '@common/errors';
 import BaseResponse, { TResponseData } from '@common/router/response';
-import { splitRouteSetupResult } from '@common/router/pageSetup';
 import Page from './page';
 import createControllers from '@generated/common/controllers';
 import type { TControllers } from '@generated/common/controllers';
@@ -220,32 +219,6 @@ export default class ServerResponse<
     - INTERNAL
     ----------------------------------*/
 
-    public async resolveRouteOptions(
-        route: TMatchedRoute<TRouterContext<TRouter>>,
-    ): Promise<TMatchedRoute<TRouterContext<TRouter>>> {
-        const setup = route.options.setup;
-        if (!setup) return route;
-
-        const requestContext = await this.createContext(route);
-        const { options } = splitRouteSetupResult(((setup as any)({ ...requestContext, data: this.request.data }) as {}) || {});
-
-        this.app.container.Trace.record(
-            this.request.id,
-            'setup.options',
-            {
-                optionKeys: Object.keys(options),
-                source: {
-                    filepath: route.options.filepath || '',
-                    line: route.options.sourceLocation?.line || 0,
-                    column: route.options.sourceLocation?.column || 0,
-                },
-            },
-            'resolve',
-        );
-
-        return { ...route, options: { ...route.options, ...options } };
-    }
-
     // Start controller services
     private async createContext(route: TAnyRoute<TRouterContext<TRouter>>): Promise<TRequestContext> {
         const contextServices = this.router.createContextServices(this.request);

package/types/global/vendors.d.ts

@@ -3,6 +3,18 @@ declare module 'accepts' {
     export default accepts;
 }
 
+declare module '@babel/generator' {
+    const generate: any;
+    export default generate;
+}
+
+declare module '@babel/traverse' {
+    export type Binding = any;
+    export type NodePath<T = any> = any;
+    const traverse: any;
+    export default traverse;
+}
+
 declare module 'bytes' {
     const bytes: (value: string | number) => number;
     export default bytes;

package/types/vendors.d.ts

@@ -3,6 +3,18 @@ declare module 'accepts' {
     export default accepts;
 }
 
+declare module '@babel/generator' {
+    const generate: any;
+    export default generate;
+}
+
+declare module '@babel/traverse' {
+    export type Binding = any;
+    export type NodePath<T = any> = any;
+    const traverse: any;
+    export default traverse;
+}
+
 declare module 'bytes' {
     const bytes: (value: string | number) => number;
     export default bytes;

package/common/router/pageSetup.ts

@@ -1,51 +0,0 @@
-/*----------------------------------
-- TYPES
-----------------------------------*/
-
-import type { TRouteOptions } from '.';
-
-export const routeSetupOptionKeys = [
-    'priority',
-    'preload',
-    'domain',
-    'accept',
-    'raw',
-    'auth',
-    'authTracking',
-    'redirectLogged',
-    'static',
-    'whenStatic',
-    'canonicalParams',
-    'layout',
-    'TESTING',
-    'logging',
-] as const satisfies (keyof TRouteOptions)[];
-
-export const reservedRouteSetupKeys = ['id', 'filepath', 'bodyId', 'data', 'setup'] as const;
-
-const routeSetupOptionKeysSet = new Set<string>(routeSetupOptionKeys);
-const reservedRouteSetupKeysSet = new Set<string>(reservedRouteSetupKeys);
-
-export const getRouteSetupOptionKey = (key: string) => {
-    const normalizedKey = key.startsWith('_') ? key.substring(1) : key;
-
-    if (reservedRouteSetupKeysSet.has(normalizedKey)) throw new Error(`"${key}" is a reserved Router.page setup key.`);
-
-    return routeSetupOptionKeysSet.has(normalizedKey) ? (normalizedKey as keyof TRouteOptions) : null;
-};
-
-export const splitRouteSetupResult = (result: TObjetDonnees | undefined) => {
-    const options: Partial<TRouteOptions> = {};
-    const data: TObjetDonnees = {};
-
-    if (!result) return { options, data };
-
-    for (const key in result) {
-        const optionKey = getRouteSetupOptionKey(key);
-
-        if (optionKey) options[optionKey] = result[key];
-        else data[key] = result[key];
-    }
-
-    return { options, data };
-};