osury 0.24.0 → 0.26.0

package/bin/osury.mjs

@@ -358,6 +358,9 @@ function generate(inputPath, outputPath) {
   const dictShimPath = path.join(outputDir || ".", "Dict.gen.ts");
   fs.writeFileSync(dictShimPath, Codegen.generateDictShim());
 
+  const jsonShimPath = path.join(outputDir || ".", "JSON.gen.ts");
+  fs.writeFileSync(jsonShimPath, Codegen.generateJsonShim());
+
   const nullableResPath = path.join(outputDir || ".", "Nullable.res");
   fs.writeFileSync(nullableResPath, Codegen.generateNullableModule());
 
@@ -371,6 +374,7 @@ function generate(inputPath, outputPath) {
   log(`  ${c.dim("Files written:")}`);
   log(`    ${sym.bullet} ${c.cyan(outputPath)} ${c.dim("(main module)")}`);
   log(`    ${sym.bullet} ${c.cyan(dictShimPath)} ${c.dim("(TS shim)")}`);
+  log(`    ${sym.bullet} ${c.cyan(jsonShimPath)} ${c.dim("(TS shim)")}`);
   log(`    ${sym.bullet} ${c.cyan(nullableResPath)} ${c.dim("(ReScript module)")}`);
   log(`    ${sym.bullet} ${c.cyan(nullableShimPath)} ${c.dim("(TS shim)")}`);
   blank();

package/package.json

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

package/src/Codegen.res.mjs

@@ -100,6 +100,8 @@ let generateInlineRecord = CodegenTypes.generateInlineRecord;
 
 let generateDictShim = CodegenShims.generateDictShim;
 
+let generateJsonShim = CodegenShims.generateJsonShim;
+
 let generateNullableShim = CodegenShims.generateNullableShim;
 
 let generateNullableModule = CodegenShims.generateNullableModule;
@@ -134,6 +136,7 @@ export {
   generateInlineVariantBody,
   generateInlineRecord,
   generateDictShim,
+  generateJsonShim,
   generateNullableShim,
   generateNullableModule,
   generateModuleWithDiagnostics,

package/src/CodegenShims.res.mjs

@@ -21,6 +21,12 @@ export type t<T> = T | null;
 `;
 }
 
+function generateJsonShim() {
+  return `// Generated by osury - JSON type shim for @genType
+export type t = unknown;
+`;
+}
+
 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
@@ -32,6 +38,7 @@ type t<'a> = option<'a>
 export {
   generateDictShim,
   generateNullableShim,
+  generateJsonShim,
   generateNullableModule,
 }
 /* No side effect */

package/src/IRGen.res.mjs

@@ -48,10 +48,15 @@ function convertType(schema) {
           _0: convertType(schema._0)
         };
       case "Object" :
-        return {
-          TAG: "InlineRecord",
-          _0: schema._0.map(convertField)
-        };
+        let fields = schema._0;
+        if (fields.length === 0) {
+          return "JSON";
+        } else {
+          return {
+            TAG: "InlineRecord",
+            _0: fields.map(convertField)
+          };
+        }
       case "Array" :
         return {
           TAG: "Array",
@@ -258,13 +263,21 @@ function convertToIrTypeDef(namedSchema, schemasDict, tagsDict, skipSchemaSet) {
   }
   let fields = namedSchema.schema;
   let kind;
-  kind = typeof fields !== "object" || fields._tag !== "Object" ? ({
+  if (typeof fields !== "object" || fields._tag !== "Object") {
+    kind = {
       TAG: "AliasDef",
       _0: convertType(namedSchema.schema)
-    }) : ({
-      TAG: "RecordDef",
-      _0: fields._0.map(convertField)
-    });
+    };
+  } else {
+    let fields$1 = fields._0;
+    kind = fields$1.length > 0 ? ({
+        TAG: "RecordDef",
+        _0: fields$1.map(convertField)
+      }) : ({
+        TAG: "AliasDef",
+        _0: convertType(namedSchema.schema)
+      });
+  }
   let annotations = shouldSkipSchema ? ["GenType"] : [
       "GenType",
       "Schema"