@intellegens/cornerstone-client 0.0.25 → 0.0.27

package/data/auth/dto/index.js

@@ -0,0 +1,4 @@
+export * from './ClaimDto';
+export * from './UserDto';
+export * from './UserInfoDto';
+export * from './RoleDto';

package/data/auth/index.d.ts

@@ -1,4 +1 @@
-export * from './Claim';
-export * from './Role';
-export * from './User';
-export * from './UserInfo';
+export * from './dto';

package/data/auth/index.js

@@ -1,4 +1 @@
-export * from './Claim';
-export * from './Role';
-export * from './User';
-export * from './UserInfo';
+export * from './dto';

package/data/index.d.ts

@@ -1,3 +1,2 @@
-export * from './_generated';
 export * from './auth';
 export * from './api';

package/data/index.js

@@ -1,3 +1,2 @@
-export * from './_generated';
 export * from './auth';
 export * from './api';

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@intellegens/cornerstone-client",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "main": "index.js",
   "type": "module",
   "scripts": {
     "clean": "node -e \"require('fs-extra').emptyDir('./dist');\"",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "npm run clean && npm run transpile-types && tsc && tsc-alias",
-    "demo": "npm run build && npx vite build && npx tsx ./demo",
-    "transpile-types": "cd ../utils/cli && npm run cli zod-gen -- --input '../../client/src/data/_jsonschema' --output '../../client/src/data/_generated'"
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage",
+    "build": "npm run clean && tsc && tsc-alias",
+    "demo": "npm run build && npx vite build && npx tsx ./demo"
   },
   "author": "",
   "license": "MIT",
@@ -16,19 +17,24 @@
   "devDependencies": {
     "@eslint/js": "^9.21.0",
     "@types/express": "^5.0.0",
+    "@types/jest": "^29.5.12",
     "@types/node": "^22.13.9",
     "eslint": "^9.21.0",
     "eslint-config-prettier": "^10.0.1",
     "express": "^4.21.2",
     "fs-extra": "^11.3.0",
     "globals": "^16.0.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "prettier": "^3.5.2",
+    "ts-jest": "^29.1.2",
     "tsc-alias": "^1.8.11",
     "typescript-eslint": "^8.26.0",
-    "vite": "^6.2.0",
+    "vite": "6.3.4",
     "zod": "^3.24.2"
   },
   "dependencies": {
-    "http-proxy-middleware": "^3.0.3"
+    "http-proxy-middleware": "^3.0.3",
+    "typescript": "^5.4.5"
   }
 }

package/services/api/ApiCrudControllerClient/index.d.ts

@@ -1,14 +1,21 @@
-import { ApiReadControllerClient } from '../..';
+import { ApiReadControllerClient } from '../ApiReadControllerClient';
 import { IIdentifiable } from '../../../data';
+import { IHttpService } from '../HttpService';
 /**
  * Generic API client for consuming any Cornerstone CrudController
  *
  * @export
- * @class ApiReadControllerClient
+ * @class ApiCrudControllerClient
  * @template TKey - Type of the entity key (e.g., number, string, GUID, etc.)
  * @template TDto - Data Transfer Object representing the entity
  */
 export declare class ApiCrudControllerClient<TKey, TDto extends IIdentifiable<TKey>> extends ApiReadControllerClient<TKey, TDto> {
+    /**
+     * Constructor
+     * @param baseControllerPath Base path to API controller
+     * @param httpService HTTP service implementation to use for requests
+     */
+    constructor(baseControllerPath: string, httpService?: IHttpService);
     /**
      * Creates a new entity.
      * @param dto - Insert request DTO

package/services/api/ApiCrudControllerClient/index.js

@@ -1,13 +1,23 @@
-import { apiInitializationService, ApiReadControllerClient } from '../..';
+import { apiInitializationService } from '../ApiInitializationService';
+import { ApiReadControllerClient } from '../ApiReadControllerClient';
+import { defaultHttpService } from '../HttpService';
 /**
  * Generic API client for consuming any Cornerstone CrudController
  *
  * @export
- * @class ApiReadControllerClient
+ * @class ApiCrudControllerClient
  * @template TKey - Type of the entity key (e.g., number, string, GUID, etc.)
  * @template TDto - Data Transfer Object representing the entity
  */
 export class ApiCrudControllerClient extends ApiReadControllerClient {
+    /**
+     * Constructor
+     * @param baseControllerPath Base path to API controller
+     * @param httpService HTTP service implementation to use for requests
+     */
+    constructor(baseControllerPath, httpService = defaultHttpService) {
+        super(baseControllerPath, httpService);
+    }
     /**
      * Creates a new entity.
      * @param dto - Insert request DTO
@@ -16,7 +26,7 @@ export class ApiCrudControllerClient extends ApiReadControllerClient {
     async create(dto) {
         try {
             const url = await apiInitializationService.getApiUrl(this.baseControllerPath, `/Create`);
-            const response = await fetch(url, {
+            const response = await this.httpService.request(url, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify(dto),
@@ -39,7 +49,7 @@ export class ApiCrudControllerClient extends ApiReadControllerClient {
     async update(id, dto) {
         try {
             const url = await apiInitializationService.getApiUrl(this.baseControllerPath, `/Update?id=${encodeURIComponent(String(id))}`);
-            const response = await fetch(url, {
+            const response = await this.httpService.request(url, {
                 method: 'PUT',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify(dto),
@@ -60,7 +70,7 @@ export class ApiCrudControllerClient extends ApiReadControllerClient {
     async delete(id) {
         try {
             const url = await apiInitializationService.getApiUrl(this.baseControllerPath, `/Delete?id=${encodeURIComponent(String(id))}`);
-            const response = await fetch(url, {
+            const response = await this.httpService.request(url, {
                 method: 'DELETE',
                 credentials: 'include',
             });

package/services/api/ApiInitializationService/index.d.ts

@@ -1,3 +1,4 @@
+import { IHttpService } from '../HttpService';
 /**
  * Central API configuration service, fetches and exposes Cornerstone API configuration
  *
@@ -12,9 +13,18 @@ export declare class ApiInitializationService {
      * - Starts detection of API base URL.
      *
      * @async
+     * @param httpService - HTTP service implementation to use for requests
      * @return {Promise<void>} Resolves when initialization is complete.
      */
-    initialize(): Promise<void>;
+    initialize({ httpService }?: {
+        httpService?: IHttpService;
+    }): Promise<void>;
+    private _httpService;
+    /**
+     * Gets configured HTTP service
+     * @returns
+     */
+    _getHttpService(): IHttpService;
     private _apiBaseUrlPromise;
     /**
      * If API base URL detection was completed

package/services/api/ApiInitializationService/index.js

@@ -1,3 +1,4 @@
+import { defaultHttpService } from '../HttpService';
 /**
  * Central API configuration service, fetches and exposes Cornerstone API configuration
  *
@@ -12,12 +13,26 @@ export class ApiInitializationService {
      * - Starts detection of API base URL.
      *
      * @async
+     * @param httpService - HTTP service implementation to use for requests
      * @return {Promise<void>} Resolves when initialization is complete.
      */
-    async initialize() {
+    async initialize({ httpService } = {}) {
+        // Store configuration
+        if (httpService !== undefined)
+            this._httpService = httpService;
         // (Pre)detect API base URL
         await this._getApiBaseUrl();
     }
+    // #region HTTP service
+    _httpService = defaultHttpService;
+    /**
+     * Gets configured HTTP service
+     * @returns
+     */
+    _getHttpService() {
+        return this._httpService;
+    }
+    // #endregion
     // #region API Base URL detection
     _apiBaseUrlPromise = undefined;
     /**
@@ -69,8 +84,8 @@ export class ApiInitializationService {
             this._apiBaseError = undefined;
             // Check CORNERSTONE-API-BASEURL header for API base URL
             try {
-                const currentUrlResponse = await fetch(window.location.href, { method: 'GET' });
-                const apiHeader = currentUrlResponse.headers.get('CORNERSTONE-API-BASEURL');
+                const currentUrlResponse = await this._httpService.request(window.location.href, { method: 'GET' });
+                const apiHeader = currentUrlResponse.headers['CORNERSTONE-API-BASEURL'] || currentUrlResponse.headers['cornerstone-api-baseurl'] || null;
                 if (apiHeader) {
                     this._apiBaseUrlDetected = true;
                     this._apiBaseUrlDetectionMethod = 'GET / Header:CORNERSTONE-API-BASEURL';
@@ -85,7 +100,7 @@ export class ApiInitializationService {
             }
             // Check ./websettings.json header for API base URL
             try {
-                const webSettingsResponse = await fetch('./websettings.json', { method: 'GET' });
+                const webSettingsResponse = await this._httpService.request('./websettings.json', { method: 'GET' });
                 if (webSettingsResponse.status === 404)
                     return (this._apiBaseUrl = undefined);
                 const webSettings = await webSettingsResponse.json();

package/services/api/ApiReadControllerClient/index.d.ts

@@ -1,4 +1,5 @@
-import { IIdentifiable, ReadSelectedDefinition } from '../../../data';
+import { IIdentifiable, ReadSelectedDefinitionDto } from '../../../data';
+import { IHttpService } from '../HttpService';
 /**
  * Generic API client for consuming any Cornerstone ReadController
  *
@@ -12,14 +13,20 @@ export declare class ApiReadControllerClient<TKey, TDto extends IIdentifiable<TK
     /**
      * Constructor
      * @param baseControllerPath Base path to API controller
+     * @param httpService HTTP service implementation to use for requests
      */
-    constructor(baseControllerPath: string);
+    constructor(baseControllerPath: string, httpService?: IHttpService);
+    private _httpService?;
+    /**
+     * Gets globally selected HTTP service
+     */
+    protected get httpService(): IHttpService;
     /**
      * Fetches selected entities based on a filter definition.
      * @param {any} definition - The filter definition object
      * @returns {Promise<TDto[]>} List of entities that match the selection criteria
      */
-    readSelected(definition: ReadSelectedDefinition): Promise<TDto[]>;
+    readSelected(definition: ReadSelectedDefinitionDto): Promise<TDto[]>;
     /**
      * Fetches a single entity by its ID.
      * @param {TKey} id - The ID of the entity

package/services/api/ApiReadControllerClient/index.js

@@ -1,4 +1,5 @@
-import { apiInitializationService } from '../..';
+import { apiInitializationService } from '../ApiInitializationService';
+import { defaultHttpService } from '../HttpService';
 /**
  * Generic API client for consuming any Cornerstone ReadController
  *
@@ -12,10 +13,22 @@ export class ApiReadControllerClient {
     /**
      * Constructor
      * @param baseControllerPath Base path to API controller
+     * @param httpService HTTP service implementation to use for requests
      */
-    constructor(baseControllerPath) {
+    constructor(baseControllerPath, httpService = defaultHttpService) {
         this.baseControllerPath = baseControllerPath;
+        this._httpService = httpService;
     }
+    // #region HTTP service
+    _httpService = undefined;
+    /**
+     * Gets globally selected HTTP service
+     */
+    get httpService() {
+        return this._httpService || apiInitializationService._getHttpService();
+    }
+    // #endregion
+    // #region API
     /**
      * Fetches selected entities based on a filter definition.
      * @param {any} definition - The filter definition object
@@ -24,7 +37,7 @@ export class ApiReadControllerClient {
     async readSelected(definition) {
         try {
             const url = await apiInitializationService.getApiUrl(this.baseControllerPath, `/ReadSelected`);
-            const response = await fetch(url, {
+            const response = await this.httpService.request(url, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify(definition),
@@ -46,7 +59,7 @@ export class ApiReadControllerClient {
     async readSingle(id) {
         try {
             const url = await apiInitializationService.getApiUrl(this.baseControllerPath, `/ReadSingle?id=${encodeURIComponent(String(id))}`);
-            const response = await fetch(url, { credentials: 'include' });
+            const response = await this.httpService.request(url, { method: 'GET', credentials: 'include' });
             if (!response.ok)
                 throw new Error('Failed to fetch single record');
             return response.json();
@@ -62,7 +75,7 @@ export class ApiReadControllerClient {
     async readAll() {
         try {
             const url = await apiInitializationService.getApiUrl(this.baseControllerPath, `/ReadAll`);
-            const response = await fetch(url, { credentials: 'include' });
+            const response = await this.httpService.request(url, { method: 'GET', credentials: 'include' });
             if (!response.ok)
                 throw new Error('Failed to fetch all records');
             return response.json();

package/services/api/HttpService/AngularHttpService.d.ts

@@ -0,0 +1,9 @@
+import { IHttpService, HttpRequestConfig, HttpResponse } from './index';
+/**
+ * Angular HttpClient-based HTTP service implementation
+ */
+export declare class AngularHttpService implements IHttpService {
+    private httpClient;
+    constructor(httpClient: any);
+    request<T = any>(url: string, config?: HttpRequestConfig): Promise<HttpResponse<T>>;
+}

package/services/api/HttpService/AngularHttpService.js

@@ -0,0 +1,86 @@
+// Ignore eslint any error in this file
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/**
+ * Angular HttpClient-based HTTP service implementation
+ */
+export class AngularHttpService {
+    httpClient;
+    constructor(httpClient) {
+        if (!httpClient) {
+            throw new Error('Angular HttpClient instance is required');
+        }
+        this.httpClient = httpClient;
+    }
+    async request(url, config) {
+        try {
+            const method = config?.method || 'GET';
+            const headers = config?.headers || {};
+            const body = config?.body;
+            const withCredentials = config?.credentials === 'include';
+            const options = {
+                headers,
+                withCredentials,
+                observe: 'response',
+                responseType: 'json',
+            };
+            let response;
+            switch (method.toUpperCase()) {
+                case 'GET':
+                    response = await this.httpClient.get(url, options).toPromise();
+                    break;
+                case 'POST':
+                    response = await this.httpClient.post(url, body ? JSON.parse(body) : null, options).toPromise();
+                    break;
+                case 'PUT':
+                    response = await this.httpClient.put(url, body ? JSON.parse(body) : null, options).toPromise();
+                    break;
+                case 'DELETE':
+                    response = await this.httpClient.delete(url, options).toPromise();
+                    break;
+                case 'PATCH':
+                    response = await this.httpClient.patch(url, body ? JSON.parse(body) : null, options).toPromise();
+                    break;
+                default:
+                    throw new Error(`Unsupported HTTP method: ${method}`);
+            }
+            // Convert Angular HttpResponse headers to plain object
+            const responseHeaders = {};
+            if (response.headers) {
+                response.headers.keys().forEach((key) => {
+                    responseHeaders[key] = response.headers.get(key);
+                });
+            }
+            return {
+                ok: response.status >= 200 && response.status < 300,
+                status: response.status,
+                statusText: response.statusText || 'OK',
+                headers: responseHeaders,
+                json: async () => response.body,
+                text: async () => (typeof response.body === 'string' ? response.body : JSON.stringify(response.body)),
+            };
+        }
+        catch (error) {
+            if (error.status !== undefined) {
+                // Angular HttpErrorResponse
+                const errorHeaders = {};
+                if (error.headers) {
+                    error.headers.keys().forEach((key) => {
+                        errorHeaders[key] = error.headers.get(key);
+                    });
+                }
+                return {
+                    ok: false,
+                    status: error.status,
+                    statusText: error.statusText || 'Error',
+                    headers: errorHeaders,
+                    json: async () => error.error,
+                    text: async () => (typeof error.error === 'string' ? error.error : JSON.stringify(error.error)),
+                };
+            }
+            else {
+                // Other errors
+                throw error;
+            }
+        }
+    }
+}

package/services/api/HttpService/AxiosHttpService.d.ts

@@ -0,0 +1,10 @@
+import { IHttpService, HttpRequestConfig, HttpResponse } from './index';
+/**
+ * Axios-based HTTP service implementation
+ * Note: This requires axios to be installed as a dependency
+ */
+export declare class AxiosHttpService implements IHttpService {
+    private readonly axios;
+    constructor(axiosInstance?: any);
+    request<T = any>(url: string, config?: HttpRequestConfig): Promise<HttpResponse<T>>;
+}

package/services/api/HttpService/AxiosHttpService.js

@@ -0,0 +1,53 @@
+// Ignore eslint any error in this file
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/**
+ * Axios-based HTTP service implementation
+ * Note: This requires axios to be installed as a dependency
+ */
+export class AxiosHttpService {
+    axios;
+    constructor(axiosInstance) {
+        if (!axiosInstance) {
+            throw new Error('Axios instance is required');
+        }
+        this.axios = axiosInstance;
+    }
+    async request(url, config) {
+        try {
+            const axiosConfig = {
+                url,
+                method: config?.method || 'GET',
+                headers: config?.headers,
+                data: config?.body,
+                withCredentials: config?.credentials === 'include',
+            };
+            const response = await this.axios(axiosConfig);
+            return {
+                ok: response.status >= 200 && response.status < 300,
+                status: response.status,
+                statusText: response.statusText,
+                headers: response.headers,
+                json: async () => response.data,
+                text: async () => (typeof response.data === 'string' ? response.data : JSON.stringify(response.data)),
+            };
+        }
+        catch (error) {
+            if (error.response) {
+                // The request was made and the server responded with a status code
+                // that falls out of the range of 2xx
+                return {
+                    ok: false,
+                    status: error.response.status,
+                    statusText: error.response.statusText,
+                    headers: error.response.headers,
+                    json: async () => error.response.data,
+                    text: async () => (typeof error.response.data === 'string' ? error.response.data : JSON.stringify(error.response.data)),
+                };
+            }
+            else {
+                // Something happened in setting up the request that triggered an Error
+                throw error;
+            }
+        }
+    }
+}

package/services/api/HttpService/FetchHttpService.d.ts

@@ -0,0 +1,7 @@
+import { HttpRequestConfig, HttpResponse, IHttpService } from '../../../services';
+/**
+ * Default HTTP service implementation using the Fetch API
+ */
+export declare class FetchHttpService implements IHttpService {
+    request<T = any>(url: string, config?: HttpRequestConfig): Promise<HttpResponse<T>>;
+}

package/services/api/HttpService/FetchHttpService.js

@@ -0,0 +1,28 @@
+// Ignore eslint any error in this file
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/**
+ * Default HTTP service implementation using the Fetch API
+ */
+export class FetchHttpService {
+    async request(url, config) {
+        const response = await fetch(url, {
+            method: config?.method || 'GET',
+            headers: config?.headers,
+            body: config?.body,
+            credentials: config?.credentials || 'include',
+        });
+        // Convert Headers to a plain object
+        const headers = {};
+        response.headers.forEach((value, key) => {
+            headers[key] = value;
+        });
+        return {
+            ok: response.ok,
+            status: response.status,
+            statusText: response.statusText,
+            headers,
+            json: () => response.json(),
+            text: () => response.text(),
+        };
+    }
+}

package/services/api/HttpService/HttpRequestConfig.d.ts

@@ -0,0 +1,9 @@
+/**
+ * HTTP request configuration interface
+ */
+export interface HttpRequestConfig {
+    method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
+    headers?: Record<string, string>;
+    body?: string;
+    credentials?: RequestCredentials;
+}

package/services/api/HttpService/HttpRequestConfig.js

@@ -0,0 +1 @@
+export {};

package/services/api/HttpService/HttpResponse.d.ts

@@ -0,0 +1,11 @@
+/**
+ * HTTP response interface
+ */
+export interface HttpResponse<T = any> {
+    ok: boolean;
+    status: number;
+    statusText: string;
+    headers: Record<string, string>;
+    json(): Promise<T>;
+    text(): Promise<string>;
+}

package/services/api/HttpService/HttpResponse.js

@@ -0,0 +1,3 @@
+// Ignore eslint any error in this file
+/* eslint-disable @typescript-eslint/no-explicit-any */
+export {};

package/services/api/HttpService/IHttpService.d.ts

@@ -0,0 +1,13 @@
+import { HttpRequestConfig, HttpResponse } from '../../../services';
+/**
+ * Abstract HTTP service interface that can be implemented by different HTTP clients
+ */
+export interface IHttpService {
+    /**
+     * Performs an HTTP request
+     * @param url - The URL to make the request to
+     * @param config - Request configuration
+     * @returns Promise that resolves to the HTTP response
+     */
+    request<T = any>(url: string, config?: HttpRequestConfig): Promise<HttpResponse<T>>;
+}

package/services/api/HttpService/IHttpService.js

@@ -0,0 +1,3 @@
+// Ignore eslint any error in this file
+/* eslint-disable @typescript-eslint/no-explicit-any */
+export {};

package/services/api/HttpService/index.d.ts

@@ -0,0 +1,11 @@
+import { FetchHttpService } from './FetchHttpService';
+/**
+ * Default HTTP service instance
+ */
+export declare const defaultHttpService: FetchHttpService;
+export * from './AxiosHttpService';
+export * from './AngularHttpService';
+export * from './FetchHttpService';
+export * from './HttpRequestConfig';
+export * from './HttpResponse';
+export * from './IHttpService';

package/services/api/HttpService/index.js

@@ -0,0 +1,12 @@
+import { FetchHttpService } from './FetchHttpService';
+/**
+ * Default HTTP service instance
+ */
+export const defaultHttpService = new FetchHttpService();
+// Export additional HTTP service implementations
+export * from './AxiosHttpService';
+export * from './AngularHttpService';
+export * from './FetchHttpService';
+export * from './HttpRequestConfig';
+export * from './HttpResponse';
+export * from './IHttpService';

package/services/api/UserManagementControllerClient/index.d.ts

@@ -1,5 +1,6 @@
-import { ApiCrudControllerClient } from '../..';
-import { User } from '../../../data';
+import { ApiCrudControllerClient } from '../ApiCrudControllerClient';
+import { IHttpService } from '../HttpService';
+import { UserDto } from '../../../data';
 /**
  * Client for user management operations
  *
@@ -8,7 +9,13 @@ import { User } from '../../../data';
  * @template TKey - Type of the entity key (e.g., number, string, GUID, etc.)
  * @template TUser - Data Transfer Object representing the user entity
  */
-export declare class UserManagementControllerClient<TKey, TUser extends User<TKey>> extends ApiCrudControllerClient<TKey, TUser> {
+export declare class UserManagementControllerClient<TKey, TUser extends UserDto<TKey>> extends ApiCrudControllerClient<TKey, TUser> {
+    /**
+     * Constructor
+     * @param baseControllerPath Base path to API controller
+     * @param httpService HTTP service implementation to use for requests
+     */
+    constructor(baseControllerPath: string, httpService?: IHttpService);
     /**
      * Gets the roles assigned to a user
      * @param id - The ID of the user