fix: working deno

.vscode/settings.json

@@ -5,7 +5,7 @@
     "source.organizeImports": "explicit",
     "source.sortMembers": "explicit"
   },
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.defaultFormatter": "denoland.vscode-deno",
   "editor.formatOnSave": true,
   "files.insertFinalNewline": true,
   "files.trimFinalNewlines": true,
@@ -21,5 +21,6 @@
   "typescript.tsdk": "node_modules/typescript/lib",
   "typescript.updateImportsOnFileMove.enabled": "always",
   "deno.enable": true,
+  "deno.lint": true,
   "eslint.enable": false
 }

deno.json

@@ -14,12 +14,15 @@
     "./packages/frontend"
   ],
   "lint": {
+    "exclude": ["**/*.spec.ts"],
     "rules": {
-      "exclude": ["no-unused-vars"]
+      "exclude": ["verbatim-module-syntax"]
     }
   },
   "nodeModulesDir": "auto",
   "compilerOptions": {
+    "jsx": "react-jsx",
+    "jsxImportSource": "npm:react",
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true
   }

example-bots/node-arrows/src/main.js

@@ -1,3 +1,4 @@
+import process from "node:process";
 import { getBot, joinBoard, moveBotOnBoard, registerBot } from "./api/bot.js";
 import {
   couldNotJoinBoard,
@@ -6,7 +7,6 @@ import {
   registrationSuccessful,
 } from "./messages.js";
 import { sleep } from "./utils.js";
-import process from "node:process";
 
 export const register = async (name, email, password, team) => {
   const bot = await registerBot(name, email, password, team);
@@ -17,7 +17,7 @@ export const register = async (name, email, password, team) => {
   }
 };
 
-const keypress = async () => {
+const keypress = () => {
   process.stdin.setRawMode(true);
   return new Promise((resolve) =>
     process.stdin.once("data", (data) => {
@@ -50,7 +50,7 @@ const keypress = async () => {
 export const play = async (token, boardId) => {
   gameStarted();
   // Gets the provided logic
-  let bot = await getBot(token);
+  const bot = await getBot(token);
 
   // Join board
   let board = await joinBoard(token, boardId);

example-bots/node/src/main.js

@@ -28,7 +28,7 @@ export const play = async (token, logic, boardId) => {
   if (!logicFunction) {
     invalidLogic();
   }
-  let bot = await getBot(token);
+  const bot = await getBot(token);
 
   // Join board
   let board = await joinBoard(token, boardId);

packages/backend/deno.json

@@ -1,6 +1,6 @@
 {
-  // "name": "@etimo/diamonds2-backend",
-  // "exports": "./mod.ts",
+  "name": "@etimo/diamonds2-backend",
+  "exports": "./mod.ts",
   "tasks": {
     "start": "deno run --watch -A src/main.ts",
     "postinstall": "deno run -A npm:prisma generate",

packages/backend/graph.json

@@ -700,4 +700,4 @@
       "nodeId": "-2098992827"
     }
   }
-}
+}

packages/backend/src/controllers/boards.controller.ts

@@ -1,7 +1,7 @@
 import { Controller, Get, Param } from "@nestjs/common";
 import { ApiOperation, ApiResponse, ApiTags } from "@nestjs/swagger";
-import { BoardDto, BoardMetadataDto } from "../models";
-import { BoardsService } from "../services";
+import { BoardDto, BoardMetadataDto } from "../models/index.ts";
+import { BoardsService } from "../services/index.ts";
 
 @ApiTags("Boards")
 @Controller("api/boards")

packages/backend/src/controllers/bots.controller.ts

@@ -7,9 +7,9 @@ import {
   BotRegistrationPublicDto,
   JoinInputDto,
   MoveInputDto,
-} from "../models";
-import { BoardsService, BotsService } from "../services";
-import { NotFoundError } from "../errors";
+} from "../models/index.ts";
+import { BoardsService, BotsService } from "../services/index.ts";
+import { NotFoundError } from "../errors/index.ts";
 
 @ApiTags("Bots")
 @Controller("api/bots")

packages/backend/src/controllers/highscores.controller.ts

@@ -1,7 +1,7 @@
 import { Controller, Get, Param } from "@nestjs/common";
 import { ApiResponse, ApiTags } from "@nestjs/swagger";
-import { HighscorePublicDto } from "../models";
-import { HighscoresService } from "../services";
+import { HighscorePublicDto } from "../models/index.ts";
+import { HighscoresService } from "../services/index.ts";
 
 @ApiTags("Highscores")
 @Controller("api/highscores")
@@ -27,7 +27,7 @@ export class HighscoresController {
       seasonId,
     );
     return highscores.map((highscore) =>
-      HighscorePublicDto.fromEntity(highscore),
+      HighscorePublicDto.fromEntity(highscore)
     );
   }
 }

packages/backend/src/controllers/index.ts

@@ -1,7 +1,7 @@
-export * from "./boards.controller";
-export * from "./bots.controller";
-export * from "./highscores.controller";
-export * from "./recordings.controller";
-export * from "./seasons.controller";
-export * from "./slack.controller";
-export * from "./teams.controller";
+export * from "./boards.controller.ts";
+export * from "./bots.controller.ts";
+export * from "./highscores.controller.ts";
+export * from "./recordings.controller.ts";
+export * from "./seasons.controller.ts";
+export * from "./slack.controller.ts";
+export * from "./teams.controller.ts";

packages/backend/src/controllers/recordings.controller.ts

@@ -1,7 +1,7 @@
 import { Controller, Get, Param } from "@nestjs/common";
 import { ApiResponse, ApiTags } from "@nestjs/swagger";
-import { RecordingListDto, RecordingPublicDto } from "../models";
-import { RecordingsService } from "../services";
+import { RecordingListDto, RecordingPublicDto } from "../models/index.ts";
+import { RecordingsService } from "../services/index.ts";
 
 @ApiTags("Recordings")
 @Controller("api/recordings")

packages/backend/src/controllers/seasons.controller.ts

@@ -1,7 +1,7 @@
 import { Controller, Get, Param } from "@nestjs/common";
 import { ApiResponse, ApiTags } from "@nestjs/swagger";
-import { BoardConfigDto, SeasonDto } from "../models";
-import { BoardConfigService, SeasonsService } from "../services";
+import { BoardConfigDto, SeasonDto } from "../models/index.ts";
+import { BoardConfigService, SeasonsService } from "../services/index.ts";
 
 @ApiTags("Seasons")
 @Controller("api/seasons")

packages/backend/src/controllers/slack.controller.ts

@@ -1,6 +1,6 @@
 import { Body, Controller, HttpCode, Post, Req } from "@nestjs/common";
 import { ApiResponse, ApiTags } from "@nestjs/swagger";
-import { AuthorizationService, SlackService } from "../services";
+import { AuthorizationService, SlackService } from "../services/index.ts";
 
 @ApiTags("Slack")
 @Controller("api/slack")

packages/backend/src/controllers/teams.controller.ts

@@ -1,7 +1,7 @@
 import { Controller, Get } from "@nestjs/common";
 import { ApiResponse, ApiTags } from "@nestjs/swagger";
-import { TeamDto } from "../models";
-import { TeamsService } from "../services";
+import { TeamDto } from "../models/index.ts";
+import { TeamsService } from "../services/index.ts";
 
 @ApiTags("Teams")
 @Controller("api/teams")

packages/backend/src/db/index.ts

@@ -1 +1 @@
-export * from "./repositories";
+export * from "./repositories/index.ts";

packages/backend/src/db/repositories/boardConfig.repository.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@nestjs/common";
-import { PrismaService } from "../../services/prisma.service";
-import { IBoardConfig, INewBoardConfig } from "../../types";
+import { PrismaService } from "../../services/prisma.service.ts";
+import { IBoardConfig, INewBoardConfig } from "../../types/index.ts";
 
 @Injectable()
 export class BoardConfigRepository {

packages/backend/src/db/repositories/botRegistrations.repository.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@nestjs/common";
-import { PrismaService } from "../../services/prisma.service";
-import { IBot, INewBot } from "../../types";
+import { PrismaService } from "../../services/prisma.service.ts";
+import { IBot, INewBot } from "../../types/index.ts";
 
 @Injectable()
 export class BotRegistrationsRepository {

packages/backend/src/db/repositories/highscores.repository.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@nestjs/common";
-import { PrismaService } from "../../services/prisma.service";
-import { IHighscore, INewHighscore } from "../../types";
+import { PrismaService } from "../../services/prisma.service.ts";
+import { IHighscore, INewHighscore } from "../../types/index.ts";
 
 @Injectable()
 export class HighscoresRepository {

packages/backend/src/db/repositories/index.ts

@@ -1,6 +1,6 @@
-export * from "./boardConfig.repository";
-export * from "./botRegistrations.repository";
-export * from "./highscores.repository";
-export * from "./recordings.repository";
-export * from "./seasons.repository";
-export * from "./teams.repository";
+export * from "./boardConfig.repository.ts";
+export * from "./botRegistrations.repository.ts";
+export * from "./highscores.repository.ts";
+export * from "./recordings.repository.ts";
+export * from "./seasons.repository.ts";
+export * from "./teams.repository.ts";

packages/backend/src/db/repositories/recordings.repository.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@nestjs/common";
-import { PrismaService } from "../../services/prisma.service";
-import { INewRecording, IRecording } from "../../types";
+import { PrismaService } from "../../services/prisma.service.ts";
+import { INewRecording, IRecording } from "../../types/index.ts";
 
 @Injectable()
 export class RecordingsRepository {

packages/backend/src/db/repositories/seasons.repository.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@nestjs/common";
-import { PrismaService } from "../../services/prisma.service";
-import { INewSeason, ISeason } from "../../types";
+import { PrismaService } from "../../services/prisma.service.ts";
+import { INewSeason, ISeason } from "../../types/index.ts";
 
 @Injectable()
 export class SeasonsRepository {

packages/backend/src/db/repositories/teams.repository.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@nestjs/common";
-import { PrismaService } from "../../services/prisma.service";
-import { INewTeam, ITeam } from "../../types";
+import { PrismaService } from "../../services/prisma.service.ts";
+import { INewTeam, ITeam } from "../../types/index.ts";
 
 @Injectable()
 export class TeamsRepository {

packages/backend/src/enums/index.ts

@@ -1,2 +1,2 @@
-export * from "./bots-errors.enum";
-export * from "./move-direction.enum";
+export * from "./bots-errors.enum.ts";
+export * from "./move-direction.enum.ts";

packages/backend/src/errors/conflict.error.ts

@@ -1,4 +1,4 @@
-import { DiamondsBaseError } from "./base.error";
+import { DiamondsBaseError } from "./base.error.ts";
 
 export class ConflictError extends DiamondsBaseError {
   constructor(message: string, errorTag?: string) {

packages/backend/src/errors/forbidden.error.ts

@@ -1,4 +1,4 @@
-import { DiamondsBaseError } from "./base.error";
+import { DiamondsBaseError } from "./base.error.ts";
 
 export class ForbiddenError extends DiamondsBaseError {
   constructor(message: string, errorTag?: string) {

packages/backend/src/errors/index.ts

@@ -1,5 +1,5 @@
-export * from "./base.error";
-export * from "./conflict.error";
-export * from "./forbidden.error";
-export * from "./not-found.error";
-export * from "./unauthorized.error";
+export * from "./base.error.ts";
+export * from "./conflict.error.ts";
+export * from "./forbidden.error.ts";
+export * from "./not-found.error.ts";
+export * from "./unauthorized.error.ts";

packages/backend/src/errors/not-found.error.ts

@@ -1,6 +1,6 @@
-import { DiamondsBaseError } from "./base.error";
+import { DiamondsBaseError } from "./base.error.ts";
 
-export  class NotFoundError extends DiamondsBaseError {
+export class NotFoundError extends DiamondsBaseError {
   constructor(message: string) {
     super(message);
   }

packages/backend/src/errors/unauthorized.error.ts

@@ -1,4 +1,4 @@
-import { DiamondsBaseError } from "./base.error";
+import { DiamondsBaseError } from "./base.error.ts";
 
 export class UnauthorizedError extends DiamondsBaseError {
   constructor(message: string) {

packages/backend/src/exceptions.ts

@@ -1,4 +1,4 @@
-import { BotsErrors } from "./enums";
+import { BotsErrors } from "./enums/index.ts";
 
 export class ValidationException extends Error {
   constructor(botErrors: BotsErrors) {

packages/backend/src/gameengine/README.md

@@ -4,7 +4,8 @@ The game engine is designed around some kind of mediator-like pattern.
 
 ## Game object providers
 
-Game object providers react to events around the board itself, such as when a board is initialized and when objects are added or removed.
+Game object providers react to events around the board itself, such as when a
+board is initialized and when objects are added or removed.
 
 All providers must inherit the abstract class `AbstractGameObjectProvider`.
 
@@ -20,30 +21,40 @@ Providers are mainly responsible for spawning/removing game objects.
 
 Examples:
 
-- When a board is initialized, generate a set of diamond game objects that can be collected.
+- When a board is initialized, generate a set of diamond game objects that can
+  be collected.
 - When diamonds are depleted, generate new ones.
 
 ## Game objects
 
-Game objects are the actual objects placed on the board. Game objects have a position, they can be acted upon, they can collide, they can react to other game objects etc.
+Game objects are the actual objects placed on the board. Game objects have a
+position, they can be acted upon, they can collide, they can react to other game
+objects etc.
 
 All game objects perform actions using the assigned board as the mediator.
 
 All game objects must inherit the abstract class `AbstractGameObject`.
 
 Available events:
 
-- _canGameObjectEnter_ - Another game object wants to move to the cell that this game object belongs to
-- _onGameObjectEntered_ - Another game object moved to the cell of this game object
-- _canGameObjectLeave_ - Another game object wants to leave the cell that this game object belongs to
+- _canGameObjectEnter_ - Another game object wants to move to the cell that this
+  game object belongs to
+- _onGameObjectEntered_ - Another game object moved to the cell of this game
+  object
+- _canGameObjectLeave_ - Another game object wants to leave the cell that this
+  game object belongs to
 - _onGameObjectLeft_ - Another game object left the cell of this game object
-- _onGameObjectCallbackNotified_ - Callback for when a certain time has passed. Use to perform periodic activity. Requires telling the board to you notify you every X ms (`registerGameObjectForCallbackLoop(gameObject: AbstractGameObject, interval: number)`)
+- _onGameObjectCallbackNotified_ - Callback for when a certain time has passed.
+  Use to perform periodic activity. Requires telling the board to you notify you
+  every X ms
+  (`registerGameObjectForCallbackLoop(gameObject: AbstractGameObject, interval: number)`)
 - _onGameObjectRemoved_ - This game object was removed from the board
 - _onEvent_ - Some kind of other event was published from a game object
 
 ### Available game objects
 
-These are the game objects currently sort of implemented (not fully tested yet though :). They have a provider as well.
+These are the game objects currently sort of implemented (not fully tested yet
+though :). They have a provider as well.
 
 - [Base](gameobjects/base/)
 - [Bot](gameobjects/bot/)
@@ -54,7 +65,9 @@ These are the game objects currently sort of implemented (not fully tested yet t
 
 ## Boards
 
-A board is created using a configuration and a set of game object providers ("Features"). This makes it easy to create different boards with different features activated.
+A board is created using a configuration and a set of game object providers
+("Features"). This makes it easy to create different boards with different
+features activated.
 
 ```typescript
 const providers = [

packages/backend/src/gameengine/board.spec.ts

@@ -1,11 +1,11 @@
 import { Position } from "@etimo/diamonds2-types";
-import { IBot } from "../types";
-import { Board } from "./board";
-import { BaseGameObject } from "./gameobjects/base/base";
-import { BotGameObject } from "./gameobjects/bot/bot";
-import { BotProvider } from "./gameobjects/bot/bot-provider";
-import { DiamondProvider } from "./gameobjects/diamond/diamond-provider";
-import { createTestBoard, createTestBot } from "./util";
+import { IBot } from "../types/index.ts";
+import { Board } from "./board.ts";
+import { BaseGameObject } from "./gameobjects/base/base.ts";
+import { BotGameObject } from "./gameobjects/bot/bot.ts";
+import { BotProvider } from "./gameobjects/bot/bot-provider.ts";
+import { DiamondProvider } from "./gameobjects/diamond/diamond-provider.ts";
+import { createTestBoard, createTestBot } from "./util/index.ts";
 
 let opponentPosition: Position;
 let board: Board;