baja-lite 1.3.23 → 1.3.25

package/code.js

@@ -12,7 +12,7 @@ const lxMap = {
     mediumint: "number",
     int: "number",
     integer: "number",
-    bigint: "BigInt",
+    bigint: "number",
     bit: "boolean",
     double: "number",
     real: "number",
@@ -24,7 +24,7 @@ const lxMap = {
     date: "Date",
     time: "string",
     year: "string",
-    timestamp: "BigInt",
+    timestamp: "number",
     datetime: "Date",
     tinyblob: "string",
     blob: "string",
@@ -185,6 +185,7 @@ try {
             else
                 delete r.notNull;
             const fields = new Array(`type:SqlType.${r.type}`);
+            r.Type = lxMap[r.type];
             if (r.length !== null) {
                 fields.push(`length:${r.length}`);
             }
@@ -193,13 +194,32 @@ try {
             }
             if (r.def !== null) {
                 r.def ?? (r.def = '');
-                if (isNaN(r.def) || r.def === '') {
-                    fields.push(`def:'${r.def}'`);
+                if (r.def !== '') {
+                    if (isNaN(r.def)) {
+                        fields.push(`def:'${r.def}'`);
+                    }
+                    else {
+                        fields.push(`def:${r.def}`);
+                    }
+                }
+            }
+            if (r.Type === 'string') {
+                if (r.def === '' || r.def === null) {
+                    r.def = "''";
                 }
                 else {
-                    fields.push(`def:${r.def}`);
+                    r.def = `'${r.def}'`;
                 }
             }
+            else if (r.Type === 'number') {
+                r.def = 0;
+            }
+            else if (r.Type === 'Date') {
+                r.def = 'new Date()';
+            }
+            else {
+                r.def = 'null';
+            }
             if (r.id === true) {
                 fields.push(`id:true`);
             }
@@ -217,7 +237,6 @@ try {
                 fields.push(`comment: '${r.comment}'`);
             }
             r.comment = r.comment ?? '';
-            r.Type = lxMap[r.type];
             r.Field = `@Field({${fields.join(',')}})`;
             r.Name = r.name.replace(/_(\w)/g, (a, b) => b.toUpperCase());
             r.NAME = r.Name.replace(/\w/, (v) => v.toUpperCase());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.3.23",
+  "version": "1.3.25",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {

package/sql.d.ts

@@ -372,7 +372,7 @@ export interface GlobalSqlOption extends GlobalSqlOptionForWeb {
                 isSum?: boolean;
                 limitStart?: number;
                 limitEnd?: number;
-                orderBy?: string;
+                sortName?: string; sortType?: string;
                 params?: Record<string, any>;
             }) => {
                 return   `
@@ -605,7 +605,8 @@ export type SqlModel = Record<string, string | ((options: {
     isSum?: boolean;
     limitStart?: number;
     limitEnd?: number;
-    orderBy?: string;
+    sortName?: string;
+    sortType?: string;
     params?: any;
 }) => string)>;
 type _SqlModel = Record<string, string | ((options: {
@@ -614,7 +615,8 @@ type _SqlModel = Record<string, string | ((options: {
     isSum?: boolean;
     limitStart?: number;
     limitEnd?: number;
-    orderBy?: string;
+    sortName?: string;
+    sortType?: string;
     params?: any;
 }) => string) | XML[]>;
 /**
@@ -657,7 +659,8 @@ export declare class SqlCache {
         isSum?: boolean;
         limitStart?: number;
         limitEnd?: number;
-        orderBy?: string;
+        sortName?: string;
+        sortType?: string;
         [k: string]: any;
     }): string;
 }
@@ -1261,7 +1264,8 @@ export declare class SqlService<T extends object> {
         limitSelf?: boolean;
         countSelf?: boolean;
         sumSelf?: boolean;
-        orderBy?: string;
+        sortName?: string;
+        sortType?: string;
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;
@@ -1276,7 +1280,8 @@ export declare class SqlService<T extends object> {
         limitSelf?: boolean;
         countSelf?: boolean;
         sumSelf?: boolean;
-        orderBy?: string;
+        sortName?: string;
+        sortType?: string;
         hump?: boolean;
         mapper?: string | SqlMapper;
         mapperIfUndefined?: MapperIfUndefined;

package/sql.js

@@ -1208,7 +1208,7 @@ class Build {
     constructor(isCount, isSum, param = {}) {
         this.isCount = isCount;
         this.isSum = isSum;
-        this.orderBy = param.orderBy ?? '';
+        this.orderBy = param.sortName ? `${param.sortName} ${param.sortType ?? 'ASC'}` : '';
         Object.assign(this, param);
     }
     /**
@@ -2842,10 +2842,14 @@ export class SqlService {
         };
         option.pageNumber ?? (option.pageNumber = 1);
         option.pageSize ?? (option.pageSize = 0);
+        if (option.hump === true || (option.hump === undefined && globalThis[_Hump] === true) && option.sortName) {
+            option.sortName = P2C(option.sortName);
+        }
         Object.assign(option.params, {
             limitStart: calc(option.pageNumber).sub(1).mul(option.pageSize).over(),
-            limitEnd: calc(option.pageSize).over(),
-            orderBy: option.orderBy
+            limitEnd: option.pageSize - 0,
+            sortName: option.sortName ?? undefined,
+            sortType: option.sortType ?? undefined
         });
         let sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, ...option.params });
         let sqlSum = '';