prisma-effect-kysely 6.0.0-next.1 → 6.0.0-next.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +43 -0
- package/README.md +36 -8
- package/dist/generator/orchestrator.d.ts +7 -0
- package/dist/generator/orchestrator.d.ts.map +1 -1
- package/dist/generator/orchestrator.js +25 -0
- package/dist/generator/orchestrator.js.map +1 -1
- package/dist/kysely/helpers.d.ts +2 -9
- package/dist/kysely/helpers.d.ts.map +1 -1
- package/dist/kysely/helpers.js.map +1 -1
- package/dist/kysely/type.d.ts.map +1 -1
- package/dist/kysely/type.js +9 -1
- package/dist/kysely/type.js.map +1 -1
- package/dist/utils/annotations.d.ts +15 -4
- package/dist/utils/annotations.d.ts.map +1 -1
- package/dist/utils/annotations.js +125 -4
- package/dist/utils/annotations.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,48 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 6.0.0-next.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- ff58e31: Fix: implicit M:N join tables now expose their physical `A`/`B` columns in the
|
|
8
|
+
Kysely `DB` interface.
|
|
9
|
+
|
|
10
|
+
Kysely uses `DB`-interface field names as literal SQL column identifiers. The
|
|
11
|
+
join-table entry was emitted as `Schema.Schema.Type<typeof JoinTable>`, whose
|
|
12
|
+
keys are the **decoded** semantic names (`product_id`, `product_tag_id`). But an
|
|
13
|
+
implicit many-to-many table's physical Postgres columns are `A`/`B` (Prisma's
|
|
14
|
+
convention), so a query like
|
|
15
|
+
`db.selectFrom('_product_tags').where('_product_tags.product_id', ...)` emitted
|
|
16
|
+
`WHERE product_id` against a table that only has `A`/`B` → runtime SQL error.
|
|
17
|
+
|
|
18
|
+
The join-table `DB` entry is now `Schema.Codec.Encoded<typeof JoinTable>`, whose
|
|
19
|
+
keys are the **encoded** physical columns `A`/`B` (carrying the branded
|
|
20
|
+
`columnType` values, so joins remain type-safe against the parent table's branded
|
|
21
|
+
id). The semantic-name mapping still lives only in the schema's
|
|
22
|
+
`Schema.encodeKeys`, used when decoding a raw DB row. Regular (non-join) model
|
|
23
|
+
tables are unchanged (`Schema.Schema.Type<typeof Model>`).
|
|
24
|
+
|
|
25
|
+
## 6.0.0-next.2
|
|
26
|
+
|
|
27
|
+
### Patch Changes
|
|
28
|
+
|
|
29
|
+
- ded938b: Warn on Effect 3 syntax in `@customType` annotations.
|
|
30
|
+
|
|
31
|
+
`@customType(...)` expressions are emitted verbatim, so an Effect 3 expression
|
|
32
|
+
(e.g. `Schema.Number.pipe(Schema.int(), Schema.between(1, 5))` or the variadic
|
|
33
|
+
`Schema.Union(A, B)`) compiles against Effect 3 but breaks against Effect 4. The
|
|
34
|
+
generator now scans `@customType` strings at `prisma generate` time and prints a
|
|
35
|
+
warning that names the field and the v4 replacement — for filters
|
|
36
|
+
(`Schema.int()` → `Schema.check(Schema.isInt())`, `Schema.between(a, b)` →
|
|
37
|
+
`Schema.check(Schema.isBetween({ minimum, maximum }))`, etc.), variadic
|
|
38
|
+
combinators (`Schema.Union(a, b)` → `Schema.Union([a, b])`), and removed schemas
|
|
39
|
+
(`Schema.UUID`, `Schema.DateFromSelf`). It only warns; it never rewrites the
|
|
40
|
+
expression (regex-transforming arbitrary user TypeScript is unsafe).
|
|
41
|
+
|
|
42
|
+
Also bumps the dev/test Effect pin to `4.0.0-beta.70` and documents that
|
|
43
|
+
consumers must pin the exact `6.0.0-next.x` version — a `"*"` range resolves to
|
|
44
|
+
the stable `5.x` line because npm/pnpm exclude prereleases from version ranges.
|
|
45
|
+
|
|
3
46
|
## 6.0.0-next.1
|
|
4
47
|
|
|
5
48
|
### Patch Changes
|
package/README.md
CHANGED
|
@@ -22,11 +22,18 @@ bun add prisma-effect-kysely@next effect@beta
|
|
|
22
22
|
|
|
23
23
|
> **Effect 4 support is a pre-release.** It requires `effect@^4.0.0-beta` and is
|
|
24
24
|
> published under the `next` dist-tag, not `latest`. It is **tested against
|
|
25
|
-
> `effect@4.0.0-beta.
|
|
25
|
+
> `effect@4.0.0-beta.70`**; later betas may introduce breaking Schema changes. A
|
|
26
26
|
> generator-output compile check (`bun run test:emit`) guards the emitted code
|
|
27
27
|
> against the installed Effect, but pin `effect` if you need stability during the
|
|
28
28
|
> beta. The `next` line will be promoted to `latest` when Effect 4 goes stable.
|
|
29
29
|
>
|
|
30
|
+
> **Pin the exact version — do not use `"*"` or `"latest"`.** A `"prisma-effect-kysely": "*"`
|
|
31
|
+
> (or any range) dependency resolves to the **stable** `5.x` line, NOT the
|
|
32
|
+
> pre-release, because npm/pnpm semver excludes prereleases from ranges. In a
|
|
33
|
+
> workspace, depend on `"6.0.0-next.x"` exactly (or add a `pnpm.overrides` /
|
|
34
|
+
> `resolutions` entry). Symptom of getting this wrong: the v3 `5.x` types resolve
|
|
35
|
+
> and consumers see cascading `Schema.Top` / `unknown` type errors.
|
|
36
|
+
>
|
|
30
37
|
> Effect 4 and Effect 3 are not interchangeable: the generated output uses
|
|
31
38
|
> Effect-4-only Schema APIs (`Schema.Date`, `Schema.String.check(Schema.isUUID())`,
|
|
32
39
|
> `Schema.encodeKeys`, `Schema.Enum`, …). Stay on the `latest` line if you are on
|
|
@@ -135,6 +142,22 @@ model User {
|
|
|
135
142
|
|
|
136
143
|
Supported on all Prisma scalar types.
|
|
137
144
|
|
|
145
|
+
`@customType(...)` expressions are emitted **verbatim** — they must be valid
|
|
146
|
+
Effect 4 syntax. The generator does not rewrite them, but it **warns** at
|
|
147
|
+
`prisma generate` time when it detects Effect 3 syntax, pointing at the v4 form.
|
|
148
|
+
Effect 4 moved all filters under `.check(Schema.is*)` and made the variadic
|
|
149
|
+
combinators take an array:
|
|
150
|
+
|
|
151
|
+
| Effect 3 (`@customType`) | Effect 4 |
|
|
152
|
+
| ------------------------------------- | ---------------------------------------------------------------------- |
|
|
153
|
+
| `Schema.Number.pipe(Schema.int())` | `Schema.Number.pipe(Schema.check(Schema.isInt()))` |
|
|
154
|
+
| `Schema.positive()` | `Schema.check(Schema.isGreaterThan(0))` |
|
|
155
|
+
| `Schema.between(1, 5)` | `Schema.check(Schema.isBetween({ minimum: 1, maximum: 5 }))` |
|
|
156
|
+
| `Schema.minLength(3)` | `Schema.check(Schema.isMinLength(3))` |
|
|
157
|
+
| `Schema.Union(A, B)` | `Schema.Union([A, B])` |
|
|
158
|
+
| `Schema.Literal('a', 'b')` | `Schema.Literals(['a', 'b'])` (single `Schema.Literal('x')` unchanged) |
|
|
159
|
+
| `Schema.UUID` / `Schema.DateFromSelf` | `Schema.String.check(Schema.isUUID())` / `Schema.Date` |
|
|
160
|
+
|
|
138
161
|
## Implicit M2M Join Tables
|
|
139
162
|
|
|
140
163
|
Prisma columns `A`/`B` map to semantic snake_case fields via `Schema.encodeKeys`:
|
|
@@ -146,15 +169,20 @@ export const ProductToProductTag = Schema.Struct({
|
|
|
146
169
|
}).pipe(Schema.encodeKeys({ product_id: 'A', product_tag_id: 'B' }));
|
|
147
170
|
```
|
|
148
171
|
|
|
172
|
+
In the Kysely `DB` interface the join table is typed by its **encoded** shape
|
|
173
|
+
(`Schema.Codec.Encoded<typeof ProductToProductTag>` → `{ A, B }`), so you query
|
|
174
|
+
the physical columns directly: `db.selectFrom('_product_tags').where('_product_tags.A', '=', productId)`.
|
|
175
|
+
`Schema.decode` of a raw row maps `A`/`B` back to `product_id`/`product_tag_id`.
|
|
176
|
+
|
|
149
177
|
## Package Exports
|
|
150
178
|
|
|
151
|
-
| Entry | Contents
|
|
152
|
-
| -------------------------------- |
|
|
153
|
-
| `prisma-effect-kysely` | Type utilities + runtime helpers (default import)
|
|
154
|
-
| `prisma-effect-kysely/generator` | Prisma generator binary entry
|
|
155
|
-
| `prisma-effect-kysely/kysely` | `
|
|
156
|
-
| `prisma-effect-kysely/error` | `NotFoundError`, `QueryError`, `DatabaseError`
|
|
157
|
-
| `prisma-effect-kysely/runtime` | All runtime utilities
|
|
179
|
+
| Entry | Contents |
|
|
180
|
+
| -------------------------------- | -------------------------------------------------- |
|
|
181
|
+
| `prisma-effect-kysely` | Type utilities + runtime helpers (default import) |
|
|
182
|
+
| `prisma-effect-kysely/generator` | Prisma generator binary entry |
|
|
183
|
+
| `prisma-effect-kysely/kysely` | `columnType`, `generated`, `JsonValue`, type utils |
|
|
184
|
+
| `prisma-effect-kysely/error` | `NotFoundError`, `QueryError`, `DatabaseError` |
|
|
185
|
+
| `prisma-effect-kysely/runtime` | All runtime utilities |
|
|
158
186
|
|
|
159
187
|
## Development
|
|
160
188
|
|
|
@@ -54,6 +54,13 @@ export declare class GeneratorOrchestrator {
|
|
|
54
54
|
* Log generation start with stats
|
|
55
55
|
*/
|
|
56
56
|
private logStart;
|
|
57
|
+
/**
|
|
58
|
+
* Scan every field's `@customType(...)` annotation for Effect 3 syntax and warn
|
|
59
|
+
* (to stderr, which Prisma surfaces to the user). `@customType` strings are
|
|
60
|
+
* emitted verbatim, so a v3 expression silently breaks once compiled against
|
|
61
|
+
* Effect 4. We never rewrite — only point at the v4 replacement.
|
|
62
|
+
*/
|
|
63
|
+
private warnLegacyAnnotations;
|
|
57
64
|
/**
|
|
58
65
|
* Log generation completion
|
|
59
66
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/generator/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/generator/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAejE;;;;;;;GAOG;AACH,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkB;gBAEhC,OAAO,EAAE,gBAAgB;IASrC;;;;;;;;OAQG;IACG,QAAQ,CAAC,OAAO,EAAE,gBAAgB;IAcxC;;;OAGG;YACW,oBAAoB;IAQlC;;;OAGG;YACW,mBAAmB;IAiBjC;;OAEG;YACW,iBAAiB;IAmE/B;;OAEG;YACW,aAAa;IAM3B;;OAEG;YACW,aAAa;IAiD3B;;OAEG;YACW,aAAa;IAK3B;;OAEG;IACH,OAAO,CAAC,QAAQ;IAWhB;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAoB7B;;OAEG;IACH,OAAO,CAAC,WAAW;CASpB"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { EffectGenerator } from '../effect/generator.js';
|
|
2
2
|
import { KyselyGenerator } from '../kysely/generator.js';
|
|
3
3
|
import { PrismaGenerator } from '../prisma/generator.js';
|
|
4
|
+
import { detectLegacyEffectV3Syntax, extractEffectTypeOverride } from '../utils/annotations.js';
|
|
4
5
|
import { FileManager } from '../utils/file-manager.js';
|
|
5
6
|
import { isMultiDomainEnabled, isScaffoldingEnabled, parseGeneratorConfig, } from './config.js';
|
|
6
7
|
import { logScaffoldResults, scaffoldContractLibraries } from './contract-scaffolder.js';
|
|
@@ -37,6 +38,7 @@ export class GeneratorOrchestrator {
|
|
|
37
38
|
*/
|
|
38
39
|
async generate(options) {
|
|
39
40
|
this.logStart(options);
|
|
41
|
+
this.warnLegacyAnnotations(options);
|
|
40
42
|
// Check if multi-domain mode is enabled
|
|
41
43
|
if (isMultiDomainEnabled(this.config)) {
|
|
42
44
|
await this.generateMultiDomain(options);
|
|
@@ -198,6 +200,29 @@ export class GeneratorOrchestrator {
|
|
|
198
200
|
}
|
|
199
201
|
}
|
|
200
202
|
}
|
|
203
|
+
/**
|
|
204
|
+
* Scan every field's `@customType(...)` annotation for Effect 3 syntax and warn
|
|
205
|
+
* (to stderr, which Prisma surfaces to the user). `@customType` strings are
|
|
206
|
+
* emitted verbatim, so a v3 expression silently breaks once compiled against
|
|
207
|
+
* Effect 4. We never rewrite — only point at the v4 replacement.
|
|
208
|
+
*/
|
|
209
|
+
warnLegacyAnnotations(options) {
|
|
210
|
+
const warnings = [];
|
|
211
|
+
for (const model of options.dmmf.datamodel.models) {
|
|
212
|
+
for (const field of model.fields) {
|
|
213
|
+
const override = extractEffectTypeOverride(field);
|
|
214
|
+
if (!override)
|
|
215
|
+
continue;
|
|
216
|
+
for (const hint of detectLegacyEffectV3Syntax(override)) {
|
|
217
|
+
warnings.push(` ${model.name}.${field.name}: ${hint}`);
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
if (warnings.length > 0) {
|
|
222
|
+
console.warn(`[prisma-effect-kysely] @customType annotations use Effect 3 syntax that does not ` +
|
|
223
|
+
`compile against Effect 4. Update them in your Prisma schema:\n${warnings.join('\n')}`);
|
|
224
|
+
}
|
|
225
|
+
}
|
|
201
226
|
/**
|
|
202
227
|
* Log generation completion
|
|
203
228
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/generator/orchestrator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAEL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAmB,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEtE;;;;;;;GAOG;AACH,MAAM,OAAO,qBAAqB;IACf,MAAM,CAAkB;IACxB,WAAW,CAAc;IACzB,SAAS,CAAkB;IAC3B,SAAS,CAAkB;IAC3B,SAAS,CAAkB;IAE5C,YAAY,OAAyB;QACnC,IAAI,CAAC,MAAM,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAE5C,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,CAAC,SAAS,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,SAAS,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,SAAS,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,QAAQ,CAAC,OAAyB;QACtC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/generator/orchestrator.ts"],"names":[],"mappings":"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"}
|
package/dist/kysely/helpers.d.ts
CHANGED
|
@@ -219,12 +219,6 @@ type ExtractInsertType<T> = [T] extends [{
|
|
|
219
219
|
* A field is optional for insert if its InsertType can be null or undefined.
|
|
220
220
|
*/
|
|
221
221
|
type IsOptionalInsert<T> = undefined extends ExtractInsertType<T> ? true : null extends ExtractInsertType<T> ? true : false;
|
|
222
|
-
/**
|
|
223
|
-
* Extract the base type without null/undefined for optional fields.
|
|
224
|
-
* Keeps the type as-is (including null) for the property type,
|
|
225
|
-
* since the optionality is expressed via `?` not the type itself.
|
|
226
|
-
*/
|
|
227
|
-
type ExtractInsertBaseType<T> = ExtractInsertType<T>;
|
|
228
222
|
/**
|
|
229
223
|
* Extract the update type from a field using the __update__ phantom property:
|
|
230
224
|
* - ColumnType<S, I, U> -> U (via __update__)
|
|
@@ -248,7 +242,7 @@ type ExtractUpdateType<T> = [T] extends [{
|
|
|
248
242
|
type CustomInsertable<T> = {
|
|
249
243
|
-readonly [K in keyof T as ExtractInsertType<T[K]> extends never ? never : IsOptionalInsert<T[K]> extends true ? never : K]: ExtractInsertType<T[K]>;
|
|
250
244
|
} & {
|
|
251
|
-
-readonly [K in keyof T as ExtractInsertType<T[K]> extends never ? never : IsOptionalInsert<T[K]> extends true ? K : never]?:
|
|
245
|
+
-readonly [K in keyof T as ExtractInsertType<T[K]> extends never ? never : IsOptionalInsert<T[K]> extends true ? K : never]?: ExtractInsertType<T[K]>;
|
|
252
246
|
};
|
|
253
247
|
/**
|
|
254
248
|
* Custom Updateable type that properly omits fields with `never` update types.
|
|
@@ -256,7 +250,6 @@ type CustomInsertable<T> = {
|
|
|
256
250
|
type CustomUpdateable<T> = {
|
|
257
251
|
-readonly [K in keyof T as ExtractUpdateType<T[K]> extends never ? never : K]?: ExtractUpdateType<T[K]>;
|
|
258
252
|
};
|
|
259
|
-
type MutableInsert<Type> = CustomInsertable<Type>;
|
|
260
253
|
/**
|
|
261
254
|
* Strip Generated<T> wrapper, returning the underlying type T.
|
|
262
255
|
* For non-Generated types, returns as-is.
|
|
@@ -292,7 +285,7 @@ export declare function Selectable<Type, Encoded>(schema: Schema.Codec<Type, Enc
|
|
|
292
285
|
* Create Insertable schema from base schema
|
|
293
286
|
* Generated fields (@default) are made optional, not excluded
|
|
294
287
|
*/
|
|
295
|
-
export declare function Insertable<Type, Encoded>(schema: Schema.Codec<Type, Encoded>): Schema.Codec<
|
|
288
|
+
export declare function Insertable<Type, Encoded>(schema: Schema.Codec<Type, Encoded>): Schema.Codec<CustomInsertable<Type>, CustomInsertable<Encoded>, never, never>;
|
|
296
289
|
/**
|
|
297
290
|
* Create Updateable schema from base schema
|
|
298
291
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/kysely/helpers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/kysely/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/kysely/helpers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/kysely/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/kysely/type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,WAEhD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,WAE/C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,MAAM,UAc1F;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAK5F;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,MAAM,UAEhG;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,UAIzD;AAED;;;GAGG;AACH,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/kysely/type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,WAEhD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,WAE/C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,MAAM,UAc1F;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAK5F;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,MAAM,UAEhG;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,UAIzD;AAED;;;GAGG;AACH,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,aAAa,UAYzE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,IAAI,CAAC,KAAK,EAAE,EAC7B,UAAU,GAAE,aAAa,EAAO,UAajC"}
|
package/dist/kysely/type.js
CHANGED
|
@@ -83,7 +83,15 @@ export function generateDBInterfaceEntry(model) {
|
|
|
83
83
|
export function generateJoinTableDBInterfaceEntry(joinTable) {
|
|
84
84
|
const { tableName, relationName } = joinTable;
|
|
85
85
|
const schemaName = toPascalCase(relationName);
|
|
86
|
-
|
|
86
|
+
// Use the ENCODED type (the `Schema.encodeKeys` mapping), NOT the decoded
|
|
87
|
+
// `Schema.Schema.Type`. Kysely uses the DB-interface field names as literal SQL
|
|
88
|
+
// column identifiers, and an implicit M:N join table's physical columns are
|
|
89
|
+
// `A`/`B` (Prisma's convention) — not the semantic `*_id` names. The decoded
|
|
90
|
+
// type has the semantic names (for `Schema.decode` output); the encoded type
|
|
91
|
+
// keeps `A`/`B` with the branded `columnType` values, so queries like
|
|
92
|
+
// `db.selectFrom('_x').where('_x.A', ...)` emit valid SQL while joins stay
|
|
93
|
+
// type-safe against the parent table's branded id.
|
|
94
|
+
return ` ${tableName}: Schema.Codec.Encoded<typeof ${schemaName}>;`;
|
|
87
95
|
}
|
|
88
96
|
/**
|
|
89
97
|
* Generate complete DB interface including join tables
|
package/dist/kysely/type.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/kysely/type.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,KAAiB;IAC/C,OAAO,eAAe,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;AACpD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,KAAiB;IAC9C,OAAO,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AACrD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,SAAiB,EAAE,KAAiB,EAAE,SAAkB;IACzF,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,yEAAyE;QACzE,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QACtE,OAAO,cAAc,MAAM,+BAA+B,CAAC;IAC7D,CAAC;SAAM,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,aAAa,SAAS,GAAG,CAAC;IACnC,CAAC;IACD,kFAAkF;IAClF,4EAA4E;IAC5E,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,OAAO,cAAc,SAAS,KAAK,SAAS,KAAK,SAAS,GAAG,CAAC;IAChE,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAAC,KAAiB;IAC/C,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;QAChD,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;IAC/D,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAAC,aAAqB,EAAE,KAAiB,EAAE,SAAkB;IAC/F,OAAO,kBAAkB,CAAC,aAAa,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;AAC7D,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,wBAAwB,CAAC,KAAiB;IACxD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC;IAC7C,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3C,OAAO,KAAK,SAAS,+BAA+B,SAAS,IAAI,CAAC;AACpE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iCAAiC,CAAC,SAAwB;IACxE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC;IAC9C,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAC9C,OAAO,KAAK,SAAS
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/kysely/type.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,13 +6,13 @@ import type { DMMF } from '@prisma/generator-helper';
|
|
|
6
6
|
*
|
|
7
7
|
* WORKS FOR: Prisma scalar types (String, Int, Boolean, DateTime, etc.)
|
|
8
8
|
*
|
|
9
|
-
* USE CASES:
|
|
10
|
-
* //
|
|
11
|
-
* /// @customType(Schema.String.
|
|
9
|
+
* USE CASES (Effect 4 syntax — emitted verbatim, so must be v4-valid):
|
|
10
|
+
* // Length constraint for String field
|
|
11
|
+
* /// @customType(Schema.String.check(Schema.isMinLength(3)))
|
|
12
12
|
* email String
|
|
13
13
|
*
|
|
14
14
|
* // Positive number constraint for Int field
|
|
15
|
-
* /// @customType(Schema.Number.
|
|
15
|
+
* /// @customType(Schema.Number.check(Schema.isGreaterThan(0)))
|
|
16
16
|
* age Int
|
|
17
17
|
*
|
|
18
18
|
* // Custom branded type
|
|
@@ -23,6 +23,17 @@ import type { DMMF } from '@prisma/generator-helper';
|
|
|
23
23
|
* @returns Extracted type string or null if no annotation found
|
|
24
24
|
*/
|
|
25
25
|
export declare function extractEffectTypeOverride(field: DMMF.Field): string | null;
|
|
26
|
+
/**
|
|
27
|
+
* Detect Effect 3 syntax in a `@customType` expression and return human-readable
|
|
28
|
+
* upgrade hints. Returns an empty array when the expression looks v4-clean.
|
|
29
|
+
*
|
|
30
|
+
* Detection is heuristic (string matching), so it is WARN-ONLY — callers should
|
|
31
|
+
* surface these as build warnings, never block generation or rewrite the string.
|
|
32
|
+
*
|
|
33
|
+
* @param typeStr - The raw `@customType(...)` expression
|
|
34
|
+
* @returns v4 upgrade hints for each matched legacy pattern
|
|
35
|
+
*/
|
|
36
|
+
export declare function detectLegacyEffectV3Syntax(typeStr: string): string[];
|
|
26
37
|
/**
|
|
27
38
|
* Check if field has any custom type annotations
|
|
28
39
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../src/utils/annotations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAErD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,iBAiC1D;
|
|
1
|
+
{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../src/utils/annotations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAErD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,iBAiC1D;AA8ID;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAEpE;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,SAAS,IAAI,CAAC,KAAK,EAAE,WAKrE"}
|
|
@@ -5,13 +5,13 @@
|
|
|
5
5
|
*
|
|
6
6
|
* WORKS FOR: Prisma scalar types (String, Int, Boolean, DateTime, etc.)
|
|
7
7
|
*
|
|
8
|
-
* USE CASES:
|
|
9
|
-
* //
|
|
10
|
-
* /// @customType(Schema.String.
|
|
8
|
+
* USE CASES (Effect 4 syntax — emitted verbatim, so must be v4-valid):
|
|
9
|
+
* // Length constraint for String field
|
|
10
|
+
* /// @customType(Schema.String.check(Schema.isMinLength(3)))
|
|
11
11
|
* email String
|
|
12
12
|
*
|
|
13
13
|
* // Positive number constraint for Int field
|
|
14
|
-
* /// @customType(Schema.Number.
|
|
14
|
+
* /// @customType(Schema.Number.check(Schema.isGreaterThan(0)))
|
|
15
15
|
* age Int
|
|
16
16
|
*
|
|
17
17
|
* // Custom branded type
|
|
@@ -65,6 +65,127 @@ export function extractEffectTypeOverride(field) {
|
|
|
65
65
|
function isCustomType(typeStr) {
|
|
66
66
|
return /^[A-Z][A-Za-z0-9]*$/.test(typeStr);
|
|
67
67
|
}
|
|
68
|
+
const LEGACY_V3_PATTERNS = [
|
|
69
|
+
// Filters: Schema.<name>(...) used as a pipeable, now `.check(Schema.is<Name>(...))`.
|
|
70
|
+
{ test: /\bSchema\.int\s*\(/, hint: 'Schema.int() → Schema.check(Schema.isInt())' },
|
|
71
|
+
{
|
|
72
|
+
test: /\bSchema\.between\s*\(/,
|
|
73
|
+
hint: 'Schema.between(min, max) → Schema.check(Schema.isBetween({ minimum, maximum })) (v4 takes an object, not positional args)',
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
test: /\bSchema\.minLength\s*\(/,
|
|
77
|
+
hint: 'Schema.minLength(n) → Schema.check(Schema.isMinLength(n))',
|
|
78
|
+
},
|
|
79
|
+
{
|
|
80
|
+
test: /\bSchema\.maxLength\s*\(/,
|
|
81
|
+
hint: 'Schema.maxLength(n) → Schema.check(Schema.isMaxLength(n))',
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
test: /\bSchema\.length\s*\(/,
|
|
85
|
+
hint: 'Schema.length(n) → Schema.check(Schema.isLengthBetween(n, n))',
|
|
86
|
+
},
|
|
87
|
+
{
|
|
88
|
+
test: /\bSchema\.greaterThanOrEqualTo\s*\(/,
|
|
89
|
+
hint: 'Schema.greaterThanOrEqualTo(n) → Schema.check(Schema.isGreaterThanOrEqualTo(n))',
|
|
90
|
+
},
|
|
91
|
+
{
|
|
92
|
+
test: /\bSchema\.greaterThan\s*\(/,
|
|
93
|
+
hint: 'Schema.greaterThan(n) → Schema.check(Schema.isGreaterThan(n))',
|
|
94
|
+
},
|
|
95
|
+
{
|
|
96
|
+
test: /\bSchema\.lessThanOrEqualTo\s*\(/,
|
|
97
|
+
hint: 'Schema.lessThanOrEqualTo(n) → Schema.check(Schema.isLessThanOrEqualTo(n))',
|
|
98
|
+
},
|
|
99
|
+
{
|
|
100
|
+
test: /\bSchema\.lessThan\s*\(/,
|
|
101
|
+
hint: 'Schema.lessThan(n) → Schema.check(Schema.isLessThan(n))',
|
|
102
|
+
},
|
|
103
|
+
{
|
|
104
|
+
test: /\bSchema\.multipleOf\s*\(/,
|
|
105
|
+
hint: 'Schema.multipleOf(n) → Schema.check(Schema.isMultipleOf(n))',
|
|
106
|
+
},
|
|
107
|
+
{ test: /\bSchema\.finite\s*\(/, hint: 'Schema.finite() → Schema.check(Schema.isFinite())' },
|
|
108
|
+
{
|
|
109
|
+
test: /\bSchema\.positive\s*\(/,
|
|
110
|
+
hint: 'Schema.positive() → Schema.check(Schema.isGreaterThan(0))',
|
|
111
|
+
},
|
|
112
|
+
{
|
|
113
|
+
test: /\bSchema\.nonNegative\s*\(/,
|
|
114
|
+
hint: 'Schema.nonNegative() → Schema.check(Schema.isGreaterThanOrEqualTo(0))',
|
|
115
|
+
},
|
|
116
|
+
{
|
|
117
|
+
test: /\bSchema\.negative\s*\(/,
|
|
118
|
+
hint: 'Schema.negative() → Schema.check(Schema.isLessThan(0))',
|
|
119
|
+
},
|
|
120
|
+
{
|
|
121
|
+
test: /\bSchema\.nonPositive\s*\(/,
|
|
122
|
+
hint: 'Schema.nonPositive() → Schema.check(Schema.isLessThanOrEqualTo(0))',
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
test: /\bSchema\.nonEmpty\s*\(/,
|
|
126
|
+
hint: 'Schema.nonEmpty() → Schema.check(Schema.isNonEmpty())',
|
|
127
|
+
},
|
|
128
|
+
{
|
|
129
|
+
test: /\bSchema\.pattern\s*\(/,
|
|
130
|
+
hint: 'Schema.pattern(re) → Schema.check(Schema.isPattern(re))',
|
|
131
|
+
},
|
|
132
|
+
{
|
|
133
|
+
test: /\bSchema\.startsWith\s*\(/,
|
|
134
|
+
hint: 'Schema.startsWith(s) → Schema.check(Schema.isStartsWith(s))',
|
|
135
|
+
},
|
|
136
|
+
{
|
|
137
|
+
test: /\bSchema\.endsWith\s*\(/,
|
|
138
|
+
hint: 'Schema.endsWith(s) → Schema.check(Schema.isEndsWith(s))',
|
|
139
|
+
},
|
|
140
|
+
{
|
|
141
|
+
test: /\bSchema\.lowercased\s*\(/,
|
|
142
|
+
hint: 'Schema.lowercased() → Schema.check(Schema.isLowercased())',
|
|
143
|
+
},
|
|
144
|
+
{
|
|
145
|
+
test: /\bSchema\.uppercased\s*\(/,
|
|
146
|
+
hint: 'Schema.uppercased() → Schema.check(Schema.isUppercased())',
|
|
147
|
+
},
|
|
148
|
+
{ test: /\bSchema\.trimmed\s*\(/, hint: 'Schema.trimmed() → Schema.check(Schema.isTrimmed())' },
|
|
149
|
+
// Removed / renamed schemas.
|
|
150
|
+
{
|
|
151
|
+
test: /\bSchema\.DateFromSelf\b/,
|
|
152
|
+
hint: 'Schema.DateFromSelf → Schema.Date (v4 Schema.Date is the native-Date schema)',
|
|
153
|
+
},
|
|
154
|
+
{ test: /\bSchema\.UUID\b/, hint: 'Schema.UUID → Schema.String.check(Schema.isUUID())' },
|
|
155
|
+
{
|
|
156
|
+
test: /\bSchema\.optionalWith\s*\(/,
|
|
157
|
+
hint: 'Schema.optionalWith({ exact: true }) → Schema.optionalKey',
|
|
158
|
+
},
|
|
159
|
+
// Variadic combinators that now take an array (non-array first arg = v3 form).
|
|
160
|
+
// `Schema.Union(A, B)` → `Schema.Union([A, B])`; single-member calls are fine.
|
|
161
|
+
{
|
|
162
|
+
test: /\bSchema\.Union\s*\(\s*[^[)]/,
|
|
163
|
+
hint: 'Schema.Union(a, b, …) is variadic in v3 → Schema.Union([a, b, …]) (array) in v4',
|
|
164
|
+
},
|
|
165
|
+
{
|
|
166
|
+
test: /\bSchema\.Tuple\s*\(\s*[^[)]/,
|
|
167
|
+
hint: 'Schema.Tuple(a, b, …) is variadic in v3 → Schema.Tuple([a, b, …]) (array) in v4',
|
|
168
|
+
},
|
|
169
|
+
// Multi-arg Literal → Literals([...]). Single Schema.Literal('x') is unchanged,
|
|
170
|
+
// so only flag when a comma appears before the closing paren.
|
|
171
|
+
{
|
|
172
|
+
test: /\bSchema\.Literal\s*\([^)]*,/,
|
|
173
|
+
hint: "Schema.Literal(a, b, …) → Schema.Literals([a, b, …]) (single Schema.Literal('x') is unchanged)",
|
|
174
|
+
},
|
|
175
|
+
];
|
|
176
|
+
/**
|
|
177
|
+
* Detect Effect 3 syntax in a `@customType` expression and return human-readable
|
|
178
|
+
* upgrade hints. Returns an empty array when the expression looks v4-clean.
|
|
179
|
+
*
|
|
180
|
+
* Detection is heuristic (string matching), so it is WARN-ONLY — callers should
|
|
181
|
+
* surface these as build warnings, never block generation or rewrite the string.
|
|
182
|
+
*
|
|
183
|
+
* @param typeStr - The raw `@customType(...)` expression
|
|
184
|
+
* @returns v4 upgrade hints for each matched legacy pattern
|
|
185
|
+
*/
|
|
186
|
+
export function detectLegacyEffectV3Syntax(typeStr) {
|
|
187
|
+
return LEGACY_V3_PATTERNS.filter((p) => p.test.test(typeStr)).map((p) => p.hint);
|
|
188
|
+
}
|
|
68
189
|
/**
|
|
69
190
|
* Check if field has any custom type annotations
|
|
70
191
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../src/utils/annotations.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,yBAAyB,CAAC,KAAiB;IACzD,IAAI,CAAC,KAAK,CAAC,aAAa;QAAE,OAAO,IAAI,CAAC;IAEtC,6DAA6D;IAC7D,MAAM,eAAe,GAAG,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtE,IAAI,CAAC,eAAe;QAAE,OAAO,IAAI,CAAC;IAElC,wCAAwC;IACxC,MAAM,QAAQ,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC;IACrF,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,MAAM,GAAG,QAAQ,CAAC;IAEtB,KAAK,IAAI,CAAC,GAAG,QAAQ,EAAE,CAAC,GAAG,KAAK,CAAC,aAAa,CAAC,MAAM,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7E,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,GAAG;YAAE,UAAU,EAAE,CAAC;QACjD,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,GAAG;YAAE,UAAU,EAAE,CAAC;QACjD,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,GAAG,CAAC,CAAC;YACX,MAAM;QACR,CAAC;IACH,CAAC;IAED,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IAEvE,4DAA4D;IAC5D,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QAC9D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,YAAY,CAAC,OAAe;IACnC,OAAO,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CAAC,MAA6B;IACpE,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3B,MAAM,QAAQ,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;QAClD,OAAO,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../src/utils/annotations.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prisma-effect-kysely",
|
|
3
|
-
"version": "6.0.0-next.
|
|
3
|
+
"version": "6.0.0-next.3",
|
|
4
4
|
"description": "Prisma generator that creates Effect Schema types from Prisma schema compatible with Kysely",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Samuel Ho",
|
|
@@ -110,7 +110,7 @@
|
|
|
110
110
|
"@typescript-eslint/parser": "^8.59.1",
|
|
111
111
|
"@vitest/coverage-v8": "^4.1.5",
|
|
112
112
|
"@vitest/eslint-plugin": "^1.6.16",
|
|
113
|
-
"effect": "4.0.0-beta.
|
|
113
|
+
"effect": "4.0.0-beta.70",
|
|
114
114
|
"eslint": "^10.0.0",
|
|
115
115
|
"eslint-import-resolver-typescript": "^4.4.4",
|
|
116
116
|
"eslint-plugin-import": "^2.32.0",
|