@mkja/o-data 0.0.4 → 0.0.6

package/dist/index.d.ts

@@ -48,7 +48,7 @@ declare class CollectionOperation<S extends Schema<S>, QE extends QueryableEntit
     /**
      * Query a collection of entities.
      */
-    query<Q extends CollectionQueryObject<QE, S>, O extends QueryOperationOptions>(q: Q, o?: O): Promise<CollectionQueryResponse<QE, Q, O>>;
+    query<Q extends CollectionQueryObject<QE, S>, O extends QueryOperationOptions>(q: Q, o?: O): Promise<CollectionQueryResponse<QE, Q, O, S>>;
     /**
      * Build the full URL for this operation.
      */

package/dist/index.js

@@ -91,13 +91,7 @@ export class OdataClient {
                 result: { error },
             };
         }
-        let result;
-        try {
-            result = await response.json();
-        }
-        catch {
-            result = {};
-        }
+        const result = response.status === 204 ? {} : await response.json();
         return {
             ok: true,
             status: response.status,
@@ -144,7 +138,7 @@ class CollectionOperation {
         const url = this.buildUrl(queryString);
         const request = new Request(url);
         const response = await this.#options.transport(request);
-        const data = await response.json();
+        const data = response.status === 204 || response.status === 304 ? {} : await response.json();
         return {
             ok: response.ok,
             status: response.status,
@@ -168,7 +162,7 @@ class CollectionOperation {
     async create(c, o) {
         const request = buildCreateRequest(this.#path, c, o, this.#options.baseUrl, this.#entityset, this.#schema);
         const response = await this.#options.transport(request);
-        const data = await response.json();
+        const data = response.status === 204 ? {} : await response.json();
         return {
             ok: response.ok,
             status: response.status,
@@ -223,7 +217,7 @@ class SingleOperation {
         const url = this.buildUrl(queryString);
         const request = new Request(url);
         const response = await this.#options.transport(request);
-        const data = await response.json();
+        const data = response.status === 204 || response.status === 304 ? {} : await response.json();
         return {
             ok: response.ok,
             status: response.status,
@@ -247,7 +241,7 @@ class SingleOperation {
     async update(u, o) {
         const request = buildUpdateRequest(this.#path, u, o, this.#options.baseUrl, this.#entityset, this.#schema);
         const response = await this.#options.transport(request);
-        const data = await response.json();
+        const data = response.status === 204 ? {} : await response.json();
         return {
             ok: response.ok,
             status: response.status,
@@ -366,13 +360,7 @@ class SingleOperation {
                 result: { error },
             };
         }
-        let result;
-        try {
-            result = await response.json();
-        }
-        catch {
-            result = {};
-        }
+        const result = response.status === 204 ? {} : await response.json();
         return {
             ok: true,
             status: response.status,

package/dist/response.d.ts

@@ -37,14 +37,12 @@ type ExtractQueryResultShape<E extends QueryableEntity, Q extends {
     select?: readonly (keyof E['properties'])[];
     expand?: Record<string, any>;
 }, S extends Schema<S> = Schema<any>> = Pick<E['properties'], ExtractSelectKeys<E, Q>> & ExtractExpandShape<E, Q, S>;
-export type CollectionQueryData<E extends QueryableEntity = any, Q extends CollectionQueryObject<E, any> = any, O = any> = Q extends CollectionQueryObject<E, infer S> ? {
-    value: ExtractQueryResultShape<E, Q, S>[];
-} & ODataMetadata : {
-    value: any[];
+export type CollectionQueryData<E extends QueryableEntity = any, Q extends CollectionQueryObject<E, any> = any, O = any, Sch extends Schema<Sch> = Schema<any>> = {
+    value: ExtractQueryResultShape<E, Q, Sch>[];
 } & ODataMetadata;
 export type CollectionQueryError = ODataError;
-export type CollectionQueryResponse<E extends QueryableEntity = any, Q extends CollectionQueryObject<E, any> = any, O = any> = ODataResponse<CollectionQueryData<E, Q, O>, CollectionQueryError> & {
-    next?: () => Promise<CollectionQueryResponse<E, Q, O>>;
+export type CollectionQueryResponse<E extends QueryableEntity = any, Q extends CollectionQueryObject<E, any> = any, O = any, Sch extends Schema<Sch> = Schema<any>> = ODataResponse<CollectionQueryData<E, Q, O, Sch>, CollectionQueryError> & {
+    next?: () => Promise<CollectionQueryResponse<E, Q, O, Sch>>;
 };
 export type SingleQueryData<E extends QueryableEntity = any, Q extends SingleQueryObject<E, any> = any, S extends Schema<S> = Schema<any>> = ExtractQueryResultShape<E, Q, S> & ODataMetadata;
 export type SingleQueryError = ODataError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mkja/o-data",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/m-kj-aldrin/o-data"