This commit is contained in:
Mathias Beaulieu-Duncan 2019-09-13 10:57:56 -05:00
parent dd55aadaf5
commit c1c19c5ce0
2 changed files with 7 additions and 4 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "@poweredsoft/data", "name": "@poweredsoft/data",
"version": "0.0.24", "version": "0.0.25",
"peerDependencies": { "peerDependencies": {
"rxjs": "^6.5.3" "rxjs": "^6.5.3"
} }

View File

@ -91,8 +91,11 @@ export class DataSource<TModel> implements IDataSource<TModel>
} }
resolveCommandModelByName<T extends any>(event: IResolveCommandModelEvent<TModel>) : Observable<T> { resolveCommandModelByName<T extends any>(event: IResolveCommandModelEvent<TModel>) : Observable<T> {
if (!this.options.transport.commands.hasOwnProperty(name)) if (!this.options.transport.commands.hasOwnProperty(event.command))
return Observable.throw(`command with name ${name} not found`); return throwError(<IDataSourceErrorMessage>{
type: 'message',
message: `command with name ${event.command} not found`
});
const commandOptions = this.options.transport.commands[event.command]; const commandOptions = this.options.transport.commands[event.command];
if (commandOptions.resolveCommandModel) if (commandOptions.resolveCommandModel)
@ -104,7 +107,7 @@ export class DataSource<TModel> implements IDataSource<TModel>
executeCommandByName<TCommand, TResult>(name: string, command: TCommand) : Observable<TResult> { executeCommandByName<TCommand, TResult>(name: string, command: TCommand) : Observable<TResult> {
if (!this.options.transport.commands.hasOwnProperty(name)) if (!this.options.transport.commands.hasOwnProperty(name))
return Observable.throw(`command with name ${name} not found`); return throwError(`command with name ${name} not found`);
return this.options.transport.commands[name].adapter.handle(command).pipe( return this.options.transport.commands[name].adapter.handle(command).pipe(
map(t => { map(t => {