From 29b10086f4f109dcd62275bef99032f048a81f77 Mon Sep 17 00:00:00 2001 From: Dennis Postma Date: Fri, 21 Mar 2025 21:52:01 +0100 Subject: [PATCH] npm update, npm run format, added new migration --- package-lock.json | 86 +++++++++---------- src/entities/base/mapObject.ts | 2 +- src/migrations/.snapshot-game.json | 10 --- ...13232305.ts => Migration20250321203033.ts} | 4 +- 4 files changed, 46 insertions(+), 56 deletions(-) rename src/migrations/{Migration20250313232305.ts => Migration20250321203033.ts} (97%) diff --git a/package-lock.json b/package-lock.json index 6aada66..d976ff3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1073,14 +1073,14 @@ } }, "node_modules/@mikro-orm/cli": { - "version": "6.4.10", - "resolved": "https://registry.npmjs.org/@mikro-orm/cli/-/cli-6.4.10.tgz", - "integrity": "sha512-9pSwTKGSW5ezbgPSgQbZ5eKL1K8anawmMX4JgFHg6/6W8feuCbGYGccuuJWxG+j3ePFp/ot4b9OERgU01vuJEg==", + "version": "6.4.11", + "resolved": "https://registry.npmjs.org/@mikro-orm/cli/-/cli-6.4.11.tgz", + "integrity": "sha512-soy/MA8FoZD/omkqe5vc4POrxYwNVYt0bPf2ySeoFGMxX5C5SeLCGK2pLMmGj0LIdc3WcDicpFf1tmp2tvcJvw==", "license": "MIT", "dependencies": { "@jercle/yargonaut": "1.1.5", - "@mikro-orm/core": "6.4.10", - "@mikro-orm/knex": "6.4.10", + "@mikro-orm/core": "6.4.11", + "@mikro-orm/knex": "6.4.11", "fs-extra": "11.3.0", "tsconfig-paths": "4.2.0", "yargs": "17.7.2" @@ -1094,9 +1094,9 @@ } }, "node_modules/@mikro-orm/core": { - "version": "6.4.10", - "resolved": "https://registry.npmjs.org/@mikro-orm/core/-/core-6.4.10.tgz", - "integrity": "sha512-rLRiBnxK0v+AkzYvfR7kHM6MLh9IaE9Ys2lccr/hDOdqcZ0pMlOseBAR/Jrq8/K2/KXF5tZGphVZYQKjU5cYyw==", + "version": "6.4.11", + "resolved": "https://registry.npmjs.org/@mikro-orm/core/-/core-6.4.11.tgz", + "integrity": "sha512-FCXWpRwcLOjjc1/1gigqWLSeJpSlMOOO9TQMUT5JP5/NEpisLfDyblwMOklRfAidrFRRTSVL9DGa9OcdZC5ACg==", "license": "MIT", "dependencies": { "dataloader": "2.2.3", @@ -1104,7 +1104,7 @@ "esprima": "4.0.1", "fs-extra": "11.3.0", "globby": "11.1.0", - "mikro-orm": "6.4.10", + "mikro-orm": "6.4.11", "reflect-metadata": "0.2.2" }, "engines": { @@ -1115,9 +1115,9 @@ } }, "node_modules/@mikro-orm/knex": { - "version": "6.4.10", - "resolved": "https://registry.npmjs.org/@mikro-orm/knex/-/knex-6.4.10.tgz", - "integrity": "sha512-u/v4Vj4cCiGRgCxzXC+iCDB8ciUnRPg0WsKX7Fu2tUFPwOlRZvJmU7hFUXfkOLRaxpAUgdzb7UPTeNmXqVaCBA==", + "version": "6.4.11", + "resolved": "https://registry.npmjs.org/@mikro-orm/knex/-/knex-6.4.11.tgz", + "integrity": "sha512-Lypp8Pw1SMFFtwu1ME7QiLECCFBY6B1Q8KcxkWiBFQaWohpU42h9JUPw13pzHCAYWQ5pNbQWrK0fh/1AFtxgkw==", "license": "MIT", "dependencies": { "fs-extra": "11.3.0", @@ -1146,12 +1146,12 @@ } }, "node_modules/@mikro-orm/mariadb": { - "version": "6.4.10", - "resolved": "https://registry.npmjs.org/@mikro-orm/mariadb/-/mariadb-6.4.10.tgz", - "integrity": "sha512-IYIdpGdNrcX8gnOdRXmlzSottp1mtDaiViRN9ls5eadUhasvL5InkZZOtHBZM0bGRocxiMLenlAttsL/UN+FxA==", + "version": "6.4.11", + "resolved": "https://registry.npmjs.org/@mikro-orm/mariadb/-/mariadb-6.4.11.tgz", + "integrity": "sha512-mjOb2qQdIg6F0tS+I97G2D7tNriy1kDg6yG7ZdHUj5ZX379fNop5QkZAfHMDIo86RQJYjkth8qvKqubV3MNFGg==", "license": "MIT", "dependencies": { - "@mikro-orm/knex": "6.4.10", + "@mikro-orm/knex": "6.4.11", "mariadb": "3.4.0" }, "engines": { @@ -1162,12 +1162,12 @@ } }, "node_modules/@mikro-orm/migrations": { - "version": "6.4.10", - "resolved": "https://registry.npmjs.org/@mikro-orm/migrations/-/migrations-6.4.10.tgz", - "integrity": "sha512-oxQncP4Y0YwNMS5awri3czbVbHv2bQpumFQ5OQ8z0LpoaNTvyPRUDdIxfcduldYpyFQGENwctPf8F6oVIrFsZQ==", + "version": "6.4.11", + "resolved": "https://registry.npmjs.org/@mikro-orm/migrations/-/migrations-6.4.11.tgz", + "integrity": "sha512-2Sy5TVd4gP4lL+t0BgQ53dHEwZ49HeiE6Xe02hiVH4d+GCv6TD/BXHYI5xgPoPRBaFjjnrWf/8tsUJMfD7tz7g==", "license": "MIT", "dependencies": { - "@mikro-orm/knex": "6.4.10", + "@mikro-orm/knex": "6.4.11", "fs-extra": "11.3.0", "umzug": "3.8.2" }, @@ -1179,13 +1179,13 @@ } }, "node_modules/@mikro-orm/mysql": { - "version": "6.4.10", - "resolved": "https://registry.npmjs.org/@mikro-orm/mysql/-/mysql-6.4.10.tgz", - "integrity": "sha512-3jyZlzrIOJPqvBICXyQ3PTncFxoMFU8ANgUUxoix7w0d9fefE4jIZbsaZZ3OqFtbRiy3fE367vMWmpn3gHuBAg==", + "version": "6.4.11", + "resolved": "https://registry.npmjs.org/@mikro-orm/mysql/-/mysql-6.4.11.tgz", + "integrity": "sha512-jd7sd15JOk7DuxV5WrcFJSQX9AyW/xvzI6caMFyAuF0CaiTgwDYEKr9u4+j409ABFzZZ07l/0tsJnazlIp9tag==", "license": "MIT", "dependencies": { - "@mikro-orm/knex": "6.4.10", - "mysql2": "3.13.0" + "@mikro-orm/knex": "6.4.11", + "mysql2": "3.14.0" }, "engines": { "node": ">= 18.12.0" @@ -1195,9 +1195,9 @@ } }, "node_modules/@mikro-orm/reflection": { - "version": "6.4.10", - "resolved": "https://registry.npmjs.org/@mikro-orm/reflection/-/reflection-6.4.10.tgz", - "integrity": "sha512-l3YUr/RbZCzBrAJvFZPhOy076ZXWNmpmcH2BUuas7413Yqj8pAW/WNX0U/QyxF4acsoGzj4G/MW33cZyxFiAxw==", + "version": "6.4.11", + "resolved": "https://registry.npmjs.org/@mikro-orm/reflection/-/reflection-6.4.11.tgz", + "integrity": "sha512-ERxjKFtx66XFl1ZTQHtgpTpth/VX2PqROSA1alakwigSb6EEZmHqBC5FTH+nx4xkWQzuPldZGyqbHUGiEyxaXA==", "license": "MIT", "dependencies": { "globby": "11.1.0", @@ -1605,9 +1605,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "20.17.24", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.24.tgz", - "integrity": "sha512-d7fGCyB96w9BnWQrOsJtpyiSaBcAYYr75bnK6ZRjDbql2cGLj/3GsL5OYmLPNq76l7Gf2q4Rv9J2o6h5CrD9sA==", + "version": "20.17.25", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.25.tgz", + "integrity": "sha512-bT+r2haIlplJUYtlZrEanFHdPIZTeiMeh/fSOEbOOfWf9uTn+lg8g0KU6Q3iMgjd9FLuuMAgfCNSkjUbxL6E3Q==", "license": "MIT", "dependencies": { "undici-types": "~6.19.2" @@ -1949,9 +1949,9 @@ } }, "node_modules/bullmq": { - "version": "5.44.0", - "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.44.0.tgz", - "integrity": "sha512-OnEtkuXyrUx2Jm5BpH92+ttrobblBdCbkhOe3OoR0hxZuAilI3mPWlwELslhfImRpDv8rK+C/0/VK7I8f3xIig==", + "version": "5.44.1", + "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.44.1.tgz", + "integrity": "sha512-NEWQIixKw5QdXmSnhQU25A336N10DvxuDcmiVXQyuwSx1lrzfNIdQA3BNADfpAUwHtuJkJImHVLCM3/KEr9nWA==", "license": "MIT", "dependencies": { "cron-parser": "^4.9.0", @@ -3393,9 +3393,9 @@ } }, "node_modules/mariadb/node_modules/@types/node": { - "version": "22.13.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz", - "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==", + "version": "22.13.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.11.tgz", + "integrity": "sha512-iEUCUJoU0i3VnrCmgoWCXttklWcvoCIx4jzcP22fioIVSdTmjgoEvmAO/QPw6TcS9k5FrNgn4w7q5lGOd1CT5g==", "license": "MIT", "dependencies": { "undici-types": "~6.20.0" @@ -3478,9 +3478,9 @@ } }, "node_modules/mikro-orm": { - "version": "6.4.10", - "resolved": "https://registry.npmjs.org/mikro-orm/-/mikro-orm-6.4.10.tgz", - "integrity": "sha512-gxElkHr4IiNpOkvb0ZtJnunth9aq/hbQUVNNj9Uvz/9lNvkKDUj45YuWMDmp692x5KGcI+ocujRf4NHk/NzTtw==", + "version": "6.4.11", + "resolved": "https://registry.npmjs.org/mikro-orm/-/mikro-orm-6.4.11.tgz", + "integrity": "sha512-vmrAVGalS+pcgsumdHGAF7OwrlSItWwA6y0vBApuy8wDnNsejzUXk1PkoSoMSThVxV897+Dt+8xhbKd+OkNsvw==", "license": "MIT", "engines": { "node": ">= 18.12.0" @@ -3579,9 +3579,9 @@ } }, "node_modules/mysql2": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.13.0.tgz", - "integrity": "sha512-M6DIQjTqKeqXH5HLbLMxwcK5XfXHw30u5ap6EZmu7QVmcF/gnh2wS/EOiQ4MTbXz/vQeoXrmycPlVRM00WSslg==", + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.14.0.tgz", + "integrity": "sha512-8eMhmG6gt/hRkU1G+8KlGOdQi2w+CgtNoD1ksXZq9gQfkfDsX4LHaBwTe1SY0Imx//t2iZA03DFnyYKPinxSRw==", "license": "MIT", "dependencies": { "aws-ssl-profiles": "^1.1.1", diff --git a/src/entities/base/mapObject.ts b/src/entities/base/mapObject.ts index 597f65c..240a53a 100644 --- a/src/entities/base/mapObject.ts +++ b/src/entities/base/mapObject.ts @@ -69,7 +69,7 @@ export class BaseMapObject extends BaseEntity { } getDepthOffsets() { - return this.depthOffsets; + return this.depthOffsets } setOriginX(originX: number) { diff --git a/src/migrations/.snapshot-game.json b/src/migrations/.snapshot-game.json index 2c67c86..c9f81f2 100644 --- a/src/migrations/.snapshot-game.json +++ b/src/migrations/.snapshot-game.json @@ -492,16 +492,6 @@ "length": null, "mappedType": "json" }, - "pivot_points": { - "name": "pivot_points", - "type": "json", - "unsigned": false, - "autoincrement": false, - "primary": false, - "nullable": false, - "length": null, - "mappedType": "json" - }, "origin_x": { "name": "origin_x", "type": "numeric(10,2)", diff --git a/src/migrations/Migration20250313232305.ts b/src/migrations/Migration20250321203033.ts similarity index 97% rename from src/migrations/Migration20250313232305.ts rename to src/migrations/Migration20250321203033.ts index 09dc86b..a3fc847 100644 --- a/src/migrations/Migration20250313232305.ts +++ b/src/migrations/Migration20250321203033.ts @@ -1,6 +1,6 @@ import { Migration } from '@mikro-orm/migrations'; -export class Migration20250313232305 extends Migration { +export class Migration20250321203033 extends Migration { override async up(): Promise { this.addSql(`create table \`map\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null default '', \`width\` int not null default 10, \`height\` int not null default 10, \`tiles\` json not null, \`pvp\` tinyint(1) not null default false, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`); @@ -16,7 +16,7 @@ export class Migration20250313232305 extends Migration { this.addSql(`alter table \`map_event_tile_teleport\` add unique \`map_event_tile_teleport_map_event_tile_id_unique\`(\`map_event_tile_id\`);`); this.addSql(`alter table \`map_event_tile_teleport\` add index \`map_event_tile_teleport_to_map_id_index\`(\`to_map_id\`);`); - this.addSql(`create table \`map_object\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`tags\` json not null, \`depth_offsets\` json not null, \`pivot_points\` json not null, \`origin_x\` numeric(10,2) not null default 0, \`origin_y\` numeric(10,2) not null default 0, \`frame_rate\` int not null default 0, \`frame_width\` int not null default 0, \`frame_height\` int not null default 0, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`); + this.addSql(`create table \`map_object\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`tags\` json not null, \`depth_offsets\` json not null, \`origin_x\` numeric(10,2) not null default 0, \`origin_y\` numeric(10,2) not null default 0, \`frame_rate\` int not null default 0, \`frame_width\` int not null default 0, \`frame_height\` int not null default 0, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`); this.addSql(`create table \`placed_map_object\` (\`id\` varchar(255) not null, \`map_id\` varchar(255) not null, \`map_object_id\` varchar(255) not null, \`is_rotated\` tinyint(1) not null default false, \`position_x\` int not null default 0, \`position_y\` int not null default 0, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`); this.addSql(`alter table \`placed_map_object\` add index \`placed_map_object_map_id_index\`(\`map_id\`);`);