@goatlab/fluent 0.6.21 → 0.6.24

package/dist/BaseConnector.d.ts

@@ -1,20 +1,17 @@
 import { TypedPathWrapper } from 'typed-path';
 import { Collection } from '@goatlab/js-utils';
-import { Filter, DaoOutput, LogicOperator, Primitives, PrimitivesArray } from './types';
+import { Filter, LogicOperator, Primitives, PrimitivesArray } from './types';
 import { ValidationError } from 'class-validator';
-export declare type Newable<T> = {
-    new (...args: any[]): T;
-};
 export interface FluentConnectorInterface<InputDTO, OutputDTO> {
-    get(): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
-    all(filter: Filter): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
-    findById(id: string): Promise<DaoOutput<InputDTO, OutputDTO>>;
-    findByIds(id: string[]): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
-    find(filter: Filter): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
+    get(): Promise<OutputDTO[]>;
+    all(filter: Filter): Promise<OutputDTO[]>;
+    findById(id: string): Promise<OutputDTO>;
+    findByIds(id: string[]): Promise<OutputDTO[]>;
+    find(filter: Filter): Promise<OutputDTO[]>;
     deleteById(id: string): Promise<string>;
-    updateById(id: string, data: InputDTO): Promise<DaoOutput<InputDTO, OutputDTO>>;
-    insert(data: InputDTO): Promise<DaoOutput<InputDTO, OutputDTO>>;
-    insertMany(data: InputDTO[]): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
+    updateById(id: string, data: InputDTO): Promise<OutputDTO>;
+    insert(data: InputDTO): Promise<OutputDTO>;
+    insertMany(data: InputDTO[]): Promise<OutputDTO[]>;
 }
 export declare abstract class BaseConnector<ModelDTO, InputDTO, OutputDTO> {
     generatedKeyPath: TypedPathWrapper<ModelDTO & InputDTO & OutputDTO, Record<never, never> & {
@@ -47,14 +44,14 @@ export declare abstract class BaseConnector<ModelDTO, InputDTO, OutputDTO> {
     protected modelRelations: any;
     isMongoDB: boolean;
     constructor();
-    findByIds(ids: string[]): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
-    get(): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
-    insertMany(data: InputDTO[]): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
-    updateById(id: string, data: InputDTO): Promise<DaoOutput<InputDTO, OutputDTO>>;
+    findByIds(ids: string[]): Promise<OutputDTO[]>;
+    get(): Promise<OutputDTO[]>;
+    insertMany(data: InputDTO[]): Promise<OutputDTO[]>;
+    updateById(id: string, data: InputDTO): Promise<OutputDTO>;
     owner(user: string): this;
     own(user: string): this;
-    first(): Promise<DaoOutput<InputDTO, OutputDTO> | null>;
-    collect(): Promise<Collection<DaoOutput<InputDTO, OutputDTO>>>;
+    first(): Promise<OutputDTO | null>;
+    collect(): Promise<Collection<OutputDTO>>;
     select(paths: (p: TypedPathWrapper<ModelDTO & InputDTO & OutputDTO, Record<never, never>>) => TypedPathWrapper<string, Record<never, never>>[] | TypedPathWrapper<string[], Record<never, never>[]>): this;
     forceSelect(paths: (p: TypedPathWrapper<ModelDTO & InputDTO & OutputDTO, Record<never, never>>) => TypedPathWrapper<string, Record<never, never>>[] | TypedPathWrapper<string[], Record<never, never>[]>): this;
     offset(offset: number): this;
@@ -72,9 +69,9 @@ export declare abstract class BaseConnector<ModelDTO, InputDTO, OutputDTO> {
     protected reset(): void;
     load(): Promise<this>;
     loadFirst(): Promise<this>;
-    getLoadedData(): DaoOutput<InputDTO, OutputDTO>[] | DaoOutput<InputDTO, OutputDTO>;
+    getLoadedData(): OutputDTO[] | OutputDTO;
     with(entities: any): this;
-    attach(data: InputDTO | DaoOutput<InputDTO, OutputDTO>): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
+    attach(data: InputDTO | OutputDTO): Promise<OutputDTO[]>;
     associate(id: string): any;
     protected hasMany<T>(Repository: any, relationName: string): T;
     protected hasOne(): void;

package/dist/BaseConnector.js

@@ -300,7 +300,7 @@ class BaseConnector {
         const updateQueries = [];
         const insertQueries = [];
         for (const related of relatedData) {
-            const exists = existingData.find(d => d.id === related.id);
+            const exists = existingData.find((d) => d.id === related.id);
             if (exists) {
                 updateQueries.push(this.updateById(exists.id, {
                     ...exists,
@@ -323,8 +323,7 @@ class BaseConnector {
             ? this.relationQuery.data
             : [this.relationQuery.data];
         const relatedData = D.map(d => ({
-            [this.relationQuery.relation.joinColumns[0].propertyName]: this
-                .isMongoDB
+            [this.relationQuery.relation.joinColumns[0].propertyName]: this.isMongoDB
                 ? js_utils_1.Ids.objectID(d.id)
                 : d.id,
             [this.relationQuery.relation.inverseJoinColumns[0].propertyName]: this
@@ -389,13 +388,13 @@ class BaseConnector {
             whitelist: true,
             skipMissingProperties: false,
             forbidUnknownValues: true,
-            stopAtFirstError: false,
+            stopAtFirstError: false
         };
         const instance = (0, class_transformer_1.plainToInstance)(validationClass, { ...input });
         const errors = await (0, class_validator_1.validate)(instance, validationOptions);
         return {
             errors: errors && errors.length ? errors : null,
-            result: errors && errors.length ? undefined : instance,
+            result: errors && errors.length ? undefined : instance
         };
     }
 }

package/dist/TypeOrmConnector/TypeOrmConnector.d.ts

@@ -1,28 +1,28 @@
 import { Repository } from 'typeorm';
 import { BaseConnector, FluentConnectorInterface } from '../BaseConnector';
-import type { Filter, DaoOutput, BaseDataElement, PaginatedData, Paginator, Sure } from '../types';
+import type { Filter, BaseDataElement, PaginatedData, Paginator, Sure } from '../types';
 import { DataSource } from 'typeorm';
 export declare const getRelations: (typeOrmRepo: any) => {
     relations: {};
 };
-export declare class TypeOrmConnector<ModelDTO = BaseDataElement, InputDTO = ModelDTO, OutputDTO = InputDTO> extends BaseConnector<ModelDTO, InputDTO, OutputDTO> implements FluentConnectorInterface<InputDTO, DaoOutput<InputDTO, OutputDTO>> {
+export declare class TypeOrmConnector<ModelDTO = BaseDataElement, InputDTO = ModelDTO, OutputDTO = InputDTO> extends BaseConnector<ModelDTO, InputDTO, OutputDTO> implements FluentConnectorInterface<InputDTO, OutputDTO> {
     private readonly repository;
     private readonly dataSource;
     constructor(entity: any, dataSource: DataSource, relationQuery?: any);
-    get(): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
-    getPaginated(): Promise<PaginatedData<DaoOutput<InputDTO, OutputDTO>>>;
-    all(): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
-    find(filter?: Filter): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
-    paginate(paginator: Paginator): Promise<PaginatedData<DaoOutput<InputDTO, OutputDTO>>>;
+    get(): Promise<OutputDTO[]>;
+    getPaginated(): Promise<PaginatedData<OutputDTO>>;
+    all(): Promise<OutputDTO[]>;
+    find(filter?: Filter): Promise<OutputDTO[]>;
+    paginate(paginator: Paginator): Promise<PaginatedData<OutputDTO>>;
     raw(): Repository<ModelDTO>;
-    insert(data: InputDTO): Promise<DaoOutput<InputDTO, OutputDTO>>;
-    insertMany(data: InputDTO[]): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
-    updateById(id: string, data: InputDTO): Promise<DaoOutput<InputDTO, OutputDTO>>;
-    replaceById(id: string, data: InputDTO): Promise<DaoOutput<InputDTO, OutputDTO>>;
+    insert(data: InputDTO): Promise<OutputDTO>;
+    insertMany(data: InputDTO[]): Promise<OutputDTO[]>;
+    updateById(id: string, data: InputDTO): Promise<OutputDTO>;
+    replaceById(id: string, data: InputDTO): Promise<OutputDTO>;
     clear({ sure }: Sure): Promise<boolean>;
     deleteById(id: string): Promise<string>;
-    findById(id: string): Promise<DaoOutput<InputDTO, OutputDTO>>;
-    findByIds(ids: string[]): Promise<DaoOutput<InputDTO, OutputDTO>[]>;
+    findById(id: string): Promise<OutputDTO>;
+    findByIds(ids: string[]): Promise<OutputDTO[]>;
     private getPage;
     private getPaginatorLimit;
     private getPopulate;