baja-lite 1.4.6 → 1.4.7

package/boot.js

@@ -1,6 +1,6 @@
 import { _Hump, DBType, getEnums } from 'baja-lite-field';
 import events from 'events';
-import { _dao, _defOption, _enum, _EventBus, _fs, _GlobalSqlOption, _path, _primaryDB, _sqlCache, ColumnMode, logger, Mysql, Postgresql, SqlCache, Sqlite, SqliteRemote } from './sql.js';
+import { _dao, _dataConvert, _defOption, _enum, _EventBus, _fs, _GlobalSqlOption, _path, _primaryDB, _sqlCache, ColumnMode, logger, Mysql, Postgresql, SqlCache, Sqlite, SqliteRemote } from './sql.js';
 export const Boot = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption);
     if (options.skipEmptyString !== undefined) {
@@ -16,12 +16,12 @@ export const Boot = async function (options) {
         globalThis[_GlobalSqlOption].maxDeal = options.maxDeal;
     }
     globalThis[_Hump] = options.columnMode === ColumnMode.HUMP;
+    logger.level = options.log ?? 'info';
+    globalThis[_sqlCache] = new SqlCache();
     if (options.sqlDir) {
         globalThis[_path] = await import('path');
         globalThis[_fs] = await import('fs');
     }
-    logger.level = options.log ?? 'info';
-    globalThis[_sqlCache] = new SqlCache();
     if (options.sqlMap || options.sqlDir) {
         await globalThis[_sqlCache].init(options);
     }
@@ -36,6 +36,9 @@ export const Boot = async function (options) {
     if (options.enums) {
         globalThis[_enum] = getEnums(options.enums);
     }
+    if (options.dataConvert) {
+        globalThis[_dataConvert] = options.dataConvert;
+    }
     if (options.Mysql) {
         const { createPool } = await import('mysql2/promise');
         if (options.Mysql['host']) {
@@ -55,7 +58,7 @@ export const Boot = async function (options) {
                     decimalNumbers: true,
                     supportBigNumbers: true
                 }));
-                if (flag === false) {
+                if (!flag) {
                     globalThis[_dao][DBType.Mysql][_primaryDB] = db;
                     flag = true;
                 }
@@ -71,7 +74,7 @@ export const Boot = async function (options) {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.Sqlite)) {
                 const db = new Sqlite(new options.BetterSqlite3(fileName, { fileMustExist: false }));
-                if (flag === false) {
+                if (!flag) {
                     globalThis[_dao][DBType.Sqlite][_primaryDB] = db;
                     flag = true;
                 }
@@ -89,7 +92,7 @@ export const Boot = async function (options) {
             for (const [key, fileName] of Object.entries(options.SqliteRemote.db)) {
                 options.SqliteRemote.service.initDB(fileName);
                 const db = new SqliteRemote(options.SqliteRemote.service, fileName);
-                if (flag === false) {
+                if (!flag) {
                     globalThis[_dao][DBType.SqliteRemote][_primaryDB] = db;
                     flag = true;
                 }
@@ -107,7 +110,7 @@ export const Boot = async function (options) {
             let flag = false;
             for (const [key, option] of Object.entries(options.Redis)) {
                 const db = new Redis(option);
-                if (flag === false) {
+                if (!flag) {
                     globalThis[_dao][DBType.Redis][_primaryDB] = db;
                     flag = true;
                 }
@@ -149,7 +152,7 @@ export const Boot = async function (options) {
             let flag = false;
             for (const [key, option] of Object.entries(options.Postgresql)) {
                 const db = new Postgresql(new Pool.default(option));
-                if (flag === false) {
+                if (!flag) {
                     globalThis[_dao][DBType.Postgresql][_primaryDB] = db;
                     flag = true;
                 }

package/object.d.ts

@@ -77,8 +77,8 @@ export declare const arraySplit: <T = any>(datas: T[], { everyLength, groupCount
 }) => T[][];
 export declare const P2C: (pro: string, IF?: boolean) => string;
 export declare const C2P: (pro: string, IF?: boolean) => string;
-export declare function C2P2<T extends Object = any, L extends Object = T>(datas: L[]): T[];
-export declare function C2P2<T extends Object = any, L extends Object = T>(datas: L): T;
+export declare function C2P2<T extends Object = any, L extends Object = T>(datas: L[], hump?: boolean, convert?: Record<string, (data: any) => any>): T[];
+export declare function C2P2<T extends Object = any, L extends Object = T>(datas: L, hump?: boolean, convert?: Record<string, (data: any) => any>): T;
 export declare function P2C2<T extends Object = any, L extends Object = T>(datas: L[]): T[];
 export declare function P2C2<T extends Object = any, L extends Object = T>(datas: L): T;
 export declare function fillArrayToMinLength<T>(arr: T[], minLength: number, fillValue: T): T[];

package/object.js

@@ -198,12 +198,34 @@ const P2CEX = /[A-Z]/g;
 export const P2C = (pro, IF = true) => IF ? pro.replace(P2CEX, (a) => `_${a.toLowerCase()}`) : pro;
 const C2PEX = /_([a-z])/g;
 export const C2P = (pro, IF = true) => IF ? pro.replace(C2PEX, (a, b) => `${b.toUpperCase()}`) : pro;
-export function C2P2(datas) {
+export function C2P2(datas, hump, convert) {
     if (datas instanceof Array) {
-        return iterate(datas).map((data) => Object.fromEntries(Object.entries(data).map(([K, V]) => [C2P(K), V]))).toArray();
+        return iterate(datas)
+            .map((data) => Object.fromEntries(Object.entries(data).map(([K, V]) => {
+            if (hump) {
+                K = C2P(K);
+            }
+            if (convert && convert[K]) {
+                return [K, convert[K](V)];
+            }
+            else {
+                return [K, V];
+            }
+        })))
+            .toArray();
     }
     else if (datas) {
-        return Object.fromEntries(Object.entries(datas).map(([K, V]) => [C2P(K), V]));
+        return Object.fromEntries(Object.entries(datas).map(([K, V]) => {
+            if (hump) {
+                K = C2P(K);
+            }
+            if (convert && convert[K]) {
+                return [K, convert[K](V)];
+            }
+            else {
+                return [K, V];
+            }
+        }));
     }
     else {
         return datas;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {