osury 0.10.0 → 0.11.0

package/package.json

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

package/src/Codegen.res.mjs

@@ -96,8 +96,9 @@ function generateType(schema) {
   } else {
     switch (schema._tag) {
       case "Optional" :
-      case "Nullable" :
         return `option<` + generateType(schema._0) + `>`;
+      case "Nullable" :
+        return `null<` + generateType(schema._0) + `>`;
       case "Object" :
         return generateRecord(schema._0);
       case "Array" :
@@ -145,7 +146,7 @@ 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.nullable ` + optionalType : optionalType;
+    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 + `: ` + finalType;
@@ -775,7 +776,10 @@ function generateModule(schemas) {
   let sorted = topologicalSort(allSchemas);
   let skipSet = {};
   let typeDefs = sorted.map(s => generateTypeDefWithSkipSet(s, skipSet, schemasDict, tagsDict)).join("\n\n");
-  return "module S = Sury\n\n" + typeDefs;
+  return `@genType.import(("./Null.gen.ts", "t"))
+type null<'a> = option<'a>
+
+` + "module S = Sury\n\n" + typeDefs;
 }
 
 function generateDictShim() {
@@ -784,6 +788,12 @@ export type t<T> = { [key: string]: T };
 `;
 }
 
+function generateNullShim() {
+  return `// Generated by osury - Null type shim for @genType
+export type t<T> = T | null;
+`;
+}
+
 export {
   reservedKeywords,
   isReservedKeyword,
@@ -816,5 +826,6 @@ export {
   collectUnionWarnings,
   generateModule,
   generateDictShim,
+  generateNullShim,
 }
 /* No side effect */