@mx-space/api-client 1.3.5 → 1.4.1

package/dist/index.global.js

@@ -29,13 +29,14 @@
     if (!from || !isObject(to)) {
       return;
     }
-    from.$raw && Object.defineProperty(to, "$raw", {
-      value: { ...from.$raw },
-      enumerable: false
-    });
-    from.$request && Object.defineProperty(to, "$request", {
-      value: { ...from.$request },
-      enumerable: false
+    ;
+    ["$raw", "$request", "$serialized"].forEach((key) => {
+      from[key] && Object.defineProperty(to, key, {
+        get() {
+          return from[key];
+        },
+        enumerable: false
+      });
     });
   };
 
@@ -909,16 +910,18 @@
                 if (!data) {
                   return null;
                 }
-                const transform = (Array.isArray(data) || isPlainObject(data)) && that.options.transformResponse ? that.options.transformResponse(data) : data;
-                if (transform && typeof transform === "object") {
-                  Object.defineProperty(transform, "$raw", {
+                const cameledObject = (Array.isArray(data) || isPlainObject(data)) && that.options.transformResponse ? that.options.transformResponse(data) : data;
+                let nextObject = cameledObject;
+                if (cameledObject && typeof cameledObject === "object") {
+                  nextObject = { ...cameledObject };
+                  Object.defineProperty(nextObject, "$raw", {
                     get() {
                       return res;
                     },
                     enumerable: false,
                     configurable: false
                   });
-                  Object.defineProperty(transform, "$request", {
+                  Object.defineProperty(nextObject, "$request", {
                     get() {
                       return {
                         url,
@@ -928,8 +931,13 @@
                     },
                     enumerable: false
                   });
+                  Object.defineProperty(nextObject, "$serialized", {
+                    get() {
+                      return cameledObject;
+                    }
+                  });
                 }
-                return transform;
+                return nextObject;
               };
             }
             route.push(name);
@@ -1021,7 +1029,7 @@
     return SnippetType2;
   })(SnippetType || {});
 
-  // ../../src/modules/subscribe/subscribe.constant.ts
+  // ../../apps/core/src/modules/subscribe/subscribe.constant.ts
   var SubscribePostCreateBit = 1 << 0;
   var SubscribeNoteCreateBit = 1 << 1;
   var SubscribeSayCreateBit = 1 << 2;

package/dist/index.js

@@ -27,13 +27,14 @@ var attachRawFromOneToAnthor = (from, to) => {
   if (!from || !isObject(to)) {
     return;
   }
-  from.$raw && Object.defineProperty(to, "$raw", {
-    value: { ...from.$raw },
-    enumerable: false
-  });
-  from.$request && Object.defineProperty(to, "$request", {
-    value: { ...from.$request },
-    enumerable: false
+  ;
+  ["$raw", "$request", "$serialized"].forEach((key) => {
+    from[key] && Object.defineProperty(to, key, {
+      get() {
+        return from[key];
+      },
+      enumerable: false
+    });
   });
 };
 
@@ -907,16 +908,18 @@ var HTTPClient = class {
               if (!data) {
                 return null;
               }
-              const transform = (Array.isArray(data) || isPlainObject(data)) && that.options.transformResponse ? that.options.transformResponse(data) : data;
-              if (transform && typeof transform === "object") {
-                Object.defineProperty(transform, "$raw", {
+              const cameledObject = (Array.isArray(data) || isPlainObject(data)) && that.options.transformResponse ? that.options.transformResponse(data) : data;
+              let nextObject = cameledObject;
+              if (cameledObject && typeof cameledObject === "object") {
+                nextObject = { ...cameledObject };
+                Object.defineProperty(nextObject, "$raw", {
                   get() {
                     return res;
                   },
                   enumerable: false,
                   configurable: false
                 });
-                Object.defineProperty(transform, "$request", {
+                Object.defineProperty(nextObject, "$request", {
                   get() {
                     return {
                       url,
@@ -926,8 +929,13 @@ var HTTPClient = class {
                   },
                   enumerable: false
                 });
+                Object.defineProperty(nextObject, "$serialized", {
+                  get() {
+                    return cameledObject;
+                  }
+                });
               }
-              return transform;
+              return nextObject;
             };
           }
           route.push(name);
@@ -1019,7 +1027,7 @@ var SnippetType = /* @__PURE__ */ ((SnippetType2) => {
   return SnippetType2;
 })(SnippetType || {});
 
-// ../../src/modules/subscribe/subscribe.constant.ts
+// ../../apps/core/src/modules/subscribe/subscribe.constant.ts
 var SubscribePostCreateBit = 1 << 0;
 var SubscribeNoteCreateBit = 1 << 1;
 var SubscribeSayCreateBit = 1 << 2;

package/interfaces/adapter.ts

@@ -1,4 +1,4 @@
-import { RequestOptions } from './instance'
+import type { RequestOptions } from './instance'
 
 export type IAdaptorRequestResponseType<P> = Promise<
   Record<string, any> & { data: P }

package/interfaces/client.ts

@@ -1,5 +1,5 @@
-import { IController } from './controller'
-import { Class } from './types'
+import type { IController } from './controller'
+import type { Class } from './types'
 
 interface IClientOptions {
   controllers: Class<IController>[]

package/interfaces/request.ts

@@ -1,4 +1,4 @@
-import { RequestOptions } from './instance'
+import type { RequestOptions } from './instance'
 
 type NoStringIndex<T> = { [K in keyof T as string extends K ? never : K]: T[K] }
 
@@ -70,6 +70,8 @@ type ResponseWrapperType<Response, RawData, T> = {
     method: string
     [k: string]: string
   }
+
+  $serialized: T
 }
 
 export type ResponseProxyExtraRaw<

package/models/aggregate.ts

@@ -1,10 +1,10 @@
-import { CategoryModel } from './category'
-import { NoteModel } from './note'
-import { PageModel } from './page'
-import { PostModel } from './post'
-import { SayModel } from './say'
-import { SeoOptionModel } from './setting'
-import { UserModel } from './user'
+import type { CategoryModel } from './category'
+import type { NoteModel } from './note'
+import type { PageModel } from './page'
+import type { PostModel } from './post'
+import type { SayModel } from './say'
+import type { SeoOptionModel } from './setting'
+import type { UserModel } from './user'
 
 export interface AggregateRoot {
   user: UserModel
@@ -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/models/category.ts

@@ -1,5 +1,5 @@
-import { BaseModel } from './base'
-import { PostModel } from './post'
+import type { BaseModel } from './base'
+import type { PostModel } from './post'
 
 export enum CategoryType {
   Category,

package/models/comment.ts

@@ -1,5 +1,5 @@
-import { BaseModel } from './base'
-import { CategoryModel } from './category'
+import type { BaseModel } from './base'
+import type { CategoryModel } from './category'
 
 export enum RefType {
   Page = 'Page',

package/models/link.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base'
+import type { BaseModel } from './base'
 
 export enum LinkType {
   Friend,

package/models/note.ts

@@ -1,5 +1,5 @@
-import { ModelWithLiked, TextBaseModel } from './base'
-import { TopicModel } from './topic'
+import type { ModelWithLiked, TextBaseModel } from './base'
+import type { TopicModel } from './topic'
 
 export interface NoteModel extends TextBaseModel {
   hide: boolean

package/models/page.ts

@@ -1,4 +1,4 @@
-import { TextBaseModel } from './base'
+import type { TextBaseModel } from './base'
 
 export enum EnumPageType {
   'md' = 'md',

package/models/post.ts

@@ -1,5 +1,5 @@
-import { Count, Image, TextBaseModel } from './base'
-import { CategoryModel } from './category'
+import type { Count, Image, TextBaseModel } from './base'
+import type { CategoryModel } from './category'
 
 export interface PostModel extends TextBaseModel {
   summary?: string

package/models/project.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base'
+import type { BaseModel } from './base'
 
 export interface ProjectModel extends BaseModel {
   name: string

package/models/recently.ts

@@ -1,4 +1,4 @@
-import { BaseCommentIndexModel } from './base'
+import type { BaseCommentIndexModel } from './base'
 
 export enum RecentlyRefTypes {
   Post = 'Post',

package/models/say.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base'
+import type { BaseModel } from './base'
 
 export interface SayModel extends BaseModel {
   text: string

package/models/snippet.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base'
+import type { BaseModel } from './base'
 
 export enum SnippetType {
   JSON = 'json',

package/models/subscribe.ts

@@ -1,4 +1,4 @@
-import { SubscribeTypeToBitMap } from '@core/modules/subscribe/subscribe.constant'
+import type { SubscribeTypeToBitMap } from '@core/modules/subscribe/subscribe.constant'
 
 export * from '@core/modules/subscribe/subscribe.constant'
 

package/models/topic.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base'
+import type { BaseModel } from './base'
 
 export interface TopicModel extends BaseModel {
   description?: string

package/models/user.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base'
+import type { BaseModel } from './base'
 
 export interface UserModel extends BaseModel {
   introduce: string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mx-space/api-client",
-  "version": "1.3.5",
+  "version": "1.4.1",
   "type": "module",
   "description": "A api client for mx-space server@next",
   "author": "Innei",
@@ -24,11 +24,6 @@
     },
     "./package.json": "./package.json"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
   "bump": {
     "before": [
       "git pull --rebase",
@@ -41,15 +36,6 @@
     "tag": false,
     "commit_message": "chore(release): bump @mx-space/api-client to v${NEW_VERSION}"
   },
-  "lint-staged": {
-    "*.{js,jsx,ts,tsx}": [
-      "prettier --ignore-path ./.prettierignore --write ",
-      "eslint --cache"
-    ]
-  },
-  "engines": {
-    "pnpm": ">=6"
-  },
   "scripts": {
     "package": "rm -rf dist && tsup && node mod-dts.mjs",
     "build": "npm run package",
@@ -60,17 +46,18 @@
   "devDependencies": {
     "@types/cors": "2.8.13",
     "@types/express": "4.17.17",
-    "@types/lodash": "4.14.191",
+    "@types/lodash": "4.14.195",
     "abort-controller": "3.0.0",
-    "axios": "^1.3.1",
-    "camelcase-keys": "*",
+    "axios": "^1.4.0",
+    "camelcase-keys": "^7.0.2",
     "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",
-    "umi-request": "1.4.0"
+    "tsup": "6.7.0",
+    "umi-request": "1.4.0",
+    "vitest": "^0.31.4",
+    "vite": "^4.3.9",
+    "form-data": "4.0.0"
   }
 }

package/tsconfig.json

@@ -23,7 +23,7 @@
         "*"
       ],
       "@core/*": [
-        "../../src/*"
+        "../../apps/core/src/*"
       ],
     }
   },