@effect-app/infra 2.60.0 → 2.60.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/infra
 
+## 2.60.1
+
+### Patch Changes
+
+- fix: don't array select non selectable types
+
 ## 2.60.0
 
 ### Minor Changes

package/dist/Model/query/new-kid-interpreter.d.ts

@@ -21,8 +21,8 @@ export declare const toFilter: <TFieldValues extends FieldValues, A, R, TFieldVa
         key: import("../filter/types/path/eager.js").Path<TFieldValues>;
         direction: "ASC" | "DESC";
     }[]];
-    ttype: "one" | "many" | "count";
-    mode: "project" | "collect" | "transform";
+    ttype: "many" | "one" | "count";
+    mode: "collect" | "project" | "transform";
     filter: FilterResult[];
 };
 //# sourceMappingURL=new-kid-interpreter.d.ts.map

package/dist/Model/query/new-kid-interpreter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new-kid-interpreter.d.ts","sourceRoot":"","sources":["../../../src/Model/query/new-kid-interpreter.ts"],"names":[],"mappings":"AAEA,OAAO,EAA8B,CAAC,EAAE,MAAM,YAAY,CAAA;AAG1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD,OAAO,EAAgB,KAAK,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAwIzD,eAAO,MAAM,QAAQ,GACnB,YAAY,SAAS,WAAW,EAChC,CAAC,EACD,CAAC,EACD,mBAAmB,SAAS,YAAY,GAAG,YAAY,EAEvD,GAAG,IAAI,CAAC,YAAY,EAAE,mBAAmB,EAAE,CAAC,EAAE,CAAC,CAAC;;;;;aAKP,MAAM;iBAAW,MAAM,EAAE;;aAAzB,MAAM;iBAAW,MAAM,EAAE;;;;;mBA5IhB,KAAK,GAAG,MAAM;;;mBAAd,KAAK,GAAG,MAAM;;;;;CAmLjE,CAAA"}
+{"version":3,"file":"new-kid-interpreter.d.ts","sourceRoot":"","sources":["../../../src/Model/query/new-kid-interpreter.ts"],"names":[],"mappings":"AAEA,OAAO,EAA8B,CAAC,EAAE,MAAM,YAAY,CAAA;AAG1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD,OAAO,EAAgB,KAAK,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAwIzD,eAAO,MAAM,QAAQ,GACnB,YAAY,SAAS,WAAW,EAChC,CAAC,EACD,CAAC,EACD,mBAAmB,SAAS,YAAY,GAAG,YAAY,EAEvD,GAAG,IAAI,CAAC,YAAY,EAAE,mBAAmB,EAAE,CAAC,EAAE,CAAC,CAAC;;;;;aAKP,MAAM;iBAAW,MAAM,EAAE;;aAAzB,MAAM;iBAAW,MAAM,EAAE;;;;;mBA5IhB,KAAK,GAAG,MAAM;;;mBAAd,KAAK,GAAG,MAAM;;;;;CAyLjE,CAAA"}

package/dist/Model/query/new-kid-interpreter.js

@@ -120,16 +120,22 @@ export const toFilter = (q) => {
             select = t.propertySignatures.map((_) => _.name);
             for (const prop of t.propertySignatures) {
                 if (S.AST.isTupleType(prop.type)) {
-                    select.push({
+                    // make sure we only select when there are actually type literals in the tuple...
+                    // otherwise we might be dealing with strings etc.
+                    // TODO; be more strict, can't support arrays with unions that have non TypeLiteral members etc..
+                    const arraySelect = {
                         key: prop.name,
                         subKeys: Array.flatMap(prop.type.rest, (x) => {
                             const t = walkTransformation(x.type);
                             return S.AST.isTypeLiteral(t) ? t.propertySignatures.map((y) => y.name) : [];
                         })
-                    });
-                    // make sure we don't double select?
-                    if (select.includes(prop.name)) {
-                        select.splice(select.indexOf(prop.name), 1);
+                    };
+                    if (arraySelect.subKeys.length > 0) {
+                        select.push(arraySelect);
+                        // make sure we don't double select?
+                        if (select.includes(prop.name)) {
+                            select.splice(select.indexOf(prop.name), 1);
+                        }
                     }
                 }
             }
@@ -149,4 +155,4 @@ export const toFilter = (q) => {
             : undefined
     });
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"new-kid-interpreter.js","sourceRoot":"","sources":["../../../src/Model/query/new-kid-interpreter.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"new-kid-interpreter.js","sourceRoot":"","sources":["../../../src/Model/query/new-kid-interpreter.ts"],"names":[],"mappings":"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"}

package/dist/QueueMaker/SQLQueue.d.ts

@@ -13,6 +13,6 @@ export declare function makeSQLQueue<Evt extends {
     _tag: string;
 }, EvtE, DrainEvtE>(queueName: NonEmptyString255, queueDrainName: NonEmptyString255, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
     publish: (messages_0: Evt, ...messages: Evt[]) => Effect.Effect<void, never, never>;
-    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, import("../RequestContext.js").LocaleRef | import("../Store/ContextMapContainer.js").ContextMapContainer | import("../Store/Memory.js").storeId>, Tracer.ParentSpan>>;
+    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, import("../Store/ContextMapContainer.js").ContextMapContainer | import("../Store/Memory.js").storeId | import("../RequestContext.js").LocaleRef>, Tracer.ParentSpan>>;
 }, never, SqlClient.SqlClient>;
 //# sourceMappingURL=SQLQueue.d.ts.map

package/dist/QueueMaker/memQueue.d.ts

@@ -9,6 +9,6 @@ export declare function makeMemQueue<Evt extends {
     _tag: string;
 }, EvtE, DrainEvtE>(queueName: string, queueDrainName: string, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
     publish: (messages_0: Evt, ...messages: Evt[]) => Effect.Effect<void, never, never>;
-    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, import("../RequestContext.js").LocaleRef | import("../Store/ContextMapContainer.js").ContextMapContainer | import("../Store/Memory.js").storeId>, Tracer.ParentSpan>>;
+    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, import("../Store/ContextMapContainer.js").ContextMapContainer | import("../Store/Memory.js").storeId | import("../RequestContext.js").LocaleRef>, Tracer.ParentSpan>>;
 }, never, MemQueue>;
 //# sourceMappingURL=memQueue.d.ts.map

package/dist/QueueMaker/sbqueue.d.ts

@@ -9,8 +9,8 @@ export declare function makeServiceBusQueue<Evt extends {
     id: StringId;
     _tag: string;
 }, EvtE, DrainEvtE>(queueName: string, queueDrainName: string, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
-    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, import("effect/Scope").Scope | Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, import("../RequestContext.js").LocaleRef | import("../Store/ContextMapContainer.js").ContextMapContainer | import("../Store/Memory.js").storeId>, ServiceBusReceiverFactory>>;
+    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, import("effect/Scope").Scope | Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, import("../Store/ContextMapContainer.js").ContextMapContainer | import("../Store/Memory.js").storeId | import("../RequestContext.js").LocaleRef>, ServiceBusReceiverFactory>>;
     publish: (messages_0: Evt, ...messages: Evt[]) => Effect.Effect<void, never, never>;
-}, never, import("@azure/service-bus").ServiceBusSender | ServiceBusReceiverFactory>;
-export declare function makeServiceBusLayers(url: string, queueName: string, queueDrainName: string): Layer.Layer<import("@azure/service-bus").ServiceBusSender | ServiceBusReceiverFactory, never, never>;
+}, never, ServiceBusReceiverFactory | import("@azure/service-bus").ServiceBusSender>;
+export declare function makeServiceBusLayers(url: string, queueName: string, queueDrainName: string): Layer.Layer<ServiceBusReceiverFactory | import("@azure/service-bus").ServiceBusSender, never, never>;
 //# sourceMappingURL=sbqueue.d.ts.map

package/dist/Store/ContextMapContainer.d.ts

@@ -1,6 +1,6 @@
 import { Context, Effect, Layer } from "effect-app";
 import { ContextMap } from "./service.js";
-declare const ContextMapContainer_base: Context.ReferenceClass<ContextMapContainer, "ContextMapContainer", "root" | ContextMap>;
+declare const ContextMapContainer_base: Context.ReferenceClass<ContextMapContainer, "ContextMapContainer", ContextMap | "root">;
 export declare class ContextMapContainer extends ContextMapContainer_base {
     static readonly layer: Layer.Layer<ContextMapContainer, never, never>;
 }

package/dist/Store/service.d.ts

@@ -92,7 +92,7 @@ declare const StoreMaker_base: (abstract new (service: {
 } & Context.Tag<StoreMaker, StoreMaker> & {} & {
     use: <X>(body: (_: {
         make: <IdKey extends keyof Encoded, Encoded extends FieldValues, R = never, E = never>(name: string, idKey: IdKey, seed?: Effect<Iterable<Encoded>, E, R>, config?: StoreConfig<Encoded>) => Effect<Store<IdKey, Encoded>, E, R>;
-    }) => X) => X extends Effect.Effect<infer A_1, infer E_1, infer R_3> ? Effect.Effect<A_1, E_1, R_3 | StoreMaker> : Effect.Effect<X, never, StoreMaker>;
+    }) => X) => X extends Effect.Effect<infer A_1, infer E_1, infer R_3> ? Effect.Effect<A_1, E_1, StoreMaker | R_3> : Effect.Effect<X, never, StoreMaker>;
 };
 export declare class StoreMaker extends StoreMaker_base {
 }

package/dist/api/internal/RequestContextMiddleware.d.ts

@@ -1,5 +1,5 @@
 import { Effect } from "effect-app";
 import { HttpServerRequest, HttpServerResponse } from "effect-app/http";
 import { Locale } from "../../RequestContext.js";
-export declare const RequestContextMiddleware: (defaultLocale?: Locale) => <E, R>(app: import("@effect/platform/HttpApp").Default<E, R>) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, HttpServerRequest.HttpServerRequest | Exclude<Exclude<R, import("effect/Tracer").ParentSpan>, import("../../RequestContext.js").LocaleRef | import("../../Store/ContextMapContainer.js").ContextMapContainer | import("../../Store/Memory.js").storeId>>;
+export declare const RequestContextMiddleware: (defaultLocale?: Locale) => <E, R>(app: import("@effect/platform/HttpApp").Default<E, R>) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, HttpServerRequest.HttpServerRequest | Exclude<Exclude<R, import("effect/Tracer").ParentSpan>, import("../../Store/ContextMapContainer.js").ContextMapContainer | import("../../Store/Memory.js").storeId | import("../../RequestContext.js").LocaleRef>>;
 //# sourceMappingURL=RequestContextMiddleware.d.ts.map

package/dist/api/setupRequest.d.ts

@@ -9,6 +9,6 @@ export declare const getRC: Effect.Effect<{
     namespace: NonEmptyString255;
 }, never, never>;
 export declare const setupRequestContextFromCurrent: (name?: string, options?: Tracer.SpanOptions) => <R, E, A>(self: Effect<A, E, R>) => Effect.Effect<A, E, Exclude<Exclude<R, Tracer.ParentSpan>, ContextMapContainer>>;
-export declare function setupRequestContext<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext): Effect.Effect<A, E, Exclude<Exclude<R, Tracer.ParentSpan>, LocaleRef | ContextMapContainer | storeId>>;
-export declare function setupRequestContextWithCustomSpan<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext, name: string, options?: Tracer.SpanOptions): Effect.Effect<A, E, Exclude<Exclude<R, Tracer.ParentSpan>, LocaleRef | ContextMapContainer | storeId>>;
+export declare function setupRequestContext<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext): Effect.Effect<A, E, Exclude<Exclude<R, Tracer.ParentSpan>, ContextMapContainer | storeId | LocaleRef>>;
+export declare function setupRequestContextWithCustomSpan<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext, name: string, options?: Tracer.SpanOptions): Effect.Effect<A, E, Exclude<Exclude<R, Tracer.ParentSpan>, ContextMapContainer | storeId | LocaleRef>>;
 //# sourceMappingURL=setupRequest.d.ts.map

package/package.json

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

package/src/Model/query/new-kid-interpreter.ts

@@ -161,7 +161,10 @@ export const toFilter = <
       select = t.propertySignatures.map((_) => _.name as string)
       for (const prop of t.propertySignatures) {
         if (S.AST.isTupleType(prop.type)) {
-          select.push({
+          // make sure we only select when there are actually type literals in the tuple...
+          // otherwise we might be dealing with strings etc.
+          // TODO; be more strict, can't support arrays with unions that have non TypeLiteral members etc..
+          const arraySelect = {
             key: prop.name as string,
             subKeys: Array.flatMap(
               prop.type.rest,
@@ -170,10 +173,13 @@ export const toFilter = <
                 return S.AST.isTypeLiteral(t) ? t.propertySignatures.map((y) => y.name as string) : []
               }
             )
-          })
-          // make sure we don't double select?
-          if (select.includes(prop.name as string)) {
-            select.splice(select.indexOf(prop.name as string), 1)
+          }
+          if (arraySelect.subKeys.length > 0) {
+            select.push(arraySelect)
+            // make sure we don't double select?
+            if (select.includes(prop.name as string)) {
+              select.splice(select.indexOf(prop.name as string), 1)
+            }
           }
         }
       }

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

@@ -1 +1 @@
-{"version":3,"file":"rawQuery.test.d.ts","sourceRoot":"","sources":["../rawQuery.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAkD,cAAc,EAAuB,MAAM,YAAY,CAAA;AAChH,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAO5C,eAAO,MAAM,EAAE,iDAUb,CAAA"}
+{"version":3,"file":"rawQuery.test.d.ts","sourceRoot":"","sources":["../rawQuery.test.ts"],"names":[],"mappings":""}

package/test/rawQuery.test.ts

@@ -1,24 +1,11 @@
-import { describe, expect, it } from "@effect/vitest"
-import { Array, Config, Effect, Layer, Logger, LogLevel, ManagedRuntime, Option, Redacted, S } from "effect-app"
-import { LogLevels } from "effect-app/utils"
+import { expect, it } from "@effect/vitest"
+import { Config, Effect, Layer, Redacted, S } from "effect-app"
 import { setupRequestContextFromCurrent } from "../src/api/setupRequest.js"
-import { and, project, where } from "../src/Model/query.js"
+import { project } from "../src/Model/query.js"
 import { makeRepo } from "../src/Model/Repository/makeRepo.js"
 import { CosmosStoreLayer } from "../src/Store/Cosmos.js"
 import { MemoryStoreLive } from "../src/Store/Memory.js"
 
-export const rt = ManagedRuntime.make(Layer.mergeAll(
-  Layer.effect(
-    LogLevels,
-    LogLevels.pipe(Effect.map((_) => {
-      const m = new Map(_)
-      m.set("@effect-app/infra", "debug")
-      return m
-    }))
-  ),
-  Logger.minimumLogLevel(LogLevel.Debug)
-))
-
 class Something extends S.Class<Something>()({
   id: S.String,
   name: S.String,
@@ -89,141 +76,58 @@ class SomethingRepo extends Effect.Service<SomethingRepo>()("SomethingRepo", {
     )
 }
 
-describe("select first-level array fields", () => {
-  const test = Effect
-    .gen(function*() {
-      const repo = yield* SomethingRepo
+const test = Effect
+  .gen(function*() {
+    const repo = yield* SomethingRepo
 
-      const projected = S.Struct({ name: S.String, items: S.Array(S.Struct({ id: S.String, value: S.Number })) })
+    const projected = S.Struct({ name: S.String, items: S.Array(S.Struct({ id: S.String, value: S.Number })) })
 
-      // ok crazy lol, "value" is a reserved word in CosmosDB, so we have to use t["value"] as a field name instead of t.value
-      const items = yield* repo.queryRaw(projected, {
-        // TODO
-        cosmos: () => ({
-          query: `
+    // ok crazy lol, "value" is a reserved word in CosmosDB, so we have to use t["value"] as a field name instead of t.value
+    const items = yield* repo.queryRaw(projected, {
+      // TODO
+      cosmos: () => ({
+        query: `
           SELECT 
             f.name,
             ARRAY (SELECT t.id,t["value"] FROM t in f.items) AS items
           FROM Somethings f`,
-          parameters: []
-        }),
-        memory: (items) =>
-          items.map(({ items, name }) => ({
-            name,
-            items: items.map(({ id, value }) => ({ id, value }))
-          }))
-      })
-
-      const items2 = yield* repo.query(project(projected))
-
-      const expected = [
-        {
-          name: "Item 1",
-          items: [
-            { id: "1-1", value: 10 },
-            { id: "1-2", value: 20 }
-          ]
-        },
-        {
-          name: "Item 2",
-          items: [
-            { id: "2-1", value: 30 },
-            { id: "2-2", value: 40 }
-          ]
-        }
-      ]
-
-      expect(items).toStrictEqual(expected)
-      expect(items2).toStrictEqual(expected)
+        parameters: []
+      }),
+      memory: (items) =>
+        items.map(({ items, name }) => ({
+          name,
+          items: items.map(({ id, value }) => ({ id, value }))
+        }))
     })
-    .pipe(setupRequestContextFromCurrent())
-
-  it("works well in CosmosDB", () =>
-    test
-      .pipe(Effect.provide(SomethingRepo.TestCosmos), rt.runPromise))
-
-  it("works well in Memory", () =>
-    test
-      .pipe(Effect.provide(SomethingRepo.Test), rt.runPromise))
-})
 
-describe("filter first-level array fields as groups", () => {
-  const test = Effect
-    .gen(function*() {
-      const repo = yield* SomethingRepo
-
-      const projected = S.Struct({ name: S.String, items: S.Array(S.Struct({ id: S.String, value: S.Number })) })
-
-      // ok crazy lol, "value" is a reserved word in CosmosDB, so we have to use t["value"] as a field name instead of t.value
-      const items = yield* repo.queryRaw(projected, {
-        // TODO
-        cosmos: () => ({
-          query: `
-          SELECT 
-            f.name,
-            ARRAY (SELECT t.id,t["value"] FROM t in f.items) AS items
-          FROM Somethings f
-          JOIN items in f.items
-          WHERE (items["value"] > @v1 AND CONTAINS(items["description"], @v2, true))`,
-          parameters: [{ name: "@v1", value: 20 }, { name: "@v2", value: "d item" }]
-        }),
-        memory: Array.filterMap(({ items, name }) =>
-          items.some((_) => _.value > 20 && _.description.includes("d item"))
-            ? Option.some({
-              name,
-              items: items.map(({ id, value }) => ({ id, value }))
-            })
-            : Option.none()
-        )
-      })
-
-      // this sucks and is poorly implemented:
-      // in memory, only eq/neq operators are implemented for arrays.
-      // wait a minute, cosmos seems to work correctly already... even though a better api would be desirable..
-      // // in both: we don't properly group the filters. you want to express; find Something where some item has both value > 20 and description includes "d item"
-      // // but in reality, you find Something where at least an item has value > 20, and at least an item has a description that includes "d item".
-      const items2 = yield* repo.query(
-        where("items.-1.value", "gt", 20),
-        and("items.-1.description", "contains", "d item"),
-        project(projected)
-      )
-      // TODO: we  need something like this instead:
-      /*
-  const subQuery = <T extends FieldValues>() => <TKey extends keyof T>(key: TKey) => make<T[TKey][number]>() // todo: mark that this is sub query on field "items"
-
-  const test = subQuery<typeof Something.Encoded>()("items")
-    .pipe(
-      where("value", "gt", 20),
-      and("description", "contains", "d item")
-    )
-
-    // ideally we can do stuff like:
-    where(subQuery("items")(
-      where("value", "gt", 10),
-      and("description", "contains", "d item")
-    ))
-    */
-
-      const expected = [
-        {
-          name: "Item 2",
-          items: [
-            { id: "2-1", value: 30 },
-            { id: "2-2", value: 40 }
-          ]
-        }
-      ]
+    const items2 = yield* repo.query(project(projected))
+
+    const expected = [
+      {
+        name: "Item 1",
+        items: [
+          { id: "1-1", value: 10 },
+          { id: "1-2", value: 20 }
+        ]
+      },
+      {
+        name: "Item 2",
+        items: [
+          { id: "2-1", value: 30 },
+          { id: "2-2", value: 40 }
+        ]
+      }
+    ]
 
-      expect(items).toStrictEqual(expected)
-      expect(items2).toStrictEqual(expected)
-    })
-    .pipe(setupRequestContextFromCurrent())
+    expect(items).toStrictEqual(expected)
+    expect(items2).toStrictEqual(expected)
+  })
+  .pipe(setupRequestContextFromCurrent())
 
-  it("works well in CosmosDB", () =>
-    test
-      .pipe(Effect.provide(SomethingRepo.TestCosmos), rt.runPromise))
+it("works well in CosmosDB", () =>
+  test
+    .pipe(Effect.provide(SomethingRepo.TestCosmos), Effect.runPromise))
 
-  it("works well in Memory", () =>
-    test
-      .pipe(Effect.provide(SomethingRepo.Test), rt.runPromise))
-})
+it("works well in Memory", () =>
+  test
+    .pipe(Effect.provide(SomethingRepo.Test), Effect.runPromise))