@mx-space/api-client 1.0.0-beta.3 → 1.0.0

package/models/aggregate.ts

@@ -1,10 +1,10 @@
-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'
+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'
 
 export interface AggregateRoot {
   user: UserModel

package/models/base.ts

@@ -43,3 +43,7 @@ export interface TextBaseModel extends BaseCommentIndexModel {
 
   meta?: Record<string, any>
 }
+
+export type ModelWithLiked<T> = T & {
+  liked: boolean
+}

package/models/category.ts

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

package/models/comment.ts

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

package/models/link.ts

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

package/models/note.ts

@@ -1,5 +1,5 @@
-import type { TextBaseModel } from './base'
-import type { TopicModel } from './topic'
+import { ModelWithLiked, TextBaseModel } from './base'
+import { TopicModel } from './topic'
 
 export interface NoteModel extends TextBaseModel {
   hide: boolean
@@ -38,3 +38,9 @@ export interface NoteWrappedPayload {
   next?: Partial<NoteModel>
   prev?: Partial<NoteModel>
 }
+
+export interface NoteWrappedWithLikedPayload {
+  data: ModelWithLiked<NoteModel>
+  next?: Partial<NoteModel>
+  prev?: Partial<NoteModel>
+}

package/models/page.ts

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

package/models/post.ts

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

package/models/project.ts

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

package/models/recently.ts

@@ -1,4 +1,4 @@
-import type { BaseModel } from './base'
+import { BaseCommentIndexModel } from './base'
 
 export enum RecentlyRefTypes {
   Post = 'Post',
@@ -10,18 +10,13 @@ export type RecentlyRefType = {
   title: string
   url: string
 }
-export interface RecentlyModel extends BaseModel {
+export interface RecentlyModel extends BaseCommentIndexModel {
   content: string
 
   ref?: RecentlyRefType & { [key: string]: any }
   refId?: string
   refType?: RecentlyRefTypes
-  /**
-   * @deprecated
-   */
-  project?: string
-  /**
-   * @deprecated
-   */
-  language?: string
+
+  up: number
+  down: number
 }

package/models/say.ts

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

package/models/snippet.ts

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

package/models/topic.ts

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

package/models/user.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mx-space/api-client",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0",
   "type": "module",
   "description": "A api client for mx-space server@next",
   "author": "Innei",
@@ -25,28 +25,6 @@
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     },
-    "./dist/*": {
-      "types": "./dist/*.d.ts",
-      "import": {
-        "type": "./dist/*.d.ts",
-        "default": "./dist/*.js"
-      },
-      "require": {
-        "type": "./dist/*.d.ts",
-        "default": "./dist/*.cjs"
-      }
-    },
-    "./dist/adaptors/*": {
-      "types": "./dist/adaptors/*.d.ts",
-      "import": {
-        "type": "./dist/adaptors/*.d.ts",
-        "default": "./dist/adaptors/*.js"
-      },
-      "require": {
-        "type": "./dist/adaptors/*.d.ts",
-        "default": "./dist/adaptors/*.cjs"
-      }
-    },
     "./package.json": "./package.json",
     "./adaptors/*": {
       "types": "./types/adaptors/*.d.ts",
@@ -73,7 +51,9 @@
     ],
     "after": [
       "npm publish --access=public"
-    ]
+    ],
+    "tag": false,
+    "commit_message": "chore(release): bump @mx-space/api-client to v${NEW_VERSION}"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
@@ -99,17 +79,16 @@
     "@rollup/plugin-node-resolve": "14.0.1",
     "@rollup/plugin-typescript": "8.5.0",
     "@types/cors": "2.8.12",
+    "@types/express": "4.17.15",
     "@types/lodash": "4.14.186",
-    "@types/node": "16.18.2",
     "abort-controller": "3.0.0",
-    "axios": "0.27.2",
-    "camelcase-keys": "8.0.2",
+    "axios": "*",
+    "camelcase-keys": "*",
+    "cors": "2.8.5",
     "dts-bundle-generator": "7.0.0",
-    "gh-pages": "4.0.0",
+    "express": "4.18.2",
     "isomorphic-unfetch": "3.1.0",
-    "jsdom": "20.0.1",
-    "ky": "0.31.4",
-    "ky-universal": "^0.11.0",
+    "ky": "0.31.3",
     "lodash": "4.17.21",
     "node-fetch": "3.2.10",
     "rollup": "2.79.1",

package/rollup.config.js

@@ -0,0 +1,150 @@
+// @ts-check
+import { execSync } from 'child_process'
+import globby from 'globby'
+import path, { resolve } from 'path'
+import peerDepsExternal from 'rollup-plugin-peer-deps-external'
+import { terser } from 'rollup-plugin-terser'
+
+import commonjs from '@rollup/plugin-commonjs'
+import { nodeResolve } from '@rollup/plugin-node-resolve'
+import typescript from '@rollup/plugin-typescript'
+
+const packageJson = require('./package.json')
+
+const umdName = packageJson.name
+
+const globals = {
+  ...packageJson.devDependencies,
+  // @ts-ignore
+  ...(packageJson.dependencies || []),
+}
+
+const dir = 'dist'
+
+/**
+ * @type {Partial<import('rollup').RollupOptions>}
+ */
+const baseRollupConfig = {
+  plugins: [
+    nodeResolve(),
+    commonjs({ include: 'node_modules/**' }),
+    typescript({ tsconfig: './tsconfig.json', declaration: false }),
+
+    // @ts-ignore
+    peerDepsExternal(),
+  ],
+  external: [...Object.keys(globals), 'lodash', 'lodash-es'],
+  treeshake: true,
+}
+
+/**
+ * @returns {import('rollup').RollupOptions[]}
+ */
+const buildAdaptorConfig = () => {
+  const paths = globby.sync('./adaptors/*.ts')
+  const filename = (path_) => path.parse(path_.split('/').pop()).name
+
+  return paths.map((path) => {
+    const libName = filename(path)
+    execSync(
+      `npx dts-bundle-generator -o dist/adaptors/${libName}.d.ts ${resolve(
+        __dirname,
+        'adaptors/',
+      )}/${libName}.ts` + `  --external-types ${libName}`,
+    )
+
+    return {
+      input: path,
+      output: [
+        {
+          file: `${dir}/adaptors/${libName}.umd.js`,
+          format: 'umd',
+          sourcemap: true,
+          name: umdName,
+        },
+        {
+          file: `${dir}/adaptors/${libName}.umd.min.js`,
+          format: 'umd',
+          sourcemap: true,
+          name: umdName,
+          plugins: [terser()],
+        },
+        {
+          file: `${dir}/adaptors/${libName}.cjs`,
+          format: 'cjs',
+          sourcemap: true,
+        },
+        {
+          file: `${dir}/adaptors/${libName}.min.cjs`,
+          format: 'cjs',
+          sourcemap: true,
+          plugins: [terser()],
+        },
+        {
+          file: `${dir}/adaptors/${libName}.js`,
+          format: 'es',
+          sourcemap: true,
+        },
+        {
+          file: `${dir}/adaptors/${libName}.min.js`,
+          format: 'es',
+          sourcemap: true,
+          plugins: [terser()],
+        },
+      ],
+      ...baseRollupConfig,
+    }
+  })
+}
+
+/**
+ * @type {import('rollup').RollupOptions[]}
+ */
+const config = [
+  {
+    input: './index.ts',
+
+    output: [
+      {
+        file: `${dir}/index.umd.js`,
+        format: 'umd',
+        sourcemap: true,
+        name: umdName,
+      },
+      {
+        file: `${dir}/index.umd.min.js`,
+        format: 'umd',
+        sourcemap: true,
+        name: umdName,
+        plugins: [terser()],
+      },
+      {
+        file: `${dir}/index.cjs`,
+        format: 'cjs',
+        sourcemap: true,
+      },
+      {
+        file: `${dir}/index.min.cjs`,
+        format: 'cjs',
+        sourcemap: true,
+        plugins: [terser()],
+      },
+      {
+        file: `${dir}/index.js`,
+        format: 'es',
+        sourcemap: true,
+      },
+      {
+        file: `${dir}/index.min.js`,
+        format: 'es',
+        sourcemap: true,
+        plugins: [terser()],
+      },
+    ],
+    ...baseRollupConfig,
+  },
+  ...buildAdaptorConfig(),
+]
+
+// eslint-disable-next-line import/no-default-export
+export default config

package/utils/auto-bind.ts

@@ -0,0 +1,48 @@
+// @ts-nocheck
+// @copy: https://github.com/sindresorhus/auto-bind/blob/main/index.js
+
+// Gets all non-builtin properties up the prototype chain.
+const getAllProperties = (object) => {
+  const properties = new Set()
+
+  do {
+    for (const key of Reflect.ownKeys(object)) {
+      properties.add([object, key])
+    }
+  } while (
+    (object = Reflect.getPrototypeOf(object)) &&
+    object !== Object.prototype
+  )
+
+  return properties
+}
+
+export function autoBind(self, { include, exclude } = {}) {
+  const filter = (key) => {
+    const match = (pattern) =>
+      typeof pattern === 'string' ? key === pattern : pattern.test(key)
+
+    if (include) {
+      return include.some(match)
+    }
+
+    if (exclude) {
+      return !exclude.some(match)
+    }
+
+    return true
+  }
+
+  for (const [object, key] of getAllProperties(self.constructor.prototype)) {
+    if (key === 'constructor' || !filter(key)) {
+      continue
+    }
+
+    const descriptor = Reflect.getOwnPropertyDescriptor(object, key)
+    if (descriptor && typeof descriptor.value === 'function') {
+      self[key] = self[key].bind(self)
+    }
+  }
+
+  return self
+}

package/utils/camelcase-keys.ts

@@ -0,0 +1,26 @@
+import { isPlainObject } from '.'
+
+/**
+ * A simple camelCase function that only handles strings, but not handling symbol, date, or other complex case.
+ * If you need to handle more complex cases, please use camelcase-keys package.
+ */
+export const camelcaseKeys = <T = any>(obj: any): T => {
+  if (Array.isArray(obj)) {
+    return obj.map((x) => camelcaseKeys(x)) as any
+  }
+
+  if (isPlainObject(obj)) {
+    return Object.keys(obj).reduce((result: any, key) => {
+      result[camelcase(key)] = camelcaseKeys(obj[key])
+      return result
+    }, {}) as any
+  }
+
+  return obj
+}
+
+export function camelcase(str: string) {
+  return str.replace(/([-_][a-z])/gi, ($1) => {
+    return $1.toUpperCase().replace('-', '').replace('_', '')
+  })
+}

package/utils/index.ts

@@ -0,0 +1,53 @@
+import { SortOrder } from '~/interfaces/options'
+
+export const isPlainObject = (obj: any) =>
+  isObject(obj) &&
+  Object.prototype.toString.call(obj) === '[object Object]' &&
+  Object.getPrototypeOf(obj) === Object.prototype
+
+export const sortOrderToNumber = (order: SortOrder) => {
+  return (
+    {
+      asc: 1,
+      desc: -1,
+    }[order] || 1
+  )
+}
+const isObject = (obj: any) => obj && typeof obj === 'object'
+export const destructureData = (payload: any) => {
+  if (typeof payload !== 'object') {
+    return payload
+  }
+  if (payload === null) {
+    return payload
+  }
+
+  const data = payload.data
+
+  const dataIsPlainObject = isPlainObject(data)
+
+  if (dataIsPlainObject && Object.keys(payload).length === 1) {
+    const d = Object.assign({}, data)
+    // attach raw onto new data
+    attachRawFromOneToAnthor(payload, d)
+    return d
+  }
+
+  return payload
+}
+
+export const attachRawFromOneToAnthor = (from: any, to: any) => {
+  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,
+    })
+}

package/utils/path.ts

@@ -0,0 +1,6 @@
+export const resolveFullPath = (endpoint: string, path: string) => {
+  if (!path.startsWith('/')) {
+    path = `/${path}`
+  }
+  return `${endpoint}${path}`
+}

package/dist/adaptors/ky-universal.cjs

@@ -1,70 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var ky = require('ky-universal');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var ky__default = /*#__PURE__*/_interopDefaultLegacy(ky);
-
-// TODO post data not only json,
-const 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;
-};
-const createKyAdaptor = (ky) => {
-    const adaptor = Object.preventExtensions({
-        get default() {
-            return ky;
-        },
-        responseWrapper: {},
-        get(url, options) {
-            return getDataFromKyResponse(ky.get(url, options));
-        },
-        post(url, options) {
-            const data = options.data;
-            delete options.data;
-            const kyOptions = {
-                ...options,
-                json: data,
-            };
-            return getDataFromKyResponse(ky.post(url, kyOptions));
-        },
-        put(url, options) {
-            const data = options.data;
-            delete options.data;
-            const kyOptions = {
-                ...options,
-                json: data,
-            };
-            return getDataFromKyResponse(ky.put(url, kyOptions));
-        },
-        patch(url, options) {
-            const data = options.data;
-            delete options.data;
-            const kyOptions = {
-                ...options,
-                json: data,
-            };
-            return getDataFromKyResponse(ky.patch(url, kyOptions));
-        },
-        delete(url, options) {
-            return getDataFromKyResponse(ky.delete(url, options));
-        },
-    });
-    return adaptor;
-};
-const createDefaultKyAdaptor = () => createKyAdaptor(ky__default["default"].create({}));
-
-exports.createDefaultKyAdaptor = createDefaultKyAdaptor;
-exports.createKyAdaptor = createKyAdaptor;
-//# sourceMappingURL=ky-universal.cjs.map

package/dist/adaptors/ky-universal.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"ky-universal.cjs","sources":["../../../adaptors/ky-universal.ts"],"sourcesContent":[null],"names":["ky"],"mappings":";;;;;;;;;;AAMA;AACA,MAAM,qBAAqB,GAAG,OAAO,QAAyB,KAAI;AAChE,IAAA,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAA;AAE1B,IAAA,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO;SAC3B,GAAG,CAAC,cAAc,CAAC;AACpB,UAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAA;AAChC,IAAA,MAAM,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,CAAA;AAEzD,IAAA,MAAM,MAAM,GAER;AACF,QAAA,GAAG,GAAG;AACN,QAAA,IAAI,EAAE,IAAI,KAAK,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;KACzC,CAAA;AACD,IAAA,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAEY,MAAA,eAAe,GAAG,CAAC,EAAc,KAAI;AAChD,IAAA,MAAM,OAAO,GACX,MAAM,CAAC,iBAAiB,CAAC;AACvB,QAAA,IAAI,OAAO,GAAA;AACT,YAAA,OAAO,EAAE,CAAA;SACV;AAED,QAAA,eAAe,EAAE,EAA4B;QAC7C,GAAG,CAAC,GAAG,EAAE,OAAO,EAAA;YACd,OAAO,qBAAqB,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;SACnD;QACD,IAAI,CAAC,GAAG,EAAE,OAAO,EAAA;AACf,YAAA,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;YACzB,OAAO,OAAO,CAAC,IAAI,CAAA;AACnB,YAAA,MAAM,SAAS,GAAY;AACzB,gBAAA,GAAG,OAAO;AACV,gBAAA,IAAI,EAAE,IAAI;aACX,CAAA;YAED,OAAO,qBAAqB,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;SACtD;QACD,GAAG,CAAC,GAAG,EAAE,OAAO,EAAA;AACd,YAAA,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;YACzB,OAAO,OAAO,CAAC,IAAI,CAAA;AACnB,YAAA,MAAM,SAAS,GAAY;AACzB,gBAAA,GAAG,OAAO;AACV,gBAAA,IAAI,EAAE,IAAI;aACX,CAAA;YACD,OAAO,qBAAqB,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;SACrD;QAED,KAAK,CAAC,GAAG,EAAE,OAAO,EAAA;AAChB,YAAA,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;YACzB,OAAO,OAAO,CAAC,IAAI,CAAA;AACnB,YAAA,MAAM,SAAS,GAAY;AACzB,gBAAA,GAAG,OAAO;AACV,gBAAA,IAAI,EAAE,IAAI;aACX,CAAA;YACD,OAAO,qBAAqB,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;SACvD;QACD,MAAM,CAAC,GAAG,EAAE,OAAO,EAAA;YACjB,OAAO,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;SACtD;AACF,KAAA,CAAC,CAAA;AACJ,IAAA,OAAO,OAAO,CAAA;AAChB,EAAC;AAEY,MAAA,sBAAsB,GAAG,MAAM,eAAe,CAACA,sBAAE,CAAC,MAAM,CAAC,EAAE,CAAC;;;;;"}

package/dist/adaptors/ky-universal.d.ts

@@ -1,37 +0,0 @@
-// Generated by dts-bundle-generator v7.0.0
-
-import { ResponsePromise } from 'ky';
-import { KyInstance } from 'ky/distribution/types/ky';
-
-export interface RequestOptions {
-	method?: string;
-	data?: Record<string, any>;
-	params?: Record<string, any> | URLSearchParams;
-	headers?: Record<string, string>;
-	[key: string]: any;
-}
-export declare type IAdaptorRequestResponseType<P> = Promise<Record<string, any> & {
-	data: P;
-}>;
-export 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>;
-}>;
-export declare const createDefaultKyAdaptor: () => 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 {};