baja-lite 1.0.2 → 1.0.3

package/cjs/code.js

@@ -0,0 +1,2 @@
+"use strict";
+console.log(__dirname);

package/cjs/index.d.ts

@@ -1,7 +1,6 @@
 export * from './error';
 export * from './fn';
 export * from './math';
-export * from './now';
 export * from './object';
 export * from './set-ex';
 export * from './sql';

package/cjs/index.js

@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./error"), exports);
 __exportStar(require("./fn"), exports);
 __exportStar(require("./math"), exports);
-__exportStar(require("./now"), exports);
 __exportStar(require("./object"), exports);
 __exportStar(require("./set-ex"), exports);
 __exportStar(require("./sql"), exports);

package/cjs/object.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.arraySplit = exports.array2map = exports.mixList = exports.mixArray = exports.fixEmptyPrototy = exports.coverComplexBean = exports.createBeanFromArray = exports.emptyBean = exports.convertBeans = exports.convertBean = exports.copyBean = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 /**
  * 对象对象（等同与convertBean）
  * 仅会将classType有的属性进行转换
@@ -98,11 +94,11 @@ const coverComplexBean = (source, classType) => {
     const arrayData = {};
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     for (const [key, value] of Object.entries(source)) {
-        if (lodash_1.default.isArray(value)) {
+        if (value instanceof Array) {
             arrayData[key] = value;
         }
-        else if (lodash_1.default.isObject(value)) {
-            lodash_1.default.assign(result, value);
+        else if (typeof value === 'object') {
+            Object.assign(result, value);
         }
         else {
             result[key] = value;

package/cjs/sql.d.ts

@@ -179,7 +179,7 @@ interface ServiceOption {
 
     ```
     interface SqlModel {
-        [key: string]: string | ((params: { [k: string]: any }, context: any, isPage?: boolean) => string)
+        [key: string]: string | ((params: { [k: string]: any }, context: any, isCount?: boolean) => string)
     }
     ```
     可以继承该接口来约束格式
@@ -256,11 +256,18 @@ interface GlobalSqlOption {
     /** 日志等级 */
     log?: 'trace' | 'debug' | 'info' | 'warn';
     /**
-     日志文件存放路径,该目录下文件名是模块名，例如有一个文件名为 `user.js`,内容为:
+     ## 日志文件存放路径,该目录下文件名是模块名，例如有一个文件名为 `user.js`,内容为:
      ```
        export default {
             'sql_1': 'SELECT * FROM user WHERE username = :username',
-            'sql_2': (params: Record<string, any>, context: any, isPage?: boolean | undefined) => {
+            'sql_2': (options: {
+                ctx: any;
+                isCount?: boolean;
+                limitStart?: number;
+                limitEnd?: number;
+                orderBy?: string;
+                [k: string]: any;
+            }) => {
                 return   `
                     SELECT * FROM user u LEFT JOIN organ o ON u.orgid = o.orgid
                     WHERE o.orgid = :orgid;
@@ -268,22 +275,33 @@ interface GlobalSqlOption {
             }
         } as SqlModel;
      ```
-     ** 可以看到，sql语句支持直接映射一个sql语句，也可以通过函数返回
+     ** 可以看到，sql语句支持直接映射一个sql语句，也可以通过函数返回,返回字符串支持[mustache](https://github.com/janl/mustache.js)
      ** 上面的文件中，将注册两个SQL：`user.sql_1` 和 `user.sql_2`.
-     ** params 是用查询时传入的参数，可以指定为任意类型，可以用来生成sql，例如进行循环语句
-     ** context 是框架的上下文，可以自行指定类型
-     ** isPage 是保留参数
+     ** `[k: string]: any;` 是用查询时传入的参数，可以指定为任意类型，可以用来生成sql，例如进行循环语句
+     ** ctx 是框架的上下文，可以自行指定类型
+     ** 其他 是保留参数
      ** 函数类型中，可以调用自己定义的通用sql
      ### 注意
      1. 不要直接拼接参数：不安全且效率低
      2. sqlite不支持多语句拼接
+    ## 也支持.mu文件,格式略
     */
     sqlDir?: string;
     /**
-     作用与sqlDir类似，不同在于sqlCache`不需要`目录，而是直接指定一个sqlModel对象，对象的格式和sqlDir的文件内容一样。
+     作用与sqlDir类似，不同在于sqlMap`不需要`目录，而是直接指定一个sqlModel对象，对象的格式和sqlDir的文件内容一样。
      ** 适用于简单使用
      */
-    sqlCache?: SqlModel;
+    sqlMap?: SqlModel;
+    /**
+    ## [mustache](https://mustache.github.io/) 编译时的[模板](https://github.com/janl/mustache.js#:~:text=requires%20only%20this%3A-,%7B%7B%3E%20next_more%7D%7D,-Why%3F%20Because%20the)
+      ** 文件名就是模板名
+     */
+    sqlFNDir?: string;
+    /**
+     作用与sqlFnDir类似，不同在于sqlFNMap`不需要`目录，而是直接指定一个 Record<string, string>，对象的格式和sqlFnDir的文件内容一样。
+     ** 适用于简单使用
+     */
+    sqlFNMap?: Record<string, string>;
     /**
      [REDIS初始化文档](https://github.com/redis/ioredis?tab=readme-ov-file#:~:text=connect%20to%20by%3A-,new%20Redis()%3B,-//%20Connect%20to%20127.0.0.1)
     ```
@@ -312,8 +330,8 @@ interface GlobalSqlOption {
 interface FieldOption extends Object {
     type?: SqlType;
     name?: string;
-    length1?: number;
-    length2?: number;
+    length?: number;
+    scale?: number;
     def?: any;
     index?: boolean;
     id?: boolean;
@@ -375,7 +393,15 @@ interface Dao {
     restore(sync: SyncMode.Sync, name: string): void;
     restore(sync: SyncMode.Async, name: string): Promise<void>;
 }
-type SqlModel = Record<string, string | ((params: Record<string, any>, context: any, isPage?: boolean) => string)>;
+export type SqlModel = Record<string, string | ((options: {
+    ctx: any;
+    isCount?: boolean;
+    isSum?: boolean;
+    limitStart?: number;
+    limitEnd?: number;
+    orderBy?: string;
+    [k: string]: any;
+}) => string)>;
 export declare const Field: (config: FieldOption) => (object: object, propertyName: string) => void;
 export declare const DB: (config: ServiceOption) => <C extends new (...args: any[]) => {}>(constructor: C) => {
     new (...args: any[]): {
@@ -763,7 +789,7 @@ export declare class SqlService<T extends object> {
         sql?: string;
         params?: Record<string, any>;
         context?: any;
-        isPage?: boolean;
+        isCount?: boolean;
         defValue?: L | null;
         multiple?: boolean;
         errorMsg?: string;
@@ -775,7 +801,7 @@ export declare class SqlService<T extends object> {
         sql?: string;
         params?: Record<string, any>;
         context?: any;
-        isPage?: boolean;
+        isCount?: boolean;
         defValue?: L | null;
         multiple?: boolean;
         errorMsg?: string;
@@ -787,7 +813,7 @@ export declare class SqlService<T extends object> {
         sql?: string;
         params?: Record<string, any>;
         context?: any;
-        isPage?: boolean;
+        isCount?: boolean;
         defValue?: L | null;
         multiple?: boolean;
         errorMsg?: string;
@@ -799,7 +825,7 @@ export declare class SqlService<T extends object> {
         sql?: string;
         params?: Record<string, any>;
         context?: any;
-        isPage?: boolean;
+        isCount?: boolean;
         defValue?: L | null;
         multiple?: boolean;
         errorMsg?: string;
@@ -811,7 +837,7 @@ export declare class SqlService<T extends object> {
         sql?: string;
         params?: Record<string, any>;
         context?: any;
-        isPage?: boolean;
+        isCount?: boolean;
         defValue?: L | null;
         multiple?: boolean;
         errorMsg?: string;
@@ -823,7 +849,7 @@ export declare class SqlService<T extends object> {
         sql?: string;
         params?: Record<string, any>;
         context?: any;
-        isPage?: boolean;
+        isCount?: boolean;
         defValue?: L | null;
         multiple?: boolean;
         errorMsg?: string;