effect-start 0.23.0 → 0.25.0

package/dist/sql/mssql/index.js

@@ -1,113 +1,194 @@
-import * as Effect from "effect/Effect";
-import * as Exit from "effect/Exit";
-import * as FiberRef from "effect/FiberRef";
-import * as GlobalValue from "effect/GlobalValue";
-import * as Layer from "effect/Layer";
-import * as Option from "effect/Option";
-import * as Sql from "../../Sql.js";
-const wrapError = (error) => new Sql.SqlError({
-    code: error?.code ??
-        (error?.number != null ? String(error.number) : "UNKNOWN"),
+import * as Effect from "effect/Effect"
+import * as Exit from "effect/Exit"
+import * as FiberRef from "effect/FiberRef"
+import * as GlobalValue from "effect/GlobalValue"
+import * as Layer from "effect/Layer"
+import * as Option from "effect/Option"
+import * as Sql from "../Sql.js"
+
+const wrapError = (error) =>
+  new Sql.SqlError({
+    code:
+      (error)?.code ??
+      ((error)?.number != null ? String((error).number) : "UNKNOWN"),
     message: error instanceof Error ? error.message : String(error),
     cause: error,
-});
+  })
+
 const makeValues = (obj, ...columns) => {
-    const items = Array.isArray(obj) ? obj : [obj];
-    const cols = columns.length > 0 ? columns : Object.keys(items[0]);
-    return { value: items, columns: cols };
-};
+  const items = Array.isArray(obj) ? obj : [obj]
+  const cols = columns.length > 0 ? columns : Object.keys(items[0])
+  return { value: items, columns: cols }
+}
+
 const buildQuery = (strings, values) => {
-    let text = strings[0];
-    for (let i = 0; i < values.length; i++)
-        text += `@p${i + 1}` + strings[i + 1];
-    return { text, values };
-};
+  let text = strings[0]
+  for (let i = 0; i < values.length; i++) text += `@p${i + 1}` + strings[i + 1]
+  return { text, values }
+}
+
 const addInputs = (request, values) => {
-    for (let i = 0; i < values.length; i++) {
-        request.input(`p${i + 1}`, values[i]);
-    }
-};
-const loadMssql = () => import("mssql");
-const currentTransaction = GlobalValue.globalValue(Symbol.for("effect-start/sql/mssql/currentTransaction"), () => FiberRef.unsafeMake(Option.none()));
-const executeQuery = (pool, text, values) => Effect.flatMap(FiberRef.get(currentTransaction), (txOpt) => {
-    const request = Option.isSome(txOpt) ? txOpt.value.transaction.request() : pool.request();
-    addInputs(request, values);
+  for (let i = 0; i < values.length; i++) {
+    request.input(`p${i + 1}`, values[i])
+  }
+}
+
+const loadMssql = () => import("mssql")
+
+const currentTransaction = GlobalValue.globalValue(
+  Symbol.for("effect-start/sql/mssql/currentTransaction"),
+  () => FiberRef.unsafeMake(Option.none()),
+)
+
+const executeQuery = (
+  pool,
+  text,
+  values,
+) =>
+  Effect.flatMap(FiberRef.get(currentTransaction), (txOpt) => {
+    const request = Option.isSome(txOpt) ? txOpt.value.transaction.request() : pool.request()
+    addInputs(request, values)
     return Effect.tryPromise({
-        try: () => request.query(text),
-        catch: wrapError,
-    }).pipe(Effect.map((result) => result.recordset ?? []));
-});
-const runQuery = (pool, strings, values) => {
-    const { text, values: params } = buildQuery(strings, values);
-    return executeQuery(pool, text, params);
-};
-const runUnsafe = (pool, query, values) => Effect.flatMap(FiberRef.get(currentTransaction), (txOpt) => {
-    const request = Option.isSome(txOpt) ? txOpt.value.transaction.request() : pool.request();
-    if (values)
-        addInputs(request, values);
+      try: () => request.query(text),
+      catch: wrapError,
+    }).pipe(Effect.map((result) => result.recordset ?? []))
+  })
+
+const runQuery = (
+  pool,
+  strings,
+  values,
+) => {
+  const { text, values: params } = buildQuery(strings, values)
+  return executeQuery(pool, text, params)
+}
+
+const runUnsafe = (
+  pool,
+  query,
+  values,
+) =>
+  Effect.flatMap(FiberRef.get(currentTransaction), (txOpt) => {
+    const request = Option.isSome(txOpt) ? txOpt.value.transaction.request() : pool.request()
+    if (values) addInputs(request, values)
     return Effect.tryPromise({
-        try: () => request.query(query),
-        catch: wrapError,
-    }).pipe(Effect.map((result) => result.recordset ?? []));
-});
-const makeWithTransaction = (pool) => (self) => Effect.uninterruptibleMask((restore) => Effect.flatMap(FiberRef.get(currentTransaction), (txOpt) => {
-    if (Option.isSome(txOpt)) {
-        const { transaction, depth } = txOpt.value;
-        const name = `sp_${depth}`;
-        return Effect.gen(function* () {
-            const req = transaction.request();
+      try: () => request.query(query),
+      catch: wrapError,
+    }).pipe(Effect.map((result) => result.recordset ?? []))
+  })
+
+const makeWithTransaction =
+  (pool) =>
+  (self) =>
+    Effect.uninterruptibleMask((restore) =>
+      Effect.flatMap(FiberRef.get(currentTransaction), (txOpt) => {
+        if (Option.isSome(txOpt)) {
+          const { transaction, depth } = txOpt.value
+          const name = `sp_${depth}`
+          return Effect.gen(function* () {
+            const req = transaction.request()
             yield* Effect.tryPromise({
-                try: () => req.query(`SAVE TRANSACTION ${name}`),
-                catch: wrapError,
-            });
-            const exit = yield* Effect.exit(restore(Effect.locally(self, currentTransaction, Option.some({ transaction, depth: depth + 1 }))));
+              try: () => req.query(`SAVE TRANSACTION ${name}`),
+              catch: wrapError,
+            })
+            const exit = yield* Effect.exit(
+              restore(
+                Effect.locally(
+                  self,
+                  currentTransaction,
+                  Option.some({ transaction, depth: depth + 1 }),
+                ),
+              ),
+            )
             if (Exit.isSuccess(exit)) {
-                return exit.value;
+              return exit.value
             }
-            const rbReq = transaction.request();
+            const rbReq = transaction.request()
             yield* Effect.tryPromise({
-                try: () => rbReq.query(`ROLLBACK TRANSACTION ${name}`),
-                catch: wrapError,
-            }).pipe(Effect.orDie);
-            return yield* exit;
-        });
-    }
-    return Effect.gen(function* () {
-        const transaction = pool.transaction();
-        yield* Effect.tryPromise({ try: () => transaction.begin(), catch: wrapError });
-        const exit = yield* Effect.exit(restore(Effect.locally(self, currentTransaction, Option.some({ transaction, depth: 1 }))));
-        if (Exit.isSuccess(exit)) {
-            yield* Effect.tryPromise({ try: () => transaction.commit(), catch: wrapError });
-            return exit.value;
+              try: () => rbReq.query(`ROLLBACK TRANSACTION ${name}`),
+              catch: wrapError,
+            }).pipe(Effect.orDie)
+            return yield* exit
+          })
         }
-        yield* Effect.tryPromise({ try: () => transaction.rollback(), catch: wrapError }).pipe(Effect.orDie);
-        return yield* exit;
-    });
-}));
-export const layer = (config) => Layer.scoped(Sql.SqlClient, Effect.acquireRelease(Effect.tryPromise({
-    try: async () => {
-        const mssql = await loadMssql();
-        const pool = await new mssql.ConnectionPool(config).connect();
-        return { mssql, pool };
-    },
-    catch: wrapError,
-}).pipe(Effect.map(({ mssql, pool }) => {
-    const use = (fn) => Effect.tryPromise({ try: () => Promise.resolve(fn(pool)), catch: wrapError });
-    return Object.assign((strings, ...values) => runQuery(pool, strings, values), {
-        unsafe: (query, values) => runUnsafe(pool, query, values),
-        values: makeValues,
-        withTransaction: makeWithTransaction(pool),
-        reserve: Effect.acquireRelease(Effect.tryPromise({
-            try: () => new mssql.ConnectionPool({
-                ...config,
-                pool: { max: 1, min: 1 },
-            }).connect(),
-            catch: wrapError,
-        }), (reserved) => Effect.tryPromise({ try: () => reserved.close(), catch: () => void 0 }).pipe(Effect.asVoid, Effect.orDie)).pipe(Effect.map((reserved) => Object.assign((strings, ...values) => runQuery(reserved, strings, values), {
-            unsafe: (query, values) => runUnsafe(reserved, query, values),
-            values: makeValues,
-        }))),
-        close: () => use((pool) => pool.close()),
-        use,
-    });
-})), (client) => client.close().pipe(Effect.orDie)));
+
+        return Effect.gen(function* () {
+          const transaction = pool.transaction()
+          yield* Effect.tryPromise({ try: () => transaction.begin(), catch: wrapError })
+          const exit = yield* Effect.exit(
+            restore(
+              Effect.locally(self, currentTransaction, Option.some({ transaction, depth: 1 })),
+            ),
+          )
+          if (Exit.isSuccess(exit)) {
+            yield* Effect.tryPromise({ try: () => transaction.commit(), catch: wrapError })
+            return exit.value
+          }
+          yield* Effect.tryPromise({ try: () => transaction.rollback(), catch: wrapError }).pipe(
+            Effect.orDie,
+          )
+          return yield* exit
+        })
+      }),
+    )
+
+export const layer = (config) =>
+  Layer.scoped(
+    Sql.SqlClient,
+    Effect.acquireRelease(
+      Effect.tryPromise({
+        try: async () => {
+          const mssql = await loadMssql()
+          const pool = await new mssql.ConnectionPool(config).connect()
+          return { mssql, pool }
+        },
+        catch: wrapError,
+      }).pipe(
+        Effect.map(({ mssql, pool }) => {
+          const use = (fn) =>
+            Effect.tryPromise({ try: () => Promise.resolve(fn(pool)), catch: wrapError })
+          return Object.assign(
+            (strings, ...values) =>
+              runQuery(pool, strings, values),
+            {
+              unsafe: (query, values) =>
+                runUnsafe(pool, query, values),
+              values: makeValues,
+              withTransaction: makeWithTransaction(pool),
+              reserve: Effect.acquireRelease(
+                Effect.tryPromise({
+                  try: () =>
+                    new mssql.ConnectionPool({
+                      ...config,
+                      pool: { max: 1, min: 1 },
+                    }).connect(),
+                  catch: wrapError,
+                }),
+                (reserved) =>
+                  Effect.tryPromise({ try: () => reserved.close(), catch: () => void 0 }).pipe(
+                    Effect.asVoid,
+                    Effect.orDie,
+                  ),
+              ).pipe(
+                Effect.map(
+                  (reserved) =>
+                    Object.assign(
+                      (strings, ...values) =>
+                        runQuery(reserved, strings, values),
+                      {
+                        unsafe: (query, values) =>
+                          runUnsafe(reserved, query, values),
+                        values: makeValues,
+                      },
+                    ),
+                ),
+              ),
+              close: () => use((pool) => pool.close()),
+              use,
+            },
+          )
+        }),
+      ),
+      (client) => client.close().pipe(Effect.orDie),
+    ),
+  )

package/dist/testing/TestLogger.js

@@ -1,32 +1,42 @@
-import * as Cause from "effect/Cause";
-import * as Context from "effect/Context";
-import * as Effect from "effect/Effect";
-import * as FiberRef from "effect/FiberRef";
-import * as HashSet from "effect/HashSet";
-import * as Layer from "effect/Layer";
-import * as Logger from "effect/Logger";
-import * as MutableRef from "effect/MutableRef";
-import * as Ref from "effect/Ref";
-export class TestLogger extends Context.Tag("effect-start/TestLogger")() {
-}
+import * as Cause from "effect/Cause"
+import * as Context from "effect/Context"
+import * as Effect from "effect/Effect"
+import * as FiberRef from "effect/FiberRef"
+import * as HashSet from "effect/HashSet"
+import * as Layer from "effect/Layer"
+import * as Logger from "effect/Logger"
+import * as MutableRef from "effect/MutableRef"
+import * as Ref from "effect/Ref"
+
+export class TestLogger extends Context.Tag("effect-start/TestLogger")() {}
+
 export function layer() {
-    return Layer.effect(TestLogger, Effect.gen(function* () {
-        const messages = yield* Ref.make([]);
-        const mutableRef = messages.ref;
-        const customLogger = Logger.make(({ message, logLevel, cause }) => {
-            const causeStr = !Cause.isEmpty(cause)
-                ? ` ${Cause.pretty(cause, { renderErrorCause: true })}`
-                : "";
-            MutableRef.update(mutableRef, (msgs) => [
-                ...msgs,
-                `[${logLevel._tag}] ${String(message)}${causeStr}`,
-            ]);
-        });
-        yield* FiberRef.update(FiberRef.currentLoggers, (loggers) => HashSet.add(HashSet.remove(loggers, Logger.defaultLogger), customLogger));
-        return { messages };
-    }));
+  return Layer.effect(
+    TestLogger,
+    Effect.gen(function* () {
+      const messages = yield* Ref.make([])
+      const mutableRef = (messages).ref
+
+      const customLogger = Logger.make(({ message, logLevel, cause }) => {
+        const causeStr = !Cause.isEmpty(cause)
+          ? ` ${Cause.pretty(cause, { renderErrorCause: true })}`
+          : ""
+        MutableRef.update(mutableRef, (msgs) => [
+          ...msgs,
+          `[${logLevel._tag}] ${String(message)}${causeStr}`,
+        ])
+      })
+
+      yield* FiberRef.update(FiberRef.currentLoggers, (loggers) =>
+        HashSet.add(HashSet.remove(loggers, Logger.defaultLogger), customLogger),
+      )
+
+      return { messages }
+    }),
+  )
 }
+
 export const messages = Effect.gen(function* () {
-    const logger = yield* TestLogger;
-    return yield* Ref.get(logger.messages);
-});
+  const logger = yield* TestLogger
+  return yield* Ref.get(logger.messages)
+})

package/dist/testing/index.js

@@ -1,2 +1,2 @@
-export * as TestLogger from "./TestLogger.js";
-export * from "./utils.js";
+export * as TestLogger from "./TestLogger.js"
+export * from "./utils.js"

package/dist/testing/utils.js

@@ -1,15 +1,28 @@
-import * as Array from "effect/Array";
-import * as Effect from "effect/Effect";
-import * as Function from "effect/Function";
-import * as Layer from "effect/Layer";
-import * as Logger from "effect/Logger";
+import * as Array from "effect/Array"
+import * as Effect from "effect/Effect"
+import * as Function from "effect/Function"
+import * as Layer from "effect/Layer"
+import * as Logger from "effect/Logger"
+
 /**
  * Creates a scoped Effects and runs is asynchronously.
  * Useful for testing.
  */
-export const effectFn = (layer) => (f) => Function.pipe(Effect.gen(f), Effect.scoped, Effect.provide(Logger.pretty), Effect.provide(layer ?? Layer.empty), 
-// @ts-expect-error will have to figure out how to clear deps
-Effect.runPromise, (v) => v.then(() => { }, clearStackTraces));
+export const effectFn =
+  (layer) =>
+  (
+    f,
+  ) =>
+    Function.pipe(
+      Effect.gen(f),
+      Effect.scoped,
+      Effect.provide(Logger.pretty),
+      Effect.provide(layer ?? Layer.empty),
+      // @ts-expect-error will have to figure out how to clear deps
+      Effect.runPromise,
+      (v) => v.then(() => {}, clearStackTraces),
+    )
+
 /*
  * When effect fails, instead of throwing FiberFailure,
  * throw a plain Error with the strack trace and hides
@@ -22,18 +35,27 @@ Effect.runPromise, (v) => v.then(() => { }, clearStackTraces));
  * files that are then loaded into a runtime.
  */
 const clearStackTraces = (err) => {
-    const ExternalStackTraceLineRegexp = /\(.*\/node_modules\/[^.]/;
-    const message = err instanceof Error
-        ? err.message
-        : typeof err === "object" && err !== null && "message" in err
-            ? String(err.message)
-            : String(err);
-    const stack = err instanceof Error
-        ? (err.stack ?? "")
-        : typeof err === "object" && err !== null && "stack" in err
-            ? String(err.stack)
-            : "";
-    const newErr = new Error(message);
-    newErr.stack = Function.pipe(stack.split("\n"), Array.takeWhile((s) => !ExternalStackTraceLineRegexp.test(s)), Array.join("\n"));
-    throw newErr;
-};
+  const ExternalStackTraceLineRegexp = /\(.*\/node_modules\/[^.]/
+
+  const message =
+    err instanceof Error
+      ? err.message
+      : typeof err === "object" && err !== null && "message" in err
+        ? String(err.message)
+        : String(err)
+  const stack =
+    err instanceof Error
+      ? (err.stack ?? "")
+      : typeof err === "object" && err !== null && "stack" in err
+        ? String(err.stack)
+        : ""
+
+  const newErr = new Error(message)
+  newErr.stack = Function.pipe(
+    stack.split("\n"),
+    Array.takeWhile((s) => !ExternalStackTraceLineRegexp.test(s)),
+    Array.join("\n"),
+  )
+
+  throw newErr
+}

package/dist/x/cloudflare/CloudflareTunnel.js

@@ -1,30 +1,63 @@
-import * as System from "../../System.js";
-import { Config, Effect, Layer, LogLevel, Option, pipe, Stream, String } from "effect";
-export const start = (opts) => Effect.gen(function* () {
-    const command = opts.command ?? "cloudflared";
-    yield* System.which(command);
-    const logPrefix = String.isString(opts.logPrefix) ? opts.logPrefix : "CloudflareTunnel: ";
+import * as System from "../../System.js"
+import { Config, Effect, Layer, LogLevel, Option, pipe, Stream, String } from "effect"
+
+export const start = (opts) =>
+  Effect.gen(function* () {
+    const command = opts.command ?? "cloudflared"
+    yield* System.which(command)
+    const logPrefix = String.isString(opts.logPrefix) ? opts.logPrefix : "CloudflareTunnel: "
     const args = [
-        "tunnel",
-        "run",
-        opts.tunnelUrl ? ["--url", opts.tunnelUrl] : [],
-        opts.tunnelName,
-    ].flatMap((v) => v);
-    const proc = yield* System.spawn(command, args);
-    yield* Effect.logInfo(`Cloudflare tunnel started name=${opts.tunnelName} pid=${proc.pid} tunnelUrl=${opts.tunnelUrl ?? "<empty>"}`);
-    yield* pipe(Stream.merge(proc.stdout, proc.stderr), Stream.decodeText("utf-8"), Stream.splitLines, (opts.cleanLogs ?? true)
+      "tunnel",
+      "run",
+      opts.tunnelUrl ? ["--url", opts.tunnelUrl] : [],
+      opts.tunnelName,
+    ].flatMap((v) => v)
+
+    const proc = yield* System.spawn(command, args)
+
+    yield* Effect.logInfo(
+      `Cloudflare tunnel started name=${opts.tunnelName} pid=${proc.pid} tunnelUrl=${
+        opts.tunnelUrl ?? "<empty>"
+      }`,
+    )
+
+    yield* pipe(
+      Stream.merge(proc.stdout, proc.stderr),
+      Stream.decodeText("utf-8"),
+      Stream.splitLines,
+      (opts.cleanLogs ?? true)
         ? Stream.map((v) => v.replace(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z\s\w+\s/, ""))
-        : (s) => s, logPrefix ? Stream.map((v) => logPrefix + v) : (s) => s, Stream.runForEach((v) => Effect.logWithLevel(opts.logLevel ?? LogLevel.Debug, v)));
-});
-export const layer = () => Layer.scopedDiscard(Effect.gen(function* () {
-    const tunnelName = yield* pipe(Config.string("CLOUDFLARE_TUNNEL_NAME"), Config.option, Effect.andThen(Option.getOrUndefined));
-    const tunnelUrl = yield* pipe(Config.string("CLOUDFLARE_TUNNEL_URL"), Config.option, Effect.andThen(Option.getOrUndefined));
-    if (!tunnelName) {
-        yield* Effect.logWarning("CLOUDFLARE_TUNNEL_NAME not provided. Skipping.");
-        return;
-    }
-    yield* Effect.forkScoped(start({
-        tunnelName,
-        tunnelUrl,
-    }).pipe(Effect.catchAll((err) => Effect.logError("Cloudflare tunnel failed", err))));
-}));
+        : (s) => s,
+      logPrefix ? Stream.map((v) => logPrefix + v) : (s) => s,
+      Stream.runForEach((v) => Effect.logWithLevel(opts.logLevel ?? LogLevel.Debug, v)),
+    )
+  })
+
+export const layer = () =>
+  Layer.scopedDiscard(
+    Effect.gen(function* () {
+      const tunnelName = yield* pipe(
+        Config.string("CLOUDFLARE_TUNNEL_NAME"),
+        Config.option,
+        Effect.andThen(Option.getOrUndefined),
+      )
+      const tunnelUrl = yield* pipe(
+        Config.string("CLOUDFLARE_TUNNEL_URL"),
+        Config.option,
+        Effect.andThen(Option.getOrUndefined),
+      )
+
+      if (!tunnelName) {
+        yield* Effect.logWarning("CLOUDFLARE_TUNNEL_NAME not provided. Skipping.")
+
+        return
+      }
+
+      yield* Effect.forkScoped(
+        start({
+          tunnelName,
+          tunnelUrl,
+        }).pipe(Effect.catchAll((err) => Effect.logError("Cloudflare tunnel failed", err))),
+      )
+    }),
+  )

package/dist/x/cloudflare/index.js

@@ -1 +1 @@
-export * as CloudflareTunnel from "./CloudflareTunnel.js";
+export * as CloudflareTunnel from "./CloudflareTunnel.js"