Skip to content

Commit 9af6601

Browse files
ArtuomkaArtuomka
authored
Merge pull request #1602 from rocket-admin/backend_biome_up
Refactor code structure for improved readability and maintainability
2 parents 461f78d + c065693 commit 9af6601

File tree

92 files changed

+1136
-639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1136
-639
lines changed

‎autoadmin-ws-server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"zod": "^4.3.6"
2222
},
2323
"devDependencies": {
24-
"@biomejs/biome": "2.3.14",
24+
"@biomejs/biome": "2.4.0",
2525
"@types/jsonwebtoken": "^9.0.10",
2626
"@types/node": "^22.10.2",
2727
"@types/ws": "^8.18.1",

‎autoadmin-ws-server/yarn.lock‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ __metadata:
55
version: 6
66
cacheKey: 8
77

8-
"@biomejs/biome@npm:2.3.14":
9-
version: 2.3.14
10-
resolution: "@biomejs/biome@npm:2.3.14"
8+
"@biomejs/biome@npm:2.4.0":
9+
version: 2.4.0
10+
resolution: "@biomejs/biome@npm:2.4.0"
1111
dependencies:
12-
"@biomejs/cli-darwin-arm64": 2.3.14
13-
"@biomejs/cli-darwin-x64": 2.3.14
14-
"@biomejs/cli-linux-arm64": 2.3.14
15-
"@biomejs/cli-linux-arm64-musl": 2.3.14
16-
"@biomejs/cli-linux-x64": 2.3.14
17-
"@biomejs/cli-linux-x64-musl": 2.3.14
18-
"@biomejs/cli-win32-arm64": 2.3.14
19-
"@biomejs/cli-win32-x64": 2.3.14
12+
"@biomejs/cli-darwin-arm64": 2.4.0
13+
"@biomejs/cli-darwin-x64": 2.4.0
14+
"@biomejs/cli-linux-arm64": 2.4.0
15+
"@biomejs/cli-linux-arm64-musl": 2.4.0
16+
"@biomejs/cli-linux-x64": 2.4.0
17+
"@biomejs/cli-linux-x64-musl": 2.4.0
18+
"@biomejs/cli-win32-arm64": 2.4.0
19+
"@biomejs/cli-win32-x64": 2.4.0
2020
dependenciesMeta:
2121
"@biomejs/cli-darwin-arm64":
2222
optional: true
@@ -36,62 +36,62 @@ __metadata:
3636
optional: true
3737
bin:
3838
biome: bin/biome
39-
checksum: 05bc8b81e5c9f0b395e40cbcf2d0645776100fb9d10e5cebbadd9c5290fa8f05948c4bb1f685c65e9b4a9ad9d70a2320ab387a3a53d59818328a49ecb73b6cf8
39+
checksum: 4712b7ce8513e4c26d2508c9c45297cb2622e4b9fc1fdf9132ebf53f2a55667df39e2f0bc270d65c070fdc7bc22cc12baadee11de44acc52733916759aa3c596
4040
languageName: node
4141
linkType: hard
4242

43-
"@biomejs/cli-darwin-arm64@npm:2.3.14":
44-
version: 2.3.14
45-
resolution: "@biomejs/cli-darwin-arm64@npm:2.3.14"
43+
"@biomejs/cli-darwin-arm64@npm:2.4.0":
44+
version: 2.4.0
45+
resolution: "@biomejs/cli-darwin-arm64@npm:2.4.0"
4646
conditions: os=darwin & cpu=arm64
4747
languageName: node
4848
linkType: hard
4949

50-
"@biomejs/cli-darwin-x64@npm:2.3.14":
51-
version: 2.3.14
52-
resolution: "@biomejs/cli-darwin-x64@npm:2.3.14"
50+
"@biomejs/cli-darwin-x64@npm:2.4.0":
51+
version: 2.4.0
52+
resolution: "@biomejs/cli-darwin-x64@npm:2.4.0"
5353
conditions: os=darwin & cpu=x64
5454
languageName: node
5555
linkType: hard
5656

57-
"@biomejs/cli-linux-arm64-musl@npm:2.3.14":
58-
version: 2.3.14
59-
resolution: "@biomejs/cli-linux-arm64-musl@npm:2.3.14"
57+
"@biomejs/cli-linux-arm64-musl@npm:2.4.0":
58+
version: 2.4.0
59+
resolution: "@biomejs/cli-linux-arm64-musl@npm:2.4.0"
6060
conditions: os=linux & cpu=arm64 & libc=musl
6161
languageName: node
6262
linkType: hard
6363

64-
"@biomejs/cli-linux-arm64@npm:2.3.14":
65-
version: 2.3.14
66-
resolution: "@biomejs/cli-linux-arm64@npm:2.3.14"
64+
"@biomejs/cli-linux-arm64@npm:2.4.0":
65+
version: 2.4.0
66+
resolution: "@biomejs/cli-linux-arm64@npm:2.4.0"
6767
conditions: os=linux & cpu=arm64 & libc=glibc
6868
languageName: node
6969
linkType: hard
7070

71-
"@biomejs/cli-linux-x64-musl@npm:2.3.14":
72-
version: 2.3.14
73-
resolution: "@biomejs/cli-linux-x64-musl@npm:2.3.14"
71+
"@biomejs/cli-linux-x64-musl@npm:2.4.0":
72+
version: 2.4.0
73+
resolution: "@biomejs/cli-linux-x64-musl@npm:2.4.0"
7474
conditions: os=linux & cpu=x64 & libc=musl
7575
languageName: node
7676
linkType: hard
7777

78-
"@biomejs/cli-linux-x64@npm:2.3.14":
79-
version: 2.3.14
80-
resolution: "@biomejs/cli-linux-x64@npm:2.3.14"
78+
"@biomejs/cli-linux-x64@npm:2.4.0":
79+
version: 2.4.0
80+
resolution: "@biomejs/cli-linux-x64@npm:2.4.0"
8181
conditions: os=linux & cpu=x64 & libc=glibc
8282
languageName: node
8383
linkType: hard
8484

85-
"@biomejs/cli-win32-arm64@npm:2.3.14":
86-
version: 2.3.14
87-
resolution: "@biomejs/cli-win32-arm64@npm:2.3.14"
85+
"@biomejs/cli-win32-arm64@npm:2.4.0":
86+
version: 2.4.0
87+
resolution: "@biomejs/cli-win32-arm64@npm:2.4.0"
8888
conditions: os=win32 & cpu=arm64
8989
languageName: node
9090
linkType: hard
9191

92-
"@biomejs/cli-win32-x64@npm:2.3.14":
93-
version: 2.3.14
94-
resolution: "@biomejs/cli-win32-x64@npm:2.3.14"
92+
"@biomejs/cli-win32-x64@npm:2.4.0":
93+
version: 2.4.0
94+
resolution: "@biomejs/cli-win32-x64@npm:2.4.0"
9595
conditions: os=win32 & cpu=x64
9696
languageName: node
9797
linkType: hard
@@ -1087,7 +1087,7 @@ __metadata:
10871087
version: 0.0.0-use.local
10881088
resolution: "rocketadmin-ws-server@workspace:."
10891089
dependencies:
1090-
"@biomejs/biome": 2.3.14
1090+
"@biomejs/biome": 2.4.0
10911091
"@hono/node-server": ^1.19.9
10921092
"@types/jsonwebtoken": ^9.0.10
10931093
"@types/node": ^22.10.2

‎backend/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
},
2626
"dependencies": {
2727
"@amplitude/node": "1.10.2",
28-
"@aws-sdk/client-bedrock-runtime": "^3.987.0",
29-
"@aws-sdk/client-s3": "^3.987.0",
30-
"@aws-sdk/lib-dynamodb": "^3.987.0",
31-
"@aws-sdk/s3-request-presigner": "^3.987.0",
28+
"@aws-sdk/client-bedrock-runtime": "^3.990.0",
29+
"@aws-sdk/client-s3": "^3.990.0",
30+
"@aws-sdk/lib-dynamodb": "^3.990.0",
31+
"@aws-sdk/s3-request-presigner": "^3.990.0",
3232
"@electric-sql/pglite": "^0.3.15",
3333
"@faker-js/faker": "^10.3.0",
34-
"@langchain/aws": "^1.2.2",
35-
"@langchain/core": "^1.1.22",
34+
"@langchain/aws": "^1.2.3",
35+
"@langchain/core": "^1.1.24",
3636
"@langchain/openai": "^1.2.7",
3737
"@nestjs/common": "11.1.13",
3838
"@nestjs/config": "4.0.3",
@@ -45,11 +45,11 @@
4545
"@nestjsx/crud": "4.6.2",
4646
"@rocketadmin/shared-code": "workspace:*",
4747
"@sentry/minimal": "^6.19.7",
48-
"@sentry/node": "10.38.0",
48+
"@sentry/node": "10.39.0",
4949
"@types/crypto-js": "^4.2.2",
5050
"@types/jsonwebtoken": "^9.0.10",
5151
"@types/multer": "^2.0.0",
52-
"@types/nodemailer": "^7.0.9",
52+
"@types/nodemailer": "^7.0.10",
5353
"@types/nunjucks": "^3.2.6",
5454
"@types/qrcode": "^1.5.6",
5555
"@zapier/secret-scrubber": "^1.1.6",
@@ -65,7 +65,7 @@
6565
"crc": "^4.3.2",
6666
"crypto-js": "4.2.0",
6767
"csv": "^6.4.1",
68-
"dotenv": "17.2.4",
68+
"dotenv": "17.3.1",
6969
"express": "5.2.1",
7070
"fetch-blob": "^4.0.0",
7171
"helmet": "8.1.0",
@@ -74,20 +74,20 @@
7474
"json2csv": "^5.0.7",
7575
"jsonwebtoken": "^9.0.3",
7676
"knex": "3.1.0",
77-
"langchain": "^1.2.21",
77+
"langchain": "^1.2.24",
7878
"lru-cache": "^11.2.6",
7979
"nanoid": "5.1.6",
8080
"nodemailer": "^8.0.1",
8181
"nunjucks": "^3.2.4",
82-
"openai": "^6.21.0",
82+
"openai": "^6.22.0",
8383
"otplib": "^12.0.1",
8484
"p-queue": "9.1.0",
8585
"pg": "^8.18.0",
8686
"pg-connection-string": "^2.11.0",
8787
"qrcode": "^1.5.4",
8888
"query-string": "^9.3.1",
8989
"reflect-metadata": "0.2.2",
90-
"rimraf": "6.1.2",
90+
"rimraf": "6.1.3",
9191
"rxjs": "7.8.2",
9292
"safe-regex2": "^5.0.0",
9393
"secure-json-parse": "4.1.0",

‎backend/public/email-templates/rocketadmin-reminder-email.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- biome-ignore-all lint/a11y/useHtmlLang: <explanation> -->
12
<!doctype html>
23
<html>
34
<head>

‎backend/src/ai-core/services/ai-core.service.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,50 +35,50 @@ export class AICoreService implements IAIService {
3535
}
3636

3737
public async complete(prompt: string, config?: AIProviderConfig): Promise<string> {
38-
return this.getProvider().generateCompletion(prompt, config);
38+
return await this.getProvider().generateCompletion(prompt, config);
3939
}
4040

4141
public async completeWithProvider(
4242
provider: AIProviderType,
4343
prompt: string,
4444
config?: AIProviderConfig,
4545
): Promise<string> {
46-
return this.getProvider(provider).generateCompletion(prompt, config);
46+
return await this.getProvider(provider).generateCompletion(prompt, config);
4747
}
4848

4949
public async chat(messages: BaseMessage[], config?: AIProviderConfig): Promise<AICompletionResult> {
50-
return this.getProvider().generateChatCompletion(messages, config);
50+
return await this.getProvider().generateChatCompletion(messages, config);
5151
}
5252

5353
public async chatWithProvider(
5454
provider: AIProviderType,
5555
messages: BaseMessage[],
5656
config?: AIProviderConfig,
5757
): Promise<AICompletionResult> {
58-
return this.getProvider(provider).generateChatCompletion(messages, config);
58+
return await this.getProvider(provider).generateChatCompletion(messages, config);
5959
}
6060

6161
public async streamChat(
6262
messages: BaseMessage[],
6363
config?: AIProviderConfig,
6464
): Promise<IterableReadableStream<AIStreamChunk>> {
65-
return this.getProvider().generateStreamingCompletion(messages, config);
65+
return await this.getProvider().generateStreamingCompletion(messages, config);
6666
}
6767

6868
public async streamChatWithProvider(
6969
provider: AIProviderType,
7070
messages: BaseMessage[],
7171
config?: AIProviderConfig,
7272
): Promise<IterableReadableStream<AIStreamChunk>> {
73-
return this.getProvider(provider).generateStreamingCompletion(messages, config);
73+
return await this.getProvider(provider).generateStreamingCompletion(messages, config);
7474
}
7575

7676
public async chatWithTools(
7777
messages: BaseMessage[],
7878
tools: AIToolDefinition[],
7979
config?: AIProviderConfig,
8080
): Promise<AICompletionResult> {
81-
return this.getProvider().generateWithTools(messages, tools, config);
81+
return await this.getProvider().generateWithTools(messages, tools, config);
8282
}
8383

8484
public async chatWithToolsAndProvider(
@@ -87,15 +87,15 @@ export class AICoreService implements IAIService {
8787
tools: AIToolDefinition[],
8888
config?: AIProviderConfig,
8989
): Promise<AICompletionResult> {
90-
return this.getProvider(provider).generateWithTools(messages, tools, config);
90+
return await this.getProvider(provider).generateWithTools(messages, tools, config);
9191
}
9292

9393
public async streamChatWithTools(
9494
messages: BaseMessage[],
9595
tools: AIToolDefinition[],
9696
config?: AIProviderConfig,
9797
): Promise<IterableReadableStream<AIStreamChunk>> {
98-
return this.getProvider().generateStreamingWithTools(messages, tools, config);
98+
return await this.getProvider().generateStreamingWithTools(messages, tools, config);
9999
}
100100

101101
public async streamChatWithToolsAndProvider(
@@ -104,7 +104,7 @@ export class AICoreService implements IAIService {
104104
tools: AIToolDefinition[],
105105
config?: AIProviderConfig,
106106
): Promise<IterableReadableStream<AIStreamChunk>> {
107-
return this.getProvider(provider).generateStreamingWithTools(messages, tools, config);
107+
return await this.getProvider(provider).generateStreamingWithTools(messages, tools, config);
108108
}
109109

110110
public async continueAfterToolCall(
@@ -113,7 +113,7 @@ export class AICoreService implements IAIService {
113113
tools: AIToolDefinition[],
114114
config?: AIProviderConfig,
115115
): Promise<AICompletionResult> {
116-
return this.getProvider().continueWithToolResults(messages, toolResults, tools, config);
116+
return await this.getProvider().continueWithToolResults(messages, toolResults, tools, config);
117117
}
118118

119119
public async continueStreamingAfterToolCall(
@@ -122,7 +122,7 @@ export class AICoreService implements IAIService {
122122
tools: AIToolDefinition[],
123123
config?: AIProviderConfig,
124124
): Promise<IterableReadableStream<AIStreamChunk>> {
125-
return this.getProvider().continueStreamingWithToolResults(messages, toolResults, tools, config);
125+
return await this.getProvider().continueStreamingWithToolResults(messages, toolResults, tools, config);
126126
}
127127

128128
public getDefaultProvider(): AIProviderType {

‎backend/src/entities/table-categories/table-categories.controller.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ import { UseCaseType } from '../../common/data-injection.tokens.js';
44
import { MasterPassword } from '../../decorators/master-password.decorator.js';
55
import { SlugUuid } from '../../decorators/slug-uuid.decorator.js';
66
import { Timeout } from '../../decorators/timeout.decorator.js';
7+
import { UserId } from '../../decorators/user-id.decorator.js';
78
import { InTransactionEnum } from '../../enums/in-transaction.enum.js';
89
import { ConnectionEditGuard } from '../../guards/connection-edit.guard.js';
910
import { TablesReceiveGuard } from '../../guards/tables-receive.guard.js';
1011
import { SentryInterceptor } from '../../interceptors/sentry.interceptor.js';
12+
import { FindTablesDs } from '../table/application/data-structures/find-tables.ds.js';
1113
import { CreateOrUpdateTableCategoriesDS } from './data-sctructures/create-or-update-table-categories.ds.js';
1214
import { CreateTableCategoryDto } from './dto/create-table-category.dto.js';
15+
import { FoundTableCategoriesWithTablesRo } from './dto/found-table-categories-with-tables.ro.js';
1316
import { FoundTableCategoryRo } from './dto/found-table-category.ro.js';
1417
import {
1518
ICreateTableCategories,
1619
IFindTableCategories,
1720
IFindTableCategoriesWithTables,
1821
} from './use-cases/table-categories-use-cases.interface.js';
19-
import { FoundTableCategoriesWithTablesRo } from './dto/found-table-categories-with-tables.ro.js';
20-
import { UserId } from '../../decorators/user-id.decorator.js';
21-
import { FindTablesDs } from '../table/application/data-structures/find-tables.ds.js';
2222

2323
@UseInterceptors(SentryInterceptor)
2424
@Timeout()

‎backend/src/entities/table-categories/use-cases/find-table-categories-with-tables.use.case.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import { isConnectionTypeAgent } from '../../../helpers/is-connection-entity-age
1313
import { isObjectPropertyExists } from '../../../helpers/validators/is-object-property-exists-validator.js';
1414
import { ConnectionEntity } from '../../connection/connection.entity.js';
1515
import { ITableAndViewPermissionData } from '../../permission/permission.interface.js';
16-
import { TableSettingsEntity } from '../../table-settings/common-table-settings/table-settings.entity.js';
1716
import { FindTablesDs } from '../../table/application/data-structures/find-tables.ds.js';
1817
import { FoundTableDs } from '../../table/application/data-structures/found-table.ds.js';
18+
import { TableSettingsEntity } from '../../table-settings/common-table-settings/table-settings.entity.js';
1919
import { FoundTableCategoriesWithTablesRo } from '../dto/found-table-categories-with-tables.ro.js';
2020
import { IFindTableCategoriesWithTables } from './table-categories-use-cases.interface.js';
2121

‎backend/src/entities/table/use-cases/find-tables-in-connection.use.case.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
2+
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
23
import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js';
34
import { TableDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table.ds.js';
45
import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js';
5-
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
66
import * as Sentry from '@sentry/node';
77
import PQueue from 'p-queue';
88
import AbstractUseCase from '../../../common/abstract-use.case.js';

‎backend/src/entities/table/use-cases/get-row-by-primary-key.use.case.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/* eslint-disable prefer-const */
22
import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
3+
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
34
import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js';
45
import { ForeignKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key.ds.js';
56
import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js';
67
import { ReferencedTableNamesAndColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/referenced-table-names-columns.ds.js';
78
import { buildDAOsTableSettingsDs } from '@rocketadmin/shared-code/dist/src/helpers/data-structures-builders/table-settings.ds.builder.js';
89
import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object.interface.js';
910
import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object-agent.interface.js';
10-
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
1111
import JSON5 from 'json5';
1212
import AbstractUseCase from '../../../common/abstract-use.case.js';
1313
import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';

‎backend/src/entities/table/use-cases/get-table-rows.use.case.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { BadRequestException, HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
2+
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
23
import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js';
34
import { ForeignKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key.ds.js';
45
import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js';
@@ -8,7 +9,6 @@ import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/shared/en
89
import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object.interface.js';
910
import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object-agent.interface.js';
1011
import { FoundRowsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/found-rows.ds.js';
11-
import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
1212
import Sentry from '@sentry/minimal';
1313
import JSON5 from 'json5';
1414
import AbstractUseCase from '../../../common/abstract-use.case.js';

0 commit comments

Comments
 (0)