osury 0.12.0 → 0.14.0

package/package.json

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

package/src/Codegen.res.mjs

@@ -96,9 +96,8 @@ function generateType(schema) {
   } else {
     switch (schema._tag) {
       case "Optional" :
-        return `option<` + generateType(schema._0) + `>`;
       case "Nullable" :
-        return `Nullable.t<` + generateType(schema._0) + `>`;
+        return `option<` + generateType(schema._0) + `>`;
       case "Object" :
         return generateRecord(schema._0);
       case "Array" :
@@ -118,12 +117,25 @@ function generateType(schema) {
   }
 }
 
-function generatePolyVariant(cases) {
-  let caseStrs = cases.map(c => {
-    let payloadStr = generateType(c.payload);
-    return `#` + c._tag + `(` + payloadStr + `)`;
-  });
-  return `[` + caseStrs.join(" | ") + `]`;
+function isOptionalType(schema) {
+  if (typeof schema !== "object") {
+    return false;
+  }
+  switch (schema._tag) {
+    case "Optional" :
+    case "Nullable" :
+      return true;
+    default:
+      return false;
+  }
+}
+
+function isNullableType(schema) {
+  if (typeof schema !== "object") {
+    return false;
+  } else {
+    return schema._tag === "Nullable";
+  }
 }
 
 function generateRecord(fields) {
@@ -133,22 +145,31 @@ function generateRecord(fields) {
   let fieldStrs = fields.map(field => {
     let typeStr = generateType(field.type);
     let optionalType = field.required || isOptionalType(field.type) ? typeStr : `option<` + typeStr + `>`;
+    let finalType = isNullableType(field.type) ? `@s.null ` + optionalType : optionalType;
     let asAttr = reservedKeywords.includes(field.name) ? `@as("` + field.name + `") ` : "";
     let fieldName = reservedKeywords.includes(field.name) ? field.name + `_` : field.name;
-    return asAttr + fieldName + `: ` + optionalType;
+    return asAttr + fieldName + `: ` + finalType;
   });
   return `{\n  ` + fieldStrs.join(",\n  ") + `\n}`;
 }
 
-function generateUnion(types) {
-  let caseStrs = types.map(t => {
-    let tag = getTagForType(t);
-    let payload = generateType(t);
-    return `#` + tag + `(` + payload + `)`;
+function generatePolyVariant(cases) {
+  let caseStrs = cases.map(c => {
+    let payloadStr = generateType(c.payload);
+    return `#` + c._tag + `(` + payloadStr + `)`;
   });
   return `[` + caseStrs.join(" | ") + `]`;
 }
 
+function ucFirst(s) {
+  if (s.length === 0) {
+    return s;
+  }
+  let first = s.charAt(0).toUpperCase();
+  let rest = s.slice(1);
+  return first + rest;
+}
+
 function getTagForType(t) {
   if (typeof t !== "object") {
     switch (t) {
@@ -187,34 +208,13 @@ function getTagForType(t) {
   }
 }
 
-function ucFirst(s) {
-  if (s.length === 0) {
-    return s;
-  }
-  let first = s.charAt(0).toUpperCase();
-  let rest = s.slice(1);
-  return first + rest;
-}
-
-function isOptionalType(schema) {
-  if (typeof schema !== "object") {
-    return false;
-  }
-  switch (schema._tag) {
-    case "Optional" :
-    case "Nullable" :
-      return true;
-    default:
-      return false;
-  }
-}
-
-function isNullableType(schema) {
-  if (typeof schema !== "object") {
-    return false;
-  } else {
-    return schema._tag === "Nullable";
-  }
+function generateUnion(types) {
+  let caseStrs = types.map(t => {
+    let tag = getTagForType(t);
+    let payload = generateType(t);
+    return `#` + tag + `(` + payload + `)`;
+  });
+  return `[` + caseStrs.join(" | ") + `]`;
 }
 
 function hasUnion(_schema) {
@@ -784,12 +784,6 @@ export type t<T> = { [key: string]: T };
 `;
 }
 
-function generateNullableShim() {
-  return `// Generated by osury - Nullable type shim for @genType
-export type t<T> = T | null;
-`;
-}
-
 export {
   reservedKeywords,
   isReservedKeyword,
@@ -822,6 +816,5 @@ export {
   collectUnionWarnings,
   generateModule,
   generateDictShim,
-  generateNullableShim,
 }
 /* No side effect */