@axiosleo/orm-mysql 0.6.2 → 0.7.0

package/index.d.ts

@@ -79,6 +79,8 @@ export declare class Query {
 
   whereConditions(...condition: WhereOptions[]): this;
 
+  groupWhere(...condition: WhereOptions[]): this;
+
   orWhere(key: string | null, opt: OptType, value: ConditionValueType | WhereOptions[]): this;
 
   andWhere(key: string | null, opt: OptType, value: ConditionValueType | WhereOptions[]): this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axiosleo/orm-mysql",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "description": "MySQL ORM tool",
   "keywords": [
     "mysql",

package/src/builder.js

@@ -216,6 +216,12 @@ class Builder {
     let sql = typeof prefix === 'undefined' ? 'WHERE ' : prefix;
     if (conditions.length) {
       sql += `${conditions.map((c) => {
+        if (typeof c.key === 'undefined') {
+          c.key = null;
+        }
+        if (typeof c.value === 'undefined') {
+          c.value = null;
+        }
         if (c.key === null && c.value === null) {
           return ` ${c.opt} `;
         }

package/src/hook.js

@@ -2,7 +2,7 @@
 
 const EventEmitter = require('events');
 
-const events = new Map(); // event tree
+const events = {}; // event tree
 const hook = new EventEmitter();
 
 const push = (callback, trace = []) => {
@@ -15,10 +15,10 @@ const push = (callback, trace = []) => {
       curr_key = '*';
     }
     event_name_items.push(curr_key);
-    if (!curr.has(curr_key)) {
-      curr.set(curr_key, new Map());
+    if (!curr[curr_key]) {
+      curr[curr_key] = {};
     }
-    curr = curr.get(curr_key);
+    curr = curr[curr_key];
     step++;
   }
   let event_name = event_name_items.join('::');
@@ -33,6 +33,14 @@ const pushEvent = (options = {}) => {
   return { event_name, label, table, opt, callback };
 };
 
+/**
+ * @param {Map} curr 
+ * @param {*} trace 
+ * @param {*} step 
+ * @param {*} paths 
+ * @param {*} args 
+ * @returns 
+ */
 const eventRecur = (curr, trace, step, paths, args) => {
   if (step === trace.length) {
     hook.emit(paths.join('::'), ...args);
@@ -41,7 +49,7 @@ const eventRecur = (curr, trace, step, paths, args) => {
   const t = trace[step];
   if (curr['*']) {
     paths[step] = '*';
-    eventRecur(curr[t], trace, step + 1, paths, args);
+    eventRecur(curr['*'], trace, step + 1, paths, args);
   }
   if (curr[t]) {
     paths[step] = t;

package/src/query.js

@@ -69,6 +69,18 @@ class Query {
     return this;
   }
 
+  groupWhere(...conditions) {
+    if (!conditions.length) {
+      return this;
+    }
+    const condition = { key: null, opt: 'group', value: [] };
+    conditions.forEach((c) => {
+      condition.value.push(c);
+    });
+    this.options.conditions.push(condition);
+    return this;
+  }
+
   orWhere(key, opt, value) {
     if (!this.options.conditions.length) {
       throw new Error('At least one where condition is required');