@buildplease/webkit 1.0.2 → 1.0.4

package/dist/src/index.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`}),require("reflect-metadata");let e=require("@buildplease/core"),t=require("inversify");function n(){return[]}`${{name:`buildplease`,displayName:`BuildPlease`,scope:`@buildplease`}.name}`;const r={DI:{}},i=e.CoreL10nResource;var a=class{mode;pendingEntries=[];activeEntries=new Set;interruption;isSerialOperationRunning=!1;constructor(e=`parallel`){this.mode=e}execute(t){if(this.interruption)return Promise.reject(new e.CanceledError);let n=this.createEntry(t);return this.mode===`serial`?(this.pendingEntries.push(n),this.startNextSerialOperation()):this.startEntry(n),n.promise}cancelAll(e){let t=this.pendingEntries.splice(0);for(let n of t)this.cancelEntry(n,e);for(let t of this.activeEntries)this.cancelEntry(t,e)}async interrupt(e){if(!this.interruption){let t=Promise.resolve().then(e).finally(()=>{this.interruption===t&&(this.interruption=void 0,this.startNextSerialOperation())});this.interruption=t,this.cancelAll()}await this.interruption}createEntry(e){let t,n;return{operation:e,promise:new Promise((e,r)=>{t=e,n=r}),resolve:e=>t?.(e),reject:e=>n?.(e),canceled:!1,settled:!1}}startEntry(e){if(e.canceled||this.interruption){this.cancelEntry(e);return}this.activeEntries.add(e),this.mode===`serial`&&(this.isSerialOperationRunning=!0),Promise.resolve().then(e.operation).then(t=>{e.canceled||this.resolveEntry(e,t)},t=>{e.canceled||this.rejectEntry(e,t)}).finally(()=>{this.activeEntries.delete(e),this.mode===`serial`&&(this.isSerialOperationRunning=!1,this.startNextSerialOperation())})}startNextSerialOperation(){if(this.mode!==`serial`||this.isSerialOperationRunning||this.interruption)return;let e=this.pendingEntries.shift();e&&this.startEntry(e)}cancelEntry(t,n){t.canceled||(t.canceled=!0,t.settled||this.rejectEntry(t,new e.CanceledError({cause:n})))}resolveEntry(e,t){e.settled||(e.settled=!0,e.resolve(t))}rejectEntry(e,t){e.settled||(e.settled=!0,e.reject(t))}},o=class extends Error{statusCode;code;details;constructor(e){super(e.message),this.name=`HttpError`,this.statusCode=e.statusCode,this.code=e.code,this.details=e.details,e.cause!==void 0&&(this.cause=e.cause)}},s=class{interceptors;constructor(e=[],t){this.interceptors=this.resolveInterceptors(e,t)}async intercept(e){let t=e;for(let e of this.interceptors)t=await e.intercept(t);return t}resolveInterceptors(e,t){let n=new Set,r=[];for(let i of e){if(n.has(i.identity)){t?.(`Duplicate HTTP request interceptor ignored: ${String(i.identity)}`);continue}n.add(i.identity),r.push(i)}return Object.freeze(r)}};const c={credentials:!0,headers:{}};var l=class{requestOptions;interceptorPipeline;asyncQueue;unauthorized;constructor(e={}){this.requestOptions=e.requestOptions??{},this.interceptorPipeline=e.interceptorPipeline??new s,this.asyncQueue=e.asyncQueue??new a,this.unauthorized=e.unauthorized}execute(e,t){return this.asyncQueue.execute(async()=>{let n=await this.makeRequestOptions(e,t);try{let t=this.createClient(n);return await e.execute(t)}catch(e){throw this.handleError(e)}})}handleError(t){return t instanceof o||t instanceof e.NetworkError||t instanceof e.TimeoutError||t instanceof e.CanceledError||t instanceof e.UnknownError?t:new e.UnknownError({message:t instanceof Error?t.message:void 0,cause:t})}async makeRequestOptions(e,t){let n=this.mergeRequestOptions(c,this.requestOptions);return n=await this.interceptorPipeline.intercept(n),n=this.mergeRequestOptions(n,e.options),n=this.mergeRequestOptions(n,t),n}mergeRequestOptions(e,t){return t?{credentials:t.credentials??e.credentials,headers:{...e.headers,...t.headers}}:e}};function u(e,t){if(typeof Reflect==`object`&&typeof Reflect.metadata==`function`)return Reflect.metadata(e,t)}function d(e,t){return function(n,r){t(n,r,e)}}function f(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let p=class{endpoint;httpClient;constructor(e,t){this.endpoint=e,this.httpClient=t}async execute(e,t){let n=await this.convertOrThrow(()=>this.endpoint.convertInput(e)),r=this.endpoint.makeRequest(n),i=await this.httpClient.execute(r,t);return await this.convertOrThrow(()=>this.endpoint.convertOutput(i))}async convertOrThrow(t){try{return await t()}catch(t){throw new e.ConversionError({cause:t})}}};p=f([(0,t.injectable)(),d(0,(0,t.unmanaged)()),d(1,(0,t.unmanaged)()),u(`design:paramtypes`,[Object,Object])],p);let m=class extends p{constructor(e,t){super(e,t)}};m=f([(0,t.injectable)(),u(`design:paramtypes`,[Object,Object])],m);let h=class extends p{constructor(e,t){super(e,t)}async execute(t,n){try{return await super.execute(t,n)}catch(t){if(!(t instanceof o))throw t;let n=this.httpClient.unauthorized;throw!n||!n.statusCodes.includes(t.statusCode)?t:n.cancelAll?(await this.httpClient.asyncQueue.interrupt(()=>n.handler.handle(t)),new e.CanceledError({cause:t})):(await n.handler.handle(t),t)}}};h=f([(0,t.injectable)(),u(`design:paramtypes`,[Object,Object])],h);function g(){let t=(0,e.coreAssembly)(),r=n();return[...t,...r]}exports.AsyncQueueImpl=a,exports.HttpClient=l,exports.HttpError=o,exports.HttpRequestInterceptorPipeline=s,Object.defineProperty(exports,"PublicRemoteResource",{enumerable:!0,get:function(){return m}}),Object.defineProperty(exports,"RemoteResource",{enumerable:!0,get:function(){return p}}),Object.defineProperty(exports,"SecuredRemoteResource",{enumerable:!0,get:function(){return h}}),exports.WebKitL10nResource=i,exports.WebKitSymbols=r,exports.webkitAssembly=g,Object.keys(e).forEach(function(t){t!=="default"&&!Object.prototype.hasOwnProperty.call(exports,t)&&Object.defineProperty(exports,t,{enumerable:!0,get:function(){return e[t]}})});
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`}),require("reflect-metadata");let e=require("@buildplease/core"),t=require("inversify");function n(){return[]}`${{name:`buildplease`,displayName:`BuildPlease`,scope:`@buildplease`}.name}`;const r={DI:{}},i=e.CoreL10nResource;var a=class{mode;pendingEntries=[];activeEntries=new Set;interruption;isSerialOperationRunning=!1;constructor(e=`parallel`){this.mode=e}execute(t){if(this.interruption)return Promise.reject(new e.CanceledError);let n=this.createEntry(t);return this.mode===`serial`?(this.pendingEntries.push(n),this.startNextSerialOperation()):this.startEntry(n),n.promise}cancelAll(e){let t=this.pendingEntries.splice(0);for(let n of t)this.cancelEntry(n,e);for(let t of this.activeEntries)this.cancelEntry(t,e)}async interrupt(e){if(!this.interruption){let t=Promise.resolve().then(e).finally(()=>{this.interruption===t&&(this.interruption=void 0,this.startNextSerialOperation())});this.interruption=t,this.cancelAll()}await this.interruption}createEntry(e){let t,n;return{operation:e,promise:new Promise((e,r)=>{t=e,n=r}),resolve:e=>t?.(e),reject:e=>n?.(e),canceled:!1,settled:!1}}startEntry(e){if(e.canceled||this.interruption){this.cancelEntry(e);return}this.activeEntries.add(e),this.mode===`serial`&&(this.isSerialOperationRunning=!0),Promise.resolve().then(e.operation).then(t=>{e.canceled||this.resolveEntry(e,t)},t=>{e.canceled||this.rejectEntry(e,t)}).finally(()=>{this.activeEntries.delete(e),this.mode===`serial`&&(this.isSerialOperationRunning=!1,this.startNextSerialOperation())})}startNextSerialOperation(){if(this.mode!==`serial`||this.isSerialOperationRunning||this.interruption)return;let e=this.pendingEntries.shift();e&&this.startEntry(e)}cancelEntry(t,n){t.canceled||(t.canceled=!0,t.settled||this.rejectEntry(t,new e.CanceledError({cause:n})))}resolveEntry(e,t){e.settled||(e.settled=!0,e.resolve(t))}rejectEntry(e,t){e.settled||(e.settled=!0,e.reject(t))}},o=class extends Error{statusCode;code;details;constructor(e){super(e.message),this.name=`HttpError`,this.statusCode=e.statusCode,this.code=e.code,this.details=e.details,e.cause!==void 0&&(this.cause=e.cause)}},s=class{interceptors;constructor(e=[],t){this.interceptors=this.resolveInterceptors(e,t)}async intercept(e){let t=e;for(let e of this.interceptors)t=await e.intercept(t);return t}resolveInterceptors(e,t){let n=new Set,r=[];for(let i of e){if(n.has(i.identity)){t?.(`Duplicate HTTP request interceptor ignored: ${String(i.identity)}`);continue}n.add(i.identity),r.push(i)}return Object.freeze(r)}};const c={credentials:!0,headers:{}};var l=class{requestOptions;interceptorPipeline;asyncQueue;unauthorized;constructor(e={}){this.requestOptions=e.requestOptions??{},this.interceptorPipeline=e.interceptorPipeline??new s,this.asyncQueue=e.asyncQueue??new a,this.unauthorized=e.unauthorized}execute(e,t){return this.asyncQueue.execute(async()=>{let n=await this.makeRequestOptions(e,t);try{let t=this.createClient(n);return await e.execute(t)}catch(e){throw this.handleError(e)}})}handleError(t){return t instanceof o||t instanceof e.NetworkError||t instanceof e.TimeoutError||t instanceof e.CanceledError||t instanceof e.UnknownError?t:new e.UnknownError({message:t instanceof Error?t.message:void 0,cause:t})}async makeRequestOptions(e,t){let n=this.mergeRequestOptions(c,this.requestOptions);return n=await this.interceptorPipeline.intercept(n),n=this.mergeRequestOptions(n,e.options),n=this.mergeRequestOptions(n,t),n}mergeRequestOptions(e,t){return t?{credentials:t.credentials??e.credentials,headers:{...e.headers,...t.headers}}:e}};function u(e,t){return{execute:t=>e(t),options:t}}function d(e,t){if(typeof Reflect==`object`&&typeof Reflect.metadata==`function`)return Reflect.metadata(e,t)}function f(e,t){return function(n,r){t(n,r,e)}}function p(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let m=class{endpoint;httpClient;constructor(e,t){this.endpoint=e,this.httpClient=t}async execute(e,t){let n=await this.convertOrThrow(()=>this.endpoint.convertInput(e)),r=this.endpoint.makeRequest(n),i=await this.httpClient.execute(r,t);return await this.convertOrThrow(()=>this.endpoint.convertOutput(i))}async convertOrThrow(t){try{return await t()}catch(t){throw new e.ConversionError({cause:t})}}};m=p([(0,t.injectable)(),f(0,(0,t.unmanaged)()),f(1,(0,t.unmanaged)()),d(`design:paramtypes`,[Object,Object])],m);let h=class extends m{constructor(e,t){super(e,t)}};h=p([(0,t.injectable)(),d(`design:paramtypes`,[Object,Object])],h);let g=class extends m{constructor(e,t){super(e,t)}async execute(t,n){try{return await super.execute(t,n)}catch(t){if(!(t instanceof o))throw t;let n=this.httpClient.unauthorized;throw!n||!n.statusCodes.includes(t.statusCode)?t:n.cancelAll?(await this.httpClient.asyncQueue.interrupt(()=>n.handler.handle(t)),new e.CanceledError({cause:t})):(await n.handler.handle(t),t)}}};g=p([(0,t.injectable)(),d(`design:paramtypes`,[Object,Object])],g);function _(){let t=(0,e.coreAssembly)(),r=n();return[...t,...r]}exports.AsyncQueueImpl=a,exports.HttpClient=l,exports.HttpError=o,exports.HttpRequestInterceptorPipeline=s,Object.defineProperty(exports,"PublicRemoteResource",{enumerable:!0,get:function(){return h}}),Object.defineProperty(exports,"RemoteResource",{enumerable:!0,get:function(){return m}}),Object.defineProperty(exports,"SecuredRemoteResource",{enumerable:!0,get:function(){return g}}),exports.WebKitL10nResource=i,exports.WebKitSymbols=r,exports.defineHttpRequest=u,exports.webkitAssembly=_,Object.keys(e).forEach(function(t){t!=="default"&&!Object.prototype.hasOwnProperty.call(exports,t)&&Object.defineProperty(exports,t,{enumerable:!0,get:function(){return e[t]}})});

package/dist/src/index.d.cts

@@ -373,11 +373,11 @@ interface HttpRequestOptions {
 }
 //#endregion
 //#region src/networking/http-request.d.ts
-interface HttpRequest<Client, Output> {
+interface HttpRequest<Output> {
   /**
-   * Executes the request using the configured client.
+   * Executes the request using the client created by the configured HTTP client.
    */
-  readonly execute: (client: Client) => Promise<Output>;
+  readonly execute: (client: unknown) => Promise<Output>;
   /**
    * Options applied specifically to this request.
    *
@@ -385,6 +385,11 @@ interface HttpRequest<Client, Output> {
    */
   readonly options?: HttpRequestOptions;
 }
+/**
+ * Creates a transport-typed HTTP request while keeping the transport type internal
+ * to the request implementation.
+ */
+declare function defineHttpRequest<Client, Output>(execute: (client: Client) => Promise<Output>, options?: HttpRequestOptions): HttpRequest<Output>;
 //#endregion
 //#region src/networking/http-request-interceptor.d.ts
 /**
@@ -405,28 +410,34 @@ declare class HttpRequestInterceptorPipeline {
 //#endregion
 //#region src/networking/http-error.d.ts
 interface HttpErrorOptions {
-  /** HTTP status code returned by the remote system. */
+  /** HTTP status code. */
   readonly statusCode: number;
-  /** Machine-readable error code for programmatic handling. */
-  readonly code: string;
-  /** Human-readable error description. */
-  readonly message: string;
   /**
-   * Structured error details.
-   *
+   * Error code.
    * @default undefined
+   * @example "not_found"
    */
-  readonly details?: Readonly<Record<string, string[]>>;
+  readonly code?: string;
   /**
-   * Original transport error.
-   *
+   * Error message.
+   * @default undefined
+   * @example "Not found"
+   */
+  readonly message?: string;
+  /**
+   * Error details.
+   * @default undefined
+   */
+  readonly details?: unknown;
+  /**
+   * Original error.
    * @default undefined
    */
   readonly cause?: unknown;
 }
 declare class HttpError extends Error {
   readonly statusCode: HttpErrorOptions['statusCode'];
-  readonly code: HttpErrorOptions['code'];
+  readonly code?: HttpErrorOptions['code'];
   readonly details?: HttpErrorOptions['details'];
   constructor(options: HttpErrorOptions);
 }
@@ -471,15 +482,15 @@ interface HttpClientOptions {
    */
   readonly unauthorized?: UnauthorizedOptions;
 }
-declare abstract class HttpClient<Client> {
+declare abstract class HttpClient {
   private readonly requestOptions;
   private readonly interceptorPipeline;
   readonly asyncQueue: AsyncQueue;
   readonly unauthorized?: UnauthorizedOptions;
   constructor(options?: HttpClientOptions);
-  execute<Output>(request: HttpRequest<Client, Output>, options?: HttpRequestOptions): Promise<Output>;
-  /** Creates the concrete client for the resolved request options. */
-  protected abstract createClient(options: HttpRequestOptions): Client;
+  execute<Output>(request: HttpRequest<Output>, options?: HttpRequestOptions): Promise<Output>;
+  /** Creates the concrete transport client for the resolved request options. */
+  protected abstract createClient(options: HttpRequestOptions): unknown;
   /** Maps a transport-specific failure to a BuildPlease error. */
   protected handleError(error: unknown): Error;
   private makeRequestOptions;
@@ -490,36 +501,36 @@ declare abstract class HttpClient<Client> {
 /**
  * Defines conversion and request creation for a remote operation.
  */
-interface RemoteEndpoint<Input, InputDto, Output, OutputDto, Client> {
+interface RemoteEndpoint<Input, InputDto, Output, OutputDto> {
   /** Converts operation input to the request DTO. */
   convertInput(input: Input): Promise<InputDto>;
   /** Creates the HTTP request for the converted input. */
-  makeRequest(input: InputDto): HttpRequest<Client, OutputDto>;
+  makeRequest(input: InputDto): HttpRequest<OutputDto>;
   /** Converts the response DTO to the operation output. */
   convertOutput(response: OutputDto): Promise<Output>;
 }
 //#endregion
 //#region src/networking/remote-resource.d.ts
-declare abstract class RemoteResource<Input, Output, Client> implements AsyncOperation<Input, Output, HttpRequestOptions> {
-  protected readonly endpoint: RemoteEndpoint<Input, unknown, Output, unknown, Client>;
-  protected readonly httpClient: HttpClient<Client>;
-  protected constructor(endpoint: RemoteEndpoint<Input, unknown, Output, unknown, Client>, httpClient: HttpClient<Client>);
+declare abstract class RemoteResource<Input, Output> implements AsyncOperation<Input, Output, HttpRequestOptions> {
+  protected readonly endpoint: RemoteEndpoint<Input, unknown, Output, unknown>;
+  protected readonly httpClient: HttpClient;
+  protected constructor(endpoint: RemoteEndpoint<Input, unknown, Output, unknown>, httpClient: HttpClient);
   execute(input: Input, options?: HttpRequestOptions): Promise<Output>;
   private convertOrThrow;
 }
 //#endregion
-//#region src/networking/public-remote-resource.d.ts
-declare class PublicRemoteResource<Input, Output, Client> extends RemoteResource<Input, Output, Client> {
-  constructor(endpoint: RemoteEndpoint<Input, unknown, Output, unknown, Client>, httpClient: HttpClient<Client>);
+//#region src/networking/remote-resource-public.d.ts
+declare class PublicRemoteResource<Input, Output> extends RemoteResource<Input, Output> {
+  constructor(endpoint: RemoteEndpoint<Input, unknown, Output, unknown>, httpClient: HttpClient);
 }
 //#endregion
-//#region src/networking/secured-remote-resource.d.ts
-declare class SecuredRemoteResource<Input, Output, Client> extends RemoteResource<Input, Output, Client> {
-  constructor(endpoint: RemoteEndpoint<Input, unknown, Output, unknown, Client>, httpClient: HttpClient<Client>);
+//#region src/networking/remote-resource-secured.d.ts
+declare class SecuredRemoteResource<Input, Output> extends RemoteResource<Input, Output> {
+  constructor(endpoint: RemoteEndpoint<Input, unknown, Output, unknown>, httpClient: HttpClient);
   execute(input: Input, options?: HttpRequestOptions): Promise<Output>;
 }
 //#endregion
 //#region src/index.d.ts
 declare function webkitAssembly(): Assembly[];
 //#endregion
-export { AsyncQueue, AsyncQueueImpl, AsyncQueueMode, HttpClient, HttpClientOptions, HttpError, HttpErrorOptions, HttpRequest, HttpRequestInterceptor, HttpRequestInterceptorPipeline, HttpRequestOptions, PublicRemoteResource, RemoteEndpoint, RemoteResource, SecuredRemoteResource, TableDataModel, TablePaginationModel, UnauthorizedHandler, UnauthorizedOptions, WebKitL10nResource, WebKitSymbols, webkitAssembly };
+export { AsyncQueue, AsyncQueueImpl, AsyncQueueMode, HttpClient, HttpClientOptions, HttpError, HttpErrorOptions, HttpRequest, HttpRequestInterceptor, HttpRequestInterceptorPipeline, HttpRequestOptions, PublicRemoteResource, RemoteEndpoint, RemoteResource, SecuredRemoteResource, TableDataModel, TablePaginationModel, UnauthorizedHandler, UnauthorizedOptions, WebKitL10nResource, WebKitSymbols, defineHttpRequest, webkitAssembly };

package/dist/src/index.d.ts

@@ -373,11 +373,11 @@ interface HttpRequestOptions {
 }
 //#endregion
 //#region src/networking/http-request.d.ts
-interface HttpRequest<Client, Output> {
+interface HttpRequest<Output> {
   /**
-   * Executes the request using the configured client.
+   * Executes the request using the client created by the configured HTTP client.
    */
-  readonly execute: (client: Client) => Promise<Output>;
+  readonly execute: (client: unknown) => Promise<Output>;
   /**
    * Options applied specifically to this request.
    *
@@ -385,6 +385,11 @@ interface HttpRequest<Client, Output> {
    */
   readonly options?: HttpRequestOptions;
 }
+/**
+ * Creates a transport-typed HTTP request while keeping the transport type internal
+ * to the request implementation.
+ */
+declare function defineHttpRequest<Client, Output>(execute: (client: Client) => Promise<Output>, options?: HttpRequestOptions): HttpRequest<Output>;
 //#endregion
 //#region src/networking/http-request-interceptor.d.ts
 /**
@@ -405,28 +410,34 @@ declare class HttpRequestInterceptorPipeline {
 //#endregion
 //#region src/networking/http-error.d.ts
 interface HttpErrorOptions {
-  /** HTTP status code returned by the remote system. */
+  /** HTTP status code. */
   readonly statusCode: number;
-  /** Machine-readable error code for programmatic handling. */
-  readonly code: string;
-  /** Human-readable error description. */
-  readonly message: string;
   /**
-   * Structured error details.
-   *
+   * Error code.
    * @default undefined
+   * @example "not_found"
    */
-  readonly details?: Readonly<Record<string, string[]>>;
+  readonly code?: string;
   /**
-   * Original transport error.
-   *
+   * Error message.
+   * @default undefined
+   * @example "Not found"
+   */
+  readonly message?: string;
+  /**
+   * Error details.
+   * @default undefined
+   */
+  readonly details?: unknown;
+  /**
+   * Original error.
    * @default undefined
    */
   readonly cause?: unknown;
 }
 declare class HttpError extends Error {
   readonly statusCode: HttpErrorOptions['statusCode'];
-  readonly code: HttpErrorOptions['code'];
+  readonly code?: HttpErrorOptions['code'];
   readonly details?: HttpErrorOptions['details'];
   constructor(options: HttpErrorOptions);
 }
@@ -471,15 +482,15 @@ interface HttpClientOptions {
    */
   readonly unauthorized?: UnauthorizedOptions;
 }
-declare abstract class HttpClient<Client> {
+declare abstract class HttpClient {
   private readonly requestOptions;
   private readonly interceptorPipeline;
   readonly asyncQueue: AsyncQueue;
   readonly unauthorized?: UnauthorizedOptions;
   constructor(options?: HttpClientOptions);
-  execute<Output>(request: HttpRequest<Client, Output>, options?: HttpRequestOptions): Promise<Output>;
-  /** Creates the concrete client for the resolved request options. */
-  protected abstract createClient(options: HttpRequestOptions): Client;
+  execute<Output>(request: HttpRequest<Output>, options?: HttpRequestOptions): Promise<Output>;
+  /** Creates the concrete transport client for the resolved request options. */
+  protected abstract createClient(options: HttpRequestOptions): unknown;
   /** Maps a transport-specific failure to a BuildPlease error. */
   protected handleError(error: unknown): Error;
   private makeRequestOptions;
@@ -490,36 +501,36 @@ declare abstract class HttpClient<Client> {
 /**
  * Defines conversion and request creation for a remote operation.
  */
-interface RemoteEndpoint<Input, InputDto, Output, OutputDto, Client> {
+interface RemoteEndpoint<Input, InputDto, Output, OutputDto> {
   /** Converts operation input to the request DTO. */
   convertInput(input: Input): Promise<InputDto>;
   /** Creates the HTTP request for the converted input. */
-  makeRequest(input: InputDto): HttpRequest<Client, OutputDto>;
+  makeRequest(input: InputDto): HttpRequest<OutputDto>;
   /** Converts the response DTO to the operation output. */
   convertOutput(response: OutputDto): Promise<Output>;
 }
 //#endregion
 //#region src/networking/remote-resource.d.ts
-declare abstract class RemoteResource<Input, Output, Client> implements AsyncOperation<Input, Output, HttpRequestOptions> {
-  protected readonly endpoint: RemoteEndpoint<Input, unknown, Output, unknown, Client>;
-  protected readonly httpClient: HttpClient<Client>;
-  protected constructor(endpoint: RemoteEndpoint<Input, unknown, Output, unknown, Client>, httpClient: HttpClient<Client>);
+declare abstract class RemoteResource<Input, Output> implements AsyncOperation<Input, Output, HttpRequestOptions> {
+  protected readonly endpoint: RemoteEndpoint<Input, unknown, Output, unknown>;
+  protected readonly httpClient: HttpClient;
+  protected constructor(endpoint: RemoteEndpoint<Input, unknown, Output, unknown>, httpClient: HttpClient);
   execute(input: Input, options?: HttpRequestOptions): Promise<Output>;
   private convertOrThrow;
 }
 //#endregion
-//#region src/networking/public-remote-resource.d.ts
-declare class PublicRemoteResource<Input, Output, Client> extends RemoteResource<Input, Output, Client> {
-  constructor(endpoint: RemoteEndpoint<Input, unknown, Output, unknown, Client>, httpClient: HttpClient<Client>);
+//#region src/networking/remote-resource-public.d.ts
+declare class PublicRemoteResource<Input, Output> extends RemoteResource<Input, Output> {
+  constructor(endpoint: RemoteEndpoint<Input, unknown, Output, unknown>, httpClient: HttpClient);
 }
 //#endregion
-//#region src/networking/secured-remote-resource.d.ts
-declare class SecuredRemoteResource<Input, Output, Client> extends RemoteResource<Input, Output, Client> {
-  constructor(endpoint: RemoteEndpoint<Input, unknown, Output, unknown, Client>, httpClient: HttpClient<Client>);
+//#region src/networking/remote-resource-secured.d.ts
+declare class SecuredRemoteResource<Input, Output> extends RemoteResource<Input, Output> {
+  constructor(endpoint: RemoteEndpoint<Input, unknown, Output, unknown>, httpClient: HttpClient);
   execute(input: Input, options?: HttpRequestOptions): Promise<Output>;
 }
 //#endregion
 //#region src/index.d.ts
 declare function webkitAssembly(): Assembly[];
 //#endregion
-export { AsyncQueue, AsyncQueueImpl, AsyncQueueMode, HttpClient, HttpClientOptions, HttpError, HttpErrorOptions, HttpRequest, HttpRequestInterceptor, HttpRequestInterceptorPipeline, HttpRequestOptions, PublicRemoteResource, RemoteEndpoint, RemoteResource, SecuredRemoteResource, TableDataModel, TablePaginationModel, UnauthorizedHandler, UnauthorizedOptions, WebKitL10nResource, WebKitSymbols, webkitAssembly };
+export { AsyncQueue, AsyncQueueImpl, AsyncQueueMode, HttpClient, HttpClientOptions, HttpError, HttpErrorOptions, HttpRequest, HttpRequestInterceptor, HttpRequestInterceptorPipeline, HttpRequestOptions, PublicRemoteResource, RemoteEndpoint, RemoteResource, SecuredRemoteResource, TableDataModel, TablePaginationModel, UnauthorizedHandler, UnauthorizedOptions, WebKitL10nResource, WebKitSymbols, defineHttpRequest, webkitAssembly };

package/dist/src/index.js

@@ -1 +1 @@
-import"reflect-metadata";import{CanceledError as e,ConversionError as t,CoreL10nResource as n,NetworkError as r,TimeoutError as i,UnknownError as a,coreAssembly as o}from"@buildplease/core";import{injectable as s,unmanaged as c}from"inversify";export*from"@buildplease/core";function l(){return[]}`${{name:`buildplease`,displayName:`BuildPlease`,scope:`@buildplease`}.name}`;const u={DI:{}},d=n;var f=class{mode;pendingEntries=[];activeEntries=new Set;interruption;isSerialOperationRunning=!1;constructor(e=`parallel`){this.mode=e}execute(t){if(this.interruption)return Promise.reject(new e);let n=this.createEntry(t);return this.mode===`serial`?(this.pendingEntries.push(n),this.startNextSerialOperation()):this.startEntry(n),n.promise}cancelAll(e){let t=this.pendingEntries.splice(0);for(let n of t)this.cancelEntry(n,e);for(let t of this.activeEntries)this.cancelEntry(t,e)}async interrupt(e){if(!this.interruption){let t=Promise.resolve().then(e).finally(()=>{this.interruption===t&&(this.interruption=void 0,this.startNextSerialOperation())});this.interruption=t,this.cancelAll()}await this.interruption}createEntry(e){let t,n;return{operation:e,promise:new Promise((e,r)=>{t=e,n=r}),resolve:e=>t?.(e),reject:e=>n?.(e),canceled:!1,settled:!1}}startEntry(e){if(e.canceled||this.interruption){this.cancelEntry(e);return}this.activeEntries.add(e),this.mode===`serial`&&(this.isSerialOperationRunning=!0),Promise.resolve().then(e.operation).then(t=>{e.canceled||this.resolveEntry(e,t)},t=>{e.canceled||this.rejectEntry(e,t)}).finally(()=>{this.activeEntries.delete(e),this.mode===`serial`&&(this.isSerialOperationRunning=!1,this.startNextSerialOperation())})}startNextSerialOperation(){if(this.mode!==`serial`||this.isSerialOperationRunning||this.interruption)return;let e=this.pendingEntries.shift();e&&this.startEntry(e)}cancelEntry(t,n){t.canceled||(t.canceled=!0,t.settled||this.rejectEntry(t,new e({cause:n})))}resolveEntry(e,t){e.settled||(e.settled=!0,e.resolve(t))}rejectEntry(e,t){e.settled||(e.settled=!0,e.reject(t))}},p=class extends Error{statusCode;code;details;constructor(e){super(e.message),this.name=`HttpError`,this.statusCode=e.statusCode,this.code=e.code,this.details=e.details,e.cause!==void 0&&(this.cause=e.cause)}},m=class{interceptors;constructor(e=[],t){this.interceptors=this.resolveInterceptors(e,t)}async intercept(e){let t=e;for(let e of this.interceptors)t=await e.intercept(t);return t}resolveInterceptors(e,t){let n=new Set,r=[];for(let i of e){if(n.has(i.identity)){t?.(`Duplicate HTTP request interceptor ignored: ${String(i.identity)}`);continue}n.add(i.identity),r.push(i)}return Object.freeze(r)}};const h={credentials:!0,headers:{}};var g=class{requestOptions;interceptorPipeline;asyncQueue;unauthorized;constructor(e={}){this.requestOptions=e.requestOptions??{},this.interceptorPipeline=e.interceptorPipeline??new m,this.asyncQueue=e.asyncQueue??new f,this.unauthorized=e.unauthorized}execute(e,t){return this.asyncQueue.execute(async()=>{let n=await this.makeRequestOptions(e,t);try{let t=this.createClient(n);return await e.execute(t)}catch(e){throw this.handleError(e)}})}handleError(t){return t instanceof p||t instanceof r||t instanceof i||t instanceof e||t instanceof a?t:new a({message:t instanceof Error?t.message:void 0,cause:t})}async makeRequestOptions(e,t){let n=this.mergeRequestOptions(h,this.requestOptions);return n=await this.interceptorPipeline.intercept(n),n=this.mergeRequestOptions(n,e.options),n=this.mergeRequestOptions(n,t),n}mergeRequestOptions(e,t){return t?{credentials:t.credentials??e.credentials,headers:{...e.headers,...t.headers}}:e}};function _(e,t){if(typeof Reflect==`object`&&typeof Reflect.metadata==`function`)return Reflect.metadata(e,t)}function v(e,t){return function(n,r){t(n,r,e)}}function y(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let b=class{endpoint;httpClient;constructor(e,t){this.endpoint=e,this.httpClient=t}async execute(e,t){let n=await this.convertOrThrow(()=>this.endpoint.convertInput(e)),r=this.endpoint.makeRequest(n),i=await this.httpClient.execute(r,t);return await this.convertOrThrow(()=>this.endpoint.convertOutput(i))}async convertOrThrow(e){try{return await e()}catch(e){throw new t({cause:e})}}};b=y([s(),v(0,c()),v(1,c()),_(`design:paramtypes`,[Object,Object])],b);let x=class extends b{constructor(e,t){super(e,t)}};x=y([s(),_(`design:paramtypes`,[Object,Object])],x);let S=class extends b{constructor(e,t){super(e,t)}async execute(t,n){try{return await super.execute(t,n)}catch(t){if(!(t instanceof p))throw t;let n=this.httpClient.unauthorized;throw!n||!n.statusCodes.includes(t.statusCode)?t:n.cancelAll?(await this.httpClient.asyncQueue.interrupt(()=>n.handler.handle(t)),new e({cause:t})):(await n.handler.handle(t),t)}}};S=y([s(),_(`design:paramtypes`,[Object,Object])],S);function C(){let e=o(),t=l();return[...e,...t]}export{f as AsyncQueueImpl,g as HttpClient,p as HttpError,m as HttpRequestInterceptorPipeline,x as PublicRemoteResource,b as RemoteResource,S as SecuredRemoteResource,d as WebKitL10nResource,u as WebKitSymbols,C as webkitAssembly};
+import"reflect-metadata";import{CanceledError as e,ConversionError as t,CoreL10nResource as n,NetworkError as r,TimeoutError as i,UnknownError as a,coreAssembly as o}from"@buildplease/core";import{injectable as s,unmanaged as c}from"inversify";export*from"@buildplease/core";function l(){return[]}`${{name:`buildplease`,displayName:`BuildPlease`,scope:`@buildplease`}.name}`;const u={DI:{}},d=n;var f=class{mode;pendingEntries=[];activeEntries=new Set;interruption;isSerialOperationRunning=!1;constructor(e=`parallel`){this.mode=e}execute(t){if(this.interruption)return Promise.reject(new e);let n=this.createEntry(t);return this.mode===`serial`?(this.pendingEntries.push(n),this.startNextSerialOperation()):this.startEntry(n),n.promise}cancelAll(e){let t=this.pendingEntries.splice(0);for(let n of t)this.cancelEntry(n,e);for(let t of this.activeEntries)this.cancelEntry(t,e)}async interrupt(e){if(!this.interruption){let t=Promise.resolve().then(e).finally(()=>{this.interruption===t&&(this.interruption=void 0,this.startNextSerialOperation())});this.interruption=t,this.cancelAll()}await this.interruption}createEntry(e){let t,n;return{operation:e,promise:new Promise((e,r)=>{t=e,n=r}),resolve:e=>t?.(e),reject:e=>n?.(e),canceled:!1,settled:!1}}startEntry(e){if(e.canceled||this.interruption){this.cancelEntry(e);return}this.activeEntries.add(e),this.mode===`serial`&&(this.isSerialOperationRunning=!0),Promise.resolve().then(e.operation).then(t=>{e.canceled||this.resolveEntry(e,t)},t=>{e.canceled||this.rejectEntry(e,t)}).finally(()=>{this.activeEntries.delete(e),this.mode===`serial`&&(this.isSerialOperationRunning=!1,this.startNextSerialOperation())})}startNextSerialOperation(){if(this.mode!==`serial`||this.isSerialOperationRunning||this.interruption)return;let e=this.pendingEntries.shift();e&&this.startEntry(e)}cancelEntry(t,n){t.canceled||(t.canceled=!0,t.settled||this.rejectEntry(t,new e({cause:n})))}resolveEntry(e,t){e.settled||(e.settled=!0,e.resolve(t))}rejectEntry(e,t){e.settled||(e.settled=!0,e.reject(t))}},p=class extends Error{statusCode;code;details;constructor(e){super(e.message),this.name=`HttpError`,this.statusCode=e.statusCode,this.code=e.code,this.details=e.details,e.cause!==void 0&&(this.cause=e.cause)}},m=class{interceptors;constructor(e=[],t){this.interceptors=this.resolveInterceptors(e,t)}async intercept(e){let t=e;for(let e of this.interceptors)t=await e.intercept(t);return t}resolveInterceptors(e,t){let n=new Set,r=[];for(let i of e){if(n.has(i.identity)){t?.(`Duplicate HTTP request interceptor ignored: ${String(i.identity)}`);continue}n.add(i.identity),r.push(i)}return Object.freeze(r)}};const h={credentials:!0,headers:{}};var g=class{requestOptions;interceptorPipeline;asyncQueue;unauthorized;constructor(e={}){this.requestOptions=e.requestOptions??{},this.interceptorPipeline=e.interceptorPipeline??new m,this.asyncQueue=e.asyncQueue??new f,this.unauthorized=e.unauthorized}execute(e,t){return this.asyncQueue.execute(async()=>{let n=await this.makeRequestOptions(e,t);try{let t=this.createClient(n);return await e.execute(t)}catch(e){throw this.handleError(e)}})}handleError(t){return t instanceof p||t instanceof r||t instanceof i||t instanceof e||t instanceof a?t:new a({message:t instanceof Error?t.message:void 0,cause:t})}async makeRequestOptions(e,t){let n=this.mergeRequestOptions(h,this.requestOptions);return n=await this.interceptorPipeline.intercept(n),n=this.mergeRequestOptions(n,e.options),n=this.mergeRequestOptions(n,t),n}mergeRequestOptions(e,t){return t?{credentials:t.credentials??e.credentials,headers:{...e.headers,...t.headers}}:e}};function _(e,t){return{execute:t=>e(t),options:t}}function v(e,t){if(typeof Reflect==`object`&&typeof Reflect.metadata==`function`)return Reflect.metadata(e,t)}function y(e,t){return function(n,r){t(n,r,e)}}function b(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let x=class{endpoint;httpClient;constructor(e,t){this.endpoint=e,this.httpClient=t}async execute(e,t){let n=await this.convertOrThrow(()=>this.endpoint.convertInput(e)),r=this.endpoint.makeRequest(n),i=await this.httpClient.execute(r,t);return await this.convertOrThrow(()=>this.endpoint.convertOutput(i))}async convertOrThrow(e){try{return await e()}catch(e){throw new t({cause:e})}}};x=b([s(),y(0,c()),y(1,c()),v(`design:paramtypes`,[Object,Object])],x);let S=class extends x{constructor(e,t){super(e,t)}};S=b([s(),v(`design:paramtypes`,[Object,Object])],S);let C=class extends x{constructor(e,t){super(e,t)}async execute(t,n){try{return await super.execute(t,n)}catch(t){if(!(t instanceof p))throw t;let n=this.httpClient.unauthorized;throw!n||!n.statusCodes.includes(t.statusCode)?t:n.cancelAll?(await this.httpClient.asyncQueue.interrupt(()=>n.handler.handle(t)),new e({cause:t})):(await n.handler.handle(t),t)}}};C=b([s(),v(`design:paramtypes`,[Object,Object])],C);function w(){let e=o(),t=l();return[...e,...t]}export{f as AsyncQueueImpl,g as HttpClient,p as HttpError,m as HttpRequestInterceptorPipeline,S as PublicRemoteResource,x as RemoteResource,C as SecuredRemoteResource,d as WebKitL10nResource,u as WebKitSymbols,_ as defineHttpRequest,w as webkitAssembly};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buildplease/webkit",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "keywords": [],
   "repository": {
     "type": "git",