badmfck-api-server 1.9.7 → 1.9.9

package/dist/apiServer/MysqlService.d.ts

@@ -24,7 +24,7 @@ export interface MysqlResult {
 }
 export interface MySqlQuery {
     query: string;
-    fields: MysqlQueryField[];
+    fields: MysqlQueryField[] | MysqlQueryFieldObject;
 }
 export interface MysqlQueryField {
     name: string;
@@ -35,6 +35,14 @@ export interface MysqlQueryField {
     useInReplace?: boolean;
     _parsedValue?: string | number | boolean | null;
 }
+export interface MysqlQueryFieldObject extends Record<string, string | number | boolean | null | undefined | {
+    value: string | number | boolean | null | undefined;
+    system?: boolean;
+    ignoreInInsert?: boolean;
+    ignoreInUpdate?: boolean;
+    useInReplace?: boolean;
+}> {
+}
 export declare class MysqlService extends BaseService {
     reconnectionTimeout: number;
     reconnecting: boolean;
@@ -48,7 +56,9 @@ export declare class MysqlService extends BaseService {
     init(): Promise<void>;
     recreatePool(): Promise<void>;
     onApplicationReady(): Promise<void>;
-    static prepareQuery(query: string, fields: MysqlQueryField[]): string;
+    static fieldsToObject(fields: MysqlQueryField[] | MysqlQueryFieldObject): MysqlQueryFieldObject;
+    static objectToFields(obj: MysqlQueryFieldObject | MysqlQueryField[]): MysqlQueryField[];
+    static prepareQuery(query: string, fields: MysqlQueryField[] | MysqlQueryFieldObject): string;
     static prepareQueryFieldValue(value: string | number | boolean | null | undefined, system?: boolean): string | number | boolean | null | undefined;
     execute(query: string): Promise<MysqlResult>;
     sendQuery(conn: PoolConnection, query: string, resolve: (data: MysqlResult) => void): void;

package/dist/apiServer/MysqlService.js

@@ -88,7 +88,55 @@ class MysqlService extends BaseService_1.BaseService {
         }
     }
     async onApplicationReady() { }
+    static fieldsToObject(fields) {
+        if (!Array.isArray(fields))
+            return fields;
+        const obj = {};
+        for (let i of fields) {
+            if (!i.name)
+                continue;
+            if (typeof i.value !== "object")
+                obj[i.name] = i.value;
+            else {
+                obj[i.name] = {
+                    value: i.value,
+                    system: i.system,
+                    ignoreInInsert: i.ignoreInInsert,
+                    ignoreInUpdate: i.ignoreInUpdate,
+                    useInReplace: i.useInReplace
+                };
+            }
+        }
+        return obj;
+    }
+    static objectToFields(obj) {
+        if (Array.isArray(obj))
+            return obj;
+        const fields = [];
+        for (let i in obj) {
+            if (typeof obj[i] === "object") {
+                const mo = obj[i];
+                fields.push({
+                    name: i,
+                    value: mo.value,
+                    system: mo.system,
+                    ignoreInInsert: mo.system,
+                    ignoreInUpdate: mo.system,
+                    useInReplace: mo.system
+                });
+            }
+            else {
+                fields.push({
+                    name: i,
+                    value: obj[i]
+                });
+            }
+        }
+        return fields;
+    }
     static prepareQuery(query, fields) {
+        if (!Array.isArray(fields))
+            fields = MysqlService.objectToFields(fields);
         for (let i of fields) {
             const val = this.prepareQueryFieldValue(i.value, i.system);
             i._parsedValue = val;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badmfck-api-server",
-  "version": "1.9.7",
+  "version": "1.9.9",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",