prisma-effect-kysely 4.0.8 → 4.0.10
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 +23 -0
- package/dist/kysely/helpers.d.ts +26 -65
- package/dist/kysely/helpers.d.ts.map +1 -1
- package/dist/kysely/helpers.js +8 -5
- package/dist/kysely/helpers.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,28 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 4.0.10
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`cad965c`](https://github.com/samuelho-dev/prisma-effect-kysely/commit/cad965cd4c933f4bd84912fffe82519290d14260) Thanks [@samuelho-dev](https://github.com/samuelho-dev)! - fix: Improved Schema type compatibility
|
|
8
|
+
- Updated `getSchemas()` to use `Schema.Schema.Any` constraint for better type inference
|
|
9
|
+
- Removed intersection-based phantom types that could cause type compatibility issues
|
|
10
|
+
- Simplified `columnType()` and `generated()` return types to plain `Schema.Schema`
|
|
11
|
+
|
|
12
|
+
Note: Like all Effect-based packages, consumers must use `skipLibCheck: true` in their tsconfig. This is a requirement of the Effect ecosystem, not specific to this package.
|
|
13
|
+
|
|
14
|
+
## 4.0.9
|
|
15
|
+
|
|
16
|
+
### Patch Changes
|
|
17
|
+
|
|
18
|
+
- [`cdcb3cb`](https://github.com/samuelho-dev/prisma-effect-kysely/commit/cdcb3cb2d0dd4a094461081689bd4b9c3e2ba527) Thanks [@samuelho-dev](https://github.com/samuelho-dev)! - fix: Insertable<T> type utility now correctly excludes generated() fields at compile-time
|
|
19
|
+
|
|
20
|
+
The previous implementation used phantom types with unique symbols which don't maintain identity across module boundaries when compiled to .d.ts files. This caused the type utility to include generated() fields even though the runtime schema correctly excluded them.
|
|
21
|
+
|
|
22
|
+
The fix simplifies the type utilities to trust the pre-computed runtime schemas. Since getSchemas() already computes the correct Insertable/Updateable schemas with generated() fields excluded, the type utility now simply extracts types from these schemas rather than re-computing field exclusions using phantom types.
|
|
23
|
+
|
|
24
|
+
This aligns with the @effect/sql pattern where schema variants are pre-computed and trusted.
|
|
25
|
+
|
|
3
26
|
## 4.0.8
|
|
4
27
|
|
|
5
28
|
### Patch Changes
|
package/dist/kysely/helpers.d.ts
CHANGED
|
@@ -7,41 +7,14 @@ import type { DeepMutable } from 'effect/Types';
|
|
|
7
7
|
*/
|
|
8
8
|
export declare const ColumnTypeId: unique symbol;
|
|
9
9
|
export declare const GeneratedId: unique symbol;
|
|
10
|
-
declare const ColumnTypeInsertPhantom: unique symbol;
|
|
11
|
-
declare const ColumnTypeUpdatePhantom: unique symbol;
|
|
12
|
-
declare const GeneratedInsertPhantom: unique symbol;
|
|
13
|
-
/**
|
|
14
|
-
* A schema with phantom types encoding insert/update type constraints.
|
|
15
|
-
* This allows TypeScript to know at compile time which fields have
|
|
16
|
-
* `never` insert/update types and should be excluded.
|
|
17
|
-
*/
|
|
18
|
-
export type ColumnTypeSchema<SType, SEncoded, SR, IType, UType> = Schema.Schema<SType, SEncoded, SR> & {
|
|
19
|
-
readonly [ColumnTypeInsertPhantom]: IType;
|
|
20
|
-
readonly [ColumnTypeUpdatePhantom]: UType;
|
|
21
|
-
};
|
|
22
|
-
/**
|
|
23
|
-
* A schema with phantom type encoding that this field is generated.
|
|
24
|
-
* Insert type is `never` (excluded from inserts), update type is the original type.
|
|
25
|
-
*/
|
|
26
|
-
export type GeneratedSchema<SType, SEncoded, SR> = Schema.Schema<SType, SEncoded, SR> & {
|
|
27
|
-
readonly [GeneratedInsertPhantom]: never;
|
|
28
|
-
};
|
|
29
|
-
type ExtractInsertPhantom<T> = T extends {
|
|
30
|
-
readonly [GeneratedInsertPhantom]: never;
|
|
31
|
-
} ? never : T extends {
|
|
32
|
-
readonly [ColumnTypeInsertPhantom]: infer I;
|
|
33
|
-
} ? I : T extends Schema.Schema<infer S, unknown, unknown> ? S : never;
|
|
34
|
-
type ExtractUpdatePhantom<T> = T extends {
|
|
35
|
-
readonly [ColumnTypeUpdatePhantom]: infer U;
|
|
36
|
-
} ? U : T extends Schema.Schema<infer S, unknown, unknown> ? S : never;
|
|
37
10
|
/**
|
|
38
11
|
* Mark a field as having different types for select/insert/update
|
|
39
12
|
* Used for ID fields with @default (read-only)
|
|
40
13
|
*
|
|
41
|
-
*
|
|
42
|
-
* which fields
|
|
14
|
+
* The insert/update schemas are stored in annotations and used at runtime
|
|
15
|
+
* to determine which fields to include in Insertable/Updateable schemas.
|
|
43
16
|
*/
|
|
44
|
-
export declare const columnType: <SType, SEncoded, SR, IType, IEncoded, IR, UType, UEncoded, UR>(selectSchema: Schema.Schema<SType, SEncoded, SR>, insertSchema: Schema.Schema<IType, IEncoded, IR>, updateSchema: Schema.Schema<UType, UEncoded, UR>) =>
|
|
17
|
+
export declare const columnType: <SType, SEncoded, SR, IType, IEncoded, IR, UType, UEncoded, UR>(selectSchema: Schema.Schema<SType, SEncoded, SR>, insertSchema: Schema.Schema<IType, IEncoded, IR>, updateSchema: Schema.Schema<UType, UEncoded, UR>) => Schema.Schema<SType, SEncoded, SR>;
|
|
45
18
|
/**
|
|
46
19
|
* Mark a field as database-generated (omitted from insert)
|
|
47
20
|
* Used for fields with @default
|
|
@@ -50,7 +23,7 @@ export declare const columnType: <SType, SEncoded, SR, IType, IEncoded, IR, UTyp
|
|
|
50
23
|
* - Present in select and update schemas
|
|
51
24
|
* - OMITTED from insert schema (not optional, completely absent)
|
|
52
25
|
*/
|
|
53
|
-
export declare const generated: <SType, SEncoded, R>(schema: Schema.Schema<SType, SEncoded, R>) =>
|
|
26
|
+
export declare const generated: <SType, SEncoded, R>(schema: Schema.Schema<SType, SEncoded, R>) => Schema.Schema<SType, SEncoded, R>;
|
|
54
27
|
/**
|
|
55
28
|
* Create Selectable schema from base schema
|
|
56
29
|
*/
|
|
@@ -69,18 +42,21 @@ export declare const Updateable: <Type, Encoded>(schema: Schema.Schema<Type, Enc
|
|
|
69
42
|
/**
|
|
70
43
|
* Schemas interface returned by getSchemas().
|
|
71
44
|
* Includes a _base property to preserve the original schema for type-level computations.
|
|
45
|
+
*
|
|
46
|
+
* Uses Schema.Schema.Any constraint to support schemas with phantom types
|
|
47
|
+
* (columnType, generated) that use intersection types internally.
|
|
72
48
|
*/
|
|
73
|
-
export interface Schemas<
|
|
49
|
+
export interface Schemas<BaseSchema extends Schema.Schema.Any> {
|
|
74
50
|
readonly _base: BaseSchema;
|
|
75
|
-
readonly Selectable: Schema.Schema<KyselySelectable<Type
|
|
76
|
-
readonly Insertable: Schema.Schema<MutableInsert<Type
|
|
77
|
-
readonly Updateable: Schema.Schema<MutableUpdate<Type
|
|
51
|
+
readonly Selectable: Schema.Schema<KyselySelectable<Schema.Schema.Type<BaseSchema>>, KyselySelectable<Schema.Schema.Encoded<BaseSchema>>, never>;
|
|
52
|
+
readonly Insertable: Schema.Schema<MutableInsert<Schema.Schema.Type<BaseSchema>>, MutableInsert<Schema.Schema.Encoded<BaseSchema>>, never>;
|
|
53
|
+
readonly Updateable: Schema.Schema<MutableUpdate<Schema.Schema.Type<BaseSchema>>, MutableUpdate<Schema.Schema.Encoded<BaseSchema>>, never>;
|
|
78
54
|
}
|
|
79
55
|
/**
|
|
80
56
|
* Extended Schemas interface with branded Id type.
|
|
81
57
|
* Returned when getSchemas() is called with an idSchema parameter.
|
|
82
58
|
*/
|
|
83
|
-
export interface SchemasWithId<
|
|
59
|
+
export interface SchemasWithId<BaseSchema extends Schema.Schema.Any, IdSchema extends Schema.Schema.Any> extends Schemas<BaseSchema> {
|
|
84
60
|
readonly Id: IdSchema;
|
|
85
61
|
}
|
|
86
62
|
/**
|
|
@@ -90,35 +66,12 @@ export interface SchemasWithId<Type, Encoded, BaseSchema extends Schema.Schema<T
|
|
|
90
66
|
* @param baseSchema - The base Effect Schema struct
|
|
91
67
|
* @param idSchema - Optional branded ID schema for models with @id fields
|
|
92
68
|
*/
|
|
93
|
-
export declare function getSchemas<
|
|
94
|
-
export declare function getSchemas<
|
|
69
|
+
export declare function getSchemas<BaseSchema extends Schema.Schema.Any, IdSchema extends Schema.Schema.Any>(baseSchema: BaseSchema, idSchema: IdSchema): SchemasWithId<BaseSchema, IdSchema>;
|
|
70
|
+
export declare function getSchemas<BaseSchema extends Schema.Schema.Any>(baseSchema: BaseSchema): Schemas<BaseSchema>;
|
|
95
71
|
type RemoveIndexSignature<T> = {
|
|
96
72
|
[K in keyof T as K extends string ? string extends K ? never : K : K extends number ? number extends K ? never : K : K extends symbol ? symbol extends K ? never : K : K]: T[K];
|
|
97
73
|
};
|
|
98
74
|
type StrictType<T> = RemoveIndexSignature<T>;
|
|
99
|
-
type ExtractStructFields<T> = T extends {
|
|
100
|
-
readonly _base: Schema.Struct<infer F>;
|
|
101
|
-
} ? F : never;
|
|
102
|
-
type HasNeverInsert<T> = T extends {
|
|
103
|
-
readonly [GeneratedInsertPhantom]: never;
|
|
104
|
-
} ? true : T extends {
|
|
105
|
-
readonly [ColumnTypeInsertPhantom]: never;
|
|
106
|
-
} ? true : false;
|
|
107
|
-
type HasNeverUpdate<T> = T extends {
|
|
108
|
-
readonly [ColumnTypeUpdatePhantom]: never;
|
|
109
|
-
} ? true : false;
|
|
110
|
-
type InsertableFields<Fields> = {
|
|
111
|
-
[K in keyof Fields as HasNeverInsert<Fields[K]> extends true ? never : K]: Fields[K];
|
|
112
|
-
};
|
|
113
|
-
type UpdateableFields<Fields> = {
|
|
114
|
-
[K in keyof Fields as HasNeverUpdate<Fields[K]> extends true ? never : K]: Fields[K];
|
|
115
|
-
};
|
|
116
|
-
type ComputeInsertableType<Fields> = StrictType<{
|
|
117
|
-
[K in keyof InsertableFields<Fields>]: ExtractInsertPhantom<Fields[K]>;
|
|
118
|
-
}>;
|
|
119
|
-
type ComputeUpdateableType<Fields> = StrictType<{
|
|
120
|
-
[K in keyof UpdateableFields<Fields>]?: ExtractUpdatePhantom<Fields[K]>;
|
|
121
|
-
}>;
|
|
122
75
|
/**
|
|
123
76
|
* Extract SELECT type from schema (matches Kysely's Selectable<T> pattern)
|
|
124
77
|
* @example type UserSelect = Selectable<typeof User>
|
|
@@ -129,21 +82,29 @@ export type Selectable<T extends {
|
|
|
129
82
|
/**
|
|
130
83
|
* Extract INSERT type from schema (matches Kysely's Insertable<T> pattern)
|
|
131
84
|
* Excludes fields with never insert type (e.g., columnType(T, Schema.Never, ...))
|
|
85
|
+
* and generated fields (marked with generated()).
|
|
86
|
+
*
|
|
87
|
+
* Note: This extracts types from the pre-computed Insertable schema which already
|
|
88
|
+
* correctly excludes generated fields at runtime. This avoids phantom type issues
|
|
89
|
+
* with unique symbols that don't maintain identity across module boundaries.
|
|
90
|
+
*
|
|
132
91
|
* @example type UserInsert = Insertable<typeof User>
|
|
133
92
|
*/
|
|
134
93
|
export type Insertable<T extends {
|
|
135
|
-
readonly _base: Schema.Schema.Any;
|
|
136
94
|
readonly Insertable: Schema.Schema.Any;
|
|
137
|
-
}> =
|
|
95
|
+
}> = StrictType<Schema.Schema.Type<T['Insertable']>>;
|
|
138
96
|
/**
|
|
139
97
|
* Extract UPDATE type from schema (matches Kysely's Updateable<T> pattern)
|
|
140
98
|
* Excludes fields with never update type (e.g., columnType(T, ..., Schema.Never))
|
|
99
|
+
*
|
|
100
|
+
* Note: This extracts types from the pre-computed Updateable schema which already
|
|
101
|
+
* correctly handles field transformations at runtime.
|
|
102
|
+
*
|
|
141
103
|
* @example type UserUpdate = Updateable<typeof User>
|
|
142
104
|
*/
|
|
143
105
|
export type Updateable<T extends {
|
|
144
|
-
readonly _base: Schema.Schema.Any;
|
|
145
106
|
readonly Updateable: Schema.Schema.Any;
|
|
146
|
-
}> =
|
|
107
|
+
}> = StrictType<Schema.Schema.Type<T['Updateable']>>;
|
|
147
108
|
/**
|
|
148
109
|
* Extract branded ID type from schema
|
|
149
110
|
* @example type UserId = Id<typeof User>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/kysely/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,KAAK,EACV,UAAU,IAAI,gBAAgB,EAC9B,UAAU,IAAI,gBAAgB,EAC9B,UAAU,IAAI,gBAAgB,EAC/B,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD;;;GAGG;AAEH,eAAO,MAAM,YAAY,eAA8B,CAAC;AACxD,eAAO,MAAM,WAAW,eAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/kysely/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,KAAK,EACV,UAAU,IAAI,gBAAgB,EAC9B,UAAU,IAAI,gBAAgB,EAC9B,UAAU,IAAI,gBAAgB,EAC/B,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD;;;GAGG;AAEH,eAAO,MAAM,YAAY,eAA8B,CAAC;AACxD,eAAO,MAAM,WAAW,eAA6B,CAAC;AAYtD;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,GAAI,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EACtF,cAAc,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,EAChD,cAAc,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,EAChD,cAAc,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,KAC/C,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAQnC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,SAAS,GAAI,KAAK,EAAE,QAAQ,EAAE,CAAC,EAC1C,QAAQ,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,KACxC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAElC,CAAC;AAuHF;;GAEG;AACH,KAAK,aAAa,CAAC,IAAI,IAAI,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;AAC/D,KAAK,aAAa,CAAC,IAAI,IAAI,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;AAE/D,eAAO,MAAM,UAAU,GAAI,IAAI,EAAE,OAAO,EACtC,QAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,KACnC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,CAgBxE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,IAAI,EAAE,OAAO,EACtC,QAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,KACnC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,KAAK,CA+BlE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,GAAI,IAAI,EAAE,OAAO,EACtC,QAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,KACnC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,KAAK,CAwBlE,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,WAAW,OAAO,CAAC,UAAU,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG;IAC3D,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAChC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAChD,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EACnD,KAAK,CACN,CAAC;IACF,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAChC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAC7C,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAChD,KAAK,CACN,CAAC;IACF,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAChC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAC7C,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAChD,KAAK,CACN,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa,CAC5B,UAAU,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EACpC,QAAQ,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,CAClC,SAAQ,OAAO,CAAC,UAAU,CAAC;IAC3B,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;CACvB;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,UAAU,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EACpC,QAAQ,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAClC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,GAAG,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AAEnF,wBAAgB,UAAU,CAAC,UAAU,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAC7D,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,UAAU,CAAC,CAAC;AAmCvB,KAAK,oBAAoB,CAAC,CAAC,IAAI;KAC5B,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,GAC7B,MAAM,SAAS,CAAC,GACd,KAAK,GACL,CAAC,GACH,CAAC,SAAS,MAAM,GACd,MAAM,SAAS,CAAC,GACd,KAAK,GACL,CAAC,GACH,CAAC,SAAS,MAAM,GACd,MAAM,SAAS,CAAC,GACd,KAAK,GACL,CAAC,GACH,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACjB,CAAC;AAEF,KAAK,UAAU,CAAC,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC,CAAC;AAE7C;;;GAGG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS;IAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA;CAAE,IAAI,UAAU,CACvF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CACpC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS;IAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA;CAAE,IAAI,UAAU,CACvF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CACpC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS;IAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA;CAAE,IAAI,UAAU,CACvF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CACpC,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,EAAE,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA;CAAE,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC"}
|
package/dist/kysely/helpers.js
CHANGED
|
@@ -10,8 +10,8 @@ export const GeneratedId = Symbol.for('/GeneratedId');
|
|
|
10
10
|
* Mark a field as having different types for select/insert/update
|
|
11
11
|
* Used for ID fields with @default (read-only)
|
|
12
12
|
*
|
|
13
|
-
*
|
|
14
|
-
* which fields
|
|
13
|
+
* The insert/update schemas are stored in annotations and used at runtime
|
|
14
|
+
* to determine which fields to include in Insertable/Updateable schemas.
|
|
15
15
|
*/
|
|
16
16
|
export const columnType = (selectSchema, insertSchema, updateSchema) => {
|
|
17
17
|
const schemas = {
|
|
@@ -134,11 +134,14 @@ export const Updateable = (schema) => {
|
|
|
134
134
|
return Schema.asSchema(Schema.make(res));
|
|
135
135
|
};
|
|
136
136
|
export function getSchemas(baseSchema, idSchema) {
|
|
137
|
+
// Use type assertion via unknown to handle Schema.Any -> Schema<Type, Encoded> conversion
|
|
138
|
+
// This is safe because Schema.Any is a supertype of all Schema types
|
|
139
|
+
const schema = baseSchema;
|
|
137
140
|
const base = {
|
|
138
141
|
_base: baseSchema,
|
|
139
|
-
Selectable: Selectable(
|
|
140
|
-
Insertable: Insertable(
|
|
141
|
-
Updateable: Updateable(
|
|
142
|
+
Selectable: Selectable(schema),
|
|
143
|
+
Insertable: Insertable(schema),
|
|
144
|
+
Updateable: Updateable(schema),
|
|
142
145
|
};
|
|
143
146
|
if (idSchema) {
|
|
144
147
|
return { ...base, Id: idSchema };
|
|
@@ -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;AAQxC;;;GAGG;AAEH,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;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/kysely/helpers.ts"],"names":[],"mappings":"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"}
|