From 4c44bf3806ebb0cbcaf4cfde66b82231d9bf1721 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sat, 25 Jul 2026 13:18:11 -0700 Subject: [PATCH 1/6] dep(rr): bump version --- .github/workflows/publish.yml | 11 ++--------- CHANGELOG.md | 4 ++++ package.json | 8 ++++---- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index fbcb1c9..5621041 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -35,14 +35,7 @@ jobs: fetch-depth: 0 # fetch-depth 0 needed by GitHub Release - name: publish to NPM - run: | - VERSION=$(node -e 'console.log(require("./package.json").version)') - if printf '%s' "$VERSION" | grep -q -- '-'; then - # prerelease versions get the "next" tag - npm publish --access public --tag next - else - npm publish --access public - fi + run: npm publish --access public publish-gpr: needs: build @@ -58,4 +51,4 @@ jobs: scope: '@nictool' - run: npm publish env: - NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fa87f7..770fdb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ### Unreleased +### [3.0.0] - 2026-07-25 + +- release 3.0.0 + ### [3.0.0-alpha.13] - 2026-07-24 - fix(sql): quote mysql 8 keyword rank diff --git a/package.json b/package.json index c400d43..b5bfa39 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nictool/api", - "version": "3.0.0-alpha.13", + "version": "3.0.0", "description": "NicTool API", "main": "index.js", "type": "module", @@ -48,7 +48,7 @@ "homepage": "https://github.com/NicTool/api#readme", "devDependencies": { "@eslint/js": "^10.0.1", - "eslint": "^10.7.0", + "eslint": "^10.8.0", "eslint-config-prettier": "^10.1.8", "globals": "^17.7.0" }, @@ -59,8 +59,8 @@ "@hapi/inert": "^7.1.2", "@hapi/jwt": "^3.2.4", "@hapi/vision": "^7.0.3", - "@msimerson/hapi-openapi": "^18.0.0", - "@nictool/dns-resource-record": "^1.8.0", + "@msimerson/hapi-openapi": "^18.0.3", + "@nictool/dns-resource-record": "^1.8.1", "@nictool/validate": "^0.9.1", "joi": "^18.2.3", "mysql2": "^3.23.1", From c53e2c7d18de79e8d7ee55c225706f5680142e9e Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sat, 25 Jul 2026 13:18:58 -0700 Subject: [PATCH 2/6] doc(CHANGELOG): add commit messages for 3.0.2 --- .release | 2 +- CHANGELOG.md | 6 +++++- package.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.release b/.release index a6911a9..290b441 160000 --- a/.release +++ b/.release @@ -1 +1 @@ -Subproject commit a6911a90f1b15486fb319d844341421c78035b2a +Subproject commit 290b441b2052b219585e0690da703c56ee1e698e diff --git a/CHANGELOG.md b/CHANGELOG.md index 770fdb5..96de869 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ### Unreleased +### [3.0.2] - 2026-07-25 + +- dep(rr): bump version + ### [3.0.0] - 2026-07-25 - release 3.0.0 @@ -91,7 +95,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). - lib/group.get: convert booleans - lib/user.get: convert booleans - [3.0.0-alpha.0]: https://github.com/NicTool/api/releases/tag/3.0.0-alpha.0 [3.0.0-alpha.1]: https://github.com/NicTool/api/releases/tag/3.0.0-alpha.1 [3.0.0-alpha.2]: https://github.com/NicTool/api/releases/tag/3.0.0-alpha.2 @@ -105,3 +108,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). [3.0.0-alpha.10]: https://github.com/NicTool/api/releases/tag/v3.0.0-alpha.10 [3.0.0-alpha.11]: https://github.com/NicTool/api/releases/tag/v3.0.0-alpha.11 [3.0.0-alpha.12]: https://github.com/NicTool/api/releases/tag/v3.0.0-alpha.12 +[3.0.2]: https://github.com/NicTool/api/releases/tag/v3.0.2 diff --git a/package.json b/package.json index b5bfa39..e20e82d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nictool/api", - "version": "3.0.0", + "version": "3.0.2", "description": "NicTool API", "main": "index.js", "type": "module", From a1326361f201f7548beb705c77d7278e3d12b5ff Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sat, 25 Jul 2026 13:19:01 -0700 Subject: [PATCH 3/6] doc(CONTRIBUTORS): updated --- CONTRIBUTORS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index bdd0410..1eee3b3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,8 +2,8 @@ This handcrafted artisanal software is brought to you by: -|
msimerson (26)|
aberoham (1)| -| :---: | :---: | +|
msimerson (30) |
aberoham (1) | +| :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | this file is generated by [.release](https://github.com/msimerson/.release). Contribute to this project to get your GitHub profile included here. From 7d6eff674d15a88fba0c03670b441e1810496f91 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sat, 25 Jul 2026 13:19:32 -0700 Subject: [PATCH 4/6] update changelog --- CHANGELOG.md | 6 ++---- package.json | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96de869..1d9b915 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ### Unreleased -### [3.0.2] - 2026-07-25 - -- dep(rr): bump version - ### [3.0.0] - 2026-07-25 - release 3.0.0 +- dep(rr): bump version ### [3.0.0-alpha.13] - 2026-07-24 @@ -109,3 +106,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). [3.0.0-alpha.11]: https://github.com/NicTool/api/releases/tag/v3.0.0-alpha.11 [3.0.0-alpha.12]: https://github.com/NicTool/api/releases/tag/v3.0.0-alpha.12 [3.0.2]: https://github.com/NicTool/api/releases/tag/v3.0.2 +[3.0.0-alpha.13]: https://github.com/NicTool/api/releases/tag/v3.0.0-alpha.13 diff --git a/package.json b/package.json index e20e82d..b5bfa39 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nictool/api", - "version": "3.0.2", + "version": "3.0.0", "description": "NicTool API", "main": "index.js", "type": "module", From 263bd6a43e547c172207cb94bb637edac98fe2c1 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sat, 25 Jul 2026 13:19:45 -0700 Subject: [PATCH 5/6] chore: format --- lib/group/store/mysql.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/group/store/mysql.js b/lib/group/store/mysql.js index 396f1a0..611810e 100644 --- a/lib/group/store/mysql.js +++ b/lib/group/store/mysql.js @@ -47,10 +47,11 @@ class Group extends GroupBase { // `rank` is a reserved word in MySQL 8.0+, so it must be backticked; the // generic Mysql.insert helper doesn't quote column names. - await Mysql.execute( - 'INSERT INTO nt_group_subgroups (nt_group_id,nt_subgroup_id,`rank`) VALUES(?,?,?)', - [parent_gid, gid, rank], - ) + await Mysql.execute('INSERT INTO nt_group_subgroups (nt_group_id,nt_subgroup_id,`rank`) VALUES(?,?,?)', [ + parent_gid, + gid, + rank, + ]) const parent = await this.get({ id: parent_gid }) if (parent.length === 1 && parent[0].parent_gid !== 0) { @@ -130,10 +131,9 @@ class Group extends GroupBase { // rootGid plus every descendant subgroup id, from the nt_group_subgroups // closure table (the same source the include_subgroups get() uses). async subgroupGids(rootGid) { - const rows = await Mysql.execute( - 'SELECT nt_subgroup_id FROM nt_group_subgroups WHERE nt_group_id = ?', - [rootGid], - ) + const rows = await Mysql.execute('SELECT nt_subgroup_id FROM nt_group_subgroups WHERE nt_group_id = ?', [ + rootGid, + ]) return [rootGid, ...rows.map((r) => r.nt_subgroup_id)] } From 32643683f36fadf4d299d205502fcf878968a6ed Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sat, 25 Jul 2026 13:22:09 -0700 Subject: [PATCH 6/6] fix changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d9b915..afb7289 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -105,5 +105,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). [3.0.0-alpha.10]: https://github.com/NicTool/api/releases/tag/v3.0.0-alpha.10 [3.0.0-alpha.11]: https://github.com/NicTool/api/releases/tag/v3.0.0-alpha.11 [3.0.0-alpha.12]: https://github.com/NicTool/api/releases/tag/v3.0.0-alpha.12 -[3.0.2]: https://github.com/NicTool/api/releases/tag/v3.0.2 [3.0.0-alpha.13]: https://github.com/NicTool/api/releases/tag/v3.0.0-alpha.13 +[3.0.0]: https://github.com/NicTool/api/releases/tag/v3.0.0