@rosoftlab/core 1.0.5-alpha-5 → 1.0.5-alpha-7

package/lib/auth/auth.service.d.ts

@@ -1,11 +1,16 @@
+import { HttpClient } from '@angular/common/http';
+import type { UserManagerSettings } from 'oidc-client-ts';
 import { UserManager } from 'oidc-client-ts';
+import { Observable } from 'rxjs';
 import * as i0 from "@angular/core";
 export declare class AuthService {
     private manager;
+    private http;
+    private guestSettings?;
     private _authNavStatusSource;
-    authNavStatus$: import("rxjs").Observable<boolean>;
+    authNavStatus$: Observable<boolean>;
     private user;
-    constructor(manager: UserManager);
+    constructor(manager: UserManager, http: HttpClient, guestSettings?: UserManagerSettings);
     login(): void;
     logout(): void;
     completeAuthentication(): Promise<void>;
@@ -24,6 +29,7 @@ export declare class AuthService {
     get organisationId(): string;
     get organisationName(): string;
     signout(): Promise<void>;
-    static ɵfac: i0.ɵɵFactoryDeclaration<AuthService, never>;
+    loginWithGuest(): Promise<void>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<AuthService, [null, null, { optional: true; }]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<AuthService>;
 }

package/lib/auth/provide-auth.d.ts

@@ -1,3 +1,3 @@
 import { Provider } from '@angular/core';
 import type { UserManagerSettings } from 'oidc-client-ts';
-export declare function provideAuth(settings: UserManagerSettings): Provider[];
+export declare function provideAuth(settings: UserManagerSettings, guest_settings?: UserManagerSettings): Provider[];

package/lib/auth/tokens.d.ts

@@ -3,3 +3,4 @@ export declare class Tokens {
 import { InjectionToken } from '@angular/core';
 import type { UserManagerSettings } from 'oidc-client-ts';
 export declare const OIDC_CLIENT_SETTINGS: InjectionToken<UserManagerSettings>;
+export declare const OIDC_GUEST_CLIENT_SETTINGS: InjectionToken<UserManagerSettings>;

package/lib/base-components/base-crud-implementation.d.ts

@@ -9,8 +9,8 @@ export declare abstract class BaseCrudImplementation<T = any> {
     protected route: ActivatedRoute;
     protected translate: TranslateService;
     protected location: Location;
-    protected modelService: import("@rosoftlab/core").BaseService<import("@rosoftlab/core").BaseModel>;
-    protected modelToken: import("@angular/core").Type<import("@rosoftlab/core").BaseModel>;
+    protected modelService: import("@rosoftlab/core").BaseService<import("@rosoftlab/core").BaseModel<string>>;
+    protected modelToken: import("@angular/core").Type<import("@rosoftlab/core").BaseModel<string>>;
     protected dialogService: import("../interfaces/dialog.interface").IDialogService;
     model: T | null;
     modelName: string | null;

package/lib/base-components/base-table-implementation.d.ts

@@ -6,8 +6,8 @@ import * as i0 from "@angular/core";
 export declare abstract class BaseTableImplementation<T = any, TEditArgs = any, TRemoveArgs = any> implements OnInit {
     protected router: Router;
     protected translate: TranslateService;
-    protected dataService: import("@rosoftlab/core").BaseService<import("@rosoftlab/core").BaseModel>;
-    protected modelToken: import("@angular/core").Type<import("@rosoftlab/core").BaseModel>;
+    protected dataService: import("@rosoftlab/core").BaseService<import("@rosoftlab/core").BaseModel<string>>;
+    protected modelToken: import("@angular/core").Type<import("@rosoftlab/core").BaseModel<string>>;
     protected dialogService: import("../interfaces/dialog.interface").IDialogService;
     basePath: string;
     title: string;

package/lib/index.d.ts

@@ -10,6 +10,7 @@ export * from './interfaces/datastore-config.interface';
 export * from './interfaces/model-config.interface';
 export * from './interfaces/overrides.interface';
 export * from './interfaces/property-converter.interface';
+export * from './services/datastore-port';
 export * from './models/base-meta.model';
 export * from './models/base-query-data';
 export * from './models/base.model';
@@ -24,3 +25,4 @@ export * from './rsl-base-module';
 export * from './services/base.service';
 export * from './services/local-file.service';
 export * from './validators/pattern-validator';
+export * from './tokens/datastore-token';

package/lib/models/base.model.d.ts

@@ -1,17 +1,11 @@
-import { HttpHeaders } from '@angular/common/http';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
-import { Observable } from 'rxjs';
 import { ModelConfig } from '../interfaces/model-config.interface';
-import { BaseDatastore, ModelType } from '../services/base-datastore.service';
-export declare class BaseModel {
-    protected _datastore: BaseDatastore;
+import type { ModelType } from '../services/datastore-port';
+export declare class BaseModel<TId = string> {
     highlighted: boolean;
-    id: any;
+    id: TId;
     [key: string]: any;
-    constructor(_datastore: BaseDatastore, data?: any);
-    save(params?: any, headers?: HttpHeaders, customUrl?: string, customBody?: any): Observable<this>;
-    patch(origModel: this, params?: any, headers?: HttpHeaders, customUrl?: string): Observable<this>;
-    replace(params?: any, headers?: HttpHeaders, customUrl?: string, customBody?: any): Observable<this>;
+    constructor(data?: any);
     get attributeMetadata(): any;
     set attributeMetadata(val: any);
     get hasDirtyAttributes(): boolean;
@@ -19,13 +13,12 @@ export declare class BaseModel {
     get modelConfig(): ModelConfig;
     protected deserializeModel<T extends BaseModel>(modelType: ModelType<T>, data: any): T;
     protected transformSerializedNamesToPropertyNames<T extends BaseModel>(modelType: ModelType<T>, attributes: any): any;
-    getModelPropertyNames(model: BaseModel): any;
-    getModelRequiredPropertyNames(model: BaseModel): any;
-    getModelDefaultPropertyValues(model: BaseModel): any;
-    getModelSubGroupPropertyNames(model: BaseModel): any;
+    getModelPropertyNames(model: BaseModel<any>): any;
+    getModelRequiredPropertyNames(model: BaseModel<any>): any;
+    getModelDefaultPropertyValues(model: BaseModel<any>): any;
+    getModelSubGroupPropertyNames(model: BaseModel<any>): any;
     getFromGroup(fb: UntypedFormBuilder): UntypedFormGroup;
     private getSubFromGroup;
-    getModelFromFormGroup(formGroup: UntypedFormGroup, id?: any): void;
-    getSerializedModel(): any;
+    getModelFromFormGroup(formGroup: UntypedFormGroup, id?: TId): void;
     getCellClass(property: string): string;
 }

package/lib/models/employee.d.ts

@@ -1,6 +1,5 @@
 import { BaseModel } from "./base.model";
 export declare class Employee extends BaseModel {
-    id: string;
     userName: string;
     firstName: string;
     lastName: string;

package/lib/models/menu.d.ts

@@ -1,6 +1,5 @@
 import { BaseModel } from "./base.model";
 export declare class Menu extends BaseModel {
-    id: string;
     header?: string;
     icon?: string;
     link?: string;

package/lib/models/metadata-storage.d.ts

@@ -1,5 +1,6 @@
 export declare class MetadataStorage {
     private static metadataMap;
     static getMetadata(key: string, target: object, propertyKey?: string): any;
+    static getMergedMetadata(key: string, target: object): any;
     static setMetadata(key: string, value: any, target: object, propertyKey?: string): void;
 }

package/lib/models/right.d.ts

@@ -1,6 +1,5 @@
 import { BaseModel } from "./base.model";
 export declare class Right extends BaseModel {
-    id: string;
     name: string;
     rightKey: string;
     pagePath: string;

package/lib/models/role.d.ts

@@ -1,6 +1,5 @@
 import { BaseModel } from './base.model';
 export declare class Role extends BaseModel {
-    id: string;
     name: string;
     roleDetail: any;
 }

package/lib/models/user.d.ts

@@ -1,6 +1,5 @@
 import { BaseModel } from "./base.model";
 export declare class User extends BaseModel {
-    id: string;
     firstName: string;
     lastName: string;
     email: string;

package/lib/services/base-datastore.service.d.ts

@@ -4,9 +4,9 @@ import { DatastoreConfig } from '../interfaces/datastore-config.interface';
 import { BaseQueryData } from '../models/base-query-data';
 import { BaseModel } from '../models/base.model';
 import { CacheService } from './cache.service';
+import type { DatastorePort, ModelType } from './datastore-port';
 import * as i0 from "@angular/core";
-export type ModelType<T extends BaseModel> = new (datastore: BaseDatastore, data: any) => T;
-export declare class BaseDatastore {
+export declare class BaseDatastore implements DatastorePort {
     protected httpClient: HttpClient;
     protected cacheService: CacheService;
     protected config: DatastoreConfig;
@@ -24,7 +24,7 @@ export declare class BaseDatastore {
     patchCustom<U, T extends BaseModel>(modelType: ModelType<T>, body: any, params?: any, headers?: HttpHeaders, customUrl?: string): Observable<U>;
     createRecord<T extends BaseModel>(modelType: ModelType<T>, data?: any): T;
     saveRecord<T extends BaseModel>(attributesMetadata: any, model: T, params?: any, headers?: HttpHeaders, customUrl?: string, customBody?: any): Observable<T>;
-    patchRecord<T extends BaseModel>(attributesMetadata: any, model: T, origModel: T, params?: any, headers?: HttpHeaders, customUrl?: string): Observable<T>;
+    patchRecord<T extends BaseModel>(attributesMetadata: any, model: T, origModel?: T, params?: any, headers?: HttpHeaders, customUrl?: string): Observable<T>;
     replaceRecord<T extends BaseModel>(attributesMetadata: any, model: T, params?: any, headers?: HttpHeaders, customUrl?: string, customBody?: any): Observable<T>;
     deleteRecord<T extends BaseModel>(modelType: ModelType<T>, id: string, headers?: HttpHeaders, customUrl?: string): Observable<{}>;
     buildUrl<T extends BaseModel>(modelType: ModelType<T>, customUrl?: string): string;
@@ -36,6 +36,7 @@ export declare class BaseDatastore {
     get datastoreConfig(): DatastoreConfig;
     protected transformSerializedNamesToPropertyNames<T extends BaseModel>(modelType: ModelType<T>, attributes: any): any;
     protected getModelPropertyNames(model: BaseModel): any;
+    protected getApiFieldMap<T extends BaseModel>(modelType: ModelType<T>): Record<string, string> | null;
     buildHeaders(customHeaders?: HttpHeaders): HttpHeaders;
     buildParams<T extends BaseModel>(modelType: ModelType<T>, params: any): HttpParams;
     protected entityToModel<T extends BaseModel>(res: any, modelType: ModelType<T>, model?: T): T;

package/lib/services/base.service.d.ts

@@ -3,12 +3,12 @@ import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { BaseQueryData } from '../models/base-query-data';
 import { BaseModel } from '../models/base.model';
-import { BaseDatastore, ModelType } from './base-datastore.service';
+import type { DatastorePort, ModelType } from './datastore-port';
 import * as i0 from "@angular/core";
 export declare class BaseService<T extends BaseModel> {
-    datastore: BaseDatastore;
+    datastore: DatastorePort;
     modelType: ModelType<T>;
-    constructor(datastore: BaseDatastore);
+    constructor(datastore: DatastorePort);
     setModelType(modelType: ModelType<T>): void;
     get(id?: any, customInclude?: string): Observable<T>;
     getAll(page: number, pageSize: number, sort?: string, filters?: string, customInclude?: string): Observable<BaseQueryData<T>>;
@@ -17,10 +17,11 @@ export declare class BaseService<T extends BaseModel> {
     postCustom<U>(body: any, params?: any, headers?: HttpHeaders, customUrl?: string): Observable<U>;
     patchCustom<U>(body: any, params?: any, headers?: HttpHeaders, customUrl?: string): Observable<U>;
     save(docTypeOrFormGroup: T | UntypedFormGroup, id?: any, origModel?: T): Observable<T>;
-    patch(docTypeOrFormGroup: T | UntypedFormGroup, origModel: T, id?: any): Observable<T>;
+    patch(docTypeOrFormGroup: T | UntypedFormGroup, origModel?: T, id?: any): Observable<T>;
     newModel(data?: any): T;
     toFormGroup(fb: UntypedFormBuilder, fromModel?: T): UntypedFormGroup;
     fromFormGroup(formGroup: UntypedFormGroup, id?: any): T;
+    serializeModel(model: T): any;
     getSelectValues(property: string): Observable<any[]>;
     static ɵfac: i0.ɵɵFactoryDeclaration<BaseService<any>, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<BaseService<any>>;

package/lib/services/datastore-port.d.ts

@@ -0,0 +1,19 @@
+import type { HttpHeaders } from '@angular/common/http';
+import type { Observable } from 'rxjs';
+import type { BaseQueryData } from '../models/base-query-data';
+import type { BaseModel } from '../models/base.model';
+export type ModelType<T extends BaseModel> = new (data: any) => T;
+export interface DatastorePort {
+    findAll<T extends BaseModel>(modelType: ModelType<T>, params?: any, headers?: HttpHeaders, customUrl?: string): Observable<BaseQueryData<T>>;
+    findRecord<T extends BaseModel>(modelType: ModelType<T>, id?: string, params?: any, headers?: HttpHeaders, customUrl?: string): Observable<T>;
+    getCustom<U, T extends BaseModel>(modelType: ModelType<T>, params?: any, headers?: HttpHeaders, customUrl?: string, customResponseType?: any): Observable<U>;
+    postCustom<U, T extends BaseModel>(modelType: ModelType<T>, body: any, params?: any, headers?: HttpHeaders, customUrl?: string): Observable<U>;
+    patchCustom<U, T extends BaseModel>(modelType: ModelType<T>, body: any, params?: any, headers?: HttpHeaders, customUrl?: string): Observable<U>;
+    createRecord<T extends BaseModel>(modelType: ModelType<T>, data?: any): T;
+    saveRecord<T extends BaseModel>(attributesMetadata: any, model: T, params?: any, headers?: HttpHeaders, customUrl?: string, customBody?: any): Observable<T>;
+    patchRecord<T extends BaseModel>(attributesMetadata: any, model: T, origModel?: T, params?: any, headers?: HttpHeaders, customUrl?: string): Observable<T>;
+    replaceRecord<T extends BaseModel>(attributesMetadata: any, model: T, params?: any, headers?: HttpHeaders, customUrl?: string, customBody?: any): Observable<T>;
+    deleteRecord<T extends BaseModel>(modelType: ModelType<T>, id: string, headers?: HttpHeaders, customUrl?: string): Observable<{}>;
+    buildUrl<T extends BaseModel>(modelType: ModelType<T>, customUrl?: string): string;
+    modelToEntity<T extends BaseModel>(model: T, attributesMetadata: any, allAttributes?: boolean): any;
+}

package/lib/services/employee.service.d.ts

@@ -1,9 +1,9 @@
-import { DatastoreCore } from '../core';
+import type { DatastorePort } from './datastore-port';
 import { Employee } from '../models';
 import { BaseService } from './base.service';
 import * as i0 from "@angular/core";
 export declare class EmployeeService extends BaseService<Employee> {
-    constructor(datastore: DatastoreCore);
+    constructor(datastore: DatastorePort);
     static ɵfac: i0.ɵɵFactoryDeclaration<EmployeeService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<EmployeeService>;
 }

package/lib/services/right.service.d.ts

@@ -1,8 +1,9 @@
-import { DatastoreCore, Right } from '../core';
+import type { DatastorePort } from './datastore-port';
+import { Right } from '../core';
 import { BaseService } from './base.service';
 import * as i0 from "@angular/core";
 export declare class RightService extends BaseService<Right> {
-    constructor(datastore: DatastoreCore);
+    constructor(datastore: DatastorePort);
     static ɵfac: i0.ɵɵFactoryDeclaration<RightService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<RightService>;
 }

package/lib/services/role.service.d.ts

@@ -1,10 +1,11 @@
 import { Observable } from 'rxjs';
-import { DatastoreCore, Right } from '../core';
+import type { DatastorePort } from './datastore-port';
+import { Right } from '../core';
 import { Role } from '../models/role';
 import { BaseService } from './base.service';
 import * as i0 from "@angular/core";
 export declare class RoleService extends BaseService<Role> {
-    constructor(datastore: DatastoreCore);
+    constructor(datastore: DatastorePort);
     getRoleRights(roleId: string): Observable<Right[]>;
     static ɵfac: i0.ɵɵFactoryDeclaration<RoleService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<RoleService>;

package/lib/services/user.service.d.ts

@@ -1,9 +1,10 @@
 import { Observable } from 'rxjs';
-import { BaseQueryData, BaseService, DatastoreCore, Menu, Right, User } from '../core';
+import { BaseQueryData, BaseService, Menu, Right, User } from '../core';
+import type { DatastorePort } from './datastore-port';
 import * as i0 from "@angular/core";
 export declare class UserService extends BaseService<User> {
     userRights: Right[];
-    constructor(datastore: DatastoreCore);
+    constructor(datastore: DatastorePort);
     getRights(): Observable<BaseQueryData<Right>>;
     hasRightForLink(link: string): boolean;
     getMenus(): Observable<BaseQueryData<Menu>>;

package/lib/tokens/datastore-token.d.ts

@@ -0,0 +1,3 @@
+import { InjectionToken } from '@angular/core';
+import type { DatastorePort } from '../services/datastore-port';
+export declare const DATASTORE_PORT: InjectionToken<DatastorePort>;

package/lib/tokens/dynamic-form-tokens.d.ts

@@ -1,6 +1,6 @@
 import { InjectionToken, Type } from '@angular/core';
 import { BaseModel } from '../models/base.model';
 import { BaseService } from '../services/base.service';
-export declare const MODEL_SERVICE: InjectionToken<BaseService<BaseModel>>;
-export declare const MODEL_TOKEN: InjectionToken<Type<BaseModel>>;
+export declare const MODEL_SERVICE: InjectionToken<BaseService<BaseModel<string>>>;
+export declare const MODEL_TOKEN: InjectionToken<Type<BaseModel<string>>>;
 export declare const RSL_FORM_IMPLEMENTATIONS_TOKEN: InjectionToken<Record<string, Type<any>>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rosoftlab/core",
-  "version": "1.0.5-alpha-5",
+  "version": "1.0.5-alpha-7",
   "peerDependencies": {
     "@angular/common": "^19.2.8",
     "@angular/core": "^19.2.8",