@mixd-id/web-scaffold 0.1.230406275 → 0.1.230406276

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mixd-id/web-scaffold",
   "private": false,
-  "version": "0.1.230406275",
+  "version": "0.1.230406276",
   "scripts": {
     "dev": "vite serve",
     "build": "vite build",

package/src/utils/preset-selector.js

@@ -342,9 +342,6 @@ const getValue = (filter, opt) => {
       break
   }
 
-
-  console.log('getValue', filter, key, type, operator, util.inspect(whereObj, false, null, true /* enable colors */))
-
   return whereObj
 }
 
@@ -366,6 +363,8 @@ const filtersToSequelizeWhere = async(filters, opt) => {
 
     const { key, value, operator } = filter
 
+    if(key.indexOf('.') >= 0) continue
+
     if(Array.isArray(value) && !operator){
       const { modifier = 'and' } = filter
 
@@ -393,7 +392,6 @@ const filtersToSequelizeWhere = async(filters, opt) => {
         ...getValue(filter, opt)
       }
     }
-
   }
 
   return {
@@ -808,6 +806,81 @@ const sortsToSequelizeWhere = async (sorts, opt) => {
   }
 }
 
+const filtersToSequelizeInclude = async(filters, opt, includes) => {
+  if(!Array.isArray(filters) || filters.length < 1){
+    return includes
+  }
+
+  // TODO: Test on 2 level or more level includes
+
+  // Generate where object
+  let whereObj = {}
+  for(let filter of filters) {
+    if (filter.enabled === false) continue
+
+    const {key, value, operator} = filter
+
+    if(key.indexOf('.') < 0) continue
+
+    if(Array.isArray(value) && !operator){
+      const { modifier = 'and' } = filter
+
+      if(![ 'and', 'or' ].includes(modifier)) continue
+
+      const opModifierValue = []
+      for(let v of value){
+        opModifierValue.push(getValue({ ...v, key }, {
+          ...opt,
+          withoutKey: true
+        }))
+      }
+
+      whereObj = {
+        ...whereObj,
+        [key]: {
+          [Op[modifier]]: opModifierValue
+        }
+      }
+    }
+    else{
+      whereObj = {
+        ...whereObj,
+        ...getValue(filter, opt)
+      }
+    }
+  }
+  //console.log('whereObj', whereObj)
+
+  // Apply where to includes
+  for(let key in whereObj){
+
+    const keyParts = key.split('.')
+    if(keyParts.length < 2) continue
+
+    // Walk through the includes to find the correct include
+    let include
+    for(let i = 0 ; i < keyParts.length - 1 ; i++){
+      const as = keyParts[i]
+      include = !include ? includes.find(_ => _.as === as) : include.includes ?? []
+    }
+
+    // If include is not found, skip
+    if(!include){
+      continue
+    }
+
+    // Generate where object for the correct include
+    const currentKey = keyParts[keyParts.length - 1]
+    if(!include.where){
+      include.where = { [Op.and]: [] }
+    }
+    include.where[Op.and].push({ [currentKey]: whereObj[key] })
+  }
+
+  //console.log('includes', includes)
+  return includes
+}
+
 module.exports = {
   filtersToSequelizeWhere,
   afterItemToSequelizeWhere,
@@ -815,4 +888,5 @@ module.exports = {
   chartToSequelizeWhere,
   pivotToSequelizeWhere,
   sortsToSequelizeWhere,
+  filtersToSequelizeInclude,
 }

package/src/utils/wss.mjs

@@ -77,6 +77,8 @@ class WSS extends EventEmitter2{
 
   async connect(reconnect = false){
 
+    console.log('connect', this._opt.token)
+
     this._instance = new WebSocket(this._opt.url, [ this._opt.token ])
 
     this._instance.binaryType = 'arraybuffer';
@@ -93,7 +95,9 @@ class WSS extends EventEmitter2{
       else if(auth){
         this._instance.isAuth = auth
 
-        reconnect ? this.emit('reconnect', null, []) : this.emit('connect', null, [])
+        reconnect ? this.emit('connect', true, []) : this.emit('connect', false, [])
+
+        console.log('pendingSend', this._pendingSend)
 
         for(let sendParams of this._pendingSend){
           this.sendSync(sendParams.path, sendParams.params, sendParams.cb, sendParams.err)