@azure-net/kit 0.6.2 → 0.6.5

package/dist/core/datasource/BaseDatasource.d.ts

@@ -1,30 +1,33 @@
 import { HttpService, HttpServiceResponse } from '../httpService/HttpService.js';
 import { QueryBuilder } from '../query/index.js';
-export interface IHttpDatasource {
-    /**
-     * Executes a wrapped HTTP request and handles the response.
-     *
-     * @param callback - A function that receives the HttpService and QueryBuilder. Returns a Promise of a response.
-     * @returns A typed HTTP response wrapped in a Promise.
-     */
-    createRequest<T>(callback: <J = T>(params: {
+type ApplyWrapper<TWrapper, T, TDataKey extends keyof TWrapper> = TWrapper extends Record<TDataKey, unknown> ? Omit<TWrapper, TDataKey> & {
+    [K in TDataKey]: T;
+} : T;
+export interface IHttpDatasource<TWrapper = never, TDataKey extends keyof TWrapper = never> {
+    createRequest<T>(callback: <J = ApplyWrapper<TWrapper, T, TDataKey>>(params: {
         http: HttpService;
         query: QueryBuilder;
-    }) => Promise<HttpServiceResponse<J>>): Promise<HttpServiceResponse<T>>;
+    }) => Promise<HttpServiceResponse<J>>): Promise<HttpServiceResponse<ApplyWrapper<TWrapper, T, TDataKey>>>;
+    createRawRequest<T>(callback: (params: {
+        http: HttpService;
+        query: QueryBuilder;
+    }) => Promise<HttpServiceResponse<T>>): Promise<HttpServiceResponse<T>>;
 }
-export declare class BaseHttpDatasource implements IHttpDatasource {
+export declare class BaseHttpDatasource<TWrapper = never, TDataKey extends keyof TWrapper = never> implements IHttpDatasource<TWrapper, TDataKey> {
     protected readonly httpClient: HttpService;
     protected readonly query: QueryBuilder;
     constructor(params: {
         http?: HttpService;
         query?: QueryBuilder;
     });
-    createRequest<T>(callback: <J = T>(params: {
+    createRequest<T>(callback: <J = ApplyWrapper<TWrapper, T, TDataKey>>(params: {
+        http: HttpService;
+        query: QueryBuilder;
+    }) => Promise<HttpServiceResponse<J>>): Promise<HttpServiceResponse<ApplyWrapper<TWrapper, T, TDataKey>>>;
+    private _createRawRequest;
+    readonly createRawRequest: <T>(callback: (params: {
         http: HttpService;
         query: QueryBuilder;
-    }) => Promise<HttpServiceResponse<J>>): Promise<HttpServiceResponse<T>>;
+    }) => Promise<HttpServiceResponse<T>>) => Promise<HttpServiceResponse<T>>;
 }
-export declare const createHttpDatasource: (params: {
-    http?: HttpService;
-    query?: QueryBuilder;
-}) => BaseHttpDatasource;
+export {};

package/dist/core/datasource/BaseDatasource.js

@@ -14,7 +14,10 @@ export class BaseHttpDatasource {
             throw err;
         });
     }
+    async _createRawRequest(callback) {
+        return await callback({ http: this.httpClient, query: this.query }).catch((err) => {
+            throw err;
+        });
+    }
+    createRawRequest = this._createRawRequest.bind(this);
 }
-export const createHttpDatasource = (params) => {
-    return new BaseHttpDatasource(params);
-};

package/dist/core/index.d.ts

@@ -4,5 +4,4 @@ export * from './httpService/index.js';
 export * from './datasource/index.js';
 export * from './request/index.js';
 export * from './query/index.js';
-export * from './container/index.js';
 export * from './boundaryProvider/index.js';

package/dist/core/index.js

@@ -4,5 +4,4 @@ export * from './httpService/index.js';
 export * from './datasource/index.js';
 export * from './request/index.js';
 export * from './query/index.js';
-export * from './container/index.js';
 export * from './boundaryProvider/index.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-net/kit",
-  "version": "0.6.2",
+  "version": "0.6.5",
   "files": [
     "dist",
     "!dist/**/*.test.*",

package/dist/core/container/Container.d.ts

@@ -1,8 +0,0 @@
-type Factory<T> = () => T;
-export declare class DIContainer {
-    private factories;
-    private instances;
-    register<T>(token: new (...args: unknown[]) => T, factory: Factory<T>): void;
-    get<T>(token: new (...args: unknown[]) => T): T;
-}
-export {};

package/dist/core/container/Container.js

@@ -1,19 +0,0 @@
-export class DIContainer {
-    factories = new Map();
-    instances = new Map();
-    register(token, factory) {
-        this.factories.set(token, factory);
-    }
-    get(token) {
-        if (this.instances.has(token)) {
-            return this.instances.get(token);
-        }
-        const factory = this.factories.get(token);
-        if (!factory) {
-            throw new Error(`Factory for ${token.name} not registered`);
-        }
-        const instance = factory();
-        this.instances.set(token, instance);
-        return instance;
-    }
-}

package/dist/core/container/index.d.ts

@@ -1 +0,0 @@
-export * from './Container.js';

package/dist/core/container/index.js

@@ -1 +0,0 @@
-export * from './Container.js';