Open-Harbor/ts-data
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

completly refactor project

Browse Source
This commit is contained in:
Mathias Beaulieu-Duncan
2024-08-30 13:19:32 -04:00
parent 5d4c94c81a
commit c18201dcd2
58 changed files with 18535 additions and 7748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/data/ng-package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../dist/data",
"dest": "../../dist/openharbor/data",
"lib": {
"entryFile": "src/public-api.ts"
}
projects/data/package.json
+6 -5
View File
@@ -2,10 +2,11 @@
"name": "@openharbor/data",
"version": "1.0.0-alpha.1",
"repository": "https://git.openharbor.io/Open-Harbor/ts-data",
"publishConfig": {
"registry": "https://registry.npmjs.org"
},
"peerDependencies": {
"rxjs": "^6.5.3"
}
"rxjs": "^6.5.3 || ^7.4.0"
},
"dependencies": {
"tslib": "^2.3.0"
},
"sideEffects": false
}
projects/data/src/lib/DataSource.ts
-284
View File
@@ -1,284 +0,0 @@
import { Observable, of, Observer, BehaviorSubject, throwError, Subject } from 'rxjs';
import { IDataSource } from './IDataSource';
import { IQueryExecutionResult, IQueryExecutionGroupResult, IFilter, ISort, IAggregate, IGroup, IQueryCriteria } from './models';
import { finalize, catchError, map } from 'rxjs/operators';
import { IDataSourceOptions, IResolveCommandModelEvent } from '../public-api';
import { IDataSourceErrorMessage } from './IDataSourceErrorMessage';
import { IDataSourceValidationError } from './IDataSourceValidationError';
import { IDataSourceError } from './IDataSourceError';
import { IDataSourceNotifyMessage } from './IDataSourceNotifyMessage';
import { IDataSourceCommandStarted } from './IDataSourceCommandStarted';
export class DataSource<TModel> implements IDataSource<TModel>
{
data: IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel> = null;
protected _dataSubject: BehaviorSubject<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>> = new BehaviorSubject(null);
protected _loadingSubject: BehaviorSubject<boolean> = new BehaviorSubject(false);
protected _validationSubject: Subject<IDataSourceValidationError> = new Subject();
protected _commandStartedSubject: Subject<IDataSourceCommandStarted> = new Subject();
protected _notifyMessageSubject: Subject<IDataSourceNotifyMessage> = new Subject();
protected _data$: Observable<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>>;
protected _loading$: Observable<boolean>;
protected _validationError$: Observable<IDataSourceValidationError>;
protected _notifyMessage$: Observable<IDataSourceNotifyMessage>;
protected _commandStarted$: Observable<IDataSourceCommandStarted>;
protected _criteria: IQueryCriteria = {
page: null,
pageSize: null,
filters: [],
aggregates: [],
groups: [],
sorts: []
};
get data$() {
if (!this._data$)
this._data$ = this._dataSubject.asObservable();
return this._data$;
}
get loading$() {
if (!this._loading$)
this._loading$ = this._loadingSubject.asObservable();
return this._loading$;
}
get validationError$() {
if (!this._validationError$)
this._validationError$ = this._validationSubject.asObservable();
return this._validationError$;
}
get commandStarted$() {
if (!this._commandStarted$)
this._commandStarted$ = this._commandStartedSubject.asObservable();
return this._commandStarted$;
}
get notifyMessage$() {
if (!this._notifyMessage$)
this._notifyMessage$ = this._notifyMessageSubject.asObservable();
return this._notifyMessage$;
}
constructor(public options: IDataSourceOptions<TModel>) {
this._initCriteria();
}
clear() {
this.data = null;
this._dataSubject.next(null);
}
updateData(value: IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>) {
this.data = value;
this._dataSubject.next(this.data);
}
replaceDataWithArray(items: TModel[]) {
this.data = {
totalRecords: items.length,
numberOfPages: null,
groups: null,
aggregates: null,
data: items
};
this._dataSubject.next(this.data);
}
replaceDataWithSingle(item: TModel) {
this.data = {
totalRecords: 1,
numberOfPages: null,
groups: null,
aggregates: null,
data: [item]
};
this._dataSubject.next(this.data);
}
protected _initCriteria() {
if (!this.options.defaultCriteria)
return;
const copy: IQueryCriteria = JSON.parse(JSON.stringify(this.options.defaultCriteria));
this._criteria.page = copy.page || this._criteria.page;
this._criteria.pageSize = copy.pageSize || this._criteria.pageSize;
this._criteria.filters = copy.filters || this._criteria.filters;
this._criteria.groups = copy.groups || this._criteria.groups;
this._criteria.aggregates = copy.aggregates || this._criteria.aggregates;
this._criteria.sorts = copy.sorts || this._criteria.sorts;
}
resolveIdField<TKeyType extends any>(model: TModel): TKeyType {
if (this.options.idField)
return model[this.options.idField];
if (this.options.resolveIdField)
return this.options.resolveIdField(model);
throw new Error("Must specify an id field or supply a method to resolve the id field.");
}
resolveCommandModelByName<T extends any>(event: IResolveCommandModelEvent<TModel>) : Observable<T> {
if (!this.options.transport.commands.hasOwnProperty(event.command))
return throwError(<IDataSourceErrorMessage>{
type: 'message',
message: `command with name ${event.command} not found`
});
const commandOptions = this.options.transport.commands[event.command];
if (commandOptions.resolveCommandModel)
return commandOptions.resolveCommandModel(event);
const noResolveMethod: any = event.model || {};
return of<T>(noResolveMethod as T);
}
executeCommandByName<TCommand, TResult>(name: string, command: TCommand) : Observable<TResult> {
if (!this.options.transport.commands.hasOwnProperty(name))
return throwError(`command with name ${name} not found`);
this._commandStartedSubject.next({
name: name, command: command
});
return this.options.transport.commands[name].adapter.handle(command).pipe(
map(t => {
this._notifyMessageSubject.next({
type: 'success',
message: 'COMMAND_EXECUTED_SUCCESSFULLY',
messageParams: {
command: name
}
});
return t;
}),
catchError((err: IDataSourceError) => {
if (err.type == 'message')
this._notifyMessageSubject.next({
type: 'error',
message: (err as IDataSourceErrorMessage).message
});
else if(err.type == 'validation')
this._validationSubject.next(err as IDataSourceValidationError);
return throwError(err);
})
);
}
private _query() : Observable<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>> {
return new Observable<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>>((o: Observer<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>>) => {
this._loadingSubject.next(true);
this.options.transport.query.adapter.handle(this._criteria)
.pipe(
finalize(() => {
o.complete();
this._loadingSubject.next(false);
})
)
.subscribe(
result => {
this.data = result;
o.next(result);
this._dataSubject.next(this.data);
this._notifyMessageSubject.next({
message: 'NEW_DATA_READ_SUCCESSFULLY',
type: 'info'
});
},
err => {
o.error(err);
this._notifyMessageSubject.next({
message: 'UNEXPECTED_ERROR_OCCURRED',
type: 'error'
});
}
);
});
}
query<TQuery extends IQueryCriteria>(query: TQuery) {
this._criteria.page = query.page === undefined ? this._criteria.page:query.page;
this._criteria.pageSize = query.pageSize === undefined ? this._criteria.pageSize: query.pageSize;
this._criteria.filters = query.filters || this._criteria.filters;
this._criteria.groups = query.groups || this._criteria.groups;
this._criteria.aggregates = query.aggregates || this._criteria.aggregates;
this._criteria.sorts = query.sorts || this._criteria.sorts;
return this.refresh();
}
executeQuery<TQuery extends IQueryCriteria>(query: TQuery): Observable<IQueryExecutionGroupResult<TModel>>{
return this.options.transport.query.adapter.handle(query);
}
refresh() {
return this._query()
.subscribe();
}
get sorts() {
return this._criteria.sorts;
}
set sorts(value: ISort[]) {
this._criteria.sorts = value;
this.refresh();
}
get filters() {
return this._criteria.filters;
}
set filters(value: IFilter[]) {
this._criteria.filters = value;
this.refresh();
}
get groups() {
return this._criteria.groups;
}
set groups(value: IGroup[]) {
this._criteria.groups = value;
this.refresh();
}
get aggregates() {
return this._criteria.aggregates;
}
set aggregates(value: IAggregate[]) {
this._criteria.aggregates = value;
this.refresh();
}
get pageSize() {
return this._criteria.pageSize;
}
set pageSize(value: number) {
this._criteria.pageSize = value;
this.refresh();
}
get page() {
return this._criteria.page;
}
set page(value: number) {
this._criteria.page = value;
this.refresh();
}
}
projects/data/src/lib/IAdvanceQueryAdapter.ts
-4
View File
@@ -1,4 +0,0 @@
import { IQueryCriteria, IQueryExecutionResult, IQueryExecutionGroupResult } from './models';
import { IQueryAdapter } from "./IQueryAdapter";
export interface IAdvanceQueryAdapter<TQuery extends IQueryCriteria, TResult> extends IQueryAdapter<TQuery, IQueryExecutionResult<TResult> & IQueryExecutionGroupResult<TResult>> {
}
projects/data/src/lib/ICommandAdapter.ts
-4
View File
@@ -1,4 +0,0 @@
import { Observable } from 'rxjs';
export interface ICommandAdapter<TCommand, TResult> {
handle(command: TCommand): Observable<TResult>;
}
projects/data/src/lib/IDataSource.ts
-35
View File
@@ -1,35 +0,0 @@
import { Observable } from "rxjs";
import { ISort, IFilter, IGroup, IAggregate, IQueryExecutionResult, IQueryExecutionGroupResult, IQueryCriteria } from "./models";
import { IResolveCommandModelEvent } from "./IResolveCommandModelEvent";
import { IDataSourceValidationError } from './IDataSourceValidationError';
import { IDataSourceNotifyMessage } from './IDataSourceNotifyMessage';
import { IDataSourceCommandStarted } from "./IDataSourceCommandStarted";
export interface IDataSource<TModel>
{
resolveCommandModelByName<T extends any>(event: IResolveCommandModelEvent<TModel>) : Observable<T>;
executeCommandByName<TCommand, TResult>(name: string, command: TCommand) : Observable<TResult>;
query<TQuery extends IQueryCriteria>(query: TQuery);
executeQuery<TQuery extends IQueryCriteria>(query: TQuery): Observable<IQueryExecutionGroupResult<TModel> & IQueryExecutionGroupResult<TModel>>;
refresh();
resolveIdField<TKeyType extends any>(model: TModel) : TKeyType;
clear();
updateData(value: IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>);
replaceDataWithArray(items: TModel[]);
replaceDataWithSingle(item: TModel);
data$: Observable<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>>;
loading$: Observable<boolean>;
validationError$: Observable<IDataSourceValidationError>;
notifyMessage$: Observable<IDataSourceNotifyMessage>;
commandStarted$: Observable<IDataSourceCommandStarted>;
data: IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>;
sorts: ISort[];
filters: IFilter[];
groups: IGroup[];
aggregates: IAggregate[];
pageSize: number;
page: number;
}
projects/data/src/lib/IDataSourceCommandAdapterOptions.ts
-7
View File
@@ -1,7 +0,0 @@
import { Observable } from "rxjs";
import { ICommandAdapter } from "./ICommandAdapter";
import { IResolveCommandModelEvent } from "./IResolveCommandModelEvent";
export interface IDataSourceCommandAdapterOptions<TModel> {
adapter: ICommandAdapter<any, any>;
resolveCommandModel?: (event: IResolveCommandModelEvent<TModel>) => Observable<any>;
}
projects/data/src/lib/IDataSourceCommandStarted.ts
-5
View File
@@ -1,5 +0,0 @@
export interface IDataSourceCommandStarted {
name: string;
command: any;
}
projects/data/src/lib/IDataSourceError.ts
-4
View File
@@ -1,4 +0,0 @@
export interface IDataSourceError {
type: 'message' | 'validation';
}
projects/data/src/lib/IDataSourceErrorMessage.ts
-7
View File
@@ -1,7 +0,0 @@
import { IDataSourceError } from './IDataSourceError';
export interface IDataSourceErrorMessage extends IDataSourceError {
message: string;
}
projects/data/src/lib/IDataSourceNotifyMessage.ts
-5
View File
@@ -1,5 +0,0 @@
export interface IDataSourceNotifyMessage {
type: 'warning' | 'info' | 'success' | 'error';
message: string;
messageParams?: any;
}
projects/data/src/lib/IDataSourceOptions.ts
-18
View File
@@ -1,18 +0,0 @@
import { IDataSourceQueryAdapterOptions } from "./IDataSourceQueryAdapterOptions";
import { IDataSourceCommandAdapterOptions } from "./IDataSourceCommandAdapterOptions";
import { IQueryCriteria } from "./models";
export interface IDataSourceOptions<TModel> {
transport: IDataSourceTransportOptions<TModel>;
idField?: string;
resolveIdField?: (model: TModel) => any;
defaultCriteria: IQueryCriteria;
}
export interface IDataSourceTransportOptions<TModel> {
query: IDataSourceQueryAdapterOptions<TModel>;
commands: {
[name: string]: IDataSourceCommandAdapterOptions<TModel>;
};
}
projects/data/src/lib/IDataSourceQueryAdapterOptions.ts
-5
View File
@@ -1,5 +0,0 @@
import { IAdvanceQueryAdapter } from "./IAdvanceQueryAdapter";
export interface IDataSourceQueryAdapterOptions<TModel> {
adapter: IAdvanceQueryAdapter<any, TModel>;
}
projects/data/src/lib/IDataSourceValidationError.ts
-6
View File
@@ -1,6 +0,0 @@
import { IDataSourceError } from './IDataSourceError';
export interface IDataSourceValidationError extends IDataSourceError
{
errors: { [field: string]: string[]; }
}
projects/data/src/lib/IQueryAdapter.ts
-4
View File
@@ -1,4 +0,0 @@
import { Observable } from 'rxjs';
export interface IQueryAdapter<TQuery, TResult> {
handle(query: TQuery): Observable<TResult>;
}
projects/data/src/lib/IResolveCommandModelEvent.ts
-5
View File
@@ -1,5 +0,0 @@
export interface IResolveCommandModelEvent<TModel> {
command: string;
model: TModel;
params?: any;
}
projects/data/src/lib/abstractions/command.abstraction.ts
+15
View File
@@ -0,0 +1,15 @@
import {Observable} from 'rxjs';
export interface ICommand {
}
export interface ICommandAdapter<TCommand extends {}, TResult> {
handle(command: TCommand): Observable<TResult>;
}
export interface IResolveCommandModelEvent<TModel> {
command: string;
model: TModel;
params?: any;
}
projects/data/src/lib/abstractions/data-source.abstraction.ts
+89
View File
@@ -0,0 +1,89 @@
import {Observable, Subscription} from 'rxjs';
import {ICommand, ICommandAdapter, IResolveCommandModelEvent} from './command.abstraction';
import {
IAdvanceQueryAdapter,
IAggregate,
IFilter,
IGroup,
IQueryCriteria,
IQueryExecutionGroupResult,
IQueryExecutionResult,
ISort
} from './query.abstraction';
export interface IDataSource<TQuery extends IQueryCriteria, TModel>
{
resolveCommandModelByName<TCommand extends ICommand>(event: IResolveCommandModelEvent<TModel>) : Observable<TCommand>;
executeCommandByName<TCommand extends ICommand, TResult>(name: string, command: TCommand) : Observable<TResult>;
query(query: TQuery): Subscription;
executeQuery(query: TQuery): Observable<IQueryExecutionGroupResult<TModel>>;
refresh(): Subscription;
resolveIdField(model: TModel) : TModel[keyof TModel];
clear(): void;
updateData(value: IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>): void;
replaceDataWithArray(items: TModel[]): void;
replaceDataWithSingle(item: TModel): void;
data$: Observable<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel> | null>;
loading$: Observable<boolean>;
validationError$: Observable<IDataSourceValidationError>;
notifyMessage$: Observable<IDataSourceNotifyMessage>;
commandStarted$: Observable<IDataSourceCommandStarted>;
data?: IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>;
sorts: ISort[];
filters: IFilter[];
groups: IGroup[];
aggregates: IAggregate[];
pageSize: number;
page: number;
}
export interface IDataSourceOptions<TQuery extends IQueryCriteria, TResult>{
transport: IDataSourceTransportOptions<TQuery, TResult>;
idField?: keyof TResult;
resolveIdField?: (model: TResult) => TResult[keyof TResult];
defaultCriteria: IQueryCriteria;
}
export interface IDataSourceTransportOptions<TQuery extends IQueryCriteria, TResult> {
query: IDataSourceQueryAdapterOptions<TQuery, TResult>;
commands: {
[name: string]: IDataSourceCommandAdapterOptions<TResult>;
};
}
export interface IDataSourceQueryAdapterOptions<TQuery extends IQueryCriteria, TResult> {
adapter: IAdvanceQueryAdapter<TQuery, TResult>;
}
export interface IDataSourceCommandAdapterOptions<TModel> {
adapter: ICommandAdapter<ICommand, any>;
resolveCommandModel?: (event: IResolveCommandModelEvent<TModel>) => Observable<any>;
}
export interface IDataSourceCommandStarted {
name: string;
command: ICommand;
}
export interface IDataSourceNotifyMessage {
type: 'warning' | 'info' | 'success' | 'error';
message: string;
messageParams?: any;
}
export interface IDataSourceError {
type: 'message' | 'validation';
}
export interface IDataSourceErrorMessage extends IDataSourceError {
message: string;
}
export interface IDataSourceValidationError extends IDataSourceError
{
errors: { [field: string]: string[]; }
}
projects/data/src/lib/abstractions/query.abstraction.ts
+104
View File
@@ -0,0 +1,104 @@
import {Observable} from 'rxjs';
export interface IQueryAdapter<TQuery extends IQueryCriteria, TResult> {
handle(query: TQuery): Observable<TResult>;
}
export interface IAdvanceQueryAdapter<TQuery extends IQueryCriteria, TResult> extends IQueryAdapter<TQuery, IQueryExecutionResult<TResult> & IQueryExecutionGroupResult<TResult>> {
}
export interface IAggregate {
path: string;
type: string;
}
export interface ISort {
path: string;
ascending?: boolean;
}
export interface ISimpleFilter extends IFilter {
path: string;
value: any;
}
export interface IQueryResult<TModel> {
aggregates?: IAggregateResult[];
data?: TModel[];
}
export interface IQueryExecutionResultPaging {
totalRecords: number;
numberOfPages?: number;
}
export interface IQueryExecutionResult<TRecord> extends IQueryResult<TRecord>, IQueryExecutionResultPaging {
}
export interface IQueryExecutionGroupResult<TModel> extends IQueryExecutionResult<TModel> {
groups?: IGroupQueryResult<TModel>[];
}
export interface IQueryCriteria {
page?: number;
pageSize?: number;
sorts?: ISort[];
groups?: IGroup[];
aggregates?: IAggregate[];
filters?: IFilter[];
}
export interface IGroupQueryResult<TModel> extends IQueryResult<TModel> {
groupPath: string;
groupValue: any;
hasSubGroups: boolean;
subGroups?: IGroupQueryResult<TModel>[];
}
export interface IGroup {
path: string;
ascending?: boolean;
}
export interface IFilter {
type: string;
and?: boolean;
}
export interface IAggregateResult {
path: string;
type: string;
value: any;
}
export interface ICompositeFilter extends IFilter {
filters: IFilter[];
}
export const enum AggregateType {
COUNT = 'Count',
SUM = 'Sum',
AVG = 'Avg',
LONGCOUNT = 'LongCount',
MIN = 'Min',
MAX = 'Max',
FIRST = 'First',
FIRSTORDEFAULT = 'FirstOrDefault',
LAST = 'Last',
LASTORDEFAULT = 'LastOrDefault'
}
export const enum FilterType {
EQUAL = 'Equal',
CONTAINS = 'Contains',
STARTSWITH = 'StartsWith',
ENDSWITH = 'EndsWith',
COMPOSITE = 'Composite',
NOTEQUAL = 'NotEqual',
GREATERTHAN = 'GreaterThan',
LESSTHANOREQUAL = 'LessThanOrEqual',
GREATERTHANOREQUAL = 'GreaterThanOrEqual',
LESSTHAN ='LessThan',
IN = 'In',
NOTIN = 'NotIn'
}
projects/data/src/lib/data-source.ts
+295
View File
@@ -0,0 +1,295 @@
import {BehaviorSubject, Observable, Observer, of, ReplaySubject, Subject, throwError} from 'rxjs';
import {catchError, finalize, map} from 'rxjs/operators';
import {
IDataSource,
IDataSourceCommandStarted,
IDataSourceError,
IDataSourceErrorMessage,
IDataSourceNotifyMessage,
IDataSourceOptions,
IDataSourceValidationError,
} from './abstractions/data-source.abstraction';
import {
IAggregate,
IFilter,
IGroup,
IQueryCriteria,
IQueryExecutionGroupResult,
IQueryExecutionResult,
ISort
} from './abstractions/query.abstraction';
import {ICommand, IResolveCommandModelEvent} from './abstractions/command.abstraction';
export class DataSource<TQuery extends IQueryCriteria, TModel extends {}> implements IDataSource<TQuery, TModel>
{
data?: IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>;
protected _dataSubject: ReplaySubject<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel> | null> = new ReplaySubject(1);
protected _loadingSubject: BehaviorSubject<boolean> = new BehaviorSubject(false);
protected _validationSubject: Subject<IDataSourceValidationError> = new Subject();
protected _commandStartedSubject: Subject<IDataSourceCommandStarted> = new Subject();
protected _notifyMessageSubject: Subject<IDataSourceNotifyMessage> = new Subject();
protected _data$!: Observable<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel> | null>;
protected _loading$!: Observable<boolean>;
protected _validationError$!: Observable<IDataSourceValidationError>;
protected _notifyMessage$!: Observable<IDataSourceNotifyMessage>;
protected _commandStarted$!: Observable<IDataSourceCommandStarted>;
protected _criteria: IQueryCriteria = {
filters: [],
aggregates: [],
groups: [],
sorts: []
};
get data$() {
if (!this._data$)
this._data$ = this._dataSubject.asObservable();
return this._data$;
}
get loading$() {
if (!this._loading$)
this._loading$ = this._loadingSubject.asObservable();
return this._loading$;
}
get validationError$() {
if (!this._validationError$)
this._validationError$ = this._validationSubject.asObservable();
return this._validationError$;
}
get commandStarted$() {
if (!this._commandStarted$)
this._commandStarted$ = this._commandStartedSubject.asObservable();
return this._commandStarted$;
}
get notifyMessage$() {
if (!this._notifyMessage$)
this._notifyMessage$ = this._notifyMessageSubject.asObservable();
return this._notifyMessage$;
}
constructor(public options: IDataSourceOptions<TQuery, TModel>) {
this._initCriteria();
}
clear() {
this.data = undefined;
this._dataSubject.next(null);
}
updateData(value: IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>) {
this.data = value;
this._dataSubject.next(this.data);
}
replaceDataWithArray(items: TModel[]) {
this.data = {
totalRecords: items.length,
numberOfPages: undefined,
groups: undefined,
aggregates: undefined,
data: items
};
this._dataSubject.next(this.data);
}
replaceDataWithSingle(item: TModel) {
this.data = {
totalRecords: 1,
numberOfPages: undefined,
groups: undefined,
aggregates: undefined,
data: [item]
};
this._dataSubject.next(this.data);
}
protected _initCriteria() {
if (!this.options.defaultCriteria)
return;
const copy: IQueryCriteria = JSON.parse(JSON.stringify(this.options.defaultCriteria));
this._criteria.page = copy.page || this._criteria.page;
this._criteria.pageSize = copy.pageSize || this._criteria.pageSize;
this._criteria.filters = copy.filters || this._criteria.filters;
this._criteria.groups = copy.groups || this._criteria.groups;
this._criteria.aggregates = copy.aggregates || this._criteria.aggregates;
this._criteria.sorts = copy.sorts || this._criteria.sorts;
}
resolveIdField(model: TModel): TModel[keyof TModel] {
if (this.options.idField) {
return model[this.options.idField];
}
if (this.options.resolveIdField) {
return this.options.resolveIdField(model);
}
throw new Error("Must specify an id field or supply a method to resolve the id field.");
}
resolveCommandModelByName<T extends any>(event: IResolveCommandModelEvent<TModel>) : Observable<T> {
if (!this.options.transport.commands.hasOwnProperty(event.command))
return throwError(() => <IDataSourceErrorMessage>{
type: 'message',
message: `command with name ${event.command} not found`
});
const commandOptions = this.options.transport.commands[event.command];
if (commandOptions.resolveCommandModel)
return commandOptions.resolveCommandModel(event);
const noResolveMethod: any = event.model || {};
return of(noResolveMethod);
}
executeCommandByName<TCommand extends ICommand, TResult>(name: string, command: TCommand) : Observable<TResult> {
if (!this.options.transport.commands.hasOwnProperty(name))
return throwError(() => `command with name ${name} not found`);
this._commandStartedSubject.next({
name: name, command: command
});
return this.options.transport.commands[name].adapter.handle(command).pipe(
map(t => {
this._notifyMessageSubject.next({
type: 'success',
message: 'COMMAND_EXECUTED_SUCCESSFULLY',
messageParams: {
command: name
}
});
return t;
}),
catchError((err: IDataSourceError) => {
if (err.type == 'message')
this._notifyMessageSubject.next({
type: 'error',
message: (err as IDataSourceErrorMessage).message
});
else if(err.type == 'validation')
this._validationSubject.next(err as IDataSourceValidationError);
return throwError(() => err);
})
);
}
private _query() : Observable<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>> {
return new Observable<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>>((o: Observer<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>>) => {
this._loadingSubject.next(true);
this.options.transport.query.adapter.handle(this._criteria as TQuery)
.pipe(
finalize(() => {
o.complete();
this._loadingSubject.next(false);
})
)
.subscribe({
next: (result) =>
{
this.data = result;
o.next(result);
this._dataSubject.next(this.data);
this._notifyMessageSubject.next({
message: 'NEW_DATA_READ_SUCCESSFULLY',
type: 'info'
});
},
error: (err) => {
o.error(err);
this._notifyMessageSubject.next({
message: 'UNEXPECTED_ERROR_OCCURRED',
type: 'error'
});
}
});
});
}
query(query: TQuery) {
this._criteria.page = query.page === undefined ? this._criteria.page:query.page;
this._criteria.pageSize = query.pageSize === undefined ? this._criteria.pageSize: query.pageSize;
this._criteria.filters = query.filters || this._criteria.filters;
this._criteria.groups = query.groups || this._criteria.groups;
this._criteria.aggregates = query.aggregates || this._criteria.aggregates;
this._criteria.sorts = query.sorts || this._criteria.sorts;
return this.refresh();
}
executeQuery(query: TQuery): Observable<IQueryExecutionGroupResult<TModel>>{
return this.options.transport.query.adapter.handle(query);
}
refresh() {
return this._query()
.subscribe();
}
get sorts() {
return this._criteria.sorts ?? [];
}
set sorts(value: ISort[]) {
this._criteria.sorts = value;
this.refresh();
}
get filters() {
return this._criteria.filters ?? [];
}
set filters(value: IFilter[]) {
this._criteria.filters = value;
this.refresh();
}
get groups() {
return this._criteria.groups ?? [];
}
set groups(value: IGroup[]) {
this._criteria.groups = value;
this.refresh();
}
get aggregates() {
return this._criteria.aggregates ?? [];
}
set aggregates(value: IAggregate[]) {
this._criteria.aggregates = value;
this.refresh();
}
get pageSize() {
return this._criteria.pageSize ?? 25;
}
set pageSize(value: number) {
this._criteria.pageSize = value;
this.refresh();
}
get page() {
return this._criteria.page ?? 0;
}
set page(value: number) {
this._criteria.page = value;
this.refresh();
}
}
projects/data/src/lib/models.ts
-95
View File
@@ -1,95 +0,0 @@
export interface IAggregate {
path: string;
type: string;
}
export interface ISort {
path: string;
ascending?: boolean;
}
export interface ISimpleFilter extends IFilter {
path: string;
value: any;
}
export interface IQueryResult<TModel> {
aggregates?: IAggregateResult[];
data?: TModel[];
}
export interface IQueryExecutionResultPaging {
totalRecords: number;
numberOfPages?: number;
}
export interface IQueryExecutionResult<TRecord> extends IQueryResult<TRecord>, IQueryExecutionResultPaging {
}
export interface IQueryExecutionGroupResult<TModel> extends IQueryExecutionResult<TModel> {
groups: IGroupQueryResult<TModel>[];
}
export interface IQueryCriteria {
page?: number;
pageSize?: number;
sorts?: ISort[];
groups?: IGroup[];
aggregates?: IAggregate[];
filters?: IFilter[];
}
export interface IGroupQueryResult<TModel> extends IQueryResult<TModel> {
groupPath: string;
groupValue: any;
hasSubGroups: boolean;
subGroups?: IGroupQueryResult<TModel>[];
}
export interface IGroup {
path: string;
ascending?: boolean;
}
export interface IFilter {
type: string;
and?: boolean;
}
export interface IAggregateResult {
path: string;
type: string;
value: any;
}
export interface ICompositeFilter extends IFilter {
filters: IFilter[];
}
export const enum AggregateType {
COUNT = 'Count',
SUM = 'Sum',
AVG = 'Avg',
LONGCOUNT = 'LongCount',
MIN = 'Min',
MAX = 'Max',
FIRST = 'First',
FIRSTORDEFAULT = 'FirstOrDefault',
LAST = 'Last',
LASTORDEFAULT = 'LastOrDefault'
}
export const enum FilterType {
EQUAL = 'Equal',
CONTAINS = 'Contains',
STARTSWITH = 'StartsWith',
ENDSWITH = 'EndsWith',
COMPOSITE = 'Composite',
NOTEQUAL = 'NotEqual',
GREATERTHAN = 'GreaterThan',
LESSTHANOREQUAL = 'LessThanOrEqual',
GREATERTHANOREQUAL = 'GreaterThanOrEqual',
LESSTHAN ='LessThan',
IN = 'In',
NOTIN = 'NotIn'
}
projects/data/src/public-api.ts
+4 -15
View File
@@ -2,18 +2,7 @@
* Public API Surface of data
*/
export * from './lib/models';
export * from './lib/DataSource';
export * from './lib/IAdvanceQueryAdapter';
export * from './lib/ICommandAdapter';
export * from './lib/IDataSource';
export * from './lib/IDataSourceOptions';
export * from './lib/IDataSourceQueryAdapterOptions';
export * from './lib/IQueryAdapter';
export * from './lib/IResolveCommandModelEvent';
export * from './lib/IDataSourceCommandAdapterOptions';
export * from './lib/IDataSourceValidationError';
export * from './lib/IDataSourceError';
export * from './lib/IDataSourceErrorMessage';
export * from './lib/IDataSourceNotifyMessage';
export * from './lib/abstractions/data-source.abstraction';
export * from './lib/abstractions/query.abstraction';
export * from './lib/abstractions/command.abstraction';
export * from './lib/data-source';
projects/data/tsconfig.lib.json
+5 -16
View File
@@ -1,26 +1,15 @@
/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../../out-tsc/lib",
"target": "es2015",
"outDir": "../../out-tsc/lib",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": [
"dom",
"es2018"
]
},
"angularCompilerOptions": {
"annotateForClosureCompiler": true,
"skipTemplateCodegen": true,
"strictMetadataEmit": true,
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true,
"enableResourceInlining": true
"types": []
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
}
projects/data/tsconfig.lib.prod.json
+11
View File
@@ -0,0 +1,11 @@
/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
{
"extends": "./tsconfig.lib.json",
"compilerOptions": {
"declarationMap": false
},
"angularCompilerOptions": {
"compilationMode": "partial"
}
}
projects/data/tsconfig.spec.json
+4 -6
View File
@@ -1,15 +1,13 @@
/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../../out-tsc/spec",
"outDir": "../../out-tsc/spec",
"types": [
"jasmine",
"node"
"jasmine"
]
},
"files": [
"src/test.ts"
],
"include": [
"**/*.spec.ts",
"**/*.d.ts"
projects/data/tslint.json
-17
View File
@@ -1,17 +0,0 @@
{
"extends": "../../tslint.json",
"rules": {
"directive-selector": [
true,
"attribute",
"lib",
"camelCase"
],
"component-selector": [
true,
"element",
"lib",
"kebab-case"
]
}
}