baja-lite 1.3.29 → 1.3.31

package/boot-remote.js

@@ -1,6 +1,5 @@
-import { DBType, _Hump } from 'baja-lite-field';
-import { getEnums } from './enum.js';
-import { ColumnMode, SqlCache, SqliteRemote, _GlobalSqlOption, _dao, _defOption, _enums, _primaryDB, _sqlCache, logger } from './sql.js';
+import { DBType, _Hump, getEnums } from 'baja-lite-field';
+import { ColumnMode, SqlCache, SqliteRemote, _GlobalSqlOption, _dao, _defOption, _enum, _primaryDB, _sqlCache, logger } from './sql.js';
 export const BootRomote = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;
@@ -13,7 +12,7 @@ export const BootRomote = async function (options) {
         [DBType.SqliteRemote]: {},
     };
     if (options.enums) {
-        globalThis[_enums] = getEnums(options.enums);
+        globalThis[_enum] = getEnums(options.enums);
     }
     if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {

package/boot.js

@@ -1,6 +1,5 @@
-import { _Hump, DBType } from 'baja-lite-field';
-import { getEnums } from './enum.js';
-import { _dao, _defOption, _enums, _EventBus, _fs, _GlobalSqlOption, _path, _primaryDB, _sqlCache, ColumnMode, logger, Mysql, Postgresql, SqlCache, Sqlite, SqliteRemote } from './sql.js';
+import { _Hump, DBType, getEnums } from 'baja-lite-field';
+import { _dao, _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, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;
@@ -22,7 +21,7 @@ export const Boot = async function (options) {
         [DBType.Redis]: {}
     };
     if (options.enums) {
-        globalThis[_enums] = getEnums(options.enums);
+        globalThis[_enum] = getEnums(options.enums);
     }
     if (options.Mysql) {
         const { createPool } = await import('mysql2/promise');

package/index.d.ts

@@ -1,5 +1,4 @@
 import 'reflect-metadata';
-export * from './enum.js';
 export * from './error.js';
 export * from './fn.js';
 export * from './list.js';

package/index.js

@@ -1,5 +1,4 @@
 import 'reflect-metadata';
-export * from './enum.js';
 export * from './error.js';
 export * from './fn.js';
 export * from './list.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.3.29",
+  "version": "1.3.31",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -38,7 +38,7 @@
     "@msgpack/msgpack": "3.1.1",
     "@types/request-promise": "4.1.51",
     "axios": "1.8.4",
-    "baja-lite-field": "1.3.28",
+    "baja-lite-field": "1.3.31",
     "decimal.js": "10.5.0",
     "html-parse-stringify": "3.0.1",
     "iterare": "1.2.1",

package/sql.d.ts

@@ -20,7 +20,7 @@ declare const _inTransaction: unique symbol;
 declare const _daoDB: unique symbol;
 declare const _sqliteRemoteName: unique symbol;
 declare const _SqlOption: unique symbol;
-export declare const _enums: unique symbol;
+export declare const _enum: unique symbol;
 export declare const _GlobalSqlOption: unique symbol;
 export declare const _EventBus: unique symbol;
 export declare const _path: unique symbol;

package/sql.js

@@ -72,7 +72,7 @@ const _sqliteRemoteName = Symbol('sqliteRemoteName');
 const _SqlOption = Symbol('SqlOption');
 const _resultMap = Symbol('resultMap');
 const _resultMap_SQLID = Symbol('resultMap_SQLID');
-export const _enums = Symbol('_enums');
+export const _enum = Symbol('_enum');
 export const _GlobalSqlOption = Symbol('GlobalSqlOption');
 export const _EventBus = Symbol('EventBus');
 export const _path = Symbol('path');
@@ -1462,7 +1462,7 @@ class Build {
             if (matchs) {
                 const [_a, MapName, Column] = matchs;
                 if (MapName && Column) {
-                    const map = globalThis[_enums].GlobalMap[MapName.trim()];
+                    const map = globalThis[_enum].EnumMap(MapName.trim());
                     if (map) {
                         return ` CASE
     ${Object.entries(map).map(([k, v]) => `WHEN ${Column} = '${k}' THEN '${v}'`).join(' ')}

package/enum.d.ts

@@ -1,2 +0,0 @@
-import { EnmuJson, EnumMap } from "baja-lite-field";
-export declare const getEnums: (GlobalValues?: EnumMap) => EnmuJson;

package/enum.js

@@ -1,31 +0,0 @@
-import { _enums } from "./sql.js";
-let configData = null;
-export const getEnums = (GlobalValues) => {
-    if (!GlobalValues) {
-        return globalThis[_enums];
-    }
-    if (configData) {
-        return configData;
-    }
-    const result = {
-        GlobalArray: {},
-        GlobalMap: {}
-    };
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    Object.keys(GlobalValues).forEach((item) => {
-        // const guess = /([\w\W]+)_([^_]+)$/.exec(item);
-        const guess = item.replace(new RegExp(`_${GlobalValues[item].value()}`, 'i'), '');
-        if (guess) {
-            if (!result.GlobalArray[guess]) {
-                result.GlobalArray[guess] = [];
-            }
-            result.GlobalArray[guess].push([GlobalValues[item].value(), GlobalValues[item].desc()]);
-            if (!result.GlobalMap[guess]) {
-                result.GlobalMap[guess] = {};
-            }
-            result.GlobalMap[guess][GlobalValues[item].value()] = GlobalValues[item].desc();
-        }
-    });
-    configData = result;
-    return result;
-};