@forinda/kickjs-db 8.1.0 → 8.3.0
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/dist/cli.d.mts +1 -1
- package/dist/cli.d.mts.map +1 -1
- package/dist/cli.mjs +4 -3
- package/dist/cli.mjs.map +1 -1
- package/dist/{create-CwuC1odW.mjs → create-HnlQadLo.mjs} +7 -7
- package/dist/create-HnlQadLo.mjs.map +1 -0
- package/dist/{custom-type-DeGuRFuz.mjs → custom-type-Ctbe_IU7.mjs} +2 -2
- package/dist/{custom-type-DeGuRFuz.mjs.map → custom-type-Ctbe_IU7.mjs.map} +1 -1
- package/dist/devtools-events.d.mts +1 -1
- package/dist/devtools-events.mjs +1 -1
- package/dist/{index-2fEnHqpn.d.mts → index-CycSeW1r.d.mts} +80 -18
- package/dist/index-CycSeW1r.d.mts.map +1 -0
- package/dist/index.d.mts +3 -3
- package/dist/index.mjs +2 -2
- package/dist/mysql.d.mts +1 -1
- package/dist/mysql.d.mts.map +1 -1
- package/dist/mysql.mjs +2 -2
- package/dist/mysql.mjs.map +1 -1
- package/dist/{pg-CsmRByEZ.mjs → pg-S7rfvX4T.mjs} +3 -3
- package/dist/{pg-CsmRByEZ.mjs.map → pg-S7rfvX4T.mjs.map} +1 -1
- package/dist/pg.d.mts +1 -1
- package/dist/pg.d.mts.map +1 -1
- package/dist/pg.mjs +2 -2
- package/dist/pg.mjs.map +1 -1
- package/dist/schema.mjs +2 -2
- package/dist/{split-statements-BPCw9cII.mjs → split-statements-Cy-Bnpw-.mjs} +2 -2
- package/dist/{split-statements-BPCw9cII.mjs.map → split-statements-Cy-Bnpw-.mjs.map} +1 -1
- package/dist/sqlite.d.mts +1 -1
- package/dist/sqlite.d.mts.map +1 -1
- package/dist/sqlite.mjs +3 -3
- package/dist/sqlite.mjs.map +1 -1
- package/dist/{src-DUtVGG2c.mjs → src-DtmQZMw4.mjs} +10 -9
- package/dist/src-DtmQZMw4.mjs.map +1 -0
- package/dist/testing.d.mts +1 -1
- package/dist/testing.mjs +2 -2
- package/dist/{types-BZoTujcR.d.mts → types-BnYMhgYq.d.mts} +13 -7
- package/dist/types-BnYMhgYq.d.mts.map +1 -0
- package/package.json +9 -9
- package/dist/create-CwuC1odW.mjs.map +0 -1
- package/dist/index-2fEnHqpn.d.mts.map +0 -1
- package/dist/src-DUtVGG2c.mjs.map +0 -1
- package/dist/types-BZoTujcR.d.mts.map +0 -1
|
@@ -24,12 +24,18 @@ interface UpsertOptions<DB, T extends keyof DB & string> {
|
|
|
24
24
|
*/
|
|
25
25
|
where?: (eb: ExpressionBuilder<DB, T>) => Expression<SqlBool>;
|
|
26
26
|
}
|
|
27
|
-
|
|
27
|
+
/** The keys `where` always has — an optional one may be missing. */
|
|
28
|
+
type PresentKeys<W> = { [K in keyof W]-?: {} extends Pick<W, K> ? never : K; }[keyof W];
|
|
29
|
+
/** What `create` adds to `where`: every required column `where` may leave out. */
|
|
30
|
+
type CreateRest<DB, T extends keyof DB, W> = Omit<Insertable<DB[T]>, PresentKeys<W>> & Partial<Insertable<DB[T]>>;
|
|
31
|
+
type FindOrCreateOptions<DB, T extends keyof DB & string, W extends Partial<Selectable<DB[T]>> = Partial<Selectable<DB[T]>>> = {
|
|
28
32
|
/** Identifies the row — columns of a unique key. Also part of what's created. */
|
|
29
|
-
where:
|
|
30
|
-
|
|
31
|
-
create?:
|
|
32
|
-
}
|
|
33
|
+
where: W & Record<Exclude<keyof W, keyof Selectable<DB[T]>>, never>;
|
|
34
|
+
} & ({} extends CreateRest<DB, T, W> ? {
|
|
35
|
+
create?: CreateRest<DB, T, W>;
|
|
36
|
+
} : {
|
|
37
|
+
create: CreateRest<DB, T, W>;
|
|
38
|
+
});
|
|
33
39
|
//#endregion
|
|
34
40
|
//#region src/extend/types.d.ts
|
|
35
41
|
/**
|
|
@@ -612,7 +618,7 @@ interface KickDbClient<DB = RegisteredDB> {
|
|
|
612
618
|
*
|
|
613
619
|
* const { row, created } = await db.findOrCreate('tags', { where: { name: 'urgent' } })
|
|
614
620
|
*/
|
|
615
|
-
findOrCreate<T extends keyof DB & string
|
|
621
|
+
findOrCreate<T extends keyof DB & string, W extends Partial<Selectable<DB[T]>>>(table: T, opts: FindOrCreateOptions<DB, T, W>): Promise<{
|
|
616
622
|
row: Selectable<DB[T]>;
|
|
617
623
|
created: boolean;
|
|
618
624
|
}>;
|
|
@@ -780,4 +786,4 @@ interface CreateDbClientOptions<TSchema, _DB = unknown> {
|
|
|
780
786
|
}
|
|
781
787
|
//#endregion
|
|
782
788
|
export { tenantKey as A, BypassInfo as C, TenancyStrategy as D, TenancyOptions as E, UpsertOptions as F, ExtensionDefinition as M, ModelExtensions as N, TenantRequiredError as O, FindOrCreateOptions as P, RegisteredDB as S, Tenancy as T, RelationMapEntry as _, QueryErrorEvent as a, WithClause as b, TransactionEvent as c, TransactionRollbackEvent as d, FindManyOptions as f, RegisteredRelations as g, QueryNamespace as h, KickDbClientEvents as i, ExtendedClient as j, defineTenancy as k, TransactionOptions as l, KickDbRelationsRegister as m, CreateDbClientOptions as n, QueryEvent as o, FindManyRow as p, KickDbClient as r, SlowQueryEvent as s, BeforeQueryEvent as t, TransactionRetryEvent as u, TableQueryNamespace as v, BypassOptions as w, KickDbRegister as x, TableRelations as y };
|
|
783
|
-
//# sourceMappingURL=types-
|
|
789
|
+
//# sourceMappingURL=types-BnYMhgYq.d.mts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types-BnYMhgYq.d.mts","names":[],"sources":["../src/client/upsert.ts","../src/extend/types.ts","../src/tenancy.ts","../src/client/register.ts","../src/query/types.ts","../src/client/types.ts"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forinda/kickjs-db",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.3.0",
|
|
4
4
|
"description": "KickJS-native ORM — code-first schema, reversible migrations, multi-dialect SQL builder",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"kickjs",
|
|
@@ -63,9 +63,9 @@
|
|
|
63
63
|
],
|
|
64
64
|
"dependencies": {
|
|
65
65
|
"commander": "^15.0.0",
|
|
66
|
-
"jiti": "^2.
|
|
66
|
+
"jiti": "^2.7.0",
|
|
67
67
|
"kysely": "0.29.6",
|
|
68
|
-
"@forinda/kickjs-cli-kit": "0.1.
|
|
68
|
+
"@forinda/kickjs-cli-kit": "0.1.3"
|
|
69
69
|
},
|
|
70
70
|
"peerDependencies": {
|
|
71
71
|
"@forinda/kickjs": ">=8.8.0",
|
|
@@ -92,21 +92,21 @@
|
|
|
92
92
|
"@libsql/client": "^0.18.0",
|
|
93
93
|
"@libsql/kysely-libsql": "^0.4.1",
|
|
94
94
|
"@testcontainers/mysql": "^12.2.0",
|
|
95
|
-
"@testcontainers/postgresql": "^12.
|
|
95
|
+
"@testcontainers/postgresql": "^12.2.0",
|
|
96
96
|
"@types/better-sqlite3": "^9.6.0",
|
|
97
|
-
"@types/node": "^26.6.
|
|
97
|
+
"@types/node": "^26.6.4",
|
|
98
98
|
"@types/pg": "^8.23.1",
|
|
99
99
|
"better-sqlite3": "^13.0.3",
|
|
100
100
|
"kysely": "^0.29.6",
|
|
101
101
|
"kysely-d1": "^0.4.0",
|
|
102
102
|
"miniflare": "^4.20260730.0",
|
|
103
|
-
"mysql2": "^3.24.
|
|
104
|
-
"pg": "^8.23.
|
|
103
|
+
"mysql2": "^3.24.5",
|
|
104
|
+
"pg": "^8.23.1",
|
|
105
105
|
"pg-cursor": "^2.22.1",
|
|
106
106
|
"typescript": "^7.0.2",
|
|
107
|
-
"@forinda/kickjs": "9.0.
|
|
107
|
+
"@forinda/kickjs": "9.0.2",
|
|
108
108
|
"@forinda/kickjs-devtools-kit": "7.1.0",
|
|
109
|
-
"@forinda/kickjs-schema": "0.2.
|
|
109
|
+
"@forinda/kickjs-schema": "0.2.2"
|
|
110
110
|
},
|
|
111
111
|
"publishConfig": {
|
|
112
112
|
"access": "public"
|