@effect/sql-mysql2 0.21.12 → 0.22.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/dist/cjs/MysqlClient.js +17 -23
- package/dist/cjs/MysqlClient.js.map +1 -1
- package/dist/dts/MysqlClient.d.ts +2 -1
- package/dist/dts/MysqlClient.d.ts.map +1 -1
- package/dist/esm/MysqlClient.js +17 -23
- package/dist/esm/MysqlClient.js.map +1 -1
- package/package.json +3 -3
- package/src/MysqlClient.ts +37 -26
package/dist/cjs/MysqlClient.js
CHANGED
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.makeCompiler = exports.make = exports.layerConfig = exports.layer = exports.TypeId = exports.MysqlClient = void 0;
|
|
7
|
+
var Reactivity = _interopRequireWildcard(require("@effect/experimental/Reactivity"));
|
|
7
8
|
var Client = _interopRequireWildcard(require("@effect/sql/SqlClient"));
|
|
8
9
|
var _SqlError = require("@effect/sql/SqlError");
|
|
9
10
|
var _SqlStream = require("@effect/sql/SqlStream");
|
|
@@ -40,7 +41,7 @@ const MysqlClient = exports.MysqlClient = /*#__PURE__*/Context.GenericTag("@effe
|
|
|
40
41
|
*/
|
|
41
42
|
const make = options => Effect.gen(function* () {
|
|
42
43
|
const compiler = makeCompiler(options.transformQueryNames);
|
|
43
|
-
const transformRows = Statement.defaultTransforms(options.transformResultNames).array;
|
|
44
|
+
const transformRows = options.transformResultNames ? Statement.defaultTransforms(options.transformResultNames).array : undefined;
|
|
44
45
|
class ConnectionImpl {
|
|
45
46
|
conn;
|
|
46
47
|
constructor(conn) {
|
|
@@ -65,32 +66,24 @@ const make = options => Effect.gen(function* () {
|
|
|
65
66
|
});
|
|
66
67
|
});
|
|
67
68
|
}
|
|
68
|
-
run(sql, values,
|
|
69
|
-
return this.runRaw(sql, values, rowsAsArray, method).pipe(Effect.map(results =>
|
|
70
|
-
if (transform && !rowsAsArray && options.transformResultNames) {
|
|
71
|
-
return transformRows(results);
|
|
72
|
-
}
|
|
73
|
-
return Array.isArray(results) ? results : [];
|
|
74
|
-
}));
|
|
69
|
+
run(sql, values, rowsAsArray = false, method = "execute") {
|
|
70
|
+
return this.runRaw(sql, values, rowsAsArray, method).pipe(Effect.map(results => Array.isArray(results) ? results : []));
|
|
75
71
|
}
|
|
76
|
-
execute(sql, params) {
|
|
77
|
-
return this.run(sql, params);
|
|
72
|
+
execute(sql, params, transformRows) {
|
|
73
|
+
return transformRows ? Effect.map(this.run(sql, params), transformRows) : this.run(sql, params);
|
|
78
74
|
}
|
|
79
75
|
executeRaw(sql, params) {
|
|
80
|
-
return this.runRaw(sql, params
|
|
81
|
-
}
|
|
82
|
-
executeWithoutTransform(sql, params) {
|
|
83
|
-
return this.run(sql, params, false);
|
|
76
|
+
return this.runRaw(sql, params);
|
|
84
77
|
}
|
|
85
78
|
executeValues(sql, params) {
|
|
86
|
-
return this.run(sql, params, true
|
|
79
|
+
return this.run(sql, params, true);
|
|
87
80
|
}
|
|
88
|
-
executeUnprepared(sql, params) {
|
|
89
|
-
return this.run(sql, params,
|
|
81
|
+
executeUnprepared(sql, params, transformRows) {
|
|
82
|
+
return transformRows ? Effect.map(this.run(sql, params, false, "query"), transformRows) : this.run(sql, params, false, "query");
|
|
90
83
|
}
|
|
91
|
-
executeStream(sql, params) {
|
|
84
|
+
executeStream(sql, params, transformRows) {
|
|
92
85
|
const stream = queryStream(this.conn, sql, params);
|
|
93
|
-
return
|
|
86
|
+
return transformRows ? Stream.mapChunks(stream, _ => Chunk.unsafeFromArray(transformRows(Chunk.toReadonlyArray(_)))) : stream;
|
|
94
87
|
}
|
|
95
88
|
}
|
|
96
89
|
const pool = options.url ? Mysql.createPool({
|
|
@@ -142,11 +135,12 @@ const make = options => Effect.gen(function* () {
|
|
|
142
135
|
if (options.database) {
|
|
143
136
|
spanAttributes.push([Otel.SEMATTRS_DB_NAME, options.database]);
|
|
144
137
|
}
|
|
145
|
-
return Object.assign(Client.make({
|
|
138
|
+
return Object.assign(yield* Client.make({
|
|
146
139
|
acquirer: Effect.succeed(poolConnection),
|
|
147
140
|
transactionAcquirer,
|
|
148
141
|
compiler,
|
|
149
|
-
spanAttributes
|
|
142
|
+
spanAttributes,
|
|
143
|
+
transformRows
|
|
150
144
|
}), {
|
|
151
145
|
[TypeId]: TypeId,
|
|
152
146
|
config: options
|
|
@@ -157,13 +151,13 @@ const make = options => Effect.gen(function* () {
|
|
|
157
151
|
* @since 1.0.0
|
|
158
152
|
*/
|
|
159
153
|
exports.make = make;
|
|
160
|
-
const layerConfig = config => Layer.scopedContext(Config.unwrap(config).pipe(Effect.flatMap(make), Effect.map(client => Context.make(MysqlClient, client).pipe(Context.add(Client.SqlClient, client)))));
|
|
154
|
+
const layerConfig = config => Layer.scopedContext(Config.unwrap(config).pipe(Effect.flatMap(make), Effect.map(client => Context.make(MysqlClient, client).pipe(Context.add(Client.SqlClient, client))))).pipe(Layer.provide(Reactivity.layer));
|
|
161
155
|
/**
|
|
162
156
|
* @category layers
|
|
163
157
|
* @since 1.0.0
|
|
164
158
|
*/
|
|
165
159
|
exports.layerConfig = layerConfig;
|
|
166
|
-
const layer = config => Layer.scopedContext(Effect.map(make(config), client => Context.make(MysqlClient, client).pipe(Context.add(Client.SqlClient, client))));
|
|
160
|
+
const layer = config => Layer.scopedContext(Effect.map(make(config), client => Context.make(MysqlClient, client).pipe(Context.add(Client.SqlClient, client)))).pipe(Layer.provide(Reactivity.layer));
|
|
167
161
|
/**
|
|
168
162
|
* @category compiler
|
|
169
163
|
* @since 1.0.0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MysqlClient.js","names":["Client","_interopRequireWildcard","require","_SqlError","_SqlStream","Statement","Otel","Chunk","Config","Context","Duration","Effect","Layer","Redacted","Stream","Mysql","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","MysqlClient","GenericTag","make","options","gen","compiler","makeCompiler","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","ConnectionImpl","conn","constructor","runRaw","sql","values","rowsAsArray","method","async","resume","cause","results","_fields","fail","SqlError","message","succeed","run","transform","pipe","map","Array","isArray","execute","params","executeRaw","executeWithoutTransform","executeValues","executeUnprepared","executeStream","stream","queryStream","mapChunks","_","unsafeFromArray","toReadonlyArray","pool","url","createPool","uri","value","multipleStatements","connectionLimit","maxConnections","idleTimeout","connectionTTL","toMillis","undefined","poolConfig","host","port","database","user","username","password","acquireRelease","void","end","poolConnection","acquireConn","getConnection","sync","release","transactionAcquirer","spanAttributes","entries","SEMATTRS_DB_SYSTEM","DBSYSTEMVALUES_MYSQL","push","SEMATTRS_DB_NAME","assign","acquirer","config","layerConfig","scopedContext","unwrap","flatMap","client","add","SqlClient","layer","dialect","placeholder","onIdentifier","withoutTransform","escape","onCustom","onRecordUpdate","defaultEscape","asyncPauseResume","emit","query","buffer","taskPending","on","row","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/MysqlClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"MysqlClient.js","names":["Reactivity","_interopRequireWildcard","require","Client","_SqlError","_SqlStream","Statement","Otel","Chunk","Config","Context","Duration","Effect","Layer","Redacted","Stream","Mysql","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","MysqlClient","GenericTag","make","options","gen","compiler","makeCompiler","transformQueryNames","transformRows","transformResultNames","defaultTransforms","array","undefined","ConnectionImpl","conn","constructor","runRaw","sql","values","rowsAsArray","method","async","resume","cause","results","_fields","fail","SqlError","message","succeed","run","pipe","map","Array","isArray","execute","params","executeRaw","executeValues","executeUnprepared","executeStream","stream","queryStream","mapChunks","_","unsafeFromArray","toReadonlyArray","pool","url","createPool","uri","value","multipleStatements","connectionLimit","maxConnections","idleTimeout","connectionTTL","toMillis","poolConfig","host","port","database","user","username","password","acquireRelease","void","end","poolConnection","acquireConn","getConnection","sync","release","transactionAcquirer","spanAttributes","entries","SEMATTRS_DB_SYSTEM","DBSYSTEMVALUES_MYSQL","push","SEMATTRS_DB_NAME","assign","acquirer","config","layerConfig","scopedContext","unwrap","flatMap","client","add","SqlClient","provide","layer","transform","dialect","placeholder","onIdentifier","withoutTransform","escape","onCustom","onRecordUpdate","defaultEscape","asyncPauseResume","emit","query","buffer","taskPending","on","row","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/MysqlClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
+
import * as Reactivity from "@effect/experimental/Reactivity";
|
|
4
5
|
import * as Client from "@effect/sql/SqlClient";
|
|
5
6
|
import { SqlError } from "@effect/sql/SqlError";
|
|
6
7
|
import * as Statement from "@effect/sql/Statement";
|
|
@@ -61,7 +62,7 @@ export interface MysqlClientConfig {
|
|
|
61
62
|
* @category constructors
|
|
62
63
|
* @since 1.0.0
|
|
63
64
|
*/
|
|
64
|
-
export declare const make: (options: MysqlClientConfig) => Effect.Effect<MysqlClient, SqlError, Scope>;
|
|
65
|
+
export declare const make: (options: MysqlClientConfig) => Effect.Effect<MysqlClient, SqlError, Scope | Reactivity.Reactivity>;
|
|
65
66
|
/**
|
|
66
67
|
* @category layers
|
|
67
68
|
* @since 1.0.0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MysqlClient.d.ts","sourceRoot":"","sources":["../../src/MysqlClient.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;AAE/C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAGlD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAEzC,OAAO,KAAK,KAAK,MAAM,QAAQ,CAAA;AAE/B;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,OAAO,MAAqD,CAAA;AAEjF;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAA;AAElC;;;GAGG;AACH,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,SAAS;IACnD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAA;CACnC;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,uCAAoE,CAAA;AAE5F;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAAG,SAAS,CAAA;IAE5C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAAG,SAAS,CAAA;IAEjD,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5C,QAAQ,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;IAE3D,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,WAAW,GAAG,SAAS,CAAA;IAEnD,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;IAE7D,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;IACrE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;CACrE;AAED;;;GAGG;AACH,eAAO,MAAM,IAAI,YACN,iBAAiB,KACzB,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"MysqlClient.d.ts","sourceRoot":"","sources":["../../src/MysqlClient.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/MysqlClient.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
+
import * as Reactivity from "@effect/experimental/Reactivity";
|
|
4
5
|
import * as Client from "@effect/sql/SqlClient";
|
|
5
6
|
import { SqlError } from "@effect/sql/SqlError";
|
|
6
7
|
import { asyncPauseResume } from "@effect/sql/SqlStream";
|
|
@@ -31,7 +32,7 @@ export const MysqlClient = /*#__PURE__*/Context.GenericTag("@effect/sql-mysql2/M
|
|
|
31
32
|
*/
|
|
32
33
|
export const make = options => Effect.gen(function* () {
|
|
33
34
|
const compiler = makeCompiler(options.transformQueryNames);
|
|
34
|
-
const transformRows = Statement.defaultTransforms(options.transformResultNames).array;
|
|
35
|
+
const transformRows = options.transformResultNames ? Statement.defaultTransforms(options.transformResultNames).array : undefined;
|
|
35
36
|
class ConnectionImpl {
|
|
36
37
|
conn;
|
|
37
38
|
constructor(conn) {
|
|
@@ -56,32 +57,24 @@ export const make = options => Effect.gen(function* () {
|
|
|
56
57
|
});
|
|
57
58
|
});
|
|
58
59
|
}
|
|
59
|
-
run(sql, values,
|
|
60
|
-
return this.runRaw(sql, values, rowsAsArray, method).pipe(Effect.map(results =>
|
|
61
|
-
if (transform && !rowsAsArray && options.transformResultNames) {
|
|
62
|
-
return transformRows(results);
|
|
63
|
-
}
|
|
64
|
-
return Array.isArray(results) ? results : [];
|
|
65
|
-
}));
|
|
60
|
+
run(sql, values, rowsAsArray = false, method = "execute") {
|
|
61
|
+
return this.runRaw(sql, values, rowsAsArray, method).pipe(Effect.map(results => Array.isArray(results) ? results : []));
|
|
66
62
|
}
|
|
67
|
-
execute(sql, params) {
|
|
68
|
-
return this.run(sql, params);
|
|
63
|
+
execute(sql, params, transformRows) {
|
|
64
|
+
return transformRows ? Effect.map(this.run(sql, params), transformRows) : this.run(sql, params);
|
|
69
65
|
}
|
|
70
66
|
executeRaw(sql, params) {
|
|
71
|
-
return this.runRaw(sql, params
|
|
72
|
-
}
|
|
73
|
-
executeWithoutTransform(sql, params) {
|
|
74
|
-
return this.run(sql, params, false);
|
|
67
|
+
return this.runRaw(sql, params);
|
|
75
68
|
}
|
|
76
69
|
executeValues(sql, params) {
|
|
77
|
-
return this.run(sql, params, true
|
|
70
|
+
return this.run(sql, params, true);
|
|
78
71
|
}
|
|
79
|
-
executeUnprepared(sql, params) {
|
|
80
|
-
return this.run(sql, params,
|
|
72
|
+
executeUnprepared(sql, params, transformRows) {
|
|
73
|
+
return transformRows ? Effect.map(this.run(sql, params, false, "query"), transformRows) : this.run(sql, params, false, "query");
|
|
81
74
|
}
|
|
82
|
-
executeStream(sql, params) {
|
|
75
|
+
executeStream(sql, params, transformRows) {
|
|
83
76
|
const stream = queryStream(this.conn, sql, params);
|
|
84
|
-
return
|
|
77
|
+
return transformRows ? Stream.mapChunks(stream, _ => Chunk.unsafeFromArray(transformRows(Chunk.toReadonlyArray(_)))) : stream;
|
|
85
78
|
}
|
|
86
79
|
}
|
|
87
80
|
const pool = options.url ? Mysql.createPool({
|
|
@@ -133,11 +126,12 @@ export const make = options => Effect.gen(function* () {
|
|
|
133
126
|
if (options.database) {
|
|
134
127
|
spanAttributes.push([Otel.SEMATTRS_DB_NAME, options.database]);
|
|
135
128
|
}
|
|
136
|
-
return Object.assign(Client.make({
|
|
129
|
+
return Object.assign(yield* Client.make({
|
|
137
130
|
acquirer: Effect.succeed(poolConnection),
|
|
138
131
|
transactionAcquirer,
|
|
139
132
|
compiler,
|
|
140
|
-
spanAttributes
|
|
133
|
+
spanAttributes,
|
|
134
|
+
transformRows
|
|
141
135
|
}), {
|
|
142
136
|
[TypeId]: TypeId,
|
|
143
137
|
config: options
|
|
@@ -147,12 +141,12 @@ export const make = options => Effect.gen(function* () {
|
|
|
147
141
|
* @category layers
|
|
148
142
|
* @since 1.0.0
|
|
149
143
|
*/
|
|
150
|
-
export const layerConfig = config => Layer.scopedContext(Config.unwrap(config).pipe(Effect.flatMap(make), Effect.map(client => Context.make(MysqlClient, client).pipe(Context.add(Client.SqlClient, client)))));
|
|
144
|
+
export const layerConfig = config => Layer.scopedContext(Config.unwrap(config).pipe(Effect.flatMap(make), Effect.map(client => Context.make(MysqlClient, client).pipe(Context.add(Client.SqlClient, client))))).pipe(Layer.provide(Reactivity.layer));
|
|
151
145
|
/**
|
|
152
146
|
* @category layers
|
|
153
147
|
* @since 1.0.0
|
|
154
148
|
*/
|
|
155
|
-
export const layer = config => Layer.scopedContext(Effect.map(make(config), client => Context.make(MysqlClient, client).pipe(Context.add(Client.SqlClient, client))));
|
|
149
|
+
export const layer = config => Layer.scopedContext(Effect.map(make(config), client => Context.make(MysqlClient, client).pipe(Context.add(Client.SqlClient, client)))).pipe(Layer.provide(Reactivity.layer));
|
|
156
150
|
/**
|
|
157
151
|
* @category compiler
|
|
158
152
|
* @since 1.0.0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MysqlClient.js","names":["Client","SqlError","asyncPauseResume","Statement","Otel","Chunk","Config","Context","Duration","Effect","Layer","Redacted","Stream","Mysql","TypeId","Symbol","for","MysqlClient","GenericTag","make","options","gen","compiler","makeCompiler","transformQueryNames","transformRows","
|
|
1
|
+
{"version":3,"file":"MysqlClient.js","names":["Reactivity","Client","SqlError","asyncPauseResume","Statement","Otel","Chunk","Config","Context","Duration","Effect","Layer","Redacted","Stream","Mysql","TypeId","Symbol","for","MysqlClient","GenericTag","make","options","gen","compiler","makeCompiler","transformQueryNames","transformRows","transformResultNames","defaultTransforms","array","undefined","ConnectionImpl","conn","constructor","runRaw","sql","values","rowsAsArray","method","async","resume","cause","results","_fields","fail","message","succeed","run","pipe","map","Array","isArray","execute","params","executeRaw","executeValues","executeUnprepared","executeStream","stream","queryStream","mapChunks","_","unsafeFromArray","toReadonlyArray","pool","url","createPool","uri","value","multipleStatements","connectionLimit","maxConnections","idleTimeout","connectionTTL","toMillis","poolConfig","host","port","database","user","username","password","acquireRelease","void","end","poolConnection","acquireConn","getConnection","sync","release","transactionAcquirer","spanAttributes","Object","entries","SEMATTRS_DB_SYSTEM","DBSYSTEMVALUES_MYSQL","push","SEMATTRS_DB_NAME","assign","acquirer","config","layerConfig","scopedContext","unwrap","flatMap","client","add","SqlClient","provide","layer","transform","dialect","placeholder","onIdentifier","withoutTransform","escape","onCustom","onRecordUpdate","defaultEscape","emit","query","buffer","taskPending","on","row","queueMicrotask","items","onInterrupt","destroy","onPause","pause","onResume"],"sources":["../../src/MysqlClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect/sql-mysql2",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.22.1",
|
|
4
4
|
"description": "A MySQL toolkit for Effect",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
"mysql2": "^3.11.0"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
|
-
"@effect/platform": "^0.69.
|
|
18
|
-
"@effect/sql": "^0.
|
|
17
|
+
"@effect/platform": "^0.69.30",
|
|
18
|
+
"@effect/sql": "^0.21.1",
|
|
19
19
|
"effect": "^3.10.19"
|
|
20
20
|
},
|
|
21
21
|
"publishConfig": {
|
package/src/MysqlClient.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
+
import * as Reactivity from "@effect/experimental/Reactivity"
|
|
4
5
|
import * as Client from "@effect/sql/SqlClient"
|
|
5
6
|
import type { Connection } from "@effect/sql/SqlConnection"
|
|
6
7
|
import { SqlError } from "@effect/sql/SqlError"
|
|
@@ -79,12 +80,14 @@ export interface MysqlClientConfig {
|
|
|
79
80
|
*/
|
|
80
81
|
export const make = (
|
|
81
82
|
options: MysqlClientConfig
|
|
82
|
-
): Effect.Effect<MysqlClient, SqlError, Scope> =>
|
|
83
|
+
): Effect.Effect<MysqlClient, SqlError, Scope | Reactivity.Reactivity> =>
|
|
83
84
|
Effect.gen(function*() {
|
|
84
85
|
const compiler = makeCompiler(options.transformQueryNames)
|
|
85
|
-
const transformRows =
|
|
86
|
-
|
|
87
|
-
|
|
86
|
+
const transformRows = options.transformResultNames ?
|
|
87
|
+
Statement.defaultTransforms(
|
|
88
|
+
options.transformResultNames
|
|
89
|
+
).array :
|
|
90
|
+
undefined
|
|
88
91
|
|
|
89
92
|
class ConnectionImpl implements Connection {
|
|
90
93
|
constructor(private readonly conn: Mysql.PoolConnection | Mysql.Pool) {}
|
|
@@ -113,38 +116,45 @@ export const make = (
|
|
|
113
116
|
private run(
|
|
114
117
|
sql: string,
|
|
115
118
|
values?: ReadonlyArray<any>,
|
|
116
|
-
transform = true,
|
|
117
119
|
rowsAsArray = false,
|
|
118
120
|
method: "execute" | "query" = "execute"
|
|
119
121
|
) {
|
|
120
122
|
return this.runRaw(sql, values, rowsAsArray, method).pipe(
|
|
121
|
-
Effect.map((results) =>
|
|
122
|
-
if (transform && !rowsAsArray && options.transformResultNames) {
|
|
123
|
-
return transformRows(results as ReadonlyArray<any>)
|
|
124
|
-
}
|
|
125
|
-
return Array.isArray(results) ? results : []
|
|
126
|
-
})
|
|
123
|
+
Effect.map((results) => Array.isArray(results) ? results : [])
|
|
127
124
|
)
|
|
128
125
|
}
|
|
129
126
|
|
|
130
|
-
execute(
|
|
131
|
-
|
|
127
|
+
execute(
|
|
128
|
+
sql: string,
|
|
129
|
+
params: ReadonlyArray<Statement.Primitive>,
|
|
130
|
+
transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
|
|
131
|
+
) {
|
|
132
|
+
return transformRows
|
|
133
|
+
? Effect.map(this.run(sql, params), transformRows)
|
|
134
|
+
: this.run(sql, params)
|
|
132
135
|
}
|
|
133
136
|
executeRaw(sql: string, params: ReadonlyArray<Statement.Primitive>) {
|
|
134
|
-
return this.runRaw(sql, params
|
|
135
|
-
}
|
|
136
|
-
executeWithoutTransform(sql: string, params: ReadonlyArray<Statement.Primitive>) {
|
|
137
|
-
return this.run(sql, params, false)
|
|
137
|
+
return this.runRaw(sql, params)
|
|
138
138
|
}
|
|
139
139
|
executeValues(sql: string, params: ReadonlyArray<Statement.Primitive>) {
|
|
140
|
-
return this.run(sql, params, true
|
|
140
|
+
return this.run(sql, params, true)
|
|
141
141
|
}
|
|
142
|
-
executeUnprepared(
|
|
143
|
-
|
|
142
|
+
executeUnprepared(
|
|
143
|
+
sql: string,
|
|
144
|
+
params: ReadonlyArray<Statement.Primitive>,
|
|
145
|
+
transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
|
|
146
|
+
) {
|
|
147
|
+
return transformRows
|
|
148
|
+
? Effect.map(this.run(sql, params, false, "query"), transformRows)
|
|
149
|
+
: this.run(sql, params, false, "query")
|
|
144
150
|
}
|
|
145
|
-
executeStream(
|
|
151
|
+
executeStream(
|
|
152
|
+
sql: string,
|
|
153
|
+
params: ReadonlyArray<Statement.Primitive>,
|
|
154
|
+
transformRows: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
|
|
155
|
+
) {
|
|
146
156
|
const stream = queryStream(this.conn as any, sql, params)
|
|
147
|
-
return
|
|
157
|
+
return transformRows
|
|
148
158
|
? Stream.mapChunks(stream, (_) =>
|
|
149
159
|
Chunk.unsafeFromArray(
|
|
150
160
|
transformRows(Chunk.toReadonlyArray(_) as Array<object>)
|
|
@@ -231,11 +241,12 @@ export const make = (
|
|
|
231
241
|
}
|
|
232
242
|
|
|
233
243
|
return Object.assign(
|
|
234
|
-
Client.make({
|
|
244
|
+
yield* Client.make({
|
|
235
245
|
acquirer: Effect.succeed(poolConnection),
|
|
236
246
|
transactionAcquirer,
|
|
237
247
|
compiler,
|
|
238
|
-
spanAttributes
|
|
248
|
+
spanAttributes,
|
|
249
|
+
transformRows
|
|
239
250
|
}),
|
|
240
251
|
{ [TypeId]: TypeId as TypeId, config: options }
|
|
241
252
|
)
|
|
@@ -257,7 +268,7 @@ export const layerConfig = (
|
|
|
257
268
|
)
|
|
258
269
|
)
|
|
259
270
|
)
|
|
260
|
-
)
|
|
271
|
+
).pipe(Layer.provide(Reactivity.layer))
|
|
261
272
|
|
|
262
273
|
/**
|
|
263
274
|
* @category layers
|
|
@@ -271,7 +282,7 @@ export const layer = (
|
|
|
271
282
|
Context.make(MysqlClient, client).pipe(
|
|
272
283
|
Context.add(Client.SqlClient, client)
|
|
273
284
|
))
|
|
274
|
-
)
|
|
285
|
+
).pipe(Layer.provide(Reactivity.layer))
|
|
275
286
|
|
|
276
287
|
/**
|
|
277
288
|
* @category compiler
|