@mkja/o-data 0.0.1 → 0.0.2

package/dist/response.d.ts

@@ -38,21 +38,17 @@ type ExtractQueryResultShape<E extends QueryableEntity, Q extends {
     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> ? {
-    data: ExtractQueryResultShape<E, Q, S>[];
+    value: ExtractQueryResultShape<E, Q, S>[];
 } & ODataMetadata : {
-    data: any[];
+    value: any[];
 } & 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 SingleQueryData<E extends QueryableEntity = any, Q extends SingleQueryObject<E, any> = any> = Q extends SingleQueryObject<E, infer S> ? {
-    data: ExtractQueryResultShape<E, Q, S>;
-} & ODataMetadata : {
-    data: any;
-} & ODataMetadata;
+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;
-export type SingleQueryResponse<E extends QueryableEntity = any, Q extends SingleQueryObject<E> = any, O = any> = ODataResponse<SingleQueryData<E, Q>, SingleQueryError>;
+export type SingleQueryResponse<E extends QueryableEntity = any, Q extends SingleQueryObject<E> = any, O = any, Sch extends Schema<Sch> = Schema<any>> = ODataResponse<SingleQueryData<E, Q, Sch>, SingleQueryError>;
 type ExtractSelectKeysForOperation<QE extends {
     properties: Record<string, any>;
 }, Select extends readonly (keyof QE['properties'])[]> = Select[number];
@@ -71,13 +67,7 @@ export type CreateResultData<QE extends QueryableEntity = any, O extends {
     };
 } = any> = O['prefer'] extends {
     return_representation: true;
-} ? ({
-    data: CreateDataShape<QE, O>;
-} & ODataMetadata) : O['select'] extends readonly (keyof QE['properties'])[] ? ({
-    data: CreateDataShape<QE, O>;
-} & ODataMetadata) : {
-    data: undefined;
-};
+} ? CreateDataShape<QE, O> & ODataMetadata : O['select'] extends readonly (keyof QE['properties'])[] ? CreateDataShape<QE, O> & ODataMetadata : ODataMetadata;
 export type CreateResultError = ODataError;
 export type CreateResponse<QE extends QueryableEntity = any, O extends {
     select?: readonly (keyof QE['properties'])[];
@@ -100,13 +90,7 @@ export type UpdateResultData<QE extends QueryableEntity = any, O extends {
     };
 } = any> = O['prefer'] extends {
     return_representation: true;
-} ? ({
-    data: UpdateDataShape<QE, O>;
-} & ODataMetadata) : O['select'] extends readonly (keyof QE['properties'])[] ? ({
-    data: UpdateDataShape<QE, O>;
-} & ODataMetadata) : {
-    data: undefined;
-};
+} ? UpdateDataShape<QE, O> & ODataMetadata : O['select'] extends readonly (keyof QE['properties'])[] ? UpdateDataShape<QE, O> & ODataMetadata : ODataMetadata;
 export type UpdateResultError = ODataError;
 export type UpdateResponse<QE extends QueryableEntity = any, O extends {
     select?: readonly (keyof QE['properties'])[];
@@ -114,19 +98,13 @@ export type UpdateResponse<QE extends QueryableEntity = any, O extends {
         return_representation?: boolean;
     };
 } = any> = ODataResponse<UpdateResultData<QE, O>, UpdateResultError>;
-export type DeleteResultData = {
-    data: undefined;
-} & ODataMetadata;
+export type DeleteResultData = ODataMetadata;
 export type DeleteResultError = ODataError;
 export type DeleteResponse = ODataResponse<DeleteResultData, DeleteResultError>;
-export type ActionResultData<R = any> = {
-    data: R extends undefined ? void : R;
-} & ODataMetadata;
+export type ActionResultData<R = any> = R extends undefined | void ? ODataMetadata : R & ODataMetadata;
 export type ActionResultError = ODataError;
 export type ActionResponse<S extends Schema<S> = any, R extends ODataType<any> | undefined = undefined> = R extends undefined ? ODataResponse<ActionResultData<void>, ActionResultError> : ODataResponse<ActionResultData<ODataTypeToTS<Exclude<R, undefined>, S>>, ActionResultError>;
-export type FunctionResultData<R = any> = {
-    data: R;
-} & ODataMetadata;
+export type FunctionResultData<R = any> = R & ODataMetadata;
 export type FunctionResultError = ODataError;
 export type FunctionResponse<S extends Schema<S> = any, R extends ODataType<any> = any> = ODataResponse<FunctionResultData<ODataTypeToTS<R, S>>, FunctionResultError>;
 export {};

package/dist/schema.d.ts

@@ -124,5 +124,5 @@ export type EntityTypeFromEntityTypeKeys<T extends Schema<T>, K extends keyof T[
 export type NavigationsTarget<N extends {
     target: any;
 }> = N['target'];
-export declare function schema<S extends Schema<S>>(definition: S): S;
+export declare function schema<const S extends Schema<S>>(definition: S): S;
 export {};

package/package.json

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