@mx-space/api-client 1.8.0-beta.1 → 1.8.1-alpha.0

package/dist/index.cjs

@@ -202,7 +202,7 @@ var ActivityController = class {
   likeIt(type, id) {
     return this.proxy.like.post({
       data: {
-        type,
+        type: type.toLowerCase(),
         id
       }
     });
@@ -940,7 +940,8 @@ var HTTPClient = class {
     this.options = options;
     this._endpoint = _endpoint.replace(/\/*$/, "").replace("localhost", "127.0.0.1");
     this._proxy = this.buildRoute(this)();
-    options.transformResponse = options.transformResponse || ((data) => camelcaseKeys(data));
+    options.transformResponse || (options.transformResponse = (data) => camelcaseKeys(data));
+    options.getDataFromResponse || (options.getDataFromResponse = (res) => res.data);
     this.initGetClient();
     attachRequestMethod(this);
   }
@@ -1047,7 +1048,7 @@ var HTTPClient = class {
                 }
                 throw that.options.customThrowResponseError ? that.options.customThrowResponseError(e) : new RequestError(message, code, url, e);
               }
-              const data = res.data;
+              const data = that.options.getDataFromResponse(res);
               if (!data) {
                 return null;
               }

package/dist/index.d.cts

@@ -16,6 +16,11 @@ interface IClientOptions {
     };
     customThrowResponseError: <T extends Error = Error>(err: any) => T;
     transformResponse: <T = any>(data: any) => T;
+    /**
+     *
+     * @default (res) => res.data
+     */
+    getDataFromResponse: <T = any>(response: unknown) => T;
 }
 type ClientOptions = Partial<IClientOptions>;
 
@@ -1608,4 +1613,4 @@ interface SnippetModel<T = unknown> extends BaseModel {
  */
 declare const camelcaseKeys: <T = any>(obj: any) => T;
 
-export { AckController, ActivityController, type ActivityPresence, AdminExtraModel, AggregateController, type AggregateRoot, type AggregateRootWithTheme, type AggregateStat, type AggregateTop, type AggregateTopNote, type AggregateTopPost, AlgoliaSearchOptionsModel, BackupOptionsModel, BaiduSearchOptionsModel, type BaseCommentIndexModel, type BaseModel, CategoryController, type CategoryEntries, type CategoryModel, CategoryType, type CategoryWithChildrenModel, CollectionRefTypes, CommentController, type CommentDto, type CommentModel, CommentOptionsModel, type CommentRef, CommentState, type Coordinate, type Count, EnumPageType, HTTPClient, type IConfig, type IConfigKeys, type Image, LinkController, type LinkModel, LinkState, LinkType, MailOptionsModel, type ModelWithLiked, NoteController, type NoteModel, type NoteMusicRecord, type NoteWrappedPayload, type NoteWrappedWithLikedPayload, PageController, type PageModel, type Pager, type PaginateResult, PostController, type PostModel, ProjectController, type ProjectModel, RecentlyAttitudeEnum, RecentlyAttitudeResultEnum, RecentlyController, type RecentlyModel, type RecentlyRefType, RecentlyRefTypes, RequestError, type RoomOmittedNote, type RoomOmittedPage, type RoomOmittedPost, type RoomsData, SayController, type SayModel, SearchController, SeoOptionModel, ServerlessController, SnippetController, type SnippetModel, SnippetType, SubscribeAllBit, SubscribeController, SubscribeNoteCreateBit, SubscribePostCreateBit, SubscribeRecentCreateBit, SubscribeSayCreateBit, type SubscribeType, SubscribeTypeToBitMap, type TLogin, type TagModel, type TextBaseModel, type TimelineData, TimelineType, TopicController, type TopicModel, type Url, UrlOptionModel, UserController, type UserModel, allControllerNames, allControllers, createClient, createClient as default, camelcaseKeys as simpleCamelcaseKeys };
+export { AckController, ActivityController, type ActivityPresence, AdminExtraModel, AggregateController, type AggregateRoot, type AggregateRootWithTheme, type AggregateStat, type AggregateTop, type AggregateTopNote, type AggregateTopPost, AlgoliaSearchOptionsModel, BackupOptionsModel, BaiduSearchOptionsModel, type BaseCommentIndexModel, type BaseModel, CategoryController, type CategoryEntries, type CategoryModel, CategoryType, type CategoryWithChildrenModel, CollectionRefTypes, CommentController, type CommentDto, type CommentModel, CommentOptionsModel, type CommentRef, CommentState, type Coordinate, type Count, EnumPageType, HTTPClient, type IConfig, type IConfigKeys, IRequestAdapter, type Image, LinkController, type LinkModel, LinkState, LinkType, MailOptionsModel, type ModelWithLiked, NoteController, type NoteModel, type NoteMusicRecord, type NoteWrappedPayload, type NoteWrappedWithLikedPayload, PageController, type PageModel, type Pager, type PaginateResult, PostController, type PostModel, ProjectController, type ProjectModel, RecentlyAttitudeEnum, RecentlyAttitudeResultEnum, RecentlyController, type RecentlyModel, type RecentlyRefType, RecentlyRefTypes, RequestError, type RoomOmittedNote, type RoomOmittedPage, type RoomOmittedPost, type RoomsData, SayController, type SayModel, SearchController, SeoOptionModel, ServerlessController, SnippetController, type SnippetModel, SnippetType, SubscribeAllBit, SubscribeController, SubscribeNoteCreateBit, SubscribePostCreateBit, SubscribeRecentCreateBit, SubscribeSayCreateBit, type SubscribeType, SubscribeTypeToBitMap, type TLogin, type TagModel, type TextBaseModel, type TimelineData, TimelineType, TopicController, type TopicModel, type Url, UrlOptionModel, UserController, type UserModel, allControllerNames, allControllers, createClient, createClient as default, camelcaseKeys as simpleCamelcaseKeys };

package/dist/index.d.ts

@@ -16,6 +16,11 @@ interface IClientOptions {
     };
     customThrowResponseError: <T extends Error = Error>(err: any) => T;
     transformResponse: <T = any>(data: any) => T;
+    /**
+     *
+     * @default (res) => res.data
+     */
+    getDataFromResponse: <T = any>(response: unknown) => T;
 }
 type ClientOptions = Partial<IClientOptions>;
 
@@ -1608,4 +1613,4 @@ interface SnippetModel<T = unknown> extends BaseModel {
  */
 declare const camelcaseKeys: <T = any>(obj: any) => T;
 
-export { AckController, ActivityController, type ActivityPresence, AdminExtraModel, AggregateController, type AggregateRoot, type AggregateRootWithTheme, type AggregateStat, type AggregateTop, type AggregateTopNote, type AggregateTopPost, AlgoliaSearchOptionsModel, BackupOptionsModel, BaiduSearchOptionsModel, type BaseCommentIndexModel, type BaseModel, CategoryController, type CategoryEntries, type CategoryModel, CategoryType, type CategoryWithChildrenModel, CollectionRefTypes, CommentController, type CommentDto, type CommentModel, CommentOptionsModel, type CommentRef, CommentState, type Coordinate, type Count, EnumPageType, HTTPClient, type IConfig, type IConfigKeys, type Image, LinkController, type LinkModel, LinkState, LinkType, MailOptionsModel, type ModelWithLiked, NoteController, type NoteModel, type NoteMusicRecord, type NoteWrappedPayload, type NoteWrappedWithLikedPayload, PageController, type PageModel, type Pager, type PaginateResult, PostController, type PostModel, ProjectController, type ProjectModel, RecentlyAttitudeEnum, RecentlyAttitudeResultEnum, RecentlyController, type RecentlyModel, type RecentlyRefType, RecentlyRefTypes, RequestError, type RoomOmittedNote, type RoomOmittedPage, type RoomOmittedPost, type RoomsData, SayController, type SayModel, SearchController, SeoOptionModel, ServerlessController, SnippetController, type SnippetModel, SnippetType, SubscribeAllBit, SubscribeController, SubscribeNoteCreateBit, SubscribePostCreateBit, SubscribeRecentCreateBit, SubscribeSayCreateBit, type SubscribeType, SubscribeTypeToBitMap, type TLogin, type TagModel, type TextBaseModel, type TimelineData, TimelineType, TopicController, type TopicModel, type Url, UrlOptionModel, UserController, type UserModel, allControllerNames, allControllers, createClient, createClient as default, camelcaseKeys as simpleCamelcaseKeys };
+export { AckController, ActivityController, type ActivityPresence, AdminExtraModel, AggregateController, type AggregateRoot, type AggregateRootWithTheme, type AggregateStat, type AggregateTop, type AggregateTopNote, type AggregateTopPost, AlgoliaSearchOptionsModel, BackupOptionsModel, BaiduSearchOptionsModel, type BaseCommentIndexModel, type BaseModel, CategoryController, type CategoryEntries, type CategoryModel, CategoryType, type CategoryWithChildrenModel, CollectionRefTypes, CommentController, type CommentDto, type CommentModel, CommentOptionsModel, type CommentRef, CommentState, type Coordinate, type Count, EnumPageType, HTTPClient, type IConfig, type IConfigKeys, IRequestAdapter, type Image, LinkController, type LinkModel, LinkState, LinkType, MailOptionsModel, type ModelWithLiked, NoteController, type NoteModel, type NoteMusicRecord, type NoteWrappedPayload, type NoteWrappedWithLikedPayload, PageController, type PageModel, type Pager, type PaginateResult, PostController, type PostModel, ProjectController, type ProjectModel, RecentlyAttitudeEnum, RecentlyAttitudeResultEnum, RecentlyController, type RecentlyModel, type RecentlyRefType, RecentlyRefTypes, RequestError, type RoomOmittedNote, type RoomOmittedPage, type RoomOmittedPost, type RoomsData, SayController, type SayModel, SearchController, SeoOptionModel, ServerlessController, SnippetController, type SnippetModel, SnippetType, SubscribeAllBit, SubscribeController, SubscribeNoteCreateBit, SubscribePostCreateBit, SubscribeRecentCreateBit, SubscribeSayCreateBit, type SubscribeType, SubscribeTypeToBitMap, type TLogin, type TagModel, type TextBaseModel, type TimelineData, TimelineType, TopicController, type TopicModel, type Url, UrlOptionModel, UserController, type UserModel, allControllerNames, allControllers, createClient, createClient as default, camelcaseKeys as simpleCamelcaseKeys };

package/dist/index.global.js

@@ -138,7 +138,7 @@
     likeIt(type, id) {
       return this.proxy.like.post({
         data: {
-          type,
+          type: type.toLowerCase(),
           id
         }
       });
@@ -876,7 +876,8 @@
       this.options = options;
       this._endpoint = _endpoint.replace(/\/*$/, "").replace("localhost", "127.0.0.1");
       this._proxy = this.buildRoute(this)();
-      options.transformResponse = options.transformResponse || ((data) => camelcaseKeys(data));
+      options.transformResponse || (options.transformResponse = (data) => camelcaseKeys(data));
+      options.getDataFromResponse || (options.getDataFromResponse = (res) => res.data);
       this.initGetClient();
       attachRequestMethod(this);
     }
@@ -983,7 +984,7 @@
                   }
                   throw that.options.customThrowResponseError ? that.options.customThrowResponseError(e) : new RequestError(message, code, url, e);
                 }
-                const data = res.data;
+                const data = that.options.getDataFromResponse(res);
                 if (!data) {
                   return null;
                 }

package/dist/index.js

@@ -136,7 +136,7 @@ var ActivityController = class {
   likeIt(type, id) {
     return this.proxy.like.post({
       data: {
-        type,
+        type: type.toLowerCase(),
         id
       }
     });
@@ -874,7 +874,8 @@ var HTTPClient = class {
     this.options = options;
     this._endpoint = _endpoint.replace(/\/*$/, "").replace("localhost", "127.0.0.1");
     this._proxy = this.buildRoute(this)();
-    options.transformResponse = options.transformResponse || ((data) => camelcaseKeys(data));
+    options.transformResponse || (options.transformResponse = (data) => camelcaseKeys(data));
+    options.getDataFromResponse || (options.getDataFromResponse = (res) => res.data);
     this.initGetClient();
     attachRequestMethod(this);
   }
@@ -981,7 +982,7 @@ var HTTPClient = class {
                 }
                 throw that.options.customThrowResponseError ? that.options.customThrowResponseError(e) : new RequestError(message, code, url, e);
               }
-              const data = res.data;
+              const data = that.options.getDataFromResponse(res);
               if (!data) {
                 return null;
               }

package/index.ts

@@ -10,3 +10,4 @@ export { camelcaseKeys as simpleCamelcaseKeys } from './utils/camelcase-keys'
 
 // eslint-disable-next-line import/no-default-export
 export default createClient
+export type { IRequestAdapter } from './interfaces/adapter'

package/interfaces/client.ts

@@ -11,5 +11,10 @@ interface IClientOptions {
   }
   customThrowResponseError: <T extends Error = Error>(err: any) => T
   transformResponse: <T = any>(data: any) => T
+  /**
+   *
+   * @default (res) => res.data
+   */
+  getDataFromResponse: <T = any>(response: unknown) => T
 }
 export type ClientOptions = Partial<IClientOptions>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mx-space/api-client",
-  "version": "1.8.0-beta.1",
+  "version": "1.8.1-alpha.0",
   "type": "module",
   "description": "A api client for mx-space server@next",
   "author": "Innei",
@@ -46,18 +46,17 @@
   "devDependencies": {
     "@types/cors": "2.8.17",
     "@types/express": "4.17.21",
-    "@types/lodash": "4.14.202",
+    "@types/lodash": "4.17.0",
     "abort-controller": "3.0.0",
     "axios": "^1.6.7",
     "camelcase-keys": "^9.1.3",
     "cors": "2.8.5",
-    "express": "4.18.2",
+    "express": "4.19.1",
     "form-data": "4.0.0",
-    "ky": "1.2.0",
     "lodash": "4.17.21",
     "tsup": "8.0.2",
     "umi-request": "1.4.0",
-    "vite": "^5.0.12",
+    "vite": "^5.1.3",
     "vitest": "^1.0.4"
   }
 }

package/dist/adaptors/ky.cjs

@@ -1,98 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// adaptors/ky.ts
-var ky_exports = {};
-__export(ky_exports, {
-  createKyAdaptor: () => createKyAdaptor,
-  default: () => ky_default,
-  defaultKyAdaptor: () => defaultKyAdaptor
-});
-module.exports = __toCommonJS(ky_exports);
-var import_ky = __toESM(require("ky"), 1);
-var $http = /* @__PURE__ */ import_ky.default.create({});
-var getDataFromKyResponse = async (response) => {
-  const res = await response;
-  const isJsonType = res.headers.get("content-type")?.includes("application/json");
-  const json = isJsonType ? await res.clone().json() : null;
-  const result = {
-    ...res,
-    data: json ?? await res.clone().text()
-  };
-  return result;
-};
-var createKyAdaptor = (ky2) => {
-  const adaptor = Object.preventExtensions({
-    get default() {
-      return ky2;
-    },
-    responseWrapper: {},
-    get(url, options) {
-      return getDataFromKyResponse(ky2.get(url, options));
-    },
-    async post(url, options) {
-      const data = options.data;
-      delete options.data;
-      const kyOptions = {
-        ...options,
-        json: data
-      };
-      return getDataFromKyResponse(ky2.post(url, kyOptions));
-    },
-    put(url, options) {
-      const data = options.data;
-      delete options.data;
-      const kyOptions = {
-        ...options,
-        json: data
-      };
-      return getDataFromKyResponse(ky2.put(url, kyOptions));
-    },
-    patch(url, options) {
-      const data = options.data;
-      delete options.data;
-      const kyOptions = {
-        ...options,
-        json: data
-      };
-      return getDataFromKyResponse(ky2.patch(url, kyOptions));
-    },
-    delete(url, options) {
-      return getDataFromKyResponse(ky2.delete(url, options));
-    }
-  });
-  return adaptor;
-};
-var defaultKyAdaptor = createKyAdaptor($http);
-var ky_default = defaultKyAdaptor;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createKyAdaptor,
-  defaultKyAdaptor
-});

package/dist/adaptors/ky.d.cts

@@ -1,26 +0,0 @@
-import { R as RequestOptions, a as IAdaptorRequestResponseType } from '../adapter-29diOMCR.cjs';
-import { ResponsePromise } from 'ky';
-import { KyInstance } from 'ky/distribution/types/ky';
-
-declare const createKyAdaptor: (ky: KyInstance) => Readonly<{
-    responseWrapper: ResponsePromise;
-} & {
-    default: KyInstance;
-    get<P = unknown>(url: string, options?: Omit<RequestOptions, "data"> | undefined): IAdaptorRequestResponseType<P>;
-    post<P_1 = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P_1>;
-    patch<P_2 = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P_2>;
-    delete<P_3 = unknown>(url: string, options?: Omit<RequestOptions, "data"> | undefined): IAdaptorRequestResponseType<P_3>;
-    put<P_4 = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P_4>;
-}>;
-declare const defaultKyAdaptor: Readonly<{
-    responseWrapper: ResponsePromise;
-} & {
-    default: KyInstance;
-    get<P = unknown>(url: string, options?: Omit<RequestOptions, "data"> | undefined): IAdaptorRequestResponseType<P>;
-    post<P_1 = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P_1>;
-    patch<P_2 = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P_2>;
-    delete<P_3 = unknown>(url: string, options?: Omit<RequestOptions, "data"> | undefined): IAdaptorRequestResponseType<P_3>;
-    put<P_4 = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P_4>;
-}>;
-
-export { createKyAdaptor, defaultKyAdaptor as default, defaultKyAdaptor };

package/dist/adaptors/ky.d.ts

@@ -1,26 +0,0 @@
-import { R as RequestOptions, a as IAdaptorRequestResponseType } from '../adapter-29diOMCR.js';
-import { ResponsePromise } from 'ky';
-import { KyInstance } from 'ky/distribution/types/ky';
-
-declare const createKyAdaptor: (ky: KyInstance) => Readonly<{
-    responseWrapper: ResponsePromise;
-} & {
-    default: KyInstance;
-    get<P = unknown>(url: string, options?: Omit<RequestOptions, "data"> | undefined): IAdaptorRequestResponseType<P>;
-    post<P_1 = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P_1>;
-    patch<P_2 = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P_2>;
-    delete<P_3 = unknown>(url: string, options?: Omit<RequestOptions, "data"> | undefined): IAdaptorRequestResponseType<P_3>;
-    put<P_4 = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P_4>;
-}>;
-declare const defaultKyAdaptor: Readonly<{
-    responseWrapper: ResponsePromise;
-} & {
-    default: KyInstance;
-    get<P = unknown>(url: string, options?: Omit<RequestOptions, "data"> | undefined): IAdaptorRequestResponseType<P>;
-    post<P_1 = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P_1>;
-    patch<P_2 = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P_2>;
-    delete<P_3 = unknown>(url: string, options?: Omit<RequestOptions, "data"> | undefined): IAdaptorRequestResponseType<P_3>;
-    put<P_4 = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P_4>;
-}>;
-
-export { createKyAdaptor, defaultKyAdaptor as default, defaultKyAdaptor };