@effect/sql-pg 4.0.0-beta.43 → 4.0.0-beta.45

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.
@@ -1,10 +1,10 @@
1
1
  import * as Config from "effect/Config";
2
+ import * as Context from "effect/Context";
2
3
  import * as Duration from "effect/Duration";
3
4
  import * as Effect from "effect/Effect";
4
5
  import * as Layer from "effect/Layer";
5
6
  import * as Redacted from "effect/Redacted";
6
7
  import * as Scope from "effect/Scope";
7
- import * as ServiceMap from "effect/ServiceMap";
8
8
  import * as Stream from "effect/Stream";
9
9
  import * as Reactivity from "effect/unstable/reactivity/Reactivity";
10
10
  import * as Client from "effect/unstable/sql/SqlClient";
@@ -40,7 +40,7 @@ export interface PgClient extends Client.SqlClient {
40
40
  * @category tags
41
41
  * @since 1.0.0
42
42
  */
43
- export declare const PgClient: ServiceMap.Service<PgClient, PgClient>;
43
+ export declare const PgClient: Context.Service<PgClient, PgClient>;
44
44
  /**
45
45
  * @category constructors
46
46
  * @since 1.0.0
@@ -1 +1 @@
1
- {"version":3,"file":"PgClient.d.ts","sourceRoot":"","sources":["../src/PgClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PgClient.d.ts","sourceRoot":"","sources":["../src/PgClient.ts"],"names":[],"mappings":"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"}
package/dist/PgClient.js CHANGED
@@ -5,6 +5,7 @@ import * as Arr from "effect/Array";
5
5
  import * as Cause from "effect/Cause";
6
6
  import * as Channel from "effect/Channel";
7
7
  import * as Config from "effect/Config";
8
+ import * as Context from "effect/Context";
8
9
  import * as Duration from "effect/Duration";
9
10
  import * as Effect from "effect/Effect";
10
11
  import * as Fiber from "effect/Fiber";
@@ -16,7 +17,6 @@ import * as RcRef from "effect/RcRef";
16
17
  import * as Redacted from "effect/Redacted";
17
18
  import * as Scope from "effect/Scope";
18
19
  import * as Semaphore from "effect/Semaphore";
19
- import * as ServiceMap from "effect/ServiceMap";
20
20
  import * as Stream from "effect/Stream";
21
21
  import * as Reactivity from "effect/unstable/reactivity/Reactivity";
22
22
  import * as Client from "effect/unstable/sql/SqlClient";
@@ -34,7 +34,7 @@ export const TypeId = "~@effect/sql-pg/PgClient";
34
34
  * @category tags
35
35
  * @since 1.0.0
36
36
  */
37
- export const PgClient = /*#__PURE__*/ServiceMap.Service("@effect/sql-pg/PgClient");
37
+ export const PgClient = /*#__PURE__*/Context.Service("@effect/sql-pg/PgClient");
38
38
  /**
39
39
  * @category constructors
40
40
  * @since 1.0.0
@@ -184,23 +184,30 @@ export const fromPool = /*#__PURE__*/Effect.fnUntraced(function* (options) {
184
184
  }, client ? Effect.succeed(client) : reserveRaw);
185
185
  const reserveRaw = Effect.callback(resume => {
186
186
  const fiber = Fiber.getCurrent();
187
- const scope = ServiceMap.getUnsafe(fiber.services, Scope.Scope);
187
+ const scope = Context.getUnsafe(fiber.context, Scope.Scope);
188
188
  let cause = undefined;
189
+ function onError(cause_) {
190
+ cause = cause_;
191
+ }
189
192
  pool.connect((err, client, release) => {
190
193
  if (err) {
191
- resume(Effect.fail(new SqlError({
194
+ return resume(Effect.fail(new SqlError({
192
195
  reason: classifyError(err, "Failed to acquire connection for transaction", "acquireConnection")
193
196
  })));
194
- } else {
195
- resume(Effect.as(Scope.addFinalizer(scope, Effect.sync(() => {
196
- client.off("error", onError);
197
- release(cause);
198
- })), client));
199
- }
200
- function onError(cause_) {
201
- cause = cause_;
197
+ } else if (!client) {
198
+ return resume(Effect.fail(new SqlError({
199
+ reason: new ConnectionError({
200
+ message: "Failed to acquire connection for transaction",
201
+ cause: new Error("No client returned"),
202
+ operation: "acquireConnection"
203
+ })
204
+ })));
202
205
  }
203
206
  client.on("error", onError);
207
+ resume(Effect.as(Scope.addFinalizer(scope, Effect.sync(() => {
208
+ client.off("error", onError);
209
+ release(cause);
210
+ })), client));
204
211
  });
205
212
  });
206
213
  const reserve = Effect.map(reserveRaw, makeConection);
@@ -447,7 +454,7 @@ const makeCancel = (pool, client) => {
447
454
  * @category layers
448
455
  * @since 1.0.0
449
456
  */
450
- export const layerFrom = acquire => Layer.effectServices(Effect.map(acquire, client => ServiceMap.make(PgClient, client).pipe(ServiceMap.add(Client.SqlClient, client)))).pipe(Layer.provide(Reactivity.layer));
457
+ export const layerFrom = acquire => Layer.effectContext(Effect.map(acquire, client => Context.make(PgClient, client).pipe(Context.add(Client.SqlClient, client)))).pipe(Layer.provide(Reactivity.layer));
451
458
  /**
452
459
  * @category layers
453
460
  * @since 1.0.0
@@ -1 +1 @@
1
- {"version":3,"file":"PgClient.js","names":["Arr","Cause","Channel","Config","Duration","Effect","Fiber","Layer","Number","Option","Queue","RcRef","Redacted","Scope","Semaphore","ServiceMap","Stream","Reactivity","Client","AuthenticationError","AuthorizationError","ConnectionError","ConstraintError","DeadlockError","LockTimeoutError","SerializationError","SqlError","SqlSyntaxError","StatementTimeoutError","UnknownError","Statement","Pg","PgConnString","Cursor","TypeId","PgClient","Service","make","options","fromPool","acquire","gen","pool","Pool","connectionString","url","value","undefined","user","username","host","database","password","ssl","port","stream","connectionTimeoutMillis","connectTimeout","toMillis","fromInputUnsafe","idleTimeoutMillis","idleTimeout","max","maxConnections","min","minConnections","maxLifetimeSeconds","connectionTTL","toSeconds","application_name","applicationName","types","on","_err","acquireRelease","tryPromise","try","query","catch","cause","reason","classifyError","promise","end","pipe","timeoutOption","timeoutOrElse","duration","seconds","orElse","fail","Error","message","operation","makeClient","fromClient","client","acquireForStream","fnUntraced","makeConection","ConnectionImpl","runWithClient","f","callback","resume","makeCancel","done","cancel","onError","cleanup","release","off","connect","client_","once","eff","suspend","void","ensuring","sync","succeed","reserveRaw","fiber","getCurrent","scope","getUnsafe","services","err","as","addFinalizer","cause_","reserve","map","onListenClientError","_","listenAcquirer","config","parsed","parse","getOrUndefined","makeWith","acquirer","transactionAcquirer","get","spanAttributes","transformResultNames","transformQueryNames","transformJson","acquireWithErrorHandler","tap","semaphore","makeUnsafe","streamClient","take","connection","withPermit","compiler","makeCompiler","transformRows","defaultTransforms","array","Object","assign","entries","ATTR_DB_SYSTEM_NAME","ATTR_DB_NAMESPACE","ATTR_SERVER_ADDRESS","ATTR_SERVER_PORT","json","fragment","PgJson","listen","channel","queue","onNotification","msg","payload","offerUnsafe","escapeIdentifier","notify","asVoid","scoped","flatMap","conn","executeRaw","constructor","run","params","result","Array","isArray","r","rows","execute","sql","executeWithoutTransform","executeValues","text","rowMode","values","executeUnprepared","executeStream","self","fromChannel","fromTransform","provide","cursor","close","read","isArrayNonEmpty","cancelEffects","WeakMap","has","processId","processID","ending","interruptible","set","layerFrom","effectServices","add","SqlClient","layer","layerConfig","unwrap","asEffect","transform","transformValue","dialect","placeholder","onIdentifier","withoutTransform","escape","onRecordUpdate","placeholders","valueAlias","valueColumns","returning","flat","concat","onCustom","type","kind","paramA","defaultEscape","custom","pgCodeFromCause","code","props","startsWith"],"sources":["../src/PgClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"PgClient.js","names":["Arr","Cause","Channel","Config","Context","Duration","Effect","Fiber","Layer","Number","Option","Queue","RcRef","Redacted","Scope","Semaphore","Stream","Reactivity","Client","AuthenticationError","AuthorizationError","ConnectionError","ConstraintError","DeadlockError","LockTimeoutError","SerializationError","SqlError","SqlSyntaxError","StatementTimeoutError","UnknownError","Statement","Pg","PgConnString","Cursor","TypeId","PgClient","Service","make","options","fromPool","acquire","gen","pool","Pool","connectionString","url","value","undefined","user","username","host","database","password","ssl","port","stream","connectionTimeoutMillis","connectTimeout","toMillis","fromInputUnsafe","idleTimeoutMillis","idleTimeout","max","maxConnections","min","minConnections","maxLifetimeSeconds","connectionTTL","toSeconds","application_name","applicationName","types","on","_err","acquireRelease","tryPromise","try","query","catch","cause","reason","classifyError","promise","end","pipe","timeoutOption","timeoutOrElse","duration","seconds","orElse","fail","Error","message","operation","makeClient","fromClient","client","acquireForStream","fnUntraced","makeConection","ConnectionImpl","runWithClient","f","callback","resume","makeCancel","done","cancel","onError","cleanup","release","off","connect","client_","once","eff","suspend","void","ensuring","sync","succeed","reserveRaw","fiber","getCurrent","scope","getUnsafe","context","cause_","err","as","addFinalizer","reserve","map","onListenClientError","_","listenAcquirer","config","parsed","parse","getOrUndefined","makeWith","acquirer","transactionAcquirer","get","spanAttributes","transformResultNames","transformQueryNames","transformJson","acquireWithErrorHandler","tap","semaphore","makeUnsafe","streamClient","take","connection","withPermit","compiler","makeCompiler","transformRows","defaultTransforms","array","Object","assign","entries","ATTR_DB_SYSTEM_NAME","ATTR_DB_NAMESPACE","ATTR_SERVER_ADDRESS","ATTR_SERVER_PORT","json","fragment","PgJson","listen","channel","queue","onNotification","msg","payload","offerUnsafe","escapeIdentifier","notify","asVoid","scoped","flatMap","conn","executeRaw","constructor","run","params","result","Array","isArray","r","rows","execute","sql","executeWithoutTransform","executeValues","text","rowMode","values","executeUnprepared","executeStream","self","fromChannel","fromTransform","provide","cursor","close","read","isArrayNonEmpty","cancelEffects","WeakMap","has","processId","processID","ending","interruptible","set","layerFrom","effectContext","add","SqlClient","layer","layerConfig","unwrap","asEffect","transform","transformValue","dialect","placeholder","onIdentifier","withoutTransform","escape","onRecordUpdate","placeholders","valueAlias","valueColumns","returning","flat","concat","onCustom","type","kind","paramA","defaultEscape","custom","pgCodeFromCause","code","props","startsWith"],"sources":["../src/PgClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect/sql-pg",
3
- "version": "4.0.0-beta.43",
3
+ "version": "4.0.0-beta.45",
4
4
  "type": "module",
5
5
  "license": "MIT",
6
6
  "description": "A PostgreSQL toolkit for Effect",
@@ -46,10 +46,10 @@
46
46
  "@testcontainers/postgresql": "^11.11.0",
47
47
  "@types/pg": "^8.16.0",
48
48
  "@types/pg-cursor": "^2.7.2",
49
- "effect": "^4.0.0-beta.43"
49
+ "effect": "^4.0.0-beta.45"
50
50
  },
51
51
  "peerDependencies": {
52
- "effect": "^4.0.0-beta.43"
52
+ "effect": "^4.0.0-beta.45"
53
53
  },
54
54
  "dependencies": {
55
55
  "pg": "^8.18.0",
package/src/PgClient.ts CHANGED
@@ -5,6 +5,7 @@ import * as Arr from "effect/Array"
5
5
  import * as Cause from "effect/Cause"
6
6
  import * as Channel from "effect/Channel"
7
7
  import * as Config from "effect/Config"
8
+ import * as Context from "effect/Context"
8
9
  import * as Duration from "effect/Duration"
9
10
  import * as Effect from "effect/Effect"
10
11
  import * as Fiber from "effect/Fiber"
@@ -16,7 +17,6 @@ import * as RcRef from "effect/RcRef"
16
17
  import * as Redacted from "effect/Redacted"
17
18
  import * as Scope from "effect/Scope"
18
19
  import * as Semaphore from "effect/Semaphore"
19
- import * as ServiceMap from "effect/ServiceMap"
20
20
  import * as Stream from "effect/Stream"
21
21
  import * as Reactivity from "effect/unstable/reactivity/Reactivity"
22
22
  import * as Client from "effect/unstable/sql/SqlClient"
@@ -71,7 +71,7 @@ export interface PgClient extends Client.SqlClient {
71
71
  * @category tags
72
72
  * @since 1.0.0
73
73
  */
74
- export const PgClient = ServiceMap.Service<PgClient>("@effect/sql-pg/PgClient")
74
+ export const PgClient = Context.Service<PgClient>("@effect/sql-pg/PgClient")
75
75
 
76
76
  /**
77
77
  * @category constructors
@@ -321,11 +321,14 @@ export const fromPool = Effect.fnUntraced(function*(
321
321
 
322
322
  const reserveRaw = Effect.callback<Pg.PoolClient, SqlError, Scope.Scope>((resume) => {
323
323
  const fiber = Fiber.getCurrent()!
324
- const scope = ServiceMap.getUnsafe(fiber.services, Scope.Scope)
324
+ const scope = Context.getUnsafe(fiber.context, Scope.Scope)
325
325
  let cause: Error | undefined = undefined
326
+ function onError(cause_: Error) {
327
+ cause = cause_
328
+ }
326
329
  pool.connect((err, client, release) => {
327
330
  if (err) {
328
- resume(
331
+ return resume(
329
332
  Effect.fail(
330
333
  new SqlError({
331
334
  reason: classifyError(
@@ -336,22 +339,30 @@ export const fromPool = Effect.fnUntraced(function*(
336
339
  })
337
340
  )
338
341
  )
339
- } else {
340
- resume(Effect.as(
341
- Scope.addFinalizer(
342
- scope,
343
- Effect.sync(() => {
344
- client!.off("error", onError)
345
- release(cause)
342
+ } else if (!client) {
343
+ return resume(
344
+ Effect.fail(
345
+ new SqlError({
346
+ reason: new ConnectionError({
347
+ message: "Failed to acquire connection for transaction",
348
+ cause: new Error("No client returned"),
349
+ operation: "acquireConnection"
350
+ })
346
351
  })
347
- ),
348
- client!
349
- ))
350
- }
351
- function onError(cause_: Error) {
352
- cause = cause_
352
+ )
353
+ )
353
354
  }
354
- client!.on("error", onError)
355
+ client.on("error", onError)
356
+ resume(Effect.as(
357
+ Scope.addFinalizer(
358
+ scope,
359
+ Effect.sync(() => {
360
+ client.off("error", onError)
361
+ release(cause)
362
+ })
363
+ ),
364
+ client
365
+ ))
355
366
  })
356
367
  })
357
368
  const reserve = Effect.map(reserveRaw, makeConection)
@@ -718,10 +729,10 @@ const makeCancel = (pool: Pg.Pool, client: Pg.PoolClient) => {
718
729
  export const layerFrom = <E, R>(
719
730
  acquire: Effect.Effect<PgClient, E, R>
720
731
  ): Layer.Layer<PgClient | Client.SqlClient, E, Exclude<R, Scope.Scope | Reactivity.Reactivity>> =>
721
- Layer.effectServices(
732
+ Layer.effectContext(
722
733
  Effect.map(acquire, (client) =>
723
- ServiceMap.make(PgClient, client).pipe(
724
- ServiceMap.add(Client.SqlClient, client)
734
+ Context.make(PgClient, client).pipe(
735
+ Context.add(Client.SqlClient, client)
725
736
  ))
726
737
  ).pipe(Layer.provide(Reactivity.layer)) as any
727
738