Merge pull request #69 from samchon/v1.0

Close #68
samchon · Aug 3, 2022 · 2193e02 · 2193e02
2 parents 15450b1 + 74056bd
commit 2193e02
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "safe-typeorm",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "Safe Relationship Decorators for the TypeORM",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

diff --git a/src/Model.ts b/src/Model.ts
@@ -235,7 +235,7 @@ export abstract class Model extends orm.BaseEntity
         (
             this: Model.Creator<T>,
             fieldLike: WhereColumnType<`${Literal}` | `${string}.${Literal}`>,
-            param: Field.MemberType<T, Literal> | null
+            param: Field.MemberType<T, Literal> | null | (() => string)
         ): [string, Record<string, Field.ValueType<T[Literal]>>];
 
     /**
@@ -270,9 +270,9 @@ export abstract class Model extends orm.BaseEntity
             this: Model.Creator<T>,
             fieldLike: WhereColumnType<`${Literal}` | `${string}.${Literal}`>,
             operator: OperatorType,
-            param: OperatorType extends "="|"!="|"<>" 
+            param: (OperatorType extends "="|"!="|"<>" 
                 ? Field.MemberType<T, Literal> | null
-                : Field.MemberType<T, Literal>
+                : Field.MemberType<T, Literal>) | (() => string)
         ): [string, Record<string, [Field.ValueType<T[Literal]>, Field.ValueType<T[Literal]>]>];
 
     /**
@@ -304,7 +304,7 @@ export abstract class Model extends orm.BaseEntity
             this: Model.Creator<T>,
             fieldLike: WhereColumnType<`${Literal}` | `${string}.${Literal}`>,
             operator: "IN" | "NOT IN",
-            parameters: Array<Field.MemberType<T, Literal>>,
+            parameters: Array<Field.MemberType<T, Literal>> | (() => string),
         ): [string, Record<string, Array<Field.ValueType<T[Literal]>>>];
 
     /**
@@ -339,8 +339,8 @@ export abstract class Model extends orm.BaseEntity
             this: Model.Creator<T>,
             fieldLike: WhereColumnType<`${Literal}` | `${string}.${Literal}`>,
             operator: "BETWEEN",
-            minimum: Field.MemberType<T, Literal>,
-            maximum: Field.MemberType<T, Literal>
+            minimum: Field.MemberType<T, Literal> | (() => string),
+            maximum: Field.MemberType<T, Literal> | (() => string)
         ): [string, { [key: string]: Array<Field.ValueType<T[Literal]>> }];
 
     public static getWhereArguments<

diff --git a/src/functional/getWhereArguments.ts b/src/functional/getWhereArguments.ts
@@ -41,7 +41,7 @@ export function getWhereArguments<
     (
         creator: Creator<T>,
         fieldLike: WhereColumnType<`${Literal}` | `${string}.${Literal}`>,
-        param: Field.MemberType<T, Literal> | null
+        param: Field.MemberType<T, Literal> | null | (() => string)
     ): [string, Record<string, Field.ValueType<T[Literal]>>];
 
 /**
@@ -77,9 +77,9 @@ export function getWhereArguments<
         creator: Creator<T>,
         fieldLike: WhereColumnType<`${Literal}` | `${string}.${Literal}`>,
         operator: OperatorType,
-        param: OperatorType extends "="|"!="|"<>"
+        param: (OperatorType extends "="|"!="|"<>"
             ? Field.MemberType<T, Literal> | null
-            : Field.MemberType<T, Literal> 
+            : Field.MemberType<T, Literal>) | (() => string) 
     ): [string, Record<string, Field.ValueType<T[Literal]>>];
 
 /**
@@ -114,7 +114,7 @@ export function getWhereArguments<
         creator: Creator<T>,
         fieldLike: WhereColumnType<`${Literal}` | `${string}.${Literal}`>,
         operator: "IN" | "NOT IN",
-        parameters: Array<Field.MemberType<T, Literal>>
+        parameters: Array<Field.MemberType<T, Literal>> | (() => string)
     ): [string, Record<string, [Field.ValueType<T[Literal]>, Field.ValueType<T[Literal]>]>];
 
 /**
@@ -150,8 +150,8 @@ export function getWhereArguments<
         creator: Creator<T>,
         fieldLike: WhereColumnType<`${Literal}` | `${string}.${Literal}`>,
         operator: "BETWEEN",
-        minimum: Field.MemberType<T, Literal>,
-        maximum: Field.MemberType<T, Literal>
+        minimum: Field.MemberType<T, Literal> | (() => string),
+        maximum: Field.MemberType<T, Literal> | (() => string)
     ): [string, Record<string, Array<Field.ValueType<T[Literal]>>>];
 
 export function getWhereArguments<
@@ -207,6 +207,10 @@ export function getWhereArguments<
                 throw new InvalidArgument(`Error on ${creator.name}.getColumn(): unable to bind null value for the ${operator} operator.`);
         }
 
+        // RETURNS RAW QUERY
+        if (typeof param === "function")
+            return [`${left} ${operator} ${param()}`, {}];
+
         // RETURNS WITH BINDING
         const uuid: string = crypto.randomBytes(64).toString("hex");
         const binding: string = (operator === "IN" || operator === "NOT IN")
@@ -221,7 +225,7 @@ export function getWhereArguments<
     const minimum: Field.ValueType<T[Literal]> = _Decompose_entity(rest[1]);
     const maximum: Field.ValueType<T[Literal]> = _Decompose_entity(rest[2]);
 
-    return [`${left} BETWEEN :${from} AND :${to}`, 
+    return [`${left} BETWEEN ${typeof minimum === "function" ? minimum() : `:${from}`} AND ${typeof maximum === "function" ? maximum() : `:${to}`}`,
     {
         [from]: minimum,
         [to]: maximum
@@ -238,7 +242,7 @@ function _Decompose_parameter(param: any): any
 
 function _Decompose_entity(param: any): any
 {
-    if (param instanceof Object && !(param instanceof Date))
+    if (typeof param !== "function" && param instanceof Object && !(param instanceof Date))
     {
         if (param instanceof BelongsAccessorBase)
             param = param.id;

diff --git a/src/test/features/test_get_where_arguments.ts b/src/test/features/test_get_where_arguments.ts
@@ -0,0 +1,5 @@
+import { BbsArticle } from "../models/bbs/BbsArticle";
+
+export function test_get_where_arguments(): void {
+    BbsArticle.getWhereArguments("created_at", "<", () => "NOW()");
+}
diff --git a/src/test/internal/generators/generate_random_external_db.ts b/src/test/internal/generators/generate_random_external_db.ts
@@ -10,7 +10,7 @@ export async function generate_random_external_db()
     await collection.execute();
 
     return {
-        group: await BbsGroup.findOneOrFail(group.id),
+        group: await BbsGroup.findOneOrFail({ id: group.id }),
         users: await BlogUser.findByIds(users.map(u => u.id))
     };
 }