effect-app 4.0.0-beta.285 → 4.0.0-beta.287

package/dist/rpc/Invalidation.d.ts

@@ -1888,7 +1888,7 @@ export interface CommandRpc extends Rpc.Custom {
  * Wraps the success schema with `CommandResponseWithMetaData` and the error
  * schema with `CommandFailureWithMetaData`.
  */
-export declare const makeCommandRpc: <const Tag extends string, Payload extends S.Top | import("effect/Schema").Struct.Fields = S.Void_, Success extends S.Top = S.Void_, Error extends S.Top = S.Never, const Stream extends boolean = false, Out extends Rpc.Custom.OutDefault = Rpc.Custom.Out<S.Struct<{
+export declare const makeCommandRpc: <const Tag extends string, Payload extends S.Top | import("effect/Schema").Struct.Fields = import("effect/Schema").Void, Success extends S.Top = import("effect/Schema").Void, Error extends S.Top = S.Never, const Stream extends boolean = false, Out extends Rpc.Custom.OutDefault = Rpc.Custom.Out<S.Struct<{
     readonly payload: S.Top & Success;
     readonly metadata: S.Struct<{
         readonly invalidateQueries: S.$Array<S.$Array<S.Codec<S.Json, S.Json, never, never>> & {
@@ -2395,7 +2395,7 @@ export interface StreamRpc extends Rpc.Custom {
  * Wraps the success schema with `StreamResponseChunk` and
  * the error schema with `StreamFailureChunk`.
  */
-export declare const makeStreamRpc: <const Tag extends string, Payload extends S.Top | import("effect/Schema").Struct.Fields = S.Void_, Success extends S.Top = S.Void_, Error extends S.Top = S.Never, const Stream extends boolean = false, Out extends Rpc.Custom.OutDefault = Rpc.Custom.Out<S.Union<readonly [S.Struct<{
+export declare const makeStreamRpc: <const Tag extends string, Payload extends S.Top | import("effect/Schema").Struct.Fields = import("effect/Schema").Void, Success extends S.Top = import("effect/Schema").Void, Error extends S.Top = S.Never, const Stream extends boolean = false, Out extends Rpc.Custom.OutDefault = Rpc.Custom.Out<S.Union<readonly [S.Struct<{
     readonly _tag: S.Literal<"value">;
     readonly value: S.Top & Success;
 }>, S.Struct<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-app",
-  "version": "4.0.0-beta.285",
+  "version": "4.0.0-beta.287",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -21,7 +21,7 @@
     "vitest": "^4.1.7"
   },
   "peerDependencies": {
-    "effect": "^4.0.0-beta.88"
+    "effect": "^4.0.0-beta.90"
   },
   "typesVersions": {
     "*": {

package/src/Model/Repository/internal/internal.ts

@@ -7,7 +7,6 @@ import * as HashSet from "effect/HashSet"
 import * as Pipeable from "effect/Pipeable"
 import * as Ref from "effect/Ref"
 import * as Result from "effect/Result"
-import * as SchemaAST from "../../../SchemaAST.ts"
 import type * as Scope from "effect/Scope"
 import * as Unify from "effect/Unify"
 import * as Array from "../../../Array.ts"
@@ -22,6 +21,7 @@ import { flatMapOption } from "../../../Effect.ts"
 import * as Option from "../../../Option.ts"
 import * as S from "../../../Schema.ts"
 import { type Codec, NonNegativeInt } from "../../../Schema.ts"
+import * as SchemaAST from "../../../SchemaAST.ts"
 import { setupRequestContextFromCurrent } from "../../../setupRequest.ts"
 import { type FilterArgs, getContextMap, type PersistenceModelType, type StoreConfig, storeId, StoreMaker } from "../../../Store.ts"
 import type { FieldValues } from "../../filter/types.ts"

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

@@ -2,11 +2,11 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { identity, pipe } from "effect/Function"
 import * as Match from "effect/Match"
-import * as SchemaAST from "../../SchemaAST.ts"
 import * as Array from "../../Array.ts"
 import { toNonEmptyArray } from "../../Array.ts"
 import * as Option from "../../Option.ts"
 import * as S from "../../Schema.ts"
+import * as SchemaAST from "../../SchemaAST.ts"
 import { dropUndefinedT } from "../../utils.ts"
 import type { FilterResult } from "../filter/filterApi.ts"
 import type { FieldValues } from "../filter/types.ts"

package/src/RequestContext.ts

@@ -8,7 +8,7 @@ export type Locale = typeof Locale.Type
 
 export class LocaleRef extends Context.Reference("Locale", { defaultValue: (): Locale => "en" }) {}
 
-const _RequestContext = S.Struct({
+export class RequestContext extends S.Opaque<RequestContext>()(S.Struct({
   span: S.Struct({
     traceId: S.String,
     spanId: S.String,
@@ -20,20 +20,7 @@ const _RequestContext = S.Struct({
   namespace: NonEmptyString255,
   /** @deprecated */
   userProfile: S.optional(S.Struct({ sub: UserProfileId })) //
-})
-
-// codegen:start {preset: modelFacade, className: _RequestContext, schema: S, base: true}
-class __RequestContext extends S.OpaqueFacade<
-  RequestContext,
-  RequestContext.Encoded,
-  RequestContext.Make,
-  RequestContext.DecodingServices,
-  RequestContext.EncodingServices
->()(_RequestContext) {}
-// codegen:end
-
-// eslint-disable-next-line typescript/no-unsafe-declaration-merging
-export class RequestContext extends __RequestContext {
+})) {
   static toMonitoring(this: void, self: RequestContext) {
     return {
       operationName: self.name,
@@ -59,37 +46,3 @@ export const spanAttributes = (ctx: Pick<RequestContext, "locale" | "namespace">
     }
     : {})
 })
-
-// codegen:start {preset: model, static: true, facade: true}
-//
-export interface RequestContext {
-  readonly span: { readonly traceId: string; readonly spanId: string; readonly sampled: boolean }
-  readonly name: S.NonEmptyString255
-  readonly locale: "en" | "de"
-  readonly namespace: S.NonEmptyString255
-  readonly sourceId?: undefined | S.NonEmptyString255
-  readonly userProfile?: undefined | { readonly sub: UserProfileId }
-}
-export namespace RequestContext {
-  export interface Encoded {
-    readonly span: { readonly traceId: string; readonly spanId: string; readonly sampled: boolean }
-    readonly name: string
-    readonly locale: "en" | "de"
-    readonly namespace: string
-    readonly sourceId?: undefined | string
-    readonly userProfile?: undefined | { readonly sub: string }
-  }
-  export interface Make {
-    readonly span: { readonly traceId: string; readonly spanId: string; readonly sampled: boolean }
-    readonly name: S.NonEmptyString255
-    readonly locale: "en" | "de"
-    readonly namespace: S.NonEmptyString255
-    readonly sourceId?: undefined | S.NonEmptyString255
-    readonly userProfile?: undefined | { readonly sub: UserProfileId }
-  }
-  export type DecodingServices = never
-  export type EncodingServices = never
-}
-//
-// codegen:end
-//

package/src/Schema/Class.ts

@@ -3,11 +3,11 @@ import type * as Cause from "effect/Cause"
 import * as Effect from "effect/Effect"
 import * as Option from "effect/Option"
 import * as S from "effect/Schema"
-import * as SchemaAST from "../SchemaAST.ts"
 import * as SchemaGetter from "effect/SchemaGetter"
 import * as SchemaIssue from "effect/SchemaIssue"
 import * as SchemaTransformation from "effect/SchemaTransformation"
 import type { Struct as EffectAppStruct } from "../Schema.ts"
+import * as SchemaAST from "../SchemaAST.ts"
 import { copyOrigin } from "../utils.ts"
 import { concurrencyUnbounded } from "./ext.ts"
 import * as SchemaParser from "./SchemaParser.ts"

package/src/Schema/ext.ts

@@ -37,11 +37,11 @@ import * as Function from "effect/Function"
 import * as Option from "effect/Option"
 import * as S from "effect/Schema"
 import { isDateValid } from "effect/Schema"
-import type * as SchemaAST from "../SchemaAST.ts"
 import * as SchemaIssue from "effect/SchemaIssue"
 import * as SchemaTransformation from "effect/SchemaTransformation"
 import { type NonEmptyReadonlyArray } from "../Array.ts"
 import * as Context from "../Context.ts"
+import type * as SchemaAST from "../SchemaAST.ts"
 import { extendM, typedKeysOf } from "../utils.ts"
 import { type AST } from "./schema.ts"
 

package/src/Schema/moreStrings.ts

@@ -14,10 +14,10 @@ import type * as B from "effect/Brand"
 import * as Effect from "effect/Effect"
 import { pipe } from "effect/Function"
 import * as S from "effect/Schema"
-import type * as SchemaAST from "../SchemaAST.ts"
 import type { Simplify } from "effect/Types"
 import { customRandom, nanoid, urlAlphabet } from "nanoid"
 import validator from "validator"
+import type * as SchemaAST from "../SchemaAST.ts"
 import { type BrandedSchema, fromBrand, nominal } from "./brand.ts"
 import { withDefaultMake } from "./ext.ts"
 import { type B as SchemaB } from "./schema.ts"

package/src/Schema/numbers.ts

@@ -11,8 +11,8 @@
 import { extendM } from "effect-app/utils"
 import * as Effect from "effect/Effect"
 import * as S from "effect/Schema"
-import type * as SchemaAST from "../SchemaAST.ts"
 import type { Simplify } from "effect/Types"
+import type * as SchemaAST from "../SchemaAST.ts"
 import { type BrandedSchema, fromBrand, nominal } from "./brand.ts"
 import { withDefaultMake } from "./ext.ts"
 import { type B } from "./schema.ts"

package/src/Schema/schema.ts

@@ -1,5 +1,5 @@
 import * as B from "effect/Brand"
-import * as AST from "../SchemaAST.ts"
 import * as P from "effect/SchemaParser"
+import * as AST from "../SchemaAST.ts"
 
 export { AST, B, P }

package/src/Schema/strings.ts

@@ -1,7 +1,7 @@
 import type * as B from "effect/Brand"
 import * as S from "effect/Schema"
-import type * as SchemaAST from "../SchemaAST.ts"
 import type { Simplify } from "effect/Types"
+import type * as SchemaAST from "../SchemaAST.ts"
 import { type BrandedSchema, fromBrand, nominal } from "./brand.ts"
 import { withDefaultMake } from "./ext.ts"
 

package/src/Schema.ts

@@ -1,5 +1,4 @@
 import * as S from "effect/Schema"
-import * as SchemaAST from "./SchemaAST.ts"
 import { type Simplify } from "effect/Struct"
 import type * as Tracer from "effect/Tracer"
 import type { RequiredKeys } from "effect/Types"
@@ -9,6 +8,7 @@ import { Email as EmailT, type Email as EmailType } from "./Schema/email.ts"
 import { concurrencyUnbounded, withDefaultMake, withDefaultParseOptions } from "./Schema/ext.ts"
 import { PhoneNumber as PhoneNumberT, type PhoneNumber as PhoneNumberType } from "./Schema/phoneNumber.ts"
 import { type AST } from "./Schema/schema.ts"
+import * as SchemaAST from "./SchemaAST.ts"
 import { copy, extendM, type StructuralCopyOrigin } from "./utils.ts"
 
 // ---------------------------------------------------------------------------
@@ -135,20 +135,14 @@ export const decodeUnknownEffectConcurrently: typeof S.decodeUnknownEffect = wit
 )
 export * as SchemaParser from "./Schema/SchemaParser.ts"
 
-export { Void as Void_ } from "effect/Schema"
-
 /**
- * Schema for a TypeScript `void` return value — the single canonical `Void`
- * used across the app, including RPC success schemas.
- *
- * Built from our overridden {@link SchemaAST.Void} AST node: accepts **any
- * present value** at runtime and discards it to `undefined`, while keeping the
- * decoded/encoded type as `void` (effect-smol PR #2475). Use {@link Void_}
- * (effect's original) or `S.Undefined` when the input must be exactly
- * `undefined`.
+ * Schema for a TypeScript `void` return value — the canonical `Void` used
+ * across the app, including RPC success schemas. Accepts **any present value**
+ * at runtime and discards it to `undefined`, while keeping the decoded/encoded
+ * type as `void`. Use `S.Undefined` when the input must be exactly `undefined`.
  */
 export interface Void extends S.Void {}
-export const Void: Void = S.make<S.Void>(new SchemaAST.Void())
+export const Void: Void = S.Void
 
 // ---------------------------------------------------------------------------
 // Struct / NonEmptyArray / Record

package/src/SchemaAST.ts

@@ -1,29 +1 @@
-import * as Effect from "effect/Effect"
-import type * as Option from "effect/Option"
-import { Void as BaseVoid } from "effect/SchemaAST"
-
 export * from "effect/SchemaAST"
-
-/**
- * AST node for a TypeScript `void` return value — overrides effect's
- * `SchemaAST.Void` parser with TypeScript `void` semantics (the effect-smol
- * PR #2475 / `b7d46ab` implementation).
- *
- * Runtime parsing accepts **any present value** and discards it, producing
- * `undefined` — matching a `void` return whose result callers never observe.
- * The decoded/encoded TypeScript representation stays `void`.
- *
- * @see {@link void_} for the singleton instance.
- */
-export class Void extends BaseVoid {
-  /** @internal — mirrors the PR's `fromAnyToConst(undefined)`. */
-  getParser() {
-    const succeed = Effect.succeedSome(undefined)
-    return (oinput: Option.Option<unknown>) => oinput._tag === "None" ? Effect.succeedNone : succeed
-  }
-}
-
-const voidNode: Void = new Void()
-
-/** Singleton {@link Void} AST node — overrides effect's `void` singleton. */
-export { voidNode as void }

package/test/special.test.ts

@@ -469,7 +469,7 @@ describe("OpaqueFacade", () => {
   })
 
   it("keeps generated struct facades decodable with public statics", () => {
-    const input: RequestContext.Encoded = {
+    const input: typeof RequestContext.Encoded = {
       span: { traceId: "trace", spanId: "span", sampled: true },
       name: "operation",
       locale: "en",