Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
b93f62f
feat(json-api-nestjs): Add JSON_API_DECORATOR_ENTITY metadata to cont…
klerick Apr 13, 2024
42b83a0
feat(nestjs-acl-permissions): First step
klerick Apr 21, 2024
8d886d5
feat(json-api-nestjs): bump zod to v4
klerick Oct 13, 2025
e4135f5
feat(json-api-nestjs): fix after update nx
klerick Oct 14, 2025
b9b15c7
feat(json-api-nestjs-microorm): fix after update nx
klerick Oct 14, 2025
8582842
feat(json-api-nestjs-sdk): fix after update nx
klerick Oct 14, 2025
4dd0084
feat(json-api-nestjs-shared): fix after update nx
klerick Oct 14, 2025
ff2c407
feat(json-api-nestjs-typeorm): fix after update nx
klerick Oct 14, 2025
fe17c0f
feat(nestjs-json-rpc-sdk): fix after update nx
klerick Oct 14, 2025
b458769
chore: update dependencies, fix tests, and adjust configuration for l…
klerick Oct 14, 2025
45081e6
chore: migrate to vitest
klerick Oct 14, 2025
f8d7a0d
chore: change tsconfig and test of type
klerick Oct 15, 2025
bb74aa5
chore: fix type for server
klerick Oct 15, 2025
20e6776
chore: fix perpare and version packages
klerick Oct 15, 2025
4a9dbf4
fix(json-api-nestjs): use ErrorFormatService for format error in Atom…
klerick Oct 22, 2025
84851f5
fix(json-api-nestjs-sdk): add id field in atomic body for add operati…
klerick Oct 22, 2025
2014180
refactor: migrate to pgLite
klerick Oct 22, 2025
822886a
fix(json-api-nestjs-typeorm): update type assertions and replace depr…
klerick Oct 22, 2025
2331350
fix(json-api-nestjs-microorm): replace deprecated faker methods and a…
klerick Oct 22, 2025
2ad3719
fix(json-api-nestjs): replace deprecated faker methods, enhance zod s…
klerick Oct 22, 2025
28f1ab9
feat(json-api-nestjs): add `allowSetId` option for enhanced control o…
klerick Oct 22, 2025
19dd8d0
fix(microorm-database): rename snapshot file
klerick Oct 22, 2025
ec00a73
refactor(typeorm-database): restructure seeders and factories
klerick Nov 12, 2025
78e7f88
refactor(microorm-database): add ACL test entities, migrations, and s…
klerick Nov 12, 2025
2161cdb
refactor(json-api-server-e2e): add ACL test specs, update setup/teard…
klerick Nov 12, 2025
1bcc3f8
refactor(json-api-server): restructure modules for better ORM type se…
klerick Nov 12, 2025
0f67440
fix(json-api-nestjs-shared): refine `RelationCheck` type logic to han…
klerick Nov 12, 2025
c4b63a7
feat(json-api-nestjs-typeorm): add ACL rule support for query builder…
klerick Nov 12, 2025
9de612f
feat(json-api-nestjs-microorm): enhance `getOne` and `getAll` with tr…
klerick Nov 12, 2025
25208b6
feat(acl-permissions): remove legacy ACL service, types, rules handli…
klerick Nov 12, 2025
1e92696
feat(json-api-nestjs): add hooks support and enhance guards handling …
klerick Nov 12, 2025
2980e07
test(json-api-server-e2e): remove commented legacy ACL test cases
klerick Nov 12, 2025
14e822f
feat(json-api-nestjs-sdk): expand types to include JsonConfig, Filter…
klerick Nov 12, 2025
4da0d8c
test(json-api-server-e2e): add ACL atomic operation tests for admin a…
klerick Nov 12, 2025
020e740
test(json-rpc,nestjs-json-rpc,nestjs-acl-permissions,json-api): updat…
klerick Nov 12, 2025
ae621b0
test(json-api-server-e2e): update ACL atomic operation test imports a…
klerick Nov 12, 2025
3c27c5d
chore: remove unused environment files, update dependencies, and enha…
klerick Nov 12, 2025
fd05093
chore(json-api-nestjs-microorm): disable debug mode and comment out u…
klerick Nov 12, 2025
98afafb
chore(github): add E2E workflow for mikroORM and integrate into PR wo…
klerick Nov 12, 2025
e39e8d7
chore(github-actions): update default projects to include nestjs-acl-…
klerick Nov 13, 2025
b498911
test(json-api-server-e2e): improve test descriptions and add comprehe…
klerick Nov 13, 2025
867e51d
docs(nestjs-acl-permissions): clarify limitations of `__current` supp…
klerick Nov 13, 2025
628ab4c
docs(json-api-server-e2e): add examples and usage documentation for J…
klerick Nov 13, 2025
f2e8a52
chore(github-actions): add support for nestjs-acl-permissions project…
klerick Nov 13, 2025
9d8e8d4
refactor(json-api-nestjs): remove resurrected old file after rebase
klerick Nov 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .e2e-micro.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
DB_LOGGING=0
ORM_TYPE=microorm
PORT=3000
1 change: 1 addition & 0 deletions .e2e.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
DB_LOGGING=0
ORM_TYPE=typeorm
PORT=3000
15 changes: 1 addition & 14 deletions .env
Original file line number Diff line number Diff line change
@@ -1,17 +1,4 @@
DB_HOST=localhost
DB_LOGGING=1
DB_NAME="json-api-db"

DB_USERNAME="postgres"
DB_PASSWORD="postgres"
DB_PORT=5432
DB_TYPE=postgres

#DB_USERNAME="root"
#DB_PASSWORD="mysql"
#DB_PORT=3306
#DB_TYPE=mysql


#ORM_TYPE=microorm
ORM_TYPE=typeorm
USE_ATTACH_BUFFER=true
2 changes: 1 addition & 1 deletion .github/actions/bump-version-save.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
projects:
description: 'Package Bump'
required: true
default: 'json-api-nestjs,json-api-nestjs-sdk,nestjs-json-rpc,nestjs-json-rpc-sdk'
default: 'json-api-nestjs,json-api-nestjs-sdk,nestjs-json-rpc,nestjs-json-rpc-sdk,nestjs-acl-permissions'
first-release:
description: 'Is first release?'
required: false
Expand Down
65 changes: 65 additions & 0 deletions .github/workflows/e2e-test-mikroorm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: ⚙️ E2E Test


on:
workflow_call:
inputs:
mainBranch:
description: Type for main nx affect
required: false
default: "master"
type: string
secrets:
NX_CLOUD_ACCESS_TOKEN:
required: true

env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}


jobs:
e2e-test:
runs-on: ubuntu-latest
# services:
# postgres:
# image: postgres
# env:
# POSTGRES_PASSWORD: postgres
# POSTGRES_DB: json-api-db
# options: >-
# --health-cmd pg_isready
# --health-interval 10s
# --health-timeout 5s
# --health-retries 5
# ports:
# - 5432:5432
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup Node.js
uses: ./.github/actions

- name: Determine base for NX affected (if not master)
if: ${{ inputs.mainBranch != 'master' }}
shell: bash
run: |
LAST_TAG=$(git describe --tags --abbrev=0)
LAST_TAG_HASH=$(git rev-parse "$LAST_TAG")
CURRENT_COMMIT=$(git rev-parse HEAD)
echo "Using last tag hash as NX_BASE: $LAST_TAG_HASH"
echo "Using current commit as NX_HEAD: $CURRENT_COMMIT"
echo "NX_BASE=$LAST_TAG_HASH" >> $GITHUB_ENV
echo "NX_HEAD=$CURRENT_COMMIT" >> $GITHUB_ENV

- name: Determine base for NX affected (if master)
if: ${{ inputs.mainBranch == 'master' }}
uses: nrwl/nx-set-shas@v4
with:
main-branch-name: ${{ inputs.mainBranch }}

# - run: npm run typeorm migration:run
# - run: npm run seed:run
# - run: npx nx run json-api-server-e2e:e2e --parallel=1
- run: npx nx run json-api-server-e2e:e2e-micro --parallel=1
32 changes: 16 additions & 16 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ env:
jobs:
e2e-test:
runs-on: ubuntu-latest
services:
postgres:
image: postgres
env:
POSTGRES_PASSWORD: postgres
POSTGRES_DB: json-api-db
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 5432:5432
# services:
# postgres:
# image: postgres
# env:
# POSTGRES_PASSWORD: postgres
# POSTGRES_DB: json-api-db
# options: >-
# --health-cmd pg_isready
# --health-interval 10s
# --health-timeout 5s
# --health-retries 5
# ports:
# - 5432:5432
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -59,7 +59,7 @@ jobs:
with:
main-branch-name: ${{ inputs.mainBranch }}

- run: npm run typeorm migration:run
- run: npm run seed:run
# - run: npm run typeorm migration:run
# - run: npm run seed:run
- run: npx nx run json-api-server-e2e:e2e --parallel=1
- run: npx nx run json-api-server-e2e:e2e-micro --parallel=1
# - run: npx nx run json-api-server-e2e:e2e-micro --parallel=1
12 changes: 12 additions & 0 deletions .github/workflows/new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- tag:type:publish
- tag:lib:json-api-nestjs
- tag:lib:nestjs-json-rpc
- lib:nestjs-acl-permissions
project1:
description: "Select project"
required: false
Expand All @@ -27,6 +28,7 @@ on:
- json-api-nestjs-microorm
- json-api-nestjs-shared
- json-api-nestjs-typeorm
- nestjs-acl-permissions
project2:
description: "Select project"
required: false
Expand All @@ -41,6 +43,7 @@ on:
- json-api-nestjs-microorm
- json-api-nestjs-shared
- json-api-nestjs-typeorm
- nestjs-acl-permissions
project3:
description: "Select project"
required: false
Expand All @@ -55,6 +58,7 @@ on:
- json-api-nestjs-microorm
- json-api-nestjs-shared
- json-api-nestjs-typeorm
- nestjs-acl-permissions
project4:
description: "Select project"
required: false
Expand All @@ -69,6 +73,7 @@ on:
- json-api-nestjs-microorm
- json-api-nestjs-shared
- json-api-nestjs-typeorm
- nestjs-acl-permissions
beta-release:
description: 'Is beta release?'
required: false
Expand Down Expand Up @@ -106,6 +111,13 @@ jobs:
mainBranch: "last-tag"
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
e2e-test-mikroorm:
needs: [ test ]
uses: ./.github/workflows/e2e-test-mikroorm.yml
with:
mainBranch: "last-tag"
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}

build:
needs: [test, e2e-test]
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@ jobs:
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}

e2e-test-mikroorm:
needs: [ test ]
uses: ./.github/workflows/e2e-test-mikroorm.yml
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}

build:
needs: [test, e2e-test]
needs: [test, e2e-test, e2e-test-mikroorm]
uses: ./.github/workflows/build.yml
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
2 changes: 0 additions & 2 deletions .test.env

This file was deleted.

18 changes: 18 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,24 @@
"${workspaceFolder}/apps/json-api-server/dist/**/*.(m|c|)js",
"!**/node_modules/**"
]
},
{
"type": "node",
"request": "launch",
"name": "Debug test with Nx",
"runtimeExecutable": "npx",
"runtimeArgs": ["nx", "serve", "test"],
"env": {
"NODE_OPTIONS": "--inspect=9230"
},
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"skipFiles": ["<node_internals>/**"],
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/apps/test/dist/**/*.(m|c|)js",
"!**/node_modules/**"
]
}
]
}
Loading