osury 0.14.0 → 0.15.0

package/bin/osury.mjs

@@ -82,12 +82,20 @@ function generate(inputPath, outputPath) {
     // Write main ReScript file
     fs.writeFileSync(outputPath, code);
 
-    // Write Dict.gen.tsx shim for @genType
-    const dictShimPath = path.join(outputDir || ".", "Dict.gen.tsx");
+    // Write Dict.gen.ts shim for @genType
+    const dictShimPath = path.join(outputDir || ".", "Dict.gen.ts");
     fs.writeFileSync(dictShimPath, Codegen.generateDictShim());
 
+    // Write Nullable.res module (option<T> alias for sury compatibility)
+    const nullableResPath = path.join(outputDir || ".", "Nullable.res");
+    fs.writeFileSync(nullableResPath, Codegen.generateNullableModule());
+
+    // Write Nullable.shim.ts for @genType.import (maps to T | null)
+    const nullableShimPath = path.join(outputDir || ".", "Nullable.shim.ts");
+    fs.writeFileSync(nullableShimPath, Codegen.generateNullableShim());
+
     console.log(`Generated ${result._0.length} types to ${outputPath}`);
-    console.log(`Generated shim: ${dictShimPath}`);
+    console.log(`Generated shims: ${dictShimPath}, ${nullableShimPath}`);
   } else {
     console.error("Parse errors:");
     result._0.forEach((err) => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "osury",
   "type": "module",
   "description": "Generate ReScript types with Sury schemas from OpenAPI specifications",
-  "version": "0.14.0",
+  "version": "0.15.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 `Nullable.t<` + generateType(schema._0) + `>`;
       case "Object" :
         return generateRecord(schema._0);
       case "Array" :
@@ -784,6 +785,28 @@ export type t<T> = { [key: string]: T };
 `;
 }
 
+function generateNullableShim() {
+  return `/**
+ * Type shim for ReScript Nullable.t
+ *
+ * This file is generated by osury (not by ReScript/genType).
+ * It maps ReScript's option<T> to TypeScript's T | null for JSON nullable fields.
+ *
+ * ReScript side: Nullable.t<T> = option<T> (works with sury's S.null schema)
+ * TypeScript side: t<T> = T | null (correct JSON null representation)
+ */
+export type t<T> = T | null;
+`;
+}
+
+function generateNullableModule() {
+  return `// Generated by osury - Nullable type for JSON null values
+// This is option<T> internally but maps to T | null in TypeScript via shim
+@genType.import(("./Nullable.shim.ts", "t"))
+type t<'a> = option<'a>
+`;
+}
+
 export {
   reservedKeywords,
   isReservedKeyword,
@@ -816,5 +839,7 @@ export {
   collectUnionWarnings,
   generateModule,
   generateDictShim,
+  generateNullableShim,
+  generateNullableModule,
 }
 /* No side effect */