baja-lite 1.0.27 → 1.0.30

package/es/test-postgresql.d.ts

@@ -0,0 +1,2 @@
+import 'reflect-metadata';
+export declare function go2(): Promise<void>;

package/es/test-postgresql.js

@@ -0,0 +1,90 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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';
+class AmaFuck2 {
+}
+__decorate([
+    Field({ type: SqlType.int, length: 200, id: true, uuid: true }),
+    __metadata("design:type", Number)
+], AmaFuck2.prototype, "userid", void 0);
+__decorate([
+    Field({ type: SqlType.varchar, length: 200, def: '333' }),
+    __metadata("design:type", String)
+], AmaFuck2.prototype, "username", void 0);
+__decorate([
+    Field({ type: SqlType.varchar, length: 200 }),
+    __metadata("design:type", String)
+], AmaFuck2.prototype, "pwd", void 0);
+let AmaService2 = class AmaService2 extends SqlService {
+};
+AmaService2 = __decorate([
+    DB({
+        tableName: 'nfc_user', clz: AmaFuck2, dbType: DBType.Postgresql
+    })
+], AmaService2);
+// interface Menu {
+//     resourceid: string;
+//     resourcepid: string;
+//     resourcename: string;
+//     children: Menu[];
+// }
+export async function go2() {
+    await Boot({
+        Postgresql: {
+            database: 'nfc',
+            user: 'postgres',
+            password: 'abcd1234',
+            port: 5432,
+            host: '127.0.0.1'
+        },
+        log: 'info',
+        columnMode: ColumnMode.HUMP,
+        sqlDir: 'E:/pro/baja-lite/xml',
+        sqlMap: {
+            ['test.test']: `SELECT * FROM nfc_user {{#username}} WHERE username = :username {{/username}}`
+        }
+    });
+    const service = new AmaService2();
+    await service.transaction({
+        fn: async (conn) => {
+            const rt5 = await service.select({
+                sqlId: 'test.test',
+                params: { username: '1111' },
+                selectResult: SelectResult.RS_CS,
+                conn
+            });
+            console.log(55, rt5.length);
+            await service.insert({
+                data: {
+                    userid: 22,
+                    username: '222',
+                    pwd: '333'
+                }
+            });
+            return 1;
+        }
+    });
+    // const data = await service.select<Menu>({
+    //     sql: 'SELECT resourceid, resourcepid,resourcename FROM cp_resource ',
+    //     params: {
+    //         site: '1234',
+    //         matchInfo: { reportType: 'yyyy', id: '11' }
+    //     },
+    //     // mapper: [
+    //     //     ['site', ['info', 'bSist'], 989],
+    //     //     ['site', ['info2', 'bSist'], 33],
+    //     //     ['site', ['Bsite'], 0]
+    //     // ]
+    // });
+    // console.log(data);
+}
+go2();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.0.27",
+  "version": "1.0.30",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -25,23 +25,26 @@
   "scripts": {
     "dist": "node ./ci.js",
     "mysql": "bun --inspect ./src/test-mysql.ts",
+    "postgres": "bun --inspect ./src/test-postgresql.ts",
     "xml": "bun --inspect ./src/test-xml.ts",
     "mysql2": "node inspect ./dist/cjs/test-mysql.js",
+    "postgres2": "node inspect ./dist/cjs/test-postgresql.js",
     "sqlite": "node inspect ./dist/cjs/test-sqlite.js"
   },
   "dependencies": {
     "@msgpack/msgpack": "3.0.0-beta2",
     "@types/lodash.get": "4.4.9",
+    "@types/pg-pool": "^2.0.6",
     "@types/shelljs": "0.8.15",
     "decimal.js": "10.4.3",
     "html-parse-stringify": "3.0.1",
     "iterare": "1.2.1",
     "lodash.get": "4.4.2",
     "mustache": "4.2.0",
-    "pino": "9.3.2",
+    "pino": "9.4.0",
     "pino-pretty": "11.2.2",
     "reflect-metadata": "0.2.2",
-    "sql-formatter": "15.4.0",
+    "sql-formatter": "15.4.3",
     "sqlstring": "2.3.3",
     "tslib": "2.7.0"
   },
@@ -50,15 +53,17 @@
     "@types/mustache": "4.2.5",
     "@types/node": "20.14.14",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "8.3.0",
-    "@typescript-eslint/parser": "8.3.0",
-    "better-sqlite3": "11.2.1",
+    "@typescript-eslint/eslint-plugin": "8.8.1",
+    "@typescript-eslint/parser": "8.8.1",
+    "better-sqlite3": "11.3.0",
     "ioredis": "5.4.1",
-    "mongodb": "6.8.0",
-    "mysql2": "3.11.0",
+    "mongodb": "6.9.0",
+    "mysql2": "3.11.3",
+    "pg": "^8.13.0",
+    "pg-pool": "^3.7.0",
     "redlock": "5.0.0-beta.2",
     "shelljs": "0.8.5",
-    "typescript": "5.5.4"
+    "typescript": "5.6.3"
   },
   "engines": {
     "node": ">=20"

package/src/boot.ts

@@ -1,5 +1,5 @@
 import { getEnums } from './enum';
-import { _GlobalSqlOption, GlobalSqlOption, _enums, _EventBus, _defOption, logger, _sqlCache, SqlCache, _dao, DBType, _primaryDB, SqliteRemote, _fs, _path, Mysql, Sqlite, _Hump, ColumnMode } from './sql';
+import { _GlobalSqlOption, GlobalSqlOption, _enums, _EventBus, _defOption, logger, _sqlCache, SqlCache, _dao, DBType, _primaryDB, SqliteRemote, _fs, _path, Mysql, Sqlite, _Hump, ColumnMode, Postgresql } from './sql';
 
 export const Boot = async function (options: GlobalSqlOption) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
@@ -16,6 +16,7 @@ export const Boot = async function (options: GlobalSqlOption) {
     globalThis[_dao] = {
         [DBType.Mongo]: {},
         [DBType.Mysql]: {},
+        [DBType.Postgresql]: {},
         [DBType.Sqlite]: {},
         [DBType.SqliteRemote]: {},
         [DBType.Redis]: {}
@@ -32,6 +33,7 @@ export const Boot = async function (options: GlobalSqlOption) {
                 decimalNumbers: true,
                 supportBigNumbers: true
             }));
+
         } else {
             let flag = false;
             for (const [key, option] of Object.entries(options.Mysql)) {
@@ -41,6 +43,7 @@ export const Boot = async function (options: GlobalSqlOption) {
                     decimalNumbers: true,
                     supportBigNumbers: true
                 }));
+
                 if (flag === false) {
                     globalThis[_dao][DBType.Mysql][_primaryDB] = db;
                     flag = true;
@@ -129,4 +132,22 @@ export const Boot = async function (options: GlobalSqlOption) {
         });
         globalThis[_EventBus] = event;
     }
+    if (options.Postgresql) {
+        const Pool  = await import('pg-pool');
+        if (options.Postgresql['host']) {
+            globalThis[_dao][DBType.Postgresql][_primaryDB] = new Postgresql(new Pool.default(options.Postgresql));
+
+        } else {
+            let flag = false;
+            for (const [key, option] of Object.entries(options.Postgresql)) {
+                const db = new Postgresql(new Pool.default(option));
+
+                if (flag === false) {
+                    globalThis[_dao][DBType.Postgresql][_primaryDB] = db;
+                    flag = true;
+                }
+                globalThis[_dao][DBType.Postgresql][key] = db;
+            }
+        }
+    }
 }