@tim-smart/openapi-gen 0.4.2 → 0.4.4

package/main.js

@@ -7344,15 +7344,15 @@ var require_swagger2openapi = __commonJS({
         scheme.scheme = "basic";
       }
       if (scheme.type === "oauth2") {
-        let flow = {};
+        let flow2 = {};
         let flowName = scheme.flow;
         if (scheme.flow === "application") flowName = "clientCredentials";
         if (scheme.flow === "accessCode") flowName = "authorizationCode";
-        if (typeof scheme.authorizationUrl !== "undefined") flow.authorizationUrl = scheme.authorizationUrl.split("?")[0].trim() || "/";
-        if (typeof scheme.tokenUrl === "string") flow.tokenUrl = scheme.tokenUrl.split("?")[0].trim() || "/";
-        flow.scopes = scheme.scopes || {};
+        if (typeof scheme.authorizationUrl !== "undefined") flow2.authorizationUrl = scheme.authorizationUrl.split("?")[0].trim() || "/";
+        if (typeof scheme.tokenUrl === "string") flow2.tokenUrl = scheme.tokenUrl.split("?")[0].trim() || "/";
+        flow2.scopes = scheme.scopes || {};
         scheme.flows = {};
-        scheme.flows[flowName] = flow;
+        scheme.flows[flowName] = flow2;
         delete scheme.flow;
         delete scheme.authorizationUrl;
         delete scheme.tokenUrl;
@@ -8556,6 +8556,45 @@ function pipe(a, ab, bc, cd, de, ef, fg, gh, hi) {
     }
   }
 }
+function flow(ab, bc, cd, de, ef, fg, gh, hi, ij) {
+  switch (arguments.length) {
+    case 1:
+      return ab;
+    case 2:
+      return function() {
+        return bc(ab.apply(this, arguments));
+      };
+    case 3:
+      return function() {
+        return cd(bc(ab.apply(this, arguments)));
+      };
+    case 4:
+      return function() {
+        return de(cd(bc(ab.apply(this, arguments))));
+      };
+    case 5:
+      return function() {
+        return ef(de(cd(bc(ab.apply(this, arguments)))));
+      };
+    case 6:
+      return function() {
+        return fg(ef(de(cd(bc(ab.apply(this, arguments))))));
+      };
+    case 7:
+      return function() {
+        return gh(fg(ef(de(cd(bc(ab.apply(this, arguments)))))));
+      };
+    case 8:
+      return function() {
+        return hi(gh(fg(ef(de(cd(bc(ab.apply(this, arguments))))))));
+      };
+    case 9:
+      return function() {
+        return ij(hi(gh(fg(ef(de(cd(bc(ab.apply(this, arguments)))))))));
+      };
+  }
+  return;
+}
 
 // node_modules/.pnpm/effect@3.15.2/node_modules/effect/dist/esm/Equivalence.js
 var make = (isEquivalent) => (self, that) => self === that || isEquivalent(self, that);
@@ -19312,11 +19351,14 @@ var TaggedError = (tag4) => {
 };
 
 // node_modules/.pnpm/effect@3.15.2/node_modules/effect/dist/esm/String.js
+var isString2 = isString;
 var toUpperCase = (self) => self.toUpperCase();
 var capitalize = (self) => {
   if (self.length === 0) return self;
   return toUpperCase(self[0]) + self.slice(1);
 };
+var trim = (self) => self.trim();
+var isNonEmpty5 = (self) => self.length > 0;
 
 // node_modules/.pnpm/effect@3.15.2/node_modules/effect/dist/esm/internal/schedule.js
 var ScheduleSymbolKey = "effect/Schedule";
@@ -20624,10 +20666,10 @@ var formatUnknown = (u, checkCircular = true) => {
   }
 };
 var formatPropertyKey = (name2) => typeof name2 === "string" ? JSON.stringify(name2) : String(name2);
-var isNonEmpty5 = (x) => Array.isArray(x);
+var isNonEmpty6 = (x) => Array.isArray(x);
 var isSingle = (x) => !Array.isArray(x);
 var formatPathKey = (key) => `[${formatPropertyKey(key)}]`;
-var formatPath = (path2) => isNonEmpty5(path2) ? path2.map(formatPathKey).join("") : formatPathKey(path2);
+var formatPath = (path2) => isNonEmpty6(path2) ? path2.map(formatPathKey).join("") : formatPathKey(path2);
 
 // node_modules/.pnpm/effect@3.15.2/node_modules/effect/dist/esm/internal/schema/errors.js
 var getErrorMessage = (reason, details, path2, ast) => {
@@ -22895,7 +22937,7 @@ var formatTree = (issue) => {
           return right2(makeTree(message));
         }
         const parseIssueTitle = getParseIssueTitle(issue);
-        return isNonEmpty5(issue.issues) ? map18(forEach8(issue.issues, formatTree), (forest) => makeTree(parseIssueTitle, forest)) : map18(formatTree(issue.issues), (tree) => makeTree(parseIssueTitle, [tree]));
+        return isNonEmpty6(issue.issues) ? map18(forEach8(issue.issues, formatTree), (forest) => makeTree(parseIssueTitle, forest)) : map18(formatTree(issue.issues), (tree) => makeTree(parseIssueTitle, [tree]));
       });
   }
 };
@@ -34761,6 +34803,19 @@ var camelize = (self) => {
   return str;
 };
 var identifier2 = (operationId) => capitalize(camelize(operationId));
+var nonEmptyString3 = flow(
+  fromNullable,
+  filter(isString2),
+  map2(trim),
+  filter(isNonEmpty5)
+);
+var toComment = match2({
+  onNone: () => "",
+  onSome: (description) => `/**
+* ${description.split("\n").join("\n* ")}
+*/
+`
+});
 
 // src/JsonSchemaGen.ts
 var make64 = gen2(function* () {
@@ -34868,7 +34923,7 @@ var make64 = gen2(function* () {
         (source) => transformer.onTopLevel({
           importName,
           schema,
-          description: fromNullable(schema.description),
+          description: nonEmptyString3(schema.description),
           name: name2,
           source,
           isClass,
@@ -34916,7 +34971,7 @@ var make64 = gen2(function* () {
             map2(
               (source) => transformer.onProperty({
                 importName,
-                description: fromNullable(schema2.description),
+                description: nonEmptyString3(schema2.description),
                 key,
                 source,
                 isOptional,
@@ -35005,8 +35060,8 @@ var make64 = gen2(function* () {
           (_) => toSource(importName, _, currentIdentifier + "Enum").pipe(
             map2(
               (source) => ({
-                description: fromNullable(_.description),
-                title: fromNullable(_.title),
+                description: nonEmptyString3(_.description),
+                title: nonEmptyString3(_.title),
                 source
               })
             )
@@ -35259,13 +35314,6 @@ export type ${name2} = (typeof ${name2})[keyof typeof ${name2}];` : `${toComment
     }
   })
 );
-var toComment = match2({
-  onNone: () => "",
-  onSome: (description) => `/**
-* ${description.split("\n").join("\n* ")}
-*/
-`
-});
 function mergeSchemas(self, other) {
   if ("properties" in self && "properties" in other) {
     return {
@@ -35414,6 +35462,9 @@ var make65 = gen2(function* () {
         const op = {
           id: camelize(operation.operationId),
           method,
+          description: nonEmptyString3(operation.description).pipe(
+            orElse(() => nonEmptyString3(operation.summary))
+          ),
           pathIds,
           pathTemplate,
           urlParams: [],
@@ -35585,7 +35636,7 @@ ${clientErrorSource(name2)}`;
         )
       );
     }
-    return `readonly "${operation.id}": (${args2.join(", ")}) => Effect.Effect<${success}, ${errors.join(" | ")}>`;
+    return `${toComment(operation.description)}readonly "${operation.id}": (${args2.join(", ")}) => Effect.Effect<${success}, ${errors.join(" | ")}>`;
   };
   const operationsToImpl = (name2, operations) => `export const make = (
   httpClient: HttpClient.HttpClient, 
@@ -35716,7 +35767,7 @@ ${clientErrorSource(name2)}`;
         errors.push(`${name2}Error<"${schema}", ${schema}>`);
       }
     }
-    return `readonly "${operation.id}": (${args2.join(", ")}) => Effect.Effect<${success}, ${errors.join(" | ")}>`;
+    return `${toComment(operation.description)}readonly "${operation.id}": (${args2.join(", ")}) => Effect.Effect<${success}, ${errors.join(" | ")}>`;
   };
   const operationsToImpl = (name2, operations) => `export const make = (
   httpClient: HttpClient.HttpClient, 

package/package.json

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