@konker.dev/middleware-fp 0.10.0 → 0.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konker.dev/middleware-fp",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "type": "module",
   "author": "Konrad Markus <mail@konker.dev>",
   "license": "ISC",
@@ -136,18 +136,14 @@
       "types": "./dist/http/contrib/requestResponseLogger.d.ts",
       "import": "./dist/http/contrib/requestResponseLogger.js"
     },
+    "./http/contrib/requestSpan": {
+      "types": "./dist/http/contrib/requestSpan.d.ts",
+      "import": "./dist/http/contrib/requestSpan.js"
+    },
     "./http/contrib/responseProcessor": {
       "types": "./dist/http/contrib/responseProcessor.d.ts",
       "import": "./dist/http/contrib/responseProcessor.js"
     },
-    "./http/contrib/sqlClientInitPg": {
-      "types": "./dist/http/contrib/sqlClientInitPg/index.d.ts",
-      "import": "./dist/http/contrib/sqlClientInitPg/index.js"
-    },
-    "./http/contrib/sqlClientInitPg/lib": {
-      "types": "./dist/http/contrib/sqlClientInitPg/lib.d.ts",
-      "import": "./dist/http/contrib/sqlClientInitPg/lib.js"
-    },
     "./http/contrib/standardRequestResponseAdapter": {
       "types": "./dist/http/contrib/standardRequestResponseAdapter.d.ts",
       "import": "./dist/http/contrib/standardRequestResponseAdapter.js"
@@ -235,55 +231,62 @@
   ],
   "peerDependencies": {
     "@aws-sdk/client-dynamodb": "^3.637.0",
+    "@effect/opentelemetry": "^0.61.0",
     "@effect/platform": "^0.94.1",
     "@effect/platform-node": "^0.104.0",
     "@effect/sql": "^0.49.0",
     "@effect/sql-pg": "^0.50.1",
     "@gomomento/sdk": "^1.102.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.211.0",
+    "@opentelemetry/sdk-trace-base": "^2.5.0",
+    "@opentelemetry/sdk-trace-node": "^2.5.0",
     "aws-lambda": "^1.0.7",
     "hono": "^4.9.9"
   },
   "dependencies": {
-    "@effect/sql": "^0.49.0",
-    "@effect/sql-pg": "^0.50.1",
-    "effect": "^3.19.14",
+    "@effect/sql": "^0.51.1",
+    "@effect/sql-pg": "^0.52.1",
+    "effect": "^3.21.4",
     "lesslog": "^1.0.2",
-    "@konker.dev/momento-cache-client-effect": "0.1.12",
-    "@konker.dev/tiny-error-fp": "0.1.12",
-    "@konker.dev/tiny-cache-fp": "0.1.13",
-    "@konker.dev/tiny-utils-fp": "0.1.13",
-    "@konker.dev/tiny-auth-utils-fp": "0.1.12"
+    "@konker.dev/momento-cache-client-effect": "0.2.0",
+    "@konker.dev/tiny-auth-utils-fp": "0.3.0",
+    "@konker.dev/tiny-cache-fp": "0.2.0",
+    "@konker.dev/tiny-utils-fp": "0.2.0"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.18.2",
-    "@aws-sdk/client-dynamodb": "^3.966.0",
-    "@aws-sdk/types": "^3.965.0",
-    "@effect/language-service": "^0.64.1",
-    "@eslint/js": "^9.39.2",
-    "@gomomento/sdk": "^1.117.1",
-    "@konker.dev/common-config": "^0.7.0",
-    "@smithy/smithy-client": "^4.10.4",
-    "@swc/core": "^1.15.8",
-    "@types/aws-lambda": "^8.10.159",
+    "@arethetypeswrong/cli": "^0.18.4",
+    "@aws-sdk/client-dynamodb": "^3.1079.0",
+    "@aws-sdk/types": "^3.973.15",
+    "@effect/language-service": "^0.86.4",
+    "@effect/opentelemetry": "^0.63.0",
+    "@eslint/js": "^10.0.1",
+    "@gomomento/sdk": "^1.118.0",
+    "@konker.dev/common-config": "^0.10.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.220.0",
+    "@opentelemetry/sdk-trace-base": "^2.9.0",
+    "@opentelemetry/sdk-trace-node": "^2.9.0",
+    "@smithy/smithy-client": "^4.14.6",
+    "@swc/core": "^1.15.43",
+    "@types/aws-lambda": "^8.10.162",
     "@types/micromatch": "^4.0.10",
-    "@types/node": "^25.0.6",
-    "@vitest/coverage-istanbul": "^4.0.16",
+    "@types/node": "^26.1.0",
+    "@vitest/coverage-istanbul": "^4.1.9",
     "aws-lambda": "^1.0.7",
     "aws-sdk-client-mock": "^4.1.0",
-    "eslint": "^9.39.2",
+    "eslint": "^10.6.0",
     "eslint-plugin-fp": "^2.3.0",
-    "eslint-plugin-prettier": "^5.5.4",
-    "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-sort-destructure-keys": "^2.0.0",
-    "hono": "^4.11.3",
+    "eslint-plugin-prettier": "^5.5.6",
+    "eslint-plugin-simple-import-sort": "^13.0.0",
+    "eslint-plugin-sort-destructure-keys": "^3.0.0",
+    "hono": "4.12.27",
     "leasot": "^14.4.0",
     "madge": "^8.0.0",
     "micromatch": "^4.0.8",
-    "prettier": "^3.7.4",
+    "prettier": "^3.9.4",
     "type-coverage": "^2.29.7",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.52.0",
-    "vitest": "^4.0.16"
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.62.1",
+    "vitest": "^4.1.9"
   },
   "scripts": {
     "test": "vitest run --coverage",

package/dist/http/contrib/sqlClientInitPg/index.d.ts

@@ -1,10 +0,0 @@
-import type { FileSystem } from '@effect/platform';
-import type { SqlClient } from '@effect/sql/SqlClient';
-import type { SqlError } from '@effect/sql/SqlError';
-import { type ConfigError, type Layer } from 'effect';
-import type { Rec, RequestResponseHandler } from '../../index.js';
-import { type CheckServerIdentityFunction } from './lib.js';
-export type Adapted<R> = Exclude<R, SqlClient> | FileSystem.FileSystem;
-export { type CheckServerIdentityFunction, ignoreCheckServerIdentity, SslConfigSchema, type SslConfig } from './lib.js';
-export declare const middleware: (caBundleFilePath?: string, checkServerIdentityFunction?: CheckServerIdentityFunction, pgSqlClientLayer?: Layer.Layer<SqlClient, ConfigError.ConfigError | SqlError>) => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I, O, E, R | SqlClient>) => RequestResponseHandler<I, O, E | ConfigError.ConfigError | SqlError, Adapted<R>>;
-//# sourceMappingURL=index.d.ts.map

package/dist/http/contrib/sqlClientInitPg/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,KAAK,EAAQ,MAAM,QAAQ,CAAC;AAG5D,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAElE,OAAO,EAAE,KAAK,2BAA2B,EAAiC,MAAM,UAAU,CAAC;AAI3F,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC;AAEvE,OAAO,EAAE,KAAK,2BAA2B,EAAE,yBAAyB,EAAE,eAAe,EAAE,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAExH,eAAO,MAAM,UAAU,GAEnB,mBAAmB,MAAM,EACzB,8BAA8B,2BAA2B,EACzD,mBAAmB,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,WAAW,GAAG,QAAQ,CAAC,MAE9E,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,KACtD,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,WAAW,GAAG,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAWjF,CAAC"}

package/dist/http/contrib/sqlClientInitPg/index.js

@@ -1,12 +0,0 @@
-import { pipe } from 'effect';
-import * as Effect from 'effect/Effect';
-import { createDefaultPgSqlClientLayer } from './lib.js';
-const TAG = 'sqlClientInitPg';
-export { ignoreCheckServerIdentity, SslConfigSchema } from './lib.js';
-export const middleware = (caBundleFilePath, checkServerIdentityFunction, pgSqlClientLayer) => (wrapped) => (i) => {
-    if (pgSqlClientLayer) {
-        return pipe(wrapped(i), Effect.provide(pgSqlClientLayer), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
-    }
-    return pipe(wrapped(i), Effect.provide(createDefaultPgSqlClientLayer(caBundleFilePath, checkServerIdentityFunction)), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
-};
-//# sourceMappingURL=index.js.map

package/dist/http/contrib/sqlClientInitPg/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC5D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAoC,6BAA6B,EAAE,MAAM,UAAU,CAAC;AAE3F,MAAM,GAAG,GAAG,iBAAiB,CAAC;AAI9B,OAAO,EAAoC,yBAAyB,EAAE,eAAe,EAAkB,MAAM,UAAU,CAAC;AAExH,MAAM,CAAC,MAAM,UAAU,GACrB,CACE,gBAAyB,EACzB,2BAAyD,EACzD,gBAA6E,EAC7E,EAAE,CACJ,CACE,OAAuD,EAC2B,EAAE,CACtF,CAAC,CAAc,EAAE,EAAE;IACjB,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACzG,CAAC;IAED,OAAO,IAAI,CACT,OAAO,CAAC,CAAC,CAAC,EACV,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAC,gBAAgB,EAAE,2BAA2B,CAAC,CAAC,EAC5F,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAC"}

package/dist/http/contrib/sqlClientInitPg/index.test.d.ts

@@ -1,4 +0,0 @@
-import { SqlClient } from '@effect/sql/SqlClient';
-import { Layer } from 'effect';
-export declare const MockPgSqlClientLayer: Layer.Layer<SqlClient, never, never>;
-//# sourceMappingURL=index.test.d.ts.map

package/dist/http/contrib/sqlClientInitPg/index.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAQ,MAAM,QAAQ,CAAC;AAWrC,eAAO,MAAM,oBAAoB,sCAAsC,CAAC"}

package/dist/http/contrib/sqlClientInitPg/index.test.js

@@ -1,93 +0,0 @@
-import { NodeFileSystem } from '@effect/platform-node';
-import { SqlClient } from '@effect/sql/SqlClient';
-import { Layer, pipe } from 'effect';
-import * as Effect from 'effect/Effect';
-import { afterEach, describe, expect, it, vi } from 'vitest';
-import { echoCoreIn200W } from '../../../test/test-common.js';
-import { EMPTY_REQUEST_W } from '../../RequestW.js';
-import * as unit from './index.js';
-import * as unitLib from './lib.js';
-import { ignoreCheckServerIdentity } from './lib.js';
-// Create a mock PgDrizzle layer for testing
-export const MockPgSqlClientLayer = Layer.succeed(SqlClient, {});
-describe('middleware/sql-client-pg-init', () => {
-    describe('middleware', () => {
-        afterEach(() => {
-            vi.restoreAllMocks();
-        });
-        it('should work as expected with custom layer', async () => {
-            const egHandler = pipe(echoCoreIn200W, unit.middleware(undefined, undefined, MockPgSqlClientLayer));
-            const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
-            expect(result).toMatchObject({
-                body: 'OK',
-                headers: {},
-                in: {
-                    url: '/',
-                    headers: {},
-                    method: 'GET',
-                    pathParameters: {},
-                    queryStringParameters: {},
-                },
-                statusCode: 200,
-            });
-        });
-        it('should work as expected with default layer', async () => {
-            const spy = vi.spyOn(unitLib, 'createDefaultPgSqlClientLayer').mockReturnValue(MockPgSqlClientLayer);
-            const egHandler = pipe(echoCoreIn200W, unit.middleware());
-            const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
-            expect(spy).toHaveBeenCalledTimes(1);
-            expect(spy).toHaveBeenCalledWith(undefined, undefined);
-            expect(result).toMatchObject({
-                body: 'OK',
-                headers: {},
-                in: {
-                    url: '/',
-                    headers: {},
-                    method: 'GET',
-                    pathParameters: {},
-                    queryStringParameters: {},
-                },
-                statusCode: 200,
-            });
-        });
-        it('should work as expected with ca bundle file path', async () => {
-            const spy = vi.spyOn(unitLib, 'createDefaultPgSqlClientLayer').mockReturnValue(MockPgSqlClientLayer);
-            const egHandler = pipe(echoCoreIn200W, unit.middleware('/path/to/ca-bundle.pem'));
-            const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
-            expect(spy).toHaveBeenCalledTimes(1);
-            expect(spy).toHaveBeenCalledWith('/path/to/ca-bundle.pem', undefined);
-            expect(result).toMatchObject({
-                body: 'OK',
-                headers: {},
-                in: {
-                    url: '/',
-                    headers: {},
-                    method: 'GET',
-                    pathParameters: {},
-                    queryStringParameters: {},
-                },
-                statusCode: 200,
-            });
-        });
-        it('should work as expected with ca bundle file path and CheckServerIdentityFunction', async () => {
-            const spy = vi.spyOn(unitLib, 'createDefaultPgSqlClientLayer').mockReturnValue(MockPgSqlClientLayer);
-            const egHandler = pipe(echoCoreIn200W, unit.middleware('/path/to/ca-bundle.pem', ignoreCheckServerIdentity));
-            const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
-            expect(spy).toHaveBeenCalledTimes(1);
-            expect(spy).toHaveBeenCalledWith('/path/to/ca-bundle.pem', ignoreCheckServerIdentity);
-            expect(result).toMatchObject({
-                body: 'OK',
-                headers: {},
-                in: {
-                    url: '/',
-                    headers: {},
-                    method: 'GET',
-                    pathParameters: {},
-                    queryStringParameters: {},
-                },
-                statusCode: 200,
-            });
-        });
-    });
-});
-//# sourceMappingURL=index.test.js.map

package/dist/http/contrib/sqlClientInitPg/index.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.test.ts"],"names":[],"mappings":"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"}

package/dist/http/contrib/sqlClientInitPg/lib.d.ts

@@ -1,16 +0,0 @@
-import type { PeerCertificate } from 'node:tls';
-import { FileSystem } from '@effect/platform';
-import type { SqlClient } from '@effect/sql/SqlClient';
-import type { SqlError } from '@effect/sql/SqlError';
-import { PgClient } from '@effect/sql-pg';
-import { Config, ConfigError, Effect, Layer, Schema } from 'effect';
-export declare const SslConfigSchema: Schema.transform<Schema.SchemaClass<unknown, string, never>, Schema.Union<[typeof Schema.Boolean, Schema.Struct<{
-    ca: typeof Schema.String;
-}>, Schema.Record$<typeof Schema.String, typeof Schema.Unknown>]>>;
-export type SslConfig = typeof SslConfigSchema.Type;
-export type CheckServerIdentityFunction = (_hostname: string, _cert: PeerCertificate) => Error | undefined;
-export declare function ignoreCheckServerIdentity(_hostname: string, _cert: PeerCertificate): Error | undefined;
-export declare function resolveSslConfigDirect(defaultValue: SslConfig): Effect.Effect<Config.Config<SslConfig>, ConfigError.ConfigError>;
-export declare function resolveSslConfigCaBundle(caBundleFilePath: string, checkServerIdentityFunction?: CheckServerIdentityFunction): Effect.Effect<Config.Config<SslConfig>, ConfigError.ConfigError, FileSystem.FileSystem>;
-export declare function createDefaultPgSqlClientLayer(caBundleFilePath?: string, checkServerIdentityFunction?: CheckServerIdentityFunction): Layer.Layer<SqlClient | PgClient.PgClient, SqlError | ConfigError.ConfigError, FileSystem.FileSystem>;
-//# sourceMappingURL=lib.d.ts.map

package/dist/http/contrib/sqlClientInitPg/lib.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAU,KAAK,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIlF,eAAO,MAAM,eAAe;;kEAM3B,CAAC;AACF,MAAM,MAAM,SAAS,GAAG,OAAO,eAAe,CAAC,IAAI,CAAC;AAGpD,MAAM,MAAM,2BAA2B,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,KAAK,KAAK,GAAG,SAAS,CAAC;AAE3G,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG,KAAK,GAAG,SAAS,CAEtG;AAGD,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,SAAS,GACtB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,CAelE;AAGD,wBAAgB,wBAAwB,CACtC,gBAAgB,EAAE,MAAM,EACxB,2BAA2B,CAAC,EAAE,2BAA2B,GACxD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,CAYzF;AAGD,wBAAgB,6BAA6B,CAC3C,gBAAgB,CAAC,EAAE,MAAM,EACzB,2BAA2B,CAAC,EAAE,2BAA2B,GACxD,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,CAiBvG"}

package/dist/http/contrib/sqlClientInitPg/lib.js

@@ -1,38 +0,0 @@
-import { FileSystem } from '@effect/platform';
-import { PgClient } from '@effect/sql-pg';
-import { Config, ConfigError, Effect, Either, Layer, pipe, Schema } from 'effect';
-import { TreeFormatter } from 'effect/ParseResult';
-// --------------------------------------------------------------------------
-export const SslConfigSchema = Schema.parseJson(Schema.Union(Schema.Boolean, Schema.Struct({ ca: Schema.String }), Schema.Record({ key: Schema.String, value: Schema.Unknown })));
-export function ignoreCheckServerIdentity(_hostname, _cert) {
-    return undefined;
-}
-// --------------------------------------------------------------------------
-export function resolveSslConfigDirect(defaultValue) {
-    return Config.string('DATABASE_SSL')
-        .pipe(Config.mapOrFail((str) => pipe(str, Schema.decodeUnknownEither(SslConfigSchema), Either.mapLeft((err) => ConfigError.InvalidData([], `[${str}]` + TreeFormatter.formatErrorSync(err))))))
-        .pipe(Config.withDefault(defaultValue))
-        .pipe(Effect.succeed);
-}
-// --------------------------------------------------------------------------
-export function resolveSslConfigCaBundle(caBundleFilePath, checkServerIdentityFunction) {
-    return pipe(FileSystem.FileSystem, Effect.flatMap((fs) => fs.readFileString(caBundleFilePath, 'utf8')), Effect.mapError((err) => ConfigError.InvalidData([], err.message)), Effect.map((ca) => Config.succeed({
-        ca,
-        checkServerIdentity: checkServerIdentityFunction,
-    })));
-}
-// --------------------------------------------------------------------------
-export function createDefaultPgSqlClientLayer(caBundleFilePath, checkServerIdentityFunction) {
-    const sslConfigEffect = caBundleFilePath
-        ? resolveSslConfigCaBundle(caBundleFilePath, checkServerIdentityFunction)
-        : resolveSslConfigDirect(false);
-    return Layer.unwrapEffect(Effect.map(sslConfigEffect, (sslConfig) => PgClient.layerConfig({
-        host: Config.string('DATABASE_HOST'),
-        port: Config.number('DATABASE_PORT'),
-        username: Config.string('DATABASE_USER'),
-        password: Config.redacted('DATABASE_PASSWORD'),
-        database: Config.string('DATABASE_NAME'),
-        ssl: sslConfig,
-    })));
-}
-//# sourceMappingURL=lib.js.map

package/dist/http/contrib/sqlClientInitPg/lib.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.ts"],"names":[],"mappings":"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"}

package/dist/http/contrib/sqlClientInitPg/lib.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=lib.test.d.ts.map

package/dist/http/contrib/sqlClientInitPg/lib.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"lib.test.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.test.ts"],"names":[],"mappings":""}

package/dist/http/contrib/sqlClientInitPg/lib.test.js

@@ -1,101 +0,0 @@
-import { NodeFileSystem } from '@effect/platform-node';
-import { Effect, Layer, pipe } from 'effect';
-import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest';
-import * as unit from './lib.js';
-import { ignoreCheckServerIdentity } from './lib.js';
-describe('middleware/sql-client-pg-init/lib', () => {
-    describe('ignoreCheckServerIdentity', () => {
-        it('should always return undefined', async () => {
-            const actual = unit.ignoreCheckServerIdentity('test-host', 'test-cert');
-            expect(actual).toStrictEqual(undefined);
-        });
-    });
-    describe('resolveSslConfigDirect', () => {
-        let _oldEnv;
-        beforeAll(() => {
-            _oldEnv = process.env;
-            process.env = {};
-        });
-        afterEach(() => {
-            process.env = {};
-        });
-        afterAll(() => {
-            process.env = _oldEnv;
-        });
-        it('should work as expected with boolean value', async () => {
-            process.env.DATABASE_SSL = 'true';
-            const actual = await pipe(unit.resolveSslConfigDirect(false), Effect.flatMap((config) => config), Effect.runPromise);
-            expect(actual).toEqual(true);
-        });
-        it('should work as expected with record value', async () => {
-            process.env.DATABASE_SSL = '{ "rejectUnauthorized": false }';
-            const actual = await pipe(unit.resolveSslConfigDirect(false), Effect.flatMap((config) => config), Effect.runPromise);
-            expect(actual).toStrictEqual({ rejectUnauthorized: false });
-        });
-        it('should work as expected with default value', async () => {
-            const actual = await pipe(unit.resolveSslConfigDirect({ foo: 123 }), Effect.flatMap((config) => config), Effect.runPromise);
-            expect(actual).toStrictEqual({ foo: 123 });
-        });
-        it('should work as expected with an invalid value', async () => {
-            process.env.DATABASE_SSL = '123';
-            const actual = async () => pipe(unit.resolveSslConfigDirect(false), Effect.flatMap((config) => config), Effect.runPromise);
-            await expect(actual).rejects.toThrow('Invalid data at DATABASE_SSL');
-        });
-    });
-    describe('resolveSslConfigCaBundle', () => {
-        it('should work as expected with a valid file path', async () => {
-            const actual = await pipe(unit.resolveSslConfigCaBundle(`${__dirname}/fixtures/test-ca-bundle.pem`), Effect.flatMap((config) => config), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
-            expect(actual).toStrictEqual({ ca: 'test-ca-bundle-content', checkServerIdentity: undefined });
-        });
-        it('should work as expected with a valid file path and a checkServerIdentity function', async () => {
-            const actual = await pipe(unit.resolveSslConfigCaBundle(`${__dirname}/fixtures/test-ca-bundle.pem`, ignoreCheckServerIdentity), Effect.flatMap((config) => config), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
-            expect(actual).toStrictEqual({ ca: 'test-ca-bundle-content', checkServerIdentity: ignoreCheckServerIdentity });
-        });
-        it('should fail with a non-existent file path', async () => {
-            const actual = async () => pipe(unit.resolveSslConfigCaBundle('/non-existent-path/ca-bundle.pem'), Effect.flatMap((config) => config), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
-            await expect(actual).rejects.toThrow('ENOENT');
-        });
-    });
-    describe('createDefaultPgSqlClientLayer', () => {
-        let _oldEnv;
-        beforeAll(() => {
-            _oldEnv = process.env;
-            process.env = {};
-        });
-        afterEach(() => {
-            process.env = {};
-        });
-        afterAll(() => {
-            process.env = _oldEnv;
-        });
-        it('should work as expected', async () => {
-            const layer = unit.createDefaultPgSqlClientLayer();
-            expect(layer).toBeDefined();
-        });
-        it('should attempt to build layer with config', async () => {
-            process.env.DATABASE_HOST = 'localhost';
-            process.env.DATABASE_PORT = '5432';
-            process.env.DATABASE_USER = 'test';
-            process.env.DATABASE_PASSWORD = 'test';
-            process.env.DATABASE_NAME = 'test';
-            const layer = unit.createDefaultPgSqlClientLayer();
-            // Building the layer will fail because there's no actual database,
-            // but this covers the PgClient.layerConfig code path
-            const actual = async () => pipe(layer, Layer.build, Effect.scoped, Effect.provide(NodeFileSystem.layer), Effect.runPromise);
-            await expect(actual).rejects.toThrow();
-        });
-        it('should attempt to build layer with ca bundle', async () => {
-            process.env.DATABASE_HOST = 'localhost';
-            process.env.DATABASE_PORT = '5432';
-            process.env.DATABASE_USER = 'test';
-            process.env.DATABASE_PASSWORD = 'test';
-            process.env.DATABASE_NAME = 'test';
-            const layer = unit.createDefaultPgSqlClientLayer(`${__dirname}/fixtures/test-ca-bundle.pem`);
-            // Building the layer will fail because there's no actual database,
-            // but this covers the PgClient.layerConfig code path with CA bundle
-            const actual = async () => pipe(layer, Layer.build, Effect.scoped, Effect.provide(NodeFileSystem.layer), Effect.runPromise);
-            await expect(actual).rejects.toThrow();
-        });
-    });
-});
-//# sourceMappingURL=lib.test.js.map

package/dist/http/contrib/sqlClientInitPg/lib.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"lib.test.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9E,OAAO,KAAK,IAAI,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAErD,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IACjD,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACzC,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,yBAAyB,CAAC,WAAW,EAAE,WAAoB,CAAC,CAAC;YACjF,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,IAAI,OAA0B,CAAC;QAC/B,SAAS,CAAC,GAAG,EAAE;YACb,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;YACtB,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,SAAS,CAAC,GAAG,EAAE;YACb,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YAC1D,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC;YAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CACvB,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAClC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAClC,MAAM,CAAC,UAAU,CAClB,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;YACzD,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,iCAAiC,CAAC;YAC7D,MAAM,MAAM,GAAG,MAAM,IAAI,CACvB,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAClC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAClC,MAAM,CAAC,UAAU,CAClB,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,CACvB,IAAI,CAAC,sBAAsB,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EACzC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAClC,MAAM,CAAC,UAAU,CAClB,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;YAC7D,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC;YACjC,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE,CACxB,IAAI,CACF,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAClC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAClC,MAAM,CAAC,UAAU,CAClB,CAAC;YAEJ,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;QACxC,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;YAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CACvB,IAAI,CAAC,wBAAwB,CAAC,GAAG,SAAS,8BAA8B,CAAC,EACzE,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAClC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,EACpC,MAAM,CAAC,UAAU,CAClB,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,SAAS,EAAE,CAAC,CAAC;QACjG,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mFAAmF,EAAE,KAAK,IAAI,EAAE;YACjG,MAAM,MAAM,GAAG,MAAM,IAAI,CACvB,IAAI,CAAC,wBAAwB,CAAC,GAAG,SAAS,8BAA8B,EAAE,yBAAyB,CAAC,EACpG,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAClC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,EACpC,MAAM,CAAC,UAAU,CAClB,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,CAAC,CAAC;QACjH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;YACzD,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE,CACxB,IAAI,CACF,IAAI,CAAC,wBAAwB,CAAC,kCAAkC,CAAC,EACjE,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAClC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,EACpC,MAAM,CAAC,UAAU,CAClB,CAAC;YAEJ,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;QAC7C,IAAI,OAA0B,CAAC;QAC/B,SAAS,CAAC,GAAG,EAAE;YACb,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;YACtB,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,SAAS,CAAC,GAAG,EAAE;YACb,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,KAAK,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;YAEnD,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;YACzD,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,WAAW,CAAC;YACxC,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC;YACvC,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC;YAEnC,MAAM,KAAK,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;YAEnD,mEAAmE;YACnE,qDAAqD;YACrD,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE,CACxB,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAEnG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC5D,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,WAAW,CAAC;YACxC,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC;YACvC,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC;YAEnC,MAAM,KAAK,GAAG,IAAI,CAAC,6BAA6B,CAAC,GAAG,SAAS,8BAA8B,CAAC,CAAC;YAE7F,mEAAmE;YACnE,oEAAoE;YACpE,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE,CACxB,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAEnG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}