@mx-space/api-client 1.3.5 → 1.4.0

package/dist/adaptors/ky.global.js

@@ -1,6 +1,6 @@
 "use strict";
 (() => {
-  // ../../node_modules/.pnpm/ky@0.33.2/node_modules/ky/distribution/errors/HTTPError.js
+  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/errors/HTTPError.js
   var HTTPError = class extends Error {
     constructor(response, request, options) {
       const code = response.status || response.status === 0 ? response.status : "";
@@ -33,7 +33,7 @@
     }
   };
 
-  // ../../node_modules/.pnpm/ky@0.33.2/node_modules/ky/distribution/errors/TimeoutError.js
+  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/errors/TimeoutError.js
   var TimeoutError = class extends Error {
     constructor(request) {
       super("Request timed out");
@@ -48,10 +48,10 @@
     }
   };
 
-  // ../../node_modules/.pnpm/ky@0.33.2/node_modules/ky/distribution/utils/is.js
+  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/utils/is.js
   var isObject = (value) => value !== null && typeof value === "object";
 
-  // ../../node_modules/.pnpm/ky@0.33.2/node_modules/ky/distribution/utils/merge.js
+  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/utils/merge.js
   var validateAndMerge = (...sources) => {
     for (const source of sources) {
       if ((!isObject(source) || Array.isArray(source)) && typeof source !== "undefined") {
@@ -98,12 +98,13 @@
     return returnValue;
   };
 
-  // ../../node_modules/.pnpm/ky@0.33.2/node_modules/ky/distribution/core/constants.js
+  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/core/constants.js
   var supportsRequestStreams = (() => {
     let duplexAccessed = false;
     let hasContentType = false;
     const supportsReadableStream = typeof globalThis.ReadableStream === "function";
-    if (supportsReadableStream) {
+    const supportsRequest = typeof globalThis.Request === "function";
+    if (supportsReadableStream && supportsRequest) {
       hasContentType = new globalThis.Request("https://a.com", {
         body: new globalThis.ReadableStream(),
         method: "POST",
@@ -132,7 +133,7 @@
   var maxSafeTimeout = 2147483647;
   var stop = Symbol("stop");
 
-  // ../../node_modules/.pnpm/ky@0.33.2/node_modules/ky/distribution/utils/normalize.js
+  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/utils/normalize.js
   var normalizeRequestMethod = (input) => requestMethods.includes(input) ? input.toUpperCase() : input;
   var retryMethods = ["get", "put", "head", "delete", "options", "trace"];
   var retryStatusCodes = [408, 413, 429, 500, 502, 503, 504];
@@ -165,7 +166,7 @@
     };
   };
 
-  // ../../node_modules/.pnpm/ky@0.33.2/node_modules/ky/distribution/utils/timeout.js
+  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/utils/timeout.js
   async function timeout(request, abortController, options) {
     return new Promise((resolve, reject) => {
       const timeoutId = setTimeout(() => {
@@ -180,7 +181,7 @@
     });
   }
 
-  // ../../node_modules/.pnpm/ky@0.33.2/node_modules/ky/distribution/errors/DOMException.js
+  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/errors/DOMException.js
   var isDomExceptionSupported = Boolean(globalThis.DOMException);
   function composeAbortError(signal) {
     if (isDomExceptionSupported) {
@@ -191,7 +192,7 @@
     return error;
   }
 
-  // ../../node_modules/.pnpm/ky@0.33.2/node_modules/ky/distribution/utils/delay.js
+  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/utils/delay.js
   async function delay(ms, { signal }) {
     return new Promise((resolve, reject) => {
       if (signal) {
@@ -212,7 +213,7 @@
     });
   }
 
-  // ../../node_modules/.pnpm/ky@0.33.2/node_modules/ky/distribution/core/Ky.js
+  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/core/Ky.js
   var Ky = class {
     // eslint-disable-next-line @typescript-eslint/promise-function-async
     static create(input, options) {
@@ -484,7 +485,7 @@
     }
   };
 
-  // ../../node_modules/.pnpm/ky@0.33.2/node_modules/ky/distribution/index.js
+  // ../../node_modules/.pnpm/ky@0.33.3/node_modules/ky/distribution/index.js
   var createInstance = (defaults) => {
     const ky2 = (input, options) => Ky.create(input, validateAndMerge(defaults, options));
     for (const method of requestMethods) {

package/dist/index.d.ts

@@ -129,7 +129,6 @@ interface TextBaseModel extends BaseCommentIndexModel {
     text: string;
     images?: Image[];
     modified: string | null;
-    meta?: Record<string, any>;
 }
 type ModelWithLiked<T> = T & {
     liked: boolean;
@@ -336,9 +335,13 @@ interface Url {
     serverUrl: string;
     webUrl: string;
 }
+interface AggregateTopNote extends Pick<NoteModel, 'id' | 'title' | 'created' | 'nid' | 'images'> {
+}
+interface AggregateTopPost extends Pick<PostModel, 'id' | 'slug' | 'created' | 'title' | 'category' | 'images'> {
+}
 interface AggregateTop {
-    notes: Pick<NoteModel, 'id' | 'title' | 'created' | 'nid'>[];
-    posts: Pick<PostModel, 'id' | 'slug' | 'created' | 'title' | 'category'>[];
+    notes: AggregateTopNote[];
+    posts: AggregateTopPost[];
     says: SayModel[];
 }
 declare enum TimelineType {
@@ -1194,47 +1197,7 @@ declare class SearchController<ResponseWrapper> implements IController {
          * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
          */
         raw?: any;
-    }, ResponseWrapper, ResponseWrapper extends unknown ? {
-        [key: string]: any;
-        data: PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
-            type: 'post';
-        }) | (Pick<NoteModel, "id" | "created" | "modified" | "title" | "nid"> & {
-            type: 'note';
-        }) | (Pick<PageModel, "id" | "created" | "modified" | "title" | "slug"> & {
-            type: 'page';
-        })> & {
-            /**
-             * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
-             */
-            raw?: any;
-        };
-    } : ResponseWrapper extends {
-        data: PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
-            type: 'post';
-        }) | (Pick<NoteModel, "id" | "created" | "modified" | "title" | "nid"> & {
-            type: 'note';
-        }) | (Pick<PageModel, "id" | "created" | "modified" | "title" | "slug"> & {
-            type: 'page';
-        })> & {
-            /**
-             * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
-             */
-            raw?: any;
-        };
-    } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
-        data: PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
-            type: 'post';
-        }) | (Pick<NoteModel, "id" | "created" | "modified" | "title" | "nid"> & {
-            type: 'note';
-        }) | (Pick<PageModel, "id" | "created" | "modified" | "title" | "slug"> & {
-            type: 'page';
-        })> & {
-            /**
-             * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
-             */
-            raw?: any;
-        };
-    }>, ResponseWrapper, ResponseWrapper extends unknown ? {
+    }, ResponseWrapper>, ResponseWrapper, ResponseWrapper extends unknown ? {
         [key: string]: any;
         data: RequestProxyResult<PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
             type: 'post';
@@ -1247,47 +1210,7 @@ declare class SearchController<ResponseWrapper> implements IController {
              * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
              */
             raw?: any;
-        }, ResponseWrapper, ResponseWrapper extends unknown ? {
-            [key: string]: any;
-            data: PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
-                type: 'post';
-            }) | (Pick<NoteModel, "id" | "created" | "modified" | "title" | "nid"> & {
-                type: 'note';
-            }) | (Pick<PageModel, "id" | "created" | "modified" | "title" | "slug"> & {
-                type: 'page';
-            })> & {
-                /**
-                 * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
-                 */
-                raw?: any;
-            };
-        } : ResponseWrapper extends {
-            data: PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
-                type: 'post';
-            }) | (Pick<NoteModel, "id" | "created" | "modified" | "title" | "nid"> & {
-                type: 'note';
-            }) | (Pick<PageModel, "id" | "created" | "modified" | "title" | "slug"> & {
-                type: 'page';
-            })> & {
-                /**
-                 * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
-                 */
-                raw?: any;
-            };
-        } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
-            data: PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
-                type: 'post';
-            }) | (Pick<NoteModel, "id" | "created" | "modified" | "title" | "nid"> & {
-                type: 'note';
-            }) | (Pick<PageModel, "id" | "created" | "modified" | "title" | "slug"> & {
-                type: 'page';
-            })> & {
-                /**
-                 * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
-                 */
-                raw?: any;
-            };
-        }>;
+        }, ResponseWrapper>;
     } : ResponseWrapper extends {
         data: RequestProxyResult<PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
             type: 'post';
@@ -1300,47 +1223,7 @@ declare class SearchController<ResponseWrapper> implements IController {
              * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
              */
             raw?: any;
-        }, ResponseWrapper, ResponseWrapper extends unknown ? {
-            [key: string]: any;
-            data: PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
-                type: 'post';
-            }) | (Pick<NoteModel, "id" | "created" | "modified" | "title" | "nid"> & {
-                type: 'note';
-            }) | (Pick<PageModel, "id" | "created" | "modified" | "title" | "slug"> & {
-                type: 'page';
-            })> & {
-                /**
-                 * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
-                 */
-                raw?: any;
-            };
-        } : ResponseWrapper extends {
-            data: PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
-                type: 'post';
-            }) | (Pick<NoteModel, "id" | "created" | "modified" | "title" | "nid"> & {
-                type: 'note';
-            }) | (Pick<PageModel, "id" | "created" | "modified" | "title" | "slug"> & {
-                type: 'page';
-            })> & {
-                /**
-                 * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
-                 */
-                raw?: any;
-            };
-        } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
-            data: PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
-                type: 'post';
-            }) | (Pick<NoteModel, "id" | "created" | "modified" | "title" | "nid"> & {
-                type: 'note';
-            }) | (Pick<PageModel, "id" | "created" | "modified" | "title" | "slug"> & {
-                type: 'page';
-            })> & {
-                /**
-                 * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
-                 */
-                raw?: any;
-            };
-        }>;
+        }, ResponseWrapper>;
     } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
         data: RequestProxyResult<PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
             type: 'post';
@@ -1353,47 +1236,7 @@ declare class SearchController<ResponseWrapper> implements IController {
              * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
              */
             raw?: any;
-        }, ResponseWrapper, ResponseWrapper extends unknown ? {
-            [key: string]: any;
-            data: PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
-                type: 'post';
-            }) | (Pick<NoteModel, "id" | "created" | "modified" | "title" | "nid"> & {
-                type: 'note';
-            }) | (Pick<PageModel, "id" | "created" | "modified" | "title" | "slug"> & {
-                type: 'page';
-            })> & {
-                /**
-                 * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
-                 */
-                raw?: any;
-            };
-        } : ResponseWrapper extends {
-            data: PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
-                type: 'post';
-            }) | (Pick<NoteModel, "id" | "created" | "modified" | "title" | "nid"> & {
-                type: 'note';
-            }) | (Pick<PageModel, "id" | "created" | "modified" | "title" | "slug"> & {
-                type: 'page';
-            })> & {
-                /**
-                 * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
-                 */
-                raw?: any;
-            };
-        } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
-            data: PaginateResult<(Pick<PostModel, "id" | "category" | "created" | "modified" | "title" | "slug"> & {
-                type: 'post';
-            }) | (Pick<NoteModel, "id" | "created" | "modified" | "title" | "nid"> & {
-                type: 'note';
-            }) | (Pick<PageModel, "id" | "created" | "modified" | "title" | "slug"> & {
-                type: 'page';
-            })> & {
-                /**
-                 * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
-                 */
-                raw?: any;
-            };
-        }>;
+        }, ResponseWrapper>;
     }>;
 }
 
@@ -1628,4 +1471,4 @@ interface SnippetModel<T = unknown> extends BaseModel {
  */
 declare const camelcaseKeys: <T = any>(obj: any) => T;
 
-export { AdminExtraModel, AggregateController, AggregateRoot, AggregateStat, AggregateTop, AlgoliaSearchOptionsModel, BackupOptionsModel, BaiduSearchOptionsModel, BaseCommentIndexModel, BaseModel, CategoryController, CategoryEntries, CategoryModel, CategoryType, CategoryWithChildrenModel, CommentController, CommentDto, CommentModel, CommentOptionsModel, CommentRef, CommentState, Coordinate, Count, EnumPageType, HTTPClient, IConfig, IConfigKeys, Image, LinkController, LinkModel, LinkState, LinkType, MailOptionsModel, ModelWithLiked, NoteController, NoteModel, NoteMusicRecord, NoteWrappedPayload, NoteWrappedWithLikedPayload, PageController, PageModel, Pager, PaginateResult, PostController, PostModel, ProjectController, ProjectModel, RecentlyAttitudeEnum, RecentlyAttitudeResultEnum, RecentlyController, RecentlyModel, RecentlyRefType, RecentlyRefTypes, RefType, RequestError, SayController, SayModel, SearchController, SeoOptionModel, ServerlessController, SnippetController, SnippetModel, SnippetType, SubscribeAllBit, SubscribeController, SubscribeNoteCreateBit, SubscribePostCreateBit, SubscribeRecentCreateBit, SubscribeSayCreateBit, SubscribeType, SubscribeTypeToBitMap, TLogin, TagModel, TextBaseModel, TimelineData, TimelineType, TopicController, TopicModel, Url, UrlOptionModel, UserController, UserModel, allContollerNames, allControllers, createClient, createClient as default, camelcaseKeys as simpleCamelcaseKeys };
+export { AdminExtraModel, AggregateController, AggregateRoot, AggregateStat, AggregateTop, AggregateTopNote, AggregateTopPost, AlgoliaSearchOptionsModel, BackupOptionsModel, BaiduSearchOptionsModel, BaseCommentIndexModel, BaseModel, CategoryController, CategoryEntries, CategoryModel, CategoryType, CategoryWithChildrenModel, CommentController, CommentDto, CommentModel, CommentOptionsModel, CommentRef, CommentState, Coordinate, Count, EnumPageType, HTTPClient, IConfig, IConfigKeys, Image, LinkController, LinkModel, LinkState, LinkType, MailOptionsModel, ModelWithLiked, NoteController, NoteModel, NoteMusicRecord, NoteWrappedPayload, NoteWrappedWithLikedPayload, PageController, PageModel, Pager, PaginateResult, PostController, PostModel, ProjectController, ProjectModel, RecentlyAttitudeEnum, RecentlyAttitudeResultEnum, RecentlyController, RecentlyModel, RecentlyRefType, RecentlyRefTypes, RefType, RequestError, SayController, SayModel, SearchController, SeoOptionModel, ServerlessController, SnippetController, SnippetModel, SnippetType, SubscribeAllBit, SubscribeController, SubscribeNoteCreateBit, SubscribePostCreateBit, SubscribeRecentCreateBit, SubscribeSayCreateBit, SubscribeType, SubscribeTypeToBitMap, TLogin, TagModel, TextBaseModel, TimelineData, TimelineType, TopicController, TopicModel, Url, UrlOptionModel, UserController, UserModel, allContollerNames, allControllers, createClient, createClient as default, camelcaseKeys as simpleCamelcaseKeys };

package/models/aggregate.ts

@@ -20,9 +20,20 @@ export interface Url {
   webUrl: string
 }
 
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface AggregateTopNote
+  extends Pick<NoteModel, 'id' | 'title' | 'created' | 'nid' | 'images'> {}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface AggregateTopPost
+  extends Pick<
+    PostModel,
+    'id' | 'slug' | 'created' | 'title' | 'category' | 'images'
+  > {}
+
 export interface AggregateTop {
-  notes: Pick<NoteModel, 'id' | 'title' | 'created' | 'nid'>[]
-  posts: Pick<PostModel, 'id' | 'slug' | 'created' | 'title' | 'category'>[]
+  notes: AggregateTopNote[]
+  posts: AggregateTopPost[]
   says: SayModel[]
 }
 

package/models/base.ts

@@ -40,8 +40,6 @@ export interface TextBaseModel extends BaseCommentIndexModel {
   text: string
   images?: Image[]
   modified: string | null
-
-  meta?: Record<string, any>
 }
 
 export type ModelWithLiked<T> = T & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mx-space/api-client",
-  "version": "1.3.5",
+  "version": "1.4.0",
   "type": "module",
   "description": "A api client for mx-space server@next",
   "author": "Innei",
@@ -60,17 +60,16 @@
   "devDependencies": {
     "@types/cors": "2.8.13",
     "@types/express": "4.17.17",
-    "@types/lodash": "4.14.191",
+    "@types/lodash": "4.14.194",
     "abort-controller": "3.0.0",
     "axios": "^1.3.1",
-    "camelcase-keys": "*",
+    "camelcase-keys": "^7",
     "cors": "2.8.5",
     "express": "4.18.2",
-    "ky": "0.33.2",
+    "ky": "0.33.3",
     "lodash": "4.17.21",
-    "node-fetch": "3.3.0",
-    "tsc-alias": "1.8.2",
-    "tsup": "6.6.3",
+    "node-fetch": "3.3.1",
+    "tsup": "6.7.0",
     "umi-request": "1.4.0"
   }
 }