Skip to content

Commit 0fb93cf

Browse files
ccmoralesjccmoralesj
authored
Merge pull request #40 from x-team/develop
Type-safe and new dependencies
2 parents 5cfac45 + 0329294 commit 0fb93cf

40 files changed

+184
-184
lines changed

‎src/models/AchievementUnlocked.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,22 @@ export class AchievementUnlocked
4141
@PrimaryKey
4242
@ForeignKey(() => User)
4343
@Column(DataType.INTEGER)
44-
_userId!: number;
44+
declare _userId: number;
4545

4646
@PrimaryKey
4747
@ForeignKey(() => Achievement)
4848
@Column(DataType.INTEGER)
49-
_achievementId!: number;
49+
declare _achievementId: number;
5050

5151
@AllowNull(false)
5252
@Default(false)
5353
@Column(DataType.BOOLEAN)
54-
isUnlocked!: boolean;
54+
declare isUnlocked: boolean;
5555

5656
@AllowNull(false)
5757
@Default(ZERO)
5858
@Column(DataType.INTEGER)
59-
progress!: number;
59+
declare progress: number;
6060

6161
@AllowNull(false)
6262
@CreatedAt

‎src/models/Achievements.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ export class Achievement
5050

5151
@AllowNull(false)
5252
@Column(DataType.TEXT)
53-
description!: string;
53+
declare description: string;
5454

5555
@AllowNull(false)
5656
@Default(true)
5757
@Column(DataType.BOOLEAN)
58-
isEnabled!: boolean;
58+
declare isEnabled: boolean;
5959

6060
@AllowNull(false)
6161
@Default(ZERO)
6262
@Column(DataType.INTEGER)
63-
targetValue!: number;
63+
declare targetValue: number;
6464

6565
@AllowNull(false)
6666
@CreatedAt
@@ -74,7 +74,7 @@ export class Achievement
7474

7575
@ForeignKey(() => GameType)
7676
@Column(DataType.INTEGER)
77-
_gameTypeId!: number;
77+
declare _gameTypeId: number;
7878

7979
@BelongsTo(() => GameType, {
8080
foreignKey: '_gameTypeId',

‎src/models/ArenaGame.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,29 @@ export class ArenaGame
5959

6060
@Default(true)
6161
@Column(DataType.BOOLEAN)
62-
hasZoneDeactivation!: boolean;
62+
declare hasZoneDeactivation: boolean;
6363

6464
@Default(false)
6565
@Column(DataType.BOOLEAN)
66-
teamBased!: boolean;
66+
declare teamBased: boolean;
6767

6868
// Ring System
6969
@Default('5')
7070
@Column(DataType.TEXT)
71-
ringSystemAlgorithm!: string;
71+
declare ringSystemAlgorithm: string;
7272

7373
@Default(ONE)
7474
@Column(DataType.INTEGER)
75-
currentRingDeactivation!: number;
75+
declare currentRingDeactivation: number;
7676

7777
@Default(ZERO)
7878
@Column(DataType.INTEGER)
79-
inactiveZonePenaltyPower!: number;
79+
declare inactiveZonePenaltyPower: number;
8080

8181
@Unique
8282
@ForeignKey(() => Game)
8383
@Column(DataType.INTEGER)
84-
_gameId!: number;
84+
declare _gameId: number;
8585

8686
@BelongsTo(() => Game, {
8787
foreignKey: '_gameId',

‎src/models/ArenaItemInventory.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ export class ArenaItemInventory
4646

4747
@ForeignKey(() => ArenaPlayer)
4848
@Column(DataType.INTEGER)
49-
_arenaPlayerId!: number;
49+
declare _arenaPlayerId: number;
5050

5151
@BelongsTo(() => ArenaPlayer, '_arenaPlayerId')
5252
_player?: ArenaPlayer;
5353

5454
@ForeignKey(() => Item)
5555
@Column(DataType.INTEGER)
56-
_itemId!: number;
56+
declare _itemId: number;
5757

5858
@BelongsTo(() => Item, {
5959
foreignKey: '_itemId',
@@ -63,7 +63,7 @@ export class ArenaItemInventory
6363
_item?: Item;
6464

6565
@Column(DataType.INTEGER)
66-
remainingUses!: number | null;
66+
declare remainingUses: number | null;
6767

6868
static associations: {
6969
_player: Association<ArenaItemInventory, ArenaPlayer>;

‎src/models/ArenaPlayer.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -147,31 +147,31 @@ export class ArenaPlayer
147147

148148
@Default(MAX_PLAYER_HEALTH)
149149
@Column(DataType.INTEGER)
150-
health!: number;
150+
declare health: number;
151151

152152
@Default(false)
153153
@Column(DataType.BOOLEAN)
154-
isSpectator!: boolean;
154+
declare isSpectator: boolean;
155155

156156
@Default(true)
157157
@Column(DataType.BOOLEAN)
158-
isVisible!: boolean;
158+
declare isVisible: boolean;
159159

160160
@Default(false)
161161
@Column(DataType.BOOLEAN)
162-
isBoss!: boolean;
162+
declare isBoss: boolean;
163163

164164
@Default(ZERO)
165165
@Column(DataType.DOUBLE)
166-
luckBoost!: number;
166+
declare luckBoost: number;
167167

168168
@Default(Ability.defaultProps())
169169
@Column(DataType.JSONB)
170-
abilitiesJSON!: AbilityProperty;
170+
declare abilitiesJSON: AbilityProperty;
171171

172172
@ForeignKey(() => User)
173173
@Column(DataType.INTEGER)
174-
_userId!: number;
174+
declare _userId: number;
175175

176176
@BelongsTo(() => User, {
177177
foreignKey: '_userId',
@@ -183,7 +183,7 @@ export class ArenaPlayer
183183
@AllowNull(true)
184184
@ForeignKey(() => Team)
185185
@Column(DataType.INTEGER)
186-
_teamId!: number | null;
186+
declare _teamId: number | null;
187187

188188
@BelongsTo(() => Team, {
189189
foreignKey: '_teamId',
@@ -194,7 +194,7 @@ export class ArenaPlayer
194194

195195
@ForeignKey(() => Game)
196196
@Column(DataType.INTEGER)
197-
_gameId!: number;
197+
declare _gameId: number;
198198

199199
@BelongsTo(() => Game, {
200200
foreignKey: '_gameId',
@@ -206,7 +206,7 @@ export class ArenaPlayer
206206
@AllowNull(true)
207207
@ForeignKey(() => ArenaZone)
208208
@Column(DataType.INTEGER)
209-
_arenaZoneId!: number | null;
209+
declare _arenaZoneId: number | null;
210210

211211
@BelongsTo(() => ArenaZone)
212212
_zone?: ArenaZone;

‎src/models/ArenaPlayerPerformance.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -48,46 +48,46 @@ export class ArenaPlayerPerformance
4848
@PrimaryKey
4949
@ForeignKey(() => ArenaPlayer)
5050
@Column(DataType.INTEGER)
51-
_arenaPlayerId!: number;
51+
declare _arenaPlayerId: number;
5252

5353
@BelongsTo(() => ArenaPlayer, '_arenaPlayerId')
5454
_player?: ArenaPlayer;
5555

5656
@PrimaryKey
5757
@ForeignKey(() => Game)
5858
@Column(DataType.INTEGER)
59-
_gameId!: number;
59+
declare _gameId: number;
6060

6161
@BelongsTo(() => Game, '_gameId')
6262
_game?: Game;
6363

6464
@Default(ZERO)
6565
@Column(DataType.INTEGER)
66-
cheersReceived!: number;
66+
declare cheersReceived: number;
6767

6868
@Default(ZERO)
6969
@Column(DataType.INTEGER)
70-
weaponsFound!: number;
70+
declare weaponsFound: number;
7171

7272
@Default(ZERO)
7373
@Column(DataType.INTEGER)
74-
damageDealt!: number;
74+
declare damageDealt: number;
7575

7676
@Default(ZERO)
7777
@Column(DataType.INTEGER)
78-
cheersGiven!: number;
78+
declare cheersGiven: number;
7979

8080
@Default(ZERO)
8181
@Column(DataType.INTEGER)
82-
healed!: number;
82+
declare healed: number;
8383

8484
@Default(ZERO)
8585
@Column(DataType.INTEGER)
86-
kills!: number;
86+
declare kills: number;
8787

8888
@Default(false)
8989
@Column(DataType.BOOLEAN)
90-
firstBlood!: boolean;
90+
declare firstBlood: boolean;
9191

9292
static associations: {
9393
_game: Association<ArenaPlayerPerformance, Game>;

‎src/models/ArenaRound.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -92,29 +92,29 @@ export class ArenaRound
9292

9393
@Default(true)
9494
@Column(DataType.BOOLEAN)
95-
isActive!: boolean;
95+
declare isActive: boolean;
9696

9797
@Default(false)
9898
@Column(DataType.BOOLEAN)
99-
isEveryoneVisible!: boolean;
99+
declare isEveryoneVisible: boolean;
100100

101101
@Column(DataType.DATE)
102-
startedAt!: Date;
102+
declare startedAt: Date;
103103

104104
@Default(null)
105105
@Column(DataType.DATE)
106-
endedAt!: Date | null;
106+
declare endedAt: Date | null;
107107

108108
@ForeignKey(() => Game)
109109
@Column(DataType.INTEGER)
110-
_gameId!: number;
110+
declare _gameId: number;
111111

112112
@BelongsTo(() => Game, '_gameId')
113113
_game?: Game;
114114

115115
@ForeignKey(() => User)
116116
@Column(DataType.INTEGER)
117-
_createdById!: number;
117+
declare _createdById: number;
118118

119119
@BelongsTo(() => User, '_createdById')
120120
_createdBy?: User;

‎src/models/ArenaRoundAction.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -51,33 +51,33 @@ export class ArenaRoundAction
5151
@PrimaryKey
5252
@ForeignKey(() => ArenaPlayer)
5353
@Column(DataType.INTEGER)
54-
_arenaPlayerId!: number;
54+
declare _arenaPlayerId: number;
5555

5656
@BelongsTo(() => ArenaPlayer, '_arenaPlayerId')
5757
_player?: ArenaPlayer;
5858

5959
@PrimaryKey
6060
@ForeignKey(() => ArenaRound)
6161
@Column(DataType.INTEGER)
62-
_arenaRoundId!: number;
62+
declare _arenaRoundId: number;
6363

6464
@BelongsTo(() => ArenaRound, '_arenaRoundId')
6565
_round?: ArenaRound;
6666

6767
@Default(false)
6868
@Column(DataType.BOOLEAN)
69-
isCompleted!: boolean;
69+
declare isCompleted: boolean;
7070

7171
@Column(DataType.DATE)
7272
declare createdAt: Date;
7373

7474
@Default(null)
7575
@Column(DataType.DATE)
76-
completedAt!: Date | null;
76+
declare completedAt: Date | null;
7777

7878
@ForeignKey(() => AvailableAction)
7979
@Column(DataType.TEXT)
80-
_availableActionId!: ARENA_ACTIONS_TYPE;
80+
declare _availableActionId: ARENA_ACTIONS_TYPE;
8181

8282
@BelongsTo(() => AvailableAction, {
8383
foreignKey: '_availableActionId',
@@ -87,7 +87,7 @@ export class ArenaRoundAction
8787
_action?: AvailableAction;
8888

8989
@Column(DataType.JSONB)
90-
actionJSON!: ArenaAction;
90+
declare actionJSON: ArenaAction;
9191

9292
static associations: {
9393
_player: Association<ArenaRoundAction, ArenaPlayer>;

‎src/models/ArenaZone.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -62,25 +62,25 @@ export class ArenaZone
6262

6363
@Unique
6464
@Column(DataType.TEXT)
65-
name!: string;
65+
declare name: string;
6666

6767
@Default(true)
6868
@Column(DataType.BOOLEAN)
69-
isActive!: boolean;
69+
declare isActive: boolean;
7070

7171
@Default(false)
7272
@Column(DataType.BOOLEAN)
73-
isArchived!: boolean;
73+
declare isArchived: boolean;
7474

7575
@Column(DataType.TEXT)
76-
emoji!: string;
76+
declare emoji: string;
7777

7878
@Column(DataType.TEXT)
79-
ring!: ARENA_ZONE_RING;
79+
declare ring: ARENA_ZONE_RING;
8080

8181
@ForeignKey(() => Organization)
8282
@Column(DataType.INTEGER)
83-
_organizationId!: string;
83+
declare _organizationId: string;
8484

8585
@BelongsTo(() => Organization, {
8686
foreignKey: '_organizationId',

0 commit comments

Comments
 (0)