prisma-effect-kysely 5.8.0 → 6.0.0-next.0

package/CHANGELOG.md

@@ -1,134 +1,23 @@
 # Changelog
 
-## 5.8.0
+## 6.0.0-next.0
 
-### Minor Changes
-
-- ac42853: fix: DateTime maps back to `Schema.DateFromSelf` (Date ↔ Date) — Prisma+Kysely canonical
-
-  Reverts the 5.6.0 change that mapped `DateTime` to `DateFromInput` (a
-  `Schema.Union(DateFromSelf, Date)` with `Encoded = Date | string`).
-
-  **Why revert**: the dual-input Union pushed the boundary problem onto
-  DA-layer consumers. Kysely's pg driver returns native `Date` instances,
-  but `Selectable<X>.created_at` typed as `Date | string` forced every DA
-  mapper that copies `result.created_at` into a contract type to either
-  narrow manually (no cast-free path) or wrap the read in
-  `Schema.decode(Selectable(X))` (heavy refactor across hundreds of sites).
-
-  **Why DateFromSelf is correct**:
-  - **Prisma docs**: _"Prisma Client returns all DateTime values as native
-    JavaScript Date objects. ... DateTime values must be passed as Date
-    objects, not strings, to avoid runtime errors."_
-  - **Kysely docs**: idiomatic DateTime column is
-    `created_at: ColumnType<Date, string | undefined, never>` — SELECT
-    yields `Date`. _"TypeScript is a compile-time concept and cannot
-    alter runtime JavaScript types. If your TypeScript definition for a
-    column differs from the database's actual return type, the runtime
-    type will not change automatically."_
-  - **Effect Schema docs (Doc 10944)**: _"schemas should be defined such
-    that encode + decode return the original value"_ — one Type, one
-    Encoded per schema. The dual-boundary problem (DA Date ↔ Date vs
-    RPC string ↔ Date) is solved by **two schemas** (one per boundary),
-    not one Union. Doc 4312 (`@effect/sql/Model.Class`) shows this
-    canonical variant pattern (`select`/`insert`/`update` vs
-    `json`/`jsonCreate`/`jsonUpdate`).
-
-  **For RPC/HTTP wire boundaries**: define a contract-layer schema that
-  overrides date columns with `Schema.Date` (Encoded = string) before the
-  RPC framework calls `Schema.decode`. This is the same pattern as
-  `@effect/sql`'s `json` variants — one schema per boundary.
-
-  **`DateFromInput` is still exported** from the package for consumers that
-  specifically want the dual-input behavior at a single call site. The
-  codegen just no longer auto-emits it for every DateTime column.
-
-  **The Schema.Schema.Encoded fix in 5.7.0 stays** — that's still correct
-  for join-table column exposure (`_product_tags.A`/`B`).
-
-  **Migration**: most consumers benefit immediately (DA mappers stop
-  seeing `Date | string`). For RPC contracts that previously didn't have
-  a Date override (because they relied on `DateFromInput`), re-add a
-  `Schema.extend` with `Schema.Date` overrides for date columns to keep
-  wire decode working.
-
-## 5.7.0
-
-### Minor Changes
+### Major Changes
 
-- d272b99: fix: DB interface uses `Schema.Schema.Encoded` so Kysely sees real DB columns
-
-  The generated `interface DB` previously emitted
-  `<table>: Schema.Schema.Type<typeof X>`. For tables using `Schema.fromKey`
-  (Prisma implicit M:N join tables, where TS field `product_id` maps to DB
-  column `A`), the Type side has the **decoded** names. Kysely uses the TS
-  interface as the SQL contract — it does not run the Effect schema decoder.
-  So queries like `db.selectFrom('_product_tags').where('product_id', ...)`
-  generated `WHERE product_id = ...` and Postgres rejected with
-  `column _product_tags.product_id does not exist`.
-
-  Fix: emit `Schema.Schema.Encoded<typeof X>` for every DB interface entry.
-  Encoded is the on-the-wire / on-disk shape that matches Postgres. For
-  regular tables `Type === Encoded`, no behavior change. For join tables,
-  Kysely now sees `A`/`B` and emits valid SQL. Application code that wants
-  the semantic field names runs the row through `Schema.decode(X)`.
-
-  `ColumnType<S, I, U>` brand preserves `__select__`/`__insert__`/`__update__`
-  phantoms on both sides, so `Insertable<X>`/`Updateable<X>` inference is
-  unchanged.
-
-  Adds `db-interface-sql-contract.test.ts` with three regression checks:
-  1. String-grep — every DB entry uses Encoded, none use Type.
-  2. Encoded-side preserves real Postgres column names for implicit M:N.
-  3. Kysely SQL compile — emitted SQL references the real `"A"` column,
-     not the `product_id` decoded name. This catches the original bug
-     structurally without needing a live database.
-
-  **Migration**: most consumers need no changes. If a consumer overrode
-  the generated DB interface entry to expose `A`/`B` directly (workaround
-  for this bug), the override can now be removed and the generator will
-  do the right thing.
-
-## 5.6.0
+- fde013c: Migrate to Effect 4 (beta).
 
-### Minor Changes
+  **Breaking:** the `effect` peer dependency is now `^4.0.0-beta` (Effect 3 is no longer supported). Consumers must upgrade to `effect@^4.0.0-beta`.
 
-- bf7d87c: feat: DateTime columns now map to `DateFromInput` (dual-boundary Date schema)
-
-  `DateTime` columns previously mapped to `Schema.DateFromSelf`
-  (`Encoded = Date`), which broke RPC/HTTP wire decode where JSON-parsed
-  input is a string. Now maps to a new exported `DateFromInput` schema:
-  - **Type** = `Date` (runtime — unchanged)
-  - **Encoded** = `Date | string` (was `Date`)
-
-  Defined as `Schema.Union(Schema.DateFromSelf, Schema.Date)`, so decode
-  accepts native `Date` instances (Kysely DA layer — pg driver returns Date)
-  AND ISO strings (RPC/HTTP wire layer — JSON.parse output). One primitive
-  serves both consumer boundaries; consumers no longer need parallel
-  schemas or `Schema.extend` overrides for date columns.
-
-  **Why minor (not major)**: existing public API behavior is preserved.
-  `Selectable<T>` / `Insertable<T>` / `Updateable<T>` Type sides unchanged.
-  Decode accepts MORE inputs (Date AND string), not fewer. Encode picks
-  the first union member (`DateFromSelf`, identity) so Kysely-bound
-  encode still produces Date instances — existing call sites keep working.
-
-  **Why the change**: `DateFromSelf` optimized for the in-memory Kysely
-  boundary; `Schema.Date` optimizes for the JSON wire boundary. Modern
-  apps cross both with the same generated schemas. Picking either single
-  primitive forced consumers to patch around it at one boundary.
-  `DateFromInput` accepts both encoded shapes natively. Mirrors the
-  `JsonValue` dual-boundary discipline already in this package
-  (`Schema<JsonValue, JsonValue>` is wire-safe by construction).
-
-  **Migration**: no code changes for typical consumers. If you imported
-  `Schema.DateFromSelf` directly from generated `types.ts` in a way that
-  depended on the literal symbol, switch to `DateFromInput` imported from
-  `prisma-effect-kysely`.
-
-  **Internal**: consolidated duplicated `PRISMA_TO_EFFECT_SCHEMA` /
-  `PRISMA_SCALAR_MAP` constants. `src/effect/type.ts` now imports the
-  canonical map from `src/utils/type-mappings.ts`.
+  What changed:
+  - **Runtime helpers** (`Selectable` / `Insertable` / `Updateable`) were reimplemented on Effect 4's public `Schema.Struct.fields` API instead of the removed `effect/SchemaAST` internals (Effect 4 reworked `SchemaAST`: `PropertySignature` is now 2-arg, structs are `Objects` nodes, `isTypeLiteral` is gone). Public signatures and the derived `Selectable<T>`/`Insertable<T>`/`Updateable<T>` types are unchanged.
+  - **Generated output** now emits Effect-4 schema source:
+    - `DateTime` → `Schema.Date` (still native `Date` on both sides — Effect 4's `Schema.Date` no longer coerces to string, replacing Effect 3's `Schema.DateFromSelf`).
+    - UUID fields → `Schema.String.check(Schema.isUUID())` (Effect 4 removed `Schema.UUID`).
+    - BigInt → `Schema.BigInt` (native bigint encoding; replaces `Schema.BigIntFromSelf`).
+    - Enums → `Schema.Enum(...)`; the internal native TS enum is suffixed with `Enum` when its name collides with the PascalCase const (Effect 4 forbids enum/const identifier merging).
+    - `@map` / implicit-M:N `A`/`B` column renames → struct-level `Schema.encodeKeys({ tsName: "db_name" })` (Effect 4 removed `Schema.propertySignature(...).pipe(Schema.fromKey(...))`).
+  - Scaffolded contract libraries now declare `effect: ^4.0.0-beta` as their peer dependency.
+  - Added a generator-output compile guard (`bun run test:emit`) that type-checks the emitted code against the installed Effect version.
 
 ## 5.5.0
 

package/README.md

@@ -4,10 +4,34 @@ Prisma generator producing Effect Schema types with Kysely-compatible column met
 
 ## Install
 
+This package's major version tracks the major version of its `effect` peer
+dependency. Pick the line that matches your Effect version:
+
+| Your Effect version | Install                             | npm dist-tag |
+| ------------------- | ----------------------------------- | ------------ |
+| Effect 3 (stable)   | `bun add prisma-effect-kysely`      | `latest`     |
+| Effect 4 (beta)     | `bun add prisma-effect-kysely@next` | `next`       |
+
 ```bash
+# Effect 3 (current stable line)
 bun add prisma-effect-kysely
+
+# Effect 4 beta — opt-in pre-release
+bun add prisma-effect-kysely@next effect@beta
 ```
 
+> **Effect 4 support is a pre-release.** It requires `effect@^4.0.0-beta` and is
+> published under the `next` dist-tag, not `latest`. It is **tested against
+> `effect@4.0.0-beta.68`**; later betas may introduce breaking Schema changes. A
+> generator-output compile check (`bun run test:emit`) guards the emitted code
+> against the installed Effect, but pin `effect` if you need stability during the
+> beta. The `next` line will be promoted to `latest` when Effect 4 goes stable.
+>
+> Effect 4 and Effect 3 are not interchangeable: the generated output uses
+> Effect-4-only Schema APIs (`Schema.Date`, `Schema.String.check(Schema.isUUID())`,
+> `Schema.encodeKeys`, `Schema.Enum`, …). Stay on the `latest` line if you are on
+> Effect 3.
+
 ## Setup
 
 ```prisma
@@ -26,18 +50,18 @@ npx prisma generate
 Three files: `enums.ts`, `types.ts`, `index.ts`.
 
 ```typescript
-import { Schema } from "effect";
-import { columnType, DateFromInput, generated, Selectable } from "prisma-effect-kysely";
+import { Schema } from 'effect';
+import { columnType, generated, Selectable } from 'prisma-effect-kysely';
 
 // Branded ID
-export const UserId = Schema.UUID.pipe(Schema.brand("UserId"));
+export const UserId = Schema.String.check(Schema.isUUID()).pipe(Schema.brand('UserId'));
 export type UserId = typeof UserId.Type;
 
 // Model schema
 export const User = Schema.Struct({
-  id: columnType(Schema.UUID, Schema.Never, Schema.Never),
+  id: columnType(UserId, Schema.Never, Schema.Never),
   email: Schema.String,
-  createdAt: generated(DateFromInput),
+  createdAt: generated(Schema.Date),
 });
 export type User = typeof User;
 
@@ -73,20 +97,20 @@ Schema names are PascalCase regardless of Prisma model name (`session_preference
 
 ## Type Mappings
 
-| Prisma      | Effect Schema         |
-| ----------- | --------------------- |
-| String      | `Schema.String`       |
-| Int / Float | `Schema.Number`       |
-| BigInt      | `Schema.BigInt`       |
-| Decimal     | `Schema.String`       |
-| Boolean     | `Schema.Boolean`      |
-| DateTime    | `DateFromInput`       |
-| Json        | `JsonValue`           |
-| Bytes       | `Schema.Uint8Array`   |
-| Enum        | `Schema.Literal(...)` |
-| UUID        | `Schema.UUID`         |
-
-Arrays → `Schema.Array(t)`. Nullable → `Schema.NullOr(t)`. `DateFromInput` accepts `Date | string` on the encoded side; `JsonValue` is `Schema<JsonValue, JsonValue>`. Both are wire-safe (`JSON.parse` output decodes cleanly).
+| Prisma      | Effect Schema                          |
+| ----------- | -------------------------------------- |
+| String      | `Schema.String`                        |
+| Int / Float | `Schema.Number`                        |
+| BigInt      | `Schema.BigInt`                        |
+| Decimal     | `Schema.String`                        |
+| Boolean     | `Schema.Boolean`                       |
+| DateTime    | `Schema.Date`                          |
+| Json        | recursive `JsonValue`                  |
+| Bytes       | `Schema.Uint8Array`                    |
+| Enum        | `Schema.Enum(...)`                     |
+| UUID        | `Schema.String.check(Schema.isUUID())` |
+
+Arrays → `Schema.Array(t)`. Nullable → `Schema.NullOr(t)`.
 
 ## UUID Detection
 
@@ -102,9 +126,9 @@ Use `@customType` in field docs to override Effect Schema:
 
 ```prisma
 model User {
-  /// @customType(Schema.String.pipe(Schema.email()))
+  /// @customType(Schema.String.check(Schema.isMinLength(3)))
   email String @unique
-  /// @customType(Schema.Number.pipe(Schema.positive()))
+  /// @customType(Schema.Number.check(Schema.isGreaterThan(0)))
   age Int
 }
 ```
@@ -113,28 +137,24 @@ Supported on all Prisma scalar types.
 
 ## Implicit M2M Join Tables
 
-Prisma columns `A`/`B` map to semantic snake_case fields via `Schema.fromKey`:
+Prisma columns `A`/`B` map to semantic snake_case fields via `Schema.encodeKeys`:
 
 ```typescript
 export const ProductToProductTag = Schema.Struct({
-  product_id: Schema.propertySignature(
-    columnType(Schema.UUID, Schema.Never, Schema.Never)
-  ).pipe(Schema.fromKey("A")),
-  product_tag_id: Schema.propertySignature(
-    columnType(Schema.UUID, Schema.Never, Schema.Never)
-  ).pipe(Schema.fromKey("B")),
-});
+  product_id: columnType(ProductId, Schema.Never, Schema.Never),
+  product_tag_id: columnType(ProductTagId, Schema.Never, Schema.Never),
+}).pipe(Schema.encodeKeys({ product_id: 'A', product_tag_id: 'B' }));
 ```
 
 ## Package Exports
 
-| Entry                            | Contents                                              |
-| -------------------------------- | ----------------------------------------------------- |
-| `prisma-effect-kysely`           | Type utilities + runtime helpers (default import)     |
-| `prisma-effect-kysely/generator` | Prisma generator binary entry                         |
-| `prisma-effect-kysely/kysely`    | `getSchemas`, `columnType`, `generated`, type utils   |
-| `prisma-effect-kysely/error`     | `NotFoundError`, `QueryError`, `QueryParseError`, ... |
-| `prisma-effect-kysely/runtime`   | All runtime utilities                                 |
+| Entry                            | Contents                                            |
+| -------------------------------- | --------------------------------------------------- |
+| `prisma-effect-kysely`           | Type utilities + runtime helpers (default import)   |
+| `prisma-effect-kysely/generator` | Prisma generator binary entry                       |
+| `prisma-effect-kysely/kysely`    | `getSchemas`, `columnType`, `generated`, type utils |
+| `prisma-effect-kysely/error`     | `NotFoundError`, `QueryError`, `DatabaseError`      |
+| `prisma-effect-kysely/runtime`   | All runtime utilities                               |
 
 ## Development
 
@@ -148,15 +168,28 @@ bun run prepublishOnly  # lint + typecheck + test + build
 
 ## Releasing
 
-Uses [Changesets](https://github.com/changesets/changesets).
+Uses [Changesets](https://github.com/changesets/changesets). Two lines run in
+parallel:
 
-```bash
-bun changeset           # add changeset
-git add .changeset/ && git commit -m "docs: changeset"
-git push
-```
+- **Stable (`latest`)** — from `main`. Normal flow:
+
+  ```bash
+  bun changeset           # add changeset
+  git add .changeset/ && git commit -m "docs: changeset"
+  git push                # CI opens a "Version Packages" PR; merging publishes
+  ```
+
+- **Pre-release (`next`)** — from the `release/next` branch, which carries
+  `.changeset/pre.json` (changesets pre mode, tag `next`). Pushing there versions
+  as `X.Y.Z-next.N` and `changeset publish` auto-routes those to the `next`
+  dist-tag (never `latest`). This is where Effect 4 support lives until Effect 4
+  is stable. When it stabilizes: run `changeset pre exit` on `release/next`,
+  merge into `main`, and the next release promotes it to `latest`.
 
-CI opens a "Version Packages" PR. Merging it publishes to npm, tags, and creates a GitHub release. Requires `NPM_TOKEN` repo secret.
+The CI workflow (`.github/workflows/release.yml`) triggers on both branches and
+uses the changesets action's `version` + `publish` inputs; `changeset publish`
+selects the dist-tag from pre mode. Requires the `NPM_TOKEN` repo secret. Do not
+enter pre mode on `main` — it blocks stable releases until you exit.
 
 ## License
 

package/dist/effect/enum.d.ts

@@ -1,9 +1,9 @@
 import type { DMMF } from '@prisma/generator-helper';
 /**
- * Generate TypeScript enum + Effect Schema.Enums wrapper
+ * Generate TypeScript enum + Effect Schema.Enum wrapper
  *
  * Output pattern:
- * - Native TS enum with SCREAMING_SNAKE_CASE (internal, for Schema.Enums)
+ * - Native TS enum with SCREAMING_SNAKE_CASE (internal, for Schema.Enum)
  * - PascalCase export IS the Schema (so it works in Schema.Struct)
  * - Type alias with same name (value + type pattern)
  */

package/dist/effect/enum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../src/effect/enum.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAKrD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,UAuB7D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,SAAS,IAAI,CAAC,aAAa,EAAE,UAMrE"}
+{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../src/effect/enum.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAKrD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,UA0B7D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,SAAS,IAAI,CAAC,aAAa,EAAE,UAMrE"}

package/dist/effect/enum.js

@@ -2,18 +2,21 @@ import { getEnumValueDbName } from '../prisma/enum.js';
 import { generateFileHeader } from '../utils/codegen.js';
 import { toPascalCase } from '../utils/naming.js';
 /**
- * Generate TypeScript enum + Effect Schema.Enums wrapper
+ * Generate TypeScript enum + Effect Schema.Enum wrapper
  *
  * Output pattern:
- * - Native TS enum with SCREAMING_SNAKE_CASE (internal, for Schema.Enums)
+ * - Native TS enum with SCREAMING_SNAKE_CASE (internal, for Schema.Enum)
  * - PascalCase export IS the Schema (so it works in Schema.Struct)
  * - Type alias with same name (value + type pattern)
  */
 export function generateEnumSchema(enumDef) {
-    // Raw enum keeps original name (usually SCREAMING_SNAKE_CASE)
-    const enumName = enumDef.name;
-    // PascalCase name is exported as BOTH the Schema value AND the type
+    // PascalCase name is exported as BOTH the Schema value AND the type.
     const pascalName = toPascalCase(enumDef.name);
+    // The native TS enum keeps its original Prisma name (usually SCREAMING_SNAKE).
+    // But when that already equals the PascalCase const (e.g. `Role` -> `Role`),
+    // TypeScript forbids the enum/const identifier from merging, so suffix the
+    // enum with `Enum` (`Role` -> internal `RoleEnum`) to keep them distinct.
+    const enumName = enumDef.name === pascalName ? `${pascalName}Enum` : enumDef.name;
     // Generate native TypeScript enum members
     const enumMembers = enumDef.values
         .map((v) => {
@@ -28,7 +31,7 @@ export function generateEnumSchema(enumDef) {
 ${enumMembers}
 }
 
-export const ${pascalName} = Schema.Enums(${enumName});
+export const ${pascalName} = Schema.Enum(${enumName});
 export type ${pascalName} = Schema.Schema.Type<typeof ${pascalName}>;`;
 }
 /**

package/dist/effect/enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../src/effect/enum.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAA2B;IAC5D,8DAA8D;IAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAC9B,oEAAoE;IACpE,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9C,0CAA0C;IAC1C,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM;SAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,MAAM,KAAK,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACpC,OAAO,KAAK,CAAC,CAAC,IAAI,OAAO,KAAK,GAAG,CAAC;IACpC,CAAC,CAAC;SACD,IAAI,CAAC,KAAK,CAAC,CAAC;IAEf,iDAAiD;IACjD,uEAAuE;IACvE,+DAA+D;IAC/D,OAAO,eAAe,QAAQ;EAC9B,WAAW;;;eAGE,UAAU,mBAAmB,QAAQ;cACtC,UAAU,gCAAgC,UAAU,IAAI,CAAC;AACvE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAoC;IACpE,MAAM,MAAM,GAAG,kBAAkB,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,kCAAkC,CAAC;IACnD,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE/D,OAAO,GAAG,MAAM,OAAO,OAAO,OAAO,WAAW,EAAE,CAAC;AACrD,CAAC"}
+{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../src/effect/enum.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAA2B;IAC5D,qEAAqE;IACrE,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,+EAA+E;IAC/E,6EAA6E;IAC7E,2EAA2E;IAC3E,0EAA0E;IAC1E,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IAElF,0CAA0C;IAC1C,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM;SAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,MAAM,KAAK,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACpC,OAAO,KAAK,CAAC,CAAC,IAAI,OAAO,KAAK,GAAG,CAAC;IACpC,CAAC,CAAC;SACD,IAAI,CAAC,KAAK,CAAC,CAAC;IAEf,iDAAiD;IACjD,uEAAuE;IACvE,+DAA+D;IAC/D,OAAO,eAAe,QAAQ;EAC9B,WAAW;;;eAGE,UAAU,kBAAkB,QAAQ;cACrC,UAAU,gCAAgC,UAAU,IAAI,CAAC;AACvE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAoC;IACpE,MAAM,MAAM,GAAG,kBAAkB,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,kCAAkC,CAAC;IACnD,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE/D,OAAO,GAAG,MAAM,OAAO,OAAO,OAAO,WAAW,EAAE,CAAC;AACrD,CAAC"}

package/dist/effect/generator.d.ts

@@ -17,7 +17,8 @@ export declare class EffectGenerator {
     generateBrandedIdSchema(model: DMMF.Model, fields: readonly DMMF.Field[]): string | null;
     /**
      * Determine the base Effect Schema type for an ID field.
-     * UUID strings → Schema.UUID, integers → Schema.Int, bigints → Schema.BigIntFromSelf, all others → Schema.String
+     * UUID strings → Schema.String.check(Schema.isUUID()), integers → Schema.Int,
+     * bigints → Schema.BigInt, all others → Schema.String
      */
     private getIdBaseType;
     /**

package/dist/effect/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../src/effect/generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAQ/E;;GAEG;AACH,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,IAAI,CAAC,QAAQ;IAEhD;;OAEG;IACH,aAAa,CAAC,KAAK,EAAE,SAAS,IAAI,CAAC,aAAa,EAAE;IAIlD;;;OAGG;IACH,uBAAuB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,IAAI,CAAC,KAAK,EAAE;IAcxE;;;OAGG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;OAIG;IACH,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,IAAI,CAAC,KAAK,EAAE;IAqBpE;;OAEG;IACH,mBAAmB,CAAC,QAAQ,EAAE,OAAO;IAsBrC;;OAEG;IACH,wBAAwB,CAAC,UAAU,EAAE,aAAa,EAAE;CAGrD"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../src/effect/generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAQ/E;;GAEG;AACH,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,IAAI,CAAC,QAAQ;IAEhD;;OAEG;IACH,aAAa,CAAC,KAAK,EAAE,SAAS,IAAI,CAAC,aAAa,EAAE;IAIlD;;;OAGG;IACH,uBAAuB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,IAAI,CAAC,KAAK,EAAE;IAcxE;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;OAIG;IACH,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,IAAI,CAAC,KAAK,EAAE;IAoCpE;;OAEG;IACH,mBAAmB,CAAC,QAAQ,EAAE,OAAO;IAoBrC;;OAEG;IACH,wBAAwB,CAAC,UAAU,EAAE,aAAa,EAAE;CAGrD"}

package/dist/effect/generator.js

@@ -1,4 +1,4 @@
-import { buildKyselyFieldType } from '../kysely/type.js';
+import { buildKyselyFieldType, fieldKeyMapping } from '../kysely/type.js';
 import { buildForeignKeyMap } from '../prisma/relation.js';
 import { isUuidField } from '../prisma/type.js';
 import { generateFileHeader } from '../utils/codegen.js';
@@ -37,15 +37,16 @@ export type ${name}Id = typeof ${name}Id.Type;`;
     }
     /**
      * Determine the base Effect Schema type for an ID field.
-     * UUID strings → Schema.UUID, integers → Schema.Int, bigints → Schema.BigIntFromSelf, all others → Schema.String
+     * UUID strings → Schema.String.check(Schema.isUUID()), integers → Schema.Int,
+     * bigints → Schema.BigInt, all others → Schema.String
      */
     getIdBaseType(field) {
         if (isUuidField(field))
-            return 'Schema.UUID';
+            return 'Schema.String.check(Schema.isUUID())';
         if (field.type === 'Int')
             return 'Schema.Int';
         if (field.type === 'BigInt')
-            return 'Schema.BigIntFromSelf';
+            return 'Schema.BigInt';
         return 'Schema.String';
     }
     /**
@@ -56,19 +57,30 @@ export type ${name}Id = typeof ${name}Id.Type;`;
     generateModelSchema(model, fields) {
         const fkMap = buildForeignKeyMap(model, this.dmmf.datamodel.models);
         const name = toPascalCase(model.name);
+        // Collect @map renames; they are applied once as a struct-level encodeKeys
+        // (Effect 4 removed the per-field Schema.fromKey pattern).
+        const keyMappings = [];
         const fieldDefinitions = fields
             .map((field) => {
             // Get base Effect type
             const baseType = buildFieldType(field, this.dmmf, fkMap);
-            // Apply Kysely helpers (columnType, generated) and @map directive
+            // Apply Kysely helpers (columnType, generated)
             // Pass model.name so @id fields use the model's branded ID type
             const fieldType = buildKyselyFieldType(baseType, field, model.name);
+            const mapping = fieldKeyMapping(field);
+            if (mapping)
+                keyMappings.push(mapping);
             return `  ${field.name}: ${fieldType}`;
         })
             .join(',\n');
+        const encodeKeys = keyMappings.length > 0
+            ? `.pipe(Schema.encodeKeys({ ${keyMappings
+                .map((m) => `${m.tsName}: "${m.dbName}"`)
+                .join(', ')} }))`
+            : '';
         return `export const ${name} = Schema.Struct({
 ${fieldDefinitions}
-});
+})${encodeKeys};
 export type ${name} = typeof ${name};`;
     }
     /**
@@ -76,10 +88,8 @@ export type ${name} = typeof ${name};`;
      */
     generateTypesHeader(hasEnums) {
         const header = generateFileHeader();
-        // Import runtime helpers from prisma-effect-kysely.
-        // DateTime fields use Schema.DateFromSelf (Date ↔ Date), matching
-        // Prisma's contract that DateTime values are native Date instances.
-        // Decode through a Schema.Date contract schema at JSON wire boundaries.
+        // Import runtime helpers from prisma-effect-kysely
+        // columnType and generated are used for field type annotations
         const imports = [
             `import { Schema } from "effect";`,
             `import { columnType, generated, JsonValue } from "prisma-effect-kysely";`,

package/dist/effect/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../src/effect/generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAsB,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C;;GAEG;AACH,MAAM,OAAO,eAAe;IACG;IAA7B,YAA6B,IAAmB;QAAnB,SAAI,GAAJ,IAAI,CAAe;IAAG,CAAC;IAEpD;;OAEG;IACH,aAAa,CAAC,KAAoC;QAChD,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAED;;;OAGG;IACH,uBAAuB,CAAC,KAAiB,EAAE,MAA6B;QACtE,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAE7C,kDAAkD;QAClD,OAAO,gBAAgB,IAAI,QAAQ,QAAQ,uBAAuB,IAAI;cAC5D,IAAI,eAAe,IAAI,UAAU,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACK,aAAa,CAAC,KAAiB;QACrC,IAAI,WAAW,CAAC,KAAK,CAAC;YAAE,OAAO,aAAa,CAAC;QAC7C,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK;YAAE,OAAO,YAAY,CAAC;QAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,uBAAuB,CAAC;QAC5D,OAAO,eAAe,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACH,mBAAmB,CAAC,KAAiB,EAAE,MAA6B;QAClE,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACpE,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEtC,MAAM,gBAAgB,GAAG,MAAM;aAC5B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACb,uBAAuB;YACvB,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACzD,kEAAkE;YAClE,gEAAgE;YAChE,MAAM,SAAS,GAAG,oBAAoB,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACpE,OAAO,KAAK,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACzC,CAAC,CAAC;aACD,IAAI,CAAC,KAAK,CAAC,CAAC;QAEf,OAAO,gBAAgB,IAAI;EAC7B,gBAAgB;;cAEJ,IAAI,aAAa,IAAI,GAAG,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,mBAAmB,CAAC,QAAiB;QACnC,MAAM,MAAM,GAAG,kBAAkB,EAAE,CAAC;QAEpC,oDAAoD;QACpD,kEAAkE;QAClE,oEAAoE;QACpE,wEAAwE;QACxE,MAAM,OAAO,GAAG;YACd,kCAAkC;YAClC,0EAA0E;SAC3E,CAAC;QAEF,IAAI,QAAQ,EAAE,CAAC;YACb,iCAAiC;YACjC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE1F,OAAO,CAAC,IAAI,CAAC,YAAY,WAAW,oBAAoB,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,GAAG,MAAM,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAC9C,CAAC;IAED;;OAEG;IACH,wBAAwB,CAAC,UAA2B;QAClD,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,uBAAuB,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrF,CAAC;CACF"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../src/effect/generator.ts"],"names":[],"mappings":"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"}

package/dist/effect/join-table.d.ts

@@ -5,7 +5,7 @@ import type { JoinTableInfo } from '../prisma/relation.js';
  *
  * Structure:
  * - Direct export with semantic snake_case field names
- * - Maps TypeScript names to database A/B columns using Schema.fromKey
+ * - Maps TypeScript names to database A/B columns using Schema.encodeKeys
  * - Uses columnType for read-only foreign keys (can't insert/update join table rows directly)
  * - No type exports - consumers use type utilities: Selectable<JoinTable>
  *

package/dist/effect/join-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"join-table.d.ts","sourceRoot":"","sources":["../../src/effect/join-table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAG3D;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,UA6BrF"}
+{"version":3,"file":"join-table.d.ts","sourceRoot":"","sources":["../../src/effect/join-table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAG3D;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,UA+BrF"}

package/dist/effect/join-table.js

@@ -4,7 +4,7 @@ import { toPascalCase, toSnakeCase } from '../utils/naming.js';
  *
  * Structure:
  * - Direct export with semantic snake_case field names
- * - Maps TypeScript names to database A/B columns using Schema.fromKey
+ * - Maps TypeScript names to database A/B columns using Schema.encodeKeys
  * - Uses columnType for read-only foreign keys (can't insert/update join table rows directly)
  * - No type exports - consumers use type utilities: Selectable<JoinTable>
  *
@@ -22,10 +22,12 @@ export function generateJoinTableSchema(joinTable, _dmmf) {
     // Reference branded ID schemas (e.g., ProductId, SellerId) generated earlier in the output
     const modelASchemaType = `${toPascalCase(modelA)}Id`;
     const modelBSchemaType = `${toPascalCase(modelB)}Id`;
-    // Use columnType for read-only FK fields (can't insert/update join table rows directly)
-    // Schema.propertySignature + Schema.fromKey maps TypeScript name to database column
-    const columnAField = `  ${columnAFieldName}: Schema.propertySignature(columnType(${modelASchemaType}, Schema.Never, Schema.Never)).pipe(Schema.fromKey("A"))`;
-    const columnBField = `  ${columnBFieldName}: Schema.propertySignature(columnType(${modelBSchemaType}, Schema.Never, Schema.Never)).pipe(Schema.fromKey("B"))`;
+    // Use columnType for read-only FK fields (can't insert/update join table rows directly).
+    // The struct uses semantic field names; Schema.encodeKeys renames them to the
+    // database A/B columns on the encoded side (Effect 4 replacement for the old
+    // Schema.propertySignature(...).pipe(Schema.fromKey(...)) pattern).
+    const columnAField = `  ${columnAFieldName}: columnType(${modelASchemaType}, Schema.Never, Schema.Never)`;
+    const columnBField = `  ${columnBFieldName}: columnType(${modelBSchemaType}, Schema.Never, Schema.Never)`;
     // Use PascalCase for exported name (consistent with regular models)
     const pascalName = toPascalCase(relationName);
     // Generate schema with semantic names mapped to A/B
@@ -35,7 +37,7 @@ export function generateJoinTableSchema(joinTable, _dmmf) {
 export const ${pascalName} = Schema.Struct({
 ${columnAField},
 ${columnBField},
-});
+}).pipe(Schema.encodeKeys({ ${columnAFieldName}: "A", ${columnBFieldName}: "B" }));
 export type ${pascalName} = typeof ${pascalName};`;
 }
 //# sourceMappingURL=join-table.js.map

package/dist/effect/join-table.js.map

@@ -1 +1 @@
-{"version":3,"file":"join-table.js","sourceRoot":"","sources":["../../src/effect/join-table.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE/D;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,uBAAuB,CAAC,SAAwB,EAAE,KAAoB;IACpF,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAE9D,4DAA4D;IAC5D,oEAAoE;IACpE,MAAM,gBAAgB,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;IACrD,MAAM,gBAAgB,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;IAErD,2FAA2F;IAC3F,MAAM,gBAAgB,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC;IACrD,MAAM,gBAAgB,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC;IAErD,wFAAwF;IACxF,oFAAoF;IACpF,MAAM,YAAY,GAAG,KAAK,gBAAgB,yCAAyC,gBAAgB,0DAA0D,CAAC;IAC9J,MAAM,YAAY,GAAG,KAAK,gBAAgB,yCAAyC,gBAAgB,0DAA0D,CAAC;IAE9J,oEAAoE;IACpE,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAE9C,oDAAoD;IACpD,OAAO,MAAM,SAAS;0BACE,MAAM,SAAS,MAAM;wBACvB,gBAAgB,KAAK,gBAAgB;eAC9C,UAAU;EACvB,YAAY;EACZ,YAAY;;cAEA,UAAU,aAAa,UAAU,GAAG,CAAC;AACnD,CAAC"}
+{"version":3,"file":"join-table.js","sourceRoot":"","sources":["../../src/effect/join-table.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE/D;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,uBAAuB,CAAC,SAAwB,EAAE,KAAoB;IACpF,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAE9D,4DAA4D;IAC5D,oEAAoE;IACpE,MAAM,gBAAgB,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;IACrD,MAAM,gBAAgB,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;IAErD,2FAA2F;IAC3F,MAAM,gBAAgB,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC;IACrD,MAAM,gBAAgB,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC;IAErD,yFAAyF;IACzF,8EAA8E;IAC9E,6EAA6E;IAC7E,oEAAoE;IACpE,MAAM,YAAY,GAAG,KAAK,gBAAgB,gBAAgB,gBAAgB,+BAA+B,CAAC;IAC1G,MAAM,YAAY,GAAG,KAAK,gBAAgB,gBAAgB,gBAAgB,+BAA+B,CAAC;IAE1G,oEAAoE;IACpE,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAE9C,oDAAoD;IACpD,OAAO,MAAM,SAAS;0BACE,MAAM,SAAS,MAAM;wBACvB,gBAAgB,KAAK,gBAAgB;eAC9C,UAAU;EACvB,YAAY;EACZ,YAAY;8BACgB,gBAAgB,UAAU,gBAAgB;cAC1D,UAAU,aAAa,UAAU,GAAG,CAAC;AACnD,CAAC"}

package/dist/effect/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/effect/type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAMrD;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,QAAQ,EACnB,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,UAmC5B;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,QAAQ,EACnB,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,UAgB5B"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/effect/type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AA4BrD;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,QAAQ,EACnB,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,UAoC5B;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,QAAQ,EACnB,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,UAgB5B"}

package/dist/effect/type.js

@@ -1,7 +1,28 @@
 import { isListField, isRequiredField, isUuidField } from '../prisma/type.js';
 import { extractEffectTypeOverride } from '../utils/annotations.js';
 import { toPascalCase } from '../utils/naming.js';
-import { PRISMA_TO_EFFECT_SCHEMA as PRISMA_SCALAR_MAP } from '../utils/type-mappings.js';
+/**
+ * Prisma scalar type mapping to Effect Schema types
+ * Uses const assertion to avoid type guards
+ *
+ * Note: DateTime uses Schema.Date so that:
+ * - Type = Date (runtime)
+ * - Encoded = Date (database)
+ * This allows Kysely to work with native Date objects directly.
+ * (In Effect 4, Schema.Date is the native-Date schema — no ISO string coercion;
+ * it replaces Effect 3's Schema.DateFromSelf.)
+ */
+const PRISMA_SCALAR_MAP = {
+    String: 'Schema.String',
+    Int: 'Schema.Number',
+    Float: 'Schema.Number',
+    BigInt: 'Schema.BigInt',
+    Decimal: 'Schema.String', // For precision
+    Boolean: 'Schema.Boolean',
+    DateTime: 'Schema.Date', // Native Date type for Kysely compatibility
+    Json: 'JsonValue', // Recursive JSON type — prevents null absorption in NullOr
+    Bytes: 'Schema.Uint8Array',
+};
 /**
  * Map Prisma field type to Effect Schema type
  * Priority order: annotation → FK branded → UUID → scalar → enum → unknown fallback
@@ -23,8 +44,9 @@ export function mapFieldToEffectType(field, dmmf, fkMap) {
         return `${toPascalCase(targetModel)}Id`;
     }
     // PRIORITY 3: Handle String type with UUID detection (non-FK UUIDs)
+    // Effect 4 removed Schema.UUID; UUID validation is now a string check.
     if (field.type === 'String' && isUuidField(field)) {
-        return 'Schema.UUID';
+        return 'Schema.String.check(Schema.isUUID())';
     }
     // PRIORITY 4: Handle scalar types with const assertion lookup
     const scalarType = PRISMA_SCALAR_MAP[field.type];

package/dist/effect/type.js.map

@@ -1 +1 @@
-{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/effect/type.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,uBAAuB,IAAI,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEzF;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAClC,KAAiB,EACjB,IAAmB,EACnB,KAA2B;IAE3B,+CAA+C;IAC/C,MAAM,YAAY,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACtD,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,8DAA8D;IAC9D,6EAA6E;IAC7E,IAAI,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC;QAC3C,OAAO,GAAG,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC;IAC1C,CAAC;IAED,oEAAoE;IACpE,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,8DAA8D;IAC9D,MAAM,UAAU,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAsC,CAAC,CAAC;IACnF,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,oCAAoC;IACpC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;IACxE,IAAI,OAAO,EAAE,CAAC;QACZ,mDAAmD;QACnD,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,kCAAkC;IAClC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,KAAiB,EACjB,IAAmB,EACnB,KAA2B;IAE3B,IAAI,QAAQ,GAAG,oBAAoB,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAExD,gBAAgB;IAChB,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,QAAQ,GAAG,gBAAgB,QAAQ,GAAG,CAAC;IACzC,CAAC;IAED,wEAAwE;IACxE,yFAAyF;IACzF,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,QAAQ,GAAG,iBAAiB,QAAQ,GAAG,CAAC;IAC1C,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/effect/type.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;;;;;GAUG;AACH,MAAM,iBAAiB,GAAG;IACxB,MAAM,EAAE,eAAe;IACvB,GAAG,EAAE,eAAe;IACpB,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,eAAe;IACvB,OAAO,EAAE,eAAe,EAAE,gBAAgB;IAC1C,OAAO,EAAE,gBAAgB;IACzB,QAAQ,EAAE,aAAa,EAAE,4CAA4C;IACrE,IAAI,EAAE,WAAW,EAAE,2DAA2D;IAC9E,KAAK,EAAE,mBAAmB;CAClB,CAAC;AAEX;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAClC,KAAiB,EACjB,IAAmB,EACnB,KAA2B;IAE3B,+CAA+C;IAC/C,MAAM,YAAY,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACtD,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,8DAA8D;IAC9D,6EAA6E;IAC7E,IAAI,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC;QAC3C,OAAO,GAAG,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC;IAC1C,CAAC;IAED,oEAAoE;IACpE,uEAAuE;IACvE,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,OAAO,sCAAsC,CAAC;IAChD,CAAC;IAED,8DAA8D;IAC9D,MAAM,UAAU,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAsC,CAAC,CAAC;IACnF,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,oCAAoC;IACpC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;IACxE,IAAI,OAAO,EAAE,CAAC;QACZ,mDAAmD;QACnD,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,kCAAkC;IAClC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,KAAiB,EACjB,IAAmB,EACnB,KAA2B;IAE3B,IAAI,QAAQ,GAAG,oBAAoB,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAExD,gBAAgB;IAChB,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,QAAQ,GAAG,gBAAgB,QAAQ,GAAG,CAAC;IACzC,CAAC;IAED,wEAAwE;IACxE,yFAAyF;IACzF,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,QAAQ,GAAG,iBAAiB,QAAQ,GAAG,CAAC;IAC1C,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}