baja-lite 1.1.13 → 1.2.1

package/code.js

@@ -96,6 +96,7 @@ console.log(`
         className, eventMainInfo
         ClassName, EventMainInfo
         vueName, event-main-info
+        splitVueName, event/main-info
         splitName, event/main/info
         SplitName, event/mainInfo
 
@@ -118,7 +119,7 @@ console.log(`
         idNames: [], 主键字段数组
         idNames_join: []
 
-        modelName: 模块名称，可能为空字符串
+        modelName: 模块名称，可能为空字符串 event
         modelPath: 模块名称实际就影响访问路径，所以这里会直接拼好controller的模块访问路径，如果模块为空，则该属性就是空字符串,否则是 /模块名称/
 
         logicDelete: 逻辑删除的查询条件，可以附加在sql条件的末尾，可能是空的
@@ -239,6 +240,8 @@ try {
             const className = tableName.replace(/_(\w)/g, (a, b) => b.toUpperCase());
             const ClassName = className.replace(/\w/, (v) => v.toUpperCase());
             const vueName = tableName.replace(/_/g, '-');
+            const splitVueName = tableName.replace(/_/, '/').replace(/_/g, '-');
+            const modelName = tableName.substring(0, tableName.indexOf('_'));
             const splitName = tableName.replace(/_/g, '/');
             const SplitName = tableName.replace(/_/, '/').replace(/_(\w)/g, (a, b) => b.toUpperCase());
             const data = {
@@ -247,6 +250,7 @@ try {
                 className,
                 ClassName,
                 vueName,
+                splitVueName,
                 splitName,
                 SplitName,
                 columns,

package/index.d.ts

@@ -6,6 +6,7 @@ export * from './list.js';
 export * from './math.js';
 export * from './object.js';
 export * from './set-ex.js';
+export * from './snowflake.js';
 export * from './sql.js';
 export * from './sqlite.js';
 export * from './string.js';

package/index.js

@@ -6,6 +6,7 @@ export * from './list.js';
 export * from './math.js';
 export * from './object.js';
 export * from './set-ex.js';
+export * from './snowflake.js';
 export * from './sql.js';
 export * from './sqlite.js';
 export * from './string.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.1.13",
+  "version": "1.2.1",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -31,7 +31,9 @@
     "postgres": "bun --inspect ./src/test-postgresql.ts",
     "postgres2": "node inspect ./dist/cjs/test-postgresql.js",
     "sqlite": "node inspect ./dist/cjs/test-sqlite.js",
-    "xml": "bun --inspect ./src/test-xml.ts"
+    "xml": "bun --inspect ./src/test-xml.ts",
+    "test": "bun --inspect ./src/test.ts",
+    "test2": "node inspect ./dist/cjs/tes.js"
   },
   "dependencies": {
     "@msgpack/msgpack": "3.1.0",

package/snowflake.d.ts

@@ -0,0 +1,12 @@
+export declare class Snowflake {
+    private seq;
+    private mid;
+    private offset;
+    private lastTime;
+    constructor(options?: {
+        mid?: number;
+        offset?: number;
+    });
+    generate(): string | null;
+}
+export declare const snowflake: Snowflake;

package/snowflake.js

@@ -0,0 +1,108 @@
+function hexToDec(hexStr) {
+    if (hexStr.substring(0, 2) === "0x")
+        hexStr = hexStr.substring(2);
+    hexStr = hexStr.toLowerCase();
+    return convertBase(hexStr, 16, 10);
+}
+function add(x, y, base) {
+    let z = [];
+    let n = Math.max(x.length, y.length);
+    let carry = 0;
+    let i = 0;
+    while (i < n || carry) {
+        let xi = i < x.length ? x[i] : 0;
+        let yi = i < y.length ? y[i] : 0;
+        let zi = carry + xi + yi;
+        z.push(zi % base);
+        carry = Math.floor(zi / base);
+        i++;
+    }
+    return z;
+}
+function multiplyByNumber(num, x, base) {
+    if (num < 0)
+        return null;
+    if (num == 0)
+        return [];
+    let result = [];
+    let power = x;
+    while (true) {
+        if (num & 1) {
+            result = add(result, power, base);
+        }
+        num = num >> 1;
+        if (num === 0)
+            break;
+        power = add(power, power, base);
+    }
+    return result;
+}
+function parseToDigitsArray(str, base) {
+    let digits = str.split("");
+    let ary = [];
+    for (let i = digits.length - 1; i >= 0; i--) {
+        let n = parseInt(digits[i], base);
+        if (isNaN(n))
+            return null;
+        ary.push(n);
+    }
+    return ary;
+}
+function convertBase(str, fromBase, toBase) {
+    let digits = parseToDigitsArray(str, fromBase);
+    if (digits === null)
+        return null;
+    let outArray = [];
+    let power = [1];
+    for (let i = 0; i < digits.length; i++) {
+        if (digits[i]) {
+            outArray = add(outArray, multiplyByNumber(digits[i], power, toBase), toBase);
+        }
+        power = multiplyByNumber(fromBase, power, toBase);
+    }
+    let out = "";
+    for (let i = outArray.length - 1; i >= 0; i--) {
+        out += outArray[i].toString(toBase);
+    }
+    return out;
+}
+export class Snowflake {
+    constructor(options) {
+        options = options || {};
+        this.seq = 0;
+        this.mid = (options.mid || 1) % 1023;
+        this.offset = options.offset || 0;
+        this.lastTime = 0;
+    }
+    generate() {
+        let time = Date.now(), bTime = (time - this.offset).toString(2);
+        if (this.lastTime == time) {
+            this.seq++;
+            if (this.seq > 4095) {
+                this.seq = 0;
+                while (Date.now() <= time) { }
+            }
+        }
+        else {
+            this.seq = 0;
+        }
+        this.lastTime = time;
+        let bSeq = this.seq.toString(2), bMid = this.mid.toString(2);
+        while (bSeq.length < 12) {
+            bSeq = "0" + bSeq;
+        }
+        while (bMid.length < 10) {
+            bMid = "0" + bMid;
+        }
+        let bid = bTime + bMid + bSeq;
+        let id = "";
+        for (let i = bid.length; i > 0; i -= 4) {
+            id = parseInt(bid.substring(i - 4, i), 2).toString(16) + id;
+        }
+        return hexToDec(id);
+    }
+}
+export const snowflake = new Snowflake({
+    mid: 66,
+    offset: (2024 - 1970) * 31536000 * 1000,
+});

package/sql.d.ts

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

package/sql.js

@@ -9,21 +9,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var _b, _c, _d, _e;
 var _f, _g, _h, _j;
-import { Throw } from './error.js';
-import tslib from 'tslib';
+import { decode, DecodeError, encode, ExtensionCodec } from "@msgpack/msgpack";
+import HTML from 'html-parse-stringify';
 import * as ite from 'iterare';
-import { emptyString } from './string.js';
+import LGet from 'lodash.get';
+import mustache from 'mustache';
 import pino from 'pino';
+import { formatDialect, mysql, postgresql, sqlite } from 'sql-formatter';
+import tslib from 'tslib';
+import { convert } from './convert-xml.js';
+import { Throw } from './error.js';
 import { excuteSplit, ExcuteSplitMode, sleep } from './fn.js';
+import { ArrayList } from './list.js';
 import { add, calc, ten2Any } from './math.js';
-import mustache from 'mustache';
 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.js';
-import { ArrayList } from './list.js';
-import LGet from 'lodash.get';
-import { encode, decode, ExtensionCodec, DecodeError } from "@msgpack/msgpack";
+import { emptyString } from './string.js';
 const iterate = ite.iterate;
 BigInt.prototype.toJSON = function () { return this.toString(); };
 const BIGINT_EXT_TYPE = 0;
@@ -2607,6 +2607,8 @@ export class SqlService {
         option.mode ?? (option.mode = InsertMode.Insert);
         const isArray = option.data instanceof Array;
         const datas = option.data instanceof Array ? option.data : [option.data];
+        if (datas.length === 0)
+            return 0n;
         if (option.sync === SyncMode.Sync) {
             const fn = () => {
                 const result = excuteSplit(ExcuteSplitMode.SyncTrust, datas, _data => {
@@ -2713,6 +2715,8 @@ export class SqlService {
     update(option) {
         Throw.if(!this[_ids] || this[_ids].length === 0, 'not found id');
         const datas = option.data instanceof Array ? option.data : [option.data];
+        if (datas.length === 0)
+            return 0;
         if (option.sync === SyncMode.Sync) {
             const fn = () => {
                 const result = excuteSplit(ExcuteSplitMode.SyncTrust, datas, _data => {
@@ -2774,6 +2778,9 @@ export class SqlService {
             option.where = ids.map(i => ({ [idName]: i }));
         }
         const wheres = option.where instanceof Array ? option.where : [option.where];
+        if (wheres.length === 0) {
+            return 0;
+        }
         const sqls = [];
         if (option.mode === DeleteMode.Common) {
             const params = new Array();

package/test.js

@@ -1,2 +1,2 @@
-import { format } from 'mysql2';
-console.log(format('select 1 from a where ?', [['1', '2', '3']]));
+import { snowflake } from "snowflake";
+console.log(snowflake.generate());