@ccci/micro-server 1.0.169 → 1.0.170

package/dist/index.js

@@ -297575,7 +297575,8 @@ function ConstructQuery(query) {
     let where2 = {};
     const pairs = query.search.split(",");
     pairs.forEach((field) => {
-      if (field.indexOf("|") > -1) {
+      if (field.indexOf("$") > -1) {
+      } else if (field.indexOf("|") > -1) {
         if (!where2.hasOwnProperty(Op.or))
           where2[Op.or] = [];
         let orFields = field.split("|");
@@ -297648,7 +297649,29 @@ function ConstructQuery(query) {
   }
   if (query.includes) {
     let data = query.includes.split(",");
-    let includes = data.filter((el) => el.indexOf(".") == -1);
+    let includes = [];
+    let toplevel = data.filter((el) => el.indexOf(".") == -1);
+    toplevel.forEach((top) => {
+      let association = { association: top };
+      if (query.search) {
+        const queries = query.search.split(",");
+        Logger.info(`queries: ${JSON.stringify(queries)}`);
+        let injectable = queries.find((q) => q.indexOf("$") > -1 && q.indexOf(top) > -1);
+        Logger.info(`injectable: ${JSON.stringify(injectable)}`);
+        if (injectable) {
+          injectable = injectable.replaceAll("$", "");
+          let nested2 = injectable.split(".");
+          Logger.info(`nested: ${JSON.stringify(nested2)}`);
+          let pair = nested2[1].split(":");
+          Logger.info(`pair: ${JSON.stringify(pair)}`);
+          let associationkey = pair[0];
+          Logger.info(`associationkey: ${JSON.stringify(associationkey)}`);
+          association.where = { associationkey: pair[1] };
+          Logger.info(`association.where: ${JSON.stringify(association.where)}`);
+        }
+      }
+      includes.push(association);
+    });
     let nested = data.filter((el) => el.indexOf(".") > -1);
     nested.forEach((nest) => {
       let keypair = nest.split(".");
@@ -297663,6 +297686,7 @@ function ConstructQuery(query) {
       }
       includes.push(temp);
     });
+    Logger.info(`INCLUDES: ${JSON.stringify(includes)}`);
     options.includes = includes;
   }
   if (query.paranoid) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccci/micro-server",
-  "version": "1.0.169",
+  "version": "1.0.170",
   "module": "index.ts",
   "type": "module",
   "main": "dist/index.js",