npm - osury - Versions diffs - 0.21.0 → 0.22.0 - Mend

osury 0.21.0 → 0.22.0

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/package.json +1 -1
package/src/IRGen.res.mjs +29 -14

package/package.json CHANGED Viewed

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

package/src/IRGen.res.mjs CHANGED Viewed

@@ -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