baja-lite 1.0.33 → 1.0.35

package/{cjs/boot-remote.d.ts → boot-remote.d.ts}

@@ -1,2 +1,2 @@
-import { GlobalSqlOptionForWeb } from './sql';
+import { GlobalSqlOptionForWeb } from './sql.js';
 export declare const BootRomote: (options: GlobalSqlOptionForWeb) => Promise<void>;

package/{es/boot-remote.js → boot-remote.js}

@@ -1,5 +1,5 @@
-import { getEnums } from './enum';
-import { _primaryDB, _dao, logger, DBType, _sqlCache, _GlobalSqlOption, _defOption, SqlCache, SqliteRemote, _Hump, ColumnMode, _enums } from './sql';
+import { getEnums } from './enum.js';
+import { _primaryDB, _dao, logger, DBType, _sqlCache, _GlobalSqlOption, _defOption, SqlCache, SqliteRemote, _Hump, ColumnMode, _enums } from './sql.js';
 export const BootRomote = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;

package/{es/boot.d.ts → boot.d.ts}

@@ -1,2 +1,2 @@
-import { GlobalSqlOption } from './sql';
+import { GlobalSqlOption } from './sql.js';
 export declare const Boot: (options: GlobalSqlOption) => Promise<void>;

package/{es/boot.js → boot.js}

@@ -1,5 +1,5 @@
-import { getEnums } from './enum';
-import { _GlobalSqlOption, _enums, _EventBus, _defOption, logger, _sqlCache, SqlCache, _dao, DBType, _primaryDB, SqliteRemote, _fs, _path, Mysql, Sqlite, _Hump, ColumnMode, Postgresql } from './sql';
+import { getEnums } from './enum.js';
+import { _GlobalSqlOption, _enums, _EventBus, _defOption, logger, _sqlCache, SqlCache, _dao, DBType, _primaryDB, SqliteRemote, _fs, _path, Mysql, Sqlite, _Hump, ColumnMode, Postgresql } from './sql.js';
 export const Boot = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;

package/{es/enum.js → enum.js}

@@ -1,4 +1,4 @@
-import { _enums } from "./sql";
+import { _enums } from "./sql.js";
 export class Enum {
     constructor(value, desc, ...config) {
         this._value = value;

package/{es/fn.js → fn.js}

@@ -1,5 +1,5 @@
-import { arraySplit } from './object';
-import { Throw } from './error';
+import { arraySplit } from './object.js';
+import { Throw } from './error.js';
 /**
  * 回调函数promise化
  * 调用示例

package/index.d.ts

@@ -0,0 +1,10 @@
+import 'reflect-metadata';
+export * from './error.js';
+export * from './fn.js';
+export * from './math.js';
+export * from './object.js';
+export * from './set-ex.js';
+export * from './sql.js';
+export * from './string.js';
+export * from './enum.js';
+export * from './list.js';

package/index.js

@@ -0,0 +1,10 @@
+import 'reflect-metadata';
+export * from './error.js';
+export * from './fn.js';
+export * from './math.js';
+export * from './object.js';
+export * from './set-ex.js';
+export * from './sql.js';
+export * from './string.js';
+export * from './enum.js';
+export * from './list.js';

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "baja-lite",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "description": "some util for self",
-  "type": "module",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
     "type": "git",
@@ -10,19 +9,20 @@
   },
   "license": "MIT",
   "author": "void-soul",
+  "type": "module",
   "exports": {
     ".": {
-      "types": "./es/index.d.ts",
-      "import": "./es/index.js",
-      "require": "./cjs/index.js"
+      "types": "./index.d.ts",
+      "import": "./index.js"
     },
-    "./*": "./*"
+    "./boot.js":"./boot.js",
+    "./boot-remote.js":"./boot-remote.js"
   },
-  "main": "./cjs/index.js",
-  "types": "./es/index.d.ts",
+  "types": "./index.d.ts",
   "bin": {
-    "baja": "./cjs/code.js"
+    "baja": "./code.js"
   },
+  "models": "./es/index.js",
   "scripts": {
     "dist": "node ./ci.js",
     "mysql": "bun --inspect ./src/test-mysql.ts",
@@ -50,7 +50,7 @@
     "@types/better-sqlite3": "7.6.12",
     "@types/lodash.get": "4.4.9",
     "@types/mustache": "4.2.5",
-    "@types/node": "20.14.14",
+    "@types/node": "22.12.0",
     "@types/pg-pool": "2.0.6",
     "@types/shelljs": "0.8.15",
     "@types/sqlstring": "2.3.2",
@@ -71,6 +71,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "models": "./es/index.js"
+  }
 }

package/{cjs/sql.d.ts → sql.d.ts}

@@ -1,6 +1,6 @@
-import { XML } from './convert-xml';
-import { ArrayList } from './list';
-import { EnumMap } from './enum';
+import { XML } from './convert-xml.js';
+import { ArrayList } from './list.js';
+import { EnumMap } from './enum.js';
 import { ExtensionCodec } from "@msgpack/msgpack";
 export declare const extensionCodec: ExtensionCodec<undefined>;
 declare const _daoDBName: unique symbol;

package/{es/sql.js → sql.js}

@@ -9,19 +9,19 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var _b, _c, _d, _e;
 var _f, _g, _h, _j;
-import { Throw } from './error';
+import { Throw } from './error.js';
 import tslib from 'tslib';
 import iterare from 'iterare';
-import { emptyString } from './string';
+import { emptyString } from './string.js';
 import pino from 'pino';
-import { excuteSplit, ExcuteSplitMode, sleep } from './fn';
-import { add, calc, ten2Any } from './math';
+import { excuteSplit, ExcuteSplitMode, sleep } from './fn.js';
+import { add, calc, ten2Any } from './math.js';
 import mustache from 'mustache';
-import { C2P, C2P2, P2C } from './object';
+import { C2P, C2P2, P2C } from './object.js';
 import { formatDialect, sqlite, mysql, postgresql } from 'sql-formatter';
 import HTML from 'html-parse-stringify';
-import { convert } from './convert-xml';
-import { ArrayList } from './list';
+import { convert } from './convert-xml.js';
+import { ArrayList } from './list.js';
 import LGet from 'lodash.get';
 import { encode, decode, ExtensionCodec, DecodeError } from "@msgpack/msgpack";
 BigInt.prototype.toJSON = function () { return this.toString(); };

package/{es/sqlite.d.ts → sqlite.d.ts}

@@ -1,4 +1,4 @@
-import { SqliteRemoteInterface } from './sql';
+import { SqliteRemoteInterface } from './sql.js';
 export declare abstract class SqliteRemoteClass implements SqliteRemoteInterface {
     private dbList;
     /** 原始存放路径 */

package/{es/sqlite.js → sqlite.js}

@@ -1,4 +1,4 @@
-import { extensionCodec, logger } from './sql';
+import { extensionCodec, logger } from './sql.js';
 import Sqlstring from 'sqlstring';
 import { encode, decode } from "@msgpack/msgpack";
 export class SqliteRemoteClass {

package/{es/test-mysql.js → test-mysql.js}

@@ -8,8 +8,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import 'reflect-metadata';
-import { Boot } from './boot';
-import { SqlService, Field, DB, DBType, SqlType, ColumnMode, SelectResult, } from './sql';
+import { Boot } from './boot.js';
+import { SqlService, Field, DB, DBType, SqlType, ColumnMode, SelectResult, } from './sql.js';
 class AmaFuck2 {
 }
 __decorate([

package/{es/test-postgresql.js → test-postgresql.js}

@@ -8,8 +8,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import 'reflect-metadata';
-import { Boot } from './boot';
-import { SqlService, Field, DB, DBType, SqlType, ColumnMode, SelectResult, } from './sql';
+import { Boot } from './boot.js';
+import { SqlService, Field, DB, DBType, SqlType, ColumnMode, SelectResult, } from './sql.js';
 class AmaFuck2 {
 }
 __decorate([

package/cjs/boot-remote.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BootRomote = void 0;
-const enum_1 = require("./enum");
-const sql_1 = require("./sql");
-const BootRomote = async function (options) {
-    globalThis[sql_1._GlobalSqlOption] = Object.assign({}, sql_1._defOption, options);
-    globalThis[sql_1._Hump] = globalThis[sql_1._GlobalSqlOption].columnMode === sql_1.ColumnMode.HUMP;
-    sql_1.logger.level = options.log ?? 'info';
-    globalThis[sql_1._sqlCache] = new sql_1.SqlCache();
-    if (options.sqlMap) {
-        await globalThis[sql_1._sqlCache].init(options);
-    }
-    globalThis[sql_1._dao] = {
-        [sql_1.DBType.SqliteRemote]: {},
-    };
-    if (options.enums) {
-        globalThis[sql_1._enums] = (0, enum_1.getEnums)(options.enums);
-    }
-    if (options.SqliteRemote && options.SqliteRemote.db) {
-        if (typeof options.SqliteRemote.db === 'string') {
-            options.SqliteRemote.service.initDB(options.SqliteRemote.db);
-            globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][sql_1._primaryDB] = new sql_1.SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
-        }
-        else {
-            let flag = false;
-            for (const [key, fileName] of Object.entries(options.SqliteRemote.db)) {
-                await options.SqliteRemote.service.initDB(fileName);
-                const db = new sql_1.SqliteRemote(options.SqliteRemote.service, fileName);
-                if (flag === false) {
-                    globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][sql_1._primaryDB] = db;
-                    flag = true;
-                }
-                globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][key] = db;
-            }
-        }
-    }
-};
-exports.BootRomote = BootRomote;
-// export const AppendRomote = async function (dbName: string) {
-//     if (!globalThis[_dao][DBType.SqliteRemote][dbName]) {
-//         globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
-//         const db = new SqliteRemote(globalThis[_GlobalSqlOption].SqliteRemote.service, dbName);
-//         if (globalThis[_dao][DBType.SqliteRemote][_primaryDB] === undefined) {
-//             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = db;
-//         }
-//         globalThis[_dao][DBType.SqliteRemote][dbName] = db;
-//     }
-// }

package/cjs/boot.d.ts

@@ -1,2 +0,0 @@
-import { GlobalSqlOption } from './sql';
-export declare const Boot: (options: GlobalSqlOption) => Promise<void>;

package/cjs/boot.js

@@ -1,183 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Boot = void 0;
-const enum_1 = require("./enum");
-const sql_1 = require("./sql");
-const Boot = async function (options) {
-    globalThis[sql_1._GlobalSqlOption] = Object.assign({}, sql_1._defOption, options);
-    globalThis[sql_1._Hump] = globalThis[sql_1._GlobalSqlOption].columnMode === sql_1.ColumnMode.HUMP;
-    if (options.sqlDir) {
-        globalThis[sql_1._path] = await Promise.resolve().then(() => __importStar(require('path')));
-        globalThis[sql_1._fs] = await Promise.resolve().then(() => __importStar(require('fs')));
-    }
-    sql_1.logger.level = options.log ?? 'info';
-    globalThis[sql_1._sqlCache] = new sql_1.SqlCache();
-    if (options.sqlMap || options.sqlDir) {
-        await globalThis[sql_1._sqlCache].init(options);
-    }
-    globalThis[sql_1._dao] = {
-        [sql_1.DBType.Mongo]: {},
-        [sql_1.DBType.Mysql]: {},
-        [sql_1.DBType.Postgresql]: {},
-        [sql_1.DBType.Sqlite]: {},
-        [sql_1.DBType.SqliteRemote]: {},
-        [sql_1.DBType.Redis]: {}
-    };
-    if (options.enums) {
-        globalThis[sql_1._enums] = (0, enum_1.getEnums)(options.enums);
-    }
-    if (options.Mysql) {
-        const { createPool } = await Promise.resolve().then(() => __importStar(require('mysql2/promise')));
-        if (options.Mysql['host']) {
-            globalThis[sql_1._dao][sql_1.DBType.Mysql][sql_1._primaryDB] = new sql_1.Mysql(createPool({
-                ...options.Mysql,
-                multipleStatements: true,
-                decimalNumbers: true,
-                supportBigNumbers: true
-            }));
-        }
-        else {
-            let flag = false;
-            for (const [key, option] of Object.entries(options.Mysql)) {
-                const db = new sql_1.Mysql(createPool({
-                    ...option,
-                    multipleStatements: true,
-                    decimalNumbers: true,
-                    supportBigNumbers: true
-                }));
-                if (flag === false) {
-                    globalThis[sql_1._dao][sql_1.DBType.Mysql][sql_1._primaryDB] = db;
-                    flag = true;
-                }
-                globalThis[sql_1._dao][sql_1.DBType.Mysql][key] = db;
-            }
-        }
-    }
-    if (options.Sqlite) {
-        if (typeof options.Sqlite === 'string') {
-            globalThis[sql_1._dao][sql_1.DBType.Sqlite][sql_1._primaryDB] = new sql_1.Sqlite(new options.BetterSqlite3(options.Sqlite, { fileMustExist: false }));
-        }
-        else {
-            let flag = false;
-            for (const [key, fileName] of Object.entries(options.Sqlite)) {
-                const db = new sql_1.Sqlite(new options.BetterSqlite3(fileName, { fileMustExist: false }));
-                if (flag === false) {
-                    globalThis[sql_1._dao][sql_1.DBType.Sqlite][sql_1._primaryDB] = db;
-                    flag = true;
-                }
-                globalThis[sql_1._dao][sql_1.DBType.Sqlite][key] = db;
-            }
-        }
-    }
-    if (options.SqliteRemote && options.SqliteRemote.db) {
-        if (typeof options.SqliteRemote.db === 'string') {
-            options.SqliteRemote.service.initDB(options.SqliteRemote.db);
-            globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][sql_1._primaryDB] = new sql_1.SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
-        }
-        else {
-            let flag = false;
-            for (const [key, fileName] of Object.entries(options.SqliteRemote.db)) {
-                options.SqliteRemote.service.initDB(fileName);
-                const db = new sql_1.SqliteRemote(options.SqliteRemote.service, fileName);
-                if (flag === false) {
-                    globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][sql_1._primaryDB] = db;
-                    flag = true;
-                }
-                globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][key] = db;
-            }
-        }
-    }
-    if (options.Redis) {
-        const { Redis } = await Promise.resolve().then(() => __importStar(require('ioredis')));
-        if (options.Redis['host']) {
-            globalThis[sql_1._dao][sql_1.DBType.Redis][sql_1._primaryDB] = new Redis(options.Redis);
-        }
-        else {
-            let flag = false;
-            for (const [key, option] of Object.entries(options.Redis)) {
-                const db = new Redis(option);
-                if (flag === false) {
-                    globalThis[sql_1._dao][sql_1.DBType.Redis][sql_1._primaryDB] = db;
-                    flag = true;
-                }
-                globalThis[sql_1._dao][sql_1.DBType.Redis][key] = db;
-            }
-        }
-        const clients = Object.values(globalThis[sql_1._dao][sql_1.DBType.Redis]);
-        const Redlock = await Promise.resolve().then(() => __importStar(require('redlock')));
-        globalThis[sql_1._dao][sql_1.DBType.RedisLock] = new Redlock.default(clients, {
-            // The expected clock drift; for more details see:
-            // http://redis.io/topics/distlock
-            driftFactor: 0.01, // multiplied by lock ttl to determine drift time
-            // The max number of times Redlock will attempt to lock a resource
-            // before erroring.
-            retryCount: 10,
-            // the time in ms between attempts
-            retryDelay: 200, // time in ms
-            // the max time in ms randomly added to retries
-            // to improve performance under high contention
-            // see https://www.awsarchitectureblog.com/2015/03/backoff.html
-            retryJitter: 200, // time in ms
-            // The minimum remaining time on a lock before an extension is automatically
-            // attempted with the `using` API.
-            automaticExtensionThreshold: 500, // time in ms
-        });
-        const { EventEmitter } = await Promise.resolve().then(() => __importStar(require('events')));
-        const event = new EventEmitter({ captureRejections: true });
-        event.on('error', error => {
-            sql_1.logger.error('event-bus', error);
-        });
-        globalThis[sql_1._EventBus] = event;
-    }
-    if (options.Postgresql) {
-        const Pool = await Promise.resolve().then(() => __importStar(require('pg-pool')));
-        if (options.Postgresql['host']) {
-            globalThis[sql_1._dao][sql_1.DBType.Postgresql][sql_1._primaryDB] = new sql_1.Postgresql(new Pool.default(options.Postgresql));
-        }
-        else {
-            let flag = false;
-            for (const [key, option] of Object.entries(options.Postgresql)) {
-                const db = new sql_1.Postgresql(new Pool.default(option));
-                if (flag === false) {
-                    globalThis[sql_1._dao][sql_1.DBType.Postgresql][sql_1._primaryDB] = db;
-                    flag = true;
-                }
-                globalThis[sql_1._dao][sql_1.DBType.Postgresql][key] = db;
-            }
-        }
-    }
-};
-exports.Boot = Boot;