prisma-effect-kysely 6.0.0-next.0 → 6.0.0-next.1
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 +21 -0
- package/README.md +2 -2
- package/dist/effect/join-table.d.ts +4 -2
- package/dist/effect/join-table.d.ts.map +1 -1
- package/dist/effect/join-table.js +8 -5
- package/dist/effect/join-table.js.map +1 -1
- package/dist/kysely/helpers.d.ts.map +1 -1
- package/dist/kysely/helpers.js +22 -20
- package/dist/kysely/helpers.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,26 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 6.0.0-next.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 5722a22: Fix Insertable/Updateable semantics surfaced by validation of the Effect 4 beta line:
|
|
8
|
+
- **`Insertable` now accepts an explicit `null` for nullable columns.** A
|
|
9
|
+
`Schema.NullOr(T)` field is optional on insert and retains `null` in its type,
|
|
10
|
+
so `{ col: null }` (set the column to NULL) decodes successfully — matching SQL
|
|
11
|
+
and Kysely's `Insertable`, which permit omit / value / explicit null. Previously
|
|
12
|
+
`null` was stripped and an explicit `null` was rejected at decode.
|
|
13
|
+
- **Implicit many-to-many join-table FK columns are now insertable.** They emit
|
|
14
|
+
`columnType(Id, Id, Never)` instead of `columnType(Id, Never, Never)`: the
|
|
15
|
+
foreign keys are provided on INSERT (you supply both keys when linking a row)
|
|
16
|
+
and read-only on UPDATE (a composite-PK join row is inserted/deleted, not
|
|
17
|
+
updated). Previously `Insertable<JoinTable>` resolved to an empty `{}`, making
|
|
18
|
+
join rows impossible to insert through the generated types.
|
|
19
|
+
- **Internal robustness:** Generated-field detection is gated on the `GeneratedId`
|
|
20
|
+
annotation rather than a bare `.from` property, so a `Schema.encodeKeys(...)`
|
|
21
|
+
transform nested as a struct field (which also exposes `.from`) is no longer
|
|
22
|
+
misclassified as a generated field.
|
|
23
|
+
|
|
3
24
|
## 6.0.0-next.0
|
|
4
25
|
|
|
5
26
|
### Major Changes
|
package/README.md
CHANGED
|
@@ -141,8 +141,8 @@ Prisma columns `A`/`B` map to semantic snake_case fields via `Schema.encodeKeys`
|
|
|
141
141
|
|
|
142
142
|
```typescript
|
|
143
143
|
export const ProductToProductTag = Schema.Struct({
|
|
144
|
-
product_id: columnType(ProductId,
|
|
145
|
-
product_tag_id: columnType(ProductTagId,
|
|
144
|
+
product_id: columnType(ProductId, ProductId, Schema.Never),
|
|
145
|
+
product_tag_id: columnType(ProductTagId, ProductTagId, Schema.Never),
|
|
146
146
|
}).pipe(Schema.encodeKeys({ product_id: 'A', product_tag_id: 'B' }));
|
|
147
147
|
```
|
|
148
148
|
|
|
@@ -6,13 +6,15 @@ import type { JoinTableInfo } from '../prisma/relation.js';
|
|
|
6
6
|
* Structure:
|
|
7
7
|
* - Direct export with semantic snake_case field names
|
|
8
8
|
* - Maps TypeScript names to database A/B columns using Schema.encodeKeys
|
|
9
|
-
* - Uses columnType
|
|
9
|
+
* - Uses columnType(Id, Id, Never) for the FK columns: provided on INSERT (you
|
|
10
|
+
* supply both foreign keys when linking a row) but read-only on UPDATE — a
|
|
11
|
+
* composite-PK join row is inserted or deleted, never updated in place
|
|
10
12
|
* - No type exports - consumers use type utilities: Selectable<JoinTable>
|
|
11
13
|
*
|
|
12
14
|
* Example:
|
|
13
15
|
* - Database columns: A, B (Prisma requirement for implicit many-to-many)
|
|
14
16
|
* - TypeScript fields: product_id, product_tag_id (semantic names)
|
|
15
|
-
* - Types: columnType(ProductId,
|
|
17
|
+
* - Types: columnType(ProductId, ProductId, Schema.Never) (insertable, read-only on update, branded)
|
|
16
18
|
*/
|
|
17
19
|
export declare function generateJoinTableSchema(joinTable: JoinTableInfo, _dmmf: DMMF.Document): string;
|
|
18
20
|
//# sourceMappingURL=join-table.d.ts.map
|
|
@@ -1 +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
|
|
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;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,UAgCrF"}
|
|
@@ -5,13 +5,15 @@ import { toPascalCase, toSnakeCase } from '../utils/naming.js';
|
|
|
5
5
|
* Structure:
|
|
6
6
|
* - Direct export with semantic snake_case field names
|
|
7
7
|
* - Maps TypeScript names to database A/B columns using Schema.encodeKeys
|
|
8
|
-
* - Uses columnType
|
|
8
|
+
* - Uses columnType(Id, Id, Never) for the FK columns: provided on INSERT (you
|
|
9
|
+
* supply both foreign keys when linking a row) but read-only on UPDATE — a
|
|
10
|
+
* composite-PK join row is inserted or deleted, never updated in place
|
|
9
11
|
* - No type exports - consumers use type utilities: Selectable<JoinTable>
|
|
10
12
|
*
|
|
11
13
|
* Example:
|
|
12
14
|
* - Database columns: A, B (Prisma requirement for implicit many-to-many)
|
|
13
15
|
* - TypeScript fields: product_id, product_tag_id (semantic names)
|
|
14
|
-
* - Types: columnType(ProductId,
|
|
16
|
+
* - Types: columnType(ProductId, ProductId, Schema.Never) (insertable, read-only on update, branded)
|
|
15
17
|
*/
|
|
16
18
|
export function generateJoinTableSchema(joinTable, _dmmf) {
|
|
17
19
|
const { tableName, relationName, modelA, modelB } = joinTable;
|
|
@@ -22,12 +24,13 @@ export function generateJoinTableSchema(joinTable, _dmmf) {
|
|
|
22
24
|
// Reference branded ID schemas (e.g., ProductId, SellerId) generated earlier in the output
|
|
23
25
|
const modelASchemaType = `${toPascalCase(modelA)}Id`;
|
|
24
26
|
const modelBSchemaType = `${toPascalCase(modelB)}Id`;
|
|
25
|
-
//
|
|
27
|
+
// columnType(Id, Id, Never): the FK is supplied on INSERT and read-only on
|
|
28
|
+
// UPDATE (composite-PK join rows are inserted/deleted, not updated).
|
|
26
29
|
// The struct uses semantic field names; Schema.encodeKeys renames them to the
|
|
27
30
|
// database A/B columns on the encoded side (Effect 4 replacement for the old
|
|
28
31
|
// Schema.propertySignature(...).pipe(Schema.fromKey(...)) pattern).
|
|
29
|
-
const columnAField = ` ${columnAFieldName}: columnType(${modelASchemaType},
|
|
30
|
-
const columnBField = ` ${columnBFieldName}: columnType(${modelBSchemaType},
|
|
32
|
+
const columnAField = ` ${columnAFieldName}: columnType(${modelASchemaType}, ${modelASchemaType}, Schema.Never)`;
|
|
33
|
+
const columnBField = ` ${columnBFieldName}: columnType(${modelBSchemaType}, ${modelBSchemaType}, Schema.Never)`;
|
|
31
34
|
// Use PascalCase for exported name (consistent with regular models)
|
|
32
35
|
const pascalName = toPascalCase(relationName);
|
|
33
36
|
// Generate schema with semantic names mapped to A/B
|
|
@@ -1 +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
|
|
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;;;;;;;;;;;;;;;GAeG;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,2EAA2E;IAC3E,qEAAqE;IACrE,8EAA8E;IAC9E,6EAA6E;IAC7E,oEAAoE;IACpE,MAAM,YAAY,GAAG,KAAK,gBAAgB,gBAAgB,gBAAgB,KAAK,gBAAgB,iBAAiB,CAAC;IACjH,MAAM,YAAY,GAAG,KAAK,gBAAgB,gBAAgB,gBAAgB,KAAK,gBAAgB,iBAAiB,CAAC;IAEjH,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"}
|
|
@@ -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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"}
|
package/dist/kysely/helpers.js
CHANGED
|
@@ -101,8 +101,23 @@ const getColumnTypeSchemas = (field) => {
|
|
|
101
101
|
}
|
|
102
102
|
return readAnnotation(field, ColumnTypeId);
|
|
103
103
|
};
|
|
104
|
-
/**
|
|
105
|
-
|
|
104
|
+
/**
|
|
105
|
+
* Resolve the base schema of a Generated field, or undefined if not generated.
|
|
106
|
+
*
|
|
107
|
+
* Detection is gated on the `GeneratedId` annotation — the authoritative marker
|
|
108
|
+
* that `generated()` always sets. A bare `.from` own-property is NOT sufficient:
|
|
109
|
+
* `Schema.encodeKeys(...)` transforms (used for join tables) also expose a `.from`
|
|
110
|
+
* property, so trusting `.from` alone would misclassify a nested encodeKeys field
|
|
111
|
+
* as generated. When the marker is present, the `.from` own-property is preferred
|
|
112
|
+
* (it survives the field→Struct round-trip) with the annotation's `from` as the
|
|
113
|
+
* fallback for a consumer-`.annotate()`d schema where own-props were dropped.
|
|
114
|
+
*/
|
|
115
|
+
const getGeneratedFrom = (field) => {
|
|
116
|
+
const annotation = readAnnotation(field, GeneratedId);
|
|
117
|
+
if (annotation === undefined)
|
|
118
|
+
return undefined;
|
|
119
|
+
return field.from ?? annotation.from;
|
|
120
|
+
};
|
|
106
121
|
const isGeneratedField = (field) => getGeneratedFrom(field) !== undefined;
|
|
107
122
|
const isNeverSchema = (schema) => AST.isNever(schema.ast);
|
|
108
123
|
const isArraySchema = (schema) => AST.isArrays(schema.ast);
|
|
@@ -114,22 +129,6 @@ const isNullableUnion = (schema) => {
|
|
|
114
129
|
const members = schema.members;
|
|
115
130
|
return Array.isArray(members) && members.some((m) => AST.isNull(m.ast));
|
|
116
131
|
};
|
|
117
|
-
/**
|
|
118
|
-
* Strip null from a `NullOr` schema for Insertable fields.
|
|
119
|
-
* For INSERT, omitting a field = NULL in the DB, so explicit null is unnecessary.
|
|
120
|
-
* Returns the non-null member; otherwise returns the schema unchanged.
|
|
121
|
-
*/
|
|
122
|
-
const stripNull = (schema) => {
|
|
123
|
-
const members = schema.members;
|
|
124
|
-
if (!Array.isArray(members))
|
|
125
|
-
return schema;
|
|
126
|
-
const nonNull = members.filter((m) => !AST.isNull(m.ast));
|
|
127
|
-
if (nonNull.length === 1)
|
|
128
|
-
return nonNull[0];
|
|
129
|
-
if (nonNull.length > 1)
|
|
130
|
-
return Schema.Union(nonNull);
|
|
131
|
-
return schema;
|
|
132
|
-
};
|
|
133
132
|
/** Apply `Schema.mutable` only to array fields (it throws on scalars in v4). */
|
|
134
133
|
const mutableIfArray = (schema) => isArraySchema(schema)
|
|
135
134
|
? Schema.mutable(schema)
|
|
@@ -214,8 +213,11 @@ export function Insertable(schema) {
|
|
|
214
213
|
continue;
|
|
215
214
|
}
|
|
216
215
|
if (isNullableUnion(field)) {
|
|
217
|
-
// Union(T, null) -> optional
|
|
218
|
-
|
|
216
|
+
// Union(T, null) -> optional on insert. Null is RETAINED so a caller can
|
|
217
|
+
// explicitly set the column to NULL (`{ x: null }`), matching SQL and
|
|
218
|
+
// Kysely's Insertable, which both permit omit / value / explicit null for
|
|
219
|
+
// a nullable column. (Omitting the key also leaves the column NULL.)
|
|
220
|
+
insertFields[key] = Schema.optional(mutableIfArray(field));
|
|
219
221
|
continue;
|
|
220
222
|
}
|
|
221
223
|
insertFields[key] = mutableIfArray(field);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/kysely/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,GAAG,MAAM,kBAAkB,CAAC;AAgDxC,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACxD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AAEtD;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAkB,MAAM,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;AAwI3F;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,YAAe,EACf,YAAe,EACf,YAAe,EACf,EAAE;IACF,MAAM,OAAO,GAAsB,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;IAChF,8EAA8E;IAC9E,4EAA4E;IAC5E,sEAAsE;IACtE,2EAA2E;IAC3E,sEAAsE;IACtE,yBAAyB;IACzB,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACrE,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE;QAC9B,YAAY;QACZ,YAAY;QACZ,YAAY;KACb,CAAiF,CAAC;AACrF,CAAC,CAAC;AAoBF;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAuB,MAAS,EAAE,EAAE;IAC3D,4EAA4E;IAC5E,iFAAiF;IACjF,iFAAiF;IACjF,iFAAiF;IACjF,+EAA+E;IAC/E,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACvE,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE;QAC9B,IAAI,EAAE,MAAM;KACb,CAAkC,CAAC;AACtC,CAAC,CAAC;AAsBF,MAAM,CAAC,MAAM,SAAS,GAAuC,MAAM,CAAC,OAAO,CACzE,GAAuC,EAAE,CACvC,MAAM,CAAC,KAAK,CAAC;IACX,MAAM,CAAC,MAAM;IACb,MAAM,CAAC,MAAM;IACb,MAAM,CAAC,OAAO;IACd,MAAM,CAAC,IAAI;IACX,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;IACvB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;CACxC,CAAC,CACL,CAAC;AAyBF;;;;;;;;GAQG;AACH,MAAM,cAAc,GAAG,CAAI,KAAiB,EAAE,GAAW,EAAiB,EAAE;IAC1E,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAwC,CAAC;IAC/E,OAAO,QAAQ,EAAE,CAAC,GAAY,CAAkB,CAAC;AACnD,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,oBAAoB,GAAG,CAAC,KAAiB,EAAiC,EAAE;IAChF,IACE,KAAK,CAAC,YAAY,KAAK,SAAS;QAChC,KAAK,CAAC,YAAY,KAAK,SAAS;QAChC,KAAK,CAAC,YAAY,KAAK,SAAS;QAChC,KAAK,CAAC,IAAI,KAAK,SAAS,EACxB,CAAC;QACD,OAAO;YACL,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,YAAY,EAAE,KAAK,CAAC,YAAY;SACjC,CAAC;IACJ,CAAC;IACD,OAAO,cAAc,CAAoB,KAAK,EAAE,YAAY,CAAC,CAAC;AAChE,CAAC,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/kysely/helpers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED