Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .changeset/update-effect-4.0.5.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"effect-app": patch
"@effect-app/cli": patch
---

Upgrade Effect packages to npm `4.0.5`. `TaggedUnion` and `ExtendTaggedUnion` reject duplicate `_tag` values at compile time, matching `Schema.toTaggedUnion`. JSON Schema for `PositiveInt` and `NonNegativeInt` now includes `Schema.Int`'s safe-integer maximum.
7 changes: 7 additions & 0 deletions .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
"effecttsgo/lazy-effect": "off",
"effecttsgo/return-effect-in-gen": "off",
"effecttsgo/run-effect-inside-effect": "off",
// Stays off. A Schema brand type argument (`{ readonly brand: unique symbol }`)
// is the wrong nominal marker here. If we brand a class, use a protected field
// so a plain object is not a class instance unless it comes from `new` / `.make`:
// class Foo extends Schema.TaggedClass<Foo>()("Foo", { /* fields */ }) {
// declare protected "~brand~": never
// }
"effecttsgo/schema-class-missing-brand": "off",
"effecttsgo/schema-sync-in-effect": "off",
"effecttsgo/strict-effect-provide": "off",
"effecttsgo/unsafe-effect-type-assertion": "off",
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,29 +48,29 @@
"@effect-app/cli": "workspace:*",
"@effect-app/eslint-codegen-model": "workspace:*",
"@effect-app/infra": "workspace:*",
"@effect/language-service": "0.87.3",
"@effect/tsgo": "^0.47.2",
"@effect/platform-node": "4.0.2",
"@effect/vitest": "4.0.2",
"@effect/language-service": "0.87.5",
"@effect/tsgo": "^0.56.0",
"@effect/platform-node": "4.0.5",
"@effect/vitest": "4.0.5",
"@tsconfig/strictest": "^2.0.8",
"@types/node": "25.9.1",
"@typescript-eslint/eslint-plugin": "8.60.0",
"@typescript-eslint/parser": "8.60.0",
"@typescript/native-preview": "7.0.0-dev.20260626.1",
"dprint": "^0.54.0",
"effect": "4.0.2",
"effect": "4.0.5",
"effect-app": "workspace:*",
"eslint": "^10.4.1",
"json5": "^2.2.3",
"lint-staged": "^17.3.0",
"madge": "^8.0.0",
"npm-check-updates": "^22.2.1",
"oxlint": "1.82.0",
"oxlint-tsgolint": "7.0.2001",
"oxlint": "1.89.0",
"oxlint-tsgolint": "7.0.2004",
"pkg-pr-new": "0.0.75",
"ts-plugin-sort-import-suggestions": "^1.0.4",
"typescript": "~6.0.3",
"vite": "^8.0.15",
"vitest": "^4.1.7"
"vitest": "^5.0.5"
}
}
6 changes: 3 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
"effect-app-cli": "./bin.js"
},
"dependencies": {
"@effect/platform-node": "4.0.2",
"effect": "4.0.2",
"@effect/platform-node": "4.0.5",
"effect": "4.0.5",
"js-yaml": "4.2.0"
},
"devDependencies": {
"@types/js-yaml": "^4.0.9",
"@types/node": "25.9.1",
"typescript": "npm:@typescript/native-preview@beta",
"vitest": "^4.1.7"
"vitest": "^5.0.5"
},
"typesVersions": {
"*": {
Expand Down
10 changes: 5 additions & 5 deletions packages/e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"effect-app": "workspace:*"
},
"devDependencies": {
"@effect/atom-vue": "^4.0.2",
"@effect/platform-node": "4.0.2",
"@effect/vitest": "4.0.2",
"@effect/atom-vue": "^4.0.5",
"@effect/platform-node": "4.0.5",
"@effect/vitest": "4.0.5",
"@tanstack/vue-query": "5.96.2",
"@types/node": "25.9.1",
"@vitejs/plugin-vue": "^6.0.7",
"effect": "^4.0.2",
"effect": "^4.0.5",
"typescript": "~6.0.3",
"vitest": "^4.1.7",
"vitest": "^5.0.5",
"vue": "^3.5.35"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions packages/effect-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"@types/validator": "^13.15.10",
"fast-check": "^4.9.0",
"typescript": "~6.0.3",
"vitest": "^4.1.7"
"vitest": "^5.0.5"
},
"peerDependencies": {
"effect": "^4.0.2"
"effect": "^4.0.5"
},
"typesVersions": {
"*": {
Expand Down
30 changes: 27 additions & 3 deletions packages/effect-app/src/Schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,28 @@ type TaggedUnionWithTags<Members extends TaggedUnionMembers> = S.toTaggedUnion<"
) => PropertyGuardsFor<Members, K, A>
}

// Mirrors effect `Schema.toTaggedUnion`: duplicate `_tag` values, including `1` and `"1"`, are rejected.
type TaggedFor<Tag extends PropertyKey> = { readonly Type: { readonly [K in Tag]: PropertyKey } }
type FlattenTaggedMembers<Schemas> = Schemas extends readonly [infer Head, ...infer Tail]
? Head extends S.Union<infer Inner> ? [...FlattenTaggedMembers<Inner>, ...FlattenTaggedMembers<Tail>]
: [Head, ...FlattenTaggedMembers<Tail>]
: []
type DiscriminantKey<T extends PropertyKey> = T extends number ? `${T}` : T
type EnsureUniqueDiscriminants<Tags extends ReadonlyArray<PropertyKey>, Seen = never> = Tags extends
readonly [infer Head extends PropertyKey, ...infer Tail extends ReadonlyArray<PropertyKey>]
? [DiscriminantKey<Head> & Seen] extends [never] ? EnsureUniqueDiscriminants<Tail, Seen | DiscriminantKey<Head>>
: never
: unknown
type TaggedDiscriminants<
Members extends ReadonlyArray<TaggedFor<"_tag">>,
Flattened extends ReadonlyArray<TaggedFor<"_tag">> = FlattenTaggedMembers<Members>
> = { readonly [I in keyof Flattened]: Flattened[I]["Type"]["_tag"] }
type UniqueTaggedUnion<Members extends TaggedUnionMembers> =
& S.Union<Members>
& NoInfer<EnsureUniqueDiscriminants<TaggedDiscriminants<Members>>>

const extendTaggedUnionWithTags = <Members extends TaggedUnionMembers>(
schema: S.Union<Members>
schema: UniqueTaggedUnion<Members>
): TaggedUnionWithTags<Members> =>
extendM(schema.pipe(S.toTaggedUnion("_tag")), (tagged) => {
const makeGuards = (property: string) => {
Expand All @@ -491,9 +511,13 @@ const extendTaggedUnionWithTags = <Members extends TaggedUnionMembers>(
})

export const ExtendTaggedUnion = <Members extends TaggedUnionMembers>(
schema: S.Union<Members>
schema: UniqueTaggedUnion<Members>
): TaggedUnionWithTags<Members> => extendTaggedUnionWithTags(schema)

export const TaggedUnion = <
Members extends TaggedUnionMembers
>(members: Members): TaggedUnionWithTags<Members> => extendTaggedUnionWithTags(S.Union(members))
>(
members: Members & NoInfer<EnsureUniqueDiscriminants<TaggedDiscriminants<Members>>>
): TaggedUnionWithTags<Members> =>
// `Schema.Union` does not carry the uniqueness proof checked on `members`.
extendTaggedUnionWithTags(S.Union(members) as UniqueTaggedUnion<Members>)
6 changes: 4 additions & 2 deletions packages/effect-app/test/special.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,8 @@ describe("Post-processing integration — real Effect Schema types", () => {
const doc = specialJsonSchemaDocument(AppSchema.PositiveInt)
expect(doc.definitions["PositiveInt"]).toStrictEqual({
type: "integer",
exclusiveMinimum: 0
exclusiveMinimum: 0,
maximum: Number.MAX_SAFE_INTEGER
})
})

Expand Down Expand Up @@ -1152,7 +1153,8 @@ describe("Post-processing integration — real Effect Schema types", () => {
const doc = specialJsonSchemaDocument(AppSchema.NonNegativeInt)
expect(doc.definitions["NonNegativeInt"]).toStrictEqual({
type: "integer",
minimum: 0
minimum: 0,
maximum: Number.MAX_SAFE_INTEGER
})
})

Expand Down
1 change: 1 addition & 0 deletions packages/eslint-shared-config/src/oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@

// Surplus type-aware rules pulled in by `correctness/suspicious/perf` categories
// that were NOT enabled in the original eslint config. Disabled to match prior baseline.
"typescript/no-generated-empty-object-type": "off",
"typescript/no-unsafe-type-assertion": "off",
"typescript/no-unsafe-enum-comparison": "off",
"typescript/no-unnecessary-type-arguments": "off",
Expand Down
8 changes: 4 additions & 4 deletions packages/infra/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"devDependencies": {
"@azure/cosmos": "^4.9.3",
"@azure/service-bus": "^7.9.5",
"@effect/sql-sqlite-node": "4.0.2",
"@effect/sql-sqlite-node": "4.0.5",
"@sentry/opentelemetry": "10.55.0",
"@types/better-sqlite3": "^7.6.13",
"@types/node": "25.9.1",
Expand All @@ -34,17 +34,17 @@
"redis": "^3.1.2",
"redlock": "^4.2.0",
"typescript": "~6.0.3",
"vitest": "^4.1.7"
"vitest": "^5.0.5"
},
"peerDependencies": {
"@azure/cosmos": "^4.9.3",
"@azure/service-bus": "^7.9.5",
"@effect/vitest": "^4.0.2",
"@effect/vitest": "^4.0.5",
"@sendgrid/helpers": "^8.0.0",
"@sendgrid/mail": "^8.1.6",
"@sentry/node": "10.55.0",
"@sentry/opentelemetry": "10.55.0",
"effect": "^4.0.2",
"effect": "^4.0.5",
"jwt-decode": "^4.0.0",
"redis": "^3.1.2",
"redlock": "^4.2.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/vue-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"peerDependencies": {
"@mdi/js": "^7.4.47",
"effect": "^4.0.2",
"effect": "^4.0.5",
"intl-messageformat": "^11.2.7",
"mdi-js": "^1.0.1",
"primeflex": "^4.0.0",
Expand All @@ -52,7 +52,7 @@
"vite": "^8.0.15",
"vite-plugin-css-injected-by-js": "^5.0.1",
"vitepress": "^1.6.4",
"vitest": "^4.1.7",
"vitest": "^5.0.5",
"vue-router": "^5.1.0",
"vue-toastification": "^2.0.0-rc.5",
"vue-tsc": "^3.3.3",
Expand Down
10 changes: 5 additions & 5 deletions packages/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@
"query-string": "^9.4.0"
},
"peerDependencies": {
"@effect/atom-vue": "^4.0.2",
"@effect/platform-browser": "^4.0.2",
"@effect/atom-vue": "^4.0.5",
"@effect/platform-browser": "^4.0.5",
"@sentry/browser": "^10.55.0",
"effect": "^4.0.2",
"effect": "^4.0.5",
"vue": "^3.5.35"
},
"devDependencies": {
"@effect/vitest": "4.0.2",
"@effect/vitest": "4.0.5",
"@formatjs/icu-messageformat-parser": "^3.5.10",
"@types/node": "25.9.1",
"@vitejs/plugin-vue": "^6.0.7",
"intl-messageformat": "^11.2.7",
"typescript": "~6.0.3",
"vite": "^8.0.15",
"vitest": "^4.1.7"
"vitest": "^5.0.5"
},
"typesVersions": {
"*": {
Expand Down
Loading
Loading