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/.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 5fa87f7..afb7289 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ### Unreleased +### [3.0.0] - 2026-07-25 + +- release 3.0.0 +- dep(rr): bump version + ### [3.0.0-alpha.13] - 2026-07-24 - fix(sql): quote mysql 8 keyword rank @@ -87,7 +92,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 @@ -101,3 +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.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 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. 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)] } 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",