chore: merge beta

Author: wojtek-krysiak

example-app/package.json

@@ -20,7 +20,7 @@
       "typescript": "3.9.7"
    },
    "dependencies": {
-      "admin-bro": "^3.0.0",
+      "admin-bro": "^3.1.1",
       "@admin-bro/express": "^3.0.0",
       "@admin-bro/typeorm": "^1.0.1",
       "express": "^4.17.1",

example-app/yarn.lock

@@ -1350,10 +1350,10 @@ accepts@~1.3.7:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
-admin-bro@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/admin-bro/-/admin-bro-3.0.0.tgz#e6f6238672ab7ec46debd008eab6e6a1299fe59b"
-  integrity sha512-fXnPn/BFBSrib1oAn65kG6LhxE6WAH9QVsLjGw+gMut6j4l9uNloodrgxuERHMksMMDmO5pMzmCOUuqw3LmRuw==
+admin-bro@^3.1.0-beta.3:
+  version "3.1.0-beta.3"
+  resolved "https://registry.yarnpkg.com/admin-bro/-/admin-bro-3.1.0-beta.3.tgz#d0677edec228dcb251e74758f22dc71aed685784"
+  integrity sha512-Dxccv+07bmUSWlyA5TtXoX/jqCaJE65GESBFBfbJHEbr/28CukK//lRAqPBhyNQWQAtsP8sot7kcelrDZ5Jm4w==
   dependencies:
     "@admin-bro/design-system" "^1.3.3"
     "@babel/core" "^7.10.2"

package-lock.json

@@ -18,6 +18,7 @@
     "test": "mocha -r ts-node/register ./spec/**/*.spec.ts",
     "ts-node": "ts-node",
     "lint": "eslint './src/**/*.{ts,js}' './spec/**/*.{ts,js}' './example-app/**/*.{ts,js}' --ignore-pattern 'build' --ignore-pattern 'yarn.lock'",
+    "check:all": "yarn lint && yarn test && yarn build",
     "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js",
     "release": "semantic-release"
   },
@@ -33,15 +34,15 @@
   "author": "Artem Zabolotnyi <[email protected]>",
   "license": "MIT",
   "peerDependencies": {
-    "admin-bro": ">=3.0.0",
+    "admin-bro": "^3.1.1",
     "typeorm": ">=0.2.1"
   },
   "optionalDependencies": {},
   "devDependencies": {
     "@types/chai": "^4.2.4",
     "@types/mocha": "^5.2.7",
     "@types/node": "12.0.10",
-    "admin-bro": ">=3.0.0",
+    "admin-bro": "^3.1.1",
     "chai": "^4.2.0",
     "class-validator": "^0.11.0",
     "mocha": "^6.2.2",

package.json

@@ -44,13 +44,13 @@ export class Car extends BaseEntity {
   })
   public carType: CarType;
 
-  @ManyToOne((type) => CarDealer, (carDealer) => carDealer.cars)
+  @ManyToOne(() => CarDealer, (carDealer) => carDealer.cars)
   public carDealer: CarDealer;
 
   @RelationId((car: Car) => car.carDealer)
   public carDealerId: number;
 
-  @ManyToOne((type) => CarBuyer, (carBuyer) => carBuyer.cars)
+  @ManyToOne(() => CarBuyer, (carBuyer) => carBuyer.cars)
   public carBuyer: CarBuyer;
 
   @RelationId((car: Car) => car.carBuyer)

spec/entities/Car.ts

@@ -11,6 +11,6 @@ export class CarBuyer extends BaseEntity {
   @IsDefined()
   public name: string;
 
-  @OneToMany((type) => Car, (car) => car.carDealer)
+  @OneToMany(() => Car, (car) => car.carDealer)
   public cars: Array<Car>;
 }

spec/entities/CarBuyer.ts

@@ -11,6 +11,6 @@ export class CarDealer extends BaseEntity {
   @IsDefined()
   public name: string;
 
-  @OneToMany((type) => Car, (car) => car.carDealer)
+  @OneToMany(() => Car, (car) => car.carDealer)
   public cars: Array<Car>;
 }

spec/entities/CarDealer.ts

@@ -159,7 +159,7 @@ export class Resource extends BaseResource {
       const property = this.property(key)
 
       // eslint-disable-next-line no-continue
-      if (!(property && param)) continue
+      if (!(property && param !== undefined)) continue
 
       const type = property.type()
 
@@ -172,14 +172,17 @@ export class Resource extends BaseResource {
       }
 
       if (type === 'reference') {
-        // references cannot be stored as an IDs in typeorm, so in order to mimic this) and
-        // not fetching reference resource) change this:
-        // { postId: "1" }
-        // to that:
-        // { post: { id: 1 } }
-
-        const id = (property.column.type === Number) ? Number(param) : param
-        preparedParams[property.column.propertyName] = { id }
+        if (param === null) {
+          preparedParams[property.column.propertyName] = null
+        } else {
+          // references cannot be stored as an IDs in typeorm, so in order to mimic this) and
+          // not fetching reference resource) change this:
+          // { postId: "1" }
+          // to that:
+          // { post: { id: 1 } }
+          const id = (property.column.type === Number) ? Number(param) : param
+          preparedParams[property.column.propertyName] = { id }
+        }
       }
     }
     return preparedParams

src/Resource.ts

@@ -1801,10 +1801,10 @@ acorn@^7.3.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
   integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
 
-admin-bro@>=3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/admin-bro/-/admin-bro-3.0.0.tgz#e6f6238672ab7ec46debd008eab6e6a1299fe59b"
-  integrity sha512-fXnPn/BFBSrib1oAn65kG6LhxE6WAH9QVsLjGw+gMut6j4l9uNloodrgxuERHMksMMDmO5pMzmCOUuqw3LmRuw==
+admin-bro@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/admin-bro/-/admin-bro-3.1.1.tgz#b6c54a53f2c94ac1dfcaf6108663c56a0bf77926"
+  integrity sha512-i3k3E3oclXpNFKmia15y2vfqPQ7ddp1Z/JbQt40TVRHloPm+lG5WI/YJwA3Sx0zN2B42ClqngX0T07Cy+aumWQ==
   dependencies:
     "@admin-bro/design-system" "^1.3.3"
     "@babel/core" "^7.10.2"