Update to zod v4 and update nx

.eslintrc.json

@@ -1,6 +1,11 @@
 {
   "ignorePatterns": ["**/*"],
   "overrides": [
+    {
+      "files": "*.json",
+      "parser": "jsonc-eslint-parser",
+      "rules": {}
+    },
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {

.gitignore

@@ -42,3 +42,9 @@ Thumbs.db
 .nx/workspace-data
 .angular
 .dev.env
+.env.local
+
+vite.config.*.timestamp*
+vitest.config.*.timestamp*
+.cursor/rules/nx-rules.mdc
+.github/instructions/nx.instructions.md

.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug json-api-server with Nx",
+      "runtimeExecutable": "npx",
+      "runtimeArgs": ["nx", "serve", "json-api-server"],
+      "env": {
+        "NODE_OPTIONS": "--inspect=9229"
+      },
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "skipFiles": ["<node_internals>/**"],
+      "sourceMaps": true,
+      "outFiles": [
+        "${workspaceFolder}/apps/json-api-server/dist/**/*.(m|c|)js",
+        "!**/node_modules/**"
+      ]
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "eslint.validate": ["json"]
+}

apps/json-api-front/project.json

@@ -5,6 +5,7 @@
   "prefix": "nestjs-json-api",
   "sourceRoot": "apps/json-api-front/src",
   "tags": [],
+  "implicitDependencies": ["json-api-nestjs-sdk"],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:application",
@@ -60,14 +61,14 @@
           "buildTarget": "json-api-front:build:development"
         }
       },
-      "defaultConfiguration": "development"
+      "defaultConfiguration": "development",
+      "dependsOn": ["json-api-server:serve"]
     },
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
         "buildTarget": "json-api-front:build"
       }
     }
-  },
-  "implicitDependencies": ["json-api-nestjs-sdk"]
+  }
 }

apps/json-api-front/proxy.conf.json

@@ -7,5 +7,9 @@
     "target": "http://localhost:3000",
     "secure": false,
     "ws": true
+  },
+  "/json-api-server-api": {
+    "target": "http://localhost:3000",
+    "secure": false
   }
 }

apps/json-api-front/tsconfig.app.json

@@ -2,9 +2,10 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "types": []
+    "types": [],
+    "moduleResolution": "bundler"
   },
   "files": ["src/main.ts"],
   "include": ["src/**/*.d.ts"],
-  "exclude": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts"]
+  "exclude": ["src/**/*.test.ts", "src/**/*.spec.ts"]
 }

apps/json-api-front/tsconfig.editor.json

@@ -2,6 +2,6 @@
   "extends": "./tsconfig.json",
   "include": ["src/**/*.ts"],
   "compilerOptions": {
-    "types": ["jest", "node"]
+    "types": ["node"]
   }
 }

apps/json-api-server-e2e/project.json

@@ -2,7 +2,7 @@
   "name": "json-api-server-e2e",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "implicitDependencies": [
-    "json-api-server"
+    "json-api-server", "json-api-nestjs-sdk"
   ],
   "projectType": "application",
   "targets": {
@@ -12,14 +12,14 @@
         "target": "build",
         "params": "ignore"
       }],
-      "executor": "@nx/jest:jest",
+      "executor": "@nx/vite:test",
       "outputs": [
         "{workspaceRoot}/coverage/{e2eProjectRoot}"
       ],
       "options": {
-        "jestConfig": "apps/json-api-server-e2e/jest.config.ts",
+        "config": "apps/json-api-server-e2e/vite.config.mts",
         "passWithNoTests": true,
-        "parallel": 1
+        "reportsDirectory": "../../coverage/apps/json-api-server-e2e"
       }
     },
     "e2e-micro": {
@@ -28,14 +28,14 @@
         "target": "build",
         "params": "ignore"
       }],
-      "executor": "@nx/jest:jest",
+      "executor": "@nx/vite:test",
       "outputs": [
         "{workspaceRoot}/coverage/{e2eProjectRoot}"
       ],
       "options": {
-        "jestConfig": "apps/json-api-server-e2e/jest.config.ts",
+        "config": "apps/json-api-server-e2e/vite.config.mts",
         "passWithNoTests": true,
-        "parallel": 1
+        "reportsDirectory": "../../coverage/apps/json-api-server-e2e"
       }
     }
   }

apps/json-api-server-e2e/src/json-api/json-api-sdk/check-common-decorator.spec.ts

@@ -87,7 +87,7 @@ describe('Check common decorator', () => {
       } catch (e) {
         expect(e).toBeInstanceOf(AxiosError);
         expect((e as AxiosError).response?.status).toBe(418);
-        expect(((e as AxiosError).response?.data as any)?.path).toBe(
+        expect(decodeURI(((e as AxiosError).response?.data as any)?.path)).toBe(
           '/api/users?filter[firstName][eq]=testControllerFilter'
         );
         expect(((e as AxiosError).response?.data as any)?.method).toBe(false);
@@ -108,7 +108,7 @@ describe('Check common decorator', () => {
         expect.assertions(4);
         expect(e).toBeInstanceOf(AxiosError);
         expect((e as AxiosError).response?.status).toBe(412);
-        expect(((e as AxiosError).response?.data as any)?.path).toBe(
+        expect(decodeURI(((e as AxiosError).response?.data as any)?.path)).toBe(
           '/api/users?filter[firstName][eq]=testMethodFilter'
         );
         expect(((e as AxiosError).response?.data as any)?.method).toBe(true);

apps/json-api-server-e2e/src/support/global-setup.ts

@@ -1,11 +1,9 @@
 /* eslint-disable */
-var __TEARDOWN_MESSAGE__: string;
-
-module.exports = async function() {
+export default async function() {
   // Start services that that the app needs to run (e.g. database, docker-compose, etc.).
   console.log('\nSetting up...\n');
 
   // Hint: Use `globalThis` to pass variables to global teardown.
   globalThis.__TEARDOWN_MESSAGE__ = '\nTearing down...\n';
-};
+}
 

apps/json-api-server-e2e/src/support/global-teardown.ts

@@ -1,7 +1,7 @@
 /* eslint-disable */
 
-module.exports = async function() {
+export default async function() {
   // Put clean up logic here (e.g. stopping services, docker-compose, etc.).
   // Hint: `globalThis` is shared between setup and teardown.
   console.log(globalThis.__TEARDOWN_MESSAGE__);
-};
+}

apps/json-api-server-e2e/tsconfig.spec.json

@@ -1,20 +1,60 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node"],
+    "outDir": "../../../dist/out-tsc",
+    "module": "ES2022",
+    "moduleResolution": "node10",
+    "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "target": "es2021",
-    "strictBindCallApply": true,
     "strictNullChecks": true,
     "noImplicitAny": true,
+    "strictBindCallApply": true,
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
-    "allowJs": true
+    "types": [
+      "vitest/globals",
+      "vitest/importMeta",
+      "vite/client",
+      "node",
+      "vitest"
+    ],
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "paths": {
+      "@nestjs-json-api/microorm-database": [
+        "libs/microorm-database/src/index.ts"
+      ],
+      "@nestjs-json-api/type-for-rpc": ["libs/type-for-rpc/src/index.ts"],
+      "@nestjs-json-api/typeorm-database": ["libs/typeorm-database/src/index.ts"],
+      "@klerick/json-api-nestjs": ["dist/libs/json-api/json-api-nestjs"],
+      "@klerick/json-api-nestjs-microorm": [
+        "dist/libs/json-api/json-api-nestjs-microorm"
+      ],
+      "@klerick/json-api-nestjs-sdk": ["dist/libs/json-api/json-api-nestjs-sdk"],
+      "@klerick/json-api-nestjs-shared": [
+        "dist/libs/json-api/json-api-nestjs-shared"
+      ],
+      "@klerick/json-api-nestjs-typeorm": [
+        "dist/libs/json-api/json-api-nestjs-typeorm"
+      ],
+      "@klerick/nestjs-json-rpc": [
+        "libs/json-rpc/nestjs-json-rpc/src/index.ts"
+      ],
+      "@klerick/nestjs-json-rpc-sdk": [
+        "libs/json-rpc/nestjs-json-rpc-sdk/src/index.ts"
+      ],
+      "@klerick/nestjs-json-rpc-sdk/ngModule": [
+        "libs/json-rpc/nestjs-json-rpc-sdk/src/ngModule.ts"
+      ]
+    }
   },
   "include": [
-    "jest.config.ts",
-    "src/**/*.ts"
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
   ]
 }