@effect-app/infra 4.0.0-beta.32 → 4.0.0-beta.33

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @effect-app/infra
 
+## 4.0.0-beta.33
+
+### Patch Changes
+
+- 4b95009: use Finite instead of Number
+- Updated dependencies [4b95009]
+  - effect-app@4.0.0-beta.33
+
 ## 4.0.0-beta.32
 
 ### Patch Changes

package/dist/QueueMaker/SQLQueue.d.ts

@@ -2,8 +2,8 @@ import { type QueueBase } from "@effect-app/infra/QueueMaker/service";
 import { Effect, S } from "effect-app";
 import type { NonEmptyString255 } from "effect-app/Schema";
 import { SqlClient } from "effect/unstable/sql";
-export declare const QueueId: S.brand<import("effect/Schema").Number & {
-    withDefault: S.withConstructorDefault<import("effect/Schema").Number & S.WithoutConstructorDefault>;
+export declare const QueueId: S.brand<import("effect/Schema").Finite & {
+    withDefault: S.withConstructorDefault<import("effect/Schema").Finite & S.WithoutConstructorDefault>;
 }, "QueueId">;
 export type QueueId = typeof QueueId.Type;
 export declare function makeSQLQueue<Evt extends {

package/dist/QueueMaker/SQLQueue.js

@@ -7,7 +7,7 @@ import { pretty } from "effect-app/utils";
 import { SqlClient } from "effect/unstable/sql";
 import { SQLModel } from "../adapters/SQL.js";
 import { InfraLogger } from "../logger.js";
-export const QueueId = S.Number.pipe(S.brand("QueueId"));
+export const QueueId = S.Finite.pipe(S.brand("QueueId"));
 // TODO: let the model track and Auto Generate versionColumn on every update instead
 export function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
     return Effect.gen(function* () {

package/examples/query.ts

@@ -1,11 +1,11 @@
-import { Effect, Layer, ManagedRuntime, S, Schema } from "effect-app"
+import { expectTypeOf } from "@effect/vitest"
+import { Effect, Layer, ManagedRuntime, S } from "effect-app"
 import { makeRepo } from "../src/Model.js"
-import { and, make, one, or, order, page, project, QueryWhere, where } from "../src/Model/query.js"
+import { and, make, one, or, order, page, project, type QueryWhere, where } from "../src/Model/query.js"
 import { MemoryStoreLive } from "../src/Store/Memory.js"
-import { expectTypeOf } from "@effect/vitest"
 
 const str = S.Struct({ _tag: S.Literal("string"), value: S.String })
-const num = S.Struct({ _tag: S.Literal("number"), value: S.Number })
+const num = S.Struct({ _tag: S.Literal("number"), value: S.Finite })
 const someUnion = S.Union(str, num)
 
 export class Something extends S.TaggedClass<Something>()("Something", {
@@ -100,31 +100,35 @@ const rt = ManagedRuntime.make(SomethingRepo.Test)
 rt.runFork(program)
 
 const test1 = make<Union.Encoded>().pipe(
-  where("union._tag", "string"),
+  where("union._tag", "string")
 )
 
-expectTypeOf(test1).toEqualTypeOf<QueryWhere<Union.Encoded, {
-    readonly _tag: "Something";
-    readonly id: string;
-    readonly displayName: string;
-    readonly n: string;
+expectTypeOf(test1).toEqualTypeOf<
+  QueryWhere<Union.Encoded, {
+    readonly _tag: "Something"
+    readonly id: string
+    readonly displayName: string
+    readonly n: string
     readonly union: {
-        readonly _tag: "string";
-        readonly value: string;
-    };
-}>>()
+      readonly _tag: "string"
+      readonly value: string
+    }
+  }>
+>()
 
 const testneq1 = make<Union.Encoded>().pipe(
-  where("union._tag", "neq", "string"),
+  where("union._tag", "neq", "string")
 )
 
-expectTypeOf(testneq1).toEqualTypeOf<QueryWhere<Union.Encoded, {
-    readonly _tag: "Something";
-    readonly id: string;
-    readonly displayName: string;
-    readonly n: string;
+expectTypeOf(testneq1).toEqualTypeOf<
+  QueryWhere<Union.Encoded, {
+    readonly _tag: "Something"
+    readonly id: string
+    readonly displayName: string
+    readonly n: string
     readonly union: {
-        readonly _tag: "number";
-        readonly value: number;
-    };
-}>>()
+      readonly _tag: "number"
+      readonly value: number
+    }
+  }>
+>()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.32",
+  "version": "4.0.0-beta.33",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -13,7 +13,7 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "7.0.1",
     "query-string": "^9.3.1",
-    "effect-app": "4.0.0-beta.32"
+    "effect-app": "4.0.0-beta.33"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.9.1",

package/src/QueueMaker/SQLQueue.ts

@@ -9,7 +9,7 @@ import { SqlClient } from "effect/unstable/sql"
 import { SQLModel } from "../adapters/SQL.js"
 import { InfraLogger } from "../logger.js"
 
-export const QueueId = S.Number.pipe(S.brand("QueueId"))
+export const QueueId = S.Finite.pipe(S.brand("QueueId"))
 export type QueueId = typeof QueueId.Type
 
 // TODO: let the model track and Auto Generate versionColumn on every update instead

package/test/controller.test.ts

@@ -233,7 +233,7 @@ export class GetSomething extends Req<GetSomething>()("GetSomething", {
 
 export class GetSomething2 extends Req<GetSomething2>()("GetSomething2", {
   id: S.String
-}, { success: S.NumberFromString }) {}
+}, { success: S.FiniteFromString }) {}
 
 const Something = { Eff, Gen, DoSomething, GetSomething, GetSomething2, meta: { moduleName: "Something" as const } }
 

package/test/query.test.ts

@@ -11,7 +11,7 @@ import { memFilter, MemoryStoreLive } from "../src/Store/Memory.js"
 import { SomeService } from "./fixtures.js"
 
 const str = S.Struct({ _tag: S.Literal("string"), value: S.String })
-const num = S.Struct({ _tag: S.Literal("number"), value: S.Number })
+const num = S.Struct({ _tag: S.Literal("number"), value: S.Finite })
 const someUnion = S.Union([str, num])
 
 export class Something extends S.Class<Something>("Something")({
@@ -672,7 +672,7 @@ it("remove null from one constituent of a tagged union", () =>
 
       class BB extends S.Class<BB>("BB")({
         id: S.Literal("BB"),
-        b: S.NullOr(S.Number)
+        b: S.NullOr(S.Finite)
       }) {}
 
       type Union = AA | BB

package/test/rawQuery.test.ts

@@ -24,7 +24,7 @@ class Something extends S.Class<Something>("Something")({
   id: S.String,
   name: S.String,
   description: S.String,
-  items: S.Array(S.Struct({ id: S.String, value: S.Number, description: S.String }))
+  items: S.Array(S.Struct({ id: S.String, value: S.Finite, description: S.String }))
 }) {}
 
 const items = [
@@ -83,21 +83,23 @@ class SomethingRepo extends ServiceMap.Service<SomethingRepo>()(
     .layer
     .pipe(
       Layer.provide(
-        Effect.gen(function*() {
-          const url = yield* Config.redacted("STORAGE_URL").pipe(
-            Config.withDefault(
-              Redacted.make(
-                // the emulator doesn't implement array projections :/ so you need an actual cloud instance!
-                "AccountEndpoint=http://localhost:8081/;AccountKey=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="
+        Effect
+          .gen(function*() {
+            const url = yield* Config.redacted("STORAGE_URL").pipe(
+              Config.withDefault(
+                Redacted.make(
+                  // the emulator doesn't implement array projections :/ so you need an actual cloud instance!
+                  "AccountEndpoint=http://localhost:8081/;AccountKey=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="
+                )
               )
             )
-          )
-          return CosmosStoreLayer({
-            dbName: "test",
-            prefix: "",
-            url
+            return CosmosStoreLayer({
+              dbName: "test",
+              prefix: "",
+              url
+            })
           })
-        }).pipe(Layer.unwrap)
+          .pipe(Layer.unwrap)
       )
     )
 }
@@ -107,7 +109,7 @@ describe("select first-level array fields", () => {
     .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.Finite })) })
 
       // 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, {
@@ -159,7 +161,7 @@ describe("select first-level array fields", () => {
       .pipe(Effect.provide(SomethingRepo.Test), rt.runPromise))
 })
 
-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.Finite })) })
 
 const expected = [
   {