code cleanup and version 1.0.0-alpha.1 release

angular.json

@@ -3,7 +3,7 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "data": {
+    "demo": {
       "projectType": "application",
       "schematics": {},
       "root": "",
@@ -121,33 +121,33 @@
         }
       }
     },
-    "@poweredsoft/data": {
+    "data": {
       "projectType": "library",
-      "root": "projects/poweredsoft/data",
+      "root": "projects/data",
-      "sourceRoot": "projects/poweredsoft/data/src",
+      "sourceRoot": "projects/data/src",
       "prefix": "lib",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
-            "tsConfig": "projects/poweredsoft/data/tsconfig.lib.json",
+            "tsConfig": "projects/data/tsconfig.lib.json",
-            "project": "projects/poweredsoft/data/ng-package.json"
+            "project": "projects/data/ng-package.json"
           }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "projects/poweredsoft/data/src/test.ts",
+            "main": "projects/data/src/test.ts",
-            "tsConfig": "projects/poweredsoft/data/tsconfig.spec.json",
+            "tsConfig": "projects/data/tsconfig.spec.json",
-            "karmaConfig": "projects/poweredsoft/data/karma.conf.js"
+            "karmaConfig": "projects/data/karma.conf.js"
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "projects/poweredsoft/data/tsconfig.lib.json",
+              "projects/data/tsconfig.lib.json",
-              "projects/poweredsoft/data/tsconfig.spec.json"
+              "projects/data/tsconfig.spec.json"
             ],
             "exclude": [
               "**/node_modules/**"
@@ -157,4 +157,4 @@
       }
     }},
   "defaultProject": "data"
-}
+}

package.json

@@ -2,16 +2,11 @@
   "name": "data",
   "version": "0.0.30",
   "scripts": {
-    "ng": "ng",
+    "serve": "ng serve",
-    "start": "ng serve",
+    "build": "ng build data",
-    "build": "ng build",
+    "publish": "npm publish dist/data --access public"
-    "test": "ng test",
-    "lint": "ng lint",
-    "e2e": "ng e2e",
-    "build-lib": "ng build @poweredsoft/data",
-    "publish-lib": "npm publish dist/poweredsoft/data"
   },
-  "private": true,
+  "private": false,
   "dependencies": {
     "@angular/animations": "~8.2.4",
     "@angular/common": "~8.2.4",
@@ -48,5 +43,6 @@
     "tsickle": "^0.37.0",
     "tslint": "~5.15.0",
     "typescript": "~3.5.3"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }

projects/data/ng-package.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../dist/data",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}

projects/data/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "@openharbor/data",
+  "version": "1.0.0-alpha.1",
+  "repository": "https://git.openharbor.io/Open-Harbor/ts-data",
+  "peerDependencies": {
+    "rxjs": "^6.5.3"
+  }
+}

projects/data/src/lib/DataSource.ts

@@ -9,10 +9,10 @@ import { IDataSourceError } from './IDataSourceError';
 import { IDataSourceNotifyMessage } from './IDataSourceNotifyMessage';
 import { IDataSourceCommandStarted } from './IDataSourceCommandStarted';
 
-export class DataSource<TModel> implements IDataSource<TModel> 
+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();
@@ -24,7 +24,7 @@ export class DataSource<TModel> implements IDataSource<TModel>
     protected _validationError$: Observable<IDataSourceValidationError>;
     protected _notifyMessage$: Observable<IDataSourceNotifyMessage>;
     protected _commandStarted$: Observable<IDataSourceCommandStarted>;
-    
+
     protected _criteria: IQueryCriteria = {
         page: null,
         pageSize: null,
@@ -107,7 +107,7 @@ export class DataSource<TModel> implements IDataSource<TModel>
     }
 
     protected _initCriteria() {
-        if (!this.options.defaultCriteria) 
+        if (!this.options.defaultCriteria)
             return;
 
         const copy: IQueryCriteria = JSON.parse(JSON.stringify(this.options.defaultCriteria));
@@ -120,10 +120,10 @@ export class DataSource<TModel> implements IDataSource<TModel>
     }
 
     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);
 
@@ -157,7 +157,7 @@ export class DataSource<TModel> implements IDataSource<TModel>
             map(t => {
                 this._notifyMessageSubject.next({
                     type: 'success',
-                    message: 'COMMAND_EXECUTED_SUCCESFULLY',
+                    message: 'COMMAND_EXECUTED_SUCCESSFULLY',
                     messageParams: {
                         command: name
                     }
@@ -179,34 +179,34 @@ export class DataSource<TModel> implements IDataSource<TModel>
     }
 
     private _query() : Observable<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>> {
-        return Observable.create((o: Observer<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>>) => {
+      return new Observable<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>>((o: Observer<IQueryExecutionResult<TModel> & IQueryExecutionGroupResult<TModel>>) => {
-            this._loadingSubject.next(true);
+        this._loadingSubject.next(true);
-            this.options.transport.query.adapter.handle(this._criteria)
+        this.options.transport.query.adapter.handle(this._criteria)
-                .pipe(
+          .pipe(
-                    finalize(() => {
+            finalize(() => {
-                        o.complete();
+              o.complete();
-                        this._loadingSubject.next(false);
+              this._loadingSubject.next(false);
-                    })
+            })
-                )
+          )
-                .subscribe(
+          .subscribe(
-                    result => {
+            result => {
-                        this.data = result;
+              this.data = result;
-                        o.next(result);
+              o.next(result);
-                        this._dataSubject.next(this.data);
+              this._dataSubject.next(this.data);
-                        this._notifyMessageSubject.next({
+              this._notifyMessageSubject.next({
-                            message: 'NEW_DATA_READ_SUCCESFULLY',
+                message: 'NEW_DATA_READ_SUCCESSFULLY',
-                            type: 'info'
+                type: 'info'
-                        });
+              });
-                    },
+            },
-                    err => {
+            err => {
-                        o.error(err);
+              o.error(err);
-                        this._notifyMessageSubject.next({
+              this._notifyMessageSubject.next({
-                            message: 'UNEXPECTED_ERROR_OCCURED',
+                message: 'UNEXPECTED_ERROR_OCCURRED',
-                            type: 'error'
+                type: 'error'
-                        });
+              });
-                    }
+            }
-                );
+          );
-        });
+      });
     }
 
     query<TQuery extends IQueryCriteria>(query: TQuery) {
@@ -219,15 +219,13 @@ export class DataSource<TModel> implements IDataSource<TModel>
         return this.refresh();
     }
 
-    excuteQuery<TQuery extends IQueryCriteria>(query: TQuery): Observable<IQueryExecutionGroupResult<TModel> & IQueryExecutionGroupResult<TModel>>{
+    executeQuery<TQuery extends IQueryCriteria>(query: TQuery): Observable<IQueryExecutionGroupResult<TModel>>{
         return this.options.transport.query.adapter.handle(query);
     }
 
     refresh() {
-        return this._query().subscribe(
+        return this._query()
-            res => {},
+          .subscribe();
-            err => {}  
-        );
     }
 
     get sorts() {

projects/data/src/lib/IDataSource.ts

@@ -10,7 +10,7 @@ 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);
-    excuteQuery<TQuery extends IQueryCriteria>(query: TQuery): Observable<IQueryExecutionGroupResult<TModel> & IQueryExecutionGroupResult<TModel>>;
+    executeQuery<TQuery extends IQueryCriteria>(query: TQuery): Observable<IQueryExecutionGroupResult<TModel> & IQueryExecutionGroupResult<TModel>>;
     refresh();
     resolveIdField<TKeyType extends any>(model: TModel) : TKeyType;
     clear();
@@ -32,4 +32,4 @@ export interface IDataSource<TModel>
     aggregates: IAggregate[];
     pageSize: number;
     page: number;
-}
+}

projects/data/tsconfig.lib.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../../out-tsc/lib",
     "target": "es2015",

projects/data/tsconfig.spec.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../../out-tsc/spec",
     "types": [

projects/data/tslint.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tslint.json",
+  "extends": "../../tslint.json",
   "rules": {
     "directive-selector": [
       true,

projects/poweredsoft/data/ng-package.json

@@ -1,7 +0,0 @@
-{
-  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
-  "dest": "../../../dist/poweredsoft/data",
-  "lib": {
-    "entryFile": "src/public-api.ts"
-  }
-}

projects/poweredsoft/data/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "@poweredsoft/data",
-  "version": "0.0.36",
-  "peerDependencies": {
-    "rxjs": "^6.5.3"
-  }
-}

src/app/app.component.spec.ts

@@ -1,31 +0,0 @@
-import { TestBed, async } from '@angular/core/testing';
-import { AppComponent } from './app.component';
-
-describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  }));
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  });
-
-  it(`should have as title 'data'`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('data');
-  });
-
-  it('should render title', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
-    const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('.content span').textContent).toContain('data app is running!');
-  });
-});

src/app/app.component.ts

@@ -1,9 +1,18 @@
-import { Component, OnInit, Pipe } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
-import { IDataSource } from 'projects/poweredsoft/data/src/lib/IDataSource';
+import {IDataSourceNotifyMessage} from '../../projects/data/src/lib/IDataSourceNotifyMessage';
-import { IDataSourceNotifyMessage } from 'projects/poweredsoft/data/src/lib/IDataSourceNotifyMessage';
+import {
-import { DataSource, IDataSourceTransportOptions, IDataSourceQueryAdapterOptions, IQueryCriteria, IQueryExecutionResult, IQueryExecutionGroupResult, IDataSourceCommandAdapterOptions, IDataSourceValidationError } from 'projects/poweredsoft/data/src/public-api';
+  DataSource,
-import { HttpClient } from '@angular/common/http';
+  IDataSource,
-import { of, throwError } from 'rxjs';
+  IDataSourceCommandAdapterOptions,
+  IDataSourceQueryAdapterOptions,
+  IDataSourceTransportOptions,
+  IDataSourceValidationError,
+  IQueryCriteria,
+  IQueryExecutionGroupResult,
+  IQueryExecutionResult
+} from '@openharbor/data';
+import {HttpClient} from '@angular/common/http';
+import {of, throwError} from 'rxjs';
 
 export interface MyModel {
     id: number;

tsconfig.json

@@ -19,16 +19,13 @@
       "dom"
     ],
     "paths": {
-      "@poweredsoft/data": [
+      "@openharbor/data": [
-        "dist/poweredsoft/data"
+        "./projects/data/src/public-api"
       ],
-      "@poweredsoft/data/*": [
-        "dist/poweredsoft/data/*"
-      ]
     }
   },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true
   }
-}
+}