Update to 18 (#10)

* update to angular 18

* update eslint and package deps

Author: michalkotas

package-lock.json

@@ -12,23 +12,23 @@
     "test": "ng test"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^17.3.10",
-    "@angular-eslint/builder": "17.5.3",
-    "@angular-eslint/eslint-plugin": "17.5.3",
-    "@angular-eslint/eslint-plugin-template": "17.5.3",
-    "@angular-eslint/schematics": "17.5.3",
-    "@angular-eslint/template-parser": "17.5.3",
-    "@angular/animations": "^17.3.12",
-    "@angular/cli": "^17.3.10",
-    "@angular/common": "^17.3.12",
-    "@angular/compiler": "^17.3.12",
-    "@angular/compiler-cli": "^17.3.12",
-    "@angular/core": "^17.3.12",
-    "@angular/forms": "^17.3.12",
-    "@angular/language-service": "^17.3.12",
-    "@angular/platform-browser": "^17.3.12",
-    "@angular/platform-browser-dynamic": "^17.3.12",
-    "@angular/router": "^17.3.12",
+    "@angular-devkit/build-angular": "^18.2.9",
+    "@angular-eslint/builder": "18.3.1",
+    "@angular-eslint/eslint-plugin": "18.3.1",
+    "@angular-eslint/eslint-plugin-template": "18.3.1",
+    "@angular-eslint/schematics": "18.3.1",
+    "@angular-eslint/template-parser": "18.3.1",
+    "@angular/animations": "^18.2.8",
+    "@angular/cli": "^18.2.9",
+    "@angular/common": "^18.2.8",
+    "@angular/compiler": "^18.2.8",
+    "@angular/compiler-cli": "^18.2.8",
+    "@angular/core": "^18.2.8",
+    "@angular/forms": "^18.2.8",
+    "@angular/language-service": "^18.2.8",
+    "@angular/platform-browser": "^18.2.8",
+    "@angular/platform-browser-dynamic": "^18.2.8",
+    "@angular/router": "^18.2.8",
     "@types/jasmine": "^5.1.1",
     "@types/node": "^20.8.10",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
@@ -44,7 +44,7 @@
     "karma-jasmine": "^5.1.0",
     "karma-jasmine-html-reporter": "^2.1.0",
     "lodash-es": "^4.17.21",
-    "ng-packagr": "^17.3.0",
+    "ng-packagr": "^18.2.1",
     "reflect-metadata": "^0.2.2",
     "rxjs": "~7.8.0",
     "ts-node": "^10.9.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michalkotas/angular2-jsonapi",
-  "version": "17.0.0",
+  "version": "18.0.0",
   "description": "A lightweight Angular 2 adapter for JSON API",
   "repository": {
     "type": "git",
@@ -27,8 +27,8 @@
     "tslib": "^2.8.0"
   },
   "peerDependencies": {
-    "@angular/common": "^17.3.12",
-    "@angular/core": "^17.3.12",
+    "@angular/common": "^18.2.8",
+    "@angular/core": "^18.2.8",
     "reflect-metadata": "^0.2.2",
     "rxjs": "*"
   }

projects/angular2-jsonapi/package.json

@@ -3,23 +3,24 @@ import { parseISO } from 'date-fns/parseISO';
 import { Author } from '../../test/models/author.model';
 import { AUTHOR_ID, BOOK_PUBLISHED, BOOK_TITLE, CHAPTER_TITLE, getAuthorData, getIncludedBooks } from '../../test/fixtures/author.fixture';
 import { Book } from '../../test/models/book.model';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { Datastore } from '../../test/datastore.service';
 import { Chapter } from '../../test/models/chapter.model';
+import { provideHttpClient } from '@angular/common/http';
 
 describe('JsonApiModel', () => {
   let datastore: Datastore;
 
   beforeEach(() => {
 
     TestBed.configureTestingModule({
-      imports: [
-        HttpClientTestingModule,
-      ],
-      providers: [
-        Datastore
-      ]
-    });
+    imports: [],
+    providers: [
+        Datastore,
+        provideHttpClient(),
+        provideHttpClientTesting()
+    ]
+});
 
     datastore = TestBed.inject(Datastore);
   });

projects/angular2-jsonapi/src/models/json-api.model.spec.ts

@@ -21,6 +21,4 @@ export * from './interfaces/model-config.interface';
 export * from './interfaces/attribute-decorator-options.interface';
 export * from './interfaces/property-converter.interface';
 
-export * from './providers';
-
-export * from './module';
+export * from './services/json-api-datastore.service'

projects/angular2-jsonapi/src/module.ts

@@ -4,14 +4,14 @@ import { Author } from '../../test/models/author.model';
 import { Chapter } from '../../test/models/chapter.model';
 import { AUTHOR_API_VERSION, AUTHOR_MODEL_ENDPOINT_URL, CustomAuthor } from '../../test/models/custom-author.model';
 import { AUTHOR_BIRTH, AUTHOR_ID, AUTHOR_NAME, BOOK_TITLE, getAuthorData } from '../../test/fixtures/author.fixture';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { API_VERSION, BASE_URL, Datastore } from '../../test/datastore.service';
 import { ErrorResponse } from '../models/error-response.model';
 import { getSampleBook } from '../../test/fixtures/book.fixture';
 import { Book } from '../../test/models/book.model';
 import { CrimeBook } from '../../test/models/crime-book.model';
 import { API_VERSION_FROM_CONFIG, BASE_URL_FROM_CONFIG, DatastoreWithConfig } from '../../test/datastore-with-config.service';
-import { HttpHeaders } from '@angular/common/http';
+import { HttpHeaders, provideHttpClient } from '@angular/common/http';
 import { Thing } from '../../test/models/thing';
 import { getSampleThing } from '../../test/fixtures/thing.fixture';
 import { ModelConfig } from '../interfaces/model-config.interface';
@@ -32,14 +32,14 @@ describe('JsonApiDatastore', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [
-        HttpClientTestingModule,
-      ],
-      providers: [
+    imports: [],
+    providers: [
         Datastore,
         DatastoreWithConfig,
-      ]
-    });
+        provideHttpClient(),
+        provideHttpClientTesting(),
+    ]
+});
     datastore = TestBed.inject(Datastore);
     datastoreWithConfig = TestBed.inject(DatastoreWithConfig);
     httpMock = TestBed.inject(HttpTestingController);

projects/angular2-jsonapi/src/public-api.ts

@@ -23,14 +23,16 @@ export type ModelType<T extends JsonApiModel> = new(datastore: JsonApiDatastore,
  */
 const AttributeMetadataIndex: string = AttributeMetadata as any;
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class JsonApiDatastore {
 
   protected config: DatastoreConfig;
   private globalHeaders: HttpHeaders;
   private globalRequestOptions: object = {};
   private internalStore: { [type: string]: { [id: string]: JsonApiModel } } = {};
-  private toQueryString: (params: any) => string = this.datastoreConfig.overrides
+  private toQueryString: (params: Record<string, unknown>) => string = this.datastoreConfig.overrides
   && this.datastoreConfig.overrides.toQueryString ?
     this.datastoreConfig.overrides.toQueryString : this._toQueryString;
 
@@ -79,7 +81,7 @@ export class JsonApiDatastore {
    */
   query<T extends JsonApiModel>(
     modelType: ModelType<T>,
-    params?: any,
+    params?: Record<string, unknown>,
     headers?: HttpHeaders,
     customUrl?: string
   ): Observable<T[]> {
@@ -94,7 +96,7 @@ export class JsonApiDatastore {
 
   public findAll<T extends JsonApiModel>(
     modelType: ModelType<T>,
-    params?: any,
+    params?: Record<string, unknown>,
     headers?: HttpHeaders,
     customUrl?: string
   ): Observable<JsonApiQueryData<T>> {
@@ -111,7 +113,7 @@ export class JsonApiDatastore {
   public findRecord<T extends JsonApiModel>(
     modelType: ModelType<T>,
     id: string,
-    params?: any,
+    params?: Record<string, unknown>,
     headers?: HttpHeaders,
     customUrl?: string
   ): Observable<T> {
@@ -132,7 +134,7 @@ export class JsonApiDatastore {
   public saveRecord<T extends JsonApiModel>(
     attributesMetadata: any,
     model: T,
-    params?: any,
+    params?: Record<string, unknown>,
     headers?: HttpHeaders,
     customUrl?: string
   ): Observable<T> {
@@ -233,7 +235,7 @@ export class JsonApiDatastore {
 
   protected buildUrl<T extends JsonApiModel>(
     modelType: ModelType<T>,
-    params?: any,
+    params?: Record<string, unknown>,
     id?: string,
     customUrl?: string
   ): string {

projects/angular2-jsonapi/src/services/json-api-datastore.service.spec.ts

@@ -5,7 +5,7 @@
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
-    "downlevelIteration": true,
+    "esModuleInterop": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "es2020",