npm - @tim-smart/openapi-gen - Versions diffs - 0.3.12 → 0.3.14 - Mend

@tim-smart/openapi-gen 0.3.12 → 0.3.14

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.

Files changed (2) hide show

package/main.js +991 -571
package/package.json +1 -1

package/main.js CHANGED Viewed

@@ -68,8 +68,8 @@ var __commonJS = (cb, mod) => function __require2() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __export = (target, all9) => {
-  for (var name in all9)
-    __defProp(target, name, { get: all9[name], enumerable: true });
+  for (var name2 in all9)
+    __defProp(target, name2, { get: all9[name2], enumerable: true });
 };
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
@@ -330,16 +330,16 @@ var require_parser = __commonJS({
       function parse8(input) {
         var options3 = arguments.length > 1 ? arguments[1] : {}, peg$FAILED = {}, peg$startRuleFunctions = { start: peg$parsestart }, peg$startRuleFunction = peg$parsestart, peg$c1 = function() {
           return nodes;
-        }, peg$c2 = peg$FAILED, peg$c3 = "#", peg$c4 = { type: "literal", value: "#", description: '"#"' }, peg$c5 = void 0, peg$c6 = { type: "any", description: "any character" }, peg$c7 = "[", peg$c8 = { type: "literal", value: "[", description: '"["' }, peg$c9 = "]", peg$c10 = { type: "literal", value: "]", description: '"]"' }, peg$c11 = function(name) {
-          addNode(node("ObjectPath", name, line4, column3));
-        }, peg$c12 = function(name) {
-          addNode(node("ArrayPath", name, line4, column3));
-        }, peg$c13 = function(parts2, name) {
-          return parts2.concat(name);
-        }, peg$c14 = function(name) {
-          return [name];
-        }, peg$c15 = function(name) {
-          return name;
+        }, peg$c2 = peg$FAILED, peg$c3 = "#", peg$c4 = { type: "literal", value: "#", description: '"#"' }, peg$c5 = void 0, peg$c6 = { type: "any", description: "any character" }, peg$c7 = "[", peg$c8 = { type: "literal", value: "[", description: '"["' }, peg$c9 = "]", peg$c10 = { type: "literal", value: "]", description: '"]"' }, peg$c11 = function(name2) {
+          addNode(node("ObjectPath", name2, line4, column3));
+        }, peg$c12 = function(name2) {
+          addNode(node("ArrayPath", name2, line4, column3));
+        }, peg$c13 = function(parts2, name2) {
+          return parts2.concat(name2);
+        }, peg$c14 = function(name2) {
+          return [name2];
+        }, peg$c15 = function(name2) {
+          return name2;
         }, peg$c16 = ".", peg$c17 = { type: "literal", value: ".", description: '"."' }, peg$c18 = "=", peg$c19 = { type: "literal", value: "=", description: '"="' }, peg$c20 = function(key, value5) {
           addNode(node("Assign", value5, line4, column3, key));
         }, peg$c21 = function(chars) {
@@ -356,14 +356,14 @@ var require_parser = __commonJS({
           return "";
         }, peg$c38 = "e", peg$c39 = { type: "literal", value: "e", description: '"e"' }, peg$c40 = "E", peg$c41 = { type: "literal", value: "E", description: '"E"' }, peg$c42 = function(left3, right3) {
           return node("Float", parseFloat(left3 + "e" + right3), line4, column3);
-        }, peg$c43 = function(text9) {
-          return node("Float", parseFloat(text9), line4, column3);
+        }, peg$c43 = function(text10) {
+          return node("Float", parseFloat(text10), line4, column3);
         }, peg$c44 = "+", peg$c45 = { type: "literal", value: "+", description: '"+"' }, peg$c46 = function(digits) {
           return digits.join("");
         }, peg$c47 = "-", peg$c48 = { type: "literal", value: "-", description: '"-"' }, peg$c49 = function(digits) {
           return "-" + digits.join("");
-        }, peg$c50 = function(text9) {
-          return node("Integer", parseInt(text9, 10), line4, column3);
+        }, peg$c50 = function(text10) {
+          return node("Integer", parseInt(text10, 10), line4, column3);
         }, peg$c51 = "true", peg$c52 = { type: "literal", value: "true", description: '"true"' }, peg$c53 = function() {
           return node("Boolean", true, line4, column3);
         }, peg$c54 = "false", peg$c55 = { type: "literal", value: "false", description: '"false"' }, peg$c56 = function() {
@@ -4116,13 +4116,13 @@ var require_utils = __commonJS({
       }
     };
     var ERR_INVALID_ARG_TYPE = class extends TypeError {
-      constructor(name, expected, actual) {
-        name.includes(".") ? "property" : "argument";
+      constructor(name2, expected, actual) {
+        name2.includes(".") ? "property" : "argument";
       }
     };
-    function assertIsObject(value5, name, types = "Object") {
+    function assertIsObject(value5, name2, types = "Object") {
       if (value5 !== void 0 && (value5 === null || typeof value5 !== "object" || Array.isArray(value5))) {
-        const err = new ERR_INVALID_ARG_TYPE(name, types, value5);
+        const err = new ERR_INVALID_ARG_TYPE(name2, types, value5);
         Error.captureStackTrace(err, assertIsObject);
         throw err;
       }
@@ -4182,11 +4182,11 @@ var require_request = __commonJS({
     var { Stream: Stream2 } = __require("stream");
     function addFunctions(container, obj) {
       const proto25 = obj.prototype;
-      Object.keys(proto25).forEach((name) => {
-        if (container.indexOf(name) != -1)
+      Object.keys(proto25).forEach((name2) => {
+        if (container.indexOf(name2) != -1)
           return;
-        if (name.indexOf("_") != 0 && typeof proto25[name] == "function") {
-          container.push(name);
+        if (name2.indexOf("_") != 0 && typeof proto25[name2] == "function") {
+          container.push(name2);
         }
       });
     }
@@ -4206,10 +4206,10 @@ var require_request = __commonJS({
       this.http2Mimic = true;
       this[$stubs] = [];
       for (var i = 0; i < STUBBED_METHODS_NAME.length; i++) {
-        let name = STUBBED_METHODS_NAME[i];
-        if (!ClientRequest.prototype[name]) {
-          this[name] = function method() {
-            return this.genericStubber(name, arguments);
+        let name2 = STUBBED_METHODS_NAME[i];
+        if (!ClientRequest.prototype[name2]) {
+          this[name2] = function method() {
+            return this.genericStubber(name2, arguments);
           }.bind(this);
         }
       }
@@ -4316,9 +4316,9 @@ var require_request = __commonJS({
       },
       take(stream3) {
         for (var i = 0; i < STUBBED_METHODS_NAME.length; i++) {
-          let name = STUBBED_METHODS_NAME[i];
-          if (stream3[name]) {
-            this[name] = stream3[name].bind(stream3);
+          let name2 = STUBBED_METHODS_NAME[i];
+          if (stream3[name2]) {
+            this[name2] = stream3[name2].bind(stream3);
           }
         }
         this._on = stream3.on.bind(stream3);
@@ -4347,18 +4347,18 @@ var require_request = __commonJS({
         });
         const properties = Object.getOwnPropertyDescriptors(http2Stream);
         for (var i = 0; i < keysToProxy.length; i++) {
-          let name = keysToProxy[i];
-          const propConfig = properties[name];
+          let name2 = keysToProxy[i];
+          const propConfig = properties[name2];
           let shouldCopyValue;
           if (!propConfig)
             shouldCopyValue = true;
           if (propConfig && (propConfig.writable || propConfig))
             shouldCopyValue = true;
           if (shouldCopyValue)
-            http2Stream[name] = this[name];
-          Object.defineProperty(this, name, {
-            get: getter.bind(name),
-            set: setter.bind(name)
+            http2Stream[name2] = this[name2];
+          Object.defineProperty(this, name2, {
+            get: getter.bind(name2),
+            set: setter.bind(name2)
           });
         }
       }
@@ -4970,10 +4970,10 @@ function writeToStream(dest, instance) {
     body.pipe(dest);
   }
 }
-function validateName(name) {
-  name = `${name}`;
-  if (invalidTokenRegex.test(name)) {
-    throw new TypeError(`${name} is not a legal HTTP header name`);
+function validateName(name2) {
+  name2 = `${name2}`;
+  if (invalidTokenRegex.test(name2)) {
+    throw new TypeError(`${name2} is not a legal HTTP header name`);
   }
 }
 function validateValue(value5) {
@@ -4982,10 +4982,10 @@ function validateValue(value5) {
     throw new TypeError(`${value5} is not a legal HTTP header value`);
   }
 }
-function find3(map33, name) {
-  name = name.toLowerCase();
+function find3(map33, name2) {
+  name2 = name2.toLowerCase();
   for (const key in map33) {
-    if (key.toLowerCase() === name) {
+    if (key.toLowerCase() === name2) {
       return key;
     }
   }
@@ -5021,23 +5021,23 @@ function exportNodeCompatibleHeaders(headers) {
 }
 function createHeadersLenient(obj) {
   const headers = new Headers();
-  for (const name of Object.keys(obj)) {
-    if (invalidTokenRegex.test(name)) {
+  for (const name2 of Object.keys(obj)) {
+    if (invalidTokenRegex.test(name2)) {
       continue;
     }
-    if (Array.isArray(obj[name])) {
-      for (const val of obj[name]) {
+    if (Array.isArray(obj[name2])) {
+      for (const val of obj[name2]) {
         if (invalidHeaderCharRegex.test(val)) {
           continue;
         }
-        if (headers[MAP][name] === void 0) {
-          headers[MAP][name] = [val];
+        if (headers[MAP][name2] === void 0) {
+          headers[MAP][name2] = [val];
         } else {
-          headers[MAP][name].push(val);
+          headers[MAP][name2].push(val);
         }
       }
-    } else if (!invalidHeaderCharRegex.test(obj[name])) {
-      headers[MAP][name] = [obj[name]];
+    } else if (!invalidHeaderCharRegex.test(obj[name2])) {
+      headers[MAP][name2] = [obj[name2]];
     }
   }
   return headers;
@@ -5431,10 +5431,10 @@ var init_lib = __esm({
       text: { enumerable: true }
     });
     Body.mixIn = function(proto25) {
-      for (const name of Object.getOwnPropertyNames(Body.prototype)) {
-        if (!(name in proto25)) {
-          const desc = Object.getOwnPropertyDescriptor(Body.prototype, name);
-          Object.defineProperty(proto25, name, desc);
+      for (const name2 of Object.getOwnPropertyNames(Body.prototype)) {
+        if (!(name2 in proto25)) {
+          const desc = Object.getOwnPropertyDescriptor(Body.prototype, name2);
+          Object.defineProperty(proto25, name2, desc);
         }
       }
     };
@@ -5498,10 +5498,10 @@ var init_lib = __esm({
        * @param   String  name  Header name
        * @return  Mixed
        */
-      get(name) {
-        name = `${name}`;
-        validateName(name);
-        const key = find3(this[MAP], name);
+      get(name2) {
+        name2 = `${name2}`;
+        validateName(name2);
+        const key = find3(this[MAP], name2);
         if (key === void 0) {
           return null;
         }
@@ -5520,8 +5520,8 @@ var init_lib = __esm({
         let i = 0;
         while (i < pairs.length) {
           var _pairs$i = pairs[i];
-          const name = _pairs$i[0], value5 = _pairs$i[1];
-          callback.call(thisArg, value5, name, this);
+          const name2 = _pairs$i[0], value5 = _pairs$i[1];
+          callback.call(thisArg, value5, name2, this);
           pairs = getHeaders(this);
           i++;
         }
@@ -5533,13 +5533,13 @@ var init_lib = __esm({
        * @param   String  value  Header value
        * @return  Void
        */
-      set(name, value5) {
-        name = `${name}`;
+      set(name2, value5) {
+        name2 = `${name2}`;
         value5 = `${value5}`;
-        validateName(name);
+        validateName(name2);
         validateValue(value5);
-        const key = find3(this[MAP], name);
-        this[MAP][key !== void 0 ? key : name] = [value5];
+        const key = find3(this[MAP], name2);
+        this[MAP][key !== void 0 ? key : name2] = [value5];
       }
       /**
        * Append a value onto existing header
@@ -5548,16 +5548,16 @@ var init_lib = __esm({
        * @param   String  value  Header value
        * @return  Void
        */
-      append(name, value5) {
-        name = `${name}`;
+      append(name2, value5) {
+        name2 = `${name2}`;
         value5 = `${value5}`;
-        validateName(name);
+        validateName(name2);
         validateValue(value5);
-        const key = find3(this[MAP], name);
+        const key = find3(this[MAP], name2);
         if (key !== void 0) {
           this[MAP][key].push(value5);
         } else {
-          this[MAP][name] = [value5];
+          this[MAP][name2] = [value5];
         }
       }
       /**
@@ -5566,10 +5566,10 @@ var init_lib = __esm({
        * @param   String   name  Header name
        * @return  Boolean
        */
-      has(name) {
-        name = `${name}`;
-        validateName(name);
-        return find3(this[MAP], name) !== void 0;
+      has(name2) {
+        name2 = `${name2}`;
+        validateName(name2);
+        return find3(this[MAP], name2) !== void 0;
       }
       /**
        * Delete all header values given name
@@ -5577,10 +5577,10 @@ var init_lib = __esm({
        * @param   String  name  Header name
        * @return  Void
        */
-      delete(name) {
-        name = `${name}`;
-        validateName(name);
-        const key = find3(this[MAP], name);
+      delete(name2) {
+        name2 = `${name2}`;
+        validateName(name2);
+        const key = find3(this[MAP], name2);
         if (key !== void 0) {
           delete this[MAP][key];
         }
@@ -7716,7 +7716,7 @@ var require_swagger2openapi = __commonJS({
         }
       }
     }
-    function processResponse(response, name, op, openapi, options3) {
+    function processResponse(response, name2, op, openapi, options3) {
       if (!response) return false;
       if (response.$ref && typeof response.$ref === "string") {
         if (response.$ref.indexOf("#/definitions/") >= 0) {
@@ -8524,6 +8524,7 @@ var identity = (a) => a;
 var constant = (value5) => () => value5;
 var constTrue = /* @__PURE__ */ constant(true);
 var constFalse = /* @__PURE__ */ constant(false);
+var constNull = /* @__PURE__ */ constant(null);
 var constUndefined = /* @__PURE__ */ constant(void 0);
 var constVoid = constUndefined;
 function pipe(a, ab, bc, cd, de, ef, fg, gh, hi) {
@@ -9360,6 +9361,7 @@ var getOrElse = /* @__PURE__ */ dual(2, (self, onNone) => isNone2(self) ? onNone
 var orElse = /* @__PURE__ */ dual(2, (self, that) => isNone2(self) ? that() : self);
 var orElseSome = /* @__PURE__ */ dual(2, (self, onNone) => isNone2(self) ? some2(onNone()) : self);
 var fromNullable = (nullableValue) => nullableValue == null ? none2() : some2(nullableValue);
+var getOrNull = /* @__PURE__ */ getOrElse(constNull);
 var getOrUndefined = /* @__PURE__ */ getOrElse(constUndefined);
 var liftThrowable = (f) => (...a) => {
   try {
@@ -14270,8 +14272,8 @@ var fromFlatLoop = (flat, prefix, config2, split2) => {
     case OP_PRIMITIVE: {
       return pipe(patch5(prefix, flat.patch), flatMap7((prefix2) => pipe(flat.load(prefix2, op, split2), flatMap7((values3) => {
         if (values3.length === 0) {
-          const name = pipe(last(prefix2), getOrElse(() => "<n/a>"));
-          return fail2(MissingData([], `Expected ${op.description} with name ${name}`));
+          const name2 = pipe(last(prefix2), getOrElse(() => "<n/a>"));
+          return fail2(MissingData([], `Expected ${op.description} with name ${name2}`));
         }
         return succeed(values3);
       }))));
@@ -14323,18 +14325,18 @@ var fromFlatLoop = (flat, prefix, config2, split2) => {
   }
 };
 var fromFlatLoopFail = (prefix, path2) => (index) => left2(MissingData(prefix, `The element at index ${index} in a sequence at path "${path2}" was missing`));
-var splitPathString = (text8, delim) => {
-  const split2 = text8.split(new RegExp(`\\s*${escape(delim)}\\s*`));
+var splitPathString = (text9, delim) => {
+  const split2 = text9.split(new RegExp(`\\s*${escape(delim)}\\s*`));
   return split2;
 };
-var parsePrimitive = (text8, path2, primitive2, delimiter, split2) => {
+var parsePrimitive = (text9, path2, primitive2, delimiter, split2) => {
   if (!split2) {
-    return pipe(primitive2.parse(text8), mapBoth2({
+    return pipe(primitive2.parse(text9), mapBoth2({
       onFailure: prefixed(path2),
       onSuccess: of
     }));
   }
-  return pipe(splitPathString(text8, delimiter), forEachSequential((char4) => primitive2.parse(char4.trim())), mapError(prefixed(path2)));
+  return pipe(splitPathString(text9, delimiter), forEachSequential((char4) => primitive2.parse(char4.trim())), mapError(prefixed(path2)));
 };
 var transpose = (array7) => {
   return Object.keys(array7[0]).map((column3) => array7.map((row) => row[column3]));
@@ -14515,7 +14517,7 @@ var randomHexString = /* @__PURE__ */ function() {
   };
 }();
 var NativeSpan = class {
-  constructor(name, parent, context7, links, startTime, kind) {
+  constructor(name2, parent, context7, links, startTime, kind) {
     __publicField(this, "name");
     __publicField(this, "parent");
     __publicField(this, "context");
@@ -14529,7 +14531,7 @@ var NativeSpan = class {
     __publicField(this, "attributes");
     __publicField(this, "events", []);
     __publicField(this, "links");
-    this.name = name;
+    this.name = name2;
     this.parent = parent;
     this.context = context7;
     this.startTime = startTime;
@@ -14554,15 +14556,15 @@ var NativeSpan = class {
   attribute(key, value5) {
     this.attributes.set(key, value5);
   }
-  event(name, startTime, attributes) {
-    this.events.push([name, startTime, attributes ?? {}]);
+  event(name2, startTime, attributes) {
+    this.events.push([name2, startTime, attributes ?? {}]);
   }
   addLinks(links) {
     this.links.push(...links);
   }
 };
 var nativeTracer = /* @__PURE__ */ make23({
-  span: (name, parent, context7, links, startTime, kind) => new NativeSpan(name, parent, context7, links, startTime, kind),
+  span: (name2, parent, context7, links, startTime, kind) => new NativeSpan(name2, parent, context7, links, startTime, kind),
   context: (f) => f()
 });
 var addSpanStackTrace = (options3) => {
@@ -14669,8 +14671,8 @@ var make25 = (bytes) => {
   redactedRegistry.set(secret4, bytes.map((byte) => String.fromCharCode(byte)).join(""));
   return secret4;
 };
-var fromString = (text8) => {
-  return make25(text8.split("").map((char4) => char4.charCodeAt(0)));
+var fromString = (text9) => {
+  return make25(text9.split("").map((char4) => char4.charCodeAt(0)));
 };
 // node_modules/.pnpm/effect@3.15.0/node_modules/effect/dist/esm/internal/config.js
@@ -15103,18 +15105,18 @@ var _a18;
 var MicroCauseImpl = class extends globalThis.Error {
   constructor(_tag, originalError, traces) {
     const causeName = `MicroCause.${_tag}`;
-    let name;
+    let name2;
     let message;
     let stack;
     if (originalError instanceof globalThis.Error) {
-      name = `(${causeName}) ${originalError.name}`;
+      name2 = `(${causeName}) ${originalError.name}`;
       message = originalError.message;
       const messageLines = message.split("\n").length;
-      stack = originalError.stack ? `(${causeName}) ${originalError.stack.split("\n").slice(0, messageLines + 3).join("\n")}` : `${name}: ${message}`;
+      stack = originalError.stack ? `(${causeName}) ${originalError.stack.split("\n").slice(0, messageLines + 3).join("\n")}` : `${name2}: ${message}`;
     } else {
-      name = causeName;
+      name2 = causeName;
       message = toStringUnknown(originalError, 0);
-      stack = `${name}: ${message}`;
+      stack = `${name2}: ${message}`;
     }
     if (traces.length > 0) {
       stack += `
@@ -15127,7 +15129,7 @@ var MicroCauseImpl = class extends globalThis.Error {
     this._tag = _tag;
     this.traces = traces;
     this[MicroCauseTypeId] = microCauseVariance;
-    this.name = name;
+    this.name = name2;
     this.stack = stack;
   }
   pipe() {
@@ -15940,14 +15942,14 @@ var when = /* @__PURE__ */ dual(2, (self, condition) => suspend(() => condition(
 var serviceOption = (tag4) => map10(context(), getOption2(tag4));
 var bigint02 = /* @__PURE__ */ BigInt(0);
 var filterDisablePropagation = /* @__PURE__ */ flatMap((span2) => get5(span2.context, DisablePropagation) ? span2._tag === "Span" ? filterDisablePropagation(span2.parent) : none2() : some2(span2));
-var unsafeMakeSpan = (fiber, name, options3) => {
+var unsafeMakeSpan = (fiber, name2, options3) => {
   const disablePropagation = !fiber.getFiberRef(currentTracerEnabled) || options3.context && get5(options3.context, DisablePropagation);
   const context7 = fiber.getFiberRef(currentContext);
   const parent = options3.parent ? some2(options3.parent) : options3.root ? none2() : filterDisablePropagation(getOption2(context7, spanTag));
   let span2;
   if (disablePropagation) {
     span2 = noopSpan({
-      name,
+      name: name2,
       parent,
       context: add4(options3.context ?? empty8(), DisablePropagation, true)
     });
@@ -15960,7 +15962,7 @@ var unsafeMakeSpan = (fiber, name, options3) => {
     const annotationsFromEnv = get9(fiberRefs3, currentTracerSpanAnnotations);
     const linksFromEnv = get9(fiberRefs3, currentTracerSpanLinks);
     const links = linksFromEnv._tag === "Some" ? options3.links !== void 0 ? [...toReadonlyArray(linksFromEnv.value), ...options3.links ?? []] : toReadonlyArray(linksFromEnv.value) : options3.links ?? empty2();
-    span2 = tracer2.span(name, parent, options3.context ?? empty8(), links, timingEnabled ? clock3.unsafeCurrentTimeNanos() : bigint02, options3.kind ?? "internal");
+    span2 = tracer2.span(name2, parent, options3.context ?? empty8(), links, timingEnabled ? clock3.unsafeCurrentTimeNanos() : bigint02, options3.kind ?? "internal");
     if (annotationsFromEnv._tag === "Some") {
       forEach3(annotationsFromEnv.value, (value5, key) => span2.attribute(key, value5));
     }
@@ -15982,11 +15984,11 @@ var endSpan = (span2, exit4, clock3, timingEnabled) => sync(() => {
   }
   span2.end(timingEnabled ? clock3.unsafeCurrentTimeNanos() : bigint02, exit4);
 });
-var useSpan = (name, ...args2) => {
+var useSpan = (name2, ...args2) => {
   const options3 = addSpanStackTrace(args2.length === 1 ? void 0 : args2[0]);
   const evaluate2 = args2[args2.length - 1];
   return withFiberRuntime((fiber) => {
-    const span2 = unsafeMakeSpan(fiber, name, options3);
+    const span2 = unsafeMakeSpan(fiber, name2, options3);
     const timingEnabled = fiber.getFiberRef(currentTracerTimingEnabled);
     const clock3 = get5(fiber.getFiberRef(currentServices), clockTag);
     return onExit(evaluate2(span2), (exit4) => endSpan(span2, exit4, clock3, timingEnabled));
@@ -15995,13 +15997,13 @@ var useSpan = (name, ...args2) => {
 var withParentSpan = /* @__PURE__ */ dual(2, (self, span2) => provideService(self, spanTag, span2));
 var withSpan = function() {
   const dataFirst = typeof arguments[0] !== "string";
-  const name = dataFirst ? arguments[1] : arguments[0];
+  const name2 = dataFirst ? arguments[1] : arguments[0];
   const options3 = addSpanStackTrace(dataFirst ? arguments[2] : arguments[1]);
   if (dataFirst) {
     const self = arguments[0];
-    return useSpan(name, options3, (span2) => withParentSpan(self, span2));
+    return useSpan(name2, options3, (span2) => withParentSpan(self, span2));
   }
-  return (self) => useSpan(name, options3, (span2) => withParentSpan(self, span2));
+  return (self) => useSpan(name2, options3, (span2) => withParentSpan(self, span2));
 };
 // node_modules/.pnpm/effect@3.15.0/node_modules/effect/dist/esm/Exit.js
@@ -16163,14 +16165,14 @@ var structuredMessage = (u) => {
     }
   }
 };
-var withColor = (text8, ...colors2) => {
+var withColor = (text9, ...colors2) => {
   let out = "";
   for (let i = 0; i < colors2.length; i++) {
     out += `\x1B[${colors2[i]}m`;
   }
-  return out + text8 + "\x1B[0m";
+  return out + text9 + "\x1B[0m";
 };
-var withColorNoop = (text8, ..._colors) => text8;
+var withColorNoop = (text9, ..._colors) => text9;
 var colors = {
   bold: "1",
   red: "31",
@@ -16454,14 +16456,14 @@ var metricKeyVariance = {
 var arrayEquivilence = /* @__PURE__ */ getEquivalence(equals);
 var _a31;
 var MetricKeyImpl = class {
-  constructor(name, keyType, description, tags2 = []) {
+  constructor(name2, keyType, description, tags2 = []) {
     __publicField(this, "name");
     __publicField(this, "keyType");
     __publicField(this, "description");
     __publicField(this, "tags");
     __publicField(this, _a31, metricKeyVariance);
     __publicField(this, "_hash");
-    this.name = name;
+    this.name = name2;
     this.keyType = keyType;
     this.description = description;
     this.tags = tags2;
@@ -16478,8 +16480,8 @@ var MetricKeyImpl = class {
   }
 };
 var isMetricKey = (u) => hasProperty(u, MetricKeyTypeId);
-var counter2 = (name, options3) => new MetricKeyImpl(name, counter(options3), fromNullable(options3?.description));
-var histogram2 = (name, boundaries, description) => new MetricKeyImpl(name, histogram(boundaries), fromNullable(description));
+var counter2 = (name2, options3) => new MetricKeyImpl(name2, counter(options3), fromNullable(options3?.description));
+var histogram2 = (name2, boundaries, description) => new MetricKeyImpl(name2, histogram(boundaries), fromNullable(description));
 var taggedWithLabels = /* @__PURE__ */ dual(2, (self, extraTags) => extraTags.length === 0 ? self : new MetricKeyImpl(self.name, self.keyType, self.description, union(self.tags, extraTags)));
 // node_modules/.pnpm/effect@3.15.0/node_modules/effect/dist/esm/MutableHashMap.js
@@ -17195,7 +17197,7 @@ var make32 = function(keyType, unsafeUpdate, unsafeValue, unsafeModify) {
   });
   return metric;
 };
-var counter5 = (name, options3) => fromMetricKey(counter2(name, options3));
+var counter5 = (name2, options3) => fromMetricKey(counter2(name2, options3));
 var fromMetricKey = (key) => {
   let untaggedHook;
   const hookCache = /* @__PURE__ */ new WeakMap();
@@ -17217,7 +17219,7 @@ var fromMetricKey = (key) => {
   };
   return make32(key.keyType, (input, extraTags) => hook(extraTags).update(input), (extraTags) => hook(extraTags).get(), (input, extraTags) => hook(extraTags).modify(input));
 };
-var histogram5 = (name, boundaries, description) => fromMetricKey(histogram2(name, boundaries, description));
+var histogram5 = (name2, boundaries, description) => fromMetricKey(histogram2(name2, boundaries, description));
 var tagged = /* @__PURE__ */ dual(3, (self, key, value5) => taggedWithLabels2(self, [make29(key, value5)]));
 var taggedWithLabels2 = /* @__PURE__ */ dual(2, (self, extraTags) => {
   return make32(self.keyType, (input, extraTags1) => self.unsafeUpdate(input, union(extraTags, extraTags1)), (extraTags1) => self.unsafeValue(union(extraTags, extraTags1)), (input, extraTags1) => self.unsafeModify(input, union(extraTags, extraTags1)));
@@ -20057,6 +20059,12 @@ var suspend4 = (evaluate2) => {
   suspend11.evaluate = evaluate2;
   return suspend11;
 };
+var sync4 = /* @__PURE__ */ dual(2, (a, b) => {
+  const tagFirst = isTag2(a);
+  const tag4 = tagFirst ? a : b;
+  const evaluate2 = tagFirst ? b : a;
+  return fromEffectContext(sync(() => make12(tag4, evaluate2())));
+});
 var provide = /* @__PURE__ */ dual(2, (self, that) => suspend4(() => {
   const provideTo = Object.create(proto5);
   provideTo._op_layer = OP_PROVIDE;
@@ -20472,7 +20480,7 @@ var fn = function(nameOrBody, ...pipeables) {
   Error.stackTraceLimit = 2;
   const errorDef = new Error();
   Error.stackTraceLimit = limit;
-  const name = nameOrBody;
+  const name2 = nameOrBody;
   const options3 = pipeables[0];
   return (body, ...pipeables2) => defineLength(body.length, function(...args2) {
     const limit2 = Error.stackTraceLimit;
@@ -20484,7 +20492,7 @@ var fn = function(nameOrBody, ...pipeables) {
       body,
       args: args2,
       pipeables: pipeables2,
-      spanName: name,
+      spanName: name2,
       spanOptions: options3,
       errorDef,
       errorCall
@@ -20607,13 +20615,13 @@ var formatUnknown = (u, checkCircular = true) => {
       JSON.stringify(u);
     }
     const pojo = `{${ownKeys(u).map((k) => `${isString(k) ? JSON.stringify(k) : String(k)}:${formatUnknown(u[k], false)}`).join(",")}}`;
-    const name = u.constructor.name;
-    return u.constructor !== Object.prototype.constructor ? `${name}(${pojo})` : pojo;
+    const name2 = u.constructor.name;
+    return u.constructor !== Object.prototype.constructor ? `${name2}(${pojo})` : pojo;
   } catch (e) {
     return "<circular structure>";
   }
 };
-var formatPropertyKey = (name) => typeof name === "string" ? JSON.stringify(name) : String(name);
+var formatPropertyKey = (name2) => typeof name2 === "string" ? JSON.stringify(name2) : String(name2);
 var isNonEmpty5 = (x) => Array.isArray(x);
 var isSingle = (x) => !Array.isArray(x);
 var formatPathKey = (key) => `[${formatPropertyKey(key)}]`;
@@ -21071,11 +21079,11 @@ var formatTuple = (ast) => {
   });
 };
 var PropertySignature = class extends OptionalType {
-  constructor(name, type2, isOptional, isReadonly, annotations2) {
+  constructor(name2, type2, isOptional, isReadonly, annotations2) {
     super(type2, isOptional, annotations2);
     __publicField(this, "name");
     __publicField(this, "isReadonly");
-    this.name = name;
+    this.name = name2;
     this.isReadonly = isReadonly;
   }
   /**
@@ -21159,11 +21167,11 @@ var TypeLiteral = class {
     this.annotations = annotations2;
     const keys5 = {};
     for (let i = 0; i < propertySignatures.length; i++) {
-      const name = propertySignatures[i].name;
-      if (Object.prototype.hasOwnProperty.call(keys5, name)) {
-        throw new Error(getASTDuplicatePropertySignatureErrorMessage(name));
+      const name2 = propertySignatures[i].name;
+      if (Object.prototype.hasOwnProperty.call(keys5, name2)) {
+        throw new Error(getASTDuplicatePropertySignatureErrorMessage(name2));
       }
-      keys5[name] = null;
+      keys5[name2] = null;
     }
     const parameters = {
       string: false,
@@ -21609,8 +21617,8 @@ var record = (key, value5) => {
         }
         break;
       case "Enums": {
-        for (const [_, name] of key2.enums) {
-          propertySignatures.push(new PropertySignature(name, value5, false, true));
+        for (const [_, name2] of key2.enums) {
+          propertySignatures.push(new PropertySignature(name2, value5, false, true));
         }
         break;
       }
@@ -22345,13 +22353,13 @@ var go = (ast, isDecoding) => {
         const isExact = options3?.exact === true;
         for (let i = 0; i < propertySignatures.length; i++) {
           const ps = propertySignatures[i][1];
-          const name = ps.name;
-          const hasKey = Object.prototype.hasOwnProperty.call(input, name);
+          const name2 = ps.name;
+          const hasKey = Object.prototype.hasOwnProperty.call(input, name2);
           if (!hasKey) {
             if (ps.isOptional) {
               continue;
             } else if (isExact) {
-              const e = new Pointer(name, input, new Missing(ps));
+              const e = new Pointer(name2, input, new Missing(ps));
               if (allErrors) {
                 es.push([stepKey++, e]);
                 continue;
@@ -22361,10 +22369,10 @@ var go = (ast, isDecoding) => {
             }
           }
           const parser = propertySignatures[i][0];
-          const te = parser(input[name], options3);
+          const te = parser(input[name2], options3);
           if (isEither3(te)) {
             if (isLeft2(te)) {
-              const e = new Pointer(name, input, hasKey ? te.left : new Missing(ps));
+              const e = new Pointer(name2, input, hasKey ? te.left : new Missing(ps));
               if (allErrors) {
                 es.push([stepKey++, e]);
                 continue;
@@ -22372,10 +22380,10 @@ var go = (ast, isDecoding) => {
                 return left2(new Composite2(ast, input, e, output));
               }
             }
-            output[name] = te.right;
+            output[name2] = te.right;
           } else {
             const nk = stepKey++;
-            const index = name;
+            const index = name2;
             if (!queue) {
               queue = [];
             }
@@ -22458,9 +22466,9 @@ var go = (ast, isDecoding) => {
           }
           if (options3?.propertyOrder === "original") {
             const keys5 = inputKeys || ownKeys(input);
-            for (const name of expectedKeys) {
-              if (keys5.indexOf(name) === -1) {
-                keys5.push(name);
+            for (const name2 of expectedKeys) {
+              if (keys5.indexOf(name2) === -1) {
+                keys5.push(name2);
               }
             }
             const out = {};
@@ -22511,29 +22519,29 @@ var go = (ast, isDecoding) => {
         if (ownKeysLen > 0) {
           if (isRecordOrArray(input)) {
             for (let i = 0; i < ownKeysLen; i++) {
-              const name = ownKeys2[i];
-              const buckets = searchTree.keys[name].buckets;
-              if (Object.prototype.hasOwnProperty.call(input, name)) {
-                const literal2 = String(input[name]);
+              const name2 = ownKeys2[i];
+              const buckets = searchTree.keys[name2].buckets;
+              if (Object.prototype.hasOwnProperty.call(input, name2)) {
+                const literal2 = String(input[name2]);
                 if (Object.prototype.hasOwnProperty.call(buckets, literal2)) {
                   candidates = candidates.concat(buckets[literal2]);
                 } else {
                   const {
                     candidates: candidates2,
                     literals
-                  } = searchTree.keys[name];
+                  } = searchTree.keys[name2];
                   const literalsUnion = Union.make(literals);
-                  const errorAst = candidates2.length === astTypesLen ? new TypeLiteral([new PropertySignature(name, literalsUnion, false, true)], []) : Union.make(candidates2);
-                  es.push([stepKey++, new Composite2(errorAst, input, new Pointer(name, input, new Type2(literalsUnion, input[name])))]);
+                  const errorAst = candidates2.length === astTypesLen ? new TypeLiteral([new PropertySignature(name2, literalsUnion, false, true)], []) : Union.make(candidates2);
+                  es.push([stepKey++, new Composite2(errorAst, input, new Pointer(name2, input, new Type2(literalsUnion, input[name2])))]);
                 }
               } else {
                 const {
                   candidates: candidates2,
                   literals
-                } = searchTree.keys[name];
-                const fakePropertySignature = new PropertySignature(name, Union.make(literals), false, true);
+                } = searchTree.keys[name2];
+                const fakePropertySignature = new PropertySignature(name2, Union.make(literals), false, true);
                 const errorAst = candidates2.length === astTypesLen ? new TypeLiteral([fakePropertySignature], []) : Union.make(candidates2);
-                es.push([stepKey++, new Composite2(errorAst, input, new Pointer(name, input, new Missing(fakePropertySignature)))]);
+                es.push([stepKey++, new Composite2(errorAst, input, new Pointer(name2, input, new Missing(fakePropertySignature)))]);
               }
             }
           } else {
@@ -22895,9 +22903,11 @@ var withMinimumLogLevel = /* @__PURE__ */ dual(2, (self, level) => fiberRefLocal
 // node_modules/.pnpm/effect@3.15.0/node_modules/effect/dist/esm/Layer.js
 var effect = fromEffect3;
+var merge7 = merge5;
 var mergeAll4 = mergeAll2;
 var scoped3 = scoped;
 var succeed10 = succeed7;
+var sync6 = sync4;
 var provide3 = provide;
 var provideMerge2 = provideMerge;
@@ -22911,7 +22921,7 @@ var defaultConfig = {
   showBuiltIns: true,
   showTypes: true
 };
-var normalizeCase = /* @__PURE__ */ dual(2, (self, text8) => self.isCaseSensitive ? text8 : text8.toLowerCase());
+var normalizeCase = /* @__PURE__ */ dual(2, (self, text9) => self.isCaseSensitive ? text9 : text9.toLowerCase());
 // node_modules/.pnpm/@effect+cli@0.61.0_@effect+platform@0.82.0_effect@3.15.0__@effect+printer-ansi@0.43.0_@effect_47yie6mzjhwbbrbs5cq7mqvkpe/node_modules/@effect/cli/dist/esm/internal/autoCorrect.js
 var levensteinDistance = (first3, second, config2) => {
@@ -23521,11 +23531,11 @@ var acquireReleaseOut = /* @__PURE__ */ dual(2, (self, release) => {
 var collectElements = (self) => {
   return suspend6(() => {
     const builder = [];
-    return flatMap12(pipeTo(self, collectElementsReader(builder)), (value5) => sync6(() => [fromIterable2(builder), value5]));
+    return flatMap12(pipeTo(self, collectElementsReader(builder)), (value5) => sync7(() => [fromIterable2(builder), value5]));
   });
 };
 var collectElementsReader = (builder) => readWith({
-  onInput: (outElem) => flatMap12(sync6(() => {
+  onInput: (outElem) => flatMap12(sync7(() => {
     builder.push(outElem);
   }), () => collectElementsReader(builder)),
   onFailure: fail11,
@@ -23610,7 +23620,7 @@ var readWithCause = (options3) => {
   op.done = new ContinuationKImpl(options3.onDone, options3.onFailure);
   return op;
 };
-var succeed11 = (value5) => sync6(() => value5);
+var succeed11 = (value5) => sync7(() => value5);
 var succeedNow = (result) => {
   const op = Object.create(proto8);
   op._tag = OP_SUCCEED_NOW;
@@ -23623,7 +23633,7 @@ var suspend6 = (evaluate2) => {
   op.channel = evaluate2;
   return op;
 };
-var sync6 = (evaluate2) => {
+var sync7 = (evaluate2) => {
   const op = Object.create(proto8);
   op._tag = OP_SUCCEED;
   op.evaluate = evaluate2;
@@ -24699,7 +24709,7 @@ var identityChannel = () => readWith({
   onFailure: fail11,
   onDone: succeedNow
 });
-var map20 = /* @__PURE__ */ dual(2, (self, f) => flatMap12(self, (a) => sync6(() => f(a))));
+var map20 = /* @__PURE__ */ dual(2, (self, f) => flatMap12(self, (a) => sync7(() => f(a))));
 var mapOut = /* @__PURE__ */ dual(2, (self, f) => {
   const reader = readWith({
     onInput: (outElem) => flatMap12(write(f(outElem)), () => reader),
@@ -25342,7 +25352,7 @@ var transduce = /* @__PURE__ */ dual(2, (self, sink) => {
     const upstreamMarker = readWith({
       onInput: (input) => flatMap12(write(input), () => upstreamMarker),
       onFailure: fail11,
-      onDone: (done8) => zipRight4(sync6(() => {
+      onDone: (done8) => zipRight4(sync7(() => {
         upstreamDone.ref = true;
       }), succeedNow(done8))
     });
@@ -25970,10 +25980,10 @@ var char = (char4) => {
   op.char = char4;
   return op;
 };
-var text = (text8) => {
+var text = (text9) => {
   const op = Object.create(proto15);
   op._tag = "Text";
-  op.text = text8;
+  op.text = text9;
   return op;
 };
 var flatAlt = /* @__PURE__ */ dual(2, (self, that) => {
@@ -26262,10 +26272,10 @@ var char2 = /* @__PURE__ */ dual(2, (self, char4) => {
   op.stream = self;
   return op;
 });
-var text2 = /* @__PURE__ */ dual(2, (self, text8) => {
+var text2 = /* @__PURE__ */ dual(2, (self, text9) => {
   const op = Object.create(proto16);
   op._tag = "TextStream";
-  op.text = text8;
+  op.text = text9;
   op.stream = self;
   return op;
 });
@@ -27423,8 +27433,8 @@ var intersectTypeLiterals = (x, y, path2) => {
   if (isTypeLiteral(x) && isTypeLiteral(y)) {
     const propertySignatures = [...x.propertySignatures];
     for (const ps of y.propertySignatures) {
-      const name = ps.name;
-      const i = propertySignatures.findIndex((ps2) => ps2.name === name);
+      const name2 = ps.name;
+      const i = propertySignatures.findIndex((ps2) => ps2.name === name2);
       if (i === -1) {
         propertySignatures.push(ps);
       } else {
@@ -27432,7 +27442,7 @@ var intersectTypeLiterals = (x, y, path2) => {
           isOptional,
           type: type2
         } = propertySignatures[i];
-        propertySignatures[i] = new PropertySignature(name, extendAST(type2, ps.type, path2.concat(name)), isOptional, true);
+        propertySignatures[i] = new PropertySignature(name2, extendAST(type2, ps.type, path2.concat(name2)), isOptional, true);
       }
     }
     return new TypeLiteral(propertySignatures, x.indexSignatures.concat(y.indexSignatures));
@@ -28388,12 +28398,12 @@ var windowsFigures = {
   pointer: /* @__PURE__ */ text3(">")
 };
 var figures = /* @__PURE__ */ map17(/* @__PURE__ */ sync5(() => process.platform === "win32"), (isWindows) => isWindows ? windowsFigures : defaultFigures);
-function eraseText(text8, columns) {
+function eraseText(text9, columns) {
   if (columns === 0) {
     return cat2(eraseLine3, cursorTo3(0));
   }
   let rows = 0;
-  const lines3 = text8.split(/\r?\n/);
+  const lines3 = text9.split(/\r?\n/);
   for (const line4 of lines3) {
     rows += 1 + Math.floor(Math.max(line4.length - 1, 0) / columns);
   }
@@ -28947,12 +28957,12 @@ function handleClear2(options3) {
       const terminal = yield* Terminal;
       const columns = yield* terminal.columns;
       const currentPath = yield* resolveCurrentPath(state.path, options3);
-      const text8 = "\n".repeat(Math.min(state.files.length, options3.maxPerPage));
+      const text9 = "\n".repeat(Math.min(state.files.length, options3.maxPerPage));
       const clearPath = eraseText(currentPath, columns);
       const message = showConfirmation(state.confirm) ? CONFIRM_MESSAGE : options3.message;
       const clearPrompt = eraseText(`
 ${message}`, columns);
-      const clearOptions = eraseText(text8, columns);
+      const clearOptions = eraseText(text9, columns);
       return clearOptions.pipe(cat2(clearPath), cat2(clearPrompt), optimize3(Deep), render3({
         style: "pretty",
         options: {
@@ -29662,8 +29672,8 @@ function handleClear4(options3) {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
     const clearPrompt = cat2(eraseLine3, cursorLeft3);
-    const text8 = "\n".repeat(Math.min(options3.choices.length, options3.maxPerPage)) + options3.message;
-    const clearOutput = eraseText(text8, columns);
+    const text9 = "\n".repeat(Math.min(options3.choices.length, options3.maxPerPage)) + options3.message;
+    const clearOutput = eraseText(text9, columns);
     return clearOutput.pipe(cat2(clearPrompt), optimize3(Deep), render3({
       style: "pretty",
       options: {
@@ -29749,7 +29759,7 @@ ${error4}`, columns))
   });
 }
 function renderInput2(nextState, options3, submitted) {
-  const text8 = getValue(nextState, options3);
+  const text9 = getValue(nextState, options3);
   const annotation = match2(nextState.error, {
     onNone: () => {
       if (submitted) {
@@ -29767,10 +29777,10 @@ function renderInput2(nextState, options3, submitted) {
       return empty34;
     }
     case "password": {
-      return annotate2(text3("*".repeat(text8.length)), annotation);
+      return annotate2(text3("*".repeat(text9.length)), annotation);
     }
     case "text": {
-      return annotate2(text3(text8), annotation);
+      return annotate2(text3(text9), annotation);
     }
   }
 }
@@ -30154,6 +30164,11 @@ var path = (pathType, pathExists) => {
   op.pathExists = pathExists;
   return op;
 };
+var text6 = /* @__PURE__ */ (() => {
+  const op = /* @__PURE__ */ Object.create(proto19);
+  op._tag = "Text";
+  return op;
+})();
 var getChoices = (self) => getChoicesInternal(self);
 var getHelp = (self) => getHelpInternal(self);
 var getTypeName = (self) => getTypeNameInternal(self);
@@ -30487,7 +30502,7 @@ var getZshCompletions = (self) => {
       return "";
     }
     case "Choice": {
-      const choices = pipe(map3(self.alternatives, ([name]) => name), join(" "));
+      const choices = pipe(map3(self.alternatives, ([name2]) => name2), join(" "));
       return `:CHOICE:(${choices})`;
     }
     case "DateTime": {
@@ -30616,7 +30631,7 @@ var render4 = (self, config2) => {
         onNone: () => empty35,
         onSome: (s) => concat3(space3, text4(s))
       }) : empty35;
-      const namesToShow = config2.showAllNames ? self.names : self.names.length > 1 ? pipe(filter2(self.names, (name) => name.startsWith("--")), head, map2(of), getOrElse(() => self.names)) : self.names;
+      const namesToShow = config2.showAllNames ? self.names : self.names.length > 1 ? pipe(filter2(self.names, (name2) => name2.startsWith("--")), head, map2(of), getOrElse(() => self.names)) : self.names;
       const nameInfo = text4(join(namesToShow, ", "));
       return config2.showAllNames && self.names.length > 1 ? of(spans([text4("("), nameInfo, typeInfo, text4(")")])) : of(concat3(nameInfo, typeInfo));
     }
@@ -30755,7 +30770,7 @@ var defaultBooleanOptions = {
   negationNames: [],
   aliases: []
 };
-var boolean4 = (name, options3) => {
+var boolean4 = (name2, options3) => {
   const {
     aliases,
     ifPresent,
@@ -30764,7 +30779,7 @@ var boolean4 = (name, options3) => {
     ...defaultBooleanOptions,
     ...options3
   };
-  const option4 = makeSingle(name, aliases, boolean3(some2(ifPresent)));
+  const option4 = makeSingle(name2, aliases, boolean3(some2(ifPresent)));
   if (isNonEmptyReadonlyArray(negationNames)) {
     const head5 = headNonEmpty(negationNames);
     const tail = tailNonEmpty(negationNames);
@@ -30773,10 +30788,10 @@ var boolean4 = (name, options3) => {
   }
   return withDefault2(option4, !ifPresent);
 };
-var choiceWithValue = (name, choices) => makeSingle(name, empty2(), choice(choices));
-var file2 = (name, config2) => makeSingle(name, empty2(), path("file", config2?.exists));
-var fileParse = (name, format6) => mapEffect5(fileText(name), ([path2, content]) => mapError2(parse5(path2, content, format6), (error4) => invalidValue(p(error4))));
-var fileText = (name) => mapEffect5(file2(name, {
+var choiceWithValue = (name2, choices) => makeSingle(name2, empty2(), choice(choices));
+var file2 = (name2, config2) => makeSingle(name2, empty2(), path("file", config2?.exists));
+var fileParse = (name2, format6) => mapEffect5(fileText(name2), ([path2, content]) => mapError2(parse5(path2, content, format6), (error4) => invalidValue(p(error4))));
+var fileText = (name2) => mapEffect5(file2(name2, {
   exists: "yes"
 }), (path2) => mapError2(readString(path2), (error4) => invalidValue(p(error4))));
 var none10 = /* @__PURE__ */ (() => {
@@ -30784,6 +30799,7 @@ var none10 = /* @__PURE__ */ (() => {
   op._tag = "Empty";
   return op;
 })();
+var text7 = (name2) => makeSingle(name2, empty2(), text6);
 var getHelp3 = (self) => getHelpInternal2(self);
 var getUsage = (self) => getUsageInternal(self);
 var map28 = /* @__PURE__ */ dual(2, (self, f) => makeMap(self, (a) => right2(f(a))));
@@ -31039,11 +31055,11 @@ var makeOrElse = (left3, right3) => {
   op.right = right3;
   return op;
 };
-var makeSingle = (name, aliases, primitiveType, description = empty36, pseudoName = none2()) => {
+var makeSingle = (name2, aliases, primitiveType, description = empty36, pseudoName = none2()) => {
   const op = Object.create(proto21);
   op._tag = "Single";
-  op.name = name;
-  op.fullName = makeFullName(name)[1];
+  op.name = name2;
+  op.fullName = makeFullName(name2)[1];
   op.placeholder = `${getOrElse(pseudoName, () => getTypeName(primitiveType))}`;
   op.aliases = aliases;
   op.primitiveType = primitiveType;
@@ -31164,7 +31180,7 @@ var parseInternal = (self, args2, config2) => {
       return _void;
     }
     case "Single": {
-      const singleNames = filterMap2(getNames(self), (name) => get7(args2, name));
+      const singleNames = filterMap2(getNames(self), (name2) => get7(args2, name2));
       if (isNonEmptyReadonlyArray(singleNames)) {
         const head5 = headNonEmpty(singleNames);
         const tail = tailNonEmpty(singleNames);
@@ -31233,16 +31249,16 @@ var parseInternal = (self, args2, config2) => {
     case "Variadic": {
       const min4 = getOrElse(self.min, () => 0);
       const max6 = getOrElse(self.max, () => Number.MAX_SAFE_INTEGER);
-      const matchedArgument = filterMap2(getNames(self), (name) => get7(args2, name));
+      const matchedArgument = filterMap2(getNames(self), (name2) => get7(args2, name2));
       const validateMinMax = (values3) => {
         if (values3.length < min4) {
-          const name = self.argumentOption.fullName;
-          const error4 = `Expected at least ${min4} value(s) for option: '${name}'`;
+          const name2 = self.argumentOption.fullName;
+          const error4 = `Expected at least ${min4} value(s) for option: '${name2}'`;
           return fail8(invalidValue(p(error4)));
         }
         if (values3.length > max6) {
-          const name = self.argumentOption.fullName;
-          const error4 = `Expected at most ${max6} value(s) for option: '${name}'`;
+          const name2 = self.argumentOption.fullName;
+          const error4 = `Expected at most ${max6} value(s) for option: '${name2}'`;
           return fail8(invalidValue(p(error4)));
         }
         const primitive2 = self.argumentOption.primitiveType;
@@ -31375,7 +31391,7 @@ var matchOptions = (input, options3, config2) => {
       if (isEmpty3(map1)) {
         return succeed8([none2(), input, map1]);
       }
-      return matchOptions(otherArgs, otherOptions, config2).pipe(map17(([error4, otherArgs2, map210]) => [error4, otherArgs2, merge8(map1, fromIterable(map210))]));
+      return matchOptions(otherArgs, otherOptions, config2).pipe(map17(([error4, otherArgs2, map210]) => [error4, otherArgs2, merge9(map1, fromIterable(map210))]));
     }), catchAll2((e) => succeed8([some2(e), input, empty9()])));
   }
   return isEmptyReadonlyArray(input) ? succeed8([none2(), empty2(), empty9()]) : succeed8([none2(), input, empty9()]);
@@ -31388,9 +31404,9 @@ var findOptions = (input, options3, config2) => matchLeft(options3, {
   }) => match2(parsed, {
     onNone: () => findOptions(leftover2, tail, config2).pipe(map17(([nextArgs, nextOptions, map33]) => [nextArgs, prepend(nextOptions, head5), map33])),
     onSome: ({
-      name,
+      name: name2,
       values: values3
-    }) => succeed8([leftover2, tail, make16([name, values3])])
+    }) => succeed8([leftover2, tail, make16([name2, values3])])
   })), catchTags2({
     CorrectedFlag: (e) => findOptions(input, tail, config2).pipe(catchSome2(() => some2(fail8(e))), flatMap9(([otherArgs, otherOptions, map33]) => fail8(e).pipe(when2(() => isEmpty3(map33)), as4([otherArgs, prepend(otherOptions, head5), map33])))),
     MissingFlag: () => findOptions(input, tail, config2).pipe(map17(([otherArgs, otherOptions, map33]) => [otherArgs, prepend(otherOptions, head5), map33])),
@@ -31427,7 +31443,7 @@ var parseCommandLine = (self, args2, config2) => {
         onNonEmpty: (head5, tail) => {
           const normalize = (value5) => normalizeCase(config2, value5);
           const normalizedHead = normalize(head5);
-          const normalizedNames = map3(getNames(self), (name) => normalize(name));
+          const normalizedNames = map3(getNames(self), (name2) => normalize(name2));
           if (contains2(normalizedNames, normalizedHead)) {
             if (isBool(self.primitiveType)) {
               return matchLeft(tail, {
@@ -31500,7 +31516,7 @@ var parseCommandLine = (self, args2, config2) => {
       })));
     }
     case "KeyValueMap": {
-      const normalizedNames = map3(getNames(self.argumentOption), (name) => normalizeCase(config2, name));
+      const normalizedNames = map3(getNames(self.argumentOption), (name2) => normalizeCase(config2, name2));
       return matchLeft(args2, {
         onEmpty: () => succeed8({
           parsed: none2(),
@@ -31511,8 +31527,8 @@ var parseCommandLine = (self, args2, config2) => {
             let keyValues = empty2();
             let leftover2 = args3;
             while (isNonEmptyReadonlyArray(leftover2)) {
-              const name = headNonEmpty(leftover2).trim();
-              const normalizedName2 = normalizeCase(config2, name);
+              const name2 = headNonEmpty(leftover2).trim();
+              const normalizedName2 = normalizeCase(config2, name2);
               if (leftover2.length >= 2 && contains2(normalizedNames, normalizedName2)) {
                 const keyValue = leftover2[1].trim();
                 const [key, value5] = keyValue.split("=");
@@ -31522,10 +31538,10 @@ var parseCommandLine = (self, args2, config2) => {
                   continue;
                 }
               }
-              if (name.includes("=")) {
-                const [key, value5] = name.split("=");
+              if (name2.includes("=")) {
+                const [key, value5] = name2.split("=");
                 if (key !== void 0 && value5 !== void 0 && value5.length > 0) {
-                  keyValues = append(keyValues, name);
+                  keyValues = append(keyValues, name2);
                   leftover2 = leftover2.slice(1);
                   continue;
                 }
@@ -31553,17 +31569,17 @@ var parseCommandLine = (self, args2, config2) => {
       });
     }
     case "Variadic": {
-      const normalizedNames = map3(getNames(self.argumentOption), (name) => normalizeCase(config2, name));
+      const normalizedNames = map3(getNames(self.argumentOption), (name2) => normalizeCase(config2, name2));
       let optionName = void 0;
       let values3 = empty2();
       let unparsed = args2;
       let leftover2 = empty2();
       while (isNonEmptyReadonlyArray(unparsed)) {
-        const name = headNonEmpty(unparsed);
-        const normalizedName = normalizeCase(config2, name);
+        const name2 = headNonEmpty(unparsed);
+        const normalizedName = normalizeCase(config2, name2);
         if (contains2(normalizedNames, normalizedName)) {
           if (optionName === void 0) {
-            optionName = name;
+            optionName = name2;
           }
           const value5 = unparsed[1];
           if (value5 !== void 0 && value5.length > 0) {
@@ -31575,8 +31591,8 @@ var parseCommandLine = (self, args2, config2) => {
           unparsed = unparsed.slice(1);
         }
       }
-      const parsed = fromNullable(optionName).pipe(orElse(() => some2(self.argumentOption.fullName)), map2((name) => ({
-        name,
+      const parsed = fromNullable(optionName).pipe(orElse(() => some2(self.argumentOption.fullName)), map2((name2) => ({
+        name: name2,
         values: values3
       })));
       return succeed8({
@@ -31594,12 +31610,12 @@ var matchUnclustered = (input, tail, options3, config2) => {
       if (isEmpty3(map1)) {
         return fail8(unclusteredFlag(empty36, empty2(), tail));
       }
-      return matchUnclustered(otherFlags, tail, opts1, config2).pipe(map17(([_2, opts2, map210]) => [tail, opts2, merge8(map1, fromIterable(map210))]));
+      return matchUnclustered(otherFlags, tail, opts1, config2).pipe(map17(([_2, opts2, map210]) => [tail, opts2, merge9(map1, fromIterable(map210))]));
     }));
   }
   return succeed8([tail, options3, empty9()]);
 };
-var merge8 = (map1, map210) => {
+var merge9 = (map1, map210) => {
   if (isNonEmptyReadonlyArray(map210)) {
     const head5 = headNonEmpty(map210);
     const tail = tailNonEmpty(map210);
@@ -31607,7 +31623,7 @@ var merge8 = (map1, map210) => {
       onNone: () => set3(map1, head5[0], head5[1]),
       onSome: (elems) => set3(map1, head5[0], appendAll(elems, head5[1]))
     });
-    return merge8(newMap, tail);
+    return merge9(newMap, tail);
   }
   return map1;
 };
@@ -31669,7 +31685,7 @@ var getFishCompletions2 = (self) => {
     case "Single": {
       const description = getShortDescription(self);
       const order = mapInput2(boolean, (tuple3) => !tuple3[0]);
-      return pipe(prepend(self.aliases, self.name), map3((name) => [name.length === 1, name]), sort(order), flatMap2(([isShort, name]) => make4(isShort ? "-s" : "-l", name)), appendAll(getFishCompletions(self.primitiveType)), appendAll(description.length === 0 ? empty2() : of(`-d '${description}'`)), join(" "), of);
+      return pipe(prepend(self.aliases, self.name), map3((name2) => [name2.length === 1, name2]), sort(order), flatMap2(([isShort, name2]) => make4(isShort ? "-s" : "-l", name2)), appendAll(getFishCompletions(self.primitiveType)), appendAll(description.length === 0 ? empty2() : of(`-d '${description}'`)), join(" "), of);
     }
     case "KeyValueMap":
     case "Variadic": {
@@ -31700,7 +31716,7 @@ var getZshCompletions2 = (self, state = {
       const possibleValues = getZshCompletions(self.primitiveType);
       const multiple = state.multiple ? "*" : "";
       const conflicts = isNonEmptyReadonlyArray(state.conflicts) ? `(${join(state.conflicts, " ")})` : "";
-      return map3(names, (name) => `${conflicts}${multiple}${name}[${escape2(description)}]${possibleValues}`);
+      return map3(names, (name2) => `${conflicts}${multiple}${name2}[${escape2(description)}]${possibleValues}`);
     }
     case "KeyValueMap": {
       return getZshCompletions2(self.argumentOption, {
@@ -31744,7 +31760,9 @@ var getZshCompletions2 = (self, state = {
 var all7 = all6;
 var boolean5 = boolean4;
 var fileParse2 = fileParse;
+var text8 = text7;
 var withAlias2 = withAlias;
+var withDefault3 = withDefault2;
 var withDescription3 = withDescription2;
 // node_modules/.pnpm/@effect+platform@0.82.0_effect@3.15.0/node_modules/@effect/platform/dist/esm/internal/commandExecutor.js
@@ -33661,7 +33679,7 @@ var validateInternal2 = (self, args2, config2) => {
             return fail8(missingValue(p(`Missing argument ${getTypeName(self.primitiveType)}`)));
           },
           onNonEmpty: (head5, tail) => validate4(self.primitiveType, some2(head5), config2).pipe(mapBoth4({
-            onFailure: (text8) => invalidArgument(p(text8)),
+            onFailure: (text9) => invalidArgument(p(text9)),
             onSuccess: (a) => [tail, a]
           }))
         });
@@ -33920,10 +33938,10 @@ var proto23 = {
 };
 var isCommand2 = (u) => typeof u === "object" && u != null && TypeId24 in u;
 var isStandard = (self) => self._tag === "Standard";
-var make59 = (name, options3 = none10, args2 = none11) => {
+var make59 = (name2, options3 = none10, args2 = none11) => {
   const op = Object.create(proto23);
   op._tag = "Standard";
-  op.name = name;
+  op.name = name2;
   op.description = empty36;
   op.options = options3;
   op.args = args2;
@@ -34138,7 +34156,7 @@ var parseInternal2 = (self, args2, config2) => {
     case "Subcommands": {
       const names = getNamesInternal(self);
       const subcommands = getSubcommandsInternal(self);
-      const [parentArgs, childArgs] = span(args2, (arg) => !some3(subcommands, ([name]) => name === arg));
+      const [parentArgs, childArgs] = span(args2, (arg) => !some3(subcommands, ([name2]) => name2 === arg));
       const parseChildren = suspend5(() => {
         const iterator = self.children[Symbol.iterator]();
         const loop2 = (next) => {
@@ -34185,7 +34203,7 @@ var parseInternal2 = (self, args2, config2) => {
                 onFailure: (err) => {
                   if (isCommandMismatch(err)) {
                     const parentName = getOrElse(head(names), () => "");
-                    const childNames = map3(subcommands, ([name]) => `'${name}'`);
+                    const childNames = map3(subcommands, ([name2]) => `'${name2}'`);
                     const oneOf = childNames.length === 1 ? "" : " one of";
                     const error4 = p(`Invalid subcommand for ${parentName} - use${oneOf} ${join(childNames, ", ")}`);
                     return commandMismatch(error4);
@@ -34255,11 +34273,11 @@ var wizardInternal4 = (self, prefix, config2) => {
           title,
           value: [title, index]
         });
-        const choices = pipe(getSubcommandsInternal(self2), map3(([name], index) => makeChoice(name, index)));
+        const choices = pipe(getSubcommandsInternal(self2), map3(([name2], index) => makeChoice(name2, index)));
         return loop2(self2.parent, commandLineRef).pipe(zipRight3(select({
           message,
           choices
-        }).pipe(tap2(([name]) => update3(commandLineRef, append(name))), zipLeft2(log2()), flatMap9(([, nextIndex]) => loop2(self2.children[nextIndex], commandLineRef)))));
+        }).pipe(tap2(([name2]) => update3(commandLineRef, append(name2))), zipLeft2(log2()), flatMap9(([, nextIndex]) => loop2(self2.children[nextIndex], commandLineRef)))));
       }
     }
   };
@@ -34326,7 +34344,7 @@ var getBashCompletionsInternal = (self, executable) => traverseCommand(self, emp
   const options3 = isStandard(info2.command) ? all7([info2.command.options, builtIns]) : builtIns;
   const optionNames = getNames(options3);
   const optionCases = isStandard(info2.command) ? getBashCompletions2(info2.command.options) : empty2();
-  const subcommandNames = pipe(info2.subcommands, map3(([name]) => name), sort(string2));
+  const subcommandNames = pipe(info2.subcommands, map3(([name2]) => name2), sort(string2));
   const wordList = appendAll(optionNames, subcommandNames);
   const preformatted = isEmptyReadonlyArray(info2.parentCommands) ? of(info2.command.name) : pipe(info2.parentCommands, append(info2.command.name), map3((command) => command.replace("-", "__")));
   const caseName = join(preformatted, ",");
@@ -34348,9 +34366,9 @@ var getFishCompletionsInternal = (self, executable) => traverseCommand(self, emp
   const optionsCompletions = getFishCompletions2(options3);
   const argsCompletions = isStandard(info2.command) ? getFishCompletions3(info2.command.args) : empty2();
   const rootCompletions = (conditionals2) => pipe(map3(optionsCompletions, (option4) => pipe(baseTemplate, appendAll(conditionals2), append(option4), join(" "))), appendAll(map3(argsCompletions, (option4) => pipe(baseTemplate, appendAll(conditionals2), append(option4), join(" ")))));
-  const subcommandCompletions = (conditionals2) => map3(info2.subcommands, ([name, subcommand]) => {
+  const subcommandCompletions = (conditionals2) => map3(info2.subcommands, ([name2, subcommand]) => {
     const description = getShortDescription3(subcommand);
-    return pipe(baseTemplate, appendAll(conditionals2), appendAll(make4("-f", "-a", `"${name}"`)), appendAll(description.length === 0 ? empty2() : make4("-d", `'${description}'`)), join(" "));
+    return pipe(baseTemplate, appendAll(conditionals2), appendAll(make4("-f", "-a", `"${name2}"`)), appendAll(description.length === 0 ? empty2() : make4("-d", `'${description}'`)), join(" "));
   });
   if (isEmptyReadonlyArray(info2.parentCommands)) {
     const conditionals2 = make4("-n", '"__fish_use_subcommand"');
@@ -34363,7 +34381,7 @@ var getFishCompletionsInternal = (self, executable) => traverseCommand(self, emp
     append(info2.command.name),
     map3((command) => `__fish_seen_subcommand_from ${command}`)
   );
-  const subcommandConditionals = map3(info2.subcommands, ([name]) => `not __fish_seen_subcommand_from ${name}`);
+  const subcommandConditionals = map3(info2.subcommands, ([name2]) => `not __fish_seen_subcommand_from ${name2}`);
   const baseConditionals = pipe(appendAll(parentConditionals, subcommandConditionals), join("; and "));
   const conditionals = make4("-n", `"${baseConditionals}"`);
   return succeed8(pipe(state, appendAll(rootCompletions(conditionals)), appendAll(subcommandCompletions(conditionals))));
@@ -34372,9 +34390,9 @@ var getZshCompletionsInternal = (self, executable) => traverseCommand(self, empt
   const preformatted = isEmptyReadonlyArray(info2.parentCommands) ? of(info2.command.name) : pipe(info2.parentCommands, append(info2.command.name), map3((command) => command.replace("-", "__")));
   const underscoreName = join(preformatted, "__");
   const spaceName = join(preformatted, " ");
-  const subcommands = pipe(info2.subcommands, map3(([name, subcommand]) => {
+  const subcommands = pipe(info2.subcommands, map3(([name2, subcommand]) => {
     const desc = getShortDescription3(subcommand);
-    return `'${name}:${desc}' \\`;
+    return `'${name2}:${desc}' \\`;
   }));
   const commands = isEmptyReadonlyArray(subcommands) ? `commands=()` : `commands=(
 ${join(indentAll(subcommands, 8), "\n")}
@@ -34518,10 +34536,10 @@ var handleBuiltInOption = (self, executable, args2, builtIn2, execute2, config2)
       const description = descriptionList([[text4("Instructions"), instructions]]);
       const header = h1(spans([code("Wizard Mode for CLI Application:"), space3, code(self.name), space3, code(`(${self.version})`), summary5]));
       const help = sequence(header, description);
-      const text8 = toAnsiText(help);
+      const text9 = toAnsiText(help);
       const command = fromIterable(getNames2(self.command))[0];
       const wizardPrefix = getWizardPrefix(builtIn2, command, args2);
-      return log2(text8).pipe(zipRight3(wizard4(builtIn2.command, wizardPrefix, config2)), tap2((args3) => log2(toAnsiText(renderWizardArgs(args3)))), flatMap9((args3) => toggle2({
+      return log2(text9).pipe(zipRight3(wizard4(builtIn2.command, wizardPrefix, config2)), tap2((args3) => log2(toAnsiText(renderWizardArgs(args3)))), flatMap9((args3) => toggle2({
         message: "Would you like to run the command?",
         initial: true,
         active: "yes",
@@ -34572,7 +34590,7 @@ var prefixCommand = (self) => {
 };
 var getWizardPrefix = (builtIn2, rootCommand, commandLineArgs) => {
   const subcommands = getSubcommands(builtIn2.command);
-  const [parentArgs, childArgs] = span(commandLineArgs, (name) => !has4(subcommands, name));
+  const [parentArgs, childArgs] = span(commandLineArgs, (name2) => !has4(subcommands, name2));
   const args2 = matchLeft(childArgs, {
     onEmpty: () => filter2(parentArgs, (arg) => arg !== "--wizard"),
     onNonEmpty: (head5) => append(parentArgs, head5)
@@ -34681,18 +34699,18 @@ var fromDescriptor = /* @__PURE__ */ dual((args2) => isCommand2(args2[0]), (desc
   const self = makeProto(descriptor2, handler ?? ((_) => failSync2(() => helpRequested(getDescriptor(self)))), GenericTag(`@effect/cli/Command/(${fromIterable(getNames2(descriptor2)).join("|")})`));
   return self;
 });
-var makeDescriptor = (name, config2) => {
+var makeDescriptor = (name2, config2) => {
   const {
     args: args2,
     options: options3,
     tree
   } = parseConfig(config2);
-  return map32(make59(name, all6(options3), all8(args2)), ({
+  return map32(make59(name2, all6(options3), all8(args2)), ({
     args: args3,
     options: options4
   }) => reconstructConfigTree(tree, args3, options4));
 };
-var make61 = (name, config2 = {}, handler) => fromDescriptor(makeDescriptor(name, config2), handler);
+var make61 = (name2, config2 = {}, handler) => fromDescriptor(makeDescriptor(name2, config2), handler);
 var withHandler = /* @__PURE__ */ dual(2, (self, handler) => makeDerive(self, {
   handler,
   transform: identity
@@ -34740,8 +34758,20 @@ var make63 = gen2(function* () {
   const classes = /* @__PURE__ */ new Set();
   const enums = /* @__PURE__ */ new Set();
   const refStore = /* @__PURE__ */ new Map();
-  const addSchema = (name, root2, context7, asStruct = false) => {
+  function cleanupSchema(schema) {
+    if ("type" in schema && Array.isArray(schema.type) && schema.type.includes("null")) {
+      schema.type = schema.type.filter((_) => _ !== "null")[0];
+      schema.nullable = true;
+    }
+    if ("type" in schema && "oneOf" in schema && Array.isArray(schema.oneOf) && schema.oneOf.length === 0) {
+      delete schema.oneOf;
+    }
+    return schema;
+  }
+  const addSchema = (name2, root2, context7, asStruct = false) => {
+    cleanupSchema(root2);
     function addRefs(schema, childName, asStruct2 = true) {
+      cleanupSchema(schema);
       if ("$ref" in schema) {
         const resolved = resolveRef(schema, {
           ...root2,
@@ -34761,7 +34791,7 @@ var make63 = gen2(function* () {
         }
       } else if ("properties" in schema) {
         Object.entries(schema.properties).forEach(
-          ([name2, s]) => addRefs(s, childName ? childName + identifier2(name2) : void 0)
+          ([name3, s]) => addRefs(s, childName ? childName + identifier2(name3) : void 0)
         );
       } else if ("type" in schema && schema.type === "array") {
         if (Array.isArray(schema.items)) {
@@ -34805,25 +34835,36 @@ var make63 = gen2(function* () {
       addRefs(root2, void 0, false);
       return identifier2(root2.$ref.split("/").pop());
     } else {
-      addRefs(root2, "properties" in root2 ? name : void 0);
-      store.set(name, root2);
+      addRefs(root2, "properties" in root2 ? name2 : void 0);
+      store.set(name2, root2);
       if (!asStruct) {
-        classes.add(name);
+        classes.add(name2);
       }
     }
-    return name;
+    return name2;
   };
-  const topLevelSource = (S, name, schema) => {
-    const isClass = classes.has(name);
-    const isEnum = enums.has(name);
-    return toSource(S, schema, name, isClass || isEnum).pipe(
-      map2((source) => {
-        const isObject2 = "properties" in schema;
-        if (!isObject2 || !isClass) {
-          return `export class ${name} extends ${source} {}`;
-        }
-        return `export class ${name} extends ${S}.Class<${name}>("${name}")(${source}) {}`;
-      })
+  const topLevelSource = (importName, name2, schema) => {
+    const isClass = classes.has(name2);
+    const isEnum = enums.has(name2);
+    const topLevel = transformer.supportsTopLevel({
+      importName,
+      schema,
+      name: name2,
+      isClass,
+      isEnum
+    });
+    return toSource(importName, schema, name2, topLevel).pipe(
+      map2(
+        (source) => transformer.onTopLevel({
+          importName,
+          schema,
+          description: fromNullable(schema.description),
+          name: name2,
+          source,
+          isClass,
+          isEnum
+        })
+      )
     );
   };
   const getSchema = (raw) => {
@@ -34846,7 +34887,8 @@ var make63 = gen2(function* () {
     }
     return getSchema(schema);
   };
-  const toSource = (S, schema, currentIdentifier, topLevel = false) => {
+  const transformer = yield* JsonSchemaTransformer;
+  const toSource = (importName, schema, currentIdentifier, topLevel = false) => {
     if ("properties" in schema) {
       const obj = schema;
       const required2 = obj.required ?? [];
@@ -34855,145 +34897,153 @@ var make63 = gen2(function* () {
         filterMap2(([key, schema2]) => {
           const fullSchema = getSchema(schema2);
           const isOptional = !required2.includes(key);
-          return toSource(S, schema2, currentIdentifier + identifier2(key)).pipe(
+          return toSource(
+            importName,
+            schema2,
+            currentIdentifier + identifier2(key)
+          ).pipe(
             map2(
-              applyAnnotations(S, {
+              (source) => transformer.onProperty({
+                importName,
+                description: fromNullable(schema2.description),
+                key,
+                source,
                 isOptional,
-                isNullable: "nullable" in fullSchema && fullSchema.nullable === true || "default" in fullSchema && fullSchema.default === null,
-                default: fullSchema.default
+                isNullable: "nullable" in fullSchema && fullSchema.nullable === true || "default" in fullSchema && fullSchema.default === null
               })
-            ),
-            map2((source) => `"${key}": ${source}`)
+            )
           );
         }),
-        join(",\n  ")
+        join(transformer.propertySeparator)
       );
       return some2(
-        `${topLevel ? "" : `${S}.Struct(`}{
-  ${properties}
-}${topLevel ? "" : ")"}`
+        transformer.onObject({ importName, properties, topLevel })
       );
     } else if ("type" in schema && schema.type === "null") {
-      return some2(`${S}.Null`);
+      return some2(transformer.onNull({ importName }));
     } else if ("type" in schema && schema.type === "object") {
-      return some2(
-        `${S}.Record({ key: ${S}.String, value: ${S}.Unknown })`
-      );
+      return some2(transformer.onRecord({ importName }));
     } else if ("enum" in schema) {
       if (!topLevel && enums.has(currentIdentifier)) {
-        return some2(currentIdentifier);
-      }
-      const items = schema.enum.map((_) => JSON.stringify(_)).join(", ");
-      return some2(`${S}.Literal(${items})`);
-    } else if ("type" in schema && schema.type) {
-      switch (schema.type) {
-        case "string": {
-          const modifiers = [];
-          if ("minLength" in schema) {
-            modifiers.push(`${S}.minLength(${schema.minLength})`);
-          }
-          if ("maxLength" in schema) {
-            modifiers.push(`${S}.maxLength(${schema.maxLength})`);
-          }
-          if ("pattern" in schema) {
-            modifiers.push(
-              `${S}.pattern(new RegExp(${JSON.stringify(schema.pattern)}))`
-            );
-          }
-          return some2(`${S}.String${pipeSource(modifiers)}`);
-        }
-        case "integer":
-        case "number": {
-          const modifiers = [];
-          const minimum = typeof schema.exclusiveMinimum === "number" ? schema.exclusiveMinimum : schema.minimum;
-          const exclusiveMinimum = typeof schema.exclusiveMinimum === "boolean" ? schema.exclusiveMinimum : typeof schema.exclusiveMinimum === "number";
-          const maximum = typeof schema.exclusiveMaximum === "number" ? schema.exclusiveMaximum : schema.maximum;
-          const exclusiveMaximum = typeof schema.exclusiveMaximum === "boolean" ? schema.exclusiveMaximum : typeof schema.exclusiveMaximum === "number";
-          if (minimum !== void 0) {
-            modifiers.push(
-              `${S}.greaterThan${exclusiveMinimum ? "" : "OrEqualTo"}(${schema.minimum})`
-            );
-          }
-          if (maximum !== void 0) {
-            modifiers.push(
-              `${S}.lessThan${exclusiveMaximum ? "" : "OrEqualTo"}(${schema.maximum})`
-            );
-          }
-          return some2(
-            `${S}.${schema.type === "integer" ? "Int" : "Number"}${pipeSource(modifiers)}`
-          );
-        }
-        case "boolean": {
-          return some2(`${S}.Boolean`);
-        }
-        case "array": {
-          const modifiers = [];
-          const nonEmpty = typeof schema.minItems === "number" && schema.minItems === 1 && schema.maxItems === void 0;
-          if ("minItems" in schema && !nonEmpty) {
-            modifiers.push(`${S}.minItems(${schema.minItems})`);
-          }
-          if ("maxItems" in schema) {
-            modifiers.push(`${S}.maxItems(${schema.maxItems})`);
-          }
-          return toSource(S, itemsSchema(schema.items), currentIdentifier).pipe(
-            map2(
-              (source) => `${S}.${nonEmpty ? "NonEmpty" : ""}Array(${source})${pipeSource(modifiers)}`
-            )
-          );
-        }
+        return some2(
+          transformer.onRef({ importName, name: currentIdentifier })
+        );
       }
+      const items = schema.enum.map((_) => JSON.stringify(_));
+      return some2(
+        transformer.onEnum({
+          importName,
+          items
+        })
+      );
     } else if ("$ref" in schema) {
       if (!schema.$ref.startsWith("#")) {
         return none2();
       }
-      const name = identifier2(schema.$ref.split("/").pop());
-      return some2(name);
+      const name2 = identifier2(schema.$ref.split("/").pop());
+      return some2(transformer.onRef({ importName, name: name2 }));
     } else if ("properties" in schema) {
       return toSource(
-        S,
+        importName,
         { type: "object", ...schema },
         currentIdentifier,
         topLevel
       );
     } else if ("allOf" in schema) {
       if (store.has(currentIdentifier)) {
-        return some2(currentIdentifier);
+        return some2(
+          transformer.onRef({ importName, name: currentIdentifier })
+        );
       }
       const sources = schema.allOf;
       if (sources.length === 0) {
         return none2();
       } else if (sources.length === 1) {
-        return toSource(S, sources[0], currentIdentifier + "Enum", topLevel);
+        return toSource(
+          importName,
+          sources[0],
+          currentIdentifier + "Enum",
+          topLevel
+        );
       }
       const flattened2 = flattenAllOf(schema);
-      return toSource(S, flattened2, currentIdentifier + "Enum", topLevel);
+      return toSource(
+        importName,
+        flattened2,
+        currentIdentifier + "Enum",
+        topLevel
+      );
     } else if ("anyOf" in schema || "oneOf" in schema) {
-      const sources = pipe(
+      const items = pipe(
         "anyOf" in schema ? schema.anyOf : schema.oneOf,
-        filterMap2((_) => toSource(S, _, currentIdentifier + "Enum"))
+        filterMap2(
+          (_) => toSource(importName, _, currentIdentifier + "Enum").pipe(
+            map2(
+              (source) => ({
+                description: fromNullable(_.description),
+                title: fromNullable(_.title),
+                source
+              })
+            )
+          )
+        )
       );
-      if (sources.length === 0) return none2();
-      else if (sources.length === 1) return some2(sources[0]);
-      return some2(`${S}.Union(${sources.join(", ")})`);
+      if (items.length === 0) return none2();
+      else if (items.length === 1) return some2(items[0].source);
+      return some2(transformer.onUnion({ importName, items, topLevel }));
     } else if ("const" in schema) {
-      return some2(`${S}.Literal(${JSON.stringify(schema.const)})`);
+      return some2(
+        transformer.onEnum({
+          importName,
+          items: [JSON.stringify(schema.const)]
+        })
+      );
+    } else if ("type" in schema && schema.type) {
+      switch (schema.type) {
+        case "string": {
+          return some2(transformer.onString({ importName, schema }));
+        }
+        case "integer":
+        case "number": {
+          const minimum = typeof schema.exclusiveMinimum === "number" ? schema.exclusiveMinimum : schema.minimum;
+          const exclusiveMinimum = typeof schema.exclusiveMinimum === "boolean" ? schema.exclusiveMinimum : typeof schema.exclusiveMinimum === "number";
+          const maximum = typeof schema.exclusiveMaximum === "number" ? schema.exclusiveMaximum : schema.maximum;
+          const exclusiveMaximum = typeof schema.exclusiveMaximum === "boolean" ? schema.exclusiveMaximum : typeof schema.exclusiveMaximum === "number";
+          return some2(
+            transformer.onNumber({
+              importName,
+              schema,
+              minimum,
+              exclusiveMinimum,
+              maximum,
+              exclusiveMaximum
+            })
+          );
+        }
+        case "boolean": {
+          return some2(transformer.onBoolean({ importName }));
+        }
+        case "array": {
+          const nonEmpty = typeof schema.minItems === "number" && schema.minItems === 1 && schema.maxItems === void 0;
+          return toSource(
+            importName,
+            itemsSchema(schema.items),
+            currentIdentifier
+          ).pipe(
+            map2(
+              (item) => transformer.onArray({
+                importName,
+                schema,
+                item,
+                nonEmpty
+              })
+            )
+          );
+        }
+      }
     }
     return none2();
   };
-  const applyAnnotations = (S, options3) => (source) => {
-    if (options3.isNullable && options3.default === null) {
-      return `${S}.optionalWith(${S}.NullOr(${source}), { default: () => null })`;
-    }
-    const defaultSource = options3.default !== void 0 && options3.default !== null ? `() => ${JSON.stringify(options3.default)} as const` : void 0;
-    if (options3.isOptional) {
-      return defaultSource ? `${S}.optionalWith(${source}, { nullable: true, default: ${defaultSource} })` : `${S}.optionalWith(${source}, { nullable: true })`;
-    }
-    const newSource = options3.isNullable ? `${S}.NullOr(${source})` : source;
-    if (defaultSource) {
-      return `${newSource}.pipe(${S}.propertySignature, ${S}.withConstructorDefault(${defaultSource}))`;
-    }
-    return newSource;
-  };
   const itemsSchema = (schema) => {
     if (schema === void 0) {
       return { $id: "/schemas/any" };
@@ -35002,22 +35052,186 @@ var make63 = gen2(function* () {
     }
     return schema;
   };
-  const pipeSource = (modifers) => modifers.length === 0 ? "" : `.pipe(${modifers.join(", ")})`;
   const generate = (importName) => sync5(
     () => pipe(
       store.entries(),
       filterMap2(
-        ([name, schema]) => topLevelSource(importName, name, schema)
+        ([name2, schema]) => topLevelSource(importName, name2, schema)
       ),
       join("\n\n")
     )
   );
   return { addSchema, generate };
 });
-var _JsonSchemaGen = class _JsonSchemaGen extends Tag2("JsonSchemaGen")() {
+var JsonSchemaGen = class extends Tag2("JsonSchemaGen")() {
+};
+var with_ = provideServiceEffect2(JsonSchemaGen, make63);
+var JsonSchemaTransformer = class extends Tag2("JsonSchemaTransformer")() {
 };
-_JsonSchemaGen.with = provideServiceEffect2(_JsonSchemaGen, make63);
-var JsonSchemaGen = _JsonSchemaGen;
+var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
+  const applyAnnotations = (S, options3) => (source) => {
+    if (options3.isNullable && options3.default === null) {
+      return `${S}.optionalWith(${S}.NullOr(${source}), { default: () => null })`;
+    }
+    const defaultSource = options3.default !== void 0 && options3.default !== null ? `() => ${JSON.stringify(options3.default)} as const` : void 0;
+    if (options3.isOptional) {
+      return defaultSource ? `${S}.optionalWith(${source}, { nullable: true, default: ${defaultSource} })` : `${S}.optionalWith(${source}, { nullable: true })`;
+    }
+    const newSource = options3.isNullable ? `${S}.NullOr(${source})` : source;
+    if (defaultSource) {
+      return `${newSource}.pipe(${S}.propertySignature, ${S}.withConstructorDefault(${defaultSource}))`;
+    }
+    return newSource;
+  };
+  const pipeSource = (modifers) => modifers.length === 0 ? "" : `.pipe(${modifers.join(", ")})`;
+  return JsonSchemaTransformer.of({
+    supportsTopLevel({ isClass, isEnum }) {
+      return isClass || isEnum;
+    },
+    onTopLevel({ importName, schema, name: name2, source, isClass }) {
+      const isObject2 = "properties" in schema;
+      if (!isObject2 || !isClass) {
+        return `export class ${name2} extends ${source} {}`;
+      }
+      return `export class ${name2} extends ${importName}.Class<${name2}>("${name2}")(${source}) {}`;
+    },
+    propertySeparator: ",\n  ",
+    onProperty: (options3) => {
+      const source = applyAnnotations(
+        options3.importName,
+        options3
+      )(options3.source);
+      return `"${options3.key}": ${source}`;
+    },
+    onRef({ name: name2 }) {
+      return name2;
+    },
+    onObject({ importName, properties, topLevel }) {
+      return `${topLevel ? "" : `${importName}.Struct(`}{
+  ${properties}
+}${topLevel ? "" : ")"}`;
+    },
+    onNull({ importName }) {
+      return `${importName}.Null`;
+    },
+    onBoolean({ importName }) {
+      return `${importName}.Boolean`;
+    },
+    onRecord({ importName }) {
+      return `${importName}.Record({ key: ${importName}.String, value: ${importName}.Unknown })`;
+    },
+    onEnum({ importName, items }) {
+      return `${importName}.Literal(${items.join(", ")})`;
+    },
+    onString({ importName, schema }) {
+      const modifiers = [];
+      if ("minLength" in schema) {
+        modifiers.push(`${importName}.minLength(${schema.minLength})`);
+      }
+      if ("maxLength" in schema) {
+        modifiers.push(`${importName}.maxLength(${schema.maxLength})`);
+      }
+      if ("pattern" in schema) {
+        modifiers.push(
+          `${importName}.pattern(new RegExp(${JSON.stringify(schema.pattern)}))`
+        );
+      }
+      return `${importName}.String${pipeSource(modifiers)}`;
+    },
+    onNumber({
+      importName,
+      schema,
+      minimum,
+      exclusiveMinimum,
+      maximum,
+      exclusiveMaximum
+    }) {
+      const modifiers = [];
+      if (minimum !== void 0) {
+        modifiers.push(
+          `${importName}.greaterThan${exclusiveMinimum ? "" : "OrEqualTo"}(${schema.minimum})`
+        );
+      }
+      if (maximum !== void 0) {
+        modifiers.push(
+          `${importName}.lessThan${exclusiveMaximum ? "" : "OrEqualTo"}(${schema.maximum})`
+        );
+      }
+      return `${importName}.${schema.type === "integer" ? "Int" : "Number"}${pipeSource(modifiers)}`;
+    },
+    onArray({ importName, schema, item, nonEmpty }) {
+      const modifiers = [];
+      if ("minItems" in schema && !nonEmpty) {
+        modifiers.push(`${importName}.minItems(${schema.minItems})`);
+      }
+      if ("maxItems" in schema) {
+        modifiers.push(`${importName}.maxItems(${schema.maxItems})`);
+      }
+      return `${importName}.${nonEmpty ? "NonEmpty" : ""}Array(${item})${pipeSource(modifiers)}`;
+    },
+    onUnion({ importName, items }) {
+      return `${importName}.Union(${items.map((_) => _.source).join(", ")})`;
+    }
+  });
+});
+var layerTransformerTs = succeed10(
+  JsonSchemaTransformer,
+  JsonSchemaTransformer.of({
+    supportsTopLevel() {
+      return true;
+    },
+    onTopLevel({ name: name2, source, schema, description }) {
+      return source[0] === "{" ? "oneOf" in schema ? `${toComment(description)}export enum ${name2} ${source}` : `${toComment(description)}export interface ${name2} ${source}` : `${toComment(description)}export type ${name2} = ${source}`;
+    },
+    propertySeparator: ";\n  ",
+    onProperty(options3) {
+      return `${toComment(options3.description)}readonly "${options3.key}"${options3.isOptional ? "?" : ""}: ${options3.source}${options3.isNullable ? " | null" : ""}`;
+    },
+    onRef({ name: name2 }) {
+      return name2;
+    },
+    onObject({ properties }) {
+      return `{
+  ${properties}
+}`;
+    },
+    onNull() {
+      return "null";
+    },
+    onBoolean() {
+      return "boolean";
+    },
+    onRecord() {
+      return "Record<string, unknown>";
+    },
+    onEnum({ items }) {
+      return items.join(" | ");
+    },
+    onString() {
+      return "string";
+    },
+    onNumber() {
+      return "number";
+    },
+    onArray({ item }) {
+      return `ReadonlyArray<${item}>`;
+    },
+    onUnion({ items, topLevel }) {
+      const useEnum = topLevel && !items.some((_) => isNone2(_.title));
+      if (!useEnum) {
+        return items.map((_) => _.source).join(" | ");
+      }
+      return `{
+  ${items.map(({ description, title, source }) => `${toComment(description)}${JSON.stringify(getOrNull(title))} = ${source}`).join(",\n  ")}}
+`;
+    }
+  })
+);
+var toComment = match2({
+  onNone: () => "",
+  onSome: (description) => `/** ${description} */
+`
+});
 function mergeSchemas(self, other) {
   if ("properties" in self && "properties" in other) {
     return {
@@ -35071,13 +35285,13 @@ function resolveRef(schema, context7, recursive = false) {
     return;
   }
   const path2 = schema.$ref.slice(2).split("/");
-  const name = identifier2(path2[path2.length - 1]);
+  const name2 = identifier2(path2[path2.length - 1]);
   let current = context7;
   for (const key of path2) {
     if (!current) return;
     current = current[key];
   }
-  return { name, schema: resolveAllOf(current, context7, recursive) };
+  return { name: name2, schema: resolveAllOf(current, context7, recursive) };
 }
 // src/OpenApi.ts
@@ -35104,198 +35318,190 @@ var make64 = gen2(function* () {
       });
     })
   );
-  const generate = fnUntraced2(function* (spec2) {
-    const gen3 = yield* JsonSchemaGen;
-    const components = spec2.components ? { ...spec2.components } : { schemas: {} };
-    const context7 = { components };
-    const operations = [];
-    function resolveRef2(ref) {
-      const parts2 = ref.split("/").slice(1);
-      let current = spec2;
-      for (const part of parts2) {
-        current = current[part];
-      }
-      return current;
-    }
-    const handlePath = (path2, methods) => methodNames.filter((method) => !!methods[method] && !!methods[method].operationId).forEach((method) => {
-      const { ids: pathIds, path: pathTemplate } = processPath(path2);
-      const operation = methods[method];
-      const op = {
-        id: camelize(operation.operationId),
-        method,
-        pathIds,
-        pathTemplate,
-        urlParams: [],
-        headers: [],
-        cookies: [],
-        successSchemas: /* @__PURE__ */ new Map(),
-        errorSchemas: /* @__PURE__ */ new Map()
-      };
-      const schemaId = identifier2(operation.operationId);
-      const validParameters = operation.parameters?.filter(
-        (_) => _.in !== "path" && _.in !== "cookie"
-      ) ?? [];
-      if (validParameters.length > 0) {
-        const schema = {
-          type: "object",
-          properties: {},
-          required: []
+  const generate = fnUntraced2(
+    function* (spec2, options3) {
+      const gen3 = yield* JsonSchemaGen;
+      const components = spec2.components ? { ...spec2.components } : { schemas: {} };
+      const context7 = { components };
+      const operations = [];
+      function resolveRef2(ref) {
+        const parts2 = ref.split("/").slice(1);
+        let current = spec2;
+        for (const part of parts2) {
+          current = current[part];
+        }
+        return current;
+      }
+      const handlePath = (path2, methods) => methodNames.filter(
+        (method) => !!methods[method] && !!methods[method].operationId
+      ).forEach((method) => {
+        const { ids: pathIds, path: pathTemplate } = processPath(path2);
+        const operation = methods[method];
+        const op = {
+          id: camelize(operation.operationId),
+          method,
+          pathIds,
+          pathTemplate,
+          urlParams: [],
+          headers: [],
+          cookies: [],
+          successSchemas: /* @__PURE__ */ new Map(),
+          errorSchemas: /* @__PURE__ */ new Map()
         };
-        validParameters.forEach((parameter) => {
-          if ("$ref" in parameter) {
-            parameter = resolveRef2(parameter.$ref);
-          }
-          if (parameter.in === "path") {
-            return;
-          }
-          const paramSchema = parameter.schema;
-          const added = [];
-          if ("properties" in paramSchema) {
-            const required2 = paramSchema.required ?? [];
-            Object.entries(paramSchema.properties).forEach(
-              ([name, propSchema]) => {
-                const adjustedName = `${parameter.name}[${name}]`;
-                schema.properties[adjustedName] = propSchema;
-                if (required2.includes(name)) {
-                  schema.required.push(adjustedName);
+        const schemaId = identifier2(operation.operationId);
+        const validParameters = operation.parameters?.filter(
+          (_) => _.in !== "path" && _.in !== "cookie"
+        ) ?? [];
+        if (validParameters.length > 0) {
+          const schema = {
+            type: "object",
+            properties: {},
+            required: []
+          };
+          validParameters.forEach((parameter) => {
+            if ("$ref" in parameter) {
+              parameter = resolveRef2(parameter.$ref);
+            }
+            if (parameter.in === "path") {
+              return;
+            }
+            const paramSchema = parameter.schema;
+            const added = [];
+            if ("properties" in paramSchema) {
+              const required2 = paramSchema.required ?? [];
+              Object.entries(paramSchema.properties).forEach(
+                ([name2, propSchema]) => {
+                  const adjustedName = `${parameter.name}[${name2}]`;
+                  schema.properties[adjustedName] = propSchema;
+                  if (required2.includes(name2)) {
+                    schema.required.push(adjustedName);
+                  }
+                  added.push(adjustedName);
                 }
-                added.push(adjustedName);
-              }
-            );
-          } else {
-            schema.properties[parameter.name] = parameter.schema;
-            parameter.required && schema.required.push(parameter.name);
-            added.push(parameter.name);
-          }
-          if (parameter.in === "query") {
-            op.urlParams.push(...added);
-          } else if (parameter.in === "header") {
-            op.headers.push(...added);
-          } else if (parameter.in === "cookie") {
-            op.cookies.push(...added);
-          }
-        });
-        op.params = gen3.addSchema(
-          `${schemaId}Params`,
-          schema,
-          context7,
-          true
-        );
-      }
-      if (operation.requestBody?.content?.["application/json"]?.schema) {
-        op.payload = gen3.addSchema(
-          `${schemaId}Request`,
-          operation.requestBody.content["application/json"].schema,
-          context7
-        );
-      } else if (operation.requestBody?.content?.["multipart/form-data"]) {
-        op.payload = "FormData";
-      }
-      Object.entries(operation.responses ?? {}).forEach(
-        ([status2, response]) => {
-          if (response.content?.["application/json"]?.schema) {
-            const schemaName = gen3.addSchema(
-              `${schemaId}${status2}`,
-              response.content["application/json"].schema,
-              context7,
-              true
-            );
-            const statusLower = status2.toLowerCase();
-            const statusMajorNumber = Number(status2[0]);
-            if (statusMajorNumber < 4) {
-              op.successSchemas.set(statusLower, schemaName);
+              );
             } else {
-              op.errorSchemas.set(statusLower, schemaName);
+              schema.properties[parameter.name] = parameter.schema;
+              parameter.required && schema.required.push(parameter.name);
+              added.push(parameter.name);
             }
-          }
+            if (parameter.in === "query") {
+              op.urlParams.push(...added);
+            } else if (parameter.in === "header") {
+              op.headers.push(...added);
+            } else if (parameter.in === "cookie") {
+              op.cookies.push(...added);
+            }
+          });
+          op.params = gen3.addSchema(
+            `${schemaId}Params`,
+            schema,
+            context7,
+            true
+          );
         }
+        if (operation.requestBody?.content?.["application/json"]?.schema) {
+          op.payload = gen3.addSchema(
+            `${schemaId}Request`,
+            operation.requestBody.content["application/json"].schema,
+            context7
+          );
+        } else if (operation.requestBody?.content?.["multipart/form-data"]) {
+          op.payload = "FormData";
+        }
+        Object.entries(operation.responses ?? {}).forEach(
+          ([status2, response]) => {
+            if (response.content?.["application/json"]?.schema) {
+              const schemaName = gen3.addSchema(
+                `${schemaId}${status2}`,
+                response.content["application/json"].schema,
+                context7,
+                true
+              );
+              const statusLower = status2.toLowerCase();
+              const statusMajorNumber = Number(status2[0]);
+              if (statusMajorNumber < 4) {
+                op.successSchemas.set(statusLower, schemaName);
+              } else {
+                op.errorSchemas.set(statusLower, schemaName);
+              }
+            }
+          }
+        );
+        operations.push(op);
+      });
+      Object.entries(spec2.paths).forEach(
+        ([path2, methods]) => handlePath(path2, methods)
       );
-      operations.push(op);
-    });
-    Object.entries(spec2.paths).forEach(
-      ([path2, methods]) => handlePath(path2, methods)
-    );
-    const imports = [
-      'import type * as HttpClient from "@effect/platform/HttpClient"',
-      'import * as HttpClientError from "@effect/platform/HttpClientError"',
-      'import * as HttpClientRequest from "@effect/platform/HttpClientRequest"',
-      'import * as HttpClientResponse from "@effect/platform/HttpClientResponse"',
-      'import * as UrlParams from "@effect/platform/UrlParams"',
-      'import * as Effect from "effect/Effect"',
-      'import type { ParseError } from "effect/ParseResult"',
-      'import * as S from "effect/Schema"'
-    ].join("\n");
-    const schemas = yield* gen3.generate("S");
-    const clientInterface = operationsToInterface("Client", operations);
-    const clientImpl = operationsToImpl("Client", operations);
-    return `${imports}
+      const transformer = yield* OpenApiTransformer;
+      const schemas = yield* gen3.generate("S");
+      return `${transformer.imports}
 ${schemas}
-${clientImpl}
+${transformer.toImplementation(options3.name, operations)}
-${clientInterface}`;
-  }, JsonSchemaGen.with);
+${transformer.toTypes(options3.name, operations)}`;
+    },
+    with_,
+    (effect3, _, options3) => provide2(
+      effect3,
+      options3?.typeOnly ? layerTransformerTs2 : layerTransformerSchema2
+    )
+  );
   return { convert: convert3, generate };
 });
 var _OpenApi = class _OpenApi extends Tag3("OpenApi")() {
 };
 _OpenApi.Live = effect(_OpenApi, make64);
 var OpenApi = _OpenApi;
-var processPath = (path2) => {
-  const ids3 = [];
-  path2 = path2.replace(/{([^}]+)}/g, (_, name) => {
-    const id2 = camelize(name);
-    ids3.push(id2);
-    return "${" + id2 + "}";
-  });
-  return { path: "`" + path2 + "`", ids: ids3 };
+var OpenApiTransformer = class extends Tag2("OpenApiTransformer")() {
 };
-var operationsToInterface = (name, operations) => `export interface ${name} {
+var layerTransformerSchema2 = sync6(OpenApiTransformer, () => {
+  const operationsToInterface = (name2, operations) => `export interface ${name2} {
   ${operations.map(operationToMethod).join("\n  ")}
 }`;
-var operationToMethod = (operation) => {
-  const args2 = [];
-  if (operation.pathIds.length > 0) {
-    args2.push(...operation.pathIds.map((id2) => `${id2}: string`));
-  }
-  let options3 = [];
-  if (operation.params && !operation.payload) {
-    args2.push(`options: typeof ${operation.params}.Encoded`);
-  } else if (operation.params) {
-    options3.push(`readonly params: typeof ${operation.params}.Encoded`);
-  }
-  if (operation.payload) {
-    const type2 = operation.payload === "FormData" ? "globalThis.FormData" : `typeof ${operation.payload}.Encoded`;
-    if (!operation.params) {
-      args2.push(`options: ${type2}`);
-    } else {
-      options3.push(`readonly payload: ${type2}`);
+  const operationToMethod = (operation) => {
+    const args2 = [];
+    if (operation.pathIds.length > 0) {
+      args2.push(...operation.pathIds.map((id2) => `${id2}: string`));
+    }
+    let options3 = [];
+    if (operation.params && !operation.payload) {
+      args2.push(`options: typeof ${operation.params}.Encoded`);
+    } else if (operation.params) {
+      options3.push(`readonly params: typeof ${operation.params}.Encoded`);
+    }
+    if (operation.payload) {
+      const type2 = operation.payload === "FormData" ? "globalThis.FormData" : `typeof ${operation.payload}.Encoded`;
+      if (!operation.params) {
+        args2.push(`options: ${type2}`);
+      } else {
+        options3.push(`readonly payload: ${type2}`);
+      }
     }
-  }
-  if (options3.length > 0) {
-    args2.push(`options: { ${options3.join("; ")} }`);
-  }
-  let success = "void";
-  if (operation.successSchemas.size > 0) {
-    success = Array.from(operation.successSchemas.values()).map((schema) => `typeof ${schema}.Type`).join(" | ");
-  }
-  const errors = ["HttpClientError.HttpClientError", "ParseError"];
-  if (operation.errorSchemas.size > 0) {
-    errors.push(
-      ...Array.from(operation.errorSchemas.values()).map(
-        (schema) => `typeof ${schema}.Type`
-      )
-    );
-  }
-  return `readonly "${operation.id}": (${args2.join(", ")}) => Effect.Effect<${success}, ${errors.join(" | ")}>`;
-};
-var operationsToImpl = (name, operations) => `export const make = (
+    if (options3.length > 0) {
+      args2.push(`options: { ${options3.join("; ")} }`);
+    }
+    let success = "void";
+    if (operation.successSchemas.size > 0) {
+      success = Array.from(operation.successSchemas.values()).map((schema) => `typeof ${schema}.Type`).join(" | ");
+    }
+    const errors = ["HttpClientError.HttpClientError", "ParseError"];
+    if (operation.errorSchemas.size > 0) {
+      errors.push(
+        ...Array.from(operation.errorSchemas.values()).map(
+          (schema) => `typeof ${schema}.Type`
+        )
+      );
+    }
+    return `readonly "${operation.id}": (${args2.join(", ")}) => Effect.Effect<${success}, ${errors.join(" | ")}>`;
+  };
+  const operationsToImpl = (name2, operations) => `export const make = (
   httpClient: HttpClient.HttpClient,
   options: {
     readonly transformClient?: ((client: HttpClient.HttpClient) => Effect.Effect<HttpClient.HttpClient>) | undefined
   } = {}
-): ${name} => {
+): ${name2} => {
   const unexpectedStatus = (request: HttpClientRequest.HttpClientRequest, response: HttpClientResponse.HttpClientResponse) =>
     Effect.flatMap(
       Effect.orElseSucceed(response.text, () => "Unexpected status code"),
@@ -35314,58 +35520,263 @@ var operationsToImpl = (name, operations) => `export const make = (
     ${operations.map(operationToImpl).join(",\n  ")}
   }
 }`;
-var operationToImpl = (operation) => {
-  const args2 = [...operation.pathIds];
-  const hasOptions = operation.params || operation.payload;
-  if (hasOptions) {
-    args2.push("options");
-  }
-  const params = `${args2.join(", ")}`;
-  const pipeline = [];
-  if (operation.params) {
-    const varName = operation.payload ? "options.params" : "options";
-    if (operation.urlParams.length > 0) {
-      const props = operation.urlParams.map(
-        (param) => `"${param}": ${varName}["${param}"] as UrlParams.Coercible`
+  const operationToImpl = (operation) => {
+    const args2 = [...operation.pathIds];
+    const hasOptions = operation.params || operation.payload;
+    if (hasOptions) {
+      args2.push("options");
+    }
+    const params = `${args2.join(", ")}`;
+    const pipeline = [];
+    if (operation.params) {
+      const varName = operation.payload ? "options.params" : "options";
+      if (operation.urlParams.length > 0) {
+        const props = operation.urlParams.map(
+          (param) => `"${param}": ${varName}["${param}"] as UrlParams.Coercible`
+        );
+        pipeline.push(`HttpClientRequest.setUrlParams({ ${props.join(", ")} })`);
+      }
+      if (operation.headers.length > 0) {
+        const props = operation.headers.map(
+          (param) => `"${param}": ${varName}["${param}"] ?? undefined`
+        );
+        pipeline.push(`HttpClientRequest.setHeaders({ ${props.join(", ")} })`);
+      }
+    }
+    const payloadVarName = operation.params ? "options.payload" : "options";
+    if (operation.payload === "FormData") {
+      pipeline.push(
+        `HttpClientRequest.bodyFormData(${payloadVarName})`,
+        "Effect.succeed"
       );
-      pipeline.push(`HttpClientRequest.setUrlParams({ ${props.join(", ")} })`);
+    } else if (operation.payload) {
+      pipeline.push(
+        `(req) => Effect.orDie(HttpClientRequest.bodyJson(req, ${payloadVarName}))`
+      );
+    } else {
+      pipeline.push("Effect.succeed");
     }
-    if (operation.headers.length > 0) {
-      const props = operation.headers.map(
-        (param) => `"${param}": ${varName}["${param}"] ?? undefined`
+    const decodes = [];
+    operation.successSchemas.forEach((schema, status2) => {
+      decodes.push(
+        `"${status2}": r => HttpClientResponse.schemaBodyJson(${schema})(r)`
       );
-      pipeline.push(`HttpClientRequest.setHeaders({ ${props.join(", ")} })`);
+    });
+    operation.errorSchemas.forEach((schema, status2) => {
+      decodes.push(`"${status2}": r => decodeError(r, ${schema})`);
+    });
+    decodes.push(`orElse: (response) => unexpectedStatus(request, response)`);
+    pipeline.push(`Effect.flatMap(request => Effect.flatMap(applyClientTransform(httpClient), (httpClient) => Effect.flatMap(httpClient.execute(request), HttpClientResponse.matchStatus({
+      ${decodes.join(",\n      ")}
+    }))))`);
+    return `"${operation.id}": (${params}) => HttpClientRequest.make("${operation.method.toUpperCase()}")(${operation.pathTemplate}).pipe(
+    ${pipeline.join(",\n    ")}
+  )`;
+  };
+  return OpenApiTransformer.of({
+    imports: [
+      'import type * as HttpClient from "@effect/platform/HttpClient"',
+      'import * as HttpClientError from "@effect/platform/HttpClientError"',
+      'import * as HttpClientRequest from "@effect/platform/HttpClientRequest"',
+      'import * as HttpClientResponse from "@effect/platform/HttpClientResponse"',
+      'import * as UrlParams from "@effect/platform/UrlParams"',
+      'import * as Effect from "effect/Effect"',
+      'import type { ParseError } from "effect/ParseResult"',
+      'import * as S from "effect/Schema"'
+    ].join("\n"),
+    toTypes: operationsToInterface,
+    toImplementation: operationsToImpl
+  });
+}).pipe(merge7(layerTransformerSchema));
+var layerTransformerTs2 = sync6(OpenApiTransformer, () => {
+  const operationsToInterface = (name2, operations) => `export interface ${name2} {
+  ${operations.map((s) => operationToMethod(name2, s)).join("\n  ")}
+}
+export interface ${name2}Error<Tag extends string, E> {
+  readonly _tag: Tag
+  readonly cause: E
+}
+class ${name2}ErrorImpl extends Data.Error<{ _tag: string; cause: any }> {}
+export const ${name2}Error = <Tag extends string, E>(
+  tag: Tag,
+  cause: E,
+): ${name2}Error<Tag, E> => new ${name2}ErrorImpl({ _tag: tag, cause }) as any`;
+  const operationToMethod = (name2, operation) => {
+    const args2 = [];
+    if (operation.pathIds.length > 0) {
+      args2.push(...operation.pathIds.map((id2) => `${id2}: string`));
+    }
+    let options3 = [];
+    if (operation.params && !operation.payload) {
+      args2.push(`options: ${operation.params}`);
+    } else if (operation.params) {
+      options3.push(`readonly params: ${operation.params}`);
+    }
+    if (operation.payload) {
+      const type2 = operation.payload === "FormData" ? "globalThis.FormData" : operation.payload;
+      if (!operation.params) {
+        args2.push(`options: ${type2}`);
+      } else {
+        options3.push(`readonly payload: ${type2}`);
+      }
+    }
+    if (options3.length > 0) {
+      args2.push(`options: { ${options3.join("; ")} }`);
+    }
+    let success = "void";
+    if (operation.successSchemas.size > 0) {
+      success = Array.from(operation.successSchemas.values()).join(" | ");
+    }
+    const errors = ["HttpClientError.HttpClientError"];
+    if (operation.errorSchemas.size > 0) {
+      for (const schema of operation.errorSchemas.values()) {
+        errors.push(`${name2}Error<"${schema}", ${schema}>`);
+      }
     }
+    return `readonly "${operation.id}": (${args2.join(", ")}) => Effect.Effect<${success}, ${errors.join(" | ")}>`;
+  };
+  const operationsToImpl = (name2, operations) => `export const make = (
+  httpClient: HttpClient.HttpClient,
+  options: {
+    readonly transformClient?: ((client: HttpClient.HttpClient) => Effect.Effect<HttpClient.HttpClient>) | undefined
+  } = {}
+): ${name2} => {
+  const unexpectedStatus = (response: HttpClientResponse.HttpClientResponse) =>
+    Effect.flatMap(
+      Effect.orElseSucceed(response.text, () => "Unexpected status code"),
+      (description) =>
+        Effect.fail(
+          new HttpClientError.ResponseError({
+            request: response.request,
+            response,
+            reason: "StatusCode",
+            description,
+          }),
+        ),
+    )
+  const applyClientTransform = (
+    client: HttpClient.HttpClient,
+  ): Effect.Effect<HttpClient.HttpClient> =>
+    options.transformClient
+      ? options.transformClient(client)
+      : Effect.succeed(client)
+  const decodeSuccess = <A>(response: HttpClientResponse.HttpClientResponse) =>
+    response.json as Effect.Effect<A, HttpClientError.ResponseError>
+  const decodeVoid = (_response: HttpClientResponse.HttpClientResponse) =>
+    Effect.void
+  const decodeError =
+    <Tag extends string, E>(tag: Tag) =>
+    (
+      response: HttpClientResponse.HttpClientResponse,
+    ): Effect.Effect<
+      never,
+      ${name2}Error<Tag, E> | HttpClientError.ResponseError
+    > =>
+      Effect.flatMap(
+        response.json as Effect.Effect<E, HttpClientError.ResponseError>,
+        (cause) => Effect.fail(${name2}Error(tag, cause)),
+      )
+  const onRequest = (
+    successCodes: ReadonlyArray<string>,
+    errorCodes: Record<string, string>,
+  ) => {
+    const cases: any = { orElse: unexpectedStatus }
+    for (const code of successCodes) {
+      cases[code] = decodeSuccess
+    }
+    for (const [code, tag] of Object.entries(errorCodes)) {
+      cases[code] = decodeError(tag)
+    }
+    if (successCodes.length === 0) {
+      cases["2xx"] = decodeVoid
+    }
+    return (
+      request: HttpClientRequest.HttpClientRequest,
+    ): Effect.Effect<any, any> =>
+      Effect.flatMap(applyClientTransform(httpClient), (httpClient) =>
+        Effect.flatMap(
+          httpClient.execute(request),
+          HttpClientResponse.matchStatus(cases) as any,
+        ),
+      )
   }
-  const payloadVarName = operation.params ? "options.payload" : "options";
-  if (operation.payload === "FormData") {
-    pipeline.push(
-      `HttpClientRequest.bodyFormData(${payloadVarName})`,
-      "Effect.succeed"
-    );
-  } else if (operation.payload) {
-    pipeline.push(
-      `(req) => Effect.orDie(HttpClientRequest.bodyJson(req, ${payloadVarName}))`
-    );
-  } else {
-    pipeline.push("Effect.succeed");
+  return {
+    ${operations.map(operationToImpl).join(",\n  ")}
   }
-  const decodes = [];
-  operation.successSchemas.forEach((schema, status2) => {
-    decodes.push(
-      `"${status2}": r => HttpClientResponse.schemaBodyJson(${schema})(r)`
+}`;
+  const operationToImpl = (operation) => {
+    const args2 = [...operation.pathIds];
+    const hasOptions = operation.params || operation.payload;
+    if (hasOptions) {
+      args2.push("options");
+    }
+    const params = `${args2.join(", ")}`;
+    const pipeline = [];
+    if (operation.params) {
+      const varName = operation.payload ? "options.params" : "options";
+      if (operation.urlParams.length > 0) {
+        const props = operation.urlParams.map(
+          (param) => `"${param}": ${varName}["${param}"] as UrlParams.Coercible`
+        );
+        pipeline.push(`HttpClientRequest.setUrlParams({ ${props.join(", ")} })`);
+      }
+      if (operation.headers.length > 0) {
+        const props = operation.headers.map(
+          (param) => `"${param}": ${varName}["${param}"] ?? undefined`
+        );
+        pipeline.push(`HttpClientRequest.setHeaders({ ${props.join(", ")} })`);
+      }
+    }
+    const payloadVarName = operation.params ? "options.payload" : "options";
+    if (operation.payload === "FormData") {
+      pipeline.push(
+        `HttpClientRequest.bodyFormData(${payloadVarName})`,
+        "Effect.succeed"
+      );
+    } else if (operation.payload) {
+      pipeline.push(
+        `(req) => Effect.orDie(HttpClientRequest.bodyJson(req, ${payloadVarName}))`
+      );
+    } else {
+      pipeline.push("Effect.succeed");
+    }
+    const successCodes = Array.from(
+      operation.successSchemas.keys(),
+      (_) => JSON.stringify(_)
+    ).join(", ");
+    const errorCodes = Object.fromEntries(operation.errorSchemas.entries());
+    pipeline.push(
+      `Effect.flatMap(onRequest([${successCodes}], ${JSON.stringify(errorCodes)}))`
     );
-  });
-  operation.errorSchemas.forEach((schema, status2) => {
-    decodes.push(`"${status2}": r => decodeError(r, ${schema})`);
-  });
-  decodes.push(`orElse: (response) => unexpectedStatus(request, response)`);
-  pipeline.push(`Effect.flatMap(request => Effect.flatMap(applyClientTransform(httpClient), (httpClient) => Effect.flatMap(httpClient.execute(request), HttpClientResponse.matchStatus({
-      ${decodes.join(",\n      ")}
-    }))))`);
-  return `"${operation.id}": (${params}) => HttpClientRequest.make("${operation.method.toUpperCase()}")(${operation.pathTemplate}).pipe(
+    return `"${operation.id}": (${params}) => HttpClientRequest.make("${operation.method.toUpperCase()}")(${operation.pathTemplate}).pipe(
     ${pipeline.join(",\n    ")}
   )`;
+  };
+  return OpenApiTransformer.of({
+    imports: [
+      'import type * as HttpClient from "@effect/platform/HttpClient"',
+      'import * as HttpClientError from "@effect/platform/HttpClientError"',
+      'import * as HttpClientRequest from "@effect/platform/HttpClientRequest"',
+      'import * as HttpClientResponse from "@effect/platform/HttpClientResponse"',
+      'import * as UrlParams from "@effect/platform/UrlParams"',
+      'import * as Data from "effect/Data"',
+      'import * as Effect from "effect/Effect"'
+    ].join("\n"),
+    toTypes: operationsToInterface,
+    toImplementation: operationsToImpl
+  });
+}).pipe(merge7(layerTransformerTs));
+var processPath = (path2) => {
+  const ids3 = [];
+  path2 = path2.replace(/{([^}]+)}/g, (_, name2) => {
+    const id2 = camelize(name2);
+    ids3.push(id2);
+    return "${" + id2 + "}";
+  });
+  return { path: "`" + path2 + "`", ids: ids3 };
 };
 // src/main.ts
@@ -35373,17 +35784,26 @@ var spec = fileParse2("spec").pipe(
   withAlias2("s"),
   withDescription3("The OpenAPI spec file to generate the client from")
 );
+var name = text8("name").pipe(
+  withAlias2("n"),
+  withDescription3("The name of the generated client"),
+  withDefault3("Client")
+);
 var convert2 = boolean5("convert").pipe(
   withAlias2("c"),
   withDescription3("Convert from OpenAPI 2 to OpenAPI 3 first")
 );
-var root = make62("openapigen", { spec, convert: convert2 }).pipe(
+var typeOnly = boolean5("type-only").pipe(
+  withAlias2("t"),
+  withDescription3("Generate a type-only client without schemas")
+);
+var root = make62("openapigen", { spec, convert: convert2, typeOnly, name }).pipe(
   withHandler2(
-    fnUntraced2(function* ({ spec: spec2, convert: convert3 }) {
+    fnUntraced2(function* ({ spec: spec2, convert: convert3, typeOnly: typeOnly2, name: name2 }) {
       if (convert3) {
         spec2 = yield* OpenApi.convert(spec2);
       }
-      return yield* OpenApi.generate(spec2).pipe(
+      return yield* OpenApi.generate(spec2, { name: name2, typeOnly: typeOnly2 }).pipe(
         flatMap9(log2)
       );
     })