Merge branch 'master' into master

Author: TriPSs

.eslintrc.json

@@ -78,13 +78,18 @@
             ]
           }
         ],
-        "simple-import-sort/exports": "warn"
+        "simple-import-sort/exports": "warn",
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
       }
     },
     {
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nx/javascript"],
-      "rules": {}
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": ["*.spec.ts", "*/__fixtures__/*.ts"],
@@ -99,7 +104,9 @@
         "@typescript-eslint/no-explicit-any": "off",
         "import/no-extraneous-dependencies": "off",
         "jest/expect-expect": "off",
-        "@nx/enforce-module-boundaries": ["off"]
+        "@nx/enforce-module-boundaries": ["off"],
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
       }
     }
   ]

.gitignore

@@ -93,4 +93,5 @@ documentation/.docusaurus
 # VSCode workspace files
 .vscode
 
-.nx/cache
+.nx/cache
+.nx/workspace-data

.prettierignore

@@ -1,3 +1,4 @@
 .prettierignore
 .docusaurus/
-/.nx/cache
+/.nx/cache
+/.nx/workspace-data

CHANGELOG.md

@@ -1,4 +1,18 @@
 
+# [7.1.0](https://github.com/TriPSs/nestjs-query/compare/v7.0.1...v7.1.0) (2024-10-16)
+
+
+### Bug Fixes
+
+* Adjust package.json configurations and correct filter defaultValue syntax ([cc19f4c](https://github.com/TriPSs/nestjs-query/commit/cc19f4c4f24f5ae872d966f2719b5ca11edbc99a))
+
+
+### Features
+
+* support querying soft deleted relations ([00296c0](https://github.com/TriPSs/nestjs-query/commit/00296c0e656f7865bcf5bb54848a07d53be8d7d7))
+
+
+
 ## [7.0.1](https://github.com/TriPSs/nestjs-query/compare/v7.0.0...v7.0.1) (2024-09-25)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestjs-query",
-  "version": "7.0.1",
+  "version": "7.1.0",
   "private": true,
   "workspaces": [
     "packages/**"
@@ -31,7 +31,7 @@
     "sequelize": "6.37.3",
     "sequelize-typescript": "2.1.6",
     "tslib": "^2.6.3",
-    "typeorm": "^0.3.17"
+    "typeorm": "0.3.17"
   },
   "devDependencies": {
     "@actions/core": "^1.10.1",
@@ -50,11 +50,11 @@
     "@nestjs/schematics": "10.1.4",
     "@nestjs/testing": "^10.4.1",
     "@nx-extend/docusaurus": "^2.0.1",
-    "@nx/eslint": "18.3.4",
-    "@nx/eslint-plugin": "18.3.4",
-    "@nx/jest": "18.3.4",
-    "@nx/js": "18.3.4",
-    "@nx/node": "18.3.4",
+    "@nx/eslint": "19.6.1",
+    "@nx/eslint-plugin": "19.6.1",
+    "@nx/jest": "19.6.1",
+    "@nx/js": "19.6.1",
+    "@nx/node": "19.6.1",
     "@typegoose/typegoose": "^12.6.0",
     "@types/express": "4.17.21",
     "@types/jest": "29.5.12",
@@ -70,8 +70,8 @@
     "@types/supertest": "6.0.2",
     "@types/uuid": "9.0.8",
     "@types/ws": "8.5.12",
-    "@typescript-eslint/eslint-plugin": "7.13.0",
-    "@typescript-eslint/parser": "7.13.0",
+    "@typescript-eslint/eslint-plugin": "7.18.0",
+    "@typescript-eslint/parser": "7.18.0",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.1",
     "clsx": "^2.1.1",
@@ -95,7 +95,7 @@
     "jest-extended": "4.0.2",
     "mongodb-memory-server": "9.3.0",
     "mysql2": "3.11.0",
-    "nx": "18.3.4",
+    "nx": "19.6.1",
     "passport": "0.7.0",
     "passport-jwt": "4.0.1",
     "passport-local": "1.0.0",
@@ -113,7 +113,7 @@
     "ts-node": "10.9.2",
     "tsconfig-extends": "1.0.1",
     "tsconfig-paths": "4.2.0",
-    "typescript": "5.4.5"
+    "typescript": "5.5.4"
   },
   "packageManager": "yarn@4.4.0"
 }

packages/core/package.json

@@ -1,10 +1,17 @@
 {
   "name": "@ptc-org/nestjs-query-core",
-  "version": "7.0.1",
+  "version": "7.1.0",
   "description": "Base query package",
-  "author": "doug-martin <doug@dougamartin.com>",
   "homepage": "https://github.com/tripss/nestjs-query#readme",
+  "bugs": {
+    "url": "https://github.com/tripss/nestjs-query/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tripss/nestjs-query.git"
+  },
   "license": "MIT",
+  "author": "doug-martin <doug@dougamartin.com>",
   "main": "src/index.js",
   "types": "src/index.d.ts",
   "directories": {
@@ -14,16 +21,6 @@
   "files": [
     "src/**"
   ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tripss/nestjs-query.git"
-  },
-  "bugs": {
-    "url": "https://github.com/tripss/nestjs-query/issues"
-  },
   "dependencies": {
     "lodash.merge": "^4.6.2",
     "reflect-metadata": "^0.2.2",
@@ -32,5 +29,8 @@
   "peerDependencies": {
     "@nestjs/common": "^9.0.0 || ^10.0.0",
     "class-transformer": "^0.5"
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }

packages/query-graphql/package.json

@@ -1,16 +1,24 @@
 {
   "name": "@ptc-org/nestjs-query-graphql",
-  "version": "7.0.1",
+  "version": "7.1.0",
   "description": "Nestjs graphql query adapter",
-  "author": "doug-martin <doug@dougamartin.com>",
-  "homepage": "https://github.com/tripss/nestjs-query#readme",
   "keywords": [
     "graphql",
     "crud",
     "nestjs",
     "dataloader"
   ],
+  "homepage": "https://github.com/tripss/nestjs-query#readme",
+  "bugs": {
+    "url": "https://github.com/tripss/nestjs-query/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tripss/nestjs-query.git",
+    "directory": "packages/query-graphql"
+  },
   "license": "MIT",
+  "author": "doug-martin <doug@dougamartin.com>",
   "main": "src/index.js",
   "types": "src/index.d.ts",
   "directories": {
@@ -20,17 +28,6 @@
   "files": [
     "src/**"
   ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tripss/nestjs-query.git",
-    "directory": "packages/query-graphql"
-  },
-  "bugs": {
-    "url": "https://github.com/tripss/nestjs-query/issues"
-  },
   "dependencies": {
     "dataloader": "^2.2.2",
     "graphql-fields": "^2.0.3",
@@ -50,5 +47,8 @@
     "graphql": "^16.0.0",
     "graphql-subscriptions": "^2.0.0",
     "ts-morph": "^19.0.0"
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }

packages/query-mongoose/package.json

@@ -1,10 +1,18 @@
 {
   "name": "@ptc-org/nestjs-query-mongoose",
-  "version": "7.0.1",
+  "version": "7.1.0",
   "description": "Mongoose adapter for @ptc-org/nestjs-query-core",
-  "author": "doug-martin <doug@dougamartin.com>",
   "homepage": "https://github.com/tripss/nestjs-query#readme",
+  "bugs": {
+    "url": "https://github.com/tripss/nestjs-query/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tripss/nestjs-query.git",
+    "directory": "packages/query-typeorm-mongo"
+  },
   "license": "MIT",
+  "author": "doug-martin <doug@dougamartin.com>",
   "main": "src/index.js",
   "types": "src/index.d.ts",
   "directories": {
@@ -14,9 +22,6 @@
   "files": [
     "src/**"
   ],
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
     "camel-case": "^4.1.2",
     "lodash.escaperegexp": "^4.1.2",
@@ -28,12 +33,7 @@
     "@nestjs/mongoose": "^9.0.0 || ^10.0.0",
     "mongoose": "^8.0.0"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tripss/nestjs-query.git",
-    "directory": "packages/query-typeorm-mongo"
-  },
-  "bugs": {
-    "url": "https://github.com/tripss/nestjs-query/issues"
+  "publishConfig": {
+    "access": "public"
   }
 }

packages/query-sequelize/package.json

@@ -1,10 +1,18 @@
 {
   "name": "@ptc-org/nestjs-query-sequelize",
-  "version": "7.0.1",
+  "version": "7.1.0",
   "description": "Sequelize adapter for @ptc-org/nestjs-query-core",
-  "author": "doug-martin <doug@dougamartin.com>",
   "homepage": "https://github.com/tripss/nestjs-query#readme",
+  "bugs": {
+    "url": "https://github.com/tripss/nestjs-query/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tripss/nestjs-query.git",
+    "directory": "packages/query-sequelize"
+  },
   "license": "MIT",
+  "author": "doug-martin <doug@dougamartin.com>",
   "main": "src/index.js",
   "types": "src/index.d.ts",
   "directories": {
@@ -14,9 +22,6 @@
   "files": [
     "src/**"
   ],
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
     "camel-case": "^4.1.2",
     "lodash.pick": "4.4.0",
@@ -28,12 +33,7 @@
     "sequelize": "^6.5.0",
     "sequelize-typescript": "^1.1.0 || ^2.0.0"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tripss/nestjs-query.git",
-    "directory": "packages/query-sequelize"
-  },
-  "bugs": {
-    "url": "https://github.com/tripss/nestjs-query/issues"
+  "publishConfig": {
+    "access": "public"
   }
 }

packages/query-typegoose/package.json

@@ -1,10 +1,18 @@
 {
   "name": "@ptc-org/nestjs-query-typegoose",
-  "version": "7.0.1",
+  "version": "7.1.0",
   "description": "Typegoose adapter for @ptc-org/nestjs-query-core",
-  "author": "john mcinall<johnmcinall@gmail.com>",
   "homepage": "https://github.com/tripss/nestjs-query#readme",
+  "bugs": {
+    "url": "https://github.com/tripss/nestjs-query/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tripss/nestjs-query.git",
+    "directory": "packages/query-typegoose"
+  },
   "license": "MIT",
+  "author": "john mcinall<johnmcinall@gmail.com>",
   "main": "src/index.js",
   "types": "src/index.d.ts",
   "directories": {
@@ -14,9 +22,6 @@
   "files": [
     "src/**"
   ],
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
     "camel-case": "^4.1.2",
     "is-class": "0.0.9",
@@ -30,12 +35,7 @@
     "@typegoose/typegoose": "^9.0.0 || ^10.0.0 || ^11.0.0",
     "mongoose": "^6.5.0 || ^7.0.3 || ^8.0.0"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tripss/nestjs-query.git",
-    "directory": "packages/query-typegoose"
-  },
-  "bugs": {
-    "url": "https://github.com/tripss/nestjs-query/issues"
+  "publishConfig": {
+    "access": "public"
   }
 }