feat(website): add translations (chinese, korean, japanese, german)

Author: marcj

packages/core/src/compiler.ts

@@ -12,7 +12,9 @@
 import { indent } from './indent.js';
 import { hasProperty } from './core.js';
 
-declare var process: any;
+declare var process: {
+    env: Record<string, string>;
+} | undefined;
 
 const indentCode = ('undefined' !== typeof process && process.env?.DEBUG || '').includes('deepkit');
 

packages/core/src/core.ts

@@ -464,6 +464,10 @@ export function getInheritanceChain(classType: ClassType): ClassType[] {
 }
 
 declare var v8debug: any;
+declare var process: {
+    execArgv: string[];
+    platform: string;
+} | undefined;
 
 export function inDebugMode() {
     return typeof v8debug === 'object' ||
@@ -497,7 +501,7 @@ export function getCurrentFileName(offset: number = 0): string {
     if (path.indexOf('file') >= 0) {
         path = new URL(path).pathname;
     }
-    if (path[0] === '/' && process.platform === 'win32') {
+    if (path[0] === '/' && 'undefined' !== typeof process && process.platform === 'win32') {
         path = path.slice(1);
     }
     return path;

packages/core/tsconfig.json

@@ -19,10 +19,6 @@
       "es2020",
       "es2022.error"
     ],
-    "types": [
-      "dot-prop",
-      "node"
-    ],
     "skipLibCheck": true
   },
   "reflection": true,
@@ -38,4 +34,4 @@
       "path": "../bench/tsconfig.json"
     }
   ]
-}
+}

packages/http/src/router.ts

@@ -8,18 +8,7 @@
  * You should have received a copy of the MIT License along with this program.
  */
 import { ClassType, CompilerContext, getClassName, isArray, isClass, urlJoin } from '@deepkit/core';
-import {
-    entity,
-    ReflectionClass,
-    ReflectionFunction,
-    ReflectionKind,
-    ReflectionParameter,
-    SerializationOptions,
-    serializer,
-    Serializer,
-    Type,
-    ValidationError,
-} from '@deepkit/type';
+import { entity, ReflectionClass, ReflectionFunction, ReflectionKind, ReflectionParameter, SerializationOptions, serializer, Serializer, Type, ValidationError } from '@deepkit/type';
 import { getActions, HttpAction, httpClass, HttpController, HttpDecorator } from './decorator.js';
 import { HttpRequest, HttpRequestPositionedParameters, HttpRequestQuery, HttpRequestResolvedParameters } from './model.js';
 import { InjectorContext, InjectorModule } from '@deepkit/injector';
@@ -30,7 +19,7 @@ import { HttpMiddlewareConfig, HttpMiddlewareFn } from './middleware.js';
 
 //@ts-ignore
 import qs from 'qs';
-import { HtmlResponse, JSONResponse, Response } from './http.js';
+import { HtmlResponse, JSONResponse, Redirect, Response } from './http.js';
 import { getRequestParserCodeForParameters, ParameterForRequestParser, parseRoutePathToRegex } from './request-parser.js';
 import { HttpConfig } from './module.config.js';
 
@@ -352,7 +341,7 @@ export interface HttpRouterFunctionOptions {
 function convertOptions(methods: string[], pathOrOptions: string | HttpRouterFunctionOptions, defaultOptions: Partial<HttpRouterFunctionOptions>): HttpRouterFunctionOptions {
     const options = 'string' === typeof pathOrOptions ? { path: pathOrOptions } : pathOrOptions;
     if (options.methods) return options;
-    return { ...options, methods };
+    return { ...defaultOptions, ...options, methods };
 }
 
 /**
@@ -444,6 +433,13 @@ export abstract class HttpRouterRegistryFunctionRegistrar {
         this.register(convertOptions(['HEAD'], pathOrOptions, this.defaultOptions), callback);
     }
 
+    public redirectCallback(pathOrOptions: string | HttpRouterFunctionOptions, callback: (request: HttpRequest) => string, redirectCode: number = 302) {
+        const options = convertOptions(['GET'], pathOrOptions, this.defaultOptions);
+        this.register(options, (request: HttpRequest) => {
+            return Redirect.toUrl(callback(request), redirectCode);
+        });
+    }
+
     private register(options: HttpRouterFunctionOptions, callback: (...args: any[]) => any, module?: InjectorModule<any>) {
         const fn = ReflectionFunction.from(callback);
 
@@ -536,7 +532,7 @@ export class HttpRouterRegistry extends HttpRouterRegistryFunctionRegistrar {
                 type: 'controller',
                 controller,
                 module,
-                methodName: action.methodName
+                methodName: action.methodName,
             };
             const routeConfig = createRouteConfigFromHttpAction(routeAction, action, module, controllerData);
 
@@ -578,7 +574,7 @@ export class HttpRouter {
         controllers: (ClassType | { module: InjectorModule<any>, controller: ClassType })[],
         middlewareRegistry: MiddlewareRegistry = new MiddlewareRegistry(),
         module: InjectorModule<any> = new InjectorModule(),
-        config: HttpConfig = new HttpConfig()
+        config: HttpConfig = new HttpConfig(),
     ): HttpRouter {
         return new this(new HttpControllers(controllers.map(v => {
             return isClass(v) ? { controller: v, module } : v;
@@ -636,7 +632,7 @@ export class HttpRouter {
             resolverForToken: routeConfig.resolverForToken,
             resolverForParameterName: routeConfig.resolverForParameterName,
             pathParameterNames: parsedRoute.pathParameterNames,
-            routeConfig
+            routeConfig,
         });
 
         let methodCheck = '';

packages/type/src/reflection/processor.ts

@@ -688,7 +688,7 @@ export class Processor {
                         case ReflectionOp.parameter: {
                             const ref = this.eatParameter() as number;
                             const t: Type = { kind: ReflectionKind.parameter, parent: undefined as any, name: program.stack[ref] as string, type: this.pop() as Type };
-                            t.type.parent = t;
+                            if (t.type) t.type.parent = t;
                             this.pushType(t);
                             break;
                         }

sync-tsconfig-deps.js

@@ -45,7 +45,7 @@ for (const name of packages) {
 }
 
 function filter(name) {
-    return !['api-console-gui', 'framework-debug-gui', 'orm-browser-gui'].includes(name);
+    return !['api-console-gui', 'framework-debug-gui', 'orm-browser-gui', 'desktop-ui'].includes(name);
 }
 
 for (const [name, config] of Object.entries(packageConfigs)) {

tsconfig.json

@@ -37,9 +37,6 @@
     {
       "path": "./packages/create-app/tsconfig.json"
     },
-    {
-      "path": "./packages/desktop-ui/tsconfig.json"
-    },
     {
       "path": "./packages/devtool/tsconfig.json"
     },
@@ -161,4 +158,4 @@
       "path": "./packages/workflow/tsconfig.json"
     }
   ]
-}
+}

website/README.md

@@ -19,3 +19,11 @@ cd website/
 docker build -t website2 -f Dockerfile ../
 docker run --rm -p 8080:8080 -e app_databaseHost=host.docker.internal website2
 ```
+
+
+## Translate
+
+```sh
+export APP_OPENAI_API_KEY=your_openai_api_key
+npm run translate de
+```

website/package.json

@@ -10,6 +10,7 @@
     "build": "npm run api-docs && BUILD=angular NODE_OPTIONS=--preserve-symlinks ng build --configuration production",
     "test": "jest"
   },
+  "type": "commonjs",
   "private": true,
   "devDependencies": {
     "@angular-devkit/build-angular": "^20.0.3",

website/src/app/app.routes.ts

@@ -1,19 +1,31 @@
-import { ActivatedRouteSnapshot, CanActivate, Route, Routes } from '@angular/router';
+import { ActivatedRouteSnapshot, CanActivate, Route, Router, Routes, UrlMatcher, UrlSegment } from '@angular/router';
 import { StartpageComponent } from '@app/app/pages/startpage.component';
 import { DocumentationComponent } from '@app/app/pages/documentation.component';
 import { EmptyComponent } from '@app/app/pages/empty.component';
-import { CommunityQuestionsComponent } from '@app/app/pages/documentation/community-questions.component';
 import { DocumentationPageComponent } from '@app/app/pages/documentation/page.component';
-import { CommunityQuestionComponent } from '@app/app/pages/documentation/community-question.component';
-import { ExamplesComponent } from '@app/app/pages/documentation/examples.component';
-import { ExampleComponent } from '@app/app/pages/documentation/example.component';
-import { DocuSearchComponent } from '@app/app/pages/documentation/search.component';
 import { StaticPageComponent } from '@app/app/pages/static-page.component';
 import { NotFoundComponent } from '@app/app/pages/not-found.component';
 import { Injectable } from '@angular/core';
 import { BlogComponent, BlogListComponent, BlogPostDetailComponent } from '@app/app/pages/blog.component';
 import { BookComponent } from '@app/app/pages/documentation/book.component.js';
 
+export const legacyDocMatcher: UrlMatcher = (segments: UrlSegment[]) => {
+    if (segments.length === 0 || segments[0].path !== 'documentation') return null;
+    const rest = segments.slice(1).map(s => s.path).join('/');
+    return { consumed: segments, posParams: { rest: new UrlSegment(rest, {}) } };
+};
+
+@Injectable({ providedIn: 'root' })
+export class LegacyDocRedirectGuard implements CanActivate {
+    constructor(private router: Router) {}
+    canActivate(route: ActivatedRouteSnapshot): false {
+        const rest = (route.params['rest'] as string) || '';
+        const target = rest ? `/en/documentation/${rest}` : `/en/documentation`;
+        this.router.navigateByUrl(target, { replaceUrl: true });
+        return false;
+    }
+}
+
 function redirect(from: string, to: string): Route {
     return {
         path: from,
@@ -36,12 +48,20 @@ export const routes: Routes = [
     redirect('documentation/type/serialization', 'documentation/runtime-types/serialization'),
     redirect('documentation/framework/rpc/controller', 'documentation/rpc/getting-started'),
 
+    { path: 'documentation', pathMatch: 'full', redirectTo: 'en/documentation' },
+    { matcher: legacyDocMatcher, canActivate: [LegacyDocRedirectGuard], component: EmptyComponent },
+
     // {
     //     path: 'benchmarks',
     //     loadChildren: () => import('./benchmarks/benchmarks.module').then(m => m.BenchmarksModule),
     // },
 
-    { path: '', pathMatch: 'full', component: StartpageComponent, data: { floatHeader: true } },
+    { path: '', pathMatch: 'full', component: StartpageComponent },
+    { path: 'zh', pathMatch: 'full', component: StartpageComponent },
+    { path: 'ko', pathMatch: 'full', component: StartpageComponent },
+    { path: 'ja', pathMatch: 'full', component: StartpageComponent },
+    { path: 'de', pathMatch: 'full', component: StartpageComponent },
+
     { path: 'admin', loadComponent: () => import('./pages/admin/admin.component').then(v => v.AdminComponent) },
     // { path: 'library', component: LibrariesComponent },
     // { path: 'library/:id', component: LibraryComponent },
@@ -51,29 +71,29 @@ export const routes: Routes = [
     { path: 'about-us', component: StaticPageComponent, data: { page: 'about-us' } },
     { path: 'contact', component: StaticPageComponent, data: { page: 'contact' } },
     { path: 'data-protection', component: StaticPageComponent, data: { page: 'data-protection' } },
-    { path: 'documentation/book', component: BookComponent },
+    { path: ':lang/documentation/book', component: BookComponent },
     {
-        path: 'blog', component: BlogComponent, children: [
+        path: ':lang/blog', component: BlogComponent, children: [
             { path: '', pathMatch: 'full', component: BlogListComponent },
             { path: ':slug', component: BlogPostDetailComponent },
         ],
     },
     {
-        path: 'documentation',
+        path: ':lang/documentation',
         component: DocumentationComponent,
         data: { search: true, footer: false, hideLogo: true },
         children: [
-            {
-                path: 'questions', component: EmptyComponent, children: [
-                    { path: 'post/:slug', component: CommunityQuestionComponent },
-                    { path: '**', component: CommunityQuestionsComponent },
-                ],
-            },
-            { path: 'search', component: DocuSearchComponent },
-            { path: 'examples', component: ExamplesComponent },
+            // {
+            //     path: 'questions', component: EmptyComponent, children: [
+            //         { path: 'post/:slug', component: CommunityQuestionComponent },
+            //         { path: '**', component: CommunityQuestionsComponent },
+            //     ],
+            // },
+            // { path: 'search', component: DocuSearchComponent },
+            // { path: 'examples', component: ExamplesComponent },
             { path: 'desktop-ui', loadChildren: () => import('./pages/documentation/desktop-ui/desktop-ui.module').then(v => v.DocDesktopUIModule) },
-            { path: ':category/examples/:slug', component: ExampleComponent },
-            { path: ':category/examples', component: ExamplesComponent },
+            // { path: ':category/examples/:slug', component: ExampleComponent },
+            // { path: ':category/examples', component: ExamplesComponent },
             { path: '**', component: DocumentationPageComponent },
         ],
     },