osury 0.7.1 → 0.8.0

package/package.json

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

package/src/Codegen.res.mjs

@@ -281,11 +281,12 @@ function generateInlineRecord(refName, schemasDict) {
   }
 }
 
-function generateInlineVariantBody(types, schemasDict) {
+function generateInlineVariantBody(types, schemasDict, tagsDict) {
   return types.map(t => {
     if (typeof t === "object" && t._tag === "Ref") {
       let name = t._0;
-      let tag = ucFirst(name);
+      let tagValue = tagsDict[name];
+      let tag = tagValue !== undefined ? ucFirst(tagValue) : ucFirst(name);
       let inlineRecord = generateInlineRecord(name, schemasDict);
       return tag + `(` + inlineRecord + `)`;
     }
@@ -571,13 +572,13 @@ function generateVariantBody(types) {
   }).join(" | ");
 }
 
-function generateTypeDefWithSkipSet(namedSchema, _skipSet, schemasDict) {
+function generateTypeDefWithSkipSet(namedSchema, _skipSet, schemasDict, tagsDict) {
   let typeName = lcFirst(namedSchema.name);
   let types = namedSchema.schema;
   if (typeof types === "object" && types._tag === "Union") {
     let types$1 = types._0;
     if (isRefOnlyUnion(types$1)) {
-      let variantBody = generateInlineVariantBody(types$1, schemasDict);
+      let variantBody = generateInlineVariantBody(types$1, schemasDict, tagsDict);
       return `@genType
 @tag("_tag")
 @schema
@@ -623,7 +624,8 @@ type ` + typeName + ` = ` + typeBody;
 function generateModule(schemas) {
   let extractedUnions = schemas.flatMap(s => extractUnions(s.name, s.schema).map(extracted => ({
     name: extracted.name,
-    schema: extracted.schema
+    schema: extracted.schema,
+    discriminatorTag: undefined
   })));
   let seen = {};
   let uniqueUnions = extractedUnions.filter(u => {
@@ -636,16 +638,23 @@ function generateModule(schemas) {
   });
   let modifiedSchemas = schemas.map(s => ({
     name: s.name,
-    schema: replaceUnions(s.name, s.schema)
+    schema: replaceUnions(s.name, s.schema),
+    discriminatorTag: s.discriminatorTag
   }));
   let allSchemas = uniqueUnions.concat(modifiedSchemas);
   let schemasDict = {};
+  let tagsDict = {};
   allSchemas.forEach(s => {
     schemasDict[s.name] = s.schema;
+    let tag = s.discriminatorTag;
+    if (tag !== undefined) {
+      tagsDict[s.name] = tag;
+      return;
+    }
   });
   let sorted = topologicalSort(allSchemas);
   let skipSet = {};
-  let typeDefs = sorted.map(s => generateTypeDefWithSkipSet(s, skipSet, schemasDict)).join("\n\n");
+  let typeDefs = sorted.map(s => generateTypeDefWithSkipSet(s, skipSet, schemasDict, tagsDict)).join("\n\n");
   return "module S = Sury\n\n" + typeDefs;
 }
 

package/src/OpenAPIParser.res.mjs

@@ -91,7 +91,8 @@ function parsePathResponses(pathsJson) {
             TAG: "Ok",
             _0: {
               name: name,
-              schema: schemaType._0
+              schema: schemaType._0,
+              discriminatorTag: undefined
             }
           };
         } else {
@@ -129,6 +130,30 @@ function parsePathResponses(pathsJson) {
   };
 }
 
+function extractDiscriminatorTag(schemaJson) {
+  if (typeof schemaJson !== "object" || schemaJson === null || Array.isArray(schemaJson)) {
+    return;
+  }
+  let match = schemaJson["properties"];
+  if (match === undefined) {
+    return;
+  }
+  if (typeof match !== "object" || match === null || Array.isArray(match)) {
+    return;
+  }
+  let match$1 = match["_tag"];
+  if (match$1 === undefined) {
+    return;
+  }
+  if (typeof match$1 !== "object" || match$1 === null || Array.isArray(match$1)) {
+    return;
+  }
+  let match$2 = match$1["const"];
+  if (typeof match$2 === "string") {
+    return match$2;
+  }
+}
+
 function parseComponentSchemas(componentsJson) {
   if (typeof componentsJson === "object" && componentsJson !== null && !Array.isArray(componentsJson)) {
     let match = componentsJson["schemas"];
@@ -142,13 +167,16 @@ function parseComponentSchemas(componentsJson) {
     if (typeof match === "object" && match !== null && !Array.isArray(match)) {
       let entries = Object.entries(match);
       let results = entries.map(param => {
-        let schemaType = Schema.parse(param[1]);
+        let schemaJson = param[1];
+        let discriminatorTag = extractDiscriminatorTag(schemaJson);
+        let schemaType = Schema.parse(schemaJson);
         if (schemaType.TAG === "Ok") {
           return {
             TAG: "Ok",
             _0: {
               name: param[0],
-              schema: schemaType._0
+              schema: schemaType._0,
+              discriminatorTag: discriminatorTag
             }
           };
         } else {
@@ -252,6 +280,7 @@ export {
   pathToName,
   ucFirst,
   parsePathResponses,
+  extractDiscriminatorTag,
   parseComponentSchemas,
   parseDocument,
 }