bigal 10.3.4 → 10.4.0-beta

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 10.4.0 - 2022-11-03
+
+- Fix string comparison where constraint with union values
+- Update npms
+
 ## 10.3.4 - 2022-10-11
 
 - Update npms

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bigal",
-  "version": "10.3.4",
+  "version": "10.4.0-beta",
   "description": "A fast and lightweight orm for postgres and node.js, written in typescript.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,34 +19,34 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@types/lodash": "^4.14.186",
+    "@types/lodash": "^4.14.187",
     "@types/node": ">=14",
     "@types/pg": "^8.6.5",
     "lodash": "^4.17.21",
     "pg": "^8.8.0",
-    "postgres-pool": "^6.0.5"
+    "postgres-pool": "^6.0.6"
   },
   "devDependencies": {
-    "@faker-js/faker": "^7.5.0",
+    "@faker-js/faker": "^7.6.0",
     "@types/chai": "^4.3.3",
     "@types/mocha": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.40.0",
-    "@typescript-eslint/parser": "^5.40.0",
+    "@typescript-eslint/eslint-plugin": "^5.42.0",
+    "@typescript-eslint/parser": "^5.42.0",
     "chai": "^4.3.6",
-    "eslint": "^8.25.0",
+    "eslint": "^8.26.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsdoc": "^39.3.6",
+    "eslint-plugin-jsdoc": "^39.6.2",
     "eslint-plugin-mocha": "10.1.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-promise": "^6.0.1",
+    "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-security": "^1.5.0",
     "husky": "^8.0.1",
     "lint-staged": "^13.0.3",
     "markdownlint-cli": "^0.32.2",
-    "mocha": "^10.0.0",
+    "mocha": "^10.1.0",
     "npm-run-all": "^4.1.5",
     "pinst": "^3.0.0",
     "prettier": "^2.7.1",

package/query/WhereQuery.d.ts

@@ -1,22 +1,20 @@
 import type { Entity, NotEntityBrand } from '../Entity';
 import type { ExcludeEntityCollections, ExcludeFunctions } from '../types';
 declare type ExcludeUndefined<T> = Exclude<T, undefined>;
-export declare type LiteralValues<TValue> = (ExcludeUndefined<TValue> | null)[] | ExcludeUndefined<TValue> | null;
-export declare type WhereClauseValue<TValue> = TValue extends NotEntityBrand | undefined ? Exclude<TValue, NotEntityBrand | undefined> : Extract<TValue, Entity> extends undefined ? LiteralValues<TValue> : (ExcludeUndefined<Exclude<TValue, Entity>> | null)[] | (Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null)[] | ExcludeUndefined<Exclude<TValue, Entity>> | Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null;
+export declare type LiteralValues<TValue> = (TValue | null)[] | TValue | null;
+export declare type WhereClauseValue<TValue> = TValue extends NotEntityBrand | undefined ? Exclude<TValue, NotEntityBrand | undefined> : Extract<TValue, Entity> extends undefined ? LiteralValues<ExcludeUndefined<TValue>> : (ExcludeUndefined<Exclude<TValue, Entity>> | null)[] | (Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null)[] | ExcludeUndefined<Exclude<TValue, Entity>> | Pick<Extract<ExcludeUndefined<TValue>, Entity>, 'id'> | null;
 export declare type StringConstraint<TValue extends string> = {
-    [P in 'contains' | 'endsWith' | 'like' | 'startsWith']?: LiteralValues<TValue>;
+    [P in 'contains' | 'endsWith' | 'like' | 'startsWith']?: LiteralValues<ExcludeUndefined<TValue>>;
 };
 export declare type NumberOrDateConstraint<TValue extends Date | number> = {
-    [P in '<' | '<=' | '>' | '>=']?: LiteralValues<TValue>;
+    [P in '<' | '<=' | '>' | '>=']?: LiteralValues<ExcludeUndefined<TValue>>;
 };
 export declare type NegatableConstraint<TValue> = TValue | {
     '!': TValue;
 };
-export declare type WhereQueryStatement<TValue> = TValue extends string ? NegatableConstraint<StringConstraint<TValue> | WhereClauseValue<TValue>> : TValue extends Date | number ? NegatableConstraint<NumberOrDateConstraint<TValue> | WhereClauseValue<TValue>> : NegatableConstraint<WhereClauseValue<TValue>>;
+export declare type WhereQueryStatement<TValue> = [TValue] extends [string] ? NegatableConstraint<StringConstraint<TValue> | WhereClauseValue<TValue>> : TValue extends Date | number ? NegatableConstraint<NumberOrDateConstraint<TValue> | WhereClauseValue<TValue>> : NegatableConstraint<WhereClauseValue<TValue>>;
 export declare type WhereQuery<T extends Entity> = {
-    [K in keyof T as ExcludeEntityCollections<T[K], ExcludeFunctions<T[K], K>>]?: K extends 'id' ? WhereQueryStatement<T | T[K]> : T[K] extends (infer U)[] | undefined ? WhereQueryStatement<U> : (ExcludeUndefined<T[K]> | null)[] | T[K] | WhereQueryStatement<T[K]> | {
-        '!': LiteralValues<T[K]>;
-    };
+    [K in keyof T as ExcludeEntityCollections<T[K], ExcludeFunctions<T[K], K>>]?: K extends 'id' ? WhereQueryStatement<T | T[K]> : T[K] extends (infer U)[] | undefined ? WhereQueryStatement<ExcludeUndefined<U>> : NegatableConstraint<LiteralValues<ExcludeUndefined<T[K]>>> | WhereQueryStatement<ExcludeUndefined<T[K]>>;
 } & {
     or?: WhereQuery<T>[];
 };