@tim-smart/openapi-gen 0.3.26 → 0.4.1

package/main.js

@@ -34919,7 +34919,8 @@ var make64 = gen2(function* () {
                 key,
                 source,
                 isOptional,
-                isNullable: "nullable" in fullSchema && fullSchema.nullable === true || "default" in fullSchema && fullSchema.default === null
+                isNullable: "nullable" in fullSchema && fullSchema.nullable === true || "default" in fullSchema && fullSchema.default === null,
+                default: fullSchema.default
               })
             )
           );
@@ -35323,8 +35324,19 @@ var methodNames = [
   "patch",
   "trace"
 ];
+var httpClientMethodNames = {
+  get: "get",
+  put: "put",
+  post: "post",
+  delete: "del",
+  options: "options",
+  head: "head",
+  patch: "patch",
+  trace: `make("TRACE")`
+};
 var make65 = gen2(function* () {
-  const convert3 = fn("OpenApi.convert")(
+  const isV2 = (spec2) => "swagger" in spec2;
+  const convert2 = fn("OpenApi.convert")(
     (v2Spec) => async2((resume2) => {
       (0, import_swagger2openapi.convertObj)(
         v2Spec,
@@ -35341,6 +35353,9 @@ var make65 = gen2(function* () {
   );
   const generate = fnUntraced2(
     function* (spec2, options3) {
+      if (isV2(spec2)) {
+        spec2 = yield* convert2(spec2);
+      }
       const gen3 = yield* JsonSchemaGen;
       const components = spec2.components ? { ...spec2.components } : { schemas: {} };
       const context7 = { components };
@@ -35479,7 +35494,7 @@ ${transformer.toTypes(options3.name, operations)}`;
       options3?.typeOnly ? layerTransformerTs2 : layerTransformerSchema2
     )
   );
-  return { convert: convert3, generate };
+  return { generate };
 });
 var _OpenApi = class _OpenApi extends Tag3("OpenApi")() {
 };
@@ -35601,7 +35616,7 @@ ${clientErrorSource(name2)}`;
     pipeline.push(`withResponse(HttpClientResponse.matchStatus({
       ${decodes.join(",\n      ")}
     }))`);
-    return `"${operation.id}": (${params}) => HttpClientRequest.make("${operation.method.toUpperCase()}")(${operation.pathTemplate}).pipe(
+    return `"${operation.id}": (${params}) => HttpClientRequest.${httpClientMethodNames[operation.method]}(${operation.pathTemplate}).pipe(
     ${pipeline.join(",\n    ")}
   )`;
   };
@@ -35749,7 +35764,7 @@ ${clientErrorSource(name2)}`;
     pipeline.push(
       `onRequest([${singleSuccessCode ? `"2xx"` : successCodes}]${errorCodes ? `, ${JSON.stringify(errorCodes)}` : ""})`
     );
-    return `"${operation.id}": (${params}) => HttpClientRequest.make("${operation.method.toUpperCase()}")(${operation.pathTemplate}).pipe(
+    return `"${operation.id}": (${params}) => HttpClientRequest.${httpClientMethodNames[operation.method]}(${operation.pathTemplate}).pipe(
     ${pipeline.join(",\n    ")}
   )`;
   };
@@ -35837,24 +35852,15 @@ var name = text8("name").pipe(
   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 typeOnly = boolean5("type-only").pipe(
   withAlias2("t"),
   withDescription3("Generate a type-only client without schemas")
 );
-var root = make63("openapigen", { spec, convert: convert2, typeOnly, name }).pipe(
+var root = make63("openapigen", { spec, typeOnly, name }).pipe(
   withHandler2(
-    fnUntraced2(function* ({ spec: spec2, convert: convert3, typeOnly: typeOnly2, name: name2 }) {
-      if (convert3) {
-        spec2 = yield* OpenApi.convert(spec2);
-      }
-      return yield* OpenApi.generate(spec2, { name: name2, typeOnly: typeOnly2 }).pipe(
-        flatMap9(log2)
-      );
-    })
+    ({ spec: spec2, typeOnly: typeOnly2, name: name2 }) => OpenApi.generate(spec2, { name: name2, typeOnly: typeOnly2 }).pipe(
+      flatMap9(log2)
+    )
   )
 );
 var run9 = run8(root, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tim-smart/openapi-gen",
-  "version": "0.3.26",
+  "version": "0.4.1",
   "description": "Generate Effect http clients from OpenAPI specs",
   "bin": "main.js",
   "repository": {