@hahnpro/hpc-api 3.2.0 → 3.4.0

package/dist/api-base.d.ts

@@ -0,0 +1,6 @@
+import { HttpClient } from './http.service';
+export declare class APIBase {
+    protected readonly httpClient: HttpClient;
+    protected readonly basePath: string;
+    constructor(httpClient: HttpClient, basePath: string);
+}

package/dist/api-base.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.APIBase = void 0;
+class APIBase {
+    constructor(httpClient, basePath) {
+        this.httpClient = httpClient;
+        this.basePath = basePath;
+    }
+}
+exports.APIBase = APIBase;

package/dist/api.js

@@ -20,7 +20,7 @@ const flow_deployment_service_1 = require("./flow-deployment.service");
 const label_service_1 = require("./label.service");
 class API {
     constructor() {
-        const normalizePath = (value = '', defaultValue = '') => value.replace(/^\/+|\/+$/g, '') || defaultValue;
+        const normalizePath = (value = '', defaultValue = '') => value.replace(/(?:^\/+)|(?:\/+$)/g, '') || defaultValue;
         let apiBaseUrl = process.env.API_BASE_URL || 'https://testing.hahnpro.com';
         if (!apiBaseUrl.startsWith('https') && !apiBaseUrl.startsWith('http')) {
             console.info('no protocol specified - using HTTPS');

package/dist/asset.interface.d.ts

@@ -15,6 +15,7 @@ export interface AssetType {
     updatedAt?: string;
     author?: string;
     revision?: number;
+    deletedAt?: string;
 }
 export declare type AssetTypeRevision = AssetType & {
     originalId: string;

package/dist/asset.service.d.ts

@@ -1,17 +1,16 @@
 import FormData from 'form-data';
+import { APIBase } from './api-base';
 import { Asset, AssetRevision } from './asset.interface';
 import { Paginated, RequestParameter } from './data.interface';
 import { DataService } from './data.service';
 import { HttpClient } from './http.service';
-export declare class AssetService extends DataService<Asset> {
+import { TrashService } from './trash.service';
+interface BaseService extends DataService<Asset>, TrashService<Asset> {
+}
+declare class BaseService extends APIBase {
+}
+export declare class AssetService extends BaseService {
     constructor(httpClient: HttpClient);
-    paperBinRestoreAll(): Promise<Asset[]>;
-    paperBinRestoreOne(id: string): Promise<Asset>;
-    emptyTrash(offset: number): Promise<{
-        acknowledged: boolean;
-        deletedCount: number;
-    }>;
-    getPaperBin(params?: RequestParameter): Promise<Paginated<Asset[]>>;
     deleteOne(id: string, force?: boolean): Promise<any>;
     addAttachment: (id: string, form: FormData) => Promise<Asset>;
     getChildren(assetId: string, params?: RequestParameter): Promise<Paginated<Asset[]>>;
@@ -19,3 +18,4 @@ export declare class AssetService extends DataService<Asset> {
     rollback(assetId: string, revisionId: string): Promise<Asset>;
     deleteRevision(assetId: string, revisionId: string): Promise<any>;
 }
+export {};

package/dist/asset.service.js

@@ -1,8 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetService = void 0;
+const tslib_1 = require("tslib");
+const ts_mixer_1 = require("ts-mixer");
+const api_base_1 = require("./api-base");
 const data_service_1 = require("./data.service");
-class AssetService extends data_service_1.DataService {
+const trash_service_1 = require("./trash.service");
+let BaseService = class BaseService extends api_base_1.APIBase {
+};
+BaseService = tslib_1.__decorate([
+    (0, ts_mixer_1.mix)(data_service_1.DataService, trash_service_1.TrashService)
+], BaseService);
+class AssetService extends BaseService {
     constructor(httpClient) {
         super(httpClient, '/assets');
         this.addAttachment = (id, form) => {
@@ -14,20 +23,6 @@ class AssetService extends data_service_1.DataService {
             });
         };
     }
-    paperBinRestoreAll() {
-        return this.httpClient.put(`${this.basePath}/paperbin/restore`, {});
-    }
-    paperBinRestoreOne(id) {
-        return this.httpClient.put(`${this.basePath}/paperbin/restore/${id}`, {});
-    }
-    emptyTrash(offset) {
-        return this.httpClient.delete(`${this.basePath}/paperbin/clean`, { params: { offset } });
-    }
-    getPaperBin(params = {}) {
-        params.limit = params.limit || 0;
-        params.page = params.page || 1;
-        return this.httpClient.get(`${this.basePath}/paperbin`, { params });
-    }
     deleteOne(id, force = false) {
         return this.httpClient.delete(`${this.basePath}/${id}`, { params: { force } });
     }

package/dist/assettypes.service.d.ts

@@ -1,10 +1,17 @@
+import { APIBase } from './api-base';
 import { AssetType } from './asset.interface';
+import { Paginated } from './data.interface';
 import { DataService } from './data.service';
 import { HttpClient } from './http.service';
-import { Paginated } from './data.interface';
-export declare class AssetTypesService extends DataService<AssetType> {
+import { TrashService } from './trash.service';
+interface BaseService extends DataService<AssetType>, TrashService<AssetType> {
+}
+declare class BaseService extends APIBase {
+}
+export declare class AssetTypesService extends BaseService {
     constructor(httpClient: HttpClient);
     getRevisions(id: string): Promise<Paginated<AssetType[]>>;
     rollback(id: string, revisionId: string): Promise<AssetType>;
     deleteRevision(id: string, revisionId: string): Promise<any>;
 }
+export {};

package/dist/assettypes.service.js

@@ -1,8 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetTypesService = void 0;
+const tslib_1 = require("tslib");
+const ts_mixer_1 = require("ts-mixer");
+const api_base_1 = require("./api-base");
 const data_service_1 = require("./data.service");
-class AssetTypesService extends data_service_1.DataService {
+const trash_service_1 = require("./trash.service");
+let BaseService = class BaseService extends api_base_1.APIBase {
+};
+BaseService = tslib_1.__decorate([
+    (0, ts_mixer_1.mix)(data_service_1.DataService, trash_service_1.TrashService)
+], BaseService);
+class AssetTypesService extends BaseService {
     constructor(httpClient) {
         super(httpClient, '/assettypes');
     }

package/dist/content.interface.d.ts

@@ -12,6 +12,7 @@ export interface Content {
     files?: Storage[];
     createdAt?: string;
     updatedAt?: string;
+    deletedAt?: string;
 }
 export declare enum ReturnType {
     TEXT = 0,

package/dist/content.service.d.ts

@@ -1,11 +1,17 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import FormData from 'form-data';
+import { Readable } from 'stream';
+import { APIBase } from './api-base';
 import { Content, ReturnType } from './content.interface';
 import { DataService } from './data.service';
 import { HttpClient } from './http.service';
-import { Readable } from 'stream';
-export declare class ContentService extends DataService<Content> {
+import { TrashService } from './trash.service';
+interface BaseService extends DataService<Content>, TrashService<Content> {
+}
+declare class BaseService extends APIBase {
+}
+export declare class ContentService extends BaseService {
     constructor(httpClient: HttpClient);
     upload: (form: FormData) => Promise<Content>;
     download(id: string, raw?: boolean): Promise<Blob | ArrayBuffer>;
@@ -16,3 +22,4 @@ export declare class ContentService extends DataService<Content> {
     download(id: string, returnType: ReturnType.ARRAYBUFFER): Promise<ArrayBuffer>;
     download(id: string, returnType: ReturnType.NODESTREAM): Promise<Readable>;
 }
+export {};

package/dist/content.service.js

@@ -1,9 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContentService = void 0;
+const tslib_1 = require("tslib");
+const ts_mixer_1 = require("ts-mixer");
+const api_base_1 = require("./api-base");
 const content_interface_1 = require("./content.interface");
 const data_service_1 = require("./data.service");
-class ContentService extends data_service_1.DataService {
+const trash_service_1 = require("./trash.service");
+let BaseService = class BaseService extends api_base_1.APIBase {
+};
+BaseService = tslib_1.__decorate([
+    (0, ts_mixer_1.mix)(data_service_1.DataService, trash_service_1.TrashService)
+], BaseService);
+class ContentService extends BaseService {
     constructor(httpClient) {
         super(httpClient, '/contents');
         this.upload = (form) => {

package/dist/data.service.d.ts

@@ -1,15 +1,12 @@
+import { APIBase } from './api-base';
 import { DataInterface, Filter, Paginated, RequestParameter } from './data.interface';
-import { HttpClient } from './http.service';
-export declare class DataService<T> implements DataInterface<T> {
-    protected readonly httpClient: HttpClient;
-    protected readonly basePath: any;
-    constructor(httpClient: HttpClient, basePath: any);
+export declare class DataService<T> extends APIBase implements DataInterface<T> {
     addOne(dto: any): Promise<T>;
     addMany(dto: any[]): Promise<T[]>;
     getOne(id: string, options?: any): Promise<T>;
     getMany(params?: RequestParameter): Promise<Paginated<T[]>>;
     getManyFiltered(filter: Filter, params?: RequestParameter): Promise<Paginated<T[]>>;
     updateOne(id: string, dto: any): Promise<T>;
-    deleteOne(id: string): Promise<any>;
-    protected getFilterString(filter: Filter): string;
+    deleteOne(id: string, force?: boolean): Promise<any>;
+    private getFilterString;
 }

package/dist/data.service.js

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataService = void 0;
-class DataService {
-    constructor(httpClient, basePath) {
-        this.httpClient = httpClient;
-        this.basePath = basePath;
-    }
+const api_base_1 = require("./api-base");
+class DataService extends api_base_1.APIBase {
     addOne(dto) {
         return this.httpClient.post(this.basePath, dto);
     }
@@ -28,8 +25,8 @@ class DataService {
     updateOne(id, dto) {
         return this.httpClient.put(`${this.basePath}/${id}`, dto);
     }
-    deleteOne(id) {
-        return this.httpClient.delete(`${this.basePath}/${id}`);
+    deleteOne(id, force = false) {
+        return this.httpClient.delete(`${this.basePath}/${id}`, { params: { force } });
     }
     getFilterString(filter) {
         const { parent, tags, type } = filter;

package/dist/events.interface.d.ts

@@ -13,4 +13,6 @@ export interface Event {
     cause: string;
     level: string;
     group?: string;
+    createdAt?: string;
+    updatedAt?: string;
 }

package/dist/flow-deployment.service.d.ts

@@ -1,8 +1,14 @@
+import { APIBase } from './api-base';
 import { DataService } from './data.service';
 import { FlowDeployment, FlowDeploymentMetrics, FlowDeploymentStatistic, FlowLog } from './flow-deployment.interface';
 import { HttpClient } from './http.service';
 import { ResourceReference } from './resource.interface';
-export declare class FlowDeploymentService extends DataService<FlowDeployment> {
+import { TrashService } from './trash.service';
+interface BaseService extends DataService<FlowDeployment>, TrashService<FlowDeployment> {
+}
+declare class BaseService extends APIBase {
+}
+export declare class FlowDeploymentService extends BaseService {
     constructor(httpClient: HttpClient);
     addMany(dto: any[]): Promise<FlowDeployment[]>;
     updateOne(id: string, dto: any, force?: boolean): Promise<FlowDeployment>;
@@ -24,3 +30,4 @@ export declare class FlowDeploymentService extends DataService<FlowDeployment> {
     subscribeToStatus(id: string, listener: (event: MessageEvent<any>) => void, errorListener?: (event: MessageEvent) => void): Promise<string>;
     subscribeToLogs(id: string, listener: (event: MessageEvent<any>) => void, errorListener?: (event: MessageEvent) => void): Promise<string>;
 }
+export {};

package/dist/flow-deployment.service.js

@@ -1,8 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlowDeploymentService = void 0;
+const tslib_1 = require("tslib");
+const ts_mixer_1 = require("ts-mixer");
+const api_base_1 = require("./api-base");
 const data_service_1 = require("./data.service");
-class FlowDeploymentService extends data_service_1.DataService {
+const trash_service_1 = require("./trash.service");
+let BaseService = class BaseService extends api_base_1.APIBase {
+};
+BaseService = tslib_1.__decorate([
+    (0, ts_mixer_1.mix)(data_service_1.DataService, trash_service_1.TrashService)
+], BaseService);
+class FlowDeploymentService extends BaseService {
     constructor(httpClient) {
         super(httpClient, '/flow/deployments');
     }

package/dist/flow.interface.d.ts

@@ -24,5 +24,5 @@ export interface FlowDiagram {
     author: string;
     createdAt?: Date | string;
     updatedAt?: Date | string;
-    deleteddAt?: Date | string;
+    deletedAt?: Date | string;
 }

package/dist/flow.service.d.ts

@@ -1,9 +1,15 @@
+import { APIBase } from './api-base';
+import { Paginated, RequestParameter } from './data.interface';
 import { DataService } from './data.service';
 import { FlowDiagram, FlowDto } from './flow.interface';
-import { HttpClient } from './http.service';
-import { Paginated, RequestParameter } from './data.interface';
 import { FlowDeployment } from './flow-deployment.interface';
-export declare class FlowService extends DataService<FlowDto> {
+import { HttpClient } from './http.service';
+import { TrashService } from './trash.service';
+interface BaseService extends DataService<FlowDto>, TrashService<FlowDto> {
+}
+declare class BaseService extends APIBase {
+}
+export declare class FlowService extends BaseService {
     constructor(httpClient: HttpClient);
     addMany(dto: any[]): Promise<FlowDto[]>;
     getMany(params?: RequestParameter): Promise<Paginated<FlowDto[]>>;
@@ -15,3 +21,4 @@ export declare class FlowService extends DataService<FlowDto> {
     rollback(id: string, revisionId: string): Promise<FlowDto>;
     deleteRevision(id: string, revisionId: string): Promise<any>;
 }
+export {};

package/dist/flow.service.js

@@ -1,8 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlowService = void 0;
+const tslib_1 = require("tslib");
+const ts_mixer_1 = require("ts-mixer");
+const api_base_1 = require("./api-base");
 const data_service_1 = require("./data.service");
-class FlowService extends data_service_1.DataService {
+const trash_service_1 = require("./trash.service");
+let BaseService = class BaseService extends api_base_1.APIBase {
+};
+BaseService = tslib_1.__decorate([
+    (0, ts_mixer_1.mix)(data_service_1.DataService, trash_service_1.TrashService)
+], BaseService);
+class FlowService extends BaseService {
     constructor(httpClient) {
         super(httpClient, '/flows');
     }
@@ -28,7 +37,7 @@ class FlowService extends data_service_1.DataService {
         const flowId = typeof depl.flow === 'string' ? depl.flow : depl.flow.id;
         const diagramId = typeof depl.diagram === 'string' ? depl.diagram : depl.diagram.id;
         const revisions = await this.getDiagramRevisions(flowId);
-        return revisions.reverse()[0].id === diagramId;
+        return revisions[revisions.length - 1].id === diagramId;
     }
     getRevisions(id) {
         return this.httpClient.get(`${this.basePath}/${id}/revisions`);

package/dist/http.service.d.ts

@@ -1,17 +1,21 @@
 import { AxiosRequestConfig } from 'axios';
 import EventSource from 'eventsource';
 export declare class HttpClient {
-    private baseURL;
+    private readonly baseURL;
+    private readonly authbaseURL;
     private readonly realm;
-    private readonly client;
-    private readonly secret;
+    private readonly clientId;
+    private readonly clientSecret;
     private readonly axiosInstance;
-    private readonly authAxiosInstance;
     private readonly requestQueue;
-    private accessToken;
-    private accessTokenExpiration;
-    eventSourcesMap: Map<string, EventSource>;
-    constructor(baseURL: string, authbaseURL: string, realm: string, client: string, secret: string);
+    private client;
+    private tokenSet;
+    eventSourcesMap: Map<string, {
+        eventSource: EventSource;
+        listener: (event: MessageEvent) => void;
+        errListener: (event: MessageEvent) => void;
+    }>;
+    constructor(baseURL: string, authbaseURL: string, realm: string, clientId: string, clientSecret: string);
     getQueueStats: () => {
         peak: number;
         pending: number;
@@ -27,6 +31,4 @@ export declare class HttpClient {
     destroyEventSource(id: string): void;
     destroyAllEventSources(): void;
     getAccessToken: () => Promise<string>;
-    private isTokenValid;
-    private getToken;
 }

package/dist/http.service.js

@@ -4,16 +4,17 @@ exports.HttpClient = void 0;
 const tslib_1 = require("tslib");
 const axios_1 = tslib_1.__importDefault(require("axios"));
 const eventsource_1 = tslib_1.__importDefault(require("eventsource"));
+const openid_client_1 = require("openid-client");
 const Queue_1 = require("./Queue");
 const crypto_1 = require("crypto");
-const EXPIRATION_BUFFER = 30 * 1000;
+const TOKEN_EXPIRATION_BUFFER = 30;
 class HttpClient {
-    constructor(baseURL, authbaseURL, realm, client, secret) {
+    constructor(baseURL, authbaseURL, realm, clientId, clientSecret) {
         this.baseURL = baseURL;
+        this.authbaseURL = authbaseURL;
         this.realm = realm;
-        this.client = client;
-        this.secret = secret;
-        this.accessTokenExpiration = 0;
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
         this.eventSourcesMap = new Map();
         this.getQueueStats = () => { var _a; return (_a = this.requestQueue) === null || _a === void 0 ? void 0 : _a.getStats(); };
         this.delete = (url, config) => this.request('DELETE', url, config);
@@ -31,60 +32,37 @@ class HttpClient {
                     .catch(reject);
             }));
         };
-        this.getAccessToken = () => {
-            if (this.isTokenValid()) {
-                return Promise.resolve(this.accessToken);
+        this.getAccessToken = async () => {
+            var _a;
+            if (!((_a = this.client) === null || _a === void 0 ? void 0 : _a.issuer)) {
+                const authIssuer = await openid_client_1.Issuer.discover(`${this.authbaseURL}/auth/realms/${this.realm}/`);
+                this.client = await new authIssuer.Client({
+                    client_id: this.clientId,
+                    client_secret: this.clientSecret,
+                    token_endpoint_auth_method: 'client_secret_jwt',
+                });
             }
-            else {
-                return this.getToken();
+            if (!this.tokenSet || this.tokenSet.expired() || this.tokenSet.expires_at < Date.now() / 1000 + TOKEN_EXPIRATION_BUFFER) {
+                this.tokenSet = await this.client.grant({ grant_type: 'client_credentials' });
             }
-        };
-        this.isTokenValid = () => {
-            if (this.accessToken && this.accessTokenExpiration) {
-                return Date.now() + EXPIRATION_BUFFER < this.accessTokenExpiration;
-            }
-            return false;
-        };
-        this.getToken = () => {
-            return new Promise((resolve, reject) => {
-                const params = new URLSearchParams([
-                    ['client_id', this.client],
-                    ['client_secret', this.secret],
-                    ['grant_type', 'client_credentials'],
-                ]);
-                const headers = { 'Content-Type': 'application/x-www-form-urlencoded' };
-                this.authAxiosInstance
-                    .post(`/realms/${this.realm}/protocol/openid-connect/token`, params.toString(), { headers })
-                    .then((res) => {
-                    var _a;
-                    if (((_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.access_token) && res.data.expires_in) {
-                        this.accessToken = res.data.access_token;
-                        this.accessTokenExpiration = Date.now() + res.data.expires_in * 1000;
-                        return resolve(res.data.access_token);
-                    }
-                    else {
-                        throw new Error('Invalid access token received');
-                    }
-                })
-                    .catch(reject);
-            });
+            return this.tokenSet.access_token;
         };
         this.axiosInstance = axios_1.default.create({ baseURL, timeout: 60000 });
-        this.authAxiosInstance = axios_1.default.create({ baseURL: authbaseURL || baseURL, timeout: 10000 });
         this.requestQueue = new Queue_1.Queue({ concurrency: 1, timeout: 70000, throwOnTimeout: true });
     }
     async addEventSource(url, listener, errorListener) {
         const id = (0, crypto_1.randomUUID)();
+        const errListener = errorListener
+            ? errorListener
+            : (event) => {
+                throw new Error(JSON.stringify(event, null, 2));
+            };
         const es = new eventsource_1.default(`${this.baseURL}${url}`, {
             headers: { authorization: 'Bearer ' + (await this.getAccessToken()) },
         });
         es.addEventListener('message', listener);
-        es.addEventListener('error', errorListener
-            ? errorListener
-            : (event) => {
-                throw new Error(JSON.stringify(event, null, 2));
-            });
-        this.eventSourcesMap.set(id, es);
+        es.addEventListener('error', errListener);
+        this.eventSourcesMap.set(id, { eventSource: es, listener, errListener });
         return id;
     }
     destroyEventSource(id) {
@@ -92,9 +70,9 @@ class HttpClient {
             return;
         }
         const es = this.eventSourcesMap.get(id);
-        es.close();
-        es.removeEventListener('message', () => { });
-        es.removeEventListener('error', () => { });
+        es.eventSource.close();
+        es.eventSource.removeEventListener('message', es.listener);
+        es.eventSource.removeEventListener('error', es.errListener);
         this.eventSourcesMap.delete(id);
     }
     destroyAllEventSources() {

package/dist/mock/api-base.mock.d.ts

@@ -0,0 +1,5 @@
+import { APIBase } from '../api-base';
+export declare class APIBaseMock<T> extends APIBase {
+    data: T[];
+    constructor(data?: T[]);
+}

package/dist/mock/api-base.mock.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.APIBaseMock = void 0;
+const api_base_1 = require("../api-base");
+class APIBaseMock extends api_base_1.APIBase {
+    constructor(data = []) {
+        super(null, null);
+        this.data = data;
+    }
+}
+exports.APIBaseMock = APIBaseMock;

package/dist/mock/asset.mock.service.d.ts

@@ -3,18 +3,17 @@ import { Asset, AssetRevision } from '../asset.interface';
 import { AssetService } from '../asset.service';
 import { Paginated, RequestParameter } from '../data.interface';
 import { MockAPI } from './api.mock';
+import { APIBaseMock } from './api-base.mock';
 import { DataMockService } from './data.mock.service';
-export declare class AssetMockService extends DataMockService<Asset> implements AssetService {
+import { TrashMockService } from './trash.mock.service';
+interface BaseService extends DataMockService<Asset>, TrashMockService<Asset> {
+}
+declare class BaseService extends APIBaseMock<Asset> {
+}
+export declare class AssetMockService extends BaseService implements AssetService {
     private api;
     private revisions;
     constructor(api: MockAPI, assets: Asset[], revisions: AssetRevision[]);
-    paperBinRestoreAll(): Promise<Asset[]>;
-    paperBinRestoreOne(id: string): Promise<Asset>;
-    emptyTrash(offset: number): Promise<{
-        acknowledged: boolean;
-        deletedCount: number;
-    }>;
-    getPaperBin(params?: RequestParameter): Promise<Paginated<Asset[]>>;
     private getAssets;
     addOne(dto: Asset): Promise<Asset>;
     deleteOne(assetId: string, force?: boolean): Promise<Asset>;
@@ -26,3 +25,4 @@ export declare class AssetMockService extends DataMockService<Asset> implements
     rollback(assetId: string, revisionId: string): Promise<Asset>;
     deleteRevision(assetId: string, revisionId: string): Promise<any>;
 }
+export {};

package/dist/mock/asset.mock.service.js

@@ -1,36 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetMockService = void 0;
+const tslib_1 = require("tslib");
+const ts_mixer_1 = require("ts-mixer");
+const api_base_mock_1 = require("./api-base.mock");
 const data_mock_service_1 = require("./data.mock.service");
-class AssetMockService extends data_mock_service_1.DataMockService {
+const trash_mock_service_1 = require("./trash.mock.service");
+let BaseService = class BaseService extends api_base_mock_1.APIBaseMock {
+};
+BaseService = tslib_1.__decorate([
+    (0, ts_mixer_1.mix)(data_mock_service_1.DataMockService, trash_mock_service_1.TrashMockService)
+], BaseService);
+class AssetMockService extends BaseService {
     constructor(api, assets, revisions) {
-        super();
+        super(assets);
         this.api = api;
         this.revisions = revisions;
-        this.data = assets;
-    }
-    paperBinRestoreAll() {
-        const deleted = this.data.filter((v) => v.deletedAt);
-        for (const asset of deleted) {
-            delete asset.deletedAt;
-        }
-        return Promise.resolve(deleted);
-    }
-    paperBinRestoreOne(id) {
-        const deleted = this.data.find((v) => v.id === id);
-        delete deleted.deletedAt;
-        return Promise.resolve(deleted);
-    }
-    emptyTrash(offset) {
-        const dateOffsSeconds = Math.round(new Date().getTime() / 1000) - offset;
-        const date = new Date(dateOffsSeconds * 1000);
-        const trash = this.data.filter((v) => new Date(v.deletedAt) < date);
-        trash.map((v) => this.deleteOne(v.id));
-        return Promise.resolve({ acknowledged: true, deletedCount: trash.length });
-    }
-    getPaperBin(params) {
-        const page = this.getAssets(params, true);
-        return Promise.resolve(page);
     }
     getAssets(params, deleted = false) {
         const data = this.data.filter((asset) => !!asset.deletedAt === deleted);

package/dist/mock/assetTypes.mock.service.d.ts

@@ -1,14 +1,22 @@
 import { AssetType, AssetTypeRevision } from '../asset.interface';
 import { AssetTypesService } from '../assettypes.service';
+import { Paginated, RequestParameter } from '../data.interface';
+import { APIBaseMock } from './api-base.mock';
 import { DataMockService } from './data.mock.service';
-import { Paginated } from '../data.interface';
-export declare class AssetTypesMockService extends DataMockService<AssetType> implements AssetTypesService {
+import { TrashMockService } from './trash.mock.service';
+interface BaseService extends DataMockService<AssetType>, TrashMockService<AssetType> {
+}
+declare class BaseService extends APIBaseMock<AssetType> {
+}
+export declare class AssetTypesMockService extends BaseService implements AssetTypesService {
     private revisions;
     constructor(assetTypes: AssetType[], revisions: AssetTypeRevision[]);
+    getMany(params?: RequestParameter): Promise<Paginated<AssetType[]>>;
     addOne(dto: AssetType): Promise<AssetType>;
-    deleteOne(id: string): Promise<any>;
+    deleteOne(id: string, force?: boolean): Promise<any>;
     updateOne(id: string, dto: AssetType): Promise<AssetType>;
     getRevisions(id: string): Promise<Paginated<AssetTypeRevision[]>>;
     rollback(id: string, revisionId: string): Promise<AssetType>;
     deleteRevision(assetId: string, revisionId: string): Promise<any>;
 }
+export {};