@effect-app/infra 2.30.2 → 2.30.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/infra
 
+## 2.30.3
+
+### Patch Changes
+
+- d846db3: fix query proper
+
 ## 2.30.2
 
 ### Patch Changes

package/_cjs/Store/Cosmos/query.cjs

@@ -8,6 +8,7 @@ exports.logQuery = logQuery;
 var _effectApp = require("effect-app");
 var _utils = require("effect-app/utils");
 var _logger = require("../../logger.cjs");
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 
 function logQuery(q) {
@@ -20,7 +21,7 @@ function logQuery(q) {
   }));
 }
 function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, defaultValues, select, order, skip, limit) {
-  const statement = (x, i) => {
+  const statement = (x, i, values) => {
     if (x.path === idKey) {
       x = {
         ...x,
@@ -31,6 +32,7 @@ function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, defaultVa
     // would have to map id, but shouldnt allow id in defaultValues anyway..
     k = x.path in defaultValues ? `(${k} ?? ${JSON.stringify(defaultValues[x.path])})` : k;
     const v = "@v" + i;
+    const realValue = values[i];
     switch (x.op) {
       case "in":
         return `ARRAY_CONTAINS(${v}, ${k})`;
@@ -41,13 +43,13 @@ function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, defaultVa
       case "notIncludes":
         return `(NOT ARRAY_CONTAINS(${k}, ${v}))`;
       case "includes-any":
-        return `ARRAY_CONTAINS_ANY(${k}, ${v})`;
+        return `ARRAY_CONTAINS_ANY(${k}, ${realValue.map((_, i) => `${v}__${i}`).join(", ")})`;
       case "notIncludes-any":
-        return `(NOT ARRAY_CONTAINS_ANY(${k}, ${v}))`;
+        return `(NOT ARRAY_CONTAINS_ANY(${k}, ${realValue.map((_, i) => `${v}__${i}`).join(", ")}))`;
       case "includes-all":
-        return `ARRAY_CONTAINS_ALL(${k}, ${v})`;
+        return `ARRAY_CONTAINS_ALL(${k}, ${realValue.map((_, i) => `${v}__${i}`).join(", ")})`;
       case "notIncludes-all":
-        return `(NOT ARRAY_CONTAINS_ALL(${k}, ${v}))`;
+        return `(NOT ARRAY_CONTAINS_ALL(${k}, ${realValue.map((_, i) => `${v}__${i}`).join(", ")}))`;
       case "contains":
         return `CONTAINS(${k}, ${v}, true)`;
       case "startsWith":
@@ -82,7 +84,7 @@ function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, defaultVa
     }
   };
   let i = 0;
-  const print = state => {
+  const print = (state, values) => {
     let s = "";
     let l = 0;
     const printN = n => {
@@ -91,32 +93,32 @@ function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, defaultVa
     for (const e of state) {
       switch (e.t) {
         case "where":
-          s += statement(e, i++);
+          s += statement(e, i++, values);
           break;
         case "or":
-          s += ` OR ${statement(e, i++)}`;
+          s += ` OR ${statement(e, i++, values)}`;
           break;
         case "and":
-          s += ` AND ${statement(e, i++)}`;
+          s += ` AND ${statement(e, i++, values)}`;
           break;
         case "or-scope":
           {
             ++l;
-            s += ` OR (\n${printN(l + 1)}${print(e.result)}\n${printN(l)})`;
+            s += ` OR (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`;
             --l;
             break;
           }
         case "and-scope":
           {
             ++l;
-            s += ` AND (\n${printN(l + 1)}${print(e.result)}\n${printN(l)})`;
+            s += ` AND (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`;
             --l;
             break;
           }
         case "where-scope":
           {
             // ;++l
-            s += `(\n${printN(l + 1)}${print(e.result)}\n)`;
+            s += `(\n${printN(l + 1)}${print(e.result, values)}\n)`;
             // ;--l
             break;
           }
@@ -148,16 +150,21 @@ function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, defaultVa
 
     ${(0, _effectApp.pipe)(values.filter(_ => _.path.includes(".-1.")).map(_ => _.path.split(".-1.")[0]).map(_ => `JOIN ${_} IN f.${_}`), _effectApp.Array.dedupeWith(_effectApp.Equivalence.string)).join("\n")}
 
-    WHERE f.id != @id ${filter.length ? `AND (${print(filter)})` : ""}
+    WHERE f.id != @id ${filter.length ? `AND (${print(filter, values.map(_ => _.value))})` : ""}
     ${order ? `ORDER BY ${order.map(_ => `f.${_.key} ${_.direction}`).join(", ")}` : ""}
     ${skip !== undefined || limit !== undefined ? `OFFSET ${skip ?? 0} LIMIT ${limit ?? 999999}` : ""}`,
     parameters: [{
       name: "@id",
       value: importedMarkerId
-    }, ...values.map((x, i) => ({
+    }, ...values.flatMap((x, i) => [{
       name: `@v${i}`,
       value: x.value
-    }))]
+    }]
+    // TODO: only for arrays that are used with _ANY or _ALL
+    .concat(_effectApp.Array.isArray(x.value) ? x.value.map((_, i2) => ({
+      name: `@v${i}__${i2}`,
+      value: _
+    })) : []))]
   };
 }
 //# sourceMappingURL=query.cjs.map

package/_cjs/Store/Cosmos/query.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"query.cjs","names":["_effectApp","require","_utils","_logger","logQuery","q","InfraLogger","logDebug","pipe","Effect","annotateLogs","query","parameters","JSON","stringify","reduce","acc","v","name","value","undefined","buildWhereCosmosQuery3","idKey","filter","importedMarkerId","defaultValues","select","order","skip","limit","statement","x","i","path","k","includes","split","op","assertUnreachable","print","state","s","l","printN","n","Array","range","map","join","e","t","result","getValues","flatMap","_","values","dedupeWith","Equivalence","string","length","key","direction"],"sources":["../../../src/Store/Cosmos/query.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"query.cjs","names":["_effectApp","require","_utils","_logger","logQuery","q","InfraLogger","logDebug","pipe","Effect","annotateLogs","query","parameters","JSON","stringify","reduce","acc","v","name","value","undefined","buildWhereCosmosQuery3","idKey","filter","importedMarkerId","defaultValues","select","order","skip","limit","statement","x","i","values","path","k","includes","split","realValue","op","map","_","join","assertUnreachable","print","state","s","l","printN","n","Array","range","e","t","result","getValues","flatMap","dedupeWith","Equivalence","string","length","key","direction","concat","isArray","i2"],"sources":["../../../src/Store/Cosmos/query.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/Store/Cosmos/query.d.ts

@@ -16,7 +16,7 @@ export declare function buildWhereCosmosQuery3(idKey: PropertyKey, filter: reado
     query: string;
     parameters: {
         name: string;
-        value: string;
+        value: any;
     }[];
 };
 //# sourceMappingURL=query.d.ts.map

package/dist/Store/Cosmos/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/Store/Cosmos/query.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,MAAM,EAAqB,MAAM,YAAY,CAAA;AAC7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAGvD,OAAO,KAAK,EAAW,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAEpD,wBAAgB,QAAQ,CAAC,CAAC,EAAE;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE;QACV,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,eAAe,GAAG,SAAS,eAAe,EAAE,CAAA;KACpD,EAAE,CAAA;CACJ,qCAcA;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,MAAM,CAAC,EAAE,qBAAqB,CAAC,MAAM,CAAC,EACtC,KAAK,CAAC,EAAE,qBAAqB,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC,EACzE,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;;;EA6Kf"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/Store/Cosmos/query.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAqB,MAAM,YAAY,CAAA;AAC7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAGvD,OAAO,KAAK,EAAW,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAEpD,wBAAgB,QAAQ,CAAC,CAAC,EAAE;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE;QACV,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,eAAe,GAAG,SAAS,eAAe,EAAE,CAAA;KACpD,EAAE,CAAA;CACJ,qCAcA;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,MAAM,CAAC,EAAE,qBAAqB,CAAC,MAAM,CAAC,EACtC,KAAK,CAAC,EAAE,qBAAqB,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC,EACzE,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;eA4Kc,GAAG;;EAOhC"}

package/dist/Store/Cosmos/query.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 import { Array, Effect, Equivalence, pipe } from "effect-app";
 import { assertUnreachable } from "effect-app/utils";
@@ -14,7 +15,7 @@ export function logQuery(q) {
     }));
 }
 export function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, defaultValues, select, order, skip, limit) {
-    const statement = (x, i) => {
+    const statement = (x, i, values) => {
         if (x.path === idKey) {
             x = { ...x, path: "id" };
         }
@@ -24,6 +25,7 @@ export function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, de
         // would have to map id, but shouldnt allow id in defaultValues anyway..
         k = x.path in defaultValues ? `(${k} ?? ${JSON.stringify(defaultValues[x.path])})` : k;
         const v = "@v" + i;
+        const realValue = values[i];
         switch (x.op) {
             case "in":
                 return `ARRAY_CONTAINS(${v}, ${k})`;
@@ -34,13 +36,13 @@ export function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, de
             case "notIncludes":
                 return `(NOT ARRAY_CONTAINS(${k}, ${v}))`;
             case "includes-any":
-                return `ARRAY_CONTAINS_ANY(${k}, ${v})`;
+                return `ARRAY_CONTAINS_ANY(${k}, ${realValue.map((_, i) => `${v}__${i}`).join(", ")})`;
             case "notIncludes-any":
-                return `(NOT ARRAY_CONTAINS_ANY(${k}, ${v}))`;
+                return `(NOT ARRAY_CONTAINS_ANY(${k}, ${realValue.map((_, i) => `${v}__${i}`).join(", ")}))`;
             case "includes-all":
-                return `ARRAY_CONTAINS_ALL(${k}, ${v})`;
+                return `ARRAY_CONTAINS_ALL(${k}, ${realValue.map((_, i) => `${v}__${i}`).join(", ")})`;
             case "notIncludes-all":
-                return `(NOT ARRAY_CONTAINS_ALL(${k}, ${v}))`;
+                return `(NOT ARRAY_CONTAINS_ALL(${k}, ${realValue.map((_, i) => `${v}__${i}`).join(", ")}))`;
             case "contains":
                 return `CONTAINS(${k}, ${v}, true)`;
             case "startsWith":
@@ -78,7 +80,7 @@ export function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, de
         }
     };
     let i = 0;
-    const print = (state) => {
+    const print = (state, values) => {
         let s = "";
         let l = 0;
         const printN = (n) => {
@@ -87,29 +89,29 @@ export function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, de
         for (const e of state) {
             switch (e.t) {
                 case "where":
-                    s += statement(e, i++);
+                    s += statement(e, i++, values);
                     break;
                 case "or":
-                    s += ` OR ${statement(e, i++)}`;
+                    s += ` OR ${statement(e, i++, values)}`;
                     break;
                 case "and":
-                    s += ` AND ${statement(e, i++)}`;
+                    s += ` AND ${statement(e, i++, values)}`;
                     break;
                 case "or-scope": {
                     ++l;
-                    s += ` OR (\n${printN(l + 1)}${print(e.result)}\n${printN(l)})`;
+                    s += ` OR (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`;
                     --l;
                     break;
                 }
                 case "and-scope": {
                     ++l;
-                    s += ` AND (\n${printN(l + 1)}${print(e.result)}\n${printN(l)})`;
+                    s += ` AND (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`;
                     --l;
                     break;
                 }
                 case "where-scope": {
                     // ;++l
-                    s += `(\n${printN(l + 1)}${print(e.result)}\n)`;
+                    s += `(\n${printN(l + 1)}${print(e.result, values)}\n)`;
                     // ;--l
                     break;
                 }
@@ -150,17 +152,19 @@ export function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, de
             .map((_) => `JOIN ${_} IN f.${_}`), Array.dedupeWith(Equivalence.string))
             .join("\n")}
 
-    WHERE f.id != @id ${filter.length ? `AND (${print(filter)})` : ""}
+    WHERE f.id != @id ${filter.length ? `AND (${print(filter, values.map((_) => _.value))})` : ""}
     ${order ? `ORDER BY ${order.map((_) => `f.${_.key} ${_.direction}`).join(", ")}` : ""}
     ${skip !== undefined || limit !== undefined ? `OFFSET ${skip ?? 0} LIMIT ${limit ?? 999999}` : ""}`,
         parameters: [
             { name: "@id", value: importedMarkerId },
             ...values
-                .map((x, i) => ({
-                name: `@v${i}`,
-                value: x.value
-            }))
+                .flatMap((x, i) => [{
+                    name: `@v${i}`,
+                    value: x.value
+                }]
+                // TODO: only for arrays that are used with _ANY or _ALL
+                .concat(Array.isArray(x.value) ? x.value.map((_, i2) => ({ name: `@v${i}__${i2}`, value: _ })) : []))
         ]
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/Store/Cosmos/query.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/Store/Cosmos/query.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "2.30.2",
+  "version": "2.30.3",
   "license": "MIT",
   "type": "module",
   "dependencies": {

package/src/Store/Cosmos/query.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 import { Array, Effect, Equivalence, pipe } from "effect-app"
 import type { NonEmptyReadonlyArray } from "effect-app"
@@ -39,7 +40,7 @@ export function buildWhereCosmosQuery3(
   skip?: number,
   limit?: number
 ) {
-  const statement = (x: FilterR, i: number) => {
+  const statement = (x: FilterR, i: number, values: any[]) => {
     if (x.path === idKey) {
       x = { ...x, path: "id" }
     }
@@ -52,6 +53,8 @@ export function buildWhereCosmosQuery3(
 
     const v = "@v" + i
 
+    const realValue = values[i]
+
     switch (x.op) {
       case "in":
         return `ARRAY_CONTAINS(${v}, ${k})`
@@ -64,14 +67,14 @@ export function buildWhereCosmosQuery3(
         return `(NOT ARRAY_CONTAINS(${k}, ${v}))`
 
       case "includes-any":
-        return `ARRAY_CONTAINS_ANY(${k}, ${v})`
+        return `ARRAY_CONTAINS_ANY(${k}, ${(realValue as any[]).map((_, i) => `${v}__${i}`).join(", ")})`
       case "notIncludes-any":
-        return `(NOT ARRAY_CONTAINS_ANY(${k}, ${v}))`
+        return `(NOT ARRAY_CONTAINS_ANY(${k}, ${(realValue as any[]).map((_, i) => `${v}__${i}`).join(", ")}))`
 
       case "includes-all":
-        return `ARRAY_CONTAINS_ALL(${k}, ${v})`
+        return `ARRAY_CONTAINS_ALL(${k}, ${(realValue as any[]).map((_, i) => `${v}__${i}`).join(", ")})`
       case "notIncludes-all":
-        return `(NOT ARRAY_CONTAINS_ALL(${k}, ${v}))`
+        return `(NOT ARRAY_CONTAINS_ALL(${k}, ${(realValue as any[]).map((_, i) => `${v}__${i}`).join(", ")}))`
 
       case "contains":
         return `CONTAINS(${k}, ${v}, true)`
@@ -114,7 +117,7 @@ export function buildWhereCosmosQuery3(
 
   let i = 0
 
-  const print = (state: readonly FilterResult[]) => {
+  const print = (state: readonly FilterResult[], values: any[]) => {
     let s = ""
     let l = 0
     const printN = (n: number) => {
@@ -123,29 +126,29 @@ export function buildWhereCosmosQuery3(
     for (const e of state) {
       switch (e.t) {
         case "where":
-          s += statement(e, i++)
+          s += statement(e, i++, values)
           break
         case "or":
-          s += ` OR ${statement(e, i++)}`
+          s += ` OR ${statement(e, i++, values)}`
           break
         case "and":
-          s += ` AND ${statement(e, i++)}`
+          s += ` AND ${statement(e, i++, values)}`
           break
         case "or-scope": {
           ++l
-          s += ` OR (\n${printN(l + 1)}${print(e.result)}\n${printN(l)})`
+          s += ` OR (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`
           --l
           break
         }
         case "and-scope": {
           ++l
-          s += ` AND (\n${printN(l + 1)}${print(e.result)}\n${printN(l)})`
+          s += ` AND (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`
           --l
           break
         }
         case "where-scope": {
           // ;++l
-          s += `(\n${printN(l + 1)}${print(e.result)}\n)`
+          s += `(\n${printN(l + 1)}${print(e.result, values)}\n)`
           // ;--l
           break
         }
@@ -198,16 +201,20 @@ export function buildWhereCosmosQuery3(
         .join("\n")
     }
 
-    WHERE f.id != @id ${filter.length ? `AND (${print(filter)})` : ""}
+    WHERE f.id != @id ${filter.length ? `AND (${print(filter, values.map((_) => _.value))})` : ""}
     ${order ? `ORDER BY ${order.map((_) => `f.${_.key} ${_.direction}`).join(", ")}` : ""}
     ${skip !== undefined || limit !== undefined ? `OFFSET ${skip ?? 0} LIMIT ${limit ?? 999999}` : ""}`,
     parameters: [
       { name: "@id", value: importedMarkerId },
       ...values
-        .map((x, i) => ({
-          name: `@v${i}`,
-          value: x.value
-        }))
+        .flatMap((x, i) =>
+          [{
+            name: `@v${i}`,
+            value: x.value as any
+          }]
+            // TODO: only for arrays that are used with _ANY or _ALL
+            .concat(Array.isArray(x.value) ? x.value.map((_, i2) => ({ name: `@v${i}__${i2}`, value: _ as any })) : [])
+        )
     ]
   }
 }