@goatlab/fluent 0.7.5 → 0.7.10

package/dist/types.d.ts

@@ -1,15 +1,21 @@
 import { ObjectID } from 'bson';
 export interface AnyObject {
-    id?: string;
-    _id?: string;
     [key: string]: any;
 }
 declare type Unpacked<T> = T extends (infer U)[] ? U : T;
+export declare type ExpandRecursively<T> = T extends (...args: infer A) => infer R ? (...args: ExpandRecursively<A>) => ExpandRecursively<R> : T extends object ? T extends infer O ? O extends any[] ? {
+    [K in keyof Unpacked<O>]: ExpandRecursively<Unpacked<O>[K]>;
+}[] : {
+    [K in keyof O]: ExpandRecursively<O[K]>;
+} : never : T;
 export declare type Concrete<Type> = {
     [Property in keyof Type]-?: Type[Property];
 };
+export declare type Subset<T, U> = {
+    [key in keyof T]: key extends keyof U ? T[key] : never;
+};
 export declare type QueryFieldSelector<T> = Partial<{
-    [K in keyof Concrete<T>]: Concrete<T>[K] extends object ? Unpacked<Partial<QueryFieldSelector<Concrete<T>[K]>>> : boolean | undefined;
+    [K in keyof Concrete<T>]: Concrete<T>[K] extends object ? true | Unpacked<Partial<QueryFieldSelector<Concrete<T>[K]>>> : true | undefined;
 }>;
 export declare type QueryOrderSelector<T> = Partial<{
     [K in keyof Concrete<T>]: Concrete<T>[K] extends object ? Partial<QueryOrderSelector<Concrete<T>[K]>> : 'asc' | 'desc' | undefined;
@@ -18,14 +24,16 @@ export declare type QueryOperations<T> = {
     [key in LogicOperator]: key extends LogicOperator.in ? T[] : key extends LogicOperator.notIn ? T[] : T;
 };
 export declare type QueryWhereFitler<T> = Partial<{
-    [K in keyof Concrete<T>]: Concrete<T>[K] extends object ? Partial<QueryWhereFitler<Concrete<T>[K]>> : Partial<QueryOperations<Concrete<T>[K]>> | T[K];
+    [K in keyof Concrete<T>]: Concrete<T>[K] extends object ? Unpacked<Partial<QueryWhereFitler<Concrete<T>[K]>>> : Unpacked<Partial<QueryOperations<Concrete<T>[K]>>> | T[K];
 }>;
 export declare type QueryInsert<T> = {
     [K in keyof T]: T[K] extends object ? QueryInsert<T[K]> : T[K];
 };
 export declare type ModelRelation<T> = T;
 export declare type QueryIncludeRelation<T> = {
-    [K in keyof Partial<T>]: FluentQuery<Unpacked<T[K]>> | boolean;
+    [K in keyof Partial<T>]: (FluentQuery<Unpacked<T[K]>> & {
+        withPivot?: true;
+    }) | true;
 };
 export declare type FluentQuery<T> = {
     select?: QueryFieldSelector<T>;
@@ -36,29 +44,38 @@ export declare type FluentQuery<T> = {
     orderBy?: QueryOrderSelector<T>[];
     limit?: number;
     offset?: number;
+    take?: number;
     include?: QueryIncludeRelation<T>;
     paginated?: Paginator;
 };
 export declare type AddUndefinedIfNullable<T> = T extends null | undefined ? undefined : never;
-export declare type GetSelectedFromObject<T extends FluentQuery<Model>, Model, OutputDTO> = {
-    [P in keyof T['select']]: T['select'][P] extends object ? QueryOutput<{
-        select: T['select'][P];
-    }, NonNullable<Model[P]>, OutputDTO[P]> | AddUndefinedIfNullable<Model[P]> : OutputDTO[P];
+export declare type GetSelectedFromInclude<T extends FluentQuery<Model>, Model> = {
+    [P in keyof T['include']]: T['include'][P] extends object ? NonNullable<Model[P]> extends any[] ? T['include'][P] extends {
+        withPivot: true;
+    } ? (QueryOutput<T['include'][P], Unpacked<NonNullable<Model[P]>>> & {
+        pivot: AnyObject;
+    })[] | AddUndefinedIfNullable<Model[P]> : (QueryOutput<T['include'][P], Unpacked<NonNullable<Model[P]>>> & {
+        pivot: AnyObject;
+    })[] | AddUndefinedIfNullable<Model[P]> : T['include'][P] extends {
+        withPivot: true;
+    } ? (QueryOutput<T['include'][P], Unpacked<NonNullable<Model[P]>>> & {
+        pivot: AnyObject;
+    }) | AddUndefinedIfNullable<Model[P]> : QueryOutput<T['include'][P], Unpacked<NonNullable<Model[P]>>> | AddUndefinedIfNullable<Model[P]> : Model[P];
 };
-export declare type QueryOutput<T extends FluentQuery<Model>, Model, OutputDTO> = T extends {
-    select: T['select'];
-} ? T extends {
-    paginated: T['paginated'];
-} ? PaginatedData<GetSelectedFromObject<T, Model, OutputDTO>> : GetSelectedFromObject<T, Model, OutputDTO>[] : T extends {
-    paginated: T['paginated'];
-} ? PaginatedData<OutputDTO> : OutputDTO[];
-export declare type SingleQueryOutput<T extends FluentQuery<Model>, Model, OutputDTO> = T extends {
+export declare type GetSelectedFromObject<T extends FluentQuery<Model>, Model> = {
+    [P in keyof T['select']]: T['select'][P] extends object ? NonNullable<Model[P]> extends any[] ? QueryOutput<{
+        select: T['select'][P];
+    }, Unpacked<NonNullable<Model[P]>>>[] | AddUndefinedIfNullable<Model[P]> : QueryOutput<{
+        select: T['select'][P];
+    }, Unpacked<NonNullable<Model[P]>>> | AddUndefinedIfNullable<Model[P]> : Model[P];
+} & GetSelectedFromInclude<T, Model>;
+export declare type QueryOutput<T extends FluentQuery<Model>, Model> = ExpandRecursively<T extends {
     select: T['select'];
 } ? T extends {
     paginated: T['paginated'];
-} ? PaginatedData<GetSelectedFromObject<T, Model, OutputDTO>> : GetSelectedFromObject<T, Model, OutputDTO> : T extends {
+} ? PaginatedData<GetSelectedFromObject<T, Model>> : ExpandRecursively<GetSelectedFromObject<T, Model>> : T extends {
     paginated: T['paginated'];
-} ? PaginatedData<OutputDTO> : OutputDTO;
+} ? PaginatedData<Model> : Model & GetSelectedFromInclude<T, Model>>;
 export interface PaginatedData<T> {
     currentPage: number;
     data: T[];
@@ -103,7 +120,7 @@ export declare enum LogicOperator {
     notExists = "notExists"
 }
 export declare type FluentHasManyRelatedAttribute<T> = Partial<{
-    [K in keyof Concrete<T>]: Concrete<T>[K] extends object ? Unpacked<Partial<FluentHasManyRelatedAttribute<Concrete<T>[K]>>> | boolean : boolean | undefined;
+    [K in keyof Concrete<T>]: Concrete<T>[K] extends object ? Unpacked<Partial<FluentHasManyRelatedAttribute<Concrete<T>[K]>>> | true : true | undefined;
 }>;
 export declare type FluentHasManyParams<T extends FluentHasManyParams<T>> = {
     repository: new () => InstanceType<T['repository']>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goatlab/fluent",
-  "version": "0.7.5",
+  "version": "0.7.10",
   "description": "Readable query Interface & API generator for TS and Node",
   "scripts": {
     "install-p": "yarn",
@@ -16,7 +16,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@goatlab/js-utils": "^0.8.1",
+    "@goatlab/js-utils": "^0.8.6",
     "@loopback/metadata": "^4.1.2",
     "bson": "^4.6.2",
     "graphql": "^16.3.0",
@@ -27,13 +27,14 @@
     "zod": "^3.17.10"
   },
   "devDependencies": {
+    "@types/node": "^18.7.13",
     "cross-spawn": "^7.0.3",
     "detect-port": "^1.3.0",
     "dotenv-cli": "^5.1.0",
     "eslint": "^8.5.0",
     "jest": "^27.5.1",
     "modern-spawn": "^1.0.0",
-    "mongodb-memory-server": "^8.8.0",
+    "mongodb": "^4.9.0",
     "mysql2": "^2.3.3",
     "net": "^1.0.2",
     "prettier": "^2.6.1",