@tim-smart/openapi-gen 0.4.1 → 0.4.3

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);
@@ -19317,6 +19356,8 @@ 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 +20665,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 +22936,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]));
       });
   }
 };
@@ -34868,7 +34909,7 @@ var make64 = gen2(function* () {
         (source) => transformer.onTopLevel({
           importName,
           schema,
-          description: fromNullable(schema.description),
+          description: nonEmptyString3(schema.description),
           name: name2,
           source,
           isClass,
@@ -34907,19 +34948,20 @@ var make64 = gen2(function* () {
         filterMap2(([key, schema2]) => {
           const fullSchema = getSchema(schema2);
           const isOptional = !required2.includes(key);
+          const [enumNullable, filteredSchema] = filterNullable(fullSchema);
           return toSource(
             importName,
-            schema2,
+            enumNullable ? filteredSchema : schema2,
             currentIdentifier + identifier2(key)
           ).pipe(
             map2(
               (source) => transformer.onProperty({
                 importName,
-                description: fromNullable(schema2.description),
+                description: nonEmptyString3(schema2.description),
                 key,
                 source,
                 isOptional,
-                isNullable: "nullable" in fullSchema && fullSchema.nullable === true || "default" in fullSchema && fullSchema.default === null,
+                isNullable: enumNullable || "nullable" in fullSchema && fullSchema.nullable === true || "default" in fullSchema && fullSchema.default === null,
                 default: fullSchema.default
               })
             )
@@ -34985,14 +35027,27 @@ var make64 = gen2(function* () {
         topLevel
       );
     } else if ("anyOf" in schema || "oneOf" in schema) {
+      let itemSchemas = "anyOf" in schema ? schema.anyOf : schema.oneOf;
+      let typePrimitives = 0;
+      const constItems = empty2();
+      for (const item of itemSchemas) {
+        if ("type" in item && item.type !== "null") {
+          typePrimitives++;
+        } else if ("const" in item) {
+          constItems.push(item);
+        }
+      }
+      if (typePrimitives <= 1 && constItems.length > 0 && constItems.length + typePrimitives === itemSchemas.length) {
+        itemSchemas = constItems;
+      }
       const items = pipe(
-        "anyOf" in schema ? schema.anyOf : schema.oneOf,
+        itemSchemas,
         filterMap2(
           (_) => toSource(importName, _, currentIdentifier + "Enum").pipe(
             map2(
               (source) => ({
-                description: fromNullable(_.description),
-                title: fromNullable(_.title),
+                description: nonEmptyString3(_.description),
+                title: nonEmptyString3(_.title),
                 source
               })
             )
@@ -35099,12 +35154,12 @@ var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
     supportsTopLevel({ isClass, isEnum }) {
       return isClass || isEnum;
     },
-    onTopLevel({ importName, schema, name: name2, source, isClass }) {
+    onTopLevel({ importName, schema, name: name2, source, isClass, description }) {
       const isObject2 = "properties" in schema;
       if (!isObject2 || !isClass) {
-        return `export class ${name2} extends ${source} {}`;
+        return `${toComment(description)}export class ${name2} extends ${source} {}`;
       }
-      return `export class ${name2} extends ${importName}.Class<${name2}>("${name2}")(${source}) {}`;
+      return `${toComment(description)}export class ${name2} extends ${importName}.Class<${name2}>("${name2}")(${source}) {}`;
     },
     propertySeparator: ",\n  ",
     onProperty: (options3) => {
@@ -35112,7 +35167,7 @@ var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
         options3.importName,
         options3
       )(options3.source);
-      return `"${options3.key}": ${source}`;
+      return `${toComment(options3.description)}"${options3.key}": ${source}`;
     },
     onRef({ name: name2 }) {
       return name2;
@@ -35163,12 +35218,12 @@ var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
       const modifiers = [];
       if (minimum !== void 0) {
         modifiers.push(
-          `${importName}.greaterThan${exclusiveMinimum ? "" : "OrEqualTo"}(${schema.minimum})`
+          `${importName}.greaterThan${exclusiveMinimum ? "" : "OrEqualTo"}(${minimum})`
         );
       }
       if (maximum !== void 0) {
         modifiers.push(
-          `${importName}.lessThan${exclusiveMaximum ? "" : "OrEqualTo"}(${schema.maximum})`
+          `${importName}.lessThan${exclusiveMaximum ? "" : "OrEqualTo"}(${maximum})`
         );
       }
       return `${importName}.${schema.type === "integer" ? "Int" : "Number"}${pipeSource(modifiers)}`;
@@ -35184,7 +35239,7 @@ var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
       return `${importName}.${nonEmpty ? "NonEmpty" : ""}Array(${item})${pipeSource(modifiers)}`;
     },
     onUnion({ importName, items }) {
-      return `${importName}.Union(${items.map((_) => _.source).join(", ")})`;
+      return `${importName}.Union(${items.map((_) => `${toComment(_.description)}${_.source}`).join(",\n")})`;
     }
   });
 });
@@ -35245,9 +35300,16 @@ export type ${name2} = (typeof ${name2})[keyof typeof ${name2}];` : `${toComment
     }
   })
 );
+var nonEmptyString3 = flow(
+  fromNullable,
+  map2(trim),
+  filter(isNonEmpty5)
+);
 var toComment = match2({
   onNone: () => "",
-  onSome: (description) => `/** ${description} */
+  onSome: (description) => `/**
+* ${description.split("\n").join("\n* ")}
+*/
 `
 });
 function mergeSchemas(self, other) {
@@ -35311,6 +35373,28 @@ function resolveRef(schema, context7, recursive = false) {
   }
   return { name: name2, schema: resolveAllOf(current, context7, recursive) };
 }
+function filterNullable(schema) {
+  if ("oneOf" in schema || "anyOf" in schema) {
+    const items = schema.oneOf ?? schema.anyOf;
+    const prop = "oneOf" in schema ? "oneOf" : "anyOf";
+    let isNullable2 = false;
+    let otherItems = empty2();
+    for (const item of items) {
+      if ("type" in item && item.type === "null") {
+        isNullable2 = true;
+      } else if ("const" in item && item.const === null) {
+        isNullable2 = true;
+      } else {
+        otherItems.push(item);
+      }
+    }
+    return [
+      isNullable2,
+      { ...schema, [prop]: otherItems }
+    ];
+  }
+  return [false, schema];
+}
 
 // src/OpenApi.ts
 var import_swagger2openapi = __toESM(require_swagger2openapi());

package/package.json

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