osury 0.4.0 → 0.5.1

package/README.md

@@ -10,8 +10,8 @@ Generate ReScript types with [Sury](https://github.com/DZakh/sury) schemas from
 - Union types extracted as proper variants with `@tag("_tag")`
 - Automatic deduplication of identical union structures
 - Generates `module S = Sury` alias (required by sury-ppx)
-- Generates `Dict.gen.tsx` and `Null.gen.tsx` shims for TypeScript interop
-- Proper JSON `null` support via `Null.t<T>` (not `option` which maps to `undefined`)
+- Generates `Dict.gen.tsx` shim for TypeScript interop
+- Proper JSON `null` support via `@s.nullable option<T>` PPX attribute
 
 ## Installation
 
@@ -29,7 +29,7 @@ npx osury openapi.json
 
 # Generate to specific directory
 npx osury openapi.json src/API.res
-# Creates: src/API.res, src/Dict.gen.tsx, src/Null.gen.tsx
+# Creates: src/API.res, src/Dict.gen.tsx
 
 # With explicit output flag
 npx osury generate openapi.json -o src/Schema.res
@@ -79,18 +79,11 @@ type user = {
 }
 ```
 
-Also generates shims for TypeScript:
-
-`Dict.gen.tsx`:
+Also generates `Dict.gen.tsx` shim for TypeScript:
 ```typescript
 export type t<T> = { [key: string]: T };
 ```
 
-`Null.gen.tsx`:
-```typescript
-export type t<T> = T | null;
-```
-
 ## Generated Annotations
 
 | Annotation | Purpose |
@@ -119,7 +112,7 @@ For the generated code to compile, your project needs:
 | `array` | `array<T>` |
 | `object` | `{ field: T }` |
 | `$ref` | type reference |
-| `anyOf` (nullable) | `Null.t<T>` |
+| `anyOf` (nullable) | `@s.nullable option<T>` |
 | `anyOf` (union) | variant type |
 | `oneOf` (tagged) | poly variant |
 | `additionalProperties` | `Dict.t<T>` |

package/bin/osury.mjs

@@ -86,12 +86,8 @@ function generate(inputPath, outputPath) {
     const dictShimPath = path.join(outputDir || ".", "Dict.gen.tsx");
     fs.writeFileSync(dictShimPath, Codegen.generateDictShim());
 
-    // Write Null.gen.tsx shim for @genType
-    const nullShimPath = path.join(outputDir || ".", "Null.gen.tsx");
-    fs.writeFileSync(nullShimPath, Codegen.generateNullShim());
-
     console.log(`Generated ${result._0.length} types to ${outputPath}`);
-    console.log(`Generated shims: Dict.gen.tsx, Null.gen.tsx`);
+    console.log(`Generated shim: ${dictShimPath}`);
   } 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.4.0",
+  "version": "0.5.1",
   "license": "MIT",
   "bin": {
     "osury": "./bin/osury.mjs"
@@ -55,6 +55,6 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/anthropic/osury"
+    "url": "https://github.com/greenteamer/osury"
   }
 }

package/src/Codegen.res.mjs

@@ -95,9 +95,8 @@ function generateType(schema) {
   } else {
     switch (schema._tag) {
       case "Optional" :
-        return `option<` + generateType(schema._0) + `>`;
       case "Nullable" :
-        return `Null.t<` + generateType(schema._0) + `>`;
+        return `option<` + generateType(schema._0) + `>`;
       case "Object" :
         return generateRecord(schema._0);
       case "Array" :
@@ -130,6 +129,14 @@ function isOptionalType(schema) {
   }
 }
 
+function isNullableType(schema) {
+  if (typeof schema !== "object") {
+    return false;
+  } else {
+    return schema._tag === "Nullable";
+  }
+}
+
 function generateRecord(fields) {
   if (fields.length === 0) {
     return "{}";
@@ -137,11 +144,10 @@ function generateRecord(fields) {
   let fieldStrs = fields.map(field => {
     let typeStr = generateType(field.type);
     let optionalType = field.required || isOptionalType(field.type) ? typeStr : `option<` + typeStr + `>`;
-    if (reservedKeywords.includes(field.name)) {
-      return `@as("` + field.name + `") ` + field.name + `_: ` + optionalType;
-    } else {
-      return field.name + `: ` + optionalType;
-    }
+    let finalType = isNullableType(field.type) ? `@s.nullable ` + 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;
   });
   return `{\n  ` + fieldStrs.join(",\n  ") + `\n}`;
 }
@@ -574,18 +580,13 @@ 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,
   lcFirst,
   generateType,
   isOptionalType,
+  isNullableType,
   generateRecord,
   generatePolyVariant,
   ucFirst,
@@ -605,6 +606,5 @@ export {
   generateTypeDef,
   generateModule,
   generateDictShim,
-  generateNullShim,
 }
 /* No side effect */