osury 0.27.0 → 0.29.0

package/package.json

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

package/src/BackendReScript.res.mjs

@@ -32,7 +32,7 @@ function printPrimitive(p) {
 
 function printType(t) {
   if (typeof t !== "object") {
-    return "JSON.t";
+    return "@s.matches(S.json) JSON.t";
   }
   switch (t.TAG) {
     case "Primitive" :

package/src/CodegenTransforms.res.mjs

@@ -348,7 +348,23 @@ function topologicalSort(schemas) {
 function buildSkipSchemaSet(schemas) {
   let skipSet = {};
   schemas.forEach(s => {
-    if (CodegenHelpers.hasUnion(s.schema) || CodegenHelpers.hasUnknown(s.schema)) {
+    let types = s.schema;
+    let hasInlineProblem;
+    if (typeof types !== "object") {
+      hasInlineProblem = CodegenHelpers.hasUnion(s.schema);
+    } else {
+      switch (types._tag) {
+        case "PolyVariant" :
+          hasInlineProblem = types._0.some(c => CodegenHelpers.hasUnion(c.payload));
+          break;
+        case "Union" :
+          hasInlineProblem = types._0.some(CodegenHelpers.hasUnion);
+          break;
+        default:
+          hasInlineProblem = CodegenHelpers.hasUnion(s.schema);
+      }
+    }
+    if (hasInlineProblem) {
       skipSet[s.name] = true;
       return;
     }

package/src/IRGen.res.mjs

@@ -166,16 +166,17 @@ function convertToIrTypeDef(namedSchema, schemasDict, tagsDict, skipSchemaSet) {
             payload: payload
           };
         });
+        let baseAnnotations = [
+          "GenType",
+          {
+            TAG: "Tag",
+            _0: tagName
+          }
+        ];
+        let annotations = shouldSkipSchema ? baseAnnotations : baseAnnotations.concat(["Schema"]);
         return {
           name: typeName,
-          annotations: [
-            "GenType",
-            {
-              TAG: "Tag",
-              _0: tagName
-            },
-            "Schema"
-          ],
+          annotations: annotations,
           kind: {
             TAG: "VariantDef",
             _0: irCases
@@ -192,17 +193,18 @@ function convertToIrTypeDef(namedSchema, schemasDict, tagsDict, skipSchemaSet) {
               payload: payload
             };
           });
+          let baseAnnotations$1 = [
+            "GenType",
+            {
+              TAG: "Tag",
+              _0: tagName
+            },
+            "Unboxed"
+          ];
+          let annotations$1 = shouldSkipSchema ? baseAnnotations$1 : baseAnnotations$1.concat(["Schema"]);
           return {
             name: typeName,
-            annotations: [
-              "GenType",
-              {
-                TAG: "Tag",
-                _0: tagName
-              },
-              "Unboxed",
-              "Schema"
-            ],
+            annotations: annotations$1,
             kind: {
               TAG: "VariantDef",
               _0: irCases$1
@@ -244,16 +246,17 @@ function convertToIrTypeDef(namedSchema, schemasDict, tagsDict, skipSchemaSet) {
             payload: payload$1
           };
         });
+        let baseAnnotations$2 = [
+          "GenType",
+          {
+            TAG: "Tag",
+            _0: tagName
+          }
+        ];
+        let annotations$2 = shouldSkipSchema ? baseAnnotations$2 : baseAnnotations$2.concat(["Schema"]);
         return {
           name: typeName,
-          annotations: [
-            "GenType",
-            {
-              TAG: "Tag",
-              _0: tagName
-            },
-            "Schema"
-          ],
+          annotations: annotations$2,
           kind: {
             TAG: "VariantDef",
             _0: irCases$2
@@ -278,13 +281,13 @@ function convertToIrTypeDef(namedSchema, schemasDict, tagsDict, skipSchemaSet) {
         _0: convertType(namedSchema.schema)
       });
   }
-  let annotations = shouldSkipSchema ? ["GenType"] : [
+  let annotations$3 = shouldSkipSchema ? ["GenType"] : [
       "GenType",
       "Schema"
     ];
   return {
     name: typeName,
-    annotations: annotations,
+    annotations: annotations$3,
     kind: kind
   };
 }