@effect-app/infra 0.212.0 → 0.213.0

package/dist/services/Store/service.d.ts

@@ -59,23 +59,16 @@ export interface Store<PM extends PersistenceModelType<Id>, Id> {
      */
     remove: (e: PM) => Effect<void>;
 }
-declare const StoreMaker_base: {
-    new (service: {
-        make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R>, config?: StoreConfig<PM>) => Effect<Store<PM, Id>, E, R>;
-    }): Readonly<{
-        make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R>, config?: StoreConfig<PM>) => Effect<Store<PM, Id>, E, R>;
-    }> & import("effect/Context").TagClassShape<"effect-app/StoreMaker", {
-        make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R>, config?: StoreConfig<PM>) => Effect<Store<PM, Id>, E, R>;
-    }>;
-    toLayer: <E_1, R_1>(eff: Effect<{
-        make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R> | undefined, config?: StoreConfig<PM> | undefined) => Effect<Store<PM, Id>, E, R>;
-    }, E_1, R_1>) => import("effect-app").Layer<StoreMaker, E_1, R_1>;
-    toLayerScoped: <E_1_1, R_1_1>(eff: Effect<{
-        make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R> | undefined, config?: StoreConfig<PM> | undefined) => Effect<Store<PM, Id>, E, R>;
-    }, E_1_1, R_1_1>) => import("effect-app").Layer<StoreMaker, E_1_1, Exclude<R_1_1, import("effect/Scope").Scope>>;
-    wrap: (service: {
-        make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R>, config?: StoreConfig<PM>) => Effect<Store<PM, Id>, E, R>;
-    }) => StoreMaker;
+declare const StoreMaker_base: (abstract new (service: {
+    make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R>, config?: StoreConfig<PM>) => Effect<Store<PM, Id>, E, R>;
+}) => Readonly<{
+    make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R>, config?: StoreConfig<PM>) => Effect<Store<PM, Id>, E, R>;
+}> & import("effect/Context").TagClassShape<"effect-app/StoreMaker", {
+    make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R>, config?: StoreConfig<PM>) => Effect<Store<PM, Id>, E, R>;
+}>) & {
+    toLayer: <E_1, R_1>(eff: Effect<Omit<StoreMaker, keyof import("effect/Context").TagClassShape<any, any>>, E_1, R_1>) => import("effect-app").Layer<StoreMaker, E_1, R_1>;
+    toLayerScoped: <E_1_1, R_1_1>(eff: Effect<Omit<StoreMaker, keyof import("effect/Context").TagClassShape<any, any>>, E_1_1, R_1_1>) => import("effect-app").Layer<StoreMaker, E_1_1, Exclude<R_1_1, import("effect/Scope").Scope>>;
+    of: (service: Omit<StoreMaker, keyof import("effect/Context").TagClassShape<any, any>>) => StoreMaker;
 } & import("effect/Context").Tag<StoreMaker, StoreMaker> & {} & {
     use: <X>(body: (_: {
         make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R> | undefined, config?: StoreConfig<PM> | undefined) => Effect<Store<PM, Id>, E, R>;
@@ -91,35 +84,25 @@ export declare const makeContextMap: () => {
     get: (id: string) => string | undefined;
     set: (id: string, eTag: string | undefined) => void;
 };
-declare const ContextMap_base: {
-    new (service: {
-        get: (id: string) => string | undefined;
-        set: (id: string, eTag: string | undefined) => void;
-    }): Readonly<{
-        get: (id: string) => string | undefined;
-        set: (id: string, eTag: string | undefined) => void;
-    }> & import("effect/Context").TagClassShape<"effect-app/ContextMap", {
-        get: (id: string) => string | undefined;
-        set: (id: string, eTag: string | undefined) => void;
-    }>;
+declare const ContextMap_base: (abstract new (service: {
+    get: (id: string) => string | undefined;
+    set: (id: string, eTag: string | undefined) => void;
+}) => Readonly<{
+    get: (id: string) => string | undefined;
+    set: (id: string, eTag: string | undefined) => void;
+}> & import("effect/Context").TagClassShape<"effect-app/ContextMap", {
+    get: (id: string) => string | undefined;
+    set: (id: string, eTag: string | undefined) => void;
+}>) & {
     toLayer: {
         (): import("effect-app").Layer<ContextMap, never, never>;
-        <E_1, R_1>(eff: Effect<{
-            get: (id: string) => string | undefined;
-            set: (id: string, eTag: string | undefined) => void;
-        }, E_1, R_1>): import("effect-app").Layer<ContextMap, E_1, R_1>;
+        <E_1, R_1>(eff: Effect<Omit<ContextMap, keyof import("effect/Context").TagClassShape<any, any>>, E_1, R_1>): import("effect-app").Layer<ContextMap, E_1, R_1>;
     };
     toLayerScoped: {
         (): import("effect-app").Layer<ContextMap, never, never>;
-        <E_2, R_2>(eff: Effect<{
-            get: (id: string) => string | undefined;
-            set: (id: string, eTag: string | undefined) => void;
-        }, E_2, R_2>): import("effect-app").Layer<ContextMap, E_2, Exclude<R_2, import("effect/Scope").Scope>>;
+        <E_2, R_2>(eff: Effect<import("effect/Context").TagClassShape<any, any>, E_2, R_2>): import("effect-app").Layer<ContextMap, E_2, Exclude<R_2, import("effect/Scope").Scope>>;
     };
-    wrap: (service: {
-        get: (id: string) => string | undefined;
-        set: (id: string, eTag: string | undefined) => void;
-    }) => ContextMap;
+    of: (service: import("effect/Context").TagClassShape<any, any>) => ContextMap;
     make: Effect<ContextMap, never, never>;
 } & import("effect/Context").Tag<ContextMap, ContextMap> & {
     get: (id: string) => Effect<string | undefined, never, ContextMap>;

package/dist/services/Store/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/services/Store/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/services/Store/service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.212.0",
+  "version": "0.213.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -20,15 +20,15 @@
     "redlock": "^4.2.0",
     "@effect-app/core": "0.151.0",
     "@effect-app/fluent-extensions": "0.144.0",
-    "@effect-app/infra-adapters": "0.138.0",
-    "effect-app": "0.182.0",
-    "@effect-app/schema": "0.204.0"
+    "@effect-app/infra-adapters": "0.138.2",
+    "@effect-app/schema": "0.204.0",
+    "effect-app": "0.183.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",
     "@sentry/node": "^7.105.0",
     "@types/express": "^4.17.21",
-    "@types/node": "~20.11.24",
+    "@types/node": "~20.11.25",
     "@types/proper-lockfile": "^4.1.4",
     "@types/redis": "^2.8.32",
     "@types/redlock": "^4.0.7",
@@ -38,9 +38,8 @@
     "mongodb": "6.4.0",
     "redis": "^3.1.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.1-rc",
-    "vitest": "^1.3.1",
-    "@effect-app/compiler": "0.72.0"
+    "typescript": "^5.4.2",
+    "vitest": "^1.3.1"
   },
   "peerDependencies": {
     "express": "^4.18.3",

package/src/services/Emailer/Sendgrid.ts

@@ -10,7 +10,7 @@ const makeSendgrid = ({ apiKey, defaultFrom, defaultReplyTo, realMail, subjectPr
   Effect.sync(() => {
     sgMail.setApiKey(Secret.value(apiKey))
 
-    return new Emailer({
+    return Emailer.of({
       sendMail(msg_: EmailMsgOptionalFrom) {
         return Effect.gen(function*($) {
           const msg: EmailMsg = dropUndefinedT({

package/src/services/Emailer/fake.ts

@@ -1,11 +1,11 @@
-import { Effect, Layer } from "effect-app"
+import { Effect } from "effect-app"
 import { pretty } from "effect-app/utils"
 import { Emailer } from "./service.js"
 
 const makeFake = Effect
   .logDebug("FAKE Emailer Service enabled")
   .pipe(Effect.map(() =>
-    new Emailer({
+    Emailer.of({
       sendMail(msg) {
         return Effect
           .logDebug(`Fake send mail`)
@@ -17,4 +17,4 @@ const makeFake = Effect
 /**
  * @tsplus static Emailer.Ops Fake
  */
-export const FakeSendgrid = Layer.effect(Emailer, makeFake)
+export const FakeSendgrid = Emailer.toLayer(makeFake)

package/src/services/Operations/live.ts

@@ -76,7 +76,7 @@ const make = Effect.sync(() => {
         ops.set(id, copy(_.value, { updatedAt: new Date(), progress }))
       }))
   }
-  return new Operations({
+  return Operations.of({
     cleanup,
     register: Effect.tap(
       makeOp,

package/src/services/RepositoryBase.ts

@@ -557,9 +557,8 @@ export function makeRepo<
                 ? Effect.andThen(
                   eff,
                   flow(
-                    toNonEmptyArray,
-                    Effect.mapError(() => new NotFoundError({ id: "query", /* TODO */ type: name })),
-                    Effect.map((_) => _[0])
+                    ReadonlyArray.head,
+                    Effect.mapError(() => new NotFoundError({ id: "query", /* TODO */ type: name }))
                   )
                 )
                 : a.ttype === "count"

package/src/services/RequestContextContainer.ts

@@ -9,11 +9,13 @@ import { restoreFromRequestContext } from "./Store/Memory.js"
  * @tsplus type RequestContextContainer
  * @tsplus companion RequestContextContainer.Ops
  */
-export class RequestContextContainer extends TagClassId("effect-app/RequestContextContainer")<RequestContextContainer, {
-  requestContext: Effect<RequestContext>
-  update: (f: (rc: RequestContext) => RequestContext) => Effect<RequestContext>
-  start: (f: RequestContext) => Effect<void>
-}>() {
+export abstract class RequestContextContainer
+  extends TagClassId("effect-app/RequestContextContainer")<RequestContextContainer, {
+    requestContext: Effect<RequestContext>
+    update: (f: (rc: RequestContext) => RequestContext) => Effect<RequestContext>
+    start: (f: RequestContext) => Effect<void>
+  }>()
+{
   static get get(): Effect<RequestContext, never, RequestContextContainer> {
     return Effect.flatMap(RequestContextContainer, (_) => _.requestContext)
   }
@@ -37,7 +39,7 @@ export class RequestContextContainer extends TagClassId("effect-app/RequestConte
     )
     .pipe(
       Effect.map((ref) =>
-        new RequestContextContainer({
+        RequestContextContainer.of({
           requestContext: FiberRef.get(ref),
           update: (f: (a: RequestContext) => RequestContext) =>
             Effect.tap(FiberRef.getAndUpdate(ref, f), (rc) => Effect.annotateCurrentSpan(spanAttributes(rc))),

package/src/services/Store/ContextMapContainer.ts

@@ -11,7 +11,7 @@ import { ContextMap } from "./service.js"
 /**
  * @tsplus companion ContextMapContainer.Ops
  */
-export class ContextMapContainer extends TagClassId("effect-app/ContextMapContainer")<ContextMapContainer, {
+export abstract class ContextMapContainer extends TagClassId("effect-app/ContextMapContainer")<ContextMapContainer, {
   get: Effect<ContextMap>
   start: Effect<void>
 }>() {
@@ -34,7 +34,7 @@ export class ContextMapContainer extends TagClassId("effect-app/ContextMapContai
     .pipe(
       Effect
         .map((ref) =>
-          new ContextMapContainer({
+          ContextMapContainer.of({
             get: FiberRef.get(ref),
             start: Effect.flatMap(ContextMap.make, (_) => FiberRef.set(ref, _))
           })

package/test/dist/filterApi.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"filterApi.test.d.ts","sourceRoot":"","sources":["../filterApi.test.ts"],"names":[],"mappings":""}

package/test/dist/query.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query.test.d.ts","sourceRoot":"","sources":["../query.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAc,CAAC,EAAE,MAAM,YAAY,CAAA;;;;;;;;;;;;;;;;;;AASlD,qBAAa,CACX,SAAQ,MAAqG;CAC7G;AACF,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;IACzB,KAAY,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;CAC3C;;;;;;;;;;;;;;;;;;;;;;;;;AAGD,qBAAa,WAAY,SAAQ,gBAA6D;CAAG"}

package/{src/services/Store → test}/filterApi.test.ts

@@ -1,6 +1,7 @@
-import { codeFilter3 } from "./codeFilter.js"
-import { buildWhereCosmosQuery3 } from "./Cosmos/query.js"
-import { print, QueryBuilder } from "./filterApi/query.js"
+import { describe, expect, it } from "vitest"
+import { codeFilter3 } from "../src/services/Store/codeFilter.js"
+import { buildWhereCosmosQuery3 } from "../src/services/Store/Cosmos/query.js"
+import { print, QueryBuilder } from "../src/services/Store/filterApi/query.js"
 
 const MyEntity = {
   query: QueryBuilder

package/{src/services → test}/query.test.ts

@@ -2,9 +2,10 @@ import { Effect, flow, pipe, S } from "effect-app"
 import { TagClassMakeId } from "effect-app/service"
 import { pick } from "effect-app/utils"
 import { inspect } from "util"
-import { and, make, or, order, page, project, toFilter, where } from "./query.js"
-import { RepositoryDefaultImpl } from "./RepositoryBase.js"
-import { memFilter } from "./Store/Memory.js"
+import { expect, it } from "vitest"
+import { and, make, or, order, page, project, toFilter, where } from "../src/services/query.js"
+import { RepositoryDefaultImpl } from "../src/services/RepositoryBase.js"
+import { memFilter } from "../src/services/Store/Memory.js"
 
 export class s
   extends S.Class<s>()({ id: S.StringId.withDefault, displayName: S.NonEmptyString255, n: S.Date.withDefault })

package/tsconfig.json

@@ -18,7 +18,7 @@
     "forceConsistentCasingInFileNames": true,
     "module": "Node16",
     "lib": [
-      "esnext"
+      "ES2023"
     ],
     "baseUrl": "./",
     "target": "es2022",
@@ -31,17 +31,14 @@
     "noImplicitAny": true,
     "useUnknownInCatchVariables": true,
     "noImplicitThis": true,
-    "outDir": "./dist",
+    "outDir": "build/dist",
     "resolveJsonModule": true,
     "moduleResolution": "Node16",
     "downlevelIteration": true,
     "noErrorTruncation": true,
     "types": [
-      "vitest/globals",
-      "./types/modules"
-    ],
-    "rootDir": "./src",
-    "tsBuildInfoFile": "./dist/.tsbuildinfo"
+      "vitest/globals"
+    ]
   },
   "$schema": "https://json.schemastore.org/tsconfig",
   "display": "Strictest",
@@ -65,22 +62,12 @@
       "*.json"
     ]
   },
-  "include": [
-    "./src/**/*.ts"
-  ],
+  "include": [],
   "exclude": [
     "**/node_modules",
     "**/build",
     "**/dist",
     "**/.*"
   ],
-  "ts-node": {
-    "require": [
-      "tsconfig-paths/register"
-    ],
-    "compilerOptions": {
-      "module": "CommonJS"
-    }
-  },
   "references": []
 }

package/tsconfig.json.bak

@@ -1,41 +1,12 @@
 {
-    "extends": "../../tsconfig.base.json",
-    "compilerOptions": {
-        "lib": [
-            "esnext"
-        ],
-        "moduleResolution": "Node16",
-        "outDir": "./dist",
-        "rootDir": "./src",
-        "tsBuildInfoFile": "./dist/.tsbuildinfo",
-        "types": [
-            "vitest/globals",
-            "./types/modules"
-        ]
+  "compilerOptions": {},
+  "extends": "../../tsconfig.base.json",
+  "references": [
+    {
+      "path": "./tsconfig.src.json"
     },
-    "include": [
-        "./src/**/*.ts"
-    ],
-    "ts-node": {
-        "require": [
-            "tsconfig-paths/register"
-        ],
-        "compilerOptions": {
-            "module": "CommonJS"
-        }
-    },
-    "references": [
-        {
-            "path": "../prelude"
-        },
-        {
-            "path": "../infra-adapters"
-        },
-        {
-            "path": "../schema"
-        },
-        {
-            "path": "../core"
-        },
-    ]
+    {
+      "path": "./tsconfig.test.json"
+    }
+  ],
 }

package/tsconfig.src.json

@@ -0,0 +1,56 @@
+{
+    "extends": "../../tsconfig.base.json",
+    "compilerOptions": {
+        "lib": [
+            "esnext"
+        ],
+        "tsBuildInfoFile": "./dist/.tsbuildinfo",
+        "esModuleInterop": true,
+        "baseUrl": "./",
+        "rootDir": "./src",
+        // keep in here, cause madge can't detect it from extended tsconfig
+        "moduleResolution": "Node16",
+        "types": [
+            "./types/modules"
+        ],
+        "outDir": "./dist"
+    },
+    "include": [
+        "./src/**/*.ts"
+    ],
+    "exclude": [
+        "./dist",
+        "*.test.ts",
+        "node_modules",
+        "build",
+        "lib",
+        "dist",
+        "**/*.d.ts.map",
+        ".git",
+        ".data",
+        "**/.*",
+        "**/*.tmp"
+    ],
+    "ts-node": {
+        "require": [
+            "tsconfig-paths/register"
+        ],
+        "compilerOptions": {
+            "module": "CommonJS"
+        }
+    },
+    "references": [
+        {
+            "path": "../prelude"
+        },
+        {
+            "path": "../infra-adapters"
+        },
+        {
+            "path": "../schema"
+        },
+        {
+            "path": "../core"
+        },
+    ]
+}

package/tsconfig.test.json

@@ -0,0 +1,32 @@
+{
+  "extends": "./tsconfig.src.json",
+  "compilerOptions": {
+    "rootDir": "./test",
+    "outDir": "./test/dist",
+    "tsBuildInfoFile": "./test/dist/.tsbuildinfo",
+    // "types": [
+    //   "vitest/globals"
+    // ]
+  },
+  "include": [
+    "./test/**/*.ts"
+  ],
+  "exclude": [
+    "./dist",
+    "./test/dist",
+    "node_modules",
+    "build",
+    "lib",
+    "dist",
+    "**/*.d.ts.map",
+    ".git",
+    ".data",
+    "**/.*",
+    "**/*.tmp"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.src.json"
+    },
+  ]
+}

package/.prettierignore

@@ -1,6 +0,0 @@
-**/node_modules/
-
-**/dist/
-**/*.js
-**/*.jsx
-**/*.d.ts

package/_cjs/services/Store/filterApi.test.cjs

@@ -1,171 +0,0 @@
-"use strict";
-
-var _codeFilter = require("./codeFilter.cjs");
-var _query = require("./Cosmos/query.cjs");
-var _query2 = require("./filterApi/query.cjs");
-const MyEntity = {
-  query: _query2.QueryBuilder.make()
-};
-const removeWhitespace = a => a.replaceAll(/\s+/g, " ").replaceAll(/^\s+/g, "").replaceAll(/\s+$/g, "");
-describe("works", () => {
-  const f = MyEntity.query((where, f) => where(f.something.id.eq(1)).and(() => where(f.something.name.startsWith("a")) // or would we do "like", "a%"?
-  .or(f.tag.in("a", "b")).or(() => where(f.name.neq("Alfredo")).and(f.tag("c"))))
-  // .and(f.state._tag("a"))
-  .and("state._tag", "a").and(f.isActive(true)).and(f.age.gte(12)));
-  const s = f.build();
-  console.log(JSON.stringify(s, undefined, 2));
-  it("print", () => expect((0, _query2.print)(s)).toBe(`something.id eq 1 AND (
-    something.name startsWith a OR tag in a OR (
-    name neq Alfredo AND tag eq c
-  )
-  ) AND state._tag eq a AND isActive eq true AND age gte 12`));
-  const values = [{
-    id: "1",
-    name: "Patrick",
-    bio: "something",
-    age: 13,
-    isActive: true,
-    state: {
-      _tag: "a",
-      val: 1
-    },
-    roles: ["admin"],
-    tag: "c",
-    something: {
-      id: 1,
-      name: "abc"
-    }
-  }, {
-    id: "1",
-    name: "Patrick",
-    bio: "something",
-    age: 11,
-    isActive: true,
-    state: {
-      _tag: "b",
-      val: "2"
-    },
-    roles: ["admin"],
-    tag: "a",
-    something: {
-      id: 1,
-      name: "abc"
-    }
-  }];
-  it("print codef", () => {
-    expect(values.filter((0, _codeFilter.codeFilter3)(s))).toStrictEqual([values[0]]);
-  });
-  it("codeFilter1", () => {
-    expect(values.filter((0, _codeFilter.codeFilter3)(s))).toStrictEqual([values[0]]);
-  });
-  it("codeFilter2", () => {
-    expect(values.filter((0, _codeFilter.codeFilter3)(MyEntity.query((where, f) => where(f.something.id.eq(0)).and(() => where(f.something.name.startsWith("a")).or(f.tag.in("a", "b")))).build()))).toStrictEqual([]);
-    expect(values.filter((0, _codeFilter.codeFilter3)(MyEntity.query((where, f) => where(f.something.id.eq(0))).build()))).toStrictEqual([]);
-    expect(values.filter((0, _codeFilter.codeFilter3)(MyEntity.query((where, f) => where(f.something.id.eq(1))).build()))).toStrictEqual(values);
-    expect(values.filter((0, _codeFilter.codeFilter3)(MyEntity.query((where, f) => where(f.age.eq(11))).build()))).toStrictEqual([values[1]]);
-  });
-  it("cosmos", () => {
-    const r = (0, _query.buildWhereCosmosQuery3)(s, "MyEntity", "marker", {
-      tag: "some"
-    });
-    expect(removeWhitespace(r.query)).toBe(removeWhitespace(`
-        SELECT f
-    FROM MyEntity f
-    WHERE f.id != @id AND f.something.id = @v0 AND (
-    STARTSWITH(f.something.name, @v1, true) OR ARRAY_CONTAINS(@v2, (f.tag ?? "some")) OR (
-    f.name <> @v3 AND (f.tag ?? "some") = @v4
-  )
-  ) AND f.state._tag = @v5 AND f.isActive = @v6 AND f.age >= @v7`));
-    expect(r.parameters).toEqual([{
-      "name": "@id",
-      "value": "marker"
-    }, {
-      "name": "@v0",
-      "value": 1
-    }, {
-      "name": "@v1",
-      "value": "a"
-    }, {
-      "name": "@v2",
-      "value": "a"
-    }, {
-      "name": "@v3",
-      "value": "Alfredo"
-    }, {
-      "name": "@v4",
-      "value": "c"
-    }, {
-      "name": "@v5",
-      "value": "a"
-    }, {
-      "name": "@v6",
-      "value": true
-    }, {
-      "name": "@v7",
-      "value": 12
-    }]);
-  });
-});
-// ref https://stackoverflow.com/questions/1241142/sql-logic-operator-precedence-and-and-or
-describe("root-or", () => {
-  const f = MyEntity.query((where, f) => where(() => where(f.something.id(1)).and(() => where(f.something.name.startsWith("a")) // or would we do "like", "a%"?
-  .or(f.tag.in("a", "b")).or(() => where(f.name.neq("Alfredo")).and(f.tag("c")))).and(f.bio.contains("abc")).and(f.isActive(true)).and(f.age.gte(12))).or(f.name.startsWith("C")));
-  const s = f.build();
-  console.log(JSON.stringify(s, undefined, 2));
-  it("print", () => {
-    expect((0, _query2.print)(s)).toBe(`(
-  something.id eq 1 AND (
-    something.name startsWith a OR tag in a OR (
-    name neq Alfredo AND tag eq c
-  )
-  ) AND bio contains abc AND isActive eq true AND age gte 12
-) OR name startsWith C`);
-  });
-  it("cosmos", () => {
-    const r = (0, _query.buildWhereCosmosQuery3)(s, "MyEntity", "marker", {
-      tag: "some"
-    });
-    expect(removeWhitespace(r.query)).toBe(removeWhitespace(`    SELECT f
-       FROM MyEntity f
-          
-          WHERE f.id != @id AND (
-    f.something.id = @v0 AND (
-      STARTSWITH(f.something.name, @v1, true) OR ARRAY_CONTAINS(@v2, (f.tag ?? "some")) OR (
-      f.name <> @v3 AND (f.tag ?? "some") = @v4
-    )
-    ) AND CONTAINS(f.bio, @v5, true) AND f.isActive = @v6 AND f.age >= @v7
-  ) OR STARTSWITH(f.name, @v8, true) `));
-    expect(r.parameters).toEqual([{
-      "name": "@id",
-      "value": "marker"
-    }, {
-      "name": "@v0",
-      "value": 1
-    }, {
-      "name": "@v1",
-      "value": "a"
-    }, {
-      "name": "@v2",
-      "value": "a"
-    }, {
-      "name": "@v3",
-      "value": "Alfredo"
-    }, {
-      "name": "@v4",
-      "value": "c"
-    }, {
-      "name": "@v5",
-      "value": "abc"
-    }, {
-      "name": "@v6",
-      "value": true
-    }, {
-      "name": "@v7",
-      "value": 12
-    }, {
-      "name": "@v8",
-      "value": "C"
-    }]);
-  });
-});
-//# sourceMappingURL=filterApi.test.cjs.map