Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 11 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,21 @@ root = true
[*]
charset = utf-8
indent_style = space
indent_size = 4
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
max_line_length = 120

[*.json]
indent_size = 2

[*.ts]
[*.{tsx,ts,jsx,js}]
quote_type = single
indent_size = 4

[*.{html,spec.ts}]
max_line_length = 250

[packages/type-compiler/src/compiler.ts]
max_line_length = 250

[*.md]
max_line_length = off
Expand Down
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
yarn.lock
.angular
packages/core/src/indent.ts
14 changes: 12 additions & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
{
"plugins": ["@trivago/prettier-plugin-sort-imports"],
"importOrderParserPlugins": ["typescript", "decorators-legacy"],
"importOrder": ["<THIRD_PARTY_MODULES>", "^@deepkit/(.*)$", "^[./]"],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true,
"trailingComma": "all",
"printWidth": 120,
"bracketSpacing": true,
"tabWidth": 2,
"singleQuote": true,
"arrowParens": "avoid",
"editorconfig": true,
"endOfLine": "lf",
"importOrderSeparation": true,
"importOrderSortSpecifiers": true,
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"options": {
"tabWidth": 4
}
},
{
"files": ["*.spec.ts", "*.html", "packages/type-compiler/src/compiler.ts"],
"options": {
"printWidth": 250
}
}
]
}
1 change: 1 addition & 0 deletions examples/rpc-websockets-esm/client.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { RpcWebSocketClient } from '@deepkit/rpc';

import type { Controller } from './server';

async function main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/rpc-websockets-esm/server.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { rpc, RpcKernel } from '@deepkit/rpc';
import { RpcKernel, rpc } from '@deepkit/rpc';
import { RpcWebSocketServer } from '@deepkit/rpc-tcp';

@rpc.controller('/main')
Expand Down
4 changes: 2 additions & 2 deletions examples/rpc-websockets-esm/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"moduleResolution": "node",
"target": "ES2022",
"esModuleInterop": true,
"module": "esnext"
"module": "esnext",
},
"reflection": true
"reflection": true,
}
1 change: 1 addition & 0 deletions examples/rpc-websockets/client.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { RpcWebSocketClient } from '@deepkit/rpc';

import type { Controller } from './server';

async function main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/rpc-websockets/server.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { rpc, RpcKernel } from '@deepkit/rpc';
import { RpcKernel, rpc } from '@deepkit/rpc';
import { RpcWebSocketServer } from '@deepkit/rpc-tcp';

@rpc.controller('/main')
Expand Down
4 changes: 2 additions & 2 deletions examples/rpc-websockets/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"moduleResolution": "node",
"target": "ES2022",
"esModuleInterop": true,
"module": "CommonJS"
"module": "CommonJS",
},
"reflection": true
"reflection": true,
}
23 changes: 17 additions & 6 deletions packages/api-console-api/src/api.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
import { ControllerSymbol } from '@deepkit/rpc';
import { deserializeType, entity, Excluded, ReflectionClass, ReflectionKind, Type, TypeMethod, TypeParameter } from '@deepkit/type';
import {
Excluded,
ReflectionClass,
ReflectionKind,
Type,
TypeMethod,
TypeParameter,
deserializeType,
entity,
} from '@deepkit/type';

export class ApiRouteParameter {
name!: string;
Expand All @@ -16,8 +25,7 @@ export class ApiRouteResponse {
public statusCode: number,
public description: string,
public serializedType: any,
) {
}
) {}

getType(): Type {
if (!this.type) {
Expand Down Expand Up @@ -50,8 +58,7 @@ export class ApiAction {
public description: string,
public groups: string[],
public category: string,
) {
}
) {}

getMethodType(): TypeMethod {
if (!this.deserializedMethodType) {
Expand Down Expand Up @@ -159,7 +166,11 @@ export class ApiEntryPoints {
rpcActions: ApiAction[] = [];
}

export const ApiConsoleApi = ControllerSymbol<ApiConsoleApi>('.deepkit/api-console', [ApiRoute, ApiDocument, ApiAction]);
export const ApiConsoleApi = ControllerSymbol<ApiConsoleApi>('.deepkit/api-console', [
ApiRoute,
ApiDocument,
ApiAction,
]);

export interface ApiConsoleApi {
getEntryPoints(): ApiEntryPoints;
Expand Down
15 changes: 6 additions & 9 deletions packages/api-console-api/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,16 @@
"outDir": "./dist/cjs",
"declaration": true,
"composite": true,
"types": []
"types": [],
},
"reflection": true,
"include": [
"index.ts",
"src"
],
"include": ["index.ts", "src"],
"references": [
{
"path": "../rpc/tsconfig.json"
"path": "../rpc/tsconfig.json",
},
{
"path": "../type/tsconfig.json"
}
]
"path": "../type/tsconfig.json",
},
],
}
22 changes: 5 additions & 17 deletions packages/api-console-gui/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,10 @@
"index": "src/index.html",
"main": "src/main.ts",
"preserveSymlinks": true,
"polyfills": [
],
"polyfills": [],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets"
],
"assets": ["src/favicon.ico", "src/assets"],
"styles": [
"@deepkit/desktop-ui/src/scss/all.scss",
"@deepkit/desktop-ui/src/scss/icon.scss",
Expand Down Expand Up @@ -73,19 +69,11 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"polyfills": [
"zone.js",
"zone.js/testing"
],
"polyfills": ["zone.js", "zone.js/testing"],
"tsConfig": "tsconfig.spec.json",
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.scss"
],
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"scripts": []
}
}
Expand Down
40 changes: 22 additions & 18 deletions packages/api-console-gui/src/app/api-console.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import { OverlayModule } from '@angular/cdk/overlay';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { BrowserModule } from '@angular/platform-browser';
import { OverlayModule } from '@angular/cdk/overlay';
import { RouterModule } from '@angular/router';
import { MarkdownModule } from 'ngx-markdown';

import {
DuiAppModule,
DuiButtonModule,
Expand All @@ -15,31 +19,29 @@ import {
DuiSplitterModule,
DuiTableModule,
DuiTabsModule,
DuiWindowModule
DuiWindowModule,
} from '@deepkit/desktop-ui';
import { FormsModule } from '@angular/forms';
import { ConsoleComponent } from './views/console.component';
import { DeepkitClient } from '@deepkit/rpc';
import { DeepkitUIModule } from '@deepkit/ui-library';

import { ControllerClient } from './client';
import { Store } from './store';
import { StringInputComponent } from './components/inputs/string-input.component';
import { InputComponent } from './components/inputs/input.component';
import { EnvironmentDialogComponent } from './components/environment-dialog.component';
import { HeadersComponent } from './components/headers.component';
import { ArrayInputComponent } from './components/inputs/array-input.component';
import { BinaryInputComponent } from './components/inputs/binary-input.component';
import { ClassInputComponent } from './components/inputs/class-input.component';
import { DateInputComponent } from './components/inputs/date-input.component';
import { EnumInputComponent } from './components/inputs/enum-input.component';
import { InputComponent } from './components/inputs/input.component';
import { JsonInputComponent } from './components/inputs/json-input.component';
import { ClassInputComponent } from './components/inputs/class-input.component';
import { HeadersComponent } from './components/headers.component';
import { MapInputComponent } from './components/inputs/map-input.component';
import { StringInputComponent } from './components/inputs/string-input.component';
import { UnionInputComponent } from './components/inputs/union-input.component';
import { EnvironmentDialogComponent } from './components/environment-dialog.component';
import { RouterModule } from '@angular/router';
import { OverviewComponent } from './views/overview.component';
import { MarkdownModule } from 'ngx-markdown';
import { DeepkitUIModule } from '@deepkit/ui-library';
import { HttpRouteDetailComponent } from './views/http/route-detail.component';
import { Store } from './store';
import { ConsoleComponent } from './views/console.component';
import { HttpRequestsComponent } from './views/http/results.component';
import { HttpRouteDetailComponent } from './views/http/route-detail.component';
import { OverviewComponent } from './views/overview.component';
import { RpcDetailComponent } from './views/rpc/rpc-detail.component';
import { RpcInspectMessageComponent } from './views/rpc/rpc-inspect-message.component';

Expand Down Expand Up @@ -91,10 +93,12 @@ import { RpcInspectMessageComponent } from './views/rpc/rpc-inspect-message.comp
MarkdownModule.forRoot(),
],
providers: [
{ provide: DeepkitClient, useFactory: () => new DeepkitClient(ControllerClient.getServerHost()) },
{
provide: DeepkitClient,
useFactory: () => new DeepkitClient(ControllerClient.getServerHost()),
},
Store,
ControllerClient,
],
})
export class ApiConsoleModule {
}
export class ApiConsoleModule {}
38 changes: 18 additions & 20 deletions packages/api-console-gui/src/app/app.component.scss
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@


:host ::ng-deep dui-window-content.no-padding > .content {
padding: 0 !important;
padding: 0 !important;
}

.top-right {
display: flex;
align-items: center;
position: absolute;
right: 15px;
top: -3px;

a, a:link {
font-size: 10px;
color: var(--color-text);
text-decoration: none;
display: inline-block;
padding: 3px 5px;
margin-right: 5px;
border-radius: 3px;
display: flex;
align-items: center;
position: absolute;
right: 15px;
top: -3px;

}
a,
a:link {
font-size: 10px;
color: var(--color-text);
text-decoration: none;
display: inline-block;
padding: 3px 5px;
margin-right: 5px;
border-radius: 3px;
}
}

:host-context(.dui-theme-light) .top-right a:hover {
background-color: #aaa;
background-color: #aaa;
}

:host-context(.dui-theme-dark) .top-right a:hover {
background-color: #111;
background-color: #111;
}
4 changes: 3 additions & 1 deletion packages/api-console-gui/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { Component, ElementRef } from '@angular/core';

import { DuiApp } from '@deepkit/desktop-ui';

import { ControllerClient } from './client';

@Component({
Expand All @@ -24,7 +26,7 @@ import { ControllerClient } from './client';
</dui-window-content>
</dui-window>
`,
styleUrls: ['./app.component.scss']
styleUrls: ['./app.component.scss'],
})
export class AppComponent {
sidebarVisible: boolean = true;
Expand Down
19 changes: 9 additions & 10 deletions packages/api-console-gui/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { AppComponent } from './app.component';
import { RouterModule } from '@angular/router';
import { ApiConsoleModule } from './api-console.module';

import { DuiAppModule, DuiButtonModule, DuiIconModule, DuiWindowModule } from '@deepkit/desktop-ui';
import { DeepkitUIModule } from '@deepkit/ui-library';
import { CommonModule } from '@angular/common';

import { ApiConsoleModule } from './api-console.module';
import { AppComponent } from './app.component';

@NgModule({
declarations: [
AppComponent,
],
declarations: [AppComponent],
imports: [
BrowserModule,
CommonModule,
Expand All @@ -21,9 +21,8 @@ import { CommonModule } from '@angular/common';
DuiAppModule.forRoot(),
DuiWindowModule.forRoot(),
DuiButtonModule,
DuiIconModule
DuiIconModule,
],
bootstrap: [AppComponent]
bootstrap: [AppComponent],
})
export class AppModule {
}
export class AppModule {}
Loading