@effect-app/infra 2.61.0 → 2.61.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @effect-app/infra
 
+## 2.61.2
+
+### Patch Changes
+
+- 43dbb4d: support nested in memory
+
+## 2.61.1
+
+### Patch Changes
+
+- 18ebe56: fix rel
+
 ## 2.61.0
 
 ### Minor Changes

package/dist/Store/codeFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAuD1C,eAAO,MAAM,mBAAmB,GAAI,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,CAAC,EAAE,YAAY,OAAO,oBAE7D,GAAG,aAGjB,CAAA;AAsBD,eAAO,MAAM,WAAW,GAAI,CAAC,EAAE,OAAO,SAAS,YAAY,EAAE,MAAM,KAAK,CAAC,YAA6B,CAAA;AA0EtG,eAAO,MAAM,YAAY,GAAI,CAAC,EAAE,OAAO,SAAS,YAAY,EAAE,EAAE,KAAK,CAAC,KAAG,OAKxE,CAAA;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,WAAW,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,IACpE,GAAG,CAAC,uCACb"}
+{"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAuD1C,eAAO,MAAM,mBAAmB,GAAI,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,CAAC,EAAE,YAAY,OAAO,oBAE7D,GAAG,aAGjB,CAAA;AAyBD,eAAO,MAAM,WAAW,GAAI,CAAC,EAAE,OAAO,SAAS,YAAY,EAAE,MAAM,KAAK,CAAC,YAA6B,CAAA;AAwFtG,eAAO,MAAM,YAAY,GAAI,CAAC,EAAE,OAAO,SAAS,YAAY,EAAE,EAAE,KAAK,CAAC,KAAG,OAKxE,CAAA;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,WAAW,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,IACpE,GAAG,CAAC,uCACb"}

package/dist/Store/codeFilter.js

@@ -59,14 +59,17 @@ export const codeFilterStatement = (p, x, isRelation) => {
     }
     return filterStatement(x, p);
 };
-const isRelationCheck = (f) => {
-    if (f.every((_) => "path" in _ && _.path.includes(".-1."))) {
+const isRelationCheck = (f, isRelation) => {
+    if (f.filter((_) => "path" in _).every((_) => "path" in _ && _.path.includes(".-1."))) {
         const first = f[0];
         const rel = first.path.split(".-1.")[0];
-        if (!f.every((_) => "path" in _ && _.path.startsWith(rel + ".-1."))) {
+        if (isRelation && rel !== isRelation) {
+            throw new Error(`expected ${isRelation} relation but found ${rel}`);
+        }
+        if (!f.filter((_) => "path" in _).every((_) => "path" in _ && _.path.startsWith(rel + ".-1."))) {
             throw new Error(`Cannot mix relation checks of different props, expected all to be "${rel}"`);
         }
-        return true;
+        return rel;
     }
     if (f.some((_) => "path" in _ && _.path.includes(".-1."))) {
         throw new Error("Cannot mix relation checks with non-relation checks in the same filter scope. create a separate one");
@@ -74,7 +77,7 @@ const isRelationCheck = (f) => {
     return false;
 };
 export const codeFilter3 = (state) => (sut) => codeFilter3_(state, sut);
-const codeFilter3__ = (state, sut, statements, isRelation = false) => {
+const codeFilter3__ = (state, sut, statements, isRelation = null) => {
     let s = "";
     let l = 0;
     const printN = (n) => {
@@ -102,36 +105,45 @@ const codeFilter3__ = (state, sut, statements, isRelation = false) => {
                 break;
             case "or-scope": {
                 ++l;
-                if (isRelationCheck(e.result)) {
+                const rel = isRelationCheck(e.result, isRelation);
+                if (rel) {
                     const rel = e.result[0].path.split(".-1.")[0];
-                    s += ` || (\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, true)})\n${printN(l)})`;
+                    s += isRelation
+                        ? ` || (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, rel)}\n${printN(l)})`
+                        : ` || (\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, rel)})\n${printN(l)})`;
                 }
                 else {
-                    s += ` || (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, true)}\n${printN(l)})`;
+                    s += ` || (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`;
                 }
                 --l;
                 break;
             }
             case "and-scope": {
                 ++l;
-                if (isRelationCheck(e.result)) {
+                const rel = isRelationCheck(e.result, isRelation);
+                if (rel) {
                     const rel = e.result[0].path.split(".-1.")[0];
-                    s += ` && (\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, true)})\n${printN(l)})`;
+                    s += isRelation
+                        ? ` && (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, rel)}\n${printN(l)})`
+                        : ` && (\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, rel)})\n${printN(l)})`;
                 }
                 else {
-                    s += ` && (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, true)}\n${printN(l)})`;
+                    s += ` && (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`;
                 }
                 --l;
                 break;
             }
             case "where-scope": {
                 // ;++l
-                if (isRelationCheck(e.result)) {
+                const rel = isRelationCheck(e.result, isRelation);
+                if (rel) {
                     const rel = e.result[0].path.split(".-1.")[0];
-                    s += `(\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, true)})\n${printN(l)})`;
+                    s += isRelation
+                        ? `(\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, rel)}\n${printN(l)})`
+                        : `(\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, rel)})\n${printN(l)})`;
                 }
                 else {
-                    s += `(\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, true)}\n${printN(l)})`;
+                    s += `(\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`;
                 }
                 // ;--l
                 break;
@@ -149,4 +161,4 @@ export const codeFilter3_ = (state, sut) => {
 export function codeFilter(filter) {
     return (x) => codeFilter3_(filter, x) ? Option.some(x) : Option.none();
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"codeFilter.js","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"codeFilter.js","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/Store/codeFilter.ts

@@ -66,16 +66,19 @@ export const codeFilterStatement = <E>(p: FilterR, x: E, isRelation: boolean) =>
   return filterStatement(x, p)
 }
 
-const isRelationCheck = (f: readonly FilterResult[]) => {
-  if (f.every((_) => "path" in _ && _.path.includes(".-1."))) {
+const isRelationCheck = (f: readonly FilterResult[], isRelation: string | null) => {
+  if (f.filter((_) => "path" in _).every((_) => "path" in _ && _.path.includes(".-1."))) {
     const first = f[0] as { path: string }
     const rel = first.path.split(".-1.")[0]
-    if (!f.every((_) => "path" in _ && _.path.startsWith(rel + ".-1."))) {
+    if (isRelation && rel !== isRelation) {
+      throw new Error(`expected ${isRelation} relation but found ${rel}`)
+    }
+    if (!f.filter((_) => "path" in _).every((_) => "path" in _ && _.path.startsWith(rel + ".-1."))) {
       throw new Error(
         `Cannot mix relation checks of different props, expected all to be "${rel}"`
       )
     }
-    return true
+    return rel
   }
   if (f.some((_) => "path" in _ && _.path.includes(".-1."))) {
     throw new Error(
@@ -87,7 +90,12 @@ const isRelationCheck = (f: readonly FilterResult[]) => {
 }
 
 export const codeFilter3 = <E>(state: readonly FilterResult[]) => (sut: E) => codeFilter3_(state, sut)
-const codeFilter3__ = <E>(state: readonly FilterResult[], sut: E, statements: any[], isRelation = false): string => {
+const codeFilter3__ = <E>(
+  state: readonly FilterResult[],
+  sut: E,
+  statements: any[],
+  isRelation: string | null = null
+): string => {
   let s = ""
   let l = 0
   const printN = (n: number) => {
@@ -117,26 +125,32 @@ const codeFilter3__ = <E>(state: readonly FilterResult[], sut: E, statements: an
         break
       case "or-scope": {
         ++l
-        if (isRelationCheck(e.result)) {
+        const rel = isRelationCheck(e.result, isRelation)
+        if (rel) {
           const rel = (e.result[0]! as { path: string }).path.split(".-1.")[0]
-          s += ` || (\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, true)})\n${
-            printN(l)
-          })`
+          s += isRelation
+            ? ` || (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, rel)}\n${printN(l)})`
+            : ` || (\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, rel)})\n${
+              printN(l)
+            })`
         } else {
-          s += ` || (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, true)}\n${printN(l)})`
+          s += ` || (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`
         }
         --l
         break
       }
       case "and-scope": {
         ++l
-        if (isRelationCheck(e.result)) {
+        const rel = isRelationCheck(e.result, isRelation)
+        if (rel) {
           const rel = (e.result[0]! as { path: string }).path.split(".-1.")[0]
-          s += ` && (\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, true)})\n${
-            printN(l)
-          })`
+          s += isRelation
+            ? ` && (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, rel)}\n${printN(l)})`
+            : ` && (\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, rel)})\n${
+              printN(l)
+            })`
         } else {
-          s += ` && (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, true)}\n${printN(l)})`
+          s += ` && (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`
         }
         --l
 
@@ -144,13 +158,16 @@ const codeFilter3__ = <E>(state: readonly FilterResult[], sut: E, statements: an
       }
       case "where-scope": {
         // ;++l
-        if (isRelationCheck(e.result)) {
+        const rel = isRelationCheck(e.result, isRelation)
+        if (rel) {
           const rel = (e.result[0]! as { path: string }).path.split(".-1.")[0]
-          s += `(\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, true)})\n${
-            printN(l)
-          })`
+          s += isRelation
+            ? `(\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, rel)}\n${printN(l)})`
+            : `(\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, rel)})\n${
+              printN(l)
+            })`
         } else {
-          s += `(\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, true)}\n${printN(l)})`
+          s += `(\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`
         }
         // ;--l
         break

package/test/rawQuery.test.ts

@@ -201,6 +201,13 @@ describe("filter first-level array fields as groups", () => {
         project(projected)
       )
 
+      // mixing relation check with scoped relationcheck
+      const items3 = yield* repo.query(
+        where("items.-1.value", "gt", 20),
+        and(where("items.-1.description", "contains", "d item")),
+        project(projected)
+      )
+
       const expected = [
         {
           name: "Item 2",
@@ -213,6 +220,7 @@ describe("filter first-level array fields as groups", () => {
 
       expect(items).toStrictEqual(expected)
       expect(items2).toStrictEqual(expected)
+      expect(items3).toStrictEqual(expected)
     })
     .pipe(setupRequestContextFromCurrent())