From 908bfe7f9547b18738a8d30cee5ad2a9dc3f21d4 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Wed, 6 Nov 2024 01:37:26 +0100 Subject: [PATCH 1/3] fix: fix upstream changes --- src/cpp/convert.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpp/convert.cpp b/src/cpp/convert.cpp index db7a47f..1d4a517 100644 --- a/src/cpp/convert.cpp +++ b/src/cpp/convert.cpp @@ -18,7 +18,7 @@ static v8::Local information_value_to_js(v8::Isolate* isolate, const recorder::InformationValue& information_value) { return std::visit( - helper::overloaded{ + helper::Overloaded{ [](const std::string& value) -> v8::Local { return Nan::New(value).ToLocalChecked(); }, From 9044e98ae144e5c530bad638b019957c8731bddf Mon Sep 17 00:00:00 2001 From: Totto16 Date: Wed, 6 Nov 2024 17:54:15 +0100 Subject: [PATCH 2/3] chore: add support for node 23 update dependencies bump version --- package-lock.json | 14 +++++++------- package.json | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 05a029b..f09d254 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "oopetris", - "version": "1.0.1", + "version": "1.0.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "oopetris", - "version": "1.0.1", + "version": "1.0.3", "hasInstallScript": true, "license": "MIT", "os": [ @@ -18,7 +18,7 @@ "node-gyp-build": "^4.8.2" }, "devDependencies": { - "@types/jest": "^29.5.13", + "@types/jest": "^29.5.14", "jest": "^29.7.0", "nan": "^2.22.0", "prebuildify": "^6.0.2", @@ -27,7 +27,7 @@ "typescript": "^5.6.3" }, "engines": { - "node": "^18.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0" + "node": "^18.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^23.0.0" } }, "node_modules/@ampproject/remapping": { @@ -1090,9 +1090,9 @@ } }, "node_modules/@types/jest": { - "version": "29.5.13", - "resolved": "https://verdaccio.totto.lt/@types/jest/-/jest-29.5.13.tgz", - "integrity": "sha512-wd+MVEZCHt23V0/L642O5APvspWply/rGY5BcW4SUETo2UzPU3Z26qr8jC2qxpimI2jjx9h7+2cj2FwIr01bXg==", + "version": "29.5.14", + "resolved": "https://verdaccio.totto.lt/@types/jest/-/jest-29.5.14.tgz", + "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 52c968c..8da4df0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oopetris", - "version": "1.0.2", + "version": "1.0.3", "description": "Node js wrapper for oopetris", "gypfile": true, "main": "./dist/index.js", @@ -17,8 +17,8 @@ "scripts": { "install": "node-gyp-build", "build": "npm run build:gyp && npm run compile", - "build:gyp": "prebuildify -t 18.20.4 -t 20.18.0 -t 21.7.3 -t 22.9.0 --strip", - "build:debug": "prebuildify -t 18.20.4 -t 20.18.0 -t 21.7.3 -t 22.9.0 --debug", + "build:gyp": "prebuildify -t 18.20.4 -t 20.18.0 -t 21.7.3 -t 22.11.0 -t 23.1.0 --strip", + "build:debug": "prebuildify -t 18.20.4 -t 20.18.0 -t 21.7.3 -t 22.11.0 -t 23.1.0 --debug", "compile": "npm run build:tsc", "build:tsc": "tsc", "test": "npx jest", @@ -36,7 +36,7 @@ }, "license": "MIT", "engines": { - "node": "^18.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0" + "node": "^18.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^23.0.0" }, "os": [ "darwin", @@ -51,7 +51,7 @@ "node-gyp-build": "^4.8.2" }, "devDependencies": { - "@types/jest": "^29.5.13", + "@types/jest": "^29.5.14", "jest": "^29.7.0", "nan": "^2.22.0", "prebuildify": "^6.0.2", From 30dc5a6762f461bae9f55aed8c94a2effcc26378 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Wed, 6 Nov 2024 18:00:05 +0100 Subject: [PATCH 3/3] fix: upstream fixes upstream now uses int8_t for the mino position, but only internally, we have to cast it, since on storage it is guaranteed to be uint8_t --- src/cpp/convert.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cpp/convert.cpp b/src/cpp/convert.cpp index 1d4a517..9281599 100644 --- a/src/cpp/convert.cpp +++ b/src/cpp/convert.cpp @@ -190,9 +190,11 @@ static v8::Local mino_position_to_js(v8::Isolate* isolate, const grid v8::Local result = Nan::New(); - auto js_x = Nan::New(mino_position.x); + auto mino_pos = mino_position.cast(); - auto js_y = Nan::New(mino_position.y); + auto js_x = Nan::New(mino_pos.x); + + auto js_y = Nan::New(mino_pos.y); std::vector>> properties_vector{ { "x", js_x },