@effect-app/infra 4.0.0-beta.31 → 4.0.0-beta.310

package/package.json

@@ -1,54 +1,53 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.31",
+  "version": "4.0.0-beta.310",
   "license": "MIT",
   "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/effect-app/libs.git",
+    "directory": "packages/infra"
+  },
   "dependencies": {
     "@faker-js/faker": "^8.4.1",
-    "change-case": "^5.4.4",
-    "cross-fetch": "^4.1.0",
-    "express-oauth2-jwt-bearer": "^1.7.4",
-    "fast-check": "~4.5.3",
-    "path-parser": "^6.1.0",
+    "fast-check": "~4.8.0",
+    "jose": "^6.2.3",
     "proper-lockfile": "^4.1.2",
-    "pure-rand": "7.0.1",
-    "query-string": "^9.3.1",
-    "effect-app": "4.0.0-beta.31"
+    "pure-rand": "8.4.0",
+    "query-string": "^9.4.0",
+    "effect-app": "4.0.0-beta.310"
   },
   "devDependencies": {
-    "@azure/cosmos": "^4.9.1",
+    "@azure/cosmos": "^4.9.3",
     "@azure/service-bus": "^7.9.5",
-    "@sentry/node": "10.42.0",
-    "@sentry/opentelemetry": "10.42.0",
-    "@types/express": "^5.0.6",
-    "@types/node": "25.3.3",
+    "@effect/sql-sqlite-node": "4.0.0-beta.90",
+    "@sentry/node": "10.55.0",
+    "@sentry/opentelemetry": "10.55.0",
+    "@types/better-sqlite3": "^7.6.13",
+    "@types/node": "25.9.1",
     "@types/proper-lockfile": "^4.1.4",
     "@types/redis": "^2.8.32",
     "@types/redlock": "^4.0.8",
-    "express": "^5.2.1",
-    "jwks-rsa": "2.1.4",
+    "better-sqlite3": "^12.10.0",
     "jwt-decode": "^4.0.0",
-    "mongodb": "7.1.0",
+    "mongodb": "7.2.0",
     "redis": "^3.1.2",
     "redlock": "^4.2.0",
-    "strip-ansi": "^7.2.0",
-    "typescript": "~5.9.3",
-    "vitest": "^4.0.18",
-    "@effect-app/eslint-shared-config": "0.5.7-beta.2"
+    "typescript": "~6.0.3",
+    "vitest": "^4.1.7"
   },
   "peerDependencies": {
-    "@azure/cosmos": "^4.9.1",
+    "@azure/cosmos": "^4.9.3",
     "@azure/service-bus": "^7.9.5",
-    "@effect/vitest": "^4.0.0-beta.37",
+    "@effect/vitest": "^4.0.0-beta.90",
     "@sendgrid/helpers": "^8.0.0",
     "@sendgrid/mail": "^8.1.6",
-    "@sentry/node": "10.42.0",
-    "@sentry/opentelemetry": "10.42.0",
+    "@sentry/node": "10.55.0",
+    "@sentry/opentelemetry": "10.55.0",
+    "effect": "^4.0.0-beta.90",
     "jwt-decode": "^4.0.0",
     "redis": "^3.1.2",
-    "redlock": "^4.2.0",
-    "effect": "^4.0.0-beta.37",
-    "express": "^5.2.1"
+    "redlock": "^4.2.0"
   },
   "typesVersions": {
     "*": {
@@ -62,346 +61,33 @@
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
-    "./CUPS": {
-      "types": "./dist/CUPS.d.ts",
-      "default": "./dist/CUPS.js"
-    },
-    "./Emailer": {
-      "types": "./dist/Emailer.d.ts",
-      "default": "./dist/Emailer.js"
-    },
-    "./Emailer/Sendgrid": {
-      "types": "./dist/Emailer/Sendgrid.d.ts",
-      "default": "./dist/Emailer/Sendgrid.js"
-    },
-    "./Emailer/fake": {
-      "types": "./dist/Emailer/fake.d.ts",
-      "default": "./dist/Emailer/fake.js"
-    },
-    "./Emailer/service": {
-      "types": "./dist/Emailer/service.d.ts",
-      "default": "./dist/Emailer/service.js"
-    },
-    "./MainFiberSet": {
-      "types": "./dist/MainFiberSet.d.ts",
-      "default": "./dist/MainFiberSet.js"
-    },
-    "./Model": {
-      "types": "./dist/Model.d.ts",
-      "default": "./dist/Model.js"
-    },
-    "./Model/Repository": {
-      "types": "./dist/Model/Repository.d.ts",
-      "default": "./dist/Model/Repository.js"
-    },
-    "./Model/Repository/ext": {
-      "types": "./dist/Model/Repository/ext.d.ts",
-      "default": "./dist/Model/Repository/ext.js"
-    },
-    "./Model/Repository/legacy": {
-      "types": "./dist/Model/Repository/legacy.d.ts",
-      "default": "./dist/Model/Repository/legacy.js"
-    },
-    "./Model/Repository/makeRepo": {
-      "types": "./dist/Model/Repository/makeRepo.d.ts",
-      "default": "./dist/Model/Repository/makeRepo.js"
-    },
-    "./Model/Repository/service": {
-      "types": "./dist/Model/Repository/service.d.ts",
-      "default": "./dist/Model/Repository/service.js"
-    },
-    "./Model/Repository/validation": {
-      "types": "./dist/Model/Repository/validation.d.ts",
-      "default": "./dist/Model/Repository/validation.js"
-    },
-    "./Model/dsl": {
-      "types": "./dist/Model/dsl.d.ts",
-      "default": "./dist/Model/dsl.js"
-    },
-    "./Model/filter/filterApi": {
-      "types": "./dist/Model/filter/filterApi.d.ts",
-      "default": "./dist/Model/filter/filterApi.js"
-    },
-    "./Model/filter/types": {
-      "types": "./dist/Model/filter/types.d.ts",
-      "default": "./dist/Model/filter/types.js"
-    },
-    "./Model/filter/types/errors": {
-      "types": "./dist/Model/filter/types/errors.d.ts",
-      "default": "./dist/Model/filter/types/errors.js"
-    },
-    "./Model/filter/types/fields": {
-      "types": "./dist/Model/filter/types/fields.d.ts",
-      "default": "./dist/Model/filter/types/fields.js"
-    },
-    "./Model/filter/types/path/common": {
-      "types": "./dist/Model/filter/types/path/common.d.ts",
-      "default": "./dist/Model/filter/types/path/common.js"
-    },
-    "./Model/filter/types/path/eager": {
-      "types": "./dist/Model/filter/types/path/eager.d.ts",
-      "default": "./dist/Model/filter/types/path/eager.js"
-    },
-    "./Model/filter/types/path/index": {
-      "types": "./dist/Model/filter/types/path/index.d.ts",
-      "default": "./dist/Model/filter/types/path/index.js"
-    },
-    "./Model/filter/types/utils": {
-      "types": "./dist/Model/filter/types/utils.d.ts",
-      "default": "./dist/Model/filter/types/utils.js"
-    },
-    "./Model/filter/types/validator": {
-      "types": "./dist/Model/filter/types/validator.d.ts",
-      "default": "./dist/Model/filter/types/validator.js"
-    },
-    "./Model/query": {
-      "types": "./dist/Model/query.d.ts",
-      "default": "./dist/Model/query.js"
-    },
-    "./Model/query/dsl": {
-      "types": "./dist/Model/query/dsl.d.ts",
-      "default": "./dist/Model/query/dsl.js"
-    },
-    "./Model/query/new-kid-interpreter": {
-      "types": "./dist/Model/query/new-kid-interpreter.d.ts",
-      "default": "./dist/Model/query/new-kid-interpreter.js"
-    },
-    "./Operations": {
-      "types": "./dist/Operations.d.ts",
-      "default": "./dist/Operations.js"
-    },
-    "./OperationsRepo": {
-      "types": "./dist/OperationsRepo.d.ts",
-      "default": "./dist/OperationsRepo.js"
-    },
-    "./QueueMaker/SQLQueue": {
-      "types": "./dist/QueueMaker/SQLQueue.d.ts",
-      "default": "./dist/QueueMaker/SQLQueue.js"
-    },
-    "./QueueMaker/errors": {
-      "types": "./dist/QueueMaker/errors.d.ts",
-      "default": "./dist/QueueMaker/errors.js"
-    },
-    "./QueueMaker/memQueue": {
-      "types": "./dist/QueueMaker/memQueue.d.ts",
-      "default": "./dist/QueueMaker/memQueue.js"
-    },
-    "./QueueMaker/sbqueue": {
-      "types": "./dist/QueueMaker/sbqueue.d.ts",
-      "default": "./dist/QueueMaker/sbqueue.js"
-    },
-    "./QueueMaker/service": {
-      "types": "./dist/QueueMaker/service.d.ts",
-      "default": "./dist/QueueMaker/service.js"
-    },
-    "./RequestContext": {
-      "types": "./dist/RequestContext.d.ts",
-      "default": "./dist/RequestContext.js"
-    },
-    "./RequestFiberSet": {
-      "types": "./dist/RequestFiberSet.d.ts",
-      "default": "./dist/RequestFiberSet.js"
-    },
-    "./Store": {
-      "types": "./dist/Store.d.ts",
-      "default": "./dist/Store.js"
-    },
-    "./Store/ContextMapContainer": {
-      "types": "./dist/Store/ContextMapContainer.d.ts",
-      "default": "./dist/Store/ContextMapContainer.js"
-    },
-    "./Store/Cosmos": {
-      "types": "./dist/Store/Cosmos.d.ts",
-      "default": "./dist/Store/Cosmos.js"
-    },
-    "./Store/Cosmos/query": {
-      "types": "./dist/Store/Cosmos/query.d.ts",
-      "default": "./dist/Store/Cosmos/query.js"
-    },
-    "./Store/Disk": {
-      "types": "./dist/Store/Disk.d.ts",
-      "default": "./dist/Store/Disk.js"
-    },
-    "./Store/Memory": {
-      "types": "./dist/Store/Memory.d.ts",
-      "default": "./dist/Store/Memory.js"
-    },
-    "./Store/codeFilter": {
-      "types": "./dist/Store/codeFilter.d.ts",
-      "default": "./dist/Store/codeFilter.js"
-    },
-    "./Store/index": {
-      "types": "./dist/Store/index.d.ts",
-      "default": "./dist/Store/index.js"
-    },
-    "./Store/service": {
-      "types": "./dist/Store/service.d.ts",
-      "default": "./dist/Store/service.js"
-    },
-    "./Store/utils": {
-      "types": "./dist/Store/utils.d.ts",
-      "default": "./dist/Store/utils.js"
-    },
-    "./adapters/SQL": {
-      "types": "./dist/adapters/SQL.d.ts",
-      "default": "./dist/adapters/SQL.js"
-    },
-    "./adapters/SQL/Model": {
-      "types": "./dist/adapters/SQL/Model.d.ts",
-      "default": "./dist/adapters/SQL/Model.js"
-    },
-    "./adapters/ServiceBus": {
-      "types": "./dist/adapters/ServiceBus.d.ts",
-      "default": "./dist/adapters/ServiceBus.js"
-    },
-    "./adapters/cosmos-client": {
-      "types": "./dist/adapters/cosmos-client.d.ts",
-      "default": "./dist/adapters/cosmos-client.js"
-    },
-    "./adapters/index": {
-      "types": "./dist/adapters/index.d.ts",
-      "default": "./dist/adapters/index.js"
-    },
-    "./adapters/logger": {
-      "types": "./dist/adapters/logger.d.ts",
-      "default": "./dist/adapters/logger.js"
-    },
-    "./adapters/memQueue": {
-      "types": "./dist/adapters/memQueue.d.ts",
-      "default": "./dist/adapters/memQueue.js"
-    },
-    "./adapters/mongo-client": {
-      "types": "./dist/adapters/mongo-client.d.ts",
-      "default": "./dist/adapters/mongo-client.js"
-    },
-    "./adapters/redis-client": {
-      "types": "./dist/adapters/redis-client.d.ts",
-      "default": "./dist/adapters/redis-client.js"
-    },
-    "./api/ContextProvider": {
-      "types": "./dist/api/ContextProvider.d.ts",
-      "default": "./dist/api/ContextProvider.js"
-    },
-    "./api/codec": {
-      "types": "./dist/api/codec.d.ts",
-      "default": "./dist/api/codec.js"
-    },
-    "./api/layerUtils": {
-      "types": "./dist/api/layerUtils.d.ts",
-      "default": "./dist/api/layerUtils.js"
-    },
-    "./api/middlewares": {
-      "types": "./dist/api/middlewares.d.ts",
-      "default": "./dist/api/middlewares.js"
-    },
-    "./api/reportError": {
-      "types": "./dist/api/reportError.d.ts",
-      "default": "./dist/api/reportError.js"
-    },
-    "./api/routing": {
-      "types": "./dist/api/routing.d.ts",
-      "default": "./dist/api/routing.js"
-    },
-    "./api/routing/middleware": {
-      "types": "./dist/api/routing/middleware.d.ts",
-      "default": "./dist/api/routing/middleware.js"
-    },
-    "./api/routing/middleware/RouterMiddleware": {
-      "types": "./dist/api/routing/middleware/RouterMiddleware.d.ts",
-      "default": "./dist/api/routing/middleware/RouterMiddleware.js"
-    },
-    "./api/routing/middleware/middleware": {
-      "types": "./dist/api/routing/middleware/middleware.d.ts",
-      "default": "./dist/api/routing/middleware/middleware.js"
-    },
-    "./api/routing/schema/jwt": {
-      "types": "./dist/api/routing/schema/jwt.d.ts",
-      "default": "./dist/api/routing/schema/jwt.js"
-    },
-    "./api/routing/tsort": {
-      "types": "./dist/api/routing/tsort.d.ts",
-      "default": "./dist/api/routing/tsort.js"
-    },
-    "./api/routing/utils": {
-      "types": "./dist/api/routing/utils.d.ts",
-      "default": "./dist/api/routing/utils.js"
-    },
-    "./api/setupRequest": {
-      "types": "./dist/api/setupRequest.d.ts",
-      "default": "./dist/api/setupRequest.js"
-    },
-    "./api/util": {
-      "types": "./dist/api/util.d.ts",
-      "default": "./dist/api/util.js"
-    },
-    "./arbs": {
-      "types": "./dist/arbs.d.ts",
-      "default": "./dist/arbs.js"
-    },
-    "./errorReporter": {
-      "types": "./dist/errorReporter.d.ts",
-      "default": "./dist/errorReporter.js"
-    },
-    "./errors": {
-      "types": "./dist/errors.d.ts",
-      "default": "./dist/errors.js"
-    },
-    "./fileUtil": {
-      "types": "./dist/fileUtil.d.ts",
-      "default": "./dist/fileUtil.js"
-    },
-    "./logger": {
-      "types": "./dist/logger.d.ts",
-      "default": "./dist/logger.js"
-    },
-    "./logger/jsonLogger": {
-      "types": "./dist/logger/jsonLogger.d.ts",
-      "default": "./dist/logger/jsonLogger.js"
-    },
-    "./logger/logFmtLogger": {
-      "types": "./dist/logger/logFmtLogger.d.ts",
-      "default": "./dist/logger/logFmtLogger.js"
-    },
-    "./logger/shared": {
-      "types": "./dist/logger/shared.d.ts",
-      "default": "./dist/logger/shared.js"
-    },
-    "./rateLimit": {
-      "types": "./dist/rateLimit.d.ts",
-      "default": "./dist/rateLimit.js"
-    },
-    "./test": {
-      "types": "./dist/test.d.ts",
-      "default": "./dist/test.js"
-    },
-    "./vitest": {
-      "types": "./dist/vitest.d.ts",
-      "default": "./dist/vitest.js"
+    "./internal/*": null,
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "default": "./dist/*.js"
     }
   },
   "gitHead": "bd8e27eea3eff97db8739d577d67e7336c078d28",
   "sideEffects": false,
   "scripts": {
     "watch": "pnpm build:tsc -w",
-    "build:tsc": "pnpm clean-dist && effect-app-cli packagejson pnpm check",
-    "check": "tsc --build",
+    "build:tsc": "pnpm clean-dist && pnpm check && node ../../scripts/rewrite-dist-declaration-imports.mjs dist",
+    "check": "tsgo --build",
     "build": "pnpm build:tsc",
-    "watch2": "pnpm clean-dist && NODE_OPTIONS=--max-old-space-size=6144 tsc -w",
+    "watch2": "pnpm clean-dist && NODE_OPTIONS=--max-old-space-size=6144 tsgo -w",
     "clean": "rm -rf dist",
     "clean-dist": "sh ../../scripts/clean-dist.sh",
     "circular": "pnpm circular:src && pnpm circular:dist",
     "circular:src": "madge --circular --ts-config ./tsconfig.json --extensions ts ./src",
     "circular:dist": "madge --circular --extensions js ./dist",
-    "compile": "NODE_OPTIONS=--max-old-space-size=6144 tsc --noEmit",
-    "lint": "NODE_OPTIONS=--max-old-space-size=6144 ESLINT_TS=1 eslint ./src",
-    "lint:watch": "ESLINT_TS=1 esw -w --changed --clear --ext ts,tsx .",
-    "lint-fix": "pnpm lint --fix",
+    "compile": "NODE_OPTIONS=--max-old-space-size=6144 tsgo --noEmit",
+    "lint": "oxlint --quiet --type-aware ./src && pnpm exec dprint check --config ../../dprint.jsonc .",
+    "lint-fix": "oxlint --quiet --type-aware --fix ./src && pnpm exec dprint fmt --config ../../dprint.jsonc .",
     "test": "vitest",
     "test:run": "pnpm run test run --passWithNoTests",
     "testsuite": "pnpm lint && pnpm circular && pnpm run test:run",
     "client": "node --experimental-specifier-resolution=node -r source-map-support/register ./dist/client.bin.js",
     "ncu": "ncu",
-    "pub": "pnpm prepublish && npm publish --access public",
-    "prepublish": "cp -f ./tsconfig.json ./tsconfig.json.bak && node ../../scripts/mergeTsConfig.mjs ./tsconfig.json"
+    "pub": "npm publish --access public"
   }
 }

package/src/CUPS.ts

@@ -1,23 +1,64 @@
 import { type FileOptions, tempFile } from "@effect-app/infra/fileUtil"
 import cp from "child_process"
-import { Config, Effect, Layer, Option, Predicate, S, ServiceMap } from "effect-app"
+import * as Config from "effect-app/Config"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
+import * as Option from "effect-app/Option"
+import * as S from "effect-app/Schema"
 import { pretty } from "effect-app/utils"
+import * as Data from "effect/Data"
+import * as Predicate from "effect/Predicate"
 import fs from "fs"
 import os from "os"
 import path from "path"
 import util from "util"
-import { InfraLogger } from "./logger.js"
+import { InfraLogger } from "./logger.ts"
 
 export const PrinterId = S.NonEmptyString255
 export type PrinterId = S.NonEmptyString255
 
+type ExecError = Error & {
+  code?: number | string
+  killed?: boolean
+  signal?: NodeJS.Signals | null
+  cmd?: string
+  stdout?: string
+  stderr?: string
+}
+
+export class CUPSError extends Data.TaggedError("CUPSError")<{
+  readonly command: string
+  readonly message: string
+  readonly code: number | string | undefined
+  readonly signal: NodeJS.Signals | null | undefined
+  readonly killed: boolean | undefined
+  readonly stdout: string | undefined
+  readonly stderr: string | undefined
+  readonly cause: unknown
+}> {}
+
 const exec_ = util.promisify(cp.exec)
 const exec = (command: string) =>
   Effect.andThen(
     InfraLogger.logDebug(`Executing: ${command}`),
     Effect.tap(
-      Effect
-        .tryPromise(() => exec_(command)),
+      Effect.tryPromise({
+        try: () => exec_(command),
+        catch: (cause) => {
+          const e = cause as ExecError
+          return new CUPSError({
+            command,
+            message: e?.message ?? String(cause),
+            code: e?.code,
+            signal: e?.signal,
+            killed: e?.killed,
+            stdout: e?.stdout,
+            stderr: e?.stderr,
+            cause
+          })
+        }
+      }),
       (r) => (InfraLogger.logDebug(`Executed`).pipe(Effect.annotateLogs("result", pretty(r))))
     )
   )
@@ -74,15 +115,13 @@ function printBuffer(printer: PrinterConfig, options: string[]) {
       )
 }
 
-function getAvailablePrinters(host?: string) {
-  return Effect.gen(function*() {
-    const { stdout } = yield* exec(["lpstat", ...buildListArgs({ host }), "-s"].join(" "))
-    return [...stdout.matchAll(/device for (\w+):/g)]
-      .map((_) => _[1])
-      .filter(Predicate.isNotNullish)
-      .map((_) => S.NonEmptyString255(_))
-  })
-}
+const getAvailablePrinters = Effect.fnUntraced(function*(host?: string) {
+  const { stdout } = yield* exec(["lpstat", ...buildListArgs({ host }), "-s"].join(" "))
+  return [...stdout.matchAll(/device for (\w+):/g)]
+    .map((_) => _[1])
+    .filter(Predicate.isNotNullish)
+    .map((_) => S.NonEmptyString255(_))
+})
 
 function* buildListArgs(config?: { host?: string | undefined }) {
   if (config?.host) {
@@ -100,7 +139,7 @@ export const CUPSConfig = Config.all({
     )
 })
 
-export class CUPS extends ServiceMap.Service<CUPS>()("effect-app/CUPS", {
+export class CUPS extends Context.Service<CUPS>()("effect-app/CUPS", {
   make: Effect.gen(function*() {
     const config = yield* CUPSConfig
     const serverUrl = Option.getOrUndefined(config.server)