baja-lite 1.1.3 → 1.1.4

package/.eslintignore

@@ -0,0 +1,7 @@
+/dist
+/src-capacitor
+/src-cordova
+/.quasar
+/node_modules
+.eslintrc.cjs
+/quasar.config.*.temporary.compiled*

package/.eslintrc.cjs

@@ -0,0 +1,89 @@
+module.exports = {
+  // https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
+  // This option interrupts the configuration hierarchy at this file
+  // Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
+  root: true,
+
+  // https://eslint.vuejs.org/user-guide/#how-to-use-a-custom-parser
+  // Must use parserOptions instead of "parser" to allow vue-eslint-parser to keep working
+  // `parser: 'vue-eslint-parser'` is already included with any 'plugin:vue/**' config and should be omitted
+  parserOptions: {
+    parser: require.resolve('@typescript-eslint/parser'),
+    extraFileExtensions: [ '.vue' ]
+  },
+
+  env: {
+    browser: true,
+    es2021: true,
+    node: true
+  },
+
+  // Rules order is important, please avoid shuffling them
+  extends: [
+    // Base ESLint recommended rules
+    // 'eslint:recommended',
+
+    // https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin#usage
+    // ESLint typescript rules
+    'plugin:@typescript-eslint/recommended',
+
+    // Uncomment any of the lines below to choose desired strictness,
+    // but leave only one uncommented!
+    // See https://eslint.vuejs.org/rules/#available-rules
+    'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
+    // 'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
+    // 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
+
+    // https://github.com/prettier/eslint-config-prettier#installation
+    // usage with Prettier, provided by 'eslint-config-prettier'.
+    'prettier'
+  ],
+
+  plugins: [
+    // required to apply rules which need type information
+    '@typescript-eslint',
+
+    // https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-files
+    // required to lint *.vue files
+    'vue'
+    
+    // https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674
+    // Prettier has not been included as plugin to avoid performance impact
+    // add it as an extension for your IDE
+    
+  ],
+
+  globals: {
+    ga: 'readonly', // Google Analytics
+    cordova: 'readonly',
+    __statics: 'readonly',
+    __QUASAR_SSR__: 'readonly',
+    __QUASAR_SSR_SERVER__: 'readonly',
+    __QUASAR_SSR_CLIENT__: 'readonly',
+    __QUASAR_SSR_PWA__: 'readonly',
+    process: 'readonly',
+    Capacitor: 'readonly',
+    chrome: 'readonly'
+  },
+
+  // add your custom rules here
+  rules: {
+    
+    'prefer-promise-reject-errors': 'off',
+
+    quotes: ['warn', 'single', { avoidEscape: true }],
+
+    // this rule, if on, would require explicit return type on the `render` function
+    '@typescript-eslint/explicit-function-return-type': 'off',
+
+    // in plain CommonJS modules, you can't use `import foo = require('foo')` to pass this rule, so it has to be disabled
+    '@typescript-eslint/no-var-requires': 'off',
+
+    // The core 'no-unused-vars' rules (in the eslint:recommended ruleset)
+    // does not work with type definitions
+    'no-unused-vars': 'off',
+
+    // allow debugger during development only
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+  }
+}

package/.prettierrc

@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "semi": true
+}

package/ci.js

@@ -0,0 +1,29 @@
+// import { rm, exec, cp } from 'shelljs';
+import pkg from 'shelljs';
+import cjs from './package-cjs.json' with { type: "json" };
+import def from './package.json' with { type: "json" };
+import fs from 'fs';
+const { rm, exec, cp } = pkg;
+
+rm('-rf', './dist/');
+rm('-rf', './tsconfig.tsbuildinfo');
+exec('yarn tsc');
+rm('-rf', './tsconfig.tsbuildinfo');
+cp('./package.json', './dist/package.json');
+cp('./README.md', './dist/README.md');
+cp('./LICENSE', './dist/LICENSE');
+rm('-rf', './dist/tsconfig.tsbuildinfo');
+
+rm('-rf', './dist-cjs/');
+rm('-rf', './tsconfig.cjs.tsbuildinfo');
+exec('yarn tsc -p tsconfig.cjs.json');
+rm('-rf', './tsconfig.cjs.tsbuildinfo');
+fs.writeFileSync('./dist-cjs/package.json', JSON.stringify(Object.assign(def, cjs), null, 2));
+cp('./README.md', './dist-cjs/README.md');
+cp('./LICENSE', './dist-cjs/LICENSE');
+
+
+cp('-R', './dist/*', 'E:\\pro\\v\\apps-services\\fast-start\\node_modules\\baja-lite');
+cp('-R', './dist-cjs/*', 'E:\\pro\\v\\apps-services\\attack-service\\node_modules\\baja-lite-cjs');
+cp('-R', './dist/*', 'E:\\pro\\v\\apps-services\\attack-front\\node_modules\\baja-lite');
+console.log('cp over');

package/package-cjs.json

@@ -0,0 +1,17 @@
+{
+  "name": "baja-lite-cjs",
+  "type": "commonjs",
+  "exports": {
+    ".": {
+      "require": "./index.js"
+    },
+    "./boot.js":"./boot.js",
+    "./boot-remote.js":"./boot-remote.js",
+    "./wx.js": "./wx.js"
+  },
+  "types": "./index.d.ts",
+  "bin": {
+    "baja": "./code.js"
+  },
+  "main": "./index.js"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -23,7 +23,7 @@
   "bin": {
     "baja": "./code.js"
   },
-  "models": "./es/index.js",
+  "models": "./index.js",
   "scripts": {
     "dist": "node ./ci.js",
     "mysql": "bun --inspect ./src/test-mysql.ts",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@msgpack/msgpack": "3.0.0-beta3",
-    "@types/request-promise": "^4.1.51",
+    "@types/request-promise": "4.1.51",
     "axios": "1.7.9",
     "decimal.js": "10.5.0",
     "html-parse-stringify": "3.0.1",
@@ -45,7 +45,7 @@
     "pino": "9.6.0",
     "pino-pretty": "13.0.0",
     "reflect-metadata": "0.2.2",
-    "request-promise": "^4.2.6",
+    "request-promise": "4.2.6",
     "sql-formatter": "15.4.10",
     "sqlstring": "2.3.3",
     "tslib": "2.8.1"
@@ -54,7 +54,7 @@
     "@types/better-sqlite3": "7.6.12",
     "@types/lodash.get": "4.4.9",
     "@types/mustache": "4.2.5",
-    "@types/node": "22.12.0",
+    "@types/node": "22.13.0",
     "@types/pg-pool": "2.0.6",
     "@types/shelljs": "0.8.15",
     "@types/sqlstring": "2.3.2",
@@ -62,7 +62,7 @@
     "@typescript-eslint/parser": "8.22.0",
     "better-sqlite3": "11.8.1",
     "ioredis": "5.4.2",
-    "mongodb": "6.12.0",
+    "mongodb": "6.13.0",
     "mysql2": "3.12.0",
     "pg": "8.13.1",
     "pg-pool": "3.7.0",

package/{boot-remote.js → src/boot-remote.ts}

@@ -1,6 +1,7 @@
 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) {
+import { _primaryDB, _dao, logger, DBType, _sqlCache, _GlobalSqlOption, GlobalSqlOptionForWeb, _defOption, SqlCache, SqliteRemote, _Hump, ColumnMode, _enums } from './sql.js';
+
+export const BootRomote = async function (options: GlobalSqlOptionForWeb) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;
     logger.level = options.log ?? 'info';
@@ -18,8 +19,7 @@ export const BootRomote = async function (options) {
         if (typeof options.SqliteRemote.db === 'string') {
             options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = new SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
-        }
-        else {
+        } else {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.SqliteRemote.db)) {
                 await options.SqliteRemote.service.initDB(fileName);
@@ -32,7 +32,8 @@ export const BootRomote = async function (options) {
             }
         }
     }
-};
+}
+
 // export const AppendRomote = async function (dbName: string) {
 //     if (!globalThis[_dao][DBType.SqliteRemote][dbName]) {
 //         globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
@@ -42,4 +43,4 @@ export const BootRomote = async function (options) {
 //         }
 //         globalThis[_dao][DBType.SqliteRemote][dbName] = db;
 //     }
-// }
+// }

package/{boot.js → src/boot.ts}

@@ -1,6 +1,7 @@
 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) {
+import { _GlobalSqlOption, 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: GlobalSqlOption) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;
     if (options.sqlDir) {
@@ -32,8 +33,8 @@ export const Boot = async function (options) {
                 decimalNumbers: true,
                 supportBigNumbers: true
             }));
-        }
-        else {
+
+        } else {
             let flag = false;
             for (const [key, option] of Object.entries(options.Mysql)) {
                 const db = new Mysql(createPool({
@@ -42,6 +43,7 @@ export const Boot = async function (options) {
                     decimalNumbers: true,
                     supportBigNumbers: true
                 }));
+
                 if (flag === false) {
                     globalThis[_dao][DBType.Mysql][_primaryDB] = db;
                     flag = true;
@@ -53,8 +55,7 @@ export const Boot = async function (options) {
     if (options.Sqlite) {
         if (typeof options.Sqlite === 'string') {
             globalThis[_dao][DBType.Sqlite][_primaryDB] = new Sqlite(new options.BetterSqlite3(options.Sqlite, { fileMustExist: false }));
-        }
-        else {
+        } else {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.Sqlite)) {
                 const db = new Sqlite(new options.BetterSqlite3(fileName, { fileMustExist: false }));
@@ -70,8 +71,7 @@ export const Boot = async function (options) {
         if (typeof options.SqliteRemote.db === 'string') {
             options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = new SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
-        }
-        else {
+        } else {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.SqliteRemote.db)) {
                 options.SqliteRemote.service.initDB(fileName);
@@ -88,8 +88,7 @@ export const Boot = async function (options) {
         const { Redis } = await import('ioredis');
         if (options.Redis['host']) {
             globalThis[_dao][DBType.Redis][_primaryDB] = new Redis(options.Redis);
-        }
-        else {
+        } else {
             let flag = false;
             for (const [key, option] of Object.entries(options.Redis)) {
                 const db = new Redis(option);
@@ -100,25 +99,32 @@ export const Boot = async function (options) {
                 globalThis[_dao][DBType.Redis][key] = db;
             }
         }
-        const clients = Object.values(globalThis[_dao][DBType.Redis]);
+        const clients = Object.values(globalThis[_dao][DBType.Redis]) as any;
         const Redlock = await import('redlock');
-        globalThis[_dao][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
-        });
+        globalThis[_dao][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 import('events');
         const event = new EventEmitter({ captureRejections: true });
         event.on('error', error => {
@@ -127,14 +133,15 @@ export const Boot = async function (options) {
         globalThis[_EventBus] = event;
     }
     if (options.Postgresql) {
-        const Pool = await import('pg-pool');
+        const Pool  = await import('pg-pool');
         if (options.Postgresql['host']) {
             globalThis[_dao][DBType.Postgresql][_primaryDB] = new Postgresql(new Pool.default(options.Postgresql));
-        }
-        else {
+
+        } 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;
@@ -143,4 +150,4 @@ export const Boot = async function (options) {
             }
         }
     }
-};
+}