osury 0.20.1 → 0.22.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "osury",
   "type": "module",
   "description": "Generate ReScript types with Sury schemas from OpenAPI specifications",
-  "version": "0.20.1",
+  "version": "0.22.0",
   "license": "MIT",
   "bin": {
     "osury": "bin/osury.mjs"

package/src/Codegen.res.mjs

@@ -66,6 +66,8 @@ let isPrimitivePlusDictUnion = CodegenTransforms.isPrimitivePlusDictUnion;
 
 let getUnionName = CodegenTransforms.getUnionName;
 
+let getPolyVariantName = CodegenTransforms.getPolyVariantName;
+
 let extractUnions = CodegenTransforms.extractUnions;
 
 let extractUnionsFromType = CodegenTransforms.extractUnionsFromType;
@@ -115,6 +117,7 @@ export {
   isRefPlusDictUnion,
   isPrimitivePlusDictUnion,
   getUnionName,
+  getPolyVariantName,
   extractUnions,
   extractUnionsFromType,
   replaceUnions,

package/src/CodegenTransforms.res.mjs

@@ -113,6 +113,10 @@ function getUnionName(types) {
   return first + rest.map(n => "Or" + CodegenHelpers.ucFirst(n)).join("");
 }
 
+function getPolyVariantName(cases) {
+  return getUnionName(cases.map(c => c.payload));
+}
+
 function extractUnionsFromType(_schema) {
   while (true) {
     let schema = _schema;
@@ -122,6 +126,12 @@ function extractUnionsFromType(_schema) {
     switch (schema._tag) {
       case "Object" :
         return schema._0.flatMap(field => extractUnionsFromType(field.type));
+      case "PolyVariant" :
+        let name = getPolyVariantName(schema._0);
+        return [{
+            name: name,
+            schema: schema
+          }];
       case "Optional" :
       case "Nullable" :
       case "Array" :
@@ -134,9 +144,9 @@ function extractUnionsFromType(_schema) {
         if (match !== undefined) {
           return [];
         }
-        let name = getUnionName(types);
+        let name$1 = getUnionName(types);
         return [{
-            name: name,
+            name: name$1,
             schema: schema
           }];
       default:
@@ -188,6 +198,11 @@ function replaceUnionInType(schema) {
         _tag: "Array",
         _0: replaceUnionInType(schema._0)
       };
+    case "PolyVariant" :
+      return {
+        _tag: "Ref",
+        _0: getPolyVariantName(schema._0)
+      };
     case "Dict" :
       return {
         _tag: "Dict",
@@ -499,6 +514,7 @@ export {
   isRefPlusDictUnion,
   isPrimitivePlusDictUnion,
   getUnionName,
+  getPolyVariantName,
   extractUnions,
   extractUnionsFromType,
   replaceUnions,

package/src/IRGen.res.mjs

@@ -139,15 +139,22 @@ function convertToIrTypeDef(namedSchema, schemasDict, tagsDict, skipSchemaSet) {
           } else {
             let refName$1 = refName._0;
             let other = schemasDict[refName$1];
-            payload = other !== undefined ? (
-                typeof other !== "object" || other._tag !== "Object" ? convertType(other) : ({
-                    TAG: "InlineRecord",
-                    _0: other._0.map(convertField)
-                  })
-              ) : ({
+            if (other !== undefined) {
+              if (typeof other !== "object" || other._tag !== "Object") {
+                payload = convertType(other);
+              } else {
+                let filtered = other._0.filter(f => f.name !== tagName);
+                payload = {
+                  TAG: "InlineRecord",
+                  _0: filtered.map(convertField)
+                };
+              }
+            } else {
+              payload = {
                 TAG: "Named",
                 _0: CodegenHelpers.lcFirst(refName$1)
-              });
+              };
+            }
           }
           return {
             tag: CodegenHelpers.ucFirst(c._tag),
@@ -203,15 +210,23 @@ function convertToIrTypeDef(namedSchema, schemasDict, tagsDict, skipSchemaSet) {
             let tagValue = tagsDict[name];
             let tag = tagValue !== undefined ? CodegenHelpers.ucFirst(tagValue) : CodegenHelpers.ucFirst(name);
             let other = schemasDict[name];
-            let payload = other !== undefined ? (
-                typeof other !== "object" || other._tag !== "Object" ? convertType(other) : ({
-                    TAG: "InlineRecord",
-                    _0: other._0.map(convertField)
-                  })
-              ) : ({
+            let payload;
+            if (other !== undefined) {
+              if (typeof other !== "object" || other._tag !== "Object") {
+                payload = convertType(other);
+              } else {
+                let filtered = other._0.filter(f => f.name !== tagName);
+                payload = {
+                  TAG: "InlineRecord",
+                  _0: filtered.map(convertField)
+                };
+              }
+            } else {
+              payload = {
                 TAG: "Named",
                 _0: CodegenHelpers.lcFirst(name)
-              });
+              };
+            }
             return {
               tag: tag,
               payload: payload

package/src/OpenAPIParser.res.mjs

@@ -133,6 +133,45 @@ function parsePathResponses(pathsJson) {
   };
 }
 
+function extractDiscriminatorFromPair(items, discDict) {
+  let match = discDict["propertyName"];
+  if (match === undefined) {
+    return;
+  }
+  if (typeof match !== "string") {
+    return;
+  }
+  let memberNames = Core__Array.filterMap(items, item => {
+    if (typeof item !== "object" || item === null || Array.isArray(item)) {
+      return;
+    }
+    let match = item["$ref"];
+    if (match === undefined) {
+      return;
+    }
+    if (typeof match !== "string") {
+      return;
+    }
+    let parts = match.split("/");
+    return parts[parts.length - 1 | 0];
+  });
+  if (memberNames.length < 2) {
+    return;
+  }
+  let lcNames = memberNames.map(n => {
+    let first = n.charAt(0).toLowerCase();
+    let rest = n.slice(1);
+    return first + rest;
+  });
+  let firstName = Core__Option.getOr(lcNames[0], "unknown");
+  let restNames = lcNames.slice(1);
+  let unionName = firstName + restNames.map(n => "Or" + ucFirst(n)).join("");
+  return [
+    unionName,
+    match
+  ];
+}
+
 function extractFieldDiscriminators(schemaJson) {
   let result = {};
   if (typeof schemaJson === "object" && schemaJson !== null && !Array.isArray(schemaJson)) {
@@ -144,52 +183,71 @@ function extractFieldDiscriminators(schemaJson) {
           return;
         }
         let match = propJson["anyOf"];
-        let match$1 = propJson["discriminator"];
-        if (match === undefined) {
-          return;
-        }
-        if (!Array.isArray(match)) {
-          return;
-        }
-        if (match$1 === undefined) {
-          return;
-        }
-        if (typeof match$1 !== "object" || match$1 === null || Array.isArray(match$1)) {
-          return;
+        let directItems;
+        let exit = 0;
+        if (Array.isArray(match)) {
+          directItems = match;
+        } else {
+          exit = 1;
         }
-        let match$2 = match$1["propertyName"];
-        if (match$2 === undefined) {
-          return;
+        if (exit === 1) {
+          let match$1 = propJson["oneOf"];
+          directItems = Array.isArray(match$1) ? match$1 : undefined;
         }
-        if (typeof match$2 !== "string") {
-          return;
+        let match$2 = propJson["discriminator"];
+        let exit$1 = 0;
+        if (directItems !== undefined && match$2 !== undefined) {
+          if (typeof match$2 === "object" && match$2 !== null && !Array.isArray(match$2)) {
+            let match$3 = extractDiscriminatorFromPair(directItems, match$2);
+            if (match$3 !== undefined) {
+              result[match$3[0]] = match$3[1];
+              return;
+            } else {
+              return;
+            }
+          }
+          exit$1 = 1;
+        } else {
+          exit$1 = 1;
         }
-        let memberNames = Core__Array.filterMap(match, item => {
-          if (typeof item !== "object" || item === null || Array.isArray(item)) {
+        if (exit$1 === 1) {
+          let match$4 = propJson["items"];
+          if (match$4 === undefined) {
+            return;
+          }
+          if (typeof match$4 !== "object" || match$4 === null || Array.isArray(match$4)) {
             return;
           }
-          let match = item["$ref"];
-          if (match === undefined) {
+          let match$5 = match$4["anyOf"];
+          let nestedItems;
+          let exit$2 = 0;
+          if (Array.isArray(match$5)) {
+            nestedItems = match$5;
+          } else {
+            exit$2 = 2;
+          }
+          if (exit$2 === 2) {
+            let match$6 = match$4["oneOf"];
+            nestedItems = Array.isArray(match$6) ? match$6 : undefined;
+          }
+          let match$7 = match$4["discriminator"];
+          if (nestedItems === undefined) {
             return;
           }
-          if (typeof match !== "string") {
+          if (match$7 === undefined) {
+            return;
+          }
+          if (typeof match$7 !== "object" || match$7 === null || Array.isArray(match$7)) {
+            return;
+          }
+          let match$8 = extractDiscriminatorFromPair(nestedItems, match$7);
+          if (match$8 !== undefined) {
+            result[match$8[0]] = match$8[1];
+            return;
+          } else {
             return;
           }
-          let parts = match.split("/");
-          return parts[parts.length - 1 | 0];
-        });
-        if (memberNames.length < 2) {
-          return;
         }
-        let lcNames = memberNames.map(n => {
-          let first = n.charAt(0).toLowerCase();
-          let rest = n.slice(1);
-          return first + rest;
-        });
-        let firstName = Core__Option.getOr(lcNames[0], "unknown");
-        let restNames = lcNames.slice(1);
-        let unionName = firstName + restNames.map(n => "Or" + ucFirst(n)).join("");
-        result[unionName] = match$2;
       });
     }
   }
@@ -368,6 +426,7 @@ export {
   pathToName,
   ucFirst,
   parsePathResponses,
+  extractDiscriminatorFromPair,
   extractFieldDiscriminators,
   extractDiscriminatorPropertyName,
   extractDiscriminatorTag,