proteum 1.0.3 → 2.0.0

package/common/router/request/index.ts

@@ -12,12 +12,10 @@ import type { TBasicUser } from '@server/services/auth';
 - TYPES
 ----------------------------------*/
 
-
 /*----------------------------------
 - CONTEXT
 ----------------------------------*/
 export default abstract class BaseRequest {
-
     // Permet d'accèder à l'instance complète via spread
     public request: this = this;
     public url!: string;
@@ -27,9 +25,5 @@ export default abstract class BaseRequest {
     public abstract response?: Response;
     public user: TBasicUser | null = null;
 
-    public constructor(
-        public path: string,
-    ) {
-
-    }
-}
+    public constructor(public path: string) {}
+}

package/common/router/response/index.ts

@@ -2,35 +2,28 @@
 - DEPENDANCES
 ----------------------------------*/
 
-// Npm
-import { FunctionalComponent } from "preact";
-
 // Core
-import { TAnyRoute } from "..";
-import type ClientRequest from '@client/services/router/request';
-import Page from '@client/services/router/response/page'
+import { TAnyRoute } from '..';
+import type BaseRequest from '@common/router/request';
 
 /*----------------------------------
 - TYPES
 ----------------------------------*/
 
-export type TResponseData = Page
+export type TResponseData = unknown;
 
 /*----------------------------------
 - CONTEXT
 ----------------------------------*/
 export default abstract class BaseResponse<
-    TData extends TResponseData = Page,
-    TRequest extends ClientRequest = ClientRequest
+    TData extends TResponseData = TResponseData,
+    TRequest extends BaseRequest = BaseRequest,
 > {
-
     public data?: TData;
     public request: TRequest;
     public route?: TAnyRoute;
 
-    public constructor(
-        request: TRequest,
-    ) {
+    public constructor(request: TRequest) {
         // ServerResponse et ClientResponse assignent request.response
         request.response = this;
         this.request = request as TRequest;
@@ -41,5 +34,5 @@ export default abstract class BaseResponse<
         return this;
     }
 
-    public abstract redirect(url: string, code: number);
-}
+    public abstract redirect(url: string, code?: number, absolute?: boolean): unknown;
+}

package/common/router/response/page.ts

@@ -7,66 +7,71 @@ import type { VNode } from 'preact';
 import type { Thing } from 'schema-dts';
 
 // Core libs
-import { ClientOrServerRouter, TClientOrServerContextForPage, TRoute, TErrorRoute } from '@common/router';
-import { TFetcherList, TDataReturnedByFetchers } from '@common/router/request/api';
+import type { ClientContext } from '@/client/context';
+import { ClientOrServerRouter, TErrorRoute, TPageErrorRoute, TPageRoute, TRoute } from '@common/router';
+import type { TFetcher, TFetcherList } from '@common/router/request/api';
+import { splitRouteSetupResult } from '@common/router/pageSetup';
 
 /*----------------------------------
 - TYPES
 ----------------------------------*/
 
-// The function that fetch data from the api before to pass them as context to the renderer
-export type TDataProvider<TProvidedData extends TFetcherList = TFetcherList> = (
-    context: TClientOrServerContextForPage & {
+export type TPageSetupContext = ClientContext;
+
+export type TPageRenderContext = With<ClientContext, 'page'>;
+
+export type TResolvedPageData<TProvidedData extends {} = {}> = {
+    [Property in keyof TProvidedData]: TProvidedData[Property] extends TFetcher<infer TData>
+        ? TData
+        : Awaited<TProvidedData[Property]>;
+};
+
+// The function that prepares route config and SSR data before rendering.
+export type TPageSetup<TProvidedData extends {} = {}> = (
+    context: TPageSetupContext & {
         // URL query parameters
         // TODO: typings
-        data: {[key: string]: string | number}
-    }
-) => TProvidedData
+        data: { [key: string]: string | number };
+    },
+) => TProvidedData;
+
+export type TDataProvider<TProvidedData extends {} = TFetcherList> = (
+    context: TPageSetupContext & { data: { [key: string]: PrimitiveValue } },
+) => TProvidedData;
 
 // The function that renders routes
 export type TFrontRenderer<
-    TProvidedData extends TFetcherList = TFetcherList, 
+    TProvidedData extends {} = {},
     TAdditionnalData extends {} = {},
     TRouter = ClientOrServerRouter,
-> = ( 
-    context: (
-        TClientOrServerContextForPage 
-        &
-        TAdditionnalData
-        &
-        {
-            context: TClientOrServerContextForPage,
-            data: {[key: string]: PrimitiveValue}
-        }
-    )
-) => VNode<any> | null
+> = (
+    context: TPageRenderContext &
+        TResolvedPageData<TProvidedData> &
+        TAdditionnalData & { context: TPageRenderContext; data: { [key: string]: PrimitiveValue } },
+) => VNode<any> | null;
 
 // Script or CSS resource
-export type TPageResource = {
-    id: string,
-    attrs?: TObjetDonnees
-} & ({
-    inline: string
-} | {
-    url: string,
-    preload?: boolean
-    })
-
-type TMetasDict = {
-    [key: string]: string | Date | undefined | null
-}
+export type TPageResource = { id: string; attrs?: TObjetDonnees } & (
+    | { inline: string }
+    | { url: string; preload?: boolean }
+);
 
-type TMetasList = ({ $: string } & TMetasDict)[]
+type TMetasDict = { [key: string]: string | Date | undefined | null };
+
+type TMetasList = ({ $: string } & TMetasDict)[];
 
 const debug = false;
 
 /*----------------------------------
 - CLASS
 ----------------------------------*/
-export default abstract class PageResponse<TRouter extends ClientOrServerRouter = ClientOrServerRouter> {
-
+export default abstract class PageResponse<
+    TRouter extends ClientOrServerRouter = ClientOrServerRouter,
+    TRouteLike extends TRoute | TErrorRoute = TPageRoute | TPageErrorRoute,
+    TContext extends TPageRenderContext = TPageRenderContext,
+> {
     // Metadata
-    public chunkId: string;
+    public chunkId?: string;
     public title?: string;
     public description?: string;
     public bodyClass: Set<string> = new Set<string>();
@@ -79,50 +84,57 @@ export default abstract class PageResponse<TRouter extends ClientOrServerRouter
     public jsonld: Thing[] = [];
     public scripts: TPageResource[] = [];
     public style: TPageResource[] = [];
+    public layout?: { data?: TDataProvider };
 
     // Data
     public fetchers: TFetcherList = {};
     public data: TObjetDonnees = {};
 
     public constructor(
-        public route: TRoute | TErrorRoute,
+        public route: TRouteLike,
         public renderer: TFrontRenderer,
-        public context: TClientOrServerContextForPage
+        public context: TContext,
     ) {
-
-        this.chunkId = context.route.options["id"];
+        this.chunkId = context.route.options.id;
 
         this.url = context.request.url;
-
-        this.fetchers = this.createFetchers(route.options.data);
-       
     }
 
-    private createFetchers( dataProvider?: TDataProvider ) {
+    private resolveSetup() {
+        const setup = this.route.options.setup;
+        if (!setup) return { options: {}, data: {} };
 
-        // Load the fetchers list to load data if needed
-        if (dataProvider)
-            return dataProvider({
-                ...this.context,
-                data: this.context.request.data
-            });
-        else
-            return {}
+        const setupContext = { ...this.context, data: this.context.request.data } as Parameters<typeof setup>[0];
 
+        return splitRouteSetupResult(setup(setupContext) || {});
     }
-    
+
+    private createFetchers() {
+        const { options, data } = this.resolveSetup();
+        this.route.options = { ...this.route.options, ...options };
+        this.chunkId = this.route.options.id;
+
+        return data as TFetcherList;
+    }
+
     public async fetchData() {
+        this.fetchers = this.createFetchers();
+        this.bodyId = this.route.options.bodyId;
 
         // Fetch layout data
         if (this.layout?.data) {
-            const fetchers = this.createFetchers(this.layout.data);
+            const layoutContext = {
+                ...this.context,
+                data: this.context.request.data,
+            } as Parameters<typeof this.layout.data>[0];
+            const fetchers = this.layout.data(layoutContext);
             this.fetchers = { ...this.fetchers, ...fetchers };
         }
 
         // Fetch page data
         debug && console.log(`[router][page] Fetching api data:` + Object.keys(this.fetchers));
-        this.data = await this.context.request.api.fetchSync( this.fetchers, this.data );
+        this.data = await this.context.request.api.fetchSync(this.fetchers, this.data);
 
         return this.data;
     }
-}
+}

package/common/utils.ts

@@ -4,4 +4,4 @@
  * @param seconds The number of seconds to wait
  * @returns A void promise
  */
-export const seconds = (seconds: number) => new Promise((resolve) => setTimeout(resolve, seconds * 1000));
+export const seconds = (seconds: number) => new Promise((resolve) => setTimeout(resolve, seconds * 1000));

package/eslint.js

@@ -0,0 +1,62 @@
+const tseslint = require('typescript-eslint');
+const reactPlugin = require('eslint-plugin-react');
+const reactHooksPlugin = require('eslint-plugin-react-hooks');
+const jsxA11yPlugin = require('eslint-plugin-jsx-a11y');
+
+const defaultIgnores = [
+    '**/node_modules/**',
+    '**/bin/**',
+    '**/bin-dev/**',
+    '**/.generated/**',
+    '**/var/**',
+];
+
+const createDoubleAssertionSelector = (typeKeyword) =>
+    `TSAsExpression[expression.type='TSAsExpression'][expression.typeAnnotation.type='${typeKeyword}']`;
+
+const createProteumEslintConfig = ({ ignores = [] } = {}) => [
+    {
+        ignores: [...defaultIgnores, ...ignores],
+    },
+    {
+        linterOptions: {
+            reportUnusedDisableDirectives: 'off',
+        },
+    },
+    {
+        files: ['**/*.{ts,tsx,mts,cts}'],
+        languageOptions: {
+            parser: tseslint.parser,
+            parserOptions: {
+                ecmaVersion: 'latest',
+                sourceType: 'module',
+                ecmaFeatures: {
+                    jsx: true,
+                },
+            },
+        },
+        plugins: {
+            '@typescript-eslint': tseslint.plugin,
+            react: reactPlugin,
+            'react-hooks': reactHooksPlugin,
+            'jsx-a11y': jsxA11yPlugin,
+        },
+        rules: {
+            'no-restricted-syntax': [
+                'error',
+                {
+                    selector: createDoubleAssertionSelector('TSUnknownKeyword'),
+                    message: 'Do not use double assertions through `unknown`.',
+                },
+                {
+                    selector: createDoubleAssertionSelector('TSAnyKeyword'),
+                    message: 'Do not use double assertions through `any`.',
+                },
+            ],
+        },
+    },
+];
+
+module.exports = {
+    createProteumEslintConfig,
+};

package/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "proteum",
-	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "1.0.3",
+	"description": "AI-first SSR, SEO, and TypeScript framework optimized for autonomous agent development.",
+	"version": "2.0.0",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/proteum.git",
 	"license": "MIT",
 	"engines": {
-		"node": ">=16.1.0",
+		"node": ">=20.19.0",
 		"npm": ">=3.10.10"
 	},
 	"keywords": [
@@ -16,42 +16,26 @@
 		"proteum": "cli/bin.js"
 	},
 	"dependencies": {
-		"@babel/cli": "^7.15.4",
-		"@babel/plugin-proposal-class-properties": "^7.14.5",
-		"@babel/plugin-proposal-decorators": "^7.25.9",
-		"@babel/plugin-proposal-private-methods": "^7.14.5",
-		"@babel/plugin-proposal-private-property-in-object": "^7.15.4",
-		"@babel/plugin-transform-react-constant-elements": "^7.14.5",
-		"@babel/preset-env": "^7.15.6",
-		"@babel/preset-react": "^7.14.5",
-		"@babel/preset-typescript": "^7.15.0",
-		"@prefresh/webpack": "^3.3.2",
 		"@prisma/client": "^6.5.0",
+		"@rspack/core": "^1.7.9",
 		"@tailwindcss/postcss": "^4.1.17",
 		"accepts": "^1.3.7",
 		"ansi-to-html": "^0.7.1",
 		"autoprefixer": "^10.4.21",
 		"aws-sdk": "^2.1415.0",
-		"babel-loader": "^10.0.0",
-		"babel-plugin-glob-import": "^0.0.9-1",
-		"babel-plugin-transform-imports": "^2.0.0",
-		"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-		"babel-plugin-transform-remove-console": "^6.9.4",
 		"bowser": "^2.11.0",
-		"brotli-webpack-plugin": "^1.1.0",
-		"browser-sync": "^2.27.5",
 		"cli-highlight": "^2.1.11",
 		"compression": "^1.7.4",
-		"compression-webpack-plugin": "^8.0.1",
 		"cookie-parser": "^1.4.5",
-		"core-js": "^3.18.1",
 		"cors": "^2.8.5",
 		"cron-parser": "^4.0.0",
 		"css-loader": "^6.2.0",
-		"css-minimizer-webpack-plugin": "^7.0.4",
 		"dayjs": "^1.11.5",
-		"dottie": "^2.0.2",
 		"escape-regexp": "^0.0.1",
+		"eslint": "^9.39.4",
+		"eslint-plugin-jsx-a11y": "^6.10.2",
+		"eslint-plugin-react": "^7.37.5",
+		"eslint-plugin-react-hooks": "^7.0.1",
 		"express": "^4.17.1",
 		"express-csp-header": "^5.0.0",
 		"express-fileupload": "^1.2.1",
@@ -63,34 +47,23 @@
 		"history": "^5.0.1",
 		"hpp": "^0.2.3",
 		"human-interval": "^2.0.1",
-		"image-minimizer-webpack-plugin": "^4.1.4",
-		"imagemin": "^9.0.1",
-		"imagemin-svgo": "^10.0.0",
-		"imagemin-webp": "^6.0.0",
 		"intl": "^1.2.5",
 		"iso-639-1": "^2.1.9",
-		"json5": "^2.2.0",
 		"jsonwebtoken": "^8.5.1",
 		"less-loader": "^10.0.1",
-		"load-script": "^2.0.0",
 		"locale": "^0.1.0",
 		"markdown-it": "^13.0.1",
 		"md5": "^2.3.0",
 		"mime-types": "^2.1.35",
-		"mini-css-extract-plugin": "^2.2.2",
 		"module-alias": "^2.2.2",
 		"mysql2": "^2.3.0",
 		"node-cmd": "^5.0.0",
 		"null-loader": "^4.0.1",
-		"object-sizeof": "^1.6.3",
 		"path-to-regexp": "^6.2.0",
 		"postcss-loader": "^8.2.0",
 		"preact": "^10.27.1",
 		"preact-render-to-string": "^6.6.1",
-		"prettier": "^3.3.3",
 		"prompts": "^2.4.2",
-		"react-dev-utils": "^11.0.4",
-		"regenerator-runtime": "^0.13.9",
 		"replace-once": "^1.0.0",
 		"request": "^2.88.2",
 		"responsive-loader": "^3.1.2",
@@ -99,17 +72,15 @@
 		"slugify": "^1.6.6",
 		"source-map-support": "^0.5.21",
 		"stopword": "^3.1.1",
+		"style-loader": "^4.0.0",
 		"tailwindcss": "^4.1.17",
-		"terser-webpack-plugin": "^5.2.4",
 		"ts-alias": "^0.0.7",
 		"ts-node": "^10.9.1",
 		"tslog": "^4.9.1",
+		"typescript": "^5.9.3",
+		"typescript-eslint": "^8.57.1",
 		"uuid": "^8.3.2",
 		"validator": "^13.7.0",
-		"webpack": "^5.104.1",
-		"webpack-assets-manifest": "^5.0.6",
-		"webpack-bundle-analyzer": "^4.4.2",
-		"ws": "^8.2.2",
 		"yaml": "^1.10.2",
 		"yargs-parser": "^21.1.1",
 		"youch": "^3.3.3",
@@ -117,8 +88,6 @@
 		"zod": "^4.1.5"
 	},
 	"devDependencies": {
-		"@types/babel__core": "^7.1.16",
-		"@types/babel__preset-env": "^7.9.6",
 		"@types/cookie": "^0.4.1",
 		"@types/express": "^4.17.13",
 		"@types/favicons": "^6.2.2",
@@ -132,10 +101,8 @@
 		"@types/prompts": "^2.0.14",
 		"@types/sharp": "^0.31.1",
 		"@types/universal-analytics": "^0.4.5",
-		"@types/webpack-env": "^1.16.2",
-		"@types/ws": "^7.4.7",
 		"@types/yargs-parser": "^21.0.0",
 		"schema-dts": "^1.1.2",
-		"speed-measure-webpack-v5-plugin": "^1.5.2"
+		"webpack-bundle-analyzer": "^5.2.0"
 	}
 }

package/prettier.config.cjs

@@ -0,0 +1,9 @@
+module.exports = {
+    tabWidth: 4,
+    printWidth: 120,
+    singleQuote: true,
+    jsxSingleQuote: false,
+    semi: true,
+    trailingComma: 'all',
+    objectWrap: 'preserve',
+};

package/scripts/cleanup-generated-controllers.ts

@@ -0,0 +1,62 @@
+import fs from 'fs-extra';
+import path from 'path';
+
+const findControllerFiles = (dir: string): string[] => {
+    if (!fs.existsSync(dir)) return [];
+
+    const files: string[] = [];
+
+    for (const dirent of fs.readdirSync(dir, { withFileTypes: true })) {
+        const filepath = path.join(dir, dirent.name);
+
+        if (dirent.isDirectory()) {
+            files.push(...findControllerFiles(filepath));
+            continue;
+        }
+
+        if (dirent.isFile() && dirent.name.endsWith('.controller.ts')) files.push(filepath);
+    }
+
+    return files;
+};
+
+const repoRoots = process.argv.slice(2);
+if (!repoRoots.length)
+    throw new Error('Usage: ts-node scripts/cleanup-generated-controllers.ts <repo-root> [repo-root...]');
+
+for (const repoRoot of repoRoots) {
+    const controllerFiles = findControllerFiles(path.join(repoRoot, 'server', 'services'));
+    let updated = 0;
+
+    for (const controllerFile of controllerFiles) {
+        let content = fs.readFileSync(controllerFile, 'utf8');
+        let changed = false;
+
+        if (
+            content.includes('this.input(schema.') &&
+            content.includes("import Controller from '@server/app/controller';")
+        ) {
+            content = content.replace(
+                "import Controller from '@server/app/controller';",
+                "import Controller, { schema } from '@server/app/controller';",
+            );
+            changed = true;
+        }
+
+        if (content.includes('export default class indexController extends Controller')) {
+            const parentName = path.basename(path.dirname(controllerFile)).replace(/[^A-Za-z0-9_$]/g, '');
+            content = content.replace(
+                'export default class indexController extends Controller',
+                `export default class ${parentName || 'Generated'}Controller extends Controller`,
+            );
+            changed = true;
+        }
+
+        if (!changed) continue;
+
+        fs.writeFileSync(controllerFile, content);
+        updated++;
+    }
+
+    console.log(`[cleanup-generated-controllers] ${repoRoot}: updated ${updated} controller files`);
+}