effect-start 0.23.1 → 0.25.0

package/dist/RouteHttpTracer.js

@@ -1,62 +1,90 @@
-import * as Effect from "effect/Effect";
-import * as FiberRef from "effect/FiberRef";
-import * as GlobalValue from "effect/GlobalValue";
-import * as Option from "effect/Option";
-import * as Tracer from "effect/Tracer";
-export const currentTracerDisabledWhen = GlobalValue.globalValue(Symbol.for("effect-start/RouteHttp/tracerDisabledWhen"), () => FiberRef.unsafeMake(() => false));
-export const withTracerDisabledWhen = (effect, predicate) => Effect.locally(effect, currentTracerDisabledWhen, predicate);
-export const currentSpanNameGenerator = GlobalValue.globalValue(Symbol.for("effect-start/RouteHttp/spanNameGenerator"), () => FiberRef.unsafeMake((request) => `http.server ${request.method}`));
-export const withSpanNameGenerator = (effect, f) => Effect.locally(effect, currentSpanNameGenerator, f);
+import * as Effect from "effect/Effect"
+import * as FiberRef from "effect/FiberRef"
+import * as GlobalValue from "effect/GlobalValue"
+import * as Option from "effect/Option"
+import * as Tracer from "effect/Tracer"
+
+export const currentTracerDisabledWhen = GlobalValue.globalValue(
+  Symbol.for("effect-start/RouteHttp/tracerDisabledWhen"),
+  () => FiberRef.unsafeMake(() => false),
+)
+
+export const withTracerDisabledWhen = (
+  effect,
+  predicate,
+) => Effect.locally(effect, currentTracerDisabledWhen, predicate)
+
+export const currentSpanNameGenerator = GlobalValue.globalValue(
+  Symbol.for("effect-start/RouteHttp/spanNameGenerator"),
+  () =>
+    FiberRef.unsafeMake((request) => `http.server ${request.method}`),
+)
+
+export const withSpanNameGenerator = (
+  effect,
+  f,
+) => Effect.locally(effect, currentSpanNameGenerator, f)
+
 const w3cTraceparent = (headers) => {
-    const header = headers.get("traceparent");
-    if (header === null)
-        return Option.none();
-    const parts = header.split("-");
-    if (parts.length < 4)
-        return Option.none();
-    const [_version, traceId, spanId, flags] = parts;
-    if (!traceId || !spanId)
-        return Option.none();
-    return Option.some(Tracer.externalSpan({
-        spanId,
-        traceId,
-        sampled: flags === "01",
-    }));
-};
+  const header = headers.get("traceparent")
+  if (header === null) return Option.none()
+
+  const parts = header.split("-")
+  if (parts.length < 4) return Option.none()
+
+  const [_version, traceId, spanId, flags] = parts
+  if (!traceId || !spanId) return Option.none()
+
+  return Option.some(
+    Tracer.externalSpan({
+      spanId,
+      traceId,
+      sampled: flags === "01",
+    }),
+  )
+}
+
 const b3Single = (headers) => {
-    const header = headers.get("b3");
-    if (header === null)
-        return Option.none();
-    const parts = header.split("-");
-    if (parts.length < 2)
-        return Option.none();
-    const [traceId, spanId, sampledStr] = parts;
-    if (!traceId || !spanId)
-        return Option.none();
-    return Option.some(Tracer.externalSpan({
-        spanId,
-        traceId,
-        sampled: sampledStr === "1",
-    }));
-};
+  const header = headers.get("b3")
+  if (header === null) return Option.none()
+
+  const parts = header.split("-")
+  if (parts.length < 2) return Option.none()
+
+  const [traceId, spanId, sampledStr] = parts
+  if (!traceId || !spanId) return Option.none()
+
+  return Option.some(
+    Tracer.externalSpan({
+      spanId,
+      traceId,
+      sampled: sampledStr === "1",
+    }),
+  )
+}
+
 const xb3 = (headers) => {
-    const traceId = headers.get("x-b3-traceid");
-    const spanId = headers.get("x-b3-spanid");
-    if (traceId === null || spanId === null)
-        return Option.none();
-    const sampled = headers.get("x-b3-sampled");
-    return Option.some(Tracer.externalSpan({
-        spanId,
-        traceId,
-        sampled: sampled === "1",
-    }));
-};
+  const traceId = headers.get("x-b3-traceid")
+  const spanId = headers.get("x-b3-spanid")
+  if (traceId === null || spanId === null) return Option.none()
+
+  const sampled = headers.get("x-b3-sampled")
+
+  return Option.some(
+    Tracer.externalSpan({
+      spanId,
+      traceId,
+      sampled: sampled === "1",
+    }),
+  )
+}
+
 export const parentSpanFromHeaders = (headers) => {
-    let span = w3cTraceparent(headers);
-    if (span._tag === "Some")
-        return span;
-    span = b3Single(headers);
-    if (span._tag === "Some")
-        return span;
-    return xb3(headers);
-};
+  let span = w3cTraceparent(headers)
+  if (span._tag === "Some") return span
+
+  span = b3Single(headers)
+  if (span._tag === "Some") return span
+
+  return xb3(headers)
+}

package/dist/RouteMount.js

@@ -1,63 +1,86 @@
-import * as Function from "effect/Function";
-import * as Route from "./Route.js";
-const RouteSetTypeId = Symbol.for("effect-start/RouteSet");
-export const use = makeMethodDescriber("*");
-export const get = makeMethodDescriber("GET");
-export const post = makeMethodDescriber("POST");
-export const put = makeMethodDescriber("PUT");
-export const del = makeMethodDescriber("DELETE");
-export const patch = makeMethodDescriber("PATCH");
-export const head = makeMethodDescriber("HEAD");
-export const options = makeMethodDescriber("OPTIONS");
-export const add = function (path, routes) {
-    const baseItems = Route.isRouteSet(this) ? Route.items(this) : [];
-    const routeSet = typeof routes === "function" ? routes(make([])) : routes;
-    const routeItems = Route.items(routeSet);
-    const newItems = routeItems.map((item) => {
-        const itemDescriptor = Route.descriptor(item);
-        const concatenatedPath = typeof itemDescriptor?.path === "string" ? path + itemDescriptor.path : path;
-        const newDescriptor = { ...itemDescriptor, path: concatenatedPath };
-        return Route.isRoute(item)
-            ? Route.make(item.handler, newDescriptor)
-            : Route.set(Route.items(item), newDescriptor);
-    });
-    return make([...baseItems, ...newItems]);
-};
+import * as Function from "effect/Function"
+import * as Route from "./Route.js"
+
+const RouteSetTypeId = Symbol.for("effect-start/RouteSet")
+
+// oxlint-disable-next-line import/first, typescript/consistent-type-imports -- typeof import() is not an import statement
+
+export const use = makeMethodDescriber("*")
+export const get = makeMethodDescriber("GET")
+export const post = makeMethodDescriber("POST")
+export const put = makeMethodDescriber("PUT")
+export const del = makeMethodDescriber("DELETE")
+export const patch = makeMethodDescriber("PATCH")
+export const head = makeMethodDescriber("HEAD")
+export const options = makeMethodDescriber("OPTIONS")
+
+export const add = function (
+  path,
+  routes,
+) {
+  const baseItems = Route.isRouteSet(this) ? Route.items(this) : (/** @type {const} */ [])
+
+  const routeSet = typeof routes === "function" ? routes(make([])) : routes
+  const routeItems = Route.items(routeSet)
+  const newItems = routeItems.map((item) => {
+    const itemDescriptor = Route.descriptor(item)
+    const concatenatedPath =
+      typeof itemDescriptor?.path === "string" ? path + itemDescriptor.path : path
+    const newDescriptor = { ...itemDescriptor, path: concatenatedPath }
+    return Route.isRoute(item)
+      ? Route.make(item.handler, newDescriptor)
+      : Route.set(Route.items(item), newDescriptor)
+  })
+
+  return make([...baseItems, ...newItems])
+}
+
 const Proto = Object.assign(Object.create(null), {
-    [RouteSetTypeId]: RouteSetTypeId,
-    *[Symbol.iterator]() {
-        yield* Route.items(this);
-    },
-    use,
-    get,
-    post,
-    put,
-    del,
-    patch,
-    head,
-    options,
-    add,
-});
+  [RouteSetTypeId]: RouteSetTypeId,
+  *[Symbol.iterator]() {
+    yield* Route.items(this)
+  },
+  use,
+  get,
+  post,
+  put,
+  del,
+  patch,
+  head,
+  options,
+  add,
+})
+
 function make(items) {
-    return Object.assign(Object.create(Proto), {
-        [Route.RouteItems]: items,
-        [Route.RouteDescriptor]: {},
-    });
+  return Object.assign(Object.create(Proto), {
+    [Route.RouteItems]: items,
+    [Route.RouteDescriptor]: {},
+  })
 }
+
 function makeMethodDescriber(method) {
-    function describeMethod(...fs) {
-        const baseItems = Route.isRouteSet(this) ? Route.items(this) : [];
-        const methodSet = Route.set([], { method });
-        const f = Function.flow(...fs);
-        const result = f(methodSet);
-        const resultItems = Route.items(result);
-        // Items are already flat (only Routes), just merge method into each descriptor
-        const flattenedItems = resultItems.map((item) => {
-            const itemDescriptor = Route.descriptor(item);
-            const newDescriptor = { method, ...itemDescriptor };
-            return Route.make(item.handler, newDescriptor);
-        });
-        return make([...baseItems, ...flattenedItems]);
-    }
-    return describeMethod;
+  function describeMethod(
+    ...fs
+  ) {
+    const baseItems = Route.isRouteSet(this) ? Route.items(this) : (/** @type {const} */ [])
+
+    const methodSet = Route.set([], { method })
+    const f = Function.flow(...(fs))
+    const result = f(methodSet)
+    const resultItems = Route.items(result)
+
+    // Items are already flat (only Routes), just merge method into each descriptor
+    const flattenedItems = resultItems.map((item) => {
+      const itemDescriptor = Route.descriptor(item)
+      const newDescriptor = { method, ...itemDescriptor }
+      return Route.make(
+        (item).handler,
+        newDescriptor,
+      )
+    })
+
+    return make([...baseItems, ...flattenedItems])
+  }
+  return describeMethod
 }
+