@wzyjs/utils 0.0.7 → 0.0.11

package/dist/cjs/rd/database/types.js

@@ -0,0 +1,25 @@
+'use strict';
+
+// 查询数据库的条件 - 比较的特殊条件
+exports.Command = void 0;
+(function (Command) {
+    Command["Eq"] = "eq";
+    Command["Neq"] = "neq";
+    Command["Lt"] = "lt";
+    Command["Lte"] = "lte";
+    Command["Gt"] = "gt";
+    Command["Gte"] = "gte";
+    Command["In"] = "in";
+    Command["Nin"] = "nin";
+    Command["Gtlt"] = "gtlt";
+})(exports.Command || (exports.Command = {}));
+// 查询的方法
+exports.Method = void 0;
+(function (Method) {
+    Method["Add"] = "add";
+    Method["Find"] = "find";
+    Method["FindList"] = "findList";
+    Method["Delete"] = "delete";
+    Method["Update"] = "update";
+    Method["Count"] = "count";
+})(exports.Method || (exports.Method = {}));

package/dist/cjs/rd/database/utils.d.ts

@@ -0,0 +1,3 @@
+import { Conditions } from './types';
+export declare const appendTime: <D>(data: D, type: 'create' | 'update') => D;
+export declare const defaultConditions: Conditions;

package/dist/cjs/rd/database/utils.js

@@ -0,0 +1,30 @@
+'use strict';
+
+// 给记录添加时间
+const appendTime = (data, type) => {
+    if (!data) {
+        return {};
+    }
+    return {
+        ...data,
+        [type + 'At']: Date.now(),
+    };
+};
+// 默认条件
+const defaultConditions = {
+    order: {
+        field: 'createAt',
+        type: 'desc',
+    },
+    options: {
+        timeout: 10000,
+        multiple: true,
+    },
+    page: {
+        current: 1,
+        size: 10,
+    },
+};
+
+exports.appendTime = appendTime;
+exports.defaultConditions = defaultConditions;

package/dist/cjs/rd/index.d.ts

@@ -0,0 +1 @@
+export * from './database';

package/dist/esm/common/index.d.ts

@@ -0,0 +1,5 @@
+import { cloneDeep, debounce, isBoolean, isEqual, isFunction, isNumber, isObject, isString, merge, omit, pick, uniq, uniqBy, uniqWith, isEmpty, isError } from 'lodash';
+export { cloneDeep, debounce, isBoolean, isEqual, isFunction, isNumber, isObject, isString, merge, omit, pick, uniq, uniqBy, uniqWith, isEmpty, isError, };
+export * as consola from 'consola';
+export * from './tools';
+export * from './types';

package/dist/esm/common/tools/other.d.ts

@@ -0,0 +1,14 @@
+import { KeyValue, OrderParams, Pagination, SortParams } from '../types';
+export declare const handleParams: (params?: Pagination & KeyValue, sort?: SortParams) => {
+    page: Pagination;
+    where: KeyValue<string, string | number | boolean | RegExp>;
+    order?: OrderParams;
+};
+export declare const handleRes2List: <D>(reqPromise: any) => Promise<{
+    label: string;
+    value: string;
+}[]>;
+export declare const executePromise: (promise: Promise<any>) => Promise<{
+    result: any;
+    time: number;
+}>;

package/dist/esm/common/tools/other.js

@@ -0,0 +1,46 @@
+// 处理 ProComponents 中 ProTable 参数中的 page 和 where 和 sort
+const handleParams = (params, sort) => {
+    if (!params) {
+        return {
+            page: {},
+            where: {},
+        };
+    }
+    const { current, pageSize, ...other } = params;
+    return {
+        page: {
+            current: current || 1,
+            pageSize: pageSize || 10,
+        },
+        where: Object.entries(other).reduce((acc, [key, value]) => {
+            if (key && value) {
+                acc[key] = typeof value === 'string' ? new RegExp(value) : value;
+            }
+            return acc;
+        }, {}),
+        order: sort && {
+            field: Object.keys(sort)[0],
+            type: Object.values(sort)[0] === 'ascend' ? 'asc' : 'desc',
+        },
+    };
+};
+// 将 list 的数据处理为 { label: string, value: string }[]
+const handleRes2List = async (reqPromise) => {
+    const { data } = await reqPromise();
+    return (data?.list || []).map((item) => ({
+        label: item.name,
+        value: item.key,
+    }));
+};
+// 计算执行 promise 花费的时间
+const executePromise = async (promise) => {
+    const start = Date.now();
+    const result = await promise;
+    const time = Date.now() - start;
+    return {
+        result,
+        time,
+    };
+};
+
+export { executePromise, handleParams, handleRes2List };

package/dist/esm/{types → common/types}/index.d.ts

@@ -3,7 +3,7 @@ export interface RequestRes<D = any> {
     message?: string;
     data?: D;
 }
-export type KeyValue<D extends object | string = string, V = string | number | boolean> = Record<D extends string ? string : keyof D, V>;
+export type KeyValue<D extends object | string = string, V = any> = Partial<Record<D extends string ? string : keyof D, V>>;
 export interface Pagination {
     current?: number;
     pageSize?: number;

package/dist/esm/fe/index.d.ts

@@ -0,0 +1,15 @@
+import md5 from 'md5';
+import dayjs from 'dayjs';
+import classnames from 'classnames';
+import copy from 'copy-to-clipboard';
+export { copy, classnames, dayjs, md5 };
+export declare const localforage: {
+    config: {
+        (options: LocalForageOptions): boolean;
+        (options: string): any;
+        (): LocalForageOptions;
+    };
+    setItem: <T>(key: string, value: T, callback?: ((err: any, value: T) => void) | undefined) => Promise<T>;
+    getItem: <T_1>(key: string, callback?: ((err: any, value: T_1 | null) => void) | undefined) => Promise<T_1 | null>;
+    removeItem: (key: string, callback?: ((err: any) => void) | undefined) => Promise<void>;
+};

package/dist/esm/fe/index.js

@@ -0,0 +1,14 @@
+export { default as md5 } from 'md5';
+export { default as dayjs } from 'dayjs';
+export { default as classnames } from 'classnames';
+export { default as copy } from 'copy-to-clipboard';
+import { config, setItem, getItem, removeItem } from 'localforage';
+
+const localforage = {
+    config,
+    setItem,
+    getItem,
+    removeItem,
+};
+
+export { localforage };

package/dist/esm/index.d.ts

@@ -1,22 +1,2 @@
-import dayjs from 'dayjs';
-import copy from 'copy-to-clipboard';
-import classnames from 'classnames';
-import consola from 'consola';
-import md5 from 'md5';
-export { copy, consola, classnames, dayjs, md5 };
-export * from 'ahooks';
-import { omit, pick, cloneDeep, isEqual, merge, isObject, isBoolean, isString, isNumber } from 'lodash';
-export { omit, pick, cloneDeep, isEqual, merge, isObject, isBoolean, isString, isNumber };
-export declare const localforage: {
-    config: {
-        (options: LocalForageOptions): boolean;
-        (options: string): any;
-        (): LocalForageOptions;
-    };
-    setItem: <T>(key: string, value: T, callback?: ((err: any, value: T) => void) | undefined) => Promise<T>;
-    getItem: <T_1>(key: string, callback?: ((err: any, value: T_1 | null) => void) | undefined) => Promise<T_1 | null>;
-    removeItem: (key: string, callback?: ((err: any) => void) | undefined) => Promise<void>;
-};
-export * from './tools';
-export * from './hooks';
-export * from './types';
+export * from './common';
+export * from './fe';

package/dist/esm/index.js

@@ -1,21 +1,11 @@
-export { default as dayjs } from 'dayjs';
+export { cloneDeep, debounce, isBoolean, isEmpty, isEqual, isError, isFunction, isNumber, isObject, isString, merge, omit, pick, uniq, uniqBy, uniqWith } from 'lodash';
+import * as consola from 'consola';
+export { consola };
+export { getChineseByStr, getStrLength, jsonParse, replaceAll, replaceByRules } from './common/tools/string.js';
+export { checkAttr } from './common/tools/object.js';
+export { executePromise, handleParams, handleRes2List } from './common/tools/other.js';
+export { localforage } from './fe/index.js';
 export { default as copy } from 'copy-to-clipboard';
 export { default as classnames } from 'classnames';
-export { default as consola } from 'consola';
+export { default as dayjs } from 'dayjs';
 export { default as md5 } from 'md5';
-export * from 'ahooks';
-export { cloneDeep, isBoolean, isEqual, isNumber, isObject, isString, merge, omit, pick } from 'lodash';
-import { config, setItem, getItem, removeItem } from 'localforage';
-export { getChineseByStr, getStrLength, jsonParse, replaceAll, replaceByRules } from './tools/string.js';
-export { checkAttr } from './tools/object.js';
-export { handleParams } from './tools/other.js';
-export { useRequestPro } from './hooks/useRequestPro.js';
-
-const localforage = {
-    config,
-    setItem,
-    getItem,
-    removeItem,
-};
-
-export { localforage };

package/dist/esm/index_c.d.ts

@@ -0,0 +1,2 @@
+export * from './common';
+export * from './rd';

package/dist/esm/rd/database/Collection.d.ts

@@ -0,0 +1,22 @@
+import { Database, IKeyValue } from '@cloudbase/node-sdk';
+import { Add, Conditions, Count, Delete, Find, FindList, IdConditions, MethodParams, Update, WhereConditions } from './types';
+export declare class Collection<D extends IKeyValue> {
+    private readonly db;
+    private readonly collection;
+    constructor(db: Database.Db, name: string);
+    private joinConditions;
+    private request;
+    private handleRes;
+    private handleData;
+    handleConditions(params: MethodParams<D>): MethodParams<D>;
+    private exec;
+    add(data: Add.Params<D>['data']): Promise<Add.Res>;
+    add(data: Add.Params<D>['data'], isReturn: true, conditions?: Pick<IdConditions, 'field'>): Promise<Find.Res<D>>;
+    delete(conditions: Conditions): Promise<Delete.Res>;
+    update(conditions: Conditions, data: Update.Params<D>['data'], isSet?: true): Promise<Update.Res<D>>;
+    update(conditions: IdConditions, data: Update.Params<D>['data'], isSet?: true): Promise<Update.Res<D>>;
+    update(conditions: IdConditions, data: Update.Params<D>['data'], isReturn: true, isSet?: true): Promise<Find.Res<D>>;
+    find(conditions?: Conditions): Promise<Find.Res<D>>;
+    findList(conditions?: WhereConditions): Promise<FindList.Res<D>>;
+    count(conditions: Conditions): Promise<Count.Res>;
+}

package/dist/esm/rd/database/Database.d.ts

@@ -0,0 +1,10 @@
+import tcb, { IKeyValue } from '@cloudbase/node-sdk';
+import { Config } from './types';
+import { Collection } from './Collection';
+export declare class Database {
+    private readonly db;
+    private readonly instance;
+    constructor(config: Config);
+    collection<D extends IKeyValue>(name: string): Collection<D>;
+    createCollection(name: string): tcb.IBaseRes;
+}

package/dist/esm/rd/database/index.d.ts

@@ -0,0 +1,2 @@
+export { Database } from './Database';
+export { Conditions, IdConditions, WhereConditions, Record } from './types';

package/dist/esm/rd/database/types.d.ts

@@ -0,0 +1,151 @@
+import { Database, ICountRes } from '@cloudbase/node-sdk';
+export interface Config {
+    env: string;
+    secretId: string;
+    secretKey: string;
+}
+export type IdConditions = {
+    _id: string;
+    field?: string[] | {
+        [key: string]: false;
+    };
+    options?: {
+        timeout: number;
+        multiple?: false;
+    };
+};
+export declare enum Command {
+    Eq = "eq",
+    Neq = "neq",
+    Lt = "lt",
+    Lte = "lte",
+    Gt = "gt",
+    Gte = "gte",
+    In = "in",
+    Nin = "nin",
+    Gtlt = "gtlt"
+}
+export type CommandWhere = {
+    type: Command.Eq;
+    value: any;
+} | {
+    type: Command.Neq;
+    value: any;
+} | {
+    type: Command.Gt;
+    value: number;
+} | {
+    type: Command.Gte;
+    value: number;
+} | {
+    type: Command.Lt;
+    value: number;
+} | {
+    type: Command.Lte;
+    value: number;
+} | {
+    type: Command.Gtlt;
+    value: number[];
+} | {
+    type: Command.In;
+    value: any[];
+} | {
+    type: Command.Nin;
+    value: any[];
+};
+export type WhereConditions = {
+    where?: {
+        [key: string]: any | CommandWhere;
+    };
+    field?: string[] | {
+        [key: string]: false;
+    };
+    page?: {
+        size?: number;
+        current?: number;
+    };
+    order?: {
+        field: string;
+        type?: 'asc' | 'desc';
+    };
+    options?: {
+        timeout?: number;
+        multiple?: boolean;
+    };
+};
+export type Conditions = IdConditions | WhereConditions;
+export declare enum Method {
+    Add = "add",
+    Find = "find",
+    FindList = "findList",
+    Delete = "delete",
+    Update = "update",
+    Count = "count"
+}
+export declare namespace Add {
+    type Params<D> = {
+        method: Method.Add;
+        data: D;
+        conditions?: Pick<IdConditions, 'field'>;
+        isReturn?: true;
+    };
+    type Res = {
+        id: string;
+    };
+}
+export declare namespace Find {
+    type Params = {
+        method: Method.Find;
+        conditions?: Conditions;
+    };
+    type Res<D> = Record<D> | undefined;
+}
+export declare namespace FindList {
+    type Params = {
+        method: Method.FindList;
+        conditions?: WhereConditions;
+    };
+    type Res<D> = {
+        list?: Record<D>[];
+        total?: number;
+    };
+}
+export declare namespace Delete {
+    type Params = {
+        method: Method.Delete;
+        conditions: Conditions;
+    };
+    type Res = {
+        deleted: number | string;
+    };
+}
+export declare namespace Update {
+    type Params<D> = {
+        method: Method.Update;
+        conditions: Conditions;
+        data: Partial<Record<D>>;
+        isReturn?: true;
+        isSet?: true;
+    };
+    type Res<D> = {
+        updated?: number;
+        doc?: D;
+    };
+}
+export declare namespace Count {
+    type Params = {
+        method: Method.Count;
+        conditions?: WhereConditions;
+    };
+    type Res = {
+        total?: number;
+    };
+}
+export type MethodParams<D> = Add.Params<D> | Find.Params | FindList.Params | Delete.Params | Update.Params<D> | Count.Params;
+export type MethodRes<D> = Add.Res | Find.Res<D> | FindList.Res<D> | Delete.Res | Update.Res<D> | Count.Res;
+export type IRes = Database.IAddRes | Database.IGetRes | Database.IDeleteResult | Database.IUpdateResult | ICountRes;
+export type Record<D> = D & {
+    _id: string;
+    createAt: number;
+    updateAt: number;
+};

package/dist/esm/rd/database/utils.d.ts

@@ -0,0 +1,3 @@
+import { Conditions } from './types';
+export declare const appendTime: <D>(data: D, type: 'create' | 'update') => D;
+export declare const defaultConditions: Conditions;

package/dist/esm/rd/index.d.ts

@@ -0,0 +1 @@
+export * from './database';

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@wzyjs/utils",
-  "version": "0.0.7",
-  "description": "> TODO: description",
-  "author": "wzy <657189555@qq.com>",
+  "version": "0.0.11",
+  "description": "description",
+  "author": "wzy",
   "license": "ISC",
-  "main": "dist/cjs/index.js",
+  "main": "dist/cjs/index_c.js",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "scripts": {
@@ -15,8 +15,7 @@
     "dist"
   ],
   "dependencies": {
-    "ahooks": "^3.7.2",
-    "antd": "^5.0.1",
+    "@cloudbase/node-sdk": "^2.9.1",
     "classnames": "^2.3.2",
     "consola": "^2.15.3",
     "copy-to-clipboard": "^3.3.3",
@@ -24,8 +23,6 @@
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
     "md5": "^2.3.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
@@ -45,5 +42,5 @@
     "type": "git",
     "url": "https://gitee.com/wang-zhenyu/app.git"
   },
-  "gitHead": "8e1d0fab516ee88720c772b14a72575bc790c9b1"
+  "gitHead": "00865dfbf006e37041dc48b3f8d6e4191d3bf75f"
 }

package/dist/cjs/hooks/index.d.ts

@@ -1 +0,0 @@
-export * from './useRequestPro';

package/dist/cjs/hooks/useRequestPro.d.ts

@@ -1,11 +0,0 @@
-import { Options, Service, Result } from 'ahooks/lib/useRequest/src/types';
-import { RequestRes } from '../types';
-interface UserOptions<P extends any[], R> extends Options<R, P> {
-    alertErrorMessage?: false | string;
-    alertSuccessMessage?: true | string;
-}
-interface IResult<R extends RequestRes, P extends any[]> extends Omit<Result<R, P>, 'data'> {
-    data?: R['data'];
-}
-export declare const useRequestPro: <P extends any[], R extends RequestRes<any>>(reqPromise: Service<R, P>, userOptions: UserOptions<P, R>) => IResult<R, P>;
-export {};

package/dist/cjs/hooks/useRequestPro.js

@@ -1,37 +0,0 @@
-'use strict';
-
-var antd = require('antd');
-var lodash = require('lodash');
-var ahooks = require('ahooks');
-
-const useRequestPro = (reqPromise, userOptions) => {
-    const { alertErrorMessage = true, alertSuccessMessage = false } = userOptions;
-    const defaultOptions = {
-        debounceWait: 300,
-        throttleWait: 300,
-        onError: (e, params) => {
-            if (alertErrorMessage) {
-                antd.message.error(typeof alertErrorMessage === 'string' ? alertErrorMessage : e.message || '请求失败');
-            }
-            userOptions?.onError?.(e, params);
-        },
-        onSuccess: (res, params) => {
-            if (!res || !res.success) {
-                defaultOptions.onError(new Error(res?.message), params);
-                return;
-            }
-            if (alertSuccessMessage) {
-                antd.message.success(typeof alertSuccessMessage === 'string' ? alertSuccessMessage : res.message || '请求成功');
-            }
-            userOptions?.onSuccess?.(res, params);
-        },
-    };
-    // delete userOptions.onSuccess
-    // delete userOptions.onError
-    const options = Object.assign(defaultOptions, lodash.omit(userOptions, ['onSuccess', 'onError']));
-    const state = ahooks.useRequest(reqPromise, options);
-    state.data = state.data?.data;
-    return state;
-};
-
-exports.useRequestPro = useRequestPro;

package/dist/cjs/index.js

@@ -1,78 +0,0 @@
-'use strict';
-
-var dayjs = require('dayjs');
-var copyToClipboard = require('copy-to-clipboard');
-var classnames = require('classnames');
-var consola = require('consola');
-var md5 = require('md5');
-var ahooks = require('ahooks');
-var lodash = require('lodash');
-var localforage$1 = require('localforage');
-var string = require('./tools/string.js');
-var object = require('./tools/object.js');
-var other = require('./tools/other.js');
-var useRequestPro = require('./hooks/useRequestPro.js');
-
-const localforage = {
-    config: localforage$1.config,
-    setItem: localforage$1.setItem,
-    getItem: localforage$1.getItem,
-    removeItem: localforage$1.removeItem,
-};
-
-exports.dayjs = dayjs;
-exports.copy = copyToClipboard;
-exports.classnames = classnames;
-exports.consola = consola;
-exports.md5 = md5;
-Object.defineProperty(exports, 'cloneDeep', {
-  enumerable: true,
-  get: function () { return lodash.cloneDeep; }
-});
-Object.defineProperty(exports, 'isBoolean', {
-  enumerable: true,
-  get: function () { return lodash.isBoolean; }
-});
-Object.defineProperty(exports, 'isEqual', {
-  enumerable: true,
-  get: function () { return lodash.isEqual; }
-});
-Object.defineProperty(exports, 'isNumber', {
-  enumerable: true,
-  get: function () { return lodash.isNumber; }
-});
-Object.defineProperty(exports, 'isObject', {
-  enumerable: true,
-  get: function () { return lodash.isObject; }
-});
-Object.defineProperty(exports, 'isString', {
-  enumerable: true,
-  get: function () { return lodash.isString; }
-});
-Object.defineProperty(exports, 'merge', {
-  enumerable: true,
-  get: function () { return lodash.merge; }
-});
-Object.defineProperty(exports, 'omit', {
-  enumerable: true,
-  get: function () { return lodash.omit; }
-});
-Object.defineProperty(exports, 'pick', {
-  enumerable: true,
-  get: function () { return lodash.pick; }
-});
-exports.getChineseByStr = string.getChineseByStr;
-exports.getStrLength = string.getStrLength;
-exports.jsonParse = string.jsonParse;
-exports.replaceAll = string.replaceAll;
-exports.replaceByRules = string.replaceByRules;
-exports.checkAttr = object.checkAttr;
-exports.handleParams = other.handleParams;
-exports.useRequestPro = useRequestPro.useRequestPro;
-exports.localforage = localforage;
-Object.keys(ahooks).forEach(function (k) {
-  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
-    enumerable: true,
-    get: function () { return ahooks[k]; }
-  });
-});

package/dist/cjs/tools/other.d.ts

@@ -1,6 +0,0 @@
-import { KeyValue, OrderParams, Pagination, SortParams } from '../types';
-export declare const handleParams: (params: Pagination & KeyValue, sort?: SortParams) => {
-    page: Pagination;
-    where: KeyValue<string, string | number | boolean | RegExp>;
-    order?: OrderParams;
-};

package/dist/cjs/tools/other.js

@@ -1,24 +0,0 @@
-'use strict';
-
-// 处理 ProComponents 中 ProTable 参数中的 page 和 查询条件 和 排序
-const handleParams = (params, sort) => {
-    const { current, pageSize, ...other } = params;
-    return {
-        page: {
-            current: current || 1,
-            pageSize: pageSize || 10,
-        },
-        where: Object.entries(other).reduce((acc, [key, value]) => {
-            if (key && value) {
-                acc[key] = typeof value === 'string' ? new RegExp(value) : value;
-            }
-            return acc;
-        }, {}),
-        order: sort && {
-            field: Object.keys(sort)[0],
-            type: Object.values(sort)[0] === 'ascend' ? 'asc' : 'desc',
-        },
-    };
-};
-
-exports.handleParams = handleParams;

package/dist/esm/hooks/index.d.ts

@@ -1 +0,0 @@
-export * from './useRequestPro';

package/dist/esm/hooks/useRequestPro.d.ts

@@ -1,11 +0,0 @@
-import { Options, Service, Result } from 'ahooks/lib/useRequest/src/types';
-import { RequestRes } from '../types';
-interface UserOptions<P extends any[], R> extends Options<R, P> {
-    alertErrorMessage?: false | string;
-    alertSuccessMessage?: true | string;
-}
-interface IResult<R extends RequestRes, P extends any[]> extends Omit<Result<R, P>, 'data'> {
-    data?: R['data'];
-}
-export declare const useRequestPro: <P extends any[], R extends RequestRes<any>>(reqPromise: Service<R, P>, userOptions: UserOptions<P, R>) => IResult<R, P>;
-export {};