@civet/common 2.1.0 → 2.1.1

package/dist/FetchProvider.d.ts

@@ -15,8 +15,8 @@ export type FetchOptions<Item = unknown, MetaType extends Meta = Meta, ResponseT
 declare class FetchProvider<Item = unknown, ResponseType extends Item | Item[] = Item | Item[], Query extends RequestInit | undefined = RequestInit | undefined, MetaType extends Meta = Meta, Options extends FetchOptions<Item, MetaType, ResponseType> = FetchOptions<Item, MetaType, ResponseType>> extends DataProvider<Item, Query, Options, MetaType, ResponseType> {
     private options;
     constructor(options?: FetchProviderOptions<Item, MetaType, ResponseType>);
-    handleGet(url: string, query: Query, options: Options | undefined, meta: MetaType, abortSignal: AbortSignalProxy): Promise<ResponseType>;
     normalizeResource(resource: string): string;
+    handleGet(url: string, query: Query, options: Options | undefined, meta: MetaType, abortSignal: AbortSignalProxy): Promise<ResponseType>;
     request<ResponseTypeI extends ResponseType = ResponseType, QueryI extends Query = Query, OptionsI extends Options = Options, MetaTypeI extends MetaType = MetaType>(url: string, query: QueryI, options?: OptionsI | undefined, meta?: MetaTypeI, abortSignal?: AbortSignalProxy): Promise<ResponseTypeI>;
 }
 declare const FetchProviderWithPlugins: import('@civet/core').DataProviderImplementationWithPlugin<typeof FetchProvider, unknown, {

package/dist/main.js

@@ -1,23 +1,23 @@
 import { DataProvider as d, Meta as l } from "@civet/core";
-import { eventPlugin as f, EventReceiver as p } from "@civet/events";
+import { eventPlugin as p, EventReceiver as f } from "@civet/events";
 class v extends d {
   options;
-  constructor(s = {}) {
-    super(), this.options = s;
+  constructor(r = {}) {
+    super(), this.options = r;
   }
-  handleGet(s, n, t, e, u) {
-    return this.request(s, n, t, e, u);
+  normalizeResource(r) {
+    return new URL(r, this.options.baseURL).toString();
   }
-  normalizeResource(s) {
-    return new URL(s, this.options.baseURL).toString();
+  handleGet(r, n, t, e, u) {
+    return this.request(r, n, t, e, u);
   }
-  async request(s, n, t, e, u) {
+  async request(r, n, t, e, u) {
     e = e instanceof l ? e : new l(e);
     const a = new AbortController();
     u?.listen(a.abort.bind(a));
-    const r = new URL(s), c = new Headers(n?.headers), o = { ...n, headers: c };
-    await this.options.modifyRequest?.(r, o, e);
-    const i = await fetch(r.toString(), {
+    const s = new URL(r, this.options.baseURL), c = new Headers(n?.headers), o = { ...n, headers: c };
+    await this.options.modifyRequest?.(s, o, e);
+    const i = await fetch(s.toString(), {
       ...o,
       signal: AbortSignal.any(
         [o.signal, a.signal].filter((g) => g != null)
@@ -26,14 +26,14 @@ class v extends d {
     if (!i.ok) {
       if (t?.handleError)
         return t.handleError(
-          r,
+          s,
           o,
           i,
           e
         );
       if (this.options.handleError)
         return this.options.handleError(
-          r,
+          s,
           o,
           i,
           e
@@ -42,14 +42,14 @@ class v extends d {
     }
     if (t?.getResponse)
       return t.getResponse(
-        r,
+        s,
         o,
         i,
         e
       );
     if (this.options.getResponse)
       return this.options.getResponse(
-        r,
+        s,
         o,
         i,
         e
@@ -62,23 +62,23 @@ class v extends d {
     throw new Error("unprocessable response");
   }
 }
-const w = f(v);
-class R extends p {
+const w = p(v);
+class R extends f {
   eventSource;
   options;
-  constructor(s, n = {}) {
-    super(), this.eventSource = s, this.options = n;
+  constructor(r, n = {}) {
+    super(), this.eventSource = r, this.options = n;
   }
-  handleSubscribe(s, n, t) {
+  handleSubscribe(r, n, t) {
     let e;
-    const u = s.subscribe(
+    const u = r.subscribe(
       (c) => {
         e = c;
       }
     ), a = new AbortController();
     a.signal.addEventListener("abort", u);
-    let r = [];
-    return n?.events ? r = n.events : this.options.events && (r = this.options.events), r.length === 0 && (r = ["message"]), r.forEach((c) => {
+    let s = [];
+    return n?.events ? s = n.events : this.options.events && (s = this.options.events), s.length === 0 && (s = ["message"]), s.forEach((c) => {
       this.eventSource.addEventListener(
         c,
         async (o) => n?.getEvents ? t(await n.getEvents(e, c, o)) : this.options.getEvents ? t(await this.options.getEvents(e, c, o)) : t([o]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civet/common",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Civet",
   "author": {
     "name": "Aaron Burmeister"